From 147fccd967e14c9a507ad57234a4bcd23a9ba29c Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vigneshnatarajan92@gmail.com>
Date: Sat, 17 Jan 2026 19:00:58 -0800
Subject: [PATCH 001/171] Add lobster tool for running local Lobster pipelines

---
 docs/tools/lobster.md                 |  64 +++++++
 src/agents/clawdbot-tools.ts          |   2 +
 src/agents/tools/lobster-tool.test.ts | 122 ++++++++++++++
 src/agents/tools/lobster-tool.ts      | 231 ++++++++++++++++++++++++++
 4 files changed, 419 insertions(+)
 create mode 100644 docs/tools/lobster.md
 create mode 100644 src/agents/tools/lobster-tool.test.ts
 create mode 100644 src/agents/tools/lobster-tool.ts

diff --git a/docs/tools/lobster.md b/docs/tools/lobster.md
new file mode 100644
index 000000000..f54fc3da2
--- /dev/null
+++ b/docs/tools/lobster.md
@@ -0,0 +1,64 @@
+---
+title: Lobster
+description: Run Lobster pipelines (typed workflows) as a first-class Clawdbot tool.
+---
+
+# Lobster
+
+The `lobster` tool lets Clawdbot run Lobster pipelines as a **local-first, typed workflow runtime**.
+
+This is designed for:
+- Deterministic orchestration (move multi-step tool workflows out of the LLM)
+- Human-in-the-loop approvals that **halt and resume**
+- Lower token usage (one `lobster.run` call instead of many tool calls)
+
+## Security model
+
+- Lobster runs as a **local subprocess**.
+- Lobster does **not** manage OAuth or secrets.
+- Side effects still go through Clawdbot tools (messaging, files, etc.).
+
+Recommendations:
+- Prefer configuring `lobsterPath` as an **absolute path** to avoid PATH hijack.
+- Use Lobster approvals (`approve`) for any side-effectful step.
+
+## Actions
+
+### `run`
+
+Run a pipeline in tool mode.
+
+Example:
+
+```json
+{
+  "action": "run",
+  "pipeline": "exec --json \"echo [1]\" | approve --prompt 'ok?'",
+  "lobsterPath": "/absolute/path/to/lobster",
+  "timeoutMs": 20000
+}
+```
+
+### `resume`
+
+Resume a halted pipeline.
+
+Example:
+
+```json
+{
+  "action": "resume",
+  "token": "<resumeToken>",
+  "approve": true,
+  "lobsterPath": "/absolute/path/to/lobster"
+}
+```
+
+## Output
+
+Lobster returns a JSON envelope:
+
+- `ok`: boolean
+- `status`: `ok` | `needs_approval` | `cancelled`
+- `output`: array of items
+- `requiresApproval`: approval request object (when `status=needs_approval`)
diff --git a/src/agents/clawdbot-tools.ts b/src/agents/clawdbot-tools.ts
index 5ae4891dc..c95636fb3 100644
--- a/src/agents/clawdbot-tools.ts
+++ b/src/agents/clawdbot-tools.ts
@@ -9,6 +9,7 @@ import type { AnyAgentTool } from "./tools/common.js";
 import { createCronTool } from "./tools/cron-tool.js";
 import { createGatewayTool } from "./tools/gateway-tool.js";
 import { createImageTool } from "./tools/image-tool.js";
+import { createLobsterTool } from "./tools/lobster-tool.js";
 import { createMessageTool } from "./tools/message-tool.js";
 import { createNodesTool } from "./tools/nodes-tool.js";
 import { createSessionStatusTool } from "./tools/session-status-tool.js";
@@ -111,6 +112,7 @@ export function createClawdbotTools(options?: {
       agentSessionKey: options?.agentSessionKey,
       config: options?.config,
     }),
+    createLobsterTool({ sandboxed: options?.sandboxed }),
     ...(webSearchTool ? [webSearchTool] : []),
     ...(webFetchTool ? [webFetchTool] : []),
     ...(imageTool ? [imageTool] : []),
diff --git a/src/agents/tools/lobster-tool.test.ts b/src/agents/tools/lobster-tool.test.ts
new file mode 100644
index 000000000..26441f2d6
--- /dev/null
+++ b/src/agents/tools/lobster-tool.test.ts
@@ -0,0 +1,122 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { describe, expect, it } from "vitest";
+
+import { createLobsterTool } from "./lobster-tool.js";
+
+async function writeFakeLobster(params: {
+  script: (args: string[]) => unknown;
+}) {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-lobster-"));
+  const binPath = path.join(dir, "lobster");
+
+  const file = `#!/usr/bin/env node\n` +
+    `const args = process.argv.slice(2);\n` +
+    `const payload = (${params.script.toString()})(args);\n` +
+    `process.stdout.write(JSON.stringify(payload));\n`;
+
+  await fs.writeFile(binPath, file, { encoding: "utf8", mode: 0o755 });
+  return { dir, binPath };
+}
+
+describe("lobster tool", () => {
+  it("runs lobster in tool mode and returns envelope", async () => {
+    const fake = await writeFakeLobster({
+      script: (args) => {
+        if (args[0] !== "run") throw new Error("expected run");
+        return {
+          ok: true,
+          status: "ok",
+          output: [{ hello: "world" }],
+          requiresApproval: null,
+        };
+      },
+    });
+
+    const tool = createLobsterTool();
+    const res = await tool.execute("call1", {
+      action: "run",
+      pipeline: "exec --json \"echo [1]\"",
+      lobsterPath: fake.binPath,
+      timeoutMs: 1000,
+    });
+
+    expect(res.details).toMatchObject({
+      ok: true,
+      status: "ok",
+      output: [{ hello: "world" }],
+      requiresApproval: null,
+    });
+  });
+
+  it("supports resume action", async () => {
+    const fake = await writeFakeLobster({
+      script: (args) => {
+        if (args[0] !== "resume") throw new Error("expected resume");
+        return {
+          ok: true,
+          status: "ok",
+          output: ["resumed"],
+          requiresApproval: null,
+        };
+      },
+    });
+
+    const tool = createLobsterTool();
+    const res = await tool.execute("call2", {
+      action: "resume",
+      token: "tok",
+      approve: true,
+      lobsterPath: fake.binPath,
+      timeoutMs: 1000,
+    });
+
+    expect(res.details).toMatchObject({ ok: true, status: "ok" });
+  });
+
+  it("rejects non-absolute lobsterPath", async () => {
+    const tool = createLobsterTool();
+    await expect(
+      tool.execute("call3", {
+        action: "run",
+        pipeline: "json",
+        lobsterPath: "./lobster",
+      }),
+    ).rejects.toThrow(/absolute path/);
+  });
+
+  it("blocks tool in sandboxed mode", async () => {
+    const tool = createLobsterTool({ sandboxed: true });
+    await expect(
+      tool.execute("call4", {
+        action: "run",
+        pipeline: "json",
+        lobsterPath: "/usr/bin/true",
+      }),
+    ).rejects.toThrow(/not available in sandboxed/);
+  });
+
+  it("rejects invalid JSON", async () => {
+    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-lobster-bad-"));
+    const binPath = path.join(dir, "lobster");
+    await fs.writeFile(
+      binPath,
+      `#!/usr/bin/env node\nprocess.stdout.write('not-json');\n`,
+      {
+        encoding: "utf8",
+        mode: 0o755,
+      },
+    );
+
+    const tool = createLobsterTool();
+    await expect(
+      tool.execute("call5", {
+        action: "run",
+        pipeline: "json",
+        lobsterPath: binPath,
+      }),
+    ).rejects.toThrow(/invalid JSON/);
+  });
+});
diff --git a/src/agents/tools/lobster-tool.ts b/src/agents/tools/lobster-tool.ts
new file mode 100644
index 000000000..c01cab81a
--- /dev/null
+++ b/src/agents/tools/lobster-tool.ts
@@ -0,0 +1,231 @@
+import { Type } from "@sinclair/typebox";
+import { spawn } from "node:child_process";
+import path from "node:path";
+
+import { stringEnum } from "../schema/typebox.js";
+import type { AnyAgentTool } from "./common.js";
+import { jsonResult, readNumberParam, readStringParam } from "./common.js";
+
+const LobsterActions = ["run", "resume"] as const;
+
+type LobsterToolParams = {
+  action: (typeof LobsterActions)[number];
+  pipeline?: string;
+  token?: string;
+  approve?: boolean;
+  lobsterPath?: string;
+  cwd?: string;
+  timeoutMs?: number;
+  maxStdoutBytes?: number;
+};
+
+type LobsterEnvelope =
+  | {
+      ok: true;
+      status: "ok" | "needs_approval" | "cancelled";
+      output: unknown[];
+      requiresApproval: null | {
+        type: "approval_request";
+        prompt: string;
+        items: unknown[];
+        resumeToken?: string;
+      };
+    }
+  | {
+      ok: false;
+      error: { type?: string; message: string };
+    };
+
+function buildSchema() {
+  return Type.Object({
+    action: stringEnum(LobsterActions),
+    pipeline: Type.Optional(Type.String({ description: "Lobster pipeline string." })),
+    token: Type.Optional(Type.String({ description: "Resume token from lobster tool mode." })),
+    approve: Type.Optional(Type.Boolean({ description: "Approval decision for resume." })),
+    lobsterPath: Type.Optional(
+      Type.String({
+        description:
+          "Path to lobster executable. Prefer an absolute path to avoid PATH hijack. Defaults to 'lobster'.",
+      }),
+    ),
+    cwd: Type.Optional(
+      Type.String({
+        description: "Working directory for lobster subprocess.",
+      }),
+    ),
+    timeoutMs: Type.Optional(
+      Type.Number({
+        description: "Subprocess timeout (ms).",
+      }),
+    ),
+    maxStdoutBytes: Type.Optional(
+      Type.Number({
+        description: "Max stdout bytes to read before aborting.",
+      }),
+    ),
+  });
+}
+
+function resolveExecutablePath(lobsterPathRaw: string | undefined) {
+  const lobsterPath = lobsterPathRaw?.trim() || "lobster";
+  if (lobsterPath !== "lobster" && !path.isAbsolute(lobsterPath)) {
+    throw new Error("lobsterPath must be an absolute path (or omit to use PATH)");
+  }
+  return lobsterPath;
+}
+
+async function runLobsterSubprocess(params: {
+  execPath: string;
+  argv: string[];
+  cwd: string;
+  timeoutMs: number;
+  maxStdoutBytes: number;
+}) {
+  const { execPath, argv, cwd } = params;
+  const timeoutMs = Math.max(200, params.timeoutMs);
+  const maxStdoutBytes = Math.max(1024, params.maxStdoutBytes);
+
+  return await new Promise<{ stdout: string; exitCode: number | null }>((resolve, reject) => {
+    const child = spawn(execPath, argv, {
+      cwd,
+      stdio: ["ignore", "pipe", "pipe"],
+      env: {
+        ...process.env,
+        // Ensure lobster never tries to be interactive.
+        LOBSTER_MODE: "tool",
+      },
+    });
+
+    let stdout = "";
+    let stdoutBytes = 0;
+    let stderr = "";
+
+    child.stdout?.setEncoding("utf8");
+    child.stderr?.setEncoding("utf8");
+
+    child.stdout?.on("data", (chunk) => {
+      const str = String(chunk);
+      stdoutBytes += Buffer.byteLength(str, "utf8");
+      if (stdoutBytes > maxStdoutBytes) {
+        try {
+          child.kill("SIGKILL");
+        } finally {
+          reject(new Error("lobster output exceeded maxStdoutBytes"));
+        }
+        return;
+      }
+      stdout += str;
+    });
+
+    child.stderr?.on("data", (chunk) => {
+      stderr += String(chunk);
+    });
+
+    const timer = setTimeout(() => {
+      try {
+        child.kill("SIGKILL");
+      } finally {
+        reject(new Error("lobster subprocess timed out"));
+      }
+    }, timeoutMs);
+
+    child.once("error", (err) => {
+      clearTimeout(timer);
+      reject(err);
+    });
+
+    child.once("exit", (code) => {
+      clearTimeout(timer);
+      if (code !== 0) {
+        reject(new Error(`lobster failed (${code ?? "?"}): ${stderr.trim() || stdout.trim()}`));
+        return;
+      }
+      resolve({ stdout, exitCode: code });
+    });
+  });
+}
+
+function parseEnvelope(stdout: string): LobsterEnvelope {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(stdout);
+  } catch {
+    throw new Error("lobster returned invalid JSON");
+  }
+
+  if (!parsed || typeof parsed !== "object") {
+    throw new Error("lobster returned invalid JSON envelope");
+  }
+
+  const ok = (parsed as { ok?: unknown }).ok;
+  if (ok === true) {
+    const env = parsed as LobsterEnvelope;
+    if (!Array.isArray((env as any).output)) {
+      throw new Error("lobster tool output must include output[]");
+    }
+    return env;
+  }
+
+  if (ok === false) {
+    const env = parsed as LobsterEnvelope;
+    const msg = (env as any)?.error?.message;
+    if (typeof msg !== "string" || !msg.trim()) {
+      throw new Error("lobster error envelope missing error.message");
+    }
+    return env;
+  }
+
+  throw new Error("lobster returned invalid JSON envelope");
+}
+
+export function createLobsterTool(options: { sandboxed?: boolean } = {}): AnyAgentTool {
+  const parameters = buildSchema();
+
+  return {
+    label: "Lobster",
+    name: "lobster",
+    description:
+      "Run Lobster pipelines as a local-first, typed workflow runtime (tool mode JSON envelope, resumable approvals).",
+    parameters,
+    async execute(_callId, paramsRaw) {
+      if (options.sandboxed) {
+        throw new Error("lobster tool is not available in sandboxed mode");
+      }
+
+      const params = paramsRaw as Record<string, unknown>;
+      const action = readStringParam(params, "action", { required: true }) as LobsterToolParams["action"];
+
+      const execPath = resolveExecutablePath(readStringParam(params, "lobsterPath"));
+      const cwd = readStringParam(params, "cwd", { allowEmpty: false }) || process.cwd();
+
+      const timeoutMs = readNumberParam(params, "timeoutMs", { integer: true }) ?? 20_000;
+      const maxStdoutBytes = readNumberParam(params, "maxStdoutBytes", { integer: true }) ?? 512_000;
+
+      let argv: string[];
+      if (action === "run") {
+        const pipeline = readStringParam(params, "pipeline", { required: true, label: "pipeline" })!;
+        argv = ["run", "--mode", "tool", pipeline];
+      } else if (action === "resume") {
+        const token = readStringParam(params, "token", { required: true, label: "token" })!;
+        const approve = params["approve"];
+        if (typeof approve !== "boolean") {
+          throw new Error("approve required");
+        }
+        argv = ["resume", "--token", token, "--approve", approve ? "yes" : "no"];
+      } else {
+        throw new Error(`Unknown action: ${action}`);
+      }
+
+      const { stdout } = await runLobsterSubprocess({
+        execPath,
+        argv,
+        cwd,
+        timeoutMs,
+        maxStdoutBytes,
+      });
+
+      const envelope = parseEnvelope(stdout);
+      return jsonResult(envelope);
+    },
+  };
+}

From b2650ba6725f11b936a91e6c008e099d32f2aa47 Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vigneshnatarajan92@gmail.com>
Date: Sat, 17 Jan 2026 20:18:54 -0800
Subject: [PATCH 002/171] Move lobster integration to optional plugin tool

---
 docs/tools/lobster.md                       |  64 ------
 extensions/lobster/README.md                |  38 ++++
 extensions/lobster/index.ts                 |   7 +
 extensions/lobster/package.json             |   9 +
 extensions/lobster/src/lobster-tool.test.ts |  87 ++++++++
 extensions/lobster/src/lobster-tool.ts      | 185 ++++++++++++++++
 src/agents/clawdbot-tools.ts                |   2 -
 src/agents/tools/lobster-tool.test.ts       | 122 -----------
 src/agents/tools/lobster-tool.ts            | 231 --------------------
 9 files changed, 326 insertions(+), 419 deletions(-)
 delete mode 100644 docs/tools/lobster.md
 create mode 100644 extensions/lobster/README.md
 create mode 100644 extensions/lobster/index.ts
 create mode 100644 extensions/lobster/package.json
 create mode 100644 extensions/lobster/src/lobster-tool.test.ts
 create mode 100644 extensions/lobster/src/lobster-tool.ts
 delete mode 100644 src/agents/tools/lobster-tool.test.ts
 delete mode 100644 src/agents/tools/lobster-tool.ts

diff --git a/docs/tools/lobster.md b/docs/tools/lobster.md
deleted file mode 100644
index f54fc3da2..000000000
--- a/docs/tools/lobster.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-title: Lobster
-description: Run Lobster pipelines (typed workflows) as a first-class Clawdbot tool.
----
-
-# Lobster
-
-The `lobster` tool lets Clawdbot run Lobster pipelines as a **local-first, typed workflow runtime**.
-
-This is designed for:
-- Deterministic orchestration (move multi-step tool workflows out of the LLM)
-- Human-in-the-loop approvals that **halt and resume**
-- Lower token usage (one `lobster.run` call instead of many tool calls)
-
-## Security model
-
-- Lobster runs as a **local subprocess**.
-- Lobster does **not** manage OAuth or secrets.
-- Side effects still go through Clawdbot tools (messaging, files, etc.).
-
-Recommendations:
-- Prefer configuring `lobsterPath` as an **absolute path** to avoid PATH hijack.
-- Use Lobster approvals (`approve`) for any side-effectful step.
-
-## Actions
-
-### `run`
-
-Run a pipeline in tool mode.
-
-Example:
-
-```json
-{
-  "action": "run",
-  "pipeline": "exec --json \"echo [1]\" | approve --prompt 'ok?'",
-  "lobsterPath": "/absolute/path/to/lobster",
-  "timeoutMs": 20000
-}
-```
-
-### `resume`
-
-Resume a halted pipeline.
-
-Example:
-
-```json
-{
-  "action": "resume",
-  "token": "<resumeToken>",
-  "approve": true,
-  "lobsterPath": "/absolute/path/to/lobster"
-}
-```
-
-## Output
-
-Lobster returns a JSON envelope:
-
-- `ok`: boolean
-- `status`: `ok` | `needs_approval` | `cancelled`
-- `output`: array of items
-- `requiresApproval`: approval request object (when `status=needs_approval`)
diff --git a/extensions/lobster/README.md b/extensions/lobster/README.md
new file mode 100644
index 000000000..13e675b45
--- /dev/null
+++ b/extensions/lobster/README.md
@@ -0,0 +1,38 @@
+# Lobster (plugin)
+
+Adds the `lobster` agent tool as an **optional** plugin tool.
+
+## What this is
+
+- Lobster is a standalone workflow shell (typed JSON-first pipelines + approvals/resume).
+- This plugin integrates Lobster with Clawdbot *without core changes*.
+
+## Enable
+
+Because this tool can trigger side effects (via workflows), it is registered with `optional: true`.
+
+Enable it in an agent allowlist:
+
+```json
+{
+  "agents": {
+    "list": [
+      {
+        "id": "main",
+        "tools": {
+          "allow": [
+            "lobster" // plugin id (enables all tools from this plugin)
+          ]
+        }
+      }
+    ]
+  }
+}
+```
+
+## Security
+
+- Runs the `lobster` executable as a local subprocess.
+- Does not manage OAuth/tokens.
+- Uses timeouts, stdout caps, and strict JSON envelope parsing.
+- Prefer an absolute `lobsterPath` in production to avoid PATH hijack.
diff --git a/extensions/lobster/index.ts b/extensions/lobster/index.ts
new file mode 100644
index 000000000..f1c06c554
--- /dev/null
+++ b/extensions/lobster/index.ts
@@ -0,0 +1,7 @@
+import type { ClawdbotPluginApi } from "../../src/plugins/types.js";
+
+import { createLobsterTool } from "./src/lobster-tool.js";
+
+export default function register(api: ClawdbotPluginApi) {
+  api.registerTool(createLobsterTool(api), { optional: true });
+}
diff --git a/extensions/lobster/package.json b/extensions/lobster/package.json
new file mode 100644
index 000000000..606975434
--- /dev/null
+++ b/extensions/lobster/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@clawdbot/lobster",
+  "version": "2026.1.17-1",
+  "type": "module",
+  "description": "Lobster workflow tool plugin (typed pipelines + resumable approvals)",
+  "clawdbot": {
+    "extensions": ["./index.ts"]
+  }
+}
diff --git a/extensions/lobster/src/lobster-tool.test.ts b/extensions/lobster/src/lobster-tool.test.ts
new file mode 100644
index 000000000..3b1dae859
--- /dev/null
+++ b/extensions/lobster/src/lobster-tool.test.ts
@@ -0,0 +1,87 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { describe, expect, it } from "vitest";
+
+import type { ClawdbotPluginApi } from "../../../src/plugins/types.js";
+import { createLobsterTool } from "./lobster-tool.js";
+
+async function writeFakeLobster(params: {
+  payload: unknown;
+}) {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-lobster-plugin-"));
+  const binPath = path.join(dir, "lobster");
+
+  const file = `#!/usr/bin/env node\n` +
+    `process.stdout.write(JSON.stringify(${JSON.stringify(params.payload)}));\n`;
+
+  await fs.writeFile(binPath, file, { encoding: "utf8", mode: 0o755 });
+  return { dir, binPath };
+}
+
+function fakeApi(): ClawdbotPluginApi {
+  return {
+    id: "lobster",
+    name: "lobster",
+    source: "test",
+    config: {} as any,
+    runtime: { version: "test" } as any,
+    logger: { info() {}, warn() {}, error() {}, debug() {} },
+    registerTool() {},
+    registerHttpHandler() {},
+    registerChannel() {},
+    registerGatewayMethod() {},
+    registerCli() {},
+    registerService() {},
+    registerProvider() {},
+    resolvePath: (p) => p,
+  };
+}
+
+describe("lobster plugin tool", () => {
+  it("runs lobster and returns parsed envelope in details", async () => {
+    const fake = await writeFakeLobster({
+      payload: { ok: true, status: "ok", output: [{ hello: "world" }], requiresApproval: null },
+    });
+
+    const tool = createLobsterTool(fakeApi());
+    const res = await tool.execute("call1", {
+      action: "run",
+      pipeline: "noop",
+      lobsterPath: fake.binPath,
+      timeoutMs: 1000,
+    });
+
+    expect(res.details).toMatchObject({ ok: true, status: "ok" });
+  });
+
+  it("requires absolute lobsterPath when provided", async () => {
+    const tool = createLobsterTool(fakeApi());
+    await expect(
+      tool.execute("call2", {
+        action: "run",
+        pipeline: "noop",
+        lobsterPath: "./lobster",
+      }),
+    ).rejects.toThrow(/absolute path/);
+  });
+
+  it("rejects invalid JSON from lobster", async () => {
+    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-lobster-plugin-bad-"));
+    const binPath = path.join(dir, "lobster");
+    await fs.writeFile(binPath, `#!/usr/bin/env node\nprocess.stdout.write('nope');\n`, {
+      encoding: "utf8",
+      mode: 0o755,
+    });
+
+    const tool = createLobsterTool(fakeApi());
+    await expect(
+      tool.execute("call3", {
+        action: "run",
+        pipeline: "noop",
+        lobsterPath: binPath,
+      }),
+    ).rejects.toThrow(/invalid JSON/);
+  });
+});
diff --git a/extensions/lobster/src/lobster-tool.ts b/extensions/lobster/src/lobster-tool.ts
new file mode 100644
index 000000000..2d76e0821
--- /dev/null
+++ b/extensions/lobster/src/lobster-tool.ts
@@ -0,0 +1,185 @@
+import { Type } from "@sinclair/typebox";
+import { spawn } from "node:child_process";
+import path from "node:path";
+
+import type { ClawdbotPluginApi } from "../../../src/plugins/types.js";
+
+type LobsterEnvelope =
+  | {
+      ok: true;
+      status: "ok" | "needs_approval" | "cancelled";
+      output: unknown[];
+      requiresApproval: null | {
+        type: "approval_request";
+        prompt: string;
+        items: unknown[];
+        resumeToken?: string;
+      };
+    }
+  | {
+      ok: false;
+      error: { type?: string; message: string };
+    };
+
+function resolveExecutablePath(lobsterPathRaw: string | undefined) {
+  const lobsterPath = lobsterPathRaw?.trim() || "lobster";
+  if (lobsterPath !== "lobster" && !path.isAbsolute(lobsterPath)) {
+    throw new Error("lobsterPath must be an absolute path (or omit to use PATH)");
+  }
+  return lobsterPath;
+}
+
+async function runLobsterSubprocess(params: {
+  execPath: string;
+  argv: string[];
+  cwd: string;
+  timeoutMs: number;
+  maxStdoutBytes: number;
+}) {
+  const { execPath, argv, cwd } = params;
+  const timeoutMs = Math.max(200, params.timeoutMs);
+  const maxStdoutBytes = Math.max(1024, params.maxStdoutBytes);
+
+  return await new Promise<{ stdout: string }>((resolve, reject) => {
+    const child = spawn(execPath, argv, {
+      cwd,
+      stdio: ["ignore", "pipe", "pipe"],
+      env: {
+        ...process.env,
+        LOBSTER_MODE: "tool",
+      },
+    });
+
+    let stdout = "";
+    let stdoutBytes = 0;
+    let stderr = "";
+
+    child.stdout?.setEncoding("utf8");
+    child.stderr?.setEncoding("utf8");
+
+    child.stdout?.on("data", (chunk) => {
+      const str = String(chunk);
+      stdoutBytes += Buffer.byteLength(str, "utf8");
+      if (stdoutBytes > maxStdoutBytes) {
+        try {
+          child.kill("SIGKILL");
+        } finally {
+          reject(new Error("lobster output exceeded maxStdoutBytes"));
+        }
+        return;
+      }
+      stdout += str;
+    });
+
+    child.stderr?.on("data", (chunk) => {
+      stderr += String(chunk);
+    });
+
+    const timer = setTimeout(() => {
+      try {
+        child.kill("SIGKILL");
+      } finally {
+        reject(new Error("lobster subprocess timed out"));
+      }
+    }, timeoutMs);
+
+    child.once("error", (err) => {
+      clearTimeout(timer);
+      reject(err);
+    });
+
+    child.once("exit", (code) => {
+      clearTimeout(timer);
+      if (code !== 0) {
+        reject(new Error(`lobster failed (${code ?? "?"}): ${stderr.trim() || stdout.trim()}`));
+        return;
+      }
+      resolve({ stdout });
+    });
+  });
+}
+
+function parseEnvelope(stdout: string): LobsterEnvelope {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(stdout);
+  } catch {
+    throw new Error("lobster returned invalid JSON");
+  }
+
+  if (!parsed || typeof parsed !== "object") {
+    throw new Error("lobster returned invalid JSON envelope");
+  }
+
+  const ok = (parsed as { ok?: unknown }).ok;
+  if (ok === true || ok === false) {
+    return parsed as LobsterEnvelope;
+  }
+
+  throw new Error("lobster returned invalid JSON envelope");
+}
+
+export function createLobsterTool(api: ClawdbotPluginApi) {
+  return {
+    name: "lobster",
+    description:
+      "Run Lobster pipelines as a local-first workflow runtime (typed JSON envelope + resumable approvals).",
+    parameters: Type.Object({
+      // NOTE: Prefer string enums in tool schemas; some providers reject unions/anyOf.
+      action: Type.Unsafe<"run" | "resume">({ type: "string", enum: ["run", "resume"] }),
+      pipeline: Type.Optional(Type.String()),
+      token: Type.Optional(Type.String()),
+      approve: Type.Optional(Type.Boolean()),
+      lobsterPath: Type.Optional(Type.String()),
+      cwd: Type.Optional(Type.String()),
+      timeoutMs: Type.Optional(Type.Number()),
+      maxStdoutBytes: Type.Optional(Type.Number()),
+    }),
+    async execute(_id: string, params: Record<string, unknown>) {
+      const action = String(params.action || "").trim();
+      if (!action) throw new Error("action required");
+
+      const execPath = resolveExecutablePath(
+        typeof params.lobsterPath === "string" ? params.lobsterPath : undefined,
+      );
+      const cwd = typeof params.cwd === "string" && params.cwd.trim() ? params.cwd.trim() : process.cwd();
+      const timeoutMs = typeof params.timeoutMs === "number" ? params.timeoutMs : 20_000;
+      const maxStdoutBytes = typeof params.maxStdoutBytes === "number" ? params.maxStdoutBytes : 512_000;
+
+      const argv = (() => {
+        if (action === "run") {
+          const pipeline = typeof params.pipeline === "string" ? params.pipeline : "";
+          if (!pipeline.trim()) throw new Error("pipeline required");
+          return ["run", "--mode", "tool", pipeline];
+        }
+        if (action === "resume") {
+          const token = typeof params.token === "string" ? params.token : "";
+          if (!token.trim()) throw new Error("token required");
+          const approve = params.approve;
+          if (typeof approve !== "boolean") throw new Error("approve required");
+          return ["resume", "--token", token, "--approve", approve ? "yes" : "no"];
+        }
+        throw new Error(`Unknown action: ${action}`);
+      })();
+
+      if (api.runtime?.version && api.logger?.debug) {
+        api.logger.debug(`lobster plugin runtime=${api.runtime.version}`);
+      }
+
+      const { stdout } = await runLobsterSubprocess({
+        execPath,
+        argv,
+        cwd,
+        timeoutMs,
+        maxStdoutBytes,
+      });
+
+      const envelope = parseEnvelope(stdout);
+
+      return {
+        content: [{ type: "text", text: JSON.stringify(envelope, null, 2) }],
+        details: envelope,
+      };
+    },
+  };
+}
diff --git a/src/agents/clawdbot-tools.ts b/src/agents/clawdbot-tools.ts
index c95636fb3..5ae4891dc 100644
--- a/src/agents/clawdbot-tools.ts
+++ b/src/agents/clawdbot-tools.ts
@@ -9,7 +9,6 @@ import type { AnyAgentTool } from "./tools/common.js";
 import { createCronTool } from "./tools/cron-tool.js";
 import { createGatewayTool } from "./tools/gateway-tool.js";
 import { createImageTool } from "./tools/image-tool.js";
-import { createLobsterTool } from "./tools/lobster-tool.js";
 import { createMessageTool } from "./tools/message-tool.js";
 import { createNodesTool } from "./tools/nodes-tool.js";
 import { createSessionStatusTool } from "./tools/session-status-tool.js";
@@ -112,7 +111,6 @@ export function createClawdbotTools(options?: {
       agentSessionKey: options?.agentSessionKey,
       config: options?.config,
     }),
-    createLobsterTool({ sandboxed: options?.sandboxed }),
     ...(webSearchTool ? [webSearchTool] : []),
     ...(webFetchTool ? [webFetchTool] : []),
     ...(imageTool ? [imageTool] : []),
diff --git a/src/agents/tools/lobster-tool.test.ts b/src/agents/tools/lobster-tool.test.ts
deleted file mode 100644
index 26441f2d6..000000000
--- a/src/agents/tools/lobster-tool.test.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import fs from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-
-import { describe, expect, it } from "vitest";
-
-import { createLobsterTool } from "./lobster-tool.js";
-
-async function writeFakeLobster(params: {
-  script: (args: string[]) => unknown;
-}) {
-  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-lobster-"));
-  const binPath = path.join(dir, "lobster");
-
-  const file = `#!/usr/bin/env node\n` +
-    `const args = process.argv.slice(2);\n` +
-    `const payload = (${params.script.toString()})(args);\n` +
-    `process.stdout.write(JSON.stringify(payload));\n`;
-
-  await fs.writeFile(binPath, file, { encoding: "utf8", mode: 0o755 });
-  return { dir, binPath };
-}
-
-describe("lobster tool", () => {
-  it("runs lobster in tool mode and returns envelope", async () => {
-    const fake = await writeFakeLobster({
-      script: (args) => {
-        if (args[0] !== "run") throw new Error("expected run");
-        return {
-          ok: true,
-          status: "ok",
-          output: [{ hello: "world" }],
-          requiresApproval: null,
-        };
-      },
-    });
-
-    const tool = createLobsterTool();
-    const res = await tool.execute("call1", {
-      action: "run",
-      pipeline: "exec --json \"echo [1]\"",
-      lobsterPath: fake.binPath,
-      timeoutMs: 1000,
-    });
-
-    expect(res.details).toMatchObject({
-      ok: true,
-      status: "ok",
-      output: [{ hello: "world" }],
-      requiresApproval: null,
-    });
-  });
-
-  it("supports resume action", async () => {
-    const fake = await writeFakeLobster({
-      script: (args) => {
-        if (args[0] !== "resume") throw new Error("expected resume");
-        return {
-          ok: true,
-          status: "ok",
-          output: ["resumed"],
-          requiresApproval: null,
-        };
-      },
-    });
-
-    const tool = createLobsterTool();
-    const res = await tool.execute("call2", {
-      action: "resume",
-      token: "tok",
-      approve: true,
-      lobsterPath: fake.binPath,
-      timeoutMs: 1000,
-    });
-
-    expect(res.details).toMatchObject({ ok: true, status: "ok" });
-  });
-
-  it("rejects non-absolute lobsterPath", async () => {
-    const tool = createLobsterTool();
-    await expect(
-      tool.execute("call3", {
-        action: "run",
-        pipeline: "json",
-        lobsterPath: "./lobster",
-      }),
-    ).rejects.toThrow(/absolute path/);
-  });
-
-  it("blocks tool in sandboxed mode", async () => {
-    const tool = createLobsterTool({ sandboxed: true });
-    await expect(
-      tool.execute("call4", {
-        action: "run",
-        pipeline: "json",
-        lobsterPath: "/usr/bin/true",
-      }),
-    ).rejects.toThrow(/not available in sandboxed/);
-  });
-
-  it("rejects invalid JSON", async () => {
-    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-lobster-bad-"));
-    const binPath = path.join(dir, "lobster");
-    await fs.writeFile(
-      binPath,
-      `#!/usr/bin/env node\nprocess.stdout.write('not-json');\n`,
-      {
-        encoding: "utf8",
-        mode: 0o755,
-      },
-    );
-
-    const tool = createLobsterTool();
-    await expect(
-      tool.execute("call5", {
-        action: "run",
-        pipeline: "json",
-        lobsterPath: binPath,
-      }),
-    ).rejects.toThrow(/invalid JSON/);
-  });
-});
diff --git a/src/agents/tools/lobster-tool.ts b/src/agents/tools/lobster-tool.ts
deleted file mode 100644
index c01cab81a..000000000
--- a/src/agents/tools/lobster-tool.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-import { Type } from "@sinclair/typebox";
-import { spawn } from "node:child_process";
-import path from "node:path";
-
-import { stringEnum } from "../schema/typebox.js";
-import type { AnyAgentTool } from "./common.js";
-import { jsonResult, readNumberParam, readStringParam } from "./common.js";
-
-const LobsterActions = ["run", "resume"] as const;
-
-type LobsterToolParams = {
-  action: (typeof LobsterActions)[number];
-  pipeline?: string;
-  token?: string;
-  approve?: boolean;
-  lobsterPath?: string;
-  cwd?: string;
-  timeoutMs?: number;
-  maxStdoutBytes?: number;
-};
-
-type LobsterEnvelope =
-  | {
-      ok: true;
-      status: "ok" | "needs_approval" | "cancelled";
-      output: unknown[];
-      requiresApproval: null | {
-        type: "approval_request";
-        prompt: string;
-        items: unknown[];
-        resumeToken?: string;
-      };
-    }
-  | {
-      ok: false;
-      error: { type?: string; message: string };
-    };
-
-function buildSchema() {
-  return Type.Object({
-    action: stringEnum(LobsterActions),
-    pipeline: Type.Optional(Type.String({ description: "Lobster pipeline string." })),
-    token: Type.Optional(Type.String({ description: "Resume token from lobster tool mode." })),
-    approve: Type.Optional(Type.Boolean({ description: "Approval decision for resume." })),
-    lobsterPath: Type.Optional(
-      Type.String({
-        description:
-          "Path to lobster executable. Prefer an absolute path to avoid PATH hijack. Defaults to 'lobster'.",
-      }),
-    ),
-    cwd: Type.Optional(
-      Type.String({
-        description: "Working directory for lobster subprocess.",
-      }),
-    ),
-    timeoutMs: Type.Optional(
-      Type.Number({
-        description: "Subprocess timeout (ms).",
-      }),
-    ),
-    maxStdoutBytes: Type.Optional(
-      Type.Number({
-        description: "Max stdout bytes to read before aborting.",
-      }),
-    ),
-  });
-}
-
-function resolveExecutablePath(lobsterPathRaw: string | undefined) {
-  const lobsterPath = lobsterPathRaw?.trim() || "lobster";
-  if (lobsterPath !== "lobster" && !path.isAbsolute(lobsterPath)) {
-    throw new Error("lobsterPath must be an absolute path (or omit to use PATH)");
-  }
-  return lobsterPath;
-}
-
-async function runLobsterSubprocess(params: {
-  execPath: string;
-  argv: string[];
-  cwd: string;
-  timeoutMs: number;
-  maxStdoutBytes: number;
-}) {
-  const { execPath, argv, cwd } = params;
-  const timeoutMs = Math.max(200, params.timeoutMs);
-  const maxStdoutBytes = Math.max(1024, params.maxStdoutBytes);
-
-  return await new Promise<{ stdout: string; exitCode: number | null }>((resolve, reject) => {
-    const child = spawn(execPath, argv, {
-      cwd,
-      stdio: ["ignore", "pipe", "pipe"],
-      env: {
-        ...process.env,
-        // Ensure lobster never tries to be interactive.
-        LOBSTER_MODE: "tool",
-      },
-    });
-
-    let stdout = "";
-    let stdoutBytes = 0;
-    let stderr = "";
-
-    child.stdout?.setEncoding("utf8");
-    child.stderr?.setEncoding("utf8");
-
-    child.stdout?.on("data", (chunk) => {
-      const str = String(chunk);
-      stdoutBytes += Buffer.byteLength(str, "utf8");
-      if (stdoutBytes > maxStdoutBytes) {
-        try {
-          child.kill("SIGKILL");
-        } finally {
-          reject(new Error("lobster output exceeded maxStdoutBytes"));
-        }
-        return;
-      }
-      stdout += str;
-    });
-
-    child.stderr?.on("data", (chunk) => {
-      stderr += String(chunk);
-    });
-
-    const timer = setTimeout(() => {
-      try {
-        child.kill("SIGKILL");
-      } finally {
-        reject(new Error("lobster subprocess timed out"));
-      }
-    }, timeoutMs);
-
-    child.once("error", (err) => {
-      clearTimeout(timer);
-      reject(err);
-    });
-
-    child.once("exit", (code) => {
-      clearTimeout(timer);
-      if (code !== 0) {
-        reject(new Error(`lobster failed (${code ?? "?"}): ${stderr.trim() || stdout.trim()}`));
-        return;
-      }
-      resolve({ stdout, exitCode: code });
-    });
-  });
-}
-
-function parseEnvelope(stdout: string): LobsterEnvelope {
-  let parsed: unknown;
-  try {
-    parsed = JSON.parse(stdout);
-  } catch {
-    throw new Error("lobster returned invalid JSON");
-  }
-
-  if (!parsed || typeof parsed !== "object") {
-    throw new Error("lobster returned invalid JSON envelope");
-  }
-
-  const ok = (parsed as { ok?: unknown }).ok;
-  if (ok === true) {
-    const env = parsed as LobsterEnvelope;
-    if (!Array.isArray((env as any).output)) {
-      throw new Error("lobster tool output must include output[]");
-    }
-    return env;
-  }
-
-  if (ok === false) {
-    const env = parsed as LobsterEnvelope;
-    const msg = (env as any)?.error?.message;
-    if (typeof msg !== "string" || !msg.trim()) {
-      throw new Error("lobster error envelope missing error.message");
-    }
-    return env;
-  }
-
-  throw new Error("lobster returned invalid JSON envelope");
-}
-
-export function createLobsterTool(options: { sandboxed?: boolean } = {}): AnyAgentTool {
-  const parameters = buildSchema();
-
-  return {
-    label: "Lobster",
-    name: "lobster",
-    description:
-      "Run Lobster pipelines as a local-first, typed workflow runtime (tool mode JSON envelope, resumable approvals).",
-    parameters,
-    async execute(_callId, paramsRaw) {
-      if (options.sandboxed) {
-        throw new Error("lobster tool is not available in sandboxed mode");
-      }
-
-      const params = paramsRaw as Record<string, unknown>;
-      const action = readStringParam(params, "action", { required: true }) as LobsterToolParams["action"];
-
-      const execPath = resolveExecutablePath(readStringParam(params, "lobsterPath"));
-      const cwd = readStringParam(params, "cwd", { allowEmpty: false }) || process.cwd();
-
-      const timeoutMs = readNumberParam(params, "timeoutMs", { integer: true }) ?? 20_000;
-      const maxStdoutBytes = readNumberParam(params, "maxStdoutBytes", { integer: true }) ?? 512_000;
-
-      let argv: string[];
-      if (action === "run") {
-        const pipeline = readStringParam(params, "pipeline", { required: true, label: "pipeline" })!;
-        argv = ["run", "--mode", "tool", pipeline];
-      } else if (action === "resume") {
-        const token = readStringParam(params, "token", { required: true, label: "token" })!;
-        const approve = params["approve"];
-        if (typeof approve !== "boolean") {
-          throw new Error("approve required");
-        }
-        argv = ["resume", "--token", token, "--approve", approve ? "yes" : "no"];
-      } else {
-        throw new Error(`Unknown action: ${action}`);
-      }
-
-      const { stdout } = await runLobsterSubprocess({
-        execPath,
-        argv,
-        cwd,
-        timeoutMs,
-        maxStdoutBytes,
-      });
-
-      const envelope = parseEnvelope(stdout);
-      return jsonResult(envelope);
-    },
-  };
-}

From e011c764a7adbef8f1a8993b5b302437e776f112 Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vigneshnatarajan92@gmail.com>
Date: Sat, 17 Jan 2026 20:33:31 -0800
Subject: [PATCH 003/171] Gate lobster plugin tool in sandboxed contexts

---
 extensions/lobster/index.ts                 |  8 +++++-
 extensions/lobster/src/lobster-tool.test.ts | 27 ++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/extensions/lobster/index.ts b/extensions/lobster/index.ts
index f1c06c554..5f459c939 100644
--- a/extensions/lobster/index.ts
+++ b/extensions/lobster/index.ts
@@ -3,5 +3,11 @@ import type { ClawdbotPluginApi } from "../../src/plugins/types.js";
 import { createLobsterTool } from "./src/lobster-tool.js";
 
 export default function register(api: ClawdbotPluginApi) {
-  api.registerTool(createLobsterTool(api), { optional: true });
+  api.registerTool(
+    (ctx) => {
+      if (ctx.sandboxed) return null;
+      return createLobsterTool(api);
+    },
+    { optional: true },
+  );
 }
diff --git a/extensions/lobster/src/lobster-tool.test.ts b/extensions/lobster/src/lobster-tool.test.ts
index 3b1dae859..1c69b3280 100644
--- a/extensions/lobster/src/lobster-tool.test.ts
+++ b/extensions/lobster/src/lobster-tool.test.ts
@@ -4,7 +4,7 @@ import path from "node:path";
 
 import { describe, expect, it } from "vitest";
 
-import type { ClawdbotPluginApi } from "../../../src/plugins/types.js";
+import type { ClawdbotPluginApi, ClawdbotPluginToolContext } from "../../../src/plugins/types.js";
 import { createLobsterTool } from "./lobster-tool.js";
 
 async function writeFakeLobster(params: {
@@ -39,6 +39,20 @@ function fakeApi(): ClawdbotPluginApi {
   };
 }
 
+function fakeCtx(overrides: Partial<ClawdbotPluginToolContext> = {}): ClawdbotPluginToolContext {
+  return {
+    config: {} as any,
+    workspaceDir: "/tmp",
+    agentDir: "/tmp",
+    agentId: "main",
+    sessionKey: "main",
+    messageChannel: undefined,
+    agentAccountId: undefined,
+    sandboxed: false,
+    ...overrides,
+  };
+}
+
 describe("lobster plugin tool", () => {
   it("runs lobster and returns parsed envelope in details", async () => {
     const fake = await writeFakeLobster({
@@ -84,4 +98,15 @@ describe("lobster plugin tool", () => {
       }),
     ).rejects.toThrow(/invalid JSON/);
   });
+
+  it("can be gated off in sandboxed contexts", async () => {
+    const api = fakeApi();
+    const factoryTool = (ctx: ClawdbotPluginToolContext) => {
+      if (ctx.sandboxed) return null;
+      return createLobsterTool(api);
+    };
+
+    expect(factoryTool(fakeCtx({ sandboxed: true }))).toBeNull();
+    expect(factoryTool(fakeCtx({ sandboxed: false }))?.name).toBe("lobster");
+  });
 });

From 032c780a797e0e226cc622533c14f7fc731aeeda Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vigneshnatarajan92@gmail.com>
Date: Sun, 18 Jan 2026 11:07:47 -0800
Subject: [PATCH 004/171] Add lobster.md documentation

---
 docs/tools/lobster.md | 109 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 docs/tools/lobster.md

diff --git a/docs/tools/lobster.md b/docs/tools/lobster.md
new file mode 100644
index 000000000..bb3f4d130
--- /dev/null
+++ b/docs/tools/lobster.md
@@ -0,0 +1,109 @@
+---
+title: Lobster
+description: Typed workflow runtime for Clawdbot — composable pipelines with approval gates.
+---
+
+# Lobster
+
+Lobster is a workflow shell that lets Clawdbot run multi-step tool sequences as a single, deterministic operation with explicit approval checkpoints.
+
+## Why
+
+Today, complex workflows require many back-and-forth tool calls. Each call costs tokens, and the LLM has to orchestrate every step. Lobster moves that orchestration into a typed runtime:
+
+- **One call instead of many**: Clawdbot calls `lobster.run(...)` once and gets a structured result.
+- **Approvals built in**: Side effects (send email, post comment) halt the workflow until explicitly approved.
+- **Resumable**: Halted workflows return a token; approve and resume without re-running everything.
+
+## Example: Email triage
+
+Without Lobster:
+```
+User: "Check my email and draft replies"
+→ clawd calls gmail.list
+→ LLM summarizes
+→ User: "draft replies to #2 and #5"
+→ LLM drafts
+→ User: "send #2"
+→ clawd calls gmail.send
+(repeat daily, no memory of what was triaged)
+```
+
+With Lobster:
+```
+clawd calls: lobster.run("email.triage --limit 20")
+
+Returns:
+{
+  "status": "needs_approval",
+  "output": {
+    "summary": "5 need replies, 2 need action",
+    "drafts": [...]
+  },
+  "requiresApproval": {
+    "prompt": "Send 2 draft replies?",
+    "resumeToken": "..."
+  }
+}
+
+User approves → clawd calls: lobster.resume(token, approve: true)
+→ Emails sent
+```
+
+One workflow. Deterministic. Safe.
+
+## Enable
+
+Lobster is an **optional** plugin tool. Enable it in your agent config:
+
+```json
+{
+  "agents": {
+    "list": [{
+      "id": "main",
+      "tools": {
+        "allow": ["lobster"]
+      }
+    }]
+  }
+}
+```
+
+You also need the `lobster` CLI installed locally.
+
+## Actions
+
+### `run`
+
+Execute a Lobster pipeline in tool mode.
+
+```json
+{
+  "action": "run",
+  "pipeline": "gog.gmail.search --query 'newer_than:1d' | email.triage",
+  "timeoutMs": 30000
+}
+```
+
+### `resume`
+
+Continue a halted workflow after approval.
+
+```json
+{
+  "action": "resume",
+  "token": "<resumeToken>",
+  "approve": true
+}
+```
+
+## Security
+
+- **Local subprocess only** — no network calls from the plugin itself.
+- **No secrets** — Lobster doesn't manage OAuth; it calls clawd tools that do.
+- **Sandbox-aware** — disabled when `ctx.sandboxed` is true.
+- **Hardened** — `lobsterPath` must be absolute if specified; timeouts and output caps enforced.
+
+## Learn more
+
+- [Lobster repo](https://github.com/vignesh07/lobster) — runtime, commands, and workflow examples.

From 9497ffcc5050d5a636c83c57a183598f12076d9d Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vigneshnatarajan92@gmail.com>
Date: Sun, 18 Jan 2026 12:11:25 -0800
Subject: [PATCH 005/171] Add SKILL.md to teach Clawdbot when/how to use
 Lobster

---
 extensions/lobster/SKILL.md | 90 +++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 extensions/lobster/SKILL.md

diff --git a/extensions/lobster/SKILL.md b/extensions/lobster/SKILL.md
new file mode 100644
index 000000000..12c4f77ec
--- /dev/null
+++ b/extensions/lobster/SKILL.md
@@ -0,0 +1,90 @@
+# Lobster
+
+Lobster executes multi-step workflows with approval checkpoints. Use it when:
+
+- User wants a repeatable automation (triage, monitor, sync)
+- Actions need human approval before executing (send, post, delete)
+- Multiple tool calls should run as one deterministic operation
+
+## When to use Lobster
+
+| User intent | Use Lobster? |
+|-------------|--------------|
+| "Triage my email" | Yes — multi-step, may send replies |
+| "Send a message" | No — single action, use message tool directly |
+| "Check my email every morning and ask before replying" | Yes — scheduled workflow with approval |
+| "What's the weather?" | No — simple query |
+| "Monitor this PR and notify me of changes" | Yes — stateful, recurring |
+
+## Basic usage
+
+### Run a pipeline
+
+```json
+{
+  "action": "run",
+  "pipeline": "gog.gmail.search --query 'newer_than:1d' --max 20 | email.triage"
+}
+```
+
+Returns structured result:
+```json
+{
+  "protocolVersion": 1,
+  "ok": true,
+  "status": "ok",
+  "output": [{ "summary": {...}, "items": [...] }],
+  "requiresApproval": null
+}
+```
+
+### Handle approval
+
+If the workflow needs approval:
+```json
+{
+  "status": "needs_approval",
+  "output": [],
+  "requiresApproval": {
+    "prompt": "Send 3 draft replies?",
+    "items": [...],
+    "resumeToken": "..."
+  }
+}
+```
+
+Present the prompt to the user. If they approve:
+```json
+{
+  "action": "resume",
+  "token": "<resumeToken>",
+  "approve": true
+}
+```
+
+## Example workflows
+
+### Email triage
+```
+gog.gmail.search --query 'newer_than:1d' --max 20 | email.triage
+```
+Fetches recent emails, classifies into buckets (needs_reply, needs_action, fyi).
+
+### Email triage with approval gate
+```
+gog.gmail.search --query 'newer_than:1d' | email.triage | approve --prompt 'Process these?'
+```
+Same as above, but halts for approval before returning.
+
+## Key behaviors
+
+- **Deterministic**: Same input → same output (no LLM variance in pipeline execution)
+- **Approval gates**: `approve` command halts execution, returns token
+- **Resumable**: Use `resume` action with token to continue
+- **Structured output**: Always returns JSON envelope with `protocolVersion`
+
+## Don't use Lobster for
+
+- Simple single-action requests (just use the tool directly)
+- Queries that need LLM interpretation mid-flow
+- One-off tasks that won't be repeated

From ed909d6013b5c6c6e1af86f9c545708fde67317f Mon Sep 17 00:00:00 2001
From: cpojer <christoph.pojer@gmail.com>
Date: Mon, 19 Jan 2026 10:42:21 +0900
Subject: [PATCH 006/171] Improve `cron` reminder tool description.

---
 src/agents/system-prompt.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/agents/system-prompt.ts b/src/agents/system-prompt.ts
index 22fd92f83..951749dcc 100644
--- a/src/agents/system-prompt.ts
+++ b/src/agents/system-prompt.ts
@@ -195,7 +195,7 @@ export function buildAgentSystemPrompt(params: {
     browser: "Control web browser",
     canvas: "Present/eval/snapshot the Canvas",
     nodes: "List/describe/notify/camera/screen on paired nodes",
-    cron: "Manage cron jobs and wake events (use for reminders; include recent context in reminder text if appropriate)",
+    cron: "Manage cron jobs and wake events (use for reminders; when scheduling a reminder, write the systemEvent text as something that will read like a reminder when it fires, and mention that it is a reminder depending on the time gap between setting and firing; include recent context in reminder text if appropriate)",
     message: "Send messages and channel actions",
     gateway: "Restart, apply config, or run updates on the running Clawdbot process",
     agents_list: "List agent ids allowed for sessions_spawn",
@@ -346,7 +346,7 @@ export function buildAgentSystemPrompt(params: {
           "- browser: control clawd's dedicated browser",
           "- canvas: present/eval/snapshot the Canvas",
           "- nodes: list/describe/notify/camera/screen on paired nodes",
-          "- cron: manage cron jobs and wake events (use for reminders; include recent context in reminder text if appropriate)",
+          "- cron: manage cron jobs and wake events (use for reminders; when scheduling a reminder, write the systemEvent text as something that will read like a reminder when it fires, and mention that it is a reminder depending on the time gap between setting and firing; include recent context in reminder text if appropriate)",
           "- sessions_list: list sessions",
           "- sessions_history: fetch session history",
           "- sessions_send: send to another session",

From 6402a48482b70ff1d4d7f5b659c8f876d1754118 Mon Sep 17 00:00:00 2001
From: Dave Lauer <dlauer@gmail.com>
Date: Tue, 20 Jan 2026 14:45:58 -0500
Subject: [PATCH 007/171] feat: add avatar support for agent identity

- Add avatar field to IdentityConfig type
- Add avatar parsing in AgentIdentity from IDENTITY.md
- Add renderAvatar support for image avatars in webchat
- Add CSS styling for image avatars

Users can now configure a custom avatar for the assistant in the webchat
by setting 'identity.avatar' in the agent config or adding 'Avatar: path'
to IDENTITY.md. The avatar can be served from the assets folder.

Closes #TBD
---
 src/commands/agents.config.ts    | 4 +++-
 src/config/types.base.ts         | 2 ++
 ui/src/styles/chat/grouped.css   | 6 ++++++
 ui/src/ui/chat/grouped-render.ts | 8 +++++++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/commands/agents.config.ts b/src/commands/agents.config.ts
index 26c70932f..3aca27d70 100644
--- a/src/commands/agents.config.ts
+++ b/src/commands/agents.config.ts
@@ -34,6 +34,7 @@ export type AgentIdentity = {
   creature?: string;
   vibe?: string;
   theme?: string;
+  avatar?: string;
 };
 
 export function listAgentEntries(cfg: ClawdbotConfig): AgentEntry[] {
@@ -90,6 +91,7 @@ export function parseIdentityMarkdown(content: string): AgentIdentity {
     if (label === "creature") identity.creature = value;
     if (label === "vibe") identity.vibe = value;
     if (label === "theme") identity.theme = value;
+    if (label === "avatar") identity.avatar = value;
   }
   return identity;
 }
@@ -99,7 +101,7 @@ export function loadAgentIdentity(workspace: string): AgentIdentity | null {
   try {
     const content = fs.readFileSync(identityPath, "utf-8");
     const parsed = parseIdentityMarkdown(content);
-    if (!parsed.name && !parsed.emoji && !parsed.theme && !parsed.creature && !parsed.vibe) {
+    if (!parsed.name && !parsed.emoji && !parsed.theme && !parsed.creature && !parsed.vibe && !parsed.avatar) {
       return null;
     }
     return parsed;
diff --git a/src/config/types.base.ts b/src/config/types.base.ts
index 827ec5abb..65b9cf68c 100644
--- a/src/config/types.base.ts
+++ b/src/config/types.base.ts
@@ -144,4 +144,6 @@ export type IdentityConfig = {
   name?: string;
   theme?: string;
   emoji?: string;
+  /** Path to a custom avatar image (relative to workspace or absolute). */
+  avatar?: string;
 };
diff --git a/ui/src/styles/chat/grouped.css b/ui/src/styles/chat/grouped.css
index d0e05e508..158ad2e0a 100644
--- a/ui/src/styles/chat/grouped.css
+++ b/ui/src/styles/chat/grouped.css
@@ -89,6 +89,12 @@
   color: rgba(134, 142, 150, 1);
 }
 
+/* Image avatar support */
+img.chat-avatar {
+  object-fit: cover;
+  object-position: center;
+}
+
 /* Minimal Bubble Design - dynamic width based on content */
 .chat-bubble {
   display: inline-block;
diff --git a/ui/src/ui/chat/grouped-render.ts b/ui/src/ui/chat/grouped-render.ts
index e84d2b7f1..b9f1ef234 100644
--- a/ui/src/ui/chat/grouped-render.ts
+++ b/ui/src/ui/chat/grouped-render.ts
@@ -104,7 +104,7 @@ export function renderMessageGroup(
   `;
 }
 
-function renderAvatar(role: string) {
+function renderAvatar(role: string, avatarUrl?: string) {
   const normalized = normalizeRoleForGrouping(role);
   const initial =
     normalized === "user"
@@ -122,6 +122,12 @@ function renderAvatar(role: string) {
         : normalized === "tool"
           ? "tool"
           : "other";
+  
+  // If avatar URL is provided for assistant, show image
+  if (avatarUrl && normalized === "assistant") {
+    return html`<img class="chat-avatar ${className}" src="${avatarUrl}" alt="Assistant" />`;
+  }
+  
   return html`<div class="chat-avatar ${className}">${initial}</div>`;
 }
 

From 056b3e40d6d1896d0dcc0f5a00ee7db1b2e69439 Mon Sep 17 00:00:00 2001
From: Dave Lauer <dlauer@gmail.com>
Date: Tue, 20 Jan 2026 16:02:55 -0500
Subject: [PATCH 008/171] chore: fix formatting

---
 src/commands/agents.config.ts           |   9 +-
 src/gateway/protocol/schema/sessions.ts | 146 ++++++++++++------------
 src/tui/components/fuzzy-filter.ts      | 138 +++++++++++-----------
 src/tui/components/selectors.ts         |   5 +-
 src/utils/time-format.ts                |  24 ++--
 5 files changed, 163 insertions(+), 159 deletions(-)

diff --git a/src/commands/agents.config.ts b/src/commands/agents.config.ts
index 3aca27d70..cd778740e 100644
--- a/src/commands/agents.config.ts
+++ b/src/commands/agents.config.ts
@@ -101,7 +101,14 @@ export function loadAgentIdentity(workspace: string): AgentIdentity | null {
   try {
     const content = fs.readFileSync(identityPath, "utf-8");
     const parsed = parseIdentityMarkdown(content);
-    if (!parsed.name && !parsed.emoji && !parsed.theme && !parsed.creature && !parsed.vibe && !parsed.avatar) {
+    if (
+      !parsed.name &&
+      !parsed.emoji &&
+      !parsed.theme &&
+      !parsed.creature &&
+      !parsed.vibe &&
+      !parsed.avatar
+    ) {
       return null;
     }
     return parsed;
diff --git a/src/gateway/protocol/schema/sessions.ts b/src/gateway/protocol/schema/sessions.ts
index 217981bb2..42fa83ff6 100644
--- a/src/gateway/protocol/schema/sessions.ts
+++ b/src/gateway/protocol/schema/sessions.ts
@@ -3,92 +3,92 @@ import { Type } from "@sinclair/typebox";
 import { NonEmptyString, SessionLabelString } from "./primitives.js";
 
 export const SessionsListParamsSchema = Type.Object(
-	{
-		limit: Type.Optional(Type.Integer({ minimum: 1 })),
-		activeMinutes: Type.Optional(Type.Integer({ minimum: 1 })),
-		includeGlobal: Type.Optional(Type.Boolean()),
-		includeUnknown: Type.Optional(Type.Boolean()),
-		/**
-		 * Read first 8KB of each session transcript to derive title from first user message.
-		 * Performs a file read per session - use `limit` to bound result set on large stores.
-		 */
-		includeDerivedTitles: Type.Optional(Type.Boolean()),
-		/**
-		 * Read last 16KB of each session transcript to extract most recent message preview.
-		 * Performs a file read per session - use `limit` to bound result set on large stores.
-		 */
-		includeLastMessage: Type.Optional(Type.Boolean()),
-		label: Type.Optional(SessionLabelString),
-		spawnedBy: Type.Optional(NonEmptyString),
-		agentId: Type.Optional(NonEmptyString),
-		search: Type.Optional(Type.String()),
-	},
-	{ additionalProperties: false },
+  {
+    limit: Type.Optional(Type.Integer({ minimum: 1 })),
+    activeMinutes: Type.Optional(Type.Integer({ minimum: 1 })),
+    includeGlobal: Type.Optional(Type.Boolean()),
+    includeUnknown: Type.Optional(Type.Boolean()),
+    /**
+     * Read first 8KB of each session transcript to derive title from first user message.
+     * Performs a file read per session - use `limit` to bound result set on large stores.
+     */
+    includeDerivedTitles: Type.Optional(Type.Boolean()),
+    /**
+     * Read last 16KB of each session transcript to extract most recent message preview.
+     * Performs a file read per session - use `limit` to bound result set on large stores.
+     */
+    includeLastMessage: Type.Optional(Type.Boolean()),
+    label: Type.Optional(SessionLabelString),
+    spawnedBy: Type.Optional(NonEmptyString),
+    agentId: Type.Optional(NonEmptyString),
+    search: Type.Optional(Type.String()),
+  },
+  { additionalProperties: false },
 );
 
 export const SessionsResolveParamsSchema = Type.Object(
-	{
-		key: Type.Optional(NonEmptyString),
-		label: Type.Optional(SessionLabelString),
-		agentId: Type.Optional(NonEmptyString),
-		spawnedBy: Type.Optional(NonEmptyString),
-		includeGlobal: Type.Optional(Type.Boolean()),
-		includeUnknown: Type.Optional(Type.Boolean()),
-	},
-	{ additionalProperties: false },
+  {
+    key: Type.Optional(NonEmptyString),
+    label: Type.Optional(SessionLabelString),
+    agentId: Type.Optional(NonEmptyString),
+    spawnedBy: Type.Optional(NonEmptyString),
+    includeGlobal: Type.Optional(Type.Boolean()),
+    includeUnknown: Type.Optional(Type.Boolean()),
+  },
+  { additionalProperties: false },
 );
 
 export const SessionsPatchParamsSchema = Type.Object(
-	{
-		key: NonEmptyString,
-		label: Type.Optional(Type.Union([SessionLabelString, Type.Null()])),
-		thinkingLevel: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
-		verboseLevel: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
-		reasoningLevel: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
-		responseUsage: Type.Optional(
-			Type.Union([
-				Type.Literal("off"),
-				Type.Literal("tokens"),
-				Type.Literal("full"),
-				// Backward compat with older clients/stores.
-				Type.Literal("on"),
-				Type.Null(),
-			]),
-		),
-		elevatedLevel: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
-		execHost: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
-		execSecurity: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
-		execAsk: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
-		execNode: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
-		model: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
-		spawnedBy: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
-		sendPolicy: Type.Optional(
-			Type.Union([Type.Literal("allow"), Type.Literal("deny"), Type.Null()]),
-		),
-		groupActivation: Type.Optional(
-			Type.Union([Type.Literal("mention"), Type.Literal("always"), Type.Null()]),
-		),
-	},
-	{ additionalProperties: false },
+  {
+    key: NonEmptyString,
+    label: Type.Optional(Type.Union([SessionLabelString, Type.Null()])),
+    thinkingLevel: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
+    verboseLevel: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
+    reasoningLevel: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
+    responseUsage: Type.Optional(
+      Type.Union([
+        Type.Literal("off"),
+        Type.Literal("tokens"),
+        Type.Literal("full"),
+        // Backward compat with older clients/stores.
+        Type.Literal("on"),
+        Type.Null(),
+      ]),
+    ),
+    elevatedLevel: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
+    execHost: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
+    execSecurity: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
+    execAsk: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
+    execNode: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
+    model: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
+    spawnedBy: Type.Optional(Type.Union([NonEmptyString, Type.Null()])),
+    sendPolicy: Type.Optional(
+      Type.Union([Type.Literal("allow"), Type.Literal("deny"), Type.Null()]),
+    ),
+    groupActivation: Type.Optional(
+      Type.Union([Type.Literal("mention"), Type.Literal("always"), Type.Null()]),
+    ),
+  },
+  { additionalProperties: false },
 );
 
 export const SessionsResetParamsSchema = Type.Object(
-	{ key: NonEmptyString },
-	{ additionalProperties: false },
+  { key: NonEmptyString },
+  { additionalProperties: false },
 );
 
 export const SessionsDeleteParamsSchema = Type.Object(
-	{
-		key: NonEmptyString,
-		deleteTranscript: Type.Optional(Type.Boolean()),
-	},
-	{ additionalProperties: false },
+  {
+    key: NonEmptyString,
+    deleteTranscript: Type.Optional(Type.Boolean()),
+  },
+  { additionalProperties: false },
 );
 
 export const SessionsCompactParamsSchema = Type.Object(
-	{
-		key: NonEmptyString,
-		maxLines: Type.Optional(Type.Integer({ minimum: 1 })),
-	},
-	{ additionalProperties: false },
+  {
+    key: NonEmptyString,
+    maxLines: Type.Optional(Type.Integer({ minimum: 1 })),
+  },
+  { additionalProperties: false },
 );
diff --git a/src/tui/components/fuzzy-filter.ts b/src/tui/components/fuzzy-filter.ts
index 76a688d3b..fb6e2acf2 100644
--- a/src/tui/components/fuzzy-filter.ts
+++ b/src/tui/components/fuzzy-filter.ts
@@ -11,7 +11,7 @@ const WORD_BOUNDARY_CHARS = /[\s\-_./:#@]/;
  * Check if position is at a word boundary.
  */
 export function isWordBoundary(text: string, index: number): boolean {
-	return index === 0 || WORD_BOUNDARY_CHARS.test(text[index - 1] ?? "");
+  return index === 0 || WORD_BOUNDARY_CHARS.test(text[index - 1] ?? "");
 }
 
 /**
@@ -19,17 +19,17 @@ export function isWordBoundary(text: string, index: number): boolean {
  * Returns null if no match.
  */
 export function findWordBoundaryIndex(text: string, query: string): number | null {
-	if (!query) return null;
-	const textLower = text.toLowerCase();
-	const queryLower = query.toLowerCase();
-	const maxIndex = textLower.length - queryLower.length;
-	if (maxIndex < 0) return null;
-	for (let i = 0; i <= maxIndex; i++) {
-		if (textLower.startsWith(queryLower, i) && isWordBoundary(textLower, i)) {
-			return i;
-		}
-	}
-	return null;
+  if (!query) return null;
+  const textLower = text.toLowerCase();
+  const queryLower = query.toLowerCase();
+  const maxIndex = textLower.length - queryLower.length;
+  if (maxIndex < 0) return null;
+  for (let i = 0; i <= maxIndex; i++) {
+    if (textLower.startsWith(queryLower, i) && isWordBoundary(textLower, i)) {
+      return i;
+    }
+  }
+  return null;
 }
 
 /**
@@ -37,31 +37,31 @@ export function findWordBoundaryIndex(text: string, query: string): number | nul
  * Returns score (lower = better) or null if no match.
  */
 export function fuzzyMatchLower(queryLower: string, textLower: string): number | null {
-	if (queryLower.length === 0) return 0;
-	if (queryLower.length > textLower.length) return null;
+  if (queryLower.length === 0) return 0;
+  if (queryLower.length > textLower.length) return null;
 
-	let queryIndex = 0;
-	let score = 0;
-	let lastMatchIndex = -1;
-	let consecutiveMatches = 0;
+  let queryIndex = 0;
+  let score = 0;
+  let lastMatchIndex = -1;
+  let consecutiveMatches = 0;
 
-	for (let i = 0; i < textLower.length && queryIndex < queryLower.length; i++) {
-		if (textLower[i] === queryLower[queryIndex]) {
-			const isAtWordBoundary = isWordBoundary(textLower, i);
-			if (lastMatchIndex === i - 1) {
-				consecutiveMatches++;
-				score -= consecutiveMatches * 5; // Reward consecutive matches
-			} else {
-				consecutiveMatches = 0;
-				if (lastMatchIndex >= 0) score += (i - lastMatchIndex - 1) * 2; // Penalize gaps
-			}
-			if (isAtWordBoundary) score -= 10; // Reward word boundary matches
-			score += i * 0.1; // Slight penalty for later matches
-			lastMatchIndex = i;
-			queryIndex++;
-		}
-	}
-	return queryIndex < queryLower.length ? null : score;
+  for (let i = 0; i < textLower.length && queryIndex < queryLower.length; i++) {
+    if (textLower[i] === queryLower[queryIndex]) {
+      const isAtWordBoundary = isWordBoundary(textLower, i);
+      if (lastMatchIndex === i - 1) {
+        consecutiveMatches++;
+        score -= consecutiveMatches * 5; // Reward consecutive matches
+      } else {
+        consecutiveMatches = 0;
+        if (lastMatchIndex >= 0) score += (i - lastMatchIndex - 1) * 2; // Penalize gaps
+      }
+      if (isAtWordBoundary) score -= 10; // Reward word boundary matches
+      score += i * 0.1; // Slight penalty for later matches
+      lastMatchIndex = i;
+      queryIndex++;
+    }
+  }
+  return queryIndex < queryLower.length ? null : score;
 }
 
 /**
@@ -69,46 +69,46 @@ export function fuzzyMatchLower(queryLower: string, textLower: string): number |
  * Supports space-separated tokens (all must match).
  */
 export function fuzzyFilterLower<T extends { searchTextLower?: string }>(
-	items: T[],
-	queryLower: string,
+  items: T[],
+  queryLower: string,
 ): T[] {
-	const trimmed = queryLower.trim();
-	if (!trimmed) return items;
+  const trimmed = queryLower.trim();
+  if (!trimmed) return items;
 
-	const tokens = trimmed.split(/\s+/).filter((t) => t.length > 0);
-	if (tokens.length === 0) return items;
+  const tokens = trimmed.split(/\s+/).filter((t) => t.length > 0);
+  if (tokens.length === 0) return items;
 
-	const results: { item: T; score: number }[] = [];
-	for (const item of items) {
-		const text = item.searchTextLower ?? "";
-		let totalScore = 0;
-		let allMatch = true;
-		for (const token of tokens) {
-			const score = fuzzyMatchLower(token, text);
-			if (score !== null) {
-				totalScore += score;
-			} else {
-				allMatch = false;
-				break;
-			}
-		}
-		if (allMatch) results.push({ item, score: totalScore });
-	}
-	results.sort((a, b) => a.score - b.score);
-	return results.map((r) => r.item);
+  const results: { item: T; score: number }[] = [];
+  for (const item of items) {
+    const text = item.searchTextLower ?? "";
+    let totalScore = 0;
+    let allMatch = true;
+    for (const token of tokens) {
+      const score = fuzzyMatchLower(token, text);
+      if (score !== null) {
+        totalScore += score;
+      } else {
+        allMatch = false;
+        break;
+      }
+    }
+    if (allMatch) results.push({ item, score: totalScore });
+  }
+  results.sort((a, b) => a.score - b.score);
+  return results.map((r) => r.item);
 }
 
 /**
  * Prepare items for fuzzy filtering by pre-computing lowercase search text.
  */
-export function prepareSearchItems<T extends { label?: string; description?: string; searchText?: string }>(
-	items: T[],
-): (T & { searchTextLower: string })[] {
-	return items.map((item) => {
-		const parts: string[] = [];
-		if (item.label) parts.push(item.label);
-		if (item.description) parts.push(item.description);
-		if (item.searchText) parts.push(item.searchText);
-		return { ...item, searchTextLower: parts.join(" ").toLowerCase() };
-	});
+export function prepareSearchItems<
+  T extends { label?: string; description?: string; searchText?: string },
+>(items: T[]): (T & { searchTextLower: string })[] {
+  return items.map((item) => {
+    const parts: string[] = [];
+    if (item.label) parts.push(item.label);
+    if (item.description) parts.push(item.description);
+    if (item.searchText) parts.push(item.searchText);
+    return { ...item, searchTextLower: parts.join(" ").toLowerCase() };
+  });
 }
diff --git a/src/tui/components/selectors.ts b/src/tui/components/selectors.ts
index ba37ff7c9..46073fbca 100644
--- a/src/tui/components/selectors.ts
+++ b/src/tui/components/selectors.ts
@@ -5,10 +5,7 @@ import {
   selectListTheme,
   settingsListTheme,
 } from "../theme/theme.js";
-import {
-  FilterableSelectList,
-  type FilterableSelectItem,
-} from "./filterable-select-list.js";
+import { FilterableSelectList, type FilterableSelectItem } from "./filterable-select-list.js";
 import { SearchableSelectList } from "./searchable-select-list.js";
 
 export function createSelectList(items: SelectItem[], maxVisible = 7) {
diff --git a/src/utils/time-format.ts b/src/utils/time-format.ts
index f5d4ee81b..bd473e4f6 100644
--- a/src/utils/time-format.ts
+++ b/src/utils/time-format.ts
@@ -1,15 +1,15 @@
 export function formatRelativeTime(timestamp: number): string {
-	const now = Date.now();
-	const diff = now - timestamp;
-	const seconds = Math.floor(diff / 1000);
-	const minutes = Math.floor(seconds / 60);
-	const hours = Math.floor(minutes / 60);
-	const days = Math.floor(hours / 24);
+  const now = Date.now();
+  const diff = now - timestamp;
+  const seconds = Math.floor(diff / 1000);
+  const minutes = Math.floor(seconds / 60);
+  const hours = Math.floor(minutes / 60);
+  const days = Math.floor(hours / 24);
 
-	if (seconds < 60) return "just now";
-	if (minutes < 60) return `${minutes}m ago`;
-	if (hours < 24) return `${hours}h ago`;
-	if (days === 1) return "Yesterday";
-	if (days < 7) return `${days}d ago`;
-	return new Date(timestamp).toLocaleDateString(undefined, { month: "short", day: "numeric" });
+  if (seconds < 60) return "just now";
+  if (minutes < 60) return `${minutes}m ago`;
+  if (hours < 24) return `${hours}h ago`;
+  if (days === 1) return "Yesterday";
+  if (days < 7) return `${days}d ago`;
+  return new Date(timestamp).toLocaleDateString(undefined, { month: "short", day: "numeric" });
 }

From 2af497495f102bccbc25958f48e44aaeb14fc425 Mon Sep 17 00:00:00 2001
From: Dave Lauer <dlauer@gmail.com>
Date: Tue, 20 Jan 2026 16:14:29 -0500
Subject: [PATCH 009/171] chore: regenerate protocol files

---
 .../ClawdbotProtocol/GatewayModels.swift      | 18 ++++++++++-
 .../ClawdbotProtocol/GatewayModels.swift      | 30 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift b/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
index 85696eb6a..04c3bab09 100644
--- a/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
+++ b/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
@@ -473,6 +473,7 @@ public struct AgentParams: Codable, Sendable {
     public let replychannel: String?
     public let accountid: String?
     public let replyaccountid: String?
+    public let threadid: String?
     public let timeout: Int?
     public let lane: String?
     public let extrasystemprompt: String?
@@ -494,6 +495,7 @@ public struct AgentParams: Codable, Sendable {
         replychannel: String?,
         accountid: String?,
         replyaccountid: String?,
+        threadid: String?,
         timeout: Int?,
         lane: String?,
         extrasystemprompt: String?,
@@ -514,6 +516,7 @@ public struct AgentParams: Codable, Sendable {
         self.replychannel = replychannel
         self.accountid = accountid
         self.replyaccountid = replyaccountid
+        self.threadid = threadid
         self.timeout = timeout
         self.lane = lane
         self.extrasystemprompt = extrasystemprompt
@@ -535,6 +538,7 @@ public struct AgentParams: Codable, Sendable {
         case replychannel = "replyChannel"
         case accountid = "accountId"
         case replyaccountid = "replyAccountId"
+        case threadid = "threadId"
         case timeout
         case lane
         case extrasystemprompt = "extraSystemPrompt"
@@ -835,35 +839,47 @@ public struct SessionsListParams: Codable, Sendable {
     public let activeminutes: Int?
     public let includeglobal: Bool?
     public let includeunknown: Bool?
+    public let includederivedtitles: Bool?
+    public let includelastmessage: Bool?
     public let label: String?
     public let spawnedby: String?
     public let agentid: String?
+    public let search: String?
 
     public init(
         limit: Int?,
         activeminutes: Int?,
         includeglobal: Bool?,
         includeunknown: Bool?,
+        includederivedtitles: Bool?,
+        includelastmessage: Bool?,
         label: String?,
         spawnedby: String?,
-        agentid: String?
+        agentid: String?,
+        search: String?
     ) {
         self.limit = limit
         self.activeminutes = activeminutes
         self.includeglobal = includeglobal
         self.includeunknown = includeunknown
+        self.includederivedtitles = includederivedtitles
+        self.includelastmessage = includelastmessage
         self.label = label
         self.spawnedby = spawnedby
         self.agentid = agentid
+        self.search = search
     }
     private enum CodingKeys: String, CodingKey {
         case limit
         case activeminutes = "activeMinutes"
         case includeglobal = "includeGlobal"
         case includeunknown = "includeUnknown"
+        case includederivedtitles = "includeDerivedTitles"
+        case includelastmessage = "includeLastMessage"
         case label
         case spawnedby = "spawnedBy"
         case agentid = "agentId"
+        case search
     }
 }
 
diff --git a/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift b/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
index dd01ffe70..04c3bab09 100644
--- a/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
+++ b/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
@@ -473,6 +473,7 @@ public struct AgentParams: Codable, Sendable {
     public let replychannel: String?
     public let accountid: String?
     public let replyaccountid: String?
+    public let threadid: String?
     public let timeout: Int?
     public let lane: String?
     public let extrasystemprompt: String?
@@ -494,6 +495,7 @@ public struct AgentParams: Codable, Sendable {
         replychannel: String?,
         accountid: String?,
         replyaccountid: String?,
+        threadid: String?,
         timeout: Int?,
         lane: String?,
         extrasystemprompt: String?,
@@ -514,6 +516,7 @@ public struct AgentParams: Codable, Sendable {
         self.replychannel = replychannel
         self.accountid = accountid
         self.replyaccountid = replyaccountid
+        self.threadid = threadid
         self.timeout = timeout
         self.lane = lane
         self.extrasystemprompt = extrasystemprompt
@@ -535,6 +538,7 @@ public struct AgentParams: Codable, Sendable {
         case replychannel = "replyChannel"
         case accountid = "accountId"
         case replyaccountid = "replyAccountId"
+        case threadid = "threadId"
         case timeout
         case lane
         case extrasystemprompt = "extraSystemPrompt"
@@ -835,35 +839,47 @@ public struct SessionsListParams: Codable, Sendable {
     public let activeminutes: Int?
     public let includeglobal: Bool?
     public let includeunknown: Bool?
+    public let includederivedtitles: Bool?
+    public let includelastmessage: Bool?
     public let label: String?
     public let spawnedby: String?
     public let agentid: String?
+    public let search: String?
 
     public init(
         limit: Int?,
         activeminutes: Int?,
         includeglobal: Bool?,
         includeunknown: Bool?,
+        includederivedtitles: Bool?,
+        includelastmessage: Bool?,
         label: String?,
         spawnedby: String?,
-        agentid: String?
+        agentid: String?,
+        search: String?
     ) {
         self.limit = limit
         self.activeminutes = activeminutes
         self.includeglobal = includeglobal
         self.includeunknown = includeunknown
+        self.includederivedtitles = includederivedtitles
+        self.includelastmessage = includelastmessage
         self.label = label
         self.spawnedby = spawnedby
         self.agentid = agentid
+        self.search = search
     }
     private enum CodingKeys: String, CodingKey {
         case limit
         case activeminutes = "activeMinutes"
         case includeglobal = "includeGlobal"
         case includeunknown = "includeUnknown"
+        case includederivedtitles = "includeDerivedTitles"
+        case includelastmessage = "includeLastMessage"
         case label
         case spawnedby = "spawnedBy"
         case agentid = "agentId"
+        case search
     }
 }
 
@@ -1324,6 +1340,9 @@ public struct ChannelsStatusResult: Codable, Sendable {
     public let ts: Int
     public let channelorder: [String]
     public let channellabels: [String: AnyCodable]
+    public let channeldetaillabels: [String: AnyCodable]?
+    public let channelsystemimages: [String: AnyCodable]?
+    public let channelmeta: [[String: AnyCodable]]?
     public let channels: [String: AnyCodable]
     public let channelaccounts: [String: AnyCodable]
     public let channeldefaultaccountid: [String: AnyCodable]
@@ -1332,6 +1351,9 @@ public struct ChannelsStatusResult: Codable, Sendable {
         ts: Int,
         channelorder: [String],
         channellabels: [String: AnyCodable],
+        channeldetaillabels: [String: AnyCodable]?,
+        channelsystemimages: [String: AnyCodable]?,
+        channelmeta: [[String: AnyCodable]]?,
         channels: [String: AnyCodable],
         channelaccounts: [String: AnyCodable],
         channeldefaultaccountid: [String: AnyCodable]
@@ -1339,6 +1361,9 @@ public struct ChannelsStatusResult: Codable, Sendable {
         self.ts = ts
         self.channelorder = channelorder
         self.channellabels = channellabels
+        self.channeldetaillabels = channeldetaillabels
+        self.channelsystemimages = channelsystemimages
+        self.channelmeta = channelmeta
         self.channels = channels
         self.channelaccounts = channelaccounts
         self.channeldefaultaccountid = channeldefaultaccountid
@@ -1347,6 +1372,9 @@ public struct ChannelsStatusResult: Codable, Sendable {
         case ts
         case channelorder = "channelOrder"
         case channellabels = "channelLabels"
+        case channeldetaillabels = "channelDetailLabels"
+        case channelsystemimages = "channelSystemImages"
+        case channelmeta = "channelMeta"
         case channels
         case channelaccounts = "channelAccounts"
         case channeldefaultaccountid = "channelDefaultAccountId"

From 2f0dd9c4ee5ef51e8aca9f8f23d977361aa2be64 Mon Sep 17 00:00:00 2001
From: Dave Lauer <dlauer@gmail.com>
Date: Tue, 20 Jan 2026 16:38:37 -0500
Subject: [PATCH 010/171] chore: fix swift formatting

---
 .../Sources/Clawdbot/ExecApprovalsSocket.swift  |  2 +-
 .../Sources/ClawdbotMacCLI/ConnectCommand.swift | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift b/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift
index bf2ffc149..268d155a0 100644
--- a/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift
+++ b/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift
@@ -319,7 +319,7 @@ private enum ExecHostExecutor {
             security: context.security,
             allowlistMatch: context.allowlistMatch,
             skillAllow: context.skillAllow),
-           approvalDecision == nil
+            approvalDecision == nil
         {
             let decision = ExecApprovalsPromptPresenter.prompt(
                 ExecApprovalPromptRequest(
diff --git a/apps/macos/Sources/ClawdbotMacCLI/ConnectCommand.swift b/apps/macos/Sources/ClawdbotMacCLI/ConnectCommand.swift
index 08e8cdde6..ac4938fb8 100644
--- a/apps/macos/Sources/ClawdbotMacCLI/ConnectCommand.swift
+++ b/apps/macos/Sources/ClawdbotMacCLI/ConnectCommand.swift
@@ -7,7 +7,7 @@ struct ConnectOptions {
     var token: String?
     var password: String?
     var mode: String?
-    var timeoutMs: Int = 15_000
+    var timeoutMs: Int = 15000
     var json: Bool = false
     var probe: Bool = false
     var clientId: String = "clawdbot-macos"
@@ -254,8 +254,12 @@ private func resolveGatewayEndpoint(opts: ConnectOptions, config: GatewayConfig)
 
     if resolvedMode == "remote" {
         guard let raw = config.remoteUrl?.trimmingCharacters(in: .whitespacesAndNewlines),
-              !raw.isEmpty else {
-            throw NSError(domain: "Gateway", code: 1, userInfo: [NSLocalizedDescriptionKey: "gateway.remote.url is missing"])
+              !raw.isEmpty
+        else {
+            throw NSError(
+                domain: "Gateway",
+                code: 1,
+                userInfo: [NSLocalizedDescriptionKey: "gateway.remote.url is missing"])
         }
         guard let url = URL(string: raw) else {
             throw NSError(domain: "Gateway", code: 1, userInfo: [NSLocalizedDescriptionKey: "invalid url: \(raw)"])
@@ -270,7 +274,10 @@ private func resolveGatewayEndpoint(opts: ConnectOptions, config: GatewayConfig)
     let port = config.port ?? 18789
     let host = "127.0.0.1"
     guard let url = URL(string: "ws://\(host):\(port)") else {
-        throw NSError(domain: "Gateway", code: 1, userInfo: [NSLocalizedDescriptionKey: "invalid url: ws://\(host):\(port)"])
+        throw NSError(
+            domain: "Gateway",
+            code: 1,
+            userInfo: [NSLocalizedDescriptionKey: "invalid url: ws://\(host):\(port)"])
     }
     return GatewayEndpoint(
         url: url,
@@ -280,7 +287,7 @@ private func resolveGatewayEndpoint(opts: ConnectOptions, config: GatewayConfig)
 }
 
 private func bestEffortEndpoint(opts: ConnectOptions, config: GatewayConfig) -> GatewayEndpoint? {
-    return try? resolveGatewayEndpoint(opts: opts, config: config)
+    try? resolveGatewayEndpoint(opts: opts, config: config)
 }
 
 private func resolvedToken(opts: ConnectOptions, mode: String, config: GatewayConfig) -> String? {

From b073deee20be18c107cfb7310edb8f41e8a178f1 Mon Sep 17 00:00:00 2001
From: Tyler Yust <TYTYYUST@YAHOO.COM>
Date: Wed, 21 Jan 2026 00:14:55 -0800
Subject: [PATCH 011/171] feat: implement short ID mapping for BlueBubbles
 messages and enhance reply context caching

- Added functionality to resolve short message IDs to full UUIDs and vice versa, optimizing token usage.
- Introduced a reply cache to store message context for replies when metadata is omitted in webhook payloads.
- Updated message handling to utilize short IDs for outbound messages and replies, improving efficiency.
- Enhanced error messages to clarify required parameters for actions like react, edit, and unsend.
- Added tests to ensure correct behavior of new features and maintain existing functionality.
---
 extensions/bluebubbles/src/actions.ts      |  59 ++--
 extensions/bluebubbles/src/monitor.test.ts | 257 ++++++++++++++++-
 extensions/bluebubbles/src/monitor.ts      | 317 +++++++++++++++++++--
 extensions/bluebubbles/src/reactions.ts    |  71 ++++-
 extensions/bluebubbles/src/send.test.ts    |  27 ++
 extensions/bluebubbles/src/send.ts         |  20 +-
 src/auto-reply/reply/agent-runner-utils.ts |  24 +-
 src/auto-reply/reply/typing-mode.test.ts   |   7 +-
 src/auto-reply/reply/typing-mode.ts        |   4 +-
 src/infra/outbound/message-action-spec.ts  |   1 +
 10 files changed, 720 insertions(+), 67 deletions(-)

diff --git a/extensions/bluebubbles/src/actions.ts b/extensions/bluebubbles/src/actions.ts
index 1e69fbfa8..3630f91fa 100644
--- a/extensions/bluebubbles/src/actions.ts
+++ b/extensions/bluebubbles/src/actions.ts
@@ -14,6 +14,7 @@ import {
 } from "clawdbot/plugin-sdk";
 
 import { resolveBlueBubblesAccount } from "./accounts.js";
+import { resolveBlueBubblesMessageId } from "./monitor.js";
 import { isMacOS26OrHigher } from "./probe.js";
 import { sendBlueBubblesReaction } from "./reactions.js";
 import { resolveChatGuidForTarget, sendMessageBlueBubbles } from "./send.js";
@@ -77,7 +78,7 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
     const accountId = typeof args.accountId === "string" ? args.accountId.trim() : undefined;
     return { to, accountId };
   },
-  handleAction: async ({ action, params, cfg, accountId }) => {
+  handleAction: async ({ action, params, cfg, accountId, toolContext }) => {
     const account = resolveBlueBubblesAccount({
       cfg: cfg as ClawdbotConfig,
       accountId: accountId ?? undefined,
@@ -86,7 +87,7 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
     const password = account.config.password?.trim();
     const opts = { cfg: cfg as ClawdbotConfig, accountId: accountId ?? undefined };
 
-    // Helper to resolve chatGuid from various params
+    // Helper to resolve chatGuid from various params or session context
     const resolveChatGuid = async (): Promise<string> => {
       const chatGuid = readStringParam(params, "chatGuid");
       if (chatGuid?.trim()) return chatGuid.trim();
@@ -94,6 +95,8 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
       const chatIdentifier = readStringParam(params, "chatIdentifier");
       const chatId = readNumberParam(params, "chatId", { integer: true });
       const to = readStringParam(params, "to");
+      // Fall back to session context if no explicit target provided
+      const contextTarget = toolContext?.currentChannelId?.trim();
 
       const target = chatIdentifier?.trim()
         ? ({
@@ -104,7 +107,9 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
           ? ({ kind: "chat_id", chatId } as BlueBubblesSendTarget)
           : to
             ? mapTarget(to)
-            : null;
+            : contextTarget
+              ? mapTarget(contextTarget)
+              : null;
 
       if (!target) {
         throw new Error(`BlueBubbles ${action} requires chatGuid, chatIdentifier, chatId, or to.`);
@@ -127,16 +132,18 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
       });
       if (isEmpty && !remove) {
         throw new Error(
-          "BlueBubbles react requires emoji parameter. Use action=react with emoji=<emoji> and messageId=<message_guid>.",
+          "BlueBubbles react requires emoji parameter. Use action=react with emoji=<emoji> and messageId=<message_id>.",
         );
       }
-      const messageId = readStringParam(params, "messageId");
-      if (!messageId) {
+      const rawMessageId = readStringParam(params, "messageId");
+      if (!rawMessageId) {
         throw new Error(
-          "BlueBubbles react requires messageId parameter (the message GUID to react to). " +
-            "Use action=react with messageId=<message_guid>, emoji=<emoji>, and to/chatGuid to identify the chat.",
+          "BlueBubbles react requires messageId parameter (the message ID to react to). " +
+            "Use action=react with messageId=<message_id>, emoji=<emoji>, and to/chatGuid to identify the chat.",
         );
       }
+      // Resolve short ID (e.g., "1", "2") to full UUID
+      const messageId = resolveBlueBubblesMessageId(rawMessageId);
       const partIndex = readNumberParam(params, "partIndex", { integer: true });
       const resolvedChatGuid = await resolveChatGuid();
 
@@ -161,20 +168,22 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
             "Apple removed the ability to edit iMessages in this version.",
         );
       }
-      const messageId = readStringParam(params, "messageId");
+      const rawMessageId = readStringParam(params, "messageId");
       const newText =
         readStringParam(params, "text") ??
         readStringParam(params, "newText") ??
         readStringParam(params, "message");
-      if (!messageId || !newText) {
+      if (!rawMessageId || !newText) {
         const missing: string[] = [];
-        if (!messageId) missing.push("messageId (the message GUID to edit)");
+        if (!rawMessageId) missing.push("messageId (the message ID to edit)");
         if (!newText) missing.push("text (the new message content)");
         throw new Error(
           `BlueBubbles edit requires: ${missing.join(", ")}. ` +
-            `Use action=edit with messageId=<message_guid>, text=<new_content>.`,
+            `Use action=edit with messageId=<message_id>, text=<new_content>.`,
         );
       }
+      // Resolve short ID (e.g., "1", "2") to full UUID
+      const messageId = resolveBlueBubblesMessageId(rawMessageId);
       const partIndex = readNumberParam(params, "partIndex", { integer: true });
       const backwardsCompatMessage = readStringParam(params, "backwardsCompatMessage");
 
@@ -184,18 +193,20 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
         backwardsCompatMessage: backwardsCompatMessage ?? undefined,
       });
 
-      return jsonResult({ ok: true, edited: messageId });
+      return jsonResult({ ok: true, edited: rawMessageId });
     }
 
     // Handle unsend action
     if (action === "unsend") {
-      const messageId = readStringParam(params, "messageId");
-      if (!messageId) {
+      const rawMessageId = readStringParam(params, "messageId");
+      if (!rawMessageId) {
         throw new Error(
-          "BlueBubbles unsend requires messageId parameter (the message GUID to unsend). " +
-            "Use action=unsend with messageId=<message_guid>.",
+          "BlueBubbles unsend requires messageId parameter (the message ID to unsend). " +
+            "Use action=unsend with messageId=<message_id>.",
         );
       }
+      // Resolve short ID (e.g., "1", "2") to full UUID
+      const messageId = resolveBlueBubblesMessageId(rawMessageId);
       const partIndex = readNumberParam(params, "partIndex", { integer: true });
 
       await unsendBlueBubblesMessage(messageId, {
@@ -203,24 +214,26 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
         partIndex: typeof partIndex === "number" ? partIndex : undefined,
       });
 
-      return jsonResult({ ok: true, unsent: messageId });
+      return jsonResult({ ok: true, unsent: rawMessageId });
     }
 
     // Handle reply action
     if (action === "reply") {
-      const messageId = readStringParam(params, "messageId");
+      const rawMessageId = readStringParam(params, "messageId");
       const text = readMessageText(params);
       const to = readStringParam(params, "to") ?? readStringParam(params, "target");
-      if (!messageId || !text || !to) {
+      if (!rawMessageId || !text || !to) {
         const missing: string[] = [];
-        if (!messageId) missing.push("messageId (the message GUID to reply to)");
+        if (!rawMessageId) missing.push("messageId (the message ID to reply to)");
         if (!text) missing.push("text or message (the reply message content)");
         if (!to) missing.push("to or target (the chat target)");
         throw new Error(
           `BlueBubbles reply requires: ${missing.join(", ")}. ` +
-            `Use action=reply with messageId=<message_guid>, message=<your reply>, target=<chat_target>.`,
+            `Use action=reply with messageId=<message_id>, message=<your reply>, target=<chat_target>.`,
         );
       }
+      // Resolve short ID (e.g., "1", "2") to full UUID
+      const messageId = resolveBlueBubblesMessageId(rawMessageId);
       const partIndex = readNumberParam(params, "partIndex", { integer: true });
 
       const result = await sendMessageBlueBubbles(to, text, {
@@ -229,7 +242,7 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
         replyToPartIndex: typeof partIndex === "number" ? partIndex : undefined,
       });
 
-      return jsonResult({ ok: true, messageId: result.messageId, repliedTo: messageId });
+      return jsonResult({ ok: true, messageId: result.messageId, repliedTo: rawMessageId });
     }
 
     // Handle sendWithEffect action
diff --git a/extensions/bluebubbles/src/monitor.test.ts b/extensions/bluebubbles/src/monitor.test.ts
index e91e88611..14c896427 100644
--- a/extensions/bluebubbles/src/monitor.test.ts
+++ b/extensions/bluebubbles/src/monitor.test.ts
@@ -6,6 +6,8 @@ import type { ClawdbotConfig, PluginRuntime } from "clawdbot/plugin-sdk";
 import {
   handleBlueBubblesWebhookRequest,
   registerBlueBubblesWebhookTarget,
+  resolveBlueBubblesMessageId,
+  _resetBlueBubblesShortIdState,
 } from "./monitor.js";
 import { setBlueBubblesRuntime } from "./runtime.js";
 import type { ResolvedBlueBubblesAccount } from "./accounts.js";
@@ -223,6 +225,8 @@ describe("BlueBubbles webhook monitor", () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
+    // Reset short ID state between tests for predictable behavior
+    _resetBlueBubblesShortIdState();
     mockReadAllowFromStore.mockResolvedValue([]);
     mockUpsertPairingRequest.mockResolvedValue({ code: "TESTCODE", created: true });
     mockResolveRequireMention.mockReturnValue(false);
@@ -467,6 +471,98 @@ describe("BlueBubbles webhook monitor", () => {
 
       expect(handled).toBe(false);
     });
+
+    it("parses chatId when provided as a string (webhook variant)", async () => {
+      const { resolveChatGuidForTarget } = await import("./send.js");
+      vi.mocked(resolveChatGuidForTarget).mockClear();
+
+      const account = createMockAccount({ groupPolicy: "open" });
+      const config: ClawdbotConfig = {};
+      const core = createMockRuntime();
+      setBlueBubblesRuntime(core);
+
+      unregister = registerBlueBubblesWebhookTarget({
+        account,
+        config,
+        runtime: { log: vi.fn(), error: vi.fn() },
+        core,
+        path: "/bluebubbles-webhook",
+      });
+
+      const payload = {
+        type: "new-message",
+        data: {
+          text: "hello from group",
+          handle: { address: "+15551234567" },
+          isGroup: true,
+          isFromMe: false,
+          guid: "msg-1",
+          chatId: "123",
+          date: Date.now(),
+        },
+      };
+
+      const req = createMockRequest("POST", "/bluebubbles-webhook", payload);
+      const res = createMockResponse();
+
+      await handleBlueBubblesWebhookRequest(req, res);
+      await new Promise((resolve) => setTimeout(resolve, 50));
+
+      expect(resolveChatGuidForTarget).toHaveBeenCalledWith(
+        expect.objectContaining({
+          target: { kind: "chat_id", chatId: 123 },
+        }),
+      );
+    });
+
+    it("extracts chatGuid from nested chat object fields (webhook variant)", async () => {
+      const { sendMessageBlueBubbles, resolveChatGuidForTarget } = await import("./send.js");
+      vi.mocked(sendMessageBlueBubbles).mockClear();
+      vi.mocked(resolveChatGuidForTarget).mockClear();
+
+      mockDispatchReplyWithBufferedBlockDispatcher.mockImplementationOnce(async (params) => {
+        await params.dispatcherOptions.deliver({ text: "replying now" }, { kind: "final" });
+      });
+
+      const account = createMockAccount({ groupPolicy: "open" });
+      const config: ClawdbotConfig = {};
+      const core = createMockRuntime();
+      setBlueBubblesRuntime(core);
+
+      unregister = registerBlueBubblesWebhookTarget({
+        account,
+        config,
+        runtime: { log: vi.fn(), error: vi.fn() },
+        core,
+        path: "/bluebubbles-webhook",
+      });
+
+      const payload = {
+        type: "new-message",
+        data: {
+          text: "hello from group",
+          handle: { address: "+15551234567" },
+          isGroup: true,
+          isFromMe: false,
+          guid: "msg-1",
+          chat: { chatGuid: "iMessage;+;chat123456" },
+          date: Date.now(),
+        },
+      };
+
+      const req = createMockRequest("POST", "/bluebubbles-webhook", payload);
+      const res = createMockResponse();
+
+      await handleBlueBubblesWebhookRequest(req, res);
+      await new Promise((resolve) => setTimeout(resolve, 50));
+
+      expect(resolveChatGuidForTarget).not.toHaveBeenCalled();
+      expect(sendMessageBlueBubbles).toHaveBeenCalledWith(
+        "chat_guid:iMessage;+;chat123456",
+        expect.any(String),
+        expect.any(Object),
+      );
+    });
   });
 
   describe("DM pairing behavior vs allowFrom", () => {
@@ -1075,13 +1171,85 @@ describe("BlueBubbles webhook monitor", () => {
 
       expect(mockDispatchReplyWithBufferedBlockDispatcher).toHaveBeenCalled();
       const callArgs = mockDispatchReplyWithBufferedBlockDispatcher.mock.calls[0][0];
+      // ReplyToId is the full UUID since it wasn't previously cached
       expect(callArgs.ctx.ReplyToId).toBe("msg-0");
       expect(callArgs.ctx.ReplyToBody).toBe("original message");
       expect(callArgs.ctx.ReplyToSender).toBe("+15550000000");
+      // Body still uses the full UUID since it wasn't cached
       expect(callArgs.ctx.Body).toContain("[Replying to +15550000000 id:msg-0]");
       expect(callArgs.ctx.Body).toContain("original message");
     });
 
+    it("hydrates missing reply sender/body from the recent-message cache", async () => {
+      const account = createMockAccount({ dmPolicy: "open", groupPolicy: "open" });
+      const config: ClawdbotConfig = {};
+      const core = createMockRuntime();
+      setBlueBubblesRuntime(core);
+
+      unregister = registerBlueBubblesWebhookTarget({
+        account,
+        config,
+        runtime: { log: vi.fn(), error: vi.fn() },
+        core,
+        path: "/bluebubbles-webhook",
+      });
+
+      const chatGuid = "iMessage;+;chat-reply-cache";
+
+      const originalPayload = {
+        type: "new-message",
+        data: {
+          text: "original message (cached)",
+          handle: { address: "+15550000000" },
+          isGroup: true,
+          isFromMe: false,
+          guid: "cache-msg-0",
+          chatGuid,
+          date: Date.now(),
+        },
+      };
+
+      const originalReq = createMockRequest("POST", "/bluebubbles-webhook", originalPayload);
+      const originalRes = createMockResponse();
+
+      await handleBlueBubblesWebhookRequest(originalReq, originalRes);
+      await new Promise((resolve) => setTimeout(resolve, 50));
+
+      // Only assert the reply message behavior below.
+      mockDispatchReplyWithBufferedBlockDispatcher.mockClear();
+
+      const replyPayload = {
+        type: "new-message",
+        data: {
+          text: "replying now",
+          handle: { address: "+15551234567" },
+          isGroup: true,
+          isFromMe: false,
+          guid: "cache-msg-1",
+          chatGuid,
+          // Only the GUID is provided; sender/body must be hydrated.
+          replyToMessageGuid: "cache-msg-0",
+          date: Date.now(),
+        },
+      };
+
+      const replyReq = createMockRequest("POST", "/bluebubbles-webhook", replyPayload);
+      const replyRes = createMockResponse();
+
+      await handleBlueBubblesWebhookRequest(replyReq, replyRes);
+      await new Promise((resolve) => setTimeout(resolve, 50));
+
+      expect(mockDispatchReplyWithBufferedBlockDispatcher).toHaveBeenCalled();
+      const callArgs = mockDispatchReplyWithBufferedBlockDispatcher.mock.calls[0][0];
+      // ReplyToId uses short ID "1" (first cached message) for token savings
+      expect(callArgs.ctx.ReplyToId).toBe("1");
+      expect(callArgs.ctx.ReplyToBody).toBe("original message (cached)");
+      expect(callArgs.ctx.ReplyToSender).toBe("+15550000000");
+      // Body uses short ID for token savings
+      expect(callArgs.ctx.Body).toContain("[Replying to +15550000000 id:1]");
+      expect(callArgs.ctx.Body).toContain("original message (cached)");
+    });
+
     it("falls back to threadOriginatorGuid when reply metadata is absent", async () => {
       const account = createMockAccount({ dmPolicy: "open" });
       const config: ClawdbotConfig = {};
@@ -1436,8 +1604,9 @@ describe("BlueBubbles webhook monitor", () => {
       await handleBlueBubblesWebhookRequest(req, res);
       await new Promise((resolve) => setTimeout(resolve, 50));
 
+      // Outbound message ID uses short ID "2" (inbound msg-1 is "1", outbound msg-123 is "2")
       expect(mockEnqueueSystemEvent).toHaveBeenCalledWith(
-        "BlueBubbles sent message id: msg-123",
+        'Assistant sent "replying now" [message_id:2]',
         expect.objectContaining({
           sessionKey: "agent:main:bluebubbles:dm:+15551234567",
         }),
@@ -1605,6 +1774,92 @@ describe("BlueBubbles webhook monitor", () => {
     });
   });
 
+  describe("short message ID mapping", () => {
+    it("assigns sequential short IDs to messages", async () => {
+      const account = createMockAccount({ dmPolicy: "open" });
+      const config: ClawdbotConfig = {};
+      const core = createMockRuntime();
+      setBlueBubblesRuntime(core);
+
+      unregister = registerBlueBubblesWebhookTarget({
+        account,
+        config,
+        runtime: { log: vi.fn(), error: vi.fn() },
+        core,
+        path: "/bluebubbles-webhook",
+      });
+
+      const payload = {
+        type: "new-message",
+        data: {
+          text: "hello",
+          handle: { address: "+15551234567" },
+          isGroup: false,
+          isFromMe: false,
+          guid: "msg-uuid-12345",
+          chatGuid: "iMessage;-;+15551234567",
+          date: Date.now(),
+        },
+      };
+
+      const req = createMockRequest("POST", "/bluebubbles-webhook", payload);
+      const res = createMockResponse();
+
+      await handleBlueBubblesWebhookRequest(req, res);
+      await new Promise((resolve) => setTimeout(resolve, 50));
+
+      expect(mockDispatchReplyWithBufferedBlockDispatcher).toHaveBeenCalled();
+      const callArgs = mockDispatchReplyWithBufferedBlockDispatcher.mock.calls[0][0];
+      // MessageSid should be short ID "1" instead of full UUID
+      expect(callArgs.ctx.MessageSid).toBe("1");
+    });
+
+    it("resolves short ID back to UUID", async () => {
+      const account = createMockAccount({ dmPolicy: "open" });
+      const config: ClawdbotConfig = {};
+      const core = createMockRuntime();
+      setBlueBubblesRuntime(core);
+
+      unregister = registerBlueBubblesWebhookTarget({
+        account,
+        config,
+        runtime: { log: vi.fn(), error: vi.fn() },
+        core,
+        path: "/bluebubbles-webhook",
+      });
+
+      const payload = {
+        type: "new-message",
+        data: {
+          text: "hello",
+          handle: { address: "+15551234567" },
+          isGroup: false,
+          isFromMe: false,
+          guid: "msg-uuid-12345",
+          chatGuid: "iMessage;-;+15551234567",
+          date: Date.now(),
+        },
+      };
+
+      const req = createMockRequest("POST", "/bluebubbles-webhook", payload);
+      const res = createMockResponse();
+
+      await handleBlueBubblesWebhookRequest(req, res);
+      await new Promise((resolve) => setTimeout(resolve, 50));
+
+      // The short ID "1" should resolve back to the full UUID
+      expect(resolveBlueBubblesMessageId("1")).toBe("msg-uuid-12345");
+    });
+
+    it("returns UUID unchanged when not in cache", () => {
+      expect(resolveBlueBubblesMessageId("msg-not-cached")).toBe("msg-not-cached");
+    });
+
+    it("returns short ID unchanged when numeric but not in cache", () => {
+      expect(resolveBlueBubblesMessageId("999")).toBe("999");
+    });
+  });
+
   describe("fromMe messages", () => {
     it("ignores messages from self (fromMe=true)", async () => {
       const account = createMockAccount();
diff --git a/extensions/bluebubbles/src/monitor.ts b/extensions/bluebubbles/src/monitor.ts
index 7133107cc..4c2b4a225 100644
--- a/extensions/bluebubbles/src/monitor.ts
+++ b/extensions/bluebubbles/src/monitor.ts
@@ -31,6 +31,165 @@ const DEFAULT_WEBHOOK_PATH = "/bluebubbles-webhook";
 const DEFAULT_TEXT_LIMIT = 4000;
 const invalidAckReactions = new Set<string>();
 
+const REPLY_CACHE_MAX = 2000;
+const REPLY_CACHE_TTL_MS = 6 * 60 * 60 * 1000;
+
+type BlueBubblesReplyCacheEntry = {
+  accountId: string;
+  messageId: string;
+  shortId: string;
+  chatGuid?: string;
+  chatIdentifier?: string;
+  chatId?: number;
+  senderLabel?: string;
+  body?: string;
+  timestamp: number;
+};
+
+// Best-effort cache for resolving reply context when BlueBubbles webhooks omit sender/body.
+const blueBubblesReplyCacheByMessageId = new Map<string, BlueBubblesReplyCacheEntry>();
+
+// Bidirectional maps for short ID ↔ UUID resolution (token savings optimization)
+const blueBubblesShortIdToUuid = new Map<string, string>();
+const blueBubblesUuidToShortId = new Map<string, string>();
+let blueBubblesShortIdCounter = 0;
+
+function trimOrUndefined(value?: string | null): string | undefined {
+  const trimmed = value?.trim();
+  return trimmed ? trimmed : undefined;
+}
+
+function generateShortId(): string {
+  blueBubblesShortIdCounter += 1;
+  return String(blueBubblesShortIdCounter);
+}
+
+function rememberBlueBubblesReplyCache(
+  entry: Omit<BlueBubblesReplyCacheEntry, "shortId">,
+): BlueBubblesReplyCacheEntry {
+  const messageId = entry.messageId.trim();
+  if (!messageId) {
+    return { ...entry, shortId: "" };
+  }
+
+  // Check if we already have a short ID for this UUID
+  let shortId = blueBubblesUuidToShortId.get(messageId);
+  if (!shortId) {
+    shortId = generateShortId();
+    blueBubblesShortIdToUuid.set(shortId, messageId);
+    blueBubblesUuidToShortId.set(messageId, shortId);
+  }
+
+  const fullEntry: BlueBubblesReplyCacheEntry = { ...entry, shortId };
+
+  // Refresh insertion order.
+  blueBubblesReplyCacheByMessageId.delete(messageId);
+  blueBubblesReplyCacheByMessageId.set(messageId, fullEntry);
+
+  // Opportunistic prune.
+  const cutoff = Date.now() - REPLY_CACHE_TTL_MS;
+  for (const [key, value] of blueBubblesReplyCacheByMessageId) {
+    if (value.timestamp < cutoff) {
+      blueBubblesReplyCacheByMessageId.delete(key);
+      // Clean up short ID mappings for expired entries
+      if (value.shortId) {
+        blueBubblesShortIdToUuid.delete(value.shortId);
+        blueBubblesUuidToShortId.delete(key);
+      }
+      continue;
+    }
+    break;
+  }
+  while (blueBubblesReplyCacheByMessageId.size > REPLY_CACHE_MAX) {
+    const oldest = blueBubblesReplyCacheByMessageId.keys().next().value as string | undefined;
+    if (!oldest) break;
+    const oldEntry = blueBubblesReplyCacheByMessageId.get(oldest);
+    blueBubblesReplyCacheByMessageId.delete(oldest);
+    // Clean up short ID mappings for evicted entries
+    if (oldEntry?.shortId) {
+      blueBubblesShortIdToUuid.delete(oldEntry.shortId);
+      blueBubblesUuidToShortId.delete(oldest);
+    }
+  }
+
+  return fullEntry;
+}
+
+/**
+ * Resolves a short message ID (e.g., "1", "2") to a full BlueBubbles UUID.
+ * Returns the input unchanged if it's already a UUID or not found in the mapping.
+ */
+export function resolveBlueBubblesMessageId(shortOrUuid: string): string {
+  const trimmed = shortOrUuid.trim();
+  if (!trimmed) return trimmed;
+
+  // If it looks like a short ID (numeric), try to resolve it
+  if (/^\d+$/.test(trimmed)) {
+    const uuid = blueBubblesShortIdToUuid.get(trimmed);
+    if (uuid) return uuid;
+  }
+
+  // Return as-is (either already a UUID or not found)
+  return trimmed;
+}
+
+/**
+ * Resets the short ID state. Only use in tests.
+ * @internal
+ */
+export function _resetBlueBubblesShortIdState(): void {
+  blueBubblesShortIdToUuid.clear();
+  blueBubblesUuidToShortId.clear();
+  blueBubblesReplyCacheByMessageId.clear();
+  blueBubblesShortIdCounter = 0;
+}
+
+/**
+ * Gets the short ID for a UUID, if one exists.
+ */
+function getShortIdForUuid(uuid: string): string | undefined {
+  return blueBubblesUuidToShortId.get(uuid.trim());
+}
+
+function resolveReplyContextFromCache(params: {
+  accountId: string;
+  replyToId: string;
+  chatGuid?: string;
+  chatIdentifier?: string;
+  chatId?: number;
+}): BlueBubblesReplyCacheEntry | null {
+  const replyToId = params.replyToId.trim();
+  if (!replyToId) return null;
+
+  const cached = blueBubblesReplyCacheByMessageId.get(replyToId);
+  if (!cached) return null;
+  if (cached.accountId !== params.accountId) return null;
+
+  const cutoff = Date.now() - REPLY_CACHE_TTL_MS;
+  if (cached.timestamp < cutoff) {
+    blueBubblesReplyCacheByMessageId.delete(replyToId);
+    return null;
+  }
+
+  const chatGuid = trimOrUndefined(params.chatGuid);
+  const chatIdentifier = trimOrUndefined(params.chatIdentifier);
+  const cachedChatGuid = trimOrUndefined(cached.chatGuid);
+  const cachedChatIdentifier = trimOrUndefined(cached.chatIdentifier);
+  const chatId = typeof params.chatId === "number" ? params.chatId : undefined;
+  const cachedChatId = typeof cached.chatId === "number" ? cached.chatId : undefined;
+
+  // Avoid cross-chat collisions if we have identifiers.
+  if (chatGuid && cachedChatGuid && chatGuid !== cachedChatGuid) return null;
+  if (!chatGuid && chatIdentifier && cachedChatIdentifier && chatIdentifier !== cachedChatIdentifier) {
+    return null;
+  }
+  if (!chatGuid && !chatIdentifier && chatId && cachedChatId && chatId !== cachedChatId) {
+    return null;
+  }
+
+  return cached;
+}
+
 type BlueBubblesCoreRuntime = ReturnType<typeof getBlueBubblesRuntime>;
 
 function logVerbose(core: BlueBubblesCoreRuntime, runtime: BlueBubblesRuntimeEnv, message: string): void {
@@ -219,12 +378,15 @@ function buildMessagePlaceholder(message: NormalizedWebhookMessage): string {
 
 function formatReplyContext(message: {
   replyToId?: string;
+  replyToShortId?: string;
   replyToBody?: string;
   replyToSender?: string;
 }): string | null {
   if (!message.replyToId && !message.replyToBody && !message.replyToSender) return null;
   const sender = message.replyToSender?.trim() || "unknown sender";
-  const idPart = message.replyToId ? ` id:${message.replyToId}` : "";
+  // Prefer short ID for token savings
+  const displayId = message.replyToShortId || message.replyToId;
+  const idPart = displayId ? ` id:${displayId}` : "";
   const body = message.replyToBody?.trim();
   if (!body) {
     return `[Replying to ${sender}${idPart}]\n[/Replying]`;
@@ -404,6 +566,15 @@ function resolveGroupFlagFromChatGuid(chatGuid?: string | null): boolean | undef
   return undefined;
 }
 
+function extractChatIdentifierFromChatGuid(chatGuid?: string | null): string | undefined {
+  const guid = chatGuid?.trim();
+  if (!guid) return undefined;
+  const parts = guid.split(";");
+  if (parts.length < 3) return undefined;
+  const identifier = parts[2]?.trim();
+  return identifier || undefined;
+}
+
 function formatGroupAllowlistEntry(params: {
   chatGuid?: string;
   chatId?: number;
@@ -550,20 +721,31 @@ function normalizeWebhookMessage(payload: Record<string, unknown>): NormalizedWe
   const chatGuid =
     readString(message, "chatGuid") ??
     readString(message, "chat_guid") ??
+    readString(chat, "chatGuid") ??
+    readString(chat, "chat_guid") ??
     readString(chat, "guid") ??
+    readString(chatFromList, "chatGuid") ??
+    readString(chatFromList, "chat_guid") ??
     readString(chatFromList, "guid");
   const chatIdentifier =
     readString(message, "chatIdentifier") ??
     readString(message, "chat_identifier") ??
+    readString(chat, "chatIdentifier") ??
+    readString(chat, "chat_identifier") ??
     readString(chat, "identifier") ??
     readString(chatFromList, "chatIdentifier") ??
     readString(chatFromList, "chat_identifier") ??
-    readString(chatFromList, "identifier");
+    readString(chatFromList, "identifier") ??
+    extractChatIdentifierFromChatGuid(chatGuid);
   const chatId =
-    readNumber(message, "chatId") ??
-    readNumber(message, "chat_id") ??
-    readNumber(chat, "id") ??
-    readNumber(chatFromList, "id");
+    readNumberLike(message, "chatId") ??
+    readNumberLike(message, "chat_id") ??
+    readNumberLike(chat, "chatId") ??
+    readNumberLike(chat, "chat_id") ??
+    readNumberLike(chat, "id") ??
+    readNumberLike(chatFromList, "chatId") ??
+    readNumberLike(chatFromList, "chat_id") ??
+    readNumberLike(chatFromList, "id");
   const chatName =
     readString(message, "chatName") ??
     readString(chat, "displayName") ??
@@ -679,19 +861,30 @@ function normalizeWebhookReaction(payload: Record<string, unknown>): NormalizedW
   const chatGuid =
     readString(message, "chatGuid") ??
     readString(message, "chat_guid") ??
+    readString(chat, "chatGuid") ??
+    readString(chat, "chat_guid") ??
     readString(chat, "guid") ??
+    readString(chatFromList, "chatGuid") ??
+    readString(chatFromList, "chat_guid") ??
     readString(chatFromList, "guid");
   const chatIdentifier =
     readString(message, "chatIdentifier") ??
     readString(message, "chat_identifier") ??
+    readString(chat, "chatIdentifier") ??
+    readString(chat, "chat_identifier") ??
     readString(chat, "identifier") ??
     readString(chatFromList, "chatIdentifier") ??
     readString(chatFromList, "chat_identifier") ??
-    readString(chatFromList, "identifier");
+    readString(chatFromList, "identifier") ??
+    extractChatIdentifierFromChatGuid(chatGuid);
   const chatId =
     readNumberLike(message, "chatId") ??
     readNumberLike(message, "chat_id") ??
+    readNumberLike(chat, "chatId") ??
+    readNumberLike(chat, "chat_id") ??
     readNumberLike(chat, "id") ??
+    readNumberLike(chatFromList, "chatId") ??
+    readNumberLike(chatFromList, "chat_id") ??
     readNumberLike(chatFromList, "id");
   const chatName =
     readString(message, "chatName") ??
@@ -901,14 +1094,36 @@ async function processMessage(
   target: WebhookTarget,
 ): Promise<void> {
   const { account, config, runtime, core, statusSink } = target;
-  if (message.fromMe) return;
+
   const groupFlag = resolveGroupFlagFromChatGuid(message.chatGuid);
   const isGroup = typeof groupFlag === "boolean" ? groupFlag : message.isGroup;
 
   const text = message.text.trim();
   const attachments = message.attachments ?? [];
   const placeholder = buildMessagePlaceholder(message);
-  if (!text && !placeholder) {
+  const rawBody = text || placeholder;
+
+  // Cache messages (including fromMe) so later replies can resolve sender/body even when
+  // BlueBubbles webhook payloads omit nested reply metadata.
+  const cacheMessageId = message.messageId?.trim();
+  let messageShortId: string | undefined;
+  if (cacheMessageId) {
+    const cacheEntry = rememberBlueBubblesReplyCache({
+      accountId: account.accountId,
+      messageId: cacheMessageId,
+      chatGuid: message.chatGuid,
+      chatIdentifier: message.chatIdentifier,
+      chatId: message.chatId,
+      senderLabel: message.fromMe ? "me" : message.senderId,
+      body: rawBody,
+      timestamp: message.timestamp ?? Date.now(),
+    });
+    messageShortId = cacheEntry.shortId;
+  }
+
+  if (message.fromMe) return;
+
+  if (!rawBody) {
     logVerbose(core, runtime, `drop: empty text sender=${message.senderId}`);
     return;
   }
@@ -1199,12 +1414,42 @@ async function processMessage(
       }
     }
   }
-  const rawBody = text.trim() || placeholder;
-  const replyContext = formatReplyContext(message);
+  let replyToId = message.replyToId;
+  let replyToBody = message.replyToBody;
+  let replyToSender = message.replyToSender;
+  let replyToShortId: string | undefined;
+
+  if (replyToId && (!replyToBody || !replyToSender)) {
+    const cached = resolveReplyContextFromCache({
+      accountId: account.accountId,
+      replyToId,
+      chatGuid: message.chatGuid,
+      chatIdentifier: message.chatIdentifier,
+      chatId: message.chatId,
+    });
+    if (cached) {
+      if (!replyToBody && cached.body) replyToBody = cached.body;
+      if (!replyToSender && cached.senderLabel) replyToSender = cached.senderLabel;
+      replyToShortId = cached.shortId;
+      if (core.logging.shouldLogVerbose()) {
+        const preview = (cached.body ?? "").replace(/\s+/g, " ").slice(0, 120);
+        logVerbose(
+          core,
+          runtime,
+          `reply-context cache hit replyToId=${replyToId} sender=${replyToSender ?? ""} body="${preview}"`,
+        );
+      }
+    }
+  }
+
+  // If no cached short ID, try to get one from the UUID directly
+  if (replyToId && !replyToShortId) {
+    replyToShortId = getShortIdForUuid(replyToId);
+  }
+
+  const replyContext = formatReplyContext({ replyToId, replyToShortId, replyToBody, replyToSender });
   const baseBody = replyContext ? `${rawBody}\n\n${replyContext}` : rawBody;
-  const fromLabel = isGroup
-    ? `group:${peerId}`
-    : message.senderName || `user:${message.senderId}`;
+  const fromLabel = isGroup ? undefined : message.senderName || `user:${message.senderId}`;
   const groupSubject = isGroup ? message.chatName?.trim() || undefined : undefined;
   const groupMembers = isGroup
     ? formatGroupMembers({
@@ -1230,12 +1475,12 @@ async function processMessage(
   });
   let chatGuidForActions = chatGuid;
   if (!chatGuidForActions && baseUrl && password) {
-  const target =
+    const target =
       isGroup && (chatId || chatIdentifier)
         ? chatId
-          ? { kind: "chat_id", chatId }
-          : { kind: "chat_identifier", chatIdentifier: chatIdentifier ?? "" }
-        : { kind: "handle", address: message.senderId };
+          ? ({ kind: "chat_id", chatId } as const)
+          : ({ kind: "chat_identifier", chatIdentifier: chatIdentifier ?? "" } as const)
+        : ({ kind: "handle", address: message.senderId } as const);
     if (target.kind !== "chat_identifier" || target.chatIdentifier) {
       chatGuidForActions =
         (await resolveChatGuidForTarget({
@@ -1316,10 +1561,23 @@ async function processMessage(
       ? formatBlueBubblesChatTarget({ chatGuid: chatGuidForActions })
       : message.senderId;
 
-  const maybeEnqueueOutboundMessageId = (messageId?: string) => {
+  const maybeEnqueueOutboundMessageId = (messageId?: string, snippet?: string) => {
     const trimmed = messageId?.trim();
     if (!trimmed || trimmed === "ok" || trimmed === "unknown") return;
-    core.system.enqueueSystemEvent(`BlueBubbles sent message id: ${trimmed}`, {
+    // Cache outbound message to get short ID
+    const cacheEntry = rememberBlueBubblesReplyCache({
+      accountId: account.accountId,
+      messageId: trimmed,
+      chatGuid: chatGuidForActions ?? chatGuid,
+      chatIdentifier,
+      chatId,
+      senderLabel: "me",
+      body: snippet ?? "",
+      timestamp: Date.now(),
+    });
+    const displayId = cacheEntry.shortId || trimmed;
+    const preview = snippet ? ` "${snippet.slice(0, 12)}${snippet.length > 12 ? "…" : ""}"` : "";
+    core.system.enqueueSystemEvent(`Assistant sent${preview} [message_id:${displayId}]`, {
       sessionKey: route.sessionKey,
       contextKey: `bluebubbles:outbound:${outboundTarget}:${trimmed}`,
     });
@@ -1343,16 +1601,18 @@ async function processMessage(
     AccountId: route.accountId,
     ChatType: isGroup ? "group" : "direct",
     ConversationLabel: fromLabel,
-    ReplyToId: message.replyToId,
-    ReplyToBody: message.replyToBody,
-    ReplyToSender: message.replyToSender,
+    // Use short ID for token savings (agent can use this to reference the message)
+    ReplyToId: replyToShortId || replyToId,
+    ReplyToBody: replyToBody,
+    ReplyToSender: replyToSender,
     GroupSubject: groupSubject,
     GroupMembers: groupMembers,
     SenderName: message.senderName || undefined,
     SenderId: message.senderId,
     Provider: "bluebubbles",
     Surface: "bluebubbles",
-    MessageSid: message.messageId,
+    // Use short ID for token savings (agent can use this to reference the message)
+    MessageSid: messageShortId || message.messageId,
     Timestamp: message.timestamp,
     OriginatingChannel: "bluebubbles",
     OriginatingTo: `bluebubbles:${outboundTarget}`,
@@ -1385,7 +1645,8 @@ async function processMessage(
                 replyToId: payload.replyToId ?? null,
                 accountId: account.accountId,
               });
-              maybeEnqueueOutboundMessageId(result.messageId);
+              const cachedBody = (caption ?? "").trim() || "<media:attachment>";
+              maybeEnqueueOutboundMessageId(result.messageId, cachedBody);
               sentMessage = true;
               statusSink?.({ lastOutboundAt: Date.now() });
             }
@@ -1407,7 +1668,7 @@ async function processMessage(
               accountId: account.accountId,
               replyToMessageGuid: replyToMessageGuid || undefined,
             });
-            maybeEnqueueOutboundMessageId(result.messageId);
+            maybeEnqueueOutboundMessageId(result.messageId, chunk);
             sentMessage = true;
             statusSink?.({ lastOutboundAt: Date.now() });
           }
@@ -1541,7 +1802,9 @@ async function processReaction(
 
   const senderLabel = reaction.senderName || reaction.senderId;
   const chatLabel = reaction.isGroup ? ` in group:${peerId}` : "";
-  const text = `BlueBubbles reaction ${reaction.action}: ${reaction.emoji} by ${senderLabel}${chatLabel} on msg ${reaction.messageId}`;
+  // Use short ID for token savings
+  const messageDisplayId = getShortIdForUuid(reaction.messageId) || reaction.messageId;
+  const text = `BlueBubbles reaction ${reaction.action}: ${reaction.emoji} by ${senderLabel}${chatLabel} on msg ${messageDisplayId}`;
   core.system.enqueueSystemEvent(text, {
     sessionKey: route.sessionKey,
     contextKey: `bluebubbles:reaction:${reaction.action}:${peerId}:${reaction.messageId}:${reaction.senderId}:${reaction.emoji}`,
diff --git a/extensions/bluebubbles/src/reactions.ts b/extensions/bluebubbles/src/reactions.ts
index d7a2beaa8..09176ef14 100644
--- a/extensions/bluebubbles/src/reactions.ts
+++ b/extensions/bluebubbles/src/reactions.ts
@@ -20,32 +20,101 @@ const REACTION_TYPES = new Set([
 ]);
 
 const REACTION_ALIASES = new Map<string, string>([
+  // General
   ["heart", "love"],
+  ["love", "love"],
+  ["❤", "love"],
+  ["❤️", "love"],
+  ["red_heart", "love"],
   ["thumbs_up", "like"],
-  ["thumbs-down", "dislike"],
+  ["thumbsup", "like"],
+  ["thumbs-up", "like"],
+  ["thumbsup", "like"],
+  ["like", "like"],
+  ["thumb", "like"],
+  ["ok", "like"],
   ["thumbs_down", "dislike"],
+  ["thumbsdown", "dislike"],
+  ["thumbs-down", "dislike"],
+  ["dislike", "dislike"],
+  ["boo", "dislike"],
+  ["no", "dislike"],
+  // Laugh
   ["haha", "laugh"],
   ["lol", "laugh"],
+  ["lmao", "laugh"],
+  ["rofl", "laugh"],
+  ["😂", "laugh"],
+  ["🤣", "laugh"],
+  ["xd", "laugh"],
+  ["laugh", "laugh"],
+  // Emphasize / exclaim
   ["emphasis", "emphasize"],
+  ["emphasize", "emphasize"],
   ["exclaim", "emphasize"],
+  ["!!", "emphasize"],
+  ["‼", "emphasize"],
+  ["‼️", "emphasize"],
+  ["❗", "emphasize"],
+  ["important", "emphasize"],
+  ["bang", "emphasize"],
+  // Question
   ["question", "question"],
+  ["?", "question"],
+  ["❓", "question"],
+  ["❔", "question"],
+  ["ask", "question"],
+  // Apple/Messages names
+  ["loved", "love"],
+  ["liked", "like"],
+  ["disliked", "dislike"],
+  ["laughed", "laugh"],
+  ["emphasized", "emphasize"],
+  ["questioned", "question"],
+  // Colloquial / informal
+  ["fire", "love"],
+  ["🔥", "love"],
+  ["wow", "emphasize"],
+  ["!", "emphasize"],
+  // Edge: generic emoji name forms
+  ["heart_eyes", "love"],
+  ["smile", "laugh"],
+  ["smiley", "laugh"],
+  ["happy", "laugh"],
+  ["joy", "laugh"],
 ]);
 
 const REACTION_EMOJIS = new Map<string, string>([
+  // Love
   ["❤️", "love"],
   ["❤", "love"],
   ["♥️", "love"],
+  ["♥", "love"],
   ["😍", "love"],
+  ["💕", "love"],
+  // Like
   ["👍", "like"],
+  ["👌", "like"],
+  // Dislike
   ["👎", "dislike"],
+  ["🙅", "dislike"],
+  // Laugh
   ["😂", "laugh"],
   ["🤣", "laugh"],
   ["😆", "laugh"],
+  ["😁", "laugh"],
+  ["😹", "laugh"],
+  // Emphasize
   ["‼️", "emphasize"],
   ["‼", "emphasize"],
+  ["!!", "emphasize"],
   ["❗", "emphasize"],
+  ["❕", "emphasize"],
+  ["!", "emphasize"],
+  // Question
   ["❓", "question"],
   ["❔", "question"],
+  ["?", "question"],
 ]);
 
 function resolveAccount(params: BlueBubblesReactionOpts) {
diff --git a/extensions/bluebubbles/src/send.test.ts b/extensions/bluebubbles/src/send.test.ts
index f39abdd5e..0b8b77a1f 100644
--- a/extensions/bluebubbles/src/send.test.ts
+++ b/extensions/bluebubbles/src/send.test.ts
@@ -96,6 +96,33 @@ describe("send", () => {
       expect(result).toBe("iMessage;-;chat123");
     });
 
+    it("matches chat_identifier against the 3rd component of chat GUID", async () => {
+      mockFetch.mockResolvedValueOnce({
+        ok: true,
+        json: () =>
+          Promise.resolve({
+            data: [
+              {
+                guid: "iMessage;+;chat660250192681427962",
+                participants: [],
+              },
+            ],
+          }),
+      });
+
+      const target: BlueBubblesSendTarget = {
+        kind: "chat_identifier",
+        chatIdentifier: "chat660250192681427962",
+      };
+      const result = await resolveChatGuidForTarget({
+        baseUrl: "http://localhost:1234",
+        password: "test",
+        target,
+      });
+
+      expect(result).toBe("iMessage;+;chat660250192681427962");
+    });
+
     it("resolves handle target by matching participant", async () => {
       mockFetch.mockResolvedValueOnce({
         ok: true,
diff --git a/extensions/bluebubbles/src/send.ts b/extensions/bluebubbles/src/send.ts
index 868184c42..675063d6d 100644
--- a/extensions/bluebubbles/src/send.ts
+++ b/extensions/bluebubbles/src/send.ts
@@ -133,6 +133,13 @@ function extractChatId(chat: BlueBubblesChatRecord): number | null {
   return null;
 }
 
+function extractChatIdentifierFromChatGuid(chatGuid: string): string | null {
+  const parts = chatGuid.split(";");
+  if (parts.length < 3) return null;
+  const identifier = parts[2]?.trim();
+  return identifier ? identifier : null;
+}
+
 function extractParticipantAddresses(chat: BlueBubblesChatRecord): string[] {
   const raw =
     (Array.isArray(chat.participants) ? chat.participants : null) ??
@@ -223,7 +230,16 @@ export async function resolveChatGuidForTarget(params: {
       }
       if (targetChatIdentifier) {
         const guid = extractChatGuid(chat);
-        if (guid && guid === targetChatIdentifier) return guid;
+        if (guid) {
+          // Back-compat: some callers might pass a full chat GUID.
+          if (guid === targetChatIdentifier) return guid;
+
+          // Primary match: BlueBubbles `chat_identifier:*` targets correspond to the
+          // third component of the chat GUID: `service;(+|-) ;identifier`.
+          const guidIdentifier = extractChatIdentifierFromChatGuid(guid);
+          if (guidIdentifier && guidIdentifier === targetChatIdentifier) return guid;
+        }
+
         const identifier =
           typeof chat.identifier === "string"
             ? chat.identifier
@@ -232,7 +248,7 @@ export async function resolveChatGuidForTarget(params: {
               : typeof chat.chat_identifier === "string"
                 ? chat.chat_identifier
                 : "";
-        if (identifier && identifier === targetChatIdentifier) return extractChatGuid(chat);
+        if (identifier && identifier === targetChatIdentifier) return guid ?? extractChatGuid(chat);
       }
       if (normalizedHandle) {
         const guid = extractChatGuid(chat);
diff --git a/src/auto-reply/reply/agent-runner-utils.ts b/src/auto-reply/reply/agent-runner-utils.ts
index 62ce6ff71..b1b3ae890 100644
--- a/src/auto-reply/reply/agent-runner-utils.ts
+++ b/src/auto-reply/reply/agent-runner-utils.ts
@@ -1,6 +1,6 @@
 import type { NormalizedUsage } from "../../agents/usage.js";
 import { getChannelDock } from "../../channels/dock.js";
-import type { ChannelThreadingToolContext } from "../../channels/plugins/types.js";
+import type { ChannelId, ChannelThreadingToolContext } from "../../channels/plugins/types.js";
 import { normalizeChannelId } from "../../channels/registry.js";
 import type { ClawdbotConfig } from "../../config/config.js";
 import { isReasoningTagProvider } from "../../utils/provider-utils.js";
@@ -21,17 +21,25 @@ export function buildThreadingToolContext(params: {
 }): ChannelThreadingToolContext {
   const { sessionCtx, config, hasRepliedRef } = params;
   if (!config) return {};
-  const provider = normalizeChannelId(sessionCtx.Provider);
-  if (!provider) return {};
-  const dock = getChannelDock(provider);
-  if (!dock?.threading?.buildToolContext) return {};
+  const rawProvider = sessionCtx.Provider?.trim().toLowerCase();
+  if (!rawProvider) return {};
+  const provider = normalizeChannelId(rawProvider);
   // WhatsApp context isolation keys off conversation id, not the bot's own number.
   const threadingTo =
-    provider === "whatsapp"
+    rawProvider === "whatsapp"
       ? (sessionCtx.From ?? sessionCtx.To)
-      : provider === "imessage" && sessionCtx.ChatType === "direct"
+      : rawProvider === "imessage" && sessionCtx.ChatType === "direct"
         ? (sessionCtx.From ?? sessionCtx.To)
         : sessionCtx.To;
+  // Fallback for unrecognized/plugin channels (e.g., BlueBubbles before plugin registry init)
+  const dock = provider ? getChannelDock(provider) : undefined;
+  if (!dock?.threading?.buildToolContext) {
+    return {
+      currentChannelId: threadingTo?.trim() || undefined,
+      currentChannelProvider: provider ?? (rawProvider as ChannelId),
+      hasRepliedRef,
+    };
+  }
   const context =
     dock.threading.buildToolContext({
       cfg: config,
@@ -47,7 +55,7 @@ export function buildThreadingToolContext(params: {
     }) ?? {};
   return {
     ...context,
-    currentChannelProvider: provider,
+    currentChannelProvider: provider!, // guaranteed non-null since dock exists
   };
 }
 
diff --git a/src/auto-reply/reply/typing-mode.test.ts b/src/auto-reply/reply/typing-mode.test.ts
index 766cbe803..064e58adf 100644
--- a/src/auto-reply/reply/typing-mode.test.ts
+++ b/src/auto-reply/reply/typing-mode.test.ts
@@ -140,7 +140,7 @@ describe("createTypingSignaler", () => {
     expect(typing.startTypingOnText).not.toHaveBeenCalled();
   });
 
-  it("does not start typing on tool start before text", async () => {
+  it("starts typing on tool start before text", async () => {
     const typing = createMockTypingController();
     const signaler = createTypingSignaler({
       typing,
@@ -150,8 +150,9 @@ describe("createTypingSignaler", () => {
 
     await signaler.signalToolStart();
 
-    expect(typing.startTypingLoop).not.toHaveBeenCalled();
-    expect(typing.refreshTypingTtl).not.toHaveBeenCalled();
+    expect(typing.startTypingLoop).toHaveBeenCalled();
+    expect(typing.refreshTypingTtl).toHaveBeenCalled();
+    expect(typing.startTypingOnText).not.toHaveBeenCalled();
   });
 
   it("refreshes ttl on tool start when active after text", async () => {
diff --git a/src/auto-reply/reply/typing-mode.ts b/src/auto-reply/reply/typing-mode.ts
index b2e62d8c4..0d73a3794 100644
--- a/src/auto-reply/reply/typing-mode.ts
+++ b/src/auto-reply/reply/typing-mode.ts
@@ -95,13 +95,13 @@ export function createTypingSignaler(params: {
 
   const signalToolStart = async () => {
     if (disabled) return;
-    if (!hasRenderableText) return;
+    // Start typing as soon as tools begin executing, even before the first text delta.
     if (!typing.isActive()) {
       await typing.startTypingLoop();
       typing.refreshTypingTtl();
       return;
     }
-    // Keep typing indicator alive during tool execution without changing mode semantics.
+    // Keep typing indicator alive during tool execution.
     typing.refreshTypingTtl();
   };
 
diff --git a/src/infra/outbound/message-action-spec.ts b/src/infra/outbound/message-action-spec.ts
index 782f8dc8b..c4f712e0f 100644
--- a/src/infra/outbound/message-action-spec.ts
+++ b/src/infra/outbound/message-action-spec.ts
@@ -57,6 +57,7 @@ export const MESSAGE_ACTION_TARGET_MODE: Record<ChannelMessageActionName, Messag
 const ACTION_TARGET_ALIASES: Partial<Record<ChannelMessageActionName, string[]>> = {
   unsend: ["messageId"],
   edit: ["messageId"],
+  react: ["chatGuid", "chatIdentifier", "chatId"],
   renameGroup: ["chatGuid", "chatIdentifier", "chatId"],
   setGroupIcon: ["chatGuid", "chatIdentifier", "chatId"],
   addParticipant: ["chatGuid", "chatIdentifier", "chatId"],

From 7bfc32fe338b224ac2c419f86e2c29bfc7d0cd67 Mon Sep 17 00:00:00 2001
From: Tyler Yust <TYTYYUST@YAHOO.COM>
Date: Wed, 21 Jan 2026 00:33:38 -0800
Subject: [PATCH 012/171] feat: enhance message handling with short ID
 resolution and reply context improvements

- Implemented resolution of short message IDs to full UUIDs in both text and media sending functions.
- Updated reply context formatting to optimize token usage by including only necessary information.
- Introduced truncation for long reply bodies to further reduce token consumption.
- Adjusted tests to reflect changes in reply context handling and message ID resolution.
---
 extensions/bluebubbles/src/channel.ts      |  5 ++++-
 extensions/bluebubbles/src/media-send.ts   | 12 ++++++++---
 extensions/bluebubbles/src/monitor.test.ts |  8 +++----
 extensions/bluebubbles/src/monitor.ts      | 25 ++++++++++++++++------
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/extensions/bluebubbles/src/channel.ts b/extensions/bluebubbles/src/channel.ts
index b78f41659..da594e763 100644
--- a/extensions/bluebubbles/src/channel.ts
+++ b/extensions/bluebubbles/src/channel.ts
@@ -20,6 +20,7 @@ import {
   resolveDefaultBlueBubblesAccountId,
 } from "./accounts.js";
 import { BlueBubblesConfigSchema } from "./config-schema.js";
+import { resolveBlueBubblesMessageId } from "./monitor.js";
 import { probeBlueBubbles, type BlueBubblesProbe } from "./probe.js";
 import { sendMessageBlueBubbles } from "./send.js";
 import {
@@ -237,7 +238,9 @@ export const bluebubblesPlugin: ChannelPlugin<ResolvedBlueBubblesAccount> = {
       return { ok: true, to: trimmed };
     },
     sendText: async ({ cfg, to, text, accountId, replyToId }) => {
-      const replyToMessageGuid = typeof replyToId === "string" ? replyToId.trim() : "";
+      const rawReplyToId = typeof replyToId === "string" ? replyToId.trim() : "";
+      // Resolve short ID (e.g., "5") to full UUID
+      const replyToMessageGuid = rawReplyToId ? resolveBlueBubblesMessageId(rawReplyToId) : "";
       const result = await sendMessageBlueBubbles(to, text, {
         cfg: cfg as ClawdbotConfig,
         accountId: accountId ?? undefined,
diff --git a/extensions/bluebubbles/src/media-send.ts b/extensions/bluebubbles/src/media-send.ts
index 254cecafd..5fc9895e3 100644
--- a/extensions/bluebubbles/src/media-send.ts
+++ b/extensions/bluebubbles/src/media-send.ts
@@ -4,8 +4,9 @@ import { fileURLToPath } from "node:url";
 import { resolveChannelMediaMaxBytes, type ClawdbotConfig } from "clawdbot/plugin-sdk";
 
 import { sendBlueBubblesAttachment } from "./attachments.js";
-import { sendMessageBlueBubbles } from "./send.js";
+import { resolveBlueBubblesMessageId } from "./monitor.js";
 import { getBlueBubblesRuntime } from "./runtime.js";
+import { sendMessageBlueBubbles } from "./send.js";
 
 const HTTP_URL_RE = /^https?:\/\//i;
 const MB = 1024 * 1024;
@@ -134,12 +135,17 @@ export async function sendBlueBubblesMedia(params: {
     }
   }
 
+  // Resolve short ID (e.g., "5") to full UUID
+  const replyToMessageGuid = replyToId?.trim()
+    ? resolveBlueBubblesMessageId(replyToId.trim())
+    : undefined;
+
   const attachmentResult = await sendBlueBubblesAttachment({
     to,
     buffer,
     filename: resolvedFilename ?? "attachment",
     contentType: resolvedContentType ?? undefined,
-    replyToMessageGuid: replyToId?.trim() || undefined,
+    replyToMessageGuid,
     opts: {
       cfg,
       accountId,
@@ -151,7 +157,7 @@ export async function sendBlueBubblesMedia(params: {
     await sendMessageBlueBubbles(to, trimmedCaption, {
       cfg,
       accountId,
-      replyToMessageGuid: replyToId?.trim() || undefined,
+      replyToMessageGuid,
     });
   }
 
diff --git a/extensions/bluebubbles/src/monitor.test.ts b/extensions/bluebubbles/src/monitor.test.ts
index 14c896427..f3be7d6ed 100644
--- a/extensions/bluebubbles/src/monitor.test.ts
+++ b/extensions/bluebubbles/src/monitor.test.ts
@@ -1175,8 +1175,8 @@ describe("BlueBubbles webhook monitor", () => {
       expect(callArgs.ctx.ReplyToId).toBe("msg-0");
       expect(callArgs.ctx.ReplyToBody).toBe("original message");
       expect(callArgs.ctx.ReplyToSender).toBe("+15550000000");
-      // Body still uses the full UUID since it wasn't cached
-      expect(callArgs.ctx.Body).toContain("[Replying to +15550000000 id:msg-0]");
+      // Body uses just the ID (no sender) for token savings
+      expect(callArgs.ctx.Body).toContain("[Replying to id:msg-0]");
       expect(callArgs.ctx.Body).toContain("original message");
     });
 
@@ -1245,8 +1245,8 @@ describe("BlueBubbles webhook monitor", () => {
       expect(callArgs.ctx.ReplyToId).toBe("1");
       expect(callArgs.ctx.ReplyToBody).toBe("original message (cached)");
       expect(callArgs.ctx.ReplyToSender).toBe("+15550000000");
-      // Body uses short ID for token savings
-      expect(callArgs.ctx.Body).toContain("[Replying to +15550000000 id:1]");
+      // Body uses just the short ID (no sender) for token savings
+      expect(callArgs.ctx.Body).toContain("[Replying to id:1]");
       expect(callArgs.ctx.Body).toContain("original message (cached)");
     });
 
diff --git a/extensions/bluebubbles/src/monitor.ts b/extensions/bluebubbles/src/monitor.ts
index 4c2b4a225..c7a4188c0 100644
--- a/extensions/bluebubbles/src/monitor.ts
+++ b/extensions/bluebubbles/src/monitor.ts
@@ -376,6 +376,8 @@ function buildMessagePlaceholder(message: NormalizedWebhookMessage): string {
   return "";
 }
 
+const REPLY_BODY_TRUNCATE_LENGTH = 60;
+
 function formatReplyContext(message: {
   replyToId?: string;
   replyToShortId?: string;
@@ -383,15 +385,20 @@ function formatReplyContext(message: {
   replyToSender?: string;
 }): string | null {
   if (!message.replyToId && !message.replyToBody && !message.replyToSender) return null;
-  const sender = message.replyToSender?.trim() || "unknown sender";
   // Prefer short ID for token savings
   const displayId = message.replyToShortId || message.replyToId;
-  const idPart = displayId ? ` id:${displayId}` : "";
-  const body = message.replyToBody?.trim();
-  if (!body) {
-    return `[Replying to ${sender}${idPart}]\n[/Replying]`;
+  // Only include sender if we don't have an ID (fallback)
+  const label = displayId ? `id:${displayId}` : (message.replyToSender?.trim() || "unknown");
+  const rawBody = message.replyToBody?.trim();
+  if (!rawBody) {
+    return `[Replying to ${label}]\n[/Replying]`;
   }
-  return `[Replying to ${sender}${idPart}]\n${body}\n[/Replying]`;
+  // Truncate long reply bodies for token savings
+  const body =
+    rawBody.length > REPLY_BODY_TRUNCATE_LENGTH
+      ? `${rawBody.slice(0, REPLY_BODY_TRUNCATE_LENGTH)}…`
+      : rawBody;
+  return `[Replying to ${label}]\n${body}\n[/Replying]`;
 }
 
 function readNumberLike(record: Record<string, unknown> | null, key: string): number | undefined {
@@ -1661,8 +1668,12 @@ async function processMessage(
           if (!chunks.length && payload.text) chunks.push(payload.text);
           if (!chunks.length) return;
           for (const chunk of chunks) {
-            const replyToMessageGuid =
+            const rawReplyToId =
               typeof payload.replyToId === "string" ? payload.replyToId.trim() : "";
+            // Resolve short ID (e.g., "5") to full UUID
+            const replyToMessageGuid = rawReplyToId
+              ? resolveBlueBubblesMessageId(rawReplyToId)
+              : "";
             const result = await sendMessageBlueBubbles(outboundTarget, chunk, {
               cfg: config,
               accountId: account.accountId,

From 9b9bbae5010111ef77d66b73b918237ac1051076 Mon Sep 17 00:00:00 2001
From: Tyler Yust <TYTYYUST@YAHOO.COM>
Date: Wed, 21 Jan 2026 00:39:39 -0800
Subject: [PATCH 013/171] feat: enhance message context with full ID support
 for replies and caching

- Updated message processing to include full message IDs alongside short IDs for better context resolution.
- Improved reply handling by caching inbound messages, allowing for accurate sender and body resolution without exposing dropped content.
- Adjusted tests to validate the new full ID properties and their integration into the message handling workflow.
---
 extensions/bluebubbles/src/channel.ts         |  2 +-
 extensions/bluebubbles/src/monitor.test.ts    |  2 ++
 extensions/bluebubbles/src/monitor.ts         | 32 ++++++++++++-------
 .../reply/agent-runner-execution.ts           |  6 ++--
 src/auto-reply/reply/agent-runner.ts          |  2 +-
 src/auto-reply/reply/get-reply-run.ts         |  2 +-
 src/auto-reply/templating.ts                  |  4 +++
 src/channels/plugins/types.core.ts            |  1 +
 8 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/extensions/bluebubbles/src/channel.ts b/extensions/bluebubbles/src/channel.ts
index da594e763..f316b499f 100644
--- a/extensions/bluebubbles/src/channel.ts
+++ b/extensions/bluebubbles/src/channel.ts
@@ -66,7 +66,7 @@ export const bluebubblesPlugin: ChannelPlugin<ResolvedBlueBubblesAccount> = {
   threading: {
     buildToolContext: ({ context, hasRepliedRef }) => ({
       currentChannelId: context.To?.trim() || undefined,
-      currentThreadTs: context.ReplyToId,
+      currentThreadTs: context.ReplyToIdFull ?? context.ReplyToId,
       hasRepliedRef,
     }),
   },
diff --git a/extensions/bluebubbles/src/monitor.test.ts b/extensions/bluebubbles/src/monitor.test.ts
index f3be7d6ed..2806bf82f 100644
--- a/extensions/bluebubbles/src/monitor.test.ts
+++ b/extensions/bluebubbles/src/monitor.test.ts
@@ -1243,6 +1243,7 @@ describe("BlueBubbles webhook monitor", () => {
       const callArgs = mockDispatchReplyWithBufferedBlockDispatcher.mock.calls[0][0];
       // ReplyToId uses short ID "1" (first cached message) for token savings
       expect(callArgs.ctx.ReplyToId).toBe("1");
+      expect(callArgs.ctx.ReplyToIdFull).toBe("cache-msg-0");
       expect(callArgs.ctx.ReplyToBody).toBe("original message (cached)");
       expect(callArgs.ctx.ReplyToSender).toBe("+15550000000");
       // Body uses just the short ID (no sender) for token savings
@@ -1812,6 +1813,7 @@ describe("BlueBubbles webhook monitor", () => {
       const callArgs = mockDispatchReplyWithBufferedBlockDispatcher.mock.calls[0][0];
       // MessageSid should be short ID "1" instead of full UUID
       expect(callArgs.ctx.MessageSid).toBe("1");
+      expect(callArgs.ctx.MessageSidFull).toBe("msg-uuid-12345");
     });
 
     it("resolves short ID back to UUID", async () => {
diff --git a/extensions/bluebubbles/src/monitor.ts b/extensions/bluebubbles/src/monitor.ts
index c7a4188c0..083587409 100644
--- a/extensions/bluebubbles/src/monitor.ts
+++ b/extensions/bluebubbles/src/monitor.ts
@@ -1110,11 +1110,10 @@ async function processMessage(
   const placeholder = buildMessagePlaceholder(message);
   const rawBody = text || placeholder;
 
-  // Cache messages (including fromMe) so later replies can resolve sender/body even when
-  // BlueBubbles webhook payloads omit nested reply metadata.
   const cacheMessageId = message.messageId?.trim();
   let messageShortId: string | undefined;
-  if (cacheMessageId) {
+  const cacheInboundMessage = () => {
+    if (!cacheMessageId) return;
     const cacheEntry = rememberBlueBubblesReplyCache({
       accountId: account.accountId,
       messageId: cacheMessageId,
@@ -1126,9 +1125,13 @@ async function processMessage(
       timestamp: message.timestamp ?? Date.now(),
     });
     messageShortId = cacheEntry.shortId;
-  }
+  };
 
-  if (message.fromMe) return;
+  if (message.fromMe) {
+    // Cache from-me messages so reply context can resolve sender/body.
+    cacheInboundMessage();
+    return;
+  }
 
   if (!rawBody) {
     logVerbose(core, runtime, `drop: empty text sender=${message.senderId}`);
@@ -1370,6 +1373,10 @@ async function processMessage(
     return;
   }
 
+  // Cache allowed inbound messages so later replies can resolve sender/body without
+  // surfacing dropped content (allowlist/mention/command gating).
+  cacheInboundMessage();
+
   const baseUrl = account.config.serverUrl?.trim();
   const password = account.config.password?.trim();
   const maxBytes =
@@ -1610,6 +1617,7 @@ async function processMessage(
     ConversationLabel: fromLabel,
     // Use short ID for token savings (agent can use this to reference the message)
     ReplyToId: replyToShortId || replyToId,
+    ReplyToIdFull: replyToId,
     ReplyToBody: replyToBody,
     ReplyToSender: replyToSender,
     GroupSubject: groupSubject,
@@ -1620,6 +1628,7 @@ async function processMessage(
     Surface: "bluebubbles",
     // Use short ID for token savings (agent can use this to reference the message)
     MessageSid: messageShortId || message.messageId,
+    MessageSidFull: message.messageId,
     Timestamp: message.timestamp,
     OriginatingChannel: "bluebubbles",
     OriginatingTo: `bluebubbles:${outboundTarget}`,
@@ -1634,6 +1643,11 @@ async function processMessage(
       cfg: config,
       dispatcherOptions: {
         deliver: async (payload) => {
+          const rawReplyToId = typeof payload.replyToId === "string" ? payload.replyToId.trim() : "";
+          // Resolve short ID (e.g., "5") to full UUID
+          const replyToMessageGuid = rawReplyToId
+            ? resolveBlueBubblesMessageId(rawReplyToId)
+            : "";
           const mediaList = payload.mediaUrls?.length
             ? payload.mediaUrls
             : payload.mediaUrl
@@ -1649,7 +1663,7 @@ async function processMessage(
                 to: outboundTarget,
                 mediaUrl,
                 caption: caption ?? undefined,
-                replyToId: payload.replyToId ?? null,
+                replyToId: replyToMessageGuid || null,
                 accountId: account.accountId,
               });
               const cachedBody = (caption ?? "").trim() || "<media:attachment>";
@@ -1668,12 +1682,6 @@ async function processMessage(
           if (!chunks.length && payload.text) chunks.push(payload.text);
           if (!chunks.length) return;
           for (const chunk of chunks) {
-            const rawReplyToId =
-              typeof payload.replyToId === "string" ? payload.replyToId.trim() : "";
-            // Resolve short ID (e.g., "5") to full UUID
-            const replyToMessageGuid = rawReplyToId
-              ? resolveBlueBubblesMessageId(rawReplyToId)
-              : "";
             const result = await sendMessageBlueBubbles(outboundTarget, chunk, {
               cfg: config,
               accountId: account.accountId,
diff --git a/src/auto-reply/reply/agent-runner-execution.ts b/src/auto-reply/reply/agent-runner-execution.ts
index bbdf6df0d..0e7dfa233 100644
--- a/src/auto-reply/reply/agent-runner-execution.ts
+++ b/src/auto-reply/reply/agent-runner-execution.ts
@@ -299,6 +299,8 @@ export async function runAgentTurnWithFallback(params: {
                   const { text, skip } = normalizeStreamingText(payload);
                   const hasPayloadMedia = (payload.mediaUrls?.length ?? 0) > 0;
                   if (skip && !hasPayloadMedia) return;
+                  const currentMessageId =
+                    params.sessionCtx.MessageSidFull ?? params.sessionCtx.MessageSid;
                   const taggedPayload = applyReplyTagsToPayload(
                     {
                       text,
@@ -308,12 +310,12 @@ export async function runAgentTurnWithFallback(params: {
                       replyToTag: payload.replyToTag,
                       replyToCurrent: payload.replyToCurrent,
                     },
-                    params.sessionCtx.MessageSid,
+                    currentMessageId,
                   );
                   // Let through payloads with audioAsVoice flag even if empty (need to track it)
                   if (!isRenderablePayload(taggedPayload) && !payload.audioAsVoice) return;
                   const parsed = parseReplyDirectives(taggedPayload.text ?? "", {
-                    currentMessageId: params.sessionCtx.MessageSid,
+                    currentMessageId,
                     silentToken: SILENT_REPLY_TOKEN,
                   });
                   const cleaned = parsed.text || undefined;
diff --git a/src/auto-reply/reply/agent-runner.ts b/src/auto-reply/reply/agent-runner.ts
index da73bf9de..1da6d3957 100644
--- a/src/auto-reply/reply/agent-runner.ts
+++ b/src/auto-reply/reply/agent-runner.ts
@@ -377,7 +377,7 @@ export async function runReplyAgent(params: {
       directlySentBlockKeys,
       replyToMode,
       replyToChannel,
-      currentMessageId: sessionCtx.MessageSid,
+      currentMessageId: sessionCtx.MessageSidFull ?? sessionCtx.MessageSid,
       messageProvider: followupRun.run.messageProvider,
       messagingToolSentTexts: runResult.messagingToolSentTexts,
       messagingToolSentTargets: runResult.messagingToolSentTargets,
diff --git a/src/auto-reply/reply/get-reply-run.ts b/src/auto-reply/reply/get-reply-run.ts
index aa2281de6..1b0bfd4eb 100644
--- a/src/auto-reply/reply/get-reply-run.ts
+++ b/src/auto-reply/reply/get-reply-run.ts
@@ -350,7 +350,7 @@ export async function runPreparedReply(
   const authProfileIdSource = sessionEntry?.authProfileOverrideSource;
   const followupRun = {
     prompt: queuedBody,
-    messageId: sessionCtx.MessageSid,
+    messageId: sessionCtx.MessageSidFull ?? sessionCtx.MessageSid,
     summaryLine: baseBodyTrimmedRaw,
     enqueuedAt: Date.now(),
     // Originating channel for reply routing.
diff --git a/src/auto-reply/templating.ts b/src/auto-reply/templating.ts
index 375ba6759..605a0fa69 100644
--- a/src/auto-reply/templating.ts
+++ b/src/auto-reply/templating.ts
@@ -38,10 +38,14 @@ export type MsgContext = {
   AccountId?: string;
   ParentSessionKey?: string;
   MessageSid?: string;
+  /** Provider-specific full message id when MessageSid is a shortened alias. */
+  MessageSidFull?: string;
   MessageSids?: string[];
   MessageSidFirst?: string;
   MessageSidLast?: string;
   ReplyToId?: string;
+  /** Provider-specific full reply-to id when ReplyToId is a shortened alias. */
+  ReplyToIdFull?: string;
   ReplyToBody?: string;
   ReplyToSender?: string;
   ForwardedFrom?: string;
diff --git a/src/channels/plugins/types.core.ts b/src/channels/plugins/types.core.ts
index 3f6600620..dced4e14c 100644
--- a/src/channels/plugins/types.core.ts
+++ b/src/channels/plugins/types.core.ts
@@ -212,6 +212,7 @@ export type ChannelThreadingContext = {
   Channel?: string;
   To?: string;
   ReplyToId?: string;
+  ReplyToIdFull?: string;
   ThreadLabel?: string;
   MessageThreadId?: string | number;
 };

From a90fe1b245c181b5fc84f402d78e91538421cc26 Mon Sep 17 00:00:00 2001
From: Pham Nam <zvw180ptn1411@gmail.com>
Date: Wed, 21 Jan 2026 19:48:21 +0700
Subject: [PATCH 014/171] Refs #1378: scaffold zalouser extension

---
 extensions/zalouser/src/zca.ts | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/extensions/zalouser/src/zca.ts b/extensions/zalouser/src/zca.ts
index 83849835f..427e20024 100644
--- a/extensions/zalouser/src/zca.ts
+++ b/extensions/zalouser/src/zca.ts
@@ -114,11 +114,36 @@ export function runZcaInteractive(
   });
 }
 
+function stripAnsi(str: string): string {
+  return str.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "");
+}
+
 export function parseJsonOutput<T>(stdout: string): T | null {
   try {
     return JSON.parse(stdout) as T;
   } catch {
-    return null;
+    const cleaned = stripAnsi(stdout);
+
+    try {
+      return JSON.parse(cleaned) as T;
+    } catch {
+      // zca may prefix output with INFO/log lines, try to find JSON
+      const lines = cleaned.split("\n");
+
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i].trim();
+        if (line.startsWith("{") || line.startsWith("[")) {
+          // Try parsing from this line to the end
+          const jsonCandidate = lines.slice(i).join("\n").trim();
+          try {
+            return JSON.parse(jsonCandidate) as T;
+          } catch {
+            continue;
+          }
+        }
+      }
+      return null;
+    }
   }
 }
 

From 0e003cb7f16dee56cbb86c09d9176dcfa19a0bf7 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 16:46:49 +0000
Subject: [PATCH 015/171] fix: normalize abort signals for telegram fetch

---
 src/infra/fetch.test.ts                       | 36 +++++++++++++++++++
 src/infra/fetch.ts                            | 29 +++++++++++++++
 ...gram-bot.installs-grammy-throttler.test.ts | 13 ++++---
 src/telegram/bot.test.ts                      | 13 ++++---
 src/telegram/fetch.ts                         |  6 ++--
 src/telegram/proxy.ts                         |  5 +--
 ...send.returns-undefined-empty-input.test.ts | 10 +++---
 7 files changed, 88 insertions(+), 24 deletions(-)
 create mode 100644 src/infra/fetch.test.ts
 create mode 100644 src/infra/fetch.ts

diff --git a/src/infra/fetch.test.ts b/src/infra/fetch.test.ts
new file mode 100644
index 000000000..9c286d4be
--- /dev/null
+++ b/src/infra/fetch.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { wrapFetchWithAbortSignal } from "./fetch.js";
+
+describe("wrapFetchWithAbortSignal", () => {
+  it("converts foreign abort signals to native controllers", async () => {
+    let seenSignal: AbortSignal | undefined;
+    const fetchImpl = vi.fn(async (_input: RequestInfo | URL, init?: RequestInit) => {
+      seenSignal = init?.signal as AbortSignal | undefined;
+      return {} as Response;
+    });
+
+    const wrapped = wrapFetchWithAbortSignal(fetchImpl);
+
+    let abortHandler: (() => void) | null = null;
+    const fakeSignal = {
+      aborted: false,
+      addEventListener: (event: string, handler: () => void) => {
+        if (event === "abort") abortHandler = handler;
+      },
+      removeEventListener: (event: string, handler: () => void) => {
+        if (event === "abort" && abortHandler === handler) abortHandler = null;
+      },
+    } as AbortSignal;
+
+    const promise = wrapped("https://example.com", { signal: fakeSignal });
+    expect(fetchImpl).toHaveBeenCalledOnce();
+    expect(seenSignal).toBeInstanceOf(AbortSignal);
+    expect(seenSignal).not.toBe(fakeSignal);
+
+    abortHandler?.();
+    expect(seenSignal?.aborted).toBe(true);
+
+    await promise;
+  });
+});
diff --git a/src/infra/fetch.ts b/src/infra/fetch.ts
new file mode 100644
index 000000000..5cd0d94e6
--- /dev/null
+++ b/src/infra/fetch.ts
@@ -0,0 +1,29 @@
+export function wrapFetchWithAbortSignal(fetchImpl: typeof fetch): typeof fetch {
+  return (input: RequestInfo | URL, init?: RequestInit) => {
+    const signal = init?.signal;
+    if (!signal) return fetchImpl(input, init);
+    if (typeof AbortSignal !== "undefined" && signal instanceof AbortSignal) {
+      return fetchImpl(input, init);
+    }
+    if (typeof AbortController === "undefined") {
+      return fetchImpl(input, init);
+    }
+    if (typeof signal.addEventListener !== "function") {
+      return fetchImpl(input, init);
+    }
+    const controller = new AbortController();
+    const onAbort = () => controller.abort();
+    if (signal.aborted) {
+      controller.abort();
+    } else {
+      signal.addEventListener("abort", onAbort, { once: true });
+    }
+    const response = fetchImpl(input, { ...init, signal: controller.signal });
+    if (typeof signal.removeEventListener === "function") {
+      void response.finally(() => {
+        signal.removeEventListener("abort", onAbort);
+      });
+    }
+    return response;
+  };
+}
diff --git a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
index fc34477c1..de7f6b62b 100644
--- a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
+++ b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
@@ -157,13 +157,12 @@ describe("createTelegramBot", () => {
       (globalThis as { Bun?: unknown }).Bun = {};
       createTelegramBot({ token: "tok" });
       const fetchImpl = resolveTelegramFetch();
-      expect(fetchImpl).toBe(fetchSpy);
-      expect(botCtorSpy).toHaveBeenCalledWith(
-        "tok",
-        expect.objectContaining({
-          client: expect.objectContaining({ fetch: fetchSpy }),
-        }),
-      );
+      expect(fetchImpl).toBeTypeOf("function");
+      expect(fetchImpl).not.toBe(fetchSpy);
+      const clientFetch = (botCtorSpy.mock.calls[0]?.[1] as { client?: { fetch?: unknown } })
+        ?.client?.fetch;
+      expect(clientFetch).toBeTypeOf("function");
+      expect(clientFetch).not.toBe(fetchSpy);
     } finally {
       globalThis.fetch = originalFetch;
       if (originalBun === undefined) {
diff --git a/src/telegram/bot.test.ts b/src/telegram/bot.test.ts
index 4166ddb19..77f50b41f 100644
--- a/src/telegram/bot.test.ts
+++ b/src/telegram/bot.test.ts
@@ -284,13 +284,12 @@ describe("createTelegramBot", () => {
       (globalThis as { Bun?: unknown }).Bun = {};
       createTelegramBot({ token: "tok" });
       const fetchImpl = resolveTelegramFetch();
-      expect(fetchImpl).toBe(fetchSpy);
-      expect(botCtorSpy).toHaveBeenCalledWith(
-        "tok",
-        expect.objectContaining({
-          client: expect.objectContaining({ fetch: fetchSpy }),
-        }),
-      );
+      expect(fetchImpl).toBeTypeOf("function");
+      expect(fetchImpl).not.toBe(fetchSpy);
+      const clientFetch = (botCtorSpy.mock.calls[0]?.[1] as { client?: { fetch?: unknown } })
+        ?.client?.fetch;
+      expect(clientFetch).toBeTypeOf("function");
+      expect(clientFetch).not.toBe(fetchSpy);
     } finally {
       globalThis.fetch = originalFetch;
       if (originalBun === undefined) {
diff --git a/src/telegram/fetch.ts b/src/telegram/fetch.ts
index 21d85e2e9..1c4a288d0 100644
--- a/src/telegram/fetch.ts
+++ b/src/telegram/fetch.ts
@@ -1,11 +1,13 @@
+import { wrapFetchWithAbortSignal } from "../infra/fetch.js";
+
 // Bun-only: force native fetch to avoid grammY's Node shim under Bun.
 export function resolveTelegramFetch(proxyFetch?: typeof fetch): typeof fetch | undefined {
-  if (proxyFetch) return proxyFetch;
+  if (proxyFetch) return wrapFetchWithAbortSignal(proxyFetch);
   const fetchImpl = globalThis.fetch;
   const isBun = "Bun" in globalThis || Boolean(process?.versions?.bun);
   if (!isBun) return undefined;
   if (!fetchImpl) {
     throw new Error("fetch is not available; set channels.telegram.proxy in config");
   }
-  return fetchImpl;
+  return wrapFetchWithAbortSignal(fetchImpl);
 }
diff --git a/src/telegram/proxy.ts b/src/telegram/proxy.ts
index 7217db477..19d53d569 100644
--- a/src/telegram/proxy.ts
+++ b/src/telegram/proxy.ts
@@ -1,10 +1,11 @@
 // @ts-nocheck
 import { ProxyAgent } from "undici";
+import { wrapFetchWithAbortSignal } from "../infra/fetch.js";
 
 export function makeProxyFetch(proxyUrl: string): typeof fetch {
   const agent = new ProxyAgent(proxyUrl);
-  return (input: RequestInfo | URL, init?: RequestInit) => {
+  return wrapFetchWithAbortSignal((input: RequestInfo | URL, init?: RequestInit) => {
     const base = init ? { ...init } : {};
     return fetch(input, { ...base, dispatcher: agent });
-  };
+  });
 }
diff --git a/src/telegram/send.returns-undefined-empty-input.test.ts b/src/telegram/send.returns-undefined-empty-input.test.ts
index f5dff070b..22a85eb3d 100644
--- a/src/telegram/send.returns-undefined-empty-input.test.ts
+++ b/src/telegram/send.returns-undefined-empty-input.test.ts
@@ -164,12 +164,10 @@ describe("sendMessageTelegram", () => {
     });
     try {
       await sendMessageTelegram("123", "hi", { token: "tok" });
-      expect(botCtorSpy).toHaveBeenCalledWith(
-        "tok",
-        expect.objectContaining({
-          client: expect.objectContaining({ fetch: fetchSpy }),
-        }),
-      );
+      const clientFetch = (botCtorSpy.mock.calls[0]?.[1] as { client?: { fetch?: unknown } })
+        ?.client?.fetch;
+      expect(clientFetch).toBeTypeOf("function");
+      expect(clientFetch).not.toBe(fetchSpy);
     } finally {
       globalThis.fetch = originalFetch;
       if (originalBun === undefined) {

From fa1bc589e4feaa18c0de6dfe187a2df42f26fe47 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 16:48:26 +0000
Subject: [PATCH 016/171] feat: flatten node CLI commands

---
 src/cli/node-cli/daemon.ts           |   9 +-
 src/cli/node-cli/register.ts         | 112 +++++++----------
 src/cli/program/register.subclis.ts  |   8 --
 src/cli/service-cli.coverage.test.ts |  59 ---------
 src/cli/service-cli.ts               | 181 ---------------------------
 5 files changed, 48 insertions(+), 321 deletions(-)
 delete mode 100644 src/cli/service-cli.coverage.test.ts
 delete mode 100644 src/cli/service-cli.ts

diff --git a/src/cli/node-cli/daemon.ts b/src/cli/node-cli/daemon.ts
index 111ac510e..4deaa49ca 100644
--- a/src/cli/node-cli/daemon.ts
+++ b/src/cli/node-cli/daemon.ts
@@ -47,10 +47,7 @@ type NodeDaemonStatusOptions = {
 };
 
 function renderNodeServiceStartHints(): string[] {
-  const base = [
-    formatCliCommand("clawdbot node service install"),
-    formatCliCommand("clawdbot node start"),
-  ];
+  const base = [formatCliCommand("clawdbot node install"), formatCliCommand("clawdbot node start")];
   switch (process.platform) {
     case "darwin":
       return [
@@ -172,9 +169,7 @@ export async function runNodeDaemonInstall(opts: NodeDaemonInstallOptions) {
     });
     if (!json) {
       defaultRuntime.log(`Node service already ${service.loadedText}.`);
-      defaultRuntime.log(
-        `Reinstall with: ${formatCliCommand("clawdbot node service install --force")}`,
-      );
+      defaultRuntime.log(`Reinstall with: ${formatCliCommand("clawdbot node install --force")}`);
     }
     return;
   }
diff --git a/src/cli/node-cli/register.ts b/src/cli/node-cli/register.ts
index 6717d001a..9a7412111 100644
--- a/src/cli/node-cli/register.ts
+++ b/src/cli/node-cli/register.ts
@@ -28,13 +28,13 @@ export function registerNodeCli(program: Command) {
     );
 
   node
-    .command("start")
-    .description("Start the headless node host (foreground)")
+    .command("run")
+    .description("Run the headless node host (foreground)")
     .option("--host <host>", "Gateway host")
     .option("--port <port>", "Gateway port")
     .option("--tls", "Use TLS for the gateway connection", false)
     .option("--tls-fingerprint <sha256>", "Expected TLS certificate fingerprint (sha256)")
-    .option("--node-id <id>", "Override node id")
+    .option("--node-id <id>", "Override node id (clears pairing token)")
     .option("--display-name <name>", "Override node display name")
     .action(async (opts) => {
       const existing = await loadNodeHostConfig();
@@ -51,71 +51,51 @@ export function registerNodeCli(program: Command) {
       });
     });
 
-  const registerNodeServiceCommands = (cmd: Command) => {
-    cmd
-      .command("status")
-      .description("Show node service status")
-      .option("--json", "Output JSON", false)
-      .action(async (opts) => {
-        await runNodeDaemonStatus(opts);
-      });
+  node
+    .command("status")
+    .description("Show node host status")
+    .option("--json", "Output JSON", false)
+    .action(async (opts) => {
+      await runNodeDaemonStatus(opts);
+    });
 
-    cmd
-      .command("install")
-      .description("Install the node service (launchd/systemd/schtasks)")
-      .option("--host <host>", "Gateway host")
-      .option("--port <port>", "Gateway port")
-      .option("--tls", "Use TLS for the gateway connection", false)
-      .option("--tls-fingerprint <sha256>", "Expected TLS certificate fingerprint (sha256)")
-      .option("--node-id <id>", "Override node id")
-      .option("--display-name <name>", "Override node display name")
-      .option("--runtime <runtime>", "Service runtime (node|bun). Default: node")
-      .option("--force", "Reinstall/overwrite if already installed", false)
-      .option("--json", "Output JSON", false)
-      .action(async (opts) => {
-        await runNodeDaemonInstall(opts);
-      });
+  node
+    .command("install")
+    .description("Install the node host service (launchd/systemd/schtasks)")
+    .option("--host <host>", "Gateway host")
+    .option("--port <port>", "Gateway port")
+    .option("--tls", "Use TLS for the gateway connection", false)
+    .option("--tls-fingerprint <sha256>", "Expected TLS certificate fingerprint (sha256)")
+    .option("--node-id <id>", "Override node id (clears pairing token)")
+    .option("--display-name <name>", "Override node display name")
+    .option("--runtime <runtime>", "Service runtime (node|bun). Default: node")
+    .option("--force", "Reinstall/overwrite if already installed", false)
+    .option("--json", "Output JSON", false)
+    .action(async (opts) => {
+      await runNodeDaemonInstall(opts);
+    });
 
-    cmd
-      .command("uninstall")
-      .description("Uninstall the node service (launchd/systemd/schtasks)")
-      .option("--json", "Output JSON", false)
-      .action(async (opts) => {
-        await runNodeDaemonUninstall(opts);
-      });
+  node
+    .command("uninstall")
+    .description("Uninstall the node host service (launchd/systemd/schtasks)")
+    .option("--json", "Output JSON", false)
+    .action(async (opts) => {
+      await runNodeDaemonUninstall(opts);
+    });
 
-    cmd
-      .command("start")
-      .description("Start the node service (launchd/systemd/schtasks)")
-      .option("--json", "Output JSON", false)
-      .action(async (opts) => {
-        await runNodeDaemonStart(opts);
-      });
+  node
+    .command("stop")
+    .description("Stop the node host service (launchd/systemd/schtasks)")
+    .option("--json", "Output JSON", false)
+    .action(async (opts) => {
+      await runNodeDaemonStop(opts);
+    });
 
-    cmd
-      .command("stop")
-      .description("Stop the node service (launchd/systemd/schtasks)")
-      .option("--json", "Output JSON", false)
-      .action(async (opts) => {
-        await runNodeDaemonStop(opts);
-      });
-
-    cmd
-      .command("restart")
-      .description("Restart the node service (launchd/systemd/schtasks)")
-      .option("--json", "Output JSON", false)
-      .action(async (opts) => {
-        await runNodeDaemonRestart(opts);
-      });
-  };
-
-  const service = node
-    .command("service")
-    .description("Manage the headless node service (launchd/systemd/schtasks)");
-  registerNodeServiceCommands(service);
-
-  const daemon = node
-    .command("daemon", { hidden: true })
-    .description("Legacy alias for node service commands");
-  registerNodeServiceCommands(daemon);
+  node
+    .command("restart")
+    .description("Restart the node host service (launchd/systemd/schtasks)")
+    .option("--json", "Output JSON", false)
+    .action(async (opts) => {
+      await runNodeDaemonRestart(opts);
+    });
 }
diff --git a/src/cli/program/register.subclis.ts b/src/cli/program/register.subclis.ts
index 74b075af0..b13a4c76f 100644
--- a/src/cli/program/register.subclis.ts
+++ b/src/cli/program/register.subclis.ts
@@ -52,14 +52,6 @@ const entries: SubCliEntry[] = [
       mod.registerGatewayCli(program);
     },
   },
-  {
-    name: "service",
-    description: "Service helpers",
-    register: async (program) => {
-      const mod = await import("../service-cli.js");
-      mod.registerServiceCli(program);
-    },
-  },
   {
     name: "logs",
     description: "Gateway logs",
diff --git a/src/cli/service-cli.coverage.test.ts b/src/cli/service-cli.coverage.test.ts
deleted file mode 100644
index e0bb6604a..000000000
--- a/src/cli/service-cli.coverage.test.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Command } from "commander";
-import { describe, expect, it, vi } from "vitest";
-
-const runDaemonStatus = vi.fn(async () => {});
-const runNodeDaemonStatus = vi.fn(async () => {});
-
-vi.mock("./daemon-cli/runners.js", () => ({
-  runDaemonInstall: vi.fn(async () => {}),
-  runDaemonRestart: vi.fn(async () => {}),
-  runDaemonStart: vi.fn(async () => {}),
-  runDaemonStatus: (opts: unknown) => runDaemonStatus(opts),
-  runDaemonStop: vi.fn(async () => {}),
-  runDaemonUninstall: vi.fn(async () => {}),
-}));
-
-vi.mock("./node-cli/daemon.js", () => ({
-  runNodeDaemonInstall: vi.fn(async () => {}),
-  runNodeDaemonRestart: vi.fn(async () => {}),
-  runNodeDaemonStart: vi.fn(async () => {}),
-  runNodeDaemonStatus: (opts: unknown) => runNodeDaemonStatus(opts),
-  runNodeDaemonStop: vi.fn(async () => {}),
-  runNodeDaemonUninstall: vi.fn(async () => {}),
-}));
-
-vi.mock("./deps.js", () => ({
-  createDefaultDeps: vi.fn(),
-}));
-
-describe("service CLI coverage", () => {
-  it("routes service gateway status to daemon status", async () => {
-    runDaemonStatus.mockClear();
-    runNodeDaemonStatus.mockClear();
-
-    const { registerServiceCli } = await import("./service-cli.js");
-    const program = new Command();
-    program.exitOverride();
-    registerServiceCli(program);
-
-    await program.parseAsync(["service", "gateway", "status"], { from: "user" });
-
-    expect(runDaemonStatus).toHaveBeenCalledTimes(1);
-    expect(runNodeDaemonStatus).toHaveBeenCalledTimes(0);
-  });
-
-  it("routes service node status to node daemon status", async () => {
-    runDaemonStatus.mockClear();
-    runNodeDaemonStatus.mockClear();
-
-    const { registerServiceCli } = await import("./service-cli.js");
-    const program = new Command();
-    program.exitOverride();
-    registerServiceCli(program);
-
-    await program.parseAsync(["service", "node", "status"], { from: "user" });
-
-    expect(runNodeDaemonStatus).toHaveBeenCalledTimes(1);
-    expect(runDaemonStatus).toHaveBeenCalledTimes(0);
-  });
-});
diff --git a/src/cli/service-cli.ts b/src/cli/service-cli.ts
deleted file mode 100644
index fa2ac3ffb..000000000
--- a/src/cli/service-cli.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-import type { Command } from "commander";
-import { formatDocsLink } from "../terminal/links.js";
-import { theme } from "../terminal/theme.js";
-import { formatHelpExampleGroup } from "./help-format.js";
-import { createDefaultDeps } from "./deps.js";
-import {
-  runDaemonInstall,
-  runDaemonRestart,
-  runDaemonStart,
-  runDaemonStatus,
-  runDaemonStop,
-  runDaemonUninstall,
-} from "./daemon-cli/runners.js";
-import {
-  runNodeDaemonInstall,
-  runNodeDaemonRestart,
-  runNodeDaemonStart,
-  runNodeDaemonStatus,
-  runNodeDaemonStop,
-  runNodeDaemonUninstall,
-} from "./node-cli/daemon.js";
-
-export function registerServiceCli(program: Command) {
-  const gatewayExamples: Array<[string, string]> = [
-    ["clawdbot service gateway status", "Show gateway service status + probe."],
-    [
-      "clawdbot service gateway install --port 18789 --token <token>",
-      "Install the Gateway service on port 18789.",
-    ],
-    ["clawdbot service gateway restart", "Restart the Gateway service."],
-  ];
-
-  const nodeExamples: Array<[string, string]> = [
-    ["clawdbot service node status", "Show node host service status."],
-    [
-      "clawdbot service node install --host gateway.local --port 18789 --tls",
-      "Install the node host service with TLS.",
-    ],
-    ["clawdbot service node restart", "Restart the node host service."],
-  ];
-
-  const service = program
-    .command("service")
-    .description("Manage Gateway and node host services (launchd/systemd/schtasks)")
-    .addHelpText(
-      "after",
-      () =>
-        `\n${theme.heading("Examples:")}\n${formatHelpExampleGroup(
-          "Gateway:",
-          gatewayExamples,
-        )}\n\n${formatHelpExampleGroup("Node:", nodeExamples)}\n\n${theme.muted(
-          "Docs:",
-        )} ${formatDocsLink("/cli/service", "docs.clawd.bot/cli/service")}\n`,
-    );
-
-  const gateway = service.command("gateway").description("Manage the Gateway service");
-
-  gateway
-    .command("status")
-    .description("Show gateway service status + probe the Gateway")
-    .option("--url <url>", "Gateway WebSocket URL (defaults to config/remote/local)")
-    .option("--token <token>", "Gateway token (if required)")
-    .option("--password <password>", "Gateway password (password auth)")
-    .option("--timeout <ms>", "Timeout in ms", "10000")
-    .option("--no-probe", "Skip RPC probe")
-    .option("--deep", "Scan system-level services", false)
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runDaemonStatus({
-        rpc: opts,
-        probe: Boolean(opts.probe),
-        deep: Boolean(opts.deep),
-        json: Boolean(opts.json),
-      });
-    });
-
-  gateway
-    .command("install")
-    .description("Install the Gateway service (launchd/systemd/schtasks)")
-    .option("--port <port>", "Gateway port")
-    .option("--runtime <runtime>", "Service runtime (node|bun). Default: node")
-    .option("--token <token>", "Gateway token (token auth)")
-    .option("--force", "Reinstall/overwrite if already installed", false)
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runDaemonInstall(opts);
-    });
-
-  gateway
-    .command("uninstall")
-    .description("Uninstall the Gateway service (launchd/systemd/schtasks)")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runDaemonUninstall(opts);
-    });
-
-  gateway
-    .command("start")
-    .description("Start the Gateway service (launchd/systemd/schtasks)")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runDaemonStart(opts);
-    });
-
-  gateway
-    .command("stop")
-    .description("Stop the Gateway service (launchd/systemd/schtasks)")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runDaemonStop(opts);
-    });
-
-  gateway
-    .command("restart")
-    .description("Restart the Gateway service (launchd/systemd/schtasks)")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runDaemonRestart(opts);
-    });
-
-  const node = service.command("node").description("Manage the node host service");
-
-  node
-    .command("status")
-    .description("Show node host service status")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runNodeDaemonStatus(opts);
-    });
-
-  node
-    .command("install")
-    .description("Install the node host service (launchd/systemd/schtasks)")
-    .option("--host <host>", "Gateway host")
-    .option("--port <port>", "Gateway port")
-    .option("--tls", "Use TLS for the Gateway connection", false)
-    .option("--tls-fingerprint <sha256>", "Expected TLS certificate fingerprint (sha256)")
-    .option("--node-id <id>", "Override node id (clears pairing token)")
-    .option("--display-name <name>", "Override node display name")
-    .option("--runtime <runtime>", "Service runtime (node|bun). Default: node")
-    .option("--force", "Reinstall/overwrite if already installed", false)
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runNodeDaemonInstall(opts);
-    });
-
-  node
-    .command("uninstall")
-    .description("Uninstall the node host service (launchd/systemd/schtasks)")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runNodeDaemonUninstall(opts);
-    });
-
-  node
-    .command("start")
-    .description("Start the node host service (launchd/systemd/schtasks)")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runNodeDaemonStart(opts);
-    });
-
-  node
-    .command("stop")
-    .description("Stop the node host service (launchd/systemd/schtasks)")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runNodeDaemonStop(opts);
-    });
-
-  node
-    .command("restart")
-    .description("Restart the node host service (launchd/systemd/schtasks)")
-    .option("--json", "Output JSON", false)
-    .action(async (opts) => {
-      await runNodeDaemonRestart(opts);
-    });
-
-  // Build default deps (parity with daemon CLI).
-  void createDefaultDeps();
-}

From 39e24c9937552cc68a77973b77792279d217214e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 16:48:31 +0000
Subject: [PATCH 017/171] docs: update node CLI references

---
 CHANGELOG.md                    |  1 +
 docs/cli/daemon.md              |  2 +-
 docs/cli/index.md               | 35 ++++++----------------
 docs/cli/node.md                | 24 +++++-----------
 docs/cli/service.md             | 51 ---------------------------------
 docs/cli/status.md              |  2 +-
 docs/gateway/configuration.md   |  2 +-
 docs/gateway/troubleshooting.md |  2 +-
 docs/nodes/index.md             | 10 +++----
 docs/platforms/mac/xpc.md       |  4 +--
 docs/platforms/macos.md         |  2 +-
 docs/refactor/exec-host.md      |  2 +-
 docs/refactor/strict-config.md  |  2 +-
 docs/tools/exec-approvals.md    |  2 +-
 docs/tools/index.md             |  2 +-
 15 files changed, 32 insertions(+), 111 deletions(-)
 delete mode 100644 docs/cli/service.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9585be95..46f4ac09b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Docs: https://docs.clawd.bot
 - CLI: exec approvals mutations render tables instead of raw JSON.
 - Exec approvals: support wildcard agent allowlists (`*`) across all agents.
 - Nodes: expose node PATH in status/describe and bootstrap PATH for node-host execution.
+- CLI: flatten node service commands under `clawdbot node` and remove `service node` docs.
 
 ### Fixes
 - Nodes tool: include agent/node/gateway context in tool failure logs to speed approval debugging.
diff --git a/docs/cli/daemon.md b/docs/cli/daemon.md
index 71c43d1f8..d1e8753ed 100644
--- a/docs/cli/daemon.md
+++ b/docs/cli/daemon.md
@@ -9,7 +9,7 @@ read_when:
 
 Manage the Gateway daemon (background service).
 
-Note: `clawdbot service gateway …` is the preferred surface; `daemon` remains
+Note: `clawdbot daemon …` is the preferred surface for Gateway service management; `daemon` remains
 as a legacy alias for compatibility.
 
 Related:
diff --git a/docs/cli/index.md b/docs/cli/index.md
index d12b5e9f8..fdf730e2b 100644
--- a/docs/cli/index.md
+++ b/docs/cli/index.md
@@ -29,7 +29,6 @@ This page describes the current CLI behavior. If commands change, update this do
 - [`sessions`](/cli/sessions)
 - [`gateway`](/cli/gateway)
 - [`daemon`](/cli/daemon)
-- [`service`](/cli/service)
 - [`logs`](/cli/logs)
 - [`models`](/cli/models)
 - [`memory`](/cli/memory)
@@ -146,21 +145,6 @@ clawdbot [--dev] [--profile <name>] <command>
     start
     stop
     restart
-  service
-    gateway
-      status
-      install
-      uninstall
-      start
-      stop
-      restart
-    node
-      status
-      install
-      uninstall
-      start
-      stop
-      restart
   logs
   models
     list
@@ -544,7 +528,7 @@ Options:
 - `--debug` (alias for `--verbose`)
 
 Notes:
-- Overview includes Gateway + Node service status when available.
+- Overview includes Gateway + node host service status when available.
 
 ### Usage tracking
 Clawdbot can surface provider usage/quota when OAuth/API creds are available.
@@ -806,16 +790,13 @@ All `cron` commands accept `--url`, `--token`, `--timeout`, `--expect-final`.
 [`clawdbot node`](/cli/node).
 
 Subcommands:
-- `node start --host <gateway-host> --port 18790`
-- `node service status`
-- `node service install [--host <gateway-host>] [--port <port>] [--tls] [--tls-fingerprint <sha256>] [--node-id <id>] [--display-name <name>] [--runtime <node|bun>] [--force]`
-- `node service uninstall`
-- `node service start`
-- `node service stop`
-- `node service restart`
-
-Legacy alias:
-- `node daemon …` (same as `node service …`)
+- `node run --host <gateway-host> --port 18790`
+- `node status`
+- `node install [--host <gateway-host>] [--port <port>] [--tls] [--tls-fingerprint <sha256>] [--node-id <id>] [--display-name <name>] [--runtime <node|bun>] [--force]`
+- `node uninstall`
+- `node run`
+- `node stop`
+- `node restart`
 
 ## Nodes
 
diff --git a/docs/cli/node.md b/docs/cli/node.md
index c6a070376..ee9893f87 100644
--- a/docs/cli/node.md
+++ b/docs/cli/node.md
@@ -23,10 +23,10 @@ Common use cases:
 Execution is still guarded by **exec approvals** and per‑agent allowlists on the
 node host, so you can keep command access scoped and explicit.
 
-## Start (foreground)
+## Run (foreground)
 
 ```bash
-clawdbot node start --host <gateway-host> --port 18790
+clawdbot node run --host <gateway-host> --port 18790
 ```
 
 Options:
@@ -42,9 +42,7 @@ Options:
 Install a headless node host as a user service.
 
 ```bash
-clawdbot node service install --host <gateway-host> --port 18790
-# or
-clawdbot service node install --host <gateway-host> --port 18790
+clawdbot node install --host <gateway-host> --port 18790
 ```
 
 Options:
@@ -61,18 +59,10 @@ Manage the service:
 
 ```bash
 clawdbot node status
-clawdbot service node status
-clawdbot node service status
-clawdbot node service start
-clawdbot node service stop
-clawdbot node service restart
-clawdbot node service uninstall
-```
-
-Legacy alias:
-
-```bash
-clawdbot node daemon status
+clawdbot node run
+clawdbot node stop
+clawdbot node restart
+clawdbot node uninstall
 ```
 
 ## Pairing
diff --git a/docs/cli/service.md b/docs/cli/service.md
deleted file mode 100644
index a3cf536a2..000000000
--- a/docs/cli/service.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-summary: "CLI reference for `clawdbot service` (manage gateway + node services)"
-read_when:
-  - You want to manage Gateway or node services cross-platform
-  - You want a single surface for start/stop/install/uninstall
----
-
-# `clawdbot service`
-
-Manage the **Gateway** service and **node host** services.
-
-Related:
-- Gateway daemon (legacy alias): [Daemon](/cli/daemon)
-- Node host: [Node](/cli/node)
-
-## Gateway service
-
-```bash
-clawdbot service gateway status
-clawdbot service gateway install --port 18789
-clawdbot service gateway start
-clawdbot service gateway stop
-clawdbot service gateway restart
-clawdbot service gateway uninstall
-```
-
-Notes:
-- `service gateway status` supports `--json` and `--deep` for system checks.
-- `service gateway install` supports `--runtime node|bun` and `--token`.
-
-## Node host service
-
-```bash
-clawdbot service node status
-clawdbot service node install --host <gateway-host> --port 18790
-clawdbot service node start
-clawdbot service node stop
-clawdbot service node restart
-clawdbot service node uninstall
-```
-
-Notes:
-- `service node install` supports `--runtime node|bun`, `--node-id`, `--display-name`,
-  and TLS options (`--tls`, `--tls-fingerprint`).
-
-## Aliases
-
-- `clawdbot daemon …` → `clawdbot service gateway …`
-- `clawdbot node service …` → `clawdbot service node …`
-- `clawdbot node status` → `clawdbot service node status`
-- `clawdbot node daemon …` → `clawdbot service node …` (legacy)
diff --git a/docs/cli/status.md b/docs/cli/status.md
index a66dd958a..f2131cbb8 100644
--- a/docs/cli/status.md
+++ b/docs/cli/status.md
@@ -19,6 +19,6 @@ clawdbot status --usage
 Notes:
 - `--deep` runs live probes (WhatsApp Web + Telegram + Discord + Slack + Signal).
 - Output includes per-agent session stores when multiple agents are configured.
-- Overview includes Gateway + Node service install/runtime status when available.
+- Overview includes Gateway + node host service install/runtime status when available.
 - Overview includes update channel + git SHA (for source checkouts).
 - Update info surfaces in the Overview; if an update is available, status prints a hint to run `clawdbot update` (see [Updating](/install/updating)).
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index 8ebcef47a..acf4ee219 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -24,7 +24,7 @@ Unknown keys, malformed types, or invalid values cause the Gateway to **refuse t
 
 When validation fails:
 - The Gateway does not boot.
-- Only diagnostic commands are allowed (for example: `clawdbot doctor`, `clawdbot logs`, `clawdbot health`, `clawdbot status`, `clawdbot service`, `clawdbot help`).
+- Only diagnostic commands are allowed (for example: `clawdbot doctor`, `clawdbot logs`, `clawdbot health`, `clawdbot status`, `clawdbot daemon`, `clawdbot help`).
 - Run `clawdbot doctor` to see the exact issues.
 - Run `clawdbot doctor --fix` (or `--yes`) to apply migrations/repairs.
 
diff --git a/docs/gateway/troubleshooting.md b/docs/gateway/troubleshooting.md
index 3065d5754..ccd9c9ea4 100644
--- a/docs/gateway/troubleshooting.md
+++ b/docs/gateway/troubleshooting.md
@@ -354,7 +354,7 @@ clawdbot doctor --fix
 Notes:
 - `clawdbot doctor` reports every invalid entry.
 - `clawdbot doctor --fix` applies migrations/repairs and rewrites the config.
-- Diagnostic commands like `clawdbot logs`, `clawdbot health`, `clawdbot status`, and `clawdbot service` still run even if the config is invalid.
+- Diagnostic commands like `clawdbot logs`, `clawdbot health`, `clawdbot status`, and `clawdbot daemon` still run even if the config is invalid.
 
 ### “All models failed” — what should I check first?
 
diff --git a/docs/nodes/index.md b/docs/nodes/index.md
index 711049e6b..9096cb7d9 100644
--- a/docs/nodes/index.md
+++ b/docs/nodes/index.md
@@ -50,14 +50,14 @@ forwards `exec` calls to the **node host** when `host=node` is selected.
 On the node machine:
 
 ```bash
-clawdbot node start --host <gateway-host> --port 18789 --display-name "Build Node"
+clawdbot node run --host <gateway-host> --port 18789 --display-name "Build Node"
 ```
 
 ### Start a node host (service)
 
 ```bash
-clawdbot node service install --host <gateway-host> --port 18789 --display-name "Build Node"
-clawdbot node service start
+clawdbot node install --host <gateway-host> --port 18789 --display-name "Build Node"
+clawdbot node start
 ```
 
 ### Pair + name
@@ -71,7 +71,7 @@ clawdbot nodes list
 ```
 
 Naming options:
-- `--display-name` on `clawdbot node start/service install` (persists in `~/.clawdbot/node.json` on the node).
+- `--display-name` on `clawdbot node run` / `clawdbot node install` (persists in `~/.clawdbot/node.json` on the node).
 - `clawdbot nodes rename --node <id|name|ip> --name "Build Node"` (gateway override).
 
 ### Allowlist the commands
@@ -281,7 +281,7 @@ or for running a minimal node alongside a server.
 Start it:
 
 ```bash
-clawdbot node start --host <gateway-host> --port 18790
+clawdbot node run --host <gateway-host> --port 18790
 ```
 
 Notes:
diff --git a/docs/platforms/mac/xpc.md b/docs/platforms/mac/xpc.md
index 5aa22b156..4beaf6fa4 100644
--- a/docs/platforms/mac/xpc.md
+++ b/docs/platforms/mac/xpc.md
@@ -5,7 +5,7 @@ read_when:
 ---
 # Clawdbot macOS IPC architecture
 
-**Current model:** a local Unix socket connects the **node service** to the **macOS app** for exec approvals + `system.run`. A `clawdbot-mac` debug CLI exists for discovery/connect checks; agent actions still flow through the Gateway WebSocket and `node.invoke`. UI automation uses PeekabooBridge.
+**Current model:** a local Unix socket connects the **node host service** to the **macOS app** for exec approvals + `system.run`. A `clawdbot-mac` debug CLI exists for discovery/connect checks; agent actions still flow through the Gateway WebSocket and `node.invoke`. UI automation uses PeekabooBridge.
 
 ## Goals
 - Single GUI app instance that owns all TCC-facing work (notifications, screen recording, mic, speech, AppleScript).
@@ -18,7 +18,7 @@ read_when:
 - Agent actions are performed via `node.invoke` (e.g. `system.run`, `system.notify`, `canvas.*`).
 
 ### Node service + app IPC
-- A headless node service connects to the Gateway bridge.
+- A headless node host service connects to the Gateway bridge.
 - `system.run` requests are forwarded to the macOS app over a local Unix socket.
 - The app performs the exec in UI context, prompts if needed, and returns output.
 
diff --git a/docs/platforms/macos.md b/docs/platforms/macos.md
index 561e09189..67b7c84cb 100644
--- a/docs/platforms/macos.md
+++ b/docs/platforms/macos.md
@@ -57,7 +57,7 @@ The macOS app presents itself as a node. Common commands:
 The node reports a `permissions` map so agents can decide what’s allowed.
 
 Node service + app IPC:
-- When the headless node service is running (remote mode), it connects to the Gateway WS as a node.
+- When the headless node host service is running (remote mode), it connects to the Gateway WS as a node.
 - `system.run` executes in the macOS app (UI/TCC context) over a local Unix socket; prompts + output stay in-app.
 
 Diagram (SCI):
diff --git a/docs/refactor/exec-host.md b/docs/refactor/exec-host.md
index 9cad8c27b..c71a456ef 100644
--- a/docs/refactor/exec-host.md
+++ b/docs/refactor/exec-host.md
@@ -30,7 +30,7 @@ read_when:
 - **Node identity:** use existing `nodeId`.
 - **Socket auth:** Unix socket + token (cross-platform); split later if needed.
 - **Node host state:** `~/.clawdbot/node.json` (node id + pairing token).
-- **macOS exec host:** run `system.run` inside the macOS app; node service forwards requests over local IPC.
+- **macOS exec host:** run `system.run` inside the macOS app; node host service forwards requests over local IPC.
 - **No XPC helper:** stick to Unix socket + token + peer checks.
 
 ## Key concepts
diff --git a/docs/refactor/strict-config.md b/docs/refactor/strict-config.md
index cfdc0ca7b..01578d2c5 100644
--- a/docs/refactor/strict-config.md
+++ b/docs/refactor/strict-config.md
@@ -54,7 +54,7 @@ Allowed (diagnostic-only):
 - `clawdbot health`
 - `clawdbot help`
 - `clawdbot status`
-- `clawdbot service`
+- `clawdbot daemon`
 
 Everything else must hard-fail with: “Config invalid. Run `clawdbot doctor --fix`.”
 
diff --git a/docs/tools/exec-approvals.md b/docs/tools/exec-approvals.md
index 369a6a408..c6dccaab5 100644
--- a/docs/tools/exec-approvals.md
+++ b/docs/tools/exec-approvals.md
@@ -23,7 +23,7 @@ Exec approvals are enforced locally on the execution host:
 - **node host** → node runner (macOS companion app or headless node host)
 
 Planned macOS split:
-- **node service** forwards `system.run` to the **macOS app** over local IPC.
+- **node host service** forwards `system.run` to the **macOS app** over local IPC.
 - **macOS app** enforces approvals + executes the command in UI context.
 
 ## Settings and storage
diff --git a/docs/tools/index.md b/docs/tools/index.md
index 541195213..ccb0c87c6 100644
--- a/docs/tools/index.md
+++ b/docs/tools/index.md
@@ -181,7 +181,7 @@ Notes:
 - If `process` is disallowed, `exec` runs synchronously and ignores `yieldMs`/`background`.
 - `elevated` is gated by `tools.elevated` plus any `agents.list[].tools.elevated` override (both must allow) and is an alias for `host=gateway` + `security=full`.
 - `elevated` only changes behavior when the agent is sandboxed (otherwise it’s a no-op).
-- `host=node` can target a macOS companion app or a headless node host (`clawdbot node start`).
+- `host=node` can target a macOS companion app or a headless node host (`clawdbot node run`).
 - gateway/node approvals and allowlists: [Exec approvals](/tools/exec-approvals).
 
 ### `process`

From cbb987247869aad1d9ac6bab785432c9f6a1b1f7 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 16:56:20 +0000
Subject: [PATCH 018/171] docs: add FAQ entry for tool_use input error

---
 docs/start/faq.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/start/faq.md b/docs/start/faq.md
index f62e0315f..0158f405e 100644
--- a/docs/start/faq.md
+++ b/docs/start/faq.md
@@ -73,6 +73,7 @@ Quick answers plus deeper troubleshooting for real-world setups (local dev, VPS,
   - [Do sessions reset automatically if I never send `/new`?](#do-sessions-reset-automatically-if-i-never-send-new)
   - [How do I completely reset Clawdbot but keep it installed?](#how-do-i-completely-reset-clawdbot-but-keep-it-installed)
   - [I’m getting “context too large” errors — how do I reset or compact?](#im-getting-context-too-large-errors-how-do-i-reset-or-compact)
+  - [Why am I seeing “LLM request rejected: messages.N.content.X.tool_use.input: Field required”?](#why-am-i-seeing-llm-request-rejected-messagesncontentxtool_useinput-field-required)
   - [Why am I getting heartbeat messages every 30 minutes?](#why-am-i-getting-heartbeat-messages-every-30-minutes)
   - [Do I need to add a “bot account” to a WhatsApp group?](#do-i-need-to-add-a-bot-account-to-a-whatsapp-group)
   - [Why doesn’t Clawdbot reply in a group?](#why-doesnt-clawdbot-reply-in-a-group)
@@ -951,6 +952,14 @@ If it keeps happening:
 
 Docs: [Compaction](/concepts/compaction), [Session pruning](/concepts/session-pruning), [Session management](/concepts/session).
 
+### Why am I seeing “LLM request rejected: messages.N.content.X.tool_use.input: Field required”?
+
+This is a provider validation error: the model emitted a `tool_use` block without the required
+`input`. It usually means the session history is stale or corrupted (often after long threads
+or a tool/schema change).
+
+Fix: start a fresh session with `/new` (standalone message).
+
 ### Why am I getting heartbeat messages every 30 minutes?
 
 Heartbeats run every **30m** by default. Tune or disable them:

From cd25d69b4d54c09c36ef9ce1022bb3abccd660cd Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:05:36 +0000
Subject: [PATCH 019/171] fix: harden bluebubbles short ids and fetch wrapper
 (#1369) (thanks @tyler6204)

---
 CHANGELOG.md                               |   2 +
 docs/gateway/configuration.md              |   3 +
 extensions/bluebubbles/src/actions.test.ts | 104 +++++++++++++++++++++
 extensions/bluebubbles/src/actions.ts      |   8 +-
 extensions/bluebubbles/src/channel.ts      |   4 +-
 extensions/bluebubbles/src/media-send.ts   |   2 +-
 extensions/bluebubbles/src/monitor.test.ts |   6 ++
 extensions/bluebubbles/src/monitor.ts      |  12 ++-
 src/cli/node-cli/register.ts               |   1 -
 src/infra/fetch.ts                         |   5 +-
 10 files changed, 136 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46f4ac09b..7474dfd2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@ Docs: https://docs.clawd.bot
 - Configure: restrict the model allowlist picker to OAuth-compatible Anthropic models and preselect Opus 4.5.
 - Configure: seed model fallbacks from the allowlist selection when multiple models are chosen.
 - Model picker: list the full catalog when no model allowlist is configured.
+- BlueBubbles: resolve short message IDs safely and expose full IDs in templates. (#1369) Thanks @tyler6204.
+- Infra: preserve fetch helper methods when wrapping abort signals. (#1369)
 
 ## 2026.1.20
 
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index acf4ee219..1ab4c4bb0 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -3022,6 +3022,9 @@ Template placeholders are expanded in `tools.media.*.models[].args` and `tools.m
 | `{{From}}` | Sender identifier (E.164 for WhatsApp; may differ per channel) |
 | `{{To}}` | Destination identifier |
 | `{{MessageSid}}` | Channel message id (when available) |
+| `{{MessageSidFull}}` | Provider-specific full message id when `MessageSid` is shortened |
+| `{{ReplyToId}}` | Reply-to message id (when available) |
+| `{{ReplyToIdFull}}` | Provider-specific full reply-to id when `ReplyToId` is shortened |
 | `{{SessionId}}` | Current session UUID |
 | `{{IsNewSession}}` | `"true"` when a new session was created |
 | `{{MediaUrl}}` | Inbound media pseudo-URL (if present) |
diff --git a/extensions/bluebubbles/src/actions.test.ts b/extensions/bluebubbles/src/actions.test.ts
index 21f1c9c9d..157776b1c 100644
--- a/extensions/bluebubbles/src/actions.test.ts
+++ b/extensions/bluebubbles/src/actions.test.ts
@@ -38,6 +38,10 @@ vi.mock("./attachments.js", () => ({
   sendBlueBubblesAttachment: vi.fn().mockResolvedValue({ messageId: "att-msg-123" }),
 }));
 
+vi.mock("./monitor.js", () => ({
+  resolveBlueBubblesMessageId: vi.fn((id: string) => id),
+}));
+
 describe("bluebubblesMessageActions", () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -358,6 +362,106 @@ describe("bluebubblesMessageActions", () => {
       );
     });
 
+    it("uses toolContext currentChannelId when no explicit target is provided", async () => {
+      const { sendBlueBubblesReaction } = await import("./reactions.js");
+      const { resolveChatGuidForTarget } = await import("./send.js");
+      vi.mocked(resolveChatGuidForTarget).mockResolvedValueOnce("iMessage;-;+15550001111");
+
+      const cfg: ClawdbotConfig = {
+        channels: {
+          bluebubbles: {
+            serverUrl: "http://localhost:1234",
+            password: "test-password",
+          },
+        },
+      };
+      await bluebubblesMessageActions.handleAction({
+        action: "react",
+        params: {
+          emoji: "👍",
+          messageId: "msg-456",
+        },
+        cfg,
+        accountId: null,
+        toolContext: {
+          currentChannelId: "bluebubbles:chat_guid:iMessage;-;+15550001111",
+        },
+      });
+
+      expect(resolveChatGuidForTarget).toHaveBeenCalledWith(
+        expect.objectContaining({
+          target: { kind: "chat_guid", chatGuid: "iMessage;-;+15550001111" },
+        }),
+      );
+      expect(sendBlueBubblesReaction).toHaveBeenCalledWith(
+        expect.objectContaining({
+          chatGuid: "iMessage;-;+15550001111",
+        }),
+      );
+    });
+
+    it("resolves short messageId before reacting", async () => {
+      const { resolveBlueBubblesMessageId } = await import("./monitor.js");
+      const { sendBlueBubblesReaction } = await import("./reactions.js");
+      vi.mocked(resolveBlueBubblesMessageId).mockReturnValueOnce("resolved-uuid");
+
+      const cfg: ClawdbotConfig = {
+        channels: {
+          bluebubbles: {
+            serverUrl: "http://localhost:1234",
+            password: "test-password",
+          },
+        },
+      };
+
+      await bluebubblesMessageActions.handleAction({
+        action: "react",
+        params: {
+          emoji: "❤️",
+          messageId: "1",
+          chatGuid: "iMessage;-;+15551234567",
+        },
+        cfg,
+        accountId: null,
+      });
+
+      expect(resolveBlueBubblesMessageId).toHaveBeenCalledWith("1", { requireKnownShortId: true });
+      expect(sendBlueBubblesReaction).toHaveBeenCalledWith(
+        expect.objectContaining({
+          messageGuid: "resolved-uuid",
+        }),
+      );
+    });
+
+    it("propagates short-id errors from the resolver", async () => {
+      const { resolveBlueBubblesMessageId } = await import("./monitor.js");
+      vi.mocked(resolveBlueBubblesMessageId).mockImplementationOnce(() => {
+        throw new Error("short id expired");
+      });
+
+      const cfg: ClawdbotConfig = {
+        channels: {
+          bluebubbles: {
+            serverUrl: "http://localhost:1234",
+            password: "test-password",
+          },
+        },
+      };
+
+      await expect(
+        bluebubblesMessageActions.handleAction({
+          action: "react",
+          params: {
+            emoji: "❤️",
+            messageId: "999",
+            chatGuid: "iMessage;-;+15551234567",
+          },
+          cfg,
+          accountId: null,
+        }),
+      ).rejects.toThrow("short id expired");
+    });
+
     it("accepts message param for edit action", async () => {
       const { editBlueBubblesMessage } = await import("./chat.js");
 
diff --git a/extensions/bluebubbles/src/actions.ts b/extensions/bluebubbles/src/actions.ts
index 3630f91fa..8097add2c 100644
--- a/extensions/bluebubbles/src/actions.ts
+++ b/extensions/bluebubbles/src/actions.ts
@@ -143,7 +143,7 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
         );
       }
       // Resolve short ID (e.g., "1", "2") to full UUID
-      const messageId = resolveBlueBubblesMessageId(rawMessageId);
+      const messageId = resolveBlueBubblesMessageId(rawMessageId, { requireKnownShortId: true });
       const partIndex = readNumberParam(params, "partIndex", { integer: true });
       const resolvedChatGuid = await resolveChatGuid();
 
@@ -183,7 +183,7 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
         );
       }
       // Resolve short ID (e.g., "1", "2") to full UUID
-      const messageId = resolveBlueBubblesMessageId(rawMessageId);
+      const messageId = resolveBlueBubblesMessageId(rawMessageId, { requireKnownShortId: true });
       const partIndex = readNumberParam(params, "partIndex", { integer: true });
       const backwardsCompatMessage = readStringParam(params, "backwardsCompatMessage");
 
@@ -206,7 +206,7 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
         );
       }
       // Resolve short ID (e.g., "1", "2") to full UUID
-      const messageId = resolveBlueBubblesMessageId(rawMessageId);
+      const messageId = resolveBlueBubblesMessageId(rawMessageId, { requireKnownShortId: true });
       const partIndex = readNumberParam(params, "partIndex", { integer: true });
 
       await unsendBlueBubblesMessage(messageId, {
@@ -233,7 +233,7 @@ export const bluebubblesMessageActions: ChannelMessageActionAdapter = {
         );
       }
       // Resolve short ID (e.g., "1", "2") to full UUID
-      const messageId = resolveBlueBubblesMessageId(rawMessageId);
+      const messageId = resolveBlueBubblesMessageId(rawMessageId, { requireKnownShortId: true });
       const partIndex = readNumberParam(params, "partIndex", { integer: true });
 
       const result = await sendMessageBlueBubbles(to, text, {
diff --git a/extensions/bluebubbles/src/channel.ts b/extensions/bluebubbles/src/channel.ts
index f316b499f..5fcb75794 100644
--- a/extensions/bluebubbles/src/channel.ts
+++ b/extensions/bluebubbles/src/channel.ts
@@ -240,7 +240,9 @@ export const bluebubblesPlugin: ChannelPlugin<ResolvedBlueBubblesAccount> = {
     sendText: async ({ cfg, to, text, accountId, replyToId }) => {
       const rawReplyToId = typeof replyToId === "string" ? replyToId.trim() : "";
       // Resolve short ID (e.g., "5") to full UUID
-      const replyToMessageGuid = rawReplyToId ? resolveBlueBubblesMessageId(rawReplyToId) : "";
+      const replyToMessageGuid = rawReplyToId
+        ? resolveBlueBubblesMessageId(rawReplyToId, { requireKnownShortId: true })
+        : "";
       const result = await sendMessageBlueBubbles(to, text, {
         cfg: cfg as ClawdbotConfig,
         accountId: accountId ?? undefined,
diff --git a/extensions/bluebubbles/src/media-send.ts b/extensions/bluebubbles/src/media-send.ts
index 5fc9895e3..5fc2225cc 100644
--- a/extensions/bluebubbles/src/media-send.ts
+++ b/extensions/bluebubbles/src/media-send.ts
@@ -137,7 +137,7 @@ export async function sendBlueBubblesMedia(params: {
 
   // Resolve short ID (e.g., "5") to full UUID
   const replyToMessageGuid = replyToId?.trim()
-    ? resolveBlueBubblesMessageId(replyToId.trim())
+    ? resolveBlueBubblesMessageId(replyToId.trim(), { requireKnownShortId: true })
     : undefined;
 
   const attachmentResult = await sendBlueBubblesAttachment({
diff --git a/extensions/bluebubbles/src/monitor.test.ts b/extensions/bluebubbles/src/monitor.test.ts
index 2806bf82f..ee9b15084 100644
--- a/extensions/bluebubbles/src/monitor.test.ts
+++ b/extensions/bluebubbles/src/monitor.test.ts
@@ -1860,6 +1860,12 @@ describe("BlueBubbles webhook monitor", () => {
     it("returns short ID unchanged when numeric but not in cache", () => {
       expect(resolveBlueBubblesMessageId("999")).toBe("999");
     });
+
+    it("throws when numeric short ID is missing and requireKnownShortId is set", () => {
+      expect(() =>
+        resolveBlueBubblesMessageId("999", { requireKnownShortId: true }),
+      ).toThrow(/short message id/i);
+    });
   });
 
   describe("fromMe messages", () => {
diff --git a/extensions/bluebubbles/src/monitor.ts b/extensions/bluebubbles/src/monitor.ts
index 3e89f88fa..f55383068 100644
--- a/extensions/bluebubbles/src/monitor.ts
+++ b/extensions/bluebubbles/src/monitor.ts
@@ -119,7 +119,10 @@ function rememberBlueBubblesReplyCache(
  * Resolves a short message ID (e.g., "1", "2") to a full BlueBubbles UUID.
  * Returns the input unchanged if it's already a UUID or not found in the mapping.
  */
-export function resolveBlueBubblesMessageId(shortOrUuid: string): string {
+export function resolveBlueBubblesMessageId(
+  shortOrUuid: string,
+  opts?: { requireKnownShortId?: boolean },
+): string {
   const trimmed = shortOrUuid.trim();
   if (!trimmed) return trimmed;
 
@@ -127,6 +130,11 @@ export function resolveBlueBubblesMessageId(shortOrUuid: string): string {
   if (/^\d+$/.test(trimmed)) {
     const uuid = blueBubblesShortIdToUuid.get(trimmed);
     if (uuid) return uuid;
+    if (opts?.requireKnownShortId) {
+      throw new Error(
+        `BlueBubbles short message id "${trimmed}" is no longer available. Use MessageSidFull.`,
+      );
+    }
   }
 
   // Return as-is (either already a UUID or not found)
@@ -1646,7 +1654,7 @@ async function processMessage(
           const rawReplyToId = typeof payload.replyToId === "string" ? payload.replyToId.trim() : "";
           // Resolve short ID (e.g., "5") to full UUID
           const replyToMessageGuid = rawReplyToId
-            ? resolveBlueBubblesMessageId(rawReplyToId)
+            ? resolveBlueBubblesMessageId(rawReplyToId, { requireKnownShortId: true })
             : "";
           const mediaList = payload.mediaUrls?.length
             ? payload.mediaUrls
diff --git a/src/cli/node-cli/register.ts b/src/cli/node-cli/register.ts
index 9a7412111..8712c6a44 100644
--- a/src/cli/node-cli/register.ts
+++ b/src/cli/node-cli/register.ts
@@ -6,7 +6,6 @@ import { runNodeHost } from "../../node-host/runner.js";
 import {
   runNodeDaemonInstall,
   runNodeDaemonRestart,
-  runNodeDaemonStart,
   runNodeDaemonStatus,
   runNodeDaemonStop,
   runNodeDaemonUninstall,
diff --git a/src/infra/fetch.ts b/src/infra/fetch.ts
index 5cd0d94e6..6a472253b 100644
--- a/src/infra/fetch.ts
+++ b/src/infra/fetch.ts
@@ -1,5 +1,5 @@
 export function wrapFetchWithAbortSignal(fetchImpl: typeof fetch): typeof fetch {
-  return (input: RequestInfo | URL, init?: RequestInit) => {
+  const wrapped = ((input: RequestInfo | URL, init?: RequestInit) => {
     const signal = init?.signal;
     if (!signal) return fetchImpl(input, init);
     if (typeof AbortSignal !== "undefined" && signal instanceof AbortSignal) {
@@ -25,5 +25,6 @@ export function wrapFetchWithAbortSignal(fetchImpl: typeof fetch): typeof fetch
       });
     }
     return response;
-  };
+  }) as typeof fetch;
+  return Object.assign(wrapped, fetchImpl);
 }

From d0e8faea97799901cf13df240ac0c64558601703 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:09:51 +0000
Subject: [PATCH 020/171] docs: update changelog for bluebubbles follow-up
 (#1387)

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7474dfd2f..234797386 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,8 +18,8 @@ Docs: https://docs.clawd.bot
 - Configure: restrict the model allowlist picker to OAuth-compatible Anthropic models and preselect Opus 4.5.
 - Configure: seed model fallbacks from the allowlist selection when multiple models are chosen.
 - Model picker: list the full catalog when no model allowlist is configured.
-- BlueBubbles: resolve short message IDs safely and expose full IDs in templates. (#1369) Thanks @tyler6204.
-- Infra: preserve fetch helper methods when wrapping abort signals. (#1369)
+- BlueBubbles: resolve short message IDs safely and expose full IDs in templates. (#1387) Thanks @tyler6204.
+- Infra: preserve fetch helper methods when wrapping abort signals. (#1387)
 
 ## 2026.1.20
 

From 43afad9f51b3e714914cf953374d7e7ef2568156 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 16:54:54 +0000
Subject: [PATCH 021/171] fix: start instant typing at run start

---
 CHANGELOG.md                         | 1 +
 src/auto-reply/reply/agent-runner.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 234797386..056498694 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ Docs: https://docs.clawd.bot
 - Nodes tool: include agent/node/gateway context in tool failure logs to speed approval debugging.
 - macOS: exec approvals now respect wildcard agent allowlists (`*`).
 - UI: remove the chat stop button and keep the composer aligned to the bottom edge.
+- Typing: start instant typing indicators at run start so DMs and mentions show immediately.
 - Configure: restrict the model allowlist picker to OAuth-compatible Anthropic models and preselect Opus 4.5.
 - Configure: seed model fallbacks from the allowlist selection when multiple models are chosen.
 - Model picker: list the full catalog when no model allowlist is configured.
diff --git a/src/auto-reply/reply/agent-runner.ts b/src/auto-reply/reply/agent-runner.ts
index 1da6d3957..8b3f39851 100644
--- a/src/auto-reply/reply/agent-runner.ts
+++ b/src/auto-reply/reply/agent-runner.ts
@@ -196,6 +196,8 @@ export async function runReplyAgent(params: {
     return undefined;
   }
 
+  await typingSignals.signalRunStart();
+
   activeSessionEntry = await runMemoryFlushIfNeeded({
     cfg,
     followupRun,

From d2a0e416ea4eb6f649fa5d7b2d14bdcab89ca519 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:03:00 +0000
Subject: [PATCH 022/171] test: align NO_REPLY typing expectations

---
 ...eplyagent-typing-heartbeat.signals-typing-normal-runs.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/auto-reply/reply/agent-runner.heartbeat-typing.runreplyagent-typing-heartbeat.signals-typing-normal-runs.test.ts b/src/auto-reply/reply/agent-runner.heartbeat-typing.runreplyagent-typing-heartbeat.signals-typing-normal-runs.test.ts
index 4040c6dc5..31d3249bb 100644
--- a/src/auto-reply/reply/agent-runner.heartbeat-typing.runreplyagent-typing-heartbeat.signals-typing-normal-runs.test.ts
+++ b/src/auto-reply/reply/agent-runner.heartbeat-typing.runreplyagent-typing-heartbeat.signals-typing-normal-runs.test.ts
@@ -172,6 +172,7 @@ describe("runReplyAgent typing (heartbeat)", () => {
 
     const { run, typing } = createMinimalRun({
       opts: { isHeartbeat: false, onPartialReply },
+      typingMode: "message",
     });
     await run();
 

From 56799a21be721f7582f5b8c8eca14dfc8bb9de6d Mon Sep 17 00:00:00 2001
From: Ameno Osman <ameno.osman13@gmail.com>
Date: Wed, 21 Jan 2026 08:34:04 -0800
Subject: [PATCH 023/171] macOS: allow SSH agents without identity file

---
 apps/macos/Sources/Clawdbot/CommandResolver.swift  | 9 ++++++---
 apps/macos/Sources/Clawdbot/RemotePortTunnel.swift | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/CommandResolver.swift b/apps/macos/Sources/Clawdbot/CommandResolver.swift
index 117930710..7661c48f1 100644
--- a/apps/macos/Sources/Clawdbot/CommandResolver.swift
+++ b/apps/macos/Sources/Clawdbot/CommandResolver.swift
@@ -284,13 +284,16 @@ enum CommandResolver {
 
         var args: [String] = [
             "-o", "BatchMode=yes",
-            "-o", "IdentitiesOnly=yes",
             "-o", "StrictHostKeyChecking=accept-new",
             "-o", "UpdateHostKeys=yes",
         ]
         if parsed.port > 0 { args.append(contentsOf: ["-p", String(parsed.port)]) }
-        if !settings.identity.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
-            args.append(contentsOf: ["-i", settings.identity])
+        let identity = settings.identity.trimmingCharacters(in: .whitespacesAndNewlines)
+        if !identity.isEmpty {
+            // Only use IdentitiesOnly when an explicit identity file is provided.
+            // This allows 1Password SSH agent and other SSH agents to provide keys.
+            args.append(contentsOf: ["-o", "IdentitiesOnly=yes"])
+            args.append(contentsOf: ["-i", identity])
         }
         let userHost = parsed.user.map { "\($0)@\(parsed.host)" } ?? parsed.host
         args.append(userHost)
diff --git a/apps/macos/Sources/Clawdbot/RemotePortTunnel.swift b/apps/macos/Sources/Clawdbot/RemotePortTunnel.swift
index ccbeb6e8d..8eaee1c05 100644
--- a/apps/macos/Sources/Clawdbot/RemotePortTunnel.swift
+++ b/apps/macos/Sources/Clawdbot/RemotePortTunnel.swift
@@ -72,7 +72,6 @@ final class RemotePortTunnel {
         }
         var args: [String] = [
             "-o", "BatchMode=yes",
-            "-o", "IdentitiesOnly=yes",
             "-o", "ExitOnForwardFailure=yes",
             "-o", "StrictHostKeyChecking=accept-new",
             "-o", "UpdateHostKeys=yes",
@@ -84,7 +83,12 @@ final class RemotePortTunnel {
         ]
         if parsed.port > 0 { args.append(contentsOf: ["-p", String(parsed.port)]) }
         let identity = settings.identity.trimmingCharacters(in: .whitespacesAndNewlines)
-        if !identity.isEmpty { args.append(contentsOf: ["-i", identity]) }
+        if !identity.isEmpty {
+            // Only use IdentitiesOnly when an explicit identity file is provided.
+            // This allows 1Password SSH agent and other SSH agents to provide keys.
+            args.append(contentsOf: ["-o", "IdentitiesOnly=yes"])
+            args.append(contentsOf: ["-i", identity])
+        }
         let userHost = parsed.user.map { "\($0)@\(parsed.host)" } ?? parsed.host
         args.append(userHost)
 

From 8aca606a6f9199b360e6d88d4274343f77a54e26 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:19:38 +0000
Subject: [PATCH 024/171] docs: clarify bluebubbles message ids

---
 docs/channels/bluebubbles.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/channels/bluebubbles.md b/docs/channels/bluebubbles.md
index b566fc795..2336f3609 100644
--- a/docs/channels/bluebubbles.md
+++ b/docs/channels/bluebubbles.md
@@ -149,6 +149,19 @@ Available actions:
 - **leaveGroup**: Leave a group chat (`chatGuid`)
 - **sendAttachment**: Send media/files (`to`, `buffer`, `filename`)
 
+### Message IDs (short vs full)
+Clawdbot may surface *short* message IDs (e.g., `1`, `2`) to save tokens.
+- `MessageSid` / `ReplyToId` can be short IDs.
+- `MessageSidFull` / `ReplyToIdFull` contain the provider full IDs.
+- Short IDs are in-memory; they can expire on restart or cache eviction.
+- Actions accept short or full `messageId`, but short IDs will error if no longer available.
+
+Use full IDs for durable automations and storage:
+- Templates: `{{MessageSidFull}}`, `{{ReplyToIdFull}}`
+- Context: `MessageSidFull` / `ReplyToIdFull` in inbound payloads
+
+See [Configuration](/gateway/configuration) for template variables.
+
 ## Block streaming
 Control whether responses are sent as a single message or streamed in blocks:
 ```json5

From 4e1806947d2a181d6a43828611ac69e3a6a01d18 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:29:39 +0000
Subject: [PATCH 025/171] fix: normalize abort signals for fetch

---
 docs/channels/telegram.md        |  4 ++++
 src/discord/api.ts               |  8 ++++++-
 src/discord/probe.ts             |  7 +++++-
 src/infra/fetch.ts               |  6 ++++++
 src/infra/provider-usage.load.ts |  6 +++++-
 src/signal/client.ts             | 14 ++++++++++--
 src/telegram/fetch.test.ts       | 37 ++++++++++++++++++++++++++++++++
 src/telegram/fetch.ts            |  8 +++----
 8 files changed, 81 insertions(+), 9 deletions(-)
 create mode 100644 src/telegram/fetch.test.ts

diff --git a/docs/channels/telegram.md b/docs/channels/telegram.md
index 3c894303e..da29b3c90 100644
--- a/docs/channels/telegram.md
+++ b/docs/channels/telegram.md
@@ -484,6 +484,10 @@ The agent sees reactions as **system notifications** in the conversation history
 - Make sure your Telegram user ID is authorized (via pairing or `channels.telegram.allowFrom`)
 - Commands require authorization even in groups with `groupPolicy: "open"`
 
+**Long-polling aborts immediately on Node 22+ (often with proxies/custom fetch):**
+- Node 22+ is stricter about `AbortSignal` instances; foreign signals can abort `fetch` calls right away.
+- Upgrade to a Clawdbot build that normalizes abort signals, or run the gateway on Node 20 until you can upgrade.
+
 **Bot starts, then silently stops responding (or logs `HttpError: Network request ... failed`):**
 - Some hosts resolve `api.telegram.org` to IPv6 first. If your server does not have working IPv6 egress, grammY can get stuck on IPv6-only requests.
 - Fix by enabling IPv6 egress **or** forcing IPv4 resolution for `api.telegram.org` (for example, add an `/etc/hosts` entry using the IPv4 A record, or prefer IPv4 in your OS DNS stack), then restart the gateway.
diff --git a/src/discord/api.ts b/src/discord/api.ts
index 6be8b4a0b..de72c8ba1 100644
--- a/src/discord/api.ts
+++ b/src/discord/api.ts
@@ -1,3 +1,5 @@
+import { resolveFetch } from "../infra/fetch.js";
+
 const DISCORD_API_BASE = "https://discord.com/api/v10";
 
 type DiscordApiErrorPayload = {
@@ -48,7 +50,11 @@ export async function fetchDiscord<T>(
   token: string,
   fetcher: typeof fetch = fetch,
 ): Promise<T> {
-  const res = await fetcher(`${DISCORD_API_BASE}${path}`, {
+  const fetchImpl = resolveFetch(fetcher);
+  if (!fetchImpl) {
+    throw new Error("fetch is not available");
+  }
+  const res = await fetchImpl(`${DISCORD_API_BASE}${path}`, {
     headers: { Authorization: `Bot ${token}` },
   });
   if (!res.ok) {
diff --git a/src/discord/probe.ts b/src/discord/probe.ts
index 21c6d1922..78175c3b9 100644
--- a/src/discord/probe.ts
+++ b/src/discord/probe.ts
@@ -1,3 +1,4 @@
+import { resolveFetch } from "../infra/fetch.js";
 import { normalizeDiscordToken } from "./token.js";
 
 const DISCORD_API_BASE = "https://discord.com/api/v10";
@@ -90,10 +91,14 @@ async function fetchWithTimeout(
   fetcher: typeof fetch,
   headers?: HeadersInit,
 ): Promise<Response> {
+  const fetchImpl = resolveFetch(fetcher);
+  if (!fetchImpl) {
+    throw new Error("fetch is not available");
+  }
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
   try {
-    return await fetcher(url, { signal: controller.signal, headers });
+    return await fetchImpl(url, { signal: controller.signal, headers });
   } finally {
     clearTimeout(timer);
   }
diff --git a/src/infra/fetch.ts b/src/infra/fetch.ts
index 6a472253b..70ab6f614 100644
--- a/src/infra/fetch.ts
+++ b/src/infra/fetch.ts
@@ -28,3 +28,9 @@ export function wrapFetchWithAbortSignal(fetchImpl: typeof fetch): typeof fetch
   }) as typeof fetch;
   return Object.assign(wrapped, fetchImpl);
 }
+
+export function resolveFetch(fetchImpl?: typeof fetch): typeof fetch | undefined {
+  const resolved = fetchImpl ?? globalThis.fetch;
+  if (!resolved) return undefined;
+  return wrapFetchWithAbortSignal(resolved);
+}
diff --git a/src/infra/provider-usage.load.ts b/src/infra/provider-usage.load.ts
index 7fdf8de3e..676ac9920 100644
--- a/src/infra/provider-usage.load.ts
+++ b/src/infra/provider-usage.load.ts
@@ -19,6 +19,7 @@ import type {
   UsageProviderId,
   UsageSummary,
 } from "./provider-usage.types.js";
+import { resolveFetch } from "./fetch.js";
 
 type UsageSummaryOptions = {
   now?: number;
@@ -34,7 +35,10 @@ export async function loadProviderUsageSummary(
 ): Promise<UsageSummary> {
   const now = opts.now ?? Date.now();
   const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-  const fetchFn = opts.fetch ?? fetch;
+  const fetchFn = resolveFetch(opts.fetch);
+  if (!fetchFn) {
+    throw new Error("fetch is not available");
+  }
 
   const auths = await resolveProviderAuths({
     providers: opts.providers ?? usageProviders,
diff --git a/src/signal/client.ts b/src/signal/client.ts
index 925cc0c63..5595edb5b 100644
--- a/src/signal/client.ts
+++ b/src/signal/client.ts
@@ -1,5 +1,7 @@
 import { randomUUID } from "node:crypto";
 
+import { resolveFetch } from "../infra/fetch.js";
+
 export type SignalRpcOptions = {
   baseUrl: string;
   timeoutMs?: number;
@@ -36,10 +38,14 @@ function normalizeBaseUrl(url: string): string {
 }
 
 async function fetchWithTimeout(url: string, init: RequestInit, timeoutMs: number) {
+  const fetchImpl = resolveFetch();
+  if (!fetchImpl) {
+    throw new Error("fetch is not available");
+  }
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
   try {
-    return await fetch(url, { ...init, signal: controller.signal });
+    return await fetchImpl(url, { ...init, signal: controller.signal });
   } finally {
     clearTimeout(timer);
   }
@@ -113,7 +119,11 @@ export async function streamSignalEvents(params: {
   const url = new URL(`${baseUrl}/api/v1/events`);
   if (params.account) url.searchParams.set("account", params.account);
 
-  const res = await fetch(url, {
+  const fetchImpl = resolveFetch();
+  if (!fetchImpl) {
+    throw new Error("fetch is not available");
+  }
+  const res = await fetchImpl(url, {
     method: "GET",
     headers: { Accept: "text/event-stream" },
     signal: params.abortSignal,
diff --git a/src/telegram/fetch.test.ts b/src/telegram/fetch.test.ts
new file mode 100644
index 000000000..f1a2353c2
--- /dev/null
+++ b/src/telegram/fetch.test.ts
@@ -0,0 +1,37 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { resolveTelegramFetch } from "./fetch.js";
+
+describe("resolveTelegramFetch", () => {
+  it("wraps proxy fetch to normalize foreign abort signals", async () => {
+    let seenSignal: AbortSignal | undefined;
+    const proxyFetch = vi.fn(async (_input: RequestInfo | URL, init?: RequestInit) => {
+      seenSignal = init?.signal as AbortSignal | undefined;
+      return {} as Response;
+    });
+
+    const fetcher = resolveTelegramFetch(proxyFetch);
+    expect(fetcher).toBeTypeOf("function");
+
+    let abortHandler: (() => void) | null = null;
+    const fakeSignal = {
+      aborted: false,
+      addEventListener: (event: string, handler: () => void) => {
+        if (event === "abort") abortHandler = handler;
+      },
+      removeEventListener: (event: string, handler: () => void) => {
+        if (event === "abort" && abortHandler === handler) abortHandler = null;
+      },
+    } as AbortSignal;
+
+    const promise = fetcher!("https://example.com", { signal: fakeSignal });
+    expect(proxyFetch).toHaveBeenCalledOnce();
+    expect(seenSignal).toBeInstanceOf(AbortSignal);
+    expect(seenSignal).not.toBe(fakeSignal);
+
+    abortHandler?.();
+    expect(seenSignal?.aborted).toBe(true);
+
+    await promise;
+  });
+});
diff --git a/src/telegram/fetch.ts b/src/telegram/fetch.ts
index 1c4a288d0..ee1c6780c 100644
--- a/src/telegram/fetch.ts
+++ b/src/telegram/fetch.ts
@@ -1,13 +1,13 @@
-import { wrapFetchWithAbortSignal } from "../infra/fetch.js";
+import { resolveFetch } from "../infra/fetch.js";
 
 // Bun-only: force native fetch to avoid grammY's Node shim under Bun.
 export function resolveTelegramFetch(proxyFetch?: typeof fetch): typeof fetch | undefined {
-  if (proxyFetch) return wrapFetchWithAbortSignal(proxyFetch);
-  const fetchImpl = globalThis.fetch;
+  if (proxyFetch) return resolveFetch(proxyFetch);
   const isBun = "Bun" in globalThis || Boolean(process?.versions?.bun);
   if (!isBun) return undefined;
+  const fetchImpl = resolveFetch();
   if (!fetchImpl) {
     throw new Error("fetch is not available; set channels.telegram.proxy in config");
   }
-  return wrapFetchWithAbortSignal(fetchImpl);
+  return fetchImpl;
 }

From fd918bf6bf6ecaf8c09c488969ec39e4402551b9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:32:00 +0000
Subject: [PATCH 026/171] fix: allow SSH agent auth without identity file
 (#1384) (thanks @ameno-)

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 056498694..be5093e3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Docs: https://docs.clawd.bot
 ### Fixes
 - Nodes tool: include agent/node/gateway context in tool failure logs to speed approval debugging.
 - macOS: exec approvals now respect wildcard agent allowlists (`*`).
+- macOS: allow SSH agent auth when no identity file is set. (#1384) Thanks @ameno-.
 - UI: remove the chat stop button and keep the composer aligned to the bottom edge.
 - Typing: start instant typing indicators at run start so DMs and mentions show immediately.
 - Configure: restrict the model allowlist picker to OAuth-compatible Anthropic models and preselect Opus 4.5.

From 6f58d508b8025d6eac4c274c5b70db1998f40294 Mon Sep 17 00:00:00 2001
From: Shadow <shadow@clawd.bot>
Date: Wed, 21 Jan 2026 11:36:56 -0600
Subject: [PATCH 027/171] chore: update carbon to v0.14.0

---
 package.json   |  2 +-
 pnpm-lock.yaml | 75 ++++++++++++++++----------------------------------
 2 files changed, 25 insertions(+), 52 deletions(-)

diff --git a/package.json b/package.json
index 760e951bc..cdea28b6f 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
   "packageManager": "pnpm@10.23.0",
   "dependencies": {
     "@agentclientprotocol/sdk": "0.13.0",
-    "@buape/carbon": "0.0.0-beta-20260110172854",
+    "@buape/carbon": "0.14.0",
     "@clack/prompts": "^0.11.0",
     "@grammyjs/runner": "^2.0.3",
     "@grammyjs/transformer-throttler": "^1.2.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c0830488b..c6ab92034 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,8 +22,8 @@ importers:
         specifier: 0.13.0
         version: 0.13.0(zod@4.3.5)
       '@buape/carbon':
-        specifier: 0.0.0-beta-20260110172854
-        version: 0.0.0-beta-20260110172854(hono@4.11.4)
+        specifier: 0.14.0
+        version: 0.14.0(hono@4.11.4)
       '@clack/prompts':
         specifier: ^0.11.0
         version: 0.11.0
@@ -647,8 +647,8 @@ packages:
   '@borewit/text-codec@0.2.1':
     resolution: {integrity: sha512-k7vvKPbf7J2fZ5klGRD9AeKfUvojuZIQ3BT5u7Jfv+puwXkUBUT5PVyMDfJZpy30CBDXGMgw7fguK/lpOMBvgw==}
 
-  '@buape/carbon@0.0.0-beta-20260110172854':
-    resolution: {integrity: sha512-hYUr5Glz+oDEQbl58r6AExqM4yObZCjB8JwXit7chn0LIkb5WDFP4Rj1taP3OP+PgwB7GHOVSbnCnBPBzUxpRw==}
+  '@buape/carbon@0.14.0':
+    resolution: {integrity: sha512-mavllPK2iVpRNRtC4C8JOUdJ1hdV0+LDelFW+pjpJaM31MBLMfIJ+f/LlYTIK5QrEcQsXOC+6lU2e0gmgjWhIQ==}
 
   '@cacheable/memory@2.0.7':
     resolution: {integrity: sha512-RbxnxAMf89Tp1dLhXMS7ceft/PGsDl1Ip7T20z5nZ+pwIAsQ1p2izPjVG69oCLv/jfQ7HDPHTWK0c9rcAWXN3A==}
@@ -666,8 +666,8 @@ packages:
   '@clack/prompts@0.11.0':
     resolution: {integrity: sha512-pMN5FcrEw9hUkZA4f+zLlzivQSeQf5dRGJjSUbvVYDLvpKCdQx5OaknvKzgbtXOizhP+SJJJjqEbOe55uKKfAw==}
 
-  '@cloudflare/workers-types@4.20251205.0':
-    resolution: {integrity: sha512-7pup7fYkuQW5XD8RUS/vkxF9SXlrGyCXuZ4ro3uVQvca/GTeSa+8bZ8T4wbq1Aea5lmLIGSlKbhl2msME7bRBA==}
+  '@cloudflare/workers-types@4.20260120.0':
+    resolution: {integrity: sha512-B8pueG+a5S+mdK3z8oKu1ShcxloZ7qWb68IEyLLaepvdryIbNC7JVPcY0bWsjS56UQVKc5fnyRge3yZIwc9bxw==}
 
   '@discordjs/voice@0.19.0':
     resolution: {integrity: sha512-UyX6rGEXzVyPzb1yvjHtPfTlnLvB5jX/stAMdiytHhfoydX+98hfympdOwsnTktzr+IRvphxTbdErgYDJkEsvw==}
@@ -887,8 +887,8 @@ packages:
     resolution: {integrity: sha512-qK6ZgGx0wwOubq/MY6eTbhApQHBUQCvCOsTYpQE01uLvfA2/Prm6egySHlZouKaina1RPuDwfLhCmsRCxwHj3Q==}
     hasBin: true
 
-  '@hono/node-server@1.19.6':
-    resolution: {integrity: sha512-Shz/KjlIeAhfiuE93NDKVdZ7HdBVLQAfdbaXEaoAVO3ic9ibRSLGIQGkcBbFyuLr+7/1D5ZCINM8B+6IvXeMtw==}
+  '@hono/node-server@1.19.9':
+    resolution: {integrity: sha512-vHL6w3ecZsky+8P5MD+eFfaGTyCeOHUIFYMGpQGbrBTSmNNoxv0if69rEZ5giu36weC5saFuznL411gRX7bJDw==}
     engines: {node: '>=18.14.1'}
     peerDependencies:
       hono: 4.11.4
@@ -2425,8 +2425,8 @@ packages:
   '@types/body-parser@1.19.6':
     resolution: {integrity: sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==}
 
-  '@types/bun@1.3.3':
-    resolution: {integrity: sha512-ogrKbJ2X5N0kWLLFKeytG0eHDleBYtngtlbu9cyBKFtNL3cnpDZkNdQj8flVf6WTZUX5ulI9AY1oa7ljhSrp+g==}
+  '@types/bun@1.3.6':
+    resolution: {integrity: sha512-uWCv6FO/8LcpREhenN1d1b6fcspAB+cefwD7uti8C8VffIv0Um08TKMn98FynpTiU38+y2dUO55T11NgDt8VAA==}
 
   '@types/chai@5.2.3':
     resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
@@ -2491,9 +2491,6 @@ packages:
   '@types/node@20.19.30':
     resolution: {integrity: sha512-WJtwWJu7UdlvzEAUm484QNg5eAoq5QR08KDNx7g45Usrs2NtOPiX8ugDqmKdXkyL03rBqU5dYNYVQetEpBHq2g==}
 
-  '@types/node@24.10.9':
-    resolution: {integrity: sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==}
-
   '@types/node@25.0.9':
     resolution: {integrity: sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==}
 
@@ -2878,8 +2875,8 @@ packages:
   buffer@6.0.3:
     resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
 
-  bun-types@1.3.3:
-    resolution: {integrity: sha512-z3Xwlg7j2l9JY27x5Qn3Wlyos8YAp0kKRlrePAOjgjMGS5IG6E7Jnlx736vH9UVI4wUICwwhC9anYL++XeOgTQ==}
+  bun-types@1.3.6:
+    resolution: {integrity: sha512-OlFwHcnNV99r//9v5IIOgQ9Uk37gZqrNMCcqEaExdkVq3Avwqok1bJFmvGMCkCE0FqzdY8VMOZpfpR3lwI+CsQ==}
 
   bytes@3.1.2:
     resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
@@ -3130,9 +3127,6 @@ packages:
     resolution: {integrity: sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==}
     engines: {node: '>=0.3.1'}
 
-  discord-api-types@0.38.36:
-    resolution: {integrity: sha512-qrbUbjjwtyeBg5HsAlm1C859epfOyiLjPqAOzkdWlCNsZCWJrertnETF/NwM8H+waMFU58xGSc5eXUfXah+WTQ==}
-
   discord-api-types@0.38.37:
     resolution: {integrity: sha512-Cv47jzY1jkGkh5sv0bfHYqGgKOWO1peOrGMkDFM4UmaGMOTgOW8QSexhvixa9sVOiz8MnVOBryWYyw/CEVhj7w==}
 
@@ -5229,18 +5223,6 @@ packages:
   wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  ws@8.18.3:
-    resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: '>=5.0.2'
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-
   ws@8.19.0:
     resolution: {integrity: sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==}
     engines: {node: '>=10.0.0'}
@@ -5777,17 +5759,17 @@ snapshots:
 
   '@borewit/text-codec@0.2.1': {}
 
-  '@buape/carbon@0.0.0-beta-20260110172854(hono@4.11.4)':
+  '@buape/carbon@0.14.0(hono@4.11.4)':
     dependencies:
-      '@types/node': 24.10.9
-      discord-api-types: 0.38.36
+      '@types/node': 25.0.9
+      discord-api-types: 0.38.37
     optionalDependencies:
-      '@cloudflare/workers-types': 4.20251205.0
+      '@cloudflare/workers-types': 4.20260120.0
       '@discordjs/voice': 0.19.0
-      '@hono/node-server': 1.19.6(hono@4.11.4)
-      '@types/bun': 1.3.3
+      '@hono/node-server': 1.19.9(hono@4.11.4)
+      '@types/bun': 1.3.6
       '@types/ws': 8.18.1
-      ws: 8.18.3
+      ws: 8.19.0
     transitivePeerDependencies:
       - '@discordjs/opus'
       - bufferutil
@@ -5826,7 +5808,7 @@ snapshots:
       picocolors: 1.1.1
       sisteransi: 1.0.5
 
-  '@cloudflare/workers-types@4.20251205.0':
+  '@cloudflare/workers-types@4.20260120.0':
     optional: true
 
   '@discordjs/voice@0.19.0':
@@ -5992,7 +5974,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@hono/node-server@1.19.6(hono@4.11.4)':
+  '@hono/node-server@1.19.9(hono@4.11.4)':
     dependencies:
       hono: 4.11.4
     optional: true
@@ -7613,9 +7595,9 @@ snapshots:
       '@types/connect': 3.4.38
       '@types/node': 25.0.9
 
-  '@types/bun@1.3.3':
+  '@types/bun@1.3.6':
     dependencies:
-      bun-types: 1.3.3
+      bun-types: 1.3.6
     optional: true
 
   '@types/chai@5.2.3':
@@ -7692,10 +7674,6 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
-  '@types/node@24.10.9':
-    dependencies:
-      undici-types: 7.16.0
-
   '@types/node@25.0.9':
     dependencies:
       undici-types: 7.16.0
@@ -8151,7 +8129,7 @@ snapshots:
       base64-js: 1.5.1
       ieee754: 1.2.1
 
-  bun-types@1.3.3:
+  bun-types@1.3.6:
     dependencies:
       '@types/node': 25.0.9
     optional: true
@@ -8398,8 +8376,6 @@ snapshots:
 
   diff@8.0.3: {}
 
-  discord-api-types@0.38.36: {}
-
   discord-api-types@0.38.37: {}
 
   docx-preview@0.3.7:
@@ -10787,9 +10763,6 @@ snapshots:
 
   wrappy@1.0.2: {}
 
-  ws@8.18.3:
-    optional: true
-
   ws@8.19.0: {}
 
   y18n@5.0.8: {}

From 9e22f019db0c4a7952e808a53d95f3d394d40c61 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:45:06 +0000
Subject: [PATCH 028/171] feat: fold gateway service commands into gateway

---
 src/agents/system-prompt.test.ts              |  2 +-
 src/agents/system-prompt.ts                   | 10 +--
 src/cli/daemon-cli/install.ts                 |  4 +-
 src/cli/daemon-cli/lifecycle.ts               |  4 +-
 src/cli/daemon-cli/register.ts                |  6 +-
 src/cli/daemon-cli/shared.ts                  |  4 +-
 src/cli/daemon-cli/status.print.ts            | 12 +--
 src/cli/daemon-cli/status.ts                  |  2 +-
 src/cli/gateway-cli.coverage.test.ts          |  6 +-
 src/cli/gateway-cli/register.ts               | 78 +++++++++++++++++--
 src/cli/gateway-cli/run.ts                    |  2 +-
 src/cli/gateway-cli/shared.ts                 |  8 +-
 src/cli/program/config-guard.ts               | 22 +++++-
 src/cli/program/register.subclis.ts           |  8 --
 src/cli/update-cli.ts                         | 16 ++--
 src/commands/configure.daemon.ts              | 26 +++----
 src/commands/configure.wizard.ts              |  4 +-
 src/commands/daemon-install-helpers.test.ts   |  2 +-
 src/commands/daemon-install-helpers.ts        |  4 +-
 src/commands/doctor-format.ts                 |  4 +-
 src/commands/doctor-gateway-daemon-flow.ts    | 14 ++--
 src/commands/doctor-gateway-services.ts       |  4 +-
 .../local/daemon-install.ts                   |  4 +-
 src/commands/status.command.ts                |  2 +-
 src/commands/uninstall.ts                     |  2 +-
 src/daemon/systemd-hints.ts                   |  2 +-
 src/infra/ports-format.ts                     |  2 +-
 27 files changed, 166 insertions(+), 88 deletions(-)

diff --git a/src/agents/system-prompt.test.ts b/src/agents/system-prompt.test.ts
index c9b225830..fce27677a 100644
--- a/src/agents/system-prompt.test.ts
+++ b/src/agents/system-prompt.test.ts
@@ -66,7 +66,7 @@ describe("buildAgentSystemPrompt", () => {
     });
 
     expect(prompt).toContain("## Clawdbot CLI Quick Reference");
-    expect(prompt).toContain("clawdbot daemon restart");
+    expect(prompt).toContain("clawdbot gateway restart");
     expect(prompt).toContain("Do not invent commands");
   });
 
diff --git a/src/agents/system-prompt.ts b/src/agents/system-prompt.ts
index cb63eb7ec..889ae84f4 100644
--- a/src/agents/system-prompt.ts
+++ b/src/agents/system-prompt.ts
@@ -365,11 +365,11 @@ export function buildAgentSystemPrompt(params: {
     "## Clawdbot CLI Quick Reference",
     "Clawdbot is controlled via subcommands. Do not invent commands.",
     "To manage the Gateway daemon service (start/stop/restart):",
-    "- clawdbot daemon status",
-    "- clawdbot daemon start",
-    "- clawdbot daemon stop",
-    "- clawdbot daemon restart",
-    "If unsure, ask the user to run `clawdbot help` (or `clawdbot daemon --help`) and paste the output.",
+    "- clawdbot gateway status",
+    "- clawdbot gateway start",
+    "- clawdbot gateway stop",
+    "- clawdbot gateway restart",
+    "If unsure, ask the user to run `clawdbot help` (or `clawdbot gateway --help`) and paste the output.",
     "",
     ...skillsSection,
     ...memorySection,
diff --git a/src/cli/daemon-cli/install.ts b/src/cli/daemon-cli/install.ts
index cf852fd38..6f1998d5d 100644
--- a/src/cli/daemon-cli/install.ts
+++ b/src/cli/daemon-cli/install.ts
@@ -43,7 +43,7 @@ export async function runDaemonInstall(opts: DaemonInstallOptions) {
   };
 
   if (resolveIsNixMode(process.env)) {
-    fail("Nix mode detected; daemon install is disabled.");
+    fail("Nix mode detected; service install is disabled.");
     return;
   }
 
@@ -84,7 +84,7 @@ export async function runDaemonInstall(opts: DaemonInstallOptions) {
       if (!json) {
         defaultRuntime.log(`Gateway service already ${service.loadedText}.`);
         defaultRuntime.log(
-          `Reinstall with: ${formatCliCommand("clawdbot daemon install --force")}`,
+          `Reinstall with: ${formatCliCommand("clawdbot gateway install --force")}`,
         );
       }
       return;
diff --git a/src/cli/daemon-cli/lifecycle.ts b/src/cli/daemon-cli/lifecycle.ts
index 0ad05f9f7..d5008c2d0 100644
--- a/src/cli/daemon-cli/lifecycle.ts
+++ b/src/cli/daemon-cli/lifecycle.ts
@@ -33,7 +33,7 @@ export async function runDaemonUninstall(opts: DaemonLifecycleOptions = {}) {
   };
 
   if (resolveIsNixMode(process.env)) {
-    fail("Nix mode detected; daemon uninstall is disabled.");
+    fail("Nix mode detected; service uninstall is disabled.");
     return;
   }
 
@@ -200,7 +200,7 @@ export async function runDaemonStop(opts: DaemonLifecycleOptions = {}) {
 }
 
 /**
- * Restart the gateway daemon service.
+ * Restart the gateway service service.
  * @returns `true` if restart succeeded, `false` if the service was not loaded.
  * Throws/exits on check or restart failures.
  */
diff --git a/src/cli/daemon-cli/register.ts b/src/cli/daemon-cli/register.ts
index ed37dc841..92b47690d 100644
--- a/src/cli/daemon-cli/register.ts
+++ b/src/cli/daemon-cli/register.ts
@@ -14,16 +14,16 @@ import {
 export function registerDaemonCli(program: Command) {
   const daemon = program
     .command("daemon")
-    .description("Manage the Gateway daemon service (launchd/systemd/schtasks)")
+    .description("Manage the Gateway service (launchd/systemd/schtasks)")
     .addHelpText(
       "after",
       () =>
-        `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/daemon", "docs.clawd.bot/cli/daemon")}\n`,
+        `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/gateway", "docs.clawd.bot/cli/gateway")}\n`,
     );
 
   daemon
     .command("status")
-    .description("Show daemon install status + probe the Gateway")
+    .description("Show service install status + probe the Gateway")
     .option("--url <url>", "Gateway WebSocket URL (defaults to config/remote/local)")
     .option("--token <token>", "Gateway token (if required)")
     .option("--password <password>", "Gateway password (password auth)")
diff --git a/src/cli/daemon-cli/shared.ts b/src/cli/daemon-cli/shared.ts
index 807cf687a..7be597ac5 100644
--- a/src/cli/daemon-cli/shared.ts
+++ b/src/cli/daemon-cli/shared.ts
@@ -123,7 +123,7 @@ export function renderRuntimeHints(
     }
   })();
   if (runtime.missingUnit) {
-    hints.push(`Service not installed. Run: ${formatCliCommand("clawdbot daemon install", env)}`);
+    hints.push(`Service not installed. Run: ${formatCliCommand("clawdbot gateway install", env)}`);
     if (fileLog) hints.push(`File logs: ${fileLog}`);
     return hints;
   }
@@ -146,7 +146,7 @@ export function renderRuntimeHints(
 
 export function renderGatewayServiceStartHints(env: NodeJS.ProcessEnv = process.env): string[] {
   const base = [
-    formatCliCommand("clawdbot daemon install", env),
+    formatCliCommand("clawdbot gateway install", env),
     formatCliCommand("clawdbot gateway", env),
   ];
   const profile = env.CLAWDBOT_PROFILE;
diff --git a/src/cli/daemon-cli/status.print.ts b/src/cli/daemon-cli/status.print.ts
index b4e879666..eb7f9f500 100644
--- a/src/cli/daemon-cli/status.print.ts
+++ b/src/cli/daemon-cli/status.print.ts
@@ -60,7 +60,7 @@ export function printDaemonStatus(status: DaemonStatus, opts: { json: boolean })
   }
   const daemonEnvLines = safeDaemonEnv(service.command?.environment);
   if (daemonEnvLines.length > 0) {
-    defaultRuntime.log(`${label("Daemon env:")} ${daemonEnvLines.join(" ")}`);
+    defaultRuntime.log(`${label("Service env:")} ${daemonEnvLines.join(" ")}`);
   }
   spacer();
 
@@ -89,11 +89,11 @@ export function printDaemonStatus(status: DaemonStatus, opts: { json: boolean })
     }
     if (status.config.daemon) {
       const daemonCfg = `${status.config.daemon.path}${status.config.daemon.exists ? "" : " (missing)"}${status.config.daemon.valid ? "" : " (invalid)"}`;
-      defaultRuntime.log(`${label("Config (daemon):")} ${infoText(daemonCfg)}`);
+      defaultRuntime.log(`${label("Config (service):")} ${infoText(daemonCfg)}`);
       if (!status.config.daemon.valid && status.config.daemon.issues?.length) {
         for (const issue of status.config.daemon.issues.slice(0, 5)) {
           defaultRuntime.error(
-            `${errorText("Daemon config issue:")} ${issue.path || "<root>"}: ${issue.message}`,
+            `${errorText("Service config issue:")} ${issue.path || "<root>"}: ${issue.message}`,
           );
         }
       }
@@ -101,12 +101,12 @@ export function printDaemonStatus(status: DaemonStatus, opts: { json: boolean })
     if (status.config.mismatch) {
       defaultRuntime.error(
         errorText(
-          "Root cause: CLI and daemon are using different config paths (likely a profile/state-dir mismatch).",
+          "Root cause: CLI and service are using different config paths (likely a profile/state-dir mismatch).",
         ),
       );
       defaultRuntime.error(
         errorText(
-          `Fix: rerun \`${formatCliCommand("clawdbot daemon install --force")}\` from the same --profile / CLAWDBOT_STATE_DIR you expect.`,
+          `Fix: rerun \`${formatCliCommand("clawdbot gateway install --force")}\` from the same --profile / CLAWDBOT_STATE_DIR you expect.`,
         ),
       );
     }
@@ -209,7 +209,7 @@ export function printDaemonStatus(status: DaemonStatus, opts: { json: boolean })
       ),
     );
     defaultRuntime.error(
-      errorText(`Then reinstall: ${formatCliCommand("clawdbot daemon install")}`),
+      errorText(`Then reinstall: ${formatCliCommand("clawdbot gateway install")}`),
     );
     spacer();
   }
diff --git a/src/cli/daemon-cli/status.ts b/src/cli/daemon-cli/status.ts
index 630369571..2af5a1977 100644
--- a/src/cli/daemon-cli/status.ts
+++ b/src/cli/daemon-cli/status.ts
@@ -14,7 +14,7 @@ export async function runDaemonStatus(opts: DaemonStatusOptions) {
     printDaemonStatus(status, { json: Boolean(opts.json) });
   } catch (err) {
     const rich = isRich();
-    defaultRuntime.error(colorize(rich, theme.error, `Daemon status failed: ${String(err)}`));
+    defaultRuntime.error(colorize(rich, theme.error, `Gateway status failed: ${String(err)}`));
     defaultRuntime.exit(1);
   }
 }
diff --git a/src/cli/gateway-cli.coverage.test.ts b/src/cli/gateway-cli.coverage.test.ts
index d6ea4a199..96437d566 100644
--- a/src/cli/gateway-cli.coverage.test.ts
+++ b/src/cli/gateway-cli.coverage.test.ts
@@ -118,7 +118,7 @@ describe("gateway-cli coverage", () => {
     expect(runtimeLogs.join("\n")).toContain('"ok": true');
   }, 30_000);
 
-  it("registers gateway status and routes to gatewayStatusCommand", async () => {
+  it("registers gateway probe and routes to gatewayStatusCommand", async () => {
     runtimeLogs.length = 0;
     runtimeErrors.length = 0;
     gatewayStatusCommand.mockClear();
@@ -128,7 +128,7 @@ describe("gateway-cli coverage", () => {
     program.exitOverride();
     registerGatewayCli(program);
 
-    await program.parseAsync(["gateway", "status", "--json"], { from: "user" });
+    await program.parseAsync(["gateway", "probe", "--json"], { from: "user" });
 
     expect(gatewayStatusCommand).toHaveBeenCalledTimes(1);
   }, 30_000);
@@ -311,7 +311,7 @@ describe("gateway-cli coverage", () => {
 
     expect(startGatewayServer).toHaveBeenCalled();
     expect(runtimeErrors.join("\n")).toContain("Gateway failed to start:");
-    expect(runtimeErrors.join("\n")).toContain("clawdbot daemon stop");
+    expect(runtimeErrors.join("\n")).toContain("clawdbot gateway stop");
   });
 
   it("uses env/config port when --port is omitted", async () => {
diff --git a/src/cli/gateway-cli/register.ts b/src/cli/gateway-cli/register.ts
index 5cfe71cd8..1f094699e 100644
--- a/src/cli/gateway-cli/register.ts
+++ b/src/cli/gateway-cli/register.ts
@@ -8,6 +8,14 @@ import { formatDocsLink } from "../../terminal/links.js";
 import { colorize, isRich, theme } from "../../terminal/theme.js";
 import { withProgress } from "../progress.js";
 import { runCommandWithRuntime } from "../cli-utils.js";
+import {
+  runDaemonInstall,
+  runDaemonRestart,
+  runDaemonStart,
+  runDaemonStatus,
+  runDaemonStop,
+  runDaemonUninstall,
+} from "../daemon-cli.js";
 import { callGatewayCli, gatewayCallOpts } from "./call.js";
 import type { GatewayDiscoverOpts } from "./discover.js";
 import {
@@ -62,13 +70,73 @@ export function registerGatewayCli(program: Command) {
       ),
   );
 
-  // Back-compat: legacy launchd plists used gateway-daemon; keep hidden alias.
   addGatewayRunCommand(
-    program
-      .command("gateway-daemon", { hidden: true })
-      .description("Run the WebSocket Gateway as a long-lived daemon"),
+    gateway.command("run").description("Run the WebSocket Gateway (foreground)"),
   );
 
+  gateway
+    .command("status")
+    .description("Show gateway service status + probe the Gateway")
+    .option("--url <url>", "Gateway WebSocket URL (defaults to config/remote/local)")
+    .option("--token <token>", "Gateway token (if required)")
+    .option("--password <password>", "Gateway password (password auth)")
+    .option("--timeout <ms>", "Timeout in ms", "10000")
+    .option("--no-probe", "Skip RPC probe")
+    .option("--deep", "Scan system-level services", false)
+    .option("--json", "Output JSON", false)
+    .action(async (opts) => {
+      await runDaemonStatus({
+        rpc: opts,
+        probe: Boolean(opts.probe),
+        deep: Boolean(opts.deep),
+        json: Boolean(opts.json),
+      });
+    });
+
+  gateway
+    .command("install")
+    .description("Install the Gateway service (launchd/systemd/schtasks)")
+    .option("--port <port>", "Gateway port")
+    .option("--runtime <runtime>", "Daemon runtime (node|bun). Default: node")
+    .option("--token <token>", "Gateway token (token auth)")
+    .option("--force", "Reinstall/overwrite if already installed", false)
+    .option("--json", "Output JSON", false)
+    .action(async (opts) => {
+      await runDaemonInstall(opts);
+    });
+
+  gateway
+    .command("uninstall")
+    .description("Uninstall the Gateway service (launchd/systemd/schtasks)")
+    .option("--json", "Output JSON", false)
+    .action(async (opts) => {
+      await runDaemonUninstall(opts);
+    });
+
+  gateway
+    .command("start")
+    .description("Start the Gateway service (launchd/systemd/schtasks)")
+    .option("--json", "Output JSON", false)
+    .action(async (opts) => {
+      await runDaemonStart(opts);
+    });
+
+  gateway
+    .command("stop")
+    .description("Stop the Gateway service (launchd/systemd/schtasks)")
+    .option("--json", "Output JSON", false)
+    .action(async (opts) => {
+      await runDaemonStop(opts);
+    });
+
+  gateway
+    .command("restart")
+    .description("Restart the Gateway service (launchd/systemd/schtasks)")
+    .option("--json", "Output JSON", false)
+    .action(async (opts) => {
+      await runDaemonRestart(opts);
+    });
+
   gatewayCallOpts(
     gateway
       .command("call")
@@ -121,7 +189,7 @@ export function registerGatewayCli(program: Command) {
   );
 
   gateway
-    .command("status")
+    .command("probe")
     .description("Show gateway reachability + discovery + health + status summary (local + remote)")
     .option("--url <url>", "Explicit Gateway WebSocket URL (still probes localhost)")
     .option("--ssh <target>", "SSH target for remote gateway tunnel (user@host or user@host:port)")
diff --git a/src/cli/gateway-cli/run.ts b/src/cli/gateway-cli/run.ts
index 211b4c2c4..e75899fb4 100644
--- a/src/cli/gateway-cli/run.ts
+++ b/src/cli/gateway-cli/run.ts
@@ -278,7 +278,7 @@ async function runGatewayCommand(opts: GatewayRunOpts) {
     ) {
       const errMessage = describeUnknownError(err);
       defaultRuntime.error(
-        `Gateway failed to start: ${errMessage}\nIf the gateway is supervised, stop it with: ${formatCliCommand("clawdbot daemon stop")}`,
+        `Gateway failed to start: ${errMessage}\nIf the gateway is supervised, stop it with: ${formatCliCommand("clawdbot gateway stop")}`,
       );
       try {
         const diagnostics = await inspectPortUsage(port);
diff --git a/src/cli/gateway-cli/shared.ts b/src/cli/gateway-cli/shared.ts
index 3105a94e6..1170ac35f 100644
--- a/src/cli/gateway-cli/shared.ts
+++ b/src/cli/gateway-cli/shared.ts
@@ -68,21 +68,21 @@ export function renderGatewayServiceStopHints(env: NodeJS.ProcessEnv = process.e
   switch (process.platform) {
     case "darwin":
       return [
-        `Tip: ${formatCliCommand("clawdbot daemon stop")}`,
+        `Tip: ${formatCliCommand("clawdbot gateway stop")}`,
         `Or: launchctl bootout gui/$UID/${resolveGatewayLaunchAgentLabel(profile)}`,
       ];
     case "linux":
       return [
-        `Tip: ${formatCliCommand("clawdbot daemon stop")}`,
+        `Tip: ${formatCliCommand("clawdbot gateway stop")}`,
         `Or: systemctl --user stop ${resolveGatewaySystemdServiceName(profile)}.service`,
       ];
     case "win32":
       return [
-        `Tip: ${formatCliCommand("clawdbot daemon stop")}`,
+        `Tip: ${formatCliCommand("clawdbot gateway stop")}`,
         `Or: schtasks /End /TN "${resolveGatewayWindowsTaskName(profile)}"`,
       ];
     default:
-      return [`Tip: ${formatCliCommand("clawdbot daemon stop")}`];
+      return [`Tip: ${formatCliCommand("clawdbot gateway stop")}`];
   }
 }
 
diff --git a/src/cli/program/config-guard.ts b/src/cli/program/config-guard.ts
index f8e3576f6..eef500c59 100644
--- a/src/cli/program/config-guard.ts
+++ b/src/cli/program/config-guard.ts
@@ -4,7 +4,19 @@ import { colorize, isRich, theme } from "../../terminal/theme.js";
 import type { RuntimeEnv } from "../../runtime.js";
 import { formatCliCommand } from "../command-format.js";
 
-const ALLOWED_INVALID_COMMANDS = new Set(["doctor", "logs", "health", "help", "status", "service"]);
+const ALLOWED_INVALID_COMMANDS = new Set(["doctor", "logs", "health", "help", "status"]);
+const ALLOWED_INVALID_GATEWAY_SUBCOMMANDS = new Set([
+  "status",
+  "probe",
+  "health",
+  "discover",
+  "call",
+  "install",
+  "uninstall",
+  "start",
+  "stop",
+  "restart",
+]);
 let didRunDoctorConfigFlow = false;
 
 function formatConfigIssues(issues: Array<{ path: string; message: string }>): string[] {
@@ -25,7 +37,13 @@ export async function ensureConfigReady(params: {
 
   const snapshot = await readConfigFileSnapshot();
   const commandName = params.commandPath?.[0];
-  const allowInvalid = commandName ? ALLOWED_INVALID_COMMANDS.has(commandName) : false;
+  const subcommandName = params.commandPath?.[1];
+  const allowInvalid = commandName
+    ? ALLOWED_INVALID_COMMANDS.has(commandName) ||
+      (commandName === "gateway" &&
+        subcommandName &&
+        ALLOWED_INVALID_GATEWAY_SUBCOMMANDS.has(subcommandName))
+    : false;
   const issues = snapshot.exists && !snapshot.valid ? formatConfigIssues(snapshot.issues) : [];
   const legacyIssues =
     snapshot.legacyIssues.length > 0
diff --git a/src/cli/program/register.subclis.ts b/src/cli/program/register.subclis.ts
index b13a4c76f..bc2496b70 100644
--- a/src/cli/program/register.subclis.ts
+++ b/src/cli/program/register.subclis.ts
@@ -36,14 +36,6 @@ const entries: SubCliEntry[] = [
       mod.registerAcpCli(program);
     },
   },
-  {
-    name: "daemon",
-    description: "Manage the gateway daemon",
-    register: async (program) => {
-      const mod = await import("../daemon-cli.js");
-      mod.registerDaemonCli(program);
-    },
-  },
   {
     name: "gateway",
     description: "Gateway control",
diff --git a/src/cli/update-cli.ts b/src/cli/update-cli.ts
index 02f92d01e..240f19ccb 100644
--- a/src/cli/update-cli.ts
+++ b/src/cli/update-cli.ts
@@ -785,7 +785,7 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
     if (result.reason === "not-git-install") {
       defaultRuntime.log(
         theme.warn(
-          `Skipped: this Clawdbot install isn't a git checkout, and the package manager couldn't be detected. Update via your package manager, then run \`${formatCliCommand("clawdbot doctor")}\` and \`${formatCliCommand("clawdbot daemon restart")}\`.`,
+          `Skipped: this Clawdbot install isn't a git checkout, and the package manager couldn't be detected. Update via your package manager, then run \`${formatCliCommand("clawdbot doctor")}\` and \`${formatCliCommand("clawdbot gateway restart")}\`.`,
         ),
       );
       defaultRuntime.log(
@@ -877,11 +877,11 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
     defaultRuntime.log(theme.warn("Skipping plugin updates: config is invalid."));
   }
 
-  // Restart daemon if requested
+  // Restart service if requested
   if (opts.restart) {
     if (!opts.json) {
       defaultRuntime.log("");
-      defaultRuntime.log(theme.heading("Restarting daemon..."));
+      defaultRuntime.log(theme.heading("Restarting service..."));
     }
     try {
       const { runDaemonRestart } = await import("./daemon-cli.js");
@@ -905,7 +905,7 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
         defaultRuntime.log(theme.warn(`Daemon restart failed: ${String(err)}`));
         defaultRuntime.log(
           theme.muted(
-            `You may need to restart the daemon manually: ${formatCliCommand("clawdbot daemon restart")}`,
+            `You may need to restart the service manually: ${formatCliCommand("clawdbot gateway restart")}`,
           ),
         );
       }
@@ -915,13 +915,13 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
     if (result.mode === "npm" || result.mode === "pnpm") {
       defaultRuntime.log(
         theme.muted(
-          `Tip: Run \`${formatCliCommand("clawdbot doctor")}\`, then \`${formatCliCommand("clawdbot daemon restart")}\` to apply updates to a running gateway.`,
+          `Tip: Run \`${formatCliCommand("clawdbot doctor")}\`, then \`${formatCliCommand("clawdbot gateway restart")}\` to apply updates to a running gateway.`,
         ),
       );
     } else {
       defaultRuntime.log(
         theme.muted(
-          `Tip: Run \`${formatCliCommand("clawdbot daemon restart")}\` to apply updates to a running gateway.`,
+          `Tip: Run \`${formatCliCommand("clawdbot gateway restart")}\` to apply updates to a running gateway.`,
         ),
       );
     }
@@ -937,7 +937,7 @@ export function registerUpdateCli(program: Command) {
     .command("update")
     .description("Update Clawdbot to the latest version")
     .option("--json", "Output result as JSON", false)
-    .option("--restart", "Restart the gateway daemon after a successful update", false)
+    .option("--restart", "Restart the gateway service after a successful update", false)
     .option("--channel <stable|beta|dev>", "Persist update channel (git + npm)")
     .option("--tag <dist-tag|version>", "Override npm dist-tag or version for this update")
     .option("--timeout <seconds>", "Timeout for each update step in seconds (default: 1200)")
@@ -948,7 +948,7 @@ export function registerUpdateCli(program: Command) {
         ["clawdbot update --channel beta", "Switch to beta channel (git + npm)"],
         ["clawdbot update --channel dev", "Switch to dev channel (git + npm)"],
         ["clawdbot update --tag beta", "One-off update to a dist-tag or version"],
-        ["clawdbot update --restart", "Update and restart the daemon"],
+        ["clawdbot update --restart", "Update and restart the service"],
         ["clawdbot update --json", "Output result as JSON"],
         ["clawdbot update --yes", "Non-interactive (accept downgrade prompts)"],
         ["clawdbot --update", "Shorthand for clawdbot update"],
diff --git a/src/commands/configure.daemon.ts b/src/commands/configure.daemon.ts
index 44f6ed457..7115d49a4 100644
--- a/src/commands/configure.daemon.ts
+++ b/src/commands/configure.daemon.ts
@@ -37,14 +37,14 @@ export async function maybeInstallDaemon(params: {
     );
     if (action === "restart") {
       await withProgress(
-        { label: "Gateway daemon", indeterminate: true, delayMs: 0 },
+        { label: "Gateway service", indeterminate: true, delayMs: 0 },
         async (progress) => {
-          progress.setLabel("Restarting Gateway daemon…");
+          progress.setLabel("Restarting Gateway service…");
           await service.restart({
             env: process.env,
             stdout: process.stdout,
           });
-          progress.setLabel("Gateway daemon restarted.");
+          progress.setLabel("Gateway service restarted.");
         },
       );
       shouldCheckLinger = true;
@@ -53,11 +53,11 @@ export async function maybeInstallDaemon(params: {
     if (action === "skip") return;
     if (action === "reinstall") {
       await withProgress(
-        { label: "Gateway daemon", indeterminate: true, delayMs: 0 },
+        { label: "Gateway service", indeterminate: true, delayMs: 0 },
         async (progress) => {
-          progress.setLabel("Uninstalling Gateway daemon…");
+          progress.setLabel("Uninstalling Gateway service…");
           await service.uninstall({ env: process.env, stdout: process.stdout });
-          progress.setLabel("Gateway daemon uninstalled.");
+          progress.setLabel("Gateway service uninstalled.");
         },
       );
     }
@@ -66,12 +66,12 @@ export async function maybeInstallDaemon(params: {
   if (shouldInstall) {
     let installError: string | null = null;
     await withProgress(
-      { label: "Gateway daemon", indeterminate: true, delayMs: 0 },
+      { label: "Gateway service", indeterminate: true, delayMs: 0 },
       async (progress) => {
         if (!params.daemonRuntime) {
           daemonRuntime = guardCancel(
             await select({
-              message: "Gateway daemon runtime",
+              message: "Gateway service runtime",
               options: GATEWAY_DAEMON_RUNTIME_OPTIONS,
               initialValue: DEFAULT_GATEWAY_DAEMON_RUNTIME,
             }),
@@ -79,7 +79,7 @@ export async function maybeInstallDaemon(params: {
           ) as GatewayDaemonRuntime;
         }
 
-        progress.setLabel("Preparing Gateway daemon…");
+        progress.setLabel("Preparing Gateway service…");
 
         const { programArguments, workingDirectory, environment } = await buildGatewayInstallPlan({
           env: process.env,
@@ -89,7 +89,7 @@ export async function maybeInstallDaemon(params: {
           warn: (message, title) => note(message, title),
         });
 
-        progress.setLabel("Installing Gateway daemon…");
+        progress.setLabel("Installing Gateway service…");
         try {
           await service.install({
             env: process.env,
@@ -98,15 +98,15 @@ export async function maybeInstallDaemon(params: {
             workingDirectory,
             environment,
           });
-          progress.setLabel("Gateway daemon installed.");
+          progress.setLabel("Gateway service installed.");
         } catch (err) {
           installError = err instanceof Error ? err.message : String(err);
-          progress.setLabel("Gateway daemon install failed.");
+          progress.setLabel("Gateway service install failed.");
         }
       },
     );
     if (installError) {
-      note("Gateway daemon install failed: " + installError, "Gateway");
+      note("Gateway service install failed: " + installError, "Gateway");
       note(gatewayInstallErrorHint(), "Gateway");
       return;
     }
diff --git a/src/commands/configure.wizard.ts b/src/commands/configure.wizard.ts
index 40b8a5934..e72ddb5a3 100644
--- a/src/commands/configure.wizard.ts
+++ b/src/commands/configure.wizard.ts
@@ -359,7 +359,7 @@ export async function runConfigureWizard(
         if (!selected.includes("gateway")) {
           const portInput = guardCancel(
             await text({
-              message: "Gateway port for daemon install",
+              message: "Gateway port for service install",
               initialValue: String(gatewayPort),
               validate: (value) => (Number.isFinite(Number(value)) ? undefined : "Invalid port"),
             }),
@@ -481,7 +481,7 @@ export async function runConfigureWizard(
           if (!didConfigureGateway) {
             const portInput = guardCancel(
               await text({
-                message: "Gateway port for daemon install",
+                message: "Gateway port for service install",
                 initialValue: String(gatewayPort),
                 validate: (value) => (Number.isFinite(Number(value)) ? undefined : "Invalid port"),
               }),
diff --git a/src/commands/daemon-install-helpers.test.ts b/src/commands/daemon-install-helpers.test.ts
index 7f6598c66..22ae7f24d 100644
--- a/src/commands/daemon-install-helpers.test.ts
+++ b/src/commands/daemon-install-helpers.test.ts
@@ -100,6 +100,6 @@ describe("buildGatewayInstallPlan", () => {
 describe("gatewayInstallErrorHint", () => {
   it("returns platform-specific hints", () => {
     expect(gatewayInstallErrorHint("win32")).toContain("Run as administrator");
-    expect(gatewayInstallErrorHint("linux")).toContain("clawdbot daemon install");
+    expect(gatewayInstallErrorHint("linux")).toContain("clawdbot gateway install");
   });
 });
diff --git a/src/commands/daemon-install-helpers.ts b/src/commands/daemon-install-helpers.ts
index 19a129ccf..26fe7ada5 100644
--- a/src/commands/daemon-install-helpers.ts
+++ b/src/commands/daemon-install-helpers.ts
@@ -65,6 +65,6 @@ export async function buildGatewayInstallPlan(params: {
 
 export function gatewayInstallErrorHint(platform = process.platform): string {
   return platform === "win32"
-    ? "Tip: rerun from an elevated PowerShell (Start → type PowerShell → right-click → Run as administrator) or skip daemon install."
-    : `Tip: rerun \`${formatCliCommand("clawdbot daemon install")}\` after fixing the error.`;
+    ? "Tip: rerun from an elevated PowerShell (Start → type PowerShell → right-click → Run as administrator) or skip service install."
+    : `Tip: rerun \`${formatCliCommand("clawdbot gateway install")}\` after fixing the error.`;
 }
diff --git a/src/commands/doctor-format.ts b/src/commands/doctor-format.ts
index 535937e10..2e5016b6e 100644
--- a/src/commands/doctor-format.ts
+++ b/src/commands/doctor-format.ts
@@ -70,10 +70,10 @@ export function buildGatewayRuntimeHints(
     hints.push(
       `LaunchAgent label cached but plist missing. Clear with: launchctl bootout gui/$UID/${label}`,
     );
-    hints.push(`Then reinstall: ${formatCliCommand("clawdbot daemon install", env)}`);
+    hints.push(`Then reinstall: ${formatCliCommand("clawdbot gateway install", env)}`);
   }
   if (runtime.missingUnit) {
-    hints.push(`Service not installed. Run: ${formatCliCommand("clawdbot daemon install", env)}`);
+    hints.push(`Service not installed. Run: ${formatCliCommand("clawdbot gateway install", env)}`);
     if (fileLog) hints.push(`File logs: ${fileLog}`);
     return hints;
   }
diff --git a/src/commands/doctor-gateway-daemon-flow.ts b/src/commands/doctor-gateway-daemon-flow.ts
index fbf9c0ea0..83a4f515e 100644
--- a/src/commands/doctor-gateway-daemon-flow.ts
+++ b/src/commands/doctor-gateway-daemon-flow.ts
@@ -139,16 +139,16 @@ export async function maybeRepairGatewayDaemon(params: {
         return;
       }
     }
-    note("Gateway daemon not installed.", "Gateway");
+    note("Gateway service not installed.", "Gateway");
     if (params.cfg.gateway?.mode !== "remote") {
       const install = await params.prompter.confirmSkipInNonInteractive({
-        message: "Install gateway daemon now?",
+        message: "Install gateway service now?",
         initialValue: true,
       });
       if (install) {
         const daemonRuntime = await params.prompter.select<GatewayDaemonRuntime>(
           {
-            message: "Gateway daemon runtime",
+            message: "Gateway service runtime",
             options: GATEWAY_DAEMON_RUNTIME_OPTIONS,
             initialValue: DEFAULT_GATEWAY_DAEMON_RUNTIME,
           },
@@ -171,7 +171,7 @@ export async function maybeRepairGatewayDaemon(params: {
             environment,
           });
         } catch (err) {
-          note(`Gateway daemon install failed: ${String(err)}`, "Gateway");
+          note(`Gateway service install failed: ${String(err)}`, "Gateway");
           note(gatewayInstallErrorHint(), "Gateway");
         }
       }
@@ -193,7 +193,7 @@ export async function maybeRepairGatewayDaemon(params: {
 
   if (serviceRuntime?.status !== "running") {
     const start = await params.prompter.confirmSkipInNonInteractive({
-      message: "Start gateway daemon now?",
+      message: "Start gateway service now?",
       initialValue: true,
     });
     if (start) {
@@ -208,14 +208,14 @@ export async function maybeRepairGatewayDaemon(params: {
   if (process.platform === "darwin") {
     const label = resolveGatewayLaunchAgentLabel(process.env.CLAWDBOT_PROFILE);
     note(
-      `LaunchAgent loaded; stopping requires "${formatCliCommand("clawdbot daemon stop")}" or launchctl bootout gui/$UID/${label}.`,
+      `LaunchAgent loaded; stopping requires "${formatCliCommand("clawdbot gateway stop")}" or launchctl bootout gui/$UID/${label}.`,
       "Gateway",
     );
   }
 
   if (serviceRuntime?.status === "running") {
     const restart = await params.prompter.confirmSkipInNonInteractive({
-      message: "Restart gateway daemon now?",
+      message: "Restart gateway service now?",
       initialValue: true,
     });
     if (restart) {
diff --git a/src/commands/doctor-gateway-services.ts b/src/commands/doctor-gateway-services.ts
index 24395ff69..e3005428d 100644
--- a/src/commands/doctor-gateway-services.ts
+++ b/src/commands/doctor-gateway-services.ts
@@ -97,7 +97,7 @@ export async function maybeMigrateLegacyGatewayService(
 
   const daemonRuntime = await prompter.select<GatewayDaemonRuntime>(
     {
-      message: "Gateway daemon runtime",
+      message: "Gateway service runtime",
       options: GATEWAY_DAEMON_RUNTIME_OPTIONS,
       initialValue: DEFAULT_GATEWAY_DAEMON_RUNTIME,
     },
@@ -120,7 +120,7 @@ export async function maybeMigrateLegacyGatewayService(
       environment,
     });
   } catch (err) {
-    runtime.error(`Gateway daemon install failed: ${String(err)}`);
+    runtime.error(`Gateway service install failed: ${String(err)}`);
     note(gatewayInstallErrorHint(), "Gateway");
   }
 }
diff --git a/src/commands/onboard-non-interactive/local/daemon-install.ts b/src/commands/onboard-non-interactive/local/daemon-install.ts
index 895f889ef..5b2e77b63 100644
--- a/src/commands/onboard-non-interactive/local/daemon-install.ts
+++ b/src/commands/onboard-non-interactive/local/daemon-install.ts
@@ -21,7 +21,7 @@ export async function installGatewayDaemonNonInteractive(params: {
   const systemdAvailable =
     process.platform === "linux" ? await isSystemdUserServiceAvailable() : true;
   if (process.platform === "linux" && !systemdAvailable) {
-    runtime.log("Systemd user services are unavailable; skipping daemon install.");
+    runtime.log("Systemd user services are unavailable; skipping service install.");
     return;
   }
 
@@ -48,7 +48,7 @@ export async function installGatewayDaemonNonInteractive(params: {
       environment,
     });
   } catch (err) {
-    runtime.error(`Gateway daemon install failed: ${String(err)}`);
+    runtime.error(`Gateway service install failed: ${String(err)}`);
     runtime.log(gatewayInstallErrorHint());
     return;
   }
diff --git a/src/commands/status.command.ts b/src/commands/status.command.ts
index a857c78bf..1ce771ac8 100644
--- a/src/commands/status.command.ts
+++ b/src/commands/status.command.ts
@@ -574,6 +574,6 @@ export async function statusCommand(
   if (gatewayReachable) {
     runtime.log(`  Need to test channels? ${formatCliCommand("clawdbot status --deep")}`);
   } else {
-    runtime.log(`  Fix reachability first: ${formatCliCommand("clawdbot gateway status")}`);
+    runtime.log(`  Fix reachability first: ${formatCliCommand("clawdbot gateway probe")}`);
   }
 }
diff --git a/src/commands/uninstall.ts b/src/commands/uninstall.ts
index 8cc1aff68..23b410606 100644
--- a/src/commands/uninstall.ts
+++ b/src/commands/uninstall.ts
@@ -51,7 +51,7 @@ function buildScopeSelection(opts: UninstallOptions): {
 
 async function stopAndUninstallService(runtime: RuntimeEnv): Promise<boolean> {
   if (isNixMode) {
-    runtime.error("Nix mode detected; daemon uninstall is disabled.");
+    runtime.error("Nix mode detected; service uninstall is disabled.");
     return false;
   }
   const service = resolveGatewayService();
diff --git a/src/daemon/systemd-hints.ts b/src/daemon/systemd-hints.ts
index 8499a718b..663a9d233 100644
--- a/src/daemon/systemd-hints.ts
+++ b/src/daemon/systemd-hints.ts
@@ -22,6 +22,6 @@ export function renderSystemdUnavailableHints(options: { wsl?: boolean } = {}):
   }
   return [
     "systemd user services are unavailable; install/enable systemd or run the gateway under your supervisor.",
-    `If you're in a container, run the gateway in the foreground instead of \`${formatCliCommand("clawdbot daemon")}\`.`,
+    `If you're in a container, run the gateway in the foreground instead of \`${formatCliCommand("clawdbot gateway")}\`.`,
   ];
 }
diff --git a/src/infra/ports-format.ts b/src/infra/ports-format.ts
index 6bf7db4bd..e6f29edd7 100644
--- a/src/infra/ports-format.ts
+++ b/src/infra/ports-format.ts
@@ -21,7 +21,7 @@ export function buildPortHints(listeners: PortListener[], port: number): string[
   const hints: string[] = [];
   if (kinds.has("gateway")) {
     hints.push(
-      `Gateway already running locally. Stop it (${formatCliCommand("clawdbot daemon stop")}) or use a different port.`,
+      `Gateway already running locally. Stop it (${formatCliCommand("clawdbot gateway stop")}) or use a different port.`,
     );
   }
   if (kinds.has("ssh")) {

From c129f0bbaa735480cd60ded7e96f72beacef95c5 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:45:12 +0000
Subject: [PATCH 029/171] docs: align gateway service naming

---
 CHANGELOG.md                          |  1 +
 docs/cli/daemon.md                    | 23 ----------
 docs/cli/gateway.md                   | 45 +++++++++++++++++--
 docs/cli/index.md                     | 51 +++++++++++-----------
 docs/cli/update.md                    |  4 +-
 docs/debugging.md                     |  2 +-
 docs/docs.json                        |  2 -
 docs/gateway/configuration.md         |  2 +-
 docs/gateway/doctor.md                |  6 +--
 docs/gateway/index.md                 | 54 +++++++++++------------
 docs/gateway/multiple-gateways.md     | 12 +++---
 docs/gateway/remote.md                |  4 +-
 docs/gateway/troubleshooting.md       | 62 +++++++++++++--------------
 docs/help/troubleshooting.md          |  6 +--
 docs/index.md                         |  4 +-
 docs/install/uninstall.md             |  4 +-
 docs/install/updating.md              | 16 +++----
 docs/nodes/index.md                   |  2 +-
 docs/platforms/exe-dev.md             |  8 ++--
 docs/platforms/index.md               |  6 +--
 docs/platforms/linux.md               |  4 +-
 docs/platforms/mac/bundled-gateway.md |  2 +-
 docs/platforms/mac/dev-setup.md       |  4 +-
 docs/platforms/macos.md               |  4 +-
 docs/platforms/windows.md             |  6 +--
 docs/refactor/strict-config.md        |  2 +-
 docs/start/faq.md                     | 58 ++++++++++++-------------
 docs/start/getting-started.md         | 10 ++---
 docs/tools/web.md                     |  4 +-
 29 files changed, 211 insertions(+), 197 deletions(-)
 delete mode 100644 docs/cli/daemon.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be5093e3e..1b1848f57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Docs: https://docs.clawd.bot
 - Exec approvals: support wildcard agent allowlists (`*`) across all agents.
 - Nodes: expose node PATH in status/describe and bootstrap PATH for node-host execution.
 - CLI: flatten node service commands under `clawdbot node` and remove `service node` docs.
+- CLI: move gateway service commands under `clawdbot gateway` and add `gateway probe` for reachability.
 
 ### Fixes
 - Nodes tool: include agent/node/gateway context in tool failure logs to speed approval debugging.
diff --git a/docs/cli/daemon.md b/docs/cli/daemon.md
deleted file mode 100644
index d1e8753ed..000000000
--- a/docs/cli/daemon.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-summary: "CLI reference for `clawdbot daemon` (install/uninstall/status for the Gateway service)"
-read_when:
-  - You want to run the Gateway as a background service
-  - You’re debugging daemon install, status, or logs
----
-
-# `clawdbot daemon`
-
-Manage the Gateway daemon (background service).
-
-Note: `clawdbot daemon …` is the preferred surface for Gateway service management; `daemon` remains
-as a legacy alias for compatibility.
-
-Related:
-- Gateway CLI: [Gateway](/cli/gateway)
-- macOS platform notes: [macOS](/platforms/macos)
-
-Tip: run `clawdbot daemon --help` for platform-specific flags.
-
-Notes:
-- `daemon status` supports `--json` for scripting.
-- `daemon install|uninstall|start|stop|restart` support `--json` for scripting (default output stays human-friendly).
diff --git a/docs/cli/gateway.md b/docs/cli/gateway.md
index 21538deef..1334bfe87 100644
--- a/docs/cli/gateway.md
+++ b/docs/cli/gateway.md
@@ -25,6 +25,12 @@ Run a local Gateway process:
 clawdbot gateway
 ```
 
+Foreground alias:
+
+```bash
+clawdbot gateway run
+```
+
 Notes:
 - By default, the Gateway refuses to start unless `gateway.mode=local` is set in `~/.clawdbot/clawdbot.json`. Use `--allow-unconfigured` for ad-hoc/dev runs.
 - Binding beyond loopback without auth is blocked (safety guardrail).
@@ -75,15 +81,32 @@ clawdbot gateway health --url ws://127.0.0.1:18789
 
 ### `gateway status`
 
-`gateway status` is the “debug everything” command. It always probes:
+`gateway status` shows the Gateway service (launchd/systemd/schtasks) plus an optional RPC probe.
+
+```bash
+clawdbot gateway status
+clawdbot gateway status --json
+```
+
+Options:
+- `--url <url>`: override the probe URL.
+- `--token <token>`: token auth for the probe.
+- `--password <password>`: password auth for the probe.
+- `--timeout <ms>`: probe timeout (default `10000`).
+- `--no-probe`: skip the RPC probe (service-only view).
+- `--deep`: scan system-level services too.
+
+### `gateway probe`
+
+`gateway probe` is the “debug everything” command. It always probes:
 - your configured remote gateway (if set), and
 - localhost (loopback) **even if remote is configured**.
 
 If multiple gateways are reachable, it prints all of them. Multiple gateways are supported when you use isolated profiles/ports (e.g., a rescue bot), but most installs still run a single gateway.
 
 ```bash
-clawdbot gateway status
-clawdbot gateway status --json
+clawdbot gateway probe
+clawdbot gateway probe --json
 ```
 
 #### Remote over SSH (Mac app parity)
@@ -93,7 +116,7 @@ The macOS app “Remote over SSH” mode uses a local port-forward so the remote
 CLI equivalent:
 
 ```bash
-clawdbot gateway status --ssh user@gateway-host
+clawdbot gateway probe --ssh user@gateway-host
 ```
 
 Options:
@@ -114,6 +137,20 @@ clawdbot gateway call status
 clawdbot gateway call logs.tail --params '{"sinceMs": 60000}'
 ```
 
+## Manage the Gateway service
+
+```bash
+clawdbot gateway install
+clawdbot gateway start
+clawdbot gateway stop
+clawdbot gateway restart
+clawdbot gateway uninstall
+```
+
+Notes:
+- `gateway install` supports `--port`, `--runtime`, `--token`, `--force`, `--json`.
+- Lifecycle commands accept `--json` for scripting.
+
 ## Discover gateways (Bonjour)
 
 `gateway discover` scans for Gateway beacons (`_clawdbot-gw._tcp`).
diff --git a/docs/cli/index.md b/docs/cli/index.md
index fdf730e2b..710c87eca 100644
--- a/docs/cli/index.md
+++ b/docs/cli/index.md
@@ -28,7 +28,6 @@ This page describes the current CLI behavior. If commands change, update this do
 - [`health`](/cli/health)
 - [`sessions`](/cli/sessions)
 - [`gateway`](/cli/gateway)
-- [`daemon`](/cli/daemon)
 - [`logs`](/cli/logs)
 - [`models`](/cli/models)
 - [`memory`](/cli/memory)
@@ -137,14 +136,14 @@ clawdbot [--dev] [--profile <name>] <command>
     call
     health
     status
+    probe
     discover
-  daemon
-    status
     install
     uninstall
     start
     stop
     restart
+    run
   logs
   models
     list
@@ -175,14 +174,13 @@ clawdbot [--dev] [--profile <name>] <command>
   nodes
   devices
   node
+    run
+    status
+    install
+    uninstall
     start
-    daemon
-      status
-      install
-      uninstall
-      start
-      stop
-      restart
+    stop
+    restart
   approvals
     get
     set
@@ -615,25 +613,25 @@ Options:
 - `--raw-stream`
 - `--raw-stream-path <path>`
 
-### `daemon`
+### `gateway service`
 Manage the Gateway service (launchd/systemd/schtasks).
 
 Subcommands:
-- `daemon status` (probes the Gateway RPC by default)
-- `daemon install` (service install)
-- `daemon uninstall`
-- `daemon start`
-- `daemon stop`
-- `daemon restart`
+- `gateway status` (probes the Gateway RPC by default)
+- `gateway install` (service install)
+- `gateway uninstall`
+- `gateway start`
+- `gateway stop`
+- `gateway restart`
 
 Notes:
-- `daemon status` probes the Gateway RPC by default using the daemon’s resolved port/config (override with `--url/--token/--password`).
-- `daemon status` supports `--no-probe`, `--deep`, and `--json` for scripting.
-- `daemon status` also surfaces legacy or extra gateway services when it can detect them (`--deep` adds system-level scans). Profile-named Clawdbot services are treated as first-class and aren't flagged as "extra".
-- `daemon status` prints which config path the CLI uses vs which config the daemon likely uses (service env), plus the resolved probe target URL.
-- `daemon install|uninstall|start|stop|restart` support `--json` for scripting (default output stays human-friendly).
-- `daemon install` defaults to Node runtime; bun is **not recommended** (WhatsApp/Telegram bugs).
-- `daemon install` options: `--port`, `--runtime`, `--token`, `--force`, `--json`.
+- `gateway status` probes the Gateway RPC by default using the service’s resolved port/config (override with `--url/--token/--password`).
+- `gateway status` supports `--no-probe`, `--deep`, and `--json` for scripting.
+- `gateway status` also surfaces legacy or extra gateway services when it can detect them (`--deep` adds system-level scans). Profile-named Clawdbot services are treated as first-class and aren't flagged as "extra".
+- `gateway status` prints which config path the CLI uses vs which config the service likely uses (service env), plus the resolved probe target URL.
+- `gateway install|uninstall|start|stop|restart` support `--json` for scripting (default output stays human-friendly).
+- `gateway install` defaults to Node runtime; bun is **not recommended** (WhatsApp/Telegram bugs).
+- `gateway install` options: `--port`, `--runtime`, `--token`, `--force`, `--json`.
 
 ### `logs`
 Tail Gateway file logs via RPC.
@@ -652,13 +650,16 @@ clawdbot logs --no-color
 ```
 
 ### `gateway <subcommand>`
-Gateway RPC helpers (use `--url`, `--token`, `--password`, `--timeout`, `--expect-final` for each).
+Gateway CLI helpers (use `--url`, `--token`, `--password`, `--timeout`, `--expect-final` for RPC subcommands).
 
 Subcommands:
 - `gateway call <method> [--params <json>]`
 - `gateway health`
 - `gateway status`
+- `gateway probe`
 - `gateway discover`
+- `gateway install|uninstall|start|stop|restart`
+- `gateway run`
 
 Common RPCs:
 - `config.apply` (validate + write config + restart + wake)
diff --git a/docs/cli/update.md b/docs/cli/update.md
index 12fa90e57..acac61b20 100644
--- a/docs/cli/update.md
+++ b/docs/cli/update.md
@@ -1,5 +1,5 @@
 ---
-summary: "CLI reference for `clawdbot update` (safe-ish source update + optional daemon restart)"
+summary: "CLI reference for `clawdbot update` (safe-ish source update + optional gateway restart)"
 read_when:
   - You want to update a source checkout safely
   - You need to understand `--update` shorthand behavior
@@ -26,7 +26,7 @@ clawdbot --update
 
 ## Options
 
-- `--restart`: restart the Gateway daemon after a successful update.
+- `--restart`: restart the Gateway service after a successful update.
 - `--channel <stable|beta|dev>`: set the update channel (git + npm; persisted in config).
 - `--tag <dist-tag|version>`: override the npm dist-tag or version for this update only.
 - `--json`: print machine-readable `UpdateRunResult` JSON.
diff --git a/docs/debugging.md b/docs/debugging.md
index a7f8a85ff..b7f94d276 100644
--- a/docs/debugging.md
+++ b/docs/debugging.md
@@ -100,7 +100,7 @@ CLAWDBOT_PROFILE=dev clawdbot gateway --dev --reset
 Tip: if a non‑dev gateway is already running (launchd/systemd), stop it first:
 
 ```bash
-clawdbot daemon stop
+clawdbot gateway stop
 ```
 
 ## Raw stream logging (Clawdbot)
diff --git a/docs/docs.json b/docs/docs.json
index 8b81228ab..72b5765a3 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -829,8 +829,6 @@
           "cli/nodes",
           "cli/approvals",
           "cli/gateway",
-          "cli/daemon",
-          "cli/service",
           "cli/tui",
           "cli/voicecall",
           "cli/wake",
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index 1ab4c4bb0..a17308344 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -24,7 +24,7 @@ Unknown keys, malformed types, or invalid values cause the Gateway to **refuse t
 
 When validation fails:
 - The Gateway does not boot.
-- Only diagnostic commands are allowed (for example: `clawdbot doctor`, `clawdbot logs`, `clawdbot health`, `clawdbot status`, `clawdbot daemon`, `clawdbot help`).
+- Only diagnostic commands are allowed (for example: `clawdbot doctor`, `clawdbot logs`, `clawdbot health`, `clawdbot status`, `clawdbot gateway status`, `clawdbot gateway probe`, `clawdbot help`).
 - Run `clawdbot doctor` to see the exact issues.
 - Run `clawdbot doctor --fix` (or `--yes`) to apply migrations/repairs.
 
diff --git a/docs/gateway/doctor.md b/docs/gateway/doctor.md
index b3c77e848..50e7ffdcc 100644
--- a/docs/gateway/doctor.md
+++ b/docs/gateway/doctor.md
@@ -225,10 +225,10 @@ Notes:
 - `clawdbot doctor --yes` accepts the default repair prompts.
 - `clawdbot doctor --repair` applies recommended fixes without prompts.
 - `clawdbot doctor --repair --force` overwrites custom supervisor configs.
-- You can always force a full rewrite via `clawdbot daemon install --force`.
+- You can always force a full rewrite via `clawdbot gateway install --force`.
 
 ### 16) Gateway runtime + port diagnostics
-Doctor inspects the daemon runtime (PID, last exit status) and warns when the
+Doctor inspects the service runtime (PID, last exit status) and warns when the
 service is installed but not actually running. It also checks for port collisions
 on the gateway port (default `18789`) and reports likely causes (gateway already
 running, SSH tunnel).
@@ -236,7 +236,7 @@ running, SSH tunnel).
 ### 17) Gateway runtime best practices
 Doctor warns when the gateway service runs on Bun or a version-managed Node path
 (`nvm`, `fnm`, `volta`, `asdf`, etc.). WhatsApp + Telegram channels require Node,
-and version-manager paths can break after upgrades because the daemon does not
+and version-manager paths can break after upgrades because the service does not
 load your shell init. Doctor offers to migrate to a system Node install when
 available (Homebrew/apt/choco).
 
diff --git a/docs/gateway/index.md b/docs/gateway/index.md
index 83ed93952..50552bcc5 100644
--- a/docs/gateway/index.md
+++ b/docs/gateway/index.md
@@ -1,9 +1,9 @@
 ---
-summary: "Runbook for the Gateway daemon, lifecycle, and operations"
+summary: "Runbook for the Gateway service, lifecycle, and operations"
 read_when:
   - Running or debugging the gateway process
 ---
-# Gateway (daemon) runbook
+# Gateway service runbook
 
 Last updated: 2025-12-09
 
@@ -101,10 +101,10 @@ Checklist per instance:
 - unique `agents.defaults.workspace`
 - separate WhatsApp numbers (if using WA)
 
-Daemon install per profile:
+Service install per profile:
 ```bash
-clawdbot --profile main daemon install
-clawdbot --profile rescue daemon install
+clawdbot --profile main gateway install
+clawdbot --profile rescue gateway install
 ```
 
 Example:
@@ -175,49 +175,49 @@ See also: [Presence](/concepts/presence) for how presence is produced/deduped an
 - Events are not replayed. Clients detect seq gaps and should refresh (`health` + `system-presence`) before continuing. WebChat and macOS clients now auto-refresh on gap.
 
 ## Supervision (macOS example)
-- Use launchd to keep the daemon alive:
+- Use launchd to keep the service alive:
   - Program: path to `clawdbot`
   - Arguments: `gateway`
   - KeepAlive: true
   - StandardOut/Err: file paths or `syslog`
 - On failure, launchd restarts; fatal misconfig should keep exiting so the operator notices.
 - LaunchAgents are per-user and require a logged-in session; for headless setups use a custom LaunchDaemon (not shipped).
-  - `clawdbot daemon install` writes `~/Library/LaunchAgents/com.clawdbot.gateway.plist`
+  - `clawdbot gateway install` writes `~/Library/LaunchAgents/com.clawdbot.gateway.plist`
     (or `com.clawdbot.<profile>.plist`).
   - `clawdbot doctor` audits the LaunchAgent config and can update it to current defaults.
 
-## Daemon management (CLI)
+## Gateway service management (CLI)
 
-Use the CLI daemon manager for install/start/stop/restart/status:
+Use the Gateway CLI for install/start/stop/restart/status:
 
 ```bash
-clawdbot daemon status
-clawdbot daemon install
-clawdbot daemon stop
-clawdbot daemon restart
+clawdbot gateway status
+clawdbot gateway install
+clawdbot gateway stop
+clawdbot gateway restart
 clawdbot logs --follow
 ```
 
 Notes:
-- `daemon status` probes the Gateway RPC by default using the daemon’s resolved port/config (override with `--url`).
-- `daemon status --deep` adds system-level scans (LaunchDaemons/system units).
-- `daemon status --no-probe` skips the RPC probe (useful when networking is down).
-- `daemon status --json` is stable for scripts.
-- `daemon status` reports **supervisor runtime** (launchd/systemd running) separately from **RPC reachability** (WS connect + status RPC).
-- `daemon status` prints config path + probe target to avoid “localhost vs LAN bind” confusion and profile mismatches.
-- `daemon status` includes the last gateway error line when the service looks running but the port is closed.
+- `gateway status` probes the Gateway RPC by default using the service’s resolved port/config (override with `--url`).
+- `gateway status --deep` adds system-level scans (LaunchDaemons/system units).
+- `gateway status --no-probe` skips the RPC probe (useful when networking is down).
+- `gateway status --json` is stable for scripts.
+- `gateway status` reports **supervisor runtime** (launchd/systemd running) separately from **RPC reachability** (WS connect + status RPC).
+- `gateway status` prints config path + probe target to avoid “localhost vs LAN bind” confusion and profile mismatches.
+- `gateway status` includes the last gateway error line when the service looks running but the port is closed.
 - `logs` tails the Gateway file log via RPC (no manual `tail`/`grep` needed).
 - If other gateway-like services are detected, the CLI warns unless they are Clawdbot profile services.
   We still recommend **one gateway per machine** for most setups; use isolated profiles/ports for redundancy or a rescue bot. See [Multiple gateways](/gateway/multiple-gateways).
-  - Cleanup: `clawdbot daemon uninstall` (current service) and `clawdbot doctor` (legacy migrations).
-- `daemon install` is a no-op when already installed; use `clawdbot daemon install --force` to reinstall (profile/env/path changes).
+  - Cleanup: `clawdbot gateway uninstall` (current service) and `clawdbot doctor` (legacy migrations).
+- `gateway install` is a no-op when already installed; use `clawdbot gateway install --force` to reinstall (profile/env/path changes).
 
 Bundled mac app:
 - Clawdbot.app can bundle a Node-based gateway relay and install a per-user LaunchAgent labeled
   `com.clawdbot.gateway` (or `com.clawdbot.<profile>`).
-- To stop it cleanly, use `clawdbot daemon stop` (or `launchctl bootout gui/$UID/com.clawdbot.gateway`).
-- To restart, use `clawdbot daemon restart` (or `launchctl kickstart -k gui/$UID/com.clawdbot.gateway`).
-  - `launchctl` only works if the LaunchAgent is installed; otherwise use `clawdbot daemon install` first.
+- To stop it cleanly, use `clawdbot gateway stop` (or `launchctl bootout gui/$UID/com.clawdbot.gateway`).
+- To restart, use `clawdbot gateway restart` (or `launchctl kickstart -k gui/$UID/com.clawdbot.gateway`).
+  - `launchctl` only works if the LaunchAgent is installed; otherwise use `clawdbot gateway install` first.
   - Replace the label with `com.clawdbot.<profile>` when running a named profile.
 
 ## Supervision (systemd user unit)
@@ -226,7 +226,7 @@ recommend user services for single-user machines (simpler env, per-user config).
 Use a **system service** for multi-user or always-on servers (no lingering
 required, shared supervision).
 
-`clawdbot daemon install` writes the user unit. `clawdbot doctor` audits the
+`clawdbot gateway install` writes the user unit. `clawdbot doctor` audits the
 unit and can update it to match the current recommended defaults.
 
 Create `~/.config/systemd/user/clawdbot-gateway[-<profile>].service`:
@@ -285,7 +285,7 @@ Windows installs should use **WSL2** and follow the Linux systemd section above.
 - `clawdbot message send --target <num> --message "hi" [--media ...]` — send via Gateway (idempotent for WhatsApp).
 - `clawdbot agent --message "hi" --to <num>` — run an agent turn (waits for final by default).
 - `clawdbot gateway call <method> --params '{"k":"v"}'` — raw method invoker for debugging.
-- `clawdbot daemon stop|restart` — stop/restart the supervised gateway service (launchd/systemd).
+- `clawdbot gateway stop|restart` — stop/restart the supervised gateway service (launchd/systemd).
 - Gateway helper subcommands assume a running gateway on `--url`; they no longer auto-spawn one.
 
 ## Migration guidance
diff --git a/docs/gateway/multiple-gateways.md b/docs/gateway/multiple-gateways.md
index ffb72a639..b1bbd7d04 100644
--- a/docs/gateway/multiple-gateways.md
+++ b/docs/gateway/multiple-gateways.md
@@ -31,10 +31,10 @@ clawdbot --profile rescue setup
 clawdbot --profile rescue gateway --port 19001
 ```
 
-Per-profile daemons:
+Per-profile services:
 ```bash
-clawdbot --profile main daemon install
-clawdbot --profile rescue daemon install
+clawdbot --profile main gateway install
+clawdbot --profile rescue gateway install
 ```
 
 ## Rescue-bot guide
@@ -55,7 +55,7 @@ Port spacing: leave at least 20 ports between base ports so the derived bridge/b
 # Main bot (existing or fresh, without --profile param)
 # Runs on port 18789 + Chrome CDC/Canvas/... Ports 
 clawdbot onboard
-clawdbot daemon install
+clawdbot gateway install
 
 # Rescue bot (isolated profile + ports)
 clawdbot --profile rescue onboard
@@ -65,8 +65,8 @@ clawdbot --profile rescue onboard
 #   better choose completely different base port, like 19789,
 # - rest of the onboarding is the same as normal
 
-# To install the daemon (if not happened automatically during onboarding)
-clawdbot --profile rescue daemon install
+# To install the service (if not happened automatically during onboarding)
+clawdbot --profile rescue gateway install
 ```
 
 ## Port mapping (derived)
diff --git a/docs/gateway/remote.md b/docs/gateway/remote.md
index ebe98d413..99ccb6326 100644
--- a/docs/gateway/remote.md
+++ b/docs/gateway/remote.md
@@ -50,7 +50,7 @@ Guide: [Tailscale](/gateway/tailscale) and [Web overview](/web).
 
 ## Command flow (what runs where)
 
-One gateway daemon owns state + channels. Nodes are peripherals.
+One gateway service owns state + channels. Nodes are peripherals.
 
 Flow example (Telegram → node):
 - Telegram message arrives at the **Gateway**.
@@ -59,7 +59,7 @@ Flow example (Telegram → node):
 - Node returns the result; Gateway replies back out to Telegram.
 
 Notes:
-- **Nodes do not run the gateway daemon.** Only one gateway should run per host unless you intentionally run isolated profiles (see [Multiple gateways](/gateway/multiple-gateways)).
+- **Nodes do not run the gateway service.** Only one gateway should run per host unless you intentionally run isolated profiles (see [Multiple gateways](/gateway/multiple-gateways)).
 - macOS app “node mode” is just a node client over the Bridge.
 
 ## SSH tunnel (CLI + tools)
diff --git a/docs/gateway/troubleshooting.md b/docs/gateway/troubleshooting.md
index ccd9c9ea4..93f5d64bc 100644
--- a/docs/gateway/troubleshooting.md
+++ b/docs/gateway/troubleshooting.md
@@ -17,12 +17,12 @@ Quick triage commands (in order):
 
 | Command | What it tells you | When to use it |
 |---|---|---|
-| `clawdbot status` | Local summary: OS + update, gateway reachability/mode, daemon, agents/sessions, provider config state | First check, quick overview |
+| `clawdbot status` | Local summary: OS + update, gateway reachability/mode, service, agents/sessions, provider config state | First check, quick overview |
 | `clawdbot status --all` | Full local diagnosis (read-only, pasteable, safe-ish) incl. log tail | When you need to share a debug report |
 | `clawdbot status --deep` | Runs gateway health checks (incl. provider probes; requires reachable gateway) | When “configured” doesn’t mean “working” |
-| `clawdbot gateway status` | Gateway discovery + reachability (local + remote targets) | When you suspect you’re probing the wrong gateway |
+| `clawdbot gateway probe` | Gateway discovery + reachability (local + remote targets) | When you suspect you’re probing the wrong gateway |
 | `clawdbot channels status --probe` | Asks the running gateway for channel status (and optionally probes) | When gateway is reachable but channels misbehave |
-| `clawdbot daemon status` | Supervisor state (launchd/systemd/schtasks), runtime PID/exit, last gateway error | When the daemon “looks loaded” but nothing runs |
+| `clawdbot gateway status` | Supervisor state (launchd/systemd/schtasks), runtime PID/exit, last gateway error | When the service “looks loaded” but nothing runs |
 | `clawdbot logs --follow` | Live logs (best signal for runtime issues) | When you need the actual failure reason |
 
 **Sharing output:** prefer `clawdbot status --all` (it redacts tokens). If you paste `clawdbot status`, consider setting `CLAWDBOT_SHOW_SECRETS=0` first (token previews).
@@ -38,16 +38,16 @@ Follow [Secret scanning](/gateway/security#secret-scanning-detect-secrets).
 
 ### Service Installed but Nothing is Running
 
-If the gateway service is installed but the process exits immediately, the daemon
+If the gateway service is installed but the process exits immediately, the service
 can appear “loaded” while nothing is running.
 
 **Check:**
 ```bash
-clawdbot daemon status
+clawdbot gateway status
 clawdbot doctor
 ```
 
-Doctor/daemon will show runtime state (PID/last exit) and log hints.
+Doctor/service will show runtime state (PID/last exit) and log hints.
 
 **Logs:**
 - Preferred: `clawdbot logs --follow`
@@ -71,12 +71,12 @@ See [/logging](/logging) for a full overview of formats, config, and access.
 
 ### Service Environment (PATH + runtime)
 
-The gateway daemon runs with a **minimal PATH** to avoid shell/manager cruft:
+The gateway service runs with a **minimal PATH** to avoid shell/manager cruft:
 - macOS: `/opt/homebrew/bin`, `/usr/local/bin`, `/usr/bin`, `/bin`
 - Linux: `/usr/local/bin`, `/usr/bin`, `/bin`
 
 This intentionally excludes version managers (nvm/fnm/volta/asdf) and package
-managers (pnpm/npm) because the daemon does not load your shell init. Runtime
+managers (pnpm/npm) because the service does not load your shell init. Runtime
 variables like `DISPLAY` should live in `~/.clawdbot/.env` (loaded early by the
 gateway).
 Exec runs on `host=gateway` merge your login-shell `PATH` into the exec environment,
@@ -106,31 +106,31 @@ the Gateway likely refused to bind.
 **What "running" means here**
 - `Runtime: running` means your supervisor (launchd/systemd/schtasks) thinks the process is alive.
 - `RPC probe` means the CLI could actually connect to the gateway WebSocket and call `status`.
-- Always trust `Probe target:` + `Config (daemon):` as the “what did we actually try?” lines.
+- Always trust `Probe target:` + `Config (service):` as the “what did we actually try?” lines.
 
 **Check:**
-- `gateway.mode` must be `local` for `clawdbot gateway` and the daemon.
-- If you set `gateway.mode=remote`, the **CLI defaults** to a remote URL. The daemon can still be running locally, but your CLI may be probing the wrong place. Use `clawdbot daemon status` to see the daemon’s resolved port + probe target (or pass `--url`).
-- `clawdbot daemon status` and `clawdbot doctor` surface the **last gateway error** from logs when the service looks running but the port is closed.
+- `gateway.mode` must be `local` for `clawdbot gateway` and the service.
+- If you set `gateway.mode=remote`, the **CLI defaults** to a remote URL. The service can still be running locally, but your CLI may be probing the wrong place. Use `clawdbot gateway status` to see the service’s resolved port + probe target (or pass `--url`).
+- `clawdbot gateway status` and `clawdbot doctor` surface the **last gateway error** from logs when the service looks running but the port is closed.
 - Non-loopback binds (`lan`/`tailnet`/`auto`) require auth:
   `gateway.auth.token` (or `CLAWDBOT_GATEWAY_TOKEN`).
 - `gateway.remote.token` is for remote CLI calls only; it does **not** enable local auth.
 - `gateway.token` is ignored; use `gateway.auth.token`.
 
-**If `clawdbot daemon status` shows a config mismatch**
-- `Config (cli): ...` and `Config (daemon): ...` should normally match.
-- If they don’t, you’re almost certainly editing one config while the daemon is running another.
-- Fix: rerun `clawdbot daemon install --force` from the same `--profile` / `CLAWDBOT_STATE_DIR` you want the daemon to use.
+**If `clawdbot gateway status` shows a config mismatch**
+- `Config (cli): ...` and `Config (service): ...` should normally match.
+- If they don’t, you’re almost certainly editing one config while the service is running another.
+- Fix: rerun `clawdbot gateway install --force` from the same `--profile` / `CLAWDBOT_STATE_DIR` you want the service to use.
 
-**If `clawdbot daemon status` reports service config issues**
+**If `clawdbot gateway status` reports service config issues**
 - The supervisor config (launchd/systemd/schtasks) is missing current defaults.
-- Fix: run `clawdbot doctor` to update it (or `clawdbot daemon install --force` for a full rewrite).
+- Fix: run `clawdbot doctor` to update it (or `clawdbot gateway install --force` for a full rewrite).
 
 **If `Last gateway error:` mentions “refusing to bind … without auth”**
 - You set `gateway.bind` to a non-loopback mode (`lan`/`tailnet`/`auto`) but left auth off.
-- Fix: set `gateway.auth.mode` + `gateway.auth.token` (or export `CLAWDBOT_GATEWAY_TOKEN`) and restart the daemon.
+- Fix: set `gateway.auth.mode` + `gateway.auth.token` (or export `CLAWDBOT_GATEWAY_TOKEN`) and restart the service.
 
-**If `clawdbot daemon status` says `bind=tailnet` but no tailnet interface was found**
+**If `clawdbot gateway status` says `bind=tailnet` but no tailnet interface was found**
 - The gateway tried to bind to a Tailscale IP (100.64.0.0/10) but none were detected on the host.
 - Fix: bring up Tailscale on that machine (or change `gateway.bind` to `loopback`/`lan`).
 
@@ -144,7 +144,7 @@ This means something is already listening on the gateway port.
 
 **Check:**
 ```bash
-clawdbot daemon status
+clawdbot gateway status
 ```
 
 It will show the listener(s) and likely causes (gateway already running, SSH tunnel).
@@ -354,7 +354,7 @@ clawdbot doctor --fix
 Notes:
 - `clawdbot doctor` reports every invalid entry.
 - `clawdbot doctor --fix` applies migrations/repairs and rewrites the config.
-- Diagnostic commands like `clawdbot logs`, `clawdbot health`, `clawdbot status`, and `clawdbot daemon` still run even if the config is invalid.
+- Diagnostic commands like `clawdbot logs`, `clawdbot health`, `clawdbot status`, `clawdbot gateway status`, and `clawdbot gateway probe` still run even if the config is invalid.
 
 ### “All models failed” — what should I check first?
 
@@ -407,7 +407,7 @@ git status   # ensure you’re in the repo root
 pnpm install
 pnpm build
 clawdbot doctor
-clawdbot daemon restart
+clawdbot gateway restart
 ```
 
 Why: pnpm is the configured package manager for this repo.
@@ -432,7 +432,7 @@ Notes:
 - After switching, run:
   ```bash
   clawdbot doctor
-  clawdbot daemon restart
+  clawdbot gateway restart
   ```
 
 ### Telegram block streaming isn’t splitting text between tool calls. Why?
@@ -507,8 +507,8 @@ The app connects to a local gateway on port `18789`. If it stays stuck:
 **Fix 1: Stop the supervisor (preferred)**
 If the gateway is supervised by launchd, killing the PID will just respawn it. Stop the supervisor first:
 ```bash
-clawdbot daemon status
-clawdbot daemon stop
+clawdbot gateway status
+clawdbot gateway stop
 # Or: launchctl bootout gui/$UID/com.clawdbot.gateway (replace with com.clawdbot.<profile> if needed)
 ```
 
@@ -558,9 +558,9 @@ clawdbot channels login --verbose
 
 ```bash
 # Supervisor + probe target + config paths
-clawdbot daemon status
+clawdbot gateway status
 # Include system-level scans (legacy/extra services, port listeners)
-clawdbot daemon status --deep
+clawdbot gateway status --deep
 
 # Is the gateway reachable?
 clawdbot health --json
@@ -581,13 +581,13 @@ tail -20 /tmp/clawdbot/clawdbot-*.log
 Nuclear option:
 
 ```bash
-clawdbot daemon stop
+clawdbot gateway stop
 # If you installed a service and want a clean install:
-# clawdbot daemon uninstall
+# clawdbot gateway uninstall
 
 trash "${CLAWDBOT_STATE_DIR:-$HOME/.clawdbot}"
 clawdbot channels login         # re-pair WhatsApp
-clawdbot daemon restart           # or: clawdbot gateway
+clawdbot gateway restart           # or: clawdbot gateway
 ```
 
 ⚠️ This loses all sessions and requires re-pairing WhatsApp.
diff --git a/docs/help/troubleshooting.md b/docs/help/troubleshooting.md
index 6d28b7294..b6219a924 100644
--- a/docs/help/troubleshooting.md
+++ b/docs/help/troubleshooting.md
@@ -14,7 +14,7 @@ Run these in order:
 ```bash
 clawdbot status
 clawdbot status --all
-clawdbot daemon status
+clawdbot gateway probe
 clawdbot logs --follow
 clawdbot doctor
 ```
@@ -38,10 +38,10 @@ Almost always a Node/npm PATH issue. Start here:
 - [Gateway troubleshooting](/gateway/troubleshooting)
 - [Gateway authentication](/gateway/authentication)
 
-### Daemon says running, but RPC probe fails
+### Service says running, but RPC probe fails
 
 - [Gateway troubleshooting](/gateway/troubleshooting)
-- [Background process / daemon](/gateway/background-process)
+- [Background process / service](/gateway/background-process)
 
 ### Model/auth failures (rate limit, billing, “all models failed”)
 
diff --git a/docs/index.md b/docs/index.md
index 293609031..088522bfa 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -103,13 +103,13 @@ Runtime requirement: **Node ≥ 22**.
 npm install -g clawdbot@latest
 # or: pnpm add -g clawdbot@latest
 
-# Onboard + install the daemon (launchd/systemd user service)
+# Onboard + install the service (launchd/systemd user service)
 clawdbot onboard --install-daemon
 
 # Pair WhatsApp Web (shows QR)
 clawdbot channels login
 
-# Gateway runs via daemon after onboarding; manual run is still possible:
+# Gateway runs via the service after onboarding; manual run is still possible:
 clawdbot gateway --port 18789
 ```
 
diff --git a/docs/install/uninstall.md b/docs/install/uninstall.md
index c179438a1..5849a6780 100644
--- a/docs/install/uninstall.md
+++ b/docs/install/uninstall.md
@@ -31,13 +31,13 @@ Manual steps (same result):
 1) Stop the gateway service:
 
 ```bash
-clawdbot daemon stop
+clawdbot gateway stop
 ```
 
 2) Uninstall the gateway service (launchd/systemd/schtasks):
 
 ```bash
-clawdbot daemon uninstall
+clawdbot gateway uninstall
 ```
 
 3) Delete state + config:
diff --git a/docs/install/updating.md b/docs/install/updating.md
index 327975f50..f0efcae2a 100644
--- a/docs/install/updating.md
+++ b/docs/install/updating.md
@@ -68,12 +68,12 @@ Then:
 
 ```bash
 clawdbot doctor
-clawdbot daemon restart
+clawdbot gateway restart
 clawdbot health
 ```
 
 Notes:
-- If your Gateway runs as a service, `clawdbot daemon restart` is preferred over killing PIDs.
+- If your Gateway runs as a service, `clawdbot gateway restart` is preferred over killing PIDs.
 - If you’re pinned to a specific version, see “Rollback / pinning” below.
 
 ## Update (`clawdbot update`)
@@ -148,9 +148,9 @@ Details: [Doctor](/gateway/doctor)
 CLI (works regardless of OS):
 
 ```bash
-clawdbot daemon status
-clawdbot daemon stop
-clawdbot daemon restart
+clawdbot gateway status
+clawdbot gateway stop
+clawdbot gateway restart
 clawdbot gateway --port 18789
 clawdbot logs --follow
 ```
@@ -159,7 +159,7 @@ If you’re supervised:
 - macOS launchd (app-bundled LaunchAgent): `launchctl kickstart -k gui/$UID/com.clawdbot.gateway` (use `com.clawdbot.<profile>` if set)
 - Linux systemd user service: `systemctl --user restart clawdbot-gateway[-<profile>].service`
 - Windows (WSL2): `systemctl --user restart clawdbot-gateway[-<profile>].service`
-  - `launchctl`/`systemctl` only work if the service is installed; otherwise run `clawdbot daemon install`.
+  - `launchctl`/`systemctl` only work if the service is installed; otherwise run `clawdbot gateway install`.
 
 Runbook + exact service labels: [Gateway runbook](/gateway)
 
@@ -183,7 +183,7 @@ Then restart + re-run doctor:
 
 ```bash
 clawdbot doctor
-clawdbot daemon restart
+clawdbot gateway restart
 ```
 
 ### Pin (source) by date
@@ -200,7 +200,7 @@ Then reinstall deps + restart:
 ```bash
 pnpm install
 pnpm build
-clawdbot daemon restart
+clawdbot gateway restart
 ```
 
 If you want to go back to latest later:
diff --git a/docs/nodes/index.md b/docs/nodes/index.md
index 9096cb7d9..6bb48a3e9 100644
--- a/docs/nodes/index.md
+++ b/docs/nodes/index.md
@@ -13,7 +13,7 @@ A **node** is a companion device (iOS/Android today) that connects to the Gatewa
 macOS can also run in **node mode**: the menubar app connects to the Gateway’s bridge and exposes its local canvas/camera commands as a node (so `clawdbot nodes …` works against this Mac).
 
 Notes:
-- Nodes are **peripherals**, not gateways. They don’t run the gateway daemon.
+- Nodes are **peripherals**, not gateways. They don’t run the gateway service.
 - Telegram/WhatsApp/etc. messages land on the **gateway**, not on nodes.
 
 ## Pairing + status
diff --git a/docs/platforms/exe-dev.md b/docs/platforms/exe-dev.md
index 813c45da8..c4fcfdd76 100644
--- a/docs/platforms/exe-dev.md
+++ b/docs/platforms/exe-dev.md
@@ -97,7 +97,7 @@ It can set up:
 - `~/.clawdbot/clawdbot.json` config
 - model auth profiles
 - model provider config/login
-- Linux systemd **user** service (daemon)
+- Linux systemd **user** service (service)
 
 If you’re doing OAuth on a headless VM: do OAuth on a normal machine first, then copy the auth profile to the VM (see [Help](/help)).
 
@@ -125,7 +125,7 @@ export CLAWDBOT_GATEWAY_TOKEN="$(openssl rand -hex 32)"
 clawdbot gateway --bind lan --port 8080 --token "$CLAWDBOT_GATEWAY_TOKEN"
 ```
 
-For daemon runs, persist it in `~/.clawdbot/clawdbot.json`:
+For service runs, persist it in `~/.clawdbot/clawdbot.json`:
 
 ```json5
 {
@@ -159,7 +159,7 @@ Notes:
 
 Control UI details: [Control UI](/web/control-ui)
 
-## 6) Keep it running (daemon)
+## 6) Keep it running (service)
 
 On Linux, Clawdbot uses a systemd **user** service. After `--install-daemon`, verify:
 
@@ -180,7 +180,7 @@ More: [Linux](/platforms/linux)
 ```bash
 npm i -g clawdbot@latest
 clawdbot doctor
-clawdbot daemon restart
+clawdbot gateway restart
 clawdbot health
 ```
 
diff --git a/docs/platforms/index.md b/docs/platforms/index.md
index 6501e1315..d646b2026 100644
--- a/docs/platforms/index.md
+++ b/docs/platforms/index.md
@@ -31,15 +31,15 @@ Native companion apps for Windows are also planned; the Gateway is recommended v
 - Install guide: [Getting Started](/start/getting-started)
 - Gateway runbook: [Gateway](/gateway)
 - Gateway configuration: [Configuration](/gateway/configuration)
-- Service status: `clawdbot daemon status`
+- Service status: `clawdbot gateway status`
 
 ## Gateway service install (CLI)
 
 Use one of these (all supported):
 
 - Wizard (recommended): `clawdbot onboard --install-daemon`
-- Direct: `clawdbot daemon install`
-- Configure flow: `clawdbot configure` → select **Gateway daemon**
+- Direct: `clawdbot gateway install`
+- Configure flow: `clawdbot configure` → select **Gateway service**
 - Repair/migrate: `clawdbot doctor` (offers to install or fix the service)
 
 The service target depends on OS:
diff --git a/docs/platforms/linux.md b/docs/platforms/linux.md
index d6cb44549..1184eca8a 100644
--- a/docs/platforms/linux.md
+++ b/docs/platforms/linux.md
@@ -41,7 +41,7 @@ clawdbot onboard --install-daemon
 Or:
 
 ```
-clawdbot daemon install
+clawdbot gateway install
 ```
 
 Or:
@@ -50,7 +50,7 @@ Or:
 clawdbot configure
 ```
 
-Select **Gateway daemon** when prompted.
+Select **Gateway service** when prompted.
 
 Repair/migrate:
 
diff --git a/docs/platforms/mac/bundled-gateway.md b/docs/platforms/mac/bundled-gateway.md
index c9d2b9c0d..ae60e5e41 100644
--- a/docs/platforms/mac/bundled-gateway.md
+++ b/docs/platforms/mac/bundled-gateway.md
@@ -34,7 +34,7 @@ Plist location (per‑user):
 
 Manager:
 - The macOS app owns LaunchAgent install/update in Local mode.
-- The CLI can also install it: `clawdbot daemon install`.
+- The CLI can also install it: `clawdbot gateway install`.
 
 Behavior:
 - “Clawdbot Active” enables/disables the LaunchAgent.
diff --git a/docs/platforms/mac/dev-setup.md b/docs/platforms/mac/dev-setup.md
index 01e65da7d..79d23abb5 100644
--- a/docs/platforms/mac/dev-setup.md
+++ b/docs/platforms/mac/dev-setup.md
@@ -82,8 +82,8 @@ If the app crashes when you try to allow **Speech Recognition** or **Microphone*
 If the gateway status stays on "Starting...", check if a zombie process is holding the port:
 
 ```bash
-clawdbot daemon status
-clawdbot daemon stop
+clawdbot gateway status
+clawdbot gateway stop
 
 # If you’re not using a LaunchAgent (dev mode / manual runs), find the listener:
 lsof -nP -iTCP:18789 -sTCP:LISTEN
diff --git a/docs/platforms/macos.md b/docs/platforms/macos.md
index 67b7c84cb..b1540def8 100644
--- a/docs/platforms/macos.md
+++ b/docs/platforms/macos.md
@@ -24,7 +24,7 @@ capabilities to the agent as a node.
 ## Local vs remote mode
 
 - **Local** (default): the app attaches to a running local Gateway if present;
-  otherwise it enables the launchd service via `clawdbot daemon`.
+  otherwise it enables the launchd service via `clawdbot gateway install`.
 - **Remote**: the app connects to a Gateway over SSH/Tailscale and never starts
   a local process.
   The app starts the local **node host service** so the remote Gateway can reach this Mac.
@@ -43,7 +43,7 @@ launchctl bootout gui/$UID/com.clawdbot.gateway
 Replace the label with `com.clawdbot.<profile>` when running a named profile.
 
 If the LaunchAgent isn’t installed, enable it from the app or run
-`clawdbot daemon install`.
+`clawdbot gateway install`.
 
 ## Node capabilities (mac)
 
diff --git a/docs/platforms/windows.md b/docs/platforms/windows.md
index e737b64c9..30f8714e0 100644
--- a/docs/platforms/windows.md
+++ b/docs/platforms/windows.md
@@ -32,7 +32,7 @@ clawdbot onboard --install-daemon
 Or:
 
 ```
-clawdbot daemon install
+clawdbot gateway install
 ```
 
 Or:
@@ -41,7 +41,7 @@ Or:
 clawdbot configure
 ```
 
-Select **Gateway daemon** when prompted.
+Select **Gateway service** when prompted.
 
 Repair/migrate:
 
@@ -108,7 +108,7 @@ wsl --install -d Ubuntu-24.04
 
 Reboot if Windows asks.
 
-### 2) Enable systemd (required for daemon install)
+### 2) Enable systemd (required for gateway install)
 
 In your WSL terminal:
 
diff --git a/docs/refactor/strict-config.md b/docs/refactor/strict-config.md
index 01578d2c5..734290daf 100644
--- a/docs/refactor/strict-config.md
+++ b/docs/refactor/strict-config.md
@@ -54,7 +54,7 @@ Allowed (diagnostic-only):
 - `clawdbot health`
 - `clawdbot help`
 - `clawdbot status`
-- `clawdbot daemon`
+- `clawdbot gateway status`
 
 Everything else must hard-fail with: “Config invalid. Run `clawdbot doctor --fix`.”
 
diff --git a/docs/start/faq.md b/docs/start/faq.md
index 0158f405e..92b6c645e 100644
--- a/docs/start/faq.md
+++ b/docs/start/faq.md
@@ -59,14 +59,14 @@ Quick answers plus deeper troubleshooting for real-world setups (local dev, VPS,
   - [How do I use Brave for browser control?](#how-do-i-use-brave-for-browser-control)
 - [Remote gateways + nodes](#remote-gateways-nodes)
   - [How do commands propagate between Telegram, the gateway, and nodes?](#how-do-commands-propagate-between-telegram-the-gateway-and-nodes)
-  - [Do nodes run a gateway daemon?](#do-nodes-run-a-gateway-daemon)
+  - [Do nodes run a gateway service?](#do-nodes-run-a-gateway-service)
   - [Is there an API / RPC way to apply config?](#is-there-an-api-rpc-way-to-apply-config)
   - [What’s a minimal “sane” config for a first install?](#whats-a-minimal-sane-config-for-a-first-install)
   - [How do I set up Tailscale on a VPS and connect from my Mac?](#how-do-i-set-up-tailscale-on-a-vps-and-connect-from-my-mac)
   - [How do I connect a Mac node to a remote Gateway (Tailscale Serve)?](#how-do-i-connect-a-mac-node-to-a-remote-gateway-tailscale-serve)
 - [Env vars and .env loading](#env-vars-and-env-loading)
   - [How does Clawdbot load environment variables?](#how-does-clawdbot-load-environment-variables)
-  - [“I started the Gateway via a daemon and my env vars disappeared.” What now?](#i-started-the-gateway-via-a-daemon-and-my-env-vars-disappeared-what-now)
+  - [“I started the Gateway via the service and my env vars disappeared.” What now?](#i-started-the-gateway-via-the-service-and-my-env-vars-disappeared-what-now)
   - [I set `COPILOT_GITHUB_TOKEN`, but models status shows “Shell env: off.” Why?](#i-set-copilot_github_token-but-models-status-shows-shell-env-off-why)
 - [Sessions & multiple chats](#sessions-multiple-chats)
   - [How do I start a fresh conversation?](#how-do-i-start-a-fresh-conversation)
@@ -100,8 +100,8 @@ Quick answers plus deeper troubleshooting for real-world setups (local dev, VPS,
   - [OAuth vs API key: what’s the difference?](#oauth-vs-api-key-whats-the-difference)
 - [Gateway: ports, “already running”, and remote mode](#gateway-ports-already-running-and-remote-mode)
   - [What port does the Gateway use?](#what-port-does-the-gateway-use)
-  - [Why does `clawdbot daemon status` say `Runtime: running` but `RPC probe: failed`?](#why-does-clawdbot-daemon-status-say-runtime-running-but-rpc-probe-failed)
-  - [Why does `clawdbot daemon status` show `Config (cli)` and `Config (daemon)` different?](#why-does-clawdbot-daemon-status-show-config-cli-and-config-daemon-different)
+  - [Why does `clawdbot gateway status` say `Runtime: running` but `RPC probe: failed`?](#why-does-clawdbot-gateway-status-say-runtime-running-but-rpc-probe-failed)
+  - [Why does `clawdbot gateway status` show `Config (cli)` and `Config (service)` different?](#why-does-clawdbot-gateway-status-show-config-cli-and-config-service-different)
   - [What does “another gateway instance is already listening” mean?](#what-does-another-gateway-instance-is-already-listening-mean)
   - [How do I run Clawdbot in remote mode (client connects to a Gateway elsewhere)?](#how-do-i-run-clawdbot-in-remote-mode-client-connects-to-a-gateway-elsewhere)
   - [The Control UI says “unauthorized” (or keeps reconnecting). What now?](#the-control-ui-says-unauthorized-or-keeps-reconnecting-what-now)
@@ -110,8 +110,8 @@ Quick answers plus deeper troubleshooting for real-world setups (local dev, VPS,
   - [What does “invalid handshake” / code 1008 mean?](#what-does-invalid-handshake--code-1008-mean)
 - [Logging and debugging](#logging-and-debugging)
   - [Where are logs?](#where-are-logs)
-  - [How do I start/stop/restart the Gateway daemon?](#how-do-i-startstoprestart-the-gateway-daemon)
-  - [ELI5: `clawdbot daemon restart` vs `clawdbot gateway`](#eli5-clawdbot-daemon-restart-vs-clawdbot-gateway)
+  - [How do I start/stop/restart the Gateway service?](#how-do-i-startstoprestart-the-gateway-service)
+  - [ELI5: `clawdbot gateway restart` vs `clawdbot gateway`](#eli5-clawdbot-gateway-restart-vs-clawdbot-gateway)
   - [What’s the fastest way to get more details when something fails?](#whats-the-fastest-way-to-get-more-details-when-something-fails)
 - [Media & attachments](#media-attachments)
   - [My skill generated an image/PDF, but nothing was sent](#my-skill-generated-an-imagepdf-but-nothing-was-sent)
@@ -129,7 +129,7 @@ Quick answers plus deeper troubleshooting for real-world setups (local dev, VPS,
    ```bash
    clawdbot status
    ```
-   Fast local summary: OS + update, gateway/daemon reachability, agents/sessions, provider config + runtime issues (when gateway is reachable).
+   Fast local summary: OS + update, gateway/service reachability, agents/sessions, provider config + runtime issues (when gateway is reachable).
 
 2) **Pasteable report (safe to share)**
    ```bash
@@ -139,9 +139,9 @@ Quick answers plus deeper troubleshooting for real-world setups (local dev, VPS,
 
 3) **Daemon + port state**
    ```bash
-   clawdbot daemon status
+   clawdbot gateway status
    ```
-   Shows supervisor runtime vs RPC reachability, the probe target URL, and which config the daemon likely used.
+   Shows supervisor runtime vs RPC reachability, the probe target URL, and which config the service likely used.
 
 4) **Deep probes**
    ```bash
@@ -335,7 +335,7 @@ cd clawdbot
 pnpm install
 pnpm build
 clawdbot doctor
-clawdbot daemon restart
+clawdbot gateway restart
 ```
 
 From git → npm:
@@ -343,7 +343,7 @@ From git → npm:
 ```bash
 npm install -g clawdbot@latest
 clawdbot doctor
-clawdbot daemon restart
+clawdbot gateway restart
 ```
 
 Doctor detects a gateway service entrypoint mismatch and offers to rewrite the service config to match the current install (use `--repair` in automation).
@@ -748,7 +748,7 @@ pair devices you trust, and review [Security](/gateway/security).
 
 Docs: [Nodes](/nodes), [Bridge protocol](/gateway/bridge-protocol), [macOS remote mode](/platforms/mac/remote), [Security](/gateway/security).
 
-### Do nodes run a gateway daemon?
+### Do nodes run a gateway service?
 
 No. Only **one gateway** should run per host unless you intentionally run isolated profiles (see [Multiple gateways](/gateway/multiple-gateways)). Nodes are peripherals that connect
 to the gateway (iOS/Android nodes, or macOS “node mode” in the menubar app).
@@ -840,11 +840,11 @@ You can also define inline env vars in config (applied only if missing from the
 
 See [/environment](/environment) for full precedence and sources.
 
-### “I started the Gateway via a daemon and my env vars disappeared.” What now?
+### “I started the Gateway via a service and my env vars disappeared.” What now?
 
 Two common fixes:
 
-1) Put the missing keys in `~/.clawdbot/.env` so they’re picked up even when the daemon doesn’t inherit your shell env.
+1) Put the missing keys in `~/.clawdbot/.env` so they’re picked up even when the service doesn’t inherit your shell env.
 2) Enable shell import (opt‑in convenience):
 
 ```json5
@@ -867,7 +867,7 @@ This runs your login shell and imports only missing expected keys (never overrid
 does **not** mean your env vars are missing — it just means Clawdbot won’t load
 your login shell automatically.
 
-If the Gateway runs as a daemon (launchd/systemd), it won’t inherit your shell
+If the Gateway runs as a service (launchd/systemd), it won’t inherit your shell
 environment. Fix by doing one of these:
 
 1) Put the token in `~/.clawdbot/.env`:
@@ -1345,24 +1345,24 @@ Precedence:
 --port > CLAWDBOT_GATEWAY_PORT > gateway.port > default 18789
 ```
 
-### Why does `clawdbot daemon status` say `Runtime: running` but `RPC probe: failed`?
+### Why does `clawdbot gateway status` say `Runtime: running` but `RPC probe: failed`?
 
 Because “running” is the **supervisor’s** view (launchd/systemd/schtasks). The RPC probe is the CLI actually connecting to the gateway WebSocket and calling `status`.
 
-Use `clawdbot daemon status` and trust these lines:
+Use `clawdbot gateway status` and trust these lines:
 - `Probe target:` (the URL the probe actually used)
 - `Listening:` (what’s actually bound on the port)
 - `Last gateway error:` (common root cause when the process is alive but the port isn’t listening)
 
-### Why does `clawdbot daemon status` show `Config (cli)` and `Config (daemon)` different?
+### Why does `clawdbot gateway status` show `Config (cli)` and `Config (service)` different?
 
-You’re editing one config file while the daemon is running another (often a `--profile` / `CLAWDBOT_STATE_DIR` mismatch).
+You’re editing one config file while the service is running another (often a `--profile` / `CLAWDBOT_STATE_DIR` mismatch).
 
 Fix:
 ```bash
-clawdbot daemon install --force
+clawdbot gateway install --force
 ```
-Run that from the same `--profile` / environment you want the daemon to use.
+Run that from the same `--profile` / environment you want the service to use.
 
 ### What does “another gateway instance is already listening” mean?
 
@@ -1431,7 +1431,7 @@ Yes, but you must isolate:
 Quick setup (recommended):
 - Use `clawdbot --profile <name> …` per instance (auto-creates `~/.clawdbot-<name>`).
 - Set a unique `gateway.port` in each profile config (or pass `--port` for manual runs).
-- Install a per-profile daemon: `clawdbot --profile <name> daemon install`.
+- Install a per-profile service: `clawdbot --profile <name> gateway install`.
 
 Profiles also suffix service names (`com.clawdbot.<profile>`, `clawdbot-gateway-<profile>.service`, `Clawdbot Gateway (<profile>)`).
 Full guide: [Multiple gateways](/gateway/multiple-gateways).
@@ -1484,23 +1484,23 @@ Service/supervisor logs (when the gateway runs via launchd/systemd):
 
 See [Troubleshooting](/gateway/troubleshooting#log-locations) for more.
 
-### How do I start/stop/restart the Gateway daemon?
+### How do I start/stop/restart the Gateway service?
 
-Use the daemon helpers:
+Use the gateway helpers:
 
 ```bash
-clawdbot daemon status
-clawdbot daemon restart
+clawdbot gateway status
+clawdbot gateway restart
 ```
 
 If you run the gateway manually, `clawdbot gateway --force` can reclaim the port. See [Gateway](/gateway).
 
-### ELI5: `clawdbot daemon restart` vs `clawdbot gateway`
+### ELI5: `clawdbot gateway restart` vs `clawdbot gateway`
 
-- `clawdbot daemon restart`: restarts the **background service** (launchd/systemd).
+- `clawdbot gateway restart`: restarts the **background service** (launchd/systemd).
 - `clawdbot gateway`: runs the gateway **in the foreground** for this terminal session.
 
-If you installed the daemon, use the daemon commands. Use `clawdbot gateway` when
+If you installed the service, use the gateway commands. Use `clawdbot gateway` when
 you want a one-off, foreground run.
 
 ### What’s the fastest way to get more details when something fails?
diff --git a/docs/start/getting-started.md b/docs/start/getting-started.md
index aa890eac5..85371b58b 100644
--- a/docs/start/getting-started.md
+++ b/docs/start/getting-started.md
@@ -15,7 +15,7 @@ Recommended path: use the **CLI onboarding wizard** (`clawdbot onboard`). It set
 - channels (WhatsApp/Telegram/Discord/…)
 - pairing defaults (secure DMs)
 - workspace bootstrap + skills
-- optional background daemon
+- optional background service
 
 If you want the deeper reference pages, jump to: [Wizard](/start/wizard), [Setup](/start/setup), [Pairing](/start/pairing), [Security](/gateway/security).
 
@@ -71,7 +71,7 @@ npm install -g clawdbot@latest
 pnpm add -g clawdbot@latest
 ```
 
-## 2) Run the onboarding wizard (and install the daemon)
+## 2) Run the onboarding wizard (and install the service)
 
 ```bash
 clawdbot onboard --install-daemon
@@ -89,7 +89,7 @@ Wizard doc: [Wizard](/start/wizard)
 
 ### Auth: where it lives (important)
 
-- **Recommended Anthropic path:** set an API key (wizard can store it for daemon use). `claude setup-token` is also supported if you want to reuse Claude Code credentials.
+- **Recommended Anthropic path:** set an API key (wizard can store it for service use). `claude setup-token` is also supported if you want to reuse Claude Code credentials.
 
 - OAuth credentials (legacy import): `~/.clawdbot/credentials/oauth.json`
 - Auth profiles (OAuth + API keys): `~/.clawdbot/agents/<agentId>/agent/auth-profiles.json`
@@ -98,10 +98,10 @@ Headless/server tip: do OAuth on a normal machine first, then copy `oauth.json`
 
 ## 3) Start the Gateway
 
-If you installed the daemon during onboarding, the Gateway should already be running:
+If you installed the service during onboarding, the Gateway should already be running:
 
 ```bash
-clawdbot daemon status
+clawdbot gateway status
 ```
 
 Manual run (foreground):
diff --git a/docs/tools/web.md b/docs/tools/web.md
index cf1738570..040c0f389 100644
--- a/docs/tools/web.md
+++ b/docs/tools/web.md
@@ -83,7 +83,7 @@ current limits and pricing.
 `~/.clawdbot/clawdbot.json` under `tools.web.search.apiKey`.
 
 **Environment alternative:** set `BRAVE_API_KEY` in the Gateway process
-environment. For a daemon install, put it in `~/.clawdbot/.env` (or your
+environment. For a gateway install, put it in `~/.clawdbot/.env` (or your
 service environment). See [Env vars](/start/faq#how-does-clawdbot-load-environment-variables).
 
 ## Using Perplexity (direct or via OpenRouter)
@@ -122,7 +122,7 @@ crypto/prepaid).
 ```
 
 **Environment alternative:** set `OPENROUTER_API_KEY` or `PERPLEXITY_API_KEY` in the Gateway
-environment. For a daemon install, put it in `~/.clawdbot/.env`.
+environment. For a gateway install, put it in `~/.clawdbot/.env`.
 
 If no base URL is set, Clawdbot chooses a default based on the API key source:
 

From 9605ad76c55449bceea573f5f6da8c06b46a3ebe Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:45:18 +0000
Subject: [PATCH 030/171] fix: preserve fetch preconnect in abort wrapper

---
 src/infra/fetch.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/infra/fetch.ts b/src/infra/fetch.ts
index 70ab6f614..9cd10c25f 100644
--- a/src/infra/fetch.ts
+++ b/src/infra/fetch.ts
@@ -1,3 +1,7 @@
+type FetchWithPreconnect = typeof fetch & {
+  preconnect: (url: string, init?: { credentials?: RequestCredentials }) => void;
+};
+
 export function wrapFetchWithAbortSignal(fetchImpl: typeof fetch): typeof fetch {
   const wrapped = ((input: RequestInfo | URL, init?: RequestInit) => {
     const signal = init?.signal;
@@ -25,7 +29,11 @@ export function wrapFetchWithAbortSignal(fetchImpl: typeof fetch): typeof fetch
       });
     }
     return response;
-  }) as typeof fetch;
+  }) as FetchWithPreconnect;
+
+  wrapped.preconnect =
+    typeof fetchImpl.preconnect === "function" ? fetchImpl.preconnect.bind(fetchImpl) : () => {};
+
   return Object.assign(wrapped, fetchImpl);
 }
 

From 9b47f463b73268c2efdd203815b27eaf6b812c1d Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:46:30 +0000
Subject: [PATCH 031/171] chore: rename gateway daemon prompts

---
 src/cli/program/register.onboard.ts |  6 ++---
 src/wizard/onboarding.finalize.ts   | 36 ++++++++++++++---------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/cli/program/register.onboard.ts b/src/cli/program/register.onboard.ts
index 4f1005304..9b1ebed06 100644
--- a/src/cli/program/register.onboard.ts
+++ b/src/cli/program/register.onboard.ts
@@ -84,9 +84,9 @@ export function registerOnboardCommand(program: Command) {
     .option("--remote-token <token>", "Remote Gateway token (optional)")
     .option("--tailscale <mode>", "Tailscale: off|serve|funnel")
     .option("--tailscale-reset-on-exit", "Reset tailscale serve/funnel on exit")
-    .option("--install-daemon", "Install gateway daemon")
-    .option("--no-install-daemon", "Skip gateway daemon install")
-    .option("--skip-daemon", "Skip gateway daemon install")
+    .option("--install-daemon", "Install gateway service")
+    .option("--no-install-daemon", "Skip gateway service install")
+    .option("--skip-daemon", "Skip gateway service install")
     .option("--daemon-runtime <runtime>", "Daemon runtime: node|bun")
     .option("--skip-channels", "Skip channel setup")
     .option("--skip-skills", "Skip skills setup")
diff --git a/src/wizard/onboarding.finalize.ts b/src/wizard/onboarding.finalize.ts
index 717446017..09240bb55 100644
--- a/src/wizard/onboarding.finalize.ts
+++ b/src/wizard/onboarding.finalize.ts
@@ -64,7 +64,7 @@ export async function finalizeOnboardingWizard(options: FinalizeOnboardingOption
     process.platform === "linux" ? await isSystemdUserServiceAvailable() : true;
   if (process.platform === "linux" && !systemdAvailable) {
     await prompter.note(
-      "Systemd user services are unavailable. Skipping lingering checks and daemon install.",
+      "Systemd user services are unavailable. Skipping lingering checks and service install.",
       "Systemd",
     );
   }
@@ -94,15 +94,15 @@ export async function finalizeOnboardingWizard(options: FinalizeOnboardingOption
     installDaemon = true;
   } else {
     installDaemon = await prompter.confirm({
-      message: "Install Gateway daemon (recommended)",
+      message: "Install Gateway service (recommended)",
       initialValue: true,
     });
   }
 
   if (process.platform === "linux" && !systemdAvailable && installDaemon) {
     await prompter.note(
-      "Systemd user services are unavailable; skipping daemon install. Use your container supervisor or `docker compose up -d`.",
-      "Gateway daemon",
+      "Systemd user services are unavailable; skipping service install. Use your container supervisor or `docker compose up -d`.",
+      "Gateway service",
     );
     installDaemon = false;
   }
@@ -112,14 +112,14 @@ export async function finalizeOnboardingWizard(options: FinalizeOnboardingOption
       flow === "quickstart"
         ? (DEFAULT_GATEWAY_DAEMON_RUNTIME as GatewayDaemonRuntime)
         : ((await prompter.select({
-            message: "Gateway daemon runtime",
+            message: "Gateway service runtime",
             options: GATEWAY_DAEMON_RUNTIME_OPTIONS,
             initialValue: opts.daemonRuntime ?? DEFAULT_GATEWAY_DAEMON_RUNTIME,
           })) as GatewayDaemonRuntime);
     if (flow === "quickstart") {
       await prompter.note(
-        "QuickStart uses Node for the Gateway daemon (stable + supported).",
-        "Gateway daemon runtime",
+        "QuickStart uses Node for the Gateway service (stable + supported).",
+        "Gateway service runtime",
       );
     }
     const service = resolveGatewayService();
@@ -135,10 +135,10 @@ export async function finalizeOnboardingWizard(options: FinalizeOnboardingOption
       })) as "restart" | "reinstall" | "skip";
       if (action === "restart") {
         await withWizardProgress(
-          "Gateway daemon",
-          { doneMessage: "Gateway daemon restarted." },
+          "Gateway service",
+          { doneMessage: "Gateway service restarted." },
           async (progress) => {
-            progress.update("Restarting Gateway daemon…");
+            progress.update("Restarting Gateway service…");
             await service.restart({
               env: process.env,
               stdout: process.stdout,
@@ -147,10 +147,10 @@ export async function finalizeOnboardingWizard(options: FinalizeOnboardingOption
         );
       } else if (action === "reinstall") {
         await withWizardProgress(
-          "Gateway daemon",
-          { doneMessage: "Gateway daemon uninstalled." },
+          "Gateway service",
+          { doneMessage: "Gateway service uninstalled." },
           async (progress) => {
-            progress.update("Uninstalling Gateway daemon…");
+            progress.update("Uninstalling Gateway service…");
             await service.uninstall({ env: process.env, stdout: process.stdout });
           },
         );
@@ -158,10 +158,10 @@ export async function finalizeOnboardingWizard(options: FinalizeOnboardingOption
     }
 
     if (!loaded || (loaded && (await service.isLoaded({ env: process.env })) === false)) {
-      const progress = prompter.progress("Gateway daemon");
+      const progress = prompter.progress("Gateway service");
       let installError: string | null = null;
       try {
-        progress.update("Preparing Gateway daemon…");
+        progress.update("Preparing Gateway service…");
         const { programArguments, workingDirectory, environment } = await buildGatewayInstallPlan({
           env: process.env,
           port: settings.port,
@@ -170,7 +170,7 @@ export async function finalizeOnboardingWizard(options: FinalizeOnboardingOption
           warn: (message, title) => prompter.note(message, title),
         });
 
-        progress.update("Installing Gateway daemon…");
+        progress.update("Installing Gateway service…");
         await service.install({
           env: process.env,
           stdout: process.stdout,
@@ -182,11 +182,11 @@ export async function finalizeOnboardingWizard(options: FinalizeOnboardingOption
         installError = err instanceof Error ? err.message : String(err);
       } finally {
         progress.stop(
-          installError ? "Gateway daemon install failed." : "Gateway daemon installed.",
+          installError ? "Gateway service install failed." : "Gateway service installed.",
         );
       }
       if (installError) {
-        await prompter.note(`Gateway daemon install failed: ${installError}`, "Gateway");
+        await prompter.note(`Gateway service install failed: ${installError}`, "Gateway");
         await prompter.note(gatewayInstallErrorHint(), "Gateway");
       }
     }

From 64d29b0c310ca73f1b6b8716c2d317e3d038b528 Mon Sep 17 00:00:00 2001
From: Wimmie <wimmie@tameson.com>
Date: Tue, 20 Jan 2026 20:49:40 +0000
Subject: [PATCH 032/171] feat(discord): add wildcard channel config support

Add support for '*' wildcard in Discord channel configuration,
matching the existing guild-level wildcard behavior.

This allows applying default channel settings (like autoThread)
to all channels without listing each one explicitly:

  guilds:
    '*':
      channels:
        '*': { autoThread: true }

Specific channel configs still take precedence over the wildcard.
---
 src/discord/monitor.test.ts       | 30 ++++++++++++++++++++++++++++++
 src/discord/monitor/allow-list.ts | 14 +++++++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/discord/monitor.test.ts b/src/discord/monitor.test.ts
index 6d3565b66..e5c3ad347 100644
--- a/src/discord/monitor.test.ts
+++ b/src/discord/monitor.test.ts
@@ -281,6 +281,36 @@ describe("discord guild/channel resolution", () => {
     });
     expect(thread?.allowed).toBe(false);
   });
+
+  it("applies wildcard channel config when no specific match", () => {
+    const guildInfo: DiscordGuildEntryResolved = {
+      channels: {
+        general: { allow: true, requireMention: false },
+        "*": { allow: true, autoThread: true, requireMention: true },
+      },
+    };
+    // Specific channel should NOT use wildcard
+    const general = resolveDiscordChannelConfig({
+      guildInfo,
+      channelId: "123",
+      channelName: "general",
+      channelSlug: "general",
+    });
+    expect(general?.allowed).toBe(true);
+    expect(general?.requireMention).toBe(false);
+    expect(general?.autoThread).toBeUndefined();
+
+    // Unknown channel should use wildcard
+    const random = resolveDiscordChannelConfig({
+      guildInfo,
+      channelId: "999",
+      channelName: "random",
+      channelSlug: "random",
+    });
+    expect(random?.allowed).toBe(true);
+    expect(random?.autoThread).toBe(true);
+    expect(random?.requireMention).toBe(true);
+  });
 });
 
 describe("discord mention gating", () => {
diff --git a/src/discord/monitor/allow-list.ts b/src/discord/monitor/allow-list.ts
index 0b4914e1c..b3dc048e7 100644
--- a/src/discord/monitor/allow-list.ts
+++ b/src/discord/monitor/allow-list.ts
@@ -234,7 +234,14 @@ export function resolveDiscordChannelConfig(params: {
     name: channelName,
     slug: channelSlug,
   });
-  if (!match.entry || !match.matchKey) return { allowed: false };
+  if (!match.entry || !match.matchKey) {
+    // Wildcard fallback: apply to all channels if "*" is configured
+    const wildcard = channels["*"];
+    if (wildcard) {
+      return resolveDiscordChannelConfigEntry(wildcard, "*", "direct");
+    }
+    return { allowed: false };
+  }
   return resolveDiscordChannelConfigEntry(match.entry, match.matchKey, "direct");
 }
 
@@ -284,6 +291,11 @@ export function resolveDiscordChannelConfigWithFallback(params: {
       match.matchSource === "parent" ? "parent" : "direct",
     );
   }
+  // Wildcard fallback: apply to all channels if "*" is configured
+  const wildcard = channels["*"];
+  if (wildcard) {
+    return resolveDiscordChannelConfigEntry(wildcard, "*", "direct");
+  }
   return { allowed: false };
 }
 

From f0a8b34198232ac50b3574e241ffea3fba4829a9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:54:31 +0000
Subject: [PATCH 033/171] fix(discord): align wildcard channel matching

---
 src/discord/monitor.test.ts       | 23 +++++++++++++++++++++++
 src/discord/monitor/allow-list.ts | 28 +++++++---------------------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/discord/monitor.test.ts b/src/discord/monitor.test.ts
index e5c3ad347..be0c8aa65 100644
--- a/src/discord/monitor.test.ts
+++ b/src/discord/monitor.test.ts
@@ -299,6 +299,7 @@ describe("discord guild/channel resolution", () => {
     expect(general?.allowed).toBe(true);
     expect(general?.requireMention).toBe(false);
     expect(general?.autoThread).toBeUndefined();
+    expect(general?.matchSource).toBe("direct");
 
     // Unknown channel should use wildcard
     const random = resolveDiscordChannelConfig({
@@ -310,6 +311,28 @@ describe("discord guild/channel resolution", () => {
     expect(random?.allowed).toBe(true);
     expect(random?.autoThread).toBe(true);
     expect(random?.requireMention).toBe(true);
+    expect(random?.matchSource).toBe("wildcard");
+  });
+
+  it("falls back to wildcard when thread channel and parent are missing", () => {
+    const guildInfo: DiscordGuildEntryResolved = {
+      channels: {
+        "*": { allow: true, requireMention: false },
+      },
+    };
+    const thread = resolveDiscordChannelConfigWithFallback({
+      guildInfo,
+      channelId: "thread-123",
+      channelName: "topic",
+      channelSlug: "topic",
+      parentId: "parent-999",
+      parentName: "general",
+      parentSlug: "general",
+      scope: "thread",
+    });
+    expect(thread?.allowed).toBe(true);
+    expect(thread?.matchKey).toBe("*");
+    expect(thread?.matchSource).toBe("wildcard");
   });
 });
 
diff --git a/src/discord/monitor/allow-list.ts b/src/discord/monitor/allow-list.ts
index b3dc048e7..236cac15e 100644
--- a/src/discord/monitor/allow-list.ts
+++ b/src/discord/monitor/allow-list.ts
@@ -3,6 +3,7 @@ import type { Guild, User } from "@buape/carbon";
 import {
   buildChannelKeyCandidates,
   resolveChannelEntryMatchWithFallback,
+  type ChannelMatchSource,
 } from "../../channels/channel-config.js";
 import type { AllowlistMatch } from "../../channels/allowlist-match.js";
 import { formatDiscordUserTag } from "./format.js";
@@ -44,7 +45,7 @@ export type DiscordChannelConfigResolved = {
   systemPrompt?: string;
   autoThread?: boolean;
   matchKey?: string;
-  matchSource?: "direct" | "parent";
+  matchSource?: ChannelMatchSource;
 };
 
 export function normalizeDiscordAllowList(
@@ -198,13 +199,14 @@ function resolveDiscordChannelEntryMatch(
     entries: channels,
     keys,
     parentKeys,
+    wildcardKey: "*",
   });
 }
 
 function resolveDiscordChannelConfigEntry(
   entry: DiscordChannelEntry,
   matchKey: string | undefined,
-  matchSource: "direct" | "parent",
+  matchSource: ChannelMatchSource,
 ): DiscordChannelConfigResolved {
   const resolved: DiscordChannelConfigResolved = {
     allowed: entry.allow !== false,
@@ -234,15 +236,8 @@ export function resolveDiscordChannelConfig(params: {
     name: channelName,
     slug: channelSlug,
   });
-  if (!match.entry || !match.matchKey) {
-    // Wildcard fallback: apply to all channels if "*" is configured
-    const wildcard = channels["*"];
-    if (wildcard) {
-      return resolveDiscordChannelConfigEntry(wildcard, "*", "direct");
-    }
-    return { allowed: false };
-  }
-  return resolveDiscordChannelConfigEntry(match.entry, match.matchKey, "direct");
+  if (!match.entry || !match.matchKey || !match.matchSource) return { allowed: false };
+  return resolveDiscordChannelConfigEntry(match.entry, match.matchKey, match.matchSource);
 }
 
 export function resolveDiscordChannelConfigWithFallback(params: {
@@ -285,16 +280,7 @@ export function resolveDiscordChannelConfigWithFallback(params: {
       : undefined,
   );
   if (match.entry && match.matchKey && match.matchSource) {
-    return resolveDiscordChannelConfigEntry(
-      match.entry,
-      match.matchKey,
-      match.matchSource === "parent" ? "parent" : "direct",
-    );
-  }
-  // Wildcard fallback: apply to all channels if "*" is configured
-  const wildcard = channels["*"];
-  if (wildcard) {
-    return resolveDiscordChannelConfigEntry(wildcard, "*", "direct");
+    return resolveDiscordChannelConfigEntry(match.entry, match.matchKey, match.matchSource);
   }
   return { allowed: false };
 }

From b52ab96e2c1dcb354041a4028e30ecd0688e4dd5 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 17:54:52 +0000
Subject: [PATCH 034/171] docs(changelog): note discord wildcard fix

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b1848f57..05909cdf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Docs: https://docs.clawd.bot
 - Configure: restrict the model allowlist picker to OAuth-compatible Anthropic models and preselect Opus 4.5.
 - Configure: seed model fallbacks from the allowlist selection when multiple models are chosen.
 - Model picker: list the full catalog when no model allowlist is configured.
+- Discord: honor wildcard channel configs via shared match helpers. (#1334) Thanks @pvoo.
 - BlueBubbles: resolve short message IDs safely and expose full IDs in templates. (#1387) Thanks @tyler6204.
 - Infra: preserve fetch helper methods when wrapping abort signals. (#1387)
 

From 88d76d4be51a0d468eca2077bd16bc14199de558 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 18:21:19 +0000
Subject: [PATCH 035/171] refactor(channels): centralize match metadata

---
 src/channels/allowlist-match.ts               |  4 ++-
 src/channels/channel-config.test.ts           | 29 +++++++++++++++++++
 src/channels/channel-config.ts                | 18 ++++++++++++
 src/channels/plugins/channel-config.ts        |  2 ++
 src/channels/plugins/index.ts                 |  2 ++
 src/discord/monitor/allow-list.ts             | 14 +++------
 .../monitor/message-handler.preflight.ts      |  9 ++----
 src/slack/monitor/channel-config.ts           | 18 ++++--------
 src/slack/monitor/context.ts                  |  5 ++--
 src/slack/monitor/message-handler/prepare.ts  |  5 ++--
 src/slack/monitor/slash.ts                    |  5 ++--
 11 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/src/channels/allowlist-match.ts b/src/channels/allowlist-match.ts
index 69e797ed9..d77fac1f9 100644
--- a/src/channels/allowlist-match.ts
+++ b/src/channels/allowlist-match.ts
@@ -16,6 +16,8 @@ export type AllowlistMatch<TSource extends string = AllowlistMatchSource> = {
   matchSource?: TSource;
 };
 
-export function formatAllowlistMatchMeta(match?: AllowlistMatch | null): string {
+export function formatAllowlistMatchMeta(
+  match?: { matchKey?: string; matchSource?: string } | null,
+): string {
   return `matchKey=${match?.matchKey ?? "none"} matchSource=${match?.matchSource ?? "none"}`;
 }
diff --git a/src/channels/channel-config.test.ts b/src/channels/channel-config.test.ts
index 25cee4ac2..984a486c0 100644
--- a/src/channels/channel-config.test.ts
+++ b/src/channels/channel-config.test.ts
@@ -6,6 +6,8 @@ import {
   resolveChannelEntryMatch,
   resolveChannelEntryMatchWithFallback,
   resolveNestedAllowlistDecision,
+  applyChannelMatchMeta,
+  resolveChannelMatchConfig,
 } from "./channel-config.js";
 
 describe("buildChannelKeyCandidates", () => {
@@ -90,6 +92,33 @@ describe("resolveChannelEntryMatchWithFallback", () => {
   });
 });
 
+describe("applyChannelMatchMeta", () => {
+  it("copies match metadata onto resolved configs", () => {
+    const resolved = applyChannelMatchMeta(
+      { allowed: true },
+      { matchKey: "general", matchSource: "direct" },
+    );
+    expect(resolved.matchKey).toBe("general");
+    expect(resolved.matchSource).toBe("direct");
+  });
+});
+
+describe("resolveChannelMatchConfig", () => {
+  it("returns null when no entry is matched", () => {
+    const resolved = resolveChannelMatchConfig({ matchKey: "x" }, () => ({ allowed: true }));
+    expect(resolved).toBeNull();
+  });
+
+  it("resolves entry and applies match metadata", () => {
+    const resolved = resolveChannelMatchConfig(
+      { entry: { allow: true }, matchKey: "*", matchSource: "wildcard" },
+      () => ({ allowed: true }),
+    );
+    expect(resolved?.matchKey).toBe("*");
+    expect(resolved?.matchSource).toBe("wildcard");
+  });
+});
+
 describe("resolveNestedAllowlistDecision", () => {
   it("allows when outer allowlist is disabled", () => {
     expect(
diff --git a/src/channels/channel-config.ts b/src/channels/channel-config.ts
index 6bf1300ce..af3898667 100644
--- a/src/channels/channel-config.ts
+++ b/src/channels/channel-config.ts
@@ -11,6 +11,24 @@ export type ChannelEntryMatch<T> = {
   matchSource?: ChannelMatchSource;
 };
 
+export function applyChannelMatchMeta<
+  TResult extends { matchKey?: string; matchSource?: ChannelMatchSource },
+>(result: TResult, match: ChannelEntryMatch<unknown>): TResult {
+  if (match.matchKey && match.matchSource) {
+    result.matchKey = match.matchKey;
+    result.matchSource = match.matchSource;
+  }
+  return result;
+}
+
+export function resolveChannelMatchConfig<
+  TEntry,
+  TResult extends { matchKey?: string; matchSource?: ChannelMatchSource },
+>(match: ChannelEntryMatch<TEntry>, resolveEntry: (entry: TEntry) => TResult): TResult | null {
+  if (!match.entry) return null;
+  return applyChannelMatchMeta(resolveEntry(match.entry), match);
+}
+
 export function normalizeChannelSlug(value: string): string {
   return value
     .trim()
diff --git a/src/channels/plugins/channel-config.ts b/src/channels/plugins/channel-config.ts
index e2bd35cdc..9f3a5150b 100644
--- a/src/channels/plugins/channel-config.ts
+++ b/src/channels/plugins/channel-config.ts
@@ -1,8 +1,10 @@
 export type { ChannelEntryMatch, ChannelMatchSource } from "../channel-config.js";
 export {
+  applyChannelMatchMeta,
   buildChannelKeyCandidates,
   normalizeChannelSlug,
   resolveChannelEntryMatch,
   resolveChannelEntryMatchWithFallback,
+  resolveChannelMatchConfig,
   resolveNestedAllowlistDecision,
 } from "../channel-config.js";
diff --git a/src/channels/plugins/index.ts b/src/channels/plugins/index.ts
index d3861f7fe..6d448df73 100644
--- a/src/channels/plugins/index.ts
+++ b/src/channels/plugins/index.ts
@@ -60,10 +60,12 @@ export {
   listWhatsAppDirectoryPeersFromConfig,
 } from "./directory-config.js";
 export {
+  applyChannelMatchMeta,
   buildChannelKeyCandidates,
   normalizeChannelSlug,
   resolveChannelEntryMatch,
   resolveChannelEntryMatchWithFallback,
+  resolveChannelMatchConfig,
   resolveNestedAllowlistDecision,
   type ChannelEntryMatch,
   type ChannelMatchSource,
diff --git a/src/discord/monitor/allow-list.ts b/src/discord/monitor/allow-list.ts
index 236cac15e..7d495af66 100644
--- a/src/discord/monitor/allow-list.ts
+++ b/src/discord/monitor/allow-list.ts
@@ -3,6 +3,7 @@ import type { Guild, User } from "@buape/carbon";
 import {
   buildChannelKeyCandidates,
   resolveChannelEntryMatchWithFallback,
+  resolveChannelMatchConfig,
   type ChannelMatchSource,
 } from "../../channels/channel-config.js";
 import type { AllowlistMatch } from "../../channels/allowlist-match.js";
@@ -205,8 +206,6 @@ function resolveDiscordChannelEntryMatch(
 
 function resolveDiscordChannelConfigEntry(
   entry: DiscordChannelEntry,
-  matchKey: string | undefined,
-  matchSource: ChannelMatchSource,
 ): DiscordChannelConfigResolved {
   const resolved: DiscordChannelConfigResolved = {
     allowed: entry.allow !== false,
@@ -217,8 +216,6 @@ function resolveDiscordChannelConfigEntry(
     systemPrompt: entry.systemPrompt,
     autoThread: entry.autoThread,
   };
-  if (matchKey) resolved.matchKey = matchKey;
-  resolved.matchSource = matchSource;
   return resolved;
 }
 
@@ -236,8 +233,8 @@ export function resolveDiscordChannelConfig(params: {
     name: channelName,
     slug: channelSlug,
   });
-  if (!match.entry || !match.matchKey || !match.matchSource) return { allowed: false };
-  return resolveDiscordChannelConfigEntry(match.entry, match.matchKey, match.matchSource);
+  const resolved = resolveChannelMatchConfig(match, resolveDiscordChannelConfigEntry);
+  return resolved ?? { allowed: false };
 }
 
 export function resolveDiscordChannelConfigWithFallback(params: {
@@ -279,10 +276,7 @@ export function resolveDiscordChannelConfigWithFallback(params: {
         }
       : undefined,
   );
-  if (match.entry && match.matchKey && match.matchSource) {
-    return resolveDiscordChannelConfigEntry(match.entry, match.matchKey, match.matchSource);
-  }
-  return { allowed: false };
+  return resolveChannelMatchConfig(match, resolveDiscordChannelConfigEntry) ?? { allowed: false };
 }
 
 export function resolveDiscordShouldRequireMention(params: {
diff --git a/src/discord/monitor/message-handler.preflight.ts b/src/discord/monitor/message-handler.preflight.ts
index 070a8ef5b..6df141e35 100644
--- a/src/discord/monitor/message-handler.preflight.ts
+++ b/src/discord/monitor/message-handler.preflight.ts
@@ -15,6 +15,7 @@ import {
 } from "../../pairing/pairing-store.js";
 import { resolveAgentRoute } from "../../routing/resolve-route.js";
 import { resolveMentionGatingWithBypass } from "../../channels/mention-gating.js";
+import { formatAllowlistMatchMeta } from "../../channels/allowlist-match.js";
 import { sendMessageDiscord } from "../send.js";
 import { resolveControlCommandGate } from "../../channels/command-gating.js";
 import {
@@ -100,9 +101,7 @@ export async function preflightDiscordMessage(
             },
           })
         : { allowed: false };
-      const allowMatchMeta = `matchKey=${allowMatch.matchKey ?? "none"} matchSource=${
-        allowMatch.matchSource ?? "none"
-      }`;
+      const allowMatchMeta = formatAllowlistMatchMeta(allowMatch);
       const permitted = allowMatch.allowed;
       if (!permitted) {
         commandAuthorized = false;
@@ -262,9 +261,7 @@ export async function preflightDiscordMessage(
         scope: threadChannel ? "thread" : "channel",
       })
     : null;
-  const channelMatchMeta = `matchKey=${channelConfig?.matchKey ?? "none"} matchSource=${
-    channelConfig?.matchSource ?? "none"
-  }`;
+  const channelMatchMeta = formatAllowlistMatchMeta(channelConfig);
   if (isGuildMessage && channelConfig?.enabled === false) {
     logVerbose(
       `Blocked discord channel ${message.channelId} (channel disabled, ${channelMatchMeta})`,
diff --git a/src/slack/monitor/channel-config.ts b/src/slack/monitor/channel-config.ts
index 2b9a31291..3e3c541c9 100644
--- a/src/slack/monitor/channel-config.ts
+++ b/src/slack/monitor/channel-config.ts
@@ -1,8 +1,10 @@
 import type { SlackReactionNotificationMode } from "../../config/config.js";
 import type { SlackMessageEvent } from "../types.js";
 import {
+  applyChannelMatchMeta,
   buildChannelKeyCandidates,
   resolveChannelEntryMatchWithFallback,
+  type ChannelMatchSource,
 } from "../../channels/channel-config.js";
 import { allowListMatches, normalizeAllowListLower, normalizeSlackSlug } from "./allow-list.js";
 
@@ -14,7 +16,7 @@ export type SlackChannelConfigResolved = {
   skills?: string[];
   systemPrompt?: string;
   matchKey?: string;
-  matchSource?: "direct" | "wildcard";
+  matchSource?: ChannelMatchSource;
 };
 
 function firstDefined<T>(...values: Array<T | undefined>) {
@@ -89,16 +91,12 @@ export function resolveSlackChannelConfig(params: {
     directName,
     normalizedName,
   );
-  const {
-    entry: matched,
-    wildcardEntry: fallback,
-    matchKey,
-    matchSource,
-  } = resolveChannelEntryMatchWithFallback({
+  const match = resolveChannelEntryMatchWithFallback({
     entries,
     keys: candidates,
     wildcardKey: "*",
   });
+  const { entry: matched, wildcardEntry: fallback } = match;
 
   const requireMentionDefault = defaultRequireMention ?? true;
   if (keys.length === 0) {
@@ -127,11 +125,7 @@ export function resolveSlackChannelConfig(params: {
     skills,
     systemPrompt,
   };
-  if (matchKey) result.matchKey = matchKey;
-  if (matchSource === "direct" || matchSource === "wildcard") {
-    result.matchSource = matchSource;
-  }
-  return result;
+  return applyChannelMatchMeta(result, match);
 }
 
 export type { SlackMessageEvent };
diff --git a/src/slack/monitor/context.ts b/src/slack/monitor/context.ts
index caeaac9b3..bd2425103 100644
--- a/src/slack/monitor/context.ts
+++ b/src/slack/monitor/context.ts
@@ -8,6 +8,7 @@ import { createDedupeCache } from "../../infra/dedupe.js";
 import { getChildLogger } from "../../logging.js";
 import type { RuntimeEnv } from "../../runtime.js";
 import type { SlackMessageEvent } from "../types.js";
+import { formatAllowlistMatchMeta } from "../../channels/allowlist-match.js";
 
 import { normalizeAllowList, normalizeAllowListLower, normalizeSlackSlug } from "./allow-list.js";
 import { resolveSlackChannelConfig } from "./channel-config.js";
@@ -310,9 +311,7 @@ export function createSlackMonitorContext(params: {
         channels: params.channelsConfig,
         defaultRequireMention,
       });
-      const channelMatchMeta = `matchKey=${channelConfig?.matchKey ?? "none"} matchSource=${
-        channelConfig?.matchSource ?? "none"
-      }`;
+      const channelMatchMeta = formatAllowlistMatchMeta(channelConfig);
       const channelAllowed = channelConfig?.allowed !== false;
       const channelAllowlistConfigured =
         Boolean(params.channelsConfig) && Object.keys(params.channelsConfig ?? {}).length > 0;
diff --git a/src/slack/monitor/message-handler/prepare.ts b/src/slack/monitor/message-handler/prepare.ts
index 849c08d31..b1d9a15c6 100644
--- a/src/slack/monitor/message-handler/prepare.ts
+++ b/src/slack/monitor/message-handler/prepare.ts
@@ -22,6 +22,7 @@ import { resolveThreadSessionKeys } from "../../../routing/session-key.js";
 import { resolveMentionGatingWithBypass } from "../../../channels/mention-gating.js";
 import { resolveConversationLabel } from "../../../channels/conversation-label.js";
 import { resolveControlCommandGate } from "../../../channels/command-gating.js";
+import { formatAllowlistMatchMeta } from "../../../channels/allowlist-match.js";
 import {
   readSessionUpdatedAt,
   recordSessionMetaFromInbound,
@@ -131,9 +132,7 @@ export async function prepareSlackMessage(params: {
         allowList: allowFromLower,
         id: directUserId,
       });
-      const allowMatchMeta = `matchKey=${allowMatch.matchKey ?? "none"} matchSource=${
-        allowMatch.matchSource ?? "none"
-      }`;
+      const allowMatchMeta = formatAllowlistMatchMeta(allowMatch);
       if (!allowMatch.allowed) {
         if (ctx.dmPolicy === "pairing") {
           const sender = await ctx.resolveUserName(directUserId);
diff --git a/src/slack/monitor/slash.ts b/src/slack/monitor/slash.ts
index 7221d86eb..d8e97dd43 100644
--- a/src/slack/monitor/slash.ts
+++ b/src/slack/monitor/slash.ts
@@ -21,6 +21,7 @@ import {
 import { resolveAgentRoute } from "../../routing/resolve-route.js";
 import { resolveConversationLabel } from "../../channels/conversation-label.js";
 import { resolveCommandAuthorizedFromAuthorizers } from "../../channels/command-gating.js";
+import { formatAllowlistMatchMeta } from "../../channels/allowlist-match.js";
 
 import type { ResolvedSlackAccount } from "../accounts.js";
 
@@ -206,9 +207,7 @@ export function registerSlackMonitorSlashCommands(params: {
             id: command.user_id,
             name: senderName,
           });
-          const allowMatchMeta = `matchKey=${allowMatch.matchKey ?? "none"} matchSource=${
-            allowMatch.matchSource ?? "none"
-          }`;
+          const allowMatchMeta = formatAllowlistMatchMeta(allowMatch);
           if (!allowMatch.allowed) {
             if (ctx.dmPolicy === "pairing") {
               const { code, created } = await upsertChannelPairingRequest({

From c913f05fb50b3d96447df60a4e991c274942da84 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 18:21:24 +0000
Subject: [PATCH 036/171] docs(discord): mention wildcard channel defaults

---
 docs/channels/discord.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/channels/discord.md b/docs/channels/discord.md
index 28ecfdfa0..ca6ff6c9c 100644
--- a/docs/channels/discord.md
+++ b/docs/channels/discord.md
@@ -175,6 +175,7 @@ Notes:
 - `agents.list[].groupChat.mentionPatterns` (or `messages.groupChat.mentionPatterns`) also count as mentions for guild messages.
 - Multi-agent override: set per-agent patterns on `agents.list[].groupChat.mentionPatterns`.
 - If `channels` is present, any channel not listed is denied by default.
+- Use a `"*"` channel entry to apply defaults across all channels; explicit channel entries override the wildcard.
 - Threads inherit parent channel config (allowlist, `requireMention`, skills, prompts, etc.) unless you add the thread channel id explicitly.
 - Bot-authored messages are ignored by default; set `channels.discord.allowBots=true` to allow them (own messages remain filtered).
 - Warning: If you allow replies to other bots (`channels.discord.allowBots=true`), prevent bot-to-bot reply loops with `requireMention`, `channels.discord.guilds.*.channels.<id>.users` allowlists, and/or clear guardrails in `AGENTS.md` and `SOUL.md`.

From cf4f1ed03aa6ded9fafba16ee9205ef715649e94 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 18:17:10 +0000
Subject: [PATCH 037/171] fix: persist history image injections

---
 CHANGELOG.md                                 | 1 +
 src/agents/pi-embedded-runner/run/attempt.ts | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05909cdf3..68a3d120d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ Docs: https://docs.clawd.bot
 - CLI: move gateway service commands under `clawdbot gateway` and add `gateway probe` for reachability.
 
 ### Fixes
+- Embedded runner: persist injected history images so attachments aren’t reloaded each turn. (#1374) Thanks @Nicell.
 - Nodes tool: include agent/node/gateway context in tool failure logs to speed approval debugging.
 - macOS: exec approvals now respect wildcard agent allowlists (`*`).
 - macOS: allow SSH agent auth when no identity file is set. (#1384) Thanks @ameno-.
diff --git a/src/agents/pi-embedded-runner/run/attempt.ts b/src/agents/pi-embedded-runner/run/attempt.ts
index 6aa62cd39..b54ff4087 100644
--- a/src/agents/pi-embedded-runner/run/attempt.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.ts
@@ -627,6 +627,7 @@ export async function runEmbeddedAttempt(
           // Inject history images into their original message positions.
           // This ensures the model sees images in context (e.g., "compare to the first image").
           if (imageResult.historyImagesByIndex.size > 0) {
+            let didMutate = false;
             for (const [msgIndex, images] of imageResult.historyImagesByIndex) {
               // Bounds check: ensure index is valid before accessing
               if (msgIndex < 0 || msgIndex >= activeSession.messages.length) continue;
@@ -635,6 +636,7 @@ export async function runEmbeddedAttempt(
                 // Convert string content to array format if needed
                 if (typeof msg.content === "string") {
                   msg.content = [{ type: "text", text: msg.content }];
+                  didMutate = true;
                 }
                 if (Array.isArray(msg.content)) {
                   // Check for existing image content to avoid duplicates across turns
@@ -653,11 +655,16 @@ export async function runEmbeddedAttempt(
                     // Only add if this image isn't already in the message
                     if (!existingImageData.has(img.data)) {
                       msg.content.push(img);
+                      didMutate = true;
                     }
                   }
                 }
               }
             }
+            if (didMutate) {
+              // Persist message mutations (e.g., injected history images) so we don't re-scan/reload.
+              activeSession.agent.replaceMessages(activeSession.messages);
+            }
           }
 
           cacheTrace?.recordStage("prompt:images", {

From 6996c0f330cfa03b5889ee2a02ddfd1597d1bfcb Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 18:40:09 +0000
Subject: [PATCH 038/171] test: cover history image injection

---
 .../pi-embedded-runner/run/attempt.test.ts    | 55 ++++++++++++
 src/agents/pi-embedded-runner/run/attempt.ts  | 90 +++++++++++--------
 2 files changed, 106 insertions(+), 39 deletions(-)
 create mode 100644 src/agents/pi-embedded-runner/run/attempt.test.ts

diff --git a/src/agents/pi-embedded-runner/run/attempt.test.ts b/src/agents/pi-embedded-runner/run/attempt.test.ts
new file mode 100644
index 000000000..d87cabd1d
--- /dev/null
+++ b/src/agents/pi-embedded-runner/run/attempt.test.ts
@@ -0,0 +1,55 @@
+import type { AgentMessage } from "@mariozechner/pi-agent-core";
+import type { ImageContent } from "@mariozechner/pi-ai";
+import { describe, expect, it } from "vitest";
+
+import { injectHistoryImagesIntoMessages } from "./attempt.js";
+
+describe("injectHistoryImagesIntoMessages", () => {
+  const image: ImageContent = { type: "image", data: "abc", mimeType: "image/png" };
+
+  it("injects history images and converts string content", () => {
+    const messages: AgentMessage[] = [
+      {
+        role: "user",
+        content: "See /tmp/photo.png",
+      } as AgentMessage,
+    ];
+
+    const didMutate = injectHistoryImagesIntoMessages(messages, new Map([[0, [image]]]));
+
+    expect(didMutate).toBe(true);
+    expect(Array.isArray(messages[0]?.content)).toBe(true);
+    const content = messages[0]?.content as Array<{ type: string; text?: string; data?: string }>;
+    expect(content).toHaveLength(2);
+    expect(content[0]?.type).toBe("text");
+    expect(content[1]).toMatchObject({ type: "image", data: "abc" });
+  });
+
+  it("avoids duplicating existing image content", () => {
+    const messages: AgentMessage[] = [
+      {
+        role: "user",
+        content: [{ type: "text", text: "See /tmp/photo.png" }, { ...image }],
+      } as AgentMessage,
+    ];
+
+    const didMutate = injectHistoryImagesIntoMessages(messages, new Map([[0, [image]]]));
+
+    expect(didMutate).toBe(false);
+    expect((messages[0]?.content as unknown[]).length).toBe(2);
+  });
+
+  it("ignores non-user messages and out-of-range indices", () => {
+    const messages: AgentMessage[] = [
+      {
+        role: "assistant",
+        content: "noop",
+      } as AgentMessage,
+    ];
+
+    const didMutate = injectHistoryImagesIntoMessages(messages, new Map([[1, [image]]]));
+
+    expect(didMutate).toBe(false);
+    expect(messages[0]?.content).toBe("noop");
+  });
+});
diff --git a/src/agents/pi-embedded-runner/run/attempt.ts b/src/agents/pi-embedded-runner/run/attempt.ts
index b54ff4087..6a1bd3978 100644
--- a/src/agents/pi-embedded-runner/run/attempt.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.ts
@@ -77,6 +77,50 @@ import { MAX_IMAGE_BYTES } from "../../../media/constants.js";
 import type { EmbeddedRunAttemptParams, EmbeddedRunAttemptResult } from "./types.js";
 import { detectAndLoadPromptImages } from "./images.js";
 
+export function injectHistoryImagesIntoMessages(
+  messages: AgentMessage[],
+  historyImagesByIndex: Map<number, ImageContent[]>,
+): boolean {
+  if (historyImagesByIndex.size === 0) return false;
+  let didMutate = false;
+
+  for (const [msgIndex, images] of historyImagesByIndex) {
+    // Bounds check: ensure index is valid before accessing
+    if (msgIndex < 0 || msgIndex >= messages.length) continue;
+    const msg = messages[msgIndex];
+    if (msg && msg.role === "user") {
+      // Convert string content to array format if needed
+      if (typeof msg.content === "string") {
+        msg.content = [{ type: "text", text: msg.content }];
+        didMutate = true;
+      }
+      if (Array.isArray(msg.content)) {
+        // Check for existing image content to avoid duplicates across turns
+        const existingImageData = new Set(
+          msg.content
+            .filter(
+              (c): c is ImageContent =>
+                c != null &&
+                typeof c === "object" &&
+                c.type === "image" &&
+                typeof c.data === "string",
+            )
+            .map((c) => c.data),
+        );
+        for (const img of images) {
+          // Only add if this image isn't already in the message
+          if (!existingImageData.has(img.data)) {
+            msg.content.push(img);
+            didMutate = true;
+          }
+        }
+      }
+    }
+  }
+
+  return didMutate;
+}
+
 export async function runEmbeddedAttempt(
   params: EmbeddedRunAttemptParams,
 ): Promise<EmbeddedRunAttemptResult> {
@@ -626,45 +670,13 @@ export async function runEmbeddedAttempt(
 
           // Inject history images into their original message positions.
           // This ensures the model sees images in context (e.g., "compare to the first image").
-          if (imageResult.historyImagesByIndex.size > 0) {
-            let didMutate = false;
-            for (const [msgIndex, images] of imageResult.historyImagesByIndex) {
-              // Bounds check: ensure index is valid before accessing
-              if (msgIndex < 0 || msgIndex >= activeSession.messages.length) continue;
-              const msg = activeSession.messages[msgIndex];
-              if (msg && msg.role === "user") {
-                // Convert string content to array format if needed
-                if (typeof msg.content === "string") {
-                  msg.content = [{ type: "text", text: msg.content }];
-                  didMutate = true;
-                }
-                if (Array.isArray(msg.content)) {
-                  // Check for existing image content to avoid duplicates across turns
-                  const existingImageData = new Set(
-                    msg.content
-                      .filter(
-                        (c): c is ImageContent =>
-                          c != null &&
-                          typeof c === "object" &&
-                          c.type === "image" &&
-                          typeof c.data === "string",
-                      )
-                      .map((c) => c.data),
-                  );
-                  for (const img of images) {
-                    // Only add if this image isn't already in the message
-                    if (!existingImageData.has(img.data)) {
-                      msg.content.push(img);
-                      didMutate = true;
-                    }
-                  }
-                }
-              }
-            }
-            if (didMutate) {
-              // Persist message mutations (e.g., injected history images) so we don't re-scan/reload.
-              activeSession.agent.replaceMessages(activeSession.messages);
-            }
+          const didMutate = injectHistoryImagesIntoMessages(
+            activeSession.messages,
+            imageResult.historyImagesByIndex,
+          );
+          if (didMutate) {
+            // Persist message mutations (e.g., injected history images) so we don't re-scan/reload.
+            activeSession.agent.replaceMessages(activeSession.messages);
           }
 
           cacheTrace?.recordStage("prompt:images", {

From 32550154f982e9471e7a79f63c3ff4d90713e30f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 18:36:10 +0000
Subject: [PATCH 039/171] feat(queue): add per-channel debounce overrides

---
 CHANGELOG.md                           |  1 +
 src/auto-reply/inbound-debounce.ts     |  3 +--
 src/auto-reply/reply/queue/settings.ts | 21 +++++++++++++++++++++
 src/channels/plugins/types.plugin.ts   |  5 +++++
 src/config/types.messages.ts           | 13 +++----------
 src/config/zod-schema.core.ts          | 13 ++-----------
 6 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68a3d120d..e09aa25b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Docs: https://docs.clawd.bot
 - Nodes: expose node PATH in status/describe and bootstrap PATH for node-host execution.
 - CLI: flatten node service commands under `clawdbot node` and remove `service node` docs.
 - CLI: move gateway service commands under `clawdbot gateway` and add `gateway probe` for reachability.
+- Queue: allow per-channel debounce overrides and plugin defaults. (#1190) Thanks @cheeeee.
 
 ### Fixes
 - Embedded runner: persist injected history images so attachments aren’t reloaded each turn. (#1374) Thanks @Nicell.
diff --git a/src/auto-reply/inbound-debounce.ts b/src/auto-reply/inbound-debounce.ts
index 47a29687d..9d43fa8f7 100644
--- a/src/auto-reply/inbound-debounce.ts
+++ b/src/auto-reply/inbound-debounce.ts
@@ -11,8 +11,7 @@ const resolveChannelOverride = (params: {
   channel: string;
 }): number | undefined => {
   if (!params.byChannel) return undefined;
-  const channelKey = params.channel as keyof InboundDebounceByProvider;
-  return resolveMs(params.byChannel[channelKey]);
+  return resolveMs(params.byChannel[params.channel]);
 };
 
 export function resolveInboundDebounceMs(params: {
diff --git a/src/auto-reply/reply/queue/settings.ts b/src/auto-reply/reply/queue/settings.ts
index 5fd9797dc..9591a8bc4 100644
--- a/src/auto-reply/reply/queue/settings.ts
+++ b/src/auto-reply/reply/queue/settings.ts
@@ -1,3 +1,5 @@
+import { getChannelPlugin } from "../../../channels/plugins/index.js";
+import type { InboundDebounceByProvider } from "../../../config/types.messages.js";
 import { normalizeQueueDropPolicy, normalizeQueueMode } from "./normalize.js";
 import { DEFAULT_QUEUE_CAP, DEFAULT_QUEUE_DEBOUNCE_MS, DEFAULT_QUEUE_DROP } from "./state.js";
 import type { QueueMode, QueueSettings, ResolveQueueSettingsParams } from "./types.js";
@@ -6,6 +8,23 @@ function defaultQueueModeForChannel(_channel?: string): QueueMode {
   return "collect";
 }
 
+/** Resolve per-channel debounce override from debounceMsByChannel map. */
+function resolveChannelDebounce(
+  byChannel: InboundDebounceByProvider | undefined,
+  channelKey: string | undefined,
+): number | undefined {
+  if (!channelKey || !byChannel) return undefined;
+  const value = byChannel[channelKey];
+  return typeof value === "number" && Number.isFinite(value) ? Math.max(0, value) : undefined;
+}
+
+function resolvePluginDebounce(channelKey: string | undefined): number | undefined {
+  if (!channelKey) return undefined;
+  const plugin = getChannelPlugin(channelKey);
+  const value = plugin?.defaults?.queue?.debounceMs;
+  return typeof value === "number" && Number.isFinite(value) ? Math.max(0, value) : undefined;
+}
+
 export function resolveQueueSettings(params: ResolveQueueSettingsParams): QueueSettings {
   const channelKey = params.channel?.trim().toLowerCase();
   const queueCfg = params.cfg.messages?.queue;
@@ -22,6 +41,8 @@ export function resolveQueueSettings(params: ResolveQueueSettingsParams): QueueS
   const debounceRaw =
     params.inlineOptions?.debounceMs ??
     params.sessionEntry?.queueDebounceMs ??
+    resolveChannelDebounce(queueCfg?.debounceMsByChannel, channelKey) ??
+    resolvePluginDebounce(channelKey) ??
     queueCfg?.debounceMs ??
     DEFAULT_QUEUE_DEBOUNCE_MS;
   const capRaw =
diff --git a/src/channels/plugins/types.plugin.ts b/src/channels/plugins/types.plugin.ts
index 38ed40666..5aeab17d3 100644
--- a/src/channels/plugins/types.plugin.ts
+++ b/src/channels/plugins/types.plugin.ts
@@ -48,6 +48,11 @@ export type ChannelPlugin<ResolvedAccount = any> = {
   id: ChannelId;
   meta: ChannelMeta;
   capabilities: ChannelCapabilities;
+  defaults?: {
+    queue?: {
+      debounceMs?: number;
+    };
+  };
   reload?: { configPrefixes: string[]; noopPrefixes?: string[] };
   // CLI onboarding wizard hooks for this channel.
   onboarding?: ChannelOnboardingAdapter;
diff --git a/src/config/types.messages.ts b/src/config/types.messages.ts
index 691ca617a..7499f79a0 100644
--- a/src/config/types.messages.ts
+++ b/src/config/types.messages.ts
@@ -13,20 +13,13 @@ export type QueueConfig = {
   mode?: QueueMode;
   byChannel?: QueueModeByProvider;
   debounceMs?: number;
+  /** Per-channel debounce overrides (ms). */
+  debounceMsByChannel?: InboundDebounceByProvider;
   cap?: number;
   drop?: QueueDropPolicy;
 };
 
-export type InboundDebounceByProvider = {
-  whatsapp?: number;
-  telegram?: number;
-  discord?: number;
-  slack?: number;
-  signal?: number;
-  imessage?: number;
-  msteams?: number;
-  webchat?: number;
-};
+export type InboundDebounceByProvider = Record<string, number>;
 
 export type InboundDebounceConfig = {
   debounceMs?: number;
diff --git a/src/config/zod-schema.core.ts b/src/config/zod-schema.core.ts
index 6e7b34b0d..48066963f 100644
--- a/src/config/zod-schema.core.ts
+++ b/src/config/zod-schema.core.ts
@@ -217,17 +217,7 @@ export const QueueModeBySurfaceSchema = z
   .optional();
 
 export const DebounceMsBySurfaceSchema = z
-  .object({
-    whatsapp: z.number().int().nonnegative().optional(),
-    telegram: z.number().int().nonnegative().optional(),
-    discord: z.number().int().nonnegative().optional(),
-    slack: z.number().int().nonnegative().optional(),
-    signal: z.number().int().nonnegative().optional(),
-    imessage: z.number().int().nonnegative().optional(),
-    msteams: z.number().int().nonnegative().optional(),
-    webchat: z.number().int().nonnegative().optional(),
-  })
-  .strict()
+  .record(z.string(), z.number().int().nonnegative())
   .optional();
 
 export const QueueSchema = z
@@ -235,6 +225,7 @@ export const QueueSchema = z
     mode: QueueModeSchema.optional(),
     byChannel: QueueModeBySurfaceSchema,
     debounceMs: z.number().int().nonnegative().optional(),
+    debounceMsByChannel: DebounceMsBySurfaceSchema,
     cap: z.number().int().positive().optional(),
     drop: QueueDropSchema.optional(),
   })

From 403904ecd107ba6a5e01c196f3c1e052fd3c03a1 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 18:52:26 +0000
Subject: [PATCH 040/171] fix: harden port listener detection

---
 src/cli/daemon-cli/shared.ts       | 32 ++++++++++++++++-----------
 src/cli/daemon-cli/status.print.ts | 27 +++++++++++++++++++++--
 src/cli/ports.ts                   |  4 +++-
 src/infra/ports-inspect.test.ts    | 35 ++++++++++++++++++++++++++++++
 src/infra/ports-inspect.ts         | 27 ++++++++++++++++++-----
 src/infra/ports-lsof.ts            | 35 ++++++++++++++++++++++++++++++
 6 files changed, 139 insertions(+), 21 deletions(-)
 create mode 100644 src/infra/ports-inspect.test.ts
 create mode 100644 src/infra/ports-lsof.ts

diff --git a/src/cli/daemon-cli/shared.ts b/src/cli/daemon-cli/shared.ts
index 7be597ac5..1e0d82dce 100644
--- a/src/cli/daemon-cli/shared.ts
+++ b/src/cli/daemon-cli/shared.ts
@@ -50,22 +50,28 @@ export function pickProbeHostForBind(
   return "127.0.0.1";
 }
 
-export function safeDaemonEnv(env: Record<string, string> | undefined): string[] {
-  if (!env) return [];
-  const allow = [
-    "CLAWDBOT_PROFILE",
-    "CLAWDBOT_STATE_DIR",
-    "CLAWDBOT_CONFIG_PATH",
-    "CLAWDBOT_GATEWAY_PORT",
-    "CLAWDBOT_NIX_MODE",
-  ];
-  const lines: string[] = [];
-  for (const key of allow) {
+const SAFE_DAEMON_ENV_KEYS = [
+  "CLAWDBOT_PROFILE",
+  "CLAWDBOT_STATE_DIR",
+  "CLAWDBOT_CONFIG_PATH",
+  "CLAWDBOT_GATEWAY_PORT",
+  "CLAWDBOT_NIX_MODE",
+];
+
+export function filterDaemonEnv(env: Record<string, string> | undefined): Record<string, string> {
+  if (!env) return {};
+  const filtered: Record<string, string> = {};
+  for (const key of SAFE_DAEMON_ENV_KEYS) {
     const value = env[key];
     if (!value?.trim()) continue;
-    lines.push(`${key}=${value.trim()}`);
+    filtered[key] = value.trim();
   }
-  return lines;
+  return filtered;
+}
+
+export function safeDaemonEnv(env: Record<string, string> | undefined): string[] {
+  const filtered = filterDaemonEnv(env);
+  return Object.entries(filtered).map(([key, value]) => `${key}=${value}`);
 }
 
 export function normalizeListenerAddress(raw: string): string {
diff --git a/src/cli/daemon-cli/status.print.ts b/src/cli/daemon-cli/status.print.ts
index eb7f9f500..931dc3f10 100644
--- a/src/cli/daemon-cli/status.print.ts
+++ b/src/cli/daemon-cli/status.print.ts
@@ -14,16 +14,39 @@ import { getResolvedLoggerSettings } from "../../logging.js";
 import { defaultRuntime } from "../../runtime.js";
 import { colorize, isRich, theme } from "../../terminal/theme.js";
 import { formatCliCommand } from "../command-format.js";
-import { formatRuntimeStatus, renderRuntimeHints, safeDaemonEnv } from "./shared.js";
+import {
+  filterDaemonEnv,
+  formatRuntimeStatus,
+  renderRuntimeHints,
+  safeDaemonEnv,
+} from "./shared.js";
 import {
   type DaemonStatus,
   renderPortDiagnosticsForCli,
   resolvePortListeningAddresses,
 } from "./status.gather.js";
 
+function sanitizeDaemonStatusForJson(status: DaemonStatus): DaemonStatus {
+  const command = status.service.command;
+  if (!command?.environment) return status;
+  const safeEnv = filterDaemonEnv(command.environment);
+  const nextCommand = {
+    ...command,
+    environment: Object.keys(safeEnv).length > 0 ? safeEnv : undefined,
+  };
+  return {
+    ...status,
+    service: {
+      ...status.service,
+      command: nextCommand,
+    },
+  };
+}
+
 export function printDaemonStatus(status: DaemonStatus, opts: { json: boolean }) {
   if (opts.json) {
-    defaultRuntime.log(JSON.stringify(status, null, 2));
+    const sanitized = sanitizeDaemonStatusForJson(status);
+    defaultRuntime.log(JSON.stringify(sanitized, null, 2));
     return;
   }
 
diff --git a/src/cli/ports.ts b/src/cli/ports.ts
index afa4210af..5384c056b 100644
--- a/src/cli/ports.ts
+++ b/src/cli/ports.ts
@@ -1,4 +1,5 @@
 import { execFileSync } from "node:child_process";
+import { resolveLsofCommandSync } from "../infra/ports-lsof.js";
 
 export type PortProcess = { pid: number; command?: string };
 
@@ -30,7 +31,8 @@ export function parseLsofOutput(output: string): PortProcess[] {
 
 export function listPortListeners(port: number): PortProcess[] {
   try {
-    const out = execFileSync("lsof", ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-FpFc"], {
+    const lsof = resolveLsofCommandSync();
+    const out = execFileSync(lsof, ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-FpFc"], {
       encoding: "utf-8",
     });
     return parseLsofOutput(out);
diff --git a/src/infra/ports-inspect.test.ts b/src/infra/ports-inspect.test.ts
new file mode 100644
index 000000000..8aaeff424
--- /dev/null
+++ b/src/infra/ports-inspect.test.ts
@@ -0,0 +1,35 @@
+import net from "node:net";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const runCommandWithTimeoutMock = vi.fn();
+
+vi.mock("../process/exec.js", () => ({
+  runCommandWithTimeout: (...args: unknown[]) => runCommandWithTimeoutMock(...args),
+}));
+
+const describeUnix = process.platform === "win32" ? describe.skip : describe;
+
+describeUnix("inspectPortUsage", () => {
+  beforeEach(() => {
+    runCommandWithTimeoutMock.mockReset();
+  });
+
+  it("reports busy when lsof is missing but loopback listener exists", async () => {
+    const server = net.createServer();
+    await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const port = (server.address() as net.AddressInfo).port;
+
+    runCommandWithTimeoutMock.mockRejectedValueOnce(
+      Object.assign(new Error("spawn lsof ENOENT"), { code: "ENOENT" }),
+    );
+
+    try {
+      const { inspectPortUsage } = await import("./ports-inspect.js");
+      const result = await inspectPortUsage(port);
+      expect(result.status).toBe("busy");
+      expect(result.errors?.some((err) => err.includes("ENOENT"))).toBe(true);
+    } finally {
+      server.close();
+    }
+  });
+});
diff --git a/src/infra/ports-inspect.ts b/src/infra/ports-inspect.ts
index 124c1255b..767480ced 100644
--- a/src/infra/ports-inspect.ts
+++ b/src/infra/ports-inspect.ts
@@ -1,5 +1,6 @@
 import net from "node:net";
 import { runCommandWithTimeout } from "../process/exec.js";
+import { resolveLsofCommand } from "./ports-lsof.js";
 import { buildPortHints } from "./ports-format.js";
 import type { PortListener, PortUsage, PortUsageStatus } from "./ports-types.js";
 
@@ -71,7 +72,8 @@ async function readUnixListeners(
   port: number,
 ): Promise<{ listeners: PortListener[]; detail?: string; errors: string[] }> {
   const errors: string[] = [];
-  const res = await runCommandSafe(["lsof", "-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-FpFcn"]);
+  const lsof = await resolveLsofCommand();
+  const res = await runCommandSafe([lsof, "-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-FpFcn"]);
   if (res.code === 0) {
     const listeners = parseLsofFieldOutput(res.stdout);
     await Promise.all(
@@ -87,11 +89,12 @@ async function readUnixListeners(
     );
     return { listeners, detail: res.stdout.trim() || undefined, errors };
   }
-  if (res.code === 1) {
+  const stderr = res.stderr.trim();
+  if (res.code === 1 && !res.error && !stderr) {
     return { listeners: [], detail: undefined, errors };
   }
   if (res.error) errors.push(res.error);
-  const detail = [res.stderr.trim(), res.stdout.trim()].filter(Boolean).join("\n");
+  const detail = [stderr, res.stdout.trim()].filter(Boolean).join("\n");
   if (detail) errors.push(detail);
   return { listeners: [], detail: undefined, errors };
 }
@@ -175,7 +178,7 @@ async function readWindowsListeners(
   return { listeners, detail: res.stdout.trim() || undefined, errors };
 }
 
-async function checkPortInUse(port: number): Promise<PortUsageStatus> {
+async function tryListenOnHost(port: number, host: string): Promise<PortUsageStatus | "skip"> {
   try {
     await new Promise<void>((resolve, reject) => {
       const tester = net
@@ -184,15 +187,29 @@ async function checkPortInUse(port: number): Promise<PortUsageStatus> {
         .once("listening", () => {
           tester.close(() => resolve());
         })
-        .listen(port);
+        .listen({ port, host, exclusive: true });
     });
     return "free";
   } catch (err) {
     if (isErrno(err) && err.code === "EADDRINUSE") return "busy";
+    if (isErrno(err) && (err.code === "EADDRNOTAVAIL" || err.code === "EAFNOSUPPORT")) {
+      return "skip";
+    }
     return "unknown";
   }
 }
 
+async function checkPortInUse(port: number): Promise<PortUsageStatus> {
+  const hosts = ["127.0.0.1", "0.0.0.0", "::1", "::"];
+  let sawUnknown = false;
+  for (const host of hosts) {
+    const result = await tryListenOnHost(port, host);
+    if (result === "busy") return "busy";
+    if (result === "unknown") sawUnknown = true;
+  }
+  return sawUnknown ? "unknown" : "free";
+}
+
 export async function inspectPortUsage(port: number): Promise<PortUsage> {
   const errors: string[] = [];
   const result =
diff --git a/src/infra/ports-lsof.ts b/src/infra/ports-lsof.ts
new file mode 100644
index 000000000..4b5f01a6a
--- /dev/null
+++ b/src/infra/ports-lsof.ts
@@ -0,0 +1,35 @@
+import fs from "node:fs";
+import fsPromises from "node:fs/promises";
+
+const LSOF_CANDIDATES =
+  process.platform === "darwin"
+    ? ["/usr/sbin/lsof", "/usr/bin/lsof"]
+    : ["/usr/bin/lsof", "/usr/sbin/lsof"];
+
+async function canExecute(path: string): Promise<boolean> {
+  try {
+    await fsPromises.access(path, fs.constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export async function resolveLsofCommand(): Promise<string> {
+  for (const candidate of LSOF_CANDIDATES) {
+    if (await canExecute(candidate)) return candidate;
+  }
+  return "lsof";
+}
+
+export function resolveLsofCommandSync(): string {
+  for (const candidate of LSOF_CANDIDATES) {
+    try {
+      fs.accessSync(candidate, fs.constants.X_OK);
+      return candidate;
+    } catch {
+      // keep trying
+    }
+  }
+  return "lsof";
+}

From c415ccaed5180f8ff8e871584515e002f3fa42e2 Mon Sep 17 00:00:00 2001
From: Echo <cash.echo.bot@gmail.com>
Date: Wed, 21 Jan 2026 13:10:31 -0600
Subject: [PATCH 041/171] feat(sessions): add channelIdleMinutes config for
 per-channel session idle durations (#1353)

* feat(sessions): add channelIdleMinutes config for per-channel session idle durations

Add new `channelIdleMinutes` config option to allow different session idle
timeouts per channel. For example, Discord sessions can now be configured
to last 7 days (10080 minutes) while other channels use shorter defaults.

Config example:
  sessions:
    channelIdleMinutes:
      discord: 10080  # 7 days

The channel-specific idle is passed as idleMinutesOverride to the existing
resolveSessionResetPolicy, integrating cleanly with the new reset policy
architecture.

* fix

* feat: add per-channel session reset overrides (#1353) (thanks @cash-echo-bot)

---------

Co-authored-by: Cash Williams <cashwilliams@gmail.com>
Co-authored-by: Peter Steinberger <steipete@gmail.com>
---
 CHANGELOG.md                                  |  2 +-
 docs/concepts/session.md                      |  4 ++
 docs/gateway/configuration-examples.md        |  4 +-
 docs/gateway/configuration.md                 |  5 ++-
 .../pi-embedded-runner/run/attempt.test.ts    |  4 +-
 src/auto-reply/reply/session.test.ts          | 39 +++++++++++++++++++
 src/auto-reply/reply/session.ts               | 17 +++++++-
 src/commands/agent/session.ts                 | 11 +++++-
 src/config/sessions/reset.ts                  | 30 +++++++++-----
 src/config/types.base.ts                      |  3 +-
 src/config/zod-schema.session.ts              |  2 +-
 src/infra/fetch.ts                            |  5 ++-
 src/web/auto-reply/session-snapshot.test.ts   | 14 ++++---
 src/web/auto-reply/session-snapshot.ts        | 11 ++++--
 14 files changed, 123 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e09aa25b9..a55377fff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ Docs: https://docs.clawd.bot
 - Nodes: expose node PATH in status/describe and bootstrap PATH for node-host execution.
 - CLI: flatten node service commands under `clawdbot node` and remove `service node` docs.
 - CLI: move gateway service commands under `clawdbot gateway` and add `gateway probe` for reachability.
-- Queue: allow per-channel debounce overrides and plugin defaults. (#1190) Thanks @cheeeee.
+- Sessions: add per-channel reset overrides via `session.resetByChannel`. (#1353) Thanks @cash-echo-bot.
 
 ### Fixes
 - Embedded runner: persist injected history images so attachments aren’t reloaded each turn. (#1374) Thanks @Nicell.
diff --git a/docs/concepts/session.md b/docs/concepts/session.md
index c88e2ddfe..48c85af09 100644
--- a/docs/concepts/session.md
+++ b/docs/concepts/session.md
@@ -60,6 +60,7 @@ the workspace is writable. See [Memory](/concepts/memory) and
 - Idle reset (optional): `idleMinutes` adds a sliding idle window. When both daily and idle resets are configured, **whichever expires first** forces a new session.
 - Legacy idle-only: if you set `session.idleMinutes` without any `session.reset`/`resetByType` config, Clawdbot stays in idle-only mode for backward compatibility.
 - Per-type overrides (optional): `resetByType` lets you override the policy for `dm`, `group`, and `thread` sessions (thread = Slack/Discord threads, Telegram topics, Matrix threads when provided by the connector).
+- Per-channel overrides (optional): `resetByChannel` overrides the reset policy for a channel (applies to all session types for that channel and takes precedence over `reset`/`resetByType`).
 - Reset triggers: exact `/new` or `/reset` (plus any extras in `resetTriggers`) start a fresh session id and pass the remainder of the message through. `/new <model>` accepts a model alias, `provider/model`, or provider name (fuzzy match) to set the new session model. If `/new` or `/reset` is sent alone, Clawdbot runs a short “hello” greeting turn to confirm the reset.
 - Manual reset: delete specific keys from the store or remove the JSONL transcript; the next message recreates them.
 - Isolated cron jobs always mint a fresh `sessionId` per run (no idle reuse).
@@ -109,6 +110,9 @@ Send these as standalone messages so they register.
       dm: { mode: "idle", idleMinutes: 240 },
       group: { mode: "idle", idleMinutes: 120 }
     },
+    resetByChannel: {
+      discord: { mode: "idle", idleMinutes: 10080 }
+    },
     resetTriggers: ["/new", "/reset"],
     store: "~/.clawdbot/agents/{agentId}/sessions/sessions.json",
     mainKey: "main",
diff --git a/docs/gateway/configuration-examples.md b/docs/gateway/configuration-examples.md
index 793ece412..91b40beac 100644
--- a/docs/gateway/configuration-examples.md
+++ b/docs/gateway/configuration-examples.md
@@ -151,7 +151,9 @@ Save to `~/.clawdbot/clawdbot.json` and you can DM the bot from that number.
       atHour: 4,
       idleMinutes: 60
     },
-    heartbeatIdleMinutes: 120,
+    resetByChannel: {
+      discord: { mode: "idle", idleMinutes: 10080 }
+    },
     resetTriggers: ["/new", "/reset"],
     store: "~/.clawdbot/agents/default/sessions/sessions.json",
     typingIntervalSeconds: 5,
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index a17308344..9eddda3f8 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -2453,6 +2453,9 @@ Controls session scoping, reset policy, reset triggers, and where the session st
       dm: { mode: "idle", idleMinutes: 240 },
       group: { mode: "idle", idleMinutes: 120 }
     },
+    resetByChannel: {
+      discord: { mode: "idle", idleMinutes: 10080 }
+    },
     resetTriggers: ["/new", "/reset"],
     // Default is already per-agent under ~/.clawdbot/agents/<agentId>/sessions/sessions.json
     // You can override with {agentId} templating:
@@ -2488,7 +2491,7 @@ Fields:
   - `idleMinutes`: sliding idle window in minutes. When daily + idle are both configured, whichever expires first wins.
 - `resetByType`: per-session overrides for `dm`, `group`, and `thread`.
   - If you only set legacy `session.idleMinutes` without any `reset`/`resetByType`, Clawdbot stays in idle-only mode for backward compatibility.
-- `heartbeatIdleMinutes`: optional idle override for heartbeat checks (daily reset still applies when enabled).
+- `resetByChannel`: channel-specific reset policy overrides (keyed by channel id, applies to all session types for that channel; overrides `reset`/`resetByType`).
 - `agentToAgent.maxPingPongTurns`: max reply-back turns between requester/target (0–5, default 5).
 - `sendPolicy.default`: `allow` or `deny` fallback when no rule matches.
 - `sendPolicy.rules[]`: match by `channel`, `chatType` (`direct|group|room`), or `keyPrefix` (e.g. `cron:`). First deny wins; otherwise allow.
diff --git a/src/agents/pi-embedded-runner/run/attempt.test.ts b/src/agents/pi-embedded-runner/run/attempt.test.ts
index d87cabd1d..af1d97828 100644
--- a/src/agents/pi-embedded-runner/run/attempt.test.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.test.ts
@@ -36,7 +36,9 @@ describe("injectHistoryImagesIntoMessages", () => {
     const didMutate = injectHistoryImagesIntoMessages(messages, new Map([[0, [image]]]));
 
     expect(didMutate).toBe(false);
-    expect((messages[0]?.content as unknown[]).length).toBe(2);
+    const content = messages[0]?.content as unknown[] | undefined;
+    expect(content).toBeDefined();
+    expect(content).toHaveLength(2);
   });
 
   it("ignores non-user messages and out-of-range indices", () => {
diff --git a/src/auto-reply/reply/session.test.ts b/src/auto-reply/reply/session.test.ts
index dca2ae1c8..af548ecb0 100644
--- a/src/auto-reply/reply/session.test.ts
+++ b/src/auto-reply/reply/session.test.ts
@@ -436,3 +436,42 @@ describe("initSessionState reset policy", () => {
     }
   });
 });
+
+describe("initSessionState channel reset overrides", () => {
+  it("uses channel-specific reset policy when configured", async () => {
+    const root = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-channel-idle-"));
+    const storePath = path.join(root, "sessions.json");
+    const sessionKey = "agent:main:discord:dm:123";
+    const sessionId = "session-override";
+    const updatedAt = Date.now() - (10080 - 1) * 60_000;
+
+    await saveSessionStore(storePath, {
+      [sessionKey]: {
+        sessionId,
+        updatedAt,
+      },
+    });
+
+    const cfg = {
+      session: {
+        store: storePath,
+        idleMinutes: 60,
+        resetByType: { dm: { mode: "idle", idleMinutes: 10 } },
+        resetByChannel: { discord: { mode: "idle", idleMinutes: 10080 } },
+      },
+    } as ClawdbotConfig;
+
+    const result = await initSessionState({
+      ctx: {
+        Body: "Hello",
+        SessionKey: sessionKey,
+        Provider: "discord",
+      },
+      cfg,
+      commandAuthorized: true,
+    });
+
+    expect(result.isNewSession).toBe(false);
+    expect(result.sessionEntry.sessionId).toBe(sessionId);
+  });
+});
diff --git a/src/auto-reply/reply/session.ts b/src/auto-reply/reply/session.ts
index 590b9b7d6..da8ca8acf 100644
--- a/src/auto-reply/reply/session.ts
+++ b/src/auto-reply/reply/session.ts
@@ -11,6 +11,7 @@ import {
   evaluateSessionFreshness,
   type GroupKeyResolution,
   loadSessionStore,
+  resolveChannelResetConfig,
   resolveThreadFlag,
   resolveSessionResetPolicy,
   resolveSessionResetType,
@@ -106,6 +107,7 @@ export async function initSessionState(params: {
     sessionKey: sessionCtxForState.SessionKey,
     config: cfg,
   });
+  const groupResolution = resolveGroupSessionKey(sessionCtxForState) ?? undefined;
   const resetTriggers = sessionCfg?.resetTriggers?.length
     ? sessionCfg.resetTriggers
     : DEFAULT_RESET_TRIGGERS;
@@ -129,7 +131,6 @@ export async function initSessionState(params: {
   let persistedModelOverride: string | undefined;
   let persistedProviderOverride: string | undefined;
 
-  const groupResolution = resolveGroupSessionKey(sessionCtxForState) ?? undefined;
   const normalizedChatType = normalizeChatType(ctx.ChatType);
   const isGroup =
     normalizedChatType != null && normalizedChatType !== "direct" ? true : Boolean(groupResolution);
@@ -195,7 +196,19 @@ export async function initSessionState(params: {
     parentSessionKey: ctx.ParentSessionKey,
   });
   const resetType = resolveSessionResetType({ sessionKey, isGroup, isThread });
-  const resetPolicy = resolveSessionResetPolicy({ sessionCfg, resetType });
+  const channelReset = resolveChannelResetConfig({
+    sessionCfg,
+    channel:
+      groupResolution?.channel ??
+      (ctx.OriginatingChannel as string | undefined) ??
+      ctx.Surface ??
+      ctx.Provider,
+  });
+  const resetPolicy = resolveSessionResetPolicy({
+    sessionCfg,
+    resetType,
+    resetOverride: channelReset,
+  });
   const freshEntry = entry
     ? evaluateSessionFreshness({ updatedAt: entry.updatedAt, now, policy: resetPolicy }).fresh
     : false;
diff --git a/src/commands/agent/session.ts b/src/commands/agent/session.ts
index ab9da524d..60860f0ec 100644
--- a/src/commands/agent/session.ts
+++ b/src/commands/agent/session.ts
@@ -12,6 +12,7 @@ import {
   evaluateSessionFreshness,
   loadSessionStore,
   resolveAgentIdFromSessionKey,
+  resolveChannelResetConfig,
   resolveExplicitAgentSessionKey,
   resolveSessionResetPolicy,
   resolveSessionResetType,
@@ -99,7 +100,15 @@ export function resolveSession(opts: {
   const sessionEntry = sessionKey ? sessionStore[sessionKey] : undefined;
 
   const resetType = resolveSessionResetType({ sessionKey });
-  const resetPolicy = resolveSessionResetPolicy({ sessionCfg, resetType });
+  const channelReset = resolveChannelResetConfig({
+    sessionCfg,
+    channel: sessionEntry?.lastChannel ?? sessionEntry?.channel,
+  });
+  const resetPolicy = resolveSessionResetPolicy({
+    sessionCfg,
+    resetType,
+    resetOverride: channelReset,
+  });
   const fresh = sessionEntry
     ? evaluateSessionFreshness({ updatedAt: sessionEntry.updatedAt, now, policy: resetPolicy })
         .fresh
diff --git a/src/config/sessions/reset.ts b/src/config/sessions/reset.ts
index 3355e4052..45d54ad4f 100644
--- a/src/config/sessions/reset.ts
+++ b/src/config/sessions/reset.ts
@@ -1,5 +1,6 @@
-import type { SessionConfig } from "../types.base.js";
+import type { SessionConfig, SessionResetConfig } from "../types.base.js";
 import { DEFAULT_IDLE_MINUTES } from "./types.js";
+import { normalizeMessageChannel } from "../../utils/message-channel.js";
 
 export type SessionResetMode = "daily" | "idle";
 export type SessionResetType = "dm" | "group" | "thread";
@@ -67,13 +68,13 @@ export function resolveDailyResetAtMs(now: number, atHour: number): number {
 export function resolveSessionResetPolicy(params: {
   sessionCfg?: SessionConfig;
   resetType: SessionResetType;
-  idleMinutesOverride?: number;
+  resetOverride?: SessionResetConfig;
 }): SessionResetPolicy {
   const sessionCfg = params.sessionCfg;
-  const baseReset = sessionCfg?.reset;
-  const typeReset = sessionCfg?.resetByType?.[params.resetType];
+  const baseReset = params.resetOverride ?? sessionCfg?.reset;
+  const typeReset = params.resetOverride ? undefined : sessionCfg?.resetByType?.[params.resetType];
   const hasExplicitReset = Boolean(baseReset || sessionCfg?.resetByType);
-  const legacyIdleMinutes = sessionCfg?.idleMinutes;
+  const legacyIdleMinutes = params.resetOverride ? undefined : sessionCfg?.idleMinutes;
   const mode =
     typeReset?.mode ??
     baseReset?.mode ??
@@ -81,11 +82,7 @@ export function resolveSessionResetPolicy(params: {
   const atHour = normalizeResetAtHour(
     typeReset?.atHour ?? baseReset?.atHour ?? DEFAULT_RESET_AT_HOUR,
   );
-  const idleMinutesRaw =
-    params.idleMinutesOverride ??
-    typeReset?.idleMinutes ??
-    baseReset?.idleMinutes ??
-    legacyIdleMinutes;
+  const idleMinutesRaw = typeReset?.idleMinutes ?? baseReset?.idleMinutes ?? legacyIdleMinutes;
 
   let idleMinutes: number | undefined;
   if (idleMinutesRaw != null) {
@@ -100,6 +97,19 @@ export function resolveSessionResetPolicy(params: {
   return { mode, atHour, idleMinutes };
 }
 
+export function resolveChannelResetConfig(params: {
+  sessionCfg?: SessionConfig;
+  channel?: string | null;
+}): SessionResetConfig | undefined {
+  const resetByChannel = params.sessionCfg?.resetByChannel;
+  if (!resetByChannel) return undefined;
+  const normalized = normalizeMessageChannel(params.channel);
+  const fallback = params.channel?.trim().toLowerCase();
+  const key = normalized ?? fallback;
+  if (!key) return undefined;
+  return resetByChannel[key] ?? resetByChannel[key.toLowerCase()];
+}
+
 export function evaluateSessionFreshness(params: {
   updatedAt: number;
   now: number;
diff --git a/src/config/types.base.ts b/src/config/types.base.ts
index 0796fa64c..8d7613936 100644
--- a/src/config/types.base.ts
+++ b/src/config/types.base.ts
@@ -77,9 +77,10 @@ export type SessionConfig = {
   identityLinks?: Record<string, string[]>;
   resetTriggers?: string[];
   idleMinutes?: number;
-  heartbeatIdleMinutes?: number;
   reset?: SessionResetConfig;
   resetByType?: SessionResetByTypeConfig;
+  /** Channel-specific reset overrides (e.g. { discord: { mode: "idle", idleMinutes: 10080 } }). */
+  resetByChannel?: Record<string, SessionResetConfig>;
   store?: string;
   typingIntervalSeconds?: number;
   typingMode?: TypingMode;
diff --git a/src/config/zod-schema.session.ts b/src/config/zod-schema.session.ts
index 6a8ad114a..6cc3084d6 100644
--- a/src/config/zod-schema.session.ts
+++ b/src/config/zod-schema.session.ts
@@ -24,7 +24,6 @@ export const SessionSchema = z
     identityLinks: z.record(z.string(), z.array(z.string())).optional(),
     resetTriggers: z.array(z.string()).optional(),
     idleMinutes: z.number().int().positive().optional(),
-    heartbeatIdleMinutes: z.number().int().positive().optional(),
     reset: SessionResetConfigSchema.optional(),
     resetByType: z
       .object({
@@ -34,6 +33,7 @@ export const SessionSchema = z
       })
       .strict()
       .optional(),
+    resetByChannel: z.record(z.string(), SessionResetConfigSchema).optional(),
     store: z.string().optional(),
     typingIntervalSeconds: z.number().int().positive().optional(),
     typingMode: z
diff --git a/src/infra/fetch.ts b/src/infra/fetch.ts
index 9cd10c25f..2f9993c7a 100644
--- a/src/infra/fetch.ts
+++ b/src/infra/fetch.ts
@@ -31,8 +31,11 @@ export function wrapFetchWithAbortSignal(fetchImpl: typeof fetch): typeof fetch
     return response;
   }) as FetchWithPreconnect;
 
+  const fetchWithPreconnect = fetchImpl as FetchWithPreconnect;
   wrapped.preconnect =
-    typeof fetchImpl.preconnect === "function" ? fetchImpl.preconnect.bind(fetchImpl) : () => {};
+    typeof fetchWithPreconnect.preconnect === "function"
+      ? fetchWithPreconnect.preconnect.bind(fetchWithPreconnect)
+      : () => {};
 
   return Object.assign(wrapped, fetchImpl);
 }
diff --git a/src/web/auto-reply/session-snapshot.test.ts b/src/web/auto-reply/session-snapshot.test.ts
index 82fa5dbf1..e6cf013c0 100644
--- a/src/web/auto-reply/session-snapshot.test.ts
+++ b/src/web/auto-reply/session-snapshot.test.ts
@@ -8,7 +8,7 @@ import { saveSessionStore } from "../../config/sessions.js";
 import { getSessionSnapshot } from "./session-snapshot.js";
 
 describe("getSessionSnapshot", () => {
-  it("uses heartbeat idle override while daily reset still applies", async () => {
+  it("uses channel reset overrides when configured", async () => {
     vi.useFakeTimers();
     vi.setSystemTime(new Date(2026, 0, 18, 5, 0, 0));
     try {
@@ -20,6 +20,7 @@ describe("getSessionSnapshot", () => {
         [sessionKey]: {
           sessionId: "snapshot-session",
           updatedAt: new Date(2026, 0, 18, 3, 30, 0).getTime(),
+          lastChannel: "whatsapp",
         },
       });
 
@@ -27,7 +28,9 @@ describe("getSessionSnapshot", () => {
         session: {
           store: storePath,
           reset: { mode: "daily", atHour: 4, idleMinutes: 240 },
-          heartbeatIdleMinutes: 30,
+          resetByChannel: {
+            whatsapp: { mode: "idle", idleMinutes: 360 },
+          },
         },
       } as Parameters<typeof getSessionSnapshot>[0];
 
@@ -35,9 +38,10 @@ describe("getSessionSnapshot", () => {
         sessionKey,
       });
 
-      expect(snapshot.resetPolicy.idleMinutes).toBe(30);
-      expect(snapshot.fresh).toBe(false);
-      expect(snapshot.dailyResetAt).toBe(new Date(2026, 0, 18, 4, 0, 0).getTime());
+      expect(snapshot.resetPolicy.mode).toBe("idle");
+      expect(snapshot.resetPolicy.idleMinutes).toBe(360);
+      expect(snapshot.fresh).toBe(true);
+      expect(snapshot.dailyResetAt).toBeUndefined();
     } finally {
       vi.useRealTimers();
     }
diff --git a/src/web/auto-reply/session-snapshot.ts b/src/web/auto-reply/session-snapshot.ts
index 051c29972..12a5619e6 100644
--- a/src/web/auto-reply/session-snapshot.ts
+++ b/src/web/auto-reply/session-snapshot.ts
@@ -2,6 +2,7 @@ import type { loadConfig } from "../../config/config.js";
 import {
   evaluateSessionFreshness,
   loadSessionStore,
+  resolveChannelResetConfig,
   resolveThreadFlag,
   resolveSessionResetPolicy,
   resolveSessionResetType,
@@ -13,7 +14,7 @@ import { normalizeMainKey } from "../../routing/session-key.js";
 export function getSessionSnapshot(
   cfg: ReturnType<typeof loadConfig>,
   from: string,
-  isHeartbeat = false,
+  _isHeartbeat = false,
   ctx?: {
     sessionKey?: string | null;
     isGroup?: boolean;
@@ -34,6 +35,7 @@ export function getSessionSnapshot(
     );
   const store = loadSessionStore(resolveStorePath(sessionCfg?.store));
   const entry = store[key];
+
   const isThread = resolveThreadFlag({
     sessionKey: key,
     messageThreadId: ctx?.messageThreadId ?? null,
@@ -42,11 +44,14 @@ export function getSessionSnapshot(
     parentSessionKey: ctx?.parentSessionKey ?? null,
   });
   const resetType = resolveSessionResetType({ sessionKey: key, isGroup: ctx?.isGroup, isThread });
-  const idleMinutesOverride = isHeartbeat ? sessionCfg?.heartbeatIdleMinutes : undefined;
+  const channelReset = resolveChannelResetConfig({
+    sessionCfg,
+    channel: entry?.lastChannel ?? entry?.channel,
+  });
   const resetPolicy = resolveSessionResetPolicy({
     sessionCfg,
     resetType,
-    idleMinutesOverride,
+    resetOverride: channelReset,
   });
   const now = Date.now();
   const freshness = entry

From 9f59ff325b66125e348b4d1a038b42ebd4e48216 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 19:44:20 +0000
Subject: [PATCH 042/171] feat: add cache-ttl pruning mode

---
 CHANGELOG.md                                  |  1 +
 docs/concepts/session-pruning.md              | 34 +++++-------
 docs/gateway/configuration.md                 | 50 ++++++++----------
 docs/providers/anthropic.md                   |  6 +--
 src/agents/pi-embedded-runner/cache-ttl.ts    | 52 +++++++++++++++++++
 src/agents/pi-embedded-runner/extensions.ts   |  5 +-
 src/agents/pi-embedded-runner/extra-params.ts |  4 +-
 .../pi-embedded-runner/run/attempt.test.ts    |  6 ++-
 src/agents/pi-embedded-runner/run/attempt.ts  | 12 +++++
 .../pi-extensions/context-pruning.test.ts     | 22 +++++---
 .../context-pruning/extension.ts              | 11 ++++
 .../pi-extensions/context-pruning/pruner.ts   | 28 ----------
 .../pi-extensions/context-pruning/runtime.ts  |  1 +
 .../pi-extensions/context-pruning/settings.ts | 23 ++++++--
 src/config/config.pruning-defaults.test.ts    |  4 +-
 src/config/defaults.ts                        | 19 +------
 src/config/types.agent-defaults.ts            |  4 +-
 src/config/zod-schema.agent-defaults.ts       |  5 +-
 18 files changed, 164 insertions(+), 123 deletions(-)
 create mode 100644 src/agents/pi-embedded-runner/cache-ttl.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a55377fff..5c5b81a8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Docs: https://docs.clawd.bot
 ## 2026.1.21
 
 ### Changes
+- Caching: make tool-result pruning TTL-aware so cache reuse stays stable and token usage drops.
 - CLI: default exec approvals to the local host, add gateway/node targeting flags, and show target details in allowlist output.
 - CLI: exec approvals mutations render tables instead of raw JSON.
 - Exec approvals: support wildcard agent allowlists (`*`) across all agents.
diff --git a/docs/concepts/session-pruning.md b/docs/concepts/session-pruning.md
index 4e76f9bb4..5e91b9fb8 100644
--- a/docs/concepts/session-pruning.md
+++ b/docs/concepts/session-pruning.md
@@ -9,8 +9,10 @@ read_when:
 Session pruning trims **old tool results** from the in-memory context right before each LLM call. It does **not** rewrite the on-disk session history (`*.jsonl`).
 
 ## When it runs
-- Before each LLM request (context hook).
+- When `mode: "cache-ttl"` is enabled and the last Anthropic call for the session is older than `ttl`.
 - Only affects the messages sent to the model for that request.
+ - Only active for Anthropic API calls (and OpenRouter Anthropic models).
+ - For best results, match `ttl` to your model `cacheControlTtl`.
 
 ## What can be pruned
 - Only `toolResult` messages.
@@ -26,14 +28,10 @@ Pruning uses an estimated context window (chars ≈ tokens × 4). The window siz
 3) `agents.defaults.contextTokens`.
 4) Default `200000` tokens.
 
-## Modes
-### adaptive
-- If estimated context ratio ≥ `softTrimRatio`: soft-trim oversized tool results.
-- If still ≥ `hardClearRatio` **and** prunable tool text ≥ `minPrunableToolChars`: hard-clear oldest eligible tool results.
-
-### aggressive
-- Always hard-clears eligible tool results before the cutoff.
-- Ignores `hardClear.enabled` (always clears when eligible).
+## Mode
+### cache-ttl
+- Pruning only runs if the last Anthropic call is older than `ttl` (default `5m`).
+- When it runs: same soft-trim + hard-clear behavior as before.
 
 ## Soft vs hard pruning
 - **Soft-trim**: only for oversized tool results.
@@ -52,6 +50,7 @@ Pruning uses an estimated context window (chars ≈ tokens × 4). The window siz
 - Compaction is separate: compaction summarizes and persists, pruning is transient per request. See [/concepts/compaction](/concepts/compaction).
 
 ## Defaults (when enabled)
+- `ttl`: `"5m"`
 - `keepLastAssistants`: `3`
 - `softTrimRatio`: `0.3`
 - `hardClearRatio`: `0.5`
@@ -60,16 +59,7 @@ Pruning uses an estimated context window (chars ≈ tokens × 4). The window siz
 - `hardClear`: `{ enabled: true, placeholder: "[Old tool result content cleared]" }`
 
 ## Examples
-Default (adaptive):
-```json5
-{
-  agent: {
-    contextPruning: { mode: "adaptive" }
-  }
-}
-```
-
-To disable:
+Default (off):
 ```json5
 {
   agent: {
@@ -78,11 +68,11 @@ To disable:
 }
 ```
 
-Aggressive:
+Enable TTL-aware pruning:
 ```json5
 {
   agent: {
-    contextPruning: { mode: "aggressive" }
+    contextPruning: { mode: "cache-ttl", ttl: "5m" }
   }
 }
 ```
@@ -92,7 +82,7 @@ Restrict pruning to specific tools:
 {
   agent: {
     contextPruning: {
-      mode: "adaptive",
+      mode: "cache-ttl",
       tools: { allow: ["exec", "read"], deny: ["*image*"] }
     }
   }
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index 9eddda3f8..ddce68e79 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -1414,7 +1414,7 @@ Each `agents.defaults.models` entry can include:
 - `alias` (optional model shortcut, e.g. `/opus`).
 - `params` (optional provider-specific API params passed through to the model request).
 
-`params` is also applied to streaming runs (embedded agent + compaction). Supported keys today: `temperature`, `maxTokens`, `cacheControlTtl` (`"5m"` or `"1h"`, Anthropic API + OpenRouter Anthropic models only; ignored for Anthropic OAuth/Claude Code tokens). These merge with call-time options; caller-supplied values win. `temperature` is an advanced knob—leave unset unless you know the model’s defaults and need a change. Anthropic API defaults to `"1h"` unless you override (`cacheControlTtl: "5m"`). Clawdbot includes the `extended-cache-ttl-2025-04-11` beta flag for Anthropic API; keep it if you override provider headers.
+`params` is also applied to streaming runs (embedded agent + compaction). Supported keys today: `temperature`, `maxTokens`, `cacheControlTtl` (`"5m"`, Anthropic API + OpenRouter Anthropic models only; ignored for Anthropic OAuth/Claude Code tokens). These merge with call-time options; caller-supplied values win. `temperature` is an advanced knob—leave unset unless you know the model’s defaults and need a change. Clawdbot includes the `extended-cache-ttl-2025-04-11` beta flag for Anthropic API; keep it if you override provider headers.
 
 Example:
 
@@ -1569,7 +1569,7 @@ Example:
 }
 ```
 
-#### `agents.defaults.contextPruning` (tool-result pruning)
+#### `agents.defaults.contextPruning` (TTL-aware tool-result pruning)
 
 `agents.defaults.contextPruning` prunes **old tool results** from the in-memory context right before a request is sent to the LLM.
 It does **not** modify the session history on disk (`*.jsonl` remains complete).
@@ -1580,11 +1580,9 @@ High level:
 - Never touches user/assistant messages.
 - Protects the last `keepLastAssistants` assistant messages (no tool results after that point are pruned).
 - Protects the bootstrap prefix (nothing before the first user message is pruned).
-- Modes:
-  - `adaptive`: soft-trims oversized tool results (keep head/tail) when the estimated context ratio crosses `softTrimRatio`.
-    Then hard-clears the oldest eligible tool results when the estimated context ratio crosses `hardClearRatio` **and**
-    there’s enough prunable tool-result bulk (`minPrunableToolChars`).
-  - `aggressive`: always replaces eligible tool results before the cutoff with the `hardClear.placeholder` (no ratio checks).
+- Mode:
+  - `cache-ttl`: pruning only runs when the last Anthropic call for the session is **older** than `ttl`.
+    When it runs, it uses the same soft-trim + hard-clear behavior as before.
 
 Soft vs hard pruning (what changes in the context sent to the LLM):
 - **Soft-trim**: only for *oversized* tool results. Keeps the beginning + end and inserts `...` in the middle.
@@ -1598,44 +1596,40 @@ Notes / current limitations:
 - Tool results containing **image blocks are skipped** (never trimmed/cleared) right now.
 - The estimated “context ratio” is based on **characters** (approximate), not exact tokens.
 - If the session doesn’t contain at least `keepLastAssistants` assistant messages yet, pruning is skipped.
-- In `aggressive` mode, `hardClear.enabled` is ignored (eligible tool results are always replaced with `hardClear.placeholder`).
+- `cache-ttl` only activates for Anthropic API calls (and OpenRouter Anthropic models).
+- For best results, match `contextPruning.ttl` to the model `cacheControlTtl` you set in `agents.defaults.models.*.params`.
 
-Default (adaptive):
-```json5
-{
-  agents: { defaults: { contextPruning: { mode: "adaptive" } } }
-}
-```
-
-To disable:
+Default (off):
 ```json5
 {
   agents: { defaults: { contextPruning: { mode: "off" } } }
 }
 ```
 
-Defaults (when `mode` is `"adaptive"` or `"aggressive"`):
-- `keepLastAssistants`: `3`
-- `softTrimRatio`: `0.3` (adaptive only)
-- `hardClearRatio`: `0.5` (adaptive only)
-- `minPrunableToolChars`: `50000` (adaptive only)
-- `softTrim`: `{ maxChars: 4000, headChars: 1500, tailChars: 1500 }` (adaptive only)
-- `hardClear`: `{ enabled: true, placeholder: "[Old tool result content cleared]" }`
-
-Example (aggressive, minimal):
+Enable TTL-aware pruning:
 ```json5
 {
-  agents: { defaults: { contextPruning: { mode: "aggressive" } } }
+  agents: { defaults: { contextPruning: { mode: "cache-ttl" } } }
 }
 ```
 
-Example (adaptive tuned):
+Defaults (when `mode` is `"cache-ttl"`):
+- `ttl`: `"5m"`
+- `keepLastAssistants`: `3`
+- `softTrimRatio`: `0.3`
+- `hardClearRatio`: `0.5`
+- `minPrunableToolChars`: `50000`
+- `softTrim`: `{ maxChars: 4000, headChars: 1500, tailChars: 1500 }`
+- `hardClear`: `{ enabled: true, placeholder: "[Old tool result content cleared]" }`
+
+Example (cache-ttl tuned):
 ```json5
 {
   agents: {
     defaults: {
       contextPruning: {
-        mode: "adaptive",
+        mode: "cache-ttl",
+        ttl: "5m",
         keepLastAssistants: 3,
         softTrimRatio: 0.3,
         hardClearRatio: 0.5,
diff --git a/docs/providers/anthropic.md b/docs/providers/anthropic.md
index 9c72b990a..80cbe5d8b 100644
--- a/docs/providers/anthropic.md
+++ b/docs/providers/anthropic.md
@@ -36,10 +36,10 @@ clawdbot onboard --anthropic-api-key "$ANTHROPIC_API_KEY"
 
 ## Prompt caching (Anthropic API)
 
-Clawdbot enables **1-hour prompt caching by default** for Anthropic API keys.
+Clawdbot does **not** override Anthropic’s default cache TTL unless you set it.
 This is **API-only**; Claude Code CLI OAuth ignores TTL settings.
 
-To override the TTL per model, set `cacheControlTtl` in the model `params`:
+To set the TTL per model, use `cacheControlTtl` in the model `params`:
 
 ```json5
 {
@@ -47,7 +47,7 @@ To override the TTL per model, set `cacheControlTtl` in the model `params`:
     defaults: {
       models: {
         "anthropic/claude-opus-4-5": {
-          params: { cacheControlTtl: "5m" } // or "1h"
+          params: { cacheControlTtl: "5m" }
         }
       }
     }
diff --git a/src/agents/pi-embedded-runner/cache-ttl.ts b/src/agents/pi-embedded-runner/cache-ttl.ts
new file mode 100644
index 000000000..a280653f1
--- /dev/null
+++ b/src/agents/pi-embedded-runner/cache-ttl.ts
@@ -0,0 +1,52 @@
+type CustomEntryLike = { type?: unknown; customType?: unknown; data?: unknown };
+
+export const CACHE_TTL_CUSTOM_TYPE = "clawdbot.cache-ttl";
+
+export type CacheTtlEntryData = {
+  timestamp: number;
+  provider?: string;
+  modelId?: string;
+};
+
+export function isCacheTtlEligibleProvider(provider: string, modelId: string): boolean {
+  const normalizedProvider = provider.toLowerCase();
+  const normalizedModelId = modelId.toLowerCase();
+  if (normalizedProvider === "anthropic") return true;
+  if (normalizedProvider === "openrouter" && normalizedModelId.startsWith("anthropic/"))
+    return true;
+  return false;
+}
+
+export function readLastCacheTtlTimestamp(sessionManager: unknown): number | null {
+  const sm = sessionManager as { getEntries?: () => CustomEntryLike[] };
+  if (!sm?.getEntries) return null;
+  try {
+    const entries = sm.getEntries();
+    let last: number | null = null;
+    for (let i = entries.length - 1; i >= 0; i--) {
+      const entry = entries[i];
+      if (entry?.type !== "custom" || entry?.customType !== CACHE_TTL_CUSTOM_TYPE) continue;
+      const data = entry?.data as Partial<CacheTtlEntryData> | undefined;
+      const ts = typeof data?.timestamp === "number" ? data.timestamp : null;
+      if (ts && Number.isFinite(ts)) {
+        last = ts;
+        break;
+      }
+    }
+    return last;
+  } catch {
+    return null;
+  }
+}
+
+export function appendCacheTtlTimestamp(sessionManager: unknown, data: CacheTtlEntryData): void {
+  const sm = sessionManager as {
+    appendCustomEntry?: (customType: string, data: unknown) => void;
+  };
+  if (!sm?.appendCustomEntry) return;
+  try {
+    sm.appendCustomEntry(CACHE_TTL_CUSTOM_TYPE, data);
+  } catch {
+    // ignore persistence failures
+  }
+}
diff --git a/src/agents/pi-embedded-runner/extensions.ts b/src/agents/pi-embedded-runner/extensions.ts
index a7fd27ebb..48d9d22e6 100644
--- a/src/agents/pi-embedded-runner/extensions.ts
+++ b/src/agents/pi-embedded-runner/extensions.ts
@@ -11,6 +11,7 @@ import { setContextPruningRuntime } from "../pi-extensions/context-pruning/runti
 import { computeEffectiveSettings } from "../pi-extensions/context-pruning/settings.js";
 import { makeToolPrunablePredicate } from "../pi-extensions/context-pruning/tools.js";
 import { ensurePiCompactionReserveTokens } from "../pi-settings.js";
+import { isCacheTtlEligibleProvider, readLastCacheTtlTimestamp } from "./cache-ttl.js";
 
 function resolvePiExtensionPath(id: string): string {
   const self = fileURLToPath(import.meta.url);
@@ -43,7 +44,8 @@ function buildContextPruningExtension(params: {
   model: Model<Api> | undefined;
 }): { additionalExtensionPaths?: string[] } {
   const raw = params.cfg?.agents?.defaults?.contextPruning;
-  if (raw?.mode !== "adaptive" && raw?.mode !== "aggressive") return {};
+  if (raw?.mode !== "cache-ttl") return {};
+  if (!isCacheTtlEligibleProvider(params.provider, params.modelId)) return {};
 
   const settings = computeEffectiveSettings(raw);
   if (!settings) return {};
@@ -52,6 +54,7 @@ function buildContextPruningExtension(params: {
     settings,
     contextWindowTokens: resolveContextWindowTokens(params),
     isToolPrunable: makeToolPrunablePredicate(settings.tools),
+    lastCacheTouchAt: readLastCacheTtlTimestamp(params.sessionManager),
   });
 
   return {
diff --git a/src/agents/pi-embedded-runner/extra-params.ts b/src/agents/pi-embedded-runner/extra-params.ts
index 11f2ab83a..f6a4490a4 100644
--- a/src/agents/pi-embedded-runner/extra-params.ts
+++ b/src/agents/pi-embedded-runner/extra-params.ts
@@ -21,7 +21,7 @@ export function resolveExtraParams(params: {
   return modelConfig?.params ? { ...modelConfig.params } : undefined;
 }
 
-type CacheControlTtl = "5m" | "1h";
+type CacheControlTtl = "5m";
 
 function resolveCacheControlTtl(
   extraParams: Record<string, unknown> | undefined,
@@ -29,7 +29,7 @@ function resolveCacheControlTtl(
   modelId: string,
 ): CacheControlTtl | undefined {
   const raw = extraParams?.cacheControlTtl;
-  if (raw !== "5m" && raw !== "1h") return undefined;
+  if (raw !== "5m") return undefined;
   if (provider === "anthropic") return raw;
   if (provider === "openrouter" && modelId.startsWith("anthropic/")) return raw;
   return undefined;
diff --git a/src/agents/pi-embedded-runner/run/attempt.test.ts b/src/agents/pi-embedded-runner/run/attempt.test.ts
index af1d97828..93d5b5651 100644
--- a/src/agents/pi-embedded-runner/run/attempt.test.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.test.ts
@@ -36,8 +36,10 @@ describe("injectHistoryImagesIntoMessages", () => {
     const didMutate = injectHistoryImagesIntoMessages(messages, new Map([[0, [image]]]));
 
     expect(didMutate).toBe(false);
-    const content = messages[0]?.content as unknown[] | undefined;
-    expect(content).toBeDefined();
+    const content = messages[0]?.content;
+    if (!Array.isArray(content)) {
+      throw new Error("expected array content");
+    }
     expect(content).toHaveLength(2);
   });
 
diff --git a/src/agents/pi-embedded-runner/run/attempt.ts b/src/agents/pi-embedded-runner/run/attempt.ts
index 6a1bd3978..e2e3a39dd 100644
--- a/src/agents/pi-embedded-runner/run/attempt.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.ts
@@ -49,6 +49,7 @@ import { resolveDefaultModelForAgent } from "../../model-selection.js";
 import { isAbortError } from "../abort.js";
 import { buildEmbeddedExtensionPaths } from "../extensions.js";
 import { applyExtraParamsToAgent } from "../extra-params.js";
+import { appendCacheTtlTimestamp, isCacheTtlEligibleProvider } from "../cache-ttl.js";
 import {
   logToolSchemasForGoogle,
   sanitizeSessionHistory,
@@ -685,6 +686,17 @@ export async function runEmbeddedAttempt(
             note: `images: prompt=${imageResult.images.length} history=${imageResult.historyImagesByIndex.size}`,
           });
 
+          const shouldTrackCacheTtl =
+            params.config?.agents?.defaults?.contextPruning?.mode === "cache-ttl" &&
+            isCacheTtlEligibleProvider(params.provider, params.modelId);
+          if (shouldTrackCacheTtl) {
+            appendCacheTtlTimestamp(sessionManager, {
+              timestamp: Date.now(),
+              provider: params.provider,
+              modelId: params.modelId,
+            });
+          }
+
           // Only pass images option if there are actually images to pass
           // This avoids potential issues with models that don't expect the images parameter
           if (imageResult.images.length > 0) {
diff --git a/src/agents/pi-extensions/context-pruning.test.ts b/src/agents/pi-extensions/context-pruning.test.ts
index 7dc8e6c59..b316ef87f 100644
--- a/src/agents/pi-extensions/context-pruning.test.ts
+++ b/src/agents/pi-extensions/context-pruning.test.ts
@@ -135,12 +135,15 @@ describe("context-pruning", () => {
   });
 
   it("never prunes tool results before the first user message", () => {
-    const settings = computeEffectiveSettings({
-      mode: "aggressive",
+    const settings = {
+      ...DEFAULT_CONTEXT_PRUNING_SETTINGS,
       keepLastAssistants: 0,
-      hardClear: { placeholder: "[cleared]" },
-    });
-    if (!settings) throw new Error("expected settings");
+      softTrimRatio: 0.0,
+      hardClearRatio: 0.0,
+      minPrunableToolChars: 0,
+      hardClear: { enabled: true, placeholder: "[cleared]" },
+      softTrim: { maxChars: 10, headChars: 3, tailChars: 3 },
+    };
 
     const messages: AgentMessage[] = [
       makeAssistant("bootstrap tool calls"),
@@ -170,7 +173,7 @@ describe("context-pruning", () => {
     expect(toolText(findToolResult(next, "t1"))).toBe("[cleared]");
   });
 
-  it("mode aggressive clears eligible tool results before cutoff", () => {
+  it("hard-clear removes eligible tool results before cutoff", () => {
     const messages: AgentMessage[] = [
       makeUser("u1"),
       makeAssistant("a1"),
@@ -195,9 +198,11 @@ describe("context-pruning", () => {
 
     const settings = {
       ...DEFAULT_CONTEXT_PRUNING_SETTINGS,
-      mode: "aggressive",
       keepLastAssistants: 1,
-      hardClear: { enabled: false, placeholder: "[cleared]" },
+      softTrimRatio: 10.0,
+      hardClearRatio: 0.0,
+      minPrunableToolChars: 0,
+      hardClear: { enabled: true, placeholder: "[cleared]" },
     };
 
     const ctx = {
@@ -258,6 +263,7 @@ describe("context-pruning", () => {
       },
       contextWindowTokens: 1000,
       isToolPrunable: () => true,
+      lastCacheTouchAt: Date.now() - DEFAULT_CONTEXT_PRUNING_SETTINGS.ttlMs - 1000,
     });
 
     const messages: AgentMessage[] = [
diff --git a/src/agents/pi-extensions/context-pruning/extension.ts b/src/agents/pi-extensions/context-pruning/extension.ts
index 94da729e4..7e48141c4 100644
--- a/src/agents/pi-extensions/context-pruning/extension.ts
+++ b/src/agents/pi-extensions/context-pruning/extension.ts
@@ -9,6 +9,17 @@ export default function contextPruningExtension(api: ExtensionAPI): void {
     const runtime = getContextPruningRuntime(ctx.sessionManager);
     if (!runtime) return undefined;
 
+    if (runtime.settings.mode === "cache-ttl") {
+      const ttlMs = runtime.settings.ttlMs;
+      const lastTouch = runtime.lastCacheTouchAt ?? null;
+      if (!lastTouch || ttlMs <= 0) {
+        return undefined;
+      }
+      if (ttlMs > 0 && Date.now() - lastTouch < ttlMs) {
+        return undefined;
+      }
+    }
+
     const next = pruneContextMessages({
       messages: event.messages as AgentMessage[],
       settings: runtime.settings,
diff --git a/src/agents/pi-extensions/context-pruning/pruner.ts b/src/agents/pi-extensions/context-pruning/pruner.ts
index 61d5154d4..c13e5c37a 100644
--- a/src/agents/pi-extensions/context-pruning/pruner.ts
+++ b/src/agents/pi-extensions/context-pruning/pruner.ts
@@ -211,34 +211,6 @@ export function pruneContextMessages(params: {
 
   const isToolPrunable = params.isToolPrunable ?? makeToolPrunablePredicate(settings.tools);
 
-  if (settings.mode === "aggressive") {
-    let next: AgentMessage[] | null = null;
-
-    for (let i = pruneStartIndex; i < cutoffIndex; i++) {
-      const msg = messages[i];
-      if (!msg || msg.role !== "toolResult") continue;
-      if (!isToolPrunable(msg.toolName)) continue;
-      if (hasImageBlocks(msg.content)) {
-        continue;
-      }
-
-      const alreadyCleared =
-        msg.content.length === 1 &&
-        msg.content[0]?.type === "text" &&
-        msg.content[0].text === settings.hardClear.placeholder;
-      if (alreadyCleared) continue;
-
-      const cleared: ToolResultMessage = {
-        ...msg,
-        content: [asText(settings.hardClear.placeholder)],
-      };
-      if (!next) next = messages.slice();
-      next[i] = cleared as unknown as AgentMessage;
-    }
-
-    return next ?? messages;
-  }
-
   const totalCharsBefore = estimateContextChars(messages);
   let totalChars = totalCharsBefore;
   let ratio = totalChars / charWindow;
diff --git a/src/agents/pi-extensions/context-pruning/runtime.ts b/src/agents/pi-extensions/context-pruning/runtime.ts
index b497e6383..fecb4ce3e 100644
--- a/src/agents/pi-extensions/context-pruning/runtime.ts
+++ b/src/agents/pi-extensions/context-pruning/runtime.ts
@@ -4,6 +4,7 @@ export type ContextPruningRuntimeValue = {
   settings: EffectiveContextPruningSettings;
   contextWindowTokens?: number | null;
   isToolPrunable: (toolName: string) => boolean;
+  lastCacheTouchAt?: number | null;
 };
 
 // Session-scoped runtime registry keyed by object identity.
diff --git a/src/agents/pi-extensions/context-pruning/settings.ts b/src/agents/pi-extensions/context-pruning/settings.ts
index 69f9474d1..8d1497083 100644
--- a/src/agents/pi-extensions/context-pruning/settings.ts
+++ b/src/agents/pi-extensions/context-pruning/settings.ts
@@ -1,12 +1,15 @@
+import { parseDurationMs } from "../../../cli/parse-duration.js";
+
 export type ContextPruningToolMatch = {
   allow?: string[];
   deny?: string[];
 };
-
-export type ContextPruningMode = "off" | "adaptive" | "aggressive";
+export type ContextPruningMode = "off" | "cache-ttl";
 
 export type ContextPruningConfig = {
   mode?: ContextPruningMode;
+  /** TTL to consider cache expired (duration string, default unit: minutes). */
+  ttl?: string;
   keepLastAssistants?: number;
   softTrimRatio?: number;
   hardClearRatio?: number;
@@ -25,6 +28,7 @@ export type ContextPruningConfig = {
 
 export type EffectiveContextPruningSettings = {
   mode: Exclude<ContextPruningMode, "off">;
+  ttlMs: number;
   keepLastAssistants: number;
   softTrimRatio: number;
   hardClearRatio: number;
@@ -42,7 +46,8 @@ export type EffectiveContextPruningSettings = {
 };
 
 export const DEFAULT_CONTEXT_PRUNING_SETTINGS: EffectiveContextPruningSettings = {
-  mode: "adaptive",
+  mode: "cache-ttl",
+  ttlMs: 5 * 60 * 1000,
   keepLastAssistants: 3,
   softTrimRatio: 0.3,
   hardClearRatio: 0.5,
@@ -62,11 +67,19 @@ export const DEFAULT_CONTEXT_PRUNING_SETTINGS: EffectiveContextPruningSettings =
 export function computeEffectiveSettings(raw: unknown): EffectiveContextPruningSettings | null {
   if (!raw || typeof raw !== "object") return null;
   const cfg = raw as ContextPruningConfig;
-  if (cfg.mode !== "adaptive" && cfg.mode !== "aggressive") return null;
+  if (cfg.mode !== "cache-ttl") return null;
 
   const s: EffectiveContextPruningSettings = structuredClone(DEFAULT_CONTEXT_PRUNING_SETTINGS);
   s.mode = cfg.mode;
 
+  if (typeof cfg.ttl === "string") {
+    try {
+      s.ttlMs = parseDurationMs(cfg.ttl, { defaultUnit: "m" });
+    } catch {
+      // keep default ttl
+    }
+  }
+
   if (typeof cfg.keepLastAssistants === "number" && Number.isFinite(cfg.keepLastAssistants)) {
     s.keepLastAssistants = Math.max(0, Math.floor(cfg.keepLastAssistants));
   }
@@ -94,7 +107,7 @@ export function computeEffectiveSettings(raw: unknown): EffectiveContextPruningS
     }
   }
   if (cfg.hardClear) {
-    if (s.mode === "adaptive" && typeof cfg.hardClear.enabled === "boolean") {
+    if (typeof cfg.hardClear.enabled === "boolean") {
       s.hardClear.enabled = cfg.hardClear.enabled;
     }
     if (typeof cfg.hardClear.placeholder === "string" && cfg.hardClear.placeholder.trim()) {
diff --git a/src/config/config.pruning-defaults.test.ts b/src/config/config.pruning-defaults.test.ts
index 195c96cc5..8bc4d7e20 100644
--- a/src/config/config.pruning-defaults.test.ts
+++ b/src/config/config.pruning-defaults.test.ts
@@ -4,7 +4,7 @@ import { describe, expect, it, vi } from "vitest";
 import { withTempHome } from "./test-helpers.js";
 
 describe("config pruning defaults", () => {
-  it("defaults contextPruning mode to adaptive", async () => {
+  it("does not enable contextPruning by default", async () => {
     await withTempHome(async (home) => {
       const configDir = path.join(home, ".clawdbot");
       await fs.mkdir(configDir, { recursive: true });
@@ -18,7 +18,7 @@ describe("config pruning defaults", () => {
       const { loadConfig } = await import("./config.js");
       const cfg = loadConfig();
 
-      expect(cfg.agents?.defaults?.contextPruning?.mode).toBe("adaptive");
+      expect(cfg.agents?.defaults?.contextPruning?.mode).toBeUndefined();
     });
   });
 
diff --git a/src/config/defaults.ts b/src/config/defaults.ts
index 1d0208fc2..9976a64ef 100644
--- a/src/config/defaults.ts
+++ b/src/config/defaults.ts
@@ -157,24 +157,7 @@ export function applyLoggingDefaults(cfg: ClawdbotConfig): ClawdbotConfig {
 }
 
 export function applyContextPruningDefaults(cfg: ClawdbotConfig): ClawdbotConfig {
-  const defaults = cfg.agents?.defaults;
-  if (!defaults) return cfg;
-  const contextPruning = defaults?.contextPruning;
-  if (contextPruning?.mode) return cfg;
-
-  return {
-    ...cfg,
-    agents: {
-      ...cfg.agents,
-      defaults: {
-        ...defaults,
-        contextPruning: {
-          ...contextPruning,
-          mode: "adaptive",
-        },
-      },
-    },
-  };
+  return cfg;
 }
 
 export function applyCompactionDefaults(cfg: ClawdbotConfig): ClawdbotConfig {
diff --git a/src/config/types.agent-defaults.ts b/src/config/types.agent-defaults.ts
index 85eff97f2..0fcdcf49b 100644
--- a/src/config/types.agent-defaults.ts
+++ b/src/config/types.agent-defaults.ts
@@ -23,7 +23,9 @@ export type AgentModelListConfig = {
 };
 
 export type AgentContextPruningConfig = {
-  mode?: "off" | "adaptive" | "aggressive";
+  mode?: "off" | "cache-ttl";
+  /** TTL to consider cache expired (duration string, default unit: minutes). */
+  ttl?: string;
   keepLastAssistants?: number;
   softTrimRatio?: number;
   hardClearRatio?: number;
diff --git a/src/config/zod-schema.agent-defaults.ts b/src/config/zod-schema.agent-defaults.ts
index aafa9a6f4..c6c0ab3b2 100644
--- a/src/config/zod-schema.agent-defaults.ts
+++ b/src/config/zod-schema.agent-defaults.ts
@@ -54,9 +54,8 @@ export const AgentDefaultsSchema = z
     memorySearch: MemorySearchSchema,
     contextPruning: z
       .object({
-        mode: z
-          .union([z.literal("off"), z.literal("adaptive"), z.literal("aggressive")])
-          .optional(),
+        mode: z.union([z.literal("off"), z.literal("cache-ttl")]).optional(),
+        ttl: z.string().optional(),
         keepLastAssistants: z.number().int().nonnegative().optional(),
         softTrimRatio: z.number().min(0).max(1).optional(),
         hardClearRatio: z.number().min(0).max(1).optional(),

From 9f999f65542c3b3d71eb0ebce5e9446f4806f245 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 19:53:00 +0000
Subject: [PATCH 043/171] fix: reset cache-ttl pruning window

---
 .../pi-extensions/context-pruning.test.ts     | 68 ++++++++++++++++++-
 .../context-pruning/extension.ts              |  5 ++
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/src/agents/pi-extensions/context-pruning.test.ts b/src/agents/pi-extensions/context-pruning.test.ts
index b316ef87f..9e92e320e 100644
--- a/src/agents/pi-extensions/context-pruning.test.ts
+++ b/src/agents/pi-extensions/context-pruning.test.ts
@@ -2,7 +2,7 @@ import type { AgentMessage } from "@mariozechner/pi-agent-core";
 import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
 import { describe, expect, it } from "vitest";
 
-import { setContextPruningRuntime } from "./context-pruning/runtime.js";
+import { getContextPruningRuntime, setContextPruningRuntime } from "./context-pruning/runtime.js";
 
 import {
   computeEffectiveSettings,
@@ -306,6 +306,72 @@ describe("context-pruning", () => {
     expect(toolText(findToolResult(result.messages, "t1"))).toBe("[cleared]");
   });
 
+  it("cache-ttl prunes once and resets the ttl window", () => {
+    const sessionManager = {};
+    const lastTouch = Date.now() - DEFAULT_CONTEXT_PRUNING_SETTINGS.ttlMs - 1000;
+
+    setContextPruningRuntime(sessionManager, {
+      settings: {
+        ...DEFAULT_CONTEXT_PRUNING_SETTINGS,
+        keepLastAssistants: 0,
+        softTrimRatio: 0,
+        hardClearRatio: 0,
+        minPrunableToolChars: 0,
+        hardClear: { enabled: true, placeholder: "[cleared]" },
+        softTrim: { maxChars: 10, headChars: 3, tailChars: 3 },
+      },
+      contextWindowTokens: 1000,
+      isToolPrunable: () => true,
+      lastCacheTouchAt: lastTouch,
+    });
+
+    const messages: AgentMessage[] = [
+      makeUser("u1"),
+      makeAssistant("a1"),
+      makeToolResult({
+        toolCallId: "t1",
+        toolName: "exec",
+        text: "x".repeat(20_000),
+      }),
+    ];
+
+    let handler:
+      | ((
+          event: { messages: AgentMessage[] },
+          ctx: ExtensionContext,
+        ) => { messages: AgentMessage[] } | undefined)
+      | undefined;
+
+    const api = {
+      on: (name: string, fn: unknown) => {
+        if (name === "context") {
+          handler = fn as typeof handler;
+        }
+      },
+      appendEntry: (_type: string, _data?: unknown) => {},
+    } as unknown as ExtensionAPI;
+
+    contextPruningExtension(api);
+    if (!handler) throw new Error("missing context handler");
+
+    const first = handler({ messages }, {
+      model: undefined,
+      sessionManager,
+    } as unknown as ExtensionContext);
+    if (!first) throw new Error("expected first prune");
+    expect(toolText(findToolResult(first.messages, "t1"))).toBe("[cleared]");
+
+    const runtime = getContextPruningRuntime(sessionManager);
+    if (!runtime?.lastCacheTouchAt) throw new Error("expected lastCacheTouchAt");
+    expect(runtime.lastCacheTouchAt).toBeGreaterThan(lastTouch);
+
+    const second = handler({ messages }, {
+      model: undefined,
+      sessionManager,
+    } as unknown as ExtensionContext);
+    expect(second).toBeUndefined();
+  });
+
   it("respects tools allow/deny (deny wins; wildcards supported)", () => {
     const messages: AgentMessage[] = [
       makeUser("u1"),
diff --git a/src/agents/pi-extensions/context-pruning/extension.ts b/src/agents/pi-extensions/context-pruning/extension.ts
index 7e48141c4..411cc9a44 100644
--- a/src/agents/pi-extensions/context-pruning/extension.ts
+++ b/src/agents/pi-extensions/context-pruning/extension.ts
@@ -29,6 +29,11 @@ export default function contextPruningExtension(api: ExtensionAPI): void {
     });
 
     if (next === event.messages) return undefined;
+
+    if (runtime.settings.mode === "cache-ttl") {
+      runtime.lastCacheTouchAt = Date.now();
+    }
+
     return { messages: next };
   });
 }

From 41d56c06b9411e1a540c4aa3649accbe2e6f4497 Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vigneshnatarajan92@gmail.com>
Date: Wed, 21 Jan 2026 11:53:02 -0800
Subject: [PATCH 044/171] feat(commands): add /models and fix /model listing UX

---
 src/auto-reply/commands-registry.data.ts      |   9 +-
 src/auto-reply/commands-registry.test.ts      |   1 +
 src/auto-reply/reply/commands-core.ts         |   2 +
 src/auto-reply/reply/commands-models.test.ts  |  89 +++++++++
 src/auto-reply/reply/commands-models.ts       | 170 ++++++++++++++++++
 .../directive-handling.model.chat-ux.test.ts  |  60 +++++++
 .../reply/directive-handling.model.ts         | 102 +++++++----
 src/auto-reply/reply/model-selection.ts       |  67 +++++--
 8 files changed, 450 insertions(+), 50 deletions(-)
 create mode 100644 src/auto-reply/reply/commands-models.test.ts
 create mode 100644 src/auto-reply/reply/commands-models.ts
 create mode 100644 src/auto-reply/reply/directive-handling.model.chat-ux.test.ts

diff --git a/src/auto-reply/commands-registry.data.ts b/src/auto-reply/commands-registry.data.ts
index 691bdd36e..4ce176b1d 100644
--- a/src/auto-reply/commands-registry.data.ts
+++ b/src/auto-reply/commands-registry.data.ts
@@ -429,6 +429,14 @@ function buildChatCommands(): ChatCommandDefinition[] {
         },
       ],
     }),
+    defineChatCommand({
+      key: "models",
+      nativeName: "models",
+      description: "List model providers or provider models.",
+      textAlias: "/models",
+      argsParsing: "none",
+      acceptsArgs: true,
+    }),
     defineChatCommand({
       key: "queue",
       nativeName: "queue",
@@ -485,7 +493,6 @@ function buildChatCommands(): ChatCommandDefinition[] {
   registerAlias(commands, "verbose", "/v");
   registerAlias(commands, "reasoning", "/reason");
   registerAlias(commands, "elevated", "/elev");
-  registerAlias(commands, "model", "/models");
 
   assertCommandRegistry(commands);
   return commands;
diff --git a/src/auto-reply/commands-registry.test.ts b/src/auto-reply/commands-registry.test.ts
index 54fb558bd..4296e06cd 100644
--- a/src/auto-reply/commands-registry.test.ts
+++ b/src/auto-reply/commands-registry.test.ts
@@ -25,6 +25,7 @@ describe("commands registry", () => {
   it("builds command text with args", () => {
     expect(buildCommandText("status")).toBe("/status");
     expect(buildCommandText("model", "gpt-5")).toBe("/model gpt-5");
+    expect(buildCommandText("models")).toBe("/models");
   });
 
   it("exposes native specs", () => {
diff --git a/src/auto-reply/reply/commands-core.ts b/src/auto-reply/reply/commands-core.ts
index 9abe5e677..f974dec74 100644
--- a/src/auto-reply/reply/commands-core.ts
+++ b/src/auto-reply/reply/commands-core.ts
@@ -15,6 +15,7 @@ import {
 } from "./commands-info.js";
 import { handleAllowlistCommand } from "./commands-allowlist.js";
 import { handleSubagentsCommand } from "./commands-subagents.js";
+import { handleModelsCommand } from "./commands-models.js";
 import {
   handleAbortTrigger,
   handleActivationCommand,
@@ -44,6 +45,7 @@ const HANDLERS: CommandHandler[] = [
   handleSubagentsCommand,
   handleConfigCommand,
   handleDebugCommand,
+  handleModelsCommand,
   handleStopCommand,
   handleCompactCommand,
   handleAbortTrigger,
diff --git a/src/auto-reply/reply/commands-models.test.ts b/src/auto-reply/reply/commands-models.test.ts
new file mode 100644
index 000000000..0dd321399
--- /dev/null
+++ b/src/auto-reply/reply/commands-models.test.ts
@@ -0,0 +1,89 @@
+import { describe, expect, it, vi } from "vitest";
+
+import type { ClawdbotConfig } from "../../config/config.js";
+import type { MsgContext } from "../templating.js";
+import { buildCommandContext, handleCommands } from "./commands.js";
+import { parseInlineDirectives } from "./directive-handling.js";
+
+vi.mock("../../agents/model-catalog.js", () => ({
+  loadModelCatalog: vi.fn(async () => [
+    { provider: "anthropic", id: "claude-opus-4-5", name: "Claude Opus" },
+    { provider: "anthropic", id: "claude-sonnet-4-5", name: "Claude Sonnet" },
+    { provider: "openai", id: "gpt-4.1", name: "GPT-4.1" },
+    { provider: "openai", id: "gpt-4.1-mini", name: "GPT-4.1 Mini" },
+    { provider: "google", id: "gemini-2.0-flash", name: "Gemini Flash" },
+  ]),
+}));
+
+function buildParams(commandBody: string, cfg: ClawdbotConfig, ctxOverrides?: Partial<MsgContext>) {
+  const ctx = {
+    Body: commandBody,
+    CommandBody: commandBody,
+    CommandSource: "text",
+    CommandAuthorized: true,
+    Provider: "telegram",
+    Surface: "telegram",
+    ...ctxOverrides,
+  } as MsgContext;
+
+  const command = buildCommandContext({
+    ctx,
+    cfg,
+    isGroup: false,
+    triggerBodyNormalized: commandBody.trim().toLowerCase(),
+    commandAuthorized: true,
+  });
+
+  return {
+    ctx,
+    cfg,
+    command,
+    directives: parseInlineDirectives(commandBody),
+    elevated: { enabled: true, allowed: true, failures: [] },
+    sessionKey: "agent:main:main",
+    workspaceDir: "/tmp",
+    defaultGroupActivation: () => "mention",
+    resolvedVerboseLevel: "off" as const,
+    resolvedReasoningLevel: "off" as const,
+    resolveDefaultThinkingLevel: async () => undefined,
+    provider: "anthropic",
+    model: "claude-opus-4-5",
+    contextTokens: 16000,
+    isGroup: false,
+  };
+}
+
+describe("/models command", () => {
+  const cfg = {
+    commands: { text: true },
+    // allowlist is empty => allowAny, but still okay for listing
+    agents: { defaults: { model: { primary: "anthropic/claude-opus-4-5" } } },
+  } as unknown as ClawdbotConfig;
+
+  it.each(["telegram", "discord", "whatsapp"])("lists providers on %s", async (surface) => {
+    const params = buildParams("/models", cfg, { Provider: surface, Surface: surface });
+    const result = await handleCommands(params);
+    expect(result.shouldContinue).toBe(false);
+    expect(result.reply?.text).toContain("Providers:");
+    expect(result.reply?.text).toContain("anthropic");
+    expect(result.reply?.text).toContain("Use: /models <provider>");
+  });
+
+  it("lists provider models with pagination hints", async () => {
+    const params = buildParams("/models anthropic", cfg);
+    const result = await handleCommands(params);
+    expect(result.shouldContinue).toBe(false);
+    expect(result.reply?.text).toContain("Models (anthropic)");
+    expect(result.reply?.text).toContain("anthropic/claude-opus-4-5");
+    expect(result.reply?.text).toContain("Switch: /model <provider/model>");
+    expect(result.reply?.text).toContain("All: /models anthropic all");
+  });
+
+  it("handles unknown providers", async () => {
+    const params = buildParams("/models not-a-provider", cfg);
+    const result = await handleCommands(params);
+    expect(result.shouldContinue).toBe(false);
+    expect(result.reply?.text).toContain("Unknown provider");
+    expect(result.reply?.text).toContain("Available providers");
+  });
+});
diff --git a/src/auto-reply/reply/commands-models.ts b/src/auto-reply/reply/commands-models.ts
new file mode 100644
index 000000000..fbc5560f5
--- /dev/null
+++ b/src/auto-reply/reply/commands-models.ts
@@ -0,0 +1,170 @@
+import { loadModelCatalog } from "../../agents/model-catalog.js";
+import {
+  buildAllowedModelSet,
+  normalizeProviderId,
+  resolveConfiguredModelRef,
+} from "../../agents/model-selection.js";
+import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "../../agents/defaults.js";
+import type { ReplyPayload } from "../types.js";
+import type { CommandHandler } from "./commands-types.js";
+
+const PAGE_SIZE_DEFAULT = 20;
+const PAGE_SIZE_MAX = 100;
+
+function formatProviderLine(params: { provider: string; count: number }): string {
+  return `- ${params.provider} (${params.count})`;
+}
+
+function parseModelsArgs(raw: string): {
+  provider?: string;
+  page: number;
+  pageSize: number;
+  all: boolean;
+} {
+  const trimmed = raw.trim();
+  if (!trimmed) {
+    return { page: 1, pageSize: PAGE_SIZE_DEFAULT, all: false };
+  }
+
+  const tokens = trimmed.split(/\s+/g).filter(Boolean);
+  const provider = tokens[0]?.trim();
+
+  let page = 1;
+  let all = false;
+  for (const token of tokens.slice(1)) {
+    const lower = token.toLowerCase();
+    if (lower === "all" || lower === "--all") {
+      all = true;
+      continue;
+    }
+    if (lower.startsWith("page=")) {
+      const value = Number.parseInt(lower.slice("page=".length), 10);
+      if (Number.isFinite(value) && value > 0) page = value;
+      continue;
+    }
+    if (/^[0-9]+$/.test(lower)) {
+      const value = Number.parseInt(lower, 10);
+      if (Number.isFinite(value) && value > 0) page = value;
+    }
+  }
+
+  let pageSize = PAGE_SIZE_DEFAULT;
+  for (const token of tokens) {
+    const lower = token.toLowerCase();
+    if (lower.startsWith("limit=") || lower.startsWith("size=")) {
+      const rawValue = lower.slice(lower.indexOf("=") + 1);
+      const value = Number.parseInt(rawValue, 10);
+      if (Number.isFinite(value) && value > 0) pageSize = Math.min(PAGE_SIZE_MAX, value);
+    }
+  }
+
+  return {
+    provider: provider ? normalizeProviderId(provider) : undefined,
+    page,
+    pageSize,
+    all,
+  };
+}
+
+export const handleModelsCommand: CommandHandler = async (params, allowTextCommands) => {
+  if (!allowTextCommands) return null;
+
+  const body = params.command.commandBodyNormalized.trim();
+  if (!body.startsWith("/models")) return null;
+
+  const argText = body.replace(/^\/models\b/i, "").trim();
+  const { provider, page, pageSize, all } = parseModelsArgs(argText);
+
+  const resolvedDefault = resolveConfiguredModelRef({
+    cfg: params.cfg,
+    defaultProvider: DEFAULT_PROVIDER,
+    defaultModel: DEFAULT_MODEL,
+  });
+
+  const catalog = await loadModelCatalog({ config: params.cfg });
+  const allowed = buildAllowedModelSet({
+    cfg: params.cfg,
+    catalog,
+    defaultProvider: resolvedDefault.provider,
+    defaultModel: resolvedDefault.model,
+  });
+
+  const byProvider = new Map<string, Set<string>>();
+  const add = (p: string, m: string) => {
+    const key = normalizeProviderId(p);
+    const set = byProvider.get(key) ?? new Set<string>();
+    set.add(m);
+    byProvider.set(key, set);
+  };
+
+  for (const entry of allowed.allowedCatalog) {
+    add(entry.provider, entry.id);
+  }
+
+  // Include config-only allowlist keys that aren't in the curated catalog.
+  for (const raw of Object.keys(params.cfg.agents?.defaults?.models ?? {})) {
+    const rawKey = String(raw ?? "").trim();
+    if (!rawKey) continue;
+    const slash = rawKey.indexOf("/");
+    if (slash === -1) continue;
+    const p = normalizeProviderId(rawKey.slice(0, slash));
+    const m = rawKey.slice(slash + 1).trim();
+    if (!p || !m) continue;
+    add(p, m);
+  }
+
+  const providers = [...byProvider.keys()].sort();
+
+  if (!provider) {
+    const lines: string[] = [
+      "Providers:",
+      ...providers.map((p) =>
+        formatProviderLine({ provider: p, count: byProvider.get(p)?.size ?? 0 }),
+      ),
+      "",
+      "Use: /models <provider>",
+      "Switch: /model <provider/model>",
+    ];
+    return { reply: { text: lines.join("\n") }, shouldContinue: false };
+  }
+
+  if (!byProvider.has(provider)) {
+    const lines: string[] = [
+      `Unknown provider: ${provider}`,
+      "",
+      "Available providers:",
+      ...providers.map((p) => `- ${p}`),
+      "",
+      "Use: /models <provider>",
+    ];
+    return { reply: { text: lines.join("\n") }, shouldContinue: false };
+  }
+
+  const models = [...(byProvider.get(provider) ?? new Set<string>())].sort();
+  const total = models.length;
+
+  const effectivePageSize = all ? total : pageSize;
+  const startIndex = (page - 1) * effectivePageSize;
+  const endIndexExclusive = Math.min(total, startIndex + effectivePageSize);
+  const pageModels = models.slice(startIndex, endIndexExclusive);
+
+  const header = `Models (${provider}) — showing ${startIndex + 1}-${endIndexExclusive} of ${total}`;
+
+  const lines: string[] = [header];
+  for (const id of pageModels) {
+    lines.push(`- ${provider}/${id}`);
+  }
+
+  const pageCount = effectivePageSize > 0 ? Math.ceil(total / effectivePageSize) : 1;
+
+  lines.push("", "Switch: /model <provider/model>");
+  if (!all && page < pageCount) {
+    lines.push(`More: /models ${provider} ${page + 1}`);
+  }
+  if (!all) {
+    lines.push(`All: /models ${provider} all`);
+  }
+
+  const payload: ReplyPayload = { text: lines.join("\n") };
+  return { reply: payload, shouldContinue: false };
+};
diff --git a/src/auto-reply/reply/directive-handling.model.chat-ux.test.ts b/src/auto-reply/reply/directive-handling.model.chat-ux.test.ts
new file mode 100644
index 000000000..1e8b2dc7b
--- /dev/null
+++ b/src/auto-reply/reply/directive-handling.model.chat-ux.test.ts
@@ -0,0 +1,60 @@
+import { describe, expect, it } from "vitest";
+
+import type { ModelAliasIndex } from "../../agents/model-selection.js";
+import type { ClawdbotConfig } from "../../config/config.js";
+import { parseInlineDirectives } from "./directive-handling.js";
+import {
+  maybeHandleModelDirectiveInfo,
+  resolveModelSelectionFromDirective,
+} from "./directive-handling.model.js";
+
+function baseAliasIndex(): ModelAliasIndex {
+  return { byAlias: new Map(), byKey: new Map() };
+}
+
+describe("/model chat UX", () => {
+  it("shows summary for /model with no args", async () => {
+    const directives = parseInlineDirectives("/model");
+    const cfg = { commands: { text: true } } as unknown as ClawdbotConfig;
+
+    const reply = await maybeHandleModelDirectiveInfo({
+      directives,
+      cfg,
+      agentDir: "/tmp/agent",
+      activeAgentId: "main",
+      provider: "anthropic",
+      model: "claude-opus-4-5",
+      defaultProvider: "anthropic",
+      defaultModel: "claude-opus-4-5",
+      aliasIndex: baseAliasIndex(),
+      allowedModelCatalog: [],
+      resetModelOverride: false,
+    });
+
+    expect(reply?.text).toContain("Current:");
+    expect(reply?.text).toContain("Browse: /models");
+    expect(reply?.text).toContain("Switch: /model <provider/model>");
+  });
+
+  it("suggests closest match for typos without switching", () => {
+    const directives = parseInlineDirectives("/model anthropic/claud-opus-4-5");
+    const cfg = { commands: { text: true } } as unknown as ClawdbotConfig;
+
+    const resolved = resolveModelSelectionFromDirective({
+      directives,
+      cfg,
+      agentDir: "/tmp/agent",
+      defaultProvider: "anthropic",
+      defaultModel: "claude-opus-4-5",
+      aliasIndex: baseAliasIndex(),
+      allowedModelKeys: new Set(["anthropic/claude-opus-4-5"]),
+      allowedModelCatalog: [{ provider: "anthropic", id: "claude-opus-4-5" }],
+      provider: "anthropic",
+    });
+
+    expect(resolved.modelSelection).toBeUndefined();
+    expect(resolved.errorText).toContain("Did you mean:");
+    expect(resolved.errorText).toContain("anthropic/claude-opus-4-5");
+    expect(resolved.errorText).toContain("Try: /model anthropic/claude-opus-4-5");
+  });
+});
diff --git a/src/auto-reply/reply/directive-handling.model.ts b/src/auto-reply/reply/directive-handling.model.ts
index 3f4200222..6cfef7828 100644
--- a/src/auto-reply/reply/directive-handling.model.ts
+++ b/src/auto-reply/reply/directive-handling.model.ts
@@ -169,8 +169,9 @@ export async function maybeHandleModelDirectiveInfo(params: {
   const rawDirective = params.directives.rawModelDirective?.trim();
   const directive = rawDirective?.toLowerCase();
   const wantsStatus = directive === "status";
-  const wantsList = !rawDirective || directive === "list";
-  if (!wantsList && !wantsStatus) return undefined;
+  const wantsSummary = !rawDirective;
+  const wantsLegacyList = directive === "list";
+  if (!wantsSummary && !wantsStatus && !wantsLegacyList) return undefined;
 
   if (params.directives.rawModelProfile) {
     return { text: "Auth profile override requires a model selection." };
@@ -184,16 +185,28 @@ export async function maybeHandleModelDirectiveInfo(params: {
     allowedModelCatalog: params.allowedModelCatalog,
   });
 
-  if (wantsList) {
-    const items = buildModelPickerItems(pickerCatalog);
-    if (items.length === 0) return { text: "No models available." };
+  if (wantsLegacyList) {
+    return {
+      text: [
+        "Model listing moved.",
+        "",
+        "Use: /models (providers) or /models <provider> (models)",
+        "Switch: /model <provider/model>",
+      ].join("\n"),
+    };
+  }
+
+  if (wantsSummary) {
     const current = `${params.provider}/${params.model}`;
-    const lines: string[] = [`Current: ${current}`, "Pick: /model <#> or /model <provider/model>"];
-    for (const [idx, item] of items.entries()) {
-      lines.push(`${idx + 1}) ${item.provider}/${item.model}`);
-    }
-    lines.push("", "More: /model status");
-    return { text: lines.join("\n") };
+    return {
+      text: [
+        `Current: ${current}`,
+        "",
+        "Switch: /model <provider/model>",
+        "Browse: /models (providers) or /models <provider> (models)",
+        "More: /model status",
+      ].join("\n"),
+    };
   }
 
   const modelsPath = `${params.agentDir}/models.json`;
@@ -285,31 +298,36 @@ export function resolveModelSelectionFromDirective(params: {
   let modelSelection: ModelDirectiveSelection | undefined;
 
   if (/^[0-9]+$/.test(raw)) {
-    const pickerCatalog = buildModelPickerCatalog({
-      cfg: params.cfg,
-      defaultProvider: params.defaultProvider,
-      defaultModel: params.defaultModel,
-      aliasIndex: params.aliasIndex,
-      allowedModelCatalog: params.allowedModelCatalog,
-    });
-    const items = buildModelPickerItems(pickerCatalog);
-    const index = Number.parseInt(raw, 10) - 1;
-    const item = Number.isFinite(index) ? items[index] : undefined;
-    if (!item) {
-      return {
-        errorText: `Invalid model selection "${raw}". Use /model to list.`,
+    return {
+      errorText: [
+        "Numeric model selection is not supported in chat.",
+        "",
+        "Browse: /models or /models <provider>",
+        "Switch: /model <provider/model>",
+      ].join("\n"),
+    };
+  }
+
+  const explicit = resolveModelRefFromString({
+    raw,
+    defaultProvider: params.defaultProvider,
+    aliasIndex: params.aliasIndex,
+  });
+  if (explicit) {
+    const explicitKey = modelKey(explicit.ref.provider, explicit.ref.model);
+    if (params.allowedModelKeys.size === 0 || params.allowedModelKeys.has(explicitKey)) {
+      modelSelection = {
+        provider: explicit.ref.provider,
+        model: explicit.ref.model,
+        isDefault:
+          explicit.ref.provider === params.defaultProvider &&
+          explicit.ref.model === params.defaultModel,
+        ...(explicit.alias ? { alias: explicit.alias } : {}),
       };
     }
-    const key = `${item.provider}/${item.model}`;
-    const aliases = params.aliasIndex.byKey.get(key);
-    const alias = aliases && aliases.length > 0 ? aliases[0] : undefined;
-    modelSelection = {
-      provider: item.provider,
-      model: item.model,
-      isDefault: item.provider === params.defaultProvider && item.model === params.defaultModel,
-      ...(alias ? { alias } : {}),
-    };
-  } else {
+  }
+
+  if (!modelSelection) {
     const resolved = resolveModelDirectiveSelection({
       raw,
       defaultProvider: params.defaultProvider,
@@ -317,10 +335,24 @@ export function resolveModelSelectionFromDirective(params: {
       aliasIndex: params.aliasIndex,
       allowedModelKeys: params.allowedModelKeys,
     });
+
     if (resolved.error) {
       return { errorText: resolved.error };
     }
-    modelSelection = resolved.selection;
+
+    if (resolved.selection) {
+      const suggestion = `${resolved.selection.provider}/${resolved.selection.model}`;
+      return {
+        errorText: [
+          `Unrecognized model: ${raw}`,
+          "",
+          `Did you mean: ${suggestion}`,
+          `Try: /model ${suggestion}`,
+          "",
+          "Browse: /models or /models <provider>",
+        ].join("\n"),
+      };
+    }
   }
 
   let profileOverride: string | undefined;
diff --git a/src/auto-reply/reply/model-selection.ts b/src/auto-reply/reply/model-selection.ts
index f1d9948a8..fe06c1c06 100644
--- a/src/auto-reply/reply/model-selection.ts
+++ b/src/auto-reply/reply/model-selection.ts
@@ -46,6 +46,39 @@ const FUZZY_VARIANT_TOKENS = [
   "nano",
 ];
 
+function boundedLevenshteinDistance(a: string, b: string, maxDistance: number): number | null {
+  if (a === b) return 0;
+  if (!a || !b) return null;
+  const aLen = a.length;
+  const bLen = b.length;
+  if (Math.abs(aLen - bLen) > maxDistance) return null;
+
+  // Standard DP with early exit. O(maxDistance * minLen) in common cases.
+  const prev = new Array<number>(bLen + 1);
+  const curr = new Array<number>(bLen + 1);
+  for (let j = 0; j <= bLen; j++) prev[j] = j;
+
+  for (let i = 1; i <= aLen; i++) {
+    curr[0] = i;
+    let rowMin = curr[0];
+
+    const aChar = a.charCodeAt(i - 1);
+    for (let j = 1; j <= bLen; j++) {
+      const cost = aChar === b.charCodeAt(j - 1) ? 0 : 1;
+      curr[j] = Math.min(prev[j] + 1, curr[j - 1] + 1, prev[j - 1] + cost);
+      if (curr[j] < rowMin) rowMin = curr[j];
+    }
+
+    if (rowMin > maxDistance) return null;
+
+    for (let j = 0; j <= bLen; j++) prev[j] = curr[j] ?? 0;
+  }
+
+  const dist = prev[bLen] ?? null;
+  if (dist == null || dist > maxDistance) return null;
+  return dist;
+}
+
 function scoreFuzzyMatch(params: {
   provider: string;
   model: string;
@@ -94,6 +127,13 @@ function scoreFuzzyMatch(params: {
     includes: 80,
   });
 
+  // Best-effort typo tolerance for common near-misses like "claud" vs "claude".
+  // Bounded to keep this cheap across large model sets.
+  const distModel = boundedLevenshteinDistance(fragment, modelLower, 3);
+  if (distModel != null) {
+    score += (3 - distModel) * 70;
+  }
+
   const aliases = params.aliasIndex.byKey.get(key) ?? [];
   for (const alias of aliases) {
     score += scoreFragment(alias.toLowerCase(), {
@@ -293,17 +333,16 @@ export function resolveModelDirectiveSelection(params: {
     const fragment = params.fragment.trim().toLowerCase();
     if (!fragment) return {};
 
+    const providerFilter = params.provider ? normalizeProviderId(params.provider) : undefined;
+
     const candidates: Array<{ provider: string; model: string }> = [];
     for (const key of allowedModelKeys) {
       const slash = key.indexOf("/");
       if (slash <= 0) continue;
       const provider = normalizeProviderId(key.slice(0, slash));
       const model = key.slice(slash + 1);
-      if (params.provider && provider !== normalizeProviderId(params.provider)) continue;
-      const haystack = `${provider}/${model}`.toLowerCase();
-      if (haystack.includes(fragment) || model.toLowerCase().includes(fragment)) {
-        candidates.push({ provider, model });
-      }
+      if (providerFilter && provider !== providerFilter) continue;
+      candidates.push({ provider, model });
     }
 
     // Also allow partial alias matches when the user didn't specify a provider.
@@ -325,11 +364,6 @@ export function resolveModelDirectiveSelection(params: {
       }
     }
 
-    if (candidates.length === 1) {
-      const match = candidates[0];
-      if (!match) return {};
-      return { selection: buildSelection(match.provider, match.model) };
-    }
     if (candidates.length === 0) return {};
 
     const scored = candidates
@@ -354,8 +388,13 @@ export function resolveModelDirectiveSelection(params: {
         return a.key.localeCompare(b.key);
       });
 
-    const best = scored[0]?.candidate;
-    if (!best) return {};
+    const bestScored = scored[0];
+    const best = bestScored?.candidate;
+    if (!best || !bestScored) return {};
+
+    const minScore = providerFilter ? 90 : 120;
+    if (bestScored.score < minScore) return {};
+
     return { selection: buildSelection(best.provider, best.model) };
   };
 
@@ -369,7 +408,7 @@ export function resolveModelDirectiveSelection(params: {
     const fuzzy = resolveFuzzy({ fragment: rawTrimmed });
     if (fuzzy.selection || fuzzy.error) return fuzzy;
     return {
-      error: `Unrecognized model "${rawTrimmed}". Use /model to list available models.`,
+      error: `Unrecognized model "${rawTrimmed}". Use /models to list providers, or /models <provider> to list models.`,
     };
   }
 
@@ -400,7 +439,7 @@ export function resolveModelDirectiveSelection(params: {
   if (fuzzy.selection || fuzzy.error) return fuzzy;
 
   return {
-    error: `Model "${resolved.ref.provider}/${resolved.ref.model}" is not allowed. Use /model to list available models.`,
+    error: `Model "${resolved.ref.provider}/${resolved.ref.model}" is not allowed. Use /models to list providers, or /models <provider> to list models.`,
   };
 }
 

From 41c9c214fc791b733bf3f1d3e4377942b158ad03 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 19:48:16 +0000
Subject: [PATCH 045/171] fix: drop obsolete pi-mono workarounds

---
 ...ded-helpers.downgradegeminihistory.test.ts |  71 ---------
 src/agents/pi-embedded-helpers.ts             |   7 +-
 src/agents/pi-embedded-helpers/google.ts      | 144 ------------------
 ...ed-runner.google-sanitize-thinking.test.ts |  55 ++++---
 ...ed-runner.sanitize-session-history.test.ts |  69 +++------
 src/agents/pi-embedded-runner/google.ts       |  59 +------
 .../pi-embedded-runner/run/attempt.test.ts    |   6 +-
 7 files changed, 57 insertions(+), 354 deletions(-)
 delete mode 100644 src/agents/pi-embedded-helpers.downgradegeminihistory.test.ts

diff --git a/src/agents/pi-embedded-helpers.downgradegeminihistory.test.ts b/src/agents/pi-embedded-helpers.downgradegeminihistory.test.ts
deleted file mode 100644
index b48d5d4e1..000000000
--- a/src/agents/pi-embedded-helpers.downgradegeminihistory.test.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { downgradeGeminiHistory } from "./pi-embedded-helpers.js";
-
-describe("downgradeGeminiHistory", () => {
-  it("drops unsigned tool calls and matching tool results", () => {
-    const input = [
-      {
-        role: "assistant",
-        content: [
-          { type: "text", text: "hello" },
-          { type: "toolCall", id: "call_1", name: "read", arguments: { path: "/tmp" } },
-        ],
-      },
-      {
-        role: "toolResult",
-        toolCallId: "call_1",
-        content: [{ type: "text", text: "ok" }],
-      },
-      { role: "user", content: "next" },
-    ];
-
-    expect(downgradeGeminiHistory(input)).toEqual([
-      {
-        role: "assistant",
-        content: [{ type: "text", text: "hello" }],
-      },
-      { role: "user", content: "next" },
-    ]);
-  });
-
-  it("keeps signed tool calls and results", () => {
-    const input = [
-      {
-        role: "assistant",
-        content: [
-          {
-            type: "toolCall",
-            id: "call_2",
-            name: "read",
-            arguments: { path: "/tmp" },
-            thought_signature: "sig_123",
-          },
-        ],
-      },
-      {
-        role: "toolResult",
-        toolCallId: "call_2",
-        content: [{ type: "text", text: "ok" }],
-      },
-    ];
-
-    expect(downgradeGeminiHistory(input)).toEqual(input);
-  });
-
-  it("drops assistant messages that only contain unsigned tool calls", () => {
-    const input = [
-      {
-        role: "assistant",
-        content: [{ type: "toolCall", id: "call_3", name: "read", arguments: {} }],
-      },
-      {
-        role: "toolResult",
-        toolCallId: "call_3",
-        content: [{ type: "text", text: "ok" }],
-      },
-      { role: "user", content: "after" },
-    ];
-
-    expect(downgradeGeminiHistory(input)).toEqual([{ role: "user", content: "after" }]);
-  });
-});
diff --git a/src/agents/pi-embedded-helpers.ts b/src/agents/pi-embedded-helpers.ts
index 64e14ebcc..85d16af12 100644
--- a/src/agents/pi-embedded-helpers.ts
+++ b/src/agents/pi-embedded-helpers.ts
@@ -30,12 +30,7 @@ export {
   isTimeoutErrorMessage,
   parseImageDimensionError,
 } from "./pi-embedded-helpers/errors.js";
-export {
-  downgradeGeminiHistory,
-  downgradeGeminiThinkingBlocks,
-  isGoogleModelApi,
-  sanitizeGoogleTurnOrdering,
-} from "./pi-embedded-helpers/google.js";
+export { isGoogleModelApi, sanitizeGoogleTurnOrdering } from "./pi-embedded-helpers/google.js";
 export {
   isEmptyAssistantMessageContent,
   sanitizeSessionMessagesImages,
diff --git a/src/agents/pi-embedded-helpers/google.ts b/src/agents/pi-embedded-helpers/google.ts
index dc21da947..59bd06b13 100644
--- a/src/agents/pi-embedded-helpers/google.ts
+++ b/src/agents/pi-embedded-helpers/google.ts
@@ -1,5 +1,3 @@
-import type { AgentMessage } from "@mariozechner/pi-agent-core";
-
 import { sanitizeGoogleTurnOrdering } from "./bootstrap.js";
 
 export function isGoogleModelApi(api?: string | null): boolean {
@@ -14,145 +12,3 @@ export function isAntigravityClaude(api?: string | null, modelId?: string): bool
 }
 
 export { sanitizeGoogleTurnOrdering };
-
-/**
- * Drops tool calls that are missing `thought_signature` (required by Gemini)
- * to prevent 400 INVALID_ARGUMENT errors. Matching tool results are dropped
- * so they don't become orphaned in the transcript.
- */
-type GeminiToolCallBlock = {
-  type?: unknown;
-  thought_signature?: unknown;
-  thoughtSignature?: unknown;
-  id?: unknown;
-  toolCallId?: unknown;
-  name?: unknown;
-  toolName?: unknown;
-  arguments?: unknown;
-  input?: unknown;
-};
-
-type GeminiThinkingBlock = {
-  type?: unknown;
-  thinking?: unknown;
-  thinkingSignature?: unknown;
-};
-
-export function downgradeGeminiThinkingBlocks(messages: AgentMessage[]): AgentMessage[] {
-  const out: AgentMessage[] = [];
-  for (const msg of messages) {
-    if (!msg || typeof msg !== "object") {
-      out.push(msg);
-      continue;
-    }
-    const role = (msg as { role?: unknown }).role;
-    if (role !== "assistant") {
-      out.push(msg);
-      continue;
-    }
-    const assistantMsg = msg as Extract<AgentMessage, { role: "assistant" }>;
-    if (!Array.isArray(assistantMsg.content)) {
-      out.push(msg);
-      continue;
-    }
-
-    // Gemini rejects thinking blocks that lack a signature; downgrade to text for safety.
-    let hasDowngraded = false;
-    type AssistantContentBlock = (typeof assistantMsg.content)[number];
-    const nextContent = assistantMsg.content.flatMap((block): AssistantContentBlock[] => {
-      if (!block || typeof block !== "object") return [block as AssistantContentBlock];
-      const record = block as GeminiThinkingBlock;
-      if (record.type !== "thinking") return [block];
-      const thinkingSig =
-        typeof record.thinkingSignature === "string" ? record.thinkingSignature.trim() : "";
-      if (thinkingSig.length > 0) return [block];
-      const thinking = typeof record.thinking === "string" ? record.thinking : "";
-      const trimmed = thinking.trim();
-      hasDowngraded = true;
-      if (!trimmed) return [];
-      return [{ type: "text" as const, text: thinking }];
-    });
-
-    if (!hasDowngraded) {
-      out.push(msg);
-      continue;
-    }
-    if (nextContent.length === 0) {
-      continue;
-    }
-    out.push({ ...assistantMsg, content: nextContent } as AgentMessage);
-  }
-  return out;
-}
-
-export function downgradeGeminiHistory(messages: AgentMessage[]): AgentMessage[] {
-  const droppedToolCallIds = new Set<string>();
-  const out: AgentMessage[] = [];
-
-  const resolveToolResultId = (
-    msg: Extract<AgentMessage, { role: "toolResult" }>,
-  ): string | undefined => {
-    const toolCallId = (msg as { toolCallId?: unknown }).toolCallId;
-    if (typeof toolCallId === "string" && toolCallId) return toolCallId;
-    const toolUseId = (msg as { toolUseId?: unknown }).toolUseId;
-    if (typeof toolUseId === "string" && toolUseId) return toolUseId;
-    return undefined;
-  };
-
-  for (const msg of messages) {
-    if (!msg || typeof msg !== "object") {
-      out.push(msg);
-      continue;
-    }
-
-    const role = (msg as { role?: unknown }).role;
-    if (role === "assistant") {
-      const assistantMsg = msg as Extract<AgentMessage, { role: "assistant" }>;
-      if (!Array.isArray(assistantMsg.content)) {
-        out.push(msg);
-        continue;
-      }
-
-      let dropped = false;
-      const nextContent = assistantMsg.content.filter((block) => {
-        if (!block || typeof block !== "object") return true;
-        const blockRecord = block as GeminiToolCallBlock;
-        const type = blockRecord.type;
-        if (type === "toolCall" || type === "functionCall" || type === "toolUse") {
-          const signature = blockRecord.thought_signature ?? blockRecord.thoughtSignature;
-          const hasSignature = Boolean(signature);
-          if (!hasSignature) {
-            const id =
-              typeof blockRecord.id === "string"
-                ? blockRecord.id
-                : typeof blockRecord.toolCallId === "string"
-                  ? blockRecord.toolCallId
-                  : undefined;
-            if (id) droppedToolCallIds.add(id);
-            dropped = true;
-            return false;
-          }
-        }
-        return true;
-      });
-
-      if (dropped && nextContent.length === 0) {
-        continue;
-      }
-
-      out.push(dropped ? ({ ...assistantMsg, content: nextContent } as AgentMessage) : msg);
-      continue;
-    }
-
-    if (role === "toolResult") {
-      const toolMsg = msg as Extract<AgentMessage, { role: "toolResult" }>;
-      const toolResultId = resolveToolResultId(toolMsg);
-      if (toolResultId && droppedToolCallIds.has(toolResultId)) {
-        continue;
-      }
-    }
-
-    out.push(msg);
-  }
-  return out;
-}
diff --git a/src/agents/pi-embedded-runner.google-sanitize-thinking.test.ts b/src/agents/pi-embedded-runner.google-sanitize-thinking.test.ts
index 1b34c732e..b79a88f5c 100644
--- a/src/agents/pi-embedded-runner.google-sanitize-thinking.test.ts
+++ b/src/agents/pi-embedded-runner.google-sanitize-thinking.test.ts
@@ -4,7 +4,7 @@ import { describe, expect, it } from "vitest";
 import { sanitizeSessionHistory } from "./pi-embedded-runner/google.js";
 
 describe("sanitizeSessionHistory (google thinking)", () => {
-  it("downgrades thinking blocks without signatures for Google models", async () => {
+  it("keeps thinking blocks without signatures for Google models", async () => {
     const sessionManager = SessionManager.inMemory();
     const input = [
       {
@@ -25,10 +25,10 @@ describe("sanitizeSessionHistory (google thinking)", () => {
     });
 
     const assistant = out.find((msg) => (msg as { role?: string }).role === "assistant") as {
-      content?: Array<{ type?: string; text?: string }>;
+      content?: Array<{ type?: string; thinking?: string }>;
     };
-    expect(assistant.content?.map((block) => block.type)).toEqual(["text"]);
-    expect(assistant.content?.[0]?.text).toBe("reasoning");
+    expect(assistant.content?.map((block) => block.type)).toEqual(["thinking"]);
+    expect(assistant.content?.[0]?.thinking).toBe("reasoning");
   });
 
   it("keeps thinking blocks with signatures for Google models", async () => {
@@ -59,7 +59,7 @@ describe("sanitizeSessionHistory (google thinking)", () => {
     expect(assistant.content?.[0]?.thinkingSignature).toBe("sig");
   });
 
-  it("downgrades thinking blocks with Anthropic-style signatures for Google models", async () => {
+  it("keeps thinking blocks with Anthropic-style signatures for Google models", async () => {
     const sessionManager = SessionManager.inMemory();
     const input = [
       {
@@ -80,10 +80,10 @@ describe("sanitizeSessionHistory (google thinking)", () => {
     });
 
     const assistant = out.find((msg) => (msg as { role?: string }).role === "assistant") as {
-      content?: Array<{ type?: string; text?: string }>;
+      content?: Array<{ type?: string; thinking?: string }>;
     };
-    expect(assistant.content?.map((block) => block.type)).toEqual(["text"]);
-    expect(assistant.content?.[0]?.text).toBe("reasoning");
+    expect(assistant.content?.map((block) => block.type)).toEqual(["thinking"]);
+    expect(assistant.content?.[0]?.thinking).toBe("reasoning");
   });
 
   it("keeps unsigned thinking blocks for Antigravity Claude", async () => {
@@ -114,7 +114,7 @@ describe("sanitizeSessionHistory (google thinking)", () => {
     expect(assistant.content?.[0]?.thinking).toBe("reasoning");
   });
 
-  it("preserves order when downgrading mixed assistant content", async () => {
+  it("preserves order for mixed assistant content", async () => {
     const sessionManager = SessionManager.inMemory();
     const input = [
       {
@@ -139,10 +139,10 @@ describe("sanitizeSessionHistory (google thinking)", () => {
     });
 
     const assistant = out.find((msg) => (msg as { role?: string }).role === "assistant") as {
-      content?: Array<{ type?: string; text?: string }>;
+      content?: Array<{ type?: string; text?: string; thinking?: string }>;
     };
-    expect(assistant.content?.map((block) => block.type)).toEqual(["text", "text", "text"]);
-    expect(assistant.content?.[1]?.text).toBe("internal note");
+    expect(assistant.content?.map((block) => block.type)).toEqual(["text", "thinking", "text"]);
+    expect(assistant.content?.[1]?.thinking).toBe("internal note");
   });
 
   it("strips non-base64 thought signatures for OpenRouter Gemini", async () => {
@@ -185,11 +185,22 @@ describe("sanitizeSessionHistory (google thinking)", () => {
     });
 
     const assistant = out.find((msg) => (msg as { role?: string }).role === "assistant") as {
-      content?: Array<{ type?: string; thought_signature?: string; thoughtSignature?: string }>;
+      content?: Array<{
+        type?: string;
+        thought_signature?: string;
+        thoughtSignature?: string;
+        thinking?: string;
+      }>;
     };
     expect(assistant.content).toEqual([
       { type: "text", text: "hello" },
-      { type: "text", text: "ok" },
+      { type: "thinking", thinking: "ok", thought_signature: "c2ln" },
+      {
+        type: "toolCall",
+        id: "call_1",
+        name: "read",
+        arguments: { path: "/tmp/foo" },
+      },
       {
         type: "toolCall",
         id: "call_2",
@@ -200,7 +211,7 @@ describe("sanitizeSessionHistory (google thinking)", () => {
     ]);
   });
 
-  it("downgrades only unsigned thinking blocks when mixed with signed ones", async () => {
+  it("keeps mixed signed/unsigned thinking blocks for Google models", async () => {
     const sessionManager = SessionManager.inMemory();
     const input = [
       {
@@ -224,14 +235,14 @@ describe("sanitizeSessionHistory (google thinking)", () => {
     });
 
     const assistant = out.find((msg) => (msg as { role?: string }).role === "assistant") as {
-      content?: Array<{ type?: string; thinking?: string; text?: string }>;
+      content?: Array<{ type?: string; thinking?: string }>;
     };
-    expect(assistant.content?.map((block) => block.type)).toEqual(["thinking", "text"]);
+    expect(assistant.content?.map((block) => block.type)).toEqual(["thinking", "thinking"]);
     expect(assistant.content?.[0]?.thinking).toBe("signed");
-    expect(assistant.content?.[1]?.text).toBe("unsigned");
+    expect(assistant.content?.[1]?.thinking).toBe("unsigned");
   });
 
-  it("drops empty unsigned thinking blocks for Google models", async () => {
+  it("keeps empty thinking blocks for Google models", async () => {
     const sessionManager = SessionManager.inMemory();
     const input = [
       {
@@ -251,8 +262,10 @@ describe("sanitizeSessionHistory (google thinking)", () => {
       sessionId: "session:google-empty",
     });
 
-    const assistant = out.find((msg) => (msg as { role?: string }).role === "assistant");
-    expect(assistant).toBeUndefined();
+    const assistant = out.find((msg) => (msg as { role?: string }).role === "assistant") as {
+      content?: Array<{ type?: string; thinking?: string }>;
+    };
+    expect(assistant?.content?.map((block) => block.type)).toEqual(["thinking"]);
   });
 
   it("keeps thinking blocks for non-Google models", async () => {
diff --git a/src/agents/pi-embedded-runner.sanitize-session-history.test.ts b/src/agents/pi-embedded-runner.sanitize-session-history.test.ts
index fc029b653..87c149d9a 100644
--- a/src/agents/pi-embedded-runner.sanitize-session-history.test.ts
+++ b/src/agents/pi-embedded-runner.sanitize-session-history.test.ts
@@ -13,7 +13,6 @@ vi.mock("./pi-embedded-helpers.js", async () => {
   return {
     ...actual,
     isGoogleModelApi: vi.fn(),
-    downgradeGeminiHistory: vi.fn(),
     sanitizeSessionMessagesImages: vi.fn().mockImplementation(async (msgs) => msgs),
   };
 });
@@ -32,19 +31,14 @@ describe("sanitizeSessionHistory", () => {
   beforeEach(async () => {
     vi.resetAllMocks();
     vi.mocked(helpers.sanitizeSessionMessagesImages).mockImplementation(async (msgs) => msgs);
-    // Default mock implementation
-    vi.mocked(helpers.downgradeGeminiHistory).mockImplementation((msgs) => {
-      if (!msgs) return [];
-      return [...msgs, { role: "system", content: "downgraded" }];
-    });
     vi.resetModules();
     ({ sanitizeSessionHistory } = await import("./pi-embedded-runner/google.js"));
   });
 
-  it("should downgrade history for Google models if provider is not google-antigravity", async () => {
+  it("sanitizes tool call ids for Google model APIs", async () => {
     vi.mocked(helpers.isGoogleModelApi).mockReturnValue(true);
 
-    const result = await sanitizeSessionHistory({
+    await sanitizeSessionHistory({
       messages: mockMessages,
       modelApi: "google-gemini",
       provider: "google-vertex",
@@ -53,35 +47,17 @@ describe("sanitizeSessionHistory", () => {
     });
 
     expect(helpers.isGoogleModelApi).toHaveBeenCalledWith("google-gemini");
-    expect(helpers.downgradeGeminiHistory).toHaveBeenCalled();
-    // Check if the result contains the downgraded message
-    expect(result).toContainEqual({ role: "system", content: "downgraded" });
+    expect(helpers.sanitizeSessionMessagesImages).toHaveBeenCalledWith(
+      mockMessages,
+      "session:history",
+      expect.objectContaining({ sanitizeToolCallIds: true }),
+    );
   });
 
-  it("should NOT downgrade history for google-antigravity provider", async () => {
-    vi.mocked(helpers.isGoogleModelApi).mockReturnValue(true);
-
-    const result = await sanitizeSessionHistory({
-      messages: mockMessages,
-      modelApi: "google-gemini",
-      provider: "google-antigravity",
-      sessionManager: mockSessionManager,
-      sessionId: "test-session",
-    });
-
-    expect(helpers.isGoogleModelApi).toHaveBeenCalledWith("google-gemini");
-    expect(helpers.downgradeGeminiHistory).not.toHaveBeenCalled();
-    // Result should not contain the downgraded message
-    expect(result).not.toContainEqual({
-      role: "system",
-      content: "downgraded",
-    });
-  });
-
-  it("should NOT downgrade history for non-Google models", async () => {
+  it("does not sanitize tool call ids for non-Google, non-OpenAI APIs", async () => {
     vi.mocked(helpers.isGoogleModelApi).mockReturnValue(false);
 
-    const _result = await sanitizeSessionHistory({
+    await sanitizeSessionHistory({
       messages: mockMessages,
       modelApi: "anthropic-messages",
       provider: "anthropic",
@@ -90,25 +66,14 @@ describe("sanitizeSessionHistory", () => {
     });
 
     expect(helpers.isGoogleModelApi).toHaveBeenCalledWith("anthropic-messages");
-    expect(helpers.downgradeGeminiHistory).not.toHaveBeenCalled();
+    expect(helpers.sanitizeSessionMessagesImages).toHaveBeenCalledWith(
+      mockMessages,
+      "session:history",
+      expect.objectContaining({ sanitizeToolCallIds: false }),
+    );
   });
 
-  it("should downgrade history if provider is undefined but model is Google", async () => {
-    vi.mocked(helpers.isGoogleModelApi).mockReturnValue(true);
-
-    const _result = await sanitizeSessionHistory({
-      messages: mockMessages,
-      modelApi: "google-gemini",
-      provider: undefined,
-      sessionManager: mockSessionManager,
-      sessionId: "test-session",
-    });
-
-    expect(helpers.isGoogleModelApi).toHaveBeenCalledWith("google-gemini");
-    expect(helpers.downgradeGeminiHistory).toHaveBeenCalled();
-  });
-
-  it("drops reasoning-only assistant messages for openai-responses", async () => {
+  it("keeps reasoning-only assistant messages for openai-responses", async () => {
     vi.mocked(helpers.isGoogleModelApi).mockReturnValue(false);
 
     const messages: AgentMessage[] = [
@@ -135,7 +100,7 @@ describe("sanitizeSessionHistory", () => {
     });
 
     expect(helpers.isGoogleModelApi).toHaveBeenCalledWith("openai-responses");
-    expect(result).toHaveLength(1);
-    expect(result[0]?.role).toBe("user");
+    expect(result).toHaveLength(2);
+    expect(result[1]?.role).toBe("assistant");
   });
 });
diff --git a/src/agents/pi-embedded-runner/google.ts b/src/agents/pi-embedded-runner/google.ts
index 45ba83ecb..558098c20 100644
--- a/src/agents/pi-embedded-runner/google.ts
+++ b/src/agents/pi-embedded-runner/google.ts
@@ -4,8 +4,6 @@ import type { SessionManager } from "@mariozechner/pi-coding-agent";
 
 import { registerUnhandledRejectionHandler } from "../../infra/unhandled-rejections.js";
 import {
-  downgradeGeminiThinkingBlocks,
-  downgradeGeminiHistory,
   isCompactionFailureError,
   isGoogleModelApi,
   sanitizeGoogleTurnOrdering,
@@ -52,42 +50,6 @@ function shouldSanitizeToolCallIds(modelApi?: string | null): boolean {
   return isGoogleModelApi(modelApi) || OPENAI_TOOL_CALL_ID_APIS.has(modelApi);
 }
 
-function filterOpenAIReasoningOnlyMessages(
-  messages: AgentMessage[],
-  modelApi?: string | null,
-): AgentMessage[] {
-  if (modelApi !== "openai-responses") return messages;
-  return messages.filter((msg) => {
-    if (!msg || typeof msg !== "object") return true;
-    if ((msg as { role?: unknown }).role !== "assistant") return true;
-    const assistant = msg as Extract<AgentMessage, { role: "assistant" }>;
-    const content = assistant.content;
-    if (!Array.isArray(content) || content.length === 0) return true;
-    let hasThinking = false;
-    let hasPairedContent = false;
-    for (const block of content) {
-      if (!block || typeof block !== "object") continue;
-      const type = (block as { type?: unknown }).type;
-      if (type === "thinking") {
-        hasThinking = true;
-        continue;
-      }
-      if (type === "toolCall" || type === "toolUse" || type === "functionCall") {
-        hasPairedContent = true;
-        break;
-      }
-      if (type === "text") {
-        const text = (block as { text?: unknown }).text;
-        if (typeof text === "string" && text.trim().length > 0) {
-          hasPairedContent = true;
-          break;
-        }
-      }
-    }
-    return !(hasThinking && !hasPairedContent);
-  });
-}
-
 function findUnsupportedSchemaKeywords(schema: unknown, path: string): string[] {
   if (!schema || typeof schema !== "object") return [];
   if (Array.isArray(schema)) {
@@ -233,7 +195,6 @@ export async function sanitizeSessionHistory(params: {
   const modelId = (params.modelId ?? "").toLowerCase();
   const isOpenRouterGemini =
     (provider === "openrouter" || provider === "opencode") && modelId.includes("gemini");
-  const isGeminiLike = isGoogleModelApi(params.modelApi) || isOpenRouterGemini;
   const sanitizedImages = await sanitizeSessionMessagesImages(params.messages, "session:history", {
     sanitizeToolCallIds: shouldSanitizeToolCallIds(params.modelApi),
     enforceToolCallLast: params.modelApi === "anthropic-messages",
@@ -242,26 +203,10 @@ export async function sanitizeSessionHistory(params: {
       ? { allowBase64Only: true, includeCamelCase: true }
       : undefined,
   });
-  // TODO REMOVE when https://github.com/badlogic/pi-mono/pull/838 is merged.
-  const openaiReasoningFiltered = filterOpenAIReasoningOnlyMessages(
-    sanitizedImages,
-    params.modelApi,
-  );
-  const repairedTools = sanitizeToolUseResultPairing(openaiReasoningFiltered);
-  const isAntigravityProvider =
-    provider === "google-antigravity" || params.modelApi === "google-antigravity";
-  const shouldDowngradeThinking = isGeminiLike && !isAntigravityClaudeModel;
-  // Gemini rejects unsigned thinking blocks; downgrade them before send to avoid INVALID_ARGUMENT.
-  const downgradedThinking = shouldDowngradeThinking
-    ? downgradeGeminiThinkingBlocks(repairedTools)
-    : repairedTools;
-  const shouldDowngradeHistory = shouldDowngradeThinking && !isAntigravityProvider;
-  const downgraded = shouldDowngradeHistory
-    ? downgradeGeminiHistory(downgradedThinking)
-    : downgradedThinking;
+  const repairedTools = sanitizeToolUseResultPairing(sanitizedImages);
 
   return applyGoogleTurnOrderingFix({
-    messages: downgraded,
+    messages: repairedTools,
     modelApi: params.modelApi,
     sessionManager: params.sessionManager,
     sessionId: params.sessionId,
diff --git a/src/agents/pi-embedded-runner/run/attempt.test.ts b/src/agents/pi-embedded-runner/run/attempt.test.ts
index 93d5b5651..c94c65736 100644
--- a/src/agents/pi-embedded-runner/run/attempt.test.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.test.ts
@@ -36,11 +36,11 @@ describe("injectHistoryImagesIntoMessages", () => {
     const didMutate = injectHistoryImagesIntoMessages(messages, new Map([[0, [image]]]));
 
     expect(didMutate).toBe(false);
-    const content = messages[0]?.content;
-    if (!Array.isArray(content)) {
+    const first = messages[0];
+    if (!first || !Array.isArray(first.content)) {
       throw new Error("expected array content");
     }
-    expect(content).toHaveLength(2);
+    expect(first.content).toHaveLength(2);
   });
 
   it("ignores non-user messages and out-of-range indices", () => {

From 6c0a01dc909e511b26c1806716c9a9010bd8b216 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 19:48:21 +0000
Subject: [PATCH 046/171] fix: bundle mac model catalog

---
 .../Sources/Clawdbot/ModelCatalogLoader.swift |  95 +++++++++++-
 package.json                                  |   3 -
 patches/@mariozechner__pi-ai@0.49.2.patch     | 135 ------------------
 pnpm-lock.yaml                                |  13 +-
 scripts/package-mac-app.sh                    |   9 ++
 5 files changed, 104 insertions(+), 151 deletions(-)
 delete mode 100644 patches/@mariozechner__pi-ai@0.49.2.patch

diff --git a/apps/macos/Sources/Clawdbot/ModelCatalogLoader.swift b/apps/macos/Sources/Clawdbot/ModelCatalogLoader.swift
index 48001b4e9..2f1c75fe6 100644
--- a/apps/macos/Sources/Clawdbot/ModelCatalogLoader.swift
+++ b/apps/macos/Sources/Clawdbot/ModelCatalogLoader.swift
@@ -2,14 +2,28 @@ import Foundation
 import JavaScriptCore
 
 enum ModelCatalogLoader {
-    static let defaultPath: String = FileManager().homeDirectoryForCurrentUser
-        .appendingPathComponent("Projects/pi-mono/packages/ai/src/models.generated.ts").path
+    static var defaultPath: String { self.resolveDefaultPath() }
     private static let logger = Logger(subsystem: "com.clawdbot", category: "models")
+    private nonisolated static let appSupportDir: URL = {
+        let base = FileManager().urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
+        return base.appendingPathComponent("Clawdbot", isDirectory: true)
+    }()
+
+    private static var cachePath: URL {
+        self.appSupportDir.appendingPathComponent("model-catalog/models.generated.js", isDirectory: false)
+    }
 
     static func load(from path: String) async throws -> [ModelChoice] {
         let expanded = (path as NSString).expandingTildeInPath
-        self.logger.debug("model catalog load start file=\(URL(fileURLWithPath: expanded).lastPathComponent)")
-        let source = try String(contentsOfFile: expanded, encoding: .utf8)
+        guard let resolved = self.resolvePath(preferred: expanded) else {
+            self.logger.error("model catalog load failed: file not found")
+            throw NSError(
+                domain: "ModelCatalogLoader",
+                code: 1,
+                userInfo: [NSLocalizedDescriptionKey: "Model catalog file not found"])
+        }
+        self.logger.debug("model catalog load start file=\(URL(fileURLWithPath: resolved.path).lastPathComponent)")
+        let source = try String(contentsOfFile: resolved.path, encoding: .utf8)
         let sanitized = self.sanitize(source: source)
 
         let ctx = JSContext()
@@ -45,9 +59,82 @@ enum ModelCatalogLoader {
             return lhs.provider.localizedCaseInsensitiveCompare(rhs.provider) == .orderedAscending
         }
         self.logger.debug("model catalog loaded providers=\(rawModels.count) models=\(sorted.count)")
+        if resolved.shouldCache {
+            self.cacheCatalog(sourcePath: resolved.path)
+        }
         return sorted
     }
 
+    private static func resolveDefaultPath() -> String {
+        let cache = self.cachePath.path
+        if FileManager().isReadableFile(atPath: cache) { return cache }
+        if let bundlePath = self.bundleCatalogPath() { return bundlePath }
+        if let nodePath = self.nodeModulesCatalogPath() { return nodePath }
+        return cache
+    }
+
+    private static func resolvePath(preferred: String) -> (path: String, shouldCache: Bool)? {
+        if FileManager().isReadableFile(atPath: preferred) {
+            return (preferred, preferred != self.cachePath.path)
+        }
+
+        if let bundlePath = self.bundleCatalogPath(), bundlePath != preferred {
+            self.logger.warning("model catalog path missing; falling back to bundled catalog")
+            return (bundlePath, true)
+        }
+
+        let cache = self.cachePath.path
+        if cache != preferred, FileManager().isReadableFile(atPath: cache) {
+            self.logger.warning("model catalog path missing; falling back to cached catalog")
+            return (cache, false)
+        }
+
+        if let nodePath = self.nodeModulesCatalogPath(), nodePath != preferred {
+            self.logger.warning("model catalog path missing; falling back to node_modules catalog")
+            return (nodePath, true)
+        }
+
+        return nil
+    }
+
+    private static func bundleCatalogPath() -> String? {
+        guard let url = Bundle.main.url(forResource: "models.generated", withExtension: "js") else {
+            return nil
+        }
+        return url.path
+    }
+
+    private static func nodeModulesCatalogPath() -> String? {
+        let roots = [
+            URL(fileURLWithPath: CommandResolver.projectRootPath()),
+            URL(fileURLWithPath: FileManager().currentDirectoryPath),
+        ]
+        for root in roots {
+            let candidate = root
+                .appendingPathComponent("node_modules/@mariozechner/pi-ai/dist/models.generated.js")
+            if FileManager().isReadableFile(atPath: candidate.path) {
+                return candidate.path
+            }
+        }
+        return nil
+    }
+
+    private static func cacheCatalog(sourcePath: String) {
+        let destination = self.cachePath
+        do {
+            try FileManager().createDirectory(
+                at: destination.deletingLastPathComponent(),
+                withIntermediateDirectories: true)
+            if FileManager().fileExists(atPath: destination.path) {
+                try FileManager().removeItem(at: destination)
+            }
+            try FileManager().copyItem(atPath: sourcePath, toPath: destination.path)
+            self.logger.debug("model catalog cached file=\(destination.lastPathComponent)")
+        } catch {
+            self.logger.warning("model catalog cache failed: \(error.localizedDescription)")
+        }
+    }
+
     private static func sanitize(source: String) -> String {
         guard let exportRange = source.range(of: "export const MODELS"),
               let firstBrace = source[exportRange.upperBound...].firstIndex(of: "{"),
diff --git a/package.json b/package.json
index cdea28b6f..9de1783ca 100644
--- a/package.json
+++ b/package.json
@@ -236,9 +236,6 @@
       "@sinclair/typebox": "0.34.47",
       "hono": "4.11.4",
       "tar": "7.5.4"
-    },
-    "patchedDependencies": {
-      "@mariozechner/pi-ai@0.49.2": "patches/@mariozechner__pi-ai@0.49.2.patch"
     }
   },
   "vitest": {
diff --git a/patches/@mariozechner__pi-ai@0.49.2.patch b/patches/@mariozechner__pi-ai@0.49.2.patch
deleted file mode 100644
index 57fb965f8..000000000
--- a/patches/@mariozechner__pi-ai@0.49.2.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/dist/providers/anthropic.js b/dist/providers/anthropic.js
-index 1cba2f1365812fd2f88993009c9cc06e9c348279..664dd6d8b400ec523fb735480741b9ad64f9a68c 100644
---- a/dist/providers/anthropic.js
-+++ b/dist/providers/anthropic.js
-@@ -298,10 +298,11 @@ function createClient(model, apiKey, interleavedThinking) {
-         });
-         return { client, isOAuthToken: true };
-     }
-+    const apiBetaFeatures = ["extended-cache-ttl-2025-04-11", ...betaFeatures];
-     const defaultHeaders = {
-         accept: "application/json",
-         "anthropic-dangerous-direct-browser-access": "true",
--        "anthropic-beta": betaFeatures.join(","),
-+        "anthropic-beta": apiBetaFeatures.join(","),
-         ...(model.headers || {}),
-     };
-     const client = new Anthropic({
-@@ -313,9 +314,11 @@ function createClient(model, apiKey, interleavedThinking) {
-     return { client, isOAuthToken: false };
- }
- function buildParams(model, context, isOAuthToken, options) {
-+    const cacheControlTtl = !isOAuthToken ? (options?.cacheControlTtl ?? "1h") : undefined;
-+    const cacheControl = cacheControlTtl ? { type: "ephemeral", ttl: cacheControlTtl } : { type: "ephemeral" };
-     const params = {
-         model: model.id,
--        messages: convertMessages(context.messages, model, isOAuthToken),
-+        messages: convertMessages(context.messages, model, isOAuthToken, cacheControl),
-         max_tokens: options?.maxTokens || (model.maxTokens / 3) | 0,
-         stream: true,
-     };
-@@ -325,18 +328,14 @@ function buildParams(model, context, isOAuthToken, options) {
-             {
-                 type: "text",
-                 text: "You are Claude Code, Anthropic's official CLI for Claude.",
--                cache_control: {
--                    type: "ephemeral",
--                },
-+                cache_control: cacheControl,
-             },
-         ];
-         if (context.systemPrompt) {
-             params.system.push({
-                 type: "text",
-                 text: sanitizeSurrogates(context.systemPrompt),
--                cache_control: {
--                    type: "ephemeral",
--                },
-+                cache_control: cacheControl,
-             });
-         }
-     }
-@@ -346,9 +345,7 @@ function buildParams(model, context, isOAuthToken, options) {
-             {
-                 type: "text",
-                 text: sanitizeSurrogates(context.systemPrompt),
--                cache_control: {
--                    type: "ephemeral",
--                },
-+                cache_control: cacheControl,
-             },
-         ];
-     }
-@@ -378,7 +375,7 @@ function buildParams(model, context, isOAuthToken, options) {
- function normalizeToolCallId(id) {
-     return id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
- }
--function convertMessages(messages, model, isOAuthToken) {
-+function convertMessages(messages, model, isOAuthToken, cacheControl) {
-     const params = [];
-     // Transform messages for cross-provider compatibility
-     const transformedMessages = transformMessages(messages, model, normalizeToolCallId);
-@@ -514,7 +511,7 @@ function convertMessages(messages, model, isOAuthToken) {
-                 const lastBlock = lastMessage.content[lastMessage.content.length - 1];
-                 if (lastBlock &&
-                     (lastBlock.type === "text" || lastBlock.type === "image" || lastBlock.type === "tool_result")) {
--                    lastBlock.cache_control = { type: "ephemeral" };
-+                    lastBlock.cache_control = cacheControl;
-                 }
-             }
-         }
-diff --git a/dist/providers/openai-completions.js b/dist/providers/openai-completions.js
-index ee5c88d8e280ceeff45ed075f2c7357d40005578..89daad7b0e53753e094028291226d32da9446440 100644
---- a/dist/providers/openai-completions.js
-+++ b/dist/providers/openai-completions.js
-@@ -305,7 +305,7 @@ function createClient(model, context, apiKey) {
- function buildParams(model, context, options) {
-     const compat = getCompat(model);
-     const messages = convertMessages(model, context, compat);
--    maybeAddOpenRouterAnthropicCacheControl(model, messages);
-+    maybeAddOpenRouterAnthropicCacheControl(model, messages, options?.cacheControlTtl);
-     const params = {
-         model: model.id,
-         messages,
-@@ -349,9 +349,10 @@ function buildParams(model, context, options) {
-     }
-     return params;
- }
--function maybeAddOpenRouterAnthropicCacheControl(model, messages) {
-+function maybeAddOpenRouterAnthropicCacheControl(model, messages, cacheControlTtl) {
-     if (model.provider !== "openrouter" || !model.id.startsWith("anthropic/"))
-         return;
-+    const cacheControl = cacheControlTtl ? { type: "ephemeral", ttl: cacheControlTtl } : { type: "ephemeral" };
-     // Anthropic-style caching requires cache_control on a text part. Add a breakpoint
-     // on the last user/assistant message (walking backwards until we find text content).
-     for (let i = messages.length - 1; i >= 0; i--) {
-@@ -361,7 +362,7 @@ function maybeAddOpenRouterAnthropicCacheControl(model, messages) {
-         const content = msg.content;
-         if (typeof content === "string") {
-             msg.content = [
--                Object.assign({ type: "text", text: content }, { cache_control: { type: "ephemeral" } }),
-+                Object.assign({ type: "text", text: content }, { cache_control: cacheControl }),
-             ];
-             return;
-         }
-@@ -371,7 +372,7 @@ function maybeAddOpenRouterAnthropicCacheControl(model, messages) {
-         for (let j = content.length - 1; j >= 0; j--) {
-             const part = content[j];
-             if (part?.type === "text") {
--                Object.assign(part, { cache_control: { type: "ephemeral" } });
-+                Object.assign(part, { cache_control: cacheControl });
-                 return;
-             }
-         }
-diff --git a/dist/stream.js b/dist/stream.js
-index d23fdd9f226a949fac4f2c7160af76f7f5fe71d1..3500f074bd88b85f4c7dd9bf42279f80fdf264d1 100644
---- a/dist/stream.js
-+++ b/dist/stream.js
-@@ -146,6 +146,7 @@ function mapOptionsForApi(model, options, apiKey) {
-         signal: options?.signal,
-         apiKey: apiKey || options?.apiKey,
-         sessionId: options?.sessionId,
-+        cacheControlTtl: options?.cacheControlTtl,
-     };
-     // Helper to clamp xhigh to high for providers that don't support it
-     const clampReasoning = (effort) => (effort === "xhigh" ? "high" : effort);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c6ab92034..e0a669c0e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,11 +9,6 @@ overrides:
   hono: 4.11.4
   tar: 7.5.4
 
-patchedDependencies:
-  '@mariozechner/pi-ai@0.49.2':
-    hash: 4ae0a92a4b2c74703711e2a62b745ca8af6a9948ea7fa923097e875c76354d7e
-    path: patches/@mariozechner__pi-ai@0.49.2.patch
-
 importers:
 
   .:
@@ -44,7 +39,7 @@ importers:
         version: 0.49.2(ws@8.19.0)(zod@4.3.5)
       '@mariozechner/pi-ai':
         specifier: 0.49.2
-        version: 0.49.2(patch_hash=4ae0a92a4b2c74703711e2a62b745ca8af6a9948ea7fa923097e875c76354d7e)(ws@8.19.0)(zod@4.3.5)
+        version: 0.49.2(ws@8.19.0)(zod@4.3.5)
       '@mariozechner/pi-coding-agent':
         specifier: 0.49.2
         version: 0.49.2(ws@8.19.0)(zod@4.3.5)
@@ -6265,7 +6260,7 @@ snapshots:
 
   '@mariozechner/pi-agent-core@0.49.2(ws@8.19.0)(zod@4.3.5)':
     dependencies:
-      '@mariozechner/pi-ai': 0.49.2(patch_hash=4ae0a92a4b2c74703711e2a62b745ca8af6a9948ea7fa923097e875c76354d7e)(ws@8.19.0)(zod@4.3.5)
+      '@mariozechner/pi-ai': 0.49.2(ws@8.19.0)(zod@4.3.5)
       '@mariozechner/pi-tui': 0.49.2
     transitivePeerDependencies:
       - '@modelcontextprotocol/sdk'
@@ -6276,7 +6271,7 @@ snapshots:
       - ws
       - zod
 
-  '@mariozechner/pi-ai@0.49.2(patch_hash=4ae0a92a4b2c74703711e2a62b745ca8af6a9948ea7fa923097e875c76354d7e)(ws@8.19.0)(zod@4.3.5)':
+  '@mariozechner/pi-ai@0.49.2(ws@8.19.0)(zod@4.3.5)':
     dependencies:
       '@anthropic-ai/sdk': 0.71.2(zod@4.3.5)
       '@aws-sdk/client-bedrock-runtime': 3.971.0
@@ -6303,7 +6298,7 @@ snapshots:
       '@mariozechner/clipboard': 0.3.0
       '@mariozechner/jiti': 2.6.5
       '@mariozechner/pi-agent-core': 0.49.2(ws@8.19.0)(zod@4.3.5)
-      '@mariozechner/pi-ai': 0.49.2(patch_hash=4ae0a92a4b2c74703711e2a62b745ca8af6a9948ea7fa923097e875c76354d7e)(ws@8.19.0)(zod@4.3.5)
+      '@mariozechner/pi-ai': 0.49.2(ws@8.19.0)(zod@4.3.5)
       '@mariozechner/pi-tui': 0.49.2
       '@silvia-odwyer/photon-node': 0.3.4
       chalk: 5.6.2
diff --git a/scripts/package-mac-app.sh b/scripts/package-mac-app.sh
index 41260013e..f0cc385b3 100755
--- a/scripts/package-mac-app.sh
+++ b/scripts/package-mac-app.sh
@@ -207,6 +207,15 @@ echo "📦 Copying device model resources"
 rm -rf "$APP_ROOT/Contents/Resources/DeviceModels"
 cp -R "$ROOT_DIR/apps/macos/Sources/Clawdbot/Resources/DeviceModels" "$APP_ROOT/Contents/Resources/DeviceModels"
 
+echo "📦 Copying model catalog"
+MODEL_CATALOG_SRC="$ROOT_DIR/node_modules/@mariozechner/pi-ai/dist/models.generated.js"
+MODEL_CATALOG_DEST="$APP_ROOT/Contents/Resources/models.generated.js"
+if [ -f "$MODEL_CATALOG_SRC" ]; then
+  cp "$MODEL_CATALOG_SRC" "$MODEL_CATALOG_DEST"
+else
+  echo "WARN: model catalog missing at $MODEL_CATALOG_SRC (continuing)" >&2
+fi
+
 echo "📦 Copying ClawdbotKit resources"
 CLAWDBOTKIT_BUNDLE="$(build_path_for_arch "$PRIMARY_ARCH")/$BUILD_CONFIG/ClawdbotKit_ClawdbotKit.bundle"
 if [ -d "$CLAWDBOTKIT_BUNDLE" ]; then

From c145a0d11614892dfecf1aa3c4b9c4de3c9c0e11 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 19:48:26 +0000
Subject: [PATCH 047/171] docs: update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c5b81a8d..2691cde9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,9 +15,11 @@ Docs: https://docs.clawd.bot
 - Sessions: add per-channel reset overrides via `session.resetByChannel`. (#1353) Thanks @cash-echo-bot.
 
 ### Fixes
+- Embedded runner: drop obsolete pi-mono transcript workarounds now handled upstream.
 - Embedded runner: persist injected history images so attachments aren’t reloaded each turn. (#1374) Thanks @Nicell.
 - Nodes tool: include agent/node/gateway context in tool failure logs to speed approval debugging.
 - macOS: exec approvals now respect wildcard agent allowlists (`*`).
+- macOS: bundle and cache the model catalog instead of reading from a local pi-mono checkout.
 - macOS: allow SSH agent auth when no identity file is set. (#1384) Thanks @ameno-.
 - UI: remove the chat stop button and keep the composer aligned to the bottom edge.
 - Typing: start instant typing indicators at run start so DMs and mentions show immediately.

From 6866cca6d7440fb4f64792ebc1869bc154e23d49 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 19:58:28 +0000
Subject: [PATCH 048/171] docs: clarify cache-ttl pruning window

---
 docs/concepts/session-pruning.md | 1 +
 docs/gateway/configuration.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/concepts/session-pruning.md b/docs/concepts/session-pruning.md
index 5e91b9fb8..fdd5080e0 100644
--- a/docs/concepts/session-pruning.md
+++ b/docs/concepts/session-pruning.md
@@ -13,6 +13,7 @@ Session pruning trims **old tool results** from the in-memory context right befo
 - Only affects the messages sent to the model for that request.
  - Only active for Anthropic API calls (and OpenRouter Anthropic models).
  - For best results, match `ttl` to your model `cacheControlTtl`.
+ - After a prune, the TTL window resets so subsequent requests keep cache until `ttl` expires again.
 
 ## What can be pruned
 - Only `toolResult` messages.
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index ddce68e79..bdf2ad29b 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -1597,6 +1597,7 @@ Notes / current limitations:
 - The estimated “context ratio” is based on **characters** (approximate), not exact tokens.
 - If the session doesn’t contain at least `keepLastAssistants` assistant messages yet, pruning is skipped.
 - `cache-ttl` only activates for Anthropic API calls (and OpenRouter Anthropic models).
+- After a prune, the TTL window resets so subsequent requests keep cache until `ttl` expires again.
 - For best results, match `contextPruning.ttl` to the model `cacheControlTtl` you set in `agents.defaults.models.*.params`.
 
 Default (off):

From 0daaa5b5925952e75eaf4f98a73f3da4f0e0be9b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:00:18 +0000
Subject: [PATCH 049/171] fix: restore 1h cache ttl option

---
 docs/gateway/configuration.md                 | 2 +-
 docs/providers/anthropic.md                   | 2 +-
 src/agents/pi-embedded-runner/extra-params.ts | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index bdf2ad29b..b6fd7d141 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -1414,7 +1414,7 @@ Each `agents.defaults.models` entry can include:
 - `alias` (optional model shortcut, e.g. `/opus`).
 - `params` (optional provider-specific API params passed through to the model request).
 
-`params` is also applied to streaming runs (embedded agent + compaction). Supported keys today: `temperature`, `maxTokens`, `cacheControlTtl` (`"5m"`, Anthropic API + OpenRouter Anthropic models only; ignored for Anthropic OAuth/Claude Code tokens). These merge with call-time options; caller-supplied values win. `temperature` is an advanced knob—leave unset unless you know the model’s defaults and need a change. Clawdbot includes the `extended-cache-ttl-2025-04-11` beta flag for Anthropic API; keep it if you override provider headers.
+`params` is also applied to streaming runs (embedded agent + compaction). Supported keys today: `temperature`, `maxTokens`, `cacheControlTtl` (`"5m"` or `"1h"`, Anthropic API + OpenRouter Anthropic models only; ignored for Anthropic OAuth/Claude Code tokens). These merge with call-time options; caller-supplied values win. `temperature` is an advanced knob—leave unset unless you know the model’s defaults and need a change. Clawdbot includes the `extended-cache-ttl-2025-04-11` beta flag for Anthropic API; keep it if you override provider headers.
 
 Example:
 
diff --git a/docs/providers/anthropic.md b/docs/providers/anthropic.md
index 80cbe5d8b..f09d1c870 100644
--- a/docs/providers/anthropic.md
+++ b/docs/providers/anthropic.md
@@ -47,7 +47,7 @@ To set the TTL per model, use `cacheControlTtl` in the model `params`:
     defaults: {
       models: {
         "anthropic/claude-opus-4-5": {
-          params: { cacheControlTtl: "5m" }
+          params: { cacheControlTtl: "5m" } // or "1h"
         }
       }
     }
diff --git a/src/agents/pi-embedded-runner/extra-params.ts b/src/agents/pi-embedded-runner/extra-params.ts
index f6a4490a4..11f2ab83a 100644
--- a/src/agents/pi-embedded-runner/extra-params.ts
+++ b/src/agents/pi-embedded-runner/extra-params.ts
@@ -21,7 +21,7 @@ export function resolveExtraParams(params: {
   return modelConfig?.params ? { ...modelConfig.params } : undefined;
 }
 
-type CacheControlTtl = "5m";
+type CacheControlTtl = "5m" | "1h";
 
 function resolveCacheControlTtl(
   extraParams: Record<string, unknown> | undefined,
@@ -29,7 +29,7 @@ function resolveCacheControlTtl(
   modelId: string,
 ): CacheControlTtl | undefined {
   const raw = extraParams?.cacheControlTtl;
-  if (raw !== "5m") return undefined;
+  if (raw !== "5m" && raw !== "1h") return undefined;
   if (provider === "anthropic") return raw;
   if (provider === "openrouter" && modelId.startsWith("anthropic/")) return raw;
   return undefined;

From 44a3539ffa6a2d711df73d700bf47c49b49b2aef Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:06:24 +0000
Subject: [PATCH 050/171] tmp

---
 src/canvas-host/a2ui/.bundle.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/canvas-host/a2ui/.bundle.hash b/src/canvas-host/a2ui/.bundle.hash
index b14bb0bad..6e2a91754 100644
--- a/src/canvas-host/a2ui/.bundle.hash
+++ b/src/canvas-host/a2ui/.bundle.hash
@@ -1 +1 @@
-d9a36b111dfd93cbbb629fddf075800690ce0ae32a3a2ef201b365f4f6d6f5d5
+27d5aed982d9f110b44e85254877597e49efae61141de480b4e9f254c04131ce

From 8b8e078ef8906edb1bbd40c027200c756fe0ee82 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:10:24 +0000
Subject: [PATCH 051/171] chore(canvas): update a2ui bundle

---
 src/canvas-host/a2ui/a2ui.bundle.js | 32685 ++++++++++++--------------
 1 file changed, 15246 insertions(+), 17439 deletions(-)

diff --git a/src/canvas-host/a2ui/a2ui.bundle.js b/src/canvas-host/a2ui/a2ui.bundle.js
index 43b4c22ec..c29280acd 100644
--- a/src/canvas-host/a2ui/a2ui.bundle.js
+++ b/src/canvas-host/a2ui/a2ui.bundle.js
@@ -1,1396 +1,978 @@
 var __defProp$1 = Object.defineProperty;
 var __exportAll = (all, symbols) => {
-  let target = {};
-  for (var name in all) {
-    __defProp$1(target, name, {
-      get: all[name],
-      enumerable: true,
-    });
-  }
-  if (symbols) {
-    __defProp$1(target, Symbol.toStringTag, { value: "Module" });
-  }
-  return target;
+	let target = {};
+	for (var name in all) {
+		__defProp$1(target, name, {
+			get: all[name],
+			enumerable: true
+		});
+	}
+	if (symbols) {
+		__defProp$1(target, Symbol.toStringTag, { value: "Module" });
+	}
+	return target;
 };
 
 /**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
-const t$6 = globalThis,
-  e$13 =
-    t$6.ShadowRoot &&
-    (void 0 === t$6.ShadyCSS || t$6.ShadyCSS.nativeShadow) &&
-    "adoptedStyleSheets" in Document.prototype &&
-    "replace" in CSSStyleSheet.prototype,
-  s$8 = Symbol(),
-  o$14 = new WeakMap();
+* @license
+* Copyright 2019 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
+const t$6 = globalThis, e$13 = t$6.ShadowRoot && (void 0 === t$6.ShadyCSS || t$6.ShadyCSS.nativeShadow) && "adoptedStyleSheets" in Document.prototype && "replace" in CSSStyleSheet.prototype, s$8 = Symbol(), o$14 = new WeakMap();
 var n$12 = class {
-  constructor(t$7, e$14, o$15) {
-    if (((this._$cssResult$ = !0), o$15 !== s$8))
-      throw Error("CSSResult is not constructable. Use `unsafeCSS` or `css` instead.");
-    ((this.cssText = t$7), (this.t = e$14));
-  }
-  get styleSheet() {
-    let t$7 = this.o;
-    const s$9 = this.t;
-    if (e$13 && void 0 === t$7) {
-      const e$14 = void 0 !== s$9 && 1 === s$9.length;
-      (e$14 && (t$7 = o$14.get(s$9)),
-        void 0 === t$7 &&
-          ((this.o = t$7 = new CSSStyleSheet()).replaceSync(this.cssText),
-          e$14 && o$14.set(s$9, t$7)));
-    }
-    return t$7;
-  }
-  toString() {
-    return this.cssText;
-  }
+	constructor(t$7, e$14, o$15) {
+		if (this._$cssResult$ = !0, o$15 !== s$8) throw Error("CSSResult is not constructable. Use `unsafeCSS` or `css` instead.");
+		this.cssText = t$7, this.t = e$14;
+	}
+	get styleSheet() {
+		let t$7 = this.o;
+		const s$9 = this.t;
+		if (e$13 && void 0 === t$7) {
+			const e$14 = void 0 !== s$9 && 1 === s$9.length;
+			e$14 && (t$7 = o$14.get(s$9)), void 0 === t$7 && ((this.o = t$7 = new CSSStyleSheet()).replaceSync(this.cssText), e$14 && o$14.set(s$9, t$7));
+		}
+		return t$7;
+	}
+	toString() {
+		return this.cssText;
+	}
 };
-const r$11 = (t$7) => new n$12("string" == typeof t$7 ? t$7 : t$7 + "", void 0, s$8),
-  i$9 = (t$7, ...e$14) => {
-    const o$15 =
-      1 === t$7.length
-        ? t$7[0]
-        : e$14.reduce(
-            (e$15, s$9, o$16) =>
-              e$15 +
-              ((t$8) => {
-                if (!0 === t$8._$cssResult$) return t$8.cssText;
-                if ("number" == typeof t$8) return t$8;
-                throw Error(
-                  "Value passed to 'css' function must be a 'css' function result: " +
-                    t$8 +
-                    ". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.",
-                );
-              })(s$9) +
-              t$7[o$16 + 1],
-            t$7[0],
-          );
-    return new n$12(o$15, t$7, s$8);
-  },
-  S$1 = (s$9, o$15) => {
-    if (e$13)
-      s$9.adoptedStyleSheets = o$15.map((t$7) =>
-        t$7 instanceof CSSStyleSheet ? t$7 : t$7.styleSheet,
-      );
-    else
-      for (const e$14 of o$15) {
-        const o$16 = document.createElement("style"),
-          n$13 = t$6.litNonce;
-        (void 0 !== n$13 && o$16.setAttribute("nonce", n$13),
-          (o$16.textContent = e$14.cssText),
-          s$9.appendChild(o$16));
-      }
-  },
-  c$6 = e$13
-    ? (t$7) => t$7
-    : (t$7) =>
-        t$7 instanceof CSSStyleSheet
-          ? ((t$8) => {
-              let e$14 = "";
-              for (const s$9 of t$8.cssRules) e$14 += s$9.cssText;
-              return r$11(e$14);
-            })(t$7)
-          : t$7;
+const r$11 = (t$7) => new n$12("string" == typeof t$7 ? t$7 : t$7 + "", void 0, s$8), i$9 = (t$7, ...e$14) => {
+	const o$15 = 1 === t$7.length ? t$7[0] : e$14.reduce((e$15, s$9, o$16) => e$15 + ((t$8) => {
+		if (!0 === t$8._$cssResult$) return t$8.cssText;
+		if ("number" == typeof t$8) return t$8;
+		throw Error("Value passed to 'css' function must be a 'css' function result: " + t$8 + ". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.");
+	})(s$9) + t$7[o$16 + 1], t$7[0]);
+	return new n$12(o$15, t$7, s$8);
+}, S$1 = (s$9, o$15) => {
+	if (e$13) s$9.adoptedStyleSheets = o$15.map((t$7) => t$7 instanceof CSSStyleSheet ? t$7 : t$7.styleSheet);
+	else for (const e$14 of o$15) {
+		const o$16 = document.createElement("style"), n$13 = t$6.litNonce;
+		void 0 !== n$13 && o$16.setAttribute("nonce", n$13), o$16.textContent = e$14.cssText, s$9.appendChild(o$16);
+	}
+}, c$6 = e$13 ? (t$7) => t$7 : (t$7) => t$7 instanceof CSSStyleSheet ? ((t$8) => {
+	let e$14 = "";
+	for (const s$9 of t$8.cssRules) e$14 += s$9.cssText;
+	return r$11(e$14);
+})(t$7) : t$7;
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ const {
-    is: i$8,
-    defineProperty: e$12,
-    getOwnPropertyDescriptor: h$6,
-    getOwnPropertyNames: r$10,
-    getOwnPropertySymbols: o$13,
-    getPrototypeOf: n$11,
-  } = Object,
-  a$1 = globalThis,
-  c$5 = a$1.trustedTypes,
-  l$4 = c$5 ? c$5.emptyScript : "",
-  p$2 = a$1.reactiveElementPolyfillSupport,
-  d$2 = (t$7, s$9) => t$7,
-  u$3 = {
-    toAttribute(t$7, s$9) {
-      switch (s$9) {
-        case Boolean:
-          t$7 = t$7 ? l$4 : null;
-          break;
-        case Object:
-        case Array:
-          t$7 = null == t$7 ? t$7 : JSON.stringify(t$7);
-      }
-      return t$7;
-    },
-    fromAttribute(t$7, s$9) {
-      let i$10 = t$7;
-      switch (s$9) {
-        case Boolean:
-          i$10 = null !== t$7;
-          break;
-        case Number:
-          i$10 = null === t$7 ? null : Number(t$7);
-          break;
-        case Object:
-        case Array:
-          try {
-            i$10 = JSON.parse(t$7);
-          } catch (t$8) {
-            i$10 = null;
-          }
-      }
-      return i$10;
-    },
-  },
-  f$3 = (t$7, s$9) => !i$8(t$7, s$9),
-  b$1 = {
-    attribute: !0,
-    type: String,
-    converter: u$3,
-    reflect: !1,
-    useDefault: !1,
-    hasChanged: f$3,
-  };
-((Symbol.metadata ??= Symbol("metadata")), (a$1.litPropertyMetadata ??= new WeakMap()));
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ const { is: i$8, defineProperty: e$12, getOwnPropertyDescriptor: h$6, getOwnPropertyNames: r$10, getOwnPropertySymbols: o$13, getPrototypeOf: n$11 } = Object, a$1 = globalThis, c$5 = a$1.trustedTypes, l$4 = c$5 ? c$5.emptyScript : "", p$2 = a$1.reactiveElementPolyfillSupport, d$2 = (t$7, s$9) => t$7, u$3 = {
+	toAttribute(t$7, s$9) {
+		switch (s$9) {
+			case Boolean:
+				t$7 = t$7 ? l$4 : null;
+				break;
+			case Object:
+			case Array: t$7 = null == t$7 ? t$7 : JSON.stringify(t$7);
+		}
+		return t$7;
+	},
+	fromAttribute(t$7, s$9) {
+		let i$10 = t$7;
+		switch (s$9) {
+			case Boolean:
+				i$10 = null !== t$7;
+				break;
+			case Number:
+				i$10 = null === t$7 ? null : Number(t$7);
+				break;
+			case Object:
+			case Array: try {
+				i$10 = JSON.parse(t$7);
+			} catch (t$8) {
+				i$10 = null;
+			}
+		}
+		return i$10;
+	}
+}, f$3 = (t$7, s$9) => !i$8(t$7, s$9), b$1 = {
+	attribute: !0,
+	type: String,
+	converter: u$3,
+	reflect: !1,
+	useDefault: !1,
+	hasChanged: f$3
+};
+Symbol.metadata ??= Symbol("metadata"), a$1.litPropertyMetadata ??= new WeakMap();
 var y$1 = class extends HTMLElement {
-  static addInitializer(t$7) {
-    (this._$Ei(), (this.l ??= []).push(t$7));
-  }
-  static get observedAttributes() {
-    return (this.finalize(), this._$Eh && [...this._$Eh.keys()]);
-  }
-  static createProperty(t$7, s$9 = b$1) {
-    if (
-      (s$9.state && (s$9.attribute = !1),
-      this._$Ei(),
-      this.prototype.hasOwnProperty(t$7) && ((s$9 = Object.create(s$9)).wrapped = !0),
-      this.elementProperties.set(t$7, s$9),
-      !s$9.noAccessor)
-    ) {
-      const i$10 = Symbol(),
-        h$7 = this.getPropertyDescriptor(t$7, i$10, s$9);
-      void 0 !== h$7 && e$12(this.prototype, t$7, h$7);
-    }
-  }
-  static getPropertyDescriptor(t$7, s$9, i$10) {
-    const { get: e$14, set: r$12 } = h$6(this.prototype, t$7) ?? {
-      get() {
-        return this[s$9];
-      },
-      set(t$8) {
-        this[s$9] = t$8;
-      },
-    };
-    return {
-      get: e$14,
-      set(s$10) {
-        const h$7 = e$14?.call(this);
-        (r$12?.call(this, s$10), this.requestUpdate(t$7, h$7, i$10));
-      },
-      configurable: !0,
-      enumerable: !0,
-    };
-  }
-  static getPropertyOptions(t$7) {
-    return this.elementProperties.get(t$7) ?? b$1;
-  }
-  static _$Ei() {
-    if (this.hasOwnProperty(d$2("elementProperties"))) return;
-    const t$7 = n$11(this);
-    (t$7.finalize(),
-      void 0 !== t$7.l && (this.l = [...t$7.l]),
-      (this.elementProperties = new Map(t$7.elementProperties)));
-  }
-  static finalize() {
-    if (this.hasOwnProperty(d$2("finalized"))) return;
-    if (((this.finalized = !0), this._$Ei(), this.hasOwnProperty(d$2("properties")))) {
-      const t$8 = this.properties,
-        s$9 = [...r$10(t$8), ...o$13(t$8)];
-      for (const i$10 of s$9) this.createProperty(i$10, t$8[i$10]);
-    }
-    const t$7 = this[Symbol.metadata];
-    if (null !== t$7) {
-      const s$9 = litPropertyMetadata.get(t$7);
-      if (void 0 !== s$9) for (const [t$8, i$10] of s$9) this.elementProperties.set(t$8, i$10);
-    }
-    this._$Eh = new Map();
-    for (const [t$8, s$9] of this.elementProperties) {
-      const i$10 = this._$Eu(t$8, s$9);
-      void 0 !== i$10 && this._$Eh.set(i$10, t$8);
-    }
-    this.elementStyles = this.finalizeStyles(this.styles);
-  }
-  static finalizeStyles(s$9) {
-    const i$10 = [];
-    if (Array.isArray(s$9)) {
-      const e$14 = new Set(s$9.flat(1 / 0).reverse());
-      for (const s$10 of e$14) i$10.unshift(c$6(s$10));
-    } else void 0 !== s$9 && i$10.push(c$6(s$9));
-    return i$10;
-  }
-  static _$Eu(t$7, s$9) {
-    const i$10 = s$9.attribute;
-    return !1 === i$10
-      ? void 0
-      : "string" == typeof i$10
-        ? i$10
-        : "string" == typeof t$7
-          ? t$7.toLowerCase()
-          : void 0;
-  }
-  constructor() {
-    (super(),
-      (this._$Ep = void 0),
-      (this.isUpdatePending = !1),
-      (this.hasUpdated = !1),
-      (this._$Em = null),
-      this._$Ev());
-  }
-  _$Ev() {
-    ((this._$ES = new Promise((t$7) => (this.enableUpdating = t$7))),
-      (this._$AL = new Map()),
-      this._$E_(),
-      this.requestUpdate(),
-      this.constructor.l?.forEach((t$7) => t$7(this)));
-  }
-  addController(t$7) {
-    ((this._$EO ??= new Set()).add(t$7),
-      void 0 !== this.renderRoot && this.isConnected && t$7.hostConnected?.());
-  }
-  removeController(t$7) {
-    this._$EO?.delete(t$7);
-  }
-  _$E_() {
-    const t$7 = new Map(),
-      s$9 = this.constructor.elementProperties;
-    for (const i$10 of s$9.keys())
-      this.hasOwnProperty(i$10) && (t$7.set(i$10, this[i$10]), delete this[i$10]);
-    t$7.size > 0 && (this._$Ep = t$7);
-  }
-  createRenderRoot() {
-    const t$7 = this.shadowRoot ?? this.attachShadow(this.constructor.shadowRootOptions);
-    return (S$1(t$7, this.constructor.elementStyles), t$7);
-  }
-  connectedCallback() {
-    ((this.renderRoot ??= this.createRenderRoot()),
-      this.enableUpdating(!0),
-      this._$EO?.forEach((t$7) => t$7.hostConnected?.()));
-  }
-  enableUpdating(t$7) {}
-  disconnectedCallback() {
-    this._$EO?.forEach((t$7) => t$7.hostDisconnected?.());
-  }
-  attributeChangedCallback(t$7, s$9, i$10) {
-    this._$AK(t$7, i$10);
-  }
-  _$ET(t$7, s$9) {
-    const i$10 = this.constructor.elementProperties.get(t$7),
-      e$14 = this.constructor._$Eu(t$7, i$10);
-    if (void 0 !== e$14 && !0 === i$10.reflect) {
-      const h$7 = (void 0 !== i$10.converter?.toAttribute ? i$10.converter : u$3).toAttribute(
-        s$9,
-        i$10.type,
-      );
-      ((this._$Em = t$7),
-        null == h$7 ? this.removeAttribute(e$14) : this.setAttribute(e$14, h$7),
-        (this._$Em = null));
-    }
-  }
-  _$AK(t$7, s$9) {
-    const i$10 = this.constructor,
-      e$14 = i$10._$Eh.get(t$7);
-    if (void 0 !== e$14 && this._$Em !== e$14) {
-      const t$8 = i$10.getPropertyOptions(e$14),
-        h$7 =
-          "function" == typeof t$8.converter
-            ? { fromAttribute: t$8.converter }
-            : void 0 !== t$8.converter?.fromAttribute
-              ? t$8.converter
-              : u$3;
-      this._$Em = e$14;
-      const r$12 = h$7.fromAttribute(s$9, t$8.type);
-      ((this[e$14] = r$12 ?? this._$Ej?.get(e$14) ?? r$12), (this._$Em = null));
-    }
-  }
-  requestUpdate(t$7, s$9, i$10, e$14 = !1, h$7) {
-    if (void 0 !== t$7) {
-      const r$12 = this.constructor;
-      if (
-        (!1 === e$14 && (h$7 = this[t$7]),
-        (i$10 ??= r$12.getPropertyOptions(t$7)),
-        !(
-          (i$10.hasChanged ?? f$3)(h$7, s$9) ||
-          (i$10.useDefault &&
-            i$10.reflect &&
-            h$7 === this._$Ej?.get(t$7) &&
-            !this.hasAttribute(r$12._$Eu(t$7, i$10)))
-        ))
-      )
-        return;
-      this.C(t$7, s$9, i$10);
-    }
-    !1 === this.isUpdatePending && (this._$ES = this._$EP());
-  }
-  C(t$7, s$9, { useDefault: i$10, reflect: e$14, wrapped: h$7 }, r$12) {
-    (i$10 &&
-      !(this._$Ej ??= new Map()).has(t$7) &&
-      (this._$Ej.set(t$7, r$12 ?? s$9 ?? this[t$7]), !0 !== h$7 || void 0 !== r$12)) ||
-      (this._$AL.has(t$7) || (this.hasUpdated || i$10 || (s$9 = void 0), this._$AL.set(t$7, s$9)),
-      !0 === e$14 && this._$Em !== t$7 && (this._$Eq ??= new Set()).add(t$7));
-  }
-  async _$EP() {
-    this.isUpdatePending = !0;
-    try {
-      await this._$ES;
-    } catch (t$8) {
-      Promise.reject(t$8);
-    }
-    const t$7 = this.scheduleUpdate();
-    return (null != t$7 && (await t$7), !this.isUpdatePending);
-  }
-  scheduleUpdate() {
-    return this.performUpdate();
-  }
-  performUpdate() {
-    if (!this.isUpdatePending) return;
-    if (!this.hasUpdated) {
-      if (((this.renderRoot ??= this.createRenderRoot()), this._$Ep)) {
-        for (const [t$9, s$10] of this._$Ep) this[t$9] = s$10;
-        this._$Ep = void 0;
-      }
-      const t$8 = this.constructor.elementProperties;
-      if (t$8.size > 0)
-        for (const [s$10, i$10] of t$8) {
-          const { wrapped: t$9 } = i$10,
-            e$14 = this[s$10];
-          !0 !== t$9 || this._$AL.has(s$10) || void 0 === e$14 || this.C(s$10, void 0, i$10, e$14);
-        }
-    }
-    let t$7 = !1;
-    const s$9 = this._$AL;
-    try {
-      ((t$7 = this.shouldUpdate(s$9)),
-        t$7
-          ? (this.willUpdate(s$9),
-            this._$EO?.forEach((t$8) => t$8.hostUpdate?.()),
-            this.update(s$9))
-          : this._$EM());
-    } catch (s$10) {
-      throw ((t$7 = !1), this._$EM(), s$10);
-    }
-    t$7 && this._$AE(s$9);
-  }
-  willUpdate(t$7) {}
-  _$AE(t$7) {
-    (this._$EO?.forEach((t$8) => t$8.hostUpdated?.()),
-      this.hasUpdated || ((this.hasUpdated = !0), this.firstUpdated(t$7)),
-      this.updated(t$7));
-  }
-  _$EM() {
-    ((this._$AL = new Map()), (this.isUpdatePending = !1));
-  }
-  get updateComplete() {
-    return this.getUpdateComplete();
-  }
-  getUpdateComplete() {
-    return this._$ES;
-  }
-  shouldUpdate(t$7) {
-    return !0;
-  }
-  update(t$7) {
-    ((this._$Eq &&= this._$Eq.forEach((t$8) => this._$ET(t$8, this[t$8]))), this._$EM());
-  }
-  updated(t$7) {}
-  firstUpdated(t$7) {}
+	static addInitializer(t$7) {
+		this._$Ei(), (this.l ??= []).push(t$7);
+	}
+	static get observedAttributes() {
+		return this.finalize(), this._$Eh && [...this._$Eh.keys()];
+	}
+	static createProperty(t$7, s$9 = b$1) {
+		if (s$9.state && (s$9.attribute = !1), this._$Ei(), this.prototype.hasOwnProperty(t$7) && ((s$9 = Object.create(s$9)).wrapped = !0), this.elementProperties.set(t$7, s$9), !s$9.noAccessor) {
+			const i$10 = Symbol(), h$7 = this.getPropertyDescriptor(t$7, i$10, s$9);
+			void 0 !== h$7 && e$12(this.prototype, t$7, h$7);
+		}
+	}
+	static getPropertyDescriptor(t$7, s$9, i$10) {
+		const { get: e$14, set: r$12 } = h$6(this.prototype, t$7) ?? {
+			get() {
+				return this[s$9];
+			},
+			set(t$8) {
+				this[s$9] = t$8;
+			}
+		};
+		return {
+			get: e$14,
+			set(s$10) {
+				const h$7 = e$14?.call(this);
+				r$12?.call(this, s$10), this.requestUpdate(t$7, h$7, i$10);
+			},
+			configurable: !0,
+			enumerable: !0
+		};
+	}
+	static getPropertyOptions(t$7) {
+		return this.elementProperties.get(t$7) ?? b$1;
+	}
+	static _$Ei() {
+		if (this.hasOwnProperty(d$2("elementProperties"))) return;
+		const t$7 = n$11(this);
+		t$7.finalize(), void 0 !== t$7.l && (this.l = [...t$7.l]), this.elementProperties = new Map(t$7.elementProperties);
+	}
+	static finalize() {
+		if (this.hasOwnProperty(d$2("finalized"))) return;
+		if (this.finalized = !0, this._$Ei(), this.hasOwnProperty(d$2("properties"))) {
+			const t$8 = this.properties, s$9 = [...r$10(t$8), ...o$13(t$8)];
+			for (const i$10 of s$9) this.createProperty(i$10, t$8[i$10]);
+		}
+		const t$7 = this[Symbol.metadata];
+		if (null !== t$7) {
+			const s$9 = litPropertyMetadata.get(t$7);
+			if (void 0 !== s$9) for (const [t$8, i$10] of s$9) this.elementProperties.set(t$8, i$10);
+		}
+		this._$Eh = new Map();
+		for (const [t$8, s$9] of this.elementProperties) {
+			const i$10 = this._$Eu(t$8, s$9);
+			void 0 !== i$10 && this._$Eh.set(i$10, t$8);
+		}
+		this.elementStyles = this.finalizeStyles(this.styles);
+	}
+	static finalizeStyles(s$9) {
+		const i$10 = [];
+		if (Array.isArray(s$9)) {
+			const e$14 = new Set(s$9.flat(1 / 0).reverse());
+			for (const s$10 of e$14) i$10.unshift(c$6(s$10));
+		} else void 0 !== s$9 && i$10.push(c$6(s$9));
+		return i$10;
+	}
+	static _$Eu(t$7, s$9) {
+		const i$10 = s$9.attribute;
+		return !1 === i$10 ? void 0 : "string" == typeof i$10 ? i$10 : "string" == typeof t$7 ? t$7.toLowerCase() : void 0;
+	}
+	constructor() {
+		super(), this._$Ep = void 0, this.isUpdatePending = !1, this.hasUpdated = !1, this._$Em = null, this._$Ev();
+	}
+	_$Ev() {
+		this._$ES = new Promise((t$7) => this.enableUpdating = t$7), this._$AL = new Map(), this._$E_(), this.requestUpdate(), this.constructor.l?.forEach((t$7) => t$7(this));
+	}
+	addController(t$7) {
+		(this._$EO ??= new Set()).add(t$7), void 0 !== this.renderRoot && this.isConnected && t$7.hostConnected?.();
+	}
+	removeController(t$7) {
+		this._$EO?.delete(t$7);
+	}
+	_$E_() {
+		const t$7 = new Map(), s$9 = this.constructor.elementProperties;
+		for (const i$10 of s$9.keys()) this.hasOwnProperty(i$10) && (t$7.set(i$10, this[i$10]), delete this[i$10]);
+		t$7.size > 0 && (this._$Ep = t$7);
+	}
+	createRenderRoot() {
+		const t$7 = this.shadowRoot ?? this.attachShadow(this.constructor.shadowRootOptions);
+		return S$1(t$7, this.constructor.elementStyles), t$7;
+	}
+	connectedCallback() {
+		this.renderRoot ??= this.createRenderRoot(), this.enableUpdating(!0), this._$EO?.forEach((t$7) => t$7.hostConnected?.());
+	}
+	enableUpdating(t$7) {}
+	disconnectedCallback() {
+		this._$EO?.forEach((t$7) => t$7.hostDisconnected?.());
+	}
+	attributeChangedCallback(t$7, s$9, i$10) {
+		this._$AK(t$7, i$10);
+	}
+	_$ET(t$7, s$9) {
+		const i$10 = this.constructor.elementProperties.get(t$7), e$14 = this.constructor._$Eu(t$7, i$10);
+		if (void 0 !== e$14 && !0 === i$10.reflect) {
+			const h$7 = (void 0 !== i$10.converter?.toAttribute ? i$10.converter : u$3).toAttribute(s$9, i$10.type);
+			this._$Em = t$7, null == h$7 ? this.removeAttribute(e$14) : this.setAttribute(e$14, h$7), this._$Em = null;
+		}
+	}
+	_$AK(t$7, s$9) {
+		const i$10 = this.constructor, e$14 = i$10._$Eh.get(t$7);
+		if (void 0 !== e$14 && this._$Em !== e$14) {
+			const t$8 = i$10.getPropertyOptions(e$14), h$7 = "function" == typeof t$8.converter ? { fromAttribute: t$8.converter } : void 0 !== t$8.converter?.fromAttribute ? t$8.converter : u$3;
+			this._$Em = e$14;
+			const r$12 = h$7.fromAttribute(s$9, t$8.type);
+			this[e$14] = r$12 ?? this._$Ej?.get(e$14) ?? r$12, this._$Em = null;
+		}
+	}
+	requestUpdate(t$7, s$9, i$10, e$14 = !1, h$7) {
+		if (void 0 !== t$7) {
+			const r$12 = this.constructor;
+			if (!1 === e$14 && (h$7 = this[t$7]), i$10 ??= r$12.getPropertyOptions(t$7), !((i$10.hasChanged ?? f$3)(h$7, s$9) || i$10.useDefault && i$10.reflect && h$7 === this._$Ej?.get(t$7) && !this.hasAttribute(r$12._$Eu(t$7, i$10)))) return;
+			this.C(t$7, s$9, i$10);
+		}
+		!1 === this.isUpdatePending && (this._$ES = this._$EP());
+	}
+	C(t$7, s$9, { useDefault: i$10, reflect: e$14, wrapped: h$7 }, r$12) {
+		i$10 && !(this._$Ej ??= new Map()).has(t$7) && (this._$Ej.set(t$7, r$12 ?? s$9 ?? this[t$7]), !0 !== h$7 || void 0 !== r$12) || (this._$AL.has(t$7) || (this.hasUpdated || i$10 || (s$9 = void 0), this._$AL.set(t$7, s$9)), !0 === e$14 && this._$Em !== t$7 && (this._$Eq ??= new Set()).add(t$7));
+	}
+	async _$EP() {
+		this.isUpdatePending = !0;
+		try {
+			await this._$ES;
+		} catch (t$8) {
+			Promise.reject(t$8);
+		}
+		const t$7 = this.scheduleUpdate();
+		return null != t$7 && await t$7, !this.isUpdatePending;
+	}
+	scheduleUpdate() {
+		return this.performUpdate();
+	}
+	performUpdate() {
+		if (!this.isUpdatePending) return;
+		if (!this.hasUpdated) {
+			if (this.renderRoot ??= this.createRenderRoot(), this._$Ep) {
+				for (const [t$9, s$10] of this._$Ep) this[t$9] = s$10;
+				this._$Ep = void 0;
+			}
+			const t$8 = this.constructor.elementProperties;
+			if (t$8.size > 0) for (const [s$10, i$10] of t$8) {
+				const { wrapped: t$9 } = i$10, e$14 = this[s$10];
+				!0 !== t$9 || this._$AL.has(s$10) || void 0 === e$14 || this.C(s$10, void 0, i$10, e$14);
+			}
+		}
+		let t$7 = !1;
+		const s$9 = this._$AL;
+		try {
+			t$7 = this.shouldUpdate(s$9), t$7 ? (this.willUpdate(s$9), this._$EO?.forEach((t$8) => t$8.hostUpdate?.()), this.update(s$9)) : this._$EM();
+		} catch (s$10) {
+			throw t$7 = !1, this._$EM(), s$10;
+		}
+		t$7 && this._$AE(s$9);
+	}
+	willUpdate(t$7) {}
+	_$AE(t$7) {
+		this._$EO?.forEach((t$8) => t$8.hostUpdated?.()), this.hasUpdated || (this.hasUpdated = !0, this.firstUpdated(t$7)), this.updated(t$7);
+	}
+	_$EM() {
+		this._$AL = new Map(), this.isUpdatePending = !1;
+	}
+	get updateComplete() {
+		return this.getUpdateComplete();
+	}
+	getUpdateComplete() {
+		return this._$ES;
+	}
+	shouldUpdate(t$7) {
+		return !0;
+	}
+	update(t$7) {
+		this._$Eq &&= this._$Eq.forEach((t$8) => this._$ET(t$8, this[t$8])), this._$EM();
+	}
+	updated(t$7) {}
+	firstUpdated(t$7) {}
 };
-((y$1.elementStyles = []),
-  (y$1.shadowRootOptions = { mode: "open" }),
-  (y$1[d$2("elementProperties")] = new Map()),
-  (y$1[d$2("finalized")] = new Map()),
-  p$2?.({ ReactiveElement: y$1 }),
-  (a$1.reactiveElementVersions ??= []).push("2.1.2"));
+y$1.elementStyles = [], y$1.shadowRootOptions = { mode: "open" }, y$1[d$2("elementProperties")] = new Map(), y$1[d$2("finalized")] = new Map(), p$2?.({ ReactiveElement: y$1 }), (a$1.reactiveElementVersions ??= []).push("2.1.2");
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
-const t$5 = globalThis,
-  i$7 = (t$7) => t$7,
-  s$7 = t$5.trustedTypes,
-  e$11 = s$7 ? s$7.createPolicy("lit-html", { createHTML: (t$7) => t$7 }) : void 0,
-  h$5 = "$lit$",
-  o$12 = `lit$${Math.random().toFixed(9).slice(2)}$`,
-  n$10 = "?" + o$12,
-  r$9 = `<${n$10}>`,
-  l$3 = document,
-  c$4 = () => l$3.createComment(""),
-  a = (t$7) => null === t$7 || ("object" != typeof t$7 && "function" != typeof t$7),
-  u$2 = Array.isArray,
-  d$1 = (t$7) => u$2(t$7) || "function" == typeof t$7?.[Symbol.iterator],
-  f$2 = "[ 	\n\f\r]",
-  v$1 = /<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g,
-  _ = /-->/g,
-  m$2 = />/g,
-  p$1 = RegExp(`>|${f$2}(?:([^\\s"'>=/]+)(${f$2}*=${f$2}*(?:[^ \t\n\f\r"'\`<>=]|("|')|))|$)`, "g"),
-  g = /'/g,
-  $ = /"/g,
-  y = /^(?:script|style|textarea|title)$/i,
-  x =
-    (t$7) =>
-    (i$10, ...s$9) => ({
-      _$litType$: t$7,
-      strings: i$10,
-      values: s$9,
-    }),
-  b = x(1),
-  w = x(2),
-  T = x(3),
-  E = Symbol.for("lit-noChange"),
-  A = Symbol.for("lit-nothing"),
-  C = new WeakMap(),
-  P = l$3.createTreeWalker(l$3, 129);
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
+const t$5 = globalThis, i$7 = (t$7) => t$7, s$7 = t$5.trustedTypes, e$11 = s$7 ? s$7.createPolicy("lit-html", { createHTML: (t$7) => t$7 }) : void 0, h$5 = "$lit$", o$12 = `lit$${Math.random().toFixed(9).slice(2)}$`, n$10 = "?" + o$12, r$9 = `<${n$10}>`, l$3 = document, c$4 = () => l$3.createComment(""), a = (t$7) => null === t$7 || "object" != typeof t$7 && "function" != typeof t$7, u$2 = Array.isArray, d$1 = (t$7) => u$2(t$7) || "function" == typeof t$7?.[Symbol.iterator], f$2 = "[ 	\n\f\r]", v$1 = /<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g, _ = /-->/g, m$2 = />/g, p$1 = RegExp(`>|${f$2}(?:([^\\s"'>=/]+)(${f$2}*=${f$2}*(?:[^ \t\n\f\r"'\`<>=]|("|')|))|$)`, "g"), g = /'/g, $ = /"/g, y = /^(?:script|style|textarea|title)$/i, x = (t$7) => (i$10, ...s$9) => ({
+	_$litType$: t$7,
+	strings: i$10,
+	values: s$9
+}), b = x(1), w = x(2), T = x(3), E = Symbol.for("lit-noChange"), A = Symbol.for("lit-nothing"), C = new WeakMap(), P = l$3.createTreeWalker(l$3, 129);
 function V(t$7, i$10) {
-  if (!u$2(t$7) || !t$7.hasOwnProperty("raw")) throw Error("invalid template strings array");
-  return void 0 !== e$11 ? e$11.createHTML(i$10) : i$10;
+	if (!u$2(t$7) || !t$7.hasOwnProperty("raw")) throw Error("invalid template strings array");
+	return void 0 !== e$11 ? e$11.createHTML(i$10) : i$10;
 }
 const N = (t$7, i$10) => {
-  const s$9 = t$7.length - 1,
-    e$14 = [];
-  let n$13,
-    l$5 = 2 === i$10 ? "<svg>" : 3 === i$10 ? "<math>" : "",
-    c$7 = v$1;
-  for (let i$11 = 0; i$11 < s$9; i$11++) {
-    const s$10 = t$7[i$11];
-    let a,
-      u$4,
-      d$3 = -1,
-      f$4 = 0;
-    for (; f$4 < s$10.length && ((c$7.lastIndex = f$4), (u$4 = c$7.exec(s$10)), null !== u$4); )
-      ((f$4 = c$7.lastIndex),
-        c$7 === v$1
-          ? "!--" === u$4[1]
-            ? (c$7 = _)
-            : void 0 !== u$4[1]
-              ? (c$7 = m$2)
-              : void 0 !== u$4[2]
-                ? (y.test(u$4[2]) && (n$13 = RegExp("</" + u$4[2], "g")), (c$7 = p$1))
-                : void 0 !== u$4[3] && (c$7 = p$1)
-          : c$7 === p$1
-            ? ">" === u$4[0]
-              ? ((c$7 = n$13 ?? v$1), (d$3 = -1))
-              : void 0 === u$4[1]
-                ? (d$3 = -2)
-                : ((d$3 = c$7.lastIndex - u$4[2].length),
-                  (a = u$4[1]),
-                  (c$7 = void 0 === u$4[3] ? p$1 : '"' === u$4[3] ? $ : g))
-            : c$7 === $ || c$7 === g
-              ? (c$7 = p$1)
-              : c$7 === _ || c$7 === m$2
-                ? (c$7 = v$1)
-                : ((c$7 = p$1), (n$13 = void 0)));
-    const x = c$7 === p$1 && t$7[i$11 + 1].startsWith("/>") ? " " : "";
-    l$5 +=
-      c$7 === v$1
-        ? s$10 + r$9
-        : d$3 >= 0
-          ? (e$14.push(a), s$10.slice(0, d$3) + h$5 + s$10.slice(d$3) + o$12 + x)
-          : s$10 + o$12 + (-2 === d$3 ? i$11 : x);
-  }
-  return [
-    V(t$7, l$5 + (t$7[s$9] || "<?>") + (2 === i$10 ? "</svg>" : 3 === i$10 ? "</math>" : "")),
-    e$14,
-  ];
+	const s$9 = t$7.length - 1, e$14 = [];
+	let n$13, l$5 = 2 === i$10 ? "<svg>" : 3 === i$10 ? "<math>" : "", c$7 = v$1;
+	for (let i$11 = 0; i$11 < s$9; i$11++) {
+		const s$10 = t$7[i$11];
+		let a, u$4, d$3 = -1, f$4 = 0;
+		for (; f$4 < s$10.length && (c$7.lastIndex = f$4, u$4 = c$7.exec(s$10), null !== u$4);) f$4 = c$7.lastIndex, c$7 === v$1 ? "!--" === u$4[1] ? c$7 = _ : void 0 !== u$4[1] ? c$7 = m$2 : void 0 !== u$4[2] ? (y.test(u$4[2]) && (n$13 = RegExp("</" + u$4[2], "g")), c$7 = p$1) : void 0 !== u$4[3] && (c$7 = p$1) : c$7 === p$1 ? ">" === u$4[0] ? (c$7 = n$13 ?? v$1, d$3 = -1) : void 0 === u$4[1] ? d$3 = -2 : (d$3 = c$7.lastIndex - u$4[2].length, a = u$4[1], c$7 = void 0 === u$4[3] ? p$1 : "\"" === u$4[3] ? $ : g) : c$7 === $ || c$7 === g ? c$7 = p$1 : c$7 === _ || c$7 === m$2 ? c$7 = v$1 : (c$7 = p$1, n$13 = void 0);
+		const x = c$7 === p$1 && t$7[i$11 + 1].startsWith("/>") ? " " : "";
+		l$5 += c$7 === v$1 ? s$10 + r$9 : d$3 >= 0 ? (e$14.push(a), s$10.slice(0, d$3) + h$5 + s$10.slice(d$3) + o$12 + x) : s$10 + o$12 + (-2 === d$3 ? i$11 : x);
+	}
+	return [V(t$7, l$5 + (t$7[s$9] || "<?>") + (2 === i$10 ? "</svg>" : 3 === i$10 ? "</math>" : "")), e$14];
 };
 var S = class S {
-  constructor({ strings: t$7, _$litType$: i$10 }, e$14) {
-    let r$12;
-    this.parts = [];
-    let l$5 = 0,
-      a = 0;
-    const u$4 = t$7.length - 1,
-      d$3 = this.parts,
-      [f$4, v$2] = N(t$7, i$10);
-    if (
-      ((this.el = S.createElement(f$4, e$14)),
-      (P.currentNode = this.el.content),
-      2 === i$10 || 3 === i$10)
-    ) {
-      const t$8 = this.el.content.firstChild;
-      t$8.replaceWith(...t$8.childNodes);
-    }
-    for (; null !== (r$12 = P.nextNode()) && d$3.length < u$4; ) {
-      if (1 === r$12.nodeType) {
-        if (r$12.hasAttributes())
-          for (const t$8 of r$12.getAttributeNames())
-            if (t$8.endsWith(h$5)) {
-              const i$11 = v$2[a++],
-                s$9 = r$12.getAttribute(t$8).split(o$12),
-                e$15 = /([.?@])?(.*)/.exec(i$11);
-              (d$3.push({
-                type: 1,
-                index: l$5,
-                name: e$15[2],
-                strings: s$9,
-                ctor: "." === e$15[1] ? I : "?" === e$15[1] ? L : "@" === e$15[1] ? z : H,
-              }),
-                r$12.removeAttribute(t$8));
-            } else
-              t$8.startsWith(o$12) &&
-                (d$3.push({
-                  type: 6,
-                  index: l$5,
-                }),
-                r$12.removeAttribute(t$8));
-        if (y.test(r$12.tagName)) {
-          const t$8 = r$12.textContent.split(o$12),
-            i$11 = t$8.length - 1;
-          if (i$11 > 0) {
-            r$12.textContent = s$7 ? s$7.emptyScript : "";
-            for (let s$9 = 0; s$9 < i$11; s$9++)
-              (r$12.append(t$8[s$9], c$4()),
-                P.nextNode(),
-                d$3.push({
-                  type: 2,
-                  index: ++l$5,
-                }));
-            r$12.append(t$8[i$11], c$4());
-          }
-        }
-      } else if (8 === r$12.nodeType)
-        if (r$12.data === n$10)
-          d$3.push({
-            type: 2,
-            index: l$5,
-          });
-        else {
-          let t$8 = -1;
-          for (; -1 !== (t$8 = r$12.data.indexOf(o$12, t$8 + 1)); )
-            (d$3.push({
-              type: 7,
-              index: l$5,
-            }),
-              (t$8 += o$12.length - 1));
-        }
-      l$5++;
-    }
-  }
-  static createElement(t$7, i$10) {
-    const s$9 = l$3.createElement("template");
-    return ((s$9.innerHTML = t$7), s$9);
-  }
+	constructor({ strings: t$7, _$litType$: i$10 }, e$14) {
+		let r$12;
+		this.parts = [];
+		let l$5 = 0, a = 0;
+		const u$4 = t$7.length - 1, d$3 = this.parts, [f$4, v$2] = N(t$7, i$10);
+		if (this.el = S.createElement(f$4, e$14), P.currentNode = this.el.content, 2 === i$10 || 3 === i$10) {
+			const t$8 = this.el.content.firstChild;
+			t$8.replaceWith(...t$8.childNodes);
+		}
+		for (; null !== (r$12 = P.nextNode()) && d$3.length < u$4;) {
+			if (1 === r$12.nodeType) {
+				if (r$12.hasAttributes()) for (const t$8 of r$12.getAttributeNames()) if (t$8.endsWith(h$5)) {
+					const i$11 = v$2[a++], s$9 = r$12.getAttribute(t$8).split(o$12), e$15 = /([.?@])?(.*)/.exec(i$11);
+					d$3.push({
+						type: 1,
+						index: l$5,
+						name: e$15[2],
+						strings: s$9,
+						ctor: "." === e$15[1] ? I : "?" === e$15[1] ? L : "@" === e$15[1] ? z : H
+					}), r$12.removeAttribute(t$8);
+				} else t$8.startsWith(o$12) && (d$3.push({
+					type: 6,
+					index: l$5
+				}), r$12.removeAttribute(t$8));
+				if (y.test(r$12.tagName)) {
+					const t$8 = r$12.textContent.split(o$12), i$11 = t$8.length - 1;
+					if (i$11 > 0) {
+						r$12.textContent = s$7 ? s$7.emptyScript : "";
+						for (let s$9 = 0; s$9 < i$11; s$9++) r$12.append(t$8[s$9], c$4()), P.nextNode(), d$3.push({
+							type: 2,
+							index: ++l$5
+						});
+						r$12.append(t$8[i$11], c$4());
+					}
+				}
+			} else if (8 === r$12.nodeType) if (r$12.data === n$10) d$3.push({
+				type: 2,
+				index: l$5
+			});
+			else {
+				let t$8 = -1;
+				for (; -1 !== (t$8 = r$12.data.indexOf(o$12, t$8 + 1));) d$3.push({
+					type: 7,
+					index: l$5
+				}), t$8 += o$12.length - 1;
+			}
+			l$5++;
+		}
+	}
+	static createElement(t$7, i$10) {
+		const s$9 = l$3.createElement("template");
+		return s$9.innerHTML = t$7, s$9;
+	}
 };
 function M$1(t$7, i$10, s$9 = t$7, e$14) {
-  if (i$10 === E) return i$10;
-  let h$7 = void 0 !== e$14 ? s$9._$Co?.[e$14] : s$9._$Cl;
-  const o$15 = a(i$10) ? void 0 : i$10._$litDirective$;
-  return (
-    h$7?.constructor !== o$15 &&
-      (h$7?._$AO?.(!1),
-      void 0 === o$15 ? (h$7 = void 0) : ((h$7 = new o$15(t$7)), h$7._$AT(t$7, s$9, e$14)),
-      void 0 !== e$14 ? ((s$9._$Co ??= [])[e$14] = h$7) : (s$9._$Cl = h$7)),
-    void 0 !== h$7 && (i$10 = M$1(t$7, h$7._$AS(t$7, i$10.values), h$7, e$14)),
-    i$10
-  );
+	if (i$10 === E) return i$10;
+	let h$7 = void 0 !== e$14 ? s$9._$Co?.[e$14] : s$9._$Cl;
+	const o$15 = a(i$10) ? void 0 : i$10._$litDirective$;
+	return h$7?.constructor !== o$15 && (h$7?._$AO?.(!1), void 0 === o$15 ? h$7 = void 0 : (h$7 = new o$15(t$7), h$7._$AT(t$7, s$9, e$14)), void 0 !== e$14 ? (s$9._$Co ??= [])[e$14] = h$7 : s$9._$Cl = h$7), void 0 !== h$7 && (i$10 = M$1(t$7, h$7._$AS(t$7, i$10.values), h$7, e$14)), i$10;
 }
 var R = class {
-  constructor(t$7, i$10) {
-    ((this._$AV = []), (this._$AN = void 0), (this._$AD = t$7), (this._$AM = i$10));
-  }
-  get parentNode() {
-    return this._$AM.parentNode;
-  }
-  get _$AU() {
-    return this._$AM._$AU;
-  }
-  u(t$7) {
-    const {
-        el: { content: i$10 },
-        parts: s$9,
-      } = this._$AD,
-      e$14 = (t$7?.creationScope ?? l$3).importNode(i$10, !0);
-    P.currentNode = e$14;
-    let h$7 = P.nextNode(),
-      o$15 = 0,
-      n$13 = 0,
-      r$12 = s$9[0];
-    for (; void 0 !== r$12; ) {
-      if (o$15 === r$12.index) {
-        let i$11;
-        (2 === r$12.type
-          ? (i$11 = new k(h$7, h$7.nextSibling, this, t$7))
-          : 1 === r$12.type
-            ? (i$11 = new r$12.ctor(h$7, r$12.name, r$12.strings, this, t$7))
-            : 6 === r$12.type && (i$11 = new Z(h$7, this, t$7)),
-          this._$AV.push(i$11),
-          (r$12 = s$9[++n$13]));
-      }
-      o$15 !== r$12?.index && ((h$7 = P.nextNode()), o$15++);
-    }
-    return ((P.currentNode = l$3), e$14);
-  }
-  p(t$7) {
-    let i$10 = 0;
-    for (const s$9 of this._$AV)
-      (void 0 !== s$9 &&
-        (void 0 !== s$9.strings
-          ? (s$9._$AI(t$7, s$9, i$10), (i$10 += s$9.strings.length - 2))
-          : s$9._$AI(t$7[i$10])),
-        i$10++);
-  }
+	constructor(t$7, i$10) {
+		this._$AV = [], this._$AN = void 0, this._$AD = t$7, this._$AM = i$10;
+	}
+	get parentNode() {
+		return this._$AM.parentNode;
+	}
+	get _$AU() {
+		return this._$AM._$AU;
+	}
+	u(t$7) {
+		const { el: { content: i$10 }, parts: s$9 } = this._$AD, e$14 = (t$7?.creationScope ?? l$3).importNode(i$10, !0);
+		P.currentNode = e$14;
+		let h$7 = P.nextNode(), o$15 = 0, n$13 = 0, r$12 = s$9[0];
+		for (; void 0 !== r$12;) {
+			if (o$15 === r$12.index) {
+				let i$11;
+				2 === r$12.type ? i$11 = new k(h$7, h$7.nextSibling, this, t$7) : 1 === r$12.type ? i$11 = new r$12.ctor(h$7, r$12.name, r$12.strings, this, t$7) : 6 === r$12.type && (i$11 = new Z(h$7, this, t$7)), this._$AV.push(i$11), r$12 = s$9[++n$13];
+			}
+			o$15 !== r$12?.index && (h$7 = P.nextNode(), o$15++);
+		}
+		return P.currentNode = l$3, e$14;
+	}
+	p(t$7) {
+		let i$10 = 0;
+		for (const s$9 of this._$AV) void 0 !== s$9 && (void 0 !== s$9.strings ? (s$9._$AI(t$7, s$9, i$10), i$10 += s$9.strings.length - 2) : s$9._$AI(t$7[i$10])), i$10++;
+	}
 };
 var k = class k {
-  get _$AU() {
-    return this._$AM?._$AU ?? this._$Cv;
-  }
-  constructor(t$7, i$10, s$9, e$14) {
-    ((this.type = 2),
-      (this._$AH = A),
-      (this._$AN = void 0),
-      (this._$AA = t$7),
-      (this._$AB = i$10),
-      (this._$AM = s$9),
-      (this.options = e$14),
-      (this._$Cv = e$14?.isConnected ?? !0));
-  }
-  get parentNode() {
-    let t$7 = this._$AA.parentNode;
-    const i$10 = this._$AM;
-    return (void 0 !== i$10 && 11 === t$7?.nodeType && (t$7 = i$10.parentNode), t$7);
-  }
-  get startNode() {
-    return this._$AA;
-  }
-  get endNode() {
-    return this._$AB;
-  }
-  _$AI(t$7, i$10 = this) {
-    ((t$7 = M$1(this, t$7, i$10)),
-      a(t$7)
-        ? t$7 === A || null == t$7 || "" === t$7
-          ? (this._$AH !== A && this._$AR(), (this._$AH = A))
-          : t$7 !== this._$AH && t$7 !== E && this._(t$7)
-        : void 0 !== t$7._$litType$
-          ? this.$(t$7)
-          : void 0 !== t$7.nodeType
-            ? this.T(t$7)
-            : d$1(t$7)
-              ? this.k(t$7)
-              : this._(t$7));
-  }
-  O(t$7) {
-    return this._$AA.parentNode.insertBefore(t$7, this._$AB);
-  }
-  T(t$7) {
-    this._$AH !== t$7 && (this._$AR(), (this._$AH = this.O(t$7)));
-  }
-  _(t$7) {
-    (this._$AH !== A && a(this._$AH)
-      ? (this._$AA.nextSibling.data = t$7)
-      : this.T(l$3.createTextNode(t$7)),
-      (this._$AH = t$7));
-  }
-  $(t$7) {
-    const { values: i$10, _$litType$: s$9 } = t$7,
-      e$14 =
-        "number" == typeof s$9
-          ? this._$AC(t$7)
-          : (void 0 === s$9.el && (s$9.el = S.createElement(V(s$9.h, s$9.h[0]), this.options)),
-            s$9);
-    if (this._$AH?._$AD === e$14) this._$AH.p(i$10);
-    else {
-      const t$8 = new R(e$14, this),
-        s$10 = t$8.u(this.options);
-      (t$8.p(i$10), this.T(s$10), (this._$AH = t$8));
-    }
-  }
-  _$AC(t$7) {
-    let i$10 = C.get(t$7.strings);
-    return (void 0 === i$10 && C.set(t$7.strings, (i$10 = new S(t$7))), i$10);
-  }
-  k(t$7) {
-    u$2(this._$AH) || ((this._$AH = []), this._$AR());
-    const i$10 = this._$AH;
-    let s$9,
-      e$14 = 0;
-    for (const h$7 of t$7)
-      (e$14 === i$10.length
-        ? i$10.push((s$9 = new k(this.O(c$4()), this.O(c$4()), this, this.options)))
-        : (s$9 = i$10[e$14]),
-        s$9._$AI(h$7),
-        e$14++);
-    e$14 < i$10.length && (this._$AR(s$9 && s$9._$AB.nextSibling, e$14), (i$10.length = e$14));
-  }
-  _$AR(t$7 = this._$AA.nextSibling, s$9) {
-    for (this._$AP?.(!1, !0, s$9); t$7 !== this._$AB; ) {
-      const s$10 = i$7(t$7).nextSibling;
-      (i$7(t$7).remove(), (t$7 = s$10));
-    }
-  }
-  setConnected(t$7) {
-    void 0 === this._$AM && ((this._$Cv = t$7), this._$AP?.(t$7));
-  }
+	get _$AU() {
+		return this._$AM?._$AU ?? this._$Cv;
+	}
+	constructor(t$7, i$10, s$9, e$14) {
+		this.type = 2, this._$AH = A, this._$AN = void 0, this._$AA = t$7, this._$AB = i$10, this._$AM = s$9, this.options = e$14, this._$Cv = e$14?.isConnected ?? !0;
+	}
+	get parentNode() {
+		let t$7 = this._$AA.parentNode;
+		const i$10 = this._$AM;
+		return void 0 !== i$10 && 11 === t$7?.nodeType && (t$7 = i$10.parentNode), t$7;
+	}
+	get startNode() {
+		return this._$AA;
+	}
+	get endNode() {
+		return this._$AB;
+	}
+	_$AI(t$7, i$10 = this) {
+		t$7 = M$1(this, t$7, i$10), a(t$7) ? t$7 === A || null == t$7 || "" === t$7 ? (this._$AH !== A && this._$AR(), this._$AH = A) : t$7 !== this._$AH && t$7 !== E && this._(t$7) : void 0 !== t$7._$litType$ ? this.$(t$7) : void 0 !== t$7.nodeType ? this.T(t$7) : d$1(t$7) ? this.k(t$7) : this._(t$7);
+	}
+	O(t$7) {
+		return this._$AA.parentNode.insertBefore(t$7, this._$AB);
+	}
+	T(t$7) {
+		this._$AH !== t$7 && (this._$AR(), this._$AH = this.O(t$7));
+	}
+	_(t$7) {
+		this._$AH !== A && a(this._$AH) ? this._$AA.nextSibling.data = t$7 : this.T(l$3.createTextNode(t$7)), this._$AH = t$7;
+	}
+	$(t$7) {
+		const { values: i$10, _$litType$: s$9 } = t$7, e$14 = "number" == typeof s$9 ? this._$AC(t$7) : (void 0 === s$9.el && (s$9.el = S.createElement(V(s$9.h, s$9.h[0]), this.options)), s$9);
+		if (this._$AH?._$AD === e$14) this._$AH.p(i$10);
+		else {
+			const t$8 = new R(e$14, this), s$10 = t$8.u(this.options);
+			t$8.p(i$10), this.T(s$10), this._$AH = t$8;
+		}
+	}
+	_$AC(t$7) {
+		let i$10 = C.get(t$7.strings);
+		return void 0 === i$10 && C.set(t$7.strings, i$10 = new S(t$7)), i$10;
+	}
+	k(t$7) {
+		u$2(this._$AH) || (this._$AH = [], this._$AR());
+		const i$10 = this._$AH;
+		let s$9, e$14 = 0;
+		for (const h$7 of t$7) e$14 === i$10.length ? i$10.push(s$9 = new k(this.O(c$4()), this.O(c$4()), this, this.options)) : s$9 = i$10[e$14], s$9._$AI(h$7), e$14++;
+		e$14 < i$10.length && (this._$AR(s$9 && s$9._$AB.nextSibling, e$14), i$10.length = e$14);
+	}
+	_$AR(t$7 = this._$AA.nextSibling, s$9) {
+		for (this._$AP?.(!1, !0, s$9); t$7 !== this._$AB;) {
+			const s$10 = i$7(t$7).nextSibling;
+			i$7(t$7).remove(), t$7 = s$10;
+		}
+	}
+	setConnected(t$7) {
+		void 0 === this._$AM && (this._$Cv = t$7, this._$AP?.(t$7));
+	}
 };
 var H = class {
-  get tagName() {
-    return this.element.tagName;
-  }
-  get _$AU() {
-    return this._$AM._$AU;
-  }
-  constructor(t$7, i$10, s$9, e$14, h$7) {
-    ((this.type = 1),
-      (this._$AH = A),
-      (this._$AN = void 0),
-      (this.element = t$7),
-      (this.name = i$10),
-      (this._$AM = e$14),
-      (this.options = h$7),
-      s$9.length > 2 || "" !== s$9[0] || "" !== s$9[1]
-        ? ((this._$AH = Array(s$9.length - 1).fill(new String())), (this.strings = s$9))
-        : (this._$AH = A));
-  }
-  _$AI(t$7, i$10 = this, s$9, e$14) {
-    const h$7 = this.strings;
-    let o$15 = !1;
-    if (void 0 === h$7)
-      ((t$7 = M$1(this, t$7, i$10, 0)),
-        (o$15 = !a(t$7) || (t$7 !== this._$AH && t$7 !== E)),
-        o$15 && (this._$AH = t$7));
-    else {
-      const e$15 = t$7;
-      let n$13, r$12;
-      for (t$7 = h$7[0], n$13 = 0; n$13 < h$7.length - 1; n$13++)
-        ((r$12 = M$1(this, e$15[s$9 + n$13], i$10, n$13)),
-          r$12 === E && (r$12 = this._$AH[n$13]),
-          (o$15 ||= !a(r$12) || r$12 !== this._$AH[n$13]),
-          r$12 === A ? (t$7 = A) : t$7 !== A && (t$7 += (r$12 ?? "") + h$7[n$13 + 1]),
-          (this._$AH[n$13] = r$12));
-    }
-    o$15 && !e$14 && this.j(t$7);
-  }
-  j(t$7) {
-    t$7 === A
-      ? this.element.removeAttribute(this.name)
-      : this.element.setAttribute(this.name, t$7 ?? "");
-  }
+	get tagName() {
+		return this.element.tagName;
+	}
+	get _$AU() {
+		return this._$AM._$AU;
+	}
+	constructor(t$7, i$10, s$9, e$14, h$7) {
+		this.type = 1, this._$AH = A, this._$AN = void 0, this.element = t$7, this.name = i$10, this._$AM = e$14, this.options = h$7, s$9.length > 2 || "" !== s$9[0] || "" !== s$9[1] ? (this._$AH = Array(s$9.length - 1).fill(new String()), this.strings = s$9) : this._$AH = A;
+	}
+	_$AI(t$7, i$10 = this, s$9, e$14) {
+		const h$7 = this.strings;
+		let o$15 = !1;
+		if (void 0 === h$7) t$7 = M$1(this, t$7, i$10, 0), o$15 = !a(t$7) || t$7 !== this._$AH && t$7 !== E, o$15 && (this._$AH = t$7);
+		else {
+			const e$15 = t$7;
+			let n$13, r$12;
+			for (t$7 = h$7[0], n$13 = 0; n$13 < h$7.length - 1; n$13++) r$12 = M$1(this, e$15[s$9 + n$13], i$10, n$13), r$12 === E && (r$12 = this._$AH[n$13]), o$15 ||= !a(r$12) || r$12 !== this._$AH[n$13], r$12 === A ? t$7 = A : t$7 !== A && (t$7 += (r$12 ?? "") + h$7[n$13 + 1]), this._$AH[n$13] = r$12;
+		}
+		o$15 && !e$14 && this.j(t$7);
+	}
+	j(t$7) {
+		t$7 === A ? this.element.removeAttribute(this.name) : this.element.setAttribute(this.name, t$7 ?? "");
+	}
 };
 var I = class extends H {
-  constructor() {
-    (super(...arguments), (this.type = 3));
-  }
-  j(t$7) {
-    this.element[this.name] = t$7 === A ? void 0 : t$7;
-  }
+	constructor() {
+		super(...arguments), this.type = 3;
+	}
+	j(t$7) {
+		this.element[this.name] = t$7 === A ? void 0 : t$7;
+	}
 };
 var L = class extends H {
-  constructor() {
-    (super(...arguments), (this.type = 4));
-  }
-  j(t$7) {
-    this.element.toggleAttribute(this.name, !!t$7 && t$7 !== A);
-  }
+	constructor() {
+		super(...arguments), this.type = 4;
+	}
+	j(t$7) {
+		this.element.toggleAttribute(this.name, !!t$7 && t$7 !== A);
+	}
 };
 var z = class extends H {
-  constructor(t$7, i$10, s$9, e$14, h$7) {
-    (super(t$7, i$10, s$9, e$14, h$7), (this.type = 5));
-  }
-  _$AI(t$7, i$10 = this) {
-    if ((t$7 = M$1(this, t$7, i$10, 0) ?? A) === E) return;
-    const s$9 = this._$AH,
-      e$14 =
-        (t$7 === A && s$9 !== A) ||
-        t$7.capture !== s$9.capture ||
-        t$7.once !== s$9.once ||
-        t$7.passive !== s$9.passive,
-      h$7 = t$7 !== A && (s$9 === A || e$14);
-    (e$14 && this.element.removeEventListener(this.name, this, s$9),
-      h$7 && this.element.addEventListener(this.name, this, t$7),
-      (this._$AH = t$7));
-  }
-  handleEvent(t$7) {
-    "function" == typeof this._$AH
-      ? this._$AH.call(this.options?.host ?? this.element, t$7)
-      : this._$AH.handleEvent(t$7);
-  }
+	constructor(t$7, i$10, s$9, e$14, h$7) {
+		super(t$7, i$10, s$9, e$14, h$7), this.type = 5;
+	}
+	_$AI(t$7, i$10 = this) {
+		if ((t$7 = M$1(this, t$7, i$10, 0) ?? A) === E) return;
+		const s$9 = this._$AH, e$14 = t$7 === A && s$9 !== A || t$7.capture !== s$9.capture || t$7.once !== s$9.once || t$7.passive !== s$9.passive, h$7 = t$7 !== A && (s$9 === A || e$14);
+		e$14 && this.element.removeEventListener(this.name, this, s$9), h$7 && this.element.addEventListener(this.name, this, t$7), this._$AH = t$7;
+	}
+	handleEvent(t$7) {
+		"function" == typeof this._$AH ? this._$AH.call(this.options?.host ?? this.element, t$7) : this._$AH.handleEvent(t$7);
+	}
 };
 var Z = class {
-  constructor(t$7, i$10, s$9) {
-    ((this.element = t$7),
-      (this.type = 6),
-      (this._$AN = void 0),
-      (this._$AM = i$10),
-      (this.options = s$9));
-  }
-  get _$AU() {
-    return this._$AM._$AU;
-  }
-  _$AI(t$7) {
-    M$1(this, t$7);
-  }
+	constructor(t$7, i$10, s$9) {
+		this.element = t$7, this.type = 6, this._$AN = void 0, this._$AM = i$10, this.options = s$9;
+	}
+	get _$AU() {
+		return this._$AM._$AU;
+	}
+	_$AI(t$7) {
+		M$1(this, t$7);
+	}
 };
 const j$1 = {
-    M: h$5,
-    P: o$12,
-    A: n$10,
-    C: 1,
-    L: N,
-    R,
-    D: d$1,
-    V: M$1,
-    I: k,
-    H,
-    N: L,
-    U: z,
-    B: I,
-    F: Z,
-  },
-  B = t$5.litHtmlPolyfillSupport;
-(B?.(S, k), (t$5.litHtmlVersions ??= []).push("3.3.2"));
+	M: h$5,
+	P: o$12,
+	A: n$10,
+	C: 1,
+	L: N,
+	R,
+	D: d$1,
+	V: M$1,
+	I: k,
+	H,
+	N: L,
+	U: z,
+	B: I,
+	F: Z
+}, B = t$5.litHtmlPolyfillSupport;
+B?.(S, k), (t$5.litHtmlVersions ??= []).push("3.3.2");
 const D = (t$7, i$10, s$9) => {
-  const e$14 = s$9?.renderBefore ?? i$10;
-  let h$7 = e$14._$litPart$;
-  if (void 0 === h$7) {
-    const t$8 = s$9?.renderBefore ?? null;
-    e$14._$litPart$ = h$7 = new k(i$10.insertBefore(c$4(), t$8), t$8, void 0, s$9 ?? {});
-  }
-  return (h$7._$AI(t$7), h$7);
+	const e$14 = s$9?.renderBefore ?? i$10;
+	let h$7 = e$14._$litPart$;
+	if (void 0 === h$7) {
+		const t$8 = s$9?.renderBefore ?? null;
+		e$14._$litPart$ = h$7 = new k(i$10.insertBefore(c$4(), t$8), t$8, void 0, s$9 ?? {});
+	}
+	return h$7._$AI(t$7), h$7;
 };
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ const s$6 = globalThis;
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ const s$6 = globalThis;
 var i$6 = class extends y$1 {
-  constructor() {
-    (super(...arguments), (this.renderOptions = { host: this }), (this._$Do = void 0));
-  }
-  createRenderRoot() {
-    const t$7 = super.createRenderRoot();
-    return ((this.renderOptions.renderBefore ??= t$7.firstChild), t$7);
-  }
-  update(t$7) {
-    const r$12 = this.render();
-    (this.hasUpdated || (this.renderOptions.isConnected = this.isConnected),
-      super.update(t$7),
-      (this._$Do = D(r$12, this.renderRoot, this.renderOptions)));
-  }
-  connectedCallback() {
-    (super.connectedCallback(), this._$Do?.setConnected(!0));
-  }
-  disconnectedCallback() {
-    (super.disconnectedCallback(), this._$Do?.setConnected(!1));
-  }
-  render() {
-    return E;
-  }
+	constructor() {
+		super(...arguments), this.renderOptions = { host: this }, this._$Do = void 0;
+	}
+	createRenderRoot() {
+		const t$7 = super.createRenderRoot();
+		return this.renderOptions.renderBefore ??= t$7.firstChild, t$7;
+	}
+	update(t$7) {
+		const r$12 = this.render();
+		this.hasUpdated || (this.renderOptions.isConnected = this.isConnected), super.update(t$7), this._$Do = D(r$12, this.renderRoot, this.renderOptions);
+	}
+	connectedCallback() {
+		super.connectedCallback(), this._$Do?.setConnected(!0);
+	}
+	disconnectedCallback() {
+		super.disconnectedCallback(), this._$Do?.setConnected(!1);
+	}
+	render() {
+		return E;
+	}
 };
-((i$6._$litElement$ = !0),
-  (i$6["finalized"] = !0),
-  s$6.litElementHydrateSupport?.({ LitElement: i$6 }));
+i$6._$litElement$ = !0, i$6["finalized"] = !0, s$6.litElementHydrateSupport?.({ LitElement: i$6 });
 const o$11 = s$6.litElementPolyfillSupport;
 o$11?.({ LitElement: i$6 });
 const n$9 = {
-  _$AK: (t$7, e$14, r$12) => {
-    t$7._$AK(e$14, r$12);
-  },
-  _$AL: (t$7) => t$7._$AL,
+	_$AK: (t$7, e$14, r$12) => {
+		t$7._$AK(e$14, r$12);
+	},
+	_$AL: (t$7) => t$7._$AL
 };
 (s$6.litElementVersions ??= []).push("4.2.2");
 
 /**
- * @license
- * Copyright 2022 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2022 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 const o$10 = !1;
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 const t$4 = {
-    ATTRIBUTE: 1,
-    CHILD: 2,
-    PROPERTY: 3,
-    BOOLEAN_ATTRIBUTE: 4,
-    EVENT: 5,
-    ELEMENT: 6,
-  },
-  e$10 =
-    (t$7) =>
-    (...e$14) => ({
-      _$litDirective$: t$7,
-      values: e$14,
-    });
+	ATTRIBUTE: 1,
+	CHILD: 2,
+	PROPERTY: 3,
+	BOOLEAN_ATTRIBUTE: 4,
+	EVENT: 5,
+	ELEMENT: 6
+}, e$10 = (t$7) => (...e$14) => ({
+	_$litDirective$: t$7,
+	values: e$14
+});
 var i$5 = class {
-  constructor(t$7) {}
-  get _$AU() {
-    return this._$AM._$AU;
-  }
-  _$AT(t$7, e$14, i$10) {
-    ((this._$Ct = t$7), (this._$AM = e$14), (this._$Ci = i$10));
-  }
-  _$AS(t$7, e$14) {
-    return this.update(t$7, e$14);
-  }
-  update(t$7, e$14) {
-    return this.render(...e$14);
-  }
+	constructor(t$7) {}
+	get _$AU() {
+		return this._$AM._$AU;
+	}
+	_$AT(t$7, e$14, i$10) {
+		this._$Ct = t$7, this._$AM = e$14, this._$Ci = i$10;
+	}
+	_$AS(t$7, e$14) {
+		return this.update(t$7, e$14);
+	}
+	update(t$7, e$14) {
+		return this.render(...e$14);
+	}
 };
 
 /**
- * @license
- * Copyright 2020 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ const { I: t$3 } = j$1,
-  i$4 = (o$15) => o$15,
-  n$8 = (o$15) => null === o$15 || ("object" != typeof o$15 && "function" != typeof o$15),
-  e$9 = {
-    HTML: 1,
-    SVG: 2,
-    MATHML: 3,
-  },
-  l$2 = (o$15, t$7) => (void 0 === t$7 ? void 0 !== o$15?._$litType$ : o$15?._$litType$ === t$7),
-  d = (o$15) => null != o$15?._$litType$?.h,
-  c$3 = (o$15) => void 0 !== o$15?._$litDirective$,
-  f$1 = (o$15) => o$15?._$litDirective$,
-  r$8 = (o$15) => void 0 === o$15.strings,
-  s$5 = () => document.createComment(""),
-  v = (o$15, n$13, e$14) => {
-    const l$5 = o$15._$AA.parentNode,
-      d = void 0 === n$13 ? o$15._$AB : n$13._$AA;
-    if (void 0 === e$14) {
-      const i$10 = l$5.insertBefore(s$5(), d),
-        n$14 = l$5.insertBefore(s$5(), d);
-      e$14 = new t$3(i$10, n$14, o$15, o$15.options);
-    } else {
-      const t$7 = e$14._$AB.nextSibling,
-        n$14 = e$14._$AM,
-        c$7 = n$14 !== o$15;
-      if (c$7) {
-        let t$8;
-        (e$14._$AQ?.(o$15),
-          (e$14._$AM = o$15),
-          void 0 !== e$14._$AP && (t$8 = o$15._$AU) !== n$14._$AU && e$14._$AP(t$8));
-      }
-      if (t$7 !== d || c$7) {
-        let o$16 = e$14._$AA;
-        for (; o$16 !== t$7; ) {
-          const t$8 = i$4(o$16).nextSibling;
-          (i$4(l$5).insertBefore(o$16, d), (o$16 = t$8));
-        }
-      }
-    }
-    return e$14;
-  },
-  u$1 = (o$15, t$7, i$10 = o$15) => (o$15._$AI(t$7, i$10), o$15),
-  m$1 = {},
-  p = (o$15, t$7 = m$1) => (o$15._$AH = t$7),
-  M = (o$15) => o$15._$AH,
-  h$4 = (o$15) => {
-    (o$15._$AR(), o$15._$AA.remove());
-  },
-  j = (o$15) => {
-    o$15._$AR();
-  };
+* @license
+* Copyright 2020 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ const { I: t$3 } = j$1, i$4 = (o$15) => o$15, n$8 = (o$15) => null === o$15 || "object" != typeof o$15 && "function" != typeof o$15, e$9 = {
+	HTML: 1,
+	SVG: 2,
+	MATHML: 3
+}, l$2 = (o$15, t$7) => void 0 === t$7 ? void 0 !== o$15?._$litType$ : o$15?._$litType$ === t$7, d = (o$15) => null != o$15?._$litType$?.h, c$3 = (o$15) => void 0 !== o$15?._$litDirective$, f$1 = (o$15) => o$15?._$litDirective$, r$8 = (o$15) => void 0 === o$15.strings, s$5 = () => document.createComment(""), v = (o$15, n$13, e$14) => {
+	const l$5 = o$15._$AA.parentNode, d = void 0 === n$13 ? o$15._$AB : n$13._$AA;
+	if (void 0 === e$14) {
+		const i$10 = l$5.insertBefore(s$5(), d), n$14 = l$5.insertBefore(s$5(), d);
+		e$14 = new t$3(i$10, n$14, o$15, o$15.options);
+	} else {
+		const t$7 = e$14._$AB.nextSibling, n$14 = e$14._$AM, c$7 = n$14 !== o$15;
+		if (c$7) {
+			let t$8;
+			e$14._$AQ?.(o$15), e$14._$AM = o$15, void 0 !== e$14._$AP && (t$8 = o$15._$AU) !== n$14._$AU && e$14._$AP(t$8);
+		}
+		if (t$7 !== d || c$7) {
+			let o$16 = e$14._$AA;
+			for (; o$16 !== t$7;) {
+				const t$8 = i$4(o$16).nextSibling;
+				i$4(l$5).insertBefore(o$16, d), o$16 = t$8;
+			}
+		}
+	}
+	return e$14;
+}, u$1 = (o$15, t$7, i$10 = o$15) => (o$15._$AI(t$7, i$10), o$15), m$1 = {}, p = (o$15, t$7 = m$1) => o$15._$AH = t$7, M = (o$15) => o$15._$AH, h$4 = (o$15) => {
+	o$15._$AR(), o$15._$AA.remove();
+}, j = (o$15) => {
+	o$15._$AR();
+};
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 const u = (e$14, s$9, t$7) => {
-    const r$12 = new Map();
-    for (let l$5 = s$9; l$5 <= t$7; l$5++) r$12.set(e$14[l$5], l$5);
-    return r$12;
-  },
-  c$2 = e$10(
-    class extends i$5 {
-      constructor(e$14) {
-        if ((super(e$14), e$14.type !== t$4.CHILD))
-          throw Error("repeat() can only be used in text expressions");
-      }
-      dt(e$14, s$9, t$7) {
-        let r$12;
-        void 0 === t$7 ? (t$7 = s$9) : void 0 !== s$9 && (r$12 = s$9);
-        const l$5 = [],
-          o$15 = [];
-        let i$10 = 0;
-        for (const s$10 of e$14)
-          ((l$5[i$10] = r$12 ? r$12(s$10, i$10) : i$10), (o$15[i$10] = t$7(s$10, i$10)), i$10++);
-        return {
-          values: o$15,
-          keys: l$5,
-        };
-      }
-      render(e$14, s$9, t$7) {
-        return this.dt(e$14, s$9, t$7).values;
-      }
-      update(s$9, [t$7, r$12, c$7]) {
-        const d$3 = M(s$9),
-          { values: p$3, keys: a$2 } = this.dt(t$7, r$12, c$7);
-        if (!Array.isArray(d$3)) return ((this.ut = a$2), p$3);
-        const h$7 = (this.ut ??= []),
-          v$2 = [];
-        let m$3,
-          y$2,
-          x$1 = 0,
-          j$2 = d$3.length - 1,
-          k$1 = 0,
-          w$1 = p$3.length - 1;
-        for (; x$1 <= j$2 && k$1 <= w$1; )
-          if (null === d$3[x$1]) x$1++;
-          else if (null === d$3[j$2]) j$2--;
-          else if (h$7[x$1] === a$2[k$1]) ((v$2[k$1] = u$1(d$3[x$1], p$3[k$1])), x$1++, k$1++);
-          else if (h$7[j$2] === a$2[w$1]) ((v$2[w$1] = u$1(d$3[j$2], p$3[w$1])), j$2--, w$1--);
-          else if (h$7[x$1] === a$2[w$1])
-            ((v$2[w$1] = u$1(d$3[x$1], p$3[w$1])), v(s$9, v$2[w$1 + 1], d$3[x$1]), x$1++, w$1--);
-          else if (h$7[j$2] === a$2[k$1])
-            ((v$2[k$1] = u$1(d$3[j$2], p$3[k$1])), v(s$9, d$3[x$1], d$3[j$2]), j$2--, k$1++);
-          else if (
-            (void 0 === m$3 && ((m$3 = u(a$2, k$1, w$1)), (y$2 = u(h$7, x$1, j$2))),
-            m$3.has(h$7[x$1]))
-          )
-            if (m$3.has(h$7[j$2])) {
-              const e$14 = y$2.get(a$2[k$1]),
-                t$8 = void 0 !== e$14 ? d$3[e$14] : null;
-              if (null === t$8) {
-                const e$15 = v(s$9, d$3[x$1]);
-                (u$1(e$15, p$3[k$1]), (v$2[k$1] = e$15));
-              } else ((v$2[k$1] = u$1(t$8, p$3[k$1])), v(s$9, d$3[x$1], t$8), (d$3[e$14] = null));
-              k$1++;
-            } else (h$4(d$3[j$2]), j$2--);
-          else (h$4(d$3[x$1]), x$1++);
-        for (; k$1 <= w$1; ) {
-          const e$14 = v(s$9, v$2[w$1 + 1]);
-          (u$1(e$14, p$3[k$1]), (v$2[k$1++] = e$14));
-        }
-        for (; x$1 <= j$2; ) {
-          const e$14 = d$3[x$1++];
-          null !== e$14 && h$4(e$14);
-        }
-        return ((this.ut = a$2), p(s$9, v$2), E);
-      }
-    },
-  );
+	const r$12 = new Map();
+	for (let l$5 = s$9; l$5 <= t$7; l$5++) r$12.set(e$14[l$5], l$5);
+	return r$12;
+}, c$2 = e$10(class extends i$5 {
+	constructor(e$14) {
+		if (super(e$14), e$14.type !== t$4.CHILD) throw Error("repeat() can only be used in text expressions");
+	}
+	dt(e$14, s$9, t$7) {
+		let r$12;
+		void 0 === t$7 ? t$7 = s$9 : void 0 !== s$9 && (r$12 = s$9);
+		const l$5 = [], o$15 = [];
+		let i$10 = 0;
+		for (const s$10 of e$14) l$5[i$10] = r$12 ? r$12(s$10, i$10) : i$10, o$15[i$10] = t$7(s$10, i$10), i$10++;
+		return {
+			values: o$15,
+			keys: l$5
+		};
+	}
+	render(e$14, s$9, t$7) {
+		return this.dt(e$14, s$9, t$7).values;
+	}
+	update(s$9, [t$7, r$12, c$7]) {
+		const d$3 = M(s$9), { values: p$3, keys: a$2 } = this.dt(t$7, r$12, c$7);
+		if (!Array.isArray(d$3)) return this.ut = a$2, p$3;
+		const h$7 = this.ut ??= [], v$2 = [];
+		let m$3, y$2, x$1 = 0, j$2 = d$3.length - 1, k$1 = 0, w$1 = p$3.length - 1;
+		for (; x$1 <= j$2 && k$1 <= w$1;) if (null === d$3[x$1]) x$1++;
+		else if (null === d$3[j$2]) j$2--;
+		else if (h$7[x$1] === a$2[k$1]) v$2[k$1] = u$1(d$3[x$1], p$3[k$1]), x$1++, k$1++;
+		else if (h$7[j$2] === a$2[w$1]) v$2[w$1] = u$1(d$3[j$2], p$3[w$1]), j$2--, w$1--;
+		else if (h$7[x$1] === a$2[w$1]) v$2[w$1] = u$1(d$3[x$1], p$3[w$1]), v(s$9, v$2[w$1 + 1], d$3[x$1]), x$1++, w$1--;
+		else if (h$7[j$2] === a$2[k$1]) v$2[k$1] = u$1(d$3[j$2], p$3[k$1]), v(s$9, d$3[x$1], d$3[j$2]), j$2--, k$1++;
+		else if (void 0 === m$3 && (m$3 = u(a$2, k$1, w$1), y$2 = u(h$7, x$1, j$2)), m$3.has(h$7[x$1])) if (m$3.has(h$7[j$2])) {
+			const e$14 = y$2.get(a$2[k$1]), t$8 = void 0 !== e$14 ? d$3[e$14] : null;
+			if (null === t$8) {
+				const e$15 = v(s$9, d$3[x$1]);
+				u$1(e$15, p$3[k$1]), v$2[k$1] = e$15;
+			} else v$2[k$1] = u$1(t$8, p$3[k$1]), v(s$9, d$3[x$1], t$8), d$3[e$14] = null;
+			k$1++;
+		} else h$4(d$3[j$2]), j$2--;
+		else h$4(d$3[x$1]), x$1++;
+		for (; k$1 <= w$1;) {
+			const e$14 = v(s$9, v$2[w$1 + 1]);
+			u$1(e$14, p$3[k$1]), v$2[k$1++] = e$14;
+		}
+		for (; x$1 <= j$2;) {
+			const e$14 = d$3[x$1++];
+			null !== e$14 && h$4(e$14);
+		}
+		return this.ut = a$2, p(s$9, v$2), E;
+	}
+});
 
 /**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2021 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 var s$4 = class extends Event {
-  constructor(s$9, t$7, e$14, o$15) {
-    (super("context-request", {
-      bubbles: !0,
-      composed: !0,
-    }),
-      (this.context = s$9),
-      (this.contextTarget = t$7),
-      (this.callback = e$14),
-      (this.subscribe = o$15 ?? !1));
-  }
+	constructor(s$9, t$7, e$14, o$15) {
+		super("context-request", {
+			bubbles: !0,
+			composed: !0
+		}), this.context = s$9, this.contextTarget = t$7, this.callback = e$14, this.subscribe = o$15 ?? !1;
+	}
 };
 
 /**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2021 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 function n$7(n$13) {
-  return n$13;
+	return n$13;
 }
 
 /**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ var s$3 = class {
-  constructor(t$7, s$9, i$10, h$7) {
-    if (
-      ((this.subscribe = !1),
-      (this.provided = !1),
-      (this.value = void 0),
-      (this.t = (t$8, s$10) => {
-        (this.unsubscribe &&
-          (this.unsubscribe !== s$10 && ((this.provided = !1), this.unsubscribe()),
-          this.subscribe || this.unsubscribe()),
-          (this.value = t$8),
-          this.host.requestUpdate(),
-          (this.provided && !this.subscribe) ||
-            ((this.provided = !0), this.callback && this.callback(t$8, s$10)),
-          (this.unsubscribe = s$10));
-      }),
-      (this.host = t$7),
-      void 0 !== s$9.context)
-    ) {
-      const t$8 = s$9;
-      ((this.context = t$8.context),
-        (this.callback = t$8.callback),
-        (this.subscribe = t$8.subscribe ?? !1));
-    } else ((this.context = s$9), (this.callback = i$10), (this.subscribe = h$7 ?? !1));
-    this.host.addController(this);
-  }
-  hostConnected() {
-    this.dispatchRequest();
-  }
-  hostDisconnected() {
-    this.unsubscribe && (this.unsubscribe(), (this.unsubscribe = void 0));
-  }
-  dispatchRequest() {
-    this.host.dispatchEvent(new s$4(this.context, this.host, this.t, this.subscribe));
-  }
+* @license
+* Copyright 2021 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ var s$3 = class {
+	constructor(t$7, s$9, i$10, h$7) {
+		if (this.subscribe = !1, this.provided = !1, this.value = void 0, this.t = (t$8, s$10) => {
+			this.unsubscribe && (this.unsubscribe !== s$10 && (this.provided = !1, this.unsubscribe()), this.subscribe || this.unsubscribe()), this.value = t$8, this.host.requestUpdate(), this.provided && !this.subscribe || (this.provided = !0, this.callback && this.callback(t$8, s$10)), this.unsubscribe = s$10;
+		}, this.host = t$7, void 0 !== s$9.context) {
+			const t$8 = s$9;
+			this.context = t$8.context, this.callback = t$8.callback, this.subscribe = t$8.subscribe ?? !1;
+		} else this.context = s$9, this.callback = i$10, this.subscribe = h$7 ?? !1;
+		this.host.addController(this);
+	}
+	hostConnected() {
+		this.dispatchRequest();
+	}
+	hostDisconnected() {
+		this.unsubscribe && (this.unsubscribe(), this.unsubscribe = void 0);
+	}
+	dispatchRequest() {
+		this.host.dispatchEvent(new s$4(this.context, this.host, this.t, this.subscribe));
+	}
 };
 
 /**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2021 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 var s$2 = class {
-  get value() {
-    return this.o;
-  }
-  set value(s$9) {
-    this.setValue(s$9);
-  }
-  setValue(s$9, t$7 = !1) {
-    const i$10 = t$7 || !Object.is(s$9, this.o);
-    ((this.o = s$9), i$10 && this.updateObservers());
-  }
-  constructor(s$9) {
-    ((this.subscriptions = new Map()),
-      (this.updateObservers = () => {
-        for (const [s$10, { disposer: t$7 }] of this.subscriptions) s$10(this.o, t$7);
-      }),
-      void 0 !== s$9 && (this.value = s$9));
-  }
-  addCallback(s$9, t$7, i$10) {
-    if (!i$10) return void s$9(this.value);
-    this.subscriptions.has(s$9) ||
-      this.subscriptions.set(s$9, {
-        disposer: () => {
-          this.subscriptions.delete(s$9);
-        },
-        consumerHost: t$7,
-      });
-    const { disposer: h$7 } = this.subscriptions.get(s$9);
-    s$9(this.value, h$7);
-  }
-  clearCallbacks() {
-    this.subscriptions.clear();
-  }
+	get value() {
+		return this.o;
+	}
+	set value(s$9) {
+		this.setValue(s$9);
+	}
+	setValue(s$9, t$7 = !1) {
+		const i$10 = t$7 || !Object.is(s$9, this.o);
+		this.o = s$9, i$10 && this.updateObservers();
+	}
+	constructor(s$9) {
+		this.subscriptions = new Map(), this.updateObservers = () => {
+			for (const [s$10, { disposer: t$7 }] of this.subscriptions) s$10(this.o, t$7);
+		}, void 0 !== s$9 && (this.value = s$9);
+	}
+	addCallback(s$9, t$7, i$10) {
+		if (!i$10) return void s$9(this.value);
+		this.subscriptions.has(s$9) || this.subscriptions.set(s$9, {
+			disposer: () => {
+				this.subscriptions.delete(s$9);
+			},
+			consumerHost: t$7
+		});
+		const { disposer: h$7 } = this.subscriptions.get(s$9);
+		s$9(this.value, h$7);
+	}
+	clearCallbacks() {
+		this.subscriptions.clear();
+	}
 };
 
 /**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ var e$8 = class extends Event {
-  constructor(t$7, s$9) {
-    (super("context-provider", {
-      bubbles: !0,
-      composed: !0,
-    }),
-      (this.context = t$7),
-      (this.contextTarget = s$9));
-  }
+* @license
+* Copyright 2021 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ var e$8 = class extends Event {
+	constructor(t$7, s$9) {
+		super("context-provider", {
+			bubbles: !0,
+			composed: !0
+		}), this.context = t$7, this.contextTarget = s$9;
+	}
 };
 var i$3 = class extends s$2 {
-  constructor(s$9, e$14, i$10) {
-    (super(void 0 !== e$14.context ? e$14.initialValue : i$10),
-      (this.onContextRequest = (t$7) => {
-        if (t$7.context !== this.context) return;
-        const s$10 = t$7.contextTarget ?? t$7.composedPath()[0];
-        s$10 !== this.host &&
-          (t$7.stopPropagation(), this.addCallback(t$7.callback, s$10, t$7.subscribe));
-      }),
-      (this.onProviderRequest = (s$10) => {
-        if (s$10.context !== this.context) return;
-        if ((s$10.contextTarget ?? s$10.composedPath()[0]) === this.host) return;
-        const e$15 = new Set();
-        for (const [s$11, { consumerHost: i$11 }] of this.subscriptions)
-          e$15.has(s$11) ||
-            (e$15.add(s$11), i$11.dispatchEvent(new s$4(this.context, i$11, s$11, !0)));
-        s$10.stopPropagation();
-      }),
-      (this.host = s$9),
-      void 0 !== e$14.context ? (this.context = e$14.context) : (this.context = e$14),
-      this.attachListeners(),
-      this.host.addController?.(this));
-  }
-  attachListeners() {
-    (this.host.addEventListener("context-request", this.onContextRequest),
-      this.host.addEventListener("context-provider", this.onProviderRequest));
-  }
-  hostConnected() {
-    this.host.dispatchEvent(new e$8(this.context, this.host));
-  }
+	constructor(s$9, e$14, i$10) {
+		super(void 0 !== e$14.context ? e$14.initialValue : i$10), this.onContextRequest = (t$7) => {
+			if (t$7.context !== this.context) return;
+			const s$10 = t$7.contextTarget ?? t$7.composedPath()[0];
+			s$10 !== this.host && (t$7.stopPropagation(), this.addCallback(t$7.callback, s$10, t$7.subscribe));
+		}, this.onProviderRequest = (s$10) => {
+			if (s$10.context !== this.context) return;
+			if ((s$10.contextTarget ?? s$10.composedPath()[0]) === this.host) return;
+			const e$15 = new Set();
+			for (const [s$11, { consumerHost: i$11 }] of this.subscriptions) e$15.has(s$11) || (e$15.add(s$11), i$11.dispatchEvent(new s$4(this.context, i$11, s$11, !0)));
+			s$10.stopPropagation();
+		}, this.host = s$9, void 0 !== e$14.context ? this.context = e$14.context : this.context = e$14, this.attachListeners(), this.host.addController?.(this);
+	}
+	attachListeners() {
+		this.host.addEventListener("context-request", this.onContextRequest), this.host.addEventListener("context-provider", this.onProviderRequest);
+	}
+	hostConnected() {
+		this.host.dispatchEvent(new e$8(this.context, this.host));
+	}
 };
 
 /**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ var t$2 = class {
-  constructor() {
-    ((this.pendingContextRequests = new Map()),
-      (this.onContextProvider = (t$7) => {
-        const s$9 = this.pendingContextRequests.get(t$7.context);
-        if (void 0 === s$9) return;
-        this.pendingContextRequests.delete(t$7.context);
-        const { requests: o$15 } = s$9;
-        for (const { elementRef: s$10, callbackRef: n$13 } of o$15) {
-          const o$16 = s$10.deref(),
-            c$7 = n$13.deref();
-          void 0 === o$16 ||
-            void 0 === c$7 ||
-            o$16.dispatchEvent(new s$4(t$7.context, o$16, c$7, !0));
-        }
-      }),
-      (this.onContextRequest = (e$14) => {
-        if (!0 !== e$14.subscribe) return;
-        const t$7 = e$14.contextTarget ?? e$14.composedPath()[0],
-          s$9 = e$14.callback;
-        let o$15 = this.pendingContextRequests.get(e$14.context);
-        void 0 === o$15 &&
-          this.pendingContextRequests.set(
-            e$14.context,
-            (o$15 = {
-              callbacks: new WeakMap(),
-              requests: [],
-            }),
-          );
-        let n$13 = o$15.callbacks.get(t$7);
-        (void 0 === n$13 && o$15.callbacks.set(t$7, (n$13 = new WeakSet())),
-          n$13.has(s$9) ||
-            (n$13.add(s$9),
-            o$15.requests.push({
-              elementRef: new WeakRef(t$7),
-              callbackRef: new WeakRef(s$9),
-            })));
-      }));
-  }
-  attach(e$14) {
-    (e$14.addEventListener("context-request", this.onContextRequest),
-      e$14.addEventListener("context-provider", this.onContextProvider));
-  }
-  detach(e$14) {
-    (e$14.removeEventListener("context-request", this.onContextRequest),
-      e$14.removeEventListener("context-provider", this.onContextProvider));
-  }
+* @license
+* Copyright 2021 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ var t$2 = class {
+	constructor() {
+		this.pendingContextRequests = new Map(), this.onContextProvider = (t$7) => {
+			const s$9 = this.pendingContextRequests.get(t$7.context);
+			if (void 0 === s$9) return;
+			this.pendingContextRequests.delete(t$7.context);
+			const { requests: o$15 } = s$9;
+			for (const { elementRef: s$10, callbackRef: n$13 } of o$15) {
+				const o$16 = s$10.deref(), c$7 = n$13.deref();
+				void 0 === o$16 || void 0 === c$7 || o$16.dispatchEvent(new s$4(t$7.context, o$16, c$7, !0));
+			}
+		}, this.onContextRequest = (e$14) => {
+			if (!0 !== e$14.subscribe) return;
+			const t$7 = e$14.contextTarget ?? e$14.composedPath()[0], s$9 = e$14.callback;
+			let o$15 = this.pendingContextRequests.get(e$14.context);
+			void 0 === o$15 && this.pendingContextRequests.set(e$14.context, o$15 = {
+				callbacks: new WeakMap(),
+				requests: []
+			});
+			let n$13 = o$15.callbacks.get(t$7);
+			void 0 === n$13 && o$15.callbacks.set(t$7, n$13 = new WeakSet()), n$13.has(s$9) || (n$13.add(s$9), o$15.requests.push({
+				elementRef: new WeakRef(t$7),
+				callbackRef: new WeakRef(s$9)
+			}));
+		};
+	}
+	attach(e$14) {
+		e$14.addEventListener("context-request", this.onContextRequest), e$14.addEventListener("context-provider", this.onContextProvider);
+	}
+	detach(e$14) {
+		e$14.removeEventListener("context-request", this.onContextRequest), e$14.removeEventListener("context-provider", this.onContextProvider);
+	}
 };
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ function e$7({ context: e$14 }) {
-  return (n$13, i$10) => {
-    const r$12 = new WeakMap();
-    if ("object" == typeof i$10)
-      return {
-        get() {
-          return n$13.get.call(this);
-        },
-        set(t$7) {
-          return (r$12.get(this).setValue(t$7), n$13.set.call(this, t$7));
-        },
-        init(n$14) {
-          return (
-            r$12.set(
-              this,
-              new i$3(this, {
-                context: e$14,
-                initialValue: n$14,
-              }),
-            ),
-            n$14
-          );
-        },
-      };
-    {
-      n$13.constructor.addInitializer((n$14) => {
-        r$12.set(n$14, new i$3(n$14, { context: e$14 }));
-      });
-      const o$15 = Object.getOwnPropertyDescriptor(n$13, i$10);
-      let s$9;
-      if (void 0 === o$15) {
-        const t$7 = new WeakMap();
-        s$9 = {
-          get() {
-            return t$7.get(this);
-          },
-          set(e$15) {
-            (r$12.get(this).setValue(e$15), t$7.set(this, e$15));
-          },
-          configurable: !0,
-          enumerable: !0,
-        };
-      } else {
-        const t$7 = o$15.set;
-        s$9 = {
-          ...o$15,
-          set(e$15) {
-            (r$12.get(this).setValue(e$15), t$7?.call(this, e$15));
-          },
-        };
-      }
-      return void Object.defineProperty(n$13, i$10, s$9);
-    }
-  };
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ function e$7({ context: e$14 }) {
+	return (n$13, i$10) => {
+		const r$12 = new WeakMap();
+		if ("object" == typeof i$10) return {
+			get() {
+				return n$13.get.call(this);
+			},
+			set(t$7) {
+				return r$12.get(this).setValue(t$7), n$13.set.call(this, t$7);
+			},
+			init(n$14) {
+				return r$12.set(this, new i$3(this, {
+					context: e$14,
+					initialValue: n$14
+				})), n$14;
+			}
+		};
+		{
+			n$13.constructor.addInitializer(((n$14) => {
+				r$12.set(n$14, new i$3(n$14, { context: e$14 }));
+			}));
+			const o$15 = Object.getOwnPropertyDescriptor(n$13, i$10);
+			let s$9;
+			if (void 0 === o$15) {
+				const t$7 = new WeakMap();
+				s$9 = {
+					get() {
+						return t$7.get(this);
+					},
+					set(e$15) {
+						r$12.get(this).setValue(e$15), t$7.set(this, e$15);
+					},
+					configurable: !0,
+					enumerable: !0
+				};
+			} else {
+				const t$7 = o$15.set;
+				s$9 = {
+					...o$15,
+					set(e$15) {
+						r$12.get(this).setValue(e$15), t$7?.call(this, e$15);
+					}
+				};
+			}
+			return void Object.defineProperty(n$13, i$10, s$9);
+		}
+	};
 }
 
 /**
- * @license
- * Copyright 2022 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ function c$1({ context: c$7, subscribe: e$14 }) {
-  return (o$15, n$13) => {
-    "object" == typeof n$13
-      ? n$13.addInitializer(function () {
-          new s$3(this, {
-            context: c$7,
-            callback: (t$7) => {
-              o$15.set.call(this, t$7);
-            },
-            subscribe: e$14,
-          });
-        })
-      : o$15.constructor.addInitializer((o$16) => {
-          new s$3(o$16, {
-            context: c$7,
-            callback: (t$7) => {
-              o$16[n$13] = t$7;
-            },
-            subscribe: e$14,
-          });
-        });
-  };
+* @license
+* Copyright 2022 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ function c$1({ context: c$7, subscribe: e$14 }) {
+	return (o$15, n$13) => {
+		"object" == typeof n$13 ? n$13.addInitializer((function() {
+			new s$3(this, {
+				context: c$7,
+				callback: (t$7) => {
+					o$15.set.call(this, t$7);
+				},
+				subscribe: e$14
+			});
+		})) : o$15.constructor.addInitializer(((o$16) => {
+			new s$3(o$16, {
+				context: c$7,
+				callback: (t$7) => {
+					o$16[n$13] = t$7;
+				},
+				subscribe: e$14
+			});
+		}));
+	};
 }
 
 const eventInit = {
-  bubbles: true,
-  cancelable: true,
-  composed: true,
+	bubbles: true,
+	cancelable: true,
+	composed: true
 };
 var StateEvent = class StateEvent extends CustomEvent {
-  static {
-    this.eventName = "a2uiaction";
-  }
-  constructor(payload) {
-    super(StateEvent.eventName, {
-      detail: payload,
-      ...eventInit,
-    });
-    this.payload = payload;
-  }
+	static {
+		this.eventName = "a2uiaction";
+	}
+	constructor(payload) {
+		super(StateEvent.eventName, {
+			detail: payload,
+			...eventInit
+		});
+		this.payload = payload;
+	}
 };
 
 const opacityBehavior = `
@@ -1405,15 +987,12 @@ const opacityBehavior = `
     }
   }`;
 const behavior = `
-  ${new Array(21)
-    .fill(0)
-    .map((_$1, idx) => {
-      return `.behavior-ho-${idx * 5} {
+  ${new Array(21).fill(0).map((_$1, idx) => {
+	return `.behavior-ho-${idx * 5} {
           --opacity: ${idx / 20};
           ${opacityBehavior}
         }`;
-    })
-    .join("\n")}
+}).join("\n")}
 
   .behavior-o-s {
     overflow: scroll;
@@ -1435,10 +1014,8 @@ const behavior = `
 const grid = 4;
 
 const border = `
-  ${new Array(25)
-    .fill(0)
-    .map((_$1, idx) => {
-      return `
+  ${new Array(25).fill(0).map((_$1, idx) => {
+	return `
         .border-bw-${idx} { border-width: ${idx}px; }
         .border-btw-${idx} { border-top-width: ${idx}px; }
         .border-bbw-${idx} { border-bottom-width: ${idx}px; }
@@ -1447,8 +1024,7 @@ const border = `
 
         .border-ow-${idx} { outline-width: ${idx}px; }
         .border-br-${idx} { border-radius: ${idx * grid}px; overflow: hidden;}`;
-    })
-    .join("\n")}
+}).join("\n")}
 
   .border-br-50pc {
     border-radius: 50%;
@@ -1459,117 +1035,125 @@ const border = `
   }
 `;
 
-const shades = [0, 5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 70, 80, 90, 95, 98, 99, 100];
+const shades = [
+	0,
+	5,
+	10,
+	15,
+	20,
+	25,
+	30,
+	35,
+	40,
+	50,
+	60,
+	70,
+	80,
+	90,
+	95,
+	98,
+	99,
+	100
+];
 
 function merge(...classes) {
-  const styles = {};
-  for (const clazz of classes) {
-    for (const [key, val] of Object.entries(clazz)) {
-      const prefix = key.split("-").with(-1, "").join("-");
-      const existingKeys = Object.keys(styles).filter((key$1) => key$1.startsWith(prefix));
-      for (const existingKey of existingKeys) {
-        delete styles[existingKey];
-      }
-      styles[key] = val;
-    }
-  }
-  return styles;
+	const styles = {};
+	for (const clazz of classes) {
+		for (const [key, val] of Object.entries(clazz)) {
+			const prefix = key.split("-").with(-1, "").join("-");
+			const existingKeys = Object.keys(styles).filter((key$1) => key$1.startsWith(prefix));
+			for (const existingKey of existingKeys) {
+				delete styles[existingKey];
+			}
+			styles[key] = val;
+		}
+	}
+	return styles;
 }
 function appendToAll(target, exclusions, ...classes) {
-  const updatedTarget = structuredClone(target);
-  for (const clazz of classes) {
-    for (const key of Object.keys(clazz)) {
-      const prefix = key.split("-").with(-1, "").join("-");
-      for (const [tagName, classesToAdd] of Object.entries(updatedTarget)) {
-        if (exclusions.includes(tagName)) {
-          continue;
-        }
-        let found = false;
-        for (let t$7 = 0; t$7 < classesToAdd.length; t$7++) {
-          if (classesToAdd[t$7].startsWith(prefix)) {
-            found = true;
-            classesToAdd[t$7] = key;
-          }
-        }
-        if (!found) {
-          classesToAdd.push(key);
-        }
-      }
-    }
-  }
-  return updatedTarget;
+	const updatedTarget = structuredClone(target);
+	for (const clazz of classes) {
+		for (const key of Object.keys(clazz)) {
+			const prefix = key.split("-").with(-1, "").join("-");
+			for (const [tagName, classesToAdd] of Object.entries(updatedTarget)) {
+				if (exclusions.includes(tagName)) {
+					continue;
+				}
+				let found = false;
+				for (let t$7 = 0; t$7 < classesToAdd.length; t$7++) {
+					if (classesToAdd[t$7].startsWith(prefix)) {
+						found = true;
+						classesToAdd[t$7] = key;
+					}
+				}
+				if (!found) {
+					classesToAdd.push(key);
+				}
+			}
+		}
+	}
+	return updatedTarget;
 }
 function createThemeStyles(palettes) {
-  const styles = {};
-  for (const palette of Object.values(palettes)) {
-    for (const [key, val] of Object.entries(palette)) {
-      const prop = toProp(key);
-      styles[prop] = val;
-    }
-  }
-  return styles;
+	const styles = {};
+	for (const palette of Object.values(palettes)) {
+		for (const [key, val] of Object.entries(palette)) {
+			const prop = toProp(key);
+			styles[prop] = val;
+		}
+	}
+	return styles;
 }
 function toProp(key) {
-  if (key.startsWith("nv")) {
-    return `--nv-${key.slice(2)}`;
-  }
-  return `--${key[0]}-${key.slice(1)}`;
+	if (key.startsWith("nv")) {
+		return `--nv-${key.slice(2)}`;
+	}
+	return `--${key[0]}-${key.slice(1)}`;
 }
 
 const color = (src) => `
-    ${src
-      .map((key) => {
-        const inverseKey = getInverseKey(key);
-        return `.color-bc-${key} { border-color: light-dark(var(${toProp(key)}), var(${toProp(inverseKey)})); }`;
-      })
-      .join("\n")}
+    ${src.map((key) => {
+	const inverseKey = getInverseKey(key);
+	return `.color-bc-${key} { border-color: light-dark(var(${toProp(key)}), var(${toProp(inverseKey)})); }`;
+}).join("\n")}
 
-    ${src
-      .map((key) => {
-        const inverseKey = getInverseKey(key);
-        const vals = [
-          `.color-bgc-${key} { background-color: light-dark(var(${toProp(key)}), var(${toProp(inverseKey)})); }`,
-          `.color-bbgc-${key}::backdrop { background-color: light-dark(var(${toProp(key)}), var(${toProp(inverseKey)})); }`,
-        ];
-        for (let o$15 = 0.1; o$15 < 1; o$15 += 0.1) {
-          vals.push(`.color-bbgc-${key}_${(o$15 * 100).toFixed(0)}::backdrop {
+    ${src.map((key) => {
+	const inverseKey = getInverseKey(key);
+	const vals = [`.color-bgc-${key} { background-color: light-dark(var(${toProp(key)}), var(${toProp(inverseKey)})); }`, `.color-bbgc-${key}::backdrop { background-color: light-dark(var(${toProp(key)}), var(${toProp(inverseKey)})); }`];
+	for (let o$15 = .1; o$15 < 1; o$15 += .1) {
+		vals.push(`.color-bbgc-${key}_${(o$15 * 100).toFixed(0)}::backdrop {
             background-color: light-dark(oklch(from var(${toProp(key)}) l c h / calc(alpha * ${o$15.toFixed(1)})), oklch(from var(${toProp(inverseKey)}) l c h / calc(alpha * ${o$15.toFixed(1)})) );
           }
         `);
-        }
-        return vals.join("\n");
-      })
-      .join("\n")}
+	}
+	return vals.join("\n");
+}).join("\n")}
 
-  ${src
-    .map((key) => {
-      const inverseKey = getInverseKey(key);
-      return `.color-c-${key} { color: light-dark(var(${toProp(key)}), var(${toProp(inverseKey)})); }`;
-    })
-    .join("\n")}
+  ${src.map((key) => {
+	const inverseKey = getInverseKey(key);
+	return `.color-c-${key} { color: light-dark(var(${toProp(key)}), var(${toProp(inverseKey)})); }`;
+}).join("\n")}
   `;
 const getInverseKey = (key) => {
-  const match = key.match(/^([a-z]+)(\d+)$/);
-  if (!match) return key;
-  const [, prefix, shadeStr] = match;
-  const shade = parseInt(shadeStr, 10);
-  const target = 100 - shade;
-  const inverseShade = shades.reduce((prev, curr) =>
-    Math.abs(curr - target) < Math.abs(prev - target) ? curr : prev,
-  );
-  return `${prefix}${inverseShade}`;
+	const match = key.match(/^([a-z]+)(\d+)$/);
+	if (!match) return key;
+	const [, prefix, shadeStr] = match;
+	const shade = parseInt(shadeStr, 10);
+	const target = 100 - shade;
+	const inverseShade = shades.reduce((prev, curr) => Math.abs(curr - target) < Math.abs(prev - target) ? curr : prev);
+	return `${prefix}${inverseShade}`;
 };
 const keyFactory = (prefix) => {
-  return shades.map((v$2) => `${prefix}${v$2}`);
+	return shades.map((v$2) => `${prefix}${v$2}`);
 };
 const colors = [
-  color(keyFactory("p")),
-  color(keyFactory("s")),
-  color(keyFactory("t")),
-  color(keyFactory("n")),
-  color(keyFactory("nv")),
-  color(keyFactory("e")),
-  `
+	color(keyFactory("p")),
+	color(keyFactory("s")),
+	color(keyFactory("t")),
+	color(keyFactory("n")),
+	color(keyFactory("nv")),
+	color(keyFactory("e")),
+	`
     .color-bgc-transparent {
       background-color: transparent;
     }
@@ -1577,18 +1161,18 @@ const colors = [
     :host {
       color-scheme: var(--color-scheme);
     }
-  `,
+  `
 ];
 
 /**
- * CSS classes for Google Symbols.
- *
- * Usage:
- *
- * ```html
- * <span class="g-icon">pen_spark</span>
- * ```
- */
+* CSS classes for Google Symbols.
+*
+* Usage:
+*
+* ```html
+* <span class="g-icon">pen_spark</span>
+* ```
+*/
 const icons = `
   .g-icon {
     font-family: "Material Symbols Outlined", "Google Symbols";
@@ -1627,20 +1211,15 @@ const icons = `
 
 const layout = `
   :host {
-    ${new Array(16)
-      .fill(0)
-      .map((_$1, idx) => {
-        return `--g-${idx + 1}: ${(idx + 1) * grid}px;`;
-      })
-      .join("\n")}
+    ${new Array(16).fill(0).map((_$1, idx) => {
+	return `--g-${idx + 1}: ${(idx + 1) * grid}px;`;
+}).join("\n")}
   }
 
-  ${new Array(49)
-    .fill(0)
-    .map((_$1, index) => {
-      const idx = index - 24;
-      const lbl = idx < 0 ? `n${Math.abs(idx)}` : idx.toString();
-      return `
+  ${new Array(49).fill(0).map((_$1, index) => {
+	const idx = index - 24;
+	const lbl = idx < 0 ? `n${Math.abs(idx)}` : idx.toString();
+	return `
         .layout-p-${lbl} { --padding: ${idx * grid}px; padding: var(--padding); }
         .layout-pt-${lbl} { padding-top: ${idx * grid}px; }
         .layout-pr-${lbl} { padding-right: ${idx * grid}px; }
@@ -1657,24 +1236,17 @@ const layout = `
         .layout-r-${lbl} { right: ${idx * grid}px; }
         .layout-b-${lbl} { bottom: ${idx * grid}px; }
         .layout-l-${lbl} { left: ${idx * grid}px; }`;
-    })
-    .join("\n")}
+}).join("\n")}
 
-  ${new Array(25)
-    .fill(0)
-    .map((_$1, idx) => {
-      return `
+  ${new Array(25).fill(0).map((_$1, idx) => {
+	return `
         .layout-g-${idx} { gap: ${idx * grid}px; }`;
-    })
-    .join("\n")}
+}).join("\n")}
 
-  ${new Array(8)
-    .fill(0)
-    .map((_$1, idx) => {
-      return `
+  ${new Array(8).fill(0).map((_$1, idx) => {
+	return `
         .layout-grd-col${idx + 1} { grid-template-columns: ${"1fr ".repeat(idx + 1).trim()}; }`;
-    })
-    .join("\n")}
+}).join("\n")}
 
   .layout-pos-a {
     position: absolute;
@@ -1784,39 +1356,27 @@ const layout = `
 
   /** Widths **/
 
-  ${new Array(10)
-    .fill(0)
-    .map((_$1, idx) => {
-      const weight = (idx + 1) * 10;
-      return `.layout-w-${weight} { width: ${weight}%; max-width: ${weight}%; }`;
-    })
-    .join("\n")}
+  ${new Array(10).fill(0).map((_$1, idx) => {
+	const weight = (idx + 1) * 10;
+	return `.layout-w-${weight} { width: ${weight}%; max-width: ${weight}%; }`;
+}).join("\n")}
 
-  ${new Array(16)
-    .fill(0)
-    .map((_$1, idx) => {
-      const weight = idx * grid;
-      return `.layout-wp-${idx} { width: ${weight}px; }`;
-    })
-    .join("\n")}
+  ${new Array(16).fill(0).map((_$1, idx) => {
+	const weight = idx * grid;
+	return `.layout-wp-${idx} { width: ${weight}px; }`;
+}).join("\n")}
 
   /** Heights **/
 
-  ${new Array(10)
-    .fill(0)
-    .map((_$1, idx) => {
-      const height = (idx + 1) * 10;
-      return `.layout-h-${height} { height: ${height}%; }`;
-    })
-    .join("\n")}
+  ${new Array(10).fill(0).map((_$1, idx) => {
+	const height = (idx + 1) * 10;
+	return `.layout-h-${height} { height: ${height}%; }`;
+}).join("\n")}
 
-  ${new Array(16)
-    .fill(0)
-    .map((_$1, idx) => {
-      const height = idx * grid;
-      return `.layout-hp-${idx} { height: ${height}px; }`;
-    })
-    .join("\n")}
+  ${new Array(16).fill(0).map((_$1, idx) => {
+	const height = idx * grid;
+	return `.layout-hp-${idx} { height: ${height}px; }`;
+}).join("\n")}
 
   .layout-el-cv {
     & img,
@@ -1840,12 +1400,9 @@ const layout = `
 `;
 
 const opacity = `
-  ${new Array(21)
-    .fill(0)
-    .map((_$1, idx) => {
-      return `.opacity-el-${idx * 5} { opacity: ${idx / 20}; }`;
-    })
-    .join("\n")}
+  ${new Array(21).fill(0).map((_$1, idx) => {
+	return `.opacity-el-${idx * 5} { opacity: ${idx / 20}; }`;
+}).join("\n")}
 `;
 
 const type$1 = `
@@ -1980,3056 +1537,2749 @@ const type$1 = `
 
   /** Weights **/
 
-  ${new Array(9)
-    .fill(0)
-    .map((_$1, idx) => {
-      const weight = (idx + 1) * 100;
-      return `.typography-w-${weight} { font-weight: ${weight}; }`;
-    })
-    .join("\n")}
+  ${new Array(9).fill(0).map((_$1, idx) => {
+	const weight = (idx + 1) * 100;
+	return `.typography-w-${weight} { font-weight: ${weight}; }`;
+}).join("\n")}
 `;
 
-const structuralStyles$1 = [behavior, border, colors, icons, layout, opacity, type$1]
-  .flat(Infinity)
-  .join("\n");
+const structuralStyles$1 = [
+	behavior,
+	border,
+	colors,
+	icons,
+	layout,
+	opacity,
+	type$1
+].flat(Infinity).join("\n");
 
 var guards_exports = /* @__PURE__ */ __exportAll({
-  isComponentArrayReference: () => isComponentArrayReference,
-  isObject: () => isObject$1,
-  isPath: () => isPath,
-  isResolvedAudioPlayer: () => isResolvedAudioPlayer,
-  isResolvedButton: () => isResolvedButton,
-  isResolvedCard: () => isResolvedCard,
-  isResolvedCheckbox: () => isResolvedCheckbox,
-  isResolvedColumn: () => isResolvedColumn,
-  isResolvedDateTimeInput: () => isResolvedDateTimeInput,
-  isResolvedDivider: () => isResolvedDivider,
-  isResolvedIcon: () => isResolvedIcon,
-  isResolvedImage: () => isResolvedImage,
-  isResolvedList: () => isResolvedList,
-  isResolvedModal: () => isResolvedModal,
-  isResolvedMultipleChoice: () => isResolvedMultipleChoice,
-  isResolvedRow: () => isResolvedRow,
-  isResolvedSlider: () => isResolvedSlider,
-  isResolvedTabs: () => isResolvedTabs,
-  isResolvedText: () => isResolvedText,
-  isResolvedTextField: () => isResolvedTextField,
-  isResolvedVideo: () => isResolvedVideo,
-  isValueMap: () => isValueMap,
+	isComponentArrayReference: () => isComponentArrayReference,
+	isObject: () => isObject$1,
+	isPath: () => isPath,
+	isResolvedAudioPlayer: () => isResolvedAudioPlayer,
+	isResolvedButton: () => isResolvedButton,
+	isResolvedCard: () => isResolvedCard,
+	isResolvedCheckbox: () => isResolvedCheckbox,
+	isResolvedColumn: () => isResolvedColumn,
+	isResolvedDateTimeInput: () => isResolvedDateTimeInput,
+	isResolvedDivider: () => isResolvedDivider,
+	isResolvedIcon: () => isResolvedIcon,
+	isResolvedImage: () => isResolvedImage,
+	isResolvedList: () => isResolvedList,
+	isResolvedModal: () => isResolvedModal,
+	isResolvedMultipleChoice: () => isResolvedMultipleChoice,
+	isResolvedRow: () => isResolvedRow,
+	isResolvedSlider: () => isResolvedSlider,
+	isResolvedTabs: () => isResolvedTabs,
+	isResolvedText: () => isResolvedText,
+	isResolvedTextField: () => isResolvedTextField,
+	isResolvedVideo: () => isResolvedVideo,
+	isValueMap: () => isValueMap
 });
 function isValueMap(value) {
-  return isObject$1(value) && "key" in value;
+	return isObject$1(value) && "key" in value;
 }
 function isPath(key, value) {
-  return key === "path" && typeof value === "string";
+	return key === "path" && typeof value === "string";
 }
 function isObject$1(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isComponentArrayReference(value) {
-  if (!isObject$1(value)) return false;
-  return "explicitList" in value || "template" in value;
+	if (!isObject$1(value)) return false;
+	return "explicitList" in value || "template" in value;
 }
 function isStringValue(value) {
-  return (
-    isObject$1(value) &&
-    ("path" in value ||
-      ("literal" in value && typeof value.literal === "string") ||
-      "literalString" in value)
-  );
+	return isObject$1(value) && ("path" in value || "literal" in value && typeof value.literal === "string" || "literalString" in value);
 }
 function isNumberValue(value) {
-  return (
-    isObject$1(value) &&
-    ("path" in value ||
-      ("literal" in value && typeof value.literal === "number") ||
-      "literalNumber" in value)
-  );
+	return isObject$1(value) && ("path" in value || "literal" in value && typeof value.literal === "number" || "literalNumber" in value);
 }
 function isBooleanValue(value) {
-  return (
-    isObject$1(value) &&
-    ("path" in value ||
-      ("literal" in value && typeof value.literal === "boolean") ||
-      "literalBoolean" in value)
-  );
+	return isObject$1(value) && ("path" in value || "literal" in value && typeof value.literal === "boolean" || "literalBoolean" in value);
 }
 function isAnyComponentNode(value) {
-  if (!isObject$1(value)) return false;
-  const hasBaseKeys = "id" in value && "type" in value && "properties" in value;
-  if (!hasBaseKeys) return false;
-  return true;
+	if (!isObject$1(value)) return false;
+	const hasBaseKeys = "id" in value && "type" in value && "properties" in value;
+	if (!hasBaseKeys) return false;
+	return true;
 }
 function isResolvedAudioPlayer(props) {
-  return isObject$1(props) && "url" in props && isStringValue(props.url);
+	return isObject$1(props) && "url" in props && isStringValue(props.url);
 }
 function isResolvedButton(props) {
-  return (
-    isObject$1(props) && "child" in props && isAnyComponentNode(props.child) && "action" in props
-  );
+	return isObject$1(props) && "child" in props && isAnyComponentNode(props.child) && "action" in props;
 }
 function isResolvedCard(props) {
-  if (!isObject$1(props)) return false;
-  if (!("child" in props)) {
-    if (!("children" in props)) {
-      return false;
-    } else {
-      return Array.isArray(props.children) && props.children.every(isAnyComponentNode);
-    }
-  }
-  return isAnyComponentNode(props.child);
+	if (!isObject$1(props)) return false;
+	if (!("child" in props)) {
+		if (!("children" in props)) {
+			return false;
+		} else {
+			return Array.isArray(props.children) && props.children.every(isAnyComponentNode);
+		}
+	}
+	return isAnyComponentNode(props.child);
 }
 function isResolvedCheckbox(props) {
-  return (
-    isObject$1(props) &&
-    "label" in props &&
-    isStringValue(props.label) &&
-    "value" in props &&
-    isBooleanValue(props.value)
-  );
+	return isObject$1(props) && "label" in props && isStringValue(props.label) && "value" in props && isBooleanValue(props.value);
 }
 function isResolvedColumn(props) {
-  return (
-    isObject$1(props) &&
-    "children" in props &&
-    Array.isArray(props.children) &&
-    props.children.every(isAnyComponentNode)
-  );
+	return isObject$1(props) && "children" in props && Array.isArray(props.children) && props.children.every(isAnyComponentNode);
 }
 function isResolvedDateTimeInput(props) {
-  return isObject$1(props) && "value" in props && isStringValue(props.value);
+	return isObject$1(props) && "value" in props && isStringValue(props.value);
 }
 function isResolvedDivider(props) {
-  return isObject$1(props);
+	return isObject$1(props);
 }
 function isResolvedImage(props) {
-  return isObject$1(props) && "url" in props && isStringValue(props.url);
+	return isObject$1(props) && "url" in props && isStringValue(props.url);
 }
 function isResolvedIcon(props) {
-  return isObject$1(props) && "name" in props && isStringValue(props.name);
+	return isObject$1(props) && "name" in props && isStringValue(props.name);
 }
 function isResolvedList(props) {
-  return (
-    isObject$1(props) &&
-    "children" in props &&
-    Array.isArray(props.children) &&
-    props.children.every(isAnyComponentNode)
-  );
+	return isObject$1(props) && "children" in props && Array.isArray(props.children) && props.children.every(isAnyComponentNode);
 }
 function isResolvedModal(props) {
-  return (
-    isObject$1(props) &&
-    "entryPointChild" in props &&
-    isAnyComponentNode(props.entryPointChild) &&
-    "contentChild" in props &&
-    isAnyComponentNode(props.contentChild)
-  );
+	return isObject$1(props) && "entryPointChild" in props && isAnyComponentNode(props.entryPointChild) && "contentChild" in props && isAnyComponentNode(props.contentChild);
 }
 function isResolvedMultipleChoice(props) {
-  return isObject$1(props) && "selections" in props;
+	return isObject$1(props) && "selections" in props;
 }
 function isResolvedRow(props) {
-  return (
-    isObject$1(props) &&
-    "children" in props &&
-    Array.isArray(props.children) &&
-    props.children.every(isAnyComponentNode)
-  );
+	return isObject$1(props) && "children" in props && Array.isArray(props.children) && props.children.every(isAnyComponentNode);
 }
 function isResolvedSlider(props) {
-  return isObject$1(props) && "value" in props && isNumberValue(props.value);
+	return isObject$1(props) && "value" in props && isNumberValue(props.value);
 }
 function isResolvedTabItem(item) {
-  return (
-    isObject$1(item) &&
-    "title" in item &&
-    isStringValue(item.title) &&
-    "child" in item &&
-    isAnyComponentNode(item.child)
-  );
+	return isObject$1(item) && "title" in item && isStringValue(item.title) && "child" in item && isAnyComponentNode(item.child);
 }
 function isResolvedTabs(props) {
-  return (
-    isObject$1(props) &&
-    "tabItems" in props &&
-    Array.isArray(props.tabItems) &&
-    props.tabItems.every(isResolvedTabItem)
-  );
+	return isObject$1(props) && "tabItems" in props && Array.isArray(props.tabItems) && props.tabItems.every(isResolvedTabItem);
 }
 function isResolvedText(props) {
-  return isObject$1(props) && "text" in props && isStringValue(props.text);
+	return isObject$1(props) && "text" in props && isStringValue(props.text);
 }
 function isResolvedTextField(props) {
-  return isObject$1(props) && "label" in props && isStringValue(props.label);
+	return isObject$1(props) && "label" in props && isStringValue(props.label);
 }
 function isResolvedVideo(props) {
-  return isObject$1(props) && "url" in props && isStringValue(props.url);
+	return isObject$1(props) && "url" in props && isStringValue(props.url);
 }
 
 /**
- * Processes and consolidates A2UIProtocolMessage objects into a structured,
- * hierarchical model of UI surfaces.
- */
+* Processes and consolidates A2UIProtocolMessage objects into a structured,
+* hierarchical model of UI surfaces.
+*/
 var A2uiMessageProcessor = class A2uiMessageProcessor {
-  static {
-    this.DEFAULT_SURFACE_ID = "@default";
-  }
-  #mapCtor = Map;
-  #arrayCtor = Array;
-  #setCtor = Set;
-  #objCtor = Object;
-  #surfaces;
-  constructor(
-    opts = {
-      mapCtor: Map,
-      arrayCtor: Array,
-      setCtor: Set,
-      objCtor: Object,
-    },
-  ) {
-    this.opts = opts;
-    this.#arrayCtor = opts.arrayCtor;
-    this.#mapCtor = opts.mapCtor;
-    this.#setCtor = opts.setCtor;
-    this.#objCtor = opts.objCtor;
-    this.#surfaces = new opts.mapCtor();
-  }
-  getSurfaces() {
-    return this.#surfaces;
-  }
-  clearSurfaces() {
-    this.#surfaces.clear();
-  }
-  processMessages(messages) {
-    for (const message of messages) {
-      if (message.beginRendering) {
-        this.#handleBeginRendering(message.beginRendering, message.beginRendering.surfaceId);
-      }
-      if (message.surfaceUpdate) {
-        this.#handleSurfaceUpdate(message.surfaceUpdate, message.surfaceUpdate.surfaceId);
-      }
-      if (message.dataModelUpdate) {
-        this.#handleDataModelUpdate(message.dataModelUpdate, message.dataModelUpdate.surfaceId);
-      }
-      if (message.deleteSurface) {
-        this.#handleDeleteSurface(message.deleteSurface);
-      }
-    }
-  }
-  /**
-   * Retrieves the data for a given component node and a relative path string.
-   * This correctly handles the special `.` path, which refers to the node's
-   * own data context.
-   */
-  getData(node, relativePath, surfaceId = A2uiMessageProcessor.DEFAULT_SURFACE_ID) {
-    const surface = this.#getOrCreateSurface(surfaceId);
-    if (!surface) return null;
-    let finalPath;
-    if (relativePath === "." || relativePath === "") {
-      finalPath = node.dataContextPath ?? "/";
-    } else {
-      finalPath = this.resolvePath(relativePath, node.dataContextPath);
-    }
-    return this.#getDataByPath(surface.dataModel, finalPath);
-  }
-  setData(node, relativePath, value, surfaceId = A2uiMessageProcessor.DEFAULT_SURFACE_ID) {
-    if (!node) {
-      console.warn("No component node set");
-      return;
-    }
-    const surface = this.#getOrCreateSurface(surfaceId);
-    if (!surface) return;
-    let finalPath;
-    if (relativePath === "." || relativePath === "") {
-      finalPath = node.dataContextPath ?? "/";
-    } else {
-      finalPath = this.resolvePath(relativePath, node.dataContextPath);
-    }
-    this.#setDataByPath(surface.dataModel, finalPath, value);
-  }
-  resolvePath(path, dataContextPath) {
-    if (path.startsWith("/")) {
-      return path;
-    }
-    if (dataContextPath && dataContextPath !== "/") {
-      return dataContextPath.endsWith("/")
-        ? `${dataContextPath}${path}`
-        : `${dataContextPath}/${path}`;
-    }
-    return `/${path}`;
-  }
-  #parseIfJsonString(value) {
-    if (typeof value !== "string") {
-      return value;
-    }
-    const trimmedValue = value.trim();
-    if (
-      (trimmedValue.startsWith("{") && trimmedValue.endsWith("}")) ||
-      (trimmedValue.startsWith("[") && trimmedValue.endsWith("]"))
-    ) {
-      try {
-        return JSON.parse(value);
-      } catch (e$14) {
-        console.warn(`Failed to parse potential JSON string: "${value.substring(0, 50)}..."`, e$14);
-        return value;
-      }
-    }
-    return value;
-  }
-  /**
-   * Converts a specific array format [{key: "...", value_string: "..."}, ...]
-   * into a standard Map. It also attempts to parse any string values that
-   * appear to be stringified JSON.
-   */
-  #convertKeyValueArrayToMap(arr) {
-    const map$1 = new this.#mapCtor();
-    for (const item of arr) {
-      if (!isObject$1(item) || !("key" in item)) continue;
-      const key = item.key;
-      const valueKey = this.#findValueKey(item);
-      if (!valueKey) continue;
-      let value = item[valueKey];
-      if (valueKey === "valueMap" && Array.isArray(value)) {
-        value = this.#convertKeyValueArrayToMap(value);
-      } else if (typeof value === "string") {
-        value = this.#parseIfJsonString(value);
-      }
-      this.#setDataByPath(map$1, key, value);
-    }
-    return map$1;
-  }
-  #setDataByPath(root, path, value) {
-    if (
-      Array.isArray(value) &&
-      (value.length === 0 || (isObject$1(value[0]) && "key" in value[0]))
-    ) {
-      if (value.length === 1 && isObject$1(value[0]) && value[0].key === ".") {
-        const item = value[0];
-        const valueKey = this.#findValueKey(item);
-        if (valueKey) {
-          value = item[valueKey];
-          if (valueKey === "valueMap" && Array.isArray(value)) {
-            value = this.#convertKeyValueArrayToMap(value);
-          } else if (typeof value === "string") {
-            value = this.#parseIfJsonString(value);
-          }
-        } else {
-          value = this.#convertKeyValueArrayToMap(value);
-        }
-      } else {
-        value = this.#convertKeyValueArrayToMap(value);
-      }
-    }
-    const segments = this.#normalizePath(path)
-      .split("/")
-      .filter((s$9) => s$9);
-    if (segments.length === 0) {
-      if (value instanceof Map || isObject$1(value)) {
-        if (!(value instanceof Map) && isObject$1(value)) {
-          value = new this.#mapCtor(Object.entries(value));
-        }
-        root.clear();
-        for (const [key, v$2] of value.entries()) {
-          root.set(key, v$2);
-        }
-      } else {
-        console.error("Cannot set root of DataModel to a non-Map value.");
-      }
-      return;
-    }
-    let current = root;
-    for (let i$10 = 0; i$10 < segments.length - 1; i$10++) {
-      const segment = segments[i$10];
-      let target;
-      if (current instanceof Map) {
-        target = current.get(segment);
-      } else if (Array.isArray(current) && /^\d+$/.test(segment)) {
-        target = current[parseInt(segment, 10)];
-      }
-      if (target === undefined || typeof target !== "object" || target === null) {
-        target = new this.#mapCtor();
-        if (current instanceof this.#mapCtor) {
-          current.set(segment, target);
-        } else if (Array.isArray(current)) {
-          current[parseInt(segment, 10)] = target;
-        }
-      }
-      current = target;
-    }
-    const finalSegment = segments[segments.length - 1];
-    const storedValue = value;
-    if (current instanceof this.#mapCtor) {
-      current.set(finalSegment, storedValue);
-    } else if (Array.isArray(current) && /^\d+$/.test(finalSegment)) {
-      current[parseInt(finalSegment, 10)] = storedValue;
-    }
-  }
-  /**
-   * Normalizes a path string into a consistent, slash-delimited format.
-   * Converts bracket notation and dot notation in a two-pass.
-   * e.g., "bookRecommendations[0].title" -> "/bookRecommendations/0/title"
-   * e.g., "book.0.title" -> "/book/0/title"
-   */
-  #normalizePath(path) {
-    const dotPath = path.replace(/\[(\d+)\]/g, ".$1");
-    const segments = dotPath.split(".");
-    return "/" + segments.filter((s$9) => s$9.length > 0).join("/");
-  }
-  #getDataByPath(root, path) {
-    const segments = this.#normalizePath(path)
-      .split("/")
-      .filter((s$9) => s$9);
-    let current = root;
-    for (const segment of segments) {
-      if (current === undefined || current === null) return null;
-      if (current instanceof Map) {
-        current = current.get(segment);
-      } else if (Array.isArray(current) && /^\d+$/.test(segment)) {
-        current = current[parseInt(segment, 10)];
-      } else if (isObject$1(current)) {
-        current = current[segment];
-      } else {
-        return null;
-      }
-    }
-    return current;
-  }
-  #getOrCreateSurface(surfaceId) {
-    let surface = this.#surfaces.get(surfaceId);
-    if (!surface) {
-      surface = new this.#objCtor({
-        rootComponentId: null,
-        componentTree: null,
-        dataModel: new this.#mapCtor(),
-        components: new this.#mapCtor(),
-        styles: new this.#objCtor(),
-      });
-      this.#surfaces.set(surfaceId, surface);
-    }
-    return surface;
-  }
-  #handleBeginRendering(message, surfaceId) {
-    const surface = this.#getOrCreateSurface(surfaceId);
-    surface.rootComponentId = message.root;
-    surface.styles = message.styles ?? {};
-    this.#rebuildComponentTree(surface);
-  }
-  #handleSurfaceUpdate(message, surfaceId) {
-    const surface = this.#getOrCreateSurface(surfaceId);
-    for (const component of message.components) {
-      surface.components.set(component.id, component);
-    }
-    this.#rebuildComponentTree(surface);
-  }
-  #handleDataModelUpdate(message, surfaceId) {
-    const surface = this.#getOrCreateSurface(surfaceId);
-    const path = message.path ?? "/";
-    this.#setDataByPath(surface.dataModel, path, message.contents);
-    this.#rebuildComponentTree(surface);
-  }
-  #handleDeleteSurface(message) {
-    this.#surfaces.delete(message.surfaceId);
-  }
-  /**
-   * Starts at the root component of the surface and builds out the tree
-   * recursively. This process involves resolving all properties of the child
-   * components, and expanding on any explicit children lists or templates
-   * found in the structure.
-   *
-   * @param surface The surface to be built.
-   */
-  #rebuildComponentTree(surface) {
-    if (!surface.rootComponentId) {
-      surface.componentTree = null;
-      return;
-    }
-    const visited = new this.#setCtor();
-    surface.componentTree = this.#buildNodeRecursive(
-      surface.rootComponentId,
-      surface,
-      visited,
-      "/",
-      "",
-    );
-  }
-  /** Finds a value key in a map. */
-  #findValueKey(value) {
-    return Object.keys(value).find((k$1) => k$1.startsWith("value"));
-  }
-  /**
-   * Builds out the nodes recursively.
-   */
-  #buildNodeRecursive(baseComponentId, surface, visited, dataContextPath, idSuffix = "") {
-    const fullId = `${baseComponentId}${idSuffix}`;
-    const { components } = surface;
-    if (!components.has(baseComponentId)) {
-      return null;
-    }
-    if (visited.has(fullId)) {
-      throw new Error(`Circular dependency for component "${fullId}".`);
-    }
-    visited.add(fullId);
-    const componentData = components.get(baseComponentId);
-    const componentProps = componentData.component ?? {};
-    const componentType = Object.keys(componentProps)[0];
-    const unresolvedProperties = componentProps[componentType];
-    const resolvedProperties = new this.#objCtor();
-    if (isObject$1(unresolvedProperties)) {
-      for (const [key, value] of Object.entries(unresolvedProperties)) {
-        resolvedProperties[key] = this.#resolvePropertyValue(
-          value,
-          surface,
-          visited,
-          dataContextPath,
-          idSuffix,
-          key,
-        );
-      }
-    }
-    visited.delete(fullId);
-    const baseNode = {
-      id: fullId,
-      dataContextPath,
-      weight: componentData.weight ?? "initial",
-    };
-    switch (componentType) {
-      case "Text":
-        if (!isResolvedText(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Text",
-          properties: resolvedProperties,
-        });
-      case "Image":
-        if (!isResolvedImage(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Image",
-          properties: resolvedProperties,
-        });
-      case "Icon":
-        if (!isResolvedIcon(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Icon",
-          properties: resolvedProperties,
-        });
-      case "Video":
-        if (!isResolvedVideo(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Video",
-          properties: resolvedProperties,
-        });
-      case "AudioPlayer":
-        if (!isResolvedAudioPlayer(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "AudioPlayer",
-          properties: resolvedProperties,
-        });
-      case "Row":
-        if (!isResolvedRow(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Row",
-          properties: resolvedProperties,
-        });
-      case "Column":
-        if (!isResolvedColumn(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Column",
-          properties: resolvedProperties,
-        });
-      case "List":
-        if (!isResolvedList(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "List",
-          properties: resolvedProperties,
-        });
-      case "Card":
-        if (!isResolvedCard(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Card",
-          properties: resolvedProperties,
-        });
-      case "Tabs":
-        if (!isResolvedTabs(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Tabs",
-          properties: resolvedProperties,
-        });
-      case "Divider":
-        if (!isResolvedDivider(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Divider",
-          properties: resolvedProperties,
-        });
-      case "Modal":
-        if (!isResolvedModal(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Modal",
-          properties: resolvedProperties,
-        });
-      case "Button":
-        if (!isResolvedButton(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Button",
-          properties: resolvedProperties,
-        });
-      case "CheckBox":
-        if (!isResolvedCheckbox(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "CheckBox",
-          properties: resolvedProperties,
-        });
-      case "TextField":
-        if (!isResolvedTextField(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "TextField",
-          properties: resolvedProperties,
-        });
-      case "DateTimeInput":
-        if (!isResolvedDateTimeInput(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "DateTimeInput",
-          properties: resolvedProperties,
-        });
-      case "MultipleChoice":
-        if (!isResolvedMultipleChoice(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "MultipleChoice",
-          properties: resolvedProperties,
-        });
-      case "Slider":
-        if (!isResolvedSlider(resolvedProperties)) {
-          throw new Error(`Invalid data; expected ${componentType}`);
-        }
-        return new this.#objCtor({
-          ...baseNode,
-          type: "Slider",
-          properties: resolvedProperties,
-        });
-      default:
-        return new this.#objCtor({
-          ...baseNode,
-          type: componentType,
-          properties: resolvedProperties,
-        });
-    }
-  }
-  /**
-   * Recursively resolves an individual property value. If a property indicates
-   * a child node (a string that matches a component ID), an explicitList of
-   * children, or a template, these will be built out here.
-   */
-  #resolvePropertyValue(
-    value,
-    surface,
-    visited,
-    dataContextPath,
-    idSuffix = "",
-    propertyKey = null,
-  ) {
-    const isComponentIdReferenceKey = (key) => key === "child" || key.endsWith("Child");
-    if (
-      typeof value === "string" &&
-      propertyKey &&
-      isComponentIdReferenceKey(propertyKey) &&
-      surface.components.has(value)
-    ) {
-      return this.#buildNodeRecursive(value, surface, visited, dataContextPath, idSuffix);
-    }
-    if (isComponentArrayReference(value)) {
-      if (value.explicitList) {
-        return value.explicitList.map((id) =>
-          this.#buildNodeRecursive(id, surface, visited, dataContextPath, idSuffix),
-        );
-      }
-      if (value.template) {
-        const fullDataPath = this.resolvePath(value.template.dataBinding, dataContextPath);
-        const data = this.#getDataByPath(surface.dataModel, fullDataPath);
-        const template = value.template;
-        if (Array.isArray(data)) {
-          return data.map((_$1, index) => {
-            const parentIndices = dataContextPath
-              .split("/")
-              .filter((segment) => /^\d+$/.test(segment));
-            const newIndices = [...parentIndices, index];
-            const newSuffix = `:${newIndices.join(":")}`;
-            const childDataContextPath = `${fullDataPath}/${index}`;
-            return this.#buildNodeRecursive(
-              template.componentId,
-              surface,
-              visited,
-              childDataContextPath,
-              newSuffix,
-            );
-          });
-        }
-        const mapCtor = this.#mapCtor;
-        if (data instanceof mapCtor) {
-          return Array.from(data.keys(), (key) => {
-            const newSuffix = `:${key}`;
-            const childDataContextPath = `${fullDataPath}/${key}`;
-            return this.#buildNodeRecursive(
-              template.componentId,
-              surface,
-              visited,
-              childDataContextPath,
-              newSuffix,
-            );
-          });
-        }
-        return new this.#arrayCtor();
-      }
-    }
-    if (Array.isArray(value)) {
-      return value.map((item) =>
-        this.#resolvePropertyValue(item, surface, visited, dataContextPath, idSuffix, propertyKey),
-      );
-    }
-    if (isObject$1(value)) {
-      const newObj = new this.#objCtor();
-      for (const [key, propValue] of Object.entries(value)) {
-        let propertyValue = propValue;
-        if (isPath(key, propValue) && dataContextPath !== "/") {
-          propertyValue = propValue
-            .replace(/^\.?\/item/, "")
-            .replace(/^\.?\/text/, "")
-            .replace(/^\.?\/label/, "")
-            .replace(/^\.?\//, "");
-          newObj[key] = propertyValue;
-          continue;
-        }
-        newObj[key] = this.#resolvePropertyValue(
-          propertyValue,
-          surface,
-          visited,
-          dataContextPath,
-          idSuffix,
-          key,
-        );
-      }
-      return newObj;
-    }
-    return value;
-  }
+	static {
+		this.DEFAULT_SURFACE_ID = "@default";
+	}
+	#mapCtor = Map;
+	#arrayCtor = Array;
+	#setCtor = Set;
+	#objCtor = Object;
+	#surfaces;
+	constructor(opts = {
+		mapCtor: Map,
+		arrayCtor: Array,
+		setCtor: Set,
+		objCtor: Object
+	}) {
+		this.opts = opts;
+		this.#arrayCtor = opts.arrayCtor;
+		this.#mapCtor = opts.mapCtor;
+		this.#setCtor = opts.setCtor;
+		this.#objCtor = opts.objCtor;
+		this.#surfaces = new opts.mapCtor();
+	}
+	getSurfaces() {
+		return this.#surfaces;
+	}
+	clearSurfaces() {
+		this.#surfaces.clear();
+	}
+	processMessages(messages) {
+		for (const message of messages) {
+			if (message.beginRendering) {
+				this.#handleBeginRendering(message.beginRendering, message.beginRendering.surfaceId);
+			}
+			if (message.surfaceUpdate) {
+				this.#handleSurfaceUpdate(message.surfaceUpdate, message.surfaceUpdate.surfaceId);
+			}
+			if (message.dataModelUpdate) {
+				this.#handleDataModelUpdate(message.dataModelUpdate, message.dataModelUpdate.surfaceId);
+			}
+			if (message.deleteSurface) {
+				this.#handleDeleteSurface(message.deleteSurface);
+			}
+		}
+	}
+	/**
+	* Retrieves the data for a given component node and a relative path string.
+	* This correctly handles the special `.` path, which refers to the node's
+	* own data context.
+	*/
+	getData(node, relativePath, surfaceId = A2uiMessageProcessor.DEFAULT_SURFACE_ID) {
+		const surface = this.#getOrCreateSurface(surfaceId);
+		if (!surface) return null;
+		let finalPath;
+		if (relativePath === "." || relativePath === "") {
+			finalPath = node.dataContextPath ?? "/";
+		} else {
+			finalPath = this.resolvePath(relativePath, node.dataContextPath);
+		}
+		return this.#getDataByPath(surface.dataModel, finalPath);
+	}
+	setData(node, relativePath, value, surfaceId = A2uiMessageProcessor.DEFAULT_SURFACE_ID) {
+		if (!node) {
+			console.warn("No component node set");
+			return;
+		}
+		const surface = this.#getOrCreateSurface(surfaceId);
+		if (!surface) return;
+		let finalPath;
+		if (relativePath === "." || relativePath === "") {
+			finalPath = node.dataContextPath ?? "/";
+		} else {
+			finalPath = this.resolvePath(relativePath, node.dataContextPath);
+		}
+		this.#setDataByPath(surface.dataModel, finalPath, value);
+	}
+	resolvePath(path, dataContextPath) {
+		if (path.startsWith("/")) {
+			return path;
+		}
+		if (dataContextPath && dataContextPath !== "/") {
+			return dataContextPath.endsWith("/") ? `${dataContextPath}${path}` : `${dataContextPath}/${path}`;
+		}
+		return `/${path}`;
+	}
+	#parseIfJsonString(value) {
+		if (typeof value !== "string") {
+			return value;
+		}
+		const trimmedValue = value.trim();
+		if (trimmedValue.startsWith("{") && trimmedValue.endsWith("}") || trimmedValue.startsWith("[") && trimmedValue.endsWith("]")) {
+			try {
+				return JSON.parse(value);
+			} catch (e$14) {
+				console.warn(`Failed to parse potential JSON string: "${value.substring(0, 50)}..."`, e$14);
+				return value;
+			}
+		}
+		return value;
+	}
+	/**
+	* Converts a specific array format [{key: "...", value_string: "..."}, ...]
+	* into a standard Map. It also attempts to parse any string values that
+	* appear to be stringified JSON.
+	*/
+	#convertKeyValueArrayToMap(arr) {
+		const map$1 = new this.#mapCtor();
+		for (const item of arr) {
+			if (!isObject$1(item) || !("key" in item)) continue;
+			const key = item.key;
+			const valueKey = this.#findValueKey(item);
+			if (!valueKey) continue;
+			let value = item[valueKey];
+			if (valueKey === "valueMap" && Array.isArray(value)) {
+				value = this.#convertKeyValueArrayToMap(value);
+			} else if (typeof value === "string") {
+				value = this.#parseIfJsonString(value);
+			}
+			this.#setDataByPath(map$1, key, value);
+		}
+		return map$1;
+	}
+	#setDataByPath(root, path, value) {
+		if (Array.isArray(value) && (value.length === 0 || isObject$1(value[0]) && "key" in value[0])) {
+			if (value.length === 1 && isObject$1(value[0]) && value[0].key === ".") {
+				const item = value[0];
+				const valueKey = this.#findValueKey(item);
+				if (valueKey) {
+					value = item[valueKey];
+					if (valueKey === "valueMap" && Array.isArray(value)) {
+						value = this.#convertKeyValueArrayToMap(value);
+					} else if (typeof value === "string") {
+						value = this.#parseIfJsonString(value);
+					}
+				} else {
+					value = this.#convertKeyValueArrayToMap(value);
+				}
+			} else {
+				value = this.#convertKeyValueArrayToMap(value);
+			}
+		}
+		const segments = this.#normalizePath(path).split("/").filter((s$9) => s$9);
+		if (segments.length === 0) {
+			if (value instanceof Map || isObject$1(value)) {
+				if (!(value instanceof Map) && isObject$1(value)) {
+					value = new this.#mapCtor(Object.entries(value));
+				}
+				root.clear();
+				for (const [key, v$2] of value.entries()) {
+					root.set(key, v$2);
+				}
+			} else {
+				console.error("Cannot set root of DataModel to a non-Map value.");
+			}
+			return;
+		}
+		let current = root;
+		for (let i$10 = 0; i$10 < segments.length - 1; i$10++) {
+			const segment = segments[i$10];
+			let target;
+			if (current instanceof Map) {
+				target = current.get(segment);
+			} else if (Array.isArray(current) && /^\d+$/.test(segment)) {
+				target = current[parseInt(segment, 10)];
+			}
+			if (target === undefined || typeof target !== "object" || target === null) {
+				target = new this.#mapCtor();
+				if (current instanceof this.#mapCtor) {
+					current.set(segment, target);
+				} else if (Array.isArray(current)) {
+					current[parseInt(segment, 10)] = target;
+				}
+			}
+			current = target;
+		}
+		const finalSegment = segments[segments.length - 1];
+		const storedValue = value;
+		if (current instanceof this.#mapCtor) {
+			current.set(finalSegment, storedValue);
+		} else if (Array.isArray(current) && /^\d+$/.test(finalSegment)) {
+			current[parseInt(finalSegment, 10)] = storedValue;
+		}
+	}
+	/**
+	* Normalizes a path string into a consistent, slash-delimited format.
+	* Converts bracket notation and dot notation in a two-pass.
+	* e.g., "bookRecommendations[0].title" -> "/bookRecommendations/0/title"
+	* e.g., "book.0.title" -> "/book/0/title"
+	*/
+	#normalizePath(path) {
+		const dotPath = path.replace(/\[(\d+)\]/g, ".$1");
+		const segments = dotPath.split(".");
+		return "/" + segments.filter((s$9) => s$9.length > 0).join("/");
+	}
+	#getDataByPath(root, path) {
+		const segments = this.#normalizePath(path).split("/").filter((s$9) => s$9);
+		let current = root;
+		for (const segment of segments) {
+			if (current === undefined || current === null) return null;
+			if (current instanceof Map) {
+				current = current.get(segment);
+			} else if (Array.isArray(current) && /^\d+$/.test(segment)) {
+				current = current[parseInt(segment, 10)];
+			} else if (isObject$1(current)) {
+				current = current[segment];
+			} else {
+				return null;
+			}
+		}
+		return current;
+	}
+	#getOrCreateSurface(surfaceId) {
+		let surface = this.#surfaces.get(surfaceId);
+		if (!surface) {
+			surface = new this.#objCtor({
+				rootComponentId: null,
+				componentTree: null,
+				dataModel: new this.#mapCtor(),
+				components: new this.#mapCtor(),
+				styles: new this.#objCtor()
+			});
+			this.#surfaces.set(surfaceId, surface);
+		}
+		return surface;
+	}
+	#handleBeginRendering(message, surfaceId) {
+		const surface = this.#getOrCreateSurface(surfaceId);
+		surface.rootComponentId = message.root;
+		surface.styles = message.styles ?? {};
+		this.#rebuildComponentTree(surface);
+	}
+	#handleSurfaceUpdate(message, surfaceId) {
+		const surface = this.#getOrCreateSurface(surfaceId);
+		for (const component of message.components) {
+			surface.components.set(component.id, component);
+		}
+		this.#rebuildComponentTree(surface);
+	}
+	#handleDataModelUpdate(message, surfaceId) {
+		const surface = this.#getOrCreateSurface(surfaceId);
+		const path = message.path ?? "/";
+		this.#setDataByPath(surface.dataModel, path, message.contents);
+		this.#rebuildComponentTree(surface);
+	}
+	#handleDeleteSurface(message) {
+		this.#surfaces.delete(message.surfaceId);
+	}
+	/**
+	* Starts at the root component of the surface and builds out the tree
+	* recursively. This process involves resolving all properties of the child
+	* components, and expanding on any explicit children lists or templates
+	* found in the structure.
+	*
+	* @param surface The surface to be built.
+	*/
+	#rebuildComponentTree(surface) {
+		if (!surface.rootComponentId) {
+			surface.componentTree = null;
+			return;
+		}
+		const visited = new this.#setCtor();
+		surface.componentTree = this.#buildNodeRecursive(surface.rootComponentId, surface, visited, "/", "");
+	}
+	/** Finds a value key in a map. */
+	#findValueKey(value) {
+		return Object.keys(value).find((k$1) => k$1.startsWith("value"));
+	}
+	/**
+	* Builds out the nodes recursively.
+	*/
+	#buildNodeRecursive(baseComponentId, surface, visited, dataContextPath, idSuffix = "") {
+		const fullId = `${baseComponentId}${idSuffix}`;
+		const { components } = surface;
+		if (!components.has(baseComponentId)) {
+			return null;
+		}
+		if (visited.has(fullId)) {
+			throw new Error(`Circular dependency for component "${fullId}".`);
+		}
+		visited.add(fullId);
+		const componentData = components.get(baseComponentId);
+		const componentProps = componentData.component ?? {};
+		const componentType = Object.keys(componentProps)[0];
+		const unresolvedProperties = componentProps[componentType];
+		const resolvedProperties = new this.#objCtor();
+		if (isObject$1(unresolvedProperties)) {
+			for (const [key, value] of Object.entries(unresolvedProperties)) {
+				resolvedProperties[key] = this.#resolvePropertyValue(value, surface, visited, dataContextPath, idSuffix, key);
+			}
+		}
+		visited.delete(fullId);
+		const baseNode = {
+			id: fullId,
+			dataContextPath,
+			weight: componentData.weight ?? "initial"
+		};
+		switch (componentType) {
+			case "Text":
+				if (!isResolvedText(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Text",
+					properties: resolvedProperties
+				});
+			case "Image":
+				if (!isResolvedImage(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Image",
+					properties: resolvedProperties
+				});
+			case "Icon":
+				if (!isResolvedIcon(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Icon",
+					properties: resolvedProperties
+				});
+			case "Video":
+				if (!isResolvedVideo(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Video",
+					properties: resolvedProperties
+				});
+			case "AudioPlayer":
+				if (!isResolvedAudioPlayer(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "AudioPlayer",
+					properties: resolvedProperties
+				});
+			case "Row":
+				if (!isResolvedRow(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Row",
+					properties: resolvedProperties
+				});
+			case "Column":
+				if (!isResolvedColumn(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Column",
+					properties: resolvedProperties
+				});
+			case "List":
+				if (!isResolvedList(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "List",
+					properties: resolvedProperties
+				});
+			case "Card":
+				if (!isResolvedCard(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Card",
+					properties: resolvedProperties
+				});
+			case "Tabs":
+				if (!isResolvedTabs(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Tabs",
+					properties: resolvedProperties
+				});
+			case "Divider":
+				if (!isResolvedDivider(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Divider",
+					properties: resolvedProperties
+				});
+			case "Modal":
+				if (!isResolvedModal(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Modal",
+					properties: resolvedProperties
+				});
+			case "Button":
+				if (!isResolvedButton(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Button",
+					properties: resolvedProperties
+				});
+			case "CheckBox":
+				if (!isResolvedCheckbox(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "CheckBox",
+					properties: resolvedProperties
+				});
+			case "TextField":
+				if (!isResolvedTextField(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "TextField",
+					properties: resolvedProperties
+				});
+			case "DateTimeInput":
+				if (!isResolvedDateTimeInput(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "DateTimeInput",
+					properties: resolvedProperties
+				});
+			case "MultipleChoice":
+				if (!isResolvedMultipleChoice(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "MultipleChoice",
+					properties: resolvedProperties
+				});
+			case "Slider":
+				if (!isResolvedSlider(resolvedProperties)) {
+					throw new Error(`Invalid data; expected ${componentType}`);
+				}
+				return new this.#objCtor({
+					...baseNode,
+					type: "Slider",
+					properties: resolvedProperties
+				});
+			default: return new this.#objCtor({
+				...baseNode,
+				type: componentType,
+				properties: resolvedProperties
+			});
+		}
+	}
+	/**
+	* Recursively resolves an individual property value. If a property indicates
+	* a child node (a string that matches a component ID), an explicitList of
+	* children, or a template, these will be built out here.
+	*/
+	#resolvePropertyValue(value, surface, visited, dataContextPath, idSuffix = "", propertyKey = null) {
+		const isComponentIdReferenceKey = (key) => key === "child" || key.endsWith("Child");
+		if (typeof value === "string" && propertyKey && isComponentIdReferenceKey(propertyKey) && surface.components.has(value)) {
+			return this.#buildNodeRecursive(value, surface, visited, dataContextPath, idSuffix);
+		}
+		if (isComponentArrayReference(value)) {
+			if (value.explicitList) {
+				return value.explicitList.map((id) => this.#buildNodeRecursive(id, surface, visited, dataContextPath, idSuffix));
+			}
+			if (value.template) {
+				const fullDataPath = this.resolvePath(value.template.dataBinding, dataContextPath);
+				const data = this.#getDataByPath(surface.dataModel, fullDataPath);
+				const template = value.template;
+				if (Array.isArray(data)) {
+					return data.map((_$1, index) => {
+						const parentIndices = dataContextPath.split("/").filter((segment) => /^\d+$/.test(segment));
+						const newIndices = [...parentIndices, index];
+						const newSuffix = `:${newIndices.join(":")}`;
+						const childDataContextPath = `${fullDataPath}/${index}`;
+						return this.#buildNodeRecursive(template.componentId, surface, visited, childDataContextPath, newSuffix);
+					});
+				}
+				const mapCtor = this.#mapCtor;
+				if (data instanceof mapCtor) {
+					return Array.from(data.keys(), (key) => {
+						const newSuffix = `:${key}`;
+						const childDataContextPath = `${fullDataPath}/${key}`;
+						return this.#buildNodeRecursive(template.componentId, surface, visited, childDataContextPath, newSuffix);
+					});
+				}
+				return new this.#arrayCtor();
+			}
+		}
+		if (Array.isArray(value)) {
+			return value.map((item) => this.#resolvePropertyValue(item, surface, visited, dataContextPath, idSuffix, propertyKey));
+		}
+		if (isObject$1(value)) {
+			const newObj = new this.#objCtor();
+			for (const [key, propValue] of Object.entries(value)) {
+				let propertyValue = propValue;
+				if (isPath(key, propValue) && dataContextPath !== "/") {
+					propertyValue = propValue.replace(/^\.?\/item/, "").replace(/^\.?\/text/, "").replace(/^\.?\/label/, "").replace(/^\.?\//, "");
+					newObj[key] = propertyValue;
+					continue;
+				}
+				newObj[key] = this.#resolvePropertyValue(propertyValue, surface, visited, dataContextPath, idSuffix, key);
+			}
+			return newObj;
+		}
+		return value;
+	}
 };
 
 var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) =>
-  key in obj
-    ? __defProp(obj, key, {
-        enumerable: true,
-        configurable: true,
-        writable: true,
-        value,
-      })
-    : (obj[key] = value);
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {
+	enumerable: true,
+	configurable: true,
+	writable: true,
+	value
+}) : obj[key] = value;
 var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
+	__defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+	return value;
 };
 var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj)) throw TypeError("Cannot " + msg);
+	if (!member.has(obj)) throw TypeError("Cannot " + msg);
 };
 var __privateIn = (member, obj) => {
-  if (Object(obj) !== obj) throw TypeError('Cannot use the "in" operator on this value');
-  return member.has(obj);
+	if (Object(obj) !== obj) throw TypeError("Cannot use the \"in\" operator on this value");
+	return member.has(obj);
 };
 var __privateAdd = (obj, member, value) => {
-  if (member.has(obj)) throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+	if (member.has(obj)) throw TypeError("Cannot add the same private member more than once");
+	member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 };
 var __privateMethod = (obj, member, method) => {
-  __accessCheck(obj, member, "access private method");
-  return method;
+	__accessCheck(obj, member, "access private method");
+	return method;
 };
 /**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
+* @license
+* Copyright Google LLC All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
 function defaultEquals(a$2, b$2) {
-  return Object.is(a$2, b$2);
+	return Object.is(a$2, b$2);
 }
 /**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
+* @license
+* Copyright Google LLC All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
 let activeConsumer = null;
 let inNotificationPhase = false;
 let epoch = 1;
 const SIGNAL = /* @__PURE__ */ Symbol("SIGNAL");
 function setActiveConsumer(consumer) {
-  const prev = activeConsumer;
-  activeConsumer = consumer;
-  return prev;
+	const prev = activeConsumer;
+	activeConsumer = consumer;
+	return prev;
 }
 function getActiveConsumer() {
-  return activeConsumer;
+	return activeConsumer;
 }
 function isInNotificationPhase() {
-  return inNotificationPhase;
+	return inNotificationPhase;
 }
 const REACTIVE_NODE = {
-  version: 0,
-  lastCleanEpoch: 0,
-  dirty: false,
-  producerNode: void 0,
-  producerLastReadVersion: void 0,
-  producerIndexOfThis: void 0,
-  nextProducerIndex: 0,
-  liveConsumerNode: void 0,
-  liveConsumerIndexOfThis: void 0,
-  consumerAllowSignalWrites: false,
-  consumerIsAlwaysLive: false,
-  producerMustRecompute: () => false,
-  producerRecomputeValue: () => {},
-  consumerMarkedDirty: () => {},
-  consumerOnSignalRead: () => {},
+	version: 0,
+	lastCleanEpoch: 0,
+	dirty: false,
+	producerNode: void 0,
+	producerLastReadVersion: void 0,
+	producerIndexOfThis: void 0,
+	nextProducerIndex: 0,
+	liveConsumerNode: void 0,
+	liveConsumerIndexOfThis: void 0,
+	consumerAllowSignalWrites: false,
+	consumerIsAlwaysLive: false,
+	producerMustRecompute: () => false,
+	producerRecomputeValue: () => {},
+	consumerMarkedDirty: () => {},
+	consumerOnSignalRead: () => {}
 };
 function producerAccessed(node) {
-  if (inNotificationPhase) {
-    throw new Error(
-      typeof ngDevMode !== "undefined" && ngDevMode
-        ? `Assertion error: signal read during notification phase`
-        : "",
-    );
-  }
-  if (activeConsumer === null) {
-    return;
-  }
-  activeConsumer.consumerOnSignalRead(node);
-  const idx = activeConsumer.nextProducerIndex++;
-  assertConsumerNode(activeConsumer);
-  if (idx < activeConsumer.producerNode.length && activeConsumer.producerNode[idx] !== node) {
-    if (consumerIsLive(activeConsumer)) {
-      const staleProducer = activeConsumer.producerNode[idx];
-      producerRemoveLiveConsumerAtIndex(staleProducer, activeConsumer.producerIndexOfThis[idx]);
-    }
-  }
-  if (activeConsumer.producerNode[idx] !== node) {
-    activeConsumer.producerNode[idx] = node;
-    activeConsumer.producerIndexOfThis[idx] = consumerIsLive(activeConsumer)
-      ? producerAddLiveConsumer(node, activeConsumer, idx)
-      : 0;
-  }
-  activeConsumer.producerLastReadVersion[idx] = node.version;
+	if (inNotificationPhase) {
+		throw new Error(typeof ngDevMode !== "undefined" && ngDevMode ? `Assertion error: signal read during notification phase` : "");
+	}
+	if (activeConsumer === null) {
+		return;
+	}
+	activeConsumer.consumerOnSignalRead(node);
+	const idx = activeConsumer.nextProducerIndex++;
+	assertConsumerNode(activeConsumer);
+	if (idx < activeConsumer.producerNode.length && activeConsumer.producerNode[idx] !== node) {
+		if (consumerIsLive(activeConsumer)) {
+			const staleProducer = activeConsumer.producerNode[idx];
+			producerRemoveLiveConsumerAtIndex(staleProducer, activeConsumer.producerIndexOfThis[idx]);
+		}
+	}
+	if (activeConsumer.producerNode[idx] !== node) {
+		activeConsumer.producerNode[idx] = node;
+		activeConsumer.producerIndexOfThis[idx] = consumerIsLive(activeConsumer) ? producerAddLiveConsumer(node, activeConsumer, idx) : 0;
+	}
+	activeConsumer.producerLastReadVersion[idx] = node.version;
 }
 function producerIncrementEpoch() {
-  epoch++;
+	epoch++;
 }
 function producerUpdateValueVersion(node) {
-  if (!node.dirty && node.lastCleanEpoch === epoch) {
-    return;
-  }
-  if (!node.producerMustRecompute(node) && !consumerPollProducersForChange(node)) {
-    node.dirty = false;
-    node.lastCleanEpoch = epoch;
-    return;
-  }
-  node.producerRecomputeValue(node);
-  node.dirty = false;
-  node.lastCleanEpoch = epoch;
+	if (!node.dirty && node.lastCleanEpoch === epoch) {
+		return;
+	}
+	if (!node.producerMustRecompute(node) && !consumerPollProducersForChange(node)) {
+		node.dirty = false;
+		node.lastCleanEpoch = epoch;
+		return;
+	}
+	node.producerRecomputeValue(node);
+	node.dirty = false;
+	node.lastCleanEpoch = epoch;
 }
 function producerNotifyConsumers(node) {
-  if (node.liveConsumerNode === void 0) {
-    return;
-  }
-  const prev = inNotificationPhase;
-  inNotificationPhase = true;
-  try {
-    for (const consumer of node.liveConsumerNode) {
-      if (!consumer.dirty) {
-        consumerMarkDirty(consumer);
-      }
-    }
-  } finally {
-    inNotificationPhase = prev;
-  }
+	if (node.liveConsumerNode === void 0) {
+		return;
+	}
+	const prev = inNotificationPhase;
+	inNotificationPhase = true;
+	try {
+		for (const consumer of node.liveConsumerNode) {
+			if (!consumer.dirty) {
+				consumerMarkDirty(consumer);
+			}
+		}
+	} finally {
+		inNotificationPhase = prev;
+	}
 }
 function producerUpdatesAllowed() {
-  return (activeConsumer == null ? void 0 : activeConsumer.consumerAllowSignalWrites) !== false;
+	return (activeConsumer == null ? void 0 : activeConsumer.consumerAllowSignalWrites) !== false;
 }
 function consumerMarkDirty(node) {
-  var _a$1;
-  node.dirty = true;
-  producerNotifyConsumers(node);
-  (_a$1 = node.consumerMarkedDirty) == null ? void 0 : _a$1.call(node.wrapper ?? node);
+	var _a$1;
+	node.dirty = true;
+	producerNotifyConsumers(node);
+	(_a$1 = node.consumerMarkedDirty) == null ? void 0 : _a$1.call(node.wrapper ?? node);
 }
 function consumerBeforeComputation(node) {
-  node && (node.nextProducerIndex = 0);
-  return setActiveConsumer(node);
+	node && (node.nextProducerIndex = 0);
+	return setActiveConsumer(node);
 }
 function consumerAfterComputation(node, prevConsumer) {
-  setActiveConsumer(prevConsumer);
-  if (
-    !node ||
-    node.producerNode === void 0 ||
-    node.producerIndexOfThis === void 0 ||
-    node.producerLastReadVersion === void 0
-  ) {
-    return;
-  }
-  if (consumerIsLive(node)) {
-    for (let i$10 = node.nextProducerIndex; i$10 < node.producerNode.length; i$10++) {
-      producerRemoveLiveConsumerAtIndex(node.producerNode[i$10], node.producerIndexOfThis[i$10]);
-    }
-  }
-  while (node.producerNode.length > node.nextProducerIndex) {
-    node.producerNode.pop();
-    node.producerLastReadVersion.pop();
-    node.producerIndexOfThis.pop();
-  }
+	setActiveConsumer(prevConsumer);
+	if (!node || node.producerNode === void 0 || node.producerIndexOfThis === void 0 || node.producerLastReadVersion === void 0) {
+		return;
+	}
+	if (consumerIsLive(node)) {
+		for (let i$10 = node.nextProducerIndex; i$10 < node.producerNode.length; i$10++) {
+			producerRemoveLiveConsumerAtIndex(node.producerNode[i$10], node.producerIndexOfThis[i$10]);
+		}
+	}
+	while (node.producerNode.length > node.nextProducerIndex) {
+		node.producerNode.pop();
+		node.producerLastReadVersion.pop();
+		node.producerIndexOfThis.pop();
+	}
 }
 function consumerPollProducersForChange(node) {
-  assertConsumerNode(node);
-  for (let i$10 = 0; i$10 < node.producerNode.length; i$10++) {
-    const producer = node.producerNode[i$10];
-    const seenVersion = node.producerLastReadVersion[i$10];
-    if (seenVersion !== producer.version) {
-      return true;
-    }
-    producerUpdateValueVersion(producer);
-    if (seenVersion !== producer.version) {
-      return true;
-    }
-  }
-  return false;
+	assertConsumerNode(node);
+	for (let i$10 = 0; i$10 < node.producerNode.length; i$10++) {
+		const producer = node.producerNode[i$10];
+		const seenVersion = node.producerLastReadVersion[i$10];
+		if (seenVersion !== producer.version) {
+			return true;
+		}
+		producerUpdateValueVersion(producer);
+		if (seenVersion !== producer.version) {
+			return true;
+		}
+	}
+	return false;
 }
 function producerAddLiveConsumer(node, consumer, indexOfThis) {
-  var _a$1;
-  assertProducerNode(node);
-  assertConsumerNode(node);
-  if (node.liveConsumerNode.length === 0) {
-    (_a$1 = node.watched) == null ? void 0 : _a$1.call(node.wrapper);
-    for (let i$10 = 0; i$10 < node.producerNode.length; i$10++) {
-      node.producerIndexOfThis[i$10] = producerAddLiveConsumer(node.producerNode[i$10], node, i$10);
-    }
-  }
-  node.liveConsumerIndexOfThis.push(indexOfThis);
-  return node.liveConsumerNode.push(consumer) - 1;
+	var _a$1;
+	assertProducerNode(node);
+	assertConsumerNode(node);
+	if (node.liveConsumerNode.length === 0) {
+		(_a$1 = node.watched) == null ? void 0 : _a$1.call(node.wrapper);
+		for (let i$10 = 0; i$10 < node.producerNode.length; i$10++) {
+			node.producerIndexOfThis[i$10] = producerAddLiveConsumer(node.producerNode[i$10], node, i$10);
+		}
+	}
+	node.liveConsumerIndexOfThis.push(indexOfThis);
+	return node.liveConsumerNode.push(consumer) - 1;
 }
 function producerRemoveLiveConsumerAtIndex(node, idx) {
-  var _a$1;
-  assertProducerNode(node);
-  assertConsumerNode(node);
-  if (typeof ngDevMode !== "undefined" && ngDevMode && idx >= node.liveConsumerNode.length) {
-    throw new Error(
-      `Assertion error: active consumer index ${idx} is out of bounds of ${node.liveConsumerNode.length} consumers)`,
-    );
-  }
-  if (node.liveConsumerNode.length === 1) {
-    (_a$1 = node.unwatched) == null ? void 0 : _a$1.call(node.wrapper);
-    for (let i$10 = 0; i$10 < node.producerNode.length; i$10++) {
-      producerRemoveLiveConsumerAtIndex(node.producerNode[i$10], node.producerIndexOfThis[i$10]);
-    }
-  }
-  const lastIdx = node.liveConsumerNode.length - 1;
-  node.liveConsumerNode[idx] = node.liveConsumerNode[lastIdx];
-  node.liveConsumerIndexOfThis[idx] = node.liveConsumerIndexOfThis[lastIdx];
-  node.liveConsumerNode.length--;
-  node.liveConsumerIndexOfThis.length--;
-  if (idx < node.liveConsumerNode.length) {
-    const idxProducer = node.liveConsumerIndexOfThis[idx];
-    const consumer = node.liveConsumerNode[idx];
-    assertConsumerNode(consumer);
-    consumer.producerIndexOfThis[idxProducer] = idx;
-  }
+	var _a$1;
+	assertProducerNode(node);
+	assertConsumerNode(node);
+	if (typeof ngDevMode !== "undefined" && ngDevMode && idx >= node.liveConsumerNode.length) {
+		throw new Error(`Assertion error: active consumer index ${idx} is out of bounds of ${node.liveConsumerNode.length} consumers)`);
+	}
+	if (node.liveConsumerNode.length === 1) {
+		(_a$1 = node.unwatched) == null ? void 0 : _a$1.call(node.wrapper);
+		for (let i$10 = 0; i$10 < node.producerNode.length; i$10++) {
+			producerRemoveLiveConsumerAtIndex(node.producerNode[i$10], node.producerIndexOfThis[i$10]);
+		}
+	}
+	const lastIdx = node.liveConsumerNode.length - 1;
+	node.liveConsumerNode[idx] = node.liveConsumerNode[lastIdx];
+	node.liveConsumerIndexOfThis[idx] = node.liveConsumerIndexOfThis[lastIdx];
+	node.liveConsumerNode.length--;
+	node.liveConsumerIndexOfThis.length--;
+	if (idx < node.liveConsumerNode.length) {
+		const idxProducer = node.liveConsumerIndexOfThis[idx];
+		const consumer = node.liveConsumerNode[idx];
+		assertConsumerNode(consumer);
+		consumer.producerIndexOfThis[idxProducer] = idx;
+	}
 }
 function consumerIsLive(node) {
-  var _a$1;
-  return (
-    node.consumerIsAlwaysLive ||
-    (((_a$1 = node == null ? void 0 : node.liveConsumerNode) == null ? void 0 : _a$1.length) ?? 0) >
-      0
-  );
+	var _a$1;
+	return node.consumerIsAlwaysLive || (((_a$1 = node == null ? void 0 : node.liveConsumerNode) == null ? void 0 : _a$1.length) ?? 0) > 0;
 }
 function assertConsumerNode(node) {
-  node.producerNode ?? (node.producerNode = []);
-  node.producerIndexOfThis ?? (node.producerIndexOfThis = []);
-  node.producerLastReadVersion ?? (node.producerLastReadVersion = []);
+	node.producerNode ?? (node.producerNode = []);
+	node.producerIndexOfThis ?? (node.producerIndexOfThis = []);
+	node.producerLastReadVersion ?? (node.producerLastReadVersion = []);
 }
 function assertProducerNode(node) {
-  node.liveConsumerNode ?? (node.liveConsumerNode = []);
-  node.liveConsumerIndexOfThis ?? (node.liveConsumerIndexOfThis = []);
+	node.liveConsumerNode ?? (node.liveConsumerNode = []);
+	node.liveConsumerIndexOfThis ?? (node.liveConsumerIndexOfThis = []);
 }
 /**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
+* @license
+* Copyright Google LLC All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
 function computedGet(node) {
-  producerUpdateValueVersion(node);
-  producerAccessed(node);
-  if (node.value === ERRORED) {
-    throw node.error;
-  }
-  return node.value;
+	producerUpdateValueVersion(node);
+	producerAccessed(node);
+	if (node.value === ERRORED) {
+		throw node.error;
+	}
+	return node.value;
 }
 function createComputed(computation) {
-  const node = Object.create(COMPUTED_NODE);
-  node.computation = computation;
-  const computed = () => computedGet(node);
-  computed[SIGNAL] = node;
-  return computed;
+	const node = Object.create(COMPUTED_NODE);
+	node.computation = computation;
+	const computed = () => computedGet(node);
+	computed[SIGNAL] = node;
+	return computed;
 }
 const UNSET = /* @__PURE__ */ Symbol("UNSET");
 const COMPUTING = /* @__PURE__ */ Symbol("COMPUTING");
 const ERRORED = /* @__PURE__ */ Symbol("ERRORED");
 const COMPUTED_NODE = /* @__PURE__ */ (() => {
-  return {
-    ...REACTIVE_NODE,
-    value: UNSET,
-    dirty: true,
-    error: null,
-    equal: defaultEquals,
-    producerMustRecompute(node) {
-      return node.value === UNSET || node.value === COMPUTING;
-    },
-    producerRecomputeValue(node) {
-      if (node.value === COMPUTING) {
-        throw new Error("Detected cycle in computations.");
-      }
-      const oldValue = node.value;
-      node.value = COMPUTING;
-      const prevConsumer = consumerBeforeComputation(node);
-      let newValue;
-      let wasEqual = false;
-      try {
-        newValue = node.computation.call(node.wrapper);
-        const oldOk = oldValue !== UNSET && oldValue !== ERRORED;
-        wasEqual = oldOk && node.equal.call(node.wrapper, oldValue, newValue);
-      } catch (err) {
-        newValue = ERRORED;
-        node.error = err;
-      } finally {
-        consumerAfterComputation(node, prevConsumer);
-      }
-      if (wasEqual) {
-        node.value = oldValue;
-        return;
-      }
-      node.value = newValue;
-      node.version++;
-    },
-  };
+	return {
+		...REACTIVE_NODE,
+		value: UNSET,
+		dirty: true,
+		error: null,
+		equal: defaultEquals,
+		producerMustRecompute(node) {
+			return node.value === UNSET || node.value === COMPUTING;
+		},
+		producerRecomputeValue(node) {
+			if (node.value === COMPUTING) {
+				throw new Error("Detected cycle in computations.");
+			}
+			const oldValue = node.value;
+			node.value = COMPUTING;
+			const prevConsumer = consumerBeforeComputation(node);
+			let newValue;
+			let wasEqual = false;
+			try {
+				newValue = node.computation.call(node.wrapper);
+				const oldOk = oldValue !== UNSET && oldValue !== ERRORED;
+				wasEqual = oldOk && node.equal.call(node.wrapper, oldValue, newValue);
+			} catch (err) {
+				newValue = ERRORED;
+				node.error = err;
+			} finally {
+				consumerAfterComputation(node, prevConsumer);
+			}
+			if (wasEqual) {
+				node.value = oldValue;
+				return;
+			}
+			node.value = newValue;
+			node.version++;
+		}
+	};
 })();
 /**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
+* @license
+* Copyright Google LLC All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
 function defaultThrowError() {
-  throw new Error();
+	throw new Error();
 }
 let throwInvalidWriteToSignalErrorFn = defaultThrowError;
 function throwInvalidWriteToSignalError() {
-  throwInvalidWriteToSignalErrorFn();
+	throwInvalidWriteToSignalErrorFn();
 }
 /**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
+* @license
+* Copyright Google LLC All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
 function createSignal(initialValue) {
-  const node = Object.create(SIGNAL_NODE);
-  node.value = initialValue;
-  const getter = () => {
-    producerAccessed(node);
-    return node.value;
-  };
-  getter[SIGNAL] = node;
-  return getter;
+	const node = Object.create(SIGNAL_NODE);
+	node.value = initialValue;
+	const getter = () => {
+		producerAccessed(node);
+		return node.value;
+	};
+	getter[SIGNAL] = node;
+	return getter;
 }
 function signalGetFn() {
-  producerAccessed(this);
-  return this.value;
+	producerAccessed(this);
+	return this.value;
 }
 function signalSetFn(node, newValue) {
-  if (!producerUpdatesAllowed()) {
-    throwInvalidWriteToSignalError();
-  }
-  if (!node.equal.call(node.wrapper, node.value, newValue)) {
-    node.value = newValue;
-    signalValueChanged(node);
-  }
+	if (!producerUpdatesAllowed()) {
+		throwInvalidWriteToSignalError();
+	}
+	if (!node.equal.call(node.wrapper, node.value, newValue)) {
+		node.value = newValue;
+		signalValueChanged(node);
+	}
 }
 const SIGNAL_NODE = /* @__PURE__ */ (() => {
-  return {
-    ...REACTIVE_NODE,
-    equal: defaultEquals,
-    value: void 0,
-  };
+	return {
+		...REACTIVE_NODE,
+		equal: defaultEquals,
+		value: void 0
+	};
 })();
 function signalValueChanged(node) {
-  node.version++;
-  producerIncrementEpoch();
-  producerNotifyConsumers(node);
+	node.version++;
+	producerIncrementEpoch();
+	producerNotifyConsumers(node);
 }
 /**
- * @license
- * Copyright 2024 Bloomberg Finance L.P.
- *
- * 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.
- */
+* @license
+* Copyright 2024 Bloomberg Finance L.P.
+*
+* 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.
+*/
 const NODE = Symbol("node");
 var Signal;
 ((Signal2) => {
-  var _a$1, _brand, brand_fn, _b, _brand2, brand_fn2;
-  class State {
-    constructor(initialValue, options = {}) {
-      __privateAdd(this, _brand);
-      __publicField(this, _a$1);
-      const ref = createSignal(initialValue);
-      const node = ref[SIGNAL];
-      this[NODE] = node;
-      node.wrapper = this;
-      if (options) {
-        const equals = options.equals;
-        if (equals) {
-          node.equal = equals;
-        }
-        node.watched = options[Signal2.subtle.watched];
-        node.unwatched = options[Signal2.subtle.unwatched];
-      }
-    }
-    get() {
-      if (!(0, Signal2.isState)(this))
-        throw new TypeError("Wrong receiver type for Signal.State.prototype.get");
-      return signalGetFn.call(this[NODE]);
-    }
-    set(newValue) {
-      if (!(0, Signal2.isState)(this))
-        throw new TypeError("Wrong receiver type for Signal.State.prototype.set");
-      if (isInNotificationPhase()) {
-        throw new Error("Writes to signals not permitted during Watcher callback");
-      }
-      const ref = this[NODE];
-      signalSetFn(ref, newValue);
-    }
-  }
-  _a$1 = NODE;
-  _brand = new WeakSet();
-  brand_fn = function () {};
-  Signal2.isState = (s$9) => typeof s$9 === "object" && __privateIn(_brand, s$9);
-  Signal2.State = State;
-  class Computed {
-    constructor(computation, options) {
-      __privateAdd(this, _brand2);
-      __publicField(this, _b);
-      const ref = createComputed(computation);
-      const node = ref[SIGNAL];
-      node.consumerAllowSignalWrites = true;
-      this[NODE] = node;
-      node.wrapper = this;
-      if (options) {
-        const equals = options.equals;
-        if (equals) {
-          node.equal = equals;
-        }
-        node.watched = options[Signal2.subtle.watched];
-        node.unwatched = options[Signal2.subtle.unwatched];
-      }
-    }
-    get() {
-      if (!(0, Signal2.isComputed)(this))
-        throw new TypeError("Wrong receiver type for Signal.Computed.prototype.get");
-      return computedGet(this[NODE]);
-    }
-  }
-  _b = NODE;
-  _brand2 = new WeakSet();
-  brand_fn2 = function () {};
-  Signal2.isComputed = (c$7) => typeof c$7 === "object" && __privateIn(_brand2, c$7);
-  Signal2.Computed = Computed;
-  ((subtle2) => {
-    var _a2, _brand3, brand_fn3, _assertSignals, assertSignals_fn;
-    function untrack(cb) {
-      let output;
-      let prevActiveConsumer = null;
-      try {
-        prevActiveConsumer = setActiveConsumer(null);
-        output = cb();
-      } finally {
-        setActiveConsumer(prevActiveConsumer);
-      }
-      return output;
-    }
-    subtle2.untrack = untrack;
-    function introspectSources(sink) {
-      var _a3;
-      if (!(0, Signal2.isComputed)(sink) && !(0, Signal2.isWatcher)(sink)) {
-        throw new TypeError("Called introspectSources without a Computed or Watcher argument");
-      }
-      return (
-        ((_a3 = sink[NODE].producerNode) == null ? void 0 : _a3.map((n$13) => n$13.wrapper)) ?? []
-      );
-    }
-    subtle2.introspectSources = introspectSources;
-    function introspectSinks(signal) {
-      var _a3;
-      if (!(0, Signal2.isComputed)(signal) && !(0, Signal2.isState)(signal)) {
-        throw new TypeError("Called introspectSinks without a Signal argument");
-      }
-      return (
-        ((_a3 = signal[NODE].liveConsumerNode) == null
-          ? void 0
-          : _a3.map((n$13) => n$13.wrapper)) ?? []
-      );
-    }
-    subtle2.introspectSinks = introspectSinks;
-    function hasSinks(signal) {
-      if (!(0, Signal2.isComputed)(signal) && !(0, Signal2.isState)(signal)) {
-        throw new TypeError("Called hasSinks without a Signal argument");
-      }
-      const liveConsumerNode = signal[NODE].liveConsumerNode;
-      if (!liveConsumerNode) return false;
-      return liveConsumerNode.length > 0;
-    }
-    subtle2.hasSinks = hasSinks;
-    function hasSources(signal) {
-      if (!(0, Signal2.isComputed)(signal) && !(0, Signal2.isWatcher)(signal)) {
-        throw new TypeError("Called hasSources without a Computed or Watcher argument");
-      }
-      const producerNode = signal[NODE].producerNode;
-      if (!producerNode) return false;
-      return producerNode.length > 0;
-    }
-    subtle2.hasSources = hasSources;
-    class Watcher {
-      constructor(notify) {
-        __privateAdd(this, _brand3);
-        __privateAdd(this, _assertSignals);
-        __publicField(this, _a2);
-        let node = Object.create(REACTIVE_NODE);
-        node.wrapper = this;
-        node.consumerMarkedDirty = notify;
-        node.consumerIsAlwaysLive = true;
-        node.consumerAllowSignalWrites = false;
-        node.producerNode = [];
-        this[NODE] = node;
-      }
-      watch(...signals) {
-        if (!(0, Signal2.isWatcher)(this)) {
-          throw new TypeError("Called unwatch without Watcher receiver");
-        }
-        __privateMethod(this, _assertSignals, assertSignals_fn).call(this, signals);
-        const node = this[NODE];
-        node.dirty = false;
-        const prev = setActiveConsumer(node);
-        for (const signal of signals) {
-          producerAccessed(signal[NODE]);
-        }
-        setActiveConsumer(prev);
-      }
-      unwatch(...signals) {
-        if (!(0, Signal2.isWatcher)(this)) {
-          throw new TypeError("Called unwatch without Watcher receiver");
-        }
-        __privateMethod(this, _assertSignals, assertSignals_fn).call(this, signals);
-        const node = this[NODE];
-        assertConsumerNode(node);
-        for (let i$10 = node.producerNode.length - 1; i$10 >= 0; i$10--) {
-          if (signals.includes(node.producerNode[i$10].wrapper)) {
-            producerRemoveLiveConsumerAtIndex(
-              node.producerNode[i$10],
-              node.producerIndexOfThis[i$10],
-            );
-            const lastIdx = node.producerNode.length - 1;
-            node.producerNode[i$10] = node.producerNode[lastIdx];
-            node.producerIndexOfThis[i$10] = node.producerIndexOfThis[lastIdx];
-            node.producerNode.length--;
-            node.producerIndexOfThis.length--;
-            node.nextProducerIndex--;
-            if (i$10 < node.producerNode.length) {
-              const idxConsumer = node.producerIndexOfThis[i$10];
-              const producer = node.producerNode[i$10];
-              assertProducerNode(producer);
-              producer.liveConsumerIndexOfThis[idxConsumer] = i$10;
-            }
-          }
-        }
-      }
-      getPending() {
-        if (!(0, Signal2.isWatcher)(this)) {
-          throw new TypeError("Called getPending without Watcher receiver");
-        }
-        const node = this[NODE];
-        return node.producerNode.filter((n$13) => n$13.dirty).map((n$13) => n$13.wrapper);
-      }
-    }
-    _a2 = NODE;
-    _brand3 = new WeakSet();
-    brand_fn3 = function () {};
-    _assertSignals = new WeakSet();
-    assertSignals_fn = function (signals) {
-      for (const signal of signals) {
-        if (!(0, Signal2.isComputed)(signal) && !(0, Signal2.isState)(signal)) {
-          throw new TypeError("Called watch/unwatch without a Computed or State argument");
-        }
-      }
-    };
-    Signal2.isWatcher = (w$1) => __privateIn(_brand3, w$1);
-    subtle2.Watcher = Watcher;
-    function currentComputed() {
-      var _a3;
-      return (_a3 = getActiveConsumer()) == null ? void 0 : _a3.wrapper;
-    }
-    subtle2.currentComputed = currentComputed;
-    subtle2.watched = Symbol("watched");
-    subtle2.unwatched = Symbol("unwatched");
-  })(Signal2.subtle || (Signal2.subtle = {}));
+	var _a$1, _brand, brand_fn, _b, _brand2, brand_fn2;
+	class State {
+		constructor(initialValue, options = {}) {
+			__privateAdd(this, _brand);
+			__publicField(this, _a$1);
+			const ref = createSignal(initialValue);
+			const node = ref[SIGNAL];
+			this[NODE] = node;
+			node.wrapper = this;
+			if (options) {
+				const equals = options.equals;
+				if (equals) {
+					node.equal = equals;
+				}
+				node.watched = options[Signal2.subtle.watched];
+				node.unwatched = options[Signal2.subtle.unwatched];
+			}
+		}
+		get() {
+			if (!(0, Signal2.isState)(this)) throw new TypeError("Wrong receiver type for Signal.State.prototype.get");
+			return signalGetFn.call(this[NODE]);
+		}
+		set(newValue) {
+			if (!(0, Signal2.isState)(this)) throw new TypeError("Wrong receiver type for Signal.State.prototype.set");
+			if (isInNotificationPhase()) {
+				throw new Error("Writes to signals not permitted during Watcher callback");
+			}
+			const ref = this[NODE];
+			signalSetFn(ref, newValue);
+		}
+	}
+	_a$1 = NODE;
+	_brand = new WeakSet();
+	brand_fn = function() {};
+	Signal2.isState = (s$9) => typeof s$9 === "object" && __privateIn(_brand, s$9);
+	Signal2.State = State;
+	class Computed {
+		constructor(computation, options) {
+			__privateAdd(this, _brand2);
+			__publicField(this, _b);
+			const ref = createComputed(computation);
+			const node = ref[SIGNAL];
+			node.consumerAllowSignalWrites = true;
+			this[NODE] = node;
+			node.wrapper = this;
+			if (options) {
+				const equals = options.equals;
+				if (equals) {
+					node.equal = equals;
+				}
+				node.watched = options[Signal2.subtle.watched];
+				node.unwatched = options[Signal2.subtle.unwatched];
+			}
+		}
+		get() {
+			if (!(0, Signal2.isComputed)(this)) throw new TypeError("Wrong receiver type for Signal.Computed.prototype.get");
+			return computedGet(this[NODE]);
+		}
+	}
+	_b = NODE;
+	_brand2 = new WeakSet();
+	brand_fn2 = function() {};
+	Signal2.isComputed = (c$7) => typeof c$7 === "object" && __privateIn(_brand2, c$7);
+	Signal2.Computed = Computed;
+	((subtle2) => {
+		var _a2, _brand3, brand_fn3, _assertSignals, assertSignals_fn;
+		function untrack(cb) {
+			let output;
+			let prevActiveConsumer = null;
+			try {
+				prevActiveConsumer = setActiveConsumer(null);
+				output = cb();
+			} finally {
+				setActiveConsumer(prevActiveConsumer);
+			}
+			return output;
+		}
+		subtle2.untrack = untrack;
+		function introspectSources(sink) {
+			var _a3;
+			if (!(0, Signal2.isComputed)(sink) && !(0, Signal2.isWatcher)(sink)) {
+				throw new TypeError("Called introspectSources without a Computed or Watcher argument");
+			}
+			return ((_a3 = sink[NODE].producerNode) == null ? void 0 : _a3.map((n$13) => n$13.wrapper)) ?? [];
+		}
+		subtle2.introspectSources = introspectSources;
+		function introspectSinks(signal) {
+			var _a3;
+			if (!(0, Signal2.isComputed)(signal) && !(0, Signal2.isState)(signal)) {
+				throw new TypeError("Called introspectSinks without a Signal argument");
+			}
+			return ((_a3 = signal[NODE].liveConsumerNode) == null ? void 0 : _a3.map((n$13) => n$13.wrapper)) ?? [];
+		}
+		subtle2.introspectSinks = introspectSinks;
+		function hasSinks(signal) {
+			if (!(0, Signal2.isComputed)(signal) && !(0, Signal2.isState)(signal)) {
+				throw new TypeError("Called hasSinks without a Signal argument");
+			}
+			const liveConsumerNode = signal[NODE].liveConsumerNode;
+			if (!liveConsumerNode) return false;
+			return liveConsumerNode.length > 0;
+		}
+		subtle2.hasSinks = hasSinks;
+		function hasSources(signal) {
+			if (!(0, Signal2.isComputed)(signal) && !(0, Signal2.isWatcher)(signal)) {
+				throw new TypeError("Called hasSources without a Computed or Watcher argument");
+			}
+			const producerNode = signal[NODE].producerNode;
+			if (!producerNode) return false;
+			return producerNode.length > 0;
+		}
+		subtle2.hasSources = hasSources;
+		class Watcher {
+			constructor(notify) {
+				__privateAdd(this, _brand3);
+				__privateAdd(this, _assertSignals);
+				__publicField(this, _a2);
+				let node = Object.create(REACTIVE_NODE);
+				node.wrapper = this;
+				node.consumerMarkedDirty = notify;
+				node.consumerIsAlwaysLive = true;
+				node.consumerAllowSignalWrites = false;
+				node.producerNode = [];
+				this[NODE] = node;
+			}
+			watch(...signals) {
+				if (!(0, Signal2.isWatcher)(this)) {
+					throw new TypeError("Called unwatch without Watcher receiver");
+				}
+				__privateMethod(this, _assertSignals, assertSignals_fn).call(this, signals);
+				const node = this[NODE];
+				node.dirty = false;
+				const prev = setActiveConsumer(node);
+				for (const signal of signals) {
+					producerAccessed(signal[NODE]);
+				}
+				setActiveConsumer(prev);
+			}
+			unwatch(...signals) {
+				if (!(0, Signal2.isWatcher)(this)) {
+					throw new TypeError("Called unwatch without Watcher receiver");
+				}
+				__privateMethod(this, _assertSignals, assertSignals_fn).call(this, signals);
+				const node = this[NODE];
+				assertConsumerNode(node);
+				for (let i$10 = node.producerNode.length - 1; i$10 >= 0; i$10--) {
+					if (signals.includes(node.producerNode[i$10].wrapper)) {
+						producerRemoveLiveConsumerAtIndex(node.producerNode[i$10], node.producerIndexOfThis[i$10]);
+						const lastIdx = node.producerNode.length - 1;
+						node.producerNode[i$10] = node.producerNode[lastIdx];
+						node.producerIndexOfThis[i$10] = node.producerIndexOfThis[lastIdx];
+						node.producerNode.length--;
+						node.producerIndexOfThis.length--;
+						node.nextProducerIndex--;
+						if (i$10 < node.producerNode.length) {
+							const idxConsumer = node.producerIndexOfThis[i$10];
+							const producer = node.producerNode[i$10];
+							assertProducerNode(producer);
+							producer.liveConsumerIndexOfThis[idxConsumer] = i$10;
+						}
+					}
+				}
+			}
+			getPending() {
+				if (!(0, Signal2.isWatcher)(this)) {
+					throw new TypeError("Called getPending without Watcher receiver");
+				}
+				const node = this[NODE];
+				return node.producerNode.filter((n$13) => n$13.dirty).map((n$13) => n$13.wrapper);
+			}
+		}
+		_a2 = NODE;
+		_brand3 = new WeakSet();
+		brand_fn3 = function() {};
+		_assertSignals = new WeakSet();
+		assertSignals_fn = function(signals) {
+			for (const signal of signals) {
+				if (!(0, Signal2.isComputed)(signal) && !(0, Signal2.isState)(signal)) {
+					throw new TypeError("Called watch/unwatch without a Computed or State argument");
+				}
+			}
+		};
+		Signal2.isWatcher = (w$1) => __privateIn(_brand3, w$1);
+		subtle2.Watcher = Watcher;
+		function currentComputed() {
+			var _a3;
+			return (_a3 = getActiveConsumer()) == null ? void 0 : _a3.wrapper;
+		}
+		subtle2.currentComputed = currentComputed;
+		subtle2.watched = Symbol("watched");
+		subtle2.unwatched = Symbol("unwatched");
+	})(Signal2.subtle || (Signal2.subtle = {}));
 })(Signal || (Signal = {}));
 
 /**
- * equality check here is always false so that we can dirty the storage
- * via setting to _anything_
- *
- *
- * This is for a pattern where we don't *directly* use signals to back the values used in collections
- * so that instanceof checks and getters and other native features "just work" without having
- * to do nested proxying.
- *
- * (though, see deep.ts for nested / deep behavior)
- */
+* equality check here is always false so that we can dirty the storage
+* via setting to _anything_
+*
+*
+* This is for a pattern where we don't *directly* use signals to back the values used in collections
+* so that instanceof checks and getters and other native features "just work" without having
+* to do nested proxying.
+*
+* (though, see deep.ts for nested / deep behavior)
+*/
 const createStorage = (initial = null) => new Signal.State(initial, { equals: () => false });
 /**
- * Just an alias for brevity
- */
+* Just an alias for brevity
+*/
 const BOUND_FUNS = new WeakMap();
 function fnCacheFor(context) {
-  let fnCache = BOUND_FUNS.get(context);
-  if (!fnCache) {
-    fnCache = new Map();
-    BOUND_FUNS.set(context, fnCache);
-  }
-  return fnCache;
+	let fnCache = BOUND_FUNS.get(context);
+	if (!fnCache) {
+		fnCache = new Map();
+		BOUND_FUNS.set(context, fnCache);
+	}
+	return fnCache;
 }
 
 const ARRAY_GETTER_METHODS = new Set([
-  Symbol.iterator,
-  "concat",
-  "entries",
-  "every",
-  "filter",
-  "find",
-  "findIndex",
-  "flat",
-  "flatMap",
-  "forEach",
-  "includes",
-  "indexOf",
-  "join",
-  "keys",
-  "lastIndexOf",
-  "map",
-  "reduce",
-  "reduceRight",
-  "slice",
-  "some",
-  "values",
+	Symbol.iterator,
+	"concat",
+	"entries",
+	"every",
+	"filter",
+	"find",
+	"findIndex",
+	"flat",
+	"flatMap",
+	"forEach",
+	"includes",
+	"indexOf",
+	"join",
+	"keys",
+	"lastIndexOf",
+	"map",
+	"reduce",
+	"reduceRight",
+	"slice",
+	"some",
+	"values"
+]);
+const ARRAY_WRITE_THEN_READ_METHODS = new Set([
+	"fill",
+	"push",
+	"unshift"
 ]);
-const ARRAY_WRITE_THEN_READ_METHODS = new Set(["fill", "push", "unshift"]);
 function convertToInt(prop) {
-  if (typeof prop === "symbol") return null;
-  const num = Number(prop);
-  if (isNaN(num)) return null;
-  return num % 1 === 0 ? num : null;
+	if (typeof prop === "symbol") return null;
+	const num = Number(prop);
+	if (isNaN(num)) return null;
+	return num % 1 === 0 ? num : null;
 }
 var SignalArray = class SignalArray {
-  /**
-   * Creates an array from an iterable object.
-   * @param iterable An iterable object to convert to an array.
-   */
-  /**
-   * Creates an array from an iterable object.
-   * @param iterable An iterable object to convert to an array.
-   * @param mapfn A mapping function to call on every element of the array.
-   * @param thisArg Value of 'this' used to invoke the mapfn.
-   */
-  static from(iterable, mapfn, thisArg) {
-    return mapfn
-      ? new SignalArray(Array.from(iterable, mapfn, thisArg))
-      : new SignalArray(Array.from(iterable));
-  }
-  static of(...arr) {
-    return new SignalArray(arr);
-  }
-  constructor(arr = []) {
-    let clone = arr.slice();
-    let self = this;
-    let boundFns = new Map();
-    /**
+	/**
+	* Creates an array from an iterable object.
+	* @param iterable An iterable object to convert to an array.
+	*/
+	/**
+	* Creates an array from an iterable object.
+	* @param iterable An iterable object to convert to an array.
+	* @param mapfn A mapping function to call on every element of the array.
+	* @param thisArg Value of 'this' used to invoke the mapfn.
+	*/
+	static from(iterable, mapfn, thisArg) {
+		return mapfn ? new SignalArray(Array.from(iterable, mapfn, thisArg)) : new SignalArray(Array.from(iterable));
+	}
+	static of(...arr) {
+		return new SignalArray(arr);
+	}
+	constructor(arr = []) {
+		let clone = arr.slice();
+		let self = this;
+		let boundFns = new Map();
+		/**
 		Flag to track whether we have *just* intercepted a call to `.push()` or
 		`.unshift()`, since in those cases (and only those cases!) the `Array`
 		itself checks `.length` to return from the function call.
 		*/
-    let nativelyAccessingLengthFromPushOrUnshift = false;
-    return new Proxy(clone, {
-      get(target, prop) {
-        let index = convertToInt(prop);
-        if (index !== null) {
-          self.#readStorageFor(index);
-          self.#collection.get();
-          return target[index];
-        }
-        if (prop === "length") {
-          if (nativelyAccessingLengthFromPushOrUnshift) {
-            nativelyAccessingLengthFromPushOrUnshift = false;
-          } else {
-            self.#collection.get();
-          }
-          return target[prop];
-        }
-        if (ARRAY_WRITE_THEN_READ_METHODS.has(prop)) {
-          nativelyAccessingLengthFromPushOrUnshift = true;
-        }
-        if (ARRAY_GETTER_METHODS.has(prop)) {
-          let fn = boundFns.get(prop);
-          if (fn === undefined) {
-            fn = (...args) => {
-              self.#collection.get();
-              return target[prop](...args);
-            };
-            boundFns.set(prop, fn);
-          }
-          return fn;
-        }
-        return target[prop];
-      },
-      set(target, prop, value) {
-        target[prop] = value;
-        let index = convertToInt(prop);
-        if (index !== null) {
-          self.#dirtyStorageFor(index);
-          self.#collection.set(null);
-        } else if (prop === "length") {
-          self.#collection.set(null);
-        }
-        return true;
-      },
-      getPrototypeOf() {
-        return SignalArray.prototype;
-      },
-    });
-  }
-  #collection = createStorage();
-  #storages = new Map();
-  #readStorageFor(index) {
-    let storage = this.#storages.get(index);
-    if (storage === undefined) {
-      storage = createStorage();
-      this.#storages.set(index, storage);
-    }
-    storage.get();
-  }
-  #dirtyStorageFor(index) {
-    const storage = this.#storages.get(index);
-    if (storage) {
-      storage.set(null);
-    }
-  }
+		let nativelyAccessingLengthFromPushOrUnshift = false;
+		return new Proxy(clone, {
+			get(target, prop) {
+				let index = convertToInt(prop);
+				if (index !== null) {
+					self.#readStorageFor(index);
+					self.#collection.get();
+					return target[index];
+				}
+				if (prop === "length") {
+					if (nativelyAccessingLengthFromPushOrUnshift) {
+						nativelyAccessingLengthFromPushOrUnshift = false;
+					} else {
+						self.#collection.get();
+					}
+					return target[prop];
+				}
+				if (ARRAY_WRITE_THEN_READ_METHODS.has(prop)) {
+					nativelyAccessingLengthFromPushOrUnshift = true;
+				}
+				if (ARRAY_GETTER_METHODS.has(prop)) {
+					let fn = boundFns.get(prop);
+					if (fn === undefined) {
+						fn = (...args) => {
+							self.#collection.get();
+							return target[prop](...args);
+						};
+						boundFns.set(prop, fn);
+					}
+					return fn;
+				}
+				return target[prop];
+			},
+			set(target, prop, value) {
+				target[prop] = value;
+				let index = convertToInt(prop);
+				if (index !== null) {
+					self.#dirtyStorageFor(index);
+					self.#collection.set(null);
+				} else if (prop === "length") {
+					self.#collection.set(null);
+				}
+				return true;
+			},
+			getPrototypeOf() {
+				return SignalArray.prototype;
+			}
+		});
+	}
+	#collection = createStorage();
+	#storages = new Map();
+	#readStorageFor(index) {
+		let storage = this.#storages.get(index);
+		if (storage === undefined) {
+			storage = createStorage();
+			this.#storages.set(index, storage);
+		}
+		storage.get();
+	}
+	#dirtyStorageFor(index) {
+		const storage = this.#storages.get(index);
+		if (storage) {
+			storage.set(null);
+		}
+	}
 };
 Object.setPrototypeOf(SignalArray.prototype, Array.prototype);
 function signalArray(x$1) {
-  return new SignalArray(x$1);
+	return new SignalArray(x$1);
 }
 
 var SignalMap = class {
-  collection = createStorage();
-  storages = new Map();
-  vals;
-  readStorageFor(key) {
-    const { storages } = this;
-    let storage = storages.get(key);
-    if (storage === undefined) {
-      storage = createStorage();
-      storages.set(key, storage);
-    }
-    storage.get();
-  }
-  dirtyStorageFor(key) {
-    const storage = this.storages.get(key);
-    if (storage) {
-      storage.set(null);
-    }
-  }
-  constructor(existing) {
-    this.vals = existing ? new Map(existing) : new Map();
-  }
-  get(key) {
-    this.readStorageFor(key);
-    return this.vals.get(key);
-  }
-  has(key) {
-    this.readStorageFor(key);
-    return this.vals.has(key);
-  }
-  entries() {
-    this.collection.get();
-    return this.vals.entries();
-  }
-  keys() {
-    this.collection.get();
-    return this.vals.keys();
-  }
-  values() {
-    this.collection.get();
-    return this.vals.values();
-  }
-  forEach(fn) {
-    this.collection.get();
-    this.vals.forEach(fn);
-  }
-  get size() {
-    this.collection.get();
-    return this.vals.size;
-  }
-  [Symbol.iterator]() {
-    this.collection.get();
-    return this.vals[Symbol.iterator]();
-  }
-  get [Symbol.toStringTag]() {
-    return this.vals[Symbol.toStringTag];
-  }
-  set(key, value) {
-    this.dirtyStorageFor(key);
-    this.collection.set(null);
-    this.vals.set(key, value);
-    return this;
-  }
-  delete(key) {
-    this.dirtyStorageFor(key);
-    this.collection.set(null);
-    return this.vals.delete(key);
-  }
-  clear() {
-    this.storages.forEach((s$9) => s$9.set(null));
-    this.collection.set(null);
-    this.vals.clear();
-  }
+	collection = createStorage();
+	storages = new Map();
+	vals;
+	readStorageFor(key) {
+		const { storages } = this;
+		let storage = storages.get(key);
+		if (storage === undefined) {
+			storage = createStorage();
+			storages.set(key, storage);
+		}
+		storage.get();
+	}
+	dirtyStorageFor(key) {
+		const storage = this.storages.get(key);
+		if (storage) {
+			storage.set(null);
+		}
+	}
+	constructor(existing) {
+		this.vals = existing ? new Map(existing) : new Map();
+	}
+	get(key) {
+		this.readStorageFor(key);
+		return this.vals.get(key);
+	}
+	has(key) {
+		this.readStorageFor(key);
+		return this.vals.has(key);
+	}
+	entries() {
+		this.collection.get();
+		return this.vals.entries();
+	}
+	keys() {
+		this.collection.get();
+		return this.vals.keys();
+	}
+	values() {
+		this.collection.get();
+		return this.vals.values();
+	}
+	forEach(fn) {
+		this.collection.get();
+		this.vals.forEach(fn);
+	}
+	get size() {
+		this.collection.get();
+		return this.vals.size;
+	}
+	[Symbol.iterator]() {
+		this.collection.get();
+		return this.vals[Symbol.iterator]();
+	}
+	get [Symbol.toStringTag]() {
+		return this.vals[Symbol.toStringTag];
+	}
+	set(key, value) {
+		this.dirtyStorageFor(key);
+		this.collection.set(null);
+		this.vals.set(key, value);
+		return this;
+	}
+	delete(key) {
+		this.dirtyStorageFor(key);
+		this.collection.set(null);
+		return this.vals.delete(key);
+	}
+	clear() {
+		this.storages.forEach((s$9) => s$9.set(null));
+		this.collection.set(null);
+		this.vals.clear();
+	}
 };
 Object.setPrototypeOf(SignalMap.prototype, Map.prototype);
 
 /**
- * Implementation based of tracked-built-ins' TrackedObject
- * https://github.com/tracked-tools/tracked-built-ins/blob/master/addon/src/-private/object.js
- */
+* Implementation based of tracked-built-ins' TrackedObject
+* https://github.com/tracked-tools/tracked-built-ins/blob/master/addon/src/-private/object.js
+*/
 var SignalObjectImpl = class SignalObjectImpl {
-  static fromEntries(entries) {
-    return new SignalObjectImpl(Object.fromEntries(entries));
-  }
-  #storages = new Map();
-  #collection = createStorage();
-  constructor(obj = {}) {
-    let proto = Object.getPrototypeOf(obj);
-    let descs = Object.getOwnPropertyDescriptors(obj);
-    let clone = Object.create(proto);
-    for (let prop in descs) {
-      Object.defineProperty(clone, prop, descs[prop]);
-    }
-    let self = this;
-    return new Proxy(clone, {
-      get(target, prop, receiver) {
-        self.#readStorageFor(prop);
-        return Reflect.get(target, prop, receiver);
-      },
-      has(target, prop) {
-        self.#readStorageFor(prop);
-        return prop in target;
-      },
-      ownKeys(target) {
-        self.#collection.get();
-        return Reflect.ownKeys(target);
-      },
-      set(target, prop, value, receiver) {
-        let result = Reflect.set(target, prop, value, receiver);
-        self.#dirtyStorageFor(prop);
-        self.#dirtyCollection();
-        return result;
-      },
-      deleteProperty(target, prop) {
-        if (prop in target) {
-          delete target[prop];
-          self.#dirtyStorageFor(prop);
-          self.#dirtyCollection();
-        }
-        return true;
-      },
-      getPrototypeOf() {
-        return SignalObjectImpl.prototype;
-      },
-    });
-  }
-  #readStorageFor(key) {
-    let storage = this.#storages.get(key);
-    if (storage === undefined) {
-      storage = createStorage();
-      this.#storages.set(key, storage);
-    }
-    storage.get();
-  }
-  #dirtyStorageFor(key) {
-    const storage = this.#storages.get(key);
-    if (storage) {
-      storage.set(null);
-    }
-  }
-  #dirtyCollection() {
-    this.#collection.set(null);
-  }
+	static fromEntries(entries) {
+		return new SignalObjectImpl(Object.fromEntries(entries));
+	}
+	#storages = new Map();
+	#collection = createStorage();
+	constructor(obj = {}) {
+		let proto = Object.getPrototypeOf(obj);
+		let descs = Object.getOwnPropertyDescriptors(obj);
+		let clone = Object.create(proto);
+		for (let prop in descs) {
+			Object.defineProperty(clone, prop, descs[prop]);
+		}
+		let self = this;
+		return new Proxy(clone, {
+			get(target, prop, receiver) {
+				self.#readStorageFor(prop);
+				return Reflect.get(target, prop, receiver);
+			},
+			has(target, prop) {
+				self.#readStorageFor(prop);
+				return prop in target;
+			},
+			ownKeys(target) {
+				self.#collection.get();
+				return Reflect.ownKeys(target);
+			},
+			set(target, prop, value, receiver) {
+				let result = Reflect.set(target, prop, value, receiver);
+				self.#dirtyStorageFor(prop);
+				self.#dirtyCollection();
+				return result;
+			},
+			deleteProperty(target, prop) {
+				if (prop in target) {
+					delete target[prop];
+					self.#dirtyStorageFor(prop);
+					self.#dirtyCollection();
+				}
+				return true;
+			},
+			getPrototypeOf() {
+				return SignalObjectImpl.prototype;
+			}
+		});
+	}
+	#readStorageFor(key) {
+		let storage = this.#storages.get(key);
+		if (storage === undefined) {
+			storage = createStorage();
+			this.#storages.set(key, storage);
+		}
+		storage.get();
+	}
+	#dirtyStorageFor(key) {
+		const storage = this.#storages.get(key);
+		if (storage) {
+			storage.set(null);
+		}
+	}
+	#dirtyCollection() {
+		this.#collection.set(null);
+	}
 };
 /**
- * Create a reactive Object, backed by Signals, using a Proxy.
- * This allows dynamic creation and deletion of signals using the object primitive
- * APIs that most folks are familiar with -- the only difference is instantiation.
- * ```js
- * const obj = new SignalObject({ foo: 123 });
- *
- * obj.foo // 123
- * obj.foo = 456
- * obj.foo // 456
- * obj.bar = 2
- * obj.bar // 2
- * ```
- */
+* Create a reactive Object, backed by Signals, using a Proxy.
+* This allows dynamic creation and deletion of signals using the object primitive
+* APIs that most folks are familiar with -- the only difference is instantiation.
+* ```js
+* const obj = new SignalObject({ foo: 123 });
+*
+* obj.foo // 123
+* obj.foo = 456
+* obj.foo // 456
+* obj.bar = 2
+* obj.bar // 2
+* ```
+*/
 const SignalObject = SignalObjectImpl;
 function signalObject(obj) {
-  return new SignalObject(obj);
+	return new SignalObject(obj);
 }
 
 var SignalSet = class {
-  collection = createStorage();
-  storages = new Map();
-  vals;
-  storageFor(key) {
-    const storages = this.storages;
-    let storage = storages.get(key);
-    if (storage === undefined) {
-      storage = createStorage();
-      storages.set(key, storage);
-    }
-    return storage;
-  }
-  dirtyStorageFor(key) {
-    const storage = this.storages.get(key);
-    if (storage) {
-      storage.set(null);
-    }
-  }
-  constructor(existing) {
-    this.vals = new Set(existing);
-  }
-  has(value) {
-    this.storageFor(value).get();
-    return this.vals.has(value);
-  }
-  entries() {
-    this.collection.get();
-    return this.vals.entries();
-  }
-  keys() {
-    this.collection.get();
-    return this.vals.keys();
-  }
-  values() {
-    this.collection.get();
-    return this.vals.values();
-  }
-  forEach(fn) {
-    this.collection.get();
-    this.vals.forEach(fn);
-  }
-  get size() {
-    this.collection.get();
-    return this.vals.size;
-  }
-  [Symbol.iterator]() {
-    this.collection.get();
-    return this.vals[Symbol.iterator]();
-  }
-  get [Symbol.toStringTag]() {
-    return this.vals[Symbol.toStringTag];
-  }
-  add(value) {
-    this.dirtyStorageFor(value);
-    this.collection.set(null);
-    this.vals.add(value);
-    return this;
-  }
-  delete(value) {
-    this.dirtyStorageFor(value);
-    this.collection.set(null);
-    return this.vals.delete(value);
-  }
-  clear() {
-    this.storages.forEach((s$9) => s$9.set(null));
-    this.collection.set(null);
-    this.vals.clear();
-  }
+	collection = createStorage();
+	storages = new Map();
+	vals;
+	storageFor(key) {
+		const storages = this.storages;
+		let storage = storages.get(key);
+		if (storage === undefined) {
+			storage = createStorage();
+			storages.set(key, storage);
+		}
+		return storage;
+	}
+	dirtyStorageFor(key) {
+		const storage = this.storages.get(key);
+		if (storage) {
+			storage.set(null);
+		}
+	}
+	constructor(existing) {
+		this.vals = new Set(existing);
+	}
+	has(value) {
+		this.storageFor(value).get();
+		return this.vals.has(value);
+	}
+	entries() {
+		this.collection.get();
+		return this.vals.entries();
+	}
+	keys() {
+		this.collection.get();
+		return this.vals.keys();
+	}
+	values() {
+		this.collection.get();
+		return this.vals.values();
+	}
+	forEach(fn) {
+		this.collection.get();
+		this.vals.forEach(fn);
+	}
+	get size() {
+		this.collection.get();
+		return this.vals.size;
+	}
+	[Symbol.iterator]() {
+		this.collection.get();
+		return this.vals[Symbol.iterator]();
+	}
+	get [Symbol.toStringTag]() {
+		return this.vals[Symbol.toStringTag];
+	}
+	add(value) {
+		this.dirtyStorageFor(value);
+		this.collection.set(null);
+		this.vals.add(value);
+		return this;
+	}
+	delete(value) {
+		this.dirtyStorageFor(value);
+		this.collection.set(null);
+		return this.vals.delete(value);
+	}
+	clear() {
+		this.storages.forEach((s$9) => s$9.set(null));
+		this.collection.set(null);
+		this.vals.clear();
+	}
 };
 Object.setPrototypeOf(SignalSet.prototype, Set.prototype);
 
 function create() {
-  return new A2uiMessageProcessor({
-    arrayCtor: SignalArray,
-    mapCtor: SignalMap,
-    objCtor: SignalObject,
-    setCtor: SignalSet,
-  });
+	return new A2uiMessageProcessor({
+		arrayCtor: SignalArray,
+		mapCtor: SignalMap,
+		objCtor: SignalObject,
+		setCtor: SignalSet
+	});
 }
 
 var server_to_client_with_standard_catalog_default = {
-  title: "A2UI Message Schema",
-  description:
-    "Describes a JSON payload for an A2UI (Agent to UI) message, which is used to dynamically construct and update user interfaces. A message MUST contain exactly ONE of the action properties: 'beginRendering', 'surfaceUpdate', 'dataModelUpdate', or 'deleteSurface'.",
-  type: "object",
-  additionalProperties: false,
-  properties: {
-    beginRendering: {
-      type: "object",
-      description:
-        "Signals the client to begin rendering a surface with a root component and specific styles.",
-      additionalProperties: false,
-      properties: {
-        surfaceId: {
-          type: "string",
-          description: "The unique identifier for the UI surface to be rendered.",
-        },
-        root: {
-          type: "string",
-          description: "The ID of the root component to render.",
-        },
-        styles: {
-          type: "object",
-          description: "Styling information for the UI.",
-          additionalProperties: false,
-          properties: {
-            font: {
-              type: "string",
-              description: "The primary font for the UI.",
-            },
-            primaryColor: {
-              type: "string",
-              description: "The primary UI color as a hexadecimal code (e.g., '#00BFFF').",
-              pattern: "^#[0-9a-fA-F]{6}$",
-            },
-          },
-        },
-      },
-      required: ["root", "surfaceId"],
-    },
-    surfaceUpdate: {
-      type: "object",
-      description: "Updates a surface with a new set of components.",
-      additionalProperties: false,
-      properties: {
-        surfaceId: {
-          type: "string",
-          description:
-            "The unique identifier for the UI surface to be updated. If you are adding a new surface this *must* be a new, unique identified that has never been used for any existing surfaces shown.",
-        },
-        components: {
-          type: "array",
-          description: "A list containing all UI components for the surface.",
-          minItems: 1,
-          items: {
-            type: "object",
-            description:
-              "Represents a *single* component in a UI widget tree. This component could be one of many supported types.",
-            additionalProperties: false,
-            properties: {
-              id: {
-                type: "string",
-                description: "The unique identifier for this component.",
-              },
-              weight: {
-                type: "number",
-                description:
-                  "The relative weight of this component within a Row or Column. This corresponds to the CSS 'flex-grow' property. Note: this may ONLY be set when the component is a direct descendant of a Row or Column.",
-              },
-              component: {
-                type: "object",
-                description:
-                  "A wrapper object that MUST contain exactly one key, which is the name of the component type (e.g., 'Heading'). The value is an object containing the properties for that specific component.",
-                additionalProperties: false,
-                properties: {
-                  Text: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      text: {
-                        type: "object",
-                        description:
-                          "The text content to display. This can be a literal string or a reference to a value in the data model ('path', e.g., '/doc/title'). While simple Markdown formatting is supported (i.e. without HTML, images, or links), utilizing dedicated UI components is generally preferred for a richer and more structured presentation.",
-                        additionalProperties: false,
-                        properties: {
-                          literalString: { type: "string" },
-                          path: { type: "string" },
-                        },
-                      },
-                      usageHint: {
-                        type: "string",
-                        description:
-                          "A hint for the base text style. One of:\n- `h1`: Largest heading.\n- `h2`: Second largest heading.\n- `h3`: Third largest heading.\n- `h4`: Fourth largest heading.\n- `h5`: Fifth largest heading.\n- `caption`: Small text for captions.\n- `body`: Standard body text.",
-                        enum: ["h1", "h2", "h3", "h4", "h5", "caption", "body"],
-                      },
-                    },
-                    required: ["text"],
-                  },
-                  Image: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      url: {
-                        type: "object",
-                        description:
-                          "The URL of the image to display. This can be a literal string ('literal') or a reference to a value in the data model ('path', e.g. '/thumbnail/url').",
-                        additionalProperties: false,
-                        properties: {
-                          literalString: { type: "string" },
-                          path: { type: "string" },
-                        },
-                      },
-                      fit: {
-                        type: "string",
-                        description:
-                          "Specifies how the image should be resized to fit its container. This corresponds to the CSS 'object-fit' property.",
-                        enum: ["contain", "cover", "fill", "none", "scale-down"],
-                      },
-                      usageHint: {
-                        type: "string",
-                        description:
-                          "A hint for the image size and style. One of:\n- `icon`: Small square icon.\n- `avatar`: Circular avatar image.\n- `smallFeature`: Small feature image.\n- `mediumFeature`: Medium feature image.\n- `largeFeature`: Large feature image.\n- `header`: Full-width, full bleed, header image.",
-                        enum: [
-                          "icon",
-                          "avatar",
-                          "smallFeature",
-                          "mediumFeature",
-                          "largeFeature",
-                          "header",
-                        ],
-                      },
-                    },
-                    required: ["url"],
-                  },
-                  Icon: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      name: {
-                        type: "object",
-                        description:
-                          "The name of the icon to display. This can be a literal string or a reference to a value in the data model ('path', e.g. '/form/submit').",
-                        additionalProperties: false,
-                        properties: {
-                          literalString: {
-                            type: "string",
-                            enum: [
-                              "accountCircle",
-                              "add",
-                              "arrowBack",
-                              "arrowForward",
-                              "attachFile",
-                              "calendarToday",
-                              "call",
-                              "camera",
-                              "check",
-                              "close",
-                              "delete",
-                              "download",
-                              "edit",
-                              "event",
-                              "error",
-                              "favorite",
-                              "favoriteOff",
-                              "folder",
-                              "help",
-                              "home",
-                              "info",
-                              "locationOn",
-                              "lock",
-                              "lockOpen",
-                              "mail",
-                              "menu",
-                              "moreVert",
-                              "moreHoriz",
-                              "notificationsOff",
-                              "notifications",
-                              "payment",
-                              "person",
-                              "phone",
-                              "photo",
-                              "print",
-                              "refresh",
-                              "search",
-                              "send",
-                              "settings",
-                              "share",
-                              "shoppingCart",
-                              "star",
-                              "starHalf",
-                              "starOff",
-                              "upload",
-                              "visibility",
-                              "visibilityOff",
-                              "warning",
-                            ],
-                          },
-                          path: { type: "string" },
-                        },
-                      },
-                    },
-                    required: ["name"],
-                  },
-                  Video: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      url: {
-                        type: "object",
-                        description:
-                          "The URL of the video to display. This can be a literal string or a reference to a value in the data model ('path', e.g. '/video/url').",
-                        additionalProperties: false,
-                        properties: {
-                          literalString: { type: "string" },
-                          path: { type: "string" },
-                        },
-                      },
-                    },
-                    required: ["url"],
-                  },
-                  AudioPlayer: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      url: {
-                        type: "object",
-                        description:
-                          "The URL of the audio to be played. This can be a literal string ('literal') or a reference to a value in the data model ('path', e.g. '/song/url').",
-                        additionalProperties: false,
-                        properties: {
-                          literalString: { type: "string" },
-                          path: { type: "string" },
-                        },
-                      },
-                      description: {
-                        type: "object",
-                        description:
-                          "A description of the audio, such as a title or summary. This can be a literal string or a reference to a value in the data model ('path', e.g. '/song/title').",
-                        additionalProperties: false,
-                        properties: {
-                          literalString: { type: "string" },
-                          path: { type: "string" },
-                        },
-                      },
-                    },
-                    required: ["url"],
-                  },
-                  Row: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      children: {
-                        type: "object",
-                        description:
-                          "Defines the children. Use 'explicitList' for a fixed set of children, or 'template' to generate children from a data list.",
-                        additionalProperties: false,
-                        properties: {
-                          explicitList: {
-                            type: "array",
-                            items: { type: "string" },
-                          },
-                          template: {
-                            type: "object",
-                            description:
-                              "A template for generating a dynamic list of children from a data model list. `componentId` is the component to use as a template, and `dataBinding` is the path to the map of components in the data model. Values in the map will define the list of children.",
-                            additionalProperties: false,
-                            properties: {
-                              componentId: { type: "string" },
-                              dataBinding: { type: "string" },
-                            },
-                            required: ["componentId", "dataBinding"],
-                          },
-                        },
-                      },
-                      distribution: {
-                        type: "string",
-                        description:
-                          "Defines the arrangement of children along the main axis (horizontally). This corresponds to the CSS 'justify-content' property.",
-                        enum: [
-                          "center",
-                          "end",
-                          "spaceAround",
-                          "spaceBetween",
-                          "spaceEvenly",
-                          "start",
-                        ],
-                      },
-                      alignment: {
-                        type: "string",
-                        description:
-                          "Defines the alignment of children along the cross axis (vertically). This corresponds to the CSS 'align-items' property.",
-                        enum: ["start", "center", "end", "stretch"],
-                      },
-                    },
-                    required: ["children"],
-                  },
-                  Column: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      children: {
-                        type: "object",
-                        description:
-                          "Defines the children. Use 'explicitList' for a fixed set of children, or 'template' to generate children from a data list.",
-                        additionalProperties: false,
-                        properties: {
-                          explicitList: {
-                            type: "array",
-                            items: { type: "string" },
-                          },
-                          template: {
-                            type: "object",
-                            description:
-                              "A template for generating a dynamic list of children from a data model list. `componentId` is the component to use as a template, and `dataBinding` is the path to the map of components in the data model. Values in the map will define the list of children.",
-                            additionalProperties: false,
-                            properties: {
-                              componentId: { type: "string" },
-                              dataBinding: { type: "string" },
-                            },
-                            required: ["componentId", "dataBinding"],
-                          },
-                        },
-                      },
-                      distribution: {
-                        type: "string",
-                        description:
-                          "Defines the arrangement of children along the main axis (vertically). This corresponds to the CSS 'justify-content' property.",
-                        enum: [
-                          "start",
-                          "center",
-                          "end",
-                          "spaceBetween",
-                          "spaceAround",
-                          "spaceEvenly",
-                        ],
-                      },
-                      alignment: {
-                        type: "string",
-                        description:
-                          "Defines the alignment of children along the cross axis (horizontally). This corresponds to the CSS 'align-items' property.",
-                        enum: ["center", "end", "start", "stretch"],
-                      },
-                    },
-                    required: ["children"],
-                  },
-                  List: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      children: {
-                        type: "object",
-                        description:
-                          "Defines the children. Use 'explicitList' for a fixed set of children, or 'template' to generate children from a data list.",
-                        additionalProperties: false,
-                        properties: {
-                          explicitList: {
-                            type: "array",
-                            items: { type: "string" },
-                          },
-                          template: {
-                            type: "object",
-                            description:
-                              "A template for generating a dynamic list of children from a data model list. `componentId` is the component to use as a template, and `dataBinding` is the path to the map of components in the data model. Values in the map will define the list of children.",
-                            additionalProperties: false,
-                            properties: {
-                              componentId: { type: "string" },
-                              dataBinding: { type: "string" },
-                            },
-                            required: ["componentId", "dataBinding"],
-                          },
-                        },
-                      },
-                      direction: {
-                        type: "string",
-                        description: "The direction in which the list items are laid out.",
-                        enum: ["vertical", "horizontal"],
-                      },
-                      alignment: {
-                        type: "string",
-                        description: "Defines the alignment of children along the cross axis.",
-                        enum: ["start", "center", "end", "stretch"],
-                      },
-                    },
-                    required: ["children"],
-                  },
-                  Card: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      child: {
-                        type: "string",
-                        description: "The ID of the component to be rendered inside the card.",
-                      },
-                    },
-                    required: ["child"],
-                  },
-                  Tabs: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      tabItems: {
-                        type: "array",
-                        description:
-                          "An array of objects, where each object defines a tab with a title and a child component.",
-                        items: {
-                          type: "object",
-                          additionalProperties: false,
-                          properties: {
-                            title: {
-                              type: "object",
-                              description:
-                                "The tab title. Defines the value as either a literal value or a path to data model value (e.g. '/options/title').",
-                              additionalProperties: false,
-                              properties: {
-                                literalString: { type: "string" },
-                                path: { type: "string" },
-                              },
-                            },
-                            child: { type: "string" },
-                          },
-                          required: ["title", "child"],
-                        },
-                      },
-                    },
-                    required: ["tabItems"],
-                  },
-                  Divider: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      axis: {
-                        type: "string",
-                        description: "The orientation of the divider.",
-                        enum: ["horizontal", "vertical"],
-                      },
-                    },
-                  },
-                  Modal: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      entryPointChild: {
-                        type: "string",
-                        description:
-                          "The ID of the component that opens the modal when interacted with (e.g., a button).",
-                      },
-                      contentChild: {
-                        type: "string",
-                        description: "The ID of the component to be displayed inside the modal.",
-                      },
-                    },
-                    required: ["entryPointChild", "contentChild"],
-                  },
-                  Button: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      child: {
-                        type: "string",
-                        description:
-                          "The ID of the component to display in the button, typically a Text component.",
-                      },
-                      primary: {
-                        type: "boolean",
-                        description:
-                          "Indicates if this button should be styled as the primary action.",
-                      },
-                      action: {
-                        type: "object",
-                        description:
-                          "The client-side action to be dispatched when the button is clicked. It includes the action's name and an optional context payload.",
-                        additionalProperties: false,
-                        properties: {
-                          name: { type: "string" },
-                          context: {
-                            type: "array",
-                            items: {
-                              type: "object",
-                              additionalProperties: false,
-                              properties: {
-                                key: { type: "string" },
-                                value: {
-                                  type: "object",
-                                  description:
-                                    "Defines the value to be included in the context as either a literal value or a path to a data model value (e.g. '/user/name').",
-                                  additionalProperties: false,
-                                  properties: {
-                                    path: { type: "string" },
-                                    literalString: { type: "string" },
-                                    literalNumber: { type: "number" },
-                                    literalBoolean: { type: "boolean" },
-                                  },
-                                },
-                              },
-                              required: ["key", "value"],
-                            },
-                          },
-                        },
-                        required: ["name"],
-                      },
-                    },
-                    required: ["child", "action"],
-                  },
-                  CheckBox: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      label: {
-                        type: "object",
-                        description:
-                          "The text to display next to the checkbox. Defines the value as either a literal value or a path to data model ('path', e.g. '/option/label').",
-                        additionalProperties: false,
-                        properties: {
-                          literalString: { type: "string" },
-                          path: { type: "string" },
-                        },
-                      },
-                      value: {
-                        type: "object",
-                        description:
-                          "The current state of the checkbox (true for checked, false for unchecked). This can be a literal boolean ('literalBoolean') or a reference to a value in the data model ('path', e.g. '/filter/open').",
-                        additionalProperties: false,
-                        properties: {
-                          literalBoolean: { type: "boolean" },
-                          path: { type: "string" },
-                        },
-                      },
-                    },
-                    required: ["label", "value"],
-                  },
-                  TextField: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      label: {
-                        type: "object",
-                        description:
-                          "The text label for the input field. This can be a literal string or a reference to a value in the data model ('path, e.g. '/user/name').",
-                        additionalProperties: false,
-                        properties: {
-                          literalString: { type: "string" },
-                          path: { type: "string" },
-                        },
-                      },
-                      text: {
-                        type: "object",
-                        description:
-                          "The value of the text field. This can be a literal string or a reference to a value in the data model ('path', e.g. '/user/name').",
-                        additionalProperties: false,
-                        properties: {
-                          literalString: { type: "string" },
-                          path: { type: "string" },
-                        },
-                      },
-                      textFieldType: {
-                        type: "string",
-                        description: "The type of input field to display.",
-                        enum: ["date", "longText", "number", "shortText", "obscured"],
-                      },
-                      validationRegexp: {
-                        type: "string",
-                        description:
-                          "A regular expression used for client-side validation of the input.",
-                      },
-                    },
-                    required: ["label"],
-                  },
-                  DateTimeInput: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      value: {
-                        type: "object",
-                        description:
-                          "The selected date and/or time value. This can be a literal string ('literalString') or a reference to a value in the data model ('path', e.g. '/user/dob').",
-                        additionalProperties: false,
-                        properties: {
-                          literalString: { type: "string" },
-                          path: { type: "string" },
-                        },
-                      },
-                      enableDate: {
-                        type: "boolean",
-                        description: "If true, allows the user to select a date.",
-                      },
-                      enableTime: {
-                        type: "boolean",
-                        description: "If true, allows the user to select a time.",
-                      },
-                      outputFormat: {
-                        type: "string",
-                        description:
-                          "The desired format for the output string after a date or time is selected.",
-                      },
-                    },
-                    required: ["value"],
-                  },
-                  MultipleChoice: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      selections: {
-                        type: "object",
-                        description:
-                          "The currently selected values for the component. This can be a literal array of strings or a path to an array in the data model('path', e.g. '/hotel/options').",
-                        additionalProperties: false,
-                        properties: {
-                          literalArray: {
-                            type: "array",
-                            items: { type: "string" },
-                          },
-                          path: { type: "string" },
-                        },
-                      },
-                      options: {
-                        type: "array",
-                        description: "An array of available options for the user to choose from.",
-                        items: {
-                          type: "object",
-                          additionalProperties: false,
-                          properties: {
-                            label: {
-                              type: "object",
-                              description:
-                                "The text to display for this option. This can be a literal string or a reference to a value in the data model (e.g. '/option/label').",
-                              additionalProperties: false,
-                              properties: {
-                                literalString: { type: "string" },
-                                path: { type: "string" },
-                              },
-                            },
-                            value: {
-                              type: "string",
-                              description:
-                                "The value to be associated with this option when selected.",
-                            },
-                          },
-                          required: ["label", "value"],
-                        },
-                      },
-                      maxAllowedSelections: {
-                        type: "integer",
-                        description:
-                          "The maximum number of options that the user is allowed to select.",
-                      },
-                    },
-                    required: ["selections", "options"],
-                  },
-                  Slider: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      value: {
-                        type: "object",
-                        description:
-                          "The current value of the slider. This can be a literal number ('literalNumber') or a reference to a value in the data model ('path', e.g. '/restaurant/cost').",
-                        additionalProperties: false,
-                        properties: {
-                          literalNumber: { type: "number" },
-                          path: { type: "string" },
-                        },
-                      },
-                      minValue: {
-                        type: "number",
-                        description: "The minimum value of the slider.",
-                      },
-                      maxValue: {
-                        type: "number",
-                        description: "The maximum value of the slider.",
-                      },
-                    },
-                    required: ["value"],
-                  },
-                },
-              },
-            },
-            required: ["id", "component"],
-          },
-        },
-      },
-      required: ["surfaceId", "components"],
-    },
-    dataModelUpdate: {
-      type: "object",
-      description: "Updates the data model for a surface.",
-      additionalProperties: false,
-      properties: {
-        surfaceId: {
-          type: "string",
-          description:
-            "The unique identifier for the UI surface this data model update applies to.",
-        },
-        path: {
-          type: "string",
-          description:
-            "An optional path to a location within the data model (e.g., '/user/name'). If omitted, or set to '/', the entire data model will be replaced.",
-        },
-        contents: {
-          type: "array",
-          description:
-            "An array of data entries. Each entry must contain a 'key' and exactly one corresponding typed 'value*' property.",
-          items: {
-            type: "object",
-            description:
-              "A single data entry. Exactly one 'value*' property should be provided alongside the key.",
-            additionalProperties: false,
-            properties: {
-              key: {
-                type: "string",
-                description: "The key for this data entry.",
-              },
-              valueString: { type: "string" },
-              valueNumber: { type: "number" },
-              valueBoolean: { type: "boolean" },
-              valueMap: {
-                description: "Represents a map as an adjacency list.",
-                type: "array",
-                items: {
-                  type: "object",
-                  description:
-                    "One entry in the map. Exactly one 'value*' property should be provided alongside the key.",
-                  additionalProperties: false,
-                  properties: {
-                    key: { type: "string" },
-                    valueString: { type: "string" },
-                    valueNumber: { type: "number" },
-                    valueBoolean: { type: "boolean" },
-                  },
-                  required: ["key"],
-                },
-              },
-            },
-            required: ["key"],
-          },
-        },
-      },
-      required: ["contents", "surfaceId"],
-    },
-    deleteSurface: {
-      type: "object",
-      description: "Signals the client to delete the surface identified by 'surfaceId'.",
-      additionalProperties: false,
-      properties: {
-        surfaceId: {
-          type: "string",
-          description: "The unique identifier for the UI surface to be deleted.",
-        },
-      },
-      required: ["surfaceId"],
-    },
-  },
+	title: "A2UI Message Schema",
+	description: "Describes a JSON payload for an A2UI (Agent to UI) message, which is used to dynamically construct and update user interfaces. A message MUST contain exactly ONE of the action properties: 'beginRendering', 'surfaceUpdate', 'dataModelUpdate', or 'deleteSurface'.",
+	type: "object",
+	additionalProperties: false,
+	properties: {
+		"beginRendering": {
+			"type": "object",
+			"description": "Signals the client to begin rendering a surface with a root component and specific styles.",
+			"additionalProperties": false,
+			"properties": {
+				"surfaceId": {
+					"type": "string",
+					"description": "The unique identifier for the UI surface to be rendered."
+				},
+				"root": {
+					"type": "string",
+					"description": "The ID of the root component to render."
+				},
+				"styles": {
+					"type": "object",
+					"description": "Styling information for the UI.",
+					"additionalProperties": false,
+					"properties": {
+						"font": {
+							"type": "string",
+							"description": "The primary font for the UI."
+						},
+						"primaryColor": {
+							"type": "string",
+							"description": "The primary UI color as a hexadecimal code (e.g., '#00BFFF').",
+							"pattern": "^#[0-9a-fA-F]{6}$"
+						}
+					}
+				}
+			},
+			"required": ["root", "surfaceId"]
+		},
+		"surfaceUpdate": {
+			"type": "object",
+			"description": "Updates a surface with a new set of components.",
+			"additionalProperties": false,
+			"properties": {
+				"surfaceId": {
+					"type": "string",
+					"description": "The unique identifier for the UI surface to be updated. If you are adding a new surface this *must* be a new, unique identified that has never been used for any existing surfaces shown."
+				},
+				"components": {
+					"type": "array",
+					"description": "A list containing all UI components for the surface.",
+					"minItems": 1,
+					"items": {
+						"type": "object",
+						"description": "Represents a *single* component in a UI widget tree. This component could be one of many supported types.",
+						"additionalProperties": false,
+						"properties": {
+							"id": {
+								"type": "string",
+								"description": "The unique identifier for this component."
+							},
+							"weight": {
+								"type": "number",
+								"description": "The relative weight of this component within a Row or Column. This corresponds to the CSS 'flex-grow' property. Note: this may ONLY be set when the component is a direct descendant of a Row or Column."
+							},
+							"component": {
+								"type": "object",
+								"description": "A wrapper object that MUST contain exactly one key, which is the name of the component type (e.g., 'Heading'). The value is an object containing the properties for that specific component.",
+								"additionalProperties": false,
+								"properties": {
+									"Text": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"text": {
+												"type": "object",
+												"description": "The text content to display. This can be a literal string or a reference to a value in the data model ('path', e.g., '/doc/title'). While simple Markdown formatting is supported (i.e. without HTML, images, or links), utilizing dedicated UI components is generally preferred for a richer and more structured presentation.",
+												"additionalProperties": false,
+												"properties": {
+													"literalString": { "type": "string" },
+													"path": { "type": "string" }
+												}
+											},
+											"usageHint": {
+												"type": "string",
+												"description": "A hint for the base text style. One of:\n- `h1`: Largest heading.\n- `h2`: Second largest heading.\n- `h3`: Third largest heading.\n- `h4`: Fourth largest heading.\n- `h5`: Fifth largest heading.\n- `caption`: Small text for captions.\n- `body`: Standard body text.",
+												"enum": [
+													"h1",
+													"h2",
+													"h3",
+													"h4",
+													"h5",
+													"caption",
+													"body"
+												]
+											}
+										},
+										"required": ["text"]
+									},
+									"Image": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"url": {
+												"type": "object",
+												"description": "The URL of the image to display. This can be a literal string ('literal') or a reference to a value in the data model ('path', e.g. '/thumbnail/url').",
+												"additionalProperties": false,
+												"properties": {
+													"literalString": { "type": "string" },
+													"path": { "type": "string" }
+												}
+											},
+											"fit": {
+												"type": "string",
+												"description": "Specifies how the image should be resized to fit its container. This corresponds to the CSS 'object-fit' property.",
+												"enum": [
+													"contain",
+													"cover",
+													"fill",
+													"none",
+													"scale-down"
+												]
+											},
+											"usageHint": {
+												"type": "string",
+												"description": "A hint for the image size and style. One of:\n- `icon`: Small square icon.\n- `avatar`: Circular avatar image.\n- `smallFeature`: Small feature image.\n- `mediumFeature`: Medium feature image.\n- `largeFeature`: Large feature image.\n- `header`: Full-width, full bleed, header image.",
+												"enum": [
+													"icon",
+													"avatar",
+													"smallFeature",
+													"mediumFeature",
+													"largeFeature",
+													"header"
+												]
+											}
+										},
+										"required": ["url"]
+									},
+									"Icon": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": { "name": {
+											"type": "object",
+											"description": "The name of the icon to display. This can be a literal string or a reference to a value in the data model ('path', e.g. '/form/submit').",
+											"additionalProperties": false,
+											"properties": {
+												"literalString": {
+													"type": "string",
+													"enum": [
+														"accountCircle",
+														"add",
+														"arrowBack",
+														"arrowForward",
+														"attachFile",
+														"calendarToday",
+														"call",
+														"camera",
+														"check",
+														"close",
+														"delete",
+														"download",
+														"edit",
+														"event",
+														"error",
+														"favorite",
+														"favoriteOff",
+														"folder",
+														"help",
+														"home",
+														"info",
+														"locationOn",
+														"lock",
+														"lockOpen",
+														"mail",
+														"menu",
+														"moreVert",
+														"moreHoriz",
+														"notificationsOff",
+														"notifications",
+														"payment",
+														"person",
+														"phone",
+														"photo",
+														"print",
+														"refresh",
+														"search",
+														"send",
+														"settings",
+														"share",
+														"shoppingCart",
+														"star",
+														"starHalf",
+														"starOff",
+														"upload",
+														"visibility",
+														"visibilityOff",
+														"warning"
+													]
+												},
+												"path": { "type": "string" }
+											}
+										} },
+										"required": ["name"]
+									},
+									"Video": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": { "url": {
+											"type": "object",
+											"description": "The URL of the video to display. This can be a literal string or a reference to a value in the data model ('path', e.g. '/video/url').",
+											"additionalProperties": false,
+											"properties": {
+												"literalString": { "type": "string" },
+												"path": { "type": "string" }
+											}
+										} },
+										"required": ["url"]
+									},
+									"AudioPlayer": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"url": {
+												"type": "object",
+												"description": "The URL of the audio to be played. This can be a literal string ('literal') or a reference to a value in the data model ('path', e.g. '/song/url').",
+												"additionalProperties": false,
+												"properties": {
+													"literalString": { "type": "string" },
+													"path": { "type": "string" }
+												}
+											},
+											"description": {
+												"type": "object",
+												"description": "A description of the audio, such as a title or summary. This can be a literal string or a reference to a value in the data model ('path', e.g. '/song/title').",
+												"additionalProperties": false,
+												"properties": {
+													"literalString": { "type": "string" },
+													"path": { "type": "string" }
+												}
+											}
+										},
+										"required": ["url"]
+									},
+									"Row": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"children": {
+												"type": "object",
+												"description": "Defines the children. Use 'explicitList' for a fixed set of children, or 'template' to generate children from a data list.",
+												"additionalProperties": false,
+												"properties": {
+													"explicitList": {
+														"type": "array",
+														"items": { "type": "string" }
+													},
+													"template": {
+														"type": "object",
+														"description": "A template for generating a dynamic list of children from a data model list. `componentId` is the component to use as a template, and `dataBinding` is the path to the map of components in the data model. Values in the map will define the list of children.",
+														"additionalProperties": false,
+														"properties": {
+															"componentId": { "type": "string" },
+															"dataBinding": { "type": "string" }
+														},
+														"required": ["componentId", "dataBinding"]
+													}
+												}
+											},
+											"distribution": {
+												"type": "string",
+												"description": "Defines the arrangement of children along the main axis (horizontally). This corresponds to the CSS 'justify-content' property.",
+												"enum": [
+													"center",
+													"end",
+													"spaceAround",
+													"spaceBetween",
+													"spaceEvenly",
+													"start"
+												]
+											},
+											"alignment": {
+												"type": "string",
+												"description": "Defines the alignment of children along the cross axis (vertically). This corresponds to the CSS 'align-items' property.",
+												"enum": [
+													"start",
+													"center",
+													"end",
+													"stretch"
+												]
+											}
+										},
+										"required": ["children"]
+									},
+									"Column": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"children": {
+												"type": "object",
+												"description": "Defines the children. Use 'explicitList' for a fixed set of children, or 'template' to generate children from a data list.",
+												"additionalProperties": false,
+												"properties": {
+													"explicitList": {
+														"type": "array",
+														"items": { "type": "string" }
+													},
+													"template": {
+														"type": "object",
+														"description": "A template for generating a dynamic list of children from a data model list. `componentId` is the component to use as a template, and `dataBinding` is the path to the map of components in the data model. Values in the map will define the list of children.",
+														"additionalProperties": false,
+														"properties": {
+															"componentId": { "type": "string" },
+															"dataBinding": { "type": "string" }
+														},
+														"required": ["componentId", "dataBinding"]
+													}
+												}
+											},
+											"distribution": {
+												"type": "string",
+												"description": "Defines the arrangement of children along the main axis (vertically). This corresponds to the CSS 'justify-content' property.",
+												"enum": [
+													"start",
+													"center",
+													"end",
+													"spaceBetween",
+													"spaceAround",
+													"spaceEvenly"
+												]
+											},
+											"alignment": {
+												"type": "string",
+												"description": "Defines the alignment of children along the cross axis (horizontally). This corresponds to the CSS 'align-items' property.",
+												"enum": [
+													"center",
+													"end",
+													"start",
+													"stretch"
+												]
+											}
+										},
+										"required": ["children"]
+									},
+									"List": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"children": {
+												"type": "object",
+												"description": "Defines the children. Use 'explicitList' for a fixed set of children, or 'template' to generate children from a data list.",
+												"additionalProperties": false,
+												"properties": {
+													"explicitList": {
+														"type": "array",
+														"items": { "type": "string" }
+													},
+													"template": {
+														"type": "object",
+														"description": "A template for generating a dynamic list of children from a data model list. `componentId` is the component to use as a template, and `dataBinding` is the path to the map of components in the data model. Values in the map will define the list of children.",
+														"additionalProperties": false,
+														"properties": {
+															"componentId": { "type": "string" },
+															"dataBinding": { "type": "string" }
+														},
+														"required": ["componentId", "dataBinding"]
+													}
+												}
+											},
+											"direction": {
+												"type": "string",
+												"description": "The direction in which the list items are laid out.",
+												"enum": ["vertical", "horizontal"]
+											},
+											"alignment": {
+												"type": "string",
+												"description": "Defines the alignment of children along the cross axis.",
+												"enum": [
+													"start",
+													"center",
+													"end",
+													"stretch"
+												]
+											}
+										},
+										"required": ["children"]
+									},
+									"Card": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": { "child": {
+											"type": "string",
+											"description": "The ID of the component to be rendered inside the card."
+										} },
+										"required": ["child"]
+									},
+									"Tabs": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": { "tabItems": {
+											"type": "array",
+											"description": "An array of objects, where each object defines a tab with a title and a child component.",
+											"items": {
+												"type": "object",
+												"additionalProperties": false,
+												"properties": {
+													"title": {
+														"type": "object",
+														"description": "The tab title. Defines the value as either a literal value or a path to data model value (e.g. '/options/title').",
+														"additionalProperties": false,
+														"properties": {
+															"literalString": { "type": "string" },
+															"path": { "type": "string" }
+														}
+													},
+													"child": { "type": "string" }
+												},
+												"required": ["title", "child"]
+											}
+										} },
+										"required": ["tabItems"]
+									},
+									"Divider": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": { "axis": {
+											"type": "string",
+											"description": "The orientation of the divider.",
+											"enum": ["horizontal", "vertical"]
+										} }
+									},
+									"Modal": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"entryPointChild": {
+												"type": "string",
+												"description": "The ID of the component that opens the modal when interacted with (e.g., a button)."
+											},
+											"contentChild": {
+												"type": "string",
+												"description": "The ID of the component to be displayed inside the modal."
+											}
+										},
+										"required": ["entryPointChild", "contentChild"]
+									},
+									"Button": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"child": {
+												"type": "string",
+												"description": "The ID of the component to display in the button, typically a Text component."
+											},
+											"primary": {
+												"type": "boolean",
+												"description": "Indicates if this button should be styled as the primary action."
+											},
+											"action": {
+												"type": "object",
+												"description": "The client-side action to be dispatched when the button is clicked. It includes the action's name and an optional context payload.",
+												"additionalProperties": false,
+												"properties": {
+													"name": { "type": "string" },
+													"context": {
+														"type": "array",
+														"items": {
+															"type": "object",
+															"additionalProperties": false,
+															"properties": {
+																"key": { "type": "string" },
+																"value": {
+																	"type": "object",
+																	"description": "Defines the value to be included in the context as either a literal value or a path to a data model value (e.g. '/user/name').",
+																	"additionalProperties": false,
+																	"properties": {
+																		"path": { "type": "string" },
+																		"literalString": { "type": "string" },
+																		"literalNumber": { "type": "number" },
+																		"literalBoolean": { "type": "boolean" }
+																	}
+																}
+															},
+															"required": ["key", "value"]
+														}
+													}
+												},
+												"required": ["name"]
+											}
+										},
+										"required": ["child", "action"]
+									},
+									"CheckBox": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"label": {
+												"type": "object",
+												"description": "The text to display next to the checkbox. Defines the value as either a literal value or a path to data model ('path', e.g. '/option/label').",
+												"additionalProperties": false,
+												"properties": {
+													"literalString": { "type": "string" },
+													"path": { "type": "string" }
+												}
+											},
+											"value": {
+												"type": "object",
+												"description": "The current state of the checkbox (true for checked, false for unchecked). This can be a literal boolean ('literalBoolean') or a reference to a value in the data model ('path', e.g. '/filter/open').",
+												"additionalProperties": false,
+												"properties": {
+													"literalBoolean": { "type": "boolean" },
+													"path": { "type": "string" }
+												}
+											}
+										},
+										"required": ["label", "value"]
+									},
+									"TextField": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"label": {
+												"type": "object",
+												"description": "The text label for the input field. This can be a literal string or a reference to a value in the data model ('path, e.g. '/user/name').",
+												"additionalProperties": false,
+												"properties": {
+													"literalString": { "type": "string" },
+													"path": { "type": "string" }
+												}
+											},
+											"text": {
+												"type": "object",
+												"description": "The value of the text field. This can be a literal string or a reference to a value in the data model ('path', e.g. '/user/name').",
+												"additionalProperties": false,
+												"properties": {
+													"literalString": { "type": "string" },
+													"path": { "type": "string" }
+												}
+											},
+											"textFieldType": {
+												"type": "string",
+												"description": "The type of input field to display.",
+												"enum": [
+													"date",
+													"longText",
+													"number",
+													"shortText",
+													"obscured"
+												]
+											},
+											"validationRegexp": {
+												"type": "string",
+												"description": "A regular expression used for client-side validation of the input."
+											}
+										},
+										"required": ["label"]
+									},
+									"DateTimeInput": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"value": {
+												"type": "object",
+												"description": "The selected date and/or time value. This can be a literal string ('literalString') or a reference to a value in the data model ('path', e.g. '/user/dob').",
+												"additionalProperties": false,
+												"properties": {
+													"literalString": { "type": "string" },
+													"path": { "type": "string" }
+												}
+											},
+											"enableDate": {
+												"type": "boolean",
+												"description": "If true, allows the user to select a date."
+											},
+											"enableTime": {
+												"type": "boolean",
+												"description": "If true, allows the user to select a time."
+											},
+											"outputFormat": {
+												"type": "string",
+												"description": "The desired format for the output string after a date or time is selected."
+											}
+										},
+										"required": ["value"]
+									},
+									"MultipleChoice": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"selections": {
+												"type": "object",
+												"description": "The currently selected values for the component. This can be a literal array of strings or a path to an array in the data model('path', e.g. '/hotel/options').",
+												"additionalProperties": false,
+												"properties": {
+													"literalArray": {
+														"type": "array",
+														"items": { "type": "string" }
+													},
+													"path": { "type": "string" }
+												}
+											},
+											"options": {
+												"type": "array",
+												"description": "An array of available options for the user to choose from.",
+												"items": {
+													"type": "object",
+													"additionalProperties": false,
+													"properties": {
+														"label": {
+															"type": "object",
+															"description": "The text to display for this option. This can be a literal string or a reference to a value in the data model (e.g. '/option/label').",
+															"additionalProperties": false,
+															"properties": {
+																"literalString": { "type": "string" },
+																"path": { "type": "string" }
+															}
+														},
+														"value": {
+															"type": "string",
+															"description": "The value to be associated with this option when selected."
+														}
+													},
+													"required": ["label", "value"]
+												}
+											},
+											"maxAllowedSelections": {
+												"type": "integer",
+												"description": "The maximum number of options that the user is allowed to select."
+											}
+										},
+										"required": ["selections", "options"]
+									},
+									"Slider": {
+										"type": "object",
+										"additionalProperties": false,
+										"properties": {
+											"value": {
+												"type": "object",
+												"description": "The current value of the slider. This can be a literal number ('literalNumber') or a reference to a value in the data model ('path', e.g. '/restaurant/cost').",
+												"additionalProperties": false,
+												"properties": {
+													"literalNumber": { "type": "number" },
+													"path": { "type": "string" }
+												}
+											},
+											"minValue": {
+												"type": "number",
+												"description": "The minimum value of the slider."
+											},
+											"maxValue": {
+												"type": "number",
+												"description": "The maximum value of the slider."
+											}
+										},
+										"required": ["value"]
+									}
+								}
+							}
+						},
+						"required": ["id", "component"]
+					}
+				}
+			},
+			"required": ["surfaceId", "components"]
+		},
+		"dataModelUpdate": {
+			"type": "object",
+			"description": "Updates the data model for a surface.",
+			"additionalProperties": false,
+			"properties": {
+				"surfaceId": {
+					"type": "string",
+					"description": "The unique identifier for the UI surface this data model update applies to."
+				},
+				"path": {
+					"type": "string",
+					"description": "An optional path to a location within the data model (e.g., '/user/name'). If omitted, or set to '/', the entire data model will be replaced."
+				},
+				"contents": {
+					"type": "array",
+					"description": "An array of data entries. Each entry must contain a 'key' and exactly one corresponding typed 'value*' property.",
+					"items": {
+						"type": "object",
+						"description": "A single data entry. Exactly one 'value*' property should be provided alongside the key.",
+						"additionalProperties": false,
+						"properties": {
+							"key": {
+								"type": "string",
+								"description": "The key for this data entry."
+							},
+							"valueString": { "type": "string" },
+							"valueNumber": { "type": "number" },
+							"valueBoolean": { "type": "boolean" },
+							"valueMap": {
+								"description": "Represents a map as an adjacency list.",
+								"type": "array",
+								"items": {
+									"type": "object",
+									"description": "One entry in the map. Exactly one 'value*' property should be provided alongside the key.",
+									"additionalProperties": false,
+									"properties": {
+										"key": { "type": "string" },
+										"valueString": { "type": "string" },
+										"valueNumber": { "type": "number" },
+										"valueBoolean": { "type": "boolean" }
+									},
+									"required": ["key"]
+								}
+							}
+						},
+						"required": ["key"]
+					}
+				}
+			},
+			"required": ["contents", "surfaceId"]
+		},
+		"deleteSurface": {
+			"type": "object",
+			"description": "Signals the client to delete the surface identified by 'surfaceId'.",
+			"additionalProperties": false,
+			"properties": { "surfaceId": {
+				"type": "string",
+				"description": "The unique identifier for the UI surface to be deleted."
+			} },
+			"required": ["surfaceId"]
+		}
+	}
 };
 
 const Data = {
-  createSignalA2uiMessageProcessor: create,
-  A2uiMessageProcessor,
-  Guards: guards_exports,
+	createSignalA2uiMessageProcessor: create,
+	A2uiMessageProcessor,
+	Guards: guards_exports
 };
 const Schemas = { A2UIClientEventMessage: server_to_client_with_standard_catalog_default };
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 const t$1 = (t$7) => (e$14, o$15) => {
-  void 0 !== o$15
-    ? o$15.addInitializer(() => {
-        customElements.define(t$7, e$14);
-      })
-    : customElements.define(t$7, e$14);
+	void 0 !== o$15 ? o$15.addInitializer(() => {
+		customElements.define(t$7, e$14);
+	}) : customElements.define(t$7, e$14);
 };
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ const o$9 = {
-    attribute: !0,
-    type: String,
-    converter: u$3,
-    reflect: !1,
-    hasChanged: f$3,
-  },
-  r$7 = (t$7 = o$9, e$14, r$12) => {
-    const { kind: n$13, metadata: i$10 } = r$12;
-    let s$9 = globalThis.litPropertyMetadata.get(i$10);
-    if (
-      (void 0 === s$9 && globalThis.litPropertyMetadata.set(i$10, (s$9 = new Map())),
-      "setter" === n$13 && ((t$7 = Object.create(t$7)).wrapped = !0),
-      s$9.set(r$12.name, t$7),
-      "accessor" === n$13)
-    ) {
-      const { name: o$15 } = r$12;
-      return {
-        set(r$13) {
-          const n$14 = e$14.get.call(this);
-          (e$14.set.call(this, r$13), this.requestUpdate(o$15, n$14, t$7, !0, r$13));
-        },
-        init(e$15) {
-          return (void 0 !== e$15 && this.C(o$15, void 0, t$7, e$15), e$15);
-        },
-      };
-    }
-    if ("setter" === n$13) {
-      const { name: o$15 } = r$12;
-      return function (r$13) {
-        const n$14 = this[o$15];
-        (e$14.call(this, r$13), this.requestUpdate(o$15, n$14, t$7, !0, r$13));
-      };
-    }
-    throw Error("Unsupported decorator location: " + n$13);
-  };
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ const o$9 = {
+	attribute: !0,
+	type: String,
+	converter: u$3,
+	reflect: !1,
+	hasChanged: f$3
+}, r$7 = (t$7 = o$9, e$14, r$12) => {
+	const { kind: n$13, metadata: i$10 } = r$12;
+	let s$9 = globalThis.litPropertyMetadata.get(i$10);
+	if (void 0 === s$9 && globalThis.litPropertyMetadata.set(i$10, s$9 = new Map()), "setter" === n$13 && ((t$7 = Object.create(t$7)).wrapped = !0), s$9.set(r$12.name, t$7), "accessor" === n$13) {
+		const { name: o$15 } = r$12;
+		return {
+			set(r$13) {
+				const n$14 = e$14.get.call(this);
+				e$14.set.call(this, r$13), this.requestUpdate(o$15, n$14, t$7, !0, r$13);
+			},
+			init(e$15) {
+				return void 0 !== e$15 && this.C(o$15, void 0, t$7, e$15), e$15;
+			}
+		};
+	}
+	if ("setter" === n$13) {
+		const { name: o$15 } = r$12;
+		return function(r$13) {
+			const n$14 = this[o$15];
+			e$14.call(this, r$13), this.requestUpdate(o$15, n$14, t$7, !0, r$13);
+		};
+	}
+	throw Error("Unsupported decorator location: " + n$13);
+};
 function n$6(t$7) {
-  return (e$14, o$15) =>
-    "object" == typeof o$15
-      ? r$7(t$7, e$14, o$15)
-      : ((t$8, e$15, o$16) => {
-          const r$12 = e$15.hasOwnProperty(o$16);
-          return (
-            e$15.constructor.createProperty(o$16, t$8),
-            r$12 ? Object.getOwnPropertyDescriptor(e$15, o$16) : void 0
-          );
-        })(t$7, e$14, o$15);
+	return (e$14, o$15) => "object" == typeof o$15 ? r$7(t$7, e$14, o$15) : ((t$8, e$15, o$16) => {
+		const r$12 = e$15.hasOwnProperty(o$16);
+		return e$15.constructor.createProperty(o$16, t$8), r$12 ? Object.getOwnPropertyDescriptor(e$15, o$16) : void 0;
+	})(t$7, e$14, o$15);
 }
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ function r$6(r$12) {
-  return n$6({
-    ...r$12,
-    state: !0,
-    attribute: !1,
-  });
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ function r$6(r$12) {
+	return n$6({
+		...r$12,
+		state: !0,
+		attribute: !1
+	});
 }
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 function t(t) {
-  return (n$13, o$15) => {
-    const c$7 = "function" == typeof n$13 ? n$13 : n$13[o$15];
-    Object.assign(c$7, t);
-  };
+	return (n$13, o$15) => {
+		const c$7 = "function" == typeof n$13 ? n$13 : n$13[o$15];
+		Object.assign(c$7, t);
+	};
 }
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
-const e$6 = (e$14, t$7, c$7) => (
-  (c$7.configurable = !0),
-  (c$7.enumerable = !0),
-  Reflect.decorate && "object" != typeof t$7 && Object.defineProperty(e$14, t$7, c$7),
-  c$7
-);
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
+const e$6 = (e$14, t$7, c$7) => (c$7.configurable = !0, c$7.enumerable = !0, Reflect.decorate && "object" != typeof t$7 && Object.defineProperty(e$14, t$7, c$7), c$7);
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ function e$5(e$14, r$12) {
-  return (n$13, s$9, i$10) => {
-    const o$15 = (t$7) => t$7.renderRoot?.querySelector(e$14) ?? null;
-    if (r$12) {
-      const { get: e$15, set: r$13 } =
-        "object" == typeof s$9
-          ? n$13
-          : (i$10 ??
-            (() => {
-              const t$7 = Symbol();
-              return {
-                get() {
-                  return this[t$7];
-                },
-                set(e$16) {
-                  this[t$7] = e$16;
-                },
-              };
-            })());
-      return e$6(n$13, s$9, {
-        get() {
-          let t$7 = e$15.call(this);
-          return (
-            void 0 === t$7 &&
-              ((t$7 = o$15(this)), (null !== t$7 || this.hasUpdated) && r$13.call(this, t$7)),
-            t$7
-          );
-        },
-      });
-    }
-    return e$6(n$13, s$9, {
-      get() {
-        return o$15(this);
-      },
-    });
-  };
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ function e$5(e$14, r$12) {
+	return (n$13, s$9, i$10) => {
+		const o$15 = (t$7) => t$7.renderRoot?.querySelector(e$14) ?? null;
+		if (r$12) {
+			const { get: e$15, set: r$13 } = "object" == typeof s$9 ? n$13 : i$10 ?? (() => {
+				const t$7 = Symbol();
+				return {
+					get() {
+						return this[t$7];
+					},
+					set(e$16) {
+						this[t$7] = e$16;
+					}
+				};
+			})();
+			return e$6(n$13, s$9, { get() {
+				let t$7 = e$15.call(this);
+				return void 0 === t$7 && (t$7 = o$15(this), (null !== t$7 || this.hasUpdated) && r$13.call(this, t$7)), t$7;
+			} });
+		}
+		return e$6(n$13, s$9, { get() {
+			return o$15(this);
+		} });
+	};
 }
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 let e$4;
 function r$5(r$12) {
-  return (n$13, o$15) =>
-    e$6(n$13, o$15, {
-      get() {
-        return (this.renderRoot ?? (e$4 ??= document.createDocumentFragment())).querySelectorAll(
-          r$12,
-        );
-      },
-    });
+	return (n$13, o$15) => e$6(n$13, o$15, { get() {
+		return (this.renderRoot ?? (e$4 ??= document.createDocumentFragment())).querySelectorAll(r$12);
+	} });
 }
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 function r$4(r$12) {
-  return (n$13, e$14) =>
-    e$6(n$13, e$14, {
-      async get() {
-        return (await this.updateComplete, this.renderRoot?.querySelector(r$12) ?? null);
-      },
-    });
+	return (n$13, e$14) => e$6(n$13, e$14, { async get() {
+		return await this.updateComplete, this.renderRoot?.querySelector(r$12) ?? null;
+	} });
 }
 
 /**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ function o$8(o$15) {
-  return (e$14, n$13) => {
-    const { slot: r$12, selector: s$9 } = o$15 ?? {},
-      c$7 = "slot" + (r$12 ? `[name=${r$12}]` : ":not([name])");
-    return e$6(e$14, n$13, {
-      get() {
-        const t$7 = this.renderRoot?.querySelector(c$7),
-          e$15 = t$7?.assignedElements(o$15) ?? [];
-        return void 0 === s$9 ? e$15 : e$15.filter((t$8) => t$8.matches(s$9));
-      },
-    });
-  };
+* @license
+* Copyright 2021 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ function o$8(o$15) {
+	return (e$14, n$13) => {
+		const { slot: r$12, selector: s$9 } = o$15 ?? {}, c$7 = "slot" + (r$12 ? `[name=${r$12}]` : ":not([name])");
+		return e$6(e$14, n$13, { get() {
+			const t$7 = this.renderRoot?.querySelector(c$7), e$15 = t$7?.assignedElements(o$15) ?? [];
+			return void 0 === s$9 ? e$15 : e$15.filter((t$8) => t$8.matches(s$9));
+		} });
+	};
 }
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ function n$5(n$13) {
-  return (o$15, r$12) => {
-    const { slot: e$14 } = n$13 ?? {},
-      s$9 = "slot" + (e$14 ? `[name=${e$14}]` : ":not([name])");
-    return e$6(o$15, r$12, {
-      get() {
-        const t$7 = this.renderRoot?.querySelector(s$9);
-        return t$7?.assignedNodes(n$13) ?? [];
-      },
-    });
-  };
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ function n$5(n$13) {
+	return (o$15, r$12) => {
+		const { slot: e$14 } = n$13 ?? {}, s$9 = "slot" + (e$14 ? `[name=${e$14}]` : ":not([name])");
+		return e$6(o$15, r$12, { get() {
+			const t$7 = this.renderRoot?.querySelector(s$9);
+			return t$7?.assignedNodes(n$13) ?? [];
+		} });
+	};
 }
 
 /**
- * @license
- * Copyright 2023 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ let i$2 = !1;
+* @license
+* Copyright 2023 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ let i$2 = !1;
 const s$1 = new Signal.subtle.Watcher(() => {
-    i$2 ||
-      ((i$2 = !0),
-      queueMicrotask(() => {
-        i$2 = !1;
-        for (const t$7 of s$1.getPending()) t$7.get();
-        s$1.watch();
-      }));
-  }),
-  h$3 = Symbol("SignalWatcherBrand"),
-  e$3 = new FinalizationRegistry((i$10) => {
-    i$10.unwatch(...Signal.subtle.introspectSources(i$10));
-  }),
-  n$4 = new WeakMap();
+	i$2 || (i$2 = !0, queueMicrotask(() => {
+		i$2 = !1;
+		for (const t$7 of s$1.getPending()) t$7.get();
+		s$1.watch();
+	}));
+}), h$3 = Symbol("SignalWatcherBrand"), e$3 = new FinalizationRegistry((i$10) => {
+	i$10.unwatch(...Signal.subtle.introspectSources(i$10));
+}), n$4 = new WeakMap();
 function o$7(i$10) {
-  return !0 === i$10[h$3]
-    ? (console.warn("SignalWatcher should not be applied to the same class more than once."), i$10)
-    : class extends i$10 {
-        constructor() {
-          (super(...arguments),
-            (this._$St = new Map()),
-            (this._$So = new Signal.State(0)),
-            (this._$Si = !1));
-        }
-        _$Sl() {
-          var t$7, i$11;
-          const s$9 = [],
-            h$7 = [];
-          this._$St.forEach((t$8, i$12) => {
-            ((null == t$8 ? void 0 : t$8.beforeUpdate) ? s$9 : h$7).push(i$12);
-          });
-          const e$14 =
-            null === (t$7 = this.h) || void 0 === t$7
-              ? void 0
-              : t$7.getPending().filter((t$8) => t$8 !== this._$Su && !this._$St.has(t$8));
-          (s$9.forEach((t$8) => t$8.get()),
-            null === (i$11 = this._$Su) || void 0 === i$11 || i$11.get(),
-            e$14.forEach((t$8) => t$8.get()),
-            h$7.forEach((t$8) => t$8.get()));
-        }
-        _$Sv() {
-          this.isUpdatePending ||
-            queueMicrotask(() => {
-              this.isUpdatePending || this._$Sl();
-            });
-        }
-        _$S_() {
-          if (void 0 !== this.h) return;
-          this._$Su = new Signal.Computed(() => {
-            (this._$So.get(), super.performUpdate());
-          });
-          const i$11 = (this.h = new Signal.subtle.Watcher(function () {
-            const t$7 = n$4.get(this);
-            void 0 !== t$7 &&
-              (!1 === t$7._$Si &&
-                (new Set(this.getPending()).has(t$7._$Su) ? t$7.requestUpdate() : t$7._$Sv()),
-              this.watch());
-          }));
-          (n$4.set(i$11, this),
-            e$3.register(this, i$11),
-            i$11.watch(this._$Su),
-            i$11.watch(...Array.from(this._$St).map(([t$7]) => t$7)));
-        }
-        _$Sp() {
-          if (void 0 === this.h) return;
-          let i$11 = !1;
-          (this.h.unwatch(
-            ...Signal.subtle.introspectSources(this.h).filter((t$7) => {
-              var s$9;
-              const h$7 =
-                !0 !==
-                (null === (s$9 = this._$St.get(t$7)) || void 0 === s$9
-                  ? void 0
-                  : s$9.manualDispose);
-              return (h$7 && this._$St.delete(t$7), i$11 || (i$11 = !h$7), h$7);
-            }),
-          ),
-            i$11 || ((this._$Su = void 0), (this.h = void 0), this._$St.clear()));
-        }
-        updateEffect(i$11, s$9) {
-          var h$7;
-          this._$S_();
-          const e$14 = new Signal.Computed(() => {
-            i$11();
-          });
-          return (
-            this.h.watch(e$14),
-            this._$St.set(e$14, s$9),
-            null !== (h$7 = null == s$9 ? void 0 : s$9.beforeUpdate) && void 0 !== h$7 && h$7
-              ? Signal.subtle.untrack(() => e$14.get())
-              : this.updateComplete.then(() => Signal.subtle.untrack(() => e$14.get())),
-            () => {
-              (this._$St.delete(e$14),
-                this.h.unwatch(e$14),
-                !1 === this.isConnected && this._$Sp());
-            }
-          );
-        }
-        performUpdate() {
-          this.isUpdatePending &&
-            (this._$S_(),
-            (this._$Si = !0),
-            this._$So.set(this._$So.get() + 1),
-            (this._$Si = !1),
-            this._$Sl());
-        }
-        connectedCallback() {
-          (super.connectedCallback(), this.requestUpdate());
-        }
-        disconnectedCallback() {
-          (super.disconnectedCallback(),
-            queueMicrotask(() => {
-              !1 === this.isConnected && this._$Sp();
-            }));
-        }
-      };
+	return !0 === i$10[h$3] ? (console.warn("SignalWatcher should not be applied to the same class more than once."), i$10) : class extends i$10 {
+		constructor() {
+			super(...arguments), this._$St = new Map(), this._$So = new Signal.State(0), this._$Si = !1;
+		}
+		_$Sl() {
+			var t$7, i$11;
+			const s$9 = [], h$7 = [];
+			this._$St.forEach((t$8, i$12) => {
+				((null == t$8 ? void 0 : t$8.beforeUpdate) ? s$9 : h$7).push(i$12);
+			});
+			const e$14 = null === (t$7 = this.h) || void 0 === t$7 ? void 0 : t$7.getPending().filter((t$8) => t$8 !== this._$Su && !this._$St.has(t$8));
+			s$9.forEach((t$8) => t$8.get()), null === (i$11 = this._$Su) || void 0 === i$11 || i$11.get(), e$14.forEach((t$8) => t$8.get()), h$7.forEach((t$8) => t$8.get());
+		}
+		_$Sv() {
+			this.isUpdatePending || queueMicrotask(() => {
+				this.isUpdatePending || this._$Sl();
+			});
+		}
+		_$S_() {
+			if (void 0 !== this.h) return;
+			this._$Su = new Signal.Computed(() => {
+				this._$So.get(), super.performUpdate();
+			});
+			const i$11 = this.h = new Signal.subtle.Watcher(function() {
+				const t$7 = n$4.get(this);
+				void 0 !== t$7 && (!1 === t$7._$Si && (new Set(this.getPending()).has(t$7._$Su) ? t$7.requestUpdate() : t$7._$Sv()), this.watch());
+			});
+			n$4.set(i$11, this), e$3.register(this, i$11), i$11.watch(this._$Su), i$11.watch(...Array.from(this._$St).map(([t$7]) => t$7));
+		}
+		_$Sp() {
+			if (void 0 === this.h) return;
+			let i$11 = !1;
+			this.h.unwatch(...Signal.subtle.introspectSources(this.h).filter((t$7) => {
+				var s$9;
+				const h$7 = !0 !== (null === (s$9 = this._$St.get(t$7)) || void 0 === s$9 ? void 0 : s$9.manualDispose);
+				return h$7 && this._$St.delete(t$7), i$11 || (i$11 = !h$7), h$7;
+			})), i$11 || (this._$Su = void 0, this.h = void 0, this._$St.clear());
+		}
+		updateEffect(i$11, s$9) {
+			var h$7;
+			this._$S_();
+			const e$14 = new Signal.Computed(() => {
+				i$11();
+			});
+			return this.h.watch(e$14), this._$St.set(e$14, s$9), null !== (h$7 = null == s$9 ? void 0 : s$9.beforeUpdate) && void 0 !== h$7 && h$7 ? Signal.subtle.untrack(() => e$14.get()) : this.updateComplete.then(() => Signal.subtle.untrack(() => e$14.get())), () => {
+				this._$St.delete(e$14), this.h.unwatch(e$14), !1 === this.isConnected && this._$Sp();
+			};
+		}
+		performUpdate() {
+			this.isUpdatePending && (this._$S_(), this._$Si = !0, this._$So.set(this._$So.get() + 1), this._$Si = !1, this._$Sl());
+		}
+		connectedCallback() {
+			super.connectedCallback(), this.requestUpdate();
+		}
+		disconnectedCallback() {
+			super.disconnectedCallback(), queueMicrotask(() => {
+				!1 === this.isConnected && this._$Sp();
+			});
+		}
+	};
 }
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ const s = (i$10, t$7) => {
-    const e$14 = i$10._$AN;
-    if (void 0 === e$14) return !1;
-    for (const i$11 of e$14) (i$11._$AO?.(t$7, !1), s(i$11, t$7));
-    return !0;
-  },
-  o$6 = (i$10) => {
-    let t$7, e$14;
-    do {
-      if (void 0 === (t$7 = i$10._$AM)) break;
-      ((e$14 = t$7._$AN), e$14.delete(i$10), (i$10 = t$7));
-    } while (0 === e$14?.size);
-  },
-  r$3 = (i$10) => {
-    for (let t$7; (t$7 = i$10._$AM); i$10 = t$7) {
-      let e$14 = t$7._$AN;
-      if (void 0 === e$14) t$7._$AN = e$14 = new Set();
-      else if (e$14.has(i$10)) break;
-      (e$14.add(i$10), c(t$7));
-    }
-  };
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ const s = (i$10, t$7) => {
+	const e$14 = i$10._$AN;
+	if (void 0 === e$14) return !1;
+	for (const i$11 of e$14) i$11._$AO?.(t$7, !1), s(i$11, t$7);
+	return !0;
+}, o$6 = (i$10) => {
+	let t$7, e$14;
+	do {
+		if (void 0 === (t$7 = i$10._$AM)) break;
+		e$14 = t$7._$AN, e$14.delete(i$10), i$10 = t$7;
+	} while (0 === e$14?.size);
+}, r$3 = (i$10) => {
+	for (let t$7; t$7 = i$10._$AM; i$10 = t$7) {
+		let e$14 = t$7._$AN;
+		if (void 0 === e$14) t$7._$AN = e$14 = new Set();
+		else if (e$14.has(i$10)) break;
+		e$14.add(i$10), c(t$7);
+	}
+};
 function h$2(i$10) {
-  void 0 !== this._$AN ? (o$6(this), (this._$AM = i$10), r$3(this)) : (this._$AM = i$10);
+	void 0 !== this._$AN ? (o$6(this), this._$AM = i$10, r$3(this)) : this._$AM = i$10;
 }
 function n$3(i$10, t$7 = !1, e$14 = 0) {
-  const r$12 = this._$AH,
-    h$7 = this._$AN;
-  if (void 0 !== h$7 && 0 !== h$7.size)
-    if (t$7)
-      if (Array.isArray(r$12))
-        for (let i$11 = e$14; i$11 < r$12.length; i$11++) (s(r$12[i$11], !1), o$6(r$12[i$11]));
-      else null != r$12 && (s(r$12, !1), o$6(r$12));
-    else s(this, i$10);
+	const r$12 = this._$AH, h$7 = this._$AN;
+	if (void 0 !== h$7 && 0 !== h$7.size) if (t$7) if (Array.isArray(r$12)) for (let i$11 = e$14; i$11 < r$12.length; i$11++) s(r$12[i$11], !1), o$6(r$12[i$11]);
+	else null != r$12 && (s(r$12, !1), o$6(r$12));
+	else s(this, i$10);
 }
 const c = (i$10) => {
-  i$10.type == t$4.CHILD && ((i$10._$AP ??= n$3), (i$10._$AQ ??= h$2));
+	i$10.type == t$4.CHILD && (i$10._$AP ??= n$3, i$10._$AQ ??= h$2);
 };
 var f = class extends i$5 {
-  constructor() {
-    (super(...arguments), (this._$AN = void 0));
-  }
-  _$AT(i$10, t$7, e$14) {
-    (super._$AT(i$10, t$7, e$14), r$3(this), (this.isConnected = i$10._$AU));
-  }
-  _$AO(i$10, t$7 = !0) {
-    (i$10 !== this.isConnected &&
-      ((this.isConnected = i$10), i$10 ? this.reconnected?.() : this.disconnected?.()),
-      t$7 && (s(this, i$10), o$6(this)));
-  }
-  setValue(t$7) {
-    if (r$8(this._$Ct)) this._$Ct._$AI(t$7, this);
-    else {
-      const i$10 = [...this._$Ct._$AH];
-      ((i$10[this._$Ci] = t$7), this._$Ct._$AI(i$10, this, 0));
-    }
-  }
-  disconnected() {}
-  reconnected() {}
+	constructor() {
+		super(...arguments), this._$AN = void 0;
+	}
+	_$AT(i$10, t$7, e$14) {
+		super._$AT(i$10, t$7, e$14), r$3(this), this.isConnected = i$10._$AU;
+	}
+	_$AO(i$10, t$7 = !0) {
+		i$10 !== this.isConnected && (this.isConnected = i$10, i$10 ? this.reconnected?.() : this.disconnected?.()), t$7 && (s(this, i$10), o$6(this));
+	}
+	setValue(t$7) {
+		if (r$8(this._$Ct)) this._$Ct._$AI(t$7, this);
+		else {
+			const i$10 = [...this._$Ct._$AH];
+			i$10[this._$Ci] = t$7, this._$Ct._$AI(i$10, this, 0);
+		}
+	}
+	disconnected() {}
+	reconnected() {}
 };
 
 /**
- * @license
- * Copyright 2023 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2023 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 let o$5 = !1;
 const n$2 = new Signal.subtle.Watcher(async () => {
-  o$5 ||
-    ((o$5 = !0),
-    queueMicrotask(() => {
-      o$5 = !1;
-      for (const i$10 of n$2.getPending()) i$10.get();
-      n$2.watch();
-    }));
+	o$5 || (o$5 = !0, queueMicrotask(() => {
+		o$5 = !1;
+		for (const i$10 of n$2.getPending()) i$10.get();
+		n$2.watch();
+	}));
 });
 var r$2 = class extends f {
-  _$S_() {
-    var i$10, t$7;
-    void 0 === this._$Sm &&
-      ((this._$Sj = new Signal.Computed(() => {
-        var i$11;
-        const t$8 = null === (i$11 = this._$SW) || void 0 === i$11 ? void 0 : i$11.get();
-        return (this.setValue(t$8), t$8);
-      })),
-      (this._$Sm =
-        null !== (t$7 = null === (i$10 = this._$Sk) || void 0 === i$10 ? void 0 : i$10.h) &&
-        void 0 !== t$7
-          ? t$7
-          : n$2),
-      this._$Sm.watch(this._$Sj),
-      Signal.subtle.untrack(() => {
-        var i$11;
-        return null === (i$11 = this._$Sj) || void 0 === i$11 ? void 0 : i$11.get();
-      }));
-  }
-  _$Sp() {
-    void 0 !== this._$Sm && (this._$Sm.unwatch(this._$SW), (this._$Sm = void 0));
-  }
-  render(i$10) {
-    return Signal.subtle.untrack(() => i$10.get());
-  }
-  update(i$10, [t$7]) {
-    var o$15, n$13;
-    return (
-      (null !== (o$15 = this._$Sk) && void 0 !== o$15) ||
-        (this._$Sk = null === (n$13 = i$10.options) || void 0 === n$13 ? void 0 : n$13.host),
-      t$7 !== this._$SW && void 0 !== this._$SW && this._$Sp(),
-      (this._$SW = t$7),
-      this._$S_(),
-      Signal.subtle.untrack(() => this._$SW.get())
-    );
-  }
-  disconnected() {
-    this._$Sp();
-  }
-  reconnected() {
-    this._$S_();
-  }
+	_$S_() {
+		var i$10, t$7;
+		void 0 === this._$Sm && (this._$Sj = new Signal.Computed(() => {
+			var i$11;
+			const t$8 = null === (i$11 = this._$SW) || void 0 === i$11 ? void 0 : i$11.get();
+			return this.setValue(t$8), t$8;
+		}), this._$Sm = null !== (t$7 = null === (i$10 = this._$Sk) || void 0 === i$10 ? void 0 : i$10.h) && void 0 !== t$7 ? t$7 : n$2, this._$Sm.watch(this._$Sj), Signal.subtle.untrack(() => {
+			var i$11;
+			return null === (i$11 = this._$Sj) || void 0 === i$11 ? void 0 : i$11.get();
+		}));
+	}
+	_$Sp() {
+		void 0 !== this._$Sm && (this._$Sm.unwatch(this._$SW), this._$Sm = void 0);
+	}
+	render(i$10) {
+		return Signal.subtle.untrack(() => i$10.get());
+	}
+	update(i$10, [t$7]) {
+		var o$15, n$13;
+		return null !== (o$15 = this._$Sk) && void 0 !== o$15 || (this._$Sk = null === (n$13 = i$10.options) || void 0 === n$13 ? void 0 : n$13.host), t$7 !== this._$SW && void 0 !== this._$SW && this._$Sp(), this._$SW = t$7, this._$S_(), Signal.subtle.untrack(() => this._$SW.get());
+	}
+	disconnected() {
+		this._$Sp();
+	}
+	reconnected() {
+		this._$S_();
+	}
 };
 const h$1 = e$10(r$2);
 
 /**
- * @license
- * Copyright 2023 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ const m =
-    (o$15) =>
-    (t$7, ...m) =>
-      o$15(
-        t$7,
-        ...m.map((o$16) =>
-          o$16 instanceof Signal.State || o$16 instanceof Signal.Computed ? h$1(o$16) : o$16,
-        ),
-      ),
-  l$1 = m(b),
-  r$1 = m(w);
+* @license
+* Copyright 2023 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ const m = (o$15) => (t$7, ...m) => o$15(t$7, ...m.map((o$16) => o$16 instanceof Signal.State || o$16 instanceof Signal.Computed ? h$1(o$16) : o$16)), l$1 = m(b), r$1 = m(w);
 
 /**
- * @license
- * Copyright 2023 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ const l = Signal.State,
-  o$4 = Signal.Computed,
-  r = (l, o$15) => new Signal.State(l, o$15),
-  i$1 = (l, o$15) => new Signal.Computed(l, o$15);
+* @license
+* Copyright 2023 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ const l = Signal.State, o$4 = Signal.Computed, r = (l, o$15) => new Signal.State(l, o$15), i$1 = (l, o$15) => new Signal.Computed(l, o$15);
 
 /**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
+* @license
+* Copyright 2021 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/
 function* o$3(o$15, f$4) {
-  if (void 0 !== o$15) {
-    let i$10 = 0;
-    for (const t$7 of o$15) yield f$4(t$7, i$10++);
-  }
+	if (void 0 !== o$15) {
+		let i$10 = 0;
+		for (const t$7 of o$15) yield f$4(t$7, i$10++);
+	}
 }
 
 let pending = false;
 let watcher = new Signal.subtle.Watcher(() => {
-  if (!pending) {
-    pending = true;
-    queueMicrotask(() => {
-      pending = false;
-      flushPending();
-    });
-  }
+	if (!pending) {
+		pending = true;
+		queueMicrotask(() => {
+			pending = false;
+			flushPending();
+		});
+	}
 });
 function flushPending() {
-  for (const signal of watcher.getPending()) {
-    signal.get();
-  }
-  watcher.watch();
+	for (const signal of watcher.getPending()) {
+		signal.get();
+	}
+	watcher.watch();
 }
 /**
- * ⚠️ WARNING: Nothing unwatches ⚠️
- * This will produce a memory leak.
- */
+* ⚠️ WARNING: Nothing unwatches ⚠️
+* This will produce a memory leak.
+*/
 function effect(cb) {
-  let c$7 = new Signal.Computed(() => cb());
-  watcher.watch(c$7);
-  c$7.get();
-  return () => {
-    watcher.unwatch(c$7);
-  };
+	let c$7 = new Signal.Computed(() => cb());
+	watcher.watch(c$7);
+	c$7.get();
+	return () => {
+		watcher.unwatch(c$7);
+	};
 }
 
 const themeContext = n$7("A2UITheme");
@@ -5037,469 +4287,371 @@ const themeContext = n$7("A2UITheme");
 const structuralStyles = r$11(structuralStyles$1);
 
 var ComponentRegistry = class {
-  constructor() {
-    this.registry = new Map();
-  }
-  register(typeName, constructor, tagName) {
-    if (!/^[a-zA-Z0-9]+$/.test(typeName)) {
-      throw new Error(`[Registry] Invalid typeName '${typeName}'. Must be alphanumeric.`);
-    }
-    this.registry.set(typeName, constructor);
-    const actualTagName = tagName || `a2ui-custom-${typeName.toLowerCase()}`;
-    const existingName = customElements.getName(constructor);
-    if (existingName) {
-      if (existingName !== actualTagName) {
-        throw new Error(
-          `Component ${typeName} is already registered as ${existingName}, but requested as ${actualTagName}.`,
-        );
-      }
-      return;
-    }
-    if (!customElements.get(actualTagName)) {
-      customElements.define(actualTagName, constructor);
-    }
-  }
-  get(typeName) {
-    return this.registry.get(typeName);
-  }
+	constructor() {
+		this.registry = new Map();
+	}
+	register(typeName, constructor, tagName) {
+		if (!/^[a-zA-Z0-9]+$/.test(typeName)) {
+			throw new Error(`[Registry] Invalid typeName '${typeName}'. Must be alphanumeric.`);
+		}
+		this.registry.set(typeName, constructor);
+		const actualTagName = tagName || `a2ui-custom-${typeName.toLowerCase()}`;
+		const existingName = customElements.getName(constructor);
+		if (existingName) {
+			if (existingName !== actualTagName) {
+				throw new Error(`Component ${typeName} is already registered as ${existingName}, but requested as ${actualTagName}.`);
+			}
+			return;
+		}
+		if (!customElements.get(actualTagName)) {
+			customElements.define(actualTagName, constructor);
+		}
+	}
+	get(typeName) {
+		return this.registry.get(typeName);
+	}
 };
 const componentRegistry = new ComponentRegistry();
 
-var __runInitializers$19 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
-var __esDecorate$19 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
+var __runInitializers$19 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
+var __esDecorate$19 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
 let Root = (() => {
-  let _classDecorators = [t$1("a2ui-root")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = o$7(i$6);
-  let _instanceExtraInitializers = [];
-  let _surfaceId_decorators;
-  let _surfaceId_initializers = [];
-  let _surfaceId_extraInitializers = [];
-  let _component_decorators;
-  let _component_initializers = [];
-  let _component_extraInitializers = [];
-  let _theme_decorators;
-  let _theme_initializers = [];
-  let _theme_extraInitializers = [];
-  let _childComponents_decorators;
-  let _childComponents_initializers = [];
-  let _childComponents_extraInitializers = [];
-  let _processor_decorators;
-  let _processor_initializers = [];
-  let _processor_extraInitializers = [];
-  let _dataContextPath_decorators;
-  let _dataContextPath_initializers = [];
-  let _dataContextPath_extraInitializers = [];
-  let _enableCustomElements_decorators;
-  let _enableCustomElements_initializers = [];
-  let _enableCustomElements_extraInitializers = [];
-  let _set_weight_decorators;
-  var Root = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _surfaceId_decorators = [n$6()];
-      _component_decorators = [n$6()];
-      _theme_decorators = [c$1({ context: themeContext })];
-      _childComponents_decorators = [n$6({ attribute: false })];
-      _processor_decorators = [n$6({ attribute: false })];
-      _dataContextPath_decorators = [n$6()];
-      _enableCustomElements_decorators = [n$6()];
-      _set_weight_decorators = [n$6()];
-      __esDecorate$19(
-        this,
-        null,
-        _surfaceId_decorators,
-        {
-          kind: "accessor",
-          name: "surfaceId",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "surfaceId" in obj,
-            get: (obj) => obj.surfaceId,
-            set: (obj, value) => {
-              obj.surfaceId = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _surfaceId_initializers,
-        _surfaceId_extraInitializers,
-      );
-      __esDecorate$19(
-        this,
-        null,
-        _component_decorators,
-        {
-          kind: "accessor",
-          name: "component",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "component" in obj,
-            get: (obj) => obj.component,
-            set: (obj, value) => {
-              obj.component = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _component_initializers,
-        _component_extraInitializers,
-      );
-      __esDecorate$19(
-        this,
-        null,
-        _theme_decorators,
-        {
-          kind: "accessor",
-          name: "theme",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "theme" in obj,
-            get: (obj) => obj.theme,
-            set: (obj, value) => {
-              obj.theme = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _theme_initializers,
-        _theme_extraInitializers,
-      );
-      __esDecorate$19(
-        this,
-        null,
-        _childComponents_decorators,
-        {
-          kind: "accessor",
-          name: "childComponents",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "childComponents" in obj,
-            get: (obj) => obj.childComponents,
-            set: (obj, value) => {
-              obj.childComponents = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _childComponents_initializers,
-        _childComponents_extraInitializers,
-      );
-      __esDecorate$19(
-        this,
-        null,
-        _processor_decorators,
-        {
-          kind: "accessor",
-          name: "processor",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "processor" in obj,
-            get: (obj) => obj.processor,
-            set: (obj, value) => {
-              obj.processor = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _processor_initializers,
-        _processor_extraInitializers,
-      );
-      __esDecorate$19(
-        this,
-        null,
-        _dataContextPath_decorators,
-        {
-          kind: "accessor",
-          name: "dataContextPath",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "dataContextPath" in obj,
-            get: (obj) => obj.dataContextPath,
-            set: (obj, value) => {
-              obj.dataContextPath = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _dataContextPath_initializers,
-        _dataContextPath_extraInitializers,
-      );
-      __esDecorate$19(
-        this,
-        null,
-        _enableCustomElements_decorators,
-        {
-          kind: "accessor",
-          name: "enableCustomElements",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "enableCustomElements" in obj,
-            get: (obj) => obj.enableCustomElements,
-            set: (obj, value) => {
-              obj.enableCustomElements = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _enableCustomElements_initializers,
-        _enableCustomElements_extraInitializers,
-      );
-      __esDecorate$19(
-        this,
-        null,
-        _set_weight_decorators,
-        {
-          kind: "setter",
-          name: "weight",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "weight" in obj,
-            set: (obj, value) => {
-              obj.weight = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        null,
-        _instanceExtraInitializers,
-      );
-      __esDecorate$19(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Root = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #surfaceId_accessor_storage =
-      (__runInitializers$19(this, _instanceExtraInitializers),
-      __runInitializers$19(this, _surfaceId_initializers, null));
-    get surfaceId() {
-      return this.#surfaceId_accessor_storage;
-    }
-    set surfaceId(value) {
-      this.#surfaceId_accessor_storage = value;
-    }
-    #component_accessor_storage =
-      (__runInitializers$19(this, _surfaceId_extraInitializers),
-      __runInitializers$19(this, _component_initializers, null));
-    get component() {
-      return this.#component_accessor_storage;
-    }
-    set component(value) {
-      this.#component_accessor_storage = value;
-    }
-    #theme_accessor_storage =
-      (__runInitializers$19(this, _component_extraInitializers),
-      __runInitializers$19(this, _theme_initializers, void 0));
-    get theme() {
-      return this.#theme_accessor_storage;
-    }
-    set theme(value) {
-      this.#theme_accessor_storage = value;
-    }
-    #childComponents_accessor_storage =
-      (__runInitializers$19(this, _theme_extraInitializers),
-      __runInitializers$19(this, _childComponents_initializers, null));
-    get childComponents() {
-      return this.#childComponents_accessor_storage;
-    }
-    set childComponents(value) {
-      this.#childComponents_accessor_storage = value;
-    }
-    #processor_accessor_storage =
-      (__runInitializers$19(this, _childComponents_extraInitializers),
-      __runInitializers$19(this, _processor_initializers, null));
-    get processor() {
-      return this.#processor_accessor_storage;
-    }
-    set processor(value) {
-      this.#processor_accessor_storage = value;
-    }
-    #dataContextPath_accessor_storage =
-      (__runInitializers$19(this, _processor_extraInitializers),
-      __runInitializers$19(this, _dataContextPath_initializers, ""));
-    get dataContextPath() {
-      return this.#dataContextPath_accessor_storage;
-    }
-    set dataContextPath(value) {
-      this.#dataContextPath_accessor_storage = value;
-    }
-    #enableCustomElements_accessor_storage =
-      (__runInitializers$19(this, _dataContextPath_extraInitializers),
-      __runInitializers$19(this, _enableCustomElements_initializers, false));
-    get enableCustomElements() {
-      return this.#enableCustomElements_accessor_storage;
-    }
-    set enableCustomElements(value) {
-      this.#enableCustomElements_accessor_storage = value;
-    }
-    set weight(weight) {
-      this.#weight = weight;
-      this.style.setProperty("--weight", `${weight}`);
-    }
-    get weight() {
-      return this.#weight;
-    }
-    #weight = (__runInitializers$19(this, _enableCustomElements_extraInitializers), 1);
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-root")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = o$7(i$6);
+	let _instanceExtraInitializers = [];
+	let _surfaceId_decorators;
+	let _surfaceId_initializers = [];
+	let _surfaceId_extraInitializers = [];
+	let _component_decorators;
+	let _component_initializers = [];
+	let _component_extraInitializers = [];
+	let _theme_decorators;
+	let _theme_initializers = [];
+	let _theme_extraInitializers = [];
+	let _childComponents_decorators;
+	let _childComponents_initializers = [];
+	let _childComponents_extraInitializers = [];
+	let _processor_decorators;
+	let _processor_initializers = [];
+	let _processor_extraInitializers = [];
+	let _dataContextPath_decorators;
+	let _dataContextPath_initializers = [];
+	let _dataContextPath_extraInitializers = [];
+	let _enableCustomElements_decorators;
+	let _enableCustomElements_initializers = [];
+	let _enableCustomElements_extraInitializers = [];
+	let _set_weight_decorators;
+	var Root = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_surfaceId_decorators = [n$6()];
+			_component_decorators = [n$6()];
+			_theme_decorators = [c$1({ context: themeContext })];
+			_childComponents_decorators = [n$6({ attribute: false })];
+			_processor_decorators = [n$6({ attribute: false })];
+			_dataContextPath_decorators = [n$6()];
+			_enableCustomElements_decorators = [n$6()];
+			_set_weight_decorators = [n$6()];
+			__esDecorate$19(this, null, _surfaceId_decorators, {
+				kind: "accessor",
+				name: "surfaceId",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "surfaceId" in obj,
+					get: (obj) => obj.surfaceId,
+					set: (obj, value) => {
+						obj.surfaceId = value;
+					}
+				},
+				metadata: _metadata
+			}, _surfaceId_initializers, _surfaceId_extraInitializers);
+			__esDecorate$19(this, null, _component_decorators, {
+				kind: "accessor",
+				name: "component",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "component" in obj,
+					get: (obj) => obj.component,
+					set: (obj, value) => {
+						obj.component = value;
+					}
+				},
+				metadata: _metadata
+			}, _component_initializers, _component_extraInitializers);
+			__esDecorate$19(this, null, _theme_decorators, {
+				kind: "accessor",
+				name: "theme",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "theme" in obj,
+					get: (obj) => obj.theme,
+					set: (obj, value) => {
+						obj.theme = value;
+					}
+				},
+				metadata: _metadata
+			}, _theme_initializers, _theme_extraInitializers);
+			__esDecorate$19(this, null, _childComponents_decorators, {
+				kind: "accessor",
+				name: "childComponents",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "childComponents" in obj,
+					get: (obj) => obj.childComponents,
+					set: (obj, value) => {
+						obj.childComponents = value;
+					}
+				},
+				metadata: _metadata
+			}, _childComponents_initializers, _childComponents_extraInitializers);
+			__esDecorate$19(this, null, _processor_decorators, {
+				kind: "accessor",
+				name: "processor",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "processor" in obj,
+					get: (obj) => obj.processor,
+					set: (obj, value) => {
+						obj.processor = value;
+					}
+				},
+				metadata: _metadata
+			}, _processor_initializers, _processor_extraInitializers);
+			__esDecorate$19(this, null, _dataContextPath_decorators, {
+				kind: "accessor",
+				name: "dataContextPath",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "dataContextPath" in obj,
+					get: (obj) => obj.dataContextPath,
+					set: (obj, value) => {
+						obj.dataContextPath = value;
+					}
+				},
+				metadata: _metadata
+			}, _dataContextPath_initializers, _dataContextPath_extraInitializers);
+			__esDecorate$19(this, null, _enableCustomElements_decorators, {
+				kind: "accessor",
+				name: "enableCustomElements",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "enableCustomElements" in obj,
+					get: (obj) => obj.enableCustomElements,
+					set: (obj, value) => {
+						obj.enableCustomElements = value;
+					}
+				},
+				metadata: _metadata
+			}, _enableCustomElements_initializers, _enableCustomElements_extraInitializers);
+			__esDecorate$19(this, null, _set_weight_decorators, {
+				kind: "setter",
+				name: "weight",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "weight" in obj,
+					set: (obj, value) => {
+						obj.weight = value;
+					}
+				},
+				metadata: _metadata
+			}, null, _instanceExtraInitializers);
+			__esDecorate$19(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Root = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#surfaceId_accessor_storage = (__runInitializers$19(this, _instanceExtraInitializers), __runInitializers$19(this, _surfaceId_initializers, null));
+		get surfaceId() {
+			return this.#surfaceId_accessor_storage;
+		}
+		set surfaceId(value) {
+			this.#surfaceId_accessor_storage = value;
+		}
+		#component_accessor_storage = (__runInitializers$19(this, _surfaceId_extraInitializers), __runInitializers$19(this, _component_initializers, null));
+		get component() {
+			return this.#component_accessor_storage;
+		}
+		set component(value) {
+			this.#component_accessor_storage = value;
+		}
+		#theme_accessor_storage = (__runInitializers$19(this, _component_extraInitializers), __runInitializers$19(this, _theme_initializers, void 0));
+		get theme() {
+			return this.#theme_accessor_storage;
+		}
+		set theme(value) {
+			this.#theme_accessor_storage = value;
+		}
+		#childComponents_accessor_storage = (__runInitializers$19(this, _theme_extraInitializers), __runInitializers$19(this, _childComponents_initializers, null));
+		get childComponents() {
+			return this.#childComponents_accessor_storage;
+		}
+		set childComponents(value) {
+			this.#childComponents_accessor_storage = value;
+		}
+		#processor_accessor_storage = (__runInitializers$19(this, _childComponents_extraInitializers), __runInitializers$19(this, _processor_initializers, null));
+		get processor() {
+			return this.#processor_accessor_storage;
+		}
+		set processor(value) {
+			this.#processor_accessor_storage = value;
+		}
+		#dataContextPath_accessor_storage = (__runInitializers$19(this, _processor_extraInitializers), __runInitializers$19(this, _dataContextPath_initializers, ""));
+		get dataContextPath() {
+			return this.#dataContextPath_accessor_storage;
+		}
+		set dataContextPath(value) {
+			this.#dataContextPath_accessor_storage = value;
+		}
+		#enableCustomElements_accessor_storage = (__runInitializers$19(this, _dataContextPath_extraInitializers), __runInitializers$19(this, _enableCustomElements_initializers, false));
+		get enableCustomElements() {
+			return this.#enableCustomElements_accessor_storage;
+		}
+		set enableCustomElements(value) {
+			this.#enableCustomElements_accessor_storage = value;
+		}
+		set weight(weight) {
+			this.#weight = weight;
+			this.style.setProperty("--weight", `${weight}`);
+		}
+		get weight() {
+			return this.#weight;
+		}
+		#weight = (__runInitializers$19(this, _enableCustomElements_extraInitializers), 1);
+		static {
+			this.styles = [structuralStyles, i$9`
       :host {
         display: flex;
         flex-direction: column;
         gap: 8px;
         max-height: 80%;
       }
-    `,
-      ];
-    }
-    /**
-     * Holds the cleanup function for our effect.
-     * We need this to stop the effect when the component is disconnected.
-     */
-    #lightDomEffectDisposer = null;
-    willUpdate(changedProperties) {
-      if (changedProperties.has("childComponents")) {
-        if (this.#lightDomEffectDisposer) {
-          this.#lightDomEffectDisposer();
-        }
-        this.#lightDomEffectDisposer = effect(() => {
-          const allChildren = this.childComponents ?? null;
-          const lightDomTemplate = this.renderComponentTree(allChildren);
-          D(lightDomTemplate, this, { host: this });
-        });
-      }
-    }
-    /**
-     * Clean up the effect when the component is removed from the DOM.
-     */
-    disconnectedCallback() {
-      super.disconnectedCallback();
-      if (this.#lightDomEffectDisposer) {
-        this.#lightDomEffectDisposer();
-      }
-    }
-    /**
-     * Turns the SignalMap into a renderable TemplateResult for Lit.
-     */
-    renderComponentTree(components) {
-      if (!components) {
-        return A;
-      }
-      if (!Array.isArray(components)) {
-        return A;
-      }
-      return b` ${o$3(components, (component) => {
-        if (this.enableCustomElements) {
-          const registeredCtor = componentRegistry.get(component.type);
-          const elCtor = registeredCtor || customElements.get(component.type);
-          if (elCtor) {
-            const node = component;
-            const el = new elCtor();
-            el.id = node.id;
-            if (node.slotName) {
-              el.slot = node.slotName;
-            }
-            el.component = node;
-            el.weight = node.weight ?? "initial";
-            el.processor = this.processor;
-            el.surfaceId = this.surfaceId;
-            el.dataContextPath = node.dataContextPath ?? "/";
-            for (const [prop, val] of Object.entries(component.properties)) {
-              el[prop] = val;
-            }
-            return b`${el}`;
-          }
-        }
-        switch (component.type) {
-          case "List": {
-            const node = component;
-            const childComponents = node.properties.children;
-            return b`<a2ui-list
+    `];
+		}
+		/**
+		* Holds the cleanup function for our effect.
+		* We need this to stop the effect when the component is disconnected.
+		*/
+		#lightDomEffectDisposer = null;
+		willUpdate(changedProperties) {
+			if (changedProperties.has("childComponents")) {
+				if (this.#lightDomEffectDisposer) {
+					this.#lightDomEffectDisposer();
+				}
+				this.#lightDomEffectDisposer = effect(() => {
+					const allChildren = this.childComponents ?? null;
+					const lightDomTemplate = this.renderComponentTree(allChildren);
+					D(lightDomTemplate, this, { host: this });
+				});
+			}
+		}
+		/**
+		* Clean up the effect when the component is removed from the DOM.
+		*/
+		disconnectedCallback() {
+			super.disconnectedCallback();
+			if (this.#lightDomEffectDisposer) {
+				this.#lightDomEffectDisposer();
+			}
+		}
+		/**
+		* Turns the SignalMap into a renderable TemplateResult for Lit.
+		*/
+		renderComponentTree(components) {
+			if (!components) {
+				return A;
+			}
+			if (!Array.isArray(components)) {
+				return A;
+			}
+			return b` ${o$3(components, (component) => {
+				if (this.enableCustomElements) {
+					const registeredCtor = componentRegistry.get(component.type);
+					const elCtor = registeredCtor || customElements.get(component.type);
+					if (elCtor) {
+						const node = component;
+						const el = new elCtor();
+						el.id = node.id;
+						if (node.slotName) {
+							el.slot = node.slotName;
+						}
+						el.component = node;
+						el.weight = node.weight ?? "initial";
+						el.processor = this.processor;
+						el.surfaceId = this.surfaceId;
+						el.dataContextPath = node.dataContextPath ?? "/";
+						for (const [prop, val] of Object.entries(component.properties)) {
+							el[prop] = val;
+						}
+						return b`${el}`;
+					}
+				}
+				switch (component.type) {
+					case "List": {
+						const node = component;
+						const childComponents = node.properties.children;
+						return b`<a2ui-list
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5510,14 +4662,14 @@ let Root = (() => {
             .childComponents=${childComponents}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-list>`;
-          }
-          case "Card": {
-            const node = component;
-            let childComponents = node.properties.children;
-            if (!childComponents && node.properties.child) {
-              childComponents = [node.properties.child];
-            }
-            return b`<a2ui-card
+					}
+					case "Card": {
+						const node = component;
+						let childComponents = node.properties.children;
+						if (!childComponents && node.properties.child) {
+							childComponents = [node.properties.child];
+						}
+						return b`<a2ui-card
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5528,10 +4680,10 @@ let Root = (() => {
             .dataContextPath=${node.dataContextPath ?? ""}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-card>`;
-          }
-          case "Column": {
-            const node = component;
-            return b`<a2ui-column
+					}
+					case "Column": {
+						const node = component;
+						return b`<a2ui-column
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5544,10 +4696,10 @@ let Root = (() => {
             .distribution=${node.properties.distribution ?? "start"}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-column>`;
-          }
-          case "Row": {
-            const node = component;
-            return b`<a2ui-row
+					}
+					case "Row": {
+						const node = component;
+						return b`<a2ui-row
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5560,10 +4712,10 @@ let Root = (() => {
             .distribution=${node.properties.distribution ?? "start"}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-row>`;
-          }
-          case "Image": {
-            const node = component;
-            return b`<a2ui-image
+					}
+					case "Image": {
+						const node = component;
+						return b`<a2ui-image
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5576,10 +4728,10 @@ let Root = (() => {
             .fit=${node.properties.fit}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-image>`;
-          }
-          case "Icon": {
-            const node = component;
-            return b`<a2ui-icon
+					}
+					case "Icon": {
+						const node = component;
+						return b`<a2ui-icon
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5590,10 +4742,10 @@ let Root = (() => {
             .dataContextPath=${node.dataContextPath ?? ""}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-icon>`;
-          }
-          case "AudioPlayer": {
-            const node = component;
-            return b`<a2ui-audioplayer
+					}
+					case "AudioPlayer": {
+						const node = component;
+						return b`<a2ui-audioplayer
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5604,10 +4756,10 @@ let Root = (() => {
             .dataContextPath=${node.dataContextPath ?? ""}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-audioplayer>`;
-          }
-          case "Button": {
-            const node = component;
-            return b`<a2ui-button
+					}
+					case "Button": {
+						const node = component;
+						return b`<a2ui-button
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5619,10 +4771,10 @@ let Root = (() => {
             .childComponents=${[node.properties.child]}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-button>`;
-          }
-          case "Text": {
-            const node = component;
-            return b`<a2ui-text
+					}
+					case "Text": {
+						const node = component;
+						return b`<a2ui-text
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5635,10 +4787,10 @@ let Root = (() => {
             .usageHint=${node.properties.usageHint}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-text>`;
-          }
-          case "CheckBox": {
-            const node = component;
-            return b`<a2ui-checkbox
+					}
+					case "CheckBox": {
+						const node = component;
+						return b`<a2ui-checkbox
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5650,10 +4802,10 @@ let Root = (() => {
             .value=${node.properties.value}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-checkbox>`;
-          }
-          case "DateTimeInput": {
-            const node = component;
-            return b`<a2ui-datetimeinput
+					}
+					case "DateTimeInput": {
+						const node = component;
+						return b`<a2ui-datetimeinput
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5667,10 +4819,10 @@ let Root = (() => {
             .value=${node.properties.value}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-datetimeinput>`;
-          }
-          case "Divider": {
-            const node = component;
-            return b`<a2ui-divider
+					}
+					case "Divider": {
+						const node = component;
+						return b`<a2ui-divider
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5683,10 +4835,10 @@ let Root = (() => {
             .color=${node.properties.color}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-divider>`;
-          }
-          case "MultipleChoice": {
-            const node = component;
-            return b`<a2ui-multiplechoice
+					}
+					case "MultipleChoice": {
+						const node = component;
+						return b`<a2ui-multiplechoice
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5699,10 +4851,10 @@ let Root = (() => {
             .selections=${node.properties.selections}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-multiplechoice>`;
-          }
-          case "Slider": {
-            const node = component;
-            return b`<a2ui-slider
+					}
+					case "Slider": {
+						const node = component;
+						return b`<a2ui-slider
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5715,10 +4867,10 @@ let Root = (() => {
             .maxValue=${node.properties.maxValue}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-slider>`;
-          }
-          case "TextField": {
-            const node = component;
-            return b`<a2ui-textfield
+					}
+					case "TextField": {
+						const node = component;
+						return b`<a2ui-textfield
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5732,10 +4884,10 @@ let Root = (() => {
             .validationRegexp=${node.properties.validationRegexp}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-textfield>`;
-          }
-          case "Video": {
-            const node = component;
-            return b`<a2ui-video
+					}
+					case "Video": {
+						const node = component;
+						return b`<a2ui-video
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5746,18 +4898,18 @@ let Root = (() => {
             .url=${node.properties.url}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-video>`;
-          }
-          case "Tabs": {
-            const node = component;
-            const titles = [];
-            const childComponents = [];
-            if (node.properties.tabItems) {
-              for (const item of node.properties.tabItems) {
-                titles.push(item.title);
-                childComponents.push(item.child);
-              }
-            }
-            return b`<a2ui-tabs
+					}
+					case "Tabs": {
+						const node = component;
+						const titles = [];
+						const childComponents = [];
+						if (node.properties.tabItems) {
+							for (const item of node.properties.tabItems) {
+								titles.push(item.title);
+								childComponents.push(item.child);
+							}
+						}
+						return b`<a2ui-tabs
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5769,12 +4921,12 @@ let Root = (() => {
             .childComponents=${childComponents}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-tabs>`;
-          }
-          case "Modal": {
-            const node = component;
-            const childComponents = [node.properties.entryPointChild, node.properties.contentChild];
-            node.properties.entryPointChild.slotName = "entry";
-            return b`<a2ui-modal
+					}
+					case "Modal": {
+						const node = component;
+						const childComponents = [node.properties.entryPointChild, node.properties.contentChild];
+						node.properties.entryPointChild.slotName = "entry";
+						return b`<a2ui-modal
             id=${node.id}
             slot=${node.slotName ? node.slotName : A}
             .component=${node}
@@ -5785,270 +4937,199 @@ let Root = (() => {
             .childComponents=${childComponents}
             .enableCustomElements=${this.enableCustomElements}
           ></a2ui-modal>`;
-          }
-          default: {
-            return this.renderCustomComponent(component);
-          }
-        }
-      })}`;
-    }
-    renderCustomComponent(component) {
-      if (!this.enableCustomElements) {
-        return;
-      }
-      const node = component;
-      const registeredCtor = componentRegistry.get(component.type);
-      const elCtor = registeredCtor || customElements.get(component.type);
-      if (!elCtor) {
-        return b`Unknown element ${component.type}`;
-      }
-      const el = new elCtor();
-      el.id = node.id;
-      if (node.slotName) {
-        el.slot = node.slotName;
-      }
-      el.component = node;
-      el.weight = node.weight ?? "initial";
-      el.processor = this.processor;
-      el.surfaceId = this.surfaceId;
-      el.dataContextPath = node.dataContextPath ?? "/";
-      for (const [prop, val] of Object.entries(component.properties)) {
-        el[prop] = val;
-      }
-      return b`${el}`;
-    }
-    render() {
-      return b`<slot></slot>`;
-    }
-    static {
-      __runInitializers$19(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Root = _classThis);
+					}
+					default: {
+						return this.renderCustomComponent(component);
+					}
+				}
+			})}`;
+		}
+		renderCustomComponent(component) {
+			if (!this.enableCustomElements) {
+				return;
+			}
+			const node = component;
+			const registeredCtor = componentRegistry.get(component.type);
+			const elCtor = registeredCtor || customElements.get(component.type);
+			if (!elCtor) {
+				return b`Unknown element ${component.type}`;
+			}
+			const el = new elCtor();
+			el.id = node.id;
+			if (node.slotName) {
+				el.slot = node.slotName;
+			}
+			el.component = node;
+			el.weight = node.weight ?? "initial";
+			el.processor = this.processor;
+			el.surfaceId = this.surfaceId;
+			el.dataContextPath = node.dataContextPath ?? "/";
+			for (const [prop, val] of Object.entries(component.properties)) {
+				el[prop] = val;
+			}
+			return b`${el}`;
+		}
+		render() {
+			return b`<slot></slot>`;
+		}
+		static {
+			__runInitializers$19(_classThis, _classExtraInitializers);
+		}
+	};
+	return Root = _classThis;
 })();
 
 /**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ const e$2 = e$10(
-  class extends i$5 {
-    constructor(t$7) {
-      if (
-        (super(t$7), t$7.type !== t$4.ATTRIBUTE || "class" !== t$7.name || t$7.strings?.length > 2)
-      )
-        throw Error(
-          "`classMap()` can only be used in the `class` attribute and must be the only part in the attribute.",
-        );
-    }
-    render(t$7) {
-      return (
-        " " +
-        Object.keys(t$7)
-          .filter((s$9) => t$7[s$9])
-          .join(" ") +
-        " "
-      );
-    }
-    update(s$9, [i$10]) {
-      if (void 0 === this.st) {
-        ((this.st = new Set()),
-          void 0 !== s$9.strings &&
-            (this.nt = new Set(
-              s$9.strings
-                .join(" ")
-                .split(/\s/)
-                .filter((t$7) => "" !== t$7),
-            )));
-        for (const t$7 in i$10) i$10[t$7] && !this.nt?.has(t$7) && this.st.add(t$7);
-        return this.render(i$10);
-      }
-      const r$12 = s$9.element.classList;
-      for (const t$7 of this.st) t$7 in i$10 || (r$12.remove(t$7), this.st.delete(t$7));
-      for (const t$7 in i$10) {
-        const s$10 = !!i$10[t$7];
-        s$10 === this.st.has(t$7) ||
-          this.nt?.has(t$7) ||
-          (s$10 ? (r$12.add(t$7), this.st.add(t$7)) : (r$12.remove(t$7), this.st.delete(t$7)));
-      }
-      return E;
-    }
-  },
-);
+* @license
+* Copyright 2018 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ const e$2 = e$10(class extends i$5 {
+	constructor(t$7) {
+		if (super(t$7), t$7.type !== t$4.ATTRIBUTE || "class" !== t$7.name || t$7.strings?.length > 2) throw Error("`classMap()` can only be used in the `class` attribute and must be the only part in the attribute.");
+	}
+	render(t$7) {
+		return " " + Object.keys(t$7).filter((s$9) => t$7[s$9]).join(" ") + " ";
+	}
+	update(s$9, [i$10]) {
+		if (void 0 === this.st) {
+			this.st = new Set(), void 0 !== s$9.strings && (this.nt = new Set(s$9.strings.join(" ").split(/\s/).filter((t$7) => "" !== t$7)));
+			for (const t$7 in i$10) i$10[t$7] && !this.nt?.has(t$7) && this.st.add(t$7);
+			return this.render(i$10);
+		}
+		const r$12 = s$9.element.classList;
+		for (const t$7 of this.st) t$7 in i$10 || (r$12.remove(t$7), this.st.delete(t$7));
+		for (const t$7 in i$10) {
+			const s$10 = !!i$10[t$7];
+			s$10 === this.st.has(t$7) || this.nt?.has(t$7) || (s$10 ? (r$12.add(t$7), this.st.add(t$7)) : (r$12.remove(t$7), this.st.delete(t$7)));
+		}
+		return E;
+	}
+});
 
 /**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ const n$1 = "important",
-  i = " !" + n$1,
-  o$2 = e$10(
-    class extends i$5 {
-      constructor(t$7) {
-        if (
-          (super(t$7),
-          t$7.type !== t$4.ATTRIBUTE || "style" !== t$7.name || t$7.strings?.length > 2)
-        )
-          throw Error(
-            "The `styleMap` directive must be used in the `style` attribute and must be the only part in the attribute.",
-          );
-      }
-      render(t$7) {
-        return Object.keys(t$7).reduce((e$14, r$12) => {
-          const s$9 = t$7[r$12];
-          return null == s$9
-            ? e$14
-            : e$14 +
-                `${(r$12 = r$12.includes("-") ? r$12 : r$12.replace(/(?:^(webkit|moz|ms|o)|)(?=[A-Z])/g, "-$&").toLowerCase())}:${s$9};`;
-        }, "");
-      }
-      update(e$14, [r$12]) {
-        const { style: s$9 } = e$14.element;
-        if (void 0 === this.ft) return ((this.ft = new Set(Object.keys(r$12))), this.render(r$12));
-        for (const t$7 of this.ft)
-          null == r$12[t$7] &&
-            (this.ft.delete(t$7), t$7.includes("-") ? s$9.removeProperty(t$7) : (s$9[t$7] = null));
-        for (const t$7 in r$12) {
-          const e$15 = r$12[t$7];
-          if (null != e$15) {
-            this.ft.add(t$7);
-            const r$13 = "string" == typeof e$15 && e$15.endsWith(i);
-            t$7.includes("-") || r$13
-              ? s$9.setProperty(t$7, r$13 ? e$15.slice(0, -11) : e$15, r$13 ? n$1 : "")
-              : (s$9[t$7] = e$15);
-          }
-        }
-        return E;
-      }
-    },
-  );
+* @license
+* Copyright 2018 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ const n$1 = "important", i = " !" + n$1, o$2 = e$10(class extends i$5 {
+	constructor(t$7) {
+		if (super(t$7), t$7.type !== t$4.ATTRIBUTE || "style" !== t$7.name || t$7.strings?.length > 2) throw Error("The `styleMap` directive must be used in the `style` attribute and must be the only part in the attribute.");
+	}
+	render(t$7) {
+		return Object.keys(t$7).reduce((e$14, r$12) => {
+			const s$9 = t$7[r$12];
+			return null == s$9 ? e$14 : e$14 + `${r$12 = r$12.includes("-") ? r$12 : r$12.replace(/(?:^(webkit|moz|ms|o)|)(?=[A-Z])/g, "-$&").toLowerCase()}:${s$9};`;
+		}, "");
+	}
+	update(e$14, [r$12]) {
+		const { style: s$9 } = e$14.element;
+		if (void 0 === this.ft) return this.ft = new Set(Object.keys(r$12)), this.render(r$12);
+		for (const t$7 of this.ft) null == r$12[t$7] && (this.ft.delete(t$7), t$7.includes("-") ? s$9.removeProperty(t$7) : s$9[t$7] = null);
+		for (const t$7 in r$12) {
+			const e$15 = r$12[t$7];
+			if (null != e$15) {
+				this.ft.add(t$7);
+				const r$13 = "string" == typeof e$15 && e$15.endsWith(i);
+				t$7.includes("-") || r$13 ? s$9.setProperty(t$7, r$13 ? e$15.slice(0, -11) : e$15, r$13 ? n$1 : "") : s$9[t$7] = e$15;
+			}
+		}
+		return E;
+	}
+});
 
-var __esDecorate$18 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$18 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$18 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$18 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Audio = (() => {
-  let _classDecorators = [t$1("a2ui-audioplayer")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _url_decorators;
-  let _url_initializers = [];
-  let _url_extraInitializers = [];
-  var Audio = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _url_decorators = [n$6()];
-      __esDecorate$18(
-        this,
-        null,
-        _url_decorators,
-        {
-          kind: "accessor",
-          name: "url",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "url" in obj,
-            get: (obj) => obj.url,
-            set: (obj, value) => {
-              obj.url = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _url_initializers,
-        _url_extraInitializers,
-      );
-      __esDecorate$18(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Audio = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #url_accessor_storage = __runInitializers$18(this, _url_initializers, null);
-    get url() {
-      return this.#url_accessor_storage;
-    }
-    set url(value) {
-      this.#url_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-audioplayer")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _url_decorators;
+	let _url_initializers = [];
+	let _url_extraInitializers = [];
+	var Audio = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_url_decorators = [n$6()];
+			__esDecorate$18(this, null, _url_decorators, {
+				kind: "accessor",
+				name: "url",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "url" in obj,
+					get: (obj) => obj.url,
+					set: (obj, value) => {
+						obj.url = value;
+					}
+				},
+				metadata: _metadata
+			}, _url_initializers, _url_extraInitializers);
+			__esDecorate$18(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Audio = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#url_accessor_storage = __runInitializers$18(this, _url_initializers, null);
+		get url() {
+			return this.#url_accessor_storage;
+		}
+		set url(value) {
+			this.#url_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -6064,317 +5145,254 @@ let Audio = (() => {
         display: block;
         width: 100%;
       }
-    `,
-      ];
-    }
-    #renderAudio() {
-      if (!this.url) {
-        return A;
-      }
-      if (this.url && typeof this.url === "object") {
-        if ("literalString" in this.url) {
-          return b`<audio controls src=${this.url.literalString} />`;
-        } else if ("literal" in this.url) {
-          return b`<audio controls src=${this.url.literal} />`;
-        } else if (this.url && "path" in this.url && this.url.path) {
-          if (!this.processor || !this.component) {
-            return b`(no processor)`;
-          }
-          const audioUrl = this.processor.getData(
-            this.component,
-            this.url.path,
-            this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-          );
-          if (!audioUrl) {
-            return b`Invalid audio URL`;
-          }
-          if (typeof audioUrl !== "string") {
-            return b`Invalid audio URL`;
-          }
-          return b`<audio controls src=${audioUrl} />`;
-        }
-      }
-      return b`(empty)`;
-    }
-    render() {
-      return b`<section
+    `];
+		}
+		#renderAudio() {
+			if (!this.url) {
+				return A;
+			}
+			if (this.url && typeof this.url === "object") {
+				if ("literalString" in this.url) {
+					return b`<audio controls src=${this.url.literalString} />`;
+				} else if ("literal" in this.url) {
+					return b`<audio controls src=${this.url.literal} />`;
+				} else if (this.url && "path" in this.url && this.url.path) {
+					if (!this.processor || !this.component) {
+						return b`(no processor)`;
+					}
+					const audioUrl = this.processor.getData(this.component, this.url.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+					if (!audioUrl) {
+						return b`Invalid audio URL`;
+					}
+					if (typeof audioUrl !== "string") {
+						return b`Invalid audio URL`;
+					}
+					return b`<audio controls src=${audioUrl} />`;
+				}
+			}
+			return b`(empty)`;
+		}
+		render() {
+			return b`<section
       class=${e$2(this.theme.components.AudioPlayer)}
       style=${this.theme.additionalStyles?.AudioPlayer ? o$2(this.theme.additionalStyles?.AudioPlayer) : A}
     >
       ${this.#renderAudio()}
     </section>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$18(this, _url_extraInitializers);
-    }
-    static {
-      __runInitializers$18(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Audio = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$18(this, _url_extraInitializers);
+		}
+		static {
+			__runInitializers$18(_classThis, _classExtraInitializers);
+		}
+	};
+	return Audio = _classThis;
 })();
 
-var __esDecorate$17 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$17 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$17 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$17 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Button = (() => {
-  let _classDecorators = [t$1("a2ui-button")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _action_decorators;
-  let _action_initializers = [];
-  let _action_extraInitializers = [];
-  var Button = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _action_decorators = [n$6()];
-      __esDecorate$17(
-        this,
-        null,
-        _action_decorators,
-        {
-          kind: "accessor",
-          name: "action",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "action" in obj,
-            get: (obj) => obj.action,
-            set: (obj, value) => {
-              obj.action = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _action_initializers,
-        _action_extraInitializers,
-      );
-      __esDecorate$17(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Button = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #action_accessor_storage = __runInitializers$17(this, _action_initializers, null);
-    get action() {
-      return this.#action_accessor_storage;
-    }
-    set action(value) {
-      this.#action_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-button")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _action_decorators;
+	let _action_initializers = [];
+	let _action_extraInitializers = [];
+	var Button = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_action_decorators = [n$6()];
+			__esDecorate$17(this, null, _action_decorators, {
+				kind: "accessor",
+				name: "action",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "action" in obj,
+					get: (obj) => obj.action,
+					set: (obj, value) => {
+						obj.action = value;
+					}
+				},
+				metadata: _metadata
+			}, _action_initializers, _action_extraInitializers);
+			__esDecorate$17(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Button = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#action_accessor_storage = __runInitializers$17(this, _action_initializers, null);
+		get action() {
+			return this.#action_accessor_storage;
+		}
+		set action(value) {
+			this.#action_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       :host {
         display: block;
         flex: var(--weight);
         min-height: 0;
       }
-    `,
-      ];
-    }
-    render() {
-      return b`<button
+    `];
+		}
+		render() {
+			return b`<button
       class=${e$2(this.theme.components.Button)}
       style=${this.theme.additionalStyles?.Button ? o$2(this.theme.additionalStyles?.Button) : A}
       @click=${() => {
-        if (!this.action) {
-          return;
-        }
-        const evt = new StateEvent({
-          eventType: "a2ui.action",
-          action: this.action,
-          dataContextPath: this.dataContextPath,
-          sourceComponentId: this.id,
-          sourceComponent: this.component,
-        });
-        this.dispatchEvent(evt);
-      }}
+				if (!this.action) {
+					return;
+				}
+				const evt = new StateEvent({
+					eventType: "a2ui.action",
+					action: this.action,
+					dataContextPath: this.dataContextPath,
+					sourceComponentId: this.id,
+					sourceComponent: this.component
+				});
+				this.dispatchEvent(evt);
+			}}
     >
       <slot></slot>
     </button>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$17(this, _action_extraInitializers);
-    }
-    static {
-      __runInitializers$17(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Button = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$17(this, _action_extraInitializers);
+		}
+		static {
+			__runInitializers$17(_classThis, _classExtraInitializers);
+		}
+	};
+	return Button = _classThis;
 })();
 
-var __esDecorate$16 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$16 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$16 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$16 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Card = (() => {
-  let _classDecorators = [t$1("a2ui-card")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  var Card = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      __esDecorate$16(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Card = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-card")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	var Card = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			__esDecorate$16(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Card = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -6397,184 +5415,142 @@ let Card = (() => {
           width: 100%;
         }
       }
-    `,
-      ];
-    }
-    render() {
-      return b` <section
+    `];
+		}
+		render() {
+			return b` <section
       class=${e$2(this.theme.components.Card)}
       style=${this.theme.additionalStyles?.Card ? o$2(this.theme.additionalStyles?.Card) : A}
     >
       <slot></slot>
     </section>`;
-    }
-    static {
-      __runInitializers$16(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Card = _classThis);
+		}
+		static {
+			__runInitializers$16(_classThis, _classExtraInitializers);
+		}
+	};
+	return Card = _classThis;
 })();
 
-var __esDecorate$15 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$15 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$15 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$15 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Checkbox = (() => {
-  let _classDecorators = [t$1("a2ui-checkbox")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _value_decorators;
-  let _value_initializers = [];
-  let _value_extraInitializers = [];
-  let _label_decorators;
-  let _label_initializers = [];
-  let _label_extraInitializers = [];
-  var Checkbox = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _value_decorators = [n$6()];
-      _label_decorators = [n$6()];
-      __esDecorate$15(
-        this,
-        null,
-        _value_decorators,
-        {
-          kind: "accessor",
-          name: "value",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "value" in obj,
-            get: (obj) => obj.value,
-            set: (obj, value) => {
-              obj.value = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _value_initializers,
-        _value_extraInitializers,
-      );
-      __esDecorate$15(
-        this,
-        null,
-        _label_decorators,
-        {
-          kind: "accessor",
-          name: "label",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "label" in obj,
-            get: (obj) => obj.label,
-            set: (obj, value) => {
-              obj.label = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _label_initializers,
-        _label_extraInitializers,
-      );
-      __esDecorate$15(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Checkbox = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #value_accessor_storage = __runInitializers$15(this, _value_initializers, null);
-    get value() {
-      return this.#value_accessor_storage;
-    }
-    set value(value) {
-      this.#value_accessor_storage = value;
-    }
-    #label_accessor_storage =
-      (__runInitializers$15(this, _value_extraInitializers),
-      __runInitializers$15(this, _label_initializers, null));
-    get label() {
-      return this.#label_accessor_storage;
-    }
-    set label(value) {
-      this.#label_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-checkbox")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _value_decorators;
+	let _value_initializers = [];
+	let _value_extraInitializers = [];
+	let _label_decorators;
+	let _label_initializers = [];
+	let _label_extraInitializers = [];
+	var Checkbox = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_value_decorators = [n$6()];
+			_label_decorators = [n$6()];
+			__esDecorate$15(this, null, _value_decorators, {
+				kind: "accessor",
+				name: "value",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "value" in obj,
+					get: (obj) => obj.value,
+					set: (obj, value) => {
+						obj.value = value;
+					}
+				},
+				metadata: _metadata
+			}, _value_initializers, _value_extraInitializers);
+			__esDecorate$15(this, null, _label_decorators, {
+				kind: "accessor",
+				name: "label",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "label" in obj,
+					get: (obj) => obj.label,
+					set: (obj, value) => {
+						obj.label = value;
+					}
+				},
+				metadata: _metadata
+			}, _label_initializers, _label_extraInitializers);
+			__esDecorate$15(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Checkbox = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#value_accessor_storage = __runInitializers$15(this, _value_initializers, null);
+		get value() {
+			return this.#value_accessor_storage;
+		}
+		set value(value) {
+			this.#value_accessor_storage = value;
+		}
+		#label_accessor_storage = (__runInitializers$15(this, _value_extraInitializers), __runInitializers$15(this, _label_initializers, null));
+		get label() {
+			return this.#label_accessor_storage;
+		}
+		set label(value) {
+			this.#label_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -6595,28 +5571,22 @@ let Checkbox = (() => {
         font-size: 14px;
         margin-bottom: 4px;
       }
-    `,
-      ];
-    }
-    #setBoundValue(value) {
-      if (!this.value || !this.processor) {
-        return;
-      }
-      if (!("path" in this.value)) {
-        return;
-      }
-      if (!this.value.path) {
-        return;
-      }
-      this.processor.setData(
-        this.component,
-        this.value.path,
-        value,
-        this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-      );
-    }
-    #renderField(value) {
-      return b` <section
+    `];
+		}
+		#setBoundValue(value) {
+			if (!this.value || !this.processor) {
+				return;
+			}
+			if (!("path" in this.value)) {
+				return;
+			}
+			if (!this.value.path) {
+				return;
+			}
+			this.processor.setData(this.component, this.value.path, value, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+		}
+		#renderField(value) {
+			return b` <section
       class=${e$2(this.theme.components.CheckBox.container)}
       style=${this.theme.additionalStyles?.CheckBox ? o$2(this.theme.additionalStyles?.CheckBox) : A}
     >
@@ -6624,11 +5594,11 @@ let Checkbox = (() => {
         class=${e$2(this.theme.components.CheckBox.element)}
         autocomplete="off"
         @input=${(evt) => {
-          if (!(evt.target instanceof HTMLInputElement)) {
-            return;
-          }
-          this.#setBoundValue(evt.target.value);
-        }}
+				if (!(evt.target instanceof HTMLInputElement)) {
+					return;
+				}
+				this.#setBoundValue(evt.target.value);
+			}}
         id="data"
         type="checkbox"
         .value=${value}
@@ -6637,214 +5607,165 @@ let Checkbox = (() => {
         >${this.label?.literalString}</label
       >
     </section>`;
-    }
-    render() {
-      if (this.value && typeof this.value === "object") {
-        if ("literalBoolean" in this.value && this.value.literalBoolean) {
-          return this.#renderField(this.value.literalBoolean);
-        } else if ("literal" in this.value && this.value.literal !== undefined) {
-          return this.#renderField(this.value.literal);
-        } else if (this.value && "path" in this.value && this.value.path) {
-          if (!this.processor || !this.component) {
-            return b`(no model)`;
-          }
-          const textValue = this.processor.getData(
-            this.component,
-            this.value.path,
-            this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-          );
-          if (textValue === null) {
-            return b`Invalid label`;
-          }
-          if (typeof textValue !== "boolean") {
-            return b`Invalid label`;
-          }
-          return this.#renderField(textValue);
-        }
-      }
-      return A;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$15(this, _label_extraInitializers);
-    }
-    static {
-      __runInitializers$15(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Checkbox = _classThis);
+		}
+		render() {
+			if (this.value && typeof this.value === "object") {
+				if ("literalBoolean" in this.value && this.value.literalBoolean) {
+					return this.#renderField(this.value.literalBoolean);
+				} else if ("literal" in this.value && this.value.literal !== undefined) {
+					return this.#renderField(this.value.literal);
+				} else if (this.value && "path" in this.value && this.value.path) {
+					if (!this.processor || !this.component) {
+						return b`(no model)`;
+					}
+					const textValue = this.processor.getData(this.component, this.value.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+					if (textValue === null) {
+						return b`Invalid label`;
+					}
+					if (typeof textValue !== "boolean") {
+						return b`Invalid label`;
+					}
+					return this.#renderField(textValue);
+				}
+			}
+			return A;
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$15(this, _label_extraInitializers);
+		}
+		static {
+			__runInitializers$15(_classThis, _classExtraInitializers);
+		}
+	};
+	return Checkbox = _classThis;
 })();
 
-var __esDecorate$14 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$14 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$14 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$14 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Column = (() => {
-  let _classDecorators = [t$1("a2ui-column")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _alignment_decorators;
-  let _alignment_initializers = [];
-  let _alignment_extraInitializers = [];
-  let _distribution_decorators;
-  let _distribution_initializers = [];
-  let _distribution_extraInitializers = [];
-  var Column = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _alignment_decorators = [
-        n$6({
-          reflect: true,
-          type: String,
-        }),
-      ];
-      _distribution_decorators = [
-        n$6({
-          reflect: true,
-          type: String,
-        }),
-      ];
-      __esDecorate$14(
-        this,
-        null,
-        _alignment_decorators,
-        {
-          kind: "accessor",
-          name: "alignment",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "alignment" in obj,
-            get: (obj) => obj.alignment,
-            set: (obj, value) => {
-              obj.alignment = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _alignment_initializers,
-        _alignment_extraInitializers,
-      );
-      __esDecorate$14(
-        this,
-        null,
-        _distribution_decorators,
-        {
-          kind: "accessor",
-          name: "distribution",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "distribution" in obj,
-            get: (obj) => obj.distribution,
-            set: (obj, value) => {
-              obj.distribution = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _distribution_initializers,
-        _distribution_extraInitializers,
-      );
-      __esDecorate$14(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Column = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #alignment_accessor_storage = __runInitializers$14(this, _alignment_initializers, "stretch");
-    get alignment() {
-      return this.#alignment_accessor_storage;
-    }
-    set alignment(value) {
-      this.#alignment_accessor_storage = value;
-    }
-    #distribution_accessor_storage =
-      (__runInitializers$14(this, _alignment_extraInitializers),
-      __runInitializers$14(this, _distribution_initializers, "start"));
-    get distribution() {
-      return this.#distribution_accessor_storage;
-    }
-    set distribution(value) {
-      this.#distribution_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-column")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _alignment_decorators;
+	let _alignment_initializers = [];
+	let _alignment_extraInitializers = [];
+	let _distribution_decorators;
+	let _distribution_initializers = [];
+	let _distribution_extraInitializers = [];
+	var Column = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_alignment_decorators = [n$6({
+				reflect: true,
+				type: String
+			})];
+			_distribution_decorators = [n$6({
+				reflect: true,
+				type: String
+			})];
+			__esDecorate$14(this, null, _alignment_decorators, {
+				kind: "accessor",
+				name: "alignment",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "alignment" in obj,
+					get: (obj) => obj.alignment,
+					set: (obj, value) => {
+						obj.alignment = value;
+					}
+				},
+				metadata: _metadata
+			}, _alignment_initializers, _alignment_extraInitializers);
+			__esDecorate$14(this, null, _distribution_decorators, {
+				kind: "accessor",
+				name: "distribution",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "distribution" in obj,
+					get: (obj) => obj.distribution,
+					set: (obj, value) => {
+						obj.distribution = value;
+					}
+				},
+				metadata: _metadata
+			}, _distribution_initializers, _distribution_extraInitializers);
+			__esDecorate$14(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Column = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#alignment_accessor_storage = __runInitializers$14(this, _alignment_initializers, "stretch");
+		get alignment() {
+			return this.#alignment_accessor_storage;
+		}
+		set alignment(value) {
+			this.#alignment_accessor_storage = value;
+		}
+		#distribution_accessor_storage = (__runInitializers$14(this, _alignment_extraInitializers), __runInitializers$14(this, _distribution_initializers, "start"));
+		get distribution() {
+			return this.#distribution_accessor_storage;
+		}
+		set distribution(value) {
+			this.#distribution_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -6900,266 +5821,202 @@ let Column = (() => {
       :host([distribution="spaceEvenly"]) section {
         justify-content: space-evenly;
       }
-    `,
-      ];
-    }
-    render() {
-      return b`<section
+    `];
+		}
+		render() {
+			return b`<section
       class=${e$2(this.theme.components.Column)}
       style=${this.theme.additionalStyles?.Column ? o$2(this.theme.additionalStyles?.Column) : A}
     >
       <slot></slot>
     </section>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$14(this, _distribution_extraInitializers);
-    }
-    static {
-      __runInitializers$14(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Column = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$14(this, _distribution_extraInitializers);
+		}
+		static {
+			__runInitializers$14(_classThis, _classExtraInitializers);
+		}
+	};
+	return Column = _classThis;
 })();
 
-var __esDecorate$13 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$13 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$13 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$13 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let DateTimeInput = (() => {
-  let _classDecorators = [t$1("a2ui-datetimeinput")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _value_decorators;
-  let _value_initializers = [];
-  let _value_extraInitializers = [];
-  let _label_decorators;
-  let _label_initializers = [];
-  let _label_extraInitializers = [];
-  let _enableDate_decorators;
-  let _enableDate_initializers = [];
-  let _enableDate_extraInitializers = [];
-  let _enableTime_decorators;
-  let _enableTime_initializers = [];
-  let _enableTime_extraInitializers = [];
-  var DateTimeInput = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _value_decorators = [n$6()];
-      _label_decorators = [n$6()];
-      _enableDate_decorators = [
-        n$6({
-          reflect: false,
-          type: Boolean,
-        }),
-      ];
-      _enableTime_decorators = [
-        n$6({
-          reflect: false,
-          type: Boolean,
-        }),
-      ];
-      __esDecorate$13(
-        this,
-        null,
-        _value_decorators,
-        {
-          kind: "accessor",
-          name: "value",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "value" in obj,
-            get: (obj) => obj.value,
-            set: (obj, value) => {
-              obj.value = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _value_initializers,
-        _value_extraInitializers,
-      );
-      __esDecorate$13(
-        this,
-        null,
-        _label_decorators,
-        {
-          kind: "accessor",
-          name: "label",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "label" in obj,
-            get: (obj) => obj.label,
-            set: (obj, value) => {
-              obj.label = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _label_initializers,
-        _label_extraInitializers,
-      );
-      __esDecorate$13(
-        this,
-        null,
-        _enableDate_decorators,
-        {
-          kind: "accessor",
-          name: "enableDate",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "enableDate" in obj,
-            get: (obj) => obj.enableDate,
-            set: (obj, value) => {
-              obj.enableDate = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _enableDate_initializers,
-        _enableDate_extraInitializers,
-      );
-      __esDecorate$13(
-        this,
-        null,
-        _enableTime_decorators,
-        {
-          kind: "accessor",
-          name: "enableTime",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "enableTime" in obj,
-            get: (obj) => obj.enableTime,
-            set: (obj, value) => {
-              obj.enableTime = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _enableTime_initializers,
-        _enableTime_extraInitializers,
-      );
-      __esDecorate$13(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      DateTimeInput = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #value_accessor_storage = __runInitializers$13(this, _value_initializers, null);
-    get value() {
-      return this.#value_accessor_storage;
-    }
-    set value(value) {
-      this.#value_accessor_storage = value;
-    }
-    #label_accessor_storage =
-      (__runInitializers$13(this, _value_extraInitializers),
-      __runInitializers$13(this, _label_initializers, null));
-    get label() {
-      return this.#label_accessor_storage;
-    }
-    set label(value) {
-      this.#label_accessor_storage = value;
-    }
-    #enableDate_accessor_storage =
-      (__runInitializers$13(this, _label_extraInitializers),
-      __runInitializers$13(this, _enableDate_initializers, true));
-    get enableDate() {
-      return this.#enableDate_accessor_storage;
-    }
-    set enableDate(value) {
-      this.#enableDate_accessor_storage = value;
-    }
-    #enableTime_accessor_storage =
-      (__runInitializers$13(this, _enableDate_extraInitializers),
-      __runInitializers$13(this, _enableTime_initializers, true));
-    get enableTime() {
-      return this.#enableTime_accessor_storage;
-    }
-    set enableTime(value) {
-      this.#enableTime_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-datetimeinput")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _value_decorators;
+	let _value_initializers = [];
+	let _value_extraInitializers = [];
+	let _label_decorators;
+	let _label_initializers = [];
+	let _label_extraInitializers = [];
+	let _enableDate_decorators;
+	let _enableDate_initializers = [];
+	let _enableDate_extraInitializers = [];
+	let _enableTime_decorators;
+	let _enableTime_initializers = [];
+	let _enableTime_extraInitializers = [];
+	var DateTimeInput = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_value_decorators = [n$6()];
+			_label_decorators = [n$6()];
+			_enableDate_decorators = [n$6({
+				reflect: false,
+				type: Boolean
+			})];
+			_enableTime_decorators = [n$6({
+				reflect: false,
+				type: Boolean
+			})];
+			__esDecorate$13(this, null, _value_decorators, {
+				kind: "accessor",
+				name: "value",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "value" in obj,
+					get: (obj) => obj.value,
+					set: (obj, value) => {
+						obj.value = value;
+					}
+				},
+				metadata: _metadata
+			}, _value_initializers, _value_extraInitializers);
+			__esDecorate$13(this, null, _label_decorators, {
+				kind: "accessor",
+				name: "label",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "label" in obj,
+					get: (obj) => obj.label,
+					set: (obj, value) => {
+						obj.label = value;
+					}
+				},
+				metadata: _metadata
+			}, _label_initializers, _label_extraInitializers);
+			__esDecorate$13(this, null, _enableDate_decorators, {
+				kind: "accessor",
+				name: "enableDate",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "enableDate" in obj,
+					get: (obj) => obj.enableDate,
+					set: (obj, value) => {
+						obj.enableDate = value;
+					}
+				},
+				metadata: _metadata
+			}, _enableDate_initializers, _enableDate_extraInitializers);
+			__esDecorate$13(this, null, _enableTime_decorators, {
+				kind: "accessor",
+				name: "enableTime",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "enableTime" in obj,
+					get: (obj) => obj.enableTime,
+					set: (obj, value) => {
+						obj.enableTime = value;
+					}
+				},
+				metadata: _metadata
+			}, _enableTime_initializers, _enableTime_extraInitializers);
+			__esDecorate$13(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			DateTimeInput = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#value_accessor_storage = __runInitializers$13(this, _value_initializers, null);
+		get value() {
+			return this.#value_accessor_storage;
+		}
+		set value(value) {
+			this.#value_accessor_storage = value;
+		}
+		#label_accessor_storage = (__runInitializers$13(this, _value_extraInitializers), __runInitializers$13(this, _label_initializers, null));
+		get label() {
+			return this.#label_accessor_storage;
+		}
+		set label(value) {
+			this.#label_accessor_storage = value;
+		}
+		#enableDate_accessor_storage = (__runInitializers$13(this, _label_extraInitializers), __runInitializers$13(this, _enableDate_initializers, true));
+		get enableDate() {
+			return this.#enableDate_accessor_storage;
+		}
+		set enableDate(value) {
+			this.#enableDate_accessor_storage = value;
+		}
+		#enableTime_accessor_storage = (__runInitializers$13(this, _enableDate_extraInitializers), __runInitializers$13(this, _enableTime_initializers, true));
+		get enableTime() {
+			return this.#enableTime_accessor_storage;
+		}
+		set enableTime(value) {
+			this.#enableTime_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -7178,28 +6035,22 @@ let DateTimeInput = (() => {
         border: 1px solid #ccc;
         width: 100%;
       }
-    `,
-      ];
-    }
-    #setBoundValue(value) {
-      if (!this.value || !this.processor) {
-        return;
-      }
-      if (!("path" in this.value)) {
-        return;
-      }
-      if (!this.value.path) {
-        return;
-      }
-      this.processor.setData(
-        this.component,
-        this.value.path,
-        value,
-        this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-      );
-    }
-    #renderField(value) {
-      return b`<section
+    `];
+		}
+		#setBoundValue(value) {
+			if (!this.value || !this.processor) {
+				return;
+			}
+			if (!("path" in this.value)) {
+				return;
+			}
+			if (!this.value.path) {
+				return;
+			}
+			this.processor.setData(this.component, this.value.path, value, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+		}
+		#renderField(value) {
+			return b`<section
       class=${e$2(this.theme.components.DateTimeInput.container)}
     >
       <label
@@ -7212,11 +6063,11 @@ let DateTimeInput = (() => {
         class=${e$2(this.theme.components.DateTimeInput.element)}
         style=${this.theme.additionalStyles?.DateTimeInput ? o$2(this.theme.additionalStyles?.DateTimeInput) : A}
         @input=${(evt) => {
-          if (!(evt.target instanceof HTMLInputElement)) {
-            return;
-          }
-          this.#setBoundValue(evt.target.value);
-        }}
+				if (!(evt.target instanceof HTMLInputElement)) {
+					return;
+				}
+				this.#setBoundValue(evt.target.value);
+			}}
         id="data"
         name="data"
         .value=${this.#formatInputValue(value)}
@@ -7224,175 +6075,146 @@ let DateTimeInput = (() => {
         .type=${this.#getInputType()}
       />
     </section>`;
-    }
-    #getInputType() {
-      if (this.enableDate && this.enableTime) {
-        return "datetime-local";
-      } else if (this.enableDate) {
-        return "date";
-      } else if (this.enableTime) {
-        return "time";
-      }
-      return "datetime-local";
-    }
-    #formatInputValue(value) {
-      const inputType = this.#getInputType();
-      const date = value ? new Date(value) : null;
-      if (!date || isNaN(date.getTime())) {
-        return "";
-      }
-      const year = this.#padNumber(date.getFullYear());
-      const month = this.#padNumber(date.getMonth());
-      const day = this.#padNumber(date.getDate());
-      const hours = this.#padNumber(date.getHours());
-      const minutes = this.#padNumber(date.getMinutes());
-      if (inputType === "date") {
-        return `${year}-${month}-${day}`;
-      } else if (inputType === "time") {
-        return `${hours}:${minutes}`;
-      }
-      return `${year}-${month}-${day}T${hours}:${minutes}`;
-    }
-    #padNumber(value) {
-      return value.toString().padStart(2, "0");
-    }
-    #getPlaceholderText() {
-      const inputType = this.#getInputType();
-      if (inputType === "date") {
-        return "Date";
-      } else if (inputType === "time") {
-        return "Time";
-      }
-      return "Date & Time";
-    }
-    render() {
-      if (this.value && typeof this.value === "object") {
-        if ("literalString" in this.value && this.value.literalString) {
-          return this.#renderField(this.value.literalString);
-        } else if ("literal" in this.value && this.value.literal !== undefined) {
-          return this.#renderField(this.value.literal);
-        } else if (this.value && "path" in this.value && this.value.path) {
-          if (!this.processor || !this.component) {
-            return b`(no model)`;
-          }
-          const textValue = this.processor.getData(
-            this.component,
-            this.value.path,
-            this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-          );
-          if (typeof textValue !== "string") {
-            return b`(invalid)`;
-          }
-          return this.#renderField(textValue);
-        }
-      }
-      return A;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$13(this, _enableTime_extraInitializers);
-    }
-    static {
-      __runInitializers$13(_classThis, _classExtraInitializers);
-    }
-  };
-  return (DateTimeInput = _classThis);
+		}
+		#getInputType() {
+			if (this.enableDate && this.enableTime) {
+				return "datetime-local";
+			} else if (this.enableDate) {
+				return "date";
+			} else if (this.enableTime) {
+				return "time";
+			}
+			return "datetime-local";
+		}
+		#formatInputValue(value) {
+			const inputType = this.#getInputType();
+			const date = value ? new Date(value) : null;
+			if (!date || isNaN(date.getTime())) {
+				return "";
+			}
+			const year = this.#padNumber(date.getFullYear());
+			const month = this.#padNumber(date.getMonth());
+			const day = this.#padNumber(date.getDate());
+			const hours = this.#padNumber(date.getHours());
+			const minutes = this.#padNumber(date.getMinutes());
+			if (inputType === "date") {
+				return `${year}-${month}-${day}`;
+			} else if (inputType === "time") {
+				return `${hours}:${minutes}`;
+			}
+			return `${year}-${month}-${day}T${hours}:${minutes}`;
+		}
+		#padNumber(value) {
+			return value.toString().padStart(2, "0");
+		}
+		#getPlaceholderText() {
+			const inputType = this.#getInputType();
+			if (inputType === "date") {
+				return "Date";
+			} else if (inputType === "time") {
+				return "Time";
+			}
+			return "Date & Time";
+		}
+		render() {
+			if (this.value && typeof this.value === "object") {
+				if ("literalString" in this.value && this.value.literalString) {
+					return this.#renderField(this.value.literalString);
+				} else if ("literal" in this.value && this.value.literal !== undefined) {
+					return this.#renderField(this.value.literal);
+				} else if (this.value && "path" in this.value && this.value.path) {
+					if (!this.processor || !this.component) {
+						return b`(no model)`;
+					}
+					const textValue = this.processor.getData(this.component, this.value.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+					if (typeof textValue !== "string") {
+						return b`(invalid)`;
+					}
+					return this.#renderField(textValue);
+				}
+			}
+			return A;
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$13(this, _enableTime_extraInitializers);
+		}
+		static {
+			__runInitializers$13(_classThis, _classExtraInitializers);
+		}
+	};
+	return DateTimeInput = _classThis;
 })();
 
-var __esDecorate$12 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$12 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$12 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$12 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Divider = (() => {
-  let _classDecorators = [t$1("a2ui-divider")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  var Divider = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      __esDecorate$12(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Divider = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-divider")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	var Divider = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			__esDecorate$12(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Divider = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       :host {
         display: block;
         min-height: 0;
@@ -7404,148 +6226,115 @@ let Divider = (() => {
         background: #ccc;
         border: none;
       }
-    `,
-      ];
-    }
-    render() {
-      return b`<hr
+    `];
+		}
+		render() {
+			return b`<hr
       class=${e$2(this.theme.components.Divider)}
       style=${this.theme.additionalStyles?.Divider ? o$2(this.theme.additionalStyles?.Divider) : A}
     />`;
-    }
-    static {
-      __runInitializers$12(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Divider = _classThis);
+		}
+		static {
+			__runInitializers$12(_classThis, _classExtraInitializers);
+		}
+	};
+	return Divider = _classThis;
 })();
 
-var __esDecorate$11 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$11 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$11 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$11 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Icon = (() => {
-  let _classDecorators = [t$1("a2ui-icon")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _name_decorators;
-  let _name_initializers = [];
-  let _name_extraInitializers = [];
-  var Icon = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _name_decorators = [n$6()];
-      __esDecorate$11(
-        this,
-        null,
-        _name_decorators,
-        {
-          kind: "accessor",
-          name: "name",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "name" in obj,
-            get: (obj) => obj.name,
-            set: (obj, value) => {
-              obj.name = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _name_initializers,
-        _name_extraInitializers,
-      );
-      __esDecorate$11(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Icon = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #name_accessor_storage = __runInitializers$11(this, _name_initializers, null);
-    get name() {
-      return this.#name_accessor_storage;
-    }
-    set name(value) {
-      this.#name_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-icon")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _name_decorators;
+	let _name_initializers = [];
+	let _name_extraInitializers = [];
+	var Icon = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_name_decorators = [n$6()];
+			__esDecorate$11(this, null, _name_decorators, {
+				kind: "accessor",
+				name: "name",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "name" in obj,
+					get: (obj) => obj.name,
+					set: (obj, value) => {
+						obj.name = value;
+					}
+				},
+				metadata: _metadata
+			}, _name_initializers, _name_extraInitializers);
+			__esDecorate$11(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Icon = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#name_accessor_storage = __runInitializers$11(this, _name_initializers, null);
+		get name() {
+			return this.#name_accessor_storage;
+		}
+		set name(value) {
+			this.#name_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -7556,257 +6345,202 @@ let Icon = (() => {
         min-height: 0;
         overflow: auto;
       }
-    `,
-      ];
-    }
-    #renderIcon() {
-      if (!this.name) {
-        return A;
-      }
-      const render = (url) => {
-        url = url.replace(/([A-Z])/gm, "_$1").toLocaleLowerCase();
-        return b`<span class="g-icon">${url}</span>`;
-      };
-      if (this.name && typeof this.name === "object") {
-        if ("literalString" in this.name) {
-          const iconName = this.name.literalString ?? "";
-          return render(iconName);
-        } else if ("literal" in this.name) {
-          const iconName = this.name.literal ?? "";
-          return render(iconName);
-        } else if (this.name && "path" in this.name && this.name.path) {
-          if (!this.processor || !this.component) {
-            return b`(no model)`;
-          }
-          const iconName = this.processor.getData(
-            this.component,
-            this.name.path,
-            this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-          );
-          if (!iconName) {
-            return b`Invalid icon name`;
-          }
-          if (typeof iconName !== "string") {
-            return b`Invalid icon name`;
-          }
-          return render(iconName);
-        }
-      }
-      return b`(empty)`;
-    }
-    render() {
-      return b`<section
+    `];
+		}
+		#renderIcon() {
+			if (!this.name) {
+				return A;
+			}
+			const render = (url) => {
+				url = url.replace(/([A-Z])/gm, "_$1").toLocaleLowerCase();
+				return b`<span class="g-icon">${url}</span>`;
+			};
+			if (this.name && typeof this.name === "object") {
+				if ("literalString" in this.name) {
+					const iconName = this.name.literalString ?? "";
+					return render(iconName);
+				} else if ("literal" in this.name) {
+					const iconName = this.name.literal ?? "";
+					return render(iconName);
+				} else if (this.name && "path" in this.name && this.name.path) {
+					if (!this.processor || !this.component) {
+						return b`(no model)`;
+					}
+					const iconName = this.processor.getData(this.component, this.name.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+					if (!iconName) {
+						return b`Invalid icon name`;
+					}
+					if (typeof iconName !== "string") {
+						return b`Invalid icon name`;
+					}
+					return render(iconName);
+				}
+			}
+			return b`(empty)`;
+		}
+		render() {
+			return b`<section
       class=${e$2(this.theme.components.Icon)}
       style=${this.theme.additionalStyles?.Icon ? o$2(this.theme.additionalStyles?.Icon) : A}
     >
       ${this.#renderIcon()}
     </section>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$11(this, _name_extraInitializers);
-    }
-    static {
-      __runInitializers$11(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Icon = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$11(this, _name_extraInitializers);
+		}
+		static {
+			__runInitializers$11(_classThis, _classExtraInitializers);
+		}
+	};
+	return Icon = _classThis;
 })();
 
-var __esDecorate$10 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$10 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$10 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$10 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Image = (() => {
-  let _classDecorators = [t$1("a2ui-image")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _url_decorators;
-  let _url_initializers = [];
-  let _url_extraInitializers = [];
-  let _usageHint_decorators;
-  let _usageHint_initializers = [];
-  let _usageHint_extraInitializers = [];
-  let _fit_decorators;
-  let _fit_initializers = [];
-  let _fit_extraInitializers = [];
-  var Image = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _url_decorators = [n$6()];
-      _usageHint_decorators = [n$6()];
-      _fit_decorators = [n$6()];
-      __esDecorate$10(
-        this,
-        null,
-        _url_decorators,
-        {
-          kind: "accessor",
-          name: "url",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "url" in obj,
-            get: (obj) => obj.url,
-            set: (obj, value) => {
-              obj.url = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _url_initializers,
-        _url_extraInitializers,
-      );
-      __esDecorate$10(
-        this,
-        null,
-        _usageHint_decorators,
-        {
-          kind: "accessor",
-          name: "usageHint",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "usageHint" in obj,
-            get: (obj) => obj.usageHint,
-            set: (obj, value) => {
-              obj.usageHint = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _usageHint_initializers,
-        _usageHint_extraInitializers,
-      );
-      __esDecorate$10(
-        this,
-        null,
-        _fit_decorators,
-        {
-          kind: "accessor",
-          name: "fit",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "fit" in obj,
-            get: (obj) => obj.fit,
-            set: (obj, value) => {
-              obj.fit = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _fit_initializers,
-        _fit_extraInitializers,
-      );
-      __esDecorate$10(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Image = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #url_accessor_storage = __runInitializers$10(this, _url_initializers, null);
-    get url() {
-      return this.#url_accessor_storage;
-    }
-    set url(value) {
-      this.#url_accessor_storage = value;
-    }
-    #usageHint_accessor_storage =
-      (__runInitializers$10(this, _url_extraInitializers),
-      __runInitializers$10(this, _usageHint_initializers, null));
-    get usageHint() {
-      return this.#usageHint_accessor_storage;
-    }
-    set usageHint(value) {
-      this.#usageHint_accessor_storage = value;
-    }
-    #fit_accessor_storage =
-      (__runInitializers$10(this, _usageHint_extraInitializers),
-      __runInitializers$10(this, _fit_initializers, null));
-    get fit() {
-      return this.#fit_accessor_storage;
-    }
-    set fit(value) {
-      this.#fit_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-image")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _url_decorators;
+	let _url_initializers = [];
+	let _url_extraInitializers = [];
+	let _usageHint_decorators;
+	let _usageHint_initializers = [];
+	let _usageHint_extraInitializers = [];
+	let _fit_decorators;
+	let _fit_initializers = [];
+	let _fit_extraInitializers = [];
+	var Image = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_url_decorators = [n$6()];
+			_usageHint_decorators = [n$6()];
+			_fit_decorators = [n$6()];
+			__esDecorate$10(this, null, _url_decorators, {
+				kind: "accessor",
+				name: "url",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "url" in obj,
+					get: (obj) => obj.url,
+					set: (obj, value) => {
+						obj.url = value;
+					}
+				},
+				metadata: _metadata
+			}, _url_initializers, _url_extraInitializers);
+			__esDecorate$10(this, null, _usageHint_decorators, {
+				kind: "accessor",
+				name: "usageHint",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "usageHint" in obj,
+					get: (obj) => obj.usageHint,
+					set: (obj, value) => {
+						obj.usageHint = value;
+					}
+				},
+				metadata: _metadata
+			}, _usageHint_initializers, _usageHint_extraInitializers);
+			__esDecorate$10(this, null, _fit_decorators, {
+				kind: "accessor",
+				name: "fit",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "fit" in obj,
+					get: (obj) => obj.fit,
+					set: (obj, value) => {
+						obj.fit = value;
+					}
+				},
+				metadata: _metadata
+			}, _fit_initializers, _fit_extraInitializers);
+			__esDecorate$10(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Image = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#url_accessor_storage = __runInitializers$10(this, _url_initializers, null);
+		get url() {
+			return this.#url_accessor_storage;
+		}
+		set url(value) {
+			this.#url_accessor_storage = value;
+		}
+		#usageHint_accessor_storage = (__runInitializers$10(this, _url_extraInitializers), __runInitializers$10(this, _usageHint_initializers, null));
+		get usageHint() {
+			return this.#usageHint_accessor_storage;
+		}
+		set usageHint(value) {
+			this.#usageHint_accessor_storage = value;
+		}
+		#fit_accessor_storage = (__runInitializers$10(this, _usageHint_extraInitializers), __runInitializers$10(this, _fit_initializers, null));
+		get fit() {
+			return this.#fit_accessor_storage;
+		}
+		set fit(value) {
+			this.#fit_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -7824,200 +6558,158 @@ let Image = (() => {
         height: 100%;
         object-fit: var(--object-fit, fill);
       }
-    `,
-      ];
-    }
-    #renderImage() {
-      if (!this.url) {
-        return A;
-      }
-      const render = (url) => {
-        return b`<img src=${url} />`;
-      };
-      if (this.url && typeof this.url === "object") {
-        if ("literalString" in this.url) {
-          const imageUrl = this.url.literalString ?? "";
-          return render(imageUrl);
-        } else if ("literal" in this.url) {
-          const imageUrl = this.url.literal ?? "";
-          return render(imageUrl);
-        } else if (this.url && "path" in this.url && this.url.path) {
-          if (!this.processor || !this.component) {
-            return b`(no model)`;
-          }
-          const imageUrl = this.processor.getData(
-            this.component,
-            this.url.path,
-            this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-          );
-          if (!imageUrl) {
-            return b`Invalid image URL`;
-          }
-          if (typeof imageUrl !== "string") {
-            return b`Invalid image URL`;
-          }
-          return render(imageUrl);
-        }
-      }
-      return b`(empty)`;
-    }
-    render() {
-      const classes = merge(
-        this.theme.components.Image.all,
-        this.usageHint ? this.theme.components.Image[this.usageHint] : {},
-      );
-      return b`<section
+    `];
+		}
+		#renderImage() {
+			if (!this.url) {
+				return A;
+			}
+			const render = (url) => {
+				return b`<img src=${url} />`;
+			};
+			if (this.url && typeof this.url === "object") {
+				if ("literalString" in this.url) {
+					const imageUrl = this.url.literalString ?? "";
+					return render(imageUrl);
+				} else if ("literal" in this.url) {
+					const imageUrl = this.url.literal ?? "";
+					return render(imageUrl);
+				} else if (this.url && "path" in this.url && this.url.path) {
+					if (!this.processor || !this.component) {
+						return b`(no model)`;
+					}
+					const imageUrl = this.processor.getData(this.component, this.url.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+					if (!imageUrl) {
+						return b`Invalid image URL`;
+					}
+					if (typeof imageUrl !== "string") {
+						return b`Invalid image URL`;
+					}
+					return render(imageUrl);
+				}
+			}
+			return b`(empty)`;
+		}
+		render() {
+			const classes = merge(this.theme.components.Image.all, this.usageHint ? this.theme.components.Image[this.usageHint] : {});
+			return b`<section
       class=${e$2(classes)}
       style=${o$2({
-        ...(this.theme.additionalStyles?.Image ?? {}),
-        "--object-fit": this.fit ?? "fill",
-      })}
+				...this.theme.additionalStyles?.Image ?? {},
+				"--object-fit": this.fit ?? "fill"
+			})}
     >
       ${this.#renderImage()}
     </section>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$10(this, _fit_extraInitializers);
-    }
-    static {
-      __runInitializers$10(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Image = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$10(this, _fit_extraInitializers);
+		}
+		static {
+			__runInitializers$10(_classThis, _classExtraInitializers);
+		}
+	};
+	return Image = _classThis;
 })();
 
-var __esDecorate$9 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$9 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$9 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$9 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let List = (() => {
-  let _classDecorators = [t$1("a2ui-list")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _direction_decorators;
-  let _direction_initializers = [];
-  let _direction_extraInitializers = [];
-  var List = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _direction_decorators = [
-        n$6({
-          reflect: true,
-          type: String,
-        }),
-      ];
-      __esDecorate$9(
-        this,
-        null,
-        _direction_decorators,
-        {
-          kind: "accessor",
-          name: "direction",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "direction" in obj,
-            get: (obj) => obj.direction,
-            set: (obj, value) => {
-              obj.direction = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _direction_initializers,
-        _direction_extraInitializers,
-      );
-      __esDecorate$9(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      List = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #direction_accessor_storage = __runInitializers$9(this, _direction_initializers, "vertical");
-    get direction() {
-      return this.#direction_accessor_storage;
-    }
-    set direction(value) {
-      this.#direction_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-list")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _direction_decorators;
+	let _direction_initializers = [];
+	let _direction_extraInitializers = [];
+	var List = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_direction_decorators = [n$6({
+				reflect: true,
+				type: String
+			})];
+			__esDecorate$9(this, null, _direction_decorators, {
+				kind: "accessor",
+				name: "direction",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "direction" in obj,
+					get: (obj) => obj.direction,
+					set: (obj, value) => {
+						obj.direction = value;
+					}
+				},
+				metadata: _metadata
+			}, _direction_initializers, _direction_extraInitializers);
+			__esDecorate$9(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			List = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#direction_accessor_storage = __runInitializers$9(this, _direction_initializers, "vertical");
+		get direction() {
+			return this.#direction_accessor_storage;
+		}
+		set direction(value) {
+			this.#direction_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -8045,275 +6737,216 @@ let List = (() => {
           max-width: min(80%, 400px);
         }
       }
-    `,
-      ];
-    }
-    render() {
-      return b`<section
+    `];
+		}
+		render() {
+			return b`<section
       class=${e$2(this.theme.components.List)}
       style=${this.theme.additionalStyles?.List ? o$2(this.theme.additionalStyles?.List) : A}
     >
       <slot></slot>
     </section>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$9(this, _direction_extraInitializers);
-    }
-    static {
-      __runInitializers$9(_classThis, _classExtraInitializers);
-    }
-  };
-  return (List = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$9(this, _direction_extraInitializers);
+		}
+		static {
+			__runInitializers$9(_classThis, _classExtraInitializers);
+		}
+	};
+	return List = _classThis;
 })();
 
 function extractStringValue(val, component, processor, surfaceId) {
-  if (val !== null && typeof val === "object") {
-    if ("literalString" in val) {
-      return val.literalString ?? "";
-    } else if ("literal" in val && val.literal !== undefined) {
-      return val.literal ?? "";
-    } else if (val && "path" in val && val.path) {
-      if (!processor || !component) {
-        return "(no model)";
-      }
-      const textValue = processor.getData(
-        component,
-        val.path,
-        surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-      );
-      if (textValue === null || typeof textValue !== "string") {
-        return "";
-      }
-      return textValue;
-    }
-  }
-  return "";
+	if (val !== null && typeof val === "object") {
+		if ("literalString" in val) {
+			return val.literalString ?? "";
+		} else if ("literal" in val && val.literal !== undefined) {
+			return val.literal ?? "";
+		} else if (val && "path" in val && val.path) {
+			if (!processor || !component) {
+				return "(no model)";
+			}
+			const textValue = processor.getData(component, val.path, surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+			if (textValue === null || typeof textValue !== "string") {
+				return "";
+			}
+			return textValue;
+		}
+	}
+	return "";
 }
 function extractNumberValue(val, component, processor, surfaceId) {
-  if (val !== null && typeof val === "object") {
-    if ("literalNumber" in val) {
-      return val.literalNumber ?? 0;
-    } else if ("literal" in val && val.literal !== undefined) {
-      return val.literal ?? 0;
-    } else if (val && "path" in val && val.path) {
-      if (!processor || !component) {
-        return -1;
-      }
-      let numberValue = processor.getData(
-        component,
-        val.path,
-        surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-      );
-      if (typeof numberValue === "string") {
-        numberValue = Number.parseInt(numberValue, 10);
-        if (Number.isNaN(numberValue)) {
-          numberValue = null;
-        }
-      }
-      if (numberValue === null || typeof numberValue !== "number") {
-        return -1;
-      }
-      return numberValue;
-    }
-  }
-  return 0;
+	if (val !== null && typeof val === "object") {
+		if ("literalNumber" in val) {
+			return val.literalNumber ?? 0;
+		} else if ("literal" in val && val.literal !== undefined) {
+			return val.literal ?? 0;
+		} else if (val && "path" in val && val.path) {
+			if (!processor || !component) {
+				return -1;
+			}
+			let numberValue = processor.getData(component, val.path, surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+			if (typeof numberValue === "string") {
+				numberValue = Number.parseInt(numberValue, 10);
+				if (Number.isNaN(numberValue)) {
+					numberValue = null;
+				}
+			}
+			if (numberValue === null || typeof numberValue !== "number") {
+				return -1;
+			}
+			return numberValue;
+		}
+	}
+	return 0;
 }
 
-var __esDecorate$8 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$8 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$8 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$8 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let MultipleChoice = (() => {
-  let _classDecorators = [t$1("a2ui-multiplechoice")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _description_decorators;
-  let _description_initializers = [];
-  let _description_extraInitializers = [];
-  let _options_decorators;
-  let _options_initializers = [];
-  let _options_extraInitializers = [];
-  let _selections_decorators;
-  let _selections_initializers = [];
-  let _selections_extraInitializers = [];
-  var MultipleChoice = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _description_decorators = [n$6()];
-      _options_decorators = [n$6()];
-      _selections_decorators = [n$6()];
-      __esDecorate$8(
-        this,
-        null,
-        _description_decorators,
-        {
-          kind: "accessor",
-          name: "description",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "description" in obj,
-            get: (obj) => obj.description,
-            set: (obj, value) => {
-              obj.description = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _description_initializers,
-        _description_extraInitializers,
-      );
-      __esDecorate$8(
-        this,
-        null,
-        _options_decorators,
-        {
-          kind: "accessor",
-          name: "options",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "options" in obj,
-            get: (obj) => obj.options,
-            set: (obj, value) => {
-              obj.options = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _options_initializers,
-        _options_extraInitializers,
-      );
-      __esDecorate$8(
-        this,
-        null,
-        _selections_decorators,
-        {
-          kind: "accessor",
-          name: "selections",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "selections" in obj,
-            get: (obj) => obj.selections,
-            set: (obj, value) => {
-              obj.selections = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _selections_initializers,
-        _selections_extraInitializers,
-      );
-      __esDecorate$8(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      MultipleChoice = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #description_accessor_storage = __runInitializers$8(this, _description_initializers, null);
-    get description() {
-      return this.#description_accessor_storage;
-    }
-    set description(value) {
-      this.#description_accessor_storage = value;
-    }
-    #options_accessor_storage =
-      (__runInitializers$8(this, _description_extraInitializers),
-      __runInitializers$8(this, _options_initializers, []));
-    get options() {
-      return this.#options_accessor_storage;
-    }
-    set options(value) {
-      this.#options_accessor_storage = value;
-    }
-    #selections_accessor_storage =
-      (__runInitializers$8(this, _options_extraInitializers),
-      __runInitializers$8(this, _selections_initializers, []));
-    get selections() {
-      return this.#selections_accessor_storage;
-    }
-    set selections(value) {
-      this.#selections_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-multiplechoice")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _description_decorators;
+	let _description_initializers = [];
+	let _description_extraInitializers = [];
+	let _options_decorators;
+	let _options_initializers = [];
+	let _options_extraInitializers = [];
+	let _selections_decorators;
+	let _selections_initializers = [];
+	let _selections_extraInitializers = [];
+	var MultipleChoice = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_description_decorators = [n$6()];
+			_options_decorators = [n$6()];
+			_selections_decorators = [n$6()];
+			__esDecorate$8(this, null, _description_decorators, {
+				kind: "accessor",
+				name: "description",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "description" in obj,
+					get: (obj) => obj.description,
+					set: (obj, value) => {
+						obj.description = value;
+					}
+				},
+				metadata: _metadata
+			}, _description_initializers, _description_extraInitializers);
+			__esDecorate$8(this, null, _options_decorators, {
+				kind: "accessor",
+				name: "options",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "options" in obj,
+					get: (obj) => obj.options,
+					set: (obj, value) => {
+						obj.options = value;
+					}
+				},
+				metadata: _metadata
+			}, _options_initializers, _options_extraInitializers);
+			__esDecorate$8(this, null, _selections_decorators, {
+				kind: "accessor",
+				name: "selections",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "selections" in obj,
+					get: (obj) => obj.selections,
+					set: (obj, value) => {
+						obj.selections = value;
+					}
+				},
+				metadata: _metadata
+			}, _selections_initializers, _selections_extraInitializers);
+			__esDecorate$8(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			MultipleChoice = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#description_accessor_storage = __runInitializers$8(this, _description_initializers, null);
+		get description() {
+			return this.#description_accessor_storage;
+		}
+		set description(value) {
+			this.#description_accessor_storage = value;
+		}
+		#options_accessor_storage = (__runInitializers$8(this, _description_extraInitializers), __runInitializers$8(this, _options_initializers, []));
+		get options() {
+			return this.#options_accessor_storage;
+		}
+		set options(value) {
+			this.#options_accessor_storage = value;
+		}
+		#selections_accessor_storage = (__runInitializers$8(this, _options_extraInitializers), __runInitializers$8(this, _selections_initializers, []));
+		get selections() {
+			return this.#selections_accessor_storage;
+		}
+		set selections(value) {
+			this.#selections_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -8331,48 +6964,38 @@ let MultipleChoice = (() => {
 
       .description {
       }
-    `,
-      ];
-    }
-    #setBoundValue(value) {
-      console.log(value);
-      if (!this.selections || !this.processor) {
-        return;
-      }
-      if (!("path" in this.selections)) {
-        return;
-      }
-      if (!this.selections.path) {
-        return;
-      }
-      this.processor.setData(
-        this.component,
-        this.selections.path,
-        value,
-        this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-      );
-    }
-    willUpdate(changedProperties) {
-      const shouldUpdate = changedProperties.has("options");
-      if (!shouldUpdate) {
-        return;
-      }
-      if (!this.processor || !this.component || Array.isArray(this.selections)) {
-        return;
-      }
-      this.selections;
-      const selectionValue = this.processor.getData(
-        this.component,
-        this.selections.path,
-        this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-      );
-      if (!Array.isArray(selectionValue)) {
-        return;
-      }
-      this.#setBoundValue(selectionValue);
-    }
-    render() {
-      return b`<section class=${e$2(this.theme.components.MultipleChoice.container)}>
+    `];
+		}
+		#setBoundValue(value) {
+			console.log(value);
+			if (!this.selections || !this.processor) {
+				return;
+			}
+			if (!("path" in this.selections)) {
+				return;
+			}
+			if (!this.selections.path) {
+				return;
+			}
+			this.processor.setData(this.component, this.selections.path, value, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+		}
+		willUpdate(changedProperties) {
+			const shouldUpdate = changedProperties.has("options");
+			if (!shouldUpdate) {
+				return;
+			}
+			if (!this.processor || !this.component || Array.isArray(this.selections)) {
+				return;
+			}
+			this.selections;
+			const selectionValue = this.processor.getData(this.component, this.selections.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+			if (!Array.isArray(selectionValue)) {
+				return;
+			}
+			this.#setBoundValue(selectionValue);
+		}
+		render() {
+			return b`<section class=${e$2(this.theme.components.MultipleChoice.container)}>
       <label class=${e$2(this.theme.components.MultipleChoice.label)} for="data">${this.description ?? "Select an item"}</div>
       <select
         name="data"
@@ -8380,265 +7003,190 @@ let MultipleChoice = (() => {
         class=${e$2(this.theme.components.MultipleChoice.element)}
         style=${this.theme.additionalStyles?.MultipleChoice ? o$2(this.theme.additionalStyles?.MultipleChoice) : A}
         @change=${(evt) => {
-          if (!(evt.target instanceof HTMLSelectElement)) {
-            return;
-          }
-          this.#setBoundValue([evt.target.value]);
-        }}
+				if (!(evt.target instanceof HTMLSelectElement)) {
+					return;
+				}
+				this.#setBoundValue([evt.target.value]);
+			}}
       >
         ${this.options.map((option) => {
-          const label = extractStringValue(
-            option.label,
-            this.component,
-            this.processor,
-            this.surfaceId,
-          );
-          return b`<option ${option.value}>${label}</option>`;
-        })}
+				const label = extractStringValue(option.label, this.component, this.processor, this.surfaceId);
+				return b`<option ${option.value}>${label}</option>`;
+			})}
       </select>
     </section>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$8(this, _selections_extraInitializers);
-    }
-    static {
-      __runInitializers$8(_classThis, _classExtraInitializers);
-    }
-  };
-  return (MultipleChoice = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$8(this, _selections_extraInitializers);
+		}
+		static {
+			__runInitializers$8(_classThis, _classExtraInitializers);
+		}
+	};
+	return MultipleChoice = _classThis;
 })();
 
 /**
- * @license
- * Copyright 2020 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ const e$1 = () => new h();
+* @license
+* Copyright 2020 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ const e$1 = () => new h();
 var h = class {};
-const o$1 = new WeakMap(),
-  n = e$10(
-    class extends f {
-      render(i$10) {
-        return A;
-      }
-      update(i$10, [s$9]) {
-        const e$14 = s$9 !== this.G;
-        return (
-          e$14 && void 0 !== this.G && this.rt(void 0),
-          (e$14 || this.lt !== this.ct) &&
-            ((this.G = s$9), (this.ht = i$10.options?.host), this.rt((this.ct = i$10.element))),
-          A
-        );
-      }
-      rt(t$7) {
-        if ((this.isConnected || (t$7 = void 0), "function" == typeof this.G)) {
-          const i$10 = this.ht ?? globalThis;
-          let s$9 = o$1.get(i$10);
-          (void 0 === s$9 && ((s$9 = new WeakMap()), o$1.set(i$10, s$9)),
-            void 0 !== s$9.get(this.G) && this.G.call(this.ht, void 0),
-            s$9.set(this.G, t$7),
-            void 0 !== t$7 && this.G.call(this.ht, t$7));
-        } else this.G.value = t$7;
-      }
-      get lt() {
-        return "function" == typeof this.G
-          ? o$1.get(this.ht ?? globalThis)?.get(this.G)
-          : this.G?.value;
-      }
-      disconnected() {
-        this.lt === this.ct && this.rt(void 0);
-      }
-      reconnected() {
-        this.rt(this.ct);
-      }
-    },
-  );
+const o$1 = new WeakMap(), n = e$10(class extends f {
+	render(i$10) {
+		return A;
+	}
+	update(i$10, [s$9]) {
+		const e$14 = s$9 !== this.G;
+		return e$14 && void 0 !== this.G && this.rt(void 0), (e$14 || this.lt !== this.ct) && (this.G = s$9, this.ht = i$10.options?.host, this.rt(this.ct = i$10.element)), A;
+	}
+	rt(t$7) {
+		if (this.isConnected || (t$7 = void 0), "function" == typeof this.G) {
+			const i$10 = this.ht ?? globalThis;
+			let s$9 = o$1.get(i$10);
+			void 0 === s$9 && (s$9 = new WeakMap(), o$1.set(i$10, s$9)), void 0 !== s$9.get(this.G) && this.G.call(this.ht, void 0), s$9.set(this.G, t$7), void 0 !== t$7 && this.G.call(this.ht, t$7);
+		} else this.G.value = t$7;
+	}
+	get lt() {
+		return "function" == typeof this.G ? o$1.get(this.ht ?? globalThis)?.get(this.G) : this.G?.value;
+	}
+	disconnected() {
+		this.lt === this.ct && this.rt(void 0);
+	}
+	reconnected() {
+		this.rt(this.ct);
+	}
+});
 
-var __esDecorate$7 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$7 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
-var __setFunctionName =
-  (void 0 && (void 0).__setFunctionName) ||
-  function (f$4, name, prefix) {
-    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
-    return Object.defineProperty(f$4, "name", {
-      configurable: true,
-      value: prefix ? "".concat(prefix, " ", name) : name,
-    });
-  };
+var __esDecorate$7 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$7 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
+var __setFunctionName = void 0 && (void 0).__setFunctionName || function(f$4, name, prefix) {
+	if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+	return Object.defineProperty(f$4, "name", {
+		configurable: true,
+		value: prefix ? "".concat(prefix, " ", name) : name
+	});
+};
 let Modal = (() => {
-  let _classDecorators = [t$1("a2ui-modal")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _private_showModal_decorators;
-  let _private_showModal_initializers = [];
-  let _private_showModal_extraInitializers = [];
-  let _private_showModal_descriptor;
-  let _private_modalRef_decorators;
-  let _private_modalRef_initializers = [];
-  let _private_modalRef_extraInitializers = [];
-  let _private_modalRef_descriptor;
-  var Modal = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _private_showModal_decorators = [r$6()];
-      _private_modalRef_decorators = [e$5("dialog")];
-      __esDecorate$7(
-        this,
-        (_private_showModal_descriptor = {
-          get: __setFunctionName(
-            function () {
-              return this.#showModal_accessor_storage;
-            },
-            "#showModal",
-            "get",
-          ),
-          set: __setFunctionName(
-            function (value) {
-              this.#showModal_accessor_storage = value;
-            },
-            "#showModal",
-            "set",
-          ),
-        }),
-        _private_showModal_decorators,
-        {
-          kind: "accessor",
-          name: "#showModal",
-          static: false,
-          private: true,
-          access: {
-            has: (obj) => #showModal in obj,
-            get: (obj) => obj.#showModal,
-            set: (obj, value) => {
-              obj.#showModal = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _private_showModal_initializers,
-        _private_showModal_extraInitializers,
-      );
-      __esDecorate$7(
-        this,
-        (_private_modalRef_descriptor = {
-          get: __setFunctionName(
-            function () {
-              return this.#modalRef_accessor_storage;
-            },
-            "#modalRef",
-            "get",
-          ),
-          set: __setFunctionName(
-            function (value) {
-              this.#modalRef_accessor_storage = value;
-            },
-            "#modalRef",
-            "set",
-          ),
-        }),
-        _private_modalRef_decorators,
-        {
-          kind: "accessor",
-          name: "#modalRef",
-          static: false,
-          private: true,
-          access: {
-            has: (obj) => #modalRef in obj,
-            get: (obj) => obj.#modalRef,
-            set: (obj, value) => {
-              obj.#modalRef = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _private_modalRef_initializers,
-        _private_modalRef_extraInitializers,
-      );
-      __esDecorate$7(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Modal = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-modal")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _private_showModal_decorators;
+	let _private_showModal_initializers = [];
+	let _private_showModal_extraInitializers = [];
+	let _private_showModal_descriptor;
+	let _private_modalRef_decorators;
+	let _private_modalRef_initializers = [];
+	let _private_modalRef_extraInitializers = [];
+	let _private_modalRef_descriptor;
+	var Modal = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_private_showModal_decorators = [r$6()];
+			_private_modalRef_decorators = [e$5("dialog")];
+			__esDecorate$7(this, _private_showModal_descriptor = {
+				get: __setFunctionName(function() {
+					return this.#showModal_accessor_storage;
+				}, "#showModal", "get"),
+				set: __setFunctionName(function(value) {
+					this.#showModal_accessor_storage = value;
+				}, "#showModal", "set")
+			}, _private_showModal_decorators, {
+				kind: "accessor",
+				name: "#showModal",
+				static: false,
+				private: true,
+				access: {
+					has: (obj) => #showModal in obj,
+					get: (obj) => obj.#showModal,
+					set: (obj, value) => {
+						obj.#showModal = value;
+					}
+				},
+				metadata: _metadata
+			}, _private_showModal_initializers, _private_showModal_extraInitializers);
+			__esDecorate$7(this, _private_modalRef_descriptor = {
+				get: __setFunctionName(function() {
+					return this.#modalRef_accessor_storage;
+				}, "#modalRef", "get"),
+				set: __setFunctionName(function(value) {
+					this.#modalRef_accessor_storage = value;
+				}, "#modalRef", "set")
+			}, _private_modalRef_decorators, {
+				kind: "accessor",
+				name: "#modalRef",
+				static: false,
+				private: true,
+				access: {
+					has: (obj) => #modalRef in obj,
+					get: (obj) => obj.#modalRef,
+					set: (obj, value) => {
+						obj.#modalRef = value;
+					}
+				},
+				metadata: _metadata
+			}, _private_modalRef_initializers, _private_modalRef_extraInitializers);
+			__esDecorate$7(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Modal = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -8666,63 +7214,60 @@ let Modal = (() => {
           }
         }
       }
-    `,
-      ];
-    }
-    #showModal_accessor_storage = __runInitializers$7(this, _private_showModal_initializers, false);
-    get #showModal() {
-      return _private_showModal_descriptor.get.call(this);
-    }
-    set #showModal(value) {
-      return _private_showModal_descriptor.set.call(this, value);
-    }
-    #modalRef_accessor_storage =
-      (__runInitializers$7(this, _private_showModal_extraInitializers),
-      __runInitializers$7(this, _private_modalRef_initializers, null));
-    get #modalRef() {
-      return _private_modalRef_descriptor.get.call(this);
-    }
-    set #modalRef(value) {
-      return _private_modalRef_descriptor.set.call(this, value);
-    }
-    #closeModal() {
-      if (!this.#modalRef) {
-        return;
-      }
-      if (this.#modalRef.open) {
-        this.#modalRef.close();
-      }
-      this.#showModal = false;
-    }
-    render() {
-      if (!this.#showModal) {
-        return b`<section
+    `];
+		}
+		#showModal_accessor_storage = __runInitializers$7(this, _private_showModal_initializers, false);
+		get #showModal() {
+			return _private_showModal_descriptor.get.call(this);
+		}
+		set #showModal(value) {
+			return _private_showModal_descriptor.set.call(this, value);
+		}
+		#modalRef_accessor_storage = (__runInitializers$7(this, _private_showModal_extraInitializers), __runInitializers$7(this, _private_modalRef_initializers, null));
+		get #modalRef() {
+			return _private_modalRef_descriptor.get.call(this);
+		}
+		set #modalRef(value) {
+			return _private_modalRef_descriptor.set.call(this, value);
+		}
+		#closeModal() {
+			if (!this.#modalRef) {
+				return;
+			}
+			if (this.#modalRef.open) {
+				this.#modalRef.close();
+			}
+			this.#showModal = false;
+		}
+		render() {
+			if (!this.#showModal) {
+				return b`<section
         @click=${() => {
-          this.#showModal = true;
-        }}
+					this.#showModal = true;
+				}}
       >
         <slot name="entry"></slot>
       </section>`;
-      }
-      return b`<dialog
+			}
+			return b`<dialog
       class=${e$2(this.theme.components.Modal.backdrop)}
       @click=${(evt) => {
-        const [top] = evt.composedPath();
-        if (!(top instanceof HTMLDialogElement)) {
-          return;
-        }
-        this.#closeModal();
-      }}
+				const [top] = evt.composedPath();
+				if (!(top instanceof HTMLDialogElement)) {
+					return;
+				}
+				this.#closeModal();
+			}}
       ${n((el) => {
-        const showModalIfNeeded = () => {
-          const validElement = el && el instanceof HTMLDialogElement;
-          if (!validElement || el.open) {
-            return;
-          }
-          el.showModal();
-        };
-        requestAnimationFrame(showModalIfNeeded);
-      })}
+				const showModalIfNeeded = () => {
+					const validElement = el && el instanceof HTMLDialogElement;
+					if (!validElement || el.open) {
+						return;
+					}
+					el.showModal();
+				};
+				requestAnimationFrame(showModalIfNeeded);
+			})}
     >
       <section
         class=${e$2(this.theme.components.Modal.element)}
@@ -8731,8 +7276,8 @@ let Modal = (() => {
         <div id="controls">
           <button
             @click=${() => {
-              this.#closeModal();
-            }}
+				this.#closeModal();
+			}}
           >
             <span class="g-icon">close</span>
           </button>
@@ -8740,188 +7285,143 @@ let Modal = (() => {
         <slot></slot>
       </section>
     </dialog>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$7(this, _private_modalRef_extraInitializers);
-    }
-    static {
-      __runInitializers$7(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Modal = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$7(this, _private_modalRef_extraInitializers);
+		}
+		static {
+			__runInitializers$7(_classThis, _classExtraInitializers);
+		}
+	};
+	return Modal = _classThis;
 })();
 
-var __esDecorate$6 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$6 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$6 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$6 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Row = (() => {
-  let _classDecorators = [t$1("a2ui-row")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _alignment_decorators;
-  let _alignment_initializers = [];
-  let _alignment_extraInitializers = [];
-  let _distribution_decorators;
-  let _distribution_initializers = [];
-  let _distribution_extraInitializers = [];
-  var Row = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _alignment_decorators = [
-        n$6({
-          reflect: true,
-          type: String,
-        }),
-      ];
-      _distribution_decorators = [
-        n$6({
-          reflect: true,
-          type: String,
-        }),
-      ];
-      __esDecorate$6(
-        this,
-        null,
-        _alignment_decorators,
-        {
-          kind: "accessor",
-          name: "alignment",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "alignment" in obj,
-            get: (obj) => obj.alignment,
-            set: (obj, value) => {
-              obj.alignment = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _alignment_initializers,
-        _alignment_extraInitializers,
-      );
-      __esDecorate$6(
-        this,
-        null,
-        _distribution_decorators,
-        {
-          kind: "accessor",
-          name: "distribution",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "distribution" in obj,
-            get: (obj) => obj.distribution,
-            set: (obj, value) => {
-              obj.distribution = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _distribution_initializers,
-        _distribution_extraInitializers,
-      );
-      __esDecorate$6(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Row = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #alignment_accessor_storage = __runInitializers$6(this, _alignment_initializers, "stretch");
-    get alignment() {
-      return this.#alignment_accessor_storage;
-    }
-    set alignment(value) {
-      this.#alignment_accessor_storage = value;
-    }
-    #distribution_accessor_storage =
-      (__runInitializers$6(this, _alignment_extraInitializers),
-      __runInitializers$6(this, _distribution_initializers, "start"));
-    get distribution() {
-      return this.#distribution_accessor_storage;
-    }
-    set distribution(value) {
-      this.#distribution_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-row")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _alignment_decorators;
+	let _alignment_initializers = [];
+	let _alignment_extraInitializers = [];
+	let _distribution_decorators;
+	let _distribution_initializers = [];
+	let _distribution_extraInitializers = [];
+	var Row = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_alignment_decorators = [n$6({
+				reflect: true,
+				type: String
+			})];
+			_distribution_decorators = [n$6({
+				reflect: true,
+				type: String
+			})];
+			__esDecorate$6(this, null, _alignment_decorators, {
+				kind: "accessor",
+				name: "alignment",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "alignment" in obj,
+					get: (obj) => obj.alignment,
+					set: (obj, value) => {
+						obj.alignment = value;
+					}
+				},
+				metadata: _metadata
+			}, _alignment_initializers, _alignment_extraInitializers);
+			__esDecorate$6(this, null, _distribution_decorators, {
+				kind: "accessor",
+				name: "distribution",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "distribution" in obj,
+					get: (obj) => obj.distribution,
+					set: (obj, value) => {
+						obj.distribution = value;
+					}
+				},
+				metadata: _metadata
+			}, _distribution_initializers, _distribution_extraInitializers);
+			__esDecorate$6(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Row = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#alignment_accessor_storage = __runInitializers$6(this, _alignment_initializers, "stretch");
+		get alignment() {
+			return this.#alignment_accessor_storage;
+		}
+		set alignment(value) {
+			this.#alignment_accessor_storage = value;
+		}
+		#distribution_accessor_storage = (__runInitializers$6(this, _alignment_extraInitializers), __runInitializers$6(this, _distribution_initializers, "start"));
+		get distribution() {
+			return this.#distribution_accessor_storage;
+		}
+		set distribution(value) {
+			this.#distribution_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -8977,290 +7477,221 @@ let Row = (() => {
       :host([distribution="spaceEvenly"]) section {
         justify-content: space-evenly;
       }
-    `,
-      ];
-    }
-    render() {
-      return b`<section
+    `];
+		}
+		render() {
+			return b`<section
       class=${e$2(this.theme.components.Row)}
       style=${this.theme.additionalStyles?.Row ? o$2(this.theme.additionalStyles?.Row) : A}
     >
       <slot></slot>
     </section>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$6(this, _distribution_extraInitializers);
-    }
-    static {
-      __runInitializers$6(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Row = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$6(this, _distribution_extraInitializers);
+		}
+		static {
+			__runInitializers$6(_classThis, _classExtraInitializers);
+		}
+	};
+	return Row = _classThis;
 })();
 
-var __esDecorate$5 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$5 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$5 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$5 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Slider = (() => {
-  let _classDecorators = [t$1("a2ui-slider")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _value_decorators;
-  let _value_initializers = [];
-  let _value_extraInitializers = [];
-  let _minValue_decorators;
-  let _minValue_initializers = [];
-  let _minValue_extraInitializers = [];
-  let _maxValue_decorators;
-  let _maxValue_initializers = [];
-  let _maxValue_extraInitializers = [];
-  let _label_decorators;
-  let _label_initializers = [];
-  let _label_extraInitializers = [];
-  let _inputType_decorators;
-  let _inputType_initializers = [];
-  let _inputType_extraInitializers = [];
-  var Slider = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _value_decorators = [n$6()];
-      _minValue_decorators = [n$6()];
-      _maxValue_decorators = [n$6()];
-      _label_decorators = [n$6()];
-      _inputType_decorators = [n$6()];
-      __esDecorate$5(
-        this,
-        null,
-        _value_decorators,
-        {
-          kind: "accessor",
-          name: "value",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "value" in obj,
-            get: (obj) => obj.value,
-            set: (obj, value) => {
-              obj.value = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _value_initializers,
-        _value_extraInitializers,
-      );
-      __esDecorate$5(
-        this,
-        null,
-        _minValue_decorators,
-        {
-          kind: "accessor",
-          name: "minValue",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "minValue" in obj,
-            get: (obj) => obj.minValue,
-            set: (obj, value) => {
-              obj.minValue = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _minValue_initializers,
-        _minValue_extraInitializers,
-      );
-      __esDecorate$5(
-        this,
-        null,
-        _maxValue_decorators,
-        {
-          kind: "accessor",
-          name: "maxValue",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "maxValue" in obj,
-            get: (obj) => obj.maxValue,
-            set: (obj, value) => {
-              obj.maxValue = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _maxValue_initializers,
-        _maxValue_extraInitializers,
-      );
-      __esDecorate$5(
-        this,
-        null,
-        _label_decorators,
-        {
-          kind: "accessor",
-          name: "label",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "label" in obj,
-            get: (obj) => obj.label,
-            set: (obj, value) => {
-              obj.label = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _label_initializers,
-        _label_extraInitializers,
-      );
-      __esDecorate$5(
-        this,
-        null,
-        _inputType_decorators,
-        {
-          kind: "accessor",
-          name: "inputType",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "inputType" in obj,
-            get: (obj) => obj.inputType,
-            set: (obj, value) => {
-              obj.inputType = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _inputType_initializers,
-        _inputType_extraInitializers,
-      );
-      __esDecorate$5(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Slider = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #value_accessor_storage = __runInitializers$5(this, _value_initializers, null);
-    get value() {
-      return this.#value_accessor_storage;
-    }
-    set value(value) {
-      this.#value_accessor_storage = value;
-    }
-    #minValue_accessor_storage =
-      (__runInitializers$5(this, _value_extraInitializers),
-      __runInitializers$5(this, _minValue_initializers, 0));
-    get minValue() {
-      return this.#minValue_accessor_storage;
-    }
-    set minValue(value) {
-      this.#minValue_accessor_storage = value;
-    }
-    #maxValue_accessor_storage =
-      (__runInitializers$5(this, _minValue_extraInitializers),
-      __runInitializers$5(this, _maxValue_initializers, 0));
-    get maxValue() {
-      return this.#maxValue_accessor_storage;
-    }
-    set maxValue(value) {
-      this.#maxValue_accessor_storage = value;
-    }
-    #label_accessor_storage =
-      (__runInitializers$5(this, _maxValue_extraInitializers),
-      __runInitializers$5(this, _label_initializers, null));
-    get label() {
-      return this.#label_accessor_storage;
-    }
-    set label(value) {
-      this.#label_accessor_storage = value;
-    }
-    #inputType_accessor_storage =
-      (__runInitializers$5(this, _label_extraInitializers),
-      __runInitializers$5(this, _inputType_initializers, null));
-    get inputType() {
-      return this.#inputType_accessor_storage;
-    }
-    set inputType(value) {
-      this.#inputType_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-slider")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _value_decorators;
+	let _value_initializers = [];
+	let _value_extraInitializers = [];
+	let _minValue_decorators;
+	let _minValue_initializers = [];
+	let _minValue_extraInitializers = [];
+	let _maxValue_decorators;
+	let _maxValue_initializers = [];
+	let _maxValue_extraInitializers = [];
+	let _label_decorators;
+	let _label_initializers = [];
+	let _label_extraInitializers = [];
+	let _inputType_decorators;
+	let _inputType_initializers = [];
+	let _inputType_extraInitializers = [];
+	var Slider = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_value_decorators = [n$6()];
+			_minValue_decorators = [n$6()];
+			_maxValue_decorators = [n$6()];
+			_label_decorators = [n$6()];
+			_inputType_decorators = [n$6()];
+			__esDecorate$5(this, null, _value_decorators, {
+				kind: "accessor",
+				name: "value",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "value" in obj,
+					get: (obj) => obj.value,
+					set: (obj, value) => {
+						obj.value = value;
+					}
+				},
+				metadata: _metadata
+			}, _value_initializers, _value_extraInitializers);
+			__esDecorate$5(this, null, _minValue_decorators, {
+				kind: "accessor",
+				name: "minValue",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "minValue" in obj,
+					get: (obj) => obj.minValue,
+					set: (obj, value) => {
+						obj.minValue = value;
+					}
+				},
+				metadata: _metadata
+			}, _minValue_initializers, _minValue_extraInitializers);
+			__esDecorate$5(this, null, _maxValue_decorators, {
+				kind: "accessor",
+				name: "maxValue",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "maxValue" in obj,
+					get: (obj) => obj.maxValue,
+					set: (obj, value) => {
+						obj.maxValue = value;
+					}
+				},
+				metadata: _metadata
+			}, _maxValue_initializers, _maxValue_extraInitializers);
+			__esDecorate$5(this, null, _label_decorators, {
+				kind: "accessor",
+				name: "label",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "label" in obj,
+					get: (obj) => obj.label,
+					set: (obj, value) => {
+						obj.label = value;
+					}
+				},
+				metadata: _metadata
+			}, _label_initializers, _label_extraInitializers);
+			__esDecorate$5(this, null, _inputType_decorators, {
+				kind: "accessor",
+				name: "inputType",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "inputType" in obj,
+					get: (obj) => obj.inputType,
+					set: (obj, value) => {
+						obj.inputType = value;
+					}
+				},
+				metadata: _metadata
+			}, _inputType_initializers, _inputType_extraInitializers);
+			__esDecorate$5(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Slider = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#value_accessor_storage = __runInitializers$5(this, _value_initializers, null);
+		get value() {
+			return this.#value_accessor_storage;
+		}
+		set value(value) {
+			this.#value_accessor_storage = value;
+		}
+		#minValue_accessor_storage = (__runInitializers$5(this, _value_extraInitializers), __runInitializers$5(this, _minValue_initializers, 0));
+		get minValue() {
+			return this.#minValue_accessor_storage;
+		}
+		set minValue(value) {
+			this.#minValue_accessor_storage = value;
+		}
+		#maxValue_accessor_storage = (__runInitializers$5(this, _minValue_extraInitializers), __runInitializers$5(this, _maxValue_initializers, 0));
+		get maxValue() {
+			return this.#maxValue_accessor_storage;
+		}
+		set maxValue(value) {
+			this.#maxValue_accessor_storage = value;
+		}
+		#label_accessor_storage = (__runInitializers$5(this, _maxValue_extraInitializers), __runInitializers$5(this, _label_initializers, null));
+		get label() {
+			return this.#label_accessor_storage;
+		}
+		set label(value) {
+			this.#label_accessor_storage = value;
+		}
+		#inputType_accessor_storage = (__runInitializers$5(this, _label_extraInitializers), __runInitializers$5(this, _inputType_initializers, null));
+		get inputType() {
+			return this.#inputType_accessor_storage;
+		}
+		set inputType(value) {
+			this.#inputType_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -9277,28 +7708,22 @@ let Slider = (() => {
 
       .description {
       }
-    `,
-      ];
-    }
-    #setBoundValue(value) {
-      if (!this.value || !this.processor) {
-        return;
-      }
-      if (!("path" in this.value)) {
-        return;
-      }
-      if (!this.value.path) {
-        return;
-      }
-      this.processor.setData(
-        this.component,
-        this.value.path,
-        value,
-        this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-      );
-    }
-    #renderField(value) {
-      return b`<section
+    `];
+		}
+		#setBoundValue(value) {
+			if (!this.value || !this.processor) {
+				return;
+			}
+			if (!("path" in this.value)) {
+				return;
+			}
+			if (!this.value.path) {
+				return;
+			}
+			this.processor.setData(this.component, this.value.path, value, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+		}
+		#renderField(value) {
+			return b`<section
       class=${e$2(this.theme.components.Slider.container)}
     >
       <label class=${e$2(this.theme.components.Slider.label)} for="data">
@@ -9309,11 +7734,11 @@ let Slider = (() => {
         class=${e$2(this.theme.components.Slider.element)}
         style=${this.theme.additionalStyles?.Slider ? o$2(this.theme.additionalStyles?.Slider) : A}
         @input=${(evt) => {
-          if (!(evt.target instanceof HTMLInputElement)) {
-            return;
-          }
-          this.#setBoundValue(evt.target.value);
-        }}
+				if (!(evt.target instanceof HTMLInputElement)) {
+					return;
+				}
+				this.#setBoundValue(evt.target.value);
+			}}
         id="data"
         name="data"
         .value=${value}
@@ -9325,237 +7750,184 @@ let Slider = (() => {
         >${this.value ? extractNumberValue(this.value, this.component, this.processor, this.surfaceId) : "0"}</span
       >
     </section>`;
-    }
-    render() {
-      if (this.value && typeof this.value === "object") {
-        if ("literalNumber" in this.value && this.value.literalNumber) {
-          return this.#renderField(this.value.literalNumber);
-        } else if ("literal" in this.value && this.value.literal !== undefined) {
-          return this.#renderField(this.value.literal);
-        } else if (this.value && "path" in this.value && this.value.path) {
-          if (!this.processor || !this.component) {
-            return b`(no processor)`;
-          }
-          const textValue = this.processor.getData(
-            this.component,
-            this.value.path,
-            this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-          );
-          if (textValue === null) {
-            return b`Invalid value`;
-          }
-          if (typeof textValue !== "string" && typeof textValue !== "number") {
-            return b`Invalid value`;
-          }
-          return this.#renderField(textValue);
-        }
-      }
-      return A;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$5(this, _inputType_extraInitializers);
-    }
-    static {
-      __runInitializers$5(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Slider = _classThis);
+		}
+		render() {
+			if (this.value && typeof this.value === "object") {
+				if ("literalNumber" in this.value && this.value.literalNumber) {
+					return this.#renderField(this.value.literalNumber);
+				} else if ("literal" in this.value && this.value.literal !== undefined) {
+					return this.#renderField(this.value.literal);
+				} else if (this.value && "path" in this.value && this.value.path) {
+					if (!this.processor || !this.component) {
+						return b`(no processor)`;
+					}
+					const textValue = this.processor.getData(this.component, this.value.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+					if (textValue === null) {
+						return b`Invalid value`;
+					}
+					if (typeof textValue !== "string" && typeof textValue !== "number") {
+						return b`Invalid value`;
+					}
+					return this.#renderField(textValue);
+				}
+			}
+			return A;
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$5(this, _inputType_extraInitializers);
+		}
+		static {
+			__runInitializers$5(_classThis, _classExtraInitializers);
+		}
+	};
+	return Slider = _classThis;
 })();
 
-var __esDecorate$4 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$4 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$4 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$4 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Surface = (() => {
-  let _classDecorators = [t$1("a2ui-surface")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _surfaceId_decorators;
-  let _surfaceId_initializers = [];
-  let _surfaceId_extraInitializers = [];
-  let _surface_decorators;
-  let _surface_initializers = [];
-  let _surface_extraInitializers = [];
-  let _processor_decorators;
-  let _processor_initializers = [];
-  let _processor_extraInitializers = [];
-  var Surface = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _surfaceId_decorators = [n$6()];
-      _surface_decorators = [n$6()];
-      _processor_decorators = [n$6()];
-      __esDecorate$4(
-        this,
-        null,
-        _surfaceId_decorators,
-        {
-          kind: "accessor",
-          name: "surfaceId",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "surfaceId" in obj,
-            get: (obj) => obj.surfaceId,
-            set: (obj, value) => {
-              obj.surfaceId = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _surfaceId_initializers,
-        _surfaceId_extraInitializers,
-      );
-      __esDecorate$4(
-        this,
-        null,
-        _surface_decorators,
-        {
-          kind: "accessor",
-          name: "surface",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "surface" in obj,
-            get: (obj) => obj.surface,
-            set: (obj, value) => {
-              obj.surface = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _surface_initializers,
-        _surface_extraInitializers,
-      );
-      __esDecorate$4(
-        this,
-        null,
-        _processor_decorators,
-        {
-          kind: "accessor",
-          name: "processor",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "processor" in obj,
-            get: (obj) => obj.processor,
-            set: (obj, value) => {
-              obj.processor = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _processor_initializers,
-        _processor_extraInitializers,
-      );
-      __esDecorate$4(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Surface = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #surfaceId_accessor_storage = __runInitializers$4(this, _surfaceId_initializers, null);
-    get surfaceId() {
-      return this.#surfaceId_accessor_storage;
-    }
-    set surfaceId(value) {
-      this.#surfaceId_accessor_storage = value;
-    }
-    #surface_accessor_storage =
-      (__runInitializers$4(this, _surfaceId_extraInitializers),
-      __runInitializers$4(this, _surface_initializers, null));
-    get surface() {
-      return this.#surface_accessor_storage;
-    }
-    set surface(value) {
-      this.#surface_accessor_storage = value;
-    }
-    #processor_accessor_storage =
-      (__runInitializers$4(this, _surface_extraInitializers),
-      __runInitializers$4(this, _processor_initializers, null));
-    get processor() {
-      return this.#processor_accessor_storage;
-    }
-    set processor(value) {
-      this.#processor_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        i$9`
+	let _classDecorators = [t$1("a2ui-surface")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _surfaceId_decorators;
+	let _surfaceId_initializers = [];
+	let _surfaceId_extraInitializers = [];
+	let _surface_decorators;
+	let _surface_initializers = [];
+	let _surface_extraInitializers = [];
+	let _processor_decorators;
+	let _processor_initializers = [];
+	let _processor_extraInitializers = [];
+	var Surface = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_surfaceId_decorators = [n$6()];
+			_surface_decorators = [n$6()];
+			_processor_decorators = [n$6()];
+			__esDecorate$4(this, null, _surfaceId_decorators, {
+				kind: "accessor",
+				name: "surfaceId",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "surfaceId" in obj,
+					get: (obj) => obj.surfaceId,
+					set: (obj, value) => {
+						obj.surfaceId = value;
+					}
+				},
+				metadata: _metadata
+			}, _surfaceId_initializers, _surfaceId_extraInitializers);
+			__esDecorate$4(this, null, _surface_decorators, {
+				kind: "accessor",
+				name: "surface",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "surface" in obj,
+					get: (obj) => obj.surface,
+					set: (obj, value) => {
+						obj.surface = value;
+					}
+				},
+				metadata: _metadata
+			}, _surface_initializers, _surface_extraInitializers);
+			__esDecorate$4(this, null, _processor_decorators, {
+				kind: "accessor",
+				name: "processor",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "processor" in obj,
+					get: (obj) => obj.processor,
+					set: (obj, value) => {
+						obj.processor = value;
+					}
+				},
+				metadata: _metadata
+			}, _processor_initializers, _processor_extraInitializers);
+			__esDecorate$4(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Surface = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#surfaceId_accessor_storage = __runInitializers$4(this, _surfaceId_initializers, null);
+		get surfaceId() {
+			return this.#surfaceId_accessor_storage;
+		}
+		set surfaceId(value) {
+			this.#surfaceId_accessor_storage = value;
+		}
+		#surface_accessor_storage = (__runInitializers$4(this, _surfaceId_extraInitializers), __runInitializers$4(this, _surface_initializers, null));
+		get surface() {
+			return this.#surface_accessor_storage;
+		}
+		set surface(value) {
+			this.#surface_accessor_storage = value;
+		}
+		#processor_accessor_storage = (__runInitializers$4(this, _surface_extraInitializers), __runInitializers$4(this, _processor_initializers, null));
+		get processor() {
+			return this.#processor_accessor_storage;
+		}
+		set processor(value) {
+			this.#processor_accessor_storage = value;
+		}
+		static {
+			this.styles = [i$9`
       :host {
         display: flex;
         min-height: 0;
@@ -9577,520 +7949,420 @@ let Surface = (() => {
       a2ui-root {
         flex: 1;
       }
-    `,
-      ];
-    }
-    #renderLogo() {
-      if (!this.surface?.styles.logoUrl) {
-        return A;
-      }
-      return b`<div id="surface-logo">
+    `];
+		}
+		#renderLogo() {
+			if (!this.surface?.styles.logoUrl) {
+				return A;
+			}
+			return b`<div id="surface-logo">
       <img src=${this.surface.styles.logoUrl} />
     </div>`;
-    }
-    #renderSurface() {
-      const styles = {};
-      if (this.surface?.styles) {
-        for (const [key, value] of Object.entries(this.surface.styles)) {
-          switch (key) {
-            case "primaryColor": {
-              styles["--p-100"] = "#ffffff";
-              styles["--p-99"] = `color-mix(in srgb, ${value} 2%, white 98%)`;
-              styles["--p-98"] = `color-mix(in srgb, ${value} 4%, white 96%)`;
-              styles["--p-95"] = `color-mix(in srgb, ${value} 10%, white 90%)`;
-              styles["--p-90"] = `color-mix(in srgb, ${value} 20%, white 80%)`;
-              styles["--p-80"] = `color-mix(in srgb, ${value} 40%, white 60%)`;
-              styles["--p-70"] = `color-mix(in srgb, ${value} 60%, white 40%)`;
-              styles["--p-60"] = `color-mix(in srgb, ${value} 80%, white 20%)`;
-              styles["--p-50"] = value;
-              styles["--p-40"] = `color-mix(in srgb, ${value} 80%, black 20%)`;
-              styles["--p-35"] = `color-mix(in srgb, ${value} 70%, black 30%)`;
-              styles["--p-30"] = `color-mix(in srgb, ${value} 60%, black 40%)`;
-              styles["--p-25"] = `color-mix(in srgb, ${value} 50%, black 50%)`;
-              styles["--p-20"] = `color-mix(in srgb, ${value} 40%, black 60%)`;
-              styles["--p-15"] = `color-mix(in srgb, ${value} 30%, black 70%)`;
-              styles["--p-10"] = `color-mix(in srgb, ${value} 20%, black 80%)`;
-              styles["--p-5"] = `color-mix(in srgb, ${value} 10%, black 90%)`;
-              styles["--0"] = "#00000";
-              break;
-            }
-            case "font": {
-              styles["--font-family"] = value;
-              styles["--font-family-flex"] = value;
-              break;
-            }
-          }
-        }
-      }
-      return b`<a2ui-root
+		}
+		#renderSurface() {
+			const styles = {};
+			if (this.surface?.styles) {
+				for (const [key, value] of Object.entries(this.surface.styles)) {
+					switch (key) {
+						case "primaryColor": {
+							styles["--p-100"] = "#ffffff";
+							styles["--p-99"] = `color-mix(in srgb, ${value} 2%, white 98%)`;
+							styles["--p-98"] = `color-mix(in srgb, ${value} 4%, white 96%)`;
+							styles["--p-95"] = `color-mix(in srgb, ${value} 10%, white 90%)`;
+							styles["--p-90"] = `color-mix(in srgb, ${value} 20%, white 80%)`;
+							styles["--p-80"] = `color-mix(in srgb, ${value} 40%, white 60%)`;
+							styles["--p-70"] = `color-mix(in srgb, ${value} 60%, white 40%)`;
+							styles["--p-60"] = `color-mix(in srgb, ${value} 80%, white 20%)`;
+							styles["--p-50"] = value;
+							styles["--p-40"] = `color-mix(in srgb, ${value} 80%, black 20%)`;
+							styles["--p-35"] = `color-mix(in srgb, ${value} 70%, black 30%)`;
+							styles["--p-30"] = `color-mix(in srgb, ${value} 60%, black 40%)`;
+							styles["--p-25"] = `color-mix(in srgb, ${value} 50%, black 50%)`;
+							styles["--p-20"] = `color-mix(in srgb, ${value} 40%, black 60%)`;
+							styles["--p-15"] = `color-mix(in srgb, ${value} 30%, black 70%)`;
+							styles["--p-10"] = `color-mix(in srgb, ${value} 20%, black 80%)`;
+							styles["--p-5"] = `color-mix(in srgb, ${value} 10%, black 90%)`;
+							styles["--0"] = "#00000";
+							break;
+						}
+						case "font": {
+							styles["--font-family"] = value;
+							styles["--font-family-flex"] = value;
+							break;
+						}
+					}
+				}
+			}
+			return b`<a2ui-root
       style=${o$2(styles)}
       .surfaceId=${this.surfaceId}
       .processor=${this.processor}
       .childComponents=${this.surface?.componentTree ? [this.surface.componentTree] : null}
     ></a2ui-root>`;
-    }
-    render() {
-      if (!this.surface) {
-        return A;
-      }
-      return b`${[this.#renderLogo(), this.#renderSurface()]}`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$4(this, _processor_extraInitializers);
-    }
-    static {
-      __runInitializers$4(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Surface = _classThis);
+		}
+		render() {
+			if (!this.surface) {
+				return A;
+			}
+			return b`${[this.#renderLogo(), this.#renderSurface()]}`;
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$4(this, _processor_extraInitializers);
+		}
+		static {
+			__runInitializers$4(_classThis, _classExtraInitializers);
+		}
+	};
+	return Surface = _classThis;
 })();
 
-var __esDecorate$3 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$3 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$3 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$3 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Tabs = (() => {
-  let _classDecorators = [t$1("a2ui-tabs")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _titles_decorators;
-  let _titles_initializers = [];
-  let _titles_extraInitializers = [];
-  let _selected_decorators;
-  let _selected_initializers = [];
-  let _selected_extraInitializers = [];
-  var Tabs = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _titles_decorators = [n$6()];
-      _selected_decorators = [n$6()];
-      __esDecorate$3(
-        this,
-        null,
-        _titles_decorators,
-        {
-          kind: "accessor",
-          name: "titles",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "titles" in obj,
-            get: (obj) => obj.titles,
-            set: (obj, value) => {
-              obj.titles = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _titles_initializers,
-        _titles_extraInitializers,
-      );
-      __esDecorate$3(
-        this,
-        null,
-        _selected_decorators,
-        {
-          kind: "accessor",
-          name: "selected",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "selected" in obj,
-            get: (obj) => obj.selected,
-            set: (obj, value) => {
-              obj.selected = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _selected_initializers,
-        _selected_extraInitializers,
-      );
-      __esDecorate$3(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Tabs = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #titles_accessor_storage = __runInitializers$3(this, _titles_initializers, null);
-    get titles() {
-      return this.#titles_accessor_storage;
-    }
-    set titles(value) {
-      this.#titles_accessor_storage = value;
-    }
-    #selected_accessor_storage =
-      (__runInitializers$3(this, _titles_extraInitializers),
-      __runInitializers$3(this, _selected_initializers, 0));
-    get selected() {
-      return this.#selected_accessor_storage;
-    }
-    set selected(value) {
-      this.#selected_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-tabs")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _titles_decorators;
+	let _titles_initializers = [];
+	let _titles_extraInitializers = [];
+	let _selected_decorators;
+	let _selected_initializers = [];
+	let _selected_extraInitializers = [];
+	var Tabs = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_titles_decorators = [n$6()];
+			_selected_decorators = [n$6()];
+			__esDecorate$3(this, null, _titles_decorators, {
+				kind: "accessor",
+				name: "titles",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "titles" in obj,
+					get: (obj) => obj.titles,
+					set: (obj, value) => {
+						obj.titles = value;
+					}
+				},
+				metadata: _metadata
+			}, _titles_initializers, _titles_extraInitializers);
+			__esDecorate$3(this, null, _selected_decorators, {
+				kind: "accessor",
+				name: "selected",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "selected" in obj,
+					get: (obj) => obj.selected,
+					set: (obj, value) => {
+						obj.selected = value;
+					}
+				},
+				metadata: _metadata
+			}, _selected_initializers, _selected_extraInitializers);
+			__esDecorate$3(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Tabs = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#titles_accessor_storage = __runInitializers$3(this, _titles_initializers, null);
+		get titles() {
+			return this.#titles_accessor_storage;
+		}
+		set titles(value) {
+			this.#titles_accessor_storage = value;
+		}
+		#selected_accessor_storage = (__runInitializers$3(this, _titles_extraInitializers), __runInitializers$3(this, _selected_initializers, 0));
+		get selected() {
+			return this.#selected_accessor_storage;
+		}
+		set selected(value) {
+			this.#selected_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       :host {
         display: block;
         flex: var(--weight);
       }
-    `,
-      ];
-    }
-    willUpdate(changedProperties) {
-      super.willUpdate(changedProperties);
-      if (changedProperties.has("selected")) {
-        for (const child of this.children) {
-          child.removeAttribute("slot");
-        }
-        const selectedChild = this.children[this.selected];
-        if (!selectedChild) {
-          return;
-        }
-        selectedChild.slot = "current";
-      }
-    }
-    #renderTabs() {
-      if (!this.titles) {
-        return A;
-      }
-      return b`<div
+    `];
+		}
+		willUpdate(changedProperties) {
+			super.willUpdate(changedProperties);
+			if (changedProperties.has("selected")) {
+				for (const child of this.children) {
+					child.removeAttribute("slot");
+				}
+				const selectedChild = this.children[this.selected];
+				if (!selectedChild) {
+					return;
+				}
+				selectedChild.slot = "current";
+			}
+		}
+		#renderTabs() {
+			if (!this.titles) {
+				return A;
+			}
+			return b`<div
       id="buttons"
       class=${e$2(this.theme.components.Tabs.element)}
     >
       ${c$2(this.titles, (title$1, idx) => {
-        let titleString = "";
-        if ("literalString" in title$1 && title$1.literalString) {
-          titleString = title$1.literalString;
-        } else if ("literal" in title$1 && title$1.literal !== undefined) {
-          titleString = title$1.literal;
-        } else if (title$1 && "path" in title$1 && title$1.path) {
-          if (!this.processor || !this.component) {
-            return b`(no model)`;
-          }
-          const textValue = this.processor.getData(
-            this.component,
-            title$1.path,
-            this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-          );
-          if (typeof textValue !== "string") {
-            return b`(invalid)`;
-          }
-          titleString = textValue;
-        }
-        let classes;
-        if (this.selected === idx) {
-          classes = merge(
-            this.theme.components.Tabs.controls.all,
-            this.theme.components.Tabs.controls.selected,
-          );
-        } else {
-          classes = { ...this.theme.components.Tabs.controls.all };
-        }
-        return b`<button
+				let titleString = "";
+				if ("literalString" in title$1 && title$1.literalString) {
+					titleString = title$1.literalString;
+				} else if ("literal" in title$1 && title$1.literal !== undefined) {
+					titleString = title$1.literal;
+				} else if (title$1 && "path" in title$1 && title$1.path) {
+					if (!this.processor || !this.component) {
+						return b`(no model)`;
+					}
+					const textValue = this.processor.getData(this.component, title$1.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+					if (typeof textValue !== "string") {
+						return b`(invalid)`;
+					}
+					titleString = textValue;
+				}
+				let classes;
+				if (this.selected === idx) {
+					classes = merge(this.theme.components.Tabs.controls.all, this.theme.components.Tabs.controls.selected);
+				} else {
+					classes = { ...this.theme.components.Tabs.controls.all };
+				}
+				return b`<button
           ?disabled=${this.selected === idx}
           class=${e$2(classes)}
           @click=${() => {
-            this.selected = idx;
-          }}
+					this.selected = idx;
+				}}
         >
           ${titleString}
         </button>`;
-      })}
+			})}
     </div>`;
-    }
-    #renderSlot() {
-      return b`<slot name="current"></slot>`;
-    }
-    render() {
-      return b`<section
+		}
+		#renderSlot() {
+			return b`<slot name="current"></slot>`;
+		}
+		render() {
+			return b`<section
       class=${e$2(this.theme.components.Tabs.container)}
       style=${this.theme.additionalStyles?.Tabs ? o$2(this.theme.additionalStyles?.Tabs) : A}
     >
       ${[this.#renderTabs(), this.#renderSlot()]}
     </section>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$3(this, _selected_extraInitializers);
-    }
-    static {
-      __runInitializers$3(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Tabs = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$3(this, _selected_extraInitializers);
+		}
+		static {
+			__runInitializers$3(_classThis, _classExtraInitializers);
+		}
+	};
+	return Tabs = _classThis;
 })();
 
-var __esDecorate$2 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$2 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$2 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$2 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let TextField = (() => {
-  let _classDecorators = [t$1("a2ui-textfield")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _text_decorators;
-  let _text_initializers = [];
-  let _text_extraInitializers = [];
-  let _label_decorators;
-  let _label_initializers = [];
-  let _label_extraInitializers = [];
-  let _inputType_decorators;
-  let _inputType_initializers = [];
-  let _inputType_extraInitializers = [];
-  var TextField = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _text_decorators = [n$6()];
-      _label_decorators = [n$6()];
-      _inputType_decorators = [n$6()];
-      __esDecorate$2(
-        this,
-        null,
-        _text_decorators,
-        {
-          kind: "accessor",
-          name: "text",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "text" in obj,
-            get: (obj) => obj.text,
-            set: (obj, value) => {
-              obj.text = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _text_initializers,
-        _text_extraInitializers,
-      );
-      __esDecorate$2(
-        this,
-        null,
-        _label_decorators,
-        {
-          kind: "accessor",
-          name: "label",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "label" in obj,
-            get: (obj) => obj.label,
-            set: (obj, value) => {
-              obj.label = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _label_initializers,
-        _label_extraInitializers,
-      );
-      __esDecorate$2(
-        this,
-        null,
-        _inputType_decorators,
-        {
-          kind: "accessor",
-          name: "inputType",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "inputType" in obj,
-            get: (obj) => obj.inputType,
-            set: (obj, value) => {
-              obj.inputType = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _inputType_initializers,
-        _inputType_extraInitializers,
-      );
-      __esDecorate$2(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      TextField = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #text_accessor_storage = __runInitializers$2(this, _text_initializers, null);
-    get text() {
-      return this.#text_accessor_storage;
-    }
-    set text(value) {
-      this.#text_accessor_storage = value;
-    }
-    #label_accessor_storage =
-      (__runInitializers$2(this, _text_extraInitializers),
-      __runInitializers$2(this, _label_initializers, null));
-    get label() {
-      return this.#label_accessor_storage;
-    }
-    set label(value) {
-      this.#label_accessor_storage = value;
-    }
-    #inputType_accessor_storage =
-      (__runInitializers$2(this, _label_extraInitializers),
-      __runInitializers$2(this, _inputType_initializers, null));
-    get inputType() {
-      return this.#inputType_accessor_storage;
-    }
-    set inputType(value) {
-      this.#inputType_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-textfield")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _text_decorators;
+	let _text_initializers = [];
+	let _text_extraInitializers = [];
+	let _label_decorators;
+	let _label_initializers = [];
+	let _label_extraInitializers = [];
+	let _inputType_decorators;
+	let _inputType_initializers = [];
+	let _inputType_extraInitializers = [];
+	var TextField = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_text_decorators = [n$6()];
+			_label_decorators = [n$6()];
+			_inputType_decorators = [n$6()];
+			__esDecorate$2(this, null, _text_decorators, {
+				kind: "accessor",
+				name: "text",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "text" in obj,
+					get: (obj) => obj.text,
+					set: (obj, value) => {
+						obj.text = value;
+					}
+				},
+				metadata: _metadata
+			}, _text_initializers, _text_extraInitializers);
+			__esDecorate$2(this, null, _label_decorators, {
+				kind: "accessor",
+				name: "label",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "label" in obj,
+					get: (obj) => obj.label,
+					set: (obj, value) => {
+						obj.label = value;
+					}
+				},
+				metadata: _metadata
+			}, _label_initializers, _label_extraInitializers);
+			__esDecorate$2(this, null, _inputType_decorators, {
+				kind: "accessor",
+				name: "inputType",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "inputType" in obj,
+					get: (obj) => obj.inputType,
+					set: (obj, value) => {
+						obj.inputType = value;
+					}
+				},
+				metadata: _metadata
+			}, _inputType_initializers, _inputType_extraInitializers);
+			__esDecorate$2(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			TextField = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#text_accessor_storage = __runInitializers$2(this, _text_initializers, null);
+		get text() {
+			return this.#text_accessor_storage;
+		}
+		set text(value) {
+			this.#text_accessor_storage = value;
+		}
+		#label_accessor_storage = (__runInitializers$2(this, _text_extraInitializers), __runInitializers$2(this, _label_initializers, null));
+		get label() {
+			return this.#label_accessor_storage;
+		}
+		set label(value) {
+			this.#label_accessor_storage = value;
+		}
+		#inputType_accessor_storage = (__runInitializers$2(this, _label_extraInitializers), __runInitializers$2(this, _inputType_initializers, null));
+		get inputType() {
+			return this.#inputType_accessor_storage;
+		}
+		set inputType(value) {
+			this.#inputType_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -10109,49 +8381,39 @@ let TextField = (() => {
         display: block;
         margin-bottom: 4px;
       }
-    `,
-      ];
-    }
-    #setBoundValue(value) {
-      if (!this.text || !this.processor) {
-        return;
-      }
-      if (!("path" in this.text)) {
-        return;
-      }
-      if (!this.text.path) {
-        return;
-      }
-      this.processor.setData(
-        this.component,
-        this.text.path,
-        value,
-        this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-      );
-    }
-    #renderField(value, label) {
-      return b` <section
+    `];
+		}
+		#setBoundValue(value) {
+			if (!this.text || !this.processor) {
+				return;
+			}
+			if (!("path" in this.text)) {
+				return;
+			}
+			if (!this.text.path) {
+				return;
+			}
+			this.processor.setData(this.component, this.text.path, value, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+		}
+		#renderField(value, label) {
+			return b` <section
       class=${e$2(this.theme.components.TextField.container)}
     >
-      ${
-        label && label !== ""
-          ? b`<label
+      ${label && label !== "" ? b`<label
             class=${e$2(this.theme.components.TextField.label)}
             for="data"
             >${label}</label
-          >`
-          : A
-      }
+          >` : A}
       <input
         autocomplete="off"
         class=${e$2(this.theme.components.TextField.element)}
         style=${this.theme.additionalStyles?.TextField ? o$2(this.theme.additionalStyles?.TextField) : A}
         @input=${(evt) => {
-          if (!(evt.target instanceof HTMLInputElement)) {
-            return;
-          }
-          this.#setBoundValue(evt.target.value);
-        }}
+				if (!(evt.target instanceof HTMLInputElement)) {
+					return;
+				}
+				this.#setBoundValue(evt.target.value);
+			}}
         name="data"
         id="data"
         .value=${value}
@@ -10159,130 +8421,125 @@ let TextField = (() => {
         type=${this.inputType === "number" ? "number" : "text"}
       />
     </section>`;
-    }
-    render() {
-      const label = extractStringValue(this.label, this.component, this.processor, this.surfaceId);
-      const value = extractStringValue(this.text, this.component, this.processor, this.surfaceId);
-      return this.#renderField(value, label);
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$2(this, _inputType_extraInitializers);
-    }
-    static {
-      __runInitializers$2(_classThis, _classExtraInitializers);
-    }
-  };
-  return (TextField = _classThis);
+		}
+		render() {
+			const label = extractStringValue(this.label, this.component, this.processor, this.surfaceId);
+			const value = extractStringValue(this.text, this.component, this.processor, this.surfaceId);
+			return this.#renderField(value, label);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$2(this, _inputType_extraInitializers);
+		}
+		static {
+			__runInitializers$2(_classThis, _classExtraInitializers);
+		}
+	};
+	return TextField = _classThis;
 })();
 
 /**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */ var e = class extends i$5 {
-  constructor(i$10) {
-    if ((super(i$10), (this.it = A), i$10.type !== t$4.CHILD))
-      throw Error(this.constructor.directiveName + "() can only be used in child bindings");
-  }
-  render(r$12) {
-    if (r$12 === A || null == r$12) return ((this._t = void 0), (this.it = r$12));
-    if (r$12 === E) return r$12;
-    if ("string" != typeof r$12)
-      throw Error(this.constructor.directiveName + "() called with a non-string value");
-    if (r$12 === this.it) return this._t;
-    this.it = r$12;
-    const s$9 = [r$12];
-    return (
-      (s$9.raw = s$9),
-      (this._t = {
-        _$litType$: this.constructor.resultType,
-        strings: s$9,
-        values: [],
-      })
-    );
-  }
+* @license
+* Copyright 2017 Google LLC
+* SPDX-License-Identifier: BSD-3-Clause
+*/ var e = class extends i$5 {
+	constructor(i$10) {
+		if (super(i$10), this.it = A, i$10.type !== t$4.CHILD) throw Error(this.constructor.directiveName + "() can only be used in child bindings");
+	}
+	render(r$12) {
+		if (r$12 === A || null == r$12) return this._t = void 0, this.it = r$12;
+		if (r$12 === E) return r$12;
+		if ("string" != typeof r$12) throw Error(this.constructor.directiveName + "() called with a non-string value");
+		if (r$12 === this.it) return this._t;
+		this.it = r$12;
+		const s$9 = [r$12];
+		return s$9.raw = s$9, this._t = {
+			_$litType$: this.constructor.resultType,
+			strings: s$9,
+			values: []
+		};
+	}
 };
-((e.directiveName = "unsafeHTML"), (e.resultType = 1));
+e.directiveName = "unsafeHTML", e.resultType = 1;
 const o = e$10(e);
 
 const decodeCache = {};
 function getDecodeCache(exclude) {
-  let cache = decodeCache[exclude];
-  if (cache) {
-    return cache;
-  }
-  cache = decodeCache[exclude] = [];
-  for (let i$10 = 0; i$10 < 128; i$10++) {
-    const ch = String.fromCharCode(i$10);
-    cache.push(ch);
-  }
-  for (let i$10 = 0; i$10 < exclude.length; i$10++) {
-    const ch = exclude.charCodeAt(i$10);
-    cache[ch] = "%" + ("0" + ch.toString(16).toUpperCase()).slice(-2);
-  }
-  return cache;
+	let cache = decodeCache[exclude];
+	if (cache) {
+		return cache;
+	}
+	cache = decodeCache[exclude] = [];
+	for (let i$10 = 0; i$10 < 128; i$10++) {
+		const ch = String.fromCharCode(i$10);
+		cache.push(ch);
+	}
+	for (let i$10 = 0; i$10 < exclude.length; i$10++) {
+		const ch = exclude.charCodeAt(i$10);
+		cache[ch] = "%" + ("0" + ch.toString(16).toUpperCase()).slice(-2);
+	}
+	return cache;
 }
 function decode$2(string, exclude) {
-  if (typeof exclude !== "string") {
-    exclude = decode$2.defaultChars;
-  }
-  const cache = getDecodeCache(exclude);
-  return string.replace(/(%[a-f0-9]{2})+/gi, function (seq) {
-    let result = "";
-    for (let i$10 = 0, l$5 = seq.length; i$10 < l$5; i$10 += 3) {
-      const b1 = parseInt(seq.slice(i$10 + 1, i$10 + 3), 16);
-      if (b1 < 128) {
-        result += cache[b1];
-        continue;
-      }
-      if ((b1 & 224) === 192 && i$10 + 3 < l$5) {
-        const b2 = parseInt(seq.slice(i$10 + 4, i$10 + 6), 16);
-        if ((b2 & 192) === 128) {
-          const chr = ((b1 << 6) & 1984) | (b2 & 63);
-          if (chr < 128) {
-            result += "��";
-          } else {
-            result += String.fromCharCode(chr);
-          }
-          i$10 += 3;
-          continue;
-        }
-      }
-      if ((b1 & 240) === 224 && i$10 + 6 < l$5) {
-        const b2 = parseInt(seq.slice(i$10 + 4, i$10 + 6), 16);
-        const b3 = parseInt(seq.slice(i$10 + 7, i$10 + 9), 16);
-        if ((b2 & 192) === 128 && (b3 & 192) === 128) {
-          const chr = ((b1 << 12) & 61440) | ((b2 << 6) & 4032) | (b3 & 63);
-          if (chr < 2048 || (chr >= 55296 && chr <= 57343)) {
-            result += "���";
-          } else {
-            result += String.fromCharCode(chr);
-          }
-          i$10 += 6;
-          continue;
-        }
-      }
-      if ((b1 & 248) === 240 && i$10 + 9 < l$5) {
-        const b2 = parseInt(seq.slice(i$10 + 4, i$10 + 6), 16);
-        const b3 = parseInt(seq.slice(i$10 + 7, i$10 + 9), 16);
-        const b4 = parseInt(seq.slice(i$10 + 10, i$10 + 12), 16);
-        if ((b2 & 192) === 128 && (b3 & 192) === 128 && (b4 & 192) === 128) {
-          let chr = ((b1 << 18) & 1835008) | ((b2 << 12) & 258048) | ((b3 << 6) & 4032) | (b4 & 63);
-          if (chr < 65536 || chr > 1114111) {
-            result += "����";
-          } else {
-            chr -= 65536;
-            result += String.fromCharCode(55296 + (chr >> 10), 56320 + (chr & 1023));
-          }
-          i$10 += 9;
-          continue;
-        }
-      }
-      result += "�";
-    }
-    return result;
-  });
+	if (typeof exclude !== "string") {
+		exclude = decode$2.defaultChars;
+	}
+	const cache = getDecodeCache(exclude);
+	return string.replace(/(%[a-f0-9]{2})+/gi, function(seq) {
+		let result = "";
+		for (let i$10 = 0, l$5 = seq.length; i$10 < l$5; i$10 += 3) {
+			const b1 = parseInt(seq.slice(i$10 + 1, i$10 + 3), 16);
+			if (b1 < 128) {
+				result += cache[b1];
+				continue;
+			}
+			if ((b1 & 224) === 192 && i$10 + 3 < l$5) {
+				const b2 = parseInt(seq.slice(i$10 + 4, i$10 + 6), 16);
+				if ((b2 & 192) === 128) {
+					const chr = b1 << 6 & 1984 | b2 & 63;
+					if (chr < 128) {
+						result += "��";
+					} else {
+						result += String.fromCharCode(chr);
+					}
+					i$10 += 3;
+					continue;
+				}
+			}
+			if ((b1 & 240) === 224 && i$10 + 6 < l$5) {
+				const b2 = parseInt(seq.slice(i$10 + 4, i$10 + 6), 16);
+				const b3 = parseInt(seq.slice(i$10 + 7, i$10 + 9), 16);
+				if ((b2 & 192) === 128 && (b3 & 192) === 128) {
+					const chr = b1 << 12 & 61440 | b2 << 6 & 4032 | b3 & 63;
+					if (chr < 2048 || chr >= 55296 && chr <= 57343) {
+						result += "���";
+					} else {
+						result += String.fromCharCode(chr);
+					}
+					i$10 += 6;
+					continue;
+				}
+			}
+			if ((b1 & 248) === 240 && i$10 + 9 < l$5) {
+				const b2 = parseInt(seq.slice(i$10 + 4, i$10 + 6), 16);
+				const b3 = parseInt(seq.slice(i$10 + 7, i$10 + 9), 16);
+				const b4 = parseInt(seq.slice(i$10 + 10, i$10 + 12), 16);
+				if ((b2 & 192) === 128 && (b3 & 192) === 128 && (b4 & 192) === 128) {
+					let chr = b1 << 18 & 1835008 | b2 << 12 & 258048 | b3 << 6 & 4032 | b4 & 63;
+					if (chr < 65536 || chr > 1114111) {
+						result += "����";
+					} else {
+						chr -= 65536;
+						result += String.fromCharCode(55296 + (chr >> 10), 56320 + (chr & 1023));
+					}
+					i$10 += 9;
+					continue;
+				}
+			}
+			result += "�";
+		}
+		return result;
+	});
 }
 decode$2.defaultChars = ";/?:@&=+$,#";
 decode$2.componentChars = "";
@@ -10290,4125 +8547,3870 @@ var decode_default = decode$2;
 
 const encodeCache = {};
 function getEncodeCache(exclude) {
-  let cache = encodeCache[exclude];
-  if (cache) {
-    return cache;
-  }
-  cache = encodeCache[exclude] = [];
-  for (let i$10 = 0; i$10 < 128; i$10++) {
-    const ch = String.fromCharCode(i$10);
-    if (/^[0-9a-z]$/i.test(ch)) {
-      cache.push(ch);
-    } else {
-      cache.push("%" + ("0" + i$10.toString(16).toUpperCase()).slice(-2));
-    }
-  }
-  for (let i$10 = 0; i$10 < exclude.length; i$10++) {
-    cache[exclude.charCodeAt(i$10)] = exclude[i$10];
-  }
-  return cache;
+	let cache = encodeCache[exclude];
+	if (cache) {
+		return cache;
+	}
+	cache = encodeCache[exclude] = [];
+	for (let i$10 = 0; i$10 < 128; i$10++) {
+		const ch = String.fromCharCode(i$10);
+		if (/^[0-9a-z]$/i.test(ch)) {
+			cache.push(ch);
+		} else {
+			cache.push("%" + ("0" + i$10.toString(16).toUpperCase()).slice(-2));
+		}
+	}
+	for (let i$10 = 0; i$10 < exclude.length; i$10++) {
+		cache[exclude.charCodeAt(i$10)] = exclude[i$10];
+	}
+	return cache;
 }
 function encode$2(string, exclude, keepEscaped) {
-  if (typeof exclude !== "string") {
-    keepEscaped = exclude;
-    exclude = encode$2.defaultChars;
-  }
-  if (typeof keepEscaped === "undefined") {
-    keepEscaped = true;
-  }
-  const cache = getEncodeCache(exclude);
-  let result = "";
-  for (let i$10 = 0, l$5 = string.length; i$10 < l$5; i$10++) {
-    const code$1 = string.charCodeAt(i$10);
-    if (keepEscaped && code$1 === 37 && i$10 + 2 < l$5) {
-      if (/^[0-9a-f]{2}$/i.test(string.slice(i$10 + 1, i$10 + 3))) {
-        result += string.slice(i$10, i$10 + 3);
-        i$10 += 2;
-        continue;
-      }
-    }
-    if (code$1 < 128) {
-      result += cache[code$1];
-      continue;
-    }
-    if (code$1 >= 55296 && code$1 <= 57343) {
-      if (code$1 >= 55296 && code$1 <= 56319 && i$10 + 1 < l$5) {
-        const nextCode = string.charCodeAt(i$10 + 1);
-        if (nextCode >= 56320 && nextCode <= 57343) {
-          result += encodeURIComponent(string[i$10] + string[i$10 + 1]);
-          i$10++;
-          continue;
-        }
-      }
-      result += "%EF%BF%BD";
-      continue;
-    }
-    result += encodeURIComponent(string[i$10]);
-  }
-  return result;
+	if (typeof exclude !== "string") {
+		keepEscaped = exclude;
+		exclude = encode$2.defaultChars;
+	}
+	if (typeof keepEscaped === "undefined") {
+		keepEscaped = true;
+	}
+	const cache = getEncodeCache(exclude);
+	let result = "";
+	for (let i$10 = 0, l$5 = string.length; i$10 < l$5; i$10++) {
+		const code$1 = string.charCodeAt(i$10);
+		if (keepEscaped && code$1 === 37 && i$10 + 2 < l$5) {
+			if (/^[0-9a-f]{2}$/i.test(string.slice(i$10 + 1, i$10 + 3))) {
+				result += string.slice(i$10, i$10 + 3);
+				i$10 += 2;
+				continue;
+			}
+		}
+		if (code$1 < 128) {
+			result += cache[code$1];
+			continue;
+		}
+		if (code$1 >= 55296 && code$1 <= 57343) {
+			if (code$1 >= 55296 && code$1 <= 56319 && i$10 + 1 < l$5) {
+				const nextCode = string.charCodeAt(i$10 + 1);
+				if (nextCode >= 56320 && nextCode <= 57343) {
+					result += encodeURIComponent(string[i$10] + string[i$10 + 1]);
+					i$10++;
+					continue;
+				}
+			}
+			result += "%EF%BF%BD";
+			continue;
+		}
+		result += encodeURIComponent(string[i$10]);
+	}
+	return result;
 }
 encode$2.defaultChars = ";/?:@&=+$,-_.!~*'()#";
 encode$2.componentChars = "-_.!~*'()";
 var encode_default = encode$2;
 
 function format(url) {
-  let result = "";
-  result += url.protocol || "";
-  result += url.slashes ? "//" : "";
-  result += url.auth ? url.auth + "@" : "";
-  if (url.hostname && url.hostname.indexOf(":") !== -1) {
-    result += "[" + url.hostname + "]";
-  } else {
-    result += url.hostname || "";
-  }
-  result += url.port ? ":" + url.port : "";
-  result += url.pathname || "";
-  result += url.search || "";
-  result += url.hash || "";
-  return result;
+	let result = "";
+	result += url.protocol || "";
+	result += url.slashes ? "//" : "";
+	result += url.auth ? url.auth + "@" : "";
+	if (url.hostname && url.hostname.indexOf(":") !== -1) {
+		result += "[" + url.hostname + "]";
+	} else {
+		result += url.hostname || "";
+	}
+	result += url.port ? ":" + url.port : "";
+	result += url.pathname || "";
+	result += url.search || "";
+	result += url.hash || "";
+	return result;
 }
+;
 
 function Url() {
-  this.protocol = null;
-  this.slashes = null;
-  this.auth = null;
-  this.port = null;
-  this.hostname = null;
-  this.hash = null;
-  this.search = null;
-  this.pathname = null;
+	this.protocol = null;
+	this.slashes = null;
+	this.auth = null;
+	this.port = null;
+	this.hostname = null;
+	this.hash = null;
+	this.search = null;
+	this.pathname = null;
 }
 const protocolPattern = /^([a-z0-9.+-]+:)/i;
 const portPattern = /:[0-9]*$/;
 const simplePathPattern = /^(\/\/?(?!\/)[^\?\s]*)(\?[^\s]*)?$/;
-const delims = ["<", ">", '"', "`", " ", "\r", "\n", "	"];
-const unwise = ["{", "}", "|", "\\", "^", "`"].concat(delims);
+const delims = [
+	"<",
+	">",
+	"\"",
+	"`",
+	" ",
+	"\r",
+	"\n",
+	"	"
+];
+const unwise = [
+	"{",
+	"}",
+	"|",
+	"\\",
+	"^",
+	"`"
+].concat(delims);
 const autoEscape = ["'"].concat(unwise);
-const nonHostChars = ["%", "/", "?", ";", "#"].concat(autoEscape);
-const hostEndingChars = ["/", "?", "#"];
+const nonHostChars = [
+	"%",
+	"/",
+	"?",
+	";",
+	"#"
+].concat(autoEscape);
+const hostEndingChars = [
+	"/",
+	"?",
+	"#"
+];
 const hostnameMaxLen = 255;
 const hostnamePartPattern = /^[+a-z0-9A-Z_-]{0,63}$/;
 const hostnamePartStart = /^([+a-z0-9A-Z_-]{0,63})(.*)$/;
 const hostlessProtocol = {
-  javascript: true,
-  "javascript:": true,
+	javascript: true,
+	"javascript:": true
 };
 const slashedProtocol = {
-  http: true,
-  https: true,
-  ftp: true,
-  gopher: true,
-  file: true,
-  "http:": true,
-  "https:": true,
-  "ftp:": true,
-  "gopher:": true,
-  "file:": true,
+	http: true,
+	https: true,
+	ftp: true,
+	gopher: true,
+	file: true,
+	"http:": true,
+	"https:": true,
+	"ftp:": true,
+	"gopher:": true,
+	"file:": true
 };
 function urlParse(url, slashesDenoteHost) {
-  if (url && url instanceof Url) return url;
-  const u$4 = new Url();
-  u$4.parse(url, slashesDenoteHost);
-  return u$4;
+	if (url && url instanceof Url) return url;
+	const u$4 = new Url();
+	u$4.parse(url, slashesDenoteHost);
+	return u$4;
 }
-Url.prototype.parse = function (url, slashesDenoteHost) {
-  let lowerProto, hec, slashes;
-  let rest = url;
-  rest = rest.trim();
-  if (!slashesDenoteHost && url.split("#").length === 1) {
-    const simplePath = simplePathPattern.exec(rest);
-    if (simplePath) {
-      this.pathname = simplePath[1];
-      if (simplePath[2]) {
-        this.search = simplePath[2];
-      }
-      return this;
-    }
-  }
-  let proto = protocolPattern.exec(rest);
-  if (proto) {
-    proto = proto[0];
-    lowerProto = proto.toLowerCase();
-    this.protocol = proto;
-    rest = rest.substr(proto.length);
-  }
-  if (slashesDenoteHost || proto || rest.match(/^\/\/[^@\/]+@[^@\/]+/)) {
-    slashes = rest.substr(0, 2) === "//";
-    if (slashes && !(proto && hostlessProtocol[proto])) {
-      rest = rest.substr(2);
-      this.slashes = true;
-    }
-  }
-  if (!hostlessProtocol[proto] && (slashes || (proto && !slashedProtocol[proto]))) {
-    let hostEnd = -1;
-    for (let i$10 = 0; i$10 < hostEndingChars.length; i$10++) {
-      hec = rest.indexOf(hostEndingChars[i$10]);
-      if (hec !== -1 && (hostEnd === -1 || hec < hostEnd)) {
-        hostEnd = hec;
-      }
-    }
-    let auth, atSign;
-    if (hostEnd === -1) {
-      atSign = rest.lastIndexOf("@");
-    } else {
-      atSign = rest.lastIndexOf("@", hostEnd);
-    }
-    if (atSign !== -1) {
-      auth = rest.slice(0, atSign);
-      rest = rest.slice(atSign + 1);
-      this.auth = auth;
-    }
-    hostEnd = -1;
-    for (let i$10 = 0; i$10 < nonHostChars.length; i$10++) {
-      hec = rest.indexOf(nonHostChars[i$10]);
-      if (hec !== -1 && (hostEnd === -1 || hec < hostEnd)) {
-        hostEnd = hec;
-      }
-    }
-    if (hostEnd === -1) {
-      hostEnd = rest.length;
-    }
-    if (rest[hostEnd - 1] === ":") {
-      hostEnd--;
-    }
-    const host = rest.slice(0, hostEnd);
-    rest = rest.slice(hostEnd);
-    this.parseHost(host);
-    this.hostname = this.hostname || "";
-    const ipv6Hostname =
-      this.hostname[0] === "[" && this.hostname[this.hostname.length - 1] === "]";
-    if (!ipv6Hostname) {
-      const hostparts = this.hostname.split(/\./);
-      for (let i$10 = 0, l$5 = hostparts.length; i$10 < l$5; i$10++) {
-        const part = hostparts[i$10];
-        if (!part) {
-          continue;
-        }
-        if (!part.match(hostnamePartPattern)) {
-          let newpart = "";
-          for (let j$2 = 0, k$1 = part.length; j$2 < k$1; j$2++) {
-            if (part.charCodeAt(j$2) > 127) {
-              newpart += "x";
-            } else {
-              newpart += part[j$2];
-            }
-          }
-          if (!newpart.match(hostnamePartPattern)) {
-            const validParts = hostparts.slice(0, i$10);
-            const notHost = hostparts.slice(i$10 + 1);
-            const bit = part.match(hostnamePartStart);
-            if (bit) {
-              validParts.push(bit[1]);
-              notHost.unshift(bit[2]);
-            }
-            if (notHost.length) {
-              rest = notHost.join(".") + rest;
-            }
-            this.hostname = validParts.join(".");
-            break;
-          }
-        }
-      }
-    }
-    if (this.hostname.length > hostnameMaxLen) {
-      this.hostname = "";
-    }
-    if (ipv6Hostname) {
-      this.hostname = this.hostname.substr(1, this.hostname.length - 2);
-    }
-  }
-  const hash = rest.indexOf("#");
-  if (hash !== -1) {
-    this.hash = rest.substr(hash);
-    rest = rest.slice(0, hash);
-  }
-  const qm = rest.indexOf("?");
-  if (qm !== -1) {
-    this.search = rest.substr(qm);
-    rest = rest.slice(0, qm);
-  }
-  if (rest) {
-    this.pathname = rest;
-  }
-  if (slashedProtocol[lowerProto] && this.hostname && !this.pathname) {
-    this.pathname = "";
-  }
-  return this;
+Url.prototype.parse = function(url, slashesDenoteHost) {
+	let lowerProto, hec, slashes;
+	let rest = url;
+	rest = rest.trim();
+	if (!slashesDenoteHost && url.split("#").length === 1) {
+		const simplePath = simplePathPattern.exec(rest);
+		if (simplePath) {
+			this.pathname = simplePath[1];
+			if (simplePath[2]) {
+				this.search = simplePath[2];
+			}
+			return this;
+		}
+	}
+	let proto = protocolPattern.exec(rest);
+	if (proto) {
+		proto = proto[0];
+		lowerProto = proto.toLowerCase();
+		this.protocol = proto;
+		rest = rest.substr(proto.length);
+	}
+	if (slashesDenoteHost || proto || rest.match(/^\/\/[^@\/]+@[^@\/]+/)) {
+		slashes = rest.substr(0, 2) === "//";
+		if (slashes && !(proto && hostlessProtocol[proto])) {
+			rest = rest.substr(2);
+			this.slashes = true;
+		}
+	}
+	if (!hostlessProtocol[proto] && (slashes || proto && !slashedProtocol[proto])) {
+		let hostEnd = -1;
+		for (let i$10 = 0; i$10 < hostEndingChars.length; i$10++) {
+			hec = rest.indexOf(hostEndingChars[i$10]);
+			if (hec !== -1 && (hostEnd === -1 || hec < hostEnd)) {
+				hostEnd = hec;
+			}
+		}
+		let auth, atSign;
+		if (hostEnd === -1) {
+			atSign = rest.lastIndexOf("@");
+		} else {
+			atSign = rest.lastIndexOf("@", hostEnd);
+		}
+		if (atSign !== -1) {
+			auth = rest.slice(0, atSign);
+			rest = rest.slice(atSign + 1);
+			this.auth = auth;
+		}
+		hostEnd = -1;
+		for (let i$10 = 0; i$10 < nonHostChars.length; i$10++) {
+			hec = rest.indexOf(nonHostChars[i$10]);
+			if (hec !== -1 && (hostEnd === -1 || hec < hostEnd)) {
+				hostEnd = hec;
+			}
+		}
+		if (hostEnd === -1) {
+			hostEnd = rest.length;
+		}
+		if (rest[hostEnd - 1] === ":") {
+			hostEnd--;
+		}
+		const host = rest.slice(0, hostEnd);
+		rest = rest.slice(hostEnd);
+		this.parseHost(host);
+		this.hostname = this.hostname || "";
+		const ipv6Hostname = this.hostname[0] === "[" && this.hostname[this.hostname.length - 1] === "]";
+		if (!ipv6Hostname) {
+			const hostparts = this.hostname.split(/\./);
+			for (let i$10 = 0, l$5 = hostparts.length; i$10 < l$5; i$10++) {
+				const part = hostparts[i$10];
+				if (!part) {
+					continue;
+				}
+				if (!part.match(hostnamePartPattern)) {
+					let newpart = "";
+					for (let j$2 = 0, k$1 = part.length; j$2 < k$1; j$2++) {
+						if (part.charCodeAt(j$2) > 127) {
+							newpart += "x";
+						} else {
+							newpart += part[j$2];
+						}
+					}
+					if (!newpart.match(hostnamePartPattern)) {
+						const validParts = hostparts.slice(0, i$10);
+						const notHost = hostparts.slice(i$10 + 1);
+						const bit = part.match(hostnamePartStart);
+						if (bit) {
+							validParts.push(bit[1]);
+							notHost.unshift(bit[2]);
+						}
+						if (notHost.length) {
+							rest = notHost.join(".") + rest;
+						}
+						this.hostname = validParts.join(".");
+						break;
+					}
+				}
+			}
+		}
+		if (this.hostname.length > hostnameMaxLen) {
+			this.hostname = "";
+		}
+		if (ipv6Hostname) {
+			this.hostname = this.hostname.substr(1, this.hostname.length - 2);
+		}
+	}
+	const hash = rest.indexOf("#");
+	if (hash !== -1) {
+		this.hash = rest.substr(hash);
+		rest = rest.slice(0, hash);
+	}
+	const qm = rest.indexOf("?");
+	if (qm !== -1) {
+		this.search = rest.substr(qm);
+		rest = rest.slice(0, qm);
+	}
+	if (rest) {
+		this.pathname = rest;
+	}
+	if (slashedProtocol[lowerProto] && this.hostname && !this.pathname) {
+		this.pathname = "";
+	}
+	return this;
 };
-Url.prototype.parseHost = function (host) {
-  let port = portPattern.exec(host);
-  if (port) {
-    port = port[0];
-    if (port !== ":") {
-      this.port = port.substr(1);
-    }
-    host = host.substr(0, host.length - port.length);
-  }
-  if (host) {
-    this.hostname = host;
-  }
+Url.prototype.parseHost = function(host) {
+	let port = portPattern.exec(host);
+	if (port) {
+		port = port[0];
+		if (port !== ":") {
+			this.port = port.substr(1);
+		}
+		host = host.substr(0, host.length - port.length);
+	}
+	if (host) {
+		this.hostname = host;
+	}
 };
 var parse_default = urlParse;
 
 var mdurl_exports = /* @__PURE__ */ __exportAll({
-  decode: () => decode_default,
-  encode: () => encode_default,
-  format: () => format,
-  parse: () => parse_default,
+	decode: () => decode_default,
+	encode: () => encode_default,
+	format: () => format,
+	parse: () => parse_default
 });
 
-var regex_default$5 =
-  /[\0-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/;
+var regex_default$5 = /[\0-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/;
 
 var regex_default$4 = /[\0-\x1F\x7F-\x9F]/;
 
-var regex_default$3 =
-  /[\xAD\u0600-\u0605\u061C\u06DD\u070F\u0890\u0891\u08E2\u180E\u200B-\u200F\u202A-\u202E\u2060-\u2064\u2066-\u206F\uFEFF\uFFF9-\uFFFB]|\uD804[\uDCBD\uDCCD]|\uD80D[\uDC30-\uDC3F]|\uD82F[\uDCA0-\uDCA3]|\uD834[\uDD73-\uDD7A]|\uDB40[\uDC01\uDC20-\uDC7F]/;
+var regex_default$3 = /[\xAD\u0600-\u0605\u061C\u06DD\u070F\u0890\u0891\u08E2\u180E\u200B-\u200F\u202A-\u202E\u2060-\u2064\u2066-\u206F\uFEFF\uFFF9-\uFFFB]|\uD804[\uDCBD\uDCCD]|\uD80D[\uDC30-\uDC3F]|\uD82F[\uDCA0-\uDCA3]|\uD834[\uDD73-\uDD7A]|\uDB40[\uDC01\uDC20-\uDC7F]/;
 
-var regex_default$2 =
-  /[!-#%-\*,-\/:;\?@\[-\]_\{\}\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061D-\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u09FD\u0A76\u0AF0\u0C77\u0C84\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1B7D\u1B7E\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E4F\u2E52-\u2E5D\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD803[\uDEAD\uDF55-\uDF59\uDF86-\uDF89]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC8\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDC4B-\uDC4F\uDC5A\uDC5B\uDC5D\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDE60-\uDE6C\uDEB9\uDF3C-\uDF3E]|\uD806[\uDC3B\uDD44-\uDD46\uDDE2\uDE3F-\uDE46\uDE9A-\uDE9C\uDE9E-\uDEA2\uDF00-\uDF09]|\uD807[\uDC41-\uDC45\uDC70\uDC71\uDEF7\uDEF8\uDF43-\uDF4F\uDFFF]|\uD809[\uDC70-\uDC74]|\uD80B[\uDFF1\uDFF2]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD81B[\uDE97-\uDE9A\uDFE2]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]|\uD83A[\uDD5E\uDD5F]/;
+var regex_default$2 = /[!-#%-\*,-\/:;\?@\[-\]_\{\}\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061D-\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u09FD\u0A76\u0AF0\u0C77\u0C84\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1B7D\u1B7E\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E4F\u2E52-\u2E5D\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD803[\uDEAD\uDF55-\uDF59\uDF86-\uDF89]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC8\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDC4B-\uDC4F\uDC5A\uDC5B\uDC5D\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDE60-\uDE6C\uDEB9\uDF3C-\uDF3E]|\uD806[\uDC3B\uDD44-\uDD46\uDDE2\uDE3F-\uDE46\uDE9A-\uDE9C\uDE9E-\uDEA2\uDF00-\uDF09]|\uD807[\uDC41-\uDC45\uDC70\uDC71\uDEF7\uDEF8\uDF43-\uDF4F\uDFFF]|\uD809[\uDC70-\uDC74]|\uD80B[\uDFF1\uDFF2]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD81B[\uDE97-\uDE9A\uDFE2]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]|\uD83A[\uDD5E\uDD5F]/;
 
-var regex_default$1 =
-  /[\$\+<->\^`\|~\xA2-\xA6\xA8\xA9\xAC\xAE-\xB1\xB4\xB8\xD7\xF7\u02C2-\u02C5\u02D2-\u02DF\u02E5-\u02EB\u02ED\u02EF-\u02FF\u0375\u0384\u0385\u03F6\u0482\u058D-\u058F\u0606-\u0608\u060B\u060E\u060F\u06DE\u06E9\u06FD\u06FE\u07F6\u07FE\u07FF\u0888\u09F2\u09F3\u09FA\u09FB\u0AF1\u0B70\u0BF3-\u0BFA\u0C7F\u0D4F\u0D79\u0E3F\u0F01-\u0F03\u0F13\u0F15-\u0F17\u0F1A-\u0F1F\u0F34\u0F36\u0F38\u0FBE-\u0FC5\u0FC7-\u0FCC\u0FCE\u0FCF\u0FD5-\u0FD8\u109E\u109F\u1390-\u1399\u166D\u17DB\u1940\u19DE-\u19FF\u1B61-\u1B6A\u1B74-\u1B7C\u1FBD\u1FBF-\u1FC1\u1FCD-\u1FCF\u1FDD-\u1FDF\u1FED-\u1FEF\u1FFD\u1FFE\u2044\u2052\u207A-\u207C\u208A-\u208C\u20A0-\u20C0\u2100\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211E-\u2123\u2125\u2127\u2129\u212E\u213A\u213B\u2140-\u2144\u214A-\u214D\u214F\u218A\u218B\u2190-\u2307\u230C-\u2328\u232B-\u2426\u2440-\u244A\u249C-\u24E9\u2500-\u2767\u2794-\u27C4\u27C7-\u27E5\u27F0-\u2982\u2999-\u29D7\u29DC-\u29FB\u29FE-\u2B73\u2B76-\u2B95\u2B97-\u2BFF\u2CE5-\u2CEA\u2E50\u2E51\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFF\u3004\u3012\u3013\u3020\u3036\u3037\u303E\u303F\u309B\u309C\u3190\u3191\u3196-\u319F\u31C0-\u31E3\u31EF\u3200-\u321E\u322A-\u3247\u3250\u3260-\u327F\u328A-\u32B0\u32C0-\u33FF\u4DC0-\u4DFF\uA490-\uA4C6\uA700-\uA716\uA720\uA721\uA789\uA78A\uA828-\uA82B\uA836-\uA839\uAA77-\uAA79\uAB5B\uAB6A\uAB6B\uFB29\uFBB2-\uFBC2\uFD40-\uFD4F\uFDCF\uFDFC-\uFDFF\uFE62\uFE64-\uFE66\uFE69\uFF04\uFF0B\uFF1C-\uFF1E\uFF3E\uFF40\uFF5C\uFF5E\uFFE0-\uFFE6\uFFE8-\uFFEE\uFFFC\uFFFD]|\uD800[\uDD37-\uDD3F\uDD79-\uDD89\uDD8C-\uDD8E\uDD90-\uDD9C\uDDA0\uDDD0-\uDDFC]|\uD802[\uDC77\uDC78\uDEC8]|\uD805\uDF3F|\uD807[\uDFD5-\uDFF1]|\uD81A[\uDF3C-\uDF3F\uDF45]|\uD82F\uDC9C|\uD833[\uDF50-\uDFC3]|\uD834[\uDC00-\uDCF5\uDD00-\uDD26\uDD29-\uDD64\uDD6A-\uDD6C\uDD83\uDD84\uDD8C-\uDDA9\uDDAE-\uDDEA\uDE00-\uDE41\uDE45\uDF00-\uDF56]|\uD835[\uDEC1\uDEDB\uDEFB\uDF15\uDF35\uDF4F\uDF6F\uDF89\uDFA9\uDFC3]|\uD836[\uDC00-\uDDFF\uDE37-\uDE3A\uDE6D-\uDE74\uDE76-\uDE83\uDE85\uDE86]|\uD838[\uDD4F\uDEFF]|\uD83B[\uDCAC\uDCB0\uDD2E\uDEF0\uDEF1]|\uD83C[\uDC00-\uDC2B\uDC30-\uDC93\uDCA0-\uDCAE\uDCB1-\uDCBF\uDCC1-\uDCCF\uDCD1-\uDCF5\uDD0D-\uDDAD\uDDE6-\uDE02\uDE10-\uDE3B\uDE40-\uDE48\uDE50\uDE51\uDE60-\uDE65\uDF00-\uDFFF]|\uD83D[\uDC00-\uDED7\uDEDC-\uDEEC\uDEF0-\uDEFC\uDF00-\uDF76\uDF7B-\uDFD9\uDFE0-\uDFEB\uDFF0]|\uD83E[\uDC00-\uDC0B\uDC10-\uDC47\uDC50-\uDC59\uDC60-\uDC87\uDC90-\uDCAD\uDCB0\uDCB1\uDD00-\uDE53\uDE60-\uDE6D\uDE70-\uDE7C\uDE80-\uDE88\uDE90-\uDEBD\uDEBF-\uDEC5\uDECE-\uDEDB\uDEE0-\uDEE8\uDEF0-\uDEF8\uDF00-\uDF92\uDF94-\uDFCA]/;
+var regex_default$1 = /[\$\+<->\^`\|~\xA2-\xA6\xA8\xA9\xAC\xAE-\xB1\xB4\xB8\xD7\xF7\u02C2-\u02C5\u02D2-\u02DF\u02E5-\u02EB\u02ED\u02EF-\u02FF\u0375\u0384\u0385\u03F6\u0482\u058D-\u058F\u0606-\u0608\u060B\u060E\u060F\u06DE\u06E9\u06FD\u06FE\u07F6\u07FE\u07FF\u0888\u09F2\u09F3\u09FA\u09FB\u0AF1\u0B70\u0BF3-\u0BFA\u0C7F\u0D4F\u0D79\u0E3F\u0F01-\u0F03\u0F13\u0F15-\u0F17\u0F1A-\u0F1F\u0F34\u0F36\u0F38\u0FBE-\u0FC5\u0FC7-\u0FCC\u0FCE\u0FCF\u0FD5-\u0FD8\u109E\u109F\u1390-\u1399\u166D\u17DB\u1940\u19DE-\u19FF\u1B61-\u1B6A\u1B74-\u1B7C\u1FBD\u1FBF-\u1FC1\u1FCD-\u1FCF\u1FDD-\u1FDF\u1FED-\u1FEF\u1FFD\u1FFE\u2044\u2052\u207A-\u207C\u208A-\u208C\u20A0-\u20C0\u2100\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211E-\u2123\u2125\u2127\u2129\u212E\u213A\u213B\u2140-\u2144\u214A-\u214D\u214F\u218A\u218B\u2190-\u2307\u230C-\u2328\u232B-\u2426\u2440-\u244A\u249C-\u24E9\u2500-\u2767\u2794-\u27C4\u27C7-\u27E5\u27F0-\u2982\u2999-\u29D7\u29DC-\u29FB\u29FE-\u2B73\u2B76-\u2B95\u2B97-\u2BFF\u2CE5-\u2CEA\u2E50\u2E51\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFF\u3004\u3012\u3013\u3020\u3036\u3037\u303E\u303F\u309B\u309C\u3190\u3191\u3196-\u319F\u31C0-\u31E3\u31EF\u3200-\u321E\u322A-\u3247\u3250\u3260-\u327F\u328A-\u32B0\u32C0-\u33FF\u4DC0-\u4DFF\uA490-\uA4C6\uA700-\uA716\uA720\uA721\uA789\uA78A\uA828-\uA82B\uA836-\uA839\uAA77-\uAA79\uAB5B\uAB6A\uAB6B\uFB29\uFBB2-\uFBC2\uFD40-\uFD4F\uFDCF\uFDFC-\uFDFF\uFE62\uFE64-\uFE66\uFE69\uFF04\uFF0B\uFF1C-\uFF1E\uFF3E\uFF40\uFF5C\uFF5E\uFFE0-\uFFE6\uFFE8-\uFFEE\uFFFC\uFFFD]|\uD800[\uDD37-\uDD3F\uDD79-\uDD89\uDD8C-\uDD8E\uDD90-\uDD9C\uDDA0\uDDD0-\uDDFC]|\uD802[\uDC77\uDC78\uDEC8]|\uD805\uDF3F|\uD807[\uDFD5-\uDFF1]|\uD81A[\uDF3C-\uDF3F\uDF45]|\uD82F\uDC9C|\uD833[\uDF50-\uDFC3]|\uD834[\uDC00-\uDCF5\uDD00-\uDD26\uDD29-\uDD64\uDD6A-\uDD6C\uDD83\uDD84\uDD8C-\uDDA9\uDDAE-\uDDEA\uDE00-\uDE41\uDE45\uDF00-\uDF56]|\uD835[\uDEC1\uDEDB\uDEFB\uDF15\uDF35\uDF4F\uDF6F\uDF89\uDFA9\uDFC3]|\uD836[\uDC00-\uDDFF\uDE37-\uDE3A\uDE6D-\uDE74\uDE76-\uDE83\uDE85\uDE86]|\uD838[\uDD4F\uDEFF]|\uD83B[\uDCAC\uDCB0\uDD2E\uDEF0\uDEF1]|\uD83C[\uDC00-\uDC2B\uDC30-\uDC93\uDCA0-\uDCAE\uDCB1-\uDCBF\uDCC1-\uDCCF\uDCD1-\uDCF5\uDD0D-\uDDAD\uDDE6-\uDE02\uDE10-\uDE3B\uDE40-\uDE48\uDE50\uDE51\uDE60-\uDE65\uDF00-\uDFFF]|\uD83D[\uDC00-\uDED7\uDEDC-\uDEEC\uDEF0-\uDEFC\uDF00-\uDF76\uDF7B-\uDFD9\uDFE0-\uDFEB\uDFF0]|\uD83E[\uDC00-\uDC0B\uDC10-\uDC47\uDC50-\uDC59\uDC60-\uDC87\uDC90-\uDCAD\uDCB0\uDCB1\uDD00-\uDE53\uDE60-\uDE6D\uDE70-\uDE7C\uDE80-\uDE88\uDE90-\uDEBD\uDEBF-\uDEC5\uDECE-\uDEDB\uDEE0-\uDEE8\uDEF0-\uDEF8\uDF00-\uDF92\uDF94-\uDFCA]/;
 
 var regex_default = /[ \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000]/;
 
 var uc_exports = /* @__PURE__ */ __exportAll({
-  Any: () => regex_default$5,
-  Cc: () => regex_default$4,
-  Cf: () => regex_default$3,
-  P: () => regex_default$2,
-  S: () => regex_default$1,
-  Z: () => regex_default,
+	Any: () => regex_default$5,
+	Cc: () => regex_default$4,
+	Cf: () => regex_default$3,
+	P: () => regex_default$2,
+	S: () => regex_default$1,
+	Z: () => regex_default
 });
 
-var decode_data_html_default = new Uint16Array(
-  'ᵁ<Õıʊҝջאٵ۞ޢߖࠏ੊ઑඡ๭༉༦჊ረዡᐕᒝᓃᓟᔥ\0\0\0\0\0\0ᕫᛍᦍᰒᷝ὾⁠↰⊍⏀⏻⑂⠤⤒ⴈ⹈⿎〖㊺㘹㞬㣾㨨㩱㫠㬮ࠀEMabcfglmnoprstu\\bfms„‹•˜¦³¹ÈÏlig耻Æ䃆P耻&䀦cute耻Á䃁reve;䄂Āiyx}rc耻Â䃂;䐐r;쀀𝔄rave耻À䃀pha;䎑acr;䄀d;橓Āgp¡on;䄄f;쀀𝔸plyFunction;恡ing耻Å䃅Ācs¾Ãr;쀀𝒜ign;扔ilde耻Ã䃃ml耻Ä䃄ЀaceforsuåûþėĜĢħĪĀcrêòkslash;或Ŷöø;櫧ed;挆y;䐑ƀcrtąċĔause;戵noullis;愬a;䎒r;쀀𝔅pf;쀀𝔹eve;䋘còēmpeq;扎܀HOacdefhilorsuōőŖƀƞƢƵƷƺǜȕɳɸɾcy;䐧PY耻©䂩ƀcpyŝŢźute;䄆Ā;iŧŨ拒talDifferentialD;慅leys;愭ȀaeioƉƎƔƘron;䄌dil耻Ç䃇rc;䄈nint;戰ot;䄊ĀdnƧƭilla;䂸terDot;䂷òſi;䎧rcleȀDMPTLJNjǑǖot;抙inus;抖lus;投imes;抗oĀcsǢǸkwiseContourIntegral;戲eCurlyĀDQȃȏoubleQuote;思uote;怙ȀlnpuȞȨɇɕonĀ;eȥȦ户;橴ƀgitȯȶȺruent;扡nt;戯ourIntegral;戮ĀfrɌɎ;愂oduct;成nterClockwiseContourIntegral;戳oss;樯cr;쀀𝒞pĀ;Cʄʅ拓ap;才րDJSZacefiosʠʬʰʴʸˋ˗ˡ˦̳ҍĀ;oŹʥtrahd;椑cy;䐂cy;䐅cy;䐏ƀgrsʿ˄ˇger;怡r;憡hv;櫤Āayː˕ron;䄎;䐔lĀ;t˝˞戇a;䎔r;쀀𝔇Āaf˫̧Ācm˰̢riticalȀADGT̖̜̀̆cute;䂴oŴ̋̍;䋙bleAcute;䋝rave;䁠ilde;䋜ond;拄ferentialD;慆Ѱ̽\0\0\0͔͂\0Ѕf;쀀𝔻ƀ;DE͈͉͍䂨ot;惜qual;扐blèCDLRUVͣͲ΂ϏϢϸontourIntegraìȹoɴ͹\0\0ͻ»͉nArrow;懓Āeo·ΤftƀARTΐΖΡrrow;懐ightArrow;懔eåˊngĀLRΫτeftĀARγιrrow;柸ightArrow;柺ightArrow;柹ightĀATϘϞrrow;懒ee;抨pɁϩ\0\0ϯrrow;懑ownArrow;懕erticalBar;戥ǹABLRTaВЪаўѿͼrrowƀ;BUНОТ憓ar;椓pArrow;懵reve;䌑eft˒к\0ц\0ѐightVector;楐eeVector;楞ectorĀ;Bљњ憽ar;楖ightǔѧ\0ѱeeVector;楟ectorĀ;BѺѻ懁ar;楗eeĀ;A҆҇护rrow;憧ĀctҒҗr;쀀𝒟rok;䄐ࠀNTacdfglmopqstuxҽӀӄӋӞӢӧӮӵԡԯԶՒ՝ՠեG;䅊H耻Ð䃐cute耻É䃉ƀaiyӒӗӜron;䄚rc耻Ê䃊;䐭ot;䄖r;쀀𝔈rave耻È䃈ement;戈ĀapӺӾcr;䄒tyɓԆ\0\0ԒmallSquare;旻erySmallSquare;斫ĀgpԦԪon;䄘f;쀀𝔼silon;䎕uĀaiԼՉlĀ;TՂՃ橵ilde;扂librium;懌Āci՗՚r;愰m;橳a;䎗ml耻Ë䃋Āipժկsts;戃onentialE;慇ʀcfiosօֈ֍ֲ׌y;䐤r;쀀𝔉lledɓ֗\0\0֣mallSquare;旼erySmallSquare;斪Ͱֺ\0ֿ\0\0ׄf;쀀𝔽All;戀riertrf;愱cò׋؀JTabcdfgorstר׬ׯ׺؀ؒؖ؛؝أ٬ٲcy;䐃耻>䀾mmaĀ;d׷׸䎓;䏜reve;䄞ƀeiy؇،ؐdil;䄢rc;䄜;䐓ot;䄠r;쀀𝔊;拙pf;쀀𝔾eater̀EFGLSTصلَٖٛ٦qualĀ;Lؾؿ扥ess;招ullEqual;执reater;檢ess;扷lantEqual;橾ilde;扳cr;쀀𝒢;扫ЀAacfiosuڅڋږڛڞڪھۊRDcy;䐪Āctڐڔek;䋇;䁞irc;䄤r;愌lbertSpace;愋ǰگ\0ڲf;愍izontalLine;攀Āctۃۅòکrok;䄦mpńېۘownHumðįqual;扏܀EJOacdfgmnostuۺ۾܃܇܎ܚܞܡܨ݄ݸދޏޕcy;䐕lig;䄲cy;䐁cute耻Í䃍Āiyܓܘrc耻Î䃎;䐘ot;䄰r;愑rave耻Ì䃌ƀ;apܠܯܿĀcgܴܷr;䄪inaryI;慈lieóϝǴ݉\0ݢĀ;eݍݎ戬Āgrݓݘral;戫section;拂isibleĀCTݬݲomma;恣imes;恢ƀgptݿރވon;䄮f;쀀𝕀a;䎙cr;愐ilde;䄨ǫޚ\0ޞcy;䐆l耻Ï䃏ʀcfosuެ޷޼߂ߐĀiyޱ޵rc;䄴;䐙r;쀀𝔍pf;쀀𝕁ǣ߇\0ߌr;쀀𝒥rcy;䐈kcy;䐄΀HJacfosߤߨ߽߬߱ࠂࠈcy;䐥cy;䐌ppa;䎚Āey߶߻dil;䄶;䐚r;쀀𝔎pf;쀀𝕂cr;쀀𝒦րJTaceflmostࠥࠩࠬࡐࡣ঳সে্਷ੇcy;䐉耻<䀼ʀcmnpr࠷࠼ࡁࡄࡍute;䄹bda;䎛g;柪lacetrf;愒r;憞ƀaeyࡗ࡜ࡡron;䄽dil;䄻;䐛Āfsࡨ॰tԀACDFRTUVarࡾࢩࢱࣦ࣠ࣼयज़ΐ४Ānrࢃ࢏gleBracket;柨rowƀ;BR࢙࢚࢞憐ar;懤ightArrow;懆eiling;挈oǵࢷ\0ࣃbleBracket;柦nǔࣈ\0࣒eeVector;楡ectorĀ;Bࣛࣜ懃ar;楙loor;挊ightĀAV࣯ࣵrrow;憔ector;楎Āerँगeƀ;AVउऊऐ抣rrow;憤ector;楚iangleƀ;BEतथऩ抲ar;槏qual;抴pƀDTVषूौownVector;楑eeVector;楠ectorĀ;Bॖॗ憿ar;楘ectorĀ;B॥०憼ar;楒ightáΜs̀EFGLSTॾঋকঝঢভqualGreater;拚ullEqual;扦reater;扶ess;檡lantEqual;橽ilde;扲r;쀀𝔏Ā;eঽা拘ftarrow;懚idot;䄿ƀnpw৔ਖਛgȀLRlr৞৷ਂਐeftĀAR০৬rrow;柵ightArrow;柷ightArrow;柶eftĀarγਊightáοightáϊf;쀀𝕃erĀLRਢਬeftArrow;憙ightArrow;憘ƀchtਾੀੂòࡌ;憰rok;䅁;扪Ѐacefiosuਗ਼੝੠੷੼અઋ઎p;椅y;䐜Ādl੥੯iumSpace;恟lintrf;愳r;쀀𝔐nusPlus;戓pf;쀀𝕄cò੶;䎜ҀJacefostuણધભીଔଙඑ඗ඞcy;䐊cute;䅃ƀaey઴હાron;䅇dil;䅅;䐝ƀgswે૰଎ativeƀMTV૓૟૨ediumSpace;怋hiĀcn૦૘ë૙eryThiî૙tedĀGL૸ଆreaterGreateòٳessLesóੈLine;䀊r;쀀𝔑ȀBnptଢନଷ଺reak;恠BreakingSpace;䂠f;愕ڀ;CDEGHLNPRSTV୕ୖ୪୼஡௫ఄ౞಄ದ೘ൡඅ櫬Āou୛୤ngruent;扢pCap;扭oubleVerticalBar;戦ƀlqxஃஊ஛ement;戉ualĀ;Tஒஓ扠ilde;쀀≂̸ists;戄reater΀;EFGLSTஶஷ஽௉௓௘௥扯qual;扱ullEqual;쀀≧̸reater;쀀≫̸ess;批lantEqual;쀀⩾̸ilde;扵umpń௲௽ownHump;쀀≎̸qual;쀀≏̸eĀfsఊధtTriangleƀ;BEచఛడ拪ar;쀀⧏̸qual;括s̀;EGLSTవశ఼ౄోౘ扮qual;扰reater;扸ess;쀀≪̸lantEqual;쀀⩽̸ilde;扴estedĀGL౨౹reaterGreater;쀀⪢̸essLess;쀀⪡̸recedesƀ;ESಒಓಛ技qual;쀀⪯̸lantEqual;拠ĀeiಫಹverseElement;戌ghtTriangleƀ;BEೋೌ೒拫ar;쀀⧐̸qual;拭ĀquೝഌuareSuĀbp೨೹setĀ;E೰ೳ쀀⊏̸qual;拢ersetĀ;Eഃആ쀀⊐̸qual;拣ƀbcpഓതൎsetĀ;Eഛഞ쀀⊂⃒qual;抈ceedsȀ;ESTലള഻െ抁qual;쀀⪰̸lantEqual;拡ilde;쀀≿̸ersetĀ;E൘൛쀀⊃⃒qual;抉ildeȀ;EFT൮൯൵ൿ扁qual;扄ullEqual;扇ilde;扉erticalBar;戤cr;쀀𝒩ilde耻Ñ䃑;䎝܀Eacdfgmoprstuvලෂ෉෕ෛ෠෧෼ขภยา฿ไlig;䅒cute耻Ó䃓Āiy෎ීrc耻Ô䃔;䐞blac;䅐r;쀀𝔒rave耻Ò䃒ƀaei෮ෲ෶cr;䅌ga;䎩cron;䎟pf;쀀𝕆enCurlyĀDQฎบoubleQuote;怜uote;怘;橔Āclวฬr;쀀𝒪ash耻Ø䃘iŬื฼de耻Õ䃕es;樷ml耻Ö䃖erĀBP๋๠Āar๐๓r;怾acĀek๚๜;揞et;掴arenthesis;揜Ҁacfhilors๿ງຊຏຒດຝະ໼rtialD;戂y;䐟r;쀀𝔓i;䎦;䎠usMinus;䂱Āipຢອncareplanåڝf;愙Ȁ;eio຺ູ໠໤檻cedesȀ;EST່້໏໚扺qual;檯lantEqual;扼ilde;找me;怳Ādp໩໮uct;戏ortionĀ;aȥ໹l;戝Āci༁༆r;쀀𝒫;䎨ȀUfos༑༖༛༟OT耻"䀢r;쀀𝔔pf;愚cr;쀀𝒬؀BEacefhiorsu༾གྷཇའཱིྦྷྪྭ႖ႩႴႾarr;椐G耻®䂮ƀcnrཎནབute;䅔g;柫rĀ;tཛྷཝ憠l;椖ƀaeyཧཬཱron;䅘dil;䅖;䐠Ā;vླྀཹ愜erseĀEUྂྙĀlq྇ྎement;戋uilibrium;懋pEquilibrium;楯r»ཹo;䎡ghtЀACDFTUVa࿁࿫࿳ဢဨၛႇϘĀnr࿆࿒gleBracket;柩rowƀ;BL࿜࿝࿡憒ar;懥eftArrow;懄eiling;按oǵ࿹\0စbleBracket;柧nǔည\0နeeVector;楝ectorĀ;Bဝသ懂ar;楕loor;挋Āerိ၃eƀ;AVဵံြ抢rrow;憦ector;楛iangleƀ;BEၐၑၕ抳ar;槐qual;抵pƀDTVၣၮၸownVector;楏eeVector;楜ectorĀ;Bႂႃ憾ar;楔ectorĀ;B႑႒懀ar;楓Āpuႛ႞f;愝ndImplies;楰ightarrow;懛ĀchႹႼr;愛;憱leDelayed;槴ڀHOacfhimoqstuფჱჷჽᄙᄞᅑᅖᅡᅧᆵᆻᆿĀCcჩხHcy;䐩y;䐨FTcy;䐬cute;䅚ʀ;aeiyᄈᄉᄎᄓᄗ檼ron;䅠dil;䅞rc;䅜;䐡r;쀀𝔖ortȀDLRUᄪᄴᄾᅉownArrow»ОeftArrow»࢚ightArrow»࿝pArrow;憑gma;䎣allCircle;战pf;쀀𝕊ɲᅭ\0\0ᅰt;戚areȀ;ISUᅻᅼᆉᆯ斡ntersection;抓uĀbpᆏᆞsetĀ;Eᆗᆘ抏qual;抑ersetĀ;Eᆨᆩ抐qual;抒nion;抔cr;쀀𝒮ar;拆ȀbcmpᇈᇛሉላĀ;sᇍᇎ拐etĀ;Eᇍᇕqual;抆ĀchᇠህeedsȀ;ESTᇭᇮᇴᇿ扻qual;檰lantEqual;扽ilde;承Tháྌ;我ƀ;esሒሓሣ拑rsetĀ;Eሜም抃qual;抇et»ሓրHRSacfhiorsሾቄ቉ቕ቞ቱቶኟዂወዑORN耻Þ䃞ADE;愢ĀHc቎ቒcy;䐋y;䐦Ābuቚቜ;䀉;䎤ƀaeyብቪቯron;䅤dil;䅢;䐢r;쀀𝔗Āeiቻ኉Dzኀ\0ኇefore;戴a;䎘Ācn኎ኘkSpace;쀀  Space;怉ldeȀ;EFTካኬኲኼ戼qual;扃ullEqual;扅ilde;扈pf;쀀𝕋ipleDot;惛Āctዖዛr;쀀𝒯rok;䅦ૡዷጎጚጦ\0ጬጱ\0\0\0\0\0ጸጽ፷ᎅ\0᏿ᐄᐊᐐĀcrዻጁute耻Ú䃚rĀ;oጇገ憟cir;楉rǣጓ\0጖y;䐎ve;䅬Āiyጞጣrc耻Û䃛;䐣blac;䅰r;쀀𝔘rave耻Ù䃙acr;䅪Ādiፁ፩erĀBPፈ፝Āarፍፐr;䁟acĀekፗፙ;揟et;掵arenthesis;揝onĀ;P፰፱拃lus;抎Āgp፻፿on;䅲f;쀀𝕌ЀADETadps᎕ᎮᎸᏄϨᏒᏗᏳrrowƀ;BDᅐᎠᎤar;椒ownArrow;懅ownArrow;憕quilibrium;楮eeĀ;AᏋᏌ报rrow;憥ownáϳerĀLRᏞᏨeftArrow;憖ightArrow;憗iĀ;lᏹᏺ䏒on;䎥ing;䅮cr;쀀𝒰ilde;䅨ml耻Ü䃜ҀDbcdefosvᐧᐬᐰᐳᐾᒅᒊᒐᒖash;披ar;櫫y;䐒ashĀ;lᐻᐼ抩;櫦Āerᑃᑅ;拁ƀbtyᑌᑐᑺar;怖Ā;iᑏᑕcalȀBLSTᑡᑥᑪᑴar;戣ine;䁼eparator;杘ilde;所ThinSpace;怊r;쀀𝔙pf;쀀𝕍cr;쀀𝒱dash;抪ʀcefosᒧᒬᒱᒶᒼirc;䅴dge;拀r;쀀𝔚pf;쀀𝕎cr;쀀𝒲Ȁfiosᓋᓐᓒᓘr;쀀𝔛;䎞pf;쀀𝕏cr;쀀𝒳ҀAIUacfosuᓱᓵᓹᓽᔄᔏᔔᔚᔠcy;䐯cy;䐇cy;䐮cute耻Ý䃝Āiyᔉᔍrc;䅶;䐫r;쀀𝔜pf;쀀𝕐cr;쀀𝒴ml;䅸ЀHacdefosᔵᔹᔿᕋᕏᕝᕠᕤcy;䐖cute;䅹Āayᕄᕉron;䅽;䐗ot;䅻Dzᕔ\0ᕛoWidtè૙a;䎖r;愨pf;愤cr;쀀𝒵௡ᖃᖊᖐ\0ᖰᖶᖿ\0\0\0\0ᗆᗛᗫᙟ᙭\0ᚕ᚛ᚲᚹ\0ᚾcute耻á䃡reve;䄃̀;Ediuyᖜᖝᖡᖣᖨᖭ戾;쀀∾̳;房rc耻â䃢te肻´̆;䐰lig耻æ䃦Ā;r²ᖺ;쀀𝔞rave耻à䃠ĀepᗊᗖĀfpᗏᗔsym;愵èᗓha;䎱ĀapᗟcĀclᗤᗧr;䄁g;樿ɤᗰ\0\0ᘊʀ;adsvᗺᗻᗿᘁᘇ戧nd;橕;橜lope;橘;橚΀;elmrszᘘᘙᘛᘞᘿᙏᙙ戠;榤e»ᘙsdĀ;aᘥᘦ戡ѡᘰᘲᘴᘶᘸᘺᘼᘾ;榨;榩;榪;榫;榬;榭;榮;榯tĀ;vᙅᙆ戟bĀ;dᙌᙍ抾;榝Āptᙔᙗh;戢»¹arr;捼Āgpᙣᙧon;䄅f;쀀𝕒΀;Eaeiop዁ᙻᙽᚂᚄᚇᚊ;橰cir;橯;扊d;手s;䀧roxĀ;e዁ᚒñᚃing耻å䃥ƀctyᚡᚦᚨr;쀀𝒶;䀪mpĀ;e዁ᚯñʈilde耻ã䃣ml耻ä䃤Āciᛂᛈoninôɲnt;樑ࠀNabcdefiklnoprsu᛭ᛱᜰ᜼ᝃᝈ᝸᝽០៦ᠹᡐᜍ᤽᥈ᥰot;櫭Ācrᛶ᜞kȀcepsᜀᜅᜍᜓong;扌psilon;䏶rime;怵imĀ;e᜚᜛戽q;拍Ŷᜢᜦee;抽edĀ;gᜬᜭ挅e»ᜭrkĀ;t፜᜷brk;掶Āoyᜁᝁ;䐱quo;怞ʀcmprtᝓ᝛ᝡᝤᝨausĀ;eĊĉptyv;榰séᜌnoõēƀahwᝯ᝱ᝳ;䎲;愶een;扬r;쀀𝔟g΀costuvwឍឝឳេ៕៛៞ƀaiuបពរðݠrc;旯p»፱ƀdptឤឨឭot;樀lus;樁imes;樂ɱឹ\0\0ើcup;樆ar;昅riangleĀdu៍្own;施p;斳plus;樄eåᑄåᒭarow;植ƀako៭ᠦᠵĀcn៲ᠣkƀlst៺֫᠂ozenge;槫riangleȀ;dlr᠒᠓᠘᠝斴own;斾eft;旂ight;斸k;搣Ʊᠫ\0ᠳƲᠯ\0ᠱ;斒;斑4;斓ck;斈ĀeoᠾᡍĀ;qᡃᡆ쀀=⃥uiv;쀀≡⃥t;挐Ȁptwxᡙᡞᡧᡬf;쀀𝕓Ā;tᏋᡣom»Ꮜtie;拈؀DHUVbdhmptuvᢅᢖᢪᢻᣗᣛᣬ᣿ᤅᤊᤐᤡȀLRlrᢎᢐᢒᢔ;敗;敔;敖;敓ʀ;DUduᢡᢢᢤᢦᢨ敐;敦;敩;敤;敧ȀLRlrᢳᢵᢷᢹ;敝;敚;敜;教΀;HLRhlrᣊᣋᣍᣏᣑᣓᣕ救;敬;散;敠;敫;敢;敟ox;槉ȀLRlrᣤᣦᣨᣪ;敕;敒;攐;攌ʀ;DUduڽ᣷᣹᣻᣽;敥;敨;攬;攴inus;抟lus;択imes;抠ȀLRlrᤙᤛᤝ᤟;敛;敘;攘;攔΀;HLRhlrᤰᤱᤳᤵᤷ᤻᤹攂;敪;敡;敞;攼;攤;攜Āevģ᥂bar耻¦䂦Ȁceioᥑᥖᥚᥠr;쀀𝒷mi;恏mĀ;e᜚᜜lƀ;bhᥨᥩᥫ䁜;槅sub;柈Ŭᥴ᥾lĀ;e᥹᥺怢t»᥺pƀ;Eeįᦅᦇ;檮Ā;qۜۛೡᦧ\0᧨ᨑᨕᨲ\0ᨷᩐ\0\0᪴\0\0᫁\0\0ᬡᬮ᭍᭒\0᯽\0ᰌƀcpr᦭ᦲ᧝ute;䄇̀;abcdsᦿᧀᧄ᧊᧕᧙戩nd;橄rcup;橉Āau᧏᧒p;橋p;橇ot;橀;쀀∩︀Āeo᧢᧥t;恁îړȀaeiu᧰᧻ᨁᨅǰ᧵\0᧸s;橍on;䄍dil耻ç䃧rc;䄉psĀ;sᨌᨍ橌m;橐ot;䄋ƀdmnᨛᨠᨦil肻¸ƭptyv;榲t脀¢;eᨭᨮ䂢räƲr;쀀𝔠ƀceiᨽᩀᩍy;䑇ckĀ;mᩇᩈ朓ark»ᩈ;䏇r΀;Ecefms᩟᩠ᩢᩫ᪤᪪᪮旋;槃ƀ;elᩩᩪᩭ䋆q;扗eɡᩴ\0\0᪈rrowĀlr᩼᪁eft;憺ight;憻ʀRSacd᪒᪔᪖᪚᪟»ཇ;擈st;抛irc;抚ash;抝nint;樐id;櫯cir;槂ubsĀ;u᪻᪼晣it»᪼ˬ᫇᫔᫺\0ᬊonĀ;eᫍᫎ䀺Ā;qÇÆɭ᫙\0\0᫢aĀ;t᫞᫟䀬;䁀ƀ;fl᫨᫩᫫戁îᅠeĀmx᫱᫶ent»᫩eóɍǧ᫾\0ᬇĀ;dኻᬂot;橭nôɆƀfryᬐᬔᬗ;쀀𝕔oäɔ脀©;sŕᬝr;愗Āaoᬥᬩrr;憵ss;朗Ācuᬲᬷr;쀀𝒸Ābpᬼ᭄Ā;eᭁᭂ櫏;櫑Ā;eᭉᭊ櫐;櫒dot;拯΀delprvw᭠᭬᭷ᮂᮬᯔ᯹arrĀlr᭨᭪;椸;椵ɰ᭲\0\0᭵r;拞c;拟arrĀ;p᭿ᮀ憶;椽̀;bcdosᮏᮐᮖᮡᮥᮨ截rcap;橈Āauᮛᮞp;橆p;橊ot;抍r;橅;쀀∪︀Ȁalrv᮵ᮿᯞᯣrrĀ;mᮼᮽ憷;椼yƀevwᯇᯔᯘqɰᯎ\0\0ᯒreã᭳uã᭵ee;拎edge;拏en耻¤䂤earrowĀlrᯮ᯳eft»ᮀight»ᮽeäᯝĀciᰁᰇoninôǷnt;戱lcty;挭ঀAHabcdefhijlorstuwz᰸᰻᰿ᱝᱩᱵᲊᲞᲬᲷ᳻᳿ᴍᵻᶑᶫᶻ᷆᷍rò΁ar;楥Ȁglrs᱈ᱍ᱒᱔ger;怠eth;愸òᄳhĀ;vᱚᱛ怐»ऊūᱡᱧarow;椏aã̕Āayᱮᱳron;䄏;䐴ƀ;ao̲ᱼᲄĀgrʿᲁr;懊tseq;橷ƀglmᲑᲔᲘ耻°䂰ta;䎴ptyv;榱ĀirᲣᲨsht;楿;쀀𝔡arĀlrᲳᲵ»ࣜ»သʀaegsv᳂͸᳖᳜᳠mƀ;oș᳊᳔ndĀ;ș᳑uit;晦amma;䏝in;拲ƀ;io᳧᳨᳸䃷de脀÷;o᳧ᳰntimes;拇nø᳷cy;䑒cɯᴆ\0\0ᴊrn;挞op;挍ʀlptuwᴘᴝᴢᵉᵕlar;䀤f;쀀𝕕ʀ;emps̋ᴭᴷᴽᵂqĀ;d͒ᴳot;扑inus;戸lus;戔quare;抡blebarwedgåúnƀadhᄮᵝᵧownarrowóᲃarpoonĀlrᵲᵶefôᲴighôᲶŢᵿᶅkaro÷གɯᶊ\0\0ᶎrn;挟op;挌ƀcotᶘᶣᶦĀryᶝᶡ;쀀𝒹;䑕l;槶rok;䄑Ādrᶰᶴot;拱iĀ;fᶺ᠖斿Āah᷀᷃ròЩaòྦangle;榦Āci᷒ᷕy;䑟grarr;柿ऀDacdefglmnopqrstuxḁḉḙḸոḼṉṡṾấắẽỡἪἷὄ὎὚ĀDoḆᴴoôᲉĀcsḎḔute耻é䃩ter;橮ȀaioyḢḧḱḶron;䄛rĀ;cḭḮ扖耻ê䃪lon;払;䑍ot;䄗ĀDrṁṅot;扒;쀀𝔢ƀ;rsṐṑṗ檚ave耻è䃨Ā;dṜṝ檖ot;檘Ȁ;ilsṪṫṲṴ檙nters;揧;愓Ā;dṹṺ檕ot;檗ƀapsẅẉẗcr;䄓tyƀ;svẒẓẕ戅et»ẓpĀ1;ẝẤijạả;怄;怅怃ĀgsẪẬ;䅋p;怂ĀgpẴẸon;䄙f;쀀𝕖ƀalsỄỎỒrĀ;sỊị拕l;槣us;橱iƀ;lvỚớở䎵on»ớ;䏵ȀcsuvỪỳἋἣĀioữḱrc»Ḯɩỹ\0\0ỻíՈantĀglἂἆtr»ṝess»Ṻƀaeiἒ἖Ἒls;䀽st;扟vĀ;DȵἠD;橸parsl;槥ĀDaἯἳot;打rr;楱ƀcdiἾὁỸr;愯oô͒ĀahὉὋ;䎷耻ð䃰Āmrὓὗl耻ë䃫o;悬ƀcipὡὤὧl;䀡sôծĀeoὬὴctatioîՙnentialåչৡᾒ\0ᾞ\0ᾡᾧ\0\0ῆῌ\0ΐ\0ῦῪ \0 ⁚llingdotseñṄy;䑄male;晀ƀilrᾭᾳ῁lig;耀ffiɩᾹ\0\0᾽g;耀ffig;耀ffl;쀀𝔣lig;耀filig;쀀fjƀaltῙ῜ῡt;晭ig;耀flns;斱of;䆒ǰ΅\0ῳf;쀀𝕗ĀakֿῷĀ;vῼ´拔;櫙artint;樍Āao‌⁕Ācs‑⁒ႉ‸⁅⁈\0⁐β•‥‧‪‬\0‮耻½䂽;慓耻¼䂼;慕;慙;慛Ƴ‴\0‶;慔;慖ʴ‾⁁\0\0⁃耻¾䂾;慗;慜5;慘ƶ⁌\0⁎;慚;慝8;慞l;恄wn;挢cr;쀀𝒻ࢀEabcdefgijlnorstv₂₉₟₥₰₴⃰⃵⃺⃿℃ℒℸ̗ℾ⅒↞Ā;lٍ₇;檌ƀcmpₐₕ₝ute;䇵maĀ;dₜ᳚䎳;檆reve;䄟Āiy₪₮rc;䄝;䐳ot;䄡Ȁ;lqsؾق₽⃉ƀ;qsؾٌ⃄lanô٥Ȁ;cdl٥⃒⃥⃕c;檩otĀ;o⃜⃝檀Ā;l⃢⃣檂;檄Ā;e⃪⃭쀀⋛︀s;檔r;쀀𝔤Ā;gٳ؛mel;愷cy;䑓Ȁ;Eajٚℌℎℐ;檒;檥;檤ȀEaesℛℝ℩ℴ;扩pĀ;p℣ℤ檊rox»ℤĀ;q℮ℯ檈Ā;q℮ℛim;拧pf;쀀𝕘Āci⅃ⅆr;愊mƀ;el٫ⅎ⅐;檎;檐茀>;cdlqr׮ⅠⅪⅮⅳⅹĀciⅥⅧ;檧r;橺ot;拗Par;榕uest;橼ʀadelsↄⅪ←ٖ↛ǰ↉\0↎proø₞r;楸qĀlqؿ↖lesó₈ií٫Āen↣↭rtneqq;쀀≩︀Å↪ԀAabcefkosy⇄⇇⇱⇵⇺∘∝∯≨≽ròΠȀilmr⇐⇔⇗⇛rsðᒄf»․ilôکĀdr⇠⇤cy;䑊ƀ;cwࣴ⇫⇯ir;楈;憭ar;意irc;䄥ƀalr∁∎∓rtsĀ;u∉∊晥it»∊lip;怦con;抹r;쀀𝔥sĀew∣∩arow;椥arow;椦ʀamopr∺∾≃≞≣rr;懿tht;戻kĀlr≉≓eftarrow;憩ightarrow;憪f;쀀𝕙bar;怕ƀclt≯≴≸r;쀀𝒽asè⇴rok;䄧Ābp⊂⊇ull;恃hen»ᱛૡ⊣\0⊪\0⊸⋅⋎\0⋕⋳\0\0⋸⌢⍧⍢⍿\0⎆⎪⎴cute耻í䃭ƀ;iyݱ⊰⊵rc耻î䃮;䐸Ācx⊼⊿y;䐵cl耻¡䂡ĀfrΟ⋉;쀀𝔦rave耻ì䃬Ȁ;inoܾ⋝⋩⋮Āin⋢⋦nt;樌t;戭fin;槜ta;愩lig;䄳ƀaop⋾⌚⌝ƀcgt⌅⌈⌗r;䄫ƀelpܟ⌏⌓inåގarôܠh;䄱f;抷ed;䆵ʀ;cfotӴ⌬⌱⌽⍁are;愅inĀ;t⌸⌹戞ie;槝doô⌙ʀ;celpݗ⍌⍐⍛⍡al;抺Āgr⍕⍙eróᕣã⍍arhk;樗rod;樼Ȁcgpt⍯⍲⍶⍻y;䑑on;䄯f;쀀𝕚a;䎹uest耻¿䂿Āci⎊⎏r;쀀𝒾nʀ;EdsvӴ⎛⎝⎡ӳ;拹ot;拵Ā;v⎦⎧拴;拳Ā;iݷ⎮lde;䄩ǫ⎸\0⎼cy;䑖l耻ï䃯̀cfmosu⏌⏗⏜⏡⏧⏵Āiy⏑⏕rc;䄵;䐹r;쀀𝔧ath;䈷pf;쀀𝕛ǣ⏬\0⏱r;쀀𝒿rcy;䑘kcy;䑔Ѐacfghjos␋␖␢␧␭␱␵␻ppaĀ;v␓␔䎺;䏰Āey␛␠dil;䄷;䐺r;쀀𝔨reen;䄸cy;䑅cy;䑜pf;쀀𝕜cr;쀀𝓀஀ABEHabcdefghjlmnoprstuv⑰⒁⒆⒍⒑┎┽╚▀♎♞♥♹♽⚚⚲⛘❝❨➋⟀⠁⠒ƀart⑷⑺⑼rò৆òΕail;椛arr;椎Ā;gঔ⒋;檋ar;楢ॣ⒥\0⒪\0⒱\0\0\0\0\0⒵Ⓔ\0ⓆⓈⓍ\0⓹ute;䄺mptyv;榴raîࡌbda;䎻gƀ;dlࢎⓁⓃ;榑åࢎ;檅uo耻«䂫rЀ;bfhlpst࢙ⓞⓦⓩ⓫⓮⓱⓵Ā;f࢝ⓣs;椟s;椝ë≒p;憫l;椹im;楳l;憢ƀ;ae⓿─┄檫il;椙Ā;s┉┊檭;쀀⪭︀ƀabr┕┙┝rr;椌rk;杲Āak┢┬cĀek┨┪;䁻;䁛Āes┱┳;榋lĀdu┹┻;榏;榍Ȁaeuy╆╋╖╘ron;䄾Ādi═╔il;䄼ìࢰâ┩;䐻Ȁcqrs╣╦╭╽a;椶uoĀ;rนᝆĀdu╲╷har;楧shar;楋h;憲ʀ;fgqs▋▌উ◳◿扤tʀahlrt▘▤▷◂◨rrowĀ;t࢙□aé⓶arpoonĀdu▯▴own»њp»०eftarrows;懇ightƀahs◍◖◞rrowĀ;sࣴࢧarpoonó྘quigarro÷⇰hreetimes;拋ƀ;qs▋ও◺lanôবʀ;cdgsব☊☍☝☨c;檨otĀ;o☔☕橿Ā;r☚☛檁;檃Ā;e☢☥쀀⋚︀s;檓ʀadegs☳☹☽♉♋pproøⓆot;拖qĀgq♃♅ôউgtò⒌ôছiíলƀilr♕࣡♚sht;楼;쀀𝔩Ā;Eজ♣;檑š♩♶rĀdu▲♮Ā;l॥♳;楪lk;斄cy;䑙ʀ;achtੈ⚈⚋⚑⚖rò◁orneòᴈard;楫ri;旺Āio⚟⚤dot;䅀ustĀ;a⚬⚭掰che»⚭ȀEaes⚻⚽⛉⛔;扨pĀ;p⛃⛄檉rox»⛄Ā;q⛎⛏檇Ā;q⛎⚻im;拦Ѐabnoptwz⛩⛴⛷✚✯❁❇❐Ānr⛮⛱g;柬r;懽rëࣁgƀlmr⛿✍✔eftĀar০✇ightá৲apsto;柼ightá৽parrowĀlr✥✩efô⓭ight;憬ƀafl✶✹✽r;榅;쀀𝕝us;樭imes;樴š❋❏st;戗áፎƀ;ef❗❘᠀旊nge»❘arĀ;l❤❥䀨t;榓ʀachmt❳❶❼➅➇ròࢨorneòᶌarĀ;d྘➃;業;怎ri;抿̀achiqt➘➝ੀ➢➮➻quo;怹r;쀀𝓁mƀ;egল➪➬;檍;檏Ābu┪➳oĀ;rฟ➹;怚rok;䅂萀<;cdhilqrࠫ⟒☹⟜⟠⟥⟪⟰Āci⟗⟙;檦r;橹reå◲mes;拉arr;楶uest;橻ĀPi⟵⟹ar;榖ƀ;ef⠀भ᠛旃rĀdu⠇⠍shar;楊har;楦Āen⠗⠡rtneqq;쀀≨︀Å⠞܀Dacdefhilnopsu⡀⡅⢂⢎⢓⢠⢥⢨⣚⣢⣤ઃ⣳⤂Dot;戺Ȁclpr⡎⡒⡣⡽r耻¯䂯Āet⡗⡙;時Ā;e⡞⡟朠se»⡟Ā;sျ⡨toȀ;dluျ⡳⡷⡻owîҌefôएðᏑker;斮Āoy⢇⢌mma;権;䐼ash;怔asuredangle»ᘦr;쀀𝔪o;愧ƀcdn⢯⢴⣉ro耻µ䂵Ȁ;acdᑤ⢽⣀⣄sôᚧir;櫰ot肻·Ƶusƀ;bd⣒ᤃ⣓戒Ā;uᴼ⣘;横ţ⣞⣡p;櫛ò−ðઁĀdp⣩⣮els;抧f;쀀𝕞Āct⣸⣽r;쀀𝓂pos»ᖝƀ;lm⤉⤊⤍䎼timap;抸ఀGLRVabcdefghijlmoprstuvw⥂⥓⥾⦉⦘⧚⧩⨕⨚⩘⩝⪃⪕⪤⪨⬄⬇⭄⭿⮮ⰴⱧⱼ⳩Āgt⥇⥋;쀀⋙̸Ā;v⥐௏쀀≫⃒ƀelt⥚⥲⥶ftĀar⥡⥧rrow;懍ightarrow;懎;쀀⋘̸Ā;v⥻ే쀀≪⃒ightarrow;懏ĀDd⦎⦓ash;抯ash;抮ʀbcnpt⦣⦧⦬⦱⧌la»˞ute;䅄g;쀀∠⃒ʀ;Eiop඄⦼⧀⧅⧈;쀀⩰̸d;쀀≋̸s;䅉roø඄urĀ;a⧓⧔普lĀ;s⧓ସdz⧟\0⧣p肻\xA0ଷmpĀ;e௹ఀʀaeouy⧴⧾⨃⨐⨓ǰ⧹\0⧻;橃on;䅈dil;䅆ngĀ;dൾ⨊ot;쀀⩭̸p;橂;䐽ash;怓΀;Aadqsxஒ⨩⨭⨻⩁⩅⩐rr;懗rĀhr⨳⨶k;椤Ā;oᏲᏰot;쀀≐̸uiöୣĀei⩊⩎ar;椨í஘istĀ;s஠டr;쀀𝔫ȀEest௅⩦⩹⩼ƀ;qs஼⩭௡ƀ;qs஼௅⩴lanô௢ií௪Ā;rஶ⪁»ஷƀAap⪊⪍⪑rò⥱rr;憮ar;櫲ƀ;svྍ⪜ྌĀ;d⪡⪢拼;拺cy;䑚΀AEadest⪷⪺⪾⫂⫅⫶⫹rò⥦;쀀≦̸rr;憚r;急Ȁ;fqs఻⫎⫣⫯tĀar⫔⫙rro÷⫁ightarro÷⪐ƀ;qs఻⪺⫪lanôౕĀ;sౕ⫴»శiíౝĀ;rవ⫾iĀ;eచథiäඐĀpt⬌⬑f;쀀𝕟膀¬;in⬙⬚⬶䂬nȀ;Edvஉ⬤⬨⬮;쀀⋹̸ot;쀀⋵̸ǡஉ⬳⬵;拷;拶iĀ;vಸ⬼ǡಸ⭁⭃;拾;拽ƀaor⭋⭣⭩rȀ;ast୻⭕⭚⭟lleì୻l;쀀⫽⃥;쀀∂̸lint;樔ƀ;ceಒ⭰⭳uåಥĀ;cಘ⭸Ā;eಒ⭽ñಘȀAait⮈⮋⮝⮧rò⦈rrƀ;cw⮔⮕⮙憛;쀀⤳̸;쀀↝̸ghtarrow»⮕riĀ;eೋೖ΀chimpqu⮽⯍⯙⬄୸⯤⯯Ȁ;cerല⯆ഷ⯉uå൅;쀀𝓃ortɭ⬅\0\0⯖ará⭖mĀ;e൮⯟Ā;q൴൳suĀbp⯫⯭å೸åഋƀbcp⯶ⰑⰙȀ;Ees⯿ⰀഢⰄ抄;쀀⫅̸etĀ;eഛⰋqĀ;qണⰀcĀ;eലⰗñസȀ;EesⰢⰣൟⰧ抅;쀀⫆̸etĀ;e൘ⰮqĀ;qൠⰣȀgilrⰽⰿⱅⱇìௗlde耻ñ䃱çృiangleĀlrⱒⱜeftĀ;eచⱚñదightĀ;eೋⱥñ೗Ā;mⱬⱭ䎽ƀ;esⱴⱵⱹ䀣ro;愖p;怇ҀDHadgilrsⲏⲔⲙⲞⲣⲰⲶⳓⳣash;抭arr;椄p;쀀≍⃒ash;抬ĀetⲨⲬ;쀀≥⃒;쀀>⃒nfin;槞ƀAetⲽⳁⳅrr;椂;쀀≤⃒Ā;rⳊⳍ쀀<⃒ie;쀀⊴⃒ĀAtⳘⳜrr;椃rie;쀀⊵⃒im;쀀∼⃒ƀAan⳰⳴ⴂrr;懖rĀhr⳺⳽k;椣Ā;oᏧᏥear;椧ቓ᪕\0\0\0\0\0\0\0\0\0\0\0\0\0ⴭ\0ⴸⵈⵠⵥ⵲ⶄᬇ\0\0ⶍⶫ\0ⷈⷎ\0ⷜ⸙⸫⸾⹃Ācsⴱ᪗ute耻ó䃳ĀiyⴼⵅrĀ;c᪞ⵂ耻ô䃴;䐾ʀabios᪠ⵒⵗLjⵚlac;䅑v;樸old;榼lig;䅓Ācr⵩⵭ir;榿;쀀𝔬ͯ⵹\0\0⵼\0ⶂn;䋛ave耻ò䃲;槁Ābmⶈ෴ar;榵Ȁacitⶕ⶘ⶥⶨrò᪀Āir⶝ⶠr;榾oss;榻nå๒;槀ƀaeiⶱⶵⶹcr;䅍ga;䏉ƀcdnⷀⷅǍron;䎿;榶pf;쀀𝕠ƀaelⷔ⷗ǒr;榷rp;榹΀;adiosvⷪⷫⷮ⸈⸍⸐⸖戨rò᪆Ȁ;efmⷷⷸ⸂⸅橝rĀ;oⷾⷿ愴f»ⷿ耻ª䂪耻º䂺gof;抶r;橖lope;橗;橛ƀclo⸟⸡⸧ò⸁ash耻ø䃸l;折iŬⸯ⸴de耻õ䃵esĀ;aǛ⸺s;樶ml耻ö䃶bar;挽ૡ⹞\0⹽\0⺀⺝\0⺢⺹\0\0⻋ຜ\0⼓\0\0⼫⾼\0⿈rȀ;astЃ⹧⹲຅脀¶;l⹭⹮䂶leìЃɩ⹸\0\0⹻m;櫳;櫽y;䐿rʀcimpt⺋⺏⺓ᡥ⺗nt;䀥od;䀮il;怰enk;怱r;쀀𝔭ƀimo⺨⺰⺴Ā;v⺭⺮䏆;䏕maô੶ne;明ƀ;tv⺿⻀⻈䏀chfork»´;䏖Āau⻏⻟nĀck⻕⻝kĀ;h⇴⻛;愎ö⇴sҀ;abcdemst⻳⻴ᤈ⻹⻽⼄⼆⼊⼎䀫cir;樣ir;樢Āouᵀ⼂;樥;橲n肻±ຝim;樦wo;樧ƀipu⼙⼠⼥ntint;樕f;쀀𝕡nd耻£䂣Ԁ;Eaceinosu່⼿⽁⽄⽇⾁⾉⾒⽾⾶;檳p;檷uå໙Ā;c໎⽌̀;acens່⽙⽟⽦⽨⽾pproø⽃urlyeñ໙ñ໎ƀaes⽯⽶⽺pprox;檹qq;檵im;拨iíໟmeĀ;s⾈ຮ怲ƀEas⽸⾐⽺ð⽵ƀdfp໬⾙⾯ƀals⾠⾥⾪lar;挮ine;挒urf;挓Ā;t໻⾴ï໻rel;抰Āci⿀⿅r;쀀𝓅;䏈ncsp;怈̀fiopsu⿚⋢⿟⿥⿫⿱r;쀀𝔮pf;쀀𝕢rime;恗cr;쀀𝓆ƀaeo⿸〉〓tĀei⿾々rnionóڰnt;樖stĀ;e【】䀿ñἙô༔઀ABHabcdefhilmnoprstux぀けさすムㄎㄫㅇㅢㅲㆎ㈆㈕㈤㈩㉘㉮㉲㊐㊰㊷ƀartぇおがròႳòϝail;検aròᱥar;楤΀cdenqrtとふへみわゔヌĀeuねぱ;쀀∽̱te;䅕iãᅮmptyv;榳gȀ;del࿑らるろ;榒;榥å࿑uo耻»䂻rր;abcfhlpstw࿜ガクシスゼゾダッデナp;極Ā;f࿠ゴs;椠;椳s;椞ë≝ð✮l;楅im;楴l;憣;憝Āaiパフil;椚oĀ;nホボ戶aló༞ƀabrョリヮrò៥rk;杳ĀakンヽcĀekヹ・;䁽;䁝Āes㄂㄄;榌lĀduㄊㄌ;榎;榐Ȁaeuyㄗㄜㄧㄩron;䅙Ādiㄡㄥil;䅗ì࿲âヺ;䑀Ȁclqsㄴㄷㄽㅄa;椷dhar;楩uoĀ;rȎȍh;憳ƀacgㅎㅟངlȀ;ipsླྀㅘㅛႜnåႻarôྩt;断ƀilrㅩဣㅮsht;楽;쀀𝔯ĀaoㅷㆆrĀduㅽㅿ»ѻĀ;l႑ㆄ;楬Ā;vㆋㆌ䏁;䏱ƀgns㆕ㇹㇼht̀ahlrstㆤㆰ㇂㇘㇤㇮rrowĀ;t࿜ㆭaéトarpoonĀduㆻㆿowîㅾp»႒eftĀah㇊㇐rrowó࿪arpoonóՑightarrows;應quigarro÷ニhreetimes;拌g;䋚ingdotseñἲƀahm㈍㈐㈓rò࿪aòՑ;怏oustĀ;a㈞㈟掱che»㈟mid;櫮Ȁabpt㈲㈽㉀㉒Ānr㈷㈺g;柭r;懾rëဃƀafl㉇㉊㉎r;榆;쀀𝕣us;樮imes;樵Āap㉝㉧rĀ;g㉣㉤䀩t;榔olint;樒arò㇣Ȁachq㉻㊀Ⴜ㊅quo;怺r;쀀𝓇Ābu・㊊oĀ;rȔȓƀhir㊗㊛㊠reåㇸmes;拊iȀ;efl㊪ၙᠡ㊫方tri;槎luhar;楨;愞ൡ㋕㋛㋟㌬㌸㍱\0㍺㎤\0\0㏬㏰\0㐨㑈㑚㒭㒱㓊㓱\0㘖\0\0㘳cute;䅛quï➺Ԁ;Eaceinpsyᇭ㋳㋵㋿㌂㌋㌏㌟㌦㌩;檴ǰ㋺\0㋼;檸on;䅡uåᇾĀ;dᇳ㌇il;䅟rc;䅝ƀEas㌖㌘㌛;檶p;檺im;择olint;樓iíሄ;䑁otƀ;be㌴ᵇ㌵担;橦΀Aacmstx㍆㍊㍗㍛㍞㍣㍭rr;懘rĀhr㍐㍒ë∨Ā;oਸ਼਴t耻§䂧i;䀻war;椩mĀin㍩ðnuóñt;朶rĀ;o㍶⁕쀀𝔰Ȁacoy㎂㎆㎑㎠rp;景Āhy㎋㎏cy;䑉;䑈rtɭ㎙\0\0㎜iäᑤaraì⹯耻­䂭Āgm㎨㎴maƀ;fv㎱㎲㎲䏃;䏂Ѐ;deglnprካ㏅㏉㏎㏖㏞㏡㏦ot;橪Ā;q኱ኰĀ;E㏓㏔檞;檠Ā;E㏛㏜檝;檟e;扆lus;樤arr;楲aròᄽȀaeit㏸㐈㐏㐗Āls㏽㐄lsetmé㍪hp;樳parsl;槤Ādlᑣ㐔e;挣Ā;e㐜㐝檪Ā;s㐢㐣檬;쀀⪬︀ƀflp㐮㐳㑂tcy;䑌Ā;b㐸㐹䀯Ā;a㐾㐿槄r;挿f;쀀𝕤aĀdr㑍ЂesĀ;u㑔㑕晠it»㑕ƀcsu㑠㑹㒟Āau㑥㑯pĀ;sᆈ㑫;쀀⊓︀pĀ;sᆴ㑵;쀀⊔︀uĀbp㑿㒏ƀ;esᆗᆜ㒆etĀ;eᆗ㒍ñᆝƀ;esᆨᆭ㒖etĀ;eᆨ㒝ñᆮƀ;afᅻ㒦ְrť㒫ֱ»ᅼaròᅈȀcemt㒹㒾㓂㓅r;쀀𝓈tmîñiì㐕aræᆾĀar㓎㓕rĀ;f㓔ឿ昆Āan㓚㓭ightĀep㓣㓪psiloîỠhé⺯s»⡒ʀbcmnp㓻㕞ሉ㖋㖎Ҁ;Edemnprs㔎㔏㔑㔕㔞㔣㔬㔱㔶抂;櫅ot;檽Ā;dᇚ㔚ot;櫃ult;櫁ĀEe㔨㔪;櫋;把lus;檿arr;楹ƀeiu㔽㕒㕕tƀ;en㔎㕅㕋qĀ;qᇚ㔏eqĀ;q㔫㔨m;櫇Ābp㕚㕜;櫕;櫓c̀;acensᇭ㕬㕲㕹㕻㌦pproø㋺urlyeñᇾñᇳƀaes㖂㖈㌛pproø㌚qñ㌗g;晪ڀ123;Edehlmnps㖩㖬㖯ሜ㖲㖴㗀㗉㗕㗚㗟㗨㗭耻¹䂹耻²䂲耻³䂳;櫆Āos㖹㖼t;檾ub;櫘Ā;dሢ㗅ot;櫄sĀou㗏㗒l;柉b;櫗arr;楻ult;櫂ĀEe㗤㗦;櫌;抋lus;櫀ƀeiu㗴㘉㘌tƀ;enሜ㗼㘂qĀ;qሢ㖲eqĀ;q㗧㗤m;櫈Ābp㘑㘓;櫔;櫖ƀAan㘜㘠㘭rr;懙rĀhr㘦㘨ë∮Ā;oਫ਩war;椪lig耻ß䃟௡㙑㙝㙠ዎ㙳㙹\0㙾㛂\0\0\0\0\0㛛㜃\0㜉㝬\0\0\0㞇ɲ㙖\0\0㙛get;挖;䏄rë๟ƀaey㙦㙫㙰ron;䅥dil;䅣;䑂lrec;挕r;쀀𝔱Ȁeiko㚆㚝㚵㚼Dz㚋\0㚑eĀ4fኄኁaƀ;sv㚘㚙㚛䎸ym;䏑Ācn㚢㚲kĀas㚨㚮pproø዁im»ኬsðኞĀas㚺㚮ð዁rn耻þ䃾Ǭ̟㛆⋧es膀×;bd㛏㛐㛘䃗Ā;aᤏ㛕r;樱;樰ƀeps㛡㛣㜀á⩍Ȁ;bcf҆㛬㛰㛴ot;挶ir;櫱Ā;o㛹㛼쀀𝕥rk;櫚á㍢rime;怴ƀaip㜏㜒㝤dåቈ΀adempst㜡㝍㝀㝑㝗㝜㝟ngleʀ;dlqr㜰㜱㜶㝀㝂斵own»ᶻeftĀ;e⠀㜾ñम;扜ightĀ;e㊪㝋ñၚot;旬inus;樺lus;樹b;槍ime;樻ezium;揢ƀcht㝲㝽㞁Āry㝷㝻;쀀𝓉;䑆cy;䑛rok;䅧Āio㞋㞎xô᝷headĀlr㞗㞠eftarro÷ࡏightarrow»ཝऀAHabcdfghlmoprstuw㟐㟓㟗㟤㟰㟼㠎㠜㠣㠴㡑㡝㡫㢩㣌㣒㣪㣶ròϭar;楣Ācr㟜㟢ute耻ú䃺òᅐrǣ㟪\0㟭y;䑞ve;䅭Āiy㟵㟺rc耻û䃻;䑃ƀabh㠃㠆㠋ròᎭlac;䅱aòᏃĀir㠓㠘sht;楾;쀀𝔲rave耻ù䃹š㠧㠱rĀlr㠬㠮»ॗ»ႃlk;斀Āct㠹㡍ɯ㠿\0\0㡊rnĀ;e㡅㡆挜r»㡆op;挏ri;旸Āal㡖㡚cr;䅫肻¨͉Āgp㡢㡦on;䅳f;쀀𝕦̀adhlsuᅋ㡸㡽፲㢑㢠ownáᎳarpoonĀlr㢈㢌efô㠭ighô㠯iƀ;hl㢙㢚㢜䏅»ᏺon»㢚parrows;懈ƀcit㢰㣄㣈ɯ㢶\0\0㣁rnĀ;e㢼㢽挝r»㢽op;挎ng;䅯ri;旹cr;쀀𝓊ƀdir㣙㣝㣢ot;拰lde;䅩iĀ;f㜰㣨»᠓Āam㣯㣲rò㢨l耻ü䃼angle;榧ހABDacdeflnoprsz㤜㤟㤩㤭㦵㦸㦽㧟㧤㧨㧳㧹㧽㨁㨠ròϷarĀ;v㤦㤧櫨;櫩asèϡĀnr㤲㤷grt;榜΀eknprst㓣㥆㥋㥒㥝㥤㦖appá␕othinçẖƀhir㓫⻈㥙opô⾵Ā;hᎷ㥢ïㆍĀiu㥩㥭gmá㎳Ābp㥲㦄setneqĀ;q㥽㦀쀀⊊︀;쀀⫋︀setneqĀ;q㦏㦒쀀⊋︀;쀀⫌︀Āhr㦛㦟etá㚜iangleĀlr㦪㦯eft»थight»ၑy;䐲ash»ံƀelr㧄㧒㧗ƀ;beⷪ㧋㧏ar;抻q;扚lip;拮Ābt㧜ᑨaòᑩr;쀀𝔳tré㦮suĀbp㧯㧱»ജ»൙pf;쀀𝕧roð໻tré㦴Ācu㨆㨋r;쀀𝓋Ābp㨐㨘nĀEe㦀㨖»㥾nĀEe㦒㨞»㦐igzag;榚΀cefoprs㨶㨻㩖㩛㩔㩡㩪irc;䅵Ādi㩀㩑Ābg㩅㩉ar;機eĀ;qᗺ㩏;扙erp;愘r;쀀𝔴pf;쀀𝕨Ā;eᑹ㩦atèᑹcr;쀀𝓌ૣណ㪇\0㪋\0㪐㪛\0\0㪝㪨㪫㪯\0\0㫃㫎\0㫘ៜ៟tré៑r;쀀𝔵ĀAa㪔㪗ròσrò৶;䎾ĀAa㪡㪤ròθrò৫að✓is;拻ƀdptឤ㪵㪾Āfl㪺ឩ;쀀𝕩imåឲĀAa㫇㫊ròώròਁĀcq㫒ីr;쀀𝓍Āpt៖㫜ré។Ѐacefiosu㫰㫽㬈㬌㬑㬕㬛㬡cĀuy㫶㫻te耻ý䃽;䑏Āiy㬂㬆rc;䅷;䑋n耻¥䂥r;쀀𝔶cy;䑗pf;쀀𝕪cr;쀀𝓎Ācm㬦㬩y;䑎l耻ÿ䃿Ԁacdefhiosw㭂㭈㭔㭘㭤㭩㭭㭴㭺㮀cute;䅺Āay㭍㭒ron;䅾;䐷ot;䅼Āet㭝㭡træᕟa;䎶r;쀀𝔷cy;䐶grarr;懝pf;쀀𝕫cr;쀀𝓏Ājn㮅㮇;怍j;怌'
-    .split("")
-    .map((c$7) => c$7.charCodeAt(0)),
-);
+var decode_data_html_default = new Uint16Array("ᵁ<Õıʊҝջאٵ۞ޢߖࠏ੊ઑඡ๭༉༦჊ረዡᐕᒝᓃᓟᔥ\0\0\0\0\0\0ᕫᛍᦍᰒᷝ὾⁠↰⊍⏀⏻⑂⠤⤒ⴈ⹈⿎〖㊺㘹㞬㣾㨨㩱㫠㬮ࠀEMabcfglmnoprstu\\bfms„‹•˜¦³¹ÈÏlig耻Æ䃆P耻&䀦cute耻Á䃁reve;䄂Āiyx}rc耻Â䃂;䐐r;쀀𝔄rave耻À䃀pha;䎑acr;䄀d;橓Āgp¡on;䄄f;쀀𝔸plyFunction;恡ing耻Å䃅Ācs¾Ãr;쀀𝒜ign;扔ilde耻Ã䃃ml耻Ä䃄ЀaceforsuåûþėĜĢħĪĀcrêòkslash;或Ŷöø;櫧ed;挆y;䐑ƀcrtąċĔause;戵noullis;愬a;䎒r;쀀𝔅pf;쀀𝔹eve;䋘còēmpeq;扎܀HOacdefhilorsuōőŖƀƞƢƵƷƺǜȕɳɸɾcy;䐧PY耻©䂩ƀcpyŝŢźute;䄆Ā;iŧŨ拒talDifferentialD;慅leys;愭ȀaeioƉƎƔƘron;䄌dil耻Ç䃇rc;䄈nint;戰ot;䄊ĀdnƧƭilla;䂸terDot;䂷òſi;䎧rcleȀDMPTLJNjǑǖot;抙inus;抖lus;投imes;抗oĀcsǢǸkwiseContourIntegral;戲eCurlyĀDQȃȏoubleQuote;思uote;怙ȀlnpuȞȨɇɕonĀ;eȥȦ户;橴ƀgitȯȶȺruent;扡nt;戯ourIntegral;戮ĀfrɌɎ;愂oduct;成nterClockwiseContourIntegral;戳oss;樯cr;쀀𝒞pĀ;Cʄʅ拓ap;才րDJSZacefiosʠʬʰʴʸˋ˗ˡ˦̳ҍĀ;oŹʥtrahd;椑cy;䐂cy;䐅cy;䐏ƀgrsʿ˄ˇger;怡r;憡hv;櫤Āayː˕ron;䄎;䐔lĀ;t˝˞戇a;䎔r;쀀𝔇Āaf˫̧Ācm˰̢riticalȀADGT̖̜̀̆cute;䂴oŴ̋̍;䋙bleAcute;䋝rave;䁠ilde;䋜ond;拄ferentialD;慆Ѱ̽\0\0\0͔͂\0Ѕf;쀀𝔻ƀ;DE͈͉͍䂨ot;惜qual;扐blèCDLRUVͣͲ΂ϏϢϸontourIntegraìȹoɴ͹\0\0ͻ»͉nArrow;懓Āeo·ΤftƀARTΐΖΡrrow;懐ightArrow;懔eåˊngĀLRΫτeftĀARγιrrow;柸ightArrow;柺ightArrow;柹ightĀATϘϞrrow;懒ee;抨pɁϩ\0\0ϯrrow;懑ownArrow;懕erticalBar;戥ǹABLRTaВЪаўѿͼrrowƀ;BUНОТ憓ar;椓pArrow;懵reve;䌑eft˒к\0ц\0ѐightVector;楐eeVector;楞ectorĀ;Bљњ憽ar;楖ightǔѧ\0ѱeeVector;楟ectorĀ;BѺѻ懁ar;楗eeĀ;A҆҇护rrow;憧ĀctҒҗr;쀀𝒟rok;䄐ࠀNTacdfglmopqstuxҽӀӄӋӞӢӧӮӵԡԯԶՒ՝ՠեG;䅊H耻Ð䃐cute耻É䃉ƀaiyӒӗӜron;䄚rc耻Ê䃊;䐭ot;䄖r;쀀𝔈rave耻È䃈ement;戈ĀapӺӾcr;䄒tyɓԆ\0\0ԒmallSquare;旻erySmallSquare;斫ĀgpԦԪon;䄘f;쀀𝔼silon;䎕uĀaiԼՉlĀ;TՂՃ橵ilde;扂librium;懌Āci՗՚r;愰m;橳a;䎗ml耻Ë䃋Āipժկsts;戃onentialE;慇ʀcfiosօֈ֍ֲ׌y;䐤r;쀀𝔉lledɓ֗\0\0֣mallSquare;旼erySmallSquare;斪Ͱֺ\0ֿ\0\0ׄf;쀀𝔽All;戀riertrf;愱cò׋؀JTabcdfgorstר׬ׯ׺؀ؒؖ؛؝أ٬ٲcy;䐃耻>䀾mmaĀ;d׷׸䎓;䏜reve;䄞ƀeiy؇،ؐdil;䄢rc;䄜;䐓ot;䄠r;쀀𝔊;拙pf;쀀𝔾eater̀EFGLSTصلَٖٛ٦qualĀ;Lؾؿ扥ess;招ullEqual;执reater;檢ess;扷lantEqual;橾ilde;扳cr;쀀𝒢;扫ЀAacfiosuڅڋږڛڞڪھۊRDcy;䐪Āctڐڔek;䋇;䁞irc;䄤r;愌lbertSpace;愋ǰگ\0ڲf;愍izontalLine;攀Āctۃۅòکrok;䄦mpńېۘownHumðįqual;扏܀EJOacdfgmnostuۺ۾܃܇܎ܚܞܡܨ݄ݸދޏޕcy;䐕lig;䄲cy;䐁cute耻Í䃍Āiyܓܘrc耻Î䃎;䐘ot;䄰r;愑rave耻Ì䃌ƀ;apܠܯܿĀcgܴܷr;䄪inaryI;慈lieóϝǴ݉\0ݢĀ;eݍݎ戬Āgrݓݘral;戫section;拂isibleĀCTݬݲomma;恣imes;恢ƀgptݿރވon;䄮f;쀀𝕀a;䎙cr;愐ilde;䄨ǫޚ\0ޞcy;䐆l耻Ï䃏ʀcfosuެ޷޼߂ߐĀiyޱ޵rc;䄴;䐙r;쀀𝔍pf;쀀𝕁ǣ߇\0ߌr;쀀𝒥rcy;䐈kcy;䐄΀HJacfosߤߨ߽߬߱ࠂࠈcy;䐥cy;䐌ppa;䎚Āey߶߻dil;䄶;䐚r;쀀𝔎pf;쀀𝕂cr;쀀𝒦րJTaceflmostࠥࠩࠬࡐࡣ঳সে্਷ੇcy;䐉耻<䀼ʀcmnpr࠷࠼ࡁࡄࡍute;䄹bda;䎛g;柪lacetrf;愒r;憞ƀaeyࡗ࡜ࡡron;䄽dil;䄻;䐛Āfsࡨ॰tԀACDFRTUVarࡾࢩࢱࣦ࣠ࣼयज़ΐ४Ānrࢃ࢏gleBracket;柨rowƀ;BR࢙࢚࢞憐ar;懤ightArrow;懆eiling;挈oǵࢷ\0ࣃbleBracket;柦nǔࣈ\0࣒eeVector;楡ectorĀ;Bࣛࣜ懃ar;楙loor;挊ightĀAV࣯ࣵrrow;憔ector;楎Āerँगeƀ;AVउऊऐ抣rrow;憤ector;楚iangleƀ;BEतथऩ抲ar;槏qual;抴pƀDTVषूौownVector;楑eeVector;楠ectorĀ;Bॖॗ憿ar;楘ectorĀ;B॥०憼ar;楒ightáΜs̀EFGLSTॾঋকঝঢভqualGreater;拚ullEqual;扦reater;扶ess;檡lantEqual;橽ilde;扲r;쀀𝔏Ā;eঽা拘ftarrow;懚idot;䄿ƀnpw৔ਖਛgȀLRlr৞৷ਂਐeftĀAR০৬rrow;柵ightArrow;柷ightArrow;柶eftĀarγਊightáοightáϊf;쀀𝕃erĀLRਢਬeftArrow;憙ightArrow;憘ƀchtਾੀੂòࡌ;憰rok;䅁;扪Ѐacefiosuਗ਼੝੠੷੼અઋ઎p;椅y;䐜Ādl੥੯iumSpace;恟lintrf;愳r;쀀𝔐nusPlus;戓pf;쀀𝕄cò੶;䎜ҀJacefostuણધભીଔଙඑ඗ඞcy;䐊cute;䅃ƀaey઴હાron;䅇dil;䅅;䐝ƀgswે૰଎ativeƀMTV૓૟૨ediumSpace;怋hiĀcn૦૘ë૙eryThiî૙tedĀGL૸ଆreaterGreateòٳessLesóੈLine;䀊r;쀀𝔑ȀBnptଢନଷ଺reak;恠BreakingSpace;䂠f;愕ڀ;CDEGHLNPRSTV୕ୖ୪୼஡௫ఄ౞಄ದ೘ൡඅ櫬Āou୛୤ngruent;扢pCap;扭oubleVerticalBar;戦ƀlqxஃஊ஛ement;戉ualĀ;Tஒஓ扠ilde;쀀≂̸ists;戄reater΀;EFGLSTஶஷ஽௉௓௘௥扯qual;扱ullEqual;쀀≧̸reater;쀀≫̸ess;批lantEqual;쀀⩾̸ilde;扵umpń௲௽ownHump;쀀≎̸qual;쀀≏̸eĀfsఊధtTriangleƀ;BEచఛడ拪ar;쀀⧏̸qual;括s̀;EGLSTవశ఼ౄోౘ扮qual;扰reater;扸ess;쀀≪̸lantEqual;쀀⩽̸ilde;扴estedĀGL౨౹reaterGreater;쀀⪢̸essLess;쀀⪡̸recedesƀ;ESಒಓಛ技qual;쀀⪯̸lantEqual;拠ĀeiಫಹverseElement;戌ghtTriangleƀ;BEೋೌ೒拫ar;쀀⧐̸qual;拭ĀquೝഌuareSuĀbp೨೹setĀ;E೰ೳ쀀⊏̸qual;拢ersetĀ;Eഃആ쀀⊐̸qual;拣ƀbcpഓതൎsetĀ;Eഛഞ쀀⊂⃒qual;抈ceedsȀ;ESTലള഻െ抁qual;쀀⪰̸lantEqual;拡ilde;쀀≿̸ersetĀ;E൘൛쀀⊃⃒qual;抉ildeȀ;EFT൮൯൵ൿ扁qual;扄ullEqual;扇ilde;扉erticalBar;戤cr;쀀𝒩ilde耻Ñ䃑;䎝܀Eacdfgmoprstuvලෂ෉෕ෛ෠෧෼ขภยา฿ไlig;䅒cute耻Ó䃓Āiy෎ීrc耻Ô䃔;䐞blac;䅐r;쀀𝔒rave耻Ò䃒ƀaei෮ෲ෶cr;䅌ga;䎩cron;䎟pf;쀀𝕆enCurlyĀDQฎบoubleQuote;怜uote;怘;橔Āclวฬr;쀀𝒪ash耻Ø䃘iŬื฼de耻Õ䃕es;樷ml耻Ö䃖erĀBP๋๠Āar๐๓r;怾acĀek๚๜;揞et;掴arenthesis;揜Ҁacfhilors๿ງຊຏຒດຝະ໼rtialD;戂y;䐟r;쀀𝔓i;䎦;䎠usMinus;䂱Āipຢອncareplanåڝf;愙Ȁ;eio຺ູ໠໤檻cedesȀ;EST່້໏໚扺qual;檯lantEqual;扼ilde;找me;怳Ādp໩໮uct;戏ortionĀ;aȥ໹l;戝Āci༁༆r;쀀𝒫;䎨ȀUfos༑༖༛༟OT耻\"䀢r;쀀𝔔pf;愚cr;쀀𝒬؀BEacefhiorsu༾གྷཇའཱིྦྷྪྭ႖ႩႴႾarr;椐G耻®䂮ƀcnrཎནབute;䅔g;柫rĀ;tཛྷཝ憠l;椖ƀaeyཧཬཱron;䅘dil;䅖;䐠Ā;vླྀཹ愜erseĀEUྂྙĀlq྇ྎement;戋uilibrium;懋pEquilibrium;楯r»ཹo;䎡ghtЀACDFTUVa࿁࿫࿳ဢဨၛႇϘĀnr࿆࿒gleBracket;柩rowƀ;BL࿜࿝࿡憒ar;懥eftArrow;懄eiling;按oǵ࿹\0စbleBracket;柧nǔည\0နeeVector;楝ectorĀ;Bဝသ懂ar;楕loor;挋Āerိ၃eƀ;AVဵံြ抢rrow;憦ector;楛iangleƀ;BEၐၑၕ抳ar;槐qual;抵pƀDTVၣၮၸownVector;楏eeVector;楜ectorĀ;Bႂႃ憾ar;楔ectorĀ;B႑႒懀ar;楓Āpuႛ႞f;愝ndImplies;楰ightarrow;懛ĀchႹႼr;愛;憱leDelayed;槴ڀHOacfhimoqstuფჱჷჽᄙᄞᅑᅖᅡᅧᆵᆻᆿĀCcჩხHcy;䐩y;䐨FTcy;䐬cute;䅚ʀ;aeiyᄈᄉᄎᄓᄗ檼ron;䅠dil;䅞rc;䅜;䐡r;쀀𝔖ortȀDLRUᄪᄴᄾᅉownArrow»ОeftArrow»࢚ightArrow»࿝pArrow;憑gma;䎣allCircle;战pf;쀀𝕊ɲᅭ\0\0ᅰt;戚areȀ;ISUᅻᅼᆉᆯ斡ntersection;抓uĀbpᆏᆞsetĀ;Eᆗᆘ抏qual;抑ersetĀ;Eᆨᆩ抐qual;抒nion;抔cr;쀀𝒮ar;拆ȀbcmpᇈᇛሉላĀ;sᇍᇎ拐etĀ;Eᇍᇕqual;抆ĀchᇠህeedsȀ;ESTᇭᇮᇴᇿ扻qual;檰lantEqual;扽ilde;承Tháྌ;我ƀ;esሒሓሣ拑rsetĀ;Eሜም抃qual;抇et»ሓրHRSacfhiorsሾቄ቉ቕ቞ቱቶኟዂወዑORN耻Þ䃞ADE;愢ĀHc቎ቒcy;䐋y;䐦Ābuቚቜ;䀉;䎤ƀaeyብቪቯron;䅤dil;䅢;䐢r;쀀𝔗Āeiቻ኉Dzኀ\0ኇefore;戴a;䎘Ācn኎ኘkSpace;쀀  Space;怉ldeȀ;EFTካኬኲኼ戼qual;扃ullEqual;扅ilde;扈pf;쀀𝕋ipleDot;惛Āctዖዛr;쀀𝒯rok;䅦ૡዷጎጚጦ\0ጬጱ\0\0\0\0\0ጸጽ፷ᎅ\0᏿ᐄᐊᐐĀcrዻጁute耻Ú䃚rĀ;oጇገ憟cir;楉rǣጓ\0጖y;䐎ve;䅬Āiyጞጣrc耻Û䃛;䐣blac;䅰r;쀀𝔘rave耻Ù䃙acr;䅪Ādiፁ፩erĀBPፈ፝Āarፍፐr;䁟acĀekፗፙ;揟et;掵arenthesis;揝onĀ;P፰፱拃lus;抎Āgp፻፿on;䅲f;쀀𝕌ЀADETadps᎕ᎮᎸᏄϨᏒᏗᏳrrowƀ;BDᅐᎠᎤar;椒ownArrow;懅ownArrow;憕quilibrium;楮eeĀ;AᏋᏌ报rrow;憥ownáϳerĀLRᏞᏨeftArrow;憖ightArrow;憗iĀ;lᏹᏺ䏒on;䎥ing;䅮cr;쀀𝒰ilde;䅨ml耻Ü䃜ҀDbcdefosvᐧᐬᐰᐳᐾᒅᒊᒐᒖash;披ar;櫫y;䐒ashĀ;lᐻᐼ抩;櫦Āerᑃᑅ;拁ƀbtyᑌᑐᑺar;怖Ā;iᑏᑕcalȀBLSTᑡᑥᑪᑴar;戣ine;䁼eparator;杘ilde;所ThinSpace;怊r;쀀𝔙pf;쀀𝕍cr;쀀𝒱dash;抪ʀcefosᒧᒬᒱᒶᒼirc;䅴dge;拀r;쀀𝔚pf;쀀𝕎cr;쀀𝒲Ȁfiosᓋᓐᓒᓘr;쀀𝔛;䎞pf;쀀𝕏cr;쀀𝒳ҀAIUacfosuᓱᓵᓹᓽᔄᔏᔔᔚᔠcy;䐯cy;䐇cy;䐮cute耻Ý䃝Āiyᔉᔍrc;䅶;䐫r;쀀𝔜pf;쀀𝕐cr;쀀𝒴ml;䅸ЀHacdefosᔵᔹᔿᕋᕏᕝᕠᕤcy;䐖cute;䅹Āayᕄᕉron;䅽;䐗ot;䅻Dzᕔ\0ᕛoWidtè૙a;䎖r;愨pf;愤cr;쀀𝒵௡ᖃᖊᖐ\0ᖰᖶᖿ\0\0\0\0ᗆᗛᗫᙟ᙭\0ᚕ᚛ᚲᚹ\0ᚾcute耻á䃡reve;䄃̀;Ediuyᖜᖝᖡᖣᖨᖭ戾;쀀∾̳;房rc耻â䃢te肻´̆;䐰lig耻æ䃦Ā;r²ᖺ;쀀𝔞rave耻à䃠ĀepᗊᗖĀfpᗏᗔsym;愵èᗓha;䎱ĀapᗟcĀclᗤᗧr;䄁g;樿ɤᗰ\0\0ᘊʀ;adsvᗺᗻᗿᘁᘇ戧nd;橕;橜lope;橘;橚΀;elmrszᘘᘙᘛᘞᘿᙏᙙ戠;榤e»ᘙsdĀ;aᘥᘦ戡ѡᘰᘲᘴᘶᘸᘺᘼᘾ;榨;榩;榪;榫;榬;榭;榮;榯tĀ;vᙅᙆ戟bĀ;dᙌᙍ抾;榝Āptᙔᙗh;戢»¹arr;捼Āgpᙣᙧon;䄅f;쀀𝕒΀;Eaeiop዁ᙻᙽᚂᚄᚇᚊ;橰cir;橯;扊d;手s;䀧roxĀ;e዁ᚒñᚃing耻å䃥ƀctyᚡᚦᚨr;쀀𝒶;䀪mpĀ;e዁ᚯñʈilde耻ã䃣ml耻ä䃤Āciᛂᛈoninôɲnt;樑ࠀNabcdefiklnoprsu᛭ᛱᜰ᜼ᝃᝈ᝸᝽០៦ᠹᡐᜍ᤽᥈ᥰot;櫭Ācrᛶ᜞kȀcepsᜀᜅᜍᜓong;扌psilon;䏶rime;怵imĀ;e᜚᜛戽q;拍Ŷᜢᜦee;抽edĀ;gᜬᜭ挅e»ᜭrkĀ;t፜᜷brk;掶Āoyᜁᝁ;䐱quo;怞ʀcmprtᝓ᝛ᝡᝤᝨausĀ;eĊĉptyv;榰séᜌnoõēƀahwᝯ᝱ᝳ;䎲;愶een;扬r;쀀𝔟g΀costuvwឍឝឳេ៕៛៞ƀaiuបពរðݠrc;旯p»፱ƀdptឤឨឭot;樀lus;樁imes;樂ɱឹ\0\0ើcup;樆ar;昅riangleĀdu៍្own;施p;斳plus;樄eåᑄåᒭarow;植ƀako៭ᠦᠵĀcn៲ᠣkƀlst៺֫᠂ozenge;槫riangleȀ;dlr᠒᠓᠘᠝斴own;斾eft;旂ight;斸k;搣Ʊᠫ\0ᠳƲᠯ\0ᠱ;斒;斑4;斓ck;斈ĀeoᠾᡍĀ;qᡃᡆ쀀=⃥uiv;쀀≡⃥t;挐Ȁptwxᡙᡞᡧᡬf;쀀𝕓Ā;tᏋᡣom»Ꮜtie;拈؀DHUVbdhmptuvᢅᢖᢪᢻᣗᣛᣬ᣿ᤅᤊᤐᤡȀLRlrᢎᢐᢒᢔ;敗;敔;敖;敓ʀ;DUduᢡᢢᢤᢦᢨ敐;敦;敩;敤;敧ȀLRlrᢳᢵᢷᢹ;敝;敚;敜;教΀;HLRhlrᣊᣋᣍᣏᣑᣓᣕ救;敬;散;敠;敫;敢;敟ox;槉ȀLRlrᣤᣦᣨᣪ;敕;敒;攐;攌ʀ;DUduڽ᣷᣹᣻᣽;敥;敨;攬;攴inus;抟lus;択imes;抠ȀLRlrᤙᤛᤝ᤟;敛;敘;攘;攔΀;HLRhlrᤰᤱᤳᤵᤷ᤻᤹攂;敪;敡;敞;攼;攤;攜Āevģ᥂bar耻¦䂦Ȁceioᥑᥖᥚᥠr;쀀𝒷mi;恏mĀ;e᜚᜜lƀ;bhᥨᥩᥫ䁜;槅sub;柈Ŭᥴ᥾lĀ;e᥹᥺怢t»᥺pƀ;Eeįᦅᦇ;檮Ā;qۜۛೡᦧ\0᧨ᨑᨕᨲ\0ᨷᩐ\0\0᪴\0\0᫁\0\0ᬡᬮ᭍᭒\0᯽\0ᰌƀcpr᦭ᦲ᧝ute;䄇̀;abcdsᦿᧀᧄ᧊᧕᧙戩nd;橄rcup;橉Āau᧏᧒p;橋p;橇ot;橀;쀀∩︀Āeo᧢᧥t;恁îړȀaeiu᧰᧻ᨁᨅǰ᧵\0᧸s;橍on;䄍dil耻ç䃧rc;䄉psĀ;sᨌᨍ橌m;橐ot;䄋ƀdmnᨛᨠᨦil肻¸ƭptyv;榲t脀¢;eᨭᨮ䂢räƲr;쀀𝔠ƀceiᨽᩀᩍy;䑇ckĀ;mᩇᩈ朓ark»ᩈ;䏇r΀;Ecefms᩟᩠ᩢᩫ᪤᪪᪮旋;槃ƀ;elᩩᩪᩭ䋆q;扗eɡᩴ\0\0᪈rrowĀlr᩼᪁eft;憺ight;憻ʀRSacd᪒᪔᪖᪚᪟»ཇ;擈st;抛irc;抚ash;抝nint;樐id;櫯cir;槂ubsĀ;u᪻᪼晣it»᪼ˬ᫇᫔᫺\0ᬊonĀ;eᫍᫎ䀺Ā;qÇÆɭ᫙\0\0᫢aĀ;t᫞᫟䀬;䁀ƀ;fl᫨᫩᫫戁îᅠeĀmx᫱᫶ent»᫩eóɍǧ᫾\0ᬇĀ;dኻᬂot;橭nôɆƀfryᬐᬔᬗ;쀀𝕔oäɔ脀©;sŕᬝr;愗Āaoᬥᬩrr;憵ss;朗Ācuᬲᬷr;쀀𝒸Ābpᬼ᭄Ā;eᭁᭂ櫏;櫑Ā;eᭉᭊ櫐;櫒dot;拯΀delprvw᭠᭬᭷ᮂᮬᯔ᯹arrĀlr᭨᭪;椸;椵ɰ᭲\0\0᭵r;拞c;拟arrĀ;p᭿ᮀ憶;椽̀;bcdosᮏᮐᮖᮡᮥᮨ截rcap;橈Āauᮛᮞp;橆p;橊ot;抍r;橅;쀀∪︀Ȁalrv᮵ᮿᯞᯣrrĀ;mᮼᮽ憷;椼yƀevwᯇᯔᯘqɰᯎ\0\0ᯒreã᭳uã᭵ee;拎edge;拏en耻¤䂤earrowĀlrᯮ᯳eft»ᮀight»ᮽeäᯝĀciᰁᰇoninôǷnt;戱lcty;挭ঀAHabcdefhijlorstuwz᰸᰻᰿ᱝᱩᱵᲊᲞᲬᲷ᳻᳿ᴍᵻᶑᶫᶻ᷆᷍rò΁ar;楥Ȁglrs᱈ᱍ᱒᱔ger;怠eth;愸òᄳhĀ;vᱚᱛ怐»ऊūᱡᱧarow;椏aã̕Āayᱮᱳron;䄏;䐴ƀ;ao̲ᱼᲄĀgrʿᲁr;懊tseq;橷ƀglmᲑᲔᲘ耻°䂰ta;䎴ptyv;榱ĀirᲣᲨsht;楿;쀀𝔡arĀlrᲳᲵ»ࣜ»သʀaegsv᳂͸᳖᳜᳠mƀ;oș᳊᳔ndĀ;ș᳑uit;晦amma;䏝in;拲ƀ;io᳧᳨᳸䃷de脀÷;o᳧ᳰntimes;拇nø᳷cy;䑒cɯᴆ\0\0ᴊrn;挞op;挍ʀlptuwᴘᴝᴢᵉᵕlar;䀤f;쀀𝕕ʀ;emps̋ᴭᴷᴽᵂqĀ;d͒ᴳot;扑inus;戸lus;戔quare;抡blebarwedgåúnƀadhᄮᵝᵧownarrowóᲃarpoonĀlrᵲᵶefôᲴighôᲶŢᵿᶅkaro÷གɯᶊ\0\0ᶎrn;挟op;挌ƀcotᶘᶣᶦĀryᶝᶡ;쀀𝒹;䑕l;槶rok;䄑Ādrᶰᶴot;拱iĀ;fᶺ᠖斿Āah᷀᷃ròЩaòྦangle;榦Āci᷒ᷕy;䑟grarr;柿ऀDacdefglmnopqrstuxḁḉḙḸոḼṉṡṾấắẽỡἪἷὄ὎὚ĀDoḆᴴoôᲉĀcsḎḔute耻é䃩ter;橮ȀaioyḢḧḱḶron;䄛rĀ;cḭḮ扖耻ê䃪lon;払;䑍ot;䄗ĀDrṁṅot;扒;쀀𝔢ƀ;rsṐṑṗ檚ave耻è䃨Ā;dṜṝ檖ot;檘Ȁ;ilsṪṫṲṴ檙nters;揧;愓Ā;dṹṺ檕ot;檗ƀapsẅẉẗcr;䄓tyƀ;svẒẓẕ戅et»ẓpĀ1;ẝẤijạả;怄;怅怃ĀgsẪẬ;䅋p;怂ĀgpẴẸon;䄙f;쀀𝕖ƀalsỄỎỒrĀ;sỊị拕l;槣us;橱iƀ;lvỚớở䎵on»ớ;䏵ȀcsuvỪỳἋἣĀioữḱrc»Ḯɩỹ\0\0ỻíՈantĀglἂἆtr»ṝess»Ṻƀaeiἒ἖Ἒls;䀽st;扟vĀ;DȵἠD;橸parsl;槥ĀDaἯἳot;打rr;楱ƀcdiἾὁỸr;愯oô͒ĀahὉὋ;䎷耻ð䃰Āmrὓὗl耻ë䃫o;悬ƀcipὡὤὧl;䀡sôծĀeoὬὴctatioîՙnentialåչৡᾒ\0ᾞ\0ᾡᾧ\0\0ῆῌ\0ΐ\0ῦῪ \0 ⁚llingdotseñṄy;䑄male;晀ƀilrᾭᾳ῁lig;耀ffiɩᾹ\0\0᾽g;耀ffig;耀ffl;쀀𝔣lig;耀filig;쀀fjƀaltῙ῜ῡt;晭ig;耀flns;斱of;䆒ǰ΅\0ῳf;쀀𝕗ĀakֿῷĀ;vῼ´拔;櫙artint;樍Āao‌⁕Ācs‑⁒ႉ‸⁅⁈\0⁐β•‥‧‪‬\0‮耻½䂽;慓耻¼䂼;慕;慙;慛Ƴ‴\0‶;慔;慖ʴ‾⁁\0\0⁃耻¾䂾;慗;慜5;慘ƶ⁌\0⁎;慚;慝8;慞l;恄wn;挢cr;쀀𝒻ࢀEabcdefgijlnorstv₂₉₟₥₰₴⃰⃵⃺⃿℃ℒℸ̗ℾ⅒↞Ā;lٍ₇;檌ƀcmpₐₕ₝ute;䇵maĀ;dₜ᳚䎳;檆reve;䄟Āiy₪₮rc;䄝;䐳ot;䄡Ȁ;lqsؾق₽⃉ƀ;qsؾٌ⃄lanô٥Ȁ;cdl٥⃒⃥⃕c;檩otĀ;o⃜⃝檀Ā;l⃢⃣檂;檄Ā;e⃪⃭쀀⋛︀s;檔r;쀀𝔤Ā;gٳ؛mel;愷cy;䑓Ȁ;Eajٚℌℎℐ;檒;檥;檤ȀEaesℛℝ℩ℴ;扩pĀ;p℣ℤ檊rox»ℤĀ;q℮ℯ檈Ā;q℮ℛim;拧pf;쀀𝕘Āci⅃ⅆr;愊mƀ;el٫ⅎ⅐;檎;檐茀>;cdlqr׮ⅠⅪⅮⅳⅹĀciⅥⅧ;檧r;橺ot;拗Par;榕uest;橼ʀadelsↄⅪ←ٖ↛ǰ↉\0↎proø₞r;楸qĀlqؿ↖lesó₈ií٫Āen↣↭rtneqq;쀀≩︀Å↪ԀAabcefkosy⇄⇇⇱⇵⇺∘∝∯≨≽ròΠȀilmr⇐⇔⇗⇛rsðᒄf»․ilôکĀdr⇠⇤cy;䑊ƀ;cwࣴ⇫⇯ir;楈;憭ar;意irc;䄥ƀalr∁∎∓rtsĀ;u∉∊晥it»∊lip;怦con;抹r;쀀𝔥sĀew∣∩arow;椥arow;椦ʀamopr∺∾≃≞≣rr;懿tht;戻kĀlr≉≓eftarrow;憩ightarrow;憪f;쀀𝕙bar;怕ƀclt≯≴≸r;쀀𝒽asè⇴rok;䄧Ābp⊂⊇ull;恃hen»ᱛૡ⊣\0⊪\0⊸⋅⋎\0⋕⋳\0\0⋸⌢⍧⍢⍿\0⎆⎪⎴cute耻í䃭ƀ;iyݱ⊰⊵rc耻î䃮;䐸Ācx⊼⊿y;䐵cl耻¡䂡ĀfrΟ⋉;쀀𝔦rave耻ì䃬Ȁ;inoܾ⋝⋩⋮Āin⋢⋦nt;樌t;戭fin;槜ta;愩lig;䄳ƀaop⋾⌚⌝ƀcgt⌅⌈⌗r;䄫ƀelpܟ⌏⌓inåގarôܠh;䄱f;抷ed;䆵ʀ;cfotӴ⌬⌱⌽⍁are;愅inĀ;t⌸⌹戞ie;槝doô⌙ʀ;celpݗ⍌⍐⍛⍡al;抺Āgr⍕⍙eróᕣã⍍arhk;樗rod;樼Ȁcgpt⍯⍲⍶⍻y;䑑on;䄯f;쀀𝕚a;䎹uest耻¿䂿Āci⎊⎏r;쀀𝒾nʀ;EdsvӴ⎛⎝⎡ӳ;拹ot;拵Ā;v⎦⎧拴;拳Ā;iݷ⎮lde;䄩ǫ⎸\0⎼cy;䑖l耻ï䃯̀cfmosu⏌⏗⏜⏡⏧⏵Āiy⏑⏕rc;䄵;䐹r;쀀𝔧ath;䈷pf;쀀𝕛ǣ⏬\0⏱r;쀀𝒿rcy;䑘kcy;䑔Ѐacfghjos␋␖␢␧␭␱␵␻ppaĀ;v␓␔䎺;䏰Āey␛␠dil;䄷;䐺r;쀀𝔨reen;䄸cy;䑅cy;䑜pf;쀀𝕜cr;쀀𝓀஀ABEHabcdefghjlmnoprstuv⑰⒁⒆⒍⒑┎┽╚▀♎♞♥♹♽⚚⚲⛘❝❨➋⟀⠁⠒ƀart⑷⑺⑼rò৆òΕail;椛arr;椎Ā;gঔ⒋;檋ar;楢ॣ⒥\0⒪\0⒱\0\0\0\0\0⒵Ⓔ\0ⓆⓈⓍ\0⓹ute;䄺mptyv;榴raîࡌbda;䎻gƀ;dlࢎⓁⓃ;榑åࢎ;檅uo耻«䂫rЀ;bfhlpst࢙ⓞⓦⓩ⓫⓮⓱⓵Ā;f࢝ⓣs;椟s;椝ë≒p;憫l;椹im;楳l;憢ƀ;ae⓿─┄檫il;椙Ā;s┉┊檭;쀀⪭︀ƀabr┕┙┝rr;椌rk;杲Āak┢┬cĀek┨┪;䁻;䁛Āes┱┳;榋lĀdu┹┻;榏;榍Ȁaeuy╆╋╖╘ron;䄾Ādi═╔il;䄼ìࢰâ┩;䐻Ȁcqrs╣╦╭╽a;椶uoĀ;rนᝆĀdu╲╷har;楧shar;楋h;憲ʀ;fgqs▋▌উ◳◿扤tʀahlrt▘▤▷◂◨rrowĀ;t࢙□aé⓶arpoonĀdu▯▴own»њp»०eftarrows;懇ightƀahs◍◖◞rrowĀ;sࣴࢧarpoonó྘quigarro÷⇰hreetimes;拋ƀ;qs▋ও◺lanôবʀ;cdgsব☊☍☝☨c;檨otĀ;o☔☕橿Ā;r☚☛檁;檃Ā;e☢☥쀀⋚︀s;檓ʀadegs☳☹☽♉♋pproøⓆot;拖qĀgq♃♅ôউgtò⒌ôছiíলƀilr♕࣡♚sht;楼;쀀𝔩Ā;Eজ♣;檑š♩♶rĀdu▲♮Ā;l॥♳;楪lk;斄cy;䑙ʀ;achtੈ⚈⚋⚑⚖rò◁orneòᴈard;楫ri;旺Āio⚟⚤dot;䅀ustĀ;a⚬⚭掰che»⚭ȀEaes⚻⚽⛉⛔;扨pĀ;p⛃⛄檉rox»⛄Ā;q⛎⛏檇Ā;q⛎⚻im;拦Ѐabnoptwz⛩⛴⛷✚✯❁❇❐Ānr⛮⛱g;柬r;懽rëࣁgƀlmr⛿✍✔eftĀar০✇ightá৲apsto;柼ightá৽parrowĀlr✥✩efô⓭ight;憬ƀafl✶✹✽r;榅;쀀𝕝us;樭imes;樴š❋❏st;戗áፎƀ;ef❗❘᠀旊nge»❘arĀ;l❤❥䀨t;榓ʀachmt❳❶❼➅➇ròࢨorneòᶌarĀ;d྘➃;業;怎ri;抿̀achiqt➘➝ੀ➢➮➻quo;怹r;쀀𝓁mƀ;egল➪➬;檍;檏Ābu┪➳oĀ;rฟ➹;怚rok;䅂萀<;cdhilqrࠫ⟒☹⟜⟠⟥⟪⟰Āci⟗⟙;檦r;橹reå◲mes;拉arr;楶uest;橻ĀPi⟵⟹ar;榖ƀ;ef⠀भ᠛旃rĀdu⠇⠍shar;楊har;楦Āen⠗⠡rtneqq;쀀≨︀Å⠞܀Dacdefhilnopsu⡀⡅⢂⢎⢓⢠⢥⢨⣚⣢⣤ઃ⣳⤂Dot;戺Ȁclpr⡎⡒⡣⡽r耻¯䂯Āet⡗⡙;時Ā;e⡞⡟朠se»⡟Ā;sျ⡨toȀ;dluျ⡳⡷⡻owîҌefôएðᏑker;斮Āoy⢇⢌mma;権;䐼ash;怔asuredangle»ᘦr;쀀𝔪o;愧ƀcdn⢯⢴⣉ro耻µ䂵Ȁ;acdᑤ⢽⣀⣄sôᚧir;櫰ot肻·Ƶusƀ;bd⣒ᤃ⣓戒Ā;uᴼ⣘;横ţ⣞⣡p;櫛ò−ðઁĀdp⣩⣮els;抧f;쀀𝕞Āct⣸⣽r;쀀𝓂pos»ᖝƀ;lm⤉⤊⤍䎼timap;抸ఀGLRVabcdefghijlmoprstuvw⥂⥓⥾⦉⦘⧚⧩⨕⨚⩘⩝⪃⪕⪤⪨⬄⬇⭄⭿⮮ⰴⱧⱼ⳩Āgt⥇⥋;쀀⋙̸Ā;v⥐௏쀀≫⃒ƀelt⥚⥲⥶ftĀar⥡⥧rrow;懍ightarrow;懎;쀀⋘̸Ā;v⥻ే쀀≪⃒ightarrow;懏ĀDd⦎⦓ash;抯ash;抮ʀbcnpt⦣⦧⦬⦱⧌la»˞ute;䅄g;쀀∠⃒ʀ;Eiop඄⦼⧀⧅⧈;쀀⩰̸d;쀀≋̸s;䅉roø඄urĀ;a⧓⧔普lĀ;s⧓ସdz⧟\0⧣p肻\xA0ଷmpĀ;e௹ఀʀaeouy⧴⧾⨃⨐⨓ǰ⧹\0⧻;橃on;䅈dil;䅆ngĀ;dൾ⨊ot;쀀⩭̸p;橂;䐽ash;怓΀;Aadqsxஒ⨩⨭⨻⩁⩅⩐rr;懗rĀhr⨳⨶k;椤Ā;oᏲᏰot;쀀≐̸uiöୣĀei⩊⩎ar;椨í஘istĀ;s஠டr;쀀𝔫ȀEest௅⩦⩹⩼ƀ;qs஼⩭௡ƀ;qs஼௅⩴lanô௢ií௪Ā;rஶ⪁»ஷƀAap⪊⪍⪑rò⥱rr;憮ar;櫲ƀ;svྍ⪜ྌĀ;d⪡⪢拼;拺cy;䑚΀AEadest⪷⪺⪾⫂⫅⫶⫹rò⥦;쀀≦̸rr;憚r;急Ȁ;fqs఻⫎⫣⫯tĀar⫔⫙rro÷⫁ightarro÷⪐ƀ;qs఻⪺⫪lanôౕĀ;sౕ⫴»శiíౝĀ;rవ⫾iĀ;eచథiäඐĀpt⬌⬑f;쀀𝕟膀¬;in⬙⬚⬶䂬nȀ;Edvஉ⬤⬨⬮;쀀⋹̸ot;쀀⋵̸ǡஉ⬳⬵;拷;拶iĀ;vಸ⬼ǡಸ⭁⭃;拾;拽ƀaor⭋⭣⭩rȀ;ast୻⭕⭚⭟lleì୻l;쀀⫽⃥;쀀∂̸lint;樔ƀ;ceಒ⭰⭳uåಥĀ;cಘ⭸Ā;eಒ⭽ñಘȀAait⮈⮋⮝⮧rò⦈rrƀ;cw⮔⮕⮙憛;쀀⤳̸;쀀↝̸ghtarrow»⮕riĀ;eೋೖ΀chimpqu⮽⯍⯙⬄୸⯤⯯Ȁ;cerല⯆ഷ⯉uå൅;쀀𝓃ortɭ⬅\0\0⯖ará⭖mĀ;e൮⯟Ā;q൴൳suĀbp⯫⯭å೸åഋƀbcp⯶ⰑⰙȀ;Ees⯿ⰀഢⰄ抄;쀀⫅̸etĀ;eഛⰋqĀ;qണⰀcĀ;eലⰗñസȀ;EesⰢⰣൟⰧ抅;쀀⫆̸etĀ;e൘ⰮqĀ;qൠⰣȀgilrⰽⰿⱅⱇìௗlde耻ñ䃱çృiangleĀlrⱒⱜeftĀ;eచⱚñదightĀ;eೋⱥñ೗Ā;mⱬⱭ䎽ƀ;esⱴⱵⱹ䀣ro;愖p;怇ҀDHadgilrsⲏⲔⲙⲞⲣⲰⲶⳓⳣash;抭arr;椄p;쀀≍⃒ash;抬ĀetⲨⲬ;쀀≥⃒;쀀>⃒nfin;槞ƀAetⲽⳁⳅrr;椂;쀀≤⃒Ā;rⳊⳍ쀀<⃒ie;쀀⊴⃒ĀAtⳘⳜrr;椃rie;쀀⊵⃒im;쀀∼⃒ƀAan⳰⳴ⴂrr;懖rĀhr⳺⳽k;椣Ā;oᏧᏥear;椧ቓ᪕\0\0\0\0\0\0\0\0\0\0\0\0\0ⴭ\0ⴸⵈⵠⵥ⵲ⶄᬇ\0\0ⶍⶫ\0ⷈⷎ\0ⷜ⸙⸫⸾⹃Ācsⴱ᪗ute耻ó䃳ĀiyⴼⵅrĀ;c᪞ⵂ耻ô䃴;䐾ʀabios᪠ⵒⵗLjⵚlac;䅑v;樸old;榼lig;䅓Ācr⵩⵭ir;榿;쀀𝔬ͯ⵹\0\0⵼\0ⶂn;䋛ave耻ò䃲;槁Ābmⶈ෴ar;榵Ȁacitⶕ⶘ⶥⶨrò᪀Āir⶝ⶠr;榾oss;榻nå๒;槀ƀaeiⶱⶵⶹcr;䅍ga;䏉ƀcdnⷀⷅǍron;䎿;榶pf;쀀𝕠ƀaelⷔ⷗ǒr;榷rp;榹΀;adiosvⷪⷫⷮ⸈⸍⸐⸖戨rò᪆Ȁ;efmⷷⷸ⸂⸅橝rĀ;oⷾⷿ愴f»ⷿ耻ª䂪耻º䂺gof;抶r;橖lope;橗;橛ƀclo⸟⸡⸧ò⸁ash耻ø䃸l;折iŬⸯ⸴de耻õ䃵esĀ;aǛ⸺s;樶ml耻ö䃶bar;挽ૡ⹞\0⹽\0⺀⺝\0⺢⺹\0\0⻋ຜ\0⼓\0\0⼫⾼\0⿈rȀ;astЃ⹧⹲຅脀¶;l⹭⹮䂶leìЃɩ⹸\0\0⹻m;櫳;櫽y;䐿rʀcimpt⺋⺏⺓ᡥ⺗nt;䀥od;䀮il;怰enk;怱r;쀀𝔭ƀimo⺨⺰⺴Ā;v⺭⺮䏆;䏕maô੶ne;明ƀ;tv⺿⻀⻈䏀chfork»´;䏖Āau⻏⻟nĀck⻕⻝kĀ;h⇴⻛;愎ö⇴sҀ;abcdemst⻳⻴ᤈ⻹⻽⼄⼆⼊⼎䀫cir;樣ir;樢Āouᵀ⼂;樥;橲n肻±ຝim;樦wo;樧ƀipu⼙⼠⼥ntint;樕f;쀀𝕡nd耻£䂣Ԁ;Eaceinosu່⼿⽁⽄⽇⾁⾉⾒⽾⾶;檳p;檷uå໙Ā;c໎⽌̀;acens່⽙⽟⽦⽨⽾pproø⽃urlyeñ໙ñ໎ƀaes⽯⽶⽺pprox;檹qq;檵im;拨iíໟmeĀ;s⾈ຮ怲ƀEas⽸⾐⽺ð⽵ƀdfp໬⾙⾯ƀals⾠⾥⾪lar;挮ine;挒urf;挓Ā;t໻⾴ï໻rel;抰Āci⿀⿅r;쀀𝓅;䏈ncsp;怈̀fiopsu⿚⋢⿟⿥⿫⿱r;쀀𝔮pf;쀀𝕢rime;恗cr;쀀𝓆ƀaeo⿸〉〓tĀei⿾々rnionóڰnt;樖stĀ;e【】䀿ñἙô༔઀ABHabcdefhilmnoprstux぀けさすムㄎㄫㅇㅢㅲㆎ㈆㈕㈤㈩㉘㉮㉲㊐㊰㊷ƀartぇおがròႳòϝail;検aròᱥar;楤΀cdenqrtとふへみわゔヌĀeuねぱ;쀀∽̱te;䅕iãᅮmptyv;榳gȀ;del࿑らるろ;榒;榥å࿑uo耻»䂻rր;abcfhlpstw࿜ガクシスゼゾダッデナp;極Ā;f࿠ゴs;椠;椳s;椞ë≝ð✮l;楅im;楴l;憣;憝Āaiパフil;椚oĀ;nホボ戶aló༞ƀabrョリヮrò៥rk;杳ĀakンヽcĀekヹ・;䁽;䁝Āes㄂㄄;榌lĀduㄊㄌ;榎;榐Ȁaeuyㄗㄜㄧㄩron;䅙Ādiㄡㄥil;䅗ì࿲âヺ;䑀Ȁclqsㄴㄷㄽㅄa;椷dhar;楩uoĀ;rȎȍh;憳ƀacgㅎㅟངlȀ;ipsླྀㅘㅛႜnåႻarôྩt;断ƀilrㅩဣㅮsht;楽;쀀𝔯ĀaoㅷㆆrĀduㅽㅿ»ѻĀ;l႑ㆄ;楬Ā;vㆋㆌ䏁;䏱ƀgns㆕ㇹㇼht̀ahlrstㆤㆰ㇂㇘㇤㇮rrowĀ;t࿜ㆭaéトarpoonĀduㆻㆿowîㅾp»႒eftĀah㇊㇐rrowó࿪arpoonóՑightarrows;應quigarro÷ニhreetimes;拌g;䋚ingdotseñἲƀahm㈍㈐㈓rò࿪aòՑ;怏oustĀ;a㈞㈟掱che»㈟mid;櫮Ȁabpt㈲㈽㉀㉒Ānr㈷㈺g;柭r;懾rëဃƀafl㉇㉊㉎r;榆;쀀𝕣us;樮imes;樵Āap㉝㉧rĀ;g㉣㉤䀩t;榔olint;樒arò㇣Ȁachq㉻㊀Ⴜ㊅quo;怺r;쀀𝓇Ābu・㊊oĀ;rȔȓƀhir㊗㊛㊠reåㇸmes;拊iȀ;efl㊪ၙᠡ㊫方tri;槎luhar;楨;愞ൡ㋕㋛㋟㌬㌸㍱\0㍺㎤\0\0㏬㏰\0㐨㑈㑚㒭㒱㓊㓱\0㘖\0\0㘳cute;䅛quï➺Ԁ;Eaceinpsyᇭ㋳㋵㋿㌂㌋㌏㌟㌦㌩;檴ǰ㋺\0㋼;檸on;䅡uåᇾĀ;dᇳ㌇il;䅟rc;䅝ƀEas㌖㌘㌛;檶p;檺im;择olint;樓iíሄ;䑁otƀ;be㌴ᵇ㌵担;橦΀Aacmstx㍆㍊㍗㍛㍞㍣㍭rr;懘rĀhr㍐㍒ë∨Ā;oਸ਼਴t耻§䂧i;䀻war;椩mĀin㍩ðnuóñt;朶rĀ;o㍶⁕쀀𝔰Ȁacoy㎂㎆㎑㎠rp;景Āhy㎋㎏cy;䑉;䑈rtɭ㎙\0\0㎜iäᑤaraì⹯耻­䂭Āgm㎨㎴maƀ;fv㎱㎲㎲䏃;䏂Ѐ;deglnprካ㏅㏉㏎㏖㏞㏡㏦ot;橪Ā;q኱ኰĀ;E㏓㏔檞;檠Ā;E㏛㏜檝;檟e;扆lus;樤arr;楲aròᄽȀaeit㏸㐈㐏㐗Āls㏽㐄lsetmé㍪hp;樳parsl;槤Ādlᑣ㐔e;挣Ā;e㐜㐝檪Ā;s㐢㐣檬;쀀⪬︀ƀflp㐮㐳㑂tcy;䑌Ā;b㐸㐹䀯Ā;a㐾㐿槄r;挿f;쀀𝕤aĀdr㑍ЂesĀ;u㑔㑕晠it»㑕ƀcsu㑠㑹㒟Āau㑥㑯pĀ;sᆈ㑫;쀀⊓︀pĀ;sᆴ㑵;쀀⊔︀uĀbp㑿㒏ƀ;esᆗᆜ㒆etĀ;eᆗ㒍ñᆝƀ;esᆨᆭ㒖etĀ;eᆨ㒝ñᆮƀ;afᅻ㒦ְrť㒫ֱ»ᅼaròᅈȀcemt㒹㒾㓂㓅r;쀀𝓈tmîñiì㐕aræᆾĀar㓎㓕rĀ;f㓔ឿ昆Āan㓚㓭ightĀep㓣㓪psiloîỠhé⺯s»⡒ʀbcmnp㓻㕞ሉ㖋㖎Ҁ;Edemnprs㔎㔏㔑㔕㔞㔣㔬㔱㔶抂;櫅ot;檽Ā;dᇚ㔚ot;櫃ult;櫁ĀEe㔨㔪;櫋;把lus;檿arr;楹ƀeiu㔽㕒㕕tƀ;en㔎㕅㕋qĀ;qᇚ㔏eqĀ;q㔫㔨m;櫇Ābp㕚㕜;櫕;櫓c̀;acensᇭ㕬㕲㕹㕻㌦pproø㋺urlyeñᇾñᇳƀaes㖂㖈㌛pproø㌚qñ㌗g;晪ڀ123;Edehlmnps㖩㖬㖯ሜ㖲㖴㗀㗉㗕㗚㗟㗨㗭耻¹䂹耻²䂲耻³䂳;櫆Āos㖹㖼t;檾ub;櫘Ā;dሢ㗅ot;櫄sĀou㗏㗒l;柉b;櫗arr;楻ult;櫂ĀEe㗤㗦;櫌;抋lus;櫀ƀeiu㗴㘉㘌tƀ;enሜ㗼㘂qĀ;qሢ㖲eqĀ;q㗧㗤m;櫈Ābp㘑㘓;櫔;櫖ƀAan㘜㘠㘭rr;懙rĀhr㘦㘨ë∮Ā;oਫ਩war;椪lig耻ß䃟௡㙑㙝㙠ዎ㙳㙹\0㙾㛂\0\0\0\0\0㛛㜃\0㜉㝬\0\0\0㞇ɲ㙖\0\0㙛get;挖;䏄rë๟ƀaey㙦㙫㙰ron;䅥dil;䅣;䑂lrec;挕r;쀀𝔱Ȁeiko㚆㚝㚵㚼Dz㚋\0㚑eĀ4fኄኁaƀ;sv㚘㚙㚛䎸ym;䏑Ācn㚢㚲kĀas㚨㚮pproø዁im»ኬsðኞĀas㚺㚮ð዁rn耻þ䃾Ǭ̟㛆⋧es膀×;bd㛏㛐㛘䃗Ā;aᤏ㛕r;樱;樰ƀeps㛡㛣㜀á⩍Ȁ;bcf҆㛬㛰㛴ot;挶ir;櫱Ā;o㛹㛼쀀𝕥rk;櫚á㍢rime;怴ƀaip㜏㜒㝤dåቈ΀adempst㜡㝍㝀㝑㝗㝜㝟ngleʀ;dlqr㜰㜱㜶㝀㝂斵own»ᶻeftĀ;e⠀㜾ñम;扜ightĀ;e㊪㝋ñၚot;旬inus;樺lus;樹b;槍ime;樻ezium;揢ƀcht㝲㝽㞁Āry㝷㝻;쀀𝓉;䑆cy;䑛rok;䅧Āio㞋㞎xô᝷headĀlr㞗㞠eftarro÷ࡏightarrow»ཝऀAHabcdfghlmoprstuw㟐㟓㟗㟤㟰㟼㠎㠜㠣㠴㡑㡝㡫㢩㣌㣒㣪㣶ròϭar;楣Ācr㟜㟢ute耻ú䃺òᅐrǣ㟪\0㟭y;䑞ve;䅭Āiy㟵㟺rc耻û䃻;䑃ƀabh㠃㠆㠋ròᎭlac;䅱aòᏃĀir㠓㠘sht;楾;쀀𝔲rave耻ù䃹š㠧㠱rĀlr㠬㠮»ॗ»ႃlk;斀Āct㠹㡍ɯ㠿\0\0㡊rnĀ;e㡅㡆挜r»㡆op;挏ri;旸Āal㡖㡚cr;䅫肻¨͉Āgp㡢㡦on;䅳f;쀀𝕦̀adhlsuᅋ㡸㡽፲㢑㢠ownáᎳarpoonĀlr㢈㢌efô㠭ighô㠯iƀ;hl㢙㢚㢜䏅»ᏺon»㢚parrows;懈ƀcit㢰㣄㣈ɯ㢶\0\0㣁rnĀ;e㢼㢽挝r»㢽op;挎ng;䅯ri;旹cr;쀀𝓊ƀdir㣙㣝㣢ot;拰lde;䅩iĀ;f㜰㣨»᠓Āam㣯㣲rò㢨l耻ü䃼angle;榧ހABDacdeflnoprsz㤜㤟㤩㤭㦵㦸㦽㧟㧤㧨㧳㧹㧽㨁㨠ròϷarĀ;v㤦㤧櫨;櫩asèϡĀnr㤲㤷grt;榜΀eknprst㓣㥆㥋㥒㥝㥤㦖appá␕othinçẖƀhir㓫⻈㥙opô⾵Ā;hᎷ㥢ïㆍĀiu㥩㥭gmá㎳Ābp㥲㦄setneqĀ;q㥽㦀쀀⊊︀;쀀⫋︀setneqĀ;q㦏㦒쀀⊋︀;쀀⫌︀Āhr㦛㦟etá㚜iangleĀlr㦪㦯eft»थight»ၑy;䐲ash»ံƀelr㧄㧒㧗ƀ;beⷪ㧋㧏ar;抻q;扚lip;拮Ābt㧜ᑨaòᑩr;쀀𝔳tré㦮suĀbp㧯㧱»ജ»൙pf;쀀𝕧roð໻tré㦴Ācu㨆㨋r;쀀𝓋Ābp㨐㨘nĀEe㦀㨖»㥾nĀEe㦒㨞»㦐igzag;榚΀cefoprs㨶㨻㩖㩛㩔㩡㩪irc;䅵Ādi㩀㩑Ābg㩅㩉ar;機eĀ;qᗺ㩏;扙erp;愘r;쀀𝔴pf;쀀𝕨Ā;eᑹ㩦atèᑹcr;쀀𝓌ૣណ㪇\0㪋\0㪐㪛\0\0㪝㪨㪫㪯\0\0㫃㫎\0㫘ៜ៟tré៑r;쀀𝔵ĀAa㪔㪗ròσrò৶;䎾ĀAa㪡㪤ròθrò৫að✓is;拻ƀdptឤ㪵㪾Āfl㪺ឩ;쀀𝕩imåឲĀAa㫇㫊ròώròਁĀcq㫒ីr;쀀𝓍Āpt៖㫜ré។Ѐacefiosu㫰㫽㬈㬌㬑㬕㬛㬡cĀuy㫶㫻te耻ý䃽;䑏Āiy㬂㬆rc;䅷;䑋n耻¥䂥r;쀀𝔶cy;䑗pf;쀀𝕪cr;쀀𝓎Ācm㬦㬩y;䑎l耻ÿ䃿Ԁacdefhiosw㭂㭈㭔㭘㭤㭩㭭㭴㭺㮀cute;䅺Āay㭍㭒ron;䅾;䐷ot;䅼Āet㭝㭡træᕟa;䎶r;쀀𝔷cy;䐶grarr;懝pf;쀀𝕫cr;쀀𝓏Ājn㮅㮇;怍j;怌".split("").map((c$7) => c$7.charCodeAt(0)));
 
-var decode_data_xml_default = new Uint16Array(
-  "Ȁaglq	\x1Bɭ\0\0p;䀦os;䀧t;䀾t;䀼uot;䀢".split("").map((c$7) => c$7.charCodeAt(0)),
-);
+var decode_data_xml_default = new Uint16Array("Ȁaglq	\x1Bɭ\0\0p;䀦os;䀧t;䀾t;䀼uot;䀢".split("").map((c$7) => c$7.charCodeAt(0)));
 
 var _a;
 const decodeMap = new Map([
-  [0, 65533],
-  [128, 8364],
-  [130, 8218],
-  [131, 402],
-  [132, 8222],
-  [133, 8230],
-  [134, 8224],
-  [135, 8225],
-  [136, 710],
-  [137, 8240],
-  [138, 352],
-  [139, 8249],
-  [140, 338],
-  [142, 381],
-  [145, 8216],
-  [146, 8217],
-  [147, 8220],
-  [148, 8221],
-  [149, 8226],
-  [150, 8211],
-  [151, 8212],
-  [152, 732],
-  [153, 8482],
-  [154, 353],
-  [155, 8250],
-  [156, 339],
-  [158, 382],
-  [159, 376],
+	[0, 65533],
+	[128, 8364],
+	[130, 8218],
+	[131, 402],
+	[132, 8222],
+	[133, 8230],
+	[134, 8224],
+	[135, 8225],
+	[136, 710],
+	[137, 8240],
+	[138, 352],
+	[139, 8249],
+	[140, 338],
+	[142, 381],
+	[145, 8216],
+	[146, 8217],
+	[147, 8220],
+	[148, 8221],
+	[149, 8226],
+	[150, 8211],
+	[151, 8212],
+	[152, 732],
+	[153, 8482],
+	[154, 353],
+	[155, 8250],
+	[156, 339],
+	[158, 382],
+	[159, 376]
 ]);
 /**
- * Polyfill for `String.fromCodePoint`. It is used to create a string from a Unicode code point.
- */
-const fromCodePoint$1 =
-  (_a = String.fromCodePoint) !== null && _a !== void 0
-    ? _a
-    : function (codePoint) {
-        let output = "";
-        if (codePoint > 65535) {
-          codePoint -= 65536;
-          output += String.fromCharCode(((codePoint >>> 10) & 1023) | 55296);
-          codePoint = 56320 | (codePoint & 1023);
-        }
-        output += String.fromCharCode(codePoint);
-        return output;
-      };
+* Polyfill for `String.fromCodePoint`. It is used to create a string from a Unicode code point.
+*/
+const fromCodePoint$1 = (_a = String.fromCodePoint) !== null && _a !== void 0 ? _a : function(codePoint) {
+	let output = "";
+	if (codePoint > 65535) {
+		codePoint -= 65536;
+		output += String.fromCharCode(codePoint >>> 10 & 1023 | 55296);
+		codePoint = 56320 | codePoint & 1023;
+	}
+	output += String.fromCharCode(codePoint);
+	return output;
+};
 /**
- * Replace the given code point with a replacement character if it is a
- * surrogate or is outside the valid range. Otherwise return the code
- * point unchanged.
- */
+* Replace the given code point with a replacement character if it is a
+* surrogate or is outside the valid range. Otherwise return the code
+* point unchanged.
+*/
 function replaceCodePoint(codePoint) {
-  var _a;
-  if ((codePoint >= 55296 && codePoint <= 57343) || codePoint > 1114111) {
-    return 65533;
-  }
-  return (_a = decodeMap.get(codePoint)) !== null && _a !== void 0 ? _a : codePoint;
+	var _a;
+	if (codePoint >= 55296 && codePoint <= 57343 || codePoint > 1114111) {
+		return 65533;
+	}
+	return (_a = decodeMap.get(codePoint)) !== null && _a !== void 0 ? _a : codePoint;
 }
 /**
- * Replace the code point if relevant, then convert it to a string.
- *
- * @deprecated Use `fromCodePoint(replaceCodePoint(codePoint))` instead.
- * @param codePoint The code point to decode.
- * @returns The decoded code point.
- */
+* Replace the code point if relevant, then convert it to a string.
+*
+* @deprecated Use `fromCodePoint(replaceCodePoint(codePoint))` instead.
+* @param codePoint The code point to decode.
+* @returns The decoded code point.
+*/
 function decodeCodePoint(codePoint) {
-  return fromCodePoint$1(replaceCodePoint(codePoint));
+	return fromCodePoint$1(replaceCodePoint(codePoint));
 }
 
 var CharCodes;
-(function (CharCodes) {
-  CharCodes[(CharCodes["NUM"] = 35)] = "NUM";
-  CharCodes[(CharCodes["SEMI"] = 59)] = "SEMI";
-  CharCodes[(CharCodes["EQUALS"] = 61)] = "EQUALS";
-  CharCodes[(CharCodes["ZERO"] = 48)] = "ZERO";
-  CharCodes[(CharCodes["NINE"] = 57)] = "NINE";
-  CharCodes[(CharCodes["LOWER_A"] = 97)] = "LOWER_A";
-  CharCodes[(CharCodes["LOWER_F"] = 102)] = "LOWER_F";
-  CharCodes[(CharCodes["LOWER_X"] = 120)] = "LOWER_X";
-  CharCodes[(CharCodes["LOWER_Z"] = 122)] = "LOWER_Z";
-  CharCodes[(CharCodes["UPPER_A"] = 65)] = "UPPER_A";
-  CharCodes[(CharCodes["UPPER_F"] = 70)] = "UPPER_F";
-  CharCodes[(CharCodes["UPPER_Z"] = 90)] = "UPPER_Z";
+(function(CharCodes) {
+	CharCodes[CharCodes["NUM"] = 35] = "NUM";
+	CharCodes[CharCodes["SEMI"] = 59] = "SEMI";
+	CharCodes[CharCodes["EQUALS"] = 61] = "EQUALS";
+	CharCodes[CharCodes["ZERO"] = 48] = "ZERO";
+	CharCodes[CharCodes["NINE"] = 57] = "NINE";
+	CharCodes[CharCodes["LOWER_A"] = 97] = "LOWER_A";
+	CharCodes[CharCodes["LOWER_F"] = 102] = "LOWER_F";
+	CharCodes[CharCodes["LOWER_X"] = 120] = "LOWER_X";
+	CharCodes[CharCodes["LOWER_Z"] = 122] = "LOWER_Z";
+	CharCodes[CharCodes["UPPER_A"] = 65] = "UPPER_A";
+	CharCodes[CharCodes["UPPER_F"] = 70] = "UPPER_F";
+	CharCodes[CharCodes["UPPER_Z"] = 90] = "UPPER_Z";
 })(CharCodes || (CharCodes = {}));
 /** Bit that needs to be set to convert an upper case ASCII character to lower case */
 const TO_LOWER_BIT = 32;
 var BinTrieFlags;
-(function (BinTrieFlags) {
-  BinTrieFlags[(BinTrieFlags["VALUE_LENGTH"] = 49152)] = "VALUE_LENGTH";
-  BinTrieFlags[(BinTrieFlags["BRANCH_LENGTH"] = 16256)] = "BRANCH_LENGTH";
-  BinTrieFlags[(BinTrieFlags["JUMP_TABLE"] = 127)] = "JUMP_TABLE";
+(function(BinTrieFlags) {
+	BinTrieFlags[BinTrieFlags["VALUE_LENGTH"] = 49152] = "VALUE_LENGTH";
+	BinTrieFlags[BinTrieFlags["BRANCH_LENGTH"] = 16256] = "BRANCH_LENGTH";
+	BinTrieFlags[BinTrieFlags["JUMP_TABLE"] = 127] = "JUMP_TABLE";
 })(BinTrieFlags || (BinTrieFlags = {}));
 function isNumber(code$1) {
-  return code$1 >= CharCodes.ZERO && code$1 <= CharCodes.NINE;
+	return code$1 >= CharCodes.ZERO && code$1 <= CharCodes.NINE;
 }
 function isHexadecimalCharacter(code$1) {
-  return (
-    (code$1 >= CharCodes.UPPER_A && code$1 <= CharCodes.UPPER_F) ||
-    (code$1 >= CharCodes.LOWER_A && code$1 <= CharCodes.LOWER_F)
-  );
+	return code$1 >= CharCodes.UPPER_A && code$1 <= CharCodes.UPPER_F || code$1 >= CharCodes.LOWER_A && code$1 <= CharCodes.LOWER_F;
 }
 function isAsciiAlphaNumeric(code$1) {
-  return (
-    (code$1 >= CharCodes.UPPER_A && code$1 <= CharCodes.UPPER_Z) ||
-    (code$1 >= CharCodes.LOWER_A && code$1 <= CharCodes.LOWER_Z) ||
-    isNumber(code$1)
-  );
+	return code$1 >= CharCodes.UPPER_A && code$1 <= CharCodes.UPPER_Z || code$1 >= CharCodes.LOWER_A && code$1 <= CharCodes.LOWER_Z || isNumber(code$1);
 }
 /**
- * Checks if the given character is a valid end character for an entity in an attribute.
- *
- * Attribute values that aren't terminated properly aren't parsed, and shouldn't lead to a parser error.
- * See the example in https://html.spec.whatwg.org/multipage/parsing.html#named-character-reference-state
- */
+* Checks if the given character is a valid end character for an entity in an attribute.
+*
+* Attribute values that aren't terminated properly aren't parsed, and shouldn't lead to a parser error.
+* See the example in https://html.spec.whatwg.org/multipage/parsing.html#named-character-reference-state
+*/
 function isEntityInAttributeInvalidEnd(code$1) {
-  return code$1 === CharCodes.EQUALS || isAsciiAlphaNumeric(code$1);
+	return code$1 === CharCodes.EQUALS || isAsciiAlphaNumeric(code$1);
 }
 var EntityDecoderState;
-(function (EntityDecoderState) {
-  EntityDecoderState[(EntityDecoderState["EntityStart"] = 0)] = "EntityStart";
-  EntityDecoderState[(EntityDecoderState["NumericStart"] = 1)] = "NumericStart";
-  EntityDecoderState[(EntityDecoderState["NumericDecimal"] = 2)] = "NumericDecimal";
-  EntityDecoderState[(EntityDecoderState["NumericHex"] = 3)] = "NumericHex";
-  EntityDecoderState[(EntityDecoderState["NamedEntity"] = 4)] = "NamedEntity";
+(function(EntityDecoderState) {
+	EntityDecoderState[EntityDecoderState["EntityStart"] = 0] = "EntityStart";
+	EntityDecoderState[EntityDecoderState["NumericStart"] = 1] = "NumericStart";
+	EntityDecoderState[EntityDecoderState["NumericDecimal"] = 2] = "NumericDecimal";
+	EntityDecoderState[EntityDecoderState["NumericHex"] = 3] = "NumericHex";
+	EntityDecoderState[EntityDecoderState["NamedEntity"] = 4] = "NamedEntity";
 })(EntityDecoderState || (EntityDecoderState = {}));
 var DecodingMode;
-(function (DecodingMode) {
-  /** Entities in text nodes that can end with any character. */
-  DecodingMode[(DecodingMode["Legacy"] = 0)] = "Legacy";
-  /** Only allow entities terminated with a semicolon. */
-  DecodingMode[(DecodingMode["Strict"] = 1)] = "Strict";
-  /** Entities in attributes have limitations on ending characters. */
-  DecodingMode[(DecodingMode["Attribute"] = 2)] = "Attribute";
+(function(DecodingMode) {
+	/** Entities in text nodes that can end with any character. */
+	DecodingMode[DecodingMode["Legacy"] = 0] = "Legacy";
+	/** Only allow entities terminated with a semicolon. */
+	DecodingMode[DecodingMode["Strict"] = 1] = "Strict";
+	/** Entities in attributes have limitations on ending characters. */
+	DecodingMode[DecodingMode["Attribute"] = 2] = "Attribute";
 })(DecodingMode || (DecodingMode = {}));
 /**
- * Token decoder with support of writing partial entities.
- */
+* Token decoder with support of writing partial entities.
+*/
 var EntityDecoder = class {
-  constructor(decodeTree, emitCodePoint, errors$1) {
-    this.decodeTree = decodeTree;
-    this.emitCodePoint = emitCodePoint;
-    this.errors = errors$1;
-    /** The current state of the decoder. */
-    this.state = EntityDecoderState.EntityStart;
-    /** Characters that were consumed while parsing an entity. */
-    this.consumed = 1;
-    /**
-     * The result of the entity.
-     *
-     * Either the result index of a numeric entity, or the codepoint of a
-     * numeric entity.
-     */
-    this.result = 0;
-    /** The current index in the decode tree. */
-    this.treeIndex = 0;
-    /** The number of characters that were consumed in excess. */
-    this.excess = 1;
-    /** The mode in which the decoder is operating. */
-    this.decodeMode = DecodingMode.Strict;
-  }
-  /** Resets the instance to make it reusable. */
-  startEntity(decodeMode) {
-    this.decodeMode = decodeMode;
-    this.state = EntityDecoderState.EntityStart;
-    this.result = 0;
-    this.treeIndex = 0;
-    this.excess = 1;
-    this.consumed = 1;
-  }
-  /**
-   * Write an entity to the decoder. This can be called multiple times with partial entities.
-   * If the entity is incomplete, the decoder will return -1.
-   *
-   * Mirrors the implementation of `getDecoder`, but with the ability to stop decoding if the
-   * entity is incomplete, and resume when the next string is written.
-   *
-   * @param string The string containing the entity (or a continuation of the entity).
-   * @param offset The offset at which the entity begins. Should be 0 if this is not the first call.
-   * @returns The number of characters that were consumed, or -1 if the entity is incomplete.
-   */
-  write(str, offset) {
-    switch (this.state) {
-      case EntityDecoderState.EntityStart: {
-        if (str.charCodeAt(offset) === CharCodes.NUM) {
-          this.state = EntityDecoderState.NumericStart;
-          this.consumed += 1;
-          return this.stateNumericStart(str, offset + 1);
-        }
-        this.state = EntityDecoderState.NamedEntity;
-        return this.stateNamedEntity(str, offset);
-      }
-      case EntityDecoderState.NumericStart: {
-        return this.stateNumericStart(str, offset);
-      }
-      case EntityDecoderState.NumericDecimal: {
-        return this.stateNumericDecimal(str, offset);
-      }
-      case EntityDecoderState.NumericHex: {
-        return this.stateNumericHex(str, offset);
-      }
-      case EntityDecoderState.NamedEntity: {
-        return this.stateNamedEntity(str, offset);
-      }
-    }
-  }
-  /**
-   * Switches between the numeric decimal and hexadecimal states.
-   *
-   * Equivalent to the `Numeric character reference state` in the HTML spec.
-   *
-   * @param str The string containing the entity (or a continuation of the entity).
-   * @param offset The current offset.
-   * @returns The number of characters that were consumed, or -1 if the entity is incomplete.
-   */
-  stateNumericStart(str, offset) {
-    if (offset >= str.length) {
-      return -1;
-    }
-    if ((str.charCodeAt(offset) | TO_LOWER_BIT) === CharCodes.LOWER_X) {
-      this.state = EntityDecoderState.NumericHex;
-      this.consumed += 1;
-      return this.stateNumericHex(str, offset + 1);
-    }
-    this.state = EntityDecoderState.NumericDecimal;
-    return this.stateNumericDecimal(str, offset);
-  }
-  addToNumericResult(str, start, end, base$1) {
-    if (start !== end) {
-      const digitCount = end - start;
-      this.result =
-        this.result * Math.pow(base$1, digitCount) +
-        parseInt(str.substr(start, digitCount), base$1);
-      this.consumed += digitCount;
-    }
-  }
-  /**
-   * Parses a hexadecimal numeric entity.
-   *
-   * Equivalent to the `Hexademical character reference state` in the HTML spec.
-   *
-   * @param str The string containing the entity (or a continuation of the entity).
-   * @param offset The current offset.
-   * @returns The number of characters that were consumed, or -1 if the entity is incomplete.
-   */
-  stateNumericHex(str, offset) {
-    const startIdx = offset;
-    while (offset < str.length) {
-      const char = str.charCodeAt(offset);
-      if (isNumber(char) || isHexadecimalCharacter(char)) {
-        offset += 1;
-      } else {
-        this.addToNumericResult(str, startIdx, offset, 16);
-        return this.emitNumericEntity(char, 3);
-      }
-    }
-    this.addToNumericResult(str, startIdx, offset, 16);
-    return -1;
-  }
-  /**
-   * Parses a decimal numeric entity.
-   *
-   * Equivalent to the `Decimal character reference state` in the HTML spec.
-   *
-   * @param str The string containing the entity (or a continuation of the entity).
-   * @param offset The current offset.
-   * @returns The number of characters that were consumed, or -1 if the entity is incomplete.
-   */
-  stateNumericDecimal(str, offset) {
-    const startIdx = offset;
-    while (offset < str.length) {
-      const char = str.charCodeAt(offset);
-      if (isNumber(char)) {
-        offset += 1;
-      } else {
-        this.addToNumericResult(str, startIdx, offset, 10);
-        return this.emitNumericEntity(char, 2);
-      }
-    }
-    this.addToNumericResult(str, startIdx, offset, 10);
-    return -1;
-  }
-  /**
-   * Validate and emit a numeric entity.
-   *
-   * Implements the logic from the `Hexademical character reference start
-   * state` and `Numeric character reference end state` in the HTML spec.
-   *
-   * @param lastCp The last code point of the entity. Used to see if the
-   *               entity was terminated with a semicolon.
-   * @param expectedLength The minimum number of characters that should be
-   *                       consumed. Used to validate that at least one digit
-   *                       was consumed.
-   * @returns The number of characters that were consumed.
-   */
-  emitNumericEntity(lastCp, expectedLength) {
-    var _a$1;
-    if (this.consumed <= expectedLength) {
-      (_a$1 = this.errors) === null || _a$1 === void 0
-        ? void 0
-        : _a$1.absenceOfDigitsInNumericCharacterReference(this.consumed);
-      return 0;
-    }
-    if (lastCp === CharCodes.SEMI) {
-      this.consumed += 1;
-    } else if (this.decodeMode === DecodingMode.Strict) {
-      return 0;
-    }
-    this.emitCodePoint(replaceCodePoint(this.result), this.consumed);
-    if (this.errors) {
-      if (lastCp !== CharCodes.SEMI) {
-        this.errors.missingSemicolonAfterCharacterReference();
-      }
-      this.errors.validateNumericCharacterReference(this.result);
-    }
-    return this.consumed;
-  }
-  /**
-   * Parses a named entity.
-   *
-   * Equivalent to the `Named character reference state` in the HTML spec.
-   *
-   * @param str The string containing the entity (or a continuation of the entity).
-   * @param offset The current offset.
-   * @returns The number of characters that were consumed, or -1 if the entity is incomplete.
-   */
-  stateNamedEntity(str, offset) {
-    const { decodeTree } = this;
-    let current = decodeTree[this.treeIndex];
-    let valueLength = (current & BinTrieFlags.VALUE_LENGTH) >> 14;
-    for (; offset < str.length; offset++, this.excess++) {
-      const char = str.charCodeAt(offset);
-      this.treeIndex = determineBranch(
-        decodeTree,
-        current,
-        this.treeIndex + Math.max(1, valueLength),
-        char,
-      );
-      if (this.treeIndex < 0) {
-        return this.result === 0 ||
-          (this.decodeMode === DecodingMode.Attribute &&
-            (valueLength === 0 || isEntityInAttributeInvalidEnd(char)))
-          ? 0
-          : this.emitNotTerminatedNamedEntity();
-      }
-      current = decodeTree[this.treeIndex];
-      valueLength = (current & BinTrieFlags.VALUE_LENGTH) >> 14;
-      if (valueLength !== 0) {
-        if (char === CharCodes.SEMI) {
-          return this.emitNamedEntityData(this.treeIndex, valueLength, this.consumed + this.excess);
-        }
-        if (this.decodeMode !== DecodingMode.Strict) {
-          this.result = this.treeIndex;
-          this.consumed += this.excess;
-          this.excess = 0;
-        }
-      }
-    }
-    return -1;
-  }
-  /**
-   * Emit a named entity that was not terminated with a semicolon.
-   *
-   * @returns The number of characters consumed.
-   */
-  emitNotTerminatedNamedEntity() {
-    var _a$1;
-    const { result, decodeTree } = this;
-    const valueLength = (decodeTree[result] & BinTrieFlags.VALUE_LENGTH) >> 14;
-    this.emitNamedEntityData(result, valueLength, this.consumed);
-    (_a$1 = this.errors) === null || _a$1 === void 0
-      ? void 0
-      : _a$1.missingSemicolonAfterCharacterReference();
-    return this.consumed;
-  }
-  /**
-   * Emit a named entity.
-   *
-   * @param result The index of the entity in the decode tree.
-   * @param valueLength The number of bytes in the entity.
-   * @param consumed The number of characters consumed.
-   *
-   * @returns The number of characters consumed.
-   */
-  emitNamedEntityData(result, valueLength, consumed) {
-    const { decodeTree } = this;
-    this.emitCodePoint(
-      valueLength === 1 ? decodeTree[result] & ~BinTrieFlags.VALUE_LENGTH : decodeTree[result + 1],
-      consumed,
-    );
-    if (valueLength === 3) {
-      this.emitCodePoint(decodeTree[result + 2], consumed);
-    }
-    return consumed;
-  }
-  /**
-   * Signal to the parser that the end of the input was reached.
-   *
-   * Remaining data will be emitted and relevant errors will be produced.
-   *
-   * @returns The number of characters consumed.
-   */
-  end() {
-    var _a$1;
-    switch (this.state) {
-      case EntityDecoderState.NamedEntity: {
-        return this.result !== 0 &&
-          (this.decodeMode !== DecodingMode.Attribute || this.result === this.treeIndex)
-          ? this.emitNotTerminatedNamedEntity()
-          : 0;
-      }
-      case EntityDecoderState.NumericDecimal: {
-        return this.emitNumericEntity(0, 2);
-      }
-      case EntityDecoderState.NumericHex: {
-        return this.emitNumericEntity(0, 3);
-      }
-      case EntityDecoderState.NumericStart: {
-        (_a$1 = this.errors) === null || _a$1 === void 0
-          ? void 0
-          : _a$1.absenceOfDigitsInNumericCharacterReference(this.consumed);
-        return 0;
-      }
-      case EntityDecoderState.EntityStart: {
-        return 0;
-      }
-    }
-  }
+	constructor(decodeTree, emitCodePoint, errors$1) {
+		this.decodeTree = decodeTree;
+		this.emitCodePoint = emitCodePoint;
+		this.errors = errors$1;
+		/** The current state of the decoder. */
+		this.state = EntityDecoderState.EntityStart;
+		/** Characters that were consumed while parsing an entity. */
+		this.consumed = 1;
+		/**
+		* The result of the entity.
+		*
+		* Either the result index of a numeric entity, or the codepoint of a
+		* numeric entity.
+		*/
+		this.result = 0;
+		/** The current index in the decode tree. */
+		this.treeIndex = 0;
+		/** The number of characters that were consumed in excess. */
+		this.excess = 1;
+		/** The mode in which the decoder is operating. */
+		this.decodeMode = DecodingMode.Strict;
+	}
+	/** Resets the instance to make it reusable. */
+	startEntity(decodeMode) {
+		this.decodeMode = decodeMode;
+		this.state = EntityDecoderState.EntityStart;
+		this.result = 0;
+		this.treeIndex = 0;
+		this.excess = 1;
+		this.consumed = 1;
+	}
+	/**
+	* Write an entity to the decoder. This can be called multiple times with partial entities.
+	* If the entity is incomplete, the decoder will return -1.
+	*
+	* Mirrors the implementation of `getDecoder`, but with the ability to stop decoding if the
+	* entity is incomplete, and resume when the next string is written.
+	*
+	* @param string The string containing the entity (or a continuation of the entity).
+	* @param offset The offset at which the entity begins. Should be 0 if this is not the first call.
+	* @returns The number of characters that were consumed, or -1 if the entity is incomplete.
+	*/
+	write(str, offset) {
+		switch (this.state) {
+			case EntityDecoderState.EntityStart: {
+				if (str.charCodeAt(offset) === CharCodes.NUM) {
+					this.state = EntityDecoderState.NumericStart;
+					this.consumed += 1;
+					return this.stateNumericStart(str, offset + 1);
+				}
+				this.state = EntityDecoderState.NamedEntity;
+				return this.stateNamedEntity(str, offset);
+			}
+			case EntityDecoderState.NumericStart: {
+				return this.stateNumericStart(str, offset);
+			}
+			case EntityDecoderState.NumericDecimal: {
+				return this.stateNumericDecimal(str, offset);
+			}
+			case EntityDecoderState.NumericHex: {
+				return this.stateNumericHex(str, offset);
+			}
+			case EntityDecoderState.NamedEntity: {
+				return this.stateNamedEntity(str, offset);
+			}
+		}
+	}
+	/**
+	* Switches between the numeric decimal and hexadecimal states.
+	*
+	* Equivalent to the `Numeric character reference state` in the HTML spec.
+	*
+	* @param str The string containing the entity (or a continuation of the entity).
+	* @param offset The current offset.
+	* @returns The number of characters that were consumed, or -1 if the entity is incomplete.
+	*/
+	stateNumericStart(str, offset) {
+		if (offset >= str.length) {
+			return -1;
+		}
+		if ((str.charCodeAt(offset) | TO_LOWER_BIT) === CharCodes.LOWER_X) {
+			this.state = EntityDecoderState.NumericHex;
+			this.consumed += 1;
+			return this.stateNumericHex(str, offset + 1);
+		}
+		this.state = EntityDecoderState.NumericDecimal;
+		return this.stateNumericDecimal(str, offset);
+	}
+	addToNumericResult(str, start, end, base$1) {
+		if (start !== end) {
+			const digitCount = end - start;
+			this.result = this.result * Math.pow(base$1, digitCount) + parseInt(str.substr(start, digitCount), base$1);
+			this.consumed += digitCount;
+		}
+	}
+	/**
+	* Parses a hexadecimal numeric entity.
+	*
+	* Equivalent to the `Hexademical character reference state` in the HTML spec.
+	*
+	* @param str The string containing the entity (or a continuation of the entity).
+	* @param offset The current offset.
+	* @returns The number of characters that were consumed, or -1 if the entity is incomplete.
+	*/
+	stateNumericHex(str, offset) {
+		const startIdx = offset;
+		while (offset < str.length) {
+			const char = str.charCodeAt(offset);
+			if (isNumber(char) || isHexadecimalCharacter(char)) {
+				offset += 1;
+			} else {
+				this.addToNumericResult(str, startIdx, offset, 16);
+				return this.emitNumericEntity(char, 3);
+			}
+		}
+		this.addToNumericResult(str, startIdx, offset, 16);
+		return -1;
+	}
+	/**
+	* Parses a decimal numeric entity.
+	*
+	* Equivalent to the `Decimal character reference state` in the HTML spec.
+	*
+	* @param str The string containing the entity (or a continuation of the entity).
+	* @param offset The current offset.
+	* @returns The number of characters that were consumed, or -1 if the entity is incomplete.
+	*/
+	stateNumericDecimal(str, offset) {
+		const startIdx = offset;
+		while (offset < str.length) {
+			const char = str.charCodeAt(offset);
+			if (isNumber(char)) {
+				offset += 1;
+			} else {
+				this.addToNumericResult(str, startIdx, offset, 10);
+				return this.emitNumericEntity(char, 2);
+			}
+		}
+		this.addToNumericResult(str, startIdx, offset, 10);
+		return -1;
+	}
+	/**
+	* Validate and emit a numeric entity.
+	*
+	* Implements the logic from the `Hexademical character reference start
+	* state` and `Numeric character reference end state` in the HTML spec.
+	*
+	* @param lastCp The last code point of the entity. Used to see if the
+	*               entity was terminated with a semicolon.
+	* @param expectedLength The minimum number of characters that should be
+	*                       consumed. Used to validate that at least one digit
+	*                       was consumed.
+	* @returns The number of characters that were consumed.
+	*/
+	emitNumericEntity(lastCp, expectedLength) {
+		var _a$1;
+		if (this.consumed <= expectedLength) {
+			(_a$1 = this.errors) === null || _a$1 === void 0 ? void 0 : _a$1.absenceOfDigitsInNumericCharacterReference(this.consumed);
+			return 0;
+		}
+		if (lastCp === CharCodes.SEMI) {
+			this.consumed += 1;
+		} else if (this.decodeMode === DecodingMode.Strict) {
+			return 0;
+		}
+		this.emitCodePoint(replaceCodePoint(this.result), this.consumed);
+		if (this.errors) {
+			if (lastCp !== CharCodes.SEMI) {
+				this.errors.missingSemicolonAfterCharacterReference();
+			}
+			this.errors.validateNumericCharacterReference(this.result);
+		}
+		return this.consumed;
+	}
+	/**
+	* Parses a named entity.
+	*
+	* Equivalent to the `Named character reference state` in the HTML spec.
+	*
+	* @param str The string containing the entity (or a continuation of the entity).
+	* @param offset The current offset.
+	* @returns The number of characters that were consumed, or -1 if the entity is incomplete.
+	*/
+	stateNamedEntity(str, offset) {
+		const { decodeTree } = this;
+		let current = decodeTree[this.treeIndex];
+		let valueLength = (current & BinTrieFlags.VALUE_LENGTH) >> 14;
+		for (; offset < str.length; offset++, this.excess++) {
+			const char = str.charCodeAt(offset);
+			this.treeIndex = determineBranch(decodeTree, current, this.treeIndex + Math.max(1, valueLength), char);
+			if (this.treeIndex < 0) {
+				return this.result === 0 || this.decodeMode === DecodingMode.Attribute && (valueLength === 0 || isEntityInAttributeInvalidEnd(char)) ? 0 : this.emitNotTerminatedNamedEntity();
+			}
+			current = decodeTree[this.treeIndex];
+			valueLength = (current & BinTrieFlags.VALUE_LENGTH) >> 14;
+			if (valueLength !== 0) {
+				if (char === CharCodes.SEMI) {
+					return this.emitNamedEntityData(this.treeIndex, valueLength, this.consumed + this.excess);
+				}
+				if (this.decodeMode !== DecodingMode.Strict) {
+					this.result = this.treeIndex;
+					this.consumed += this.excess;
+					this.excess = 0;
+				}
+			}
+		}
+		return -1;
+	}
+	/**
+	* Emit a named entity that was not terminated with a semicolon.
+	*
+	* @returns The number of characters consumed.
+	*/
+	emitNotTerminatedNamedEntity() {
+		var _a$1;
+		const { result, decodeTree } = this;
+		const valueLength = (decodeTree[result] & BinTrieFlags.VALUE_LENGTH) >> 14;
+		this.emitNamedEntityData(result, valueLength, this.consumed);
+		(_a$1 = this.errors) === null || _a$1 === void 0 ? void 0 : _a$1.missingSemicolonAfterCharacterReference();
+		return this.consumed;
+	}
+	/**
+	* Emit a named entity.
+	*
+	* @param result The index of the entity in the decode tree.
+	* @param valueLength The number of bytes in the entity.
+	* @param consumed The number of characters consumed.
+	*
+	* @returns The number of characters consumed.
+	*/
+	emitNamedEntityData(result, valueLength, consumed) {
+		const { decodeTree } = this;
+		this.emitCodePoint(valueLength === 1 ? decodeTree[result] & ~BinTrieFlags.VALUE_LENGTH : decodeTree[result + 1], consumed);
+		if (valueLength === 3) {
+			this.emitCodePoint(decodeTree[result + 2], consumed);
+		}
+		return consumed;
+	}
+	/**
+	* Signal to the parser that the end of the input was reached.
+	*
+	* Remaining data will be emitted and relevant errors will be produced.
+	*
+	* @returns The number of characters consumed.
+	*/
+	end() {
+		var _a$1;
+		switch (this.state) {
+			case EntityDecoderState.NamedEntity: {
+				return this.result !== 0 && (this.decodeMode !== DecodingMode.Attribute || this.result === this.treeIndex) ? this.emitNotTerminatedNamedEntity() : 0;
+			}
+			case EntityDecoderState.NumericDecimal: {
+				return this.emitNumericEntity(0, 2);
+			}
+			case EntityDecoderState.NumericHex: {
+				return this.emitNumericEntity(0, 3);
+			}
+			case EntityDecoderState.NumericStart: {
+				(_a$1 = this.errors) === null || _a$1 === void 0 ? void 0 : _a$1.absenceOfDigitsInNumericCharacterReference(this.consumed);
+				return 0;
+			}
+			case EntityDecoderState.EntityStart: {
+				return 0;
+			}
+		}
+	}
 };
 /**
- * Creates a function that decodes entities in a string.
- *
- * @param decodeTree The decode tree.
- * @returns A function that decodes entities in a string.
- */
+* Creates a function that decodes entities in a string.
+*
+* @param decodeTree The decode tree.
+* @returns A function that decodes entities in a string.
+*/
 function getDecoder(decodeTree) {
-  let ret = "";
-  const decoder = new EntityDecoder(decodeTree, (str) => (ret += fromCodePoint$1(str)));
-  return function decodeWithTrie(str, decodeMode) {
-    let lastIndex = 0;
-    let offset = 0;
-    while ((offset = str.indexOf("&", offset)) >= 0) {
-      ret += str.slice(lastIndex, offset);
-      decoder.startEntity(decodeMode);
-      const len = decoder.write(str, offset + 1);
-      if (len < 0) {
-        lastIndex = offset + decoder.end();
-        break;
-      }
-      lastIndex = offset + len;
-      offset = len === 0 ? lastIndex + 1 : lastIndex;
-    }
-    const result = ret + str.slice(lastIndex);
-    ret = "";
-    return result;
-  };
+	let ret = "";
+	const decoder = new EntityDecoder(decodeTree, (str) => ret += fromCodePoint$1(str));
+	return function decodeWithTrie(str, decodeMode) {
+		let lastIndex = 0;
+		let offset = 0;
+		while ((offset = str.indexOf("&", offset)) >= 0) {
+			ret += str.slice(lastIndex, offset);
+			decoder.startEntity(decodeMode);
+			const len = decoder.write(str, offset + 1);
+			if (len < 0) {
+				lastIndex = offset + decoder.end();
+				break;
+			}
+			lastIndex = offset + len;
+			offset = len === 0 ? lastIndex + 1 : lastIndex;
+		}
+		const result = ret + str.slice(lastIndex);
+		ret = "";
+		return result;
+	};
 }
 /**
- * Determines the branch of the current node that is taken given the current
- * character. This function is used to traverse the trie.
- *
- * @param decodeTree The trie.
- * @param current The current node.
- * @param nodeIdx The index right after the current node and its value.
- * @param char The current character.
- * @returns The index of the next node, or -1 if no branch is taken.
- */
+* Determines the branch of the current node that is taken given the current
+* character. This function is used to traverse the trie.
+*
+* @param decodeTree The trie.
+* @param current The current node.
+* @param nodeIdx The index right after the current node and its value.
+* @param char The current character.
+* @returns The index of the next node, or -1 if no branch is taken.
+*/
 function determineBranch(decodeTree, current, nodeIdx, char) {
-  const branchCount = (current & BinTrieFlags.BRANCH_LENGTH) >> 7;
-  const jumpOffset = current & BinTrieFlags.JUMP_TABLE;
-  if (branchCount === 0) {
-    return jumpOffset !== 0 && char === jumpOffset ? nodeIdx : -1;
-  }
-  if (jumpOffset) {
-    const value = char - jumpOffset;
-    return value < 0 || value >= branchCount ? -1 : decodeTree[nodeIdx + value] - 1;
-  }
-  let lo = nodeIdx;
-  let hi = lo + branchCount - 1;
-  while (lo <= hi) {
-    const mid = (lo + hi) >>> 1;
-    const midVal = decodeTree[mid];
-    if (midVal < char) {
-      lo = mid + 1;
-    } else if (midVal > char) {
-      hi = mid - 1;
-    } else {
-      return decodeTree[mid + branchCount];
-    }
-  }
-  return -1;
+	const branchCount = (current & BinTrieFlags.BRANCH_LENGTH) >> 7;
+	const jumpOffset = current & BinTrieFlags.JUMP_TABLE;
+	if (branchCount === 0) {
+		return jumpOffset !== 0 && char === jumpOffset ? nodeIdx : -1;
+	}
+	if (jumpOffset) {
+		const value = char - jumpOffset;
+		return value < 0 || value >= branchCount ? -1 : decodeTree[nodeIdx + value] - 1;
+	}
+	let lo = nodeIdx;
+	let hi = lo + branchCount - 1;
+	while (lo <= hi) {
+		const mid = lo + hi >>> 1;
+		const midVal = decodeTree[mid];
+		if (midVal < char) {
+			lo = mid + 1;
+		} else if (midVal > char) {
+			hi = mid - 1;
+		} else {
+			return decodeTree[mid + branchCount];
+		}
+	}
+	return -1;
 }
 const htmlDecoder = getDecoder(decode_data_html_default);
 const xmlDecoder = getDecoder(decode_data_xml_default);
 /**
- * Decodes an HTML string.
- *
- * @param str The string to decode.
- * @param mode The decoding mode.
- * @returns The decoded string.
- */
+* Decodes an HTML string.
+*
+* @param str The string to decode.
+* @param mode The decoding mode.
+* @returns The decoded string.
+*/
 function decodeHTML(str, mode = DecodingMode.Legacy) {
-  return htmlDecoder(str, mode);
+	return htmlDecoder(str, mode);
 }
 /**
- * Decodes an HTML string in an attribute.
- *
- * @param str The string to decode.
- * @returns The decoded string.
- */
+* Decodes an HTML string in an attribute.
+*
+* @param str The string to decode.
+* @returns The decoded string.
+*/
 function decodeHTMLAttribute(str) {
-  return htmlDecoder(str, DecodingMode.Attribute);
+	return htmlDecoder(str, DecodingMode.Attribute);
 }
 /**
- * Decodes an HTML string, requiring all entities to be terminated by a semicolon.
- *
- * @param str The string to decode.
- * @returns The decoded string.
- */
+* Decodes an HTML string, requiring all entities to be terminated by a semicolon.
+*
+* @param str The string to decode.
+* @returns The decoded string.
+*/
 function decodeHTMLStrict(str) {
-  return htmlDecoder(str, DecodingMode.Strict);
+	return htmlDecoder(str, DecodingMode.Strict);
 }
 /**
- * Decodes an XML string, requiring all entities to be terminated by a semicolon.
- *
- * @param str The string to decode.
- * @returns The decoded string.
- */
+* Decodes an XML string, requiring all entities to be terminated by a semicolon.
+*
+* @param str The string to decode.
+* @returns The decoded string.
+*/
 function decodeXML(str) {
-  return xmlDecoder(str, DecodingMode.Strict);
+	return xmlDecoder(str, DecodingMode.Strict);
 }
 
 function restoreDiff(arr) {
-  for (let i$10 = 1; i$10 < arr.length; i$10++) {
-    arr[i$10][0] += arr[i$10 - 1][0] + 1;
-  }
-  return arr;
+	for (let i$10 = 1; i$10 < arr.length; i$10++) {
+		arr[i$10][0] += arr[i$10 - 1][0] + 1;
+	}
+	return arr;
 }
-var encode_html_default = new Map(
-  /* @__PURE__ */ restoreDiff([
-    [9, "&Tab;"],
-    [0, "&NewLine;"],
-    [22, "&excl;"],
-    [0, "&quot;"],
-    [0, "&num;"],
-    [0, "&dollar;"],
-    [0, "&percnt;"],
-    [0, "&amp;"],
-    [0, "&apos;"],
-    [0, "&lpar;"],
-    [0, "&rpar;"],
-    [0, "&ast;"],
-    [0, "&plus;"],
-    [0, "&comma;"],
-    [1, "&period;"],
-    [0, "&sol;"],
-    [10, "&colon;"],
-    [0, "&semi;"],
-    [
-      0,
-      {
-        v: "&lt;",
-        n: 8402,
-        o: "&nvlt;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&equals;",
-        n: 8421,
-        o: "&bne;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&gt;",
-        n: 8402,
-        o: "&nvgt;",
-      },
-    ],
-    [0, "&quest;"],
-    [0, "&commat;"],
-    [26, "&lbrack;"],
-    [0, "&bsol;"],
-    [0, "&rbrack;"],
-    [0, "&Hat;"],
-    [0, "&lowbar;"],
-    [0, "&DiacriticalGrave;"],
-    [
-      5,
-      {
-        n: 106,
-        o: "&fjlig;",
-      },
-    ],
-    [20, "&lbrace;"],
-    [0, "&verbar;"],
-    [0, "&rbrace;"],
-    [34, "&nbsp;"],
-    [0, "&iexcl;"],
-    [0, "&cent;"],
-    [0, "&pound;"],
-    [0, "&curren;"],
-    [0, "&yen;"],
-    [0, "&brvbar;"],
-    [0, "&sect;"],
-    [0, "&die;"],
-    [0, "&copy;"],
-    [0, "&ordf;"],
-    [0, "&laquo;"],
-    [0, "&not;"],
-    [0, "&shy;"],
-    [0, "&circledR;"],
-    [0, "&macr;"],
-    [0, "&deg;"],
-    [0, "&PlusMinus;"],
-    [0, "&sup2;"],
-    [0, "&sup3;"],
-    [0, "&acute;"],
-    [0, "&micro;"],
-    [0, "&para;"],
-    [0, "&centerdot;"],
-    [0, "&cedil;"],
-    [0, "&sup1;"],
-    [0, "&ordm;"],
-    [0, "&raquo;"],
-    [0, "&frac14;"],
-    [0, "&frac12;"],
-    [0, "&frac34;"],
-    [0, "&iquest;"],
-    [0, "&Agrave;"],
-    [0, "&Aacute;"],
-    [0, "&Acirc;"],
-    [0, "&Atilde;"],
-    [0, "&Auml;"],
-    [0, "&angst;"],
-    [0, "&AElig;"],
-    [0, "&Ccedil;"],
-    [0, "&Egrave;"],
-    [0, "&Eacute;"],
-    [0, "&Ecirc;"],
-    [0, "&Euml;"],
-    [0, "&Igrave;"],
-    [0, "&Iacute;"],
-    [0, "&Icirc;"],
-    [0, "&Iuml;"],
-    [0, "&ETH;"],
-    [0, "&Ntilde;"],
-    [0, "&Ograve;"],
-    [0, "&Oacute;"],
-    [0, "&Ocirc;"],
-    [0, "&Otilde;"],
-    [0, "&Ouml;"],
-    [0, "&times;"],
-    [0, "&Oslash;"],
-    [0, "&Ugrave;"],
-    [0, "&Uacute;"],
-    [0, "&Ucirc;"],
-    [0, "&Uuml;"],
-    [0, "&Yacute;"],
-    [0, "&THORN;"],
-    [0, "&szlig;"],
-    [0, "&agrave;"],
-    [0, "&aacute;"],
-    [0, "&acirc;"],
-    [0, "&atilde;"],
-    [0, "&auml;"],
-    [0, "&aring;"],
-    [0, "&aelig;"],
-    [0, "&ccedil;"],
-    [0, "&egrave;"],
-    [0, "&eacute;"],
-    [0, "&ecirc;"],
-    [0, "&euml;"],
-    [0, "&igrave;"],
-    [0, "&iacute;"],
-    [0, "&icirc;"],
-    [0, "&iuml;"],
-    [0, "&eth;"],
-    [0, "&ntilde;"],
-    [0, "&ograve;"],
-    [0, "&oacute;"],
-    [0, "&ocirc;"],
-    [0, "&otilde;"],
-    [0, "&ouml;"],
-    [0, "&div;"],
-    [0, "&oslash;"],
-    [0, "&ugrave;"],
-    [0, "&uacute;"],
-    [0, "&ucirc;"],
-    [0, "&uuml;"],
-    [0, "&yacute;"],
-    [0, "&thorn;"],
-    [0, "&yuml;"],
-    [0, "&Amacr;"],
-    [0, "&amacr;"],
-    [0, "&Abreve;"],
-    [0, "&abreve;"],
-    [0, "&Aogon;"],
-    [0, "&aogon;"],
-    [0, "&Cacute;"],
-    [0, "&cacute;"],
-    [0, "&Ccirc;"],
-    [0, "&ccirc;"],
-    [0, "&Cdot;"],
-    [0, "&cdot;"],
-    [0, "&Ccaron;"],
-    [0, "&ccaron;"],
-    [0, "&Dcaron;"],
-    [0, "&dcaron;"],
-    [0, "&Dstrok;"],
-    [0, "&dstrok;"],
-    [0, "&Emacr;"],
-    [0, "&emacr;"],
-    [2, "&Edot;"],
-    [0, "&edot;"],
-    [0, "&Eogon;"],
-    [0, "&eogon;"],
-    [0, "&Ecaron;"],
-    [0, "&ecaron;"],
-    [0, "&Gcirc;"],
-    [0, "&gcirc;"],
-    [0, "&Gbreve;"],
-    [0, "&gbreve;"],
-    [0, "&Gdot;"],
-    [0, "&gdot;"],
-    [0, "&Gcedil;"],
-    [1, "&Hcirc;"],
-    [0, "&hcirc;"],
-    [0, "&Hstrok;"],
-    [0, "&hstrok;"],
-    [0, "&Itilde;"],
-    [0, "&itilde;"],
-    [0, "&Imacr;"],
-    [0, "&imacr;"],
-    [2, "&Iogon;"],
-    [0, "&iogon;"],
-    [0, "&Idot;"],
-    [0, "&imath;"],
-    [0, "&IJlig;"],
-    [0, "&ijlig;"],
-    [0, "&Jcirc;"],
-    [0, "&jcirc;"],
-    [0, "&Kcedil;"],
-    [0, "&kcedil;"],
-    [0, "&kgreen;"],
-    [0, "&Lacute;"],
-    [0, "&lacute;"],
-    [0, "&Lcedil;"],
-    [0, "&lcedil;"],
-    [0, "&Lcaron;"],
-    [0, "&lcaron;"],
-    [0, "&Lmidot;"],
-    [0, "&lmidot;"],
-    [0, "&Lstrok;"],
-    [0, "&lstrok;"],
-    [0, "&Nacute;"],
-    [0, "&nacute;"],
-    [0, "&Ncedil;"],
-    [0, "&ncedil;"],
-    [0, "&Ncaron;"],
-    [0, "&ncaron;"],
-    [0, "&napos;"],
-    [0, "&ENG;"],
-    [0, "&eng;"],
-    [0, "&Omacr;"],
-    [0, "&omacr;"],
-    [2, "&Odblac;"],
-    [0, "&odblac;"],
-    [0, "&OElig;"],
-    [0, "&oelig;"],
-    [0, "&Racute;"],
-    [0, "&racute;"],
-    [0, "&Rcedil;"],
-    [0, "&rcedil;"],
-    [0, "&Rcaron;"],
-    [0, "&rcaron;"],
-    [0, "&Sacute;"],
-    [0, "&sacute;"],
-    [0, "&Scirc;"],
-    [0, "&scirc;"],
-    [0, "&Scedil;"],
-    [0, "&scedil;"],
-    [0, "&Scaron;"],
-    [0, "&scaron;"],
-    [0, "&Tcedil;"],
-    [0, "&tcedil;"],
-    [0, "&Tcaron;"],
-    [0, "&tcaron;"],
-    [0, "&Tstrok;"],
-    [0, "&tstrok;"],
-    [0, "&Utilde;"],
-    [0, "&utilde;"],
-    [0, "&Umacr;"],
-    [0, "&umacr;"],
-    [0, "&Ubreve;"],
-    [0, "&ubreve;"],
-    [0, "&Uring;"],
-    [0, "&uring;"],
-    [0, "&Udblac;"],
-    [0, "&udblac;"],
-    [0, "&Uogon;"],
-    [0, "&uogon;"],
-    [0, "&Wcirc;"],
-    [0, "&wcirc;"],
-    [0, "&Ycirc;"],
-    [0, "&ycirc;"],
-    [0, "&Yuml;"],
-    [0, "&Zacute;"],
-    [0, "&zacute;"],
-    [0, "&Zdot;"],
-    [0, "&zdot;"],
-    [0, "&Zcaron;"],
-    [0, "&zcaron;"],
-    [19, "&fnof;"],
-    [34, "&imped;"],
-    [63, "&gacute;"],
-    [65, "&jmath;"],
-    [142, "&circ;"],
-    [0, "&caron;"],
-    [16, "&breve;"],
-    [0, "&DiacriticalDot;"],
-    [0, "&ring;"],
-    [0, "&ogon;"],
-    [0, "&DiacriticalTilde;"],
-    [0, "&dblac;"],
-    [51, "&DownBreve;"],
-    [127, "&Alpha;"],
-    [0, "&Beta;"],
-    [0, "&Gamma;"],
-    [0, "&Delta;"],
-    [0, "&Epsilon;"],
-    [0, "&Zeta;"],
-    [0, "&Eta;"],
-    [0, "&Theta;"],
-    [0, "&Iota;"],
-    [0, "&Kappa;"],
-    [0, "&Lambda;"],
-    [0, "&Mu;"],
-    [0, "&Nu;"],
-    [0, "&Xi;"],
-    [0, "&Omicron;"],
-    [0, "&Pi;"],
-    [0, "&Rho;"],
-    [1, "&Sigma;"],
-    [0, "&Tau;"],
-    [0, "&Upsilon;"],
-    [0, "&Phi;"],
-    [0, "&Chi;"],
-    [0, "&Psi;"],
-    [0, "&ohm;"],
-    [7, "&alpha;"],
-    [0, "&beta;"],
-    [0, "&gamma;"],
-    [0, "&delta;"],
-    [0, "&epsi;"],
-    [0, "&zeta;"],
-    [0, "&eta;"],
-    [0, "&theta;"],
-    [0, "&iota;"],
-    [0, "&kappa;"],
-    [0, "&lambda;"],
-    [0, "&mu;"],
-    [0, "&nu;"],
-    [0, "&xi;"],
-    [0, "&omicron;"],
-    [0, "&pi;"],
-    [0, "&rho;"],
-    [0, "&sigmaf;"],
-    [0, "&sigma;"],
-    [0, "&tau;"],
-    [0, "&upsi;"],
-    [0, "&phi;"],
-    [0, "&chi;"],
-    [0, "&psi;"],
-    [0, "&omega;"],
-    [7, "&thetasym;"],
-    [0, "&Upsi;"],
-    [2, "&phiv;"],
-    [0, "&piv;"],
-    [5, "&Gammad;"],
-    [0, "&digamma;"],
-    [18, "&kappav;"],
-    [0, "&rhov;"],
-    [3, "&epsiv;"],
-    [0, "&backepsilon;"],
-    [10, "&IOcy;"],
-    [0, "&DJcy;"],
-    [0, "&GJcy;"],
-    [0, "&Jukcy;"],
-    [0, "&DScy;"],
-    [0, "&Iukcy;"],
-    [0, "&YIcy;"],
-    [0, "&Jsercy;"],
-    [0, "&LJcy;"],
-    [0, "&NJcy;"],
-    [0, "&TSHcy;"],
-    [0, "&KJcy;"],
-    [1, "&Ubrcy;"],
-    [0, "&DZcy;"],
-    [0, "&Acy;"],
-    [0, "&Bcy;"],
-    [0, "&Vcy;"],
-    [0, "&Gcy;"],
-    [0, "&Dcy;"],
-    [0, "&IEcy;"],
-    [0, "&ZHcy;"],
-    [0, "&Zcy;"],
-    [0, "&Icy;"],
-    [0, "&Jcy;"],
-    [0, "&Kcy;"],
-    [0, "&Lcy;"],
-    [0, "&Mcy;"],
-    [0, "&Ncy;"],
-    [0, "&Ocy;"],
-    [0, "&Pcy;"],
-    [0, "&Rcy;"],
-    [0, "&Scy;"],
-    [0, "&Tcy;"],
-    [0, "&Ucy;"],
-    [0, "&Fcy;"],
-    [0, "&KHcy;"],
-    [0, "&TScy;"],
-    [0, "&CHcy;"],
-    [0, "&SHcy;"],
-    [0, "&SHCHcy;"],
-    [0, "&HARDcy;"],
-    [0, "&Ycy;"],
-    [0, "&SOFTcy;"],
-    [0, "&Ecy;"],
-    [0, "&YUcy;"],
-    [0, "&YAcy;"],
-    [0, "&acy;"],
-    [0, "&bcy;"],
-    [0, "&vcy;"],
-    [0, "&gcy;"],
-    [0, "&dcy;"],
-    [0, "&iecy;"],
-    [0, "&zhcy;"],
-    [0, "&zcy;"],
-    [0, "&icy;"],
-    [0, "&jcy;"],
-    [0, "&kcy;"],
-    [0, "&lcy;"],
-    [0, "&mcy;"],
-    [0, "&ncy;"],
-    [0, "&ocy;"],
-    [0, "&pcy;"],
-    [0, "&rcy;"],
-    [0, "&scy;"],
-    [0, "&tcy;"],
-    [0, "&ucy;"],
-    [0, "&fcy;"],
-    [0, "&khcy;"],
-    [0, "&tscy;"],
-    [0, "&chcy;"],
-    [0, "&shcy;"],
-    [0, "&shchcy;"],
-    [0, "&hardcy;"],
-    [0, "&ycy;"],
-    [0, "&softcy;"],
-    [0, "&ecy;"],
-    [0, "&yucy;"],
-    [0, "&yacy;"],
-    [1, "&iocy;"],
-    [0, "&djcy;"],
-    [0, "&gjcy;"],
-    [0, "&jukcy;"],
-    [0, "&dscy;"],
-    [0, "&iukcy;"],
-    [0, "&yicy;"],
-    [0, "&jsercy;"],
-    [0, "&ljcy;"],
-    [0, "&njcy;"],
-    [0, "&tshcy;"],
-    [0, "&kjcy;"],
-    [1, "&ubrcy;"],
-    [0, "&dzcy;"],
-    [7074, "&ensp;"],
-    [0, "&emsp;"],
-    [0, "&emsp13;"],
-    [0, "&emsp14;"],
-    [1, "&numsp;"],
-    [0, "&puncsp;"],
-    [0, "&ThinSpace;"],
-    [0, "&hairsp;"],
-    [0, "&NegativeMediumSpace;"],
-    [0, "&zwnj;"],
-    [0, "&zwj;"],
-    [0, "&lrm;"],
-    [0, "&rlm;"],
-    [0, "&dash;"],
-    [2, "&ndash;"],
-    [0, "&mdash;"],
-    [0, "&horbar;"],
-    [0, "&Verbar;"],
-    [1, "&lsquo;"],
-    [0, "&CloseCurlyQuote;"],
-    [0, "&lsquor;"],
-    [1, "&ldquo;"],
-    [0, "&CloseCurlyDoubleQuote;"],
-    [0, "&bdquo;"],
-    [1, "&dagger;"],
-    [0, "&Dagger;"],
-    [0, "&bull;"],
-    [2, "&nldr;"],
-    [0, "&hellip;"],
-    [9, "&permil;"],
-    [0, "&pertenk;"],
-    [0, "&prime;"],
-    [0, "&Prime;"],
-    [0, "&tprime;"],
-    [0, "&backprime;"],
-    [3, "&lsaquo;"],
-    [0, "&rsaquo;"],
-    [3, "&oline;"],
-    [2, "&caret;"],
-    [1, "&hybull;"],
-    [0, "&frasl;"],
-    [10, "&bsemi;"],
-    [7, "&qprime;"],
-    [
-      7,
-      {
-        v: "&MediumSpace;",
-        n: 8202,
-        o: "&ThickSpace;",
-      },
-    ],
-    [0, "&NoBreak;"],
-    [0, "&af;"],
-    [0, "&InvisibleTimes;"],
-    [0, "&ic;"],
-    [72, "&euro;"],
-    [46, "&tdot;"],
-    [0, "&DotDot;"],
-    [37, "&complexes;"],
-    [2, "&incare;"],
-    [4, "&gscr;"],
-    [0, "&hamilt;"],
-    [0, "&Hfr;"],
-    [0, "&Hopf;"],
-    [0, "&planckh;"],
-    [0, "&hbar;"],
-    [0, "&imagline;"],
-    [0, "&Ifr;"],
-    [0, "&lagran;"],
-    [0, "&ell;"],
-    [1, "&naturals;"],
-    [0, "&numero;"],
-    [0, "&copysr;"],
-    [0, "&weierp;"],
-    [0, "&Popf;"],
-    [0, "&Qopf;"],
-    [0, "&realine;"],
-    [0, "&real;"],
-    [0, "&reals;"],
-    [0, "&rx;"],
-    [3, "&trade;"],
-    [1, "&integers;"],
-    [2, "&mho;"],
-    [0, "&zeetrf;"],
-    [0, "&iiota;"],
-    [2, "&bernou;"],
-    [0, "&Cayleys;"],
-    [1, "&escr;"],
-    [0, "&Escr;"],
-    [0, "&Fouriertrf;"],
-    [1, "&Mellintrf;"],
-    [0, "&order;"],
-    [0, "&alefsym;"],
-    [0, "&beth;"],
-    [0, "&gimel;"],
-    [0, "&daleth;"],
-    [12, "&CapitalDifferentialD;"],
-    [0, "&dd;"],
-    [0, "&ee;"],
-    [0, "&ii;"],
-    [10, "&frac13;"],
-    [0, "&frac23;"],
-    [0, "&frac15;"],
-    [0, "&frac25;"],
-    [0, "&frac35;"],
-    [0, "&frac45;"],
-    [0, "&frac16;"],
-    [0, "&frac56;"],
-    [0, "&frac18;"],
-    [0, "&frac38;"],
-    [0, "&frac58;"],
-    [0, "&frac78;"],
-    [49, "&larr;"],
-    [0, "&ShortUpArrow;"],
-    [0, "&rarr;"],
-    [0, "&darr;"],
-    [0, "&harr;"],
-    [0, "&updownarrow;"],
-    [0, "&nwarr;"],
-    [0, "&nearr;"],
-    [0, "&LowerRightArrow;"],
-    [0, "&LowerLeftArrow;"],
-    [0, "&nlarr;"],
-    [0, "&nrarr;"],
-    [
-      1,
-      {
-        v: "&rarrw;",
-        n: 824,
-        o: "&nrarrw;",
-      },
-    ],
-    [0, "&Larr;"],
-    [0, "&Uarr;"],
-    [0, "&Rarr;"],
-    [0, "&Darr;"],
-    [0, "&larrtl;"],
-    [0, "&rarrtl;"],
-    [0, "&LeftTeeArrow;"],
-    [0, "&mapstoup;"],
-    [0, "&map;"],
-    [0, "&DownTeeArrow;"],
-    [1, "&hookleftarrow;"],
-    [0, "&hookrightarrow;"],
-    [0, "&larrlp;"],
-    [0, "&looparrowright;"],
-    [0, "&harrw;"],
-    [0, "&nharr;"],
-    [1, "&lsh;"],
-    [0, "&rsh;"],
-    [0, "&ldsh;"],
-    [0, "&rdsh;"],
-    [1, "&crarr;"],
-    [0, "&cularr;"],
-    [0, "&curarr;"],
-    [2, "&circlearrowleft;"],
-    [0, "&circlearrowright;"],
-    [0, "&leftharpoonup;"],
-    [0, "&DownLeftVector;"],
-    [0, "&RightUpVector;"],
-    [0, "&LeftUpVector;"],
-    [0, "&rharu;"],
-    [0, "&DownRightVector;"],
-    [0, "&dharr;"],
-    [0, "&dharl;"],
-    [0, "&RightArrowLeftArrow;"],
-    [0, "&udarr;"],
-    [0, "&LeftArrowRightArrow;"],
-    [0, "&leftleftarrows;"],
-    [0, "&upuparrows;"],
-    [0, "&rightrightarrows;"],
-    [0, "&ddarr;"],
-    [0, "&leftrightharpoons;"],
-    [0, "&Equilibrium;"],
-    [0, "&nlArr;"],
-    [0, "&nhArr;"],
-    [0, "&nrArr;"],
-    [0, "&DoubleLeftArrow;"],
-    [0, "&DoubleUpArrow;"],
-    [0, "&DoubleRightArrow;"],
-    [0, "&dArr;"],
-    [0, "&DoubleLeftRightArrow;"],
-    [0, "&DoubleUpDownArrow;"],
-    [0, "&nwArr;"],
-    [0, "&neArr;"],
-    [0, "&seArr;"],
-    [0, "&swArr;"],
-    [0, "&lAarr;"],
-    [0, "&rAarr;"],
-    [1, "&zigrarr;"],
-    [6, "&larrb;"],
-    [0, "&rarrb;"],
-    [15, "&DownArrowUpArrow;"],
-    [7, "&loarr;"],
-    [0, "&roarr;"],
-    [0, "&hoarr;"],
-    [0, "&forall;"],
-    [0, "&comp;"],
-    [
-      0,
-      {
-        v: "&part;",
-        n: 824,
-        o: "&npart;",
-      },
-    ],
-    [0, "&exist;"],
-    [0, "&nexist;"],
-    [0, "&empty;"],
-    [1, "&Del;"],
-    [0, "&Element;"],
-    [0, "&NotElement;"],
-    [1, "&ni;"],
-    [0, "&notni;"],
-    [2, "&prod;"],
-    [0, "&coprod;"],
-    [0, "&sum;"],
-    [0, "&minus;"],
-    [0, "&MinusPlus;"],
-    [0, "&dotplus;"],
-    [1, "&Backslash;"],
-    [0, "&lowast;"],
-    [0, "&compfn;"],
-    [1, "&radic;"],
-    [2, "&prop;"],
-    [0, "&infin;"],
-    [0, "&angrt;"],
-    [
-      0,
-      {
-        v: "&ang;",
-        n: 8402,
-        o: "&nang;",
-      },
-    ],
-    [0, "&angmsd;"],
-    [0, "&angsph;"],
-    [0, "&mid;"],
-    [0, "&nmid;"],
-    [0, "&DoubleVerticalBar;"],
-    [0, "&NotDoubleVerticalBar;"],
-    [0, "&and;"],
-    [0, "&or;"],
-    [
-      0,
-      {
-        v: "&cap;",
-        n: 65024,
-        o: "&caps;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&cup;",
-        n: 65024,
-        o: "&cups;",
-      },
-    ],
-    [0, "&int;"],
-    [0, "&Int;"],
-    [0, "&iiint;"],
-    [0, "&conint;"],
-    [0, "&Conint;"],
-    [0, "&Cconint;"],
-    [0, "&cwint;"],
-    [0, "&ClockwiseContourIntegral;"],
-    [0, "&awconint;"],
-    [0, "&there4;"],
-    [0, "&becaus;"],
-    [0, "&ratio;"],
-    [0, "&Colon;"],
-    [0, "&dotminus;"],
-    [1, "&mDDot;"],
-    [0, "&homtht;"],
-    [
-      0,
-      {
-        v: "&sim;",
-        n: 8402,
-        o: "&nvsim;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&backsim;",
-        n: 817,
-        o: "&race;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&ac;",
-        n: 819,
-        o: "&acE;",
-      },
-    ],
-    [0, "&acd;"],
-    [0, "&VerticalTilde;"],
-    [0, "&NotTilde;"],
-    [
-      0,
-      {
-        v: "&eqsim;",
-        n: 824,
-        o: "&nesim;",
-      },
-    ],
-    [0, "&sime;"],
-    [0, "&NotTildeEqual;"],
-    [0, "&cong;"],
-    [0, "&simne;"],
-    [0, "&ncong;"],
-    [0, "&ap;"],
-    [0, "&nap;"],
-    [0, "&ape;"],
-    [
-      0,
-      {
-        v: "&apid;",
-        n: 824,
-        o: "&napid;",
-      },
-    ],
-    [0, "&backcong;"],
-    [
-      0,
-      {
-        v: "&asympeq;",
-        n: 8402,
-        o: "&nvap;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&bump;",
-        n: 824,
-        o: "&nbump;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&bumpe;",
-        n: 824,
-        o: "&nbumpe;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&doteq;",
-        n: 824,
-        o: "&nedot;",
-      },
-    ],
-    [0, "&doteqdot;"],
-    [0, "&efDot;"],
-    [0, "&erDot;"],
-    [0, "&Assign;"],
-    [0, "&ecolon;"],
-    [0, "&ecir;"],
-    [0, "&circeq;"],
-    [1, "&wedgeq;"],
-    [0, "&veeeq;"],
-    [1, "&triangleq;"],
-    [2, "&equest;"],
-    [0, "&ne;"],
-    [
-      0,
-      {
-        v: "&Congruent;",
-        n: 8421,
-        o: "&bnequiv;",
-      },
-    ],
-    [0, "&nequiv;"],
-    [
-      1,
-      {
-        v: "&le;",
-        n: 8402,
-        o: "&nvle;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&ge;",
-        n: 8402,
-        o: "&nvge;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&lE;",
-        n: 824,
-        o: "&nlE;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&gE;",
-        n: 824,
-        o: "&ngE;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&lnE;",
-        n: 65024,
-        o: "&lvertneqq;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&gnE;",
-        n: 65024,
-        o: "&gvertneqq;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&ll;",
-        n: new Map(
-          /* @__PURE__ */ restoreDiff([
-            [824, "&nLtv;"],
-            [7577, "&nLt;"],
-          ]),
-        ),
-      },
-    ],
-    [
-      0,
-      {
-        v: "&gg;",
-        n: new Map(
-          /* @__PURE__ */ restoreDiff([
-            [824, "&nGtv;"],
-            [7577, "&nGt;"],
-          ]),
-        ),
-      },
-    ],
-    [0, "&between;"],
-    [0, "&NotCupCap;"],
-    [0, "&nless;"],
-    [0, "&ngt;"],
-    [0, "&nle;"],
-    [0, "&nge;"],
-    [0, "&lesssim;"],
-    [0, "&GreaterTilde;"],
-    [0, "&nlsim;"],
-    [0, "&ngsim;"],
-    [0, "&LessGreater;"],
-    [0, "&gl;"],
-    [0, "&NotLessGreater;"],
-    [0, "&NotGreaterLess;"],
-    [0, "&pr;"],
-    [0, "&sc;"],
-    [0, "&prcue;"],
-    [0, "&sccue;"],
-    [0, "&PrecedesTilde;"],
-    [
-      0,
-      {
-        v: "&scsim;",
-        n: 824,
-        o: "&NotSucceedsTilde;",
-      },
-    ],
-    [0, "&NotPrecedes;"],
-    [0, "&NotSucceeds;"],
-    [
-      0,
-      {
-        v: "&sub;",
-        n: 8402,
-        o: "&NotSubset;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&sup;",
-        n: 8402,
-        o: "&NotSuperset;",
-      },
-    ],
-    [0, "&nsub;"],
-    [0, "&nsup;"],
-    [0, "&sube;"],
-    [0, "&supe;"],
-    [0, "&NotSubsetEqual;"],
-    [0, "&NotSupersetEqual;"],
-    [
-      0,
-      {
-        v: "&subne;",
-        n: 65024,
-        o: "&varsubsetneq;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&supne;",
-        n: 65024,
-        o: "&varsupsetneq;",
-      },
-    ],
-    [1, "&cupdot;"],
-    [0, "&UnionPlus;"],
-    [
-      0,
-      {
-        v: "&sqsub;",
-        n: 824,
-        o: "&NotSquareSubset;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&sqsup;",
-        n: 824,
-        o: "&NotSquareSuperset;",
-      },
-    ],
-    [0, "&sqsube;"],
-    [0, "&sqsupe;"],
-    [
-      0,
-      {
-        v: "&sqcap;",
-        n: 65024,
-        o: "&sqcaps;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&sqcup;",
-        n: 65024,
-        o: "&sqcups;",
-      },
-    ],
-    [0, "&CirclePlus;"],
-    [0, "&CircleMinus;"],
-    [0, "&CircleTimes;"],
-    [0, "&osol;"],
-    [0, "&CircleDot;"],
-    [0, "&circledcirc;"],
-    [0, "&circledast;"],
-    [1, "&circleddash;"],
-    [0, "&boxplus;"],
-    [0, "&boxminus;"],
-    [0, "&boxtimes;"],
-    [0, "&dotsquare;"],
-    [0, "&RightTee;"],
-    [0, "&dashv;"],
-    [0, "&DownTee;"],
-    [0, "&bot;"],
-    [1, "&models;"],
-    [0, "&DoubleRightTee;"],
-    [0, "&Vdash;"],
-    [0, "&Vvdash;"],
-    [0, "&VDash;"],
-    [0, "&nvdash;"],
-    [0, "&nvDash;"],
-    [0, "&nVdash;"],
-    [0, "&nVDash;"],
-    [0, "&prurel;"],
-    [1, "&LeftTriangle;"],
-    [0, "&RightTriangle;"],
-    [
-      0,
-      {
-        v: "&LeftTriangleEqual;",
-        n: 8402,
-        o: "&nvltrie;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&RightTriangleEqual;",
-        n: 8402,
-        o: "&nvrtrie;",
-      },
-    ],
-    [0, "&origof;"],
-    [0, "&imof;"],
-    [0, "&multimap;"],
-    [0, "&hercon;"],
-    [0, "&intcal;"],
-    [0, "&veebar;"],
-    [1, "&barvee;"],
-    [0, "&angrtvb;"],
-    [0, "&lrtri;"],
-    [0, "&bigwedge;"],
-    [0, "&bigvee;"],
-    [0, "&bigcap;"],
-    [0, "&bigcup;"],
-    [0, "&diam;"],
-    [0, "&sdot;"],
-    [0, "&sstarf;"],
-    [0, "&divideontimes;"],
-    [0, "&bowtie;"],
-    [0, "&ltimes;"],
-    [0, "&rtimes;"],
-    [0, "&leftthreetimes;"],
-    [0, "&rightthreetimes;"],
-    [0, "&backsimeq;"],
-    [0, "&curlyvee;"],
-    [0, "&curlywedge;"],
-    [0, "&Sub;"],
-    [0, "&Sup;"],
-    [0, "&Cap;"],
-    [0, "&Cup;"],
-    [0, "&fork;"],
-    [0, "&epar;"],
-    [0, "&lessdot;"],
-    [0, "&gtdot;"],
-    [
-      0,
-      {
-        v: "&Ll;",
-        n: 824,
-        o: "&nLl;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&Gg;",
-        n: 824,
-        o: "&nGg;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&leg;",
-        n: 65024,
-        o: "&lesg;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&gel;",
-        n: 65024,
-        o: "&gesl;",
-      },
-    ],
-    [2, "&cuepr;"],
-    [0, "&cuesc;"],
-    [0, "&NotPrecedesSlantEqual;"],
-    [0, "&NotSucceedsSlantEqual;"],
-    [0, "&NotSquareSubsetEqual;"],
-    [0, "&NotSquareSupersetEqual;"],
-    [2, "&lnsim;"],
-    [0, "&gnsim;"],
-    [0, "&precnsim;"],
-    [0, "&scnsim;"],
-    [0, "&nltri;"],
-    [0, "&NotRightTriangle;"],
-    [0, "&nltrie;"],
-    [0, "&NotRightTriangleEqual;"],
-    [0, "&vellip;"],
-    [0, "&ctdot;"],
-    [0, "&utdot;"],
-    [0, "&dtdot;"],
-    [0, "&disin;"],
-    [0, "&isinsv;"],
-    [0, "&isins;"],
-    [
-      0,
-      {
-        v: "&isindot;",
-        n: 824,
-        o: "&notindot;",
-      },
-    ],
-    [0, "&notinvc;"],
-    [0, "&notinvb;"],
-    [
-      1,
-      {
-        v: "&isinE;",
-        n: 824,
-        o: "&notinE;",
-      },
-    ],
-    [0, "&nisd;"],
-    [0, "&xnis;"],
-    [0, "&nis;"],
-    [0, "&notnivc;"],
-    [0, "&notnivb;"],
-    [6, "&barwed;"],
-    [0, "&Barwed;"],
-    [1, "&lceil;"],
-    [0, "&rceil;"],
-    [0, "&LeftFloor;"],
-    [0, "&rfloor;"],
-    [0, "&drcrop;"],
-    [0, "&dlcrop;"],
-    [0, "&urcrop;"],
-    [0, "&ulcrop;"],
-    [0, "&bnot;"],
-    [1, "&profline;"],
-    [0, "&profsurf;"],
-    [1, "&telrec;"],
-    [0, "&target;"],
-    [5, "&ulcorn;"],
-    [0, "&urcorn;"],
-    [0, "&dlcorn;"],
-    [0, "&drcorn;"],
-    [2, "&frown;"],
-    [0, "&smile;"],
-    [9, "&cylcty;"],
-    [0, "&profalar;"],
-    [7, "&topbot;"],
-    [6, "&ovbar;"],
-    [1, "&solbar;"],
-    [60, "&angzarr;"],
-    [51, "&lmoustache;"],
-    [0, "&rmoustache;"],
-    [2, "&OverBracket;"],
-    [0, "&bbrk;"],
-    [0, "&bbrktbrk;"],
-    [37, "&OverParenthesis;"],
-    [0, "&UnderParenthesis;"],
-    [0, "&OverBrace;"],
-    [0, "&UnderBrace;"],
-    [2, "&trpezium;"],
-    [4, "&elinters;"],
-    [59, "&blank;"],
-    [164, "&circledS;"],
-    [55, "&boxh;"],
-    [1, "&boxv;"],
-    [9, "&boxdr;"],
-    [3, "&boxdl;"],
-    [3, "&boxur;"],
-    [3, "&boxul;"],
-    [3, "&boxvr;"],
-    [7, "&boxvl;"],
-    [7, "&boxhd;"],
-    [7, "&boxhu;"],
-    [7, "&boxvh;"],
-    [19, "&boxH;"],
-    [0, "&boxV;"],
-    [0, "&boxdR;"],
-    [0, "&boxDr;"],
-    [0, "&boxDR;"],
-    [0, "&boxdL;"],
-    [0, "&boxDl;"],
-    [0, "&boxDL;"],
-    [0, "&boxuR;"],
-    [0, "&boxUr;"],
-    [0, "&boxUR;"],
-    [0, "&boxuL;"],
-    [0, "&boxUl;"],
-    [0, "&boxUL;"],
-    [0, "&boxvR;"],
-    [0, "&boxVr;"],
-    [0, "&boxVR;"],
-    [0, "&boxvL;"],
-    [0, "&boxVl;"],
-    [0, "&boxVL;"],
-    [0, "&boxHd;"],
-    [0, "&boxhD;"],
-    [0, "&boxHD;"],
-    [0, "&boxHu;"],
-    [0, "&boxhU;"],
-    [0, "&boxHU;"],
-    [0, "&boxvH;"],
-    [0, "&boxVh;"],
-    [0, "&boxVH;"],
-    [19, "&uhblk;"],
-    [3, "&lhblk;"],
-    [3, "&block;"],
-    [8, "&blk14;"],
-    [0, "&blk12;"],
-    [0, "&blk34;"],
-    [13, "&square;"],
-    [8, "&blacksquare;"],
-    [0, "&EmptyVerySmallSquare;"],
-    [1, "&rect;"],
-    [0, "&marker;"],
-    [2, "&fltns;"],
-    [1, "&bigtriangleup;"],
-    [0, "&blacktriangle;"],
-    [0, "&triangle;"],
-    [2, "&blacktriangleright;"],
-    [0, "&rtri;"],
-    [3, "&bigtriangledown;"],
-    [0, "&blacktriangledown;"],
-    [0, "&dtri;"],
-    [2, "&blacktriangleleft;"],
-    [0, "&ltri;"],
-    [6, "&loz;"],
-    [0, "&cir;"],
-    [32, "&tridot;"],
-    [2, "&bigcirc;"],
-    [8, "&ultri;"],
-    [0, "&urtri;"],
-    [0, "&lltri;"],
-    [0, "&EmptySmallSquare;"],
-    [0, "&FilledSmallSquare;"],
-    [8, "&bigstar;"],
-    [0, "&star;"],
-    [7, "&phone;"],
-    [49, "&female;"],
-    [1, "&male;"],
-    [29, "&spades;"],
-    [2, "&clubs;"],
-    [1, "&hearts;"],
-    [0, "&diamondsuit;"],
-    [3, "&sung;"],
-    [2, "&flat;"],
-    [0, "&natural;"],
-    [0, "&sharp;"],
-    [163, "&check;"],
-    [3, "&cross;"],
-    [8, "&malt;"],
-    [21, "&sext;"],
-    [33, "&VerticalSeparator;"],
-    [25, "&lbbrk;"],
-    [0, "&rbbrk;"],
-    [84, "&bsolhsub;"],
-    [0, "&suphsol;"],
-    [28, "&LeftDoubleBracket;"],
-    [0, "&RightDoubleBracket;"],
-    [0, "&lang;"],
-    [0, "&rang;"],
-    [0, "&Lang;"],
-    [0, "&Rang;"],
-    [0, "&loang;"],
-    [0, "&roang;"],
-    [7, "&longleftarrow;"],
-    [0, "&longrightarrow;"],
-    [0, "&longleftrightarrow;"],
-    [0, "&DoubleLongLeftArrow;"],
-    [0, "&DoubleLongRightArrow;"],
-    [0, "&DoubleLongLeftRightArrow;"],
-    [1, "&longmapsto;"],
-    [2, "&dzigrarr;"],
-    [258, "&nvlArr;"],
-    [0, "&nvrArr;"],
-    [0, "&nvHarr;"],
-    [0, "&Map;"],
-    [6, "&lbarr;"],
-    [0, "&bkarow;"],
-    [0, "&lBarr;"],
-    [0, "&dbkarow;"],
-    [0, "&drbkarow;"],
-    [0, "&DDotrahd;"],
-    [0, "&UpArrowBar;"],
-    [0, "&DownArrowBar;"],
-    [2, "&Rarrtl;"],
-    [2, "&latail;"],
-    [0, "&ratail;"],
-    [0, "&lAtail;"],
-    [0, "&rAtail;"],
-    [0, "&larrfs;"],
-    [0, "&rarrfs;"],
-    [0, "&larrbfs;"],
-    [0, "&rarrbfs;"],
-    [2, "&nwarhk;"],
-    [0, "&nearhk;"],
-    [0, "&hksearow;"],
-    [0, "&hkswarow;"],
-    [0, "&nwnear;"],
-    [0, "&nesear;"],
-    [0, "&seswar;"],
-    [0, "&swnwar;"],
-    [
-      8,
-      {
-        v: "&rarrc;",
-        n: 824,
-        o: "&nrarrc;",
-      },
-    ],
-    [1, "&cudarrr;"],
-    [0, "&ldca;"],
-    [0, "&rdca;"],
-    [0, "&cudarrl;"],
-    [0, "&larrpl;"],
-    [2, "&curarrm;"],
-    [0, "&cularrp;"],
-    [7, "&rarrpl;"],
-    [2, "&harrcir;"],
-    [0, "&Uarrocir;"],
-    [0, "&lurdshar;"],
-    [0, "&ldrushar;"],
-    [2, "&LeftRightVector;"],
-    [0, "&RightUpDownVector;"],
-    [0, "&DownLeftRightVector;"],
-    [0, "&LeftUpDownVector;"],
-    [0, "&LeftVectorBar;"],
-    [0, "&RightVectorBar;"],
-    [0, "&RightUpVectorBar;"],
-    [0, "&RightDownVectorBar;"],
-    [0, "&DownLeftVectorBar;"],
-    [0, "&DownRightVectorBar;"],
-    [0, "&LeftUpVectorBar;"],
-    [0, "&LeftDownVectorBar;"],
-    [0, "&LeftTeeVector;"],
-    [0, "&RightTeeVector;"],
-    [0, "&RightUpTeeVector;"],
-    [0, "&RightDownTeeVector;"],
-    [0, "&DownLeftTeeVector;"],
-    [0, "&DownRightTeeVector;"],
-    [0, "&LeftUpTeeVector;"],
-    [0, "&LeftDownTeeVector;"],
-    [0, "&lHar;"],
-    [0, "&uHar;"],
-    [0, "&rHar;"],
-    [0, "&dHar;"],
-    [0, "&luruhar;"],
-    [0, "&ldrdhar;"],
-    [0, "&ruluhar;"],
-    [0, "&rdldhar;"],
-    [0, "&lharul;"],
-    [0, "&llhard;"],
-    [0, "&rharul;"],
-    [0, "&lrhard;"],
-    [0, "&udhar;"],
-    [0, "&duhar;"],
-    [0, "&RoundImplies;"],
-    [0, "&erarr;"],
-    [0, "&simrarr;"],
-    [0, "&larrsim;"],
-    [0, "&rarrsim;"],
-    [0, "&rarrap;"],
-    [0, "&ltlarr;"],
-    [1, "&gtrarr;"],
-    [0, "&subrarr;"],
-    [1, "&suplarr;"],
-    [0, "&lfisht;"],
-    [0, "&rfisht;"],
-    [0, "&ufisht;"],
-    [0, "&dfisht;"],
-    [5, "&lopar;"],
-    [0, "&ropar;"],
-    [4, "&lbrke;"],
-    [0, "&rbrke;"],
-    [0, "&lbrkslu;"],
-    [0, "&rbrksld;"],
-    [0, "&lbrksld;"],
-    [0, "&rbrkslu;"],
-    [0, "&langd;"],
-    [0, "&rangd;"],
-    [0, "&lparlt;"],
-    [0, "&rpargt;"],
-    [0, "&gtlPar;"],
-    [0, "&ltrPar;"],
-    [3, "&vzigzag;"],
-    [1, "&vangrt;"],
-    [0, "&angrtvbd;"],
-    [6, "&ange;"],
-    [0, "&range;"],
-    [0, "&dwangle;"],
-    [0, "&uwangle;"],
-    [0, "&angmsdaa;"],
-    [0, "&angmsdab;"],
-    [0, "&angmsdac;"],
-    [0, "&angmsdad;"],
-    [0, "&angmsdae;"],
-    [0, "&angmsdaf;"],
-    [0, "&angmsdag;"],
-    [0, "&angmsdah;"],
-    [0, "&bemptyv;"],
-    [0, "&demptyv;"],
-    [0, "&cemptyv;"],
-    [0, "&raemptyv;"],
-    [0, "&laemptyv;"],
-    [0, "&ohbar;"],
-    [0, "&omid;"],
-    [0, "&opar;"],
-    [1, "&operp;"],
-    [1, "&olcross;"],
-    [0, "&odsold;"],
-    [1, "&olcir;"],
-    [0, "&ofcir;"],
-    [0, "&olt;"],
-    [0, "&ogt;"],
-    [0, "&cirscir;"],
-    [0, "&cirE;"],
-    [0, "&solb;"],
-    [0, "&bsolb;"],
-    [3, "&boxbox;"],
-    [3, "&trisb;"],
-    [0, "&rtriltri;"],
-    [
-      0,
-      {
-        v: "&LeftTriangleBar;",
-        n: 824,
-        o: "&NotLeftTriangleBar;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&RightTriangleBar;",
-        n: 824,
-        o: "&NotRightTriangleBar;",
-      },
-    ],
-    [11, "&iinfin;"],
-    [0, "&infintie;"],
-    [0, "&nvinfin;"],
-    [4, "&eparsl;"],
-    [0, "&smeparsl;"],
-    [0, "&eqvparsl;"],
-    [5, "&blacklozenge;"],
-    [8, "&RuleDelayed;"],
-    [1, "&dsol;"],
-    [9, "&bigodot;"],
-    [0, "&bigoplus;"],
-    [0, "&bigotimes;"],
-    [1, "&biguplus;"],
-    [1, "&bigsqcup;"],
-    [5, "&iiiint;"],
-    [0, "&fpartint;"],
-    [2, "&cirfnint;"],
-    [0, "&awint;"],
-    [0, "&rppolint;"],
-    [0, "&scpolint;"],
-    [0, "&npolint;"],
-    [0, "&pointint;"],
-    [0, "&quatint;"],
-    [0, "&intlarhk;"],
-    [10, "&pluscir;"],
-    [0, "&plusacir;"],
-    [0, "&simplus;"],
-    [0, "&plusdu;"],
-    [0, "&plussim;"],
-    [0, "&plustwo;"],
-    [1, "&mcomma;"],
-    [0, "&minusdu;"],
-    [2, "&loplus;"],
-    [0, "&roplus;"],
-    [0, "&Cross;"],
-    [0, "&timesd;"],
-    [0, "&timesbar;"],
-    [1, "&smashp;"],
-    [0, "&lotimes;"],
-    [0, "&rotimes;"],
-    [0, "&otimesas;"],
-    [0, "&Otimes;"],
-    [0, "&odiv;"],
-    [0, "&triplus;"],
-    [0, "&triminus;"],
-    [0, "&tritime;"],
-    [0, "&intprod;"],
-    [2, "&amalg;"],
-    [0, "&capdot;"],
-    [1, "&ncup;"],
-    [0, "&ncap;"],
-    [0, "&capand;"],
-    [0, "&cupor;"],
-    [0, "&cupcap;"],
-    [0, "&capcup;"],
-    [0, "&cupbrcap;"],
-    [0, "&capbrcup;"],
-    [0, "&cupcup;"],
-    [0, "&capcap;"],
-    [0, "&ccups;"],
-    [0, "&ccaps;"],
-    [2, "&ccupssm;"],
-    [2, "&And;"],
-    [0, "&Or;"],
-    [0, "&andand;"],
-    [0, "&oror;"],
-    [0, "&orslope;"],
-    [0, "&andslope;"],
-    [1, "&andv;"],
-    [0, "&orv;"],
-    [0, "&andd;"],
-    [0, "&ord;"],
-    [1, "&wedbar;"],
-    [6, "&sdote;"],
-    [3, "&simdot;"],
-    [
-      2,
-      {
-        v: "&congdot;",
-        n: 824,
-        o: "&ncongdot;",
-      },
-    ],
-    [0, "&easter;"],
-    [0, "&apacir;"],
-    [
-      0,
-      {
-        v: "&apE;",
-        n: 824,
-        o: "&napE;",
-      },
-    ],
-    [0, "&eplus;"],
-    [0, "&pluse;"],
-    [0, "&Esim;"],
-    [0, "&Colone;"],
-    [0, "&Equal;"],
-    [1, "&ddotseq;"],
-    [0, "&equivDD;"],
-    [0, "&ltcir;"],
-    [0, "&gtcir;"],
-    [0, "&ltquest;"],
-    [0, "&gtquest;"],
-    [
-      0,
-      {
-        v: "&leqslant;",
-        n: 824,
-        o: "&nleqslant;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&geqslant;",
-        n: 824,
-        o: "&ngeqslant;",
-      },
-    ],
-    [0, "&lesdot;"],
-    [0, "&gesdot;"],
-    [0, "&lesdoto;"],
-    [0, "&gesdoto;"],
-    [0, "&lesdotor;"],
-    [0, "&gesdotol;"],
-    [0, "&lap;"],
-    [0, "&gap;"],
-    [0, "&lne;"],
-    [0, "&gne;"],
-    [0, "&lnap;"],
-    [0, "&gnap;"],
-    [0, "&lEg;"],
-    [0, "&gEl;"],
-    [0, "&lsime;"],
-    [0, "&gsime;"],
-    [0, "&lsimg;"],
-    [0, "&gsiml;"],
-    [0, "&lgE;"],
-    [0, "&glE;"],
-    [0, "&lesges;"],
-    [0, "&gesles;"],
-    [0, "&els;"],
-    [0, "&egs;"],
-    [0, "&elsdot;"],
-    [0, "&egsdot;"],
-    [0, "&el;"],
-    [0, "&eg;"],
-    [2, "&siml;"],
-    [0, "&simg;"],
-    [0, "&simlE;"],
-    [0, "&simgE;"],
-    [
-      0,
-      {
-        v: "&LessLess;",
-        n: 824,
-        o: "&NotNestedLessLess;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&GreaterGreater;",
-        n: 824,
-        o: "&NotNestedGreaterGreater;",
-      },
-    ],
-    [1, "&glj;"],
-    [0, "&gla;"],
-    [0, "&ltcc;"],
-    [0, "&gtcc;"],
-    [0, "&lescc;"],
-    [0, "&gescc;"],
-    [0, "&smt;"],
-    [0, "&lat;"],
-    [
-      0,
-      {
-        v: "&smte;",
-        n: 65024,
-        o: "&smtes;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&late;",
-        n: 65024,
-        o: "&lates;",
-      },
-    ],
-    [0, "&bumpE;"],
-    [
-      0,
-      {
-        v: "&PrecedesEqual;",
-        n: 824,
-        o: "&NotPrecedesEqual;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&sce;",
-        n: 824,
-        o: "&NotSucceedsEqual;",
-      },
-    ],
-    [2, "&prE;"],
-    [0, "&scE;"],
-    [0, "&precneqq;"],
-    [0, "&scnE;"],
-    [0, "&prap;"],
-    [0, "&scap;"],
-    [0, "&precnapprox;"],
-    [0, "&scnap;"],
-    [0, "&Pr;"],
-    [0, "&Sc;"],
-    [0, "&subdot;"],
-    [0, "&supdot;"],
-    [0, "&subplus;"],
-    [0, "&supplus;"],
-    [0, "&submult;"],
-    [0, "&supmult;"],
-    [0, "&subedot;"],
-    [0, "&supedot;"],
-    [
-      0,
-      {
-        v: "&subE;",
-        n: 824,
-        o: "&nsubE;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&supE;",
-        n: 824,
-        o: "&nsupE;",
-      },
-    ],
-    [0, "&subsim;"],
-    [0, "&supsim;"],
-    [
-      2,
-      {
-        v: "&subnE;",
-        n: 65024,
-        o: "&varsubsetneqq;",
-      },
-    ],
-    [
-      0,
-      {
-        v: "&supnE;",
-        n: 65024,
-        o: "&varsupsetneqq;",
-      },
-    ],
-    [2, "&csub;"],
-    [0, "&csup;"],
-    [0, "&csube;"],
-    [0, "&csupe;"],
-    [0, "&subsup;"],
-    [0, "&supsub;"],
-    [0, "&subsub;"],
-    [0, "&supsup;"],
-    [0, "&suphsub;"],
-    [0, "&supdsub;"],
-    [0, "&forkv;"],
-    [0, "&topfork;"],
-    [0, "&mlcp;"],
-    [8, "&Dashv;"],
-    [1, "&Vdashl;"],
-    [0, "&Barv;"],
-    [0, "&vBar;"],
-    [0, "&vBarv;"],
-    [1, "&Vbar;"],
-    [0, "&Not;"],
-    [0, "&bNot;"],
-    [0, "&rnmid;"],
-    [0, "&cirmid;"],
-    [0, "&midcir;"],
-    [0, "&topcir;"],
-    [0, "&nhpar;"],
-    [0, "&parsim;"],
-    [
-      9,
-      {
-        v: "&parsl;",
-        n: 8421,
-        o: "&nparsl;",
-      },
-    ],
-    [
-      44343,
-      {
-        n: new Map(
-          /* @__PURE__ */ restoreDiff([
-            [56476, "&Ascr;"],
-            [1, "&Cscr;"],
-            [0, "&Dscr;"],
-            [2, "&Gscr;"],
-            [2, "&Jscr;"],
-            [0, "&Kscr;"],
-            [2, "&Nscr;"],
-            [0, "&Oscr;"],
-            [0, "&Pscr;"],
-            [0, "&Qscr;"],
-            [1, "&Sscr;"],
-            [0, "&Tscr;"],
-            [0, "&Uscr;"],
-            [0, "&Vscr;"],
-            [0, "&Wscr;"],
-            [0, "&Xscr;"],
-            [0, "&Yscr;"],
-            [0, "&Zscr;"],
-            [0, "&ascr;"],
-            [0, "&bscr;"],
-            [0, "&cscr;"],
-            [0, "&dscr;"],
-            [1, "&fscr;"],
-            [1, "&hscr;"],
-            [0, "&iscr;"],
-            [0, "&jscr;"],
-            [0, "&kscr;"],
-            [0, "&lscr;"],
-            [0, "&mscr;"],
-            [0, "&nscr;"],
-            [1, "&pscr;"],
-            [0, "&qscr;"],
-            [0, "&rscr;"],
-            [0, "&sscr;"],
-            [0, "&tscr;"],
-            [0, "&uscr;"],
-            [0, "&vscr;"],
-            [0, "&wscr;"],
-            [0, "&xscr;"],
-            [0, "&yscr;"],
-            [0, "&zscr;"],
-            [52, "&Afr;"],
-            [0, "&Bfr;"],
-            [1, "&Dfr;"],
-            [0, "&Efr;"],
-            [0, "&Ffr;"],
-            [0, "&Gfr;"],
-            [2, "&Jfr;"],
-            [0, "&Kfr;"],
-            [0, "&Lfr;"],
-            [0, "&Mfr;"],
-            [0, "&Nfr;"],
-            [0, "&Ofr;"],
-            [0, "&Pfr;"],
-            [0, "&Qfr;"],
-            [1, "&Sfr;"],
-            [0, "&Tfr;"],
-            [0, "&Ufr;"],
-            [0, "&Vfr;"],
-            [0, "&Wfr;"],
-            [0, "&Xfr;"],
-            [0, "&Yfr;"],
-            [1, "&afr;"],
-            [0, "&bfr;"],
-            [0, "&cfr;"],
-            [0, "&dfr;"],
-            [0, "&efr;"],
-            [0, "&ffr;"],
-            [0, "&gfr;"],
-            [0, "&hfr;"],
-            [0, "&ifr;"],
-            [0, "&jfr;"],
-            [0, "&kfr;"],
-            [0, "&lfr;"],
-            [0, "&mfr;"],
-            [0, "&nfr;"],
-            [0, "&ofr;"],
-            [0, "&pfr;"],
-            [0, "&qfr;"],
-            [0, "&rfr;"],
-            [0, "&sfr;"],
-            [0, "&tfr;"],
-            [0, "&ufr;"],
-            [0, "&vfr;"],
-            [0, "&wfr;"],
-            [0, "&xfr;"],
-            [0, "&yfr;"],
-            [0, "&zfr;"],
-            [0, "&Aopf;"],
-            [0, "&Bopf;"],
-            [1, "&Dopf;"],
-            [0, "&Eopf;"],
-            [0, "&Fopf;"],
-            [0, "&Gopf;"],
-            [1, "&Iopf;"],
-            [0, "&Jopf;"],
-            [0, "&Kopf;"],
-            [0, "&Lopf;"],
-            [0, "&Mopf;"],
-            [1, "&Oopf;"],
-            [3, "&Sopf;"],
-            [0, "&Topf;"],
-            [0, "&Uopf;"],
-            [0, "&Vopf;"],
-            [0, "&Wopf;"],
-            [0, "&Xopf;"],
-            [0, "&Yopf;"],
-            [1, "&aopf;"],
-            [0, "&bopf;"],
-            [0, "&copf;"],
-            [0, "&dopf;"],
-            [0, "&eopf;"],
-            [0, "&fopf;"],
-            [0, "&gopf;"],
-            [0, "&hopf;"],
-            [0, "&iopf;"],
-            [0, "&jopf;"],
-            [0, "&kopf;"],
-            [0, "&lopf;"],
-            [0, "&mopf;"],
-            [0, "&nopf;"],
-            [0, "&oopf;"],
-            [0, "&popf;"],
-            [0, "&qopf;"],
-            [0, "&ropf;"],
-            [0, "&sopf;"],
-            [0, "&topf;"],
-            [0, "&uopf;"],
-            [0, "&vopf;"],
-            [0, "&wopf;"],
-            [0, "&xopf;"],
-            [0, "&yopf;"],
-            [0, "&zopf;"],
-          ]),
-        ),
-      },
-    ],
-    [8906, "&fflig;"],
-    [0, "&filig;"],
-    [0, "&fllig;"],
-    [0, "&ffilig;"],
-    [0, "&ffllig;"],
-  ]),
-);
+var encode_html_default = new Map(/* @__PURE__ */ restoreDiff([
+	[9, "&Tab;"],
+	[0, "&NewLine;"],
+	[22, "&excl;"],
+	[0, "&quot;"],
+	[0, "&num;"],
+	[0, "&dollar;"],
+	[0, "&percnt;"],
+	[0, "&amp;"],
+	[0, "&apos;"],
+	[0, "&lpar;"],
+	[0, "&rpar;"],
+	[0, "&ast;"],
+	[0, "&plus;"],
+	[0, "&comma;"],
+	[1, "&period;"],
+	[0, "&sol;"],
+	[10, "&colon;"],
+	[0, "&semi;"],
+	[0, {
+		v: "&lt;",
+		n: 8402,
+		o: "&nvlt;"
+	}],
+	[0, {
+		v: "&equals;",
+		n: 8421,
+		o: "&bne;"
+	}],
+	[0, {
+		v: "&gt;",
+		n: 8402,
+		o: "&nvgt;"
+	}],
+	[0, "&quest;"],
+	[0, "&commat;"],
+	[26, "&lbrack;"],
+	[0, "&bsol;"],
+	[0, "&rbrack;"],
+	[0, "&Hat;"],
+	[0, "&lowbar;"],
+	[0, "&DiacriticalGrave;"],
+	[5, {
+		n: 106,
+		o: "&fjlig;"
+	}],
+	[20, "&lbrace;"],
+	[0, "&verbar;"],
+	[0, "&rbrace;"],
+	[34, "&nbsp;"],
+	[0, "&iexcl;"],
+	[0, "&cent;"],
+	[0, "&pound;"],
+	[0, "&curren;"],
+	[0, "&yen;"],
+	[0, "&brvbar;"],
+	[0, "&sect;"],
+	[0, "&die;"],
+	[0, "&copy;"],
+	[0, "&ordf;"],
+	[0, "&laquo;"],
+	[0, "&not;"],
+	[0, "&shy;"],
+	[0, "&circledR;"],
+	[0, "&macr;"],
+	[0, "&deg;"],
+	[0, "&PlusMinus;"],
+	[0, "&sup2;"],
+	[0, "&sup3;"],
+	[0, "&acute;"],
+	[0, "&micro;"],
+	[0, "&para;"],
+	[0, "&centerdot;"],
+	[0, "&cedil;"],
+	[0, "&sup1;"],
+	[0, "&ordm;"],
+	[0, "&raquo;"],
+	[0, "&frac14;"],
+	[0, "&frac12;"],
+	[0, "&frac34;"],
+	[0, "&iquest;"],
+	[0, "&Agrave;"],
+	[0, "&Aacute;"],
+	[0, "&Acirc;"],
+	[0, "&Atilde;"],
+	[0, "&Auml;"],
+	[0, "&angst;"],
+	[0, "&AElig;"],
+	[0, "&Ccedil;"],
+	[0, "&Egrave;"],
+	[0, "&Eacute;"],
+	[0, "&Ecirc;"],
+	[0, "&Euml;"],
+	[0, "&Igrave;"],
+	[0, "&Iacute;"],
+	[0, "&Icirc;"],
+	[0, "&Iuml;"],
+	[0, "&ETH;"],
+	[0, "&Ntilde;"],
+	[0, "&Ograve;"],
+	[0, "&Oacute;"],
+	[0, "&Ocirc;"],
+	[0, "&Otilde;"],
+	[0, "&Ouml;"],
+	[0, "&times;"],
+	[0, "&Oslash;"],
+	[0, "&Ugrave;"],
+	[0, "&Uacute;"],
+	[0, "&Ucirc;"],
+	[0, "&Uuml;"],
+	[0, "&Yacute;"],
+	[0, "&THORN;"],
+	[0, "&szlig;"],
+	[0, "&agrave;"],
+	[0, "&aacute;"],
+	[0, "&acirc;"],
+	[0, "&atilde;"],
+	[0, "&auml;"],
+	[0, "&aring;"],
+	[0, "&aelig;"],
+	[0, "&ccedil;"],
+	[0, "&egrave;"],
+	[0, "&eacute;"],
+	[0, "&ecirc;"],
+	[0, "&euml;"],
+	[0, "&igrave;"],
+	[0, "&iacute;"],
+	[0, "&icirc;"],
+	[0, "&iuml;"],
+	[0, "&eth;"],
+	[0, "&ntilde;"],
+	[0, "&ograve;"],
+	[0, "&oacute;"],
+	[0, "&ocirc;"],
+	[0, "&otilde;"],
+	[0, "&ouml;"],
+	[0, "&div;"],
+	[0, "&oslash;"],
+	[0, "&ugrave;"],
+	[0, "&uacute;"],
+	[0, "&ucirc;"],
+	[0, "&uuml;"],
+	[0, "&yacute;"],
+	[0, "&thorn;"],
+	[0, "&yuml;"],
+	[0, "&Amacr;"],
+	[0, "&amacr;"],
+	[0, "&Abreve;"],
+	[0, "&abreve;"],
+	[0, "&Aogon;"],
+	[0, "&aogon;"],
+	[0, "&Cacute;"],
+	[0, "&cacute;"],
+	[0, "&Ccirc;"],
+	[0, "&ccirc;"],
+	[0, "&Cdot;"],
+	[0, "&cdot;"],
+	[0, "&Ccaron;"],
+	[0, "&ccaron;"],
+	[0, "&Dcaron;"],
+	[0, "&dcaron;"],
+	[0, "&Dstrok;"],
+	[0, "&dstrok;"],
+	[0, "&Emacr;"],
+	[0, "&emacr;"],
+	[2, "&Edot;"],
+	[0, "&edot;"],
+	[0, "&Eogon;"],
+	[0, "&eogon;"],
+	[0, "&Ecaron;"],
+	[0, "&ecaron;"],
+	[0, "&Gcirc;"],
+	[0, "&gcirc;"],
+	[0, "&Gbreve;"],
+	[0, "&gbreve;"],
+	[0, "&Gdot;"],
+	[0, "&gdot;"],
+	[0, "&Gcedil;"],
+	[1, "&Hcirc;"],
+	[0, "&hcirc;"],
+	[0, "&Hstrok;"],
+	[0, "&hstrok;"],
+	[0, "&Itilde;"],
+	[0, "&itilde;"],
+	[0, "&Imacr;"],
+	[0, "&imacr;"],
+	[2, "&Iogon;"],
+	[0, "&iogon;"],
+	[0, "&Idot;"],
+	[0, "&imath;"],
+	[0, "&IJlig;"],
+	[0, "&ijlig;"],
+	[0, "&Jcirc;"],
+	[0, "&jcirc;"],
+	[0, "&Kcedil;"],
+	[0, "&kcedil;"],
+	[0, "&kgreen;"],
+	[0, "&Lacute;"],
+	[0, "&lacute;"],
+	[0, "&Lcedil;"],
+	[0, "&lcedil;"],
+	[0, "&Lcaron;"],
+	[0, "&lcaron;"],
+	[0, "&Lmidot;"],
+	[0, "&lmidot;"],
+	[0, "&Lstrok;"],
+	[0, "&lstrok;"],
+	[0, "&Nacute;"],
+	[0, "&nacute;"],
+	[0, "&Ncedil;"],
+	[0, "&ncedil;"],
+	[0, "&Ncaron;"],
+	[0, "&ncaron;"],
+	[0, "&napos;"],
+	[0, "&ENG;"],
+	[0, "&eng;"],
+	[0, "&Omacr;"],
+	[0, "&omacr;"],
+	[2, "&Odblac;"],
+	[0, "&odblac;"],
+	[0, "&OElig;"],
+	[0, "&oelig;"],
+	[0, "&Racute;"],
+	[0, "&racute;"],
+	[0, "&Rcedil;"],
+	[0, "&rcedil;"],
+	[0, "&Rcaron;"],
+	[0, "&rcaron;"],
+	[0, "&Sacute;"],
+	[0, "&sacute;"],
+	[0, "&Scirc;"],
+	[0, "&scirc;"],
+	[0, "&Scedil;"],
+	[0, "&scedil;"],
+	[0, "&Scaron;"],
+	[0, "&scaron;"],
+	[0, "&Tcedil;"],
+	[0, "&tcedil;"],
+	[0, "&Tcaron;"],
+	[0, "&tcaron;"],
+	[0, "&Tstrok;"],
+	[0, "&tstrok;"],
+	[0, "&Utilde;"],
+	[0, "&utilde;"],
+	[0, "&Umacr;"],
+	[0, "&umacr;"],
+	[0, "&Ubreve;"],
+	[0, "&ubreve;"],
+	[0, "&Uring;"],
+	[0, "&uring;"],
+	[0, "&Udblac;"],
+	[0, "&udblac;"],
+	[0, "&Uogon;"],
+	[0, "&uogon;"],
+	[0, "&Wcirc;"],
+	[0, "&wcirc;"],
+	[0, "&Ycirc;"],
+	[0, "&ycirc;"],
+	[0, "&Yuml;"],
+	[0, "&Zacute;"],
+	[0, "&zacute;"],
+	[0, "&Zdot;"],
+	[0, "&zdot;"],
+	[0, "&Zcaron;"],
+	[0, "&zcaron;"],
+	[19, "&fnof;"],
+	[34, "&imped;"],
+	[63, "&gacute;"],
+	[65, "&jmath;"],
+	[142, "&circ;"],
+	[0, "&caron;"],
+	[16, "&breve;"],
+	[0, "&DiacriticalDot;"],
+	[0, "&ring;"],
+	[0, "&ogon;"],
+	[0, "&DiacriticalTilde;"],
+	[0, "&dblac;"],
+	[51, "&DownBreve;"],
+	[127, "&Alpha;"],
+	[0, "&Beta;"],
+	[0, "&Gamma;"],
+	[0, "&Delta;"],
+	[0, "&Epsilon;"],
+	[0, "&Zeta;"],
+	[0, "&Eta;"],
+	[0, "&Theta;"],
+	[0, "&Iota;"],
+	[0, "&Kappa;"],
+	[0, "&Lambda;"],
+	[0, "&Mu;"],
+	[0, "&Nu;"],
+	[0, "&Xi;"],
+	[0, "&Omicron;"],
+	[0, "&Pi;"],
+	[0, "&Rho;"],
+	[1, "&Sigma;"],
+	[0, "&Tau;"],
+	[0, "&Upsilon;"],
+	[0, "&Phi;"],
+	[0, "&Chi;"],
+	[0, "&Psi;"],
+	[0, "&ohm;"],
+	[7, "&alpha;"],
+	[0, "&beta;"],
+	[0, "&gamma;"],
+	[0, "&delta;"],
+	[0, "&epsi;"],
+	[0, "&zeta;"],
+	[0, "&eta;"],
+	[0, "&theta;"],
+	[0, "&iota;"],
+	[0, "&kappa;"],
+	[0, "&lambda;"],
+	[0, "&mu;"],
+	[0, "&nu;"],
+	[0, "&xi;"],
+	[0, "&omicron;"],
+	[0, "&pi;"],
+	[0, "&rho;"],
+	[0, "&sigmaf;"],
+	[0, "&sigma;"],
+	[0, "&tau;"],
+	[0, "&upsi;"],
+	[0, "&phi;"],
+	[0, "&chi;"],
+	[0, "&psi;"],
+	[0, "&omega;"],
+	[7, "&thetasym;"],
+	[0, "&Upsi;"],
+	[2, "&phiv;"],
+	[0, "&piv;"],
+	[5, "&Gammad;"],
+	[0, "&digamma;"],
+	[18, "&kappav;"],
+	[0, "&rhov;"],
+	[3, "&epsiv;"],
+	[0, "&backepsilon;"],
+	[10, "&IOcy;"],
+	[0, "&DJcy;"],
+	[0, "&GJcy;"],
+	[0, "&Jukcy;"],
+	[0, "&DScy;"],
+	[0, "&Iukcy;"],
+	[0, "&YIcy;"],
+	[0, "&Jsercy;"],
+	[0, "&LJcy;"],
+	[0, "&NJcy;"],
+	[0, "&TSHcy;"],
+	[0, "&KJcy;"],
+	[1, "&Ubrcy;"],
+	[0, "&DZcy;"],
+	[0, "&Acy;"],
+	[0, "&Bcy;"],
+	[0, "&Vcy;"],
+	[0, "&Gcy;"],
+	[0, "&Dcy;"],
+	[0, "&IEcy;"],
+	[0, "&ZHcy;"],
+	[0, "&Zcy;"],
+	[0, "&Icy;"],
+	[0, "&Jcy;"],
+	[0, "&Kcy;"],
+	[0, "&Lcy;"],
+	[0, "&Mcy;"],
+	[0, "&Ncy;"],
+	[0, "&Ocy;"],
+	[0, "&Pcy;"],
+	[0, "&Rcy;"],
+	[0, "&Scy;"],
+	[0, "&Tcy;"],
+	[0, "&Ucy;"],
+	[0, "&Fcy;"],
+	[0, "&KHcy;"],
+	[0, "&TScy;"],
+	[0, "&CHcy;"],
+	[0, "&SHcy;"],
+	[0, "&SHCHcy;"],
+	[0, "&HARDcy;"],
+	[0, "&Ycy;"],
+	[0, "&SOFTcy;"],
+	[0, "&Ecy;"],
+	[0, "&YUcy;"],
+	[0, "&YAcy;"],
+	[0, "&acy;"],
+	[0, "&bcy;"],
+	[0, "&vcy;"],
+	[0, "&gcy;"],
+	[0, "&dcy;"],
+	[0, "&iecy;"],
+	[0, "&zhcy;"],
+	[0, "&zcy;"],
+	[0, "&icy;"],
+	[0, "&jcy;"],
+	[0, "&kcy;"],
+	[0, "&lcy;"],
+	[0, "&mcy;"],
+	[0, "&ncy;"],
+	[0, "&ocy;"],
+	[0, "&pcy;"],
+	[0, "&rcy;"],
+	[0, "&scy;"],
+	[0, "&tcy;"],
+	[0, "&ucy;"],
+	[0, "&fcy;"],
+	[0, "&khcy;"],
+	[0, "&tscy;"],
+	[0, "&chcy;"],
+	[0, "&shcy;"],
+	[0, "&shchcy;"],
+	[0, "&hardcy;"],
+	[0, "&ycy;"],
+	[0, "&softcy;"],
+	[0, "&ecy;"],
+	[0, "&yucy;"],
+	[0, "&yacy;"],
+	[1, "&iocy;"],
+	[0, "&djcy;"],
+	[0, "&gjcy;"],
+	[0, "&jukcy;"],
+	[0, "&dscy;"],
+	[0, "&iukcy;"],
+	[0, "&yicy;"],
+	[0, "&jsercy;"],
+	[0, "&ljcy;"],
+	[0, "&njcy;"],
+	[0, "&tshcy;"],
+	[0, "&kjcy;"],
+	[1, "&ubrcy;"],
+	[0, "&dzcy;"],
+	[7074, "&ensp;"],
+	[0, "&emsp;"],
+	[0, "&emsp13;"],
+	[0, "&emsp14;"],
+	[1, "&numsp;"],
+	[0, "&puncsp;"],
+	[0, "&ThinSpace;"],
+	[0, "&hairsp;"],
+	[0, "&NegativeMediumSpace;"],
+	[0, "&zwnj;"],
+	[0, "&zwj;"],
+	[0, "&lrm;"],
+	[0, "&rlm;"],
+	[0, "&dash;"],
+	[2, "&ndash;"],
+	[0, "&mdash;"],
+	[0, "&horbar;"],
+	[0, "&Verbar;"],
+	[1, "&lsquo;"],
+	[0, "&CloseCurlyQuote;"],
+	[0, "&lsquor;"],
+	[1, "&ldquo;"],
+	[0, "&CloseCurlyDoubleQuote;"],
+	[0, "&bdquo;"],
+	[1, "&dagger;"],
+	[0, "&Dagger;"],
+	[0, "&bull;"],
+	[2, "&nldr;"],
+	[0, "&hellip;"],
+	[9, "&permil;"],
+	[0, "&pertenk;"],
+	[0, "&prime;"],
+	[0, "&Prime;"],
+	[0, "&tprime;"],
+	[0, "&backprime;"],
+	[3, "&lsaquo;"],
+	[0, "&rsaquo;"],
+	[3, "&oline;"],
+	[2, "&caret;"],
+	[1, "&hybull;"],
+	[0, "&frasl;"],
+	[10, "&bsemi;"],
+	[7, "&qprime;"],
+	[7, {
+		v: "&MediumSpace;",
+		n: 8202,
+		o: "&ThickSpace;"
+	}],
+	[0, "&NoBreak;"],
+	[0, "&af;"],
+	[0, "&InvisibleTimes;"],
+	[0, "&ic;"],
+	[72, "&euro;"],
+	[46, "&tdot;"],
+	[0, "&DotDot;"],
+	[37, "&complexes;"],
+	[2, "&incare;"],
+	[4, "&gscr;"],
+	[0, "&hamilt;"],
+	[0, "&Hfr;"],
+	[0, "&Hopf;"],
+	[0, "&planckh;"],
+	[0, "&hbar;"],
+	[0, "&imagline;"],
+	[0, "&Ifr;"],
+	[0, "&lagran;"],
+	[0, "&ell;"],
+	[1, "&naturals;"],
+	[0, "&numero;"],
+	[0, "&copysr;"],
+	[0, "&weierp;"],
+	[0, "&Popf;"],
+	[0, "&Qopf;"],
+	[0, "&realine;"],
+	[0, "&real;"],
+	[0, "&reals;"],
+	[0, "&rx;"],
+	[3, "&trade;"],
+	[1, "&integers;"],
+	[2, "&mho;"],
+	[0, "&zeetrf;"],
+	[0, "&iiota;"],
+	[2, "&bernou;"],
+	[0, "&Cayleys;"],
+	[1, "&escr;"],
+	[0, "&Escr;"],
+	[0, "&Fouriertrf;"],
+	[1, "&Mellintrf;"],
+	[0, "&order;"],
+	[0, "&alefsym;"],
+	[0, "&beth;"],
+	[0, "&gimel;"],
+	[0, "&daleth;"],
+	[12, "&CapitalDifferentialD;"],
+	[0, "&dd;"],
+	[0, "&ee;"],
+	[0, "&ii;"],
+	[10, "&frac13;"],
+	[0, "&frac23;"],
+	[0, "&frac15;"],
+	[0, "&frac25;"],
+	[0, "&frac35;"],
+	[0, "&frac45;"],
+	[0, "&frac16;"],
+	[0, "&frac56;"],
+	[0, "&frac18;"],
+	[0, "&frac38;"],
+	[0, "&frac58;"],
+	[0, "&frac78;"],
+	[49, "&larr;"],
+	[0, "&ShortUpArrow;"],
+	[0, "&rarr;"],
+	[0, "&darr;"],
+	[0, "&harr;"],
+	[0, "&updownarrow;"],
+	[0, "&nwarr;"],
+	[0, "&nearr;"],
+	[0, "&LowerRightArrow;"],
+	[0, "&LowerLeftArrow;"],
+	[0, "&nlarr;"],
+	[0, "&nrarr;"],
+	[1, {
+		v: "&rarrw;",
+		n: 824,
+		o: "&nrarrw;"
+	}],
+	[0, "&Larr;"],
+	[0, "&Uarr;"],
+	[0, "&Rarr;"],
+	[0, "&Darr;"],
+	[0, "&larrtl;"],
+	[0, "&rarrtl;"],
+	[0, "&LeftTeeArrow;"],
+	[0, "&mapstoup;"],
+	[0, "&map;"],
+	[0, "&DownTeeArrow;"],
+	[1, "&hookleftarrow;"],
+	[0, "&hookrightarrow;"],
+	[0, "&larrlp;"],
+	[0, "&looparrowright;"],
+	[0, "&harrw;"],
+	[0, "&nharr;"],
+	[1, "&lsh;"],
+	[0, "&rsh;"],
+	[0, "&ldsh;"],
+	[0, "&rdsh;"],
+	[1, "&crarr;"],
+	[0, "&cularr;"],
+	[0, "&curarr;"],
+	[2, "&circlearrowleft;"],
+	[0, "&circlearrowright;"],
+	[0, "&leftharpoonup;"],
+	[0, "&DownLeftVector;"],
+	[0, "&RightUpVector;"],
+	[0, "&LeftUpVector;"],
+	[0, "&rharu;"],
+	[0, "&DownRightVector;"],
+	[0, "&dharr;"],
+	[0, "&dharl;"],
+	[0, "&RightArrowLeftArrow;"],
+	[0, "&udarr;"],
+	[0, "&LeftArrowRightArrow;"],
+	[0, "&leftleftarrows;"],
+	[0, "&upuparrows;"],
+	[0, "&rightrightarrows;"],
+	[0, "&ddarr;"],
+	[0, "&leftrightharpoons;"],
+	[0, "&Equilibrium;"],
+	[0, "&nlArr;"],
+	[0, "&nhArr;"],
+	[0, "&nrArr;"],
+	[0, "&DoubleLeftArrow;"],
+	[0, "&DoubleUpArrow;"],
+	[0, "&DoubleRightArrow;"],
+	[0, "&dArr;"],
+	[0, "&DoubleLeftRightArrow;"],
+	[0, "&DoubleUpDownArrow;"],
+	[0, "&nwArr;"],
+	[0, "&neArr;"],
+	[0, "&seArr;"],
+	[0, "&swArr;"],
+	[0, "&lAarr;"],
+	[0, "&rAarr;"],
+	[1, "&zigrarr;"],
+	[6, "&larrb;"],
+	[0, "&rarrb;"],
+	[15, "&DownArrowUpArrow;"],
+	[7, "&loarr;"],
+	[0, "&roarr;"],
+	[0, "&hoarr;"],
+	[0, "&forall;"],
+	[0, "&comp;"],
+	[0, {
+		v: "&part;",
+		n: 824,
+		o: "&npart;"
+	}],
+	[0, "&exist;"],
+	[0, "&nexist;"],
+	[0, "&empty;"],
+	[1, "&Del;"],
+	[0, "&Element;"],
+	[0, "&NotElement;"],
+	[1, "&ni;"],
+	[0, "&notni;"],
+	[2, "&prod;"],
+	[0, "&coprod;"],
+	[0, "&sum;"],
+	[0, "&minus;"],
+	[0, "&MinusPlus;"],
+	[0, "&dotplus;"],
+	[1, "&Backslash;"],
+	[0, "&lowast;"],
+	[0, "&compfn;"],
+	[1, "&radic;"],
+	[2, "&prop;"],
+	[0, "&infin;"],
+	[0, "&angrt;"],
+	[0, {
+		v: "&ang;",
+		n: 8402,
+		o: "&nang;"
+	}],
+	[0, "&angmsd;"],
+	[0, "&angsph;"],
+	[0, "&mid;"],
+	[0, "&nmid;"],
+	[0, "&DoubleVerticalBar;"],
+	[0, "&NotDoubleVerticalBar;"],
+	[0, "&and;"],
+	[0, "&or;"],
+	[0, {
+		v: "&cap;",
+		n: 65024,
+		o: "&caps;"
+	}],
+	[0, {
+		v: "&cup;",
+		n: 65024,
+		o: "&cups;"
+	}],
+	[0, "&int;"],
+	[0, "&Int;"],
+	[0, "&iiint;"],
+	[0, "&conint;"],
+	[0, "&Conint;"],
+	[0, "&Cconint;"],
+	[0, "&cwint;"],
+	[0, "&ClockwiseContourIntegral;"],
+	[0, "&awconint;"],
+	[0, "&there4;"],
+	[0, "&becaus;"],
+	[0, "&ratio;"],
+	[0, "&Colon;"],
+	[0, "&dotminus;"],
+	[1, "&mDDot;"],
+	[0, "&homtht;"],
+	[0, {
+		v: "&sim;",
+		n: 8402,
+		o: "&nvsim;"
+	}],
+	[0, {
+		v: "&backsim;",
+		n: 817,
+		o: "&race;"
+	}],
+	[0, {
+		v: "&ac;",
+		n: 819,
+		o: "&acE;"
+	}],
+	[0, "&acd;"],
+	[0, "&VerticalTilde;"],
+	[0, "&NotTilde;"],
+	[0, {
+		v: "&eqsim;",
+		n: 824,
+		o: "&nesim;"
+	}],
+	[0, "&sime;"],
+	[0, "&NotTildeEqual;"],
+	[0, "&cong;"],
+	[0, "&simne;"],
+	[0, "&ncong;"],
+	[0, "&ap;"],
+	[0, "&nap;"],
+	[0, "&ape;"],
+	[0, {
+		v: "&apid;",
+		n: 824,
+		o: "&napid;"
+	}],
+	[0, "&backcong;"],
+	[0, {
+		v: "&asympeq;",
+		n: 8402,
+		o: "&nvap;"
+	}],
+	[0, {
+		v: "&bump;",
+		n: 824,
+		o: "&nbump;"
+	}],
+	[0, {
+		v: "&bumpe;",
+		n: 824,
+		o: "&nbumpe;"
+	}],
+	[0, {
+		v: "&doteq;",
+		n: 824,
+		o: "&nedot;"
+	}],
+	[0, "&doteqdot;"],
+	[0, "&efDot;"],
+	[0, "&erDot;"],
+	[0, "&Assign;"],
+	[0, "&ecolon;"],
+	[0, "&ecir;"],
+	[0, "&circeq;"],
+	[1, "&wedgeq;"],
+	[0, "&veeeq;"],
+	[1, "&triangleq;"],
+	[2, "&equest;"],
+	[0, "&ne;"],
+	[0, {
+		v: "&Congruent;",
+		n: 8421,
+		o: "&bnequiv;"
+	}],
+	[0, "&nequiv;"],
+	[1, {
+		v: "&le;",
+		n: 8402,
+		o: "&nvle;"
+	}],
+	[0, {
+		v: "&ge;",
+		n: 8402,
+		o: "&nvge;"
+	}],
+	[0, {
+		v: "&lE;",
+		n: 824,
+		o: "&nlE;"
+	}],
+	[0, {
+		v: "&gE;",
+		n: 824,
+		o: "&ngE;"
+	}],
+	[0, {
+		v: "&lnE;",
+		n: 65024,
+		o: "&lvertneqq;"
+	}],
+	[0, {
+		v: "&gnE;",
+		n: 65024,
+		o: "&gvertneqq;"
+	}],
+	[0, {
+		v: "&ll;",
+		n: new Map(/* @__PURE__ */ restoreDiff([[824, "&nLtv;"], [7577, "&nLt;"]]))
+	}],
+	[0, {
+		v: "&gg;",
+		n: new Map(/* @__PURE__ */ restoreDiff([[824, "&nGtv;"], [7577, "&nGt;"]]))
+	}],
+	[0, "&between;"],
+	[0, "&NotCupCap;"],
+	[0, "&nless;"],
+	[0, "&ngt;"],
+	[0, "&nle;"],
+	[0, "&nge;"],
+	[0, "&lesssim;"],
+	[0, "&GreaterTilde;"],
+	[0, "&nlsim;"],
+	[0, "&ngsim;"],
+	[0, "&LessGreater;"],
+	[0, "&gl;"],
+	[0, "&NotLessGreater;"],
+	[0, "&NotGreaterLess;"],
+	[0, "&pr;"],
+	[0, "&sc;"],
+	[0, "&prcue;"],
+	[0, "&sccue;"],
+	[0, "&PrecedesTilde;"],
+	[0, {
+		v: "&scsim;",
+		n: 824,
+		o: "&NotSucceedsTilde;"
+	}],
+	[0, "&NotPrecedes;"],
+	[0, "&NotSucceeds;"],
+	[0, {
+		v: "&sub;",
+		n: 8402,
+		o: "&NotSubset;"
+	}],
+	[0, {
+		v: "&sup;",
+		n: 8402,
+		o: "&NotSuperset;"
+	}],
+	[0, "&nsub;"],
+	[0, "&nsup;"],
+	[0, "&sube;"],
+	[0, "&supe;"],
+	[0, "&NotSubsetEqual;"],
+	[0, "&NotSupersetEqual;"],
+	[0, {
+		v: "&subne;",
+		n: 65024,
+		o: "&varsubsetneq;"
+	}],
+	[0, {
+		v: "&supne;",
+		n: 65024,
+		o: "&varsupsetneq;"
+	}],
+	[1, "&cupdot;"],
+	[0, "&UnionPlus;"],
+	[0, {
+		v: "&sqsub;",
+		n: 824,
+		o: "&NotSquareSubset;"
+	}],
+	[0, {
+		v: "&sqsup;",
+		n: 824,
+		o: "&NotSquareSuperset;"
+	}],
+	[0, "&sqsube;"],
+	[0, "&sqsupe;"],
+	[0, {
+		v: "&sqcap;",
+		n: 65024,
+		o: "&sqcaps;"
+	}],
+	[0, {
+		v: "&sqcup;",
+		n: 65024,
+		o: "&sqcups;"
+	}],
+	[0, "&CirclePlus;"],
+	[0, "&CircleMinus;"],
+	[0, "&CircleTimes;"],
+	[0, "&osol;"],
+	[0, "&CircleDot;"],
+	[0, "&circledcirc;"],
+	[0, "&circledast;"],
+	[1, "&circleddash;"],
+	[0, "&boxplus;"],
+	[0, "&boxminus;"],
+	[0, "&boxtimes;"],
+	[0, "&dotsquare;"],
+	[0, "&RightTee;"],
+	[0, "&dashv;"],
+	[0, "&DownTee;"],
+	[0, "&bot;"],
+	[1, "&models;"],
+	[0, "&DoubleRightTee;"],
+	[0, "&Vdash;"],
+	[0, "&Vvdash;"],
+	[0, "&VDash;"],
+	[0, "&nvdash;"],
+	[0, "&nvDash;"],
+	[0, "&nVdash;"],
+	[0, "&nVDash;"],
+	[0, "&prurel;"],
+	[1, "&LeftTriangle;"],
+	[0, "&RightTriangle;"],
+	[0, {
+		v: "&LeftTriangleEqual;",
+		n: 8402,
+		o: "&nvltrie;"
+	}],
+	[0, {
+		v: "&RightTriangleEqual;",
+		n: 8402,
+		o: "&nvrtrie;"
+	}],
+	[0, "&origof;"],
+	[0, "&imof;"],
+	[0, "&multimap;"],
+	[0, "&hercon;"],
+	[0, "&intcal;"],
+	[0, "&veebar;"],
+	[1, "&barvee;"],
+	[0, "&angrtvb;"],
+	[0, "&lrtri;"],
+	[0, "&bigwedge;"],
+	[0, "&bigvee;"],
+	[0, "&bigcap;"],
+	[0, "&bigcup;"],
+	[0, "&diam;"],
+	[0, "&sdot;"],
+	[0, "&sstarf;"],
+	[0, "&divideontimes;"],
+	[0, "&bowtie;"],
+	[0, "&ltimes;"],
+	[0, "&rtimes;"],
+	[0, "&leftthreetimes;"],
+	[0, "&rightthreetimes;"],
+	[0, "&backsimeq;"],
+	[0, "&curlyvee;"],
+	[0, "&curlywedge;"],
+	[0, "&Sub;"],
+	[0, "&Sup;"],
+	[0, "&Cap;"],
+	[0, "&Cup;"],
+	[0, "&fork;"],
+	[0, "&epar;"],
+	[0, "&lessdot;"],
+	[0, "&gtdot;"],
+	[0, {
+		v: "&Ll;",
+		n: 824,
+		o: "&nLl;"
+	}],
+	[0, {
+		v: "&Gg;",
+		n: 824,
+		o: "&nGg;"
+	}],
+	[0, {
+		v: "&leg;",
+		n: 65024,
+		o: "&lesg;"
+	}],
+	[0, {
+		v: "&gel;",
+		n: 65024,
+		o: "&gesl;"
+	}],
+	[2, "&cuepr;"],
+	[0, "&cuesc;"],
+	[0, "&NotPrecedesSlantEqual;"],
+	[0, "&NotSucceedsSlantEqual;"],
+	[0, "&NotSquareSubsetEqual;"],
+	[0, "&NotSquareSupersetEqual;"],
+	[2, "&lnsim;"],
+	[0, "&gnsim;"],
+	[0, "&precnsim;"],
+	[0, "&scnsim;"],
+	[0, "&nltri;"],
+	[0, "&NotRightTriangle;"],
+	[0, "&nltrie;"],
+	[0, "&NotRightTriangleEqual;"],
+	[0, "&vellip;"],
+	[0, "&ctdot;"],
+	[0, "&utdot;"],
+	[0, "&dtdot;"],
+	[0, "&disin;"],
+	[0, "&isinsv;"],
+	[0, "&isins;"],
+	[0, {
+		v: "&isindot;",
+		n: 824,
+		o: "&notindot;"
+	}],
+	[0, "&notinvc;"],
+	[0, "&notinvb;"],
+	[1, {
+		v: "&isinE;",
+		n: 824,
+		o: "&notinE;"
+	}],
+	[0, "&nisd;"],
+	[0, "&xnis;"],
+	[0, "&nis;"],
+	[0, "&notnivc;"],
+	[0, "&notnivb;"],
+	[6, "&barwed;"],
+	[0, "&Barwed;"],
+	[1, "&lceil;"],
+	[0, "&rceil;"],
+	[0, "&LeftFloor;"],
+	[0, "&rfloor;"],
+	[0, "&drcrop;"],
+	[0, "&dlcrop;"],
+	[0, "&urcrop;"],
+	[0, "&ulcrop;"],
+	[0, "&bnot;"],
+	[1, "&profline;"],
+	[0, "&profsurf;"],
+	[1, "&telrec;"],
+	[0, "&target;"],
+	[5, "&ulcorn;"],
+	[0, "&urcorn;"],
+	[0, "&dlcorn;"],
+	[0, "&drcorn;"],
+	[2, "&frown;"],
+	[0, "&smile;"],
+	[9, "&cylcty;"],
+	[0, "&profalar;"],
+	[7, "&topbot;"],
+	[6, "&ovbar;"],
+	[1, "&solbar;"],
+	[60, "&angzarr;"],
+	[51, "&lmoustache;"],
+	[0, "&rmoustache;"],
+	[2, "&OverBracket;"],
+	[0, "&bbrk;"],
+	[0, "&bbrktbrk;"],
+	[37, "&OverParenthesis;"],
+	[0, "&UnderParenthesis;"],
+	[0, "&OverBrace;"],
+	[0, "&UnderBrace;"],
+	[2, "&trpezium;"],
+	[4, "&elinters;"],
+	[59, "&blank;"],
+	[164, "&circledS;"],
+	[55, "&boxh;"],
+	[1, "&boxv;"],
+	[9, "&boxdr;"],
+	[3, "&boxdl;"],
+	[3, "&boxur;"],
+	[3, "&boxul;"],
+	[3, "&boxvr;"],
+	[7, "&boxvl;"],
+	[7, "&boxhd;"],
+	[7, "&boxhu;"],
+	[7, "&boxvh;"],
+	[19, "&boxH;"],
+	[0, "&boxV;"],
+	[0, "&boxdR;"],
+	[0, "&boxDr;"],
+	[0, "&boxDR;"],
+	[0, "&boxdL;"],
+	[0, "&boxDl;"],
+	[0, "&boxDL;"],
+	[0, "&boxuR;"],
+	[0, "&boxUr;"],
+	[0, "&boxUR;"],
+	[0, "&boxuL;"],
+	[0, "&boxUl;"],
+	[0, "&boxUL;"],
+	[0, "&boxvR;"],
+	[0, "&boxVr;"],
+	[0, "&boxVR;"],
+	[0, "&boxvL;"],
+	[0, "&boxVl;"],
+	[0, "&boxVL;"],
+	[0, "&boxHd;"],
+	[0, "&boxhD;"],
+	[0, "&boxHD;"],
+	[0, "&boxHu;"],
+	[0, "&boxhU;"],
+	[0, "&boxHU;"],
+	[0, "&boxvH;"],
+	[0, "&boxVh;"],
+	[0, "&boxVH;"],
+	[19, "&uhblk;"],
+	[3, "&lhblk;"],
+	[3, "&block;"],
+	[8, "&blk14;"],
+	[0, "&blk12;"],
+	[0, "&blk34;"],
+	[13, "&square;"],
+	[8, "&blacksquare;"],
+	[0, "&EmptyVerySmallSquare;"],
+	[1, "&rect;"],
+	[0, "&marker;"],
+	[2, "&fltns;"],
+	[1, "&bigtriangleup;"],
+	[0, "&blacktriangle;"],
+	[0, "&triangle;"],
+	[2, "&blacktriangleright;"],
+	[0, "&rtri;"],
+	[3, "&bigtriangledown;"],
+	[0, "&blacktriangledown;"],
+	[0, "&dtri;"],
+	[2, "&blacktriangleleft;"],
+	[0, "&ltri;"],
+	[6, "&loz;"],
+	[0, "&cir;"],
+	[32, "&tridot;"],
+	[2, "&bigcirc;"],
+	[8, "&ultri;"],
+	[0, "&urtri;"],
+	[0, "&lltri;"],
+	[0, "&EmptySmallSquare;"],
+	[0, "&FilledSmallSquare;"],
+	[8, "&bigstar;"],
+	[0, "&star;"],
+	[7, "&phone;"],
+	[49, "&female;"],
+	[1, "&male;"],
+	[29, "&spades;"],
+	[2, "&clubs;"],
+	[1, "&hearts;"],
+	[0, "&diamondsuit;"],
+	[3, "&sung;"],
+	[2, "&flat;"],
+	[0, "&natural;"],
+	[0, "&sharp;"],
+	[163, "&check;"],
+	[3, "&cross;"],
+	[8, "&malt;"],
+	[21, "&sext;"],
+	[33, "&VerticalSeparator;"],
+	[25, "&lbbrk;"],
+	[0, "&rbbrk;"],
+	[84, "&bsolhsub;"],
+	[0, "&suphsol;"],
+	[28, "&LeftDoubleBracket;"],
+	[0, "&RightDoubleBracket;"],
+	[0, "&lang;"],
+	[0, "&rang;"],
+	[0, "&Lang;"],
+	[0, "&Rang;"],
+	[0, "&loang;"],
+	[0, "&roang;"],
+	[7, "&longleftarrow;"],
+	[0, "&longrightarrow;"],
+	[0, "&longleftrightarrow;"],
+	[0, "&DoubleLongLeftArrow;"],
+	[0, "&DoubleLongRightArrow;"],
+	[0, "&DoubleLongLeftRightArrow;"],
+	[1, "&longmapsto;"],
+	[2, "&dzigrarr;"],
+	[258, "&nvlArr;"],
+	[0, "&nvrArr;"],
+	[0, "&nvHarr;"],
+	[0, "&Map;"],
+	[6, "&lbarr;"],
+	[0, "&bkarow;"],
+	[0, "&lBarr;"],
+	[0, "&dbkarow;"],
+	[0, "&drbkarow;"],
+	[0, "&DDotrahd;"],
+	[0, "&UpArrowBar;"],
+	[0, "&DownArrowBar;"],
+	[2, "&Rarrtl;"],
+	[2, "&latail;"],
+	[0, "&ratail;"],
+	[0, "&lAtail;"],
+	[0, "&rAtail;"],
+	[0, "&larrfs;"],
+	[0, "&rarrfs;"],
+	[0, "&larrbfs;"],
+	[0, "&rarrbfs;"],
+	[2, "&nwarhk;"],
+	[0, "&nearhk;"],
+	[0, "&hksearow;"],
+	[0, "&hkswarow;"],
+	[0, "&nwnear;"],
+	[0, "&nesear;"],
+	[0, "&seswar;"],
+	[0, "&swnwar;"],
+	[8, {
+		v: "&rarrc;",
+		n: 824,
+		o: "&nrarrc;"
+	}],
+	[1, "&cudarrr;"],
+	[0, "&ldca;"],
+	[0, "&rdca;"],
+	[0, "&cudarrl;"],
+	[0, "&larrpl;"],
+	[2, "&curarrm;"],
+	[0, "&cularrp;"],
+	[7, "&rarrpl;"],
+	[2, "&harrcir;"],
+	[0, "&Uarrocir;"],
+	[0, "&lurdshar;"],
+	[0, "&ldrushar;"],
+	[2, "&LeftRightVector;"],
+	[0, "&RightUpDownVector;"],
+	[0, "&DownLeftRightVector;"],
+	[0, "&LeftUpDownVector;"],
+	[0, "&LeftVectorBar;"],
+	[0, "&RightVectorBar;"],
+	[0, "&RightUpVectorBar;"],
+	[0, "&RightDownVectorBar;"],
+	[0, "&DownLeftVectorBar;"],
+	[0, "&DownRightVectorBar;"],
+	[0, "&LeftUpVectorBar;"],
+	[0, "&LeftDownVectorBar;"],
+	[0, "&LeftTeeVector;"],
+	[0, "&RightTeeVector;"],
+	[0, "&RightUpTeeVector;"],
+	[0, "&RightDownTeeVector;"],
+	[0, "&DownLeftTeeVector;"],
+	[0, "&DownRightTeeVector;"],
+	[0, "&LeftUpTeeVector;"],
+	[0, "&LeftDownTeeVector;"],
+	[0, "&lHar;"],
+	[0, "&uHar;"],
+	[0, "&rHar;"],
+	[0, "&dHar;"],
+	[0, "&luruhar;"],
+	[0, "&ldrdhar;"],
+	[0, "&ruluhar;"],
+	[0, "&rdldhar;"],
+	[0, "&lharul;"],
+	[0, "&llhard;"],
+	[0, "&rharul;"],
+	[0, "&lrhard;"],
+	[0, "&udhar;"],
+	[0, "&duhar;"],
+	[0, "&RoundImplies;"],
+	[0, "&erarr;"],
+	[0, "&simrarr;"],
+	[0, "&larrsim;"],
+	[0, "&rarrsim;"],
+	[0, "&rarrap;"],
+	[0, "&ltlarr;"],
+	[1, "&gtrarr;"],
+	[0, "&subrarr;"],
+	[1, "&suplarr;"],
+	[0, "&lfisht;"],
+	[0, "&rfisht;"],
+	[0, "&ufisht;"],
+	[0, "&dfisht;"],
+	[5, "&lopar;"],
+	[0, "&ropar;"],
+	[4, "&lbrke;"],
+	[0, "&rbrke;"],
+	[0, "&lbrkslu;"],
+	[0, "&rbrksld;"],
+	[0, "&lbrksld;"],
+	[0, "&rbrkslu;"],
+	[0, "&langd;"],
+	[0, "&rangd;"],
+	[0, "&lparlt;"],
+	[0, "&rpargt;"],
+	[0, "&gtlPar;"],
+	[0, "&ltrPar;"],
+	[3, "&vzigzag;"],
+	[1, "&vangrt;"],
+	[0, "&angrtvbd;"],
+	[6, "&ange;"],
+	[0, "&range;"],
+	[0, "&dwangle;"],
+	[0, "&uwangle;"],
+	[0, "&angmsdaa;"],
+	[0, "&angmsdab;"],
+	[0, "&angmsdac;"],
+	[0, "&angmsdad;"],
+	[0, "&angmsdae;"],
+	[0, "&angmsdaf;"],
+	[0, "&angmsdag;"],
+	[0, "&angmsdah;"],
+	[0, "&bemptyv;"],
+	[0, "&demptyv;"],
+	[0, "&cemptyv;"],
+	[0, "&raemptyv;"],
+	[0, "&laemptyv;"],
+	[0, "&ohbar;"],
+	[0, "&omid;"],
+	[0, "&opar;"],
+	[1, "&operp;"],
+	[1, "&olcross;"],
+	[0, "&odsold;"],
+	[1, "&olcir;"],
+	[0, "&ofcir;"],
+	[0, "&olt;"],
+	[0, "&ogt;"],
+	[0, "&cirscir;"],
+	[0, "&cirE;"],
+	[0, "&solb;"],
+	[0, "&bsolb;"],
+	[3, "&boxbox;"],
+	[3, "&trisb;"],
+	[0, "&rtriltri;"],
+	[0, {
+		v: "&LeftTriangleBar;",
+		n: 824,
+		o: "&NotLeftTriangleBar;"
+	}],
+	[0, {
+		v: "&RightTriangleBar;",
+		n: 824,
+		o: "&NotRightTriangleBar;"
+	}],
+	[11, "&iinfin;"],
+	[0, "&infintie;"],
+	[0, "&nvinfin;"],
+	[4, "&eparsl;"],
+	[0, "&smeparsl;"],
+	[0, "&eqvparsl;"],
+	[5, "&blacklozenge;"],
+	[8, "&RuleDelayed;"],
+	[1, "&dsol;"],
+	[9, "&bigodot;"],
+	[0, "&bigoplus;"],
+	[0, "&bigotimes;"],
+	[1, "&biguplus;"],
+	[1, "&bigsqcup;"],
+	[5, "&iiiint;"],
+	[0, "&fpartint;"],
+	[2, "&cirfnint;"],
+	[0, "&awint;"],
+	[0, "&rppolint;"],
+	[0, "&scpolint;"],
+	[0, "&npolint;"],
+	[0, "&pointint;"],
+	[0, "&quatint;"],
+	[0, "&intlarhk;"],
+	[10, "&pluscir;"],
+	[0, "&plusacir;"],
+	[0, "&simplus;"],
+	[0, "&plusdu;"],
+	[0, "&plussim;"],
+	[0, "&plustwo;"],
+	[1, "&mcomma;"],
+	[0, "&minusdu;"],
+	[2, "&loplus;"],
+	[0, "&roplus;"],
+	[0, "&Cross;"],
+	[0, "&timesd;"],
+	[0, "&timesbar;"],
+	[1, "&smashp;"],
+	[0, "&lotimes;"],
+	[0, "&rotimes;"],
+	[0, "&otimesas;"],
+	[0, "&Otimes;"],
+	[0, "&odiv;"],
+	[0, "&triplus;"],
+	[0, "&triminus;"],
+	[0, "&tritime;"],
+	[0, "&intprod;"],
+	[2, "&amalg;"],
+	[0, "&capdot;"],
+	[1, "&ncup;"],
+	[0, "&ncap;"],
+	[0, "&capand;"],
+	[0, "&cupor;"],
+	[0, "&cupcap;"],
+	[0, "&capcup;"],
+	[0, "&cupbrcap;"],
+	[0, "&capbrcup;"],
+	[0, "&cupcup;"],
+	[0, "&capcap;"],
+	[0, "&ccups;"],
+	[0, "&ccaps;"],
+	[2, "&ccupssm;"],
+	[2, "&And;"],
+	[0, "&Or;"],
+	[0, "&andand;"],
+	[0, "&oror;"],
+	[0, "&orslope;"],
+	[0, "&andslope;"],
+	[1, "&andv;"],
+	[0, "&orv;"],
+	[0, "&andd;"],
+	[0, "&ord;"],
+	[1, "&wedbar;"],
+	[6, "&sdote;"],
+	[3, "&simdot;"],
+	[2, {
+		v: "&congdot;",
+		n: 824,
+		o: "&ncongdot;"
+	}],
+	[0, "&easter;"],
+	[0, "&apacir;"],
+	[0, {
+		v: "&apE;",
+		n: 824,
+		o: "&napE;"
+	}],
+	[0, "&eplus;"],
+	[0, "&pluse;"],
+	[0, "&Esim;"],
+	[0, "&Colone;"],
+	[0, "&Equal;"],
+	[1, "&ddotseq;"],
+	[0, "&equivDD;"],
+	[0, "&ltcir;"],
+	[0, "&gtcir;"],
+	[0, "&ltquest;"],
+	[0, "&gtquest;"],
+	[0, {
+		v: "&leqslant;",
+		n: 824,
+		o: "&nleqslant;"
+	}],
+	[0, {
+		v: "&geqslant;",
+		n: 824,
+		o: "&ngeqslant;"
+	}],
+	[0, "&lesdot;"],
+	[0, "&gesdot;"],
+	[0, "&lesdoto;"],
+	[0, "&gesdoto;"],
+	[0, "&lesdotor;"],
+	[0, "&gesdotol;"],
+	[0, "&lap;"],
+	[0, "&gap;"],
+	[0, "&lne;"],
+	[0, "&gne;"],
+	[0, "&lnap;"],
+	[0, "&gnap;"],
+	[0, "&lEg;"],
+	[0, "&gEl;"],
+	[0, "&lsime;"],
+	[0, "&gsime;"],
+	[0, "&lsimg;"],
+	[0, "&gsiml;"],
+	[0, "&lgE;"],
+	[0, "&glE;"],
+	[0, "&lesges;"],
+	[0, "&gesles;"],
+	[0, "&els;"],
+	[0, "&egs;"],
+	[0, "&elsdot;"],
+	[0, "&egsdot;"],
+	[0, "&el;"],
+	[0, "&eg;"],
+	[2, "&siml;"],
+	[0, "&simg;"],
+	[0, "&simlE;"],
+	[0, "&simgE;"],
+	[0, {
+		v: "&LessLess;",
+		n: 824,
+		o: "&NotNestedLessLess;"
+	}],
+	[0, {
+		v: "&GreaterGreater;",
+		n: 824,
+		o: "&NotNestedGreaterGreater;"
+	}],
+	[1, "&glj;"],
+	[0, "&gla;"],
+	[0, "&ltcc;"],
+	[0, "&gtcc;"],
+	[0, "&lescc;"],
+	[0, "&gescc;"],
+	[0, "&smt;"],
+	[0, "&lat;"],
+	[0, {
+		v: "&smte;",
+		n: 65024,
+		o: "&smtes;"
+	}],
+	[0, {
+		v: "&late;",
+		n: 65024,
+		o: "&lates;"
+	}],
+	[0, "&bumpE;"],
+	[0, {
+		v: "&PrecedesEqual;",
+		n: 824,
+		o: "&NotPrecedesEqual;"
+	}],
+	[0, {
+		v: "&sce;",
+		n: 824,
+		o: "&NotSucceedsEqual;"
+	}],
+	[2, "&prE;"],
+	[0, "&scE;"],
+	[0, "&precneqq;"],
+	[0, "&scnE;"],
+	[0, "&prap;"],
+	[0, "&scap;"],
+	[0, "&precnapprox;"],
+	[0, "&scnap;"],
+	[0, "&Pr;"],
+	[0, "&Sc;"],
+	[0, "&subdot;"],
+	[0, "&supdot;"],
+	[0, "&subplus;"],
+	[0, "&supplus;"],
+	[0, "&submult;"],
+	[0, "&supmult;"],
+	[0, "&subedot;"],
+	[0, "&supedot;"],
+	[0, {
+		v: "&subE;",
+		n: 824,
+		o: "&nsubE;"
+	}],
+	[0, {
+		v: "&supE;",
+		n: 824,
+		o: "&nsupE;"
+	}],
+	[0, "&subsim;"],
+	[0, "&supsim;"],
+	[2, {
+		v: "&subnE;",
+		n: 65024,
+		o: "&varsubsetneqq;"
+	}],
+	[0, {
+		v: "&supnE;",
+		n: 65024,
+		o: "&varsupsetneqq;"
+	}],
+	[2, "&csub;"],
+	[0, "&csup;"],
+	[0, "&csube;"],
+	[0, "&csupe;"],
+	[0, "&subsup;"],
+	[0, "&supsub;"],
+	[0, "&subsub;"],
+	[0, "&supsup;"],
+	[0, "&suphsub;"],
+	[0, "&supdsub;"],
+	[0, "&forkv;"],
+	[0, "&topfork;"],
+	[0, "&mlcp;"],
+	[8, "&Dashv;"],
+	[1, "&Vdashl;"],
+	[0, "&Barv;"],
+	[0, "&vBar;"],
+	[0, "&vBarv;"],
+	[1, "&Vbar;"],
+	[0, "&Not;"],
+	[0, "&bNot;"],
+	[0, "&rnmid;"],
+	[0, "&cirmid;"],
+	[0, "&midcir;"],
+	[0, "&topcir;"],
+	[0, "&nhpar;"],
+	[0, "&parsim;"],
+	[9, {
+		v: "&parsl;",
+		n: 8421,
+		o: "&nparsl;"
+	}],
+	[44343, { n: new Map(/* @__PURE__ */ restoreDiff([
+		[56476, "&Ascr;"],
+		[1, "&Cscr;"],
+		[0, "&Dscr;"],
+		[2, "&Gscr;"],
+		[2, "&Jscr;"],
+		[0, "&Kscr;"],
+		[2, "&Nscr;"],
+		[0, "&Oscr;"],
+		[0, "&Pscr;"],
+		[0, "&Qscr;"],
+		[1, "&Sscr;"],
+		[0, "&Tscr;"],
+		[0, "&Uscr;"],
+		[0, "&Vscr;"],
+		[0, "&Wscr;"],
+		[0, "&Xscr;"],
+		[0, "&Yscr;"],
+		[0, "&Zscr;"],
+		[0, "&ascr;"],
+		[0, "&bscr;"],
+		[0, "&cscr;"],
+		[0, "&dscr;"],
+		[1, "&fscr;"],
+		[1, "&hscr;"],
+		[0, "&iscr;"],
+		[0, "&jscr;"],
+		[0, "&kscr;"],
+		[0, "&lscr;"],
+		[0, "&mscr;"],
+		[0, "&nscr;"],
+		[1, "&pscr;"],
+		[0, "&qscr;"],
+		[0, "&rscr;"],
+		[0, "&sscr;"],
+		[0, "&tscr;"],
+		[0, "&uscr;"],
+		[0, "&vscr;"],
+		[0, "&wscr;"],
+		[0, "&xscr;"],
+		[0, "&yscr;"],
+		[0, "&zscr;"],
+		[52, "&Afr;"],
+		[0, "&Bfr;"],
+		[1, "&Dfr;"],
+		[0, "&Efr;"],
+		[0, "&Ffr;"],
+		[0, "&Gfr;"],
+		[2, "&Jfr;"],
+		[0, "&Kfr;"],
+		[0, "&Lfr;"],
+		[0, "&Mfr;"],
+		[0, "&Nfr;"],
+		[0, "&Ofr;"],
+		[0, "&Pfr;"],
+		[0, "&Qfr;"],
+		[1, "&Sfr;"],
+		[0, "&Tfr;"],
+		[0, "&Ufr;"],
+		[0, "&Vfr;"],
+		[0, "&Wfr;"],
+		[0, "&Xfr;"],
+		[0, "&Yfr;"],
+		[1, "&afr;"],
+		[0, "&bfr;"],
+		[0, "&cfr;"],
+		[0, "&dfr;"],
+		[0, "&efr;"],
+		[0, "&ffr;"],
+		[0, "&gfr;"],
+		[0, "&hfr;"],
+		[0, "&ifr;"],
+		[0, "&jfr;"],
+		[0, "&kfr;"],
+		[0, "&lfr;"],
+		[0, "&mfr;"],
+		[0, "&nfr;"],
+		[0, "&ofr;"],
+		[0, "&pfr;"],
+		[0, "&qfr;"],
+		[0, "&rfr;"],
+		[0, "&sfr;"],
+		[0, "&tfr;"],
+		[0, "&ufr;"],
+		[0, "&vfr;"],
+		[0, "&wfr;"],
+		[0, "&xfr;"],
+		[0, "&yfr;"],
+		[0, "&zfr;"],
+		[0, "&Aopf;"],
+		[0, "&Bopf;"],
+		[1, "&Dopf;"],
+		[0, "&Eopf;"],
+		[0, "&Fopf;"],
+		[0, "&Gopf;"],
+		[1, "&Iopf;"],
+		[0, "&Jopf;"],
+		[0, "&Kopf;"],
+		[0, "&Lopf;"],
+		[0, "&Mopf;"],
+		[1, "&Oopf;"],
+		[3, "&Sopf;"],
+		[0, "&Topf;"],
+		[0, "&Uopf;"],
+		[0, "&Vopf;"],
+		[0, "&Wopf;"],
+		[0, "&Xopf;"],
+		[0, "&Yopf;"],
+		[1, "&aopf;"],
+		[0, "&bopf;"],
+		[0, "&copf;"],
+		[0, "&dopf;"],
+		[0, "&eopf;"],
+		[0, "&fopf;"],
+		[0, "&gopf;"],
+		[0, "&hopf;"],
+		[0, "&iopf;"],
+		[0, "&jopf;"],
+		[0, "&kopf;"],
+		[0, "&lopf;"],
+		[0, "&mopf;"],
+		[0, "&nopf;"],
+		[0, "&oopf;"],
+		[0, "&popf;"],
+		[0, "&qopf;"],
+		[0, "&ropf;"],
+		[0, "&sopf;"],
+		[0, "&topf;"],
+		[0, "&uopf;"],
+		[0, "&vopf;"],
+		[0, "&wopf;"],
+		[0, "&xopf;"],
+		[0, "&yopf;"],
+		[0, "&zopf;"]
+	])) }],
+	[8906, "&fflig;"],
+	[0, "&filig;"],
+	[0, "&fllig;"],
+	[0, "&ffilig;"],
+	[0, "&ffllig;"]
+]));
 
 const xmlReplacer = /["&'<>$\x80-\uFFFF]/g;
 const xmlCodeMap = new Map([
-  [34, "&quot;"],
-  [38, "&amp;"],
-  [39, "&apos;"],
-  [60, "&lt;"],
-  [62, "&gt;"],
+	[34, "&quot;"],
+	[38, "&amp;"],
+	[39, "&apos;"],
+	[60, "&lt;"],
+	[62, "&gt;"]
 ]);
-const getCodePoint =
-  String.prototype.codePointAt != null
-    ? (str, index) => str.codePointAt(index)
-    : (c$7, index) =>
-        (c$7.charCodeAt(index) & 64512) === 55296
-          ? (c$7.charCodeAt(index) - 55296) * 1024 + c$7.charCodeAt(index + 1) - 56320 + 65536
-          : c$7.charCodeAt(index);
+const getCodePoint = String.prototype.codePointAt != null ? (str, index) => str.codePointAt(index) : (c$7, index) => (c$7.charCodeAt(index) & 64512) === 55296 ? (c$7.charCodeAt(index) - 55296) * 1024 + c$7.charCodeAt(index + 1) - 56320 + 65536 : c$7.charCodeAt(index);
 /**
- * Encodes all non-ASCII characters, as well as characters not valid in XML
- * documents using XML entities.
- *
- * If a character has no equivalent entity, a
- * numeric hexadecimal reference (eg. `&#xfc;`) will be used.
- */
+* Encodes all non-ASCII characters, as well as characters not valid in XML
+* documents using XML entities.
+*
+* If a character has no equivalent entity, a
+* numeric hexadecimal reference (eg. `&#xfc;`) will be used.
+*/
 function encodeXML(str) {
-  let ret = "";
-  let lastIdx = 0;
-  let match;
-  while ((match = xmlReplacer.exec(str)) !== null) {
-    const i$10 = match.index;
-    const char = str.charCodeAt(i$10);
-    const next = xmlCodeMap.get(char);
-    if (next !== undefined) {
-      ret += str.substring(lastIdx, i$10) + next;
-      lastIdx = i$10 + 1;
-    } else {
-      ret += `${str.substring(lastIdx, i$10)}&#x${getCodePoint(str, i$10).toString(16)};`;
-      lastIdx = xmlReplacer.lastIndex += Number((char & 64512) === 55296);
-    }
-  }
-  return ret + str.substr(lastIdx);
+	let ret = "";
+	let lastIdx = 0;
+	let match;
+	while ((match = xmlReplacer.exec(str)) !== null) {
+		const i$10 = match.index;
+		const char = str.charCodeAt(i$10);
+		const next = xmlCodeMap.get(char);
+		if (next !== undefined) {
+			ret += str.substring(lastIdx, i$10) + next;
+			lastIdx = i$10 + 1;
+		} else {
+			ret += `${str.substring(lastIdx, i$10)}&#x${getCodePoint(str, i$10).toString(16)};`;
+			lastIdx = xmlReplacer.lastIndex += Number((char & 64512) === 55296);
+		}
+	}
+	return ret + str.substr(lastIdx);
 }
 /**
- * Encodes all non-ASCII characters, as well as characters not valid in XML
- * documents using numeric hexadecimal reference (eg. `&#xfc;`).
- *
- * Have a look at `escapeUTF8` if you want a more concise output at the expense
- * of reduced transportability.
- *
- * @param data String to escape.
- */
+* Encodes all non-ASCII characters, as well as characters not valid in XML
+* documents using numeric hexadecimal reference (eg. `&#xfc;`).
+*
+* Have a look at `escapeUTF8` if you want a more concise output at the expense
+* of reduced transportability.
+*
+* @param data String to escape.
+*/
 const escape$1 = encodeXML;
 /**
- * Creates a function that escapes all characters matched by the given regular
- * expression using the given map of characters to escape to their entities.
- *
- * @param regex Regular expression to match characters to escape.
- * @param map Map of characters to escape to their entities.
- *
- * @returns Function that escapes all characters matched by the given regular
- * expression using the given map of characters to escape to their entities.
- */
+* Creates a function that escapes all characters matched by the given regular
+* expression using the given map of characters to escape to their entities.
+*
+* @param regex Regular expression to match characters to escape.
+* @param map Map of characters to escape to their entities.
+*
+* @returns Function that escapes all characters matched by the given regular
+* expression using the given map of characters to escape to their entities.
+*/
 function getEscaper(regex, map$1) {
-  return function escape$2(data) {
-    let match;
-    let lastIdx = 0;
-    let result = "";
-    while ((match = regex.exec(data))) {
-      if (lastIdx !== match.index) {
-        result += data.substring(lastIdx, match.index);
-      }
-      result += map$1.get(match[0].charCodeAt(0));
-      lastIdx = match.index + 1;
-    }
-    return result + data.substring(lastIdx);
-  };
+	return function escape$2(data) {
+		let match;
+		let lastIdx = 0;
+		let result = "";
+		while (match = regex.exec(data)) {
+			if (lastIdx !== match.index) {
+				result += data.substring(lastIdx, match.index);
+			}
+			result += map$1.get(match[0].charCodeAt(0));
+			lastIdx = match.index + 1;
+		}
+		return result + data.substring(lastIdx);
+	};
 }
 /**
- * Encodes all characters not valid in XML documents using XML entities.
- *
- * Note that the output will be character-set dependent.
- *
- * @param data String to escape.
- */
+* Encodes all characters not valid in XML documents using XML entities.
+*
+* Note that the output will be character-set dependent.
+*
+* @param data String to escape.
+*/
 const escapeUTF8 = getEscaper(/[&<>'"]/g, xmlCodeMap);
 /**
- * Encodes all characters that have to be escaped in HTML attributes,
- * following {@link https://html.spec.whatwg.org/multipage/parsing.html#escapingString}.
- *
- * @param data String to escape.
- */
-const escapeAttribute = getEscaper(
-  /["&\u00A0]/g,
-  new Map([
-    [34, "&quot;"],
-    [38, "&amp;"],
-    [160, "&nbsp;"],
-  ]),
-);
+* Encodes all characters that have to be escaped in HTML attributes,
+* following {@link https://html.spec.whatwg.org/multipage/parsing.html#escapingString}.
+*
+* @param data String to escape.
+*/
+const escapeAttribute = getEscaper(/["&\u00A0]/g, new Map([
+	[34, "&quot;"],
+	[38, "&amp;"],
+	[160, "&nbsp;"]
+]));
 /**
- * Encodes all characters that have to be escaped in HTML text,
- * following {@link https://html.spec.whatwg.org/multipage/parsing.html#escapingString}.
- *
- * @param data String to escape.
- */
-const escapeText = getEscaper(
-  /[&<>\u00A0]/g,
-  new Map([
-    [38, "&amp;"],
-    [60, "&lt;"],
-    [62, "&gt;"],
-    [160, "&nbsp;"],
-  ]),
-);
+* Encodes all characters that have to be escaped in HTML text,
+* following {@link https://html.spec.whatwg.org/multipage/parsing.html#escapingString}.
+*
+* @param data String to escape.
+*/
+const escapeText = getEscaper(/[&<>\u00A0]/g, new Map([
+	[38, "&amp;"],
+	[60, "&lt;"],
+	[62, "&gt;"],
+	[160, "&nbsp;"]
+]));
 
 const htmlReplacer = /[\t\n!-,./:-@[-`\f{-}$\x80-\uFFFF]/g;
 /**
- * Encodes all characters in the input using HTML entities. This includes
- * characters that are valid ASCII characters in HTML documents, such as `#`.
- *
- * To get a more compact output, consider using the `encodeNonAsciiHTML`
- * function, which will only encode characters that are not valid in HTML
- * documents, as well as non-ASCII characters.
- *
- * If a character has no equivalent entity, a numeric hexadecimal reference
- * (eg. `&#xfc;`) will be used.
- */
+* Encodes all characters in the input using HTML entities. This includes
+* characters that are valid ASCII characters in HTML documents, such as `#`.
+*
+* To get a more compact output, consider using the `encodeNonAsciiHTML`
+* function, which will only encode characters that are not valid in HTML
+* documents, as well as non-ASCII characters.
+*
+* If a character has no equivalent entity, a numeric hexadecimal reference
+* (eg. `&#xfc;`) will be used.
+*/
 function encodeHTML(data) {
-  return encodeHTMLTrieRe(htmlReplacer, data);
+	return encodeHTMLTrieRe(htmlReplacer, data);
 }
 /**
- * Encodes all non-ASCII characters, as well as characters not valid in HTML
- * documents using HTML entities. This function will not encode characters that
- * are valid in HTML documents, such as `#`.
- *
- * If a character has no equivalent entity, a numeric hexadecimal reference
- * (eg. `&#xfc;`) will be used.
- */
+* Encodes all non-ASCII characters, as well as characters not valid in HTML
+* documents using HTML entities. This function will not encode characters that
+* are valid in HTML documents, such as `#`.
+*
+* If a character has no equivalent entity, a numeric hexadecimal reference
+* (eg. `&#xfc;`) will be used.
+*/
 function encodeNonAsciiHTML(data) {
-  return encodeHTMLTrieRe(xmlReplacer, data);
+	return encodeHTMLTrieRe(xmlReplacer, data);
 }
 function encodeHTMLTrieRe(regExp, str) {
-  let ret = "";
-  let lastIdx = 0;
-  let match;
-  while ((match = regExp.exec(str)) !== null) {
-    const i$10 = match.index;
-    ret += str.substring(lastIdx, i$10);
-    const char = str.charCodeAt(i$10);
-    let next = encode_html_default.get(char);
-    if (typeof next === "object") {
-      if (i$10 + 1 < str.length) {
-        const nextChar = str.charCodeAt(i$10 + 1);
-        const value =
-          typeof next.n === "number"
-            ? next.n === nextChar
-              ? next.o
-              : undefined
-            : next.n.get(nextChar);
-        if (value !== undefined) {
-          ret += value;
-          lastIdx = regExp.lastIndex += 1;
-          continue;
-        }
-      }
-      next = next.v;
-    }
-    if (next !== undefined) {
-      ret += next;
-      lastIdx = i$10 + 1;
-    } else {
-      const cp = getCodePoint(str, i$10);
-      ret += `&#x${cp.toString(16)};`;
-      lastIdx = regExp.lastIndex += Number(cp !== char);
-    }
-  }
-  return ret + str.substr(lastIdx);
+	let ret = "";
+	let lastIdx = 0;
+	let match;
+	while ((match = regExp.exec(str)) !== null) {
+		const i$10 = match.index;
+		ret += str.substring(lastIdx, i$10);
+		const char = str.charCodeAt(i$10);
+		let next = encode_html_default.get(char);
+		if (typeof next === "object") {
+			if (i$10 + 1 < str.length) {
+				const nextChar = str.charCodeAt(i$10 + 1);
+				const value = typeof next.n === "number" ? next.n === nextChar ? next.o : undefined : next.n.get(nextChar);
+				if (value !== undefined) {
+					ret += value;
+					lastIdx = regExp.lastIndex += 1;
+					continue;
+				}
+			}
+			next = next.v;
+		}
+		if (next !== undefined) {
+			ret += next;
+			lastIdx = i$10 + 1;
+		} else {
+			const cp = getCodePoint(str, i$10);
+			ret += `&#x${cp.toString(16)};`;
+			lastIdx = regExp.lastIndex += Number(cp !== char);
+		}
+	}
+	return ret + str.substr(lastIdx);
 }
 
 /** The level of entities to support. */
 var EntityLevel;
-(function (EntityLevel) {
-  /** Support only XML entities. */
-  EntityLevel[(EntityLevel["XML"] = 0)] = "XML";
-  /** Support HTML entities, which are a superset of XML entities. */
-  EntityLevel[(EntityLevel["HTML"] = 1)] = "HTML";
+(function(EntityLevel) {
+	/** Support only XML entities. */
+	EntityLevel[EntityLevel["XML"] = 0] = "XML";
+	/** Support HTML entities, which are a superset of XML entities. */
+	EntityLevel[EntityLevel["HTML"] = 1] = "HTML";
 })(EntityLevel || (EntityLevel = {}));
 var EncodingMode;
-(function (EncodingMode) {
-  /**
-   * The output is UTF-8 encoded. Only characters that need escaping within
-   * XML will be escaped.
-   */
-  EncodingMode[(EncodingMode["UTF8"] = 0)] = "UTF8";
-  /**
-   * The output consists only of ASCII characters. Characters that need
-   * escaping within HTML, and characters that aren't ASCII characters will
-   * be escaped.
-   */
-  EncodingMode[(EncodingMode["ASCII"] = 1)] = "ASCII";
-  /**
-   * Encode all characters that have an equivalent entity, as well as all
-   * characters that are not ASCII characters.
-   */
-  EncodingMode[(EncodingMode["Extensive"] = 2)] = "Extensive";
-  /**
-   * Encode all characters that have to be escaped in HTML attributes,
-   * following {@link https://html.spec.whatwg.org/multipage/parsing.html#escapingString}.
-   */
-  EncodingMode[(EncodingMode["Attribute"] = 3)] = "Attribute";
-  /**
-   * Encode all characters that have to be escaped in HTML text,
-   * following {@link https://html.spec.whatwg.org/multipage/parsing.html#escapingString}.
-   */
-  EncodingMode[(EncodingMode["Text"] = 4)] = "Text";
+(function(EncodingMode) {
+	/**
+	* The output is UTF-8 encoded. Only characters that need escaping within
+	* XML will be escaped.
+	*/
+	EncodingMode[EncodingMode["UTF8"] = 0] = "UTF8";
+	/**
+	* The output consists only of ASCII characters. Characters that need
+	* escaping within HTML, and characters that aren't ASCII characters will
+	* be escaped.
+	*/
+	EncodingMode[EncodingMode["ASCII"] = 1] = "ASCII";
+	/**
+	* Encode all characters that have an equivalent entity, as well as all
+	* characters that are not ASCII characters.
+	*/
+	EncodingMode[EncodingMode["Extensive"] = 2] = "Extensive";
+	/**
+	* Encode all characters that have to be escaped in HTML attributes,
+	* following {@link https://html.spec.whatwg.org/multipage/parsing.html#escapingString}.
+	*/
+	EncodingMode[EncodingMode["Attribute"] = 3] = "Attribute";
+	/**
+	* Encode all characters that have to be escaped in HTML text,
+	* following {@link https://html.spec.whatwg.org/multipage/parsing.html#escapingString}.
+	*/
+	EncodingMode[EncodingMode["Text"] = 4] = "Text";
 })(EncodingMode || (EncodingMode = {}));
 /**
- * Decodes a string with entities.
- *
- * @param data String to decode.
- * @param options Decoding options.
- */
+* Decodes a string with entities.
+*
+* @param data String to decode.
+* @param options Decoding options.
+*/
 function decode$1(data, options = EntityLevel.XML) {
-  const level = typeof options === "number" ? options : options.level;
-  if (level === EntityLevel.HTML) {
-    const mode = typeof options === "object" ? options.mode : undefined;
-    return decodeHTML(data, mode);
-  }
-  return decodeXML(data);
+	const level = typeof options === "number" ? options : options.level;
+	if (level === EntityLevel.HTML) {
+		const mode = typeof options === "object" ? options.mode : undefined;
+		return decodeHTML(data, mode);
+	}
+	return decodeXML(data);
 }
 /**
- * Decodes a string with entities. Does not allow missing trailing semicolons for entities.
- *
- * @param data String to decode.
- * @param options Decoding options.
- * @deprecated Use `decode` with the `mode` set to `Strict`.
- */
+* Decodes a string with entities. Does not allow missing trailing semicolons for entities.
+*
+* @param data String to decode.
+* @param options Decoding options.
+* @deprecated Use `decode` with the `mode` set to `Strict`.
+*/
 function decodeStrict(data, options = EntityLevel.XML) {
-  var _a$1;
-  const opts = typeof options === "number" ? { level: options } : options;
-  (_a$1 = opts.mode) !== null && _a$1 !== void 0 ? _a$1 : (opts.mode = DecodingMode.Strict);
-  return decode$1(data, opts);
+	var _a$1;
+	const opts = typeof options === "number" ? { level: options } : options;
+	(_a$1 = opts.mode) !== null && _a$1 !== void 0 ? _a$1 : opts.mode = DecodingMode.Strict;
+	return decode$1(data, opts);
 }
 /**
- * Encodes a string with entities.
- *
- * @param data String to encode.
- * @param options Encoding options.
- */
+* Encodes a string with entities.
+*
+* @param data String to encode.
+* @param options Encoding options.
+*/
 function encode$1(data, options = EntityLevel.XML) {
-  const opts = typeof options === "number" ? { level: options } : options;
-  if (opts.mode === EncodingMode.UTF8) return escapeUTF8(data);
-  if (opts.mode === EncodingMode.Attribute) return escapeAttribute(data);
-  if (opts.mode === EncodingMode.Text) return escapeText(data);
-  if (opts.level === EntityLevel.HTML) {
-    if (opts.mode === EncodingMode.ASCII) {
-      return encodeNonAsciiHTML(data);
-    }
-    return encodeHTML(data);
-  }
-  return encodeXML(data);
+	const opts = typeof options === "number" ? { level: options } : options;
+	if (opts.mode === EncodingMode.UTF8) return escapeUTF8(data);
+	if (opts.mode === EncodingMode.Attribute) return escapeAttribute(data);
+	if (opts.mode === EncodingMode.Text) return escapeText(data);
+	if (opts.level === EntityLevel.HTML) {
+		if (opts.mode === EncodingMode.ASCII) {
+			return encodeNonAsciiHTML(data);
+		}
+		return encodeHTML(data);
+	}
+	return encodeXML(data);
 }
 
 var utils_exports = /* @__PURE__ */ __exportAll({
-  arrayReplaceAt: () => arrayReplaceAt,
-  assign: () => assign$1,
-  escapeHtml: () => escapeHtml,
-  escapeRE: () => escapeRE$1,
-  fromCodePoint: () => fromCodePoint,
-  has: () => has,
-  isMdAsciiPunct: () => isMdAsciiPunct,
-  isPunctChar: () => isPunctChar,
-  isSpace: () => isSpace,
-  isString: () => isString$1,
-  isValidEntityCode: () => isValidEntityCode,
-  isWhiteSpace: () => isWhiteSpace,
-  lib: () => lib,
-  normalizeReference: () => normalizeReference,
-  unescapeAll: () => unescapeAll,
-  unescapeMd: () => unescapeMd,
+	arrayReplaceAt: () => arrayReplaceAt,
+	assign: () => assign$1,
+	escapeHtml: () => escapeHtml,
+	escapeRE: () => escapeRE$1,
+	fromCodePoint: () => fromCodePoint,
+	has: () => has,
+	isMdAsciiPunct: () => isMdAsciiPunct,
+	isPunctChar: () => isPunctChar,
+	isSpace: () => isSpace,
+	isString: () => isString$1,
+	isValidEntityCode: () => isValidEntityCode,
+	isWhiteSpace: () => isWhiteSpace,
+	lib: () => lib,
+	normalizeReference: () => normalizeReference,
+	unescapeAll: () => unescapeAll,
+	unescapeMd: () => unescapeMd
 });
 function _class$1(obj) {
-  return Object.prototype.toString.call(obj);
+	return Object.prototype.toString.call(obj);
 }
 function isString$1(obj) {
-  return _class$1(obj) === "[object String]";
+	return _class$1(obj) === "[object String]";
 }
 const _hasOwnProperty = Object.prototype.hasOwnProperty;
 function has(object, key) {
-  return _hasOwnProperty.call(object, key);
+	return _hasOwnProperty.call(object, key);
 }
 function assign$1(obj) {
-  const sources = Array.prototype.slice.call(arguments, 1);
-  sources.forEach(function (source) {
-    if (!source) {
-      return;
-    }
-    if (typeof source !== "object") {
-      throw new TypeError(source + "must be object");
-    }
-    Object.keys(source).forEach(function (key) {
-      obj[key] = source[key];
-    });
-  });
-  return obj;
+	const sources = Array.prototype.slice.call(arguments, 1);
+	sources.forEach(function(source) {
+		if (!source) {
+			return;
+		}
+		if (typeof source !== "object") {
+			throw new TypeError(source + "must be object");
+		}
+		Object.keys(source).forEach(function(key) {
+			obj[key] = source[key];
+		});
+	});
+	return obj;
 }
 function arrayReplaceAt(src, pos, newElements) {
-  return [].concat(src.slice(0, pos), newElements, src.slice(pos + 1));
+	return [].concat(src.slice(0, pos), newElements, src.slice(pos + 1));
 }
 function isValidEntityCode(c$7) {
-  if (c$7 >= 55296 && c$7 <= 57343) {
-    return false;
-  }
-  if (c$7 >= 64976 && c$7 <= 65007) {
-    return false;
-  }
-  if ((c$7 & 65535) === 65535 || (c$7 & 65535) === 65534) {
-    return false;
-  }
-  if (c$7 >= 0 && c$7 <= 8) {
-    return false;
-  }
-  if (c$7 === 11) {
-    return false;
-  }
-  if (c$7 >= 14 && c$7 <= 31) {
-    return false;
-  }
-  if (c$7 >= 127 && c$7 <= 159) {
-    return false;
-  }
-  if (c$7 > 1114111) {
-    return false;
-  }
-  return true;
+	if (c$7 >= 55296 && c$7 <= 57343) {
+		return false;
+	}
+	if (c$7 >= 64976 && c$7 <= 65007) {
+		return false;
+	}
+	if ((c$7 & 65535) === 65535 || (c$7 & 65535) === 65534) {
+		return false;
+	}
+	if (c$7 >= 0 && c$7 <= 8) {
+		return false;
+	}
+	if (c$7 === 11) {
+		return false;
+	}
+	if (c$7 >= 14 && c$7 <= 31) {
+		return false;
+	}
+	if (c$7 >= 127 && c$7 <= 159) {
+		return false;
+	}
+	if (c$7 > 1114111) {
+		return false;
+	}
+	return true;
 }
 function fromCodePoint(c$7) {
-  if (c$7 > 65535) {
-    c$7 -= 65536;
-    const surrogate1 = 55296 + (c$7 >> 10);
-    const surrogate2 = 56320 + (c$7 & 1023);
-    return String.fromCharCode(surrogate1, surrogate2);
-  }
-  return String.fromCharCode(c$7);
+	if (c$7 > 65535) {
+		c$7 -= 65536;
+		const surrogate1 = 55296 + (c$7 >> 10);
+		const surrogate2 = 56320 + (c$7 & 1023);
+		return String.fromCharCode(surrogate1, surrogate2);
+	}
+	return String.fromCharCode(c$7);
 }
 const UNESCAPE_MD_RE = /\\([!"#$%&'()*+,\-./:;<=>?@[\\\]^_`{|}~])/g;
 const ENTITY_RE = /&([a-z#][a-z0-9]{1,31});/gi;
 const UNESCAPE_ALL_RE = new RegExp(UNESCAPE_MD_RE.source + "|" + ENTITY_RE.source, "gi");
 const DIGITAL_ENTITY_TEST_RE = /^#((?:x[a-f0-9]{1,8}|[0-9]{1,8}))$/i;
 function replaceEntityPattern(match, name) {
-  if (name.charCodeAt(0) === 35 && DIGITAL_ENTITY_TEST_RE.test(name)) {
-    const code$1 =
-      name[1].toLowerCase() === "x" ? parseInt(name.slice(2), 16) : parseInt(name.slice(1), 10);
-    if (isValidEntityCode(code$1)) {
-      return fromCodePoint(code$1);
-    }
-    return match;
-  }
-  const decoded = decodeHTML(match);
-  if (decoded !== match) {
-    return decoded;
-  }
-  return match;
+	if (name.charCodeAt(0) === 35 && DIGITAL_ENTITY_TEST_RE.test(name)) {
+		const code$1 = name[1].toLowerCase() === "x" ? parseInt(name.slice(2), 16) : parseInt(name.slice(1), 10);
+		if (isValidEntityCode(code$1)) {
+			return fromCodePoint(code$1);
+		}
+		return match;
+	}
+	const decoded = decodeHTML(match);
+	if (decoded !== match) {
+		return decoded;
+	}
+	return match;
 }
 function unescapeMd(str) {
-  if (str.indexOf("\\") < 0) {
-    return str;
-  }
-  return str.replace(UNESCAPE_MD_RE, "$1");
+	if (str.indexOf("\\") < 0) {
+		return str;
+	}
+	return str.replace(UNESCAPE_MD_RE, "$1");
 }
 function unescapeAll(str) {
-  if (str.indexOf("\\") < 0 && str.indexOf("&") < 0) {
-    return str;
-  }
-  return str.replace(UNESCAPE_ALL_RE, function (match, escaped, entity$1) {
-    if (escaped) {
-      return escaped;
-    }
-    return replaceEntityPattern(match, entity$1);
-  });
+	if (str.indexOf("\\") < 0 && str.indexOf("&") < 0) {
+		return str;
+	}
+	return str.replace(UNESCAPE_ALL_RE, function(match, escaped, entity$1) {
+		if (escaped) {
+			return escaped;
+		}
+		return replaceEntityPattern(match, entity$1);
+	});
 }
 const HTML_ESCAPE_TEST_RE = /[&<>"]/;
 const HTML_ESCAPE_REPLACE_RE = /[&<>"]/g;
 const HTML_REPLACEMENTS = {
-  "&": "&amp;",
-  "<": "&lt;",
-  ">": "&gt;",
-  '"': "&quot;",
+	"&": "&amp;",
+	"<": "&lt;",
+	">": "&gt;",
+	"\"": "&quot;"
 };
 function replaceUnsafeChar(ch) {
-  return HTML_REPLACEMENTS[ch];
+	return HTML_REPLACEMENTS[ch];
 }
 function escapeHtml(str) {
-  if (HTML_ESCAPE_TEST_RE.test(str)) {
-    return str.replace(HTML_ESCAPE_REPLACE_RE, replaceUnsafeChar);
-  }
-  return str;
+	if (HTML_ESCAPE_TEST_RE.test(str)) {
+		return str.replace(HTML_ESCAPE_REPLACE_RE, replaceUnsafeChar);
+	}
+	return str;
 }
 const REGEXP_ESCAPE_RE = /[.?*+^$[\]\\(){}|-]/g;
 function escapeRE$1(str) {
-  return str.replace(REGEXP_ESCAPE_RE, "\\$&");
+	return str.replace(REGEXP_ESCAPE_RE, "\\$&");
 }
 function isSpace(code$1) {
-  switch (code$1) {
-    case 9:
-    case 32:
-      return true;
-  }
-  return false;
+	switch (code$1) {
+		case 9:
+		case 32: return true;
+	}
+	return false;
 }
 function isWhiteSpace(code$1) {
-  if (code$1 >= 8192 && code$1 <= 8202) {
-    return true;
-  }
-  switch (code$1) {
-    case 9:
-    case 10:
-    case 11:
-    case 12:
-    case 13:
-    case 32:
-    case 160:
-    case 5760:
-    case 8239:
-    case 8287:
-    case 12288:
-      return true;
-  }
-  return false;
+	if (code$1 >= 8192 && code$1 <= 8202) {
+		return true;
+	}
+	switch (code$1) {
+		case 9:
+		case 10:
+		case 11:
+		case 12:
+		case 13:
+		case 32:
+		case 160:
+		case 5760:
+		case 8239:
+		case 8287:
+		case 12288: return true;
+	}
+	return false;
 }
 function isPunctChar(ch) {
-  return regex_default$2.test(ch) || regex_default$1.test(ch);
+	return regex_default$2.test(ch) || regex_default$1.test(ch);
 }
 function isMdAsciiPunct(ch) {
-  switch (ch) {
-    case 33:
-    case 34:
-    case 35:
-    case 36:
-    case 37:
-    case 38:
-    case 39:
-    case 40:
-    case 41:
-    case 42:
-    case 43:
-    case 44:
-    case 45:
-    case 46:
-    case 47:
-    case 58:
-    case 59:
-    case 60:
-    case 61:
-    case 62:
-    case 63:
-    case 64:
-    case 91:
-    case 92:
-    case 93:
-    case 94:
-    case 95:
-    case 96:
-    case 123:
-    case 124:
-    case 125:
-    case 126:
-      return true;
-    default:
-      return false;
-  }
+	switch (ch) {
+		case 33:
+		case 34:
+		case 35:
+		case 36:
+		case 37:
+		case 38:
+		case 39:
+		case 40:
+		case 41:
+		case 42:
+		case 43:
+		case 44:
+		case 45:
+		case 46:
+		case 47:
+		case 58:
+		case 59:
+		case 60:
+		case 61:
+		case 62:
+		case 63:
+		case 64:
+		case 91:
+		case 92:
+		case 93:
+		case 94:
+		case 95:
+		case 96:
+		case 123:
+		case 124:
+		case 125:
+		case 126: return true;
+		default: return false;
+	}
 }
 function normalizeReference(str) {
-  str = str.trim().replace(/\s+/g, " ");
-  if ("ẞ".toLowerCase() === "Ṿ") {
-    str = str.replace(/ẞ/g, "ß");
-  }
-  return str.toLowerCase().toUpperCase();
+	str = str.trim().replace(/\s+/g, " ");
+	if ("ẞ".toLowerCase() === "Ṿ") {
+		str = str.replace(/ẞ/g, "ß");
+	}
+	return str.toLowerCase().toUpperCase();
 }
 const lib = {
-  mdurl: mdurl_exports,
-  ucmicro: uc_exports,
+	mdurl: mdurl_exports,
+	ucmicro: uc_exports
 };
 
 function parseLinkLabel(state, start, disableNested) {
-  let level, found, marker, prevPos;
-  const max = state.posMax;
-  const oldPos = state.pos;
-  state.pos = start + 1;
-  level = 1;
-  while (state.pos < max) {
-    marker = state.src.charCodeAt(state.pos);
-    if (marker === 93) {
-      level--;
-      if (level === 0) {
-        found = true;
-        break;
-      }
-    }
-    prevPos = state.pos;
-    state.md.inline.skipToken(state);
-    if (marker === 91) {
-      if (prevPos === state.pos - 1) {
-        level++;
-      } else if (disableNested) {
-        state.pos = oldPos;
-        return -1;
-      }
-    }
-  }
-  let labelEnd = -1;
-  if (found) {
-    labelEnd = state.pos;
-  }
-  state.pos = oldPos;
-  return labelEnd;
+	let level, found, marker, prevPos;
+	const max = state.posMax;
+	const oldPos = state.pos;
+	state.pos = start + 1;
+	level = 1;
+	while (state.pos < max) {
+		marker = state.src.charCodeAt(state.pos);
+		if (marker === 93) {
+			level--;
+			if (level === 0) {
+				found = true;
+				break;
+			}
+		}
+		prevPos = state.pos;
+		state.md.inline.skipToken(state);
+		if (marker === 91) {
+			if (prevPos === state.pos - 1) {
+				level++;
+			} else if (disableNested) {
+				state.pos = oldPos;
+				return -1;
+			}
+		}
+	}
+	let labelEnd = -1;
+	if (found) {
+		labelEnd = state.pos;
+	}
+	state.pos = oldPos;
+	return labelEnd;
 }
 
 function parseLinkDestination(str, start, max) {
-  let code$1;
-  let pos = start;
-  const result = {
-    ok: false,
-    pos: 0,
-    str: "",
-  };
-  if (str.charCodeAt(pos) === 60) {
-    pos++;
-    while (pos < max) {
-      code$1 = str.charCodeAt(pos);
-      if (code$1 === 10) {
-        return result;
-      }
-      if (code$1 === 60) {
-        return result;
-      }
-      if (code$1 === 62) {
-        result.pos = pos + 1;
-        result.str = unescapeAll(str.slice(start + 1, pos));
-        result.ok = true;
-        return result;
-      }
-      if (code$1 === 92 && pos + 1 < max) {
-        pos += 2;
-        continue;
-      }
-      pos++;
-    }
-    return result;
-  }
-  let level = 0;
-  while (pos < max) {
-    code$1 = str.charCodeAt(pos);
-    if (code$1 === 32) {
-      break;
-    }
-    if (code$1 < 32 || code$1 === 127) {
-      break;
-    }
-    if (code$1 === 92 && pos + 1 < max) {
-      if (str.charCodeAt(pos + 1) === 32) {
-        break;
-      }
-      pos += 2;
-      continue;
-    }
-    if (code$1 === 40) {
-      level++;
-      if (level > 32) {
-        return result;
-      }
-    }
-    if (code$1 === 41) {
-      if (level === 0) {
-        break;
-      }
-      level--;
-    }
-    pos++;
-  }
-  if (start === pos) {
-    return result;
-  }
-  if (level !== 0) {
-    return result;
-  }
-  result.str = unescapeAll(str.slice(start, pos));
-  result.pos = pos;
-  result.ok = true;
-  return result;
+	let code$1;
+	let pos = start;
+	const result = {
+		ok: false,
+		pos: 0,
+		str: ""
+	};
+	if (str.charCodeAt(pos) === 60) {
+		pos++;
+		while (pos < max) {
+			code$1 = str.charCodeAt(pos);
+			if (code$1 === 10) {
+				return result;
+			}
+			if (code$1 === 60) {
+				return result;
+			}
+			if (code$1 === 62) {
+				result.pos = pos + 1;
+				result.str = unescapeAll(str.slice(start + 1, pos));
+				result.ok = true;
+				return result;
+			}
+			if (code$1 === 92 && pos + 1 < max) {
+				pos += 2;
+				continue;
+			}
+			pos++;
+		}
+		return result;
+	}
+	let level = 0;
+	while (pos < max) {
+		code$1 = str.charCodeAt(pos);
+		if (code$1 === 32) {
+			break;
+		}
+		if (code$1 < 32 || code$1 === 127) {
+			break;
+		}
+		if (code$1 === 92 && pos + 1 < max) {
+			if (str.charCodeAt(pos + 1) === 32) {
+				break;
+			}
+			pos += 2;
+			continue;
+		}
+		if (code$1 === 40) {
+			level++;
+			if (level > 32) {
+				return result;
+			}
+		}
+		if (code$1 === 41) {
+			if (level === 0) {
+				break;
+			}
+			level--;
+		}
+		pos++;
+	}
+	if (start === pos) {
+		return result;
+	}
+	if (level !== 0) {
+		return result;
+	}
+	result.str = unescapeAll(str.slice(start, pos));
+	result.pos = pos;
+	result.ok = true;
+	return result;
 }
 
 function parseLinkTitle(str, start, max, prev_state) {
-  let code$1;
-  let pos = start;
-  const state = {
-    ok: false,
-    can_continue: false,
-    pos: 0,
-    str: "",
-    marker: 0,
-  };
-  if (prev_state) {
-    state.str = prev_state.str;
-    state.marker = prev_state.marker;
-  } else {
-    if (pos >= max) {
-      return state;
-    }
-    let marker = str.charCodeAt(pos);
-    if (marker !== 34 && marker !== 39 && marker !== 40) {
-      return state;
-    }
-    start++;
-    pos++;
-    if (marker === 40) {
-      marker = 41;
-    }
-    state.marker = marker;
-  }
-  while (pos < max) {
-    code$1 = str.charCodeAt(pos);
-    if (code$1 === state.marker) {
-      state.pos = pos + 1;
-      state.str += unescapeAll(str.slice(start, pos));
-      state.ok = true;
-      return state;
-    } else if (code$1 === 40 && state.marker === 41) {
-      return state;
-    } else if (code$1 === 92 && pos + 1 < max) {
-      pos++;
-    }
-    pos++;
-  }
-  state.can_continue = true;
-  state.str += unescapeAll(str.slice(start, pos));
-  return state;
+	let code$1;
+	let pos = start;
+	const state = {
+		ok: false,
+		can_continue: false,
+		pos: 0,
+		str: "",
+		marker: 0
+	};
+	if (prev_state) {
+		state.str = prev_state.str;
+		state.marker = prev_state.marker;
+	} else {
+		if (pos >= max) {
+			return state;
+		}
+		let marker = str.charCodeAt(pos);
+		if (marker !== 34 && marker !== 39 && marker !== 40) {
+			return state;
+		}
+		start++;
+		pos++;
+		if (marker === 40) {
+			marker = 41;
+		}
+		state.marker = marker;
+	}
+	while (pos < max) {
+		code$1 = str.charCodeAt(pos);
+		if (code$1 === state.marker) {
+			state.pos = pos + 1;
+			state.str += unescapeAll(str.slice(start, pos));
+			state.ok = true;
+			return state;
+		} else if (code$1 === 40 && state.marker === 41) {
+			return state;
+		} else if (code$1 === 92 && pos + 1 < max) {
+			pos++;
+		}
+		pos++;
+	}
+	state.can_continue = true;
+	state.str += unescapeAll(str.slice(start, pos));
+	return state;
 }
 
 var helpers_exports = /* @__PURE__ */ __exportAll({
-  parseLinkDestination: () => parseLinkDestination,
-  parseLinkLabel: () => parseLinkLabel,
-  parseLinkTitle: () => parseLinkTitle,
+	parseLinkDestination: () => parseLinkDestination,
+	parseLinkLabel: () => parseLinkLabel,
+	parseLinkTitle: () => parseLinkTitle
 });
 
 /**
- * class Renderer
- *
- * Generates HTML from parsed token stream. Each instance has independent
- * copy of rules. Those can be rewritten with ease. Also, you can add new
- * rules if you create plugin and adds new token types.
- **/
+* class Renderer
+*
+* Generates HTML from parsed token stream. Each instance has independent
+* copy of rules. Those can be rewritten with ease. Also, you can add new
+* rules if you create plugin and adds new token types.
+**/
 const default_rules = {};
-default_rules.code_inline = function (tokens, idx, options, env, slf) {
-  const token = tokens[idx];
-  return "<code" + slf.renderAttrs(token) + ">" + escapeHtml(token.content) + "</code>";
+default_rules.code_inline = function(tokens, idx, options, env, slf) {
+	const token = tokens[idx];
+	return "<code" + slf.renderAttrs(token) + ">" + escapeHtml(token.content) + "</code>";
 };
-default_rules.code_block = function (tokens, idx, options, env, slf) {
-  const token = tokens[idx];
-  return (
-    "<pre" +
-    slf.renderAttrs(token) +
-    "><code>" +
-    escapeHtml(tokens[idx].content) +
-    "</code></pre>\n"
-  );
+default_rules.code_block = function(tokens, idx, options, env, slf) {
+	const token = tokens[idx];
+	return "<pre" + slf.renderAttrs(token) + "><code>" + escapeHtml(tokens[idx].content) + "</code></pre>\n";
 };
-default_rules.fence = function (tokens, idx, options, env, slf) {
-  const token = tokens[idx];
-  const info = token.info ? unescapeAll(token.info).trim() : "";
-  let langName = "";
-  let langAttrs = "";
-  if (info) {
-    const arr = info.split(/(\s+)/g);
-    langName = arr[0];
-    langAttrs = arr.slice(2).join("");
-  }
-  let highlighted;
-  if (options.highlight) {
-    highlighted =
-      options.highlight(token.content, langName, langAttrs) || escapeHtml(token.content);
-  } else {
-    highlighted = escapeHtml(token.content);
-  }
-  if (highlighted.indexOf("<pre") === 0) {
-    return highlighted + "\n";
-  }
-  if (info) {
-    const i$10 = token.attrIndex("class");
-    const tmpAttrs = token.attrs ? token.attrs.slice() : [];
-    if (i$10 < 0) {
-      tmpAttrs.push(["class", options.langPrefix + langName]);
-    } else {
-      tmpAttrs[i$10] = tmpAttrs[i$10].slice();
-      tmpAttrs[i$10][1] += " " + options.langPrefix + langName;
-    }
-    const tmpToken = { attrs: tmpAttrs };
-    return `<pre><code${slf.renderAttrs(tmpToken)}>${highlighted}</code></pre>\n`;
-  }
-  return `<pre><code${slf.renderAttrs(token)}>${highlighted}</code></pre>\n`;
+default_rules.fence = function(tokens, idx, options, env, slf) {
+	const token = tokens[idx];
+	const info = token.info ? unescapeAll(token.info).trim() : "";
+	let langName = "";
+	let langAttrs = "";
+	if (info) {
+		const arr = info.split(/(\s+)/g);
+		langName = arr[0];
+		langAttrs = arr.slice(2).join("");
+	}
+	let highlighted;
+	if (options.highlight) {
+		highlighted = options.highlight(token.content, langName, langAttrs) || escapeHtml(token.content);
+	} else {
+		highlighted = escapeHtml(token.content);
+	}
+	if (highlighted.indexOf("<pre") === 0) {
+		return highlighted + "\n";
+	}
+	if (info) {
+		const i$10 = token.attrIndex("class");
+		const tmpAttrs = token.attrs ? token.attrs.slice() : [];
+		if (i$10 < 0) {
+			tmpAttrs.push(["class", options.langPrefix + langName]);
+		} else {
+			tmpAttrs[i$10] = tmpAttrs[i$10].slice();
+			tmpAttrs[i$10][1] += " " + options.langPrefix + langName;
+		}
+		const tmpToken = { attrs: tmpAttrs };
+		return `<pre><code${slf.renderAttrs(tmpToken)}>${highlighted}</code></pre>\n`;
+	}
+	return `<pre><code${slf.renderAttrs(token)}>${highlighted}</code></pre>\n`;
 };
-default_rules.image = function (tokens, idx, options, env, slf) {
-  const token = tokens[idx];
-  token.attrs[token.attrIndex("alt")][1] = slf.renderInlineAsText(token.children, options, env);
-  return slf.renderToken(tokens, idx, options);
+default_rules.image = function(tokens, idx, options, env, slf) {
+	const token = tokens[idx];
+	token.attrs[token.attrIndex("alt")][1] = slf.renderInlineAsText(token.children, options, env);
+	return slf.renderToken(tokens, idx, options);
 };
-default_rules.hardbreak = function (tokens, idx, options) {
-  return options.xhtmlOut ? "<br />\n" : "<br>\n";
+default_rules.hardbreak = function(tokens, idx, options) {
+	return options.xhtmlOut ? "<br />\n" : "<br>\n";
 };
-default_rules.softbreak = function (tokens, idx, options) {
-  return options.breaks ? (options.xhtmlOut ? "<br />\n" : "<br>\n") : "\n";
+default_rules.softbreak = function(tokens, idx, options) {
+	return options.breaks ? options.xhtmlOut ? "<br />\n" : "<br>\n" : "\n";
 };
-default_rules.text = function (tokens, idx) {
-  return escapeHtml(tokens[idx].content);
+default_rules.text = function(tokens, idx) {
+	return escapeHtml(tokens[idx].content);
 };
-default_rules.html_block = function (tokens, idx) {
-  return tokens[idx].content;
+default_rules.html_block = function(tokens, idx) {
+	return tokens[idx].content;
 };
-default_rules.html_inline = function (tokens, idx) {
-  return tokens[idx].content;
+default_rules.html_inline = function(tokens, idx) {
+	return tokens[idx].content;
 };
 /**
- * new Renderer()
- *
- * Creates new [[Renderer]] instance and fill [[Renderer#rules]] with defaults.
- **/
+* new Renderer()
+*
+* Creates new [[Renderer]] instance and fill [[Renderer#rules]] with defaults.
+**/
 function Renderer() {
-  /**
-   * Renderer#rules -> Object
-   *
-   * Contains render rules for tokens. Can be updated and extended.
-   *
-   * ##### Example
-   *
-   * ```javascript
-   * var md = require('markdown-it')();
-   *
-   * md.renderer.rules.strong_open  = function () { return '<b>'; };
-   * md.renderer.rules.strong_close = function () { return '</b>'; };
-   *
-   * var result = md.renderInline(...);
-   * ```
-   *
-   * Each rule is called as independent static function with fixed signature:
-   *
-   * ```javascript
-   * function my_token_render(tokens, idx, options, env, renderer) {
-   *   // ...
-   *   return renderedHTML;
-   * }
-   * ```
-   *
-   * See [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.mjs)
-   * for more details and examples.
-   **/
-  this.rules = assign$1({}, default_rules);
+	/**
+	* Renderer#rules -> Object
+	*
+	* Contains render rules for tokens. Can be updated and extended.
+	*
+	* ##### Example
+	*
+	* ```javascript
+	* var md = require('markdown-it')();
+	*
+	* md.renderer.rules.strong_open  = function () { return '<b>'; };
+	* md.renderer.rules.strong_close = function () { return '</b>'; };
+	*
+	* var result = md.renderInline(...);
+	* ```
+	*
+	* Each rule is called as independent static function with fixed signature:
+	*
+	* ```javascript
+	* function my_token_render(tokens, idx, options, env, renderer) {
+	*   // ...
+	*   return renderedHTML;
+	* }
+	* ```
+	*
+	* See [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.mjs)
+	* for more details and examples.
+	**/
+	this.rules = assign$1({}, default_rules);
 }
 /**
- * Renderer.renderAttrs(token) -> String
- *
- * Render token attributes to string.
- **/
+* Renderer.renderAttrs(token) -> String
+*
+* Render token attributes to string.
+**/
 Renderer.prototype.renderAttrs = function renderAttrs(token) {
-  let i$10, l$5, result;
-  if (!token.attrs) {
-    return "";
-  }
-  result = "";
-  for (i$10 = 0, l$5 = token.attrs.length; i$10 < l$5; i$10++) {
-    result +=
-      " " + escapeHtml(token.attrs[i$10][0]) + '="' + escapeHtml(token.attrs[i$10][1]) + '"';
-  }
-  return result;
+	let i$10, l$5, result;
+	if (!token.attrs) {
+		return "";
+	}
+	result = "";
+	for (i$10 = 0, l$5 = token.attrs.length; i$10 < l$5; i$10++) {
+		result += " " + escapeHtml(token.attrs[i$10][0]) + "=\"" + escapeHtml(token.attrs[i$10][1]) + "\"";
+	}
+	return result;
 };
 /**
- * Renderer.renderToken(tokens, idx, options) -> String
- * - tokens (Array): list of tokens
- * - idx (Numbed): token index to render
- * - options (Object): params of parser instance
- *
- * Default token renderer. Can be overriden by custom function
- * in [[Renderer#rules]].
- **/
+* Renderer.renderToken(tokens, idx, options) -> String
+* - tokens (Array): list of tokens
+* - idx (Numbed): token index to render
+* - options (Object): params of parser instance
+*
+* Default token renderer. Can be overriden by custom function
+* in [[Renderer#rules]].
+**/
 Renderer.prototype.renderToken = function renderToken(tokens, idx, options) {
-  const token = tokens[idx];
-  let result = "";
-  if (token.hidden) {
-    return "";
-  }
-  if (token.block && token.nesting !== -1 && idx && tokens[idx - 1].hidden) {
-    result += "\n";
-  }
-  result += (token.nesting === -1 ? "</" : "<") + token.tag;
-  result += this.renderAttrs(token);
-  if (token.nesting === 0 && options.xhtmlOut) {
-    result += " /";
-  }
-  let needLf = false;
-  if (token.block) {
-    needLf = true;
-    if (token.nesting === 1) {
-      if (idx + 1 < tokens.length) {
-        const nextToken = tokens[idx + 1];
-        if (nextToken.type === "inline" || nextToken.hidden) {
-          needLf = false;
-        } else if (nextToken.nesting === -1 && nextToken.tag === token.tag) {
-          needLf = false;
-        }
-      }
-    }
-  }
-  result += needLf ? ">\n" : ">";
-  return result;
+	const token = tokens[idx];
+	let result = "";
+	if (token.hidden) {
+		return "";
+	}
+	if (token.block && token.nesting !== -1 && idx && tokens[idx - 1].hidden) {
+		result += "\n";
+	}
+	result += (token.nesting === -1 ? "</" : "<") + token.tag;
+	result += this.renderAttrs(token);
+	if (token.nesting === 0 && options.xhtmlOut) {
+		result += " /";
+	}
+	let needLf = false;
+	if (token.block) {
+		needLf = true;
+		if (token.nesting === 1) {
+			if (idx + 1 < tokens.length) {
+				const nextToken = tokens[idx + 1];
+				if (nextToken.type === "inline" || nextToken.hidden) {
+					needLf = false;
+				} else if (nextToken.nesting === -1 && nextToken.tag === token.tag) {
+					needLf = false;
+				}
+			}
+		}
+	}
+	result += needLf ? ">\n" : ">";
+	return result;
 };
 /**
- * Renderer.renderInline(tokens, options, env) -> String
- * - tokens (Array): list on block tokens to render
- * - options (Object): params of parser instance
- * - env (Object): additional data from parsed input (references, for example)
- *
- * The same as [[Renderer.render]], but for single token of `inline` type.
- **/
-Renderer.prototype.renderInline = function (tokens, options, env) {
-  let result = "";
-  const rules = this.rules;
-  for (let i$10 = 0, len = tokens.length; i$10 < len; i$10++) {
-    const type$2 = tokens[i$10].type;
-    if (typeof rules[type$2] !== "undefined") {
-      result += rules[type$2](tokens, i$10, options, env, this);
-    } else {
-      result += this.renderToken(tokens, i$10, options);
-    }
-  }
-  return result;
+* Renderer.renderInline(tokens, options, env) -> String
+* - tokens (Array): list on block tokens to render
+* - options (Object): params of parser instance
+* - env (Object): additional data from parsed input (references, for example)
+*
+* The same as [[Renderer.render]], but for single token of `inline` type.
+**/
+Renderer.prototype.renderInline = function(tokens, options, env) {
+	let result = "";
+	const rules = this.rules;
+	for (let i$10 = 0, len = tokens.length; i$10 < len; i$10++) {
+		const type$2 = tokens[i$10].type;
+		if (typeof rules[type$2] !== "undefined") {
+			result += rules[type$2](tokens, i$10, options, env, this);
+		} else {
+			result += this.renderToken(tokens, i$10, options);
+		}
+	}
+	return result;
 };
 /** internal
- * Renderer.renderInlineAsText(tokens, options, env) -> String
- * - tokens (Array): list on block tokens to render
- * - options (Object): params of parser instance
- * - env (Object): additional data from parsed input (references, for example)
- *
- * Special kludge for image `alt` attributes to conform CommonMark spec.
- * Don't try to use it! Spec requires to show `alt` content with stripped markup,
- * instead of simple escaping.
- **/
-Renderer.prototype.renderInlineAsText = function (tokens, options, env) {
-  let result = "";
-  for (let i$10 = 0, len = tokens.length; i$10 < len; i$10++) {
-    switch (tokens[i$10].type) {
-      case "text":
-        result += tokens[i$10].content;
-        break;
-      case "image":
-        result += this.renderInlineAsText(tokens[i$10].children, options, env);
-        break;
-      case "html_inline":
-      case "html_block":
-        result += tokens[i$10].content;
-        break;
-      case "softbreak":
-      case "hardbreak":
-        result += "\n";
-        break;
-      default:
-    }
-  }
-  return result;
+* Renderer.renderInlineAsText(tokens, options, env) -> String
+* - tokens (Array): list on block tokens to render
+* - options (Object): params of parser instance
+* - env (Object): additional data from parsed input (references, for example)
+*
+* Special kludge for image `alt` attributes to conform CommonMark spec.
+* Don't try to use it! Spec requires to show `alt` content with stripped markup,
+* instead of simple escaping.
+**/
+Renderer.prototype.renderInlineAsText = function(tokens, options, env) {
+	let result = "";
+	for (let i$10 = 0, len = tokens.length; i$10 < len; i$10++) {
+		switch (tokens[i$10].type) {
+			case "text":
+				result += tokens[i$10].content;
+				break;
+			case "image":
+				result += this.renderInlineAsText(tokens[i$10].children, options, env);
+				break;
+			case "html_inline":
+			case "html_block":
+				result += tokens[i$10].content;
+				break;
+			case "softbreak":
+			case "hardbreak":
+				result += "\n";
+				break;
+			default:
+		}
+	}
+	return result;
 };
 /**
- * Renderer.render(tokens, options, env) -> String
- * - tokens (Array): list on block tokens to render
- * - options (Object): params of parser instance
- * - env (Object): additional data from parsed input (references, for example)
- *
- * Takes token stream and generates HTML. Probably, you will never need to call
- * this method directly.
- **/
-Renderer.prototype.render = function (tokens, options, env) {
-  let result = "";
-  const rules = this.rules;
-  for (let i$10 = 0, len = tokens.length; i$10 < len; i$10++) {
-    const type$2 = tokens[i$10].type;
-    if (type$2 === "inline") {
-      result += this.renderInline(tokens[i$10].children, options, env);
-    } else if (typeof rules[type$2] !== "undefined") {
-      result += rules[type$2](tokens, i$10, options, env, this);
-    } else {
-      result += this.renderToken(tokens, i$10, options, env);
-    }
-  }
-  return result;
+* Renderer.render(tokens, options, env) -> String
+* - tokens (Array): list on block tokens to render
+* - options (Object): params of parser instance
+* - env (Object): additional data from parsed input (references, for example)
+*
+* Takes token stream and generates HTML. Probably, you will never need to call
+* this method directly.
+**/
+Renderer.prototype.render = function(tokens, options, env) {
+	let result = "";
+	const rules = this.rules;
+	for (let i$10 = 0, len = tokens.length; i$10 < len; i$10++) {
+		const type$2 = tokens[i$10].type;
+		if (type$2 === "inline") {
+			result += this.renderInline(tokens[i$10].children, options, env);
+		} else if (typeof rules[type$2] !== "undefined") {
+			result += rules[type$2](tokens, i$10, options, env, this);
+		} else {
+			result += this.renderToken(tokens, i$10, options, env);
+		}
+	}
+	return result;
 };
 var renderer_default = Renderer;
 
 /**
- * class Ruler
- *
- * Helper class, used by [[MarkdownIt#core]], [[MarkdownIt#block]] and
- * [[MarkdownIt#inline]] to manage sequences of functions (rules):
- *
- * - keep rules in defined order
- * - assign the name to each rule
- * - enable/disable rules
- * - add/replace rules
- * - allow assign rules to additional named chains (in the same)
- * - cacheing lists of active rules
- *
- * You will not need use this class directly until write plugins. For simple
- * rules control use [[MarkdownIt.disable]], [[MarkdownIt.enable]] and
- * [[MarkdownIt.use]].
- **/
+* class Ruler
+*
+* Helper class, used by [[MarkdownIt#core]], [[MarkdownIt#block]] and
+* [[MarkdownIt#inline]] to manage sequences of functions (rules):
+*
+* - keep rules in defined order
+* - assign the name to each rule
+* - enable/disable rules
+* - add/replace rules
+* - allow assign rules to additional named chains (in the same)
+* - cacheing lists of active rules
+*
+* You will not need use this class directly until write plugins. For simple
+* rules control use [[MarkdownIt.disable]], [[MarkdownIt.enable]] and
+* [[MarkdownIt.use]].
+**/
 /**
- * new Ruler()
- **/
+* new Ruler()
+**/
 function Ruler() {
-  this.__rules__ = [];
-  this.__cache__ = null;
+	this.__rules__ = [];
+	this.__cache__ = null;
 }
-Ruler.prototype.__find__ = function (name) {
-  for (let i$10 = 0; i$10 < this.__rules__.length; i$10++) {
-    if (this.__rules__[i$10].name === name) {
-      return i$10;
-    }
-  }
-  return -1;
+Ruler.prototype.__find__ = function(name) {
+	for (let i$10 = 0; i$10 < this.__rules__.length; i$10++) {
+		if (this.__rules__[i$10].name === name) {
+			return i$10;
+		}
+	}
+	return -1;
 };
-Ruler.prototype.__compile__ = function () {
-  const self = this;
-  const chains = [""];
-  self.__rules__.forEach(function (rule) {
-    if (!rule.enabled) {
-      return;
-    }
-    rule.alt.forEach(function (altName) {
-      if (chains.indexOf(altName) < 0) {
-        chains.push(altName);
-      }
-    });
-  });
-  self.__cache__ = {};
-  chains.forEach(function (chain) {
-    self.__cache__[chain] = [];
-    self.__rules__.forEach(function (rule) {
-      if (!rule.enabled) {
-        return;
-      }
-      if (chain && rule.alt.indexOf(chain) < 0) {
-        return;
-      }
-      self.__cache__[chain].push(rule.fn);
-    });
-  });
+Ruler.prototype.__compile__ = function() {
+	const self = this;
+	const chains = [""];
+	self.__rules__.forEach(function(rule) {
+		if (!rule.enabled) {
+			return;
+		}
+		rule.alt.forEach(function(altName) {
+			if (chains.indexOf(altName) < 0) {
+				chains.push(altName);
+			}
+		});
+	});
+	self.__cache__ = {};
+	chains.forEach(function(chain) {
+		self.__cache__[chain] = [];
+		self.__rules__.forEach(function(rule) {
+			if (!rule.enabled) {
+				return;
+			}
+			if (chain && rule.alt.indexOf(chain) < 0) {
+				return;
+			}
+			self.__cache__[chain].push(rule.fn);
+		});
+	});
 };
 /**
- * Ruler.at(name, fn [, options])
- * - name (String): rule name to replace.
- * - fn (Function): new rule function.
- * - options (Object): new rule options (not mandatory).
- *
- * Replace rule by name with new function & options. Throws error if name not
- * found.
- *
- * ##### Options:
- *
- * - __alt__ - array with names of "alternate" chains.
- *
- * ##### Example
- *
- * Replace existing typographer replacement rule with new one:
- *
- * ```javascript
- * var md = require('markdown-it')();
- *
- * md.core.ruler.at('replacements', function replace(state) {
- *   //...
- * });
- * ```
- **/
-Ruler.prototype.at = function (name, fn, options) {
-  const index = this.__find__(name);
-  const opt = options || {};
-  if (index === -1) {
-    throw new Error("Parser rule not found: " + name);
-  }
-  this.__rules__[index].fn = fn;
-  this.__rules__[index].alt = opt.alt || [];
-  this.__cache__ = null;
+* Ruler.at(name, fn [, options])
+* - name (String): rule name to replace.
+* - fn (Function): new rule function.
+* - options (Object): new rule options (not mandatory).
+*
+* Replace rule by name with new function & options. Throws error if name not
+* found.
+*
+* ##### Options:
+*
+* - __alt__ - array with names of "alternate" chains.
+*
+* ##### Example
+*
+* Replace existing typographer replacement rule with new one:
+*
+* ```javascript
+* var md = require('markdown-it')();
+*
+* md.core.ruler.at('replacements', function replace(state) {
+*   //...
+* });
+* ```
+**/
+Ruler.prototype.at = function(name, fn, options) {
+	const index = this.__find__(name);
+	const opt = options || {};
+	if (index === -1) {
+		throw new Error("Parser rule not found: " + name);
+	}
+	this.__rules__[index].fn = fn;
+	this.__rules__[index].alt = opt.alt || [];
+	this.__cache__ = null;
 };
 /**
- * Ruler.before(beforeName, ruleName, fn [, options])
- * - beforeName (String): new rule will be added before this one.
- * - ruleName (String): name of added rule.
- * - fn (Function): rule function.
- * - options (Object): rule options (not mandatory).
- *
- * Add new rule to chain before one with given name. See also
- * [[Ruler.after]], [[Ruler.push]].
- *
- * ##### Options:
- *
- * - __alt__ - array with names of "alternate" chains.
- *
- * ##### Example
- *
- * ```javascript
- * var md = require('markdown-it')();
- *
- * md.block.ruler.before('paragraph', 'my_rule', function replace(state) {
- *   //...
- * });
- * ```
- **/
-Ruler.prototype.before = function (beforeName, ruleName, fn, options) {
-  const index = this.__find__(beforeName);
-  const opt = options || {};
-  if (index === -1) {
-    throw new Error("Parser rule not found: " + beforeName);
-  }
-  this.__rules__.splice(index, 0, {
-    name: ruleName,
-    enabled: true,
-    fn,
-    alt: opt.alt || [],
-  });
-  this.__cache__ = null;
+* Ruler.before(beforeName, ruleName, fn [, options])
+* - beforeName (String): new rule will be added before this one.
+* - ruleName (String): name of added rule.
+* - fn (Function): rule function.
+* - options (Object): rule options (not mandatory).
+*
+* Add new rule to chain before one with given name. See also
+* [[Ruler.after]], [[Ruler.push]].
+*
+* ##### Options:
+*
+* - __alt__ - array with names of "alternate" chains.
+*
+* ##### Example
+*
+* ```javascript
+* var md = require('markdown-it')();
+*
+* md.block.ruler.before('paragraph', 'my_rule', function replace(state) {
+*   //...
+* });
+* ```
+**/
+Ruler.prototype.before = function(beforeName, ruleName, fn, options) {
+	const index = this.__find__(beforeName);
+	const opt = options || {};
+	if (index === -1) {
+		throw new Error("Parser rule not found: " + beforeName);
+	}
+	this.__rules__.splice(index, 0, {
+		name: ruleName,
+		enabled: true,
+		fn,
+		alt: opt.alt || []
+	});
+	this.__cache__ = null;
 };
 /**
- * Ruler.after(afterName, ruleName, fn [, options])
- * - afterName (String): new rule will be added after this one.
- * - ruleName (String): name of added rule.
- * - fn (Function): rule function.
- * - options (Object): rule options (not mandatory).
- *
- * Add new rule to chain after one with given name. See also
- * [[Ruler.before]], [[Ruler.push]].
- *
- * ##### Options:
- *
- * - __alt__ - array with names of "alternate" chains.
- *
- * ##### Example
- *
- * ```javascript
- * var md = require('markdown-it')();
- *
- * md.inline.ruler.after('text', 'my_rule', function replace(state) {
- *   //...
- * });
- * ```
- **/
-Ruler.prototype.after = function (afterName, ruleName, fn, options) {
-  const index = this.__find__(afterName);
-  const opt = options || {};
-  if (index === -1) {
-    throw new Error("Parser rule not found: " + afterName);
-  }
-  this.__rules__.splice(index + 1, 0, {
-    name: ruleName,
-    enabled: true,
-    fn,
-    alt: opt.alt || [],
-  });
-  this.__cache__ = null;
+* Ruler.after(afterName, ruleName, fn [, options])
+* - afterName (String): new rule will be added after this one.
+* - ruleName (String): name of added rule.
+* - fn (Function): rule function.
+* - options (Object): rule options (not mandatory).
+*
+* Add new rule to chain after one with given name. See also
+* [[Ruler.before]], [[Ruler.push]].
+*
+* ##### Options:
+*
+* - __alt__ - array with names of "alternate" chains.
+*
+* ##### Example
+*
+* ```javascript
+* var md = require('markdown-it')();
+*
+* md.inline.ruler.after('text', 'my_rule', function replace(state) {
+*   //...
+* });
+* ```
+**/
+Ruler.prototype.after = function(afterName, ruleName, fn, options) {
+	const index = this.__find__(afterName);
+	const opt = options || {};
+	if (index === -1) {
+		throw new Error("Parser rule not found: " + afterName);
+	}
+	this.__rules__.splice(index + 1, 0, {
+		name: ruleName,
+		enabled: true,
+		fn,
+		alt: opt.alt || []
+	});
+	this.__cache__ = null;
 };
 /**
- * Ruler.push(ruleName, fn [, options])
- * - ruleName (String): name of added rule.
- * - fn (Function): rule function.
- * - options (Object): rule options (not mandatory).
- *
- * Push new rule to the end of chain. See also
- * [[Ruler.before]], [[Ruler.after]].
- *
- * ##### Options:
- *
- * - __alt__ - array with names of "alternate" chains.
- *
- * ##### Example
- *
- * ```javascript
- * var md = require('markdown-it')();
- *
- * md.core.ruler.push('my_rule', function replace(state) {
- *   //...
- * });
- * ```
- **/
-Ruler.prototype.push = function (ruleName, fn, options) {
-  const opt = options || {};
-  this.__rules__.push({
-    name: ruleName,
-    enabled: true,
-    fn,
-    alt: opt.alt || [],
-  });
-  this.__cache__ = null;
+* Ruler.push(ruleName, fn [, options])
+* - ruleName (String): name of added rule.
+* - fn (Function): rule function.
+* - options (Object): rule options (not mandatory).
+*
+* Push new rule to the end of chain. See also
+* [[Ruler.before]], [[Ruler.after]].
+*
+* ##### Options:
+*
+* - __alt__ - array with names of "alternate" chains.
+*
+* ##### Example
+*
+* ```javascript
+* var md = require('markdown-it')();
+*
+* md.core.ruler.push('my_rule', function replace(state) {
+*   //...
+* });
+* ```
+**/
+Ruler.prototype.push = function(ruleName, fn, options) {
+	const opt = options || {};
+	this.__rules__.push({
+		name: ruleName,
+		enabled: true,
+		fn,
+		alt: opt.alt || []
+	});
+	this.__cache__ = null;
 };
 /**
- * Ruler.enable(list [, ignoreInvalid]) -> Array
- * - list (String|Array): list of rule names to enable.
- * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
- *
- * Enable rules with given names. If any rule name not found - throw Error.
- * Errors can be disabled by second param.
- *
- * Returns list of found rule names (if no exception happened).
- *
- * See also [[Ruler.disable]], [[Ruler.enableOnly]].
- **/
-Ruler.prototype.enable = function (list$1, ignoreInvalid) {
-  if (!Array.isArray(list$1)) {
-    list$1 = [list$1];
-  }
-  const result = [];
-  list$1.forEach(function (name) {
-    const idx = this.__find__(name);
-    if (idx < 0) {
-      if (ignoreInvalid) {
-        return;
-      }
-      throw new Error("Rules manager: invalid rule name " + name);
-    }
-    this.__rules__[idx].enabled = true;
-    result.push(name);
-  }, this);
-  this.__cache__ = null;
-  return result;
+* Ruler.enable(list [, ignoreInvalid]) -> Array
+* - list (String|Array): list of rule names to enable.
+* - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
+*
+* Enable rules with given names. If any rule name not found - throw Error.
+* Errors can be disabled by second param.
+*
+* Returns list of found rule names (if no exception happened).
+*
+* See also [[Ruler.disable]], [[Ruler.enableOnly]].
+**/
+Ruler.prototype.enable = function(list$1, ignoreInvalid) {
+	if (!Array.isArray(list$1)) {
+		list$1 = [list$1];
+	}
+	const result = [];
+	list$1.forEach(function(name) {
+		const idx = this.__find__(name);
+		if (idx < 0) {
+			if (ignoreInvalid) {
+				return;
+			}
+			throw new Error("Rules manager: invalid rule name " + name);
+		}
+		this.__rules__[idx].enabled = true;
+		result.push(name);
+	}, this);
+	this.__cache__ = null;
+	return result;
 };
 /**
- * Ruler.enableOnly(list [, ignoreInvalid])
- * - list (String|Array): list of rule names to enable (whitelist).
- * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
- *
- * Enable rules with given names, and disable everything else. If any rule name
- * not found - throw Error. Errors can be disabled by second param.
- *
- * See also [[Ruler.disable]], [[Ruler.enable]].
- **/
-Ruler.prototype.enableOnly = function (list$1, ignoreInvalid) {
-  if (!Array.isArray(list$1)) {
-    list$1 = [list$1];
-  }
-  this.__rules__.forEach(function (rule) {
-    rule.enabled = false;
-  });
-  this.enable(list$1, ignoreInvalid);
+* Ruler.enableOnly(list [, ignoreInvalid])
+* - list (String|Array): list of rule names to enable (whitelist).
+* - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
+*
+* Enable rules with given names, and disable everything else. If any rule name
+* not found - throw Error. Errors can be disabled by second param.
+*
+* See also [[Ruler.disable]], [[Ruler.enable]].
+**/
+Ruler.prototype.enableOnly = function(list$1, ignoreInvalid) {
+	if (!Array.isArray(list$1)) {
+		list$1 = [list$1];
+	}
+	this.__rules__.forEach(function(rule) {
+		rule.enabled = false;
+	});
+	this.enable(list$1, ignoreInvalid);
 };
 /**
- * Ruler.disable(list [, ignoreInvalid]) -> Array
- * - list (String|Array): list of rule names to disable.
- * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
- *
- * Disable rules with given names. If any rule name not found - throw Error.
- * Errors can be disabled by second param.
- *
- * Returns list of found rule names (if no exception happened).
- *
- * See also [[Ruler.enable]], [[Ruler.enableOnly]].
- **/
-Ruler.prototype.disable = function (list$1, ignoreInvalid) {
-  if (!Array.isArray(list$1)) {
-    list$1 = [list$1];
-  }
-  const result = [];
-  list$1.forEach(function (name) {
-    const idx = this.__find__(name);
-    if (idx < 0) {
-      if (ignoreInvalid) {
-        return;
-      }
-      throw new Error("Rules manager: invalid rule name " + name);
-    }
-    this.__rules__[idx].enabled = false;
-    result.push(name);
-  }, this);
-  this.__cache__ = null;
-  return result;
+* Ruler.disable(list [, ignoreInvalid]) -> Array
+* - list (String|Array): list of rule names to disable.
+* - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
+*
+* Disable rules with given names. If any rule name not found - throw Error.
+* Errors can be disabled by second param.
+*
+* Returns list of found rule names (if no exception happened).
+*
+* See also [[Ruler.enable]], [[Ruler.enableOnly]].
+**/
+Ruler.prototype.disable = function(list$1, ignoreInvalid) {
+	if (!Array.isArray(list$1)) {
+		list$1 = [list$1];
+	}
+	const result = [];
+	list$1.forEach(function(name) {
+		const idx = this.__find__(name);
+		if (idx < 0) {
+			if (ignoreInvalid) {
+				return;
+			}
+			throw new Error("Rules manager: invalid rule name " + name);
+		}
+		this.__rules__[idx].enabled = false;
+		result.push(name);
+	}, this);
+	this.__cache__ = null;
+	return result;
 };
 /**
- * Ruler.getRules(chainName) -> Array
- *
- * Return array of active functions (rules) for given chain name. It analyzes
- * rules configuration, compiles caches if not exists and returns result.
- *
- * Default chain name is `''` (empty string). It can't be skipped. That's
- * done intentionally, to keep signature monomorphic for high speed.
- **/
-Ruler.prototype.getRules = function (chainName) {
-  if (this.__cache__ === null) {
-    this.__compile__();
-  }
-  return this.__cache__[chainName] || [];
+* Ruler.getRules(chainName) -> Array
+*
+* Return array of active functions (rules) for given chain name. It analyzes
+* rules configuration, compiles caches if not exists and returns result.
+*
+* Default chain name is `''` (empty string). It can't be skipped. That's
+* done intentionally, to keep signature monomorphic for high speed.
+**/
+Ruler.prototype.getRules = function(chainName) {
+	if (this.__cache__ === null) {
+		this.__compile__();
+	}
+	return this.__cache__[chainName] || [];
 };
 var ruler_default = Ruler;
 
 /**
- * class Token
- **/
+* class Token
+**/
 /**
- * new Token(type, tag, nesting)
- *
- * Create new token and fill passed properties.
- **/
+* new Token(type, tag, nesting)
+*
+* Create new token and fill passed properties.
+**/
 function Token(type$2, tag, nesting) {
-  /**
-   * Token#type -> String
-   *
-   * Type of the token (string, e.g. "paragraph_open")
-   **/
-  this.type = type$2;
-  /**
-   * Token#tag -> String
-   *
-   * html tag name, e.g. "p"
-   **/
-  this.tag = tag;
-  /**
-   * Token#attrs -> Array
-   *
-   * Html attributes. Format: `[ [ name1, value1 ], [ name2, value2 ] ]`
-   **/
-  this.attrs = null;
-  /**
-   * Token#map -> Array
-   *
-   * Source map info. Format: `[ line_begin, line_end ]`
-   **/
-  this.map = null;
-  /**
-   * Token#nesting -> Number
-   *
-   * Level change (number in {-1, 0, 1} set), where:
-   *
-   * -  `1` means the tag is opening
-   * -  `0` means the tag is self-closing
-   * - `-1` means the tag is closing
-   **/
-  this.nesting = nesting;
-  /**
-   * Token#level -> Number
-   *
-   * nesting level, the same as `state.level`
-   **/
-  this.level = 0;
-  /**
-   * Token#children -> Array
-   *
-   * An array of child nodes (inline and img tokens)
-   **/
-  this.children = null;
-  /**
-   * Token#content -> String
-   *
-   * In a case of self-closing tag (code, html, fence, etc.),
-   * it has contents of this tag.
-   **/
-  this.content = "";
-  /**
-   * Token#markup -> String
-   *
-   * '*' or '_' for emphasis, fence string for fence, etc.
-   **/
-  this.markup = "";
-  /**
-   * Token#info -> String
-   *
-   * Additional information:
-   *
-   * - Info string for "fence" tokens
-   * - The value "auto" for autolink "link_open" and "link_close" tokens
-   * - The string value of the item marker for ordered-list "list_item_open" tokens
-   **/
-  this.info = "";
-  /**
-   * Token#meta -> Object
-   *
-   * A place for plugins to store an arbitrary data
-   **/
-  this.meta = null;
-  /**
-   * Token#block -> Boolean
-   *
-   * True for block-level tokens, false for inline tokens.
-   * Used in renderer to calculate line breaks
-   **/
-  this.block = false;
-  /**
-   * Token#hidden -> Boolean
-   *
-   * If it's true, ignore this element when rendering. Used for tight lists
-   * to hide paragraphs.
-   **/
-  this.hidden = false;
+	/**
+	* Token#type -> String
+	*
+	* Type of the token (string, e.g. "paragraph_open")
+	**/
+	this.type = type$2;
+	/**
+	* Token#tag -> String
+	*
+	* html tag name, e.g. "p"
+	**/
+	this.tag = tag;
+	/**
+	* Token#attrs -> Array
+	*
+	* Html attributes. Format: `[ [ name1, value1 ], [ name2, value2 ] ]`
+	**/
+	this.attrs = null;
+	/**
+	* Token#map -> Array
+	*
+	* Source map info. Format: `[ line_begin, line_end ]`
+	**/
+	this.map = null;
+	/**
+	* Token#nesting -> Number
+	*
+	* Level change (number in {-1, 0, 1} set), where:
+	*
+	* -  `1` means the tag is opening
+	* -  `0` means the tag is self-closing
+	* - `-1` means the tag is closing
+	**/
+	this.nesting = nesting;
+	/**
+	* Token#level -> Number
+	*
+	* nesting level, the same as `state.level`
+	**/
+	this.level = 0;
+	/**
+	* Token#children -> Array
+	*
+	* An array of child nodes (inline and img tokens)
+	**/
+	this.children = null;
+	/**
+	* Token#content -> String
+	*
+	* In a case of self-closing tag (code, html, fence, etc.),
+	* it has contents of this tag.
+	**/
+	this.content = "";
+	/**
+	* Token#markup -> String
+	*
+	* '*' or '_' for emphasis, fence string for fence, etc.
+	**/
+	this.markup = "";
+	/**
+	* Token#info -> String
+	*
+	* Additional information:
+	*
+	* - Info string for "fence" tokens
+	* - The value "auto" for autolink "link_open" and "link_close" tokens
+	* - The string value of the item marker for ordered-list "list_item_open" tokens
+	**/
+	this.info = "";
+	/**
+	* Token#meta -> Object
+	*
+	* A place for plugins to store an arbitrary data
+	**/
+	this.meta = null;
+	/**
+	* Token#block -> Boolean
+	*
+	* True for block-level tokens, false for inline tokens.
+	* Used in renderer to calculate line breaks
+	**/
+	this.block = false;
+	/**
+	* Token#hidden -> Boolean
+	*
+	* If it's true, ignore this element when rendering. Used for tight lists
+	* to hide paragraphs.
+	**/
+	this.hidden = false;
 }
 /**
- * Token.attrIndex(name) -> Number
- *
- * Search attribute index by name.
- **/
+* Token.attrIndex(name) -> Number
+*
+* Search attribute index by name.
+**/
 Token.prototype.attrIndex = function attrIndex(name) {
-  if (!this.attrs) {
-    return -1;
-  }
-  const attrs = this.attrs;
-  for (let i$10 = 0, len = attrs.length; i$10 < len; i$10++) {
-    if (attrs[i$10][0] === name) {
-      return i$10;
-    }
-  }
-  return -1;
+	if (!this.attrs) {
+		return -1;
+	}
+	const attrs = this.attrs;
+	for (let i$10 = 0, len = attrs.length; i$10 < len; i$10++) {
+		if (attrs[i$10][0] === name) {
+			return i$10;
+		}
+	}
+	return -1;
 };
 /**
- * Token.attrPush(attrData)
- *
- * Add `[ name, value ]` attribute to list. Init attrs if necessary
- **/
+* Token.attrPush(attrData)
+*
+* Add `[ name, value ]` attribute to list. Init attrs if necessary
+**/
 Token.prototype.attrPush = function attrPush(attrData) {
-  if (this.attrs) {
-    this.attrs.push(attrData);
-  } else {
-    this.attrs = [attrData];
-  }
+	if (this.attrs) {
+		this.attrs.push(attrData);
+	} else {
+		this.attrs = [attrData];
+	}
 };
 /**
- * Token.attrSet(name, value)
- *
- * Set `name` attribute to `value`. Override old value if exists.
- **/
+* Token.attrSet(name, value)
+*
+* Set `name` attribute to `value`. Override old value if exists.
+**/
 Token.prototype.attrSet = function attrSet(name, value) {
-  const idx = this.attrIndex(name);
-  const attrData = [name, value];
-  if (idx < 0) {
-    this.attrPush(attrData);
-  } else {
-    this.attrs[idx] = attrData;
-  }
+	const idx = this.attrIndex(name);
+	const attrData = [name, value];
+	if (idx < 0) {
+		this.attrPush(attrData);
+	} else {
+		this.attrs[idx] = attrData;
+	}
 };
 /**
- * Token.attrGet(name)
- *
- * Get the value of attribute `name`, or null if it does not exist.
- **/
+* Token.attrGet(name)
+*
+* Get the value of attribute `name`, or null if it does not exist.
+**/
 Token.prototype.attrGet = function attrGet(name) {
-  const idx = this.attrIndex(name);
-  let value = null;
-  if (idx >= 0) {
-    value = this.attrs[idx][1];
-  }
-  return value;
+	const idx = this.attrIndex(name);
+	let value = null;
+	if (idx >= 0) {
+		value = this.attrs[idx][1];
+	}
+	return value;
 };
 /**
- * Token.attrJoin(name, value)
- *
- * Join value to existing attribute via space. Or create new attribute if not
- * exists. Useful to operate with token classes.
- **/
+* Token.attrJoin(name, value)
+*
+* Join value to existing attribute via space. Or create new attribute if not
+* exists. Useful to operate with token classes.
+**/
 Token.prototype.attrJoin = function attrJoin(name, value) {
-  const idx = this.attrIndex(name);
-  if (idx < 0) {
-    this.attrPush([name, value]);
-  } else {
-    this.attrs[idx][1] = this.attrs[idx][1] + " " + value;
-  }
+	const idx = this.attrIndex(name);
+	if (idx < 0) {
+		this.attrPush([name, value]);
+	} else {
+		this.attrs[idx][1] = this.attrs[idx][1] + " " + value;
+	}
 };
 var token_default = Token;
 
 function StateCore(src, md, env) {
-  this.src = src;
-  this.env = env;
-  this.tokens = [];
-  this.inlineMode = false;
-  this.md = md;
+	this.src = src;
+	this.env = env;
+	this.tokens = [];
+	this.inlineMode = false;
+	this.md = md;
 }
 StateCore.prototype.Token = token_default;
 var state_core_default = StateCore;
@@ -14416,1500 +12418,1471 @@ var state_core_default = StateCore;
 const NEWLINES_RE = /\r\n?|\n/g;
 const NULL_RE = /\0/g;
 function normalize(state) {
-  let str;
-  str = state.src.replace(NEWLINES_RE, "\n");
-  str = str.replace(NULL_RE, "�");
-  state.src = str;
+	let str;
+	str = state.src.replace(NEWLINES_RE, "\n");
+	str = str.replace(NULL_RE, "�");
+	state.src = str;
 }
 
 function block(state) {
-  let token;
-  if (state.inlineMode) {
-    token = new state.Token("inline", "", 0);
-    token.content = state.src;
-    token.map = [0, 1];
-    token.children = [];
-    state.tokens.push(token);
-  } else {
-    state.md.block.parse(state.src, state.md, state.env, state.tokens);
-  }
+	let token;
+	if (state.inlineMode) {
+		token = new state.Token("inline", "", 0);
+		token.content = state.src;
+		token.map = [0, 1];
+		token.children = [];
+		state.tokens.push(token);
+	} else {
+		state.md.block.parse(state.src, state.md, state.env, state.tokens);
+	}
 }
 
 function inline(state) {
-  const tokens = state.tokens;
-  for (let i$10 = 0, l$5 = tokens.length; i$10 < l$5; i$10++) {
-    const tok = tokens[i$10];
-    if (tok.type === "inline") {
-      state.md.inline.parse(tok.content, state.md, state.env, tok.children);
-    }
-  }
+	const tokens = state.tokens;
+	for (let i$10 = 0, l$5 = tokens.length; i$10 < l$5; i$10++) {
+		const tok = tokens[i$10];
+		if (tok.type === "inline") {
+			state.md.inline.parse(tok.content, state.md, state.env, tok.children);
+		}
+	}
 }
 
 function isLinkOpen$1(str) {
-  return /^<a[>\s]/i.test(str);
+	return /^<a[>\s]/i.test(str);
 }
 function isLinkClose$1(str) {
-  return /^<\/a\s*>/i.test(str);
+	return /^<\/a\s*>/i.test(str);
 }
 function linkify$1(state) {
-  const blockTokens = state.tokens;
-  if (!state.md.options.linkify) {
-    return;
-  }
-  for (let j$2 = 0, l$5 = blockTokens.length; j$2 < l$5; j$2++) {
-    if (blockTokens[j$2].type !== "inline" || !state.md.linkify.pretest(blockTokens[j$2].content)) {
-      continue;
-    }
-    let tokens = blockTokens[j$2].children;
-    let htmlLinkLevel = 0;
-    for (let i$10 = tokens.length - 1; i$10 >= 0; i$10--) {
-      const currentToken = tokens[i$10];
-      if (currentToken.type === "link_close") {
-        i$10--;
-        while (tokens[i$10].level !== currentToken.level && tokens[i$10].type !== "link_open") {
-          i$10--;
-        }
-        continue;
-      }
-      if (currentToken.type === "html_inline") {
-        if (isLinkOpen$1(currentToken.content) && htmlLinkLevel > 0) {
-          htmlLinkLevel--;
-        }
-        if (isLinkClose$1(currentToken.content)) {
-          htmlLinkLevel++;
-        }
-      }
-      if (htmlLinkLevel > 0) {
-        continue;
-      }
-      if (currentToken.type === "text" && state.md.linkify.test(currentToken.content)) {
-        const text$1 = currentToken.content;
-        let links = state.md.linkify.match(text$1);
-        const nodes = [];
-        let level = currentToken.level;
-        let lastPos = 0;
-        if (
-          links.length > 0 &&
-          links[0].index === 0 &&
-          i$10 > 0 &&
-          tokens[i$10 - 1].type === "text_special"
-        ) {
-          links = links.slice(1);
-        }
-        for (let ln = 0; ln < links.length; ln++) {
-          const url = links[ln].url;
-          const fullUrl = state.md.normalizeLink(url);
-          if (!state.md.validateLink(fullUrl)) {
-            continue;
-          }
-          let urlText = links[ln].text;
-          if (!links[ln].schema) {
-            urlText = state.md.normalizeLinkText("http://" + urlText).replace(/^http:\/\//, "");
-          } else if (links[ln].schema === "mailto:" && !/^mailto:/i.test(urlText)) {
-            urlText = state.md.normalizeLinkText("mailto:" + urlText).replace(/^mailto:/, "");
-          } else {
-            urlText = state.md.normalizeLinkText(urlText);
-          }
-          const pos = links[ln].index;
-          if (pos > lastPos) {
-            const token = new state.Token("text", "", 0);
-            token.content = text$1.slice(lastPos, pos);
-            token.level = level;
-            nodes.push(token);
-          }
-          const token_o = new state.Token("link_open", "a", 1);
-          token_o.attrs = [["href", fullUrl]];
-          token_o.level = level++;
-          token_o.markup = "linkify";
-          token_o.info = "auto";
-          nodes.push(token_o);
-          const token_t = new state.Token("text", "", 0);
-          token_t.content = urlText;
-          token_t.level = level;
-          nodes.push(token_t);
-          const token_c = new state.Token("link_close", "a", -1);
-          token_c.level = --level;
-          token_c.markup = "linkify";
-          token_c.info = "auto";
-          nodes.push(token_c);
-          lastPos = links[ln].lastIndex;
-        }
-        if (lastPos < text$1.length) {
-          const token = new state.Token("text", "", 0);
-          token.content = text$1.slice(lastPos);
-          token.level = level;
-          nodes.push(token);
-        }
-        blockTokens[j$2].children = tokens = arrayReplaceAt(tokens, i$10, nodes);
-      }
-    }
-  }
+	const blockTokens = state.tokens;
+	if (!state.md.options.linkify) {
+		return;
+	}
+	for (let j$2 = 0, l$5 = blockTokens.length; j$2 < l$5; j$2++) {
+		if (blockTokens[j$2].type !== "inline" || !state.md.linkify.pretest(blockTokens[j$2].content)) {
+			continue;
+		}
+		let tokens = blockTokens[j$2].children;
+		let htmlLinkLevel = 0;
+		for (let i$10 = tokens.length - 1; i$10 >= 0; i$10--) {
+			const currentToken = tokens[i$10];
+			if (currentToken.type === "link_close") {
+				i$10--;
+				while (tokens[i$10].level !== currentToken.level && tokens[i$10].type !== "link_open") {
+					i$10--;
+				}
+				continue;
+			}
+			if (currentToken.type === "html_inline") {
+				if (isLinkOpen$1(currentToken.content) && htmlLinkLevel > 0) {
+					htmlLinkLevel--;
+				}
+				if (isLinkClose$1(currentToken.content)) {
+					htmlLinkLevel++;
+				}
+			}
+			if (htmlLinkLevel > 0) {
+				continue;
+			}
+			if (currentToken.type === "text" && state.md.linkify.test(currentToken.content)) {
+				const text$1 = currentToken.content;
+				let links = state.md.linkify.match(text$1);
+				const nodes = [];
+				let level = currentToken.level;
+				let lastPos = 0;
+				if (links.length > 0 && links[0].index === 0 && i$10 > 0 && tokens[i$10 - 1].type === "text_special") {
+					links = links.slice(1);
+				}
+				for (let ln = 0; ln < links.length; ln++) {
+					const url = links[ln].url;
+					const fullUrl = state.md.normalizeLink(url);
+					if (!state.md.validateLink(fullUrl)) {
+						continue;
+					}
+					let urlText = links[ln].text;
+					if (!links[ln].schema) {
+						urlText = state.md.normalizeLinkText("http://" + urlText).replace(/^http:\/\//, "");
+					} else if (links[ln].schema === "mailto:" && !/^mailto:/i.test(urlText)) {
+						urlText = state.md.normalizeLinkText("mailto:" + urlText).replace(/^mailto:/, "");
+					} else {
+						urlText = state.md.normalizeLinkText(urlText);
+					}
+					const pos = links[ln].index;
+					if (pos > lastPos) {
+						const token = new state.Token("text", "", 0);
+						token.content = text$1.slice(lastPos, pos);
+						token.level = level;
+						nodes.push(token);
+					}
+					const token_o = new state.Token("link_open", "a", 1);
+					token_o.attrs = [["href", fullUrl]];
+					token_o.level = level++;
+					token_o.markup = "linkify";
+					token_o.info = "auto";
+					nodes.push(token_o);
+					const token_t = new state.Token("text", "", 0);
+					token_t.content = urlText;
+					token_t.level = level;
+					nodes.push(token_t);
+					const token_c = new state.Token("link_close", "a", -1);
+					token_c.level = --level;
+					token_c.markup = "linkify";
+					token_c.info = "auto";
+					nodes.push(token_c);
+					lastPos = links[ln].lastIndex;
+				}
+				if (lastPos < text$1.length) {
+					const token = new state.Token("text", "", 0);
+					token.content = text$1.slice(lastPos);
+					token.level = level;
+					nodes.push(token);
+				}
+				blockTokens[j$2].children = tokens = arrayReplaceAt(tokens, i$10, nodes);
+			}
+		}
+	}
 }
 
 const RARE_RE = /\+-|\.\.|\?\?\?\?|!!!!|,,|--/;
 const SCOPED_ABBR_TEST_RE = /\((c|tm|r)\)/i;
 const SCOPED_ABBR_RE = /\((c|tm|r)\)/gi;
 const SCOPED_ABBR = {
-  c: "©",
-  r: "®",
-  tm: "™",
+	c: "©",
+	r: "®",
+	tm: "™"
 };
 function replaceFn(match, name) {
-  return SCOPED_ABBR[name.toLowerCase()];
+	return SCOPED_ABBR[name.toLowerCase()];
 }
 function replace_scoped(inlineTokens) {
-  let inside_autolink = 0;
-  for (let i$10 = inlineTokens.length - 1; i$10 >= 0; i$10--) {
-    const token = inlineTokens[i$10];
-    if (token.type === "text" && !inside_autolink) {
-      token.content = token.content.replace(SCOPED_ABBR_RE, replaceFn);
-    }
-    if (token.type === "link_open" && token.info === "auto") {
-      inside_autolink--;
-    }
-    if (token.type === "link_close" && token.info === "auto") {
-      inside_autolink++;
-    }
-  }
+	let inside_autolink = 0;
+	for (let i$10 = inlineTokens.length - 1; i$10 >= 0; i$10--) {
+		const token = inlineTokens[i$10];
+		if (token.type === "text" && !inside_autolink) {
+			token.content = token.content.replace(SCOPED_ABBR_RE, replaceFn);
+		}
+		if (token.type === "link_open" && token.info === "auto") {
+			inside_autolink--;
+		}
+		if (token.type === "link_close" && token.info === "auto") {
+			inside_autolink++;
+		}
+	}
 }
 function replace_rare(inlineTokens) {
-  let inside_autolink = 0;
-  for (let i$10 = inlineTokens.length - 1; i$10 >= 0; i$10--) {
-    const token = inlineTokens[i$10];
-    if (token.type === "text" && !inside_autolink) {
-      if (RARE_RE.test(token.content)) {
-        token.content = token.content
-          .replace(/\+-/g, "±")
-          .replace(/\.{2,}/g, "…")
-          .replace(/([?!])…/g, "$1..")
-          .replace(/([?!]){4,}/g, "$1$1$1")
-          .replace(/,{2,}/g, ",")
-          .replace(/(^|[^-])---(?=[^-]|$)/gm, "$1—")
-          .replace(/(^|\s)--(?=\s|$)/gm, "$1–")
-          .replace(/(^|[^-\s])--(?=[^-\s]|$)/gm, "$1–");
-      }
-    }
-    if (token.type === "link_open" && token.info === "auto") {
-      inside_autolink--;
-    }
-    if (token.type === "link_close" && token.info === "auto") {
-      inside_autolink++;
-    }
-  }
+	let inside_autolink = 0;
+	for (let i$10 = inlineTokens.length - 1; i$10 >= 0; i$10--) {
+		const token = inlineTokens[i$10];
+		if (token.type === "text" && !inside_autolink) {
+			if (RARE_RE.test(token.content)) {
+				token.content = token.content.replace(/\+-/g, "±").replace(/\.{2,}/g, "…").replace(/([?!])…/g, "$1..").replace(/([?!]){4,}/g, "$1$1$1").replace(/,{2,}/g, ",").replace(/(^|[^-])---(?=[^-]|$)/gm, "$1—").replace(/(^|\s)--(?=\s|$)/gm, "$1–").replace(/(^|[^-\s])--(?=[^-\s]|$)/gm, "$1–");
+			}
+		}
+		if (token.type === "link_open" && token.info === "auto") {
+			inside_autolink--;
+		}
+		if (token.type === "link_close" && token.info === "auto") {
+			inside_autolink++;
+		}
+	}
 }
 function replace(state) {
-  let blkIdx;
-  if (!state.md.options.typographer) {
-    return;
-  }
-  for (blkIdx = state.tokens.length - 1; blkIdx >= 0; blkIdx--) {
-    if (state.tokens[blkIdx].type !== "inline") {
-      continue;
-    }
-    if (SCOPED_ABBR_TEST_RE.test(state.tokens[blkIdx].content)) {
-      replace_scoped(state.tokens[blkIdx].children);
-    }
-    if (RARE_RE.test(state.tokens[blkIdx].content)) {
-      replace_rare(state.tokens[blkIdx].children);
-    }
-  }
+	let blkIdx;
+	if (!state.md.options.typographer) {
+		return;
+	}
+	for (blkIdx = state.tokens.length - 1; blkIdx >= 0; blkIdx--) {
+		if (state.tokens[blkIdx].type !== "inline") {
+			continue;
+		}
+		if (SCOPED_ABBR_TEST_RE.test(state.tokens[blkIdx].content)) {
+			replace_scoped(state.tokens[blkIdx].children);
+		}
+		if (RARE_RE.test(state.tokens[blkIdx].content)) {
+			replace_rare(state.tokens[blkIdx].children);
+		}
+	}
 }
 
 const QUOTE_TEST_RE = /['"]/;
 const QUOTE_RE = /['"]/g;
 const APOSTROPHE = "’";
 function replaceAt(str, index, ch) {
-  return str.slice(0, index) + ch + str.slice(index + 1);
+	return str.slice(0, index) + ch + str.slice(index + 1);
 }
 function process_inlines(tokens, state) {
-  let j$2;
-  const stack = [];
-  for (let i$10 = 0; i$10 < tokens.length; i$10++) {
-    const token = tokens[i$10];
-    const thisLevel = tokens[i$10].level;
-    for (j$2 = stack.length - 1; j$2 >= 0; j$2--) {
-      if (stack[j$2].level <= thisLevel) {
-        break;
-      }
-    }
-    stack.length = j$2 + 1;
-    if (token.type !== "text") {
-      continue;
-    }
-    let text$1 = token.content;
-    let pos = 0;
-    let max = text$1.length;
-    OUTER: while (pos < max) {
-      QUOTE_RE.lastIndex = pos;
-      const t$7 = QUOTE_RE.exec(text$1);
-      if (!t$7) {
-        break;
-      }
-      let canOpen = true;
-      let canClose = true;
-      pos = t$7.index + 1;
-      const isSingle = t$7[0] === "'";
-      let lastChar = 32;
-      if (t$7.index - 1 >= 0) {
-        lastChar = text$1.charCodeAt(t$7.index - 1);
-      } else {
-        for (j$2 = i$10 - 1; j$2 >= 0; j$2--) {
-          if (tokens[j$2].type === "softbreak" || tokens[j$2].type === "hardbreak") break;
-          if (!tokens[j$2].content) continue;
-          lastChar = tokens[j$2].content.charCodeAt(tokens[j$2].content.length - 1);
-          break;
-        }
-      }
-      let nextChar = 32;
-      if (pos < max) {
-        nextChar = text$1.charCodeAt(pos);
-      } else {
-        for (j$2 = i$10 + 1; j$2 < tokens.length; j$2++) {
-          if (tokens[j$2].type === "softbreak" || tokens[j$2].type === "hardbreak") break;
-          if (!tokens[j$2].content) continue;
-          nextChar = tokens[j$2].content.charCodeAt(0);
-          break;
-        }
-      }
-      const isLastPunctChar =
-        isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
-      const isNextPunctChar =
-        isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
-      const isLastWhiteSpace = isWhiteSpace(lastChar);
-      const isNextWhiteSpace = isWhiteSpace(nextChar);
-      if (isNextWhiteSpace) {
-        canOpen = false;
-      } else if (isNextPunctChar) {
-        if (!(isLastWhiteSpace || isLastPunctChar)) {
-          canOpen = false;
-        }
-      }
-      if (isLastWhiteSpace) {
-        canClose = false;
-      } else if (isLastPunctChar) {
-        if (!(isNextWhiteSpace || isNextPunctChar)) {
-          canClose = false;
-        }
-      }
-      if (nextChar === 34 && t$7[0] === '"') {
-        if (lastChar >= 48 && lastChar <= 57) {
-          canClose = canOpen = false;
-        }
-      }
-      if (canOpen && canClose) {
-        canOpen = isLastPunctChar;
-        canClose = isNextPunctChar;
-      }
-      if (!canOpen && !canClose) {
-        if (isSingle) {
-          token.content = replaceAt(token.content, t$7.index, APOSTROPHE);
-        }
-        continue;
-      }
-      if (canClose) {
-        for (j$2 = stack.length - 1; j$2 >= 0; j$2--) {
-          let item = stack[j$2];
-          if (stack[j$2].level < thisLevel) {
-            break;
-          }
-          if (item.single === isSingle && stack[j$2].level === thisLevel) {
-            item = stack[j$2];
-            let openQuote;
-            let closeQuote;
-            if (isSingle) {
-              openQuote = state.md.options.quotes[2];
-              closeQuote = state.md.options.quotes[3];
-            } else {
-              openQuote = state.md.options.quotes[0];
-              closeQuote = state.md.options.quotes[1];
-            }
-            token.content = replaceAt(token.content, t$7.index, closeQuote);
-            tokens[item.token].content = replaceAt(tokens[item.token].content, item.pos, openQuote);
-            pos += closeQuote.length - 1;
-            if (item.token === i$10) {
-              pos += openQuote.length - 1;
-            }
-            text$1 = token.content;
-            max = text$1.length;
-            stack.length = j$2;
-            continue OUTER;
-          }
-        }
-      }
-      if (canOpen) {
-        stack.push({
-          token: i$10,
-          pos: t$7.index,
-          single: isSingle,
-          level: thisLevel,
-        });
-      } else if (canClose && isSingle) {
-        token.content = replaceAt(token.content, t$7.index, APOSTROPHE);
-      }
-    }
-  }
+	let j$2;
+	const stack = [];
+	for (let i$10 = 0; i$10 < tokens.length; i$10++) {
+		const token = tokens[i$10];
+		const thisLevel = tokens[i$10].level;
+		for (j$2 = stack.length - 1; j$2 >= 0; j$2--) {
+			if (stack[j$2].level <= thisLevel) {
+				break;
+			}
+		}
+		stack.length = j$2 + 1;
+		if (token.type !== "text") {
+			continue;
+		}
+		let text$1 = token.content;
+		let pos = 0;
+		let max = text$1.length;
+		OUTER: while (pos < max) {
+			QUOTE_RE.lastIndex = pos;
+			const t$7 = QUOTE_RE.exec(text$1);
+			if (!t$7) {
+				break;
+			}
+			let canOpen = true;
+			let canClose = true;
+			pos = t$7.index + 1;
+			const isSingle = t$7[0] === "'";
+			let lastChar = 32;
+			if (t$7.index - 1 >= 0) {
+				lastChar = text$1.charCodeAt(t$7.index - 1);
+			} else {
+				for (j$2 = i$10 - 1; j$2 >= 0; j$2--) {
+					if (tokens[j$2].type === "softbreak" || tokens[j$2].type === "hardbreak") break;
+					if (!tokens[j$2].content) continue;
+					lastChar = tokens[j$2].content.charCodeAt(tokens[j$2].content.length - 1);
+					break;
+				}
+			}
+			let nextChar = 32;
+			if (pos < max) {
+				nextChar = text$1.charCodeAt(pos);
+			} else {
+				for (j$2 = i$10 + 1; j$2 < tokens.length; j$2++) {
+					if (tokens[j$2].type === "softbreak" || tokens[j$2].type === "hardbreak") break;
+					if (!tokens[j$2].content) continue;
+					nextChar = tokens[j$2].content.charCodeAt(0);
+					break;
+				}
+			}
+			const isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
+			const isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
+			const isLastWhiteSpace = isWhiteSpace(lastChar);
+			const isNextWhiteSpace = isWhiteSpace(nextChar);
+			if (isNextWhiteSpace) {
+				canOpen = false;
+			} else if (isNextPunctChar) {
+				if (!(isLastWhiteSpace || isLastPunctChar)) {
+					canOpen = false;
+				}
+			}
+			if (isLastWhiteSpace) {
+				canClose = false;
+			} else if (isLastPunctChar) {
+				if (!(isNextWhiteSpace || isNextPunctChar)) {
+					canClose = false;
+				}
+			}
+			if (nextChar === 34 && t$7[0] === "\"") {
+				if (lastChar >= 48 && lastChar <= 57) {
+					canClose = canOpen = false;
+				}
+			}
+			if (canOpen && canClose) {
+				canOpen = isLastPunctChar;
+				canClose = isNextPunctChar;
+			}
+			if (!canOpen && !canClose) {
+				if (isSingle) {
+					token.content = replaceAt(token.content, t$7.index, APOSTROPHE);
+				}
+				continue;
+			}
+			if (canClose) {
+				for (j$2 = stack.length - 1; j$2 >= 0; j$2--) {
+					let item = stack[j$2];
+					if (stack[j$2].level < thisLevel) {
+						break;
+					}
+					if (item.single === isSingle && stack[j$2].level === thisLevel) {
+						item = stack[j$2];
+						let openQuote;
+						let closeQuote;
+						if (isSingle) {
+							openQuote = state.md.options.quotes[2];
+							closeQuote = state.md.options.quotes[3];
+						} else {
+							openQuote = state.md.options.quotes[0];
+							closeQuote = state.md.options.quotes[1];
+						}
+						token.content = replaceAt(token.content, t$7.index, closeQuote);
+						tokens[item.token].content = replaceAt(tokens[item.token].content, item.pos, openQuote);
+						pos += closeQuote.length - 1;
+						if (item.token === i$10) {
+							pos += openQuote.length - 1;
+						}
+						text$1 = token.content;
+						max = text$1.length;
+						stack.length = j$2;
+						continue OUTER;
+					}
+				}
+			}
+			if (canOpen) {
+				stack.push({
+					token: i$10,
+					pos: t$7.index,
+					single: isSingle,
+					level: thisLevel
+				});
+			} else if (canClose && isSingle) {
+				token.content = replaceAt(token.content, t$7.index, APOSTROPHE);
+			}
+		}
+	}
 }
 function smartquotes(state) {
-  if (!state.md.options.typographer) {
-    return;
-  }
-  for (let blkIdx = state.tokens.length - 1; blkIdx >= 0; blkIdx--) {
-    if (
-      state.tokens[blkIdx].type !== "inline" ||
-      !QUOTE_TEST_RE.test(state.tokens[blkIdx].content)
-    ) {
-      continue;
-    }
-    process_inlines(state.tokens[blkIdx].children, state);
-  }
+	if (!state.md.options.typographer) {
+		return;
+	}
+	for (let blkIdx = state.tokens.length - 1; blkIdx >= 0; blkIdx--) {
+		if (state.tokens[blkIdx].type !== "inline" || !QUOTE_TEST_RE.test(state.tokens[blkIdx].content)) {
+			continue;
+		}
+		process_inlines(state.tokens[blkIdx].children, state);
+	}
 }
 
 function text_join(state) {
-  let curr, last;
-  const blockTokens = state.tokens;
-  const l$5 = blockTokens.length;
-  for (let j$2 = 0; j$2 < l$5; j$2++) {
-    if (blockTokens[j$2].type !== "inline") continue;
-    const tokens = blockTokens[j$2].children;
-    const max = tokens.length;
-    for (curr = 0; curr < max; curr++) {
-      if (tokens[curr].type === "text_special") {
-        tokens[curr].type = "text";
-      }
-    }
-    for (curr = last = 0; curr < max; curr++) {
-      if (tokens[curr].type === "text" && curr + 1 < max && tokens[curr + 1].type === "text") {
-        tokens[curr + 1].content = tokens[curr].content + tokens[curr + 1].content;
-      } else {
-        if (curr !== last) {
-          tokens[last] = tokens[curr];
-        }
-        last++;
-      }
-    }
-    if (curr !== last) {
-      tokens.length = last;
-    }
-  }
+	let curr, last;
+	const blockTokens = state.tokens;
+	const l$5 = blockTokens.length;
+	for (let j$2 = 0; j$2 < l$5; j$2++) {
+		if (blockTokens[j$2].type !== "inline") continue;
+		const tokens = blockTokens[j$2].children;
+		const max = tokens.length;
+		for (curr = 0; curr < max; curr++) {
+			if (tokens[curr].type === "text_special") {
+				tokens[curr].type = "text";
+			}
+		}
+		for (curr = last = 0; curr < max; curr++) {
+			if (tokens[curr].type === "text" && curr + 1 < max && tokens[curr + 1].type === "text") {
+				tokens[curr + 1].content = tokens[curr].content + tokens[curr + 1].content;
+			} else {
+				if (curr !== last) {
+					tokens[last] = tokens[curr];
+				}
+				last++;
+			}
+		}
+		if (curr !== last) {
+			tokens.length = last;
+		}
+	}
 }
 
 /** internal
- * class Core
- *
- * Top-level rules executor. Glues block/inline parsers and does intermediate
- * transformations.
- **/
+* class Core
+*
+* Top-level rules executor. Glues block/inline parsers and does intermediate
+* transformations.
+**/
 const _rules$2 = [
-  ["normalize", normalize],
-  ["block", block],
-  ["inline", inline],
-  ["linkify", linkify$1],
-  ["replacements", replace],
-  ["smartquotes", smartquotes],
-  ["text_join", text_join],
+	["normalize", normalize],
+	["block", block],
+	["inline", inline],
+	["linkify", linkify$1],
+	["replacements", replace],
+	["smartquotes", smartquotes],
+	["text_join", text_join]
 ];
 /**
- * new Core()
- **/
+* new Core()
+**/
 function Core() {
-  /**
-   * Core#ruler -> Ruler
-   *
-   * [[Ruler]] instance. Keep configuration of core rules.
-   **/
-  this.ruler = new ruler_default();
-  for (let i$10 = 0; i$10 < _rules$2.length; i$10++) {
-    this.ruler.push(_rules$2[i$10][0], _rules$2[i$10][1]);
-  }
+	/**
+	* Core#ruler -> Ruler
+	*
+	* [[Ruler]] instance. Keep configuration of core rules.
+	**/
+	this.ruler = new ruler_default();
+	for (let i$10 = 0; i$10 < _rules$2.length; i$10++) {
+		this.ruler.push(_rules$2[i$10][0], _rules$2[i$10][1]);
+	}
 }
 /**
- * Core.process(state)
- *
- * Executes core chain rules.
- **/
-Core.prototype.process = function (state) {
-  const rules = this.ruler.getRules("");
-  for (let i$10 = 0, l$5 = rules.length; i$10 < l$5; i$10++) {
-    rules[i$10](state);
-  }
+* Core.process(state)
+*
+* Executes core chain rules.
+**/
+Core.prototype.process = function(state) {
+	const rules = this.ruler.getRules("");
+	for (let i$10 = 0, l$5 = rules.length; i$10 < l$5; i$10++) {
+		rules[i$10](state);
+	}
 };
 Core.prototype.State = state_core_default;
 var parser_core_default = Core;
 
 function StateBlock(src, md, env, tokens) {
-  this.src = src;
-  this.md = md;
-  this.env = env;
-  this.tokens = tokens;
-  this.bMarks = [];
-  this.eMarks = [];
-  this.tShift = [];
-  this.sCount = [];
-  this.bsCount = [];
-  this.blkIndent = 0;
-  this.line = 0;
-  this.lineMax = 0;
-  this.tight = false;
-  this.ddIndent = -1;
-  this.listIndent = -1;
-  this.parentType = "root";
-  this.level = 0;
-  const s$9 = this.src;
-  for (
-    let start = 0, pos = 0, indent = 0, offset = 0, len = s$9.length, indent_found = false;
-    pos < len;
-    pos++
-  ) {
-    const ch = s$9.charCodeAt(pos);
-    if (!indent_found) {
-      if (isSpace(ch)) {
-        indent++;
-        if (ch === 9) {
-          offset += 4 - (offset % 4);
-        } else {
-          offset++;
-        }
-        continue;
-      } else {
-        indent_found = true;
-      }
-    }
-    if (ch === 10 || pos === len - 1) {
-      if (ch !== 10) {
-        pos++;
-      }
-      this.bMarks.push(start);
-      this.eMarks.push(pos);
-      this.tShift.push(indent);
-      this.sCount.push(offset);
-      this.bsCount.push(0);
-      indent_found = false;
-      indent = 0;
-      offset = 0;
-      start = pos + 1;
-    }
-  }
-  this.bMarks.push(s$9.length);
-  this.eMarks.push(s$9.length);
-  this.tShift.push(0);
-  this.sCount.push(0);
-  this.bsCount.push(0);
-  this.lineMax = this.bMarks.length - 1;
+	this.src = src;
+	this.md = md;
+	this.env = env;
+	this.tokens = tokens;
+	this.bMarks = [];
+	this.eMarks = [];
+	this.tShift = [];
+	this.sCount = [];
+	this.bsCount = [];
+	this.blkIndent = 0;
+	this.line = 0;
+	this.lineMax = 0;
+	this.tight = false;
+	this.ddIndent = -1;
+	this.listIndent = -1;
+	this.parentType = "root";
+	this.level = 0;
+	const s$9 = this.src;
+	for (let start = 0, pos = 0, indent = 0, offset = 0, len = s$9.length, indent_found = false; pos < len; pos++) {
+		const ch = s$9.charCodeAt(pos);
+		if (!indent_found) {
+			if (isSpace(ch)) {
+				indent++;
+				if (ch === 9) {
+					offset += 4 - offset % 4;
+				} else {
+					offset++;
+				}
+				continue;
+			} else {
+				indent_found = true;
+			}
+		}
+		if (ch === 10 || pos === len - 1) {
+			if (ch !== 10) {
+				pos++;
+			}
+			this.bMarks.push(start);
+			this.eMarks.push(pos);
+			this.tShift.push(indent);
+			this.sCount.push(offset);
+			this.bsCount.push(0);
+			indent_found = false;
+			indent = 0;
+			offset = 0;
+			start = pos + 1;
+		}
+	}
+	this.bMarks.push(s$9.length);
+	this.eMarks.push(s$9.length);
+	this.tShift.push(0);
+	this.sCount.push(0);
+	this.bsCount.push(0);
+	this.lineMax = this.bMarks.length - 1;
 }
-StateBlock.prototype.push = function (type$2, tag, nesting) {
-  const token = new token_default(type$2, tag, nesting);
-  token.block = true;
-  if (nesting < 0) this.level--;
-  token.level = this.level;
-  if (nesting > 0) this.level++;
-  this.tokens.push(token);
-  return token;
+StateBlock.prototype.push = function(type$2, tag, nesting) {
+	const token = new token_default(type$2, tag, nesting);
+	token.block = true;
+	if (nesting < 0) this.level--;
+	token.level = this.level;
+	if (nesting > 0) this.level++;
+	this.tokens.push(token);
+	return token;
 };
 StateBlock.prototype.isEmpty = function isEmpty(line) {
-  return this.bMarks[line] + this.tShift[line] >= this.eMarks[line];
+	return this.bMarks[line] + this.tShift[line] >= this.eMarks[line];
 };
 StateBlock.prototype.skipEmptyLines = function skipEmptyLines(from) {
-  for (let max = this.lineMax; from < max; from++) {
-    if (this.bMarks[from] + this.tShift[from] < this.eMarks[from]) {
-      break;
-    }
-  }
-  return from;
+	for (let max = this.lineMax; from < max; from++) {
+		if (this.bMarks[from] + this.tShift[from] < this.eMarks[from]) {
+			break;
+		}
+	}
+	return from;
 };
 StateBlock.prototype.skipSpaces = function skipSpaces(pos) {
-  for (let max = this.src.length; pos < max; pos++) {
-    const ch = this.src.charCodeAt(pos);
-    if (!isSpace(ch)) {
-      break;
-    }
-  }
-  return pos;
+	for (let max = this.src.length; pos < max; pos++) {
+		const ch = this.src.charCodeAt(pos);
+		if (!isSpace(ch)) {
+			break;
+		}
+	}
+	return pos;
 };
 StateBlock.prototype.skipSpacesBack = function skipSpacesBack(pos, min) {
-  if (pos <= min) {
-    return pos;
-  }
-  while (pos > min) {
-    if (!isSpace(this.src.charCodeAt(--pos))) {
-      return pos + 1;
-    }
-  }
-  return pos;
+	if (pos <= min) {
+		return pos;
+	}
+	while (pos > min) {
+		if (!isSpace(this.src.charCodeAt(--pos))) {
+			return pos + 1;
+		}
+	}
+	return pos;
 };
 StateBlock.prototype.skipChars = function skipChars(pos, code$1) {
-  for (let max = this.src.length; pos < max; pos++) {
-    if (this.src.charCodeAt(pos) !== code$1) {
-      break;
-    }
-  }
-  return pos;
+	for (let max = this.src.length; pos < max; pos++) {
+		if (this.src.charCodeAt(pos) !== code$1) {
+			break;
+		}
+	}
+	return pos;
 };
 StateBlock.prototype.skipCharsBack = function skipCharsBack(pos, code$1, min) {
-  if (pos <= min) {
-    return pos;
-  }
-  while (pos > min) {
-    if (code$1 !== this.src.charCodeAt(--pos)) {
-      return pos + 1;
-    }
-  }
-  return pos;
+	if (pos <= min) {
+		return pos;
+	}
+	while (pos > min) {
+		if (code$1 !== this.src.charCodeAt(--pos)) {
+			return pos + 1;
+		}
+	}
+	return pos;
 };
 StateBlock.prototype.getLines = function getLines(begin, end, indent, keepLastLF) {
-  if (begin >= end) {
-    return "";
-  }
-  const queue = new Array(end - begin);
-  for (let i$10 = 0, line = begin; line < end; line++, i$10++) {
-    let lineIndent = 0;
-    const lineStart = this.bMarks[line];
-    let first = lineStart;
-    let last;
-    if (line + 1 < end || keepLastLF) {
-      last = this.eMarks[line] + 1;
-    } else {
-      last = this.eMarks[line];
-    }
-    while (first < last && lineIndent < indent) {
-      const ch = this.src.charCodeAt(first);
-      if (isSpace(ch)) {
-        if (ch === 9) {
-          lineIndent += 4 - ((lineIndent + this.bsCount[line]) % 4);
-        } else {
-          lineIndent++;
-        }
-      } else if (first - lineStart < this.tShift[line]) {
-        lineIndent++;
-      } else {
-        break;
-      }
-      first++;
-    }
-    if (lineIndent > indent) {
-      queue[i$10] = new Array(lineIndent - indent + 1).join(" ") + this.src.slice(first, last);
-    } else {
-      queue[i$10] = this.src.slice(first, last);
-    }
-  }
-  return queue.join("");
+	if (begin >= end) {
+		return "";
+	}
+	const queue = new Array(end - begin);
+	for (let i$10 = 0, line = begin; line < end; line++, i$10++) {
+		let lineIndent = 0;
+		const lineStart = this.bMarks[line];
+		let first = lineStart;
+		let last;
+		if (line + 1 < end || keepLastLF) {
+			last = this.eMarks[line] + 1;
+		} else {
+			last = this.eMarks[line];
+		}
+		while (first < last && lineIndent < indent) {
+			const ch = this.src.charCodeAt(first);
+			if (isSpace(ch)) {
+				if (ch === 9) {
+					lineIndent += 4 - (lineIndent + this.bsCount[line]) % 4;
+				} else {
+					lineIndent++;
+				}
+			} else if (first - lineStart < this.tShift[line]) {
+				lineIndent++;
+			} else {
+				break;
+			}
+			first++;
+		}
+		if (lineIndent > indent) {
+			queue[i$10] = new Array(lineIndent - indent + 1).join(" ") + this.src.slice(first, last);
+		} else {
+			queue[i$10] = this.src.slice(first, last);
+		}
+	}
+	return queue.join("");
 };
 StateBlock.prototype.Token = token_default;
 var state_block_default = StateBlock;
 
 const MAX_AUTOCOMPLETED_CELLS = 65536;
 function getLine(state, line) {
-  const pos = state.bMarks[line] + state.tShift[line];
-  const max = state.eMarks[line];
-  return state.src.slice(pos, max);
+	const pos = state.bMarks[line] + state.tShift[line];
+	const max = state.eMarks[line];
+	return state.src.slice(pos, max);
 }
 function escapedSplit(str) {
-  const result = [];
-  const max = str.length;
-  let pos = 0;
-  let ch = str.charCodeAt(pos);
-  let isEscaped = false;
-  let lastPos = 0;
-  let current = "";
-  while (pos < max) {
-    if (ch === 124) {
-      if (!isEscaped) {
-        result.push(current + str.substring(lastPos, pos));
-        current = "";
-        lastPos = pos + 1;
-      } else {
-        current += str.substring(lastPos, pos - 1);
-        lastPos = pos;
-      }
-    }
-    isEscaped = ch === 92;
-    pos++;
-    ch = str.charCodeAt(pos);
-  }
-  result.push(current + str.substring(lastPos));
-  return result;
+	const result = [];
+	const max = str.length;
+	let pos = 0;
+	let ch = str.charCodeAt(pos);
+	let isEscaped = false;
+	let lastPos = 0;
+	let current = "";
+	while (pos < max) {
+		if (ch === 124) {
+			if (!isEscaped) {
+				result.push(current + str.substring(lastPos, pos));
+				current = "";
+				lastPos = pos + 1;
+			} else {
+				current += str.substring(lastPos, pos - 1);
+				lastPos = pos;
+			}
+		}
+		isEscaped = ch === 92;
+		pos++;
+		ch = str.charCodeAt(pos);
+	}
+	result.push(current + str.substring(lastPos));
+	return result;
 }
 function table(state, startLine, endLine, silent) {
-  if (startLine + 2 > endLine) {
-    return false;
-  }
-  let nextLine = startLine + 1;
-  if (state.sCount[nextLine] < state.blkIndent) {
-    return false;
-  }
-  if (state.sCount[nextLine] - state.blkIndent >= 4) {
-    return false;
-  }
-  let pos = state.bMarks[nextLine] + state.tShift[nextLine];
-  if (pos >= state.eMarks[nextLine]) {
-    return false;
-  }
-  const firstCh = state.src.charCodeAt(pos++);
-  if (firstCh !== 124 && firstCh !== 45 && firstCh !== 58) {
-    return false;
-  }
-  if (pos >= state.eMarks[nextLine]) {
-    return false;
-  }
-  const secondCh = state.src.charCodeAt(pos++);
-  if (secondCh !== 124 && secondCh !== 45 && secondCh !== 58 && !isSpace(secondCh)) {
-    return false;
-  }
-  if (firstCh === 45 && isSpace(secondCh)) {
-    return false;
-  }
-  while (pos < state.eMarks[nextLine]) {
-    const ch = state.src.charCodeAt(pos);
-    if (ch !== 124 && ch !== 45 && ch !== 58 && !isSpace(ch)) {
-      return false;
-    }
-    pos++;
-  }
-  let lineText = getLine(state, startLine + 1);
-  let columns = lineText.split("|");
-  const aligns = [];
-  for (let i$10 = 0; i$10 < columns.length; i$10++) {
-    const t$7 = columns[i$10].trim();
-    if (!t$7) {
-      if (i$10 === 0 || i$10 === columns.length - 1) {
-        continue;
-      } else {
-        return false;
-      }
-    }
-    if (!/^:?-+:?$/.test(t$7)) {
-      return false;
-    }
-    if (t$7.charCodeAt(t$7.length - 1) === 58) {
-      aligns.push(t$7.charCodeAt(0) === 58 ? "center" : "right");
-    } else if (t$7.charCodeAt(0) === 58) {
-      aligns.push("left");
-    } else {
-      aligns.push("");
-    }
-  }
-  lineText = getLine(state, startLine).trim();
-  if (lineText.indexOf("|") === -1) {
-    return false;
-  }
-  if (state.sCount[startLine] - state.blkIndent >= 4) {
-    return false;
-  }
-  columns = escapedSplit(lineText);
-  if (columns.length && columns[0] === "") columns.shift();
-  if (columns.length && columns[columns.length - 1] === "") columns.pop();
-  const columnCount = columns.length;
-  if (columnCount === 0 || columnCount !== aligns.length) {
-    return false;
-  }
-  if (silent) {
-    return true;
-  }
-  const oldParentType = state.parentType;
-  state.parentType = "table";
-  const terminatorRules = state.md.block.ruler.getRules("blockquote");
-  const token_to = state.push("table_open", "table", 1);
-  const tableLines = [startLine, 0];
-  token_to.map = tableLines;
-  const token_tho = state.push("thead_open", "thead", 1);
-  token_tho.map = [startLine, startLine + 1];
-  const token_htro = state.push("tr_open", "tr", 1);
-  token_htro.map = [startLine, startLine + 1];
-  for (let i$10 = 0; i$10 < columns.length; i$10++) {
-    const token_ho = state.push("th_open", "th", 1);
-    if (aligns[i$10]) {
-      token_ho.attrs = [["style", "text-align:" + aligns[i$10]]];
-    }
-    const token_il = state.push("inline", "", 0);
-    token_il.content = columns[i$10].trim();
-    token_il.children = [];
-    state.push("th_close", "th", -1);
-  }
-  state.push("tr_close", "tr", -1);
-  state.push("thead_close", "thead", -1);
-  let tbodyLines;
-  let autocompletedCells = 0;
-  for (nextLine = startLine + 2; nextLine < endLine; nextLine++) {
-    if (state.sCount[nextLine] < state.blkIndent) {
-      break;
-    }
-    let terminate = false;
-    for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
-      if (terminatorRules[i$10](state, nextLine, endLine, true)) {
-        terminate = true;
-        break;
-      }
-    }
-    if (terminate) {
-      break;
-    }
-    lineText = getLine(state, nextLine).trim();
-    if (!lineText) {
-      break;
-    }
-    if (state.sCount[nextLine] - state.blkIndent >= 4) {
-      break;
-    }
-    columns = escapedSplit(lineText);
-    if (columns.length && columns[0] === "") columns.shift();
-    if (columns.length && columns[columns.length - 1] === "") columns.pop();
-    autocompletedCells += columnCount - columns.length;
-    if (autocompletedCells > MAX_AUTOCOMPLETED_CELLS) {
-      break;
-    }
-    if (nextLine === startLine + 2) {
-      const token_tbo = state.push("tbody_open", "tbody", 1);
-      token_tbo.map = tbodyLines = [startLine + 2, 0];
-    }
-    const token_tro = state.push("tr_open", "tr", 1);
-    token_tro.map = [nextLine, nextLine + 1];
-    for (let i$10 = 0; i$10 < columnCount; i$10++) {
-      const token_tdo = state.push("td_open", "td", 1);
-      if (aligns[i$10]) {
-        token_tdo.attrs = [["style", "text-align:" + aligns[i$10]]];
-      }
-      const token_il = state.push("inline", "", 0);
-      token_il.content = columns[i$10] ? columns[i$10].trim() : "";
-      token_il.children = [];
-      state.push("td_close", "td", -1);
-    }
-    state.push("tr_close", "tr", -1);
-  }
-  if (tbodyLines) {
-    state.push("tbody_close", "tbody", -1);
-    tbodyLines[1] = nextLine;
-  }
-  state.push("table_close", "table", -1);
-  tableLines[1] = nextLine;
-  state.parentType = oldParentType;
-  state.line = nextLine;
-  return true;
+	if (startLine + 2 > endLine) {
+		return false;
+	}
+	let nextLine = startLine + 1;
+	if (state.sCount[nextLine] < state.blkIndent) {
+		return false;
+	}
+	if (state.sCount[nextLine] - state.blkIndent >= 4) {
+		return false;
+	}
+	let pos = state.bMarks[nextLine] + state.tShift[nextLine];
+	if (pos >= state.eMarks[nextLine]) {
+		return false;
+	}
+	const firstCh = state.src.charCodeAt(pos++);
+	if (firstCh !== 124 && firstCh !== 45 && firstCh !== 58) {
+		return false;
+	}
+	if (pos >= state.eMarks[nextLine]) {
+		return false;
+	}
+	const secondCh = state.src.charCodeAt(pos++);
+	if (secondCh !== 124 && secondCh !== 45 && secondCh !== 58 && !isSpace(secondCh)) {
+		return false;
+	}
+	if (firstCh === 45 && isSpace(secondCh)) {
+		return false;
+	}
+	while (pos < state.eMarks[nextLine]) {
+		const ch = state.src.charCodeAt(pos);
+		if (ch !== 124 && ch !== 45 && ch !== 58 && !isSpace(ch)) {
+			return false;
+		}
+		pos++;
+	}
+	let lineText = getLine(state, startLine + 1);
+	let columns = lineText.split("|");
+	const aligns = [];
+	for (let i$10 = 0; i$10 < columns.length; i$10++) {
+		const t$7 = columns[i$10].trim();
+		if (!t$7) {
+			if (i$10 === 0 || i$10 === columns.length - 1) {
+				continue;
+			} else {
+				return false;
+			}
+		}
+		if (!/^:?-+:?$/.test(t$7)) {
+			return false;
+		}
+		if (t$7.charCodeAt(t$7.length - 1) === 58) {
+			aligns.push(t$7.charCodeAt(0) === 58 ? "center" : "right");
+		} else if (t$7.charCodeAt(0) === 58) {
+			aligns.push("left");
+		} else {
+			aligns.push("");
+		}
+	}
+	lineText = getLine(state, startLine).trim();
+	if (lineText.indexOf("|") === -1) {
+		return false;
+	}
+	if (state.sCount[startLine] - state.blkIndent >= 4) {
+		return false;
+	}
+	columns = escapedSplit(lineText);
+	if (columns.length && columns[0] === "") columns.shift();
+	if (columns.length && columns[columns.length - 1] === "") columns.pop();
+	const columnCount = columns.length;
+	if (columnCount === 0 || columnCount !== aligns.length) {
+		return false;
+	}
+	if (silent) {
+		return true;
+	}
+	const oldParentType = state.parentType;
+	state.parentType = "table";
+	const terminatorRules = state.md.block.ruler.getRules("blockquote");
+	const token_to = state.push("table_open", "table", 1);
+	const tableLines = [startLine, 0];
+	token_to.map = tableLines;
+	const token_tho = state.push("thead_open", "thead", 1);
+	token_tho.map = [startLine, startLine + 1];
+	const token_htro = state.push("tr_open", "tr", 1);
+	token_htro.map = [startLine, startLine + 1];
+	for (let i$10 = 0; i$10 < columns.length; i$10++) {
+		const token_ho = state.push("th_open", "th", 1);
+		if (aligns[i$10]) {
+			token_ho.attrs = [["style", "text-align:" + aligns[i$10]]];
+		}
+		const token_il = state.push("inline", "", 0);
+		token_il.content = columns[i$10].trim();
+		token_il.children = [];
+		state.push("th_close", "th", -1);
+	}
+	state.push("tr_close", "tr", -1);
+	state.push("thead_close", "thead", -1);
+	let tbodyLines;
+	let autocompletedCells = 0;
+	for (nextLine = startLine + 2; nextLine < endLine; nextLine++) {
+		if (state.sCount[nextLine] < state.blkIndent) {
+			break;
+		}
+		let terminate = false;
+		for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
+			if (terminatorRules[i$10](state, nextLine, endLine, true)) {
+				terminate = true;
+				break;
+			}
+		}
+		if (terminate) {
+			break;
+		}
+		lineText = getLine(state, nextLine).trim();
+		if (!lineText) {
+			break;
+		}
+		if (state.sCount[nextLine] - state.blkIndent >= 4) {
+			break;
+		}
+		columns = escapedSplit(lineText);
+		if (columns.length && columns[0] === "") columns.shift();
+		if (columns.length && columns[columns.length - 1] === "") columns.pop();
+		autocompletedCells += columnCount - columns.length;
+		if (autocompletedCells > MAX_AUTOCOMPLETED_CELLS) {
+			break;
+		}
+		if (nextLine === startLine + 2) {
+			const token_tbo = state.push("tbody_open", "tbody", 1);
+			token_tbo.map = tbodyLines = [startLine + 2, 0];
+		}
+		const token_tro = state.push("tr_open", "tr", 1);
+		token_tro.map = [nextLine, nextLine + 1];
+		for (let i$10 = 0; i$10 < columnCount; i$10++) {
+			const token_tdo = state.push("td_open", "td", 1);
+			if (aligns[i$10]) {
+				token_tdo.attrs = [["style", "text-align:" + aligns[i$10]]];
+			}
+			const token_il = state.push("inline", "", 0);
+			token_il.content = columns[i$10] ? columns[i$10].trim() : "";
+			token_il.children = [];
+			state.push("td_close", "td", -1);
+		}
+		state.push("tr_close", "tr", -1);
+	}
+	if (tbodyLines) {
+		state.push("tbody_close", "tbody", -1);
+		tbodyLines[1] = nextLine;
+	}
+	state.push("table_close", "table", -1);
+	tableLines[1] = nextLine;
+	state.parentType = oldParentType;
+	state.line = nextLine;
+	return true;
 }
 
 function code(state, startLine, endLine) {
-  if (state.sCount[startLine] - state.blkIndent < 4) {
-    return false;
-  }
-  let nextLine = startLine + 1;
-  let last = nextLine;
-  while (nextLine < endLine) {
-    if (state.isEmpty(nextLine)) {
-      nextLine++;
-      continue;
-    }
-    if (state.sCount[nextLine] - state.blkIndent >= 4) {
-      nextLine++;
-      last = nextLine;
-      continue;
-    }
-    break;
-  }
-  state.line = last;
-  const token = state.push("code_block", "code", 0);
-  token.content = state.getLines(startLine, last, 4 + state.blkIndent, false) + "\n";
-  token.map = [startLine, state.line];
-  return true;
+	if (state.sCount[startLine] - state.blkIndent < 4) {
+		return false;
+	}
+	let nextLine = startLine + 1;
+	let last = nextLine;
+	while (nextLine < endLine) {
+		if (state.isEmpty(nextLine)) {
+			nextLine++;
+			continue;
+		}
+		if (state.sCount[nextLine] - state.blkIndent >= 4) {
+			nextLine++;
+			last = nextLine;
+			continue;
+		}
+		break;
+	}
+	state.line = last;
+	const token = state.push("code_block", "code", 0);
+	token.content = state.getLines(startLine, last, 4 + state.blkIndent, false) + "\n";
+	token.map = [startLine, state.line];
+	return true;
 }
 
 function fence(state, startLine, endLine, silent) {
-  let pos = state.bMarks[startLine] + state.tShift[startLine];
-  let max = state.eMarks[startLine];
-  if (state.sCount[startLine] - state.blkIndent >= 4) {
-    return false;
-  }
-  if (pos + 3 > max) {
-    return false;
-  }
-  const marker = state.src.charCodeAt(pos);
-  if (marker !== 126 && marker !== 96) {
-    return false;
-  }
-  let mem = pos;
-  pos = state.skipChars(pos, marker);
-  let len = pos - mem;
-  if (len < 3) {
-    return false;
-  }
-  const markup = state.src.slice(mem, pos);
-  const params = state.src.slice(pos, max);
-  if (marker === 96) {
-    if (params.indexOf(String.fromCharCode(marker)) >= 0) {
-      return false;
-    }
-  }
-  if (silent) {
-    return true;
-  }
-  let nextLine = startLine;
-  let haveEndMarker = false;
-  for (;;) {
-    nextLine++;
-    if (nextLine >= endLine) {
-      break;
-    }
-    pos = mem = state.bMarks[nextLine] + state.tShift[nextLine];
-    max = state.eMarks[nextLine];
-    if (pos < max && state.sCount[nextLine] < state.blkIndent) {
-      break;
-    }
-    if (state.src.charCodeAt(pos) !== marker) {
-      continue;
-    }
-    if (state.sCount[nextLine] - state.blkIndent >= 4) {
-      continue;
-    }
-    pos = state.skipChars(pos, marker);
-    if (pos - mem < len) {
-      continue;
-    }
-    pos = state.skipSpaces(pos);
-    if (pos < max) {
-      continue;
-    }
-    haveEndMarker = true;
-    break;
-  }
-  len = state.sCount[startLine];
-  state.line = nextLine + (haveEndMarker ? 1 : 0);
-  const token = state.push("fence", "code", 0);
-  token.info = params;
-  token.content = state.getLines(startLine + 1, nextLine, len, true);
-  token.markup = markup;
-  token.map = [startLine, state.line];
-  return true;
+	let pos = state.bMarks[startLine] + state.tShift[startLine];
+	let max = state.eMarks[startLine];
+	if (state.sCount[startLine] - state.blkIndent >= 4) {
+		return false;
+	}
+	if (pos + 3 > max) {
+		return false;
+	}
+	const marker = state.src.charCodeAt(pos);
+	if (marker !== 126 && marker !== 96) {
+		return false;
+	}
+	let mem = pos;
+	pos = state.skipChars(pos, marker);
+	let len = pos - mem;
+	if (len < 3) {
+		return false;
+	}
+	const markup = state.src.slice(mem, pos);
+	const params = state.src.slice(pos, max);
+	if (marker === 96) {
+		if (params.indexOf(String.fromCharCode(marker)) >= 0) {
+			return false;
+		}
+	}
+	if (silent) {
+		return true;
+	}
+	let nextLine = startLine;
+	let haveEndMarker = false;
+	for (;;) {
+		nextLine++;
+		if (nextLine >= endLine) {
+			break;
+		}
+		pos = mem = state.bMarks[nextLine] + state.tShift[nextLine];
+		max = state.eMarks[nextLine];
+		if (pos < max && state.sCount[nextLine] < state.blkIndent) {
+			break;
+		}
+		if (state.src.charCodeAt(pos) !== marker) {
+			continue;
+		}
+		if (state.sCount[nextLine] - state.blkIndent >= 4) {
+			continue;
+		}
+		pos = state.skipChars(pos, marker);
+		if (pos - mem < len) {
+			continue;
+		}
+		pos = state.skipSpaces(pos);
+		if (pos < max) {
+			continue;
+		}
+		haveEndMarker = true;
+		break;
+	}
+	len = state.sCount[startLine];
+	state.line = nextLine + (haveEndMarker ? 1 : 0);
+	const token = state.push("fence", "code", 0);
+	token.info = params;
+	token.content = state.getLines(startLine + 1, nextLine, len, true);
+	token.markup = markup;
+	token.map = [startLine, state.line];
+	return true;
 }
 
 function blockquote(state, startLine, endLine, silent) {
-  let pos = state.bMarks[startLine] + state.tShift[startLine];
-  let max = state.eMarks[startLine];
-  const oldLineMax = state.lineMax;
-  if (state.sCount[startLine] - state.blkIndent >= 4) {
-    return false;
-  }
-  if (state.src.charCodeAt(pos) !== 62) {
-    return false;
-  }
-  if (silent) {
-    return true;
-  }
-  const oldBMarks = [];
-  const oldBSCount = [];
-  const oldSCount = [];
-  const oldTShift = [];
-  const terminatorRules = state.md.block.ruler.getRules("blockquote");
-  const oldParentType = state.parentType;
-  state.parentType = "blockquote";
-  let lastLineEmpty = false;
-  let nextLine;
-  for (nextLine = startLine; nextLine < endLine; nextLine++) {
-    const isOutdented = state.sCount[nextLine] < state.blkIndent;
-    pos = state.bMarks[nextLine] + state.tShift[nextLine];
-    max = state.eMarks[nextLine];
-    if (pos >= max) {
-      break;
-    }
-    if (state.src.charCodeAt(pos++) === 62 && !isOutdented) {
-      let initial = state.sCount[nextLine] + 1;
-      let spaceAfterMarker;
-      let adjustTab;
-      if (state.src.charCodeAt(pos) === 32) {
-        pos++;
-        initial++;
-        adjustTab = false;
-        spaceAfterMarker = true;
-      } else if (state.src.charCodeAt(pos) === 9) {
-        spaceAfterMarker = true;
-        if ((state.bsCount[nextLine] + initial) % 4 === 3) {
-          pos++;
-          initial++;
-          adjustTab = false;
-        } else {
-          adjustTab = true;
-        }
-      } else {
-        spaceAfterMarker = false;
-      }
-      let offset = initial;
-      oldBMarks.push(state.bMarks[nextLine]);
-      state.bMarks[nextLine] = pos;
-      while (pos < max) {
-        const ch = state.src.charCodeAt(pos);
-        if (isSpace(ch)) {
-          if (ch === 9) {
-            offset += 4 - ((offset + state.bsCount[nextLine] + (adjustTab ? 1 : 0)) % 4);
-          } else {
-            offset++;
-          }
-        } else {
-          break;
-        }
-        pos++;
-      }
-      lastLineEmpty = pos >= max;
-      oldBSCount.push(state.bsCount[nextLine]);
-      state.bsCount[nextLine] = state.sCount[nextLine] + 1 + (spaceAfterMarker ? 1 : 0);
-      oldSCount.push(state.sCount[nextLine]);
-      state.sCount[nextLine] = offset - initial;
-      oldTShift.push(state.tShift[nextLine]);
-      state.tShift[nextLine] = pos - state.bMarks[nextLine];
-      continue;
-    }
-    if (lastLineEmpty) {
-      break;
-    }
-    let terminate = false;
-    for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
-      if (terminatorRules[i$10](state, nextLine, endLine, true)) {
-        terminate = true;
-        break;
-      }
-    }
-    if (terminate) {
-      state.lineMax = nextLine;
-      if (state.blkIndent !== 0) {
-        oldBMarks.push(state.bMarks[nextLine]);
-        oldBSCount.push(state.bsCount[nextLine]);
-        oldTShift.push(state.tShift[nextLine]);
-        oldSCount.push(state.sCount[nextLine]);
-        state.sCount[nextLine] -= state.blkIndent;
-      }
-      break;
-    }
-    oldBMarks.push(state.bMarks[nextLine]);
-    oldBSCount.push(state.bsCount[nextLine]);
-    oldTShift.push(state.tShift[nextLine]);
-    oldSCount.push(state.sCount[nextLine]);
-    state.sCount[nextLine] = -1;
-  }
-  const oldIndent = state.blkIndent;
-  state.blkIndent = 0;
-  const token_o = state.push("blockquote_open", "blockquote", 1);
-  token_o.markup = ">";
-  const lines = [startLine, 0];
-  token_o.map = lines;
-  state.md.block.tokenize(state, startLine, nextLine);
-  const token_c = state.push("blockquote_close", "blockquote", -1);
-  token_c.markup = ">";
-  state.lineMax = oldLineMax;
-  state.parentType = oldParentType;
-  lines[1] = state.line;
-  for (let i$10 = 0; i$10 < oldTShift.length; i$10++) {
-    state.bMarks[i$10 + startLine] = oldBMarks[i$10];
-    state.tShift[i$10 + startLine] = oldTShift[i$10];
-    state.sCount[i$10 + startLine] = oldSCount[i$10];
-    state.bsCount[i$10 + startLine] = oldBSCount[i$10];
-  }
-  state.blkIndent = oldIndent;
-  return true;
+	let pos = state.bMarks[startLine] + state.tShift[startLine];
+	let max = state.eMarks[startLine];
+	const oldLineMax = state.lineMax;
+	if (state.sCount[startLine] - state.blkIndent >= 4) {
+		return false;
+	}
+	if (state.src.charCodeAt(pos) !== 62) {
+		return false;
+	}
+	if (silent) {
+		return true;
+	}
+	const oldBMarks = [];
+	const oldBSCount = [];
+	const oldSCount = [];
+	const oldTShift = [];
+	const terminatorRules = state.md.block.ruler.getRules("blockquote");
+	const oldParentType = state.parentType;
+	state.parentType = "blockquote";
+	let lastLineEmpty = false;
+	let nextLine;
+	for (nextLine = startLine; nextLine < endLine; nextLine++) {
+		const isOutdented = state.sCount[nextLine] < state.blkIndent;
+		pos = state.bMarks[nextLine] + state.tShift[nextLine];
+		max = state.eMarks[nextLine];
+		if (pos >= max) {
+			break;
+		}
+		if (state.src.charCodeAt(pos++) === 62 && !isOutdented) {
+			let initial = state.sCount[nextLine] + 1;
+			let spaceAfterMarker;
+			let adjustTab;
+			if (state.src.charCodeAt(pos) === 32) {
+				pos++;
+				initial++;
+				adjustTab = false;
+				spaceAfterMarker = true;
+			} else if (state.src.charCodeAt(pos) === 9) {
+				spaceAfterMarker = true;
+				if ((state.bsCount[nextLine] + initial) % 4 === 3) {
+					pos++;
+					initial++;
+					adjustTab = false;
+				} else {
+					adjustTab = true;
+				}
+			} else {
+				spaceAfterMarker = false;
+			}
+			let offset = initial;
+			oldBMarks.push(state.bMarks[nextLine]);
+			state.bMarks[nextLine] = pos;
+			while (pos < max) {
+				const ch = state.src.charCodeAt(pos);
+				if (isSpace(ch)) {
+					if (ch === 9) {
+						offset += 4 - (offset + state.bsCount[nextLine] + (adjustTab ? 1 : 0)) % 4;
+					} else {
+						offset++;
+					}
+				} else {
+					break;
+				}
+				pos++;
+			}
+			lastLineEmpty = pos >= max;
+			oldBSCount.push(state.bsCount[nextLine]);
+			state.bsCount[nextLine] = state.sCount[nextLine] + 1 + (spaceAfterMarker ? 1 : 0);
+			oldSCount.push(state.sCount[nextLine]);
+			state.sCount[nextLine] = offset - initial;
+			oldTShift.push(state.tShift[nextLine]);
+			state.tShift[nextLine] = pos - state.bMarks[nextLine];
+			continue;
+		}
+		if (lastLineEmpty) {
+			break;
+		}
+		let terminate = false;
+		for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
+			if (terminatorRules[i$10](state, nextLine, endLine, true)) {
+				terminate = true;
+				break;
+			}
+		}
+		if (terminate) {
+			state.lineMax = nextLine;
+			if (state.blkIndent !== 0) {
+				oldBMarks.push(state.bMarks[nextLine]);
+				oldBSCount.push(state.bsCount[nextLine]);
+				oldTShift.push(state.tShift[nextLine]);
+				oldSCount.push(state.sCount[nextLine]);
+				state.sCount[nextLine] -= state.blkIndent;
+			}
+			break;
+		}
+		oldBMarks.push(state.bMarks[nextLine]);
+		oldBSCount.push(state.bsCount[nextLine]);
+		oldTShift.push(state.tShift[nextLine]);
+		oldSCount.push(state.sCount[nextLine]);
+		state.sCount[nextLine] = -1;
+	}
+	const oldIndent = state.blkIndent;
+	state.blkIndent = 0;
+	const token_o = state.push("blockquote_open", "blockquote", 1);
+	token_o.markup = ">";
+	const lines = [startLine, 0];
+	token_o.map = lines;
+	state.md.block.tokenize(state, startLine, nextLine);
+	const token_c = state.push("blockquote_close", "blockquote", -1);
+	token_c.markup = ">";
+	state.lineMax = oldLineMax;
+	state.parentType = oldParentType;
+	lines[1] = state.line;
+	for (let i$10 = 0; i$10 < oldTShift.length; i$10++) {
+		state.bMarks[i$10 + startLine] = oldBMarks[i$10];
+		state.tShift[i$10 + startLine] = oldTShift[i$10];
+		state.sCount[i$10 + startLine] = oldSCount[i$10];
+		state.bsCount[i$10 + startLine] = oldBSCount[i$10];
+	}
+	state.blkIndent = oldIndent;
+	return true;
 }
 
 function hr(state, startLine, endLine, silent) {
-  const max = state.eMarks[startLine];
-  if (state.sCount[startLine] - state.blkIndent >= 4) {
-    return false;
-  }
-  let pos = state.bMarks[startLine] + state.tShift[startLine];
-  const marker = state.src.charCodeAt(pos++);
-  if (marker !== 42 && marker !== 45 && marker !== 95) {
-    return false;
-  }
-  let cnt = 1;
-  while (pos < max) {
-    const ch = state.src.charCodeAt(pos++);
-    if (ch !== marker && !isSpace(ch)) {
-      return false;
-    }
-    if (ch === marker) {
-      cnt++;
-    }
-  }
-  if (cnt < 3) {
-    return false;
-  }
-  if (silent) {
-    return true;
-  }
-  state.line = startLine + 1;
-  const token = state.push("hr", "hr", 0);
-  token.map = [startLine, state.line];
-  token.markup = Array(cnt + 1).join(String.fromCharCode(marker));
-  return true;
+	const max = state.eMarks[startLine];
+	if (state.sCount[startLine] - state.blkIndent >= 4) {
+		return false;
+	}
+	let pos = state.bMarks[startLine] + state.tShift[startLine];
+	const marker = state.src.charCodeAt(pos++);
+	if (marker !== 42 && marker !== 45 && marker !== 95) {
+		return false;
+	}
+	let cnt = 1;
+	while (pos < max) {
+		const ch = state.src.charCodeAt(pos++);
+		if (ch !== marker && !isSpace(ch)) {
+			return false;
+		}
+		if (ch === marker) {
+			cnt++;
+		}
+	}
+	if (cnt < 3) {
+		return false;
+	}
+	if (silent) {
+		return true;
+	}
+	state.line = startLine + 1;
+	const token = state.push("hr", "hr", 0);
+	token.map = [startLine, state.line];
+	token.markup = Array(cnt + 1).join(String.fromCharCode(marker));
+	return true;
 }
 
 function skipBulletListMarker(state, startLine) {
-  const max = state.eMarks[startLine];
-  let pos = state.bMarks[startLine] + state.tShift[startLine];
-  const marker = state.src.charCodeAt(pos++);
-  if (marker !== 42 && marker !== 45 && marker !== 43) {
-    return -1;
-  }
-  if (pos < max) {
-    const ch = state.src.charCodeAt(pos);
-    if (!isSpace(ch)) {
-      return -1;
-    }
-  }
-  return pos;
+	const max = state.eMarks[startLine];
+	let pos = state.bMarks[startLine] + state.tShift[startLine];
+	const marker = state.src.charCodeAt(pos++);
+	if (marker !== 42 && marker !== 45 && marker !== 43) {
+		return -1;
+	}
+	if (pos < max) {
+		const ch = state.src.charCodeAt(pos);
+		if (!isSpace(ch)) {
+			return -1;
+		}
+	}
+	return pos;
 }
 function skipOrderedListMarker(state, startLine) {
-  const start = state.bMarks[startLine] + state.tShift[startLine];
-  const max = state.eMarks[startLine];
-  let pos = start;
-  if (pos + 1 >= max) {
-    return -1;
-  }
-  let ch = state.src.charCodeAt(pos++);
-  if (ch < 48 || ch > 57) {
-    return -1;
-  }
-  for (;;) {
-    if (pos >= max) {
-      return -1;
-    }
-    ch = state.src.charCodeAt(pos++);
-    if (ch >= 48 && ch <= 57) {
-      if (pos - start >= 10) {
-        return -1;
-      }
-      continue;
-    }
-    if (ch === 41 || ch === 46) {
-      break;
-    }
-    return -1;
-  }
-  if (pos < max) {
-    ch = state.src.charCodeAt(pos);
-    if (!isSpace(ch)) {
-      return -1;
-    }
-  }
-  return pos;
+	const start = state.bMarks[startLine] + state.tShift[startLine];
+	const max = state.eMarks[startLine];
+	let pos = start;
+	if (pos + 1 >= max) {
+		return -1;
+	}
+	let ch = state.src.charCodeAt(pos++);
+	if (ch < 48 || ch > 57) {
+		return -1;
+	}
+	for (;;) {
+		if (pos >= max) {
+			return -1;
+		}
+		ch = state.src.charCodeAt(pos++);
+		if (ch >= 48 && ch <= 57) {
+			if (pos - start >= 10) {
+				return -1;
+			}
+			continue;
+		}
+		if (ch === 41 || ch === 46) {
+			break;
+		}
+		return -1;
+	}
+	if (pos < max) {
+		ch = state.src.charCodeAt(pos);
+		if (!isSpace(ch)) {
+			return -1;
+		}
+	}
+	return pos;
 }
 function markTightParagraphs(state, idx) {
-  const level = state.level + 2;
-  for (let i$10 = idx + 2, l$5 = state.tokens.length - 2; i$10 < l$5; i$10++) {
-    if (state.tokens[i$10].level === level && state.tokens[i$10].type === "paragraph_open") {
-      state.tokens[i$10 + 2].hidden = true;
-      state.tokens[i$10].hidden = true;
-      i$10 += 2;
-    }
-  }
+	const level = state.level + 2;
+	for (let i$10 = idx + 2, l$5 = state.tokens.length - 2; i$10 < l$5; i$10++) {
+		if (state.tokens[i$10].level === level && state.tokens[i$10].type === "paragraph_open") {
+			state.tokens[i$10 + 2].hidden = true;
+			state.tokens[i$10].hidden = true;
+			i$10 += 2;
+		}
+	}
 }
 function list(state, startLine, endLine, silent) {
-  let max, pos, start, token;
-  let nextLine = startLine;
-  let tight = true;
-  if (state.sCount[nextLine] - state.blkIndent >= 4) {
-    return false;
-  }
-  if (
-    state.listIndent >= 0 &&
-    state.sCount[nextLine] - state.listIndent >= 4 &&
-    state.sCount[nextLine] < state.blkIndent
-  ) {
-    return false;
-  }
-  let isTerminatingParagraph = false;
-  if (silent && state.parentType === "paragraph") {
-    if (state.sCount[nextLine] >= state.blkIndent) {
-      isTerminatingParagraph = true;
-    }
-  }
-  let isOrdered;
-  let markerValue;
-  let posAfterMarker;
-  if ((posAfterMarker = skipOrderedListMarker(state, nextLine)) >= 0) {
-    isOrdered = true;
-    start = state.bMarks[nextLine] + state.tShift[nextLine];
-    markerValue = Number(state.src.slice(start, posAfterMarker - 1));
-    if (isTerminatingParagraph && markerValue !== 1) return false;
-  } else if ((posAfterMarker = skipBulletListMarker(state, nextLine)) >= 0) {
-    isOrdered = false;
-  } else {
-    return false;
-  }
-  if (isTerminatingParagraph) {
-    if (state.skipSpaces(posAfterMarker) >= state.eMarks[nextLine]) return false;
-  }
-  if (silent) {
-    return true;
-  }
-  const markerCharCode = state.src.charCodeAt(posAfterMarker - 1);
-  const listTokIdx = state.tokens.length;
-  if (isOrdered) {
-    token = state.push("ordered_list_open", "ol", 1);
-    if (markerValue !== 1) {
-      token.attrs = [["start", markerValue]];
-    }
-  } else {
-    token = state.push("bullet_list_open", "ul", 1);
-  }
-  const listLines = [nextLine, 0];
-  token.map = listLines;
-  token.markup = String.fromCharCode(markerCharCode);
-  let prevEmptyEnd = false;
-  const terminatorRules = state.md.block.ruler.getRules("list");
-  const oldParentType = state.parentType;
-  state.parentType = "list";
-  while (nextLine < endLine) {
-    pos = posAfterMarker;
-    max = state.eMarks[nextLine];
-    const initial =
-      state.sCount[nextLine] + posAfterMarker - (state.bMarks[nextLine] + state.tShift[nextLine]);
-    let offset = initial;
-    while (pos < max) {
-      const ch = state.src.charCodeAt(pos);
-      if (ch === 9) {
-        offset += 4 - ((offset + state.bsCount[nextLine]) % 4);
-      } else if (ch === 32) {
-        offset++;
-      } else {
-        break;
-      }
-      pos++;
-    }
-    const contentStart = pos;
-    let indentAfterMarker;
-    if (contentStart >= max) {
-      indentAfterMarker = 1;
-    } else {
-      indentAfterMarker = offset - initial;
-    }
-    if (indentAfterMarker > 4) {
-      indentAfterMarker = 1;
-    }
-    const indent = initial + indentAfterMarker;
-    token = state.push("list_item_open", "li", 1);
-    token.markup = String.fromCharCode(markerCharCode);
-    const itemLines = [nextLine, 0];
-    token.map = itemLines;
-    if (isOrdered) {
-      token.info = state.src.slice(start, posAfterMarker - 1);
-    }
-    const oldTight = state.tight;
-    const oldTShift = state.tShift[nextLine];
-    const oldSCount = state.sCount[nextLine];
-    const oldListIndent = state.listIndent;
-    state.listIndent = state.blkIndent;
-    state.blkIndent = indent;
-    state.tight = true;
-    state.tShift[nextLine] = contentStart - state.bMarks[nextLine];
-    state.sCount[nextLine] = offset;
-    if (contentStart >= max && state.isEmpty(nextLine + 1)) {
-      state.line = Math.min(state.line + 2, endLine);
-    } else {
-      state.md.block.tokenize(state, nextLine, endLine, true);
-    }
-    if (!state.tight || prevEmptyEnd) {
-      tight = false;
-    }
-    prevEmptyEnd = state.line - nextLine > 1 && state.isEmpty(state.line - 1);
-    state.blkIndent = state.listIndent;
-    state.listIndent = oldListIndent;
-    state.tShift[nextLine] = oldTShift;
-    state.sCount[nextLine] = oldSCount;
-    state.tight = oldTight;
-    token = state.push("list_item_close", "li", -1);
-    token.markup = String.fromCharCode(markerCharCode);
-    nextLine = state.line;
-    itemLines[1] = nextLine;
-    if (nextLine >= endLine) {
-      break;
-    }
-    if (state.sCount[nextLine] < state.blkIndent) {
-      break;
-    }
-    if (state.sCount[nextLine] - state.blkIndent >= 4) {
-      break;
-    }
-    let terminate = false;
-    for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
-      if (terminatorRules[i$10](state, nextLine, endLine, true)) {
-        terminate = true;
-        break;
-      }
-    }
-    if (terminate) {
-      break;
-    }
-    if (isOrdered) {
-      posAfterMarker = skipOrderedListMarker(state, nextLine);
-      if (posAfterMarker < 0) {
-        break;
-      }
-      start = state.bMarks[nextLine] + state.tShift[nextLine];
-    } else {
-      posAfterMarker = skipBulletListMarker(state, nextLine);
-      if (posAfterMarker < 0) {
-        break;
-      }
-    }
-    if (markerCharCode !== state.src.charCodeAt(posAfterMarker - 1)) {
-      break;
-    }
-  }
-  if (isOrdered) {
-    token = state.push("ordered_list_close", "ol", -1);
-  } else {
-    token = state.push("bullet_list_close", "ul", -1);
-  }
-  token.markup = String.fromCharCode(markerCharCode);
-  listLines[1] = nextLine;
-  state.line = nextLine;
-  state.parentType = oldParentType;
-  if (tight) {
-    markTightParagraphs(state, listTokIdx);
-  }
-  return true;
+	let max, pos, start, token;
+	let nextLine = startLine;
+	let tight = true;
+	if (state.sCount[nextLine] - state.blkIndent >= 4) {
+		return false;
+	}
+	if (state.listIndent >= 0 && state.sCount[nextLine] - state.listIndent >= 4 && state.sCount[nextLine] < state.blkIndent) {
+		return false;
+	}
+	let isTerminatingParagraph = false;
+	if (silent && state.parentType === "paragraph") {
+		if (state.sCount[nextLine] >= state.blkIndent) {
+			isTerminatingParagraph = true;
+		}
+	}
+	let isOrdered;
+	let markerValue;
+	let posAfterMarker;
+	if ((posAfterMarker = skipOrderedListMarker(state, nextLine)) >= 0) {
+		isOrdered = true;
+		start = state.bMarks[nextLine] + state.tShift[nextLine];
+		markerValue = Number(state.src.slice(start, posAfterMarker - 1));
+		if (isTerminatingParagraph && markerValue !== 1) return false;
+	} else if ((posAfterMarker = skipBulletListMarker(state, nextLine)) >= 0) {
+		isOrdered = false;
+	} else {
+		return false;
+	}
+	if (isTerminatingParagraph) {
+		if (state.skipSpaces(posAfterMarker) >= state.eMarks[nextLine]) return false;
+	}
+	if (silent) {
+		return true;
+	}
+	const markerCharCode = state.src.charCodeAt(posAfterMarker - 1);
+	const listTokIdx = state.tokens.length;
+	if (isOrdered) {
+		token = state.push("ordered_list_open", "ol", 1);
+		if (markerValue !== 1) {
+			token.attrs = [["start", markerValue]];
+		}
+	} else {
+		token = state.push("bullet_list_open", "ul", 1);
+	}
+	const listLines = [nextLine, 0];
+	token.map = listLines;
+	token.markup = String.fromCharCode(markerCharCode);
+	let prevEmptyEnd = false;
+	const terminatorRules = state.md.block.ruler.getRules("list");
+	const oldParentType = state.parentType;
+	state.parentType = "list";
+	while (nextLine < endLine) {
+		pos = posAfterMarker;
+		max = state.eMarks[nextLine];
+		const initial = state.sCount[nextLine] + posAfterMarker - (state.bMarks[nextLine] + state.tShift[nextLine]);
+		let offset = initial;
+		while (pos < max) {
+			const ch = state.src.charCodeAt(pos);
+			if (ch === 9) {
+				offset += 4 - (offset + state.bsCount[nextLine]) % 4;
+			} else if (ch === 32) {
+				offset++;
+			} else {
+				break;
+			}
+			pos++;
+		}
+		const contentStart = pos;
+		let indentAfterMarker;
+		if (contentStart >= max) {
+			indentAfterMarker = 1;
+		} else {
+			indentAfterMarker = offset - initial;
+		}
+		if (indentAfterMarker > 4) {
+			indentAfterMarker = 1;
+		}
+		const indent = initial + indentAfterMarker;
+		token = state.push("list_item_open", "li", 1);
+		token.markup = String.fromCharCode(markerCharCode);
+		const itemLines = [nextLine, 0];
+		token.map = itemLines;
+		if (isOrdered) {
+			token.info = state.src.slice(start, posAfterMarker - 1);
+		}
+		const oldTight = state.tight;
+		const oldTShift = state.tShift[nextLine];
+		const oldSCount = state.sCount[nextLine];
+		const oldListIndent = state.listIndent;
+		state.listIndent = state.blkIndent;
+		state.blkIndent = indent;
+		state.tight = true;
+		state.tShift[nextLine] = contentStart - state.bMarks[nextLine];
+		state.sCount[nextLine] = offset;
+		if (contentStart >= max && state.isEmpty(nextLine + 1)) {
+			state.line = Math.min(state.line + 2, endLine);
+		} else {
+			state.md.block.tokenize(state, nextLine, endLine, true);
+		}
+		if (!state.tight || prevEmptyEnd) {
+			tight = false;
+		}
+		prevEmptyEnd = state.line - nextLine > 1 && state.isEmpty(state.line - 1);
+		state.blkIndent = state.listIndent;
+		state.listIndent = oldListIndent;
+		state.tShift[nextLine] = oldTShift;
+		state.sCount[nextLine] = oldSCount;
+		state.tight = oldTight;
+		token = state.push("list_item_close", "li", -1);
+		token.markup = String.fromCharCode(markerCharCode);
+		nextLine = state.line;
+		itemLines[1] = nextLine;
+		if (nextLine >= endLine) {
+			break;
+		}
+		if (state.sCount[nextLine] < state.blkIndent) {
+			break;
+		}
+		if (state.sCount[nextLine] - state.blkIndent >= 4) {
+			break;
+		}
+		let terminate = false;
+		for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
+			if (terminatorRules[i$10](state, nextLine, endLine, true)) {
+				terminate = true;
+				break;
+			}
+		}
+		if (terminate) {
+			break;
+		}
+		if (isOrdered) {
+			posAfterMarker = skipOrderedListMarker(state, nextLine);
+			if (posAfterMarker < 0) {
+				break;
+			}
+			start = state.bMarks[nextLine] + state.tShift[nextLine];
+		} else {
+			posAfterMarker = skipBulletListMarker(state, nextLine);
+			if (posAfterMarker < 0) {
+				break;
+			}
+		}
+		if (markerCharCode !== state.src.charCodeAt(posAfterMarker - 1)) {
+			break;
+		}
+	}
+	if (isOrdered) {
+		token = state.push("ordered_list_close", "ol", -1);
+	} else {
+		token = state.push("bullet_list_close", "ul", -1);
+	}
+	token.markup = String.fromCharCode(markerCharCode);
+	listLines[1] = nextLine;
+	state.line = nextLine;
+	state.parentType = oldParentType;
+	if (tight) {
+		markTightParagraphs(state, listTokIdx);
+	}
+	return true;
 }
 
 function reference(state, startLine, _endLine, silent) {
-  let pos = state.bMarks[startLine] + state.tShift[startLine];
-  let max = state.eMarks[startLine];
-  let nextLine = startLine + 1;
-  if (state.sCount[startLine] - state.blkIndent >= 4) {
-    return false;
-  }
-  if (state.src.charCodeAt(pos) !== 91) {
-    return false;
-  }
-  function getNextLine(nextLine$1) {
-    const endLine = state.lineMax;
-    if (nextLine$1 >= endLine || state.isEmpty(nextLine$1)) {
-      return null;
-    }
-    let isContinuation = false;
-    if (state.sCount[nextLine$1] - state.blkIndent > 3) {
-      isContinuation = true;
-    }
-    if (state.sCount[nextLine$1] < 0) {
-      isContinuation = true;
-    }
-    if (!isContinuation) {
-      const terminatorRules = state.md.block.ruler.getRules("reference");
-      const oldParentType = state.parentType;
-      state.parentType = "reference";
-      let terminate = false;
-      for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
-        if (terminatorRules[i$10](state, nextLine$1, endLine, true)) {
-          terminate = true;
-          break;
-        }
-      }
-      state.parentType = oldParentType;
-      if (terminate) {
-        return null;
-      }
-    }
-    const pos$1 = state.bMarks[nextLine$1] + state.tShift[nextLine$1];
-    const max$1 = state.eMarks[nextLine$1];
-    return state.src.slice(pos$1, max$1 + 1);
-  }
-  let str = state.src.slice(pos, max + 1);
-  max = str.length;
-  let labelEnd = -1;
-  for (pos = 1; pos < max; pos++) {
-    const ch = str.charCodeAt(pos);
-    if (ch === 91) {
-      return false;
-    } else if (ch === 93) {
-      labelEnd = pos;
-      break;
-    } else if (ch === 10) {
-      const lineContent = getNextLine(nextLine);
-      if (lineContent !== null) {
-        str += lineContent;
-        max = str.length;
-        nextLine++;
-      }
-    } else if (ch === 92) {
-      pos++;
-      if (pos < max && str.charCodeAt(pos) === 10) {
-        const lineContent = getNextLine(nextLine);
-        if (lineContent !== null) {
-          str += lineContent;
-          max = str.length;
-          nextLine++;
-        }
-      }
-    }
-  }
-  if (labelEnd < 0 || str.charCodeAt(labelEnd + 1) !== 58) {
-    return false;
-  }
-  for (pos = labelEnd + 2; pos < max; pos++) {
-    const ch = str.charCodeAt(pos);
-    if (ch === 10) {
-      const lineContent = getNextLine(nextLine);
-      if (lineContent !== null) {
-        str += lineContent;
-        max = str.length;
-        nextLine++;
-      }
-    } else if (isSpace(ch)) {
-    } else {
-      break;
-    }
-  }
-  const destRes = state.md.helpers.parseLinkDestination(str, pos, max);
-  if (!destRes.ok) {
-    return false;
-  }
-  const href = state.md.normalizeLink(destRes.str);
-  if (!state.md.validateLink(href)) {
-    return false;
-  }
-  pos = destRes.pos;
-  const destEndPos = pos;
-  const destEndLineNo = nextLine;
-  const start = pos;
-  for (; pos < max; pos++) {
-    const ch = str.charCodeAt(pos);
-    if (ch === 10) {
-      const lineContent = getNextLine(nextLine);
-      if (lineContent !== null) {
-        str += lineContent;
-        max = str.length;
-        nextLine++;
-      }
-    } else if (isSpace(ch)) {
-    } else {
-      break;
-    }
-  }
-  let titleRes = state.md.helpers.parseLinkTitle(str, pos, max);
-  while (titleRes.can_continue) {
-    const lineContent = getNextLine(nextLine);
-    if (lineContent === null) break;
-    str += lineContent;
-    pos = max;
-    max = str.length;
-    nextLine++;
-    titleRes = state.md.helpers.parseLinkTitle(str, pos, max, titleRes);
-  }
-  let title$1;
-  if (pos < max && start !== pos && titleRes.ok) {
-    title$1 = titleRes.str;
-    pos = titleRes.pos;
-  } else {
-    title$1 = "";
-    pos = destEndPos;
-    nextLine = destEndLineNo;
-  }
-  while (pos < max) {
-    const ch = str.charCodeAt(pos);
-    if (!isSpace(ch)) {
-      break;
-    }
-    pos++;
-  }
-  if (pos < max && str.charCodeAt(pos) !== 10) {
-    if (title$1) {
-      title$1 = "";
-      pos = destEndPos;
-      nextLine = destEndLineNo;
-      while (pos < max) {
-        const ch = str.charCodeAt(pos);
-        if (!isSpace(ch)) {
-          break;
-        }
-        pos++;
-      }
-    }
-  }
-  if (pos < max && str.charCodeAt(pos) !== 10) {
-    return false;
-  }
-  const label = normalizeReference(str.slice(1, labelEnd));
-  if (!label) {
-    return false;
-  }
-  /* istanbul ignore if */
-  if (silent) {
-    return true;
-  }
-  if (typeof state.env.references === "undefined") {
-    state.env.references = {};
-  }
-  if (typeof state.env.references[label] === "undefined") {
-    state.env.references[label] = {
-      title: title$1,
-      href,
-    };
-  }
-  state.line = nextLine;
-  return true;
+	let pos = state.bMarks[startLine] + state.tShift[startLine];
+	let max = state.eMarks[startLine];
+	let nextLine = startLine + 1;
+	if (state.sCount[startLine] - state.blkIndent >= 4) {
+		return false;
+	}
+	if (state.src.charCodeAt(pos) !== 91) {
+		return false;
+	}
+	function getNextLine(nextLine$1) {
+		const endLine = state.lineMax;
+		if (nextLine$1 >= endLine || state.isEmpty(nextLine$1)) {
+			return null;
+		}
+		let isContinuation = false;
+		if (state.sCount[nextLine$1] - state.blkIndent > 3) {
+			isContinuation = true;
+		}
+		if (state.sCount[nextLine$1] < 0) {
+			isContinuation = true;
+		}
+		if (!isContinuation) {
+			const terminatorRules = state.md.block.ruler.getRules("reference");
+			const oldParentType = state.parentType;
+			state.parentType = "reference";
+			let terminate = false;
+			for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
+				if (terminatorRules[i$10](state, nextLine$1, endLine, true)) {
+					terminate = true;
+					break;
+				}
+			}
+			state.parentType = oldParentType;
+			if (terminate) {
+				return null;
+			}
+		}
+		const pos$1 = state.bMarks[nextLine$1] + state.tShift[nextLine$1];
+		const max$1 = state.eMarks[nextLine$1];
+		return state.src.slice(pos$1, max$1 + 1);
+	}
+	let str = state.src.slice(pos, max + 1);
+	max = str.length;
+	let labelEnd = -1;
+	for (pos = 1; pos < max; pos++) {
+		const ch = str.charCodeAt(pos);
+		if (ch === 91) {
+			return false;
+		} else if (ch === 93) {
+			labelEnd = pos;
+			break;
+		} else if (ch === 10) {
+			const lineContent = getNextLine(nextLine);
+			if (lineContent !== null) {
+				str += lineContent;
+				max = str.length;
+				nextLine++;
+			}
+		} else if (ch === 92) {
+			pos++;
+			if (pos < max && str.charCodeAt(pos) === 10) {
+				const lineContent = getNextLine(nextLine);
+				if (lineContent !== null) {
+					str += lineContent;
+					max = str.length;
+					nextLine++;
+				}
+			}
+		}
+	}
+	if (labelEnd < 0 || str.charCodeAt(labelEnd + 1) !== 58) {
+		return false;
+	}
+	for (pos = labelEnd + 2; pos < max; pos++) {
+		const ch = str.charCodeAt(pos);
+		if (ch === 10) {
+			const lineContent = getNextLine(nextLine);
+			if (lineContent !== null) {
+				str += lineContent;
+				max = str.length;
+				nextLine++;
+			}
+		} else if (isSpace(ch)) {} else {
+			break;
+		}
+	}
+	const destRes = state.md.helpers.parseLinkDestination(str, pos, max);
+	if (!destRes.ok) {
+		return false;
+	}
+	const href = state.md.normalizeLink(destRes.str);
+	if (!state.md.validateLink(href)) {
+		return false;
+	}
+	pos = destRes.pos;
+	const destEndPos = pos;
+	const destEndLineNo = nextLine;
+	const start = pos;
+	for (; pos < max; pos++) {
+		const ch = str.charCodeAt(pos);
+		if (ch === 10) {
+			const lineContent = getNextLine(nextLine);
+			if (lineContent !== null) {
+				str += lineContent;
+				max = str.length;
+				nextLine++;
+			}
+		} else if (isSpace(ch)) {} else {
+			break;
+		}
+	}
+	let titleRes = state.md.helpers.parseLinkTitle(str, pos, max);
+	while (titleRes.can_continue) {
+		const lineContent = getNextLine(nextLine);
+		if (lineContent === null) break;
+		str += lineContent;
+		pos = max;
+		max = str.length;
+		nextLine++;
+		titleRes = state.md.helpers.parseLinkTitle(str, pos, max, titleRes);
+	}
+	let title$1;
+	if (pos < max && start !== pos && titleRes.ok) {
+		title$1 = titleRes.str;
+		pos = titleRes.pos;
+	} else {
+		title$1 = "";
+		pos = destEndPos;
+		nextLine = destEndLineNo;
+	}
+	while (pos < max) {
+		const ch = str.charCodeAt(pos);
+		if (!isSpace(ch)) {
+			break;
+		}
+		pos++;
+	}
+	if (pos < max && str.charCodeAt(pos) !== 10) {
+		if (title$1) {
+			title$1 = "";
+			pos = destEndPos;
+			nextLine = destEndLineNo;
+			while (pos < max) {
+				const ch = str.charCodeAt(pos);
+				if (!isSpace(ch)) {
+					break;
+				}
+				pos++;
+			}
+		}
+	}
+	if (pos < max && str.charCodeAt(pos) !== 10) {
+		return false;
+	}
+	const label = normalizeReference(str.slice(1, labelEnd));
+	if (!label) {
+		return false;
+	}
+	/* istanbul ignore if */
+	if (silent) {
+		return true;
+	}
+	if (typeof state.env.references === "undefined") {
+		state.env.references = {};
+	}
+	if (typeof state.env.references[label] === "undefined") {
+		state.env.references[label] = {
+			title: title$1,
+			href
+		};
+	}
+	state.line = nextLine;
+	return true;
 }
 
 var html_blocks_default = [
-  "address",
-  "article",
-  "aside",
-  "base",
-  "basefont",
-  "blockquote",
-  "body",
-  "caption",
-  "center",
-  "col",
-  "colgroup",
-  "dd",
-  "details",
-  "dialog",
-  "dir",
-  "div",
-  "dl",
-  "dt",
-  "fieldset",
-  "figcaption",
-  "figure",
-  "footer",
-  "form",
-  "frame",
-  "frameset",
-  "h1",
-  "h2",
-  "h3",
-  "h4",
-  "h5",
-  "h6",
-  "head",
-  "header",
-  "hr",
-  "html",
-  "iframe",
-  "legend",
-  "li",
-  "link",
-  "main",
-  "menu",
-  "menuitem",
-  "nav",
-  "noframes",
-  "ol",
-  "optgroup",
-  "option",
-  "p",
-  "param",
-  "search",
-  "section",
-  "summary",
-  "table",
-  "tbody",
-  "td",
-  "tfoot",
-  "th",
-  "thead",
-  "title",
-  "tr",
-  "track",
-  "ul",
+	"address",
+	"article",
+	"aside",
+	"base",
+	"basefont",
+	"blockquote",
+	"body",
+	"caption",
+	"center",
+	"col",
+	"colgroup",
+	"dd",
+	"details",
+	"dialog",
+	"dir",
+	"div",
+	"dl",
+	"dt",
+	"fieldset",
+	"figcaption",
+	"figure",
+	"footer",
+	"form",
+	"frame",
+	"frameset",
+	"h1",
+	"h2",
+	"h3",
+	"h4",
+	"h5",
+	"h6",
+	"head",
+	"header",
+	"hr",
+	"html",
+	"iframe",
+	"legend",
+	"li",
+	"link",
+	"main",
+	"menu",
+	"menuitem",
+	"nav",
+	"noframes",
+	"ol",
+	"optgroup",
+	"option",
+	"p",
+	"param",
+	"search",
+	"section",
+	"summary",
+	"table",
+	"tbody",
+	"td",
+	"tfoot",
+	"th",
+	"thead",
+	"title",
+	"tr",
+	"track",
+	"ul"
 ];
 
 const attr_name = "[a-zA-Z_:][a-zA-Z0-9:._-]*";
 const unquoted = "[^\"'=<>`\\x00-\\x20]+";
 const single_quoted = "'[^']*'";
-const double_quoted = '"[^"]*"';
+const double_quoted = "\"[^\"]*\"";
 const attr_value = "(?:" + unquoted + "|" + single_quoted + "|" + double_quoted + ")";
 const attribute = "(?:\\s+" + attr_name + "(?:\\s*=\\s*" + attr_value + ")?)";
 const open_tag = "<[A-Za-z][A-Za-z0-9\\-]*" + attribute + "*\\s*\\/?>";
@@ -15918,2004 +13891,1915 @@ const comment = "<!---?>|<!--(?:[^-]|-[^-]|--[^>])*-->";
 const processing = "<[?][\\s\\S]*?[?]>";
 const declaration = "<![A-Za-z][^>]*>";
 const cdata = "<!\\[CDATA\\[[\\s\\S]*?\\]\\]>";
-const HTML_TAG_RE = new RegExp(
-  "^(?:" +
-    open_tag +
-    "|" +
-    close_tag +
-    "|" +
-    comment +
-    "|" +
-    processing +
-    "|" +
-    declaration +
-    "|" +
-    cdata +
-    ")",
-);
+const HTML_TAG_RE = new RegExp("^(?:" + open_tag + "|" + close_tag + "|" + comment + "|" + processing + "|" + declaration + "|" + cdata + ")");
 const HTML_OPEN_CLOSE_TAG_RE = new RegExp("^(?:" + open_tag + "|" + close_tag + ")");
 
 const HTML_SEQUENCES = [
-  [/^<(script|pre|style|textarea)(?=(\s|>|$))/i, /<\/(script|pre|style|textarea)>/i, true],
-  [/^<!--/, /-->/, true],
-  [/^<\?/, /\?>/, true],
-  [/^<![A-Z]/, />/, true],
-  [/^<!\[CDATA\[/, /\]\]>/, true],
-  [new RegExp("^</?(" + html_blocks_default.join("|") + ")(?=(\\s|/?>|$))", "i"), /^$/, true],
-  [new RegExp(HTML_OPEN_CLOSE_TAG_RE.source + "\\s*$"), /^$/, false],
+	[
+		/^<(script|pre|style|textarea)(?=(\s|>|$))/i,
+		/<\/(script|pre|style|textarea)>/i,
+		true
+	],
+	[
+		/^<!--/,
+		/-->/,
+		true
+	],
+	[
+		/^<\?/,
+		/\?>/,
+		true
+	],
+	[
+		/^<![A-Z]/,
+		/>/,
+		true
+	],
+	[
+		/^<!\[CDATA\[/,
+		/\]\]>/,
+		true
+	],
+	[
+		new RegExp("^</?(" + html_blocks_default.join("|") + ")(?=(\\s|/?>|$))", "i"),
+		/^$/,
+		true
+	],
+	[
+		new RegExp(HTML_OPEN_CLOSE_TAG_RE.source + "\\s*$"),
+		/^$/,
+		false
+	]
 ];
 function html_block(state, startLine, endLine, silent) {
-  let pos = state.bMarks[startLine] + state.tShift[startLine];
-  let max = state.eMarks[startLine];
-  if (state.sCount[startLine] - state.blkIndent >= 4) {
-    return false;
-  }
-  if (!state.md.options.html) {
-    return false;
-  }
-  if (state.src.charCodeAt(pos) !== 60) {
-    return false;
-  }
-  let lineText = state.src.slice(pos, max);
-  let i$10 = 0;
-  for (; i$10 < HTML_SEQUENCES.length; i$10++) {
-    if (HTML_SEQUENCES[i$10][0].test(lineText)) {
-      break;
-    }
-  }
-  if (i$10 === HTML_SEQUENCES.length) {
-    return false;
-  }
-  if (silent) {
-    return HTML_SEQUENCES[i$10][2];
-  }
-  let nextLine = startLine + 1;
-  if (!HTML_SEQUENCES[i$10][1].test(lineText)) {
-    for (; nextLine < endLine; nextLine++) {
-      if (state.sCount[nextLine] < state.blkIndent) {
-        break;
-      }
-      pos = state.bMarks[nextLine] + state.tShift[nextLine];
-      max = state.eMarks[nextLine];
-      lineText = state.src.slice(pos, max);
-      if (HTML_SEQUENCES[i$10][1].test(lineText)) {
-        if (lineText.length !== 0) {
-          nextLine++;
-        }
-        break;
-      }
-    }
-  }
-  state.line = nextLine;
-  const token = state.push("html_block", "", 0);
-  token.map = [startLine, nextLine];
-  token.content = state.getLines(startLine, nextLine, state.blkIndent, true);
-  return true;
+	let pos = state.bMarks[startLine] + state.tShift[startLine];
+	let max = state.eMarks[startLine];
+	if (state.sCount[startLine] - state.blkIndent >= 4) {
+		return false;
+	}
+	if (!state.md.options.html) {
+		return false;
+	}
+	if (state.src.charCodeAt(pos) !== 60) {
+		return false;
+	}
+	let lineText = state.src.slice(pos, max);
+	let i$10 = 0;
+	for (; i$10 < HTML_SEQUENCES.length; i$10++) {
+		if (HTML_SEQUENCES[i$10][0].test(lineText)) {
+			break;
+		}
+	}
+	if (i$10 === HTML_SEQUENCES.length) {
+		return false;
+	}
+	if (silent) {
+		return HTML_SEQUENCES[i$10][2];
+	}
+	let nextLine = startLine + 1;
+	if (!HTML_SEQUENCES[i$10][1].test(lineText)) {
+		for (; nextLine < endLine; nextLine++) {
+			if (state.sCount[nextLine] < state.blkIndent) {
+				break;
+			}
+			pos = state.bMarks[nextLine] + state.tShift[nextLine];
+			max = state.eMarks[nextLine];
+			lineText = state.src.slice(pos, max);
+			if (HTML_SEQUENCES[i$10][1].test(lineText)) {
+				if (lineText.length !== 0) {
+					nextLine++;
+				}
+				break;
+			}
+		}
+	}
+	state.line = nextLine;
+	const token = state.push("html_block", "", 0);
+	token.map = [startLine, nextLine];
+	token.content = state.getLines(startLine, nextLine, state.blkIndent, true);
+	return true;
 }
 
 function heading(state, startLine, endLine, silent) {
-  let pos = state.bMarks[startLine] + state.tShift[startLine];
-  let max = state.eMarks[startLine];
-  if (state.sCount[startLine] - state.blkIndent >= 4) {
-    return false;
-  }
-  let ch = state.src.charCodeAt(pos);
-  if (ch !== 35 || pos >= max) {
-    return false;
-  }
-  let level = 1;
-  ch = state.src.charCodeAt(++pos);
-  while (ch === 35 && pos < max && level <= 6) {
-    level++;
-    ch = state.src.charCodeAt(++pos);
-  }
-  if (level > 6 || (pos < max && !isSpace(ch))) {
-    return false;
-  }
-  if (silent) {
-    return true;
-  }
-  max = state.skipSpacesBack(max, pos);
-  const tmp = state.skipCharsBack(max, 35, pos);
-  if (tmp > pos && isSpace(state.src.charCodeAt(tmp - 1))) {
-    max = tmp;
-  }
-  state.line = startLine + 1;
-  const token_o = state.push("heading_open", "h" + String(level), 1);
-  token_o.markup = "########".slice(0, level);
-  token_o.map = [startLine, state.line];
-  const token_i = state.push("inline", "", 0);
-  token_i.content = state.src.slice(pos, max).trim();
-  token_i.map = [startLine, state.line];
-  token_i.children = [];
-  const token_c = state.push("heading_close", "h" + String(level), -1);
-  token_c.markup = "########".slice(0, level);
-  return true;
+	let pos = state.bMarks[startLine] + state.tShift[startLine];
+	let max = state.eMarks[startLine];
+	if (state.sCount[startLine] - state.blkIndent >= 4) {
+		return false;
+	}
+	let ch = state.src.charCodeAt(pos);
+	if (ch !== 35 || pos >= max) {
+		return false;
+	}
+	let level = 1;
+	ch = state.src.charCodeAt(++pos);
+	while (ch === 35 && pos < max && level <= 6) {
+		level++;
+		ch = state.src.charCodeAt(++pos);
+	}
+	if (level > 6 || pos < max && !isSpace(ch)) {
+		return false;
+	}
+	if (silent) {
+		return true;
+	}
+	max = state.skipSpacesBack(max, pos);
+	const tmp = state.skipCharsBack(max, 35, pos);
+	if (tmp > pos && isSpace(state.src.charCodeAt(tmp - 1))) {
+		max = tmp;
+	}
+	state.line = startLine + 1;
+	const token_o = state.push("heading_open", "h" + String(level), 1);
+	token_o.markup = "########".slice(0, level);
+	token_o.map = [startLine, state.line];
+	const token_i = state.push("inline", "", 0);
+	token_i.content = state.src.slice(pos, max).trim();
+	token_i.map = [startLine, state.line];
+	token_i.children = [];
+	const token_c = state.push("heading_close", "h" + String(level), -1);
+	token_c.markup = "########".slice(0, level);
+	return true;
 }
 
 function lheading(state, startLine, endLine) {
-  const terminatorRules = state.md.block.ruler.getRules("paragraph");
-  if (state.sCount[startLine] - state.blkIndent >= 4) {
-    return false;
-  }
-  const oldParentType = state.parentType;
-  state.parentType = "paragraph";
-  let level = 0;
-  let marker;
-  let nextLine = startLine + 1;
-  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
-    if (state.sCount[nextLine] - state.blkIndent > 3) {
-      continue;
-    }
-    if (state.sCount[nextLine] >= state.blkIndent) {
-      let pos = state.bMarks[nextLine] + state.tShift[nextLine];
-      const max = state.eMarks[nextLine];
-      if (pos < max) {
-        marker = state.src.charCodeAt(pos);
-        if (marker === 45 || marker === 61) {
-          pos = state.skipChars(pos, marker);
-          pos = state.skipSpaces(pos);
-          if (pos >= max) {
-            level = marker === 61 ? 1 : 2;
-            break;
-          }
-        }
-      }
-    }
-    if (state.sCount[nextLine] < 0) {
-      continue;
-    }
-    let terminate = false;
-    for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
-      if (terminatorRules[i$10](state, nextLine, endLine, true)) {
-        terminate = true;
-        break;
-      }
-    }
-    if (terminate) {
-      break;
-    }
-  }
-  if (!level) {
-    return false;
-  }
-  const content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
-  state.line = nextLine + 1;
-  const token_o = state.push("heading_open", "h" + String(level), 1);
-  token_o.markup = String.fromCharCode(marker);
-  token_o.map = [startLine, state.line];
-  const token_i = state.push("inline", "", 0);
-  token_i.content = content;
-  token_i.map = [startLine, state.line - 1];
-  token_i.children = [];
-  const token_c = state.push("heading_close", "h" + String(level), -1);
-  token_c.markup = String.fromCharCode(marker);
-  state.parentType = oldParentType;
-  return true;
+	const terminatorRules = state.md.block.ruler.getRules("paragraph");
+	if (state.sCount[startLine] - state.blkIndent >= 4) {
+		return false;
+	}
+	const oldParentType = state.parentType;
+	state.parentType = "paragraph";
+	let level = 0;
+	let marker;
+	let nextLine = startLine + 1;
+	for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
+		if (state.sCount[nextLine] - state.blkIndent > 3) {
+			continue;
+		}
+		if (state.sCount[nextLine] >= state.blkIndent) {
+			let pos = state.bMarks[nextLine] + state.tShift[nextLine];
+			const max = state.eMarks[nextLine];
+			if (pos < max) {
+				marker = state.src.charCodeAt(pos);
+				if (marker === 45 || marker === 61) {
+					pos = state.skipChars(pos, marker);
+					pos = state.skipSpaces(pos);
+					if (pos >= max) {
+						level = marker === 61 ? 1 : 2;
+						break;
+					}
+				}
+			}
+		}
+		if (state.sCount[nextLine] < 0) {
+			continue;
+		}
+		let terminate = false;
+		for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
+			if (terminatorRules[i$10](state, nextLine, endLine, true)) {
+				terminate = true;
+				break;
+			}
+		}
+		if (terminate) {
+			break;
+		}
+	}
+	if (!level) {
+		return false;
+	}
+	const content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
+	state.line = nextLine + 1;
+	const token_o = state.push("heading_open", "h" + String(level), 1);
+	token_o.markup = String.fromCharCode(marker);
+	token_o.map = [startLine, state.line];
+	const token_i = state.push("inline", "", 0);
+	token_i.content = content;
+	token_i.map = [startLine, state.line - 1];
+	token_i.children = [];
+	const token_c = state.push("heading_close", "h" + String(level), -1);
+	token_c.markup = String.fromCharCode(marker);
+	state.parentType = oldParentType;
+	return true;
 }
 
 function paragraph(state, startLine, endLine) {
-  const terminatorRules = state.md.block.ruler.getRules("paragraph");
-  const oldParentType = state.parentType;
-  let nextLine = startLine + 1;
-  state.parentType = "paragraph";
-  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
-    if (state.sCount[nextLine] - state.blkIndent > 3) {
-      continue;
-    }
-    if (state.sCount[nextLine] < 0) {
-      continue;
-    }
-    let terminate = false;
-    for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
-      if (terminatorRules[i$10](state, nextLine, endLine, true)) {
-        terminate = true;
-        break;
-      }
-    }
-    if (terminate) {
-      break;
-    }
-  }
-  const content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
-  state.line = nextLine;
-  const token_o = state.push("paragraph_open", "p", 1);
-  token_o.map = [startLine, state.line];
-  const token_i = state.push("inline", "", 0);
-  token_i.content = content;
-  token_i.map = [startLine, state.line];
-  token_i.children = [];
-  state.push("paragraph_close", "p", -1);
-  state.parentType = oldParentType;
-  return true;
+	const terminatorRules = state.md.block.ruler.getRules("paragraph");
+	const oldParentType = state.parentType;
+	let nextLine = startLine + 1;
+	state.parentType = "paragraph";
+	for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
+		if (state.sCount[nextLine] - state.blkIndent > 3) {
+			continue;
+		}
+		if (state.sCount[nextLine] < 0) {
+			continue;
+		}
+		let terminate = false;
+		for (let i$10 = 0, l$5 = terminatorRules.length; i$10 < l$5; i$10++) {
+			if (terminatorRules[i$10](state, nextLine, endLine, true)) {
+				terminate = true;
+				break;
+			}
+		}
+		if (terminate) {
+			break;
+		}
+	}
+	const content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
+	state.line = nextLine;
+	const token_o = state.push("paragraph_open", "p", 1);
+	token_o.map = [startLine, state.line];
+	const token_i = state.push("inline", "", 0);
+	token_i.content = content;
+	token_i.map = [startLine, state.line];
+	token_i.children = [];
+	state.push("paragraph_close", "p", -1);
+	state.parentType = oldParentType;
+	return true;
 }
 
 /** internal
- * class ParserBlock
- *
- * Block-level tokenizer.
- **/
+* class ParserBlock
+*
+* Block-level tokenizer.
+**/
 const _rules$1 = [
-  ["table", table, ["paragraph", "reference"]],
-  ["code", code],
-  ["fence", fence, ["paragraph", "reference", "blockquote", "list"]],
-  ["blockquote", blockquote, ["paragraph", "reference", "blockquote", "list"]],
-  ["hr", hr, ["paragraph", "reference", "blockquote", "list"]],
-  ["list", list, ["paragraph", "reference", "blockquote"]],
-  ["reference", reference],
-  ["html_block", html_block, ["paragraph", "reference", "blockquote"]],
-  ["heading", heading, ["paragraph", "reference", "blockquote"]],
-  ["lheading", lheading],
-  ["paragraph", paragraph],
+	[
+		"table",
+		table,
+		["paragraph", "reference"]
+	],
+	["code", code],
+	[
+		"fence",
+		fence,
+		[
+			"paragraph",
+			"reference",
+			"blockquote",
+			"list"
+		]
+	],
+	[
+		"blockquote",
+		blockquote,
+		[
+			"paragraph",
+			"reference",
+			"blockquote",
+			"list"
+		]
+	],
+	[
+		"hr",
+		hr,
+		[
+			"paragraph",
+			"reference",
+			"blockquote",
+			"list"
+		]
+	],
+	[
+		"list",
+		list,
+		[
+			"paragraph",
+			"reference",
+			"blockquote"
+		]
+	],
+	["reference", reference],
+	[
+		"html_block",
+		html_block,
+		[
+			"paragraph",
+			"reference",
+			"blockquote"
+		]
+	],
+	[
+		"heading",
+		heading,
+		[
+			"paragraph",
+			"reference",
+			"blockquote"
+		]
+	],
+	["lheading", lheading],
+	["paragraph", paragraph]
 ];
 /**
- * new ParserBlock()
- **/
+* new ParserBlock()
+**/
 function ParserBlock() {
-  /**
-   * ParserBlock#ruler -> Ruler
-   *
-   * [[Ruler]] instance. Keep configuration of block rules.
-   **/
-  this.ruler = new ruler_default();
-  for (let i$10 = 0; i$10 < _rules$1.length; i$10++) {
-    this.ruler.push(_rules$1[i$10][0], _rules$1[i$10][1], {
-      alt: (_rules$1[i$10][2] || []).slice(),
-    });
-  }
+	/**
+	* ParserBlock#ruler -> Ruler
+	*
+	* [[Ruler]] instance. Keep configuration of block rules.
+	**/
+	this.ruler = new ruler_default();
+	for (let i$10 = 0; i$10 < _rules$1.length; i$10++) {
+		this.ruler.push(_rules$1[i$10][0], _rules$1[i$10][1], { alt: (_rules$1[i$10][2] || []).slice() });
+	}
 }
-ParserBlock.prototype.tokenize = function (state, startLine, endLine) {
-  const rules = this.ruler.getRules("");
-  const len = rules.length;
-  const maxNesting = state.md.options.maxNesting;
-  let line = startLine;
-  let hasEmptyLines = false;
-  while (line < endLine) {
-    state.line = line = state.skipEmptyLines(line);
-    if (line >= endLine) {
-      break;
-    }
-    if (state.sCount[line] < state.blkIndent) {
-      break;
-    }
-    if (state.level >= maxNesting) {
-      state.line = endLine;
-      break;
-    }
-    const prevLine = state.line;
-    let ok = false;
-    for (let i$10 = 0; i$10 < len; i$10++) {
-      ok = rules[i$10](state, line, endLine, false);
-      if (ok) {
-        if (prevLine >= state.line) {
-          throw new Error("block rule didn't increment state.line");
-        }
-        break;
-      }
-    }
-    if (!ok) throw new Error("none of the block rules matched");
-    state.tight = !hasEmptyLines;
-    if (state.isEmpty(state.line - 1)) {
-      hasEmptyLines = true;
-    }
-    line = state.line;
-    if (line < endLine && state.isEmpty(line)) {
-      hasEmptyLines = true;
-      line++;
-      state.line = line;
-    }
-  }
+ParserBlock.prototype.tokenize = function(state, startLine, endLine) {
+	const rules = this.ruler.getRules("");
+	const len = rules.length;
+	const maxNesting = state.md.options.maxNesting;
+	let line = startLine;
+	let hasEmptyLines = false;
+	while (line < endLine) {
+		state.line = line = state.skipEmptyLines(line);
+		if (line >= endLine) {
+			break;
+		}
+		if (state.sCount[line] < state.blkIndent) {
+			break;
+		}
+		if (state.level >= maxNesting) {
+			state.line = endLine;
+			break;
+		}
+		const prevLine = state.line;
+		let ok = false;
+		for (let i$10 = 0; i$10 < len; i$10++) {
+			ok = rules[i$10](state, line, endLine, false);
+			if (ok) {
+				if (prevLine >= state.line) {
+					throw new Error("block rule didn't increment state.line");
+				}
+				break;
+			}
+		}
+		if (!ok) throw new Error("none of the block rules matched");
+		state.tight = !hasEmptyLines;
+		if (state.isEmpty(state.line - 1)) {
+			hasEmptyLines = true;
+		}
+		line = state.line;
+		if (line < endLine && state.isEmpty(line)) {
+			hasEmptyLines = true;
+			line++;
+			state.line = line;
+		}
+	}
 };
 /**
- * ParserBlock.parse(str, md, env, outTokens)
- *
- * Process input string and push block tokens into `outTokens`
- **/
-ParserBlock.prototype.parse = function (src, md, env, outTokens) {
-  if (!src) {
-    return;
-  }
-  const state = new this.State(src, md, env, outTokens);
-  this.tokenize(state, state.line, state.lineMax);
+* ParserBlock.parse(str, md, env, outTokens)
+*
+* Process input string and push block tokens into `outTokens`
+**/
+ParserBlock.prototype.parse = function(src, md, env, outTokens) {
+	if (!src) {
+		return;
+	}
+	const state = new this.State(src, md, env, outTokens);
+	this.tokenize(state, state.line, state.lineMax);
 };
 ParserBlock.prototype.State = state_block_default;
 var parser_block_default = ParserBlock;
 
 function StateInline(src, md, env, outTokens) {
-  this.src = src;
-  this.env = env;
-  this.md = md;
-  this.tokens = outTokens;
-  this.tokens_meta = Array(outTokens.length);
-  this.pos = 0;
-  this.posMax = this.src.length;
-  this.level = 0;
-  this.pending = "";
-  this.pendingLevel = 0;
-  this.cache = {};
-  this.delimiters = [];
-  this._prev_delimiters = [];
-  this.backticks = {};
-  this.backticksScanned = false;
-  this.linkLevel = 0;
+	this.src = src;
+	this.env = env;
+	this.md = md;
+	this.tokens = outTokens;
+	this.tokens_meta = Array(outTokens.length);
+	this.pos = 0;
+	this.posMax = this.src.length;
+	this.level = 0;
+	this.pending = "";
+	this.pendingLevel = 0;
+	this.cache = {};
+	this.delimiters = [];
+	this._prev_delimiters = [];
+	this.backticks = {};
+	this.backticksScanned = false;
+	this.linkLevel = 0;
 }
-StateInline.prototype.pushPending = function () {
-  const token = new token_default("text", "", 0);
-  token.content = this.pending;
-  token.level = this.pendingLevel;
-  this.tokens.push(token);
-  this.pending = "";
-  return token;
+StateInline.prototype.pushPending = function() {
+	const token = new token_default("text", "", 0);
+	token.content = this.pending;
+	token.level = this.pendingLevel;
+	this.tokens.push(token);
+	this.pending = "";
+	return token;
 };
-StateInline.prototype.push = function (type$2, tag, nesting) {
-  if (this.pending) {
-    this.pushPending();
-  }
-  const token = new token_default(type$2, tag, nesting);
-  let token_meta = null;
-  if (nesting < 0) {
-    this.level--;
-    this.delimiters = this._prev_delimiters.pop();
-  }
-  token.level = this.level;
-  if (nesting > 0) {
-    this.level++;
-    this._prev_delimiters.push(this.delimiters);
-    this.delimiters = [];
-    token_meta = { delimiters: this.delimiters };
-  }
-  this.pendingLevel = this.level;
-  this.tokens.push(token);
-  this.tokens_meta.push(token_meta);
-  return token;
+StateInline.prototype.push = function(type$2, tag, nesting) {
+	if (this.pending) {
+		this.pushPending();
+	}
+	const token = new token_default(type$2, tag, nesting);
+	let token_meta = null;
+	if (nesting < 0) {
+		this.level--;
+		this.delimiters = this._prev_delimiters.pop();
+	}
+	token.level = this.level;
+	if (nesting > 0) {
+		this.level++;
+		this._prev_delimiters.push(this.delimiters);
+		this.delimiters = [];
+		token_meta = { delimiters: this.delimiters };
+	}
+	this.pendingLevel = this.level;
+	this.tokens.push(token);
+	this.tokens_meta.push(token_meta);
+	return token;
 };
-StateInline.prototype.scanDelims = function (start, canSplitWord) {
-  const max = this.posMax;
-  const marker = this.src.charCodeAt(start);
-  const lastChar = start > 0 ? this.src.charCodeAt(start - 1) : 32;
-  let pos = start;
-  while (pos < max && this.src.charCodeAt(pos) === marker) {
-    pos++;
-  }
-  const count = pos - start;
-  const nextChar = pos < max ? this.src.charCodeAt(pos) : 32;
-  const isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
-  const isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
-  const isLastWhiteSpace = isWhiteSpace(lastChar);
-  const isNextWhiteSpace = isWhiteSpace(nextChar);
-  const left_flanking =
-    !isNextWhiteSpace && (!isNextPunctChar || isLastWhiteSpace || isLastPunctChar);
-  const right_flanking =
-    !isLastWhiteSpace && (!isLastPunctChar || isNextWhiteSpace || isNextPunctChar);
-  const can_open = left_flanking && (canSplitWord || !right_flanking || isLastPunctChar);
-  const can_close = right_flanking && (canSplitWord || !left_flanking || isNextPunctChar);
-  return {
-    can_open,
-    can_close,
-    length: count,
-  };
+StateInline.prototype.scanDelims = function(start, canSplitWord) {
+	const max = this.posMax;
+	const marker = this.src.charCodeAt(start);
+	const lastChar = start > 0 ? this.src.charCodeAt(start - 1) : 32;
+	let pos = start;
+	while (pos < max && this.src.charCodeAt(pos) === marker) {
+		pos++;
+	}
+	const count = pos - start;
+	const nextChar = pos < max ? this.src.charCodeAt(pos) : 32;
+	const isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
+	const isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
+	const isLastWhiteSpace = isWhiteSpace(lastChar);
+	const isNextWhiteSpace = isWhiteSpace(nextChar);
+	const left_flanking = !isNextWhiteSpace && (!isNextPunctChar || isLastWhiteSpace || isLastPunctChar);
+	const right_flanking = !isLastWhiteSpace && (!isLastPunctChar || isNextWhiteSpace || isNextPunctChar);
+	const can_open = left_flanking && (canSplitWord || !right_flanking || isLastPunctChar);
+	const can_close = right_flanking && (canSplitWord || !left_flanking || isNextPunctChar);
+	return {
+		can_open,
+		can_close,
+		length: count
+	};
 };
 StateInline.prototype.Token = token_default;
 var state_inline_default = StateInline;
 
 function isTerminatorChar(ch) {
-  switch (ch) {
-    case 10:
-    case 33:
-    case 35:
-    case 36:
-    case 37:
-    case 38:
-    case 42:
-    case 43:
-    case 45:
-    case 58:
-    case 60:
-    case 61:
-    case 62:
-    case 64:
-    case 91:
-    case 92:
-    case 93:
-    case 94:
-    case 95:
-    case 96:
-    case 123:
-    case 125:
-    case 126:
-      return true;
-    default:
-      return false;
-  }
+	switch (ch) {
+		case 10:
+		case 33:
+		case 35:
+		case 36:
+		case 37:
+		case 38:
+		case 42:
+		case 43:
+		case 45:
+		case 58:
+		case 60:
+		case 61:
+		case 62:
+		case 64:
+		case 91:
+		case 92:
+		case 93:
+		case 94:
+		case 95:
+		case 96:
+		case 123:
+		case 125:
+		case 126: return true;
+		default: return false;
+	}
 }
 function text(state, silent) {
-  let pos = state.pos;
-  while (pos < state.posMax && !isTerminatorChar(state.src.charCodeAt(pos))) {
-    pos++;
-  }
-  if (pos === state.pos) {
-    return false;
-  }
-  if (!silent) {
-    state.pending += state.src.slice(state.pos, pos);
-  }
-  state.pos = pos;
-  return true;
+	let pos = state.pos;
+	while (pos < state.posMax && !isTerminatorChar(state.src.charCodeAt(pos))) {
+		pos++;
+	}
+	if (pos === state.pos) {
+		return false;
+	}
+	if (!silent) {
+		state.pending += state.src.slice(state.pos, pos);
+	}
+	state.pos = pos;
+	return true;
 }
 
 const SCHEME_RE = /(?:^|[^a-z0-9.+-])([a-z][a-z0-9.+-]*)$/i;
 function linkify(state, silent) {
-  if (!state.md.options.linkify) return false;
-  if (state.linkLevel > 0) return false;
-  const pos = state.pos;
-  const max = state.posMax;
-  if (pos + 3 > max) return false;
-  if (state.src.charCodeAt(pos) !== 58) return false;
-  if (state.src.charCodeAt(pos + 1) !== 47) return false;
-  if (state.src.charCodeAt(pos + 2) !== 47) return false;
-  const match = state.pending.match(SCHEME_RE);
-  if (!match) return false;
-  const proto = match[1];
-  const link$1 = state.md.linkify.matchAtStart(state.src.slice(pos - proto.length));
-  if (!link$1) return false;
-  let url = link$1.url;
-  if (url.length <= proto.length) return false;
-  url = url.replace(/\*+$/, "");
-  const fullUrl = state.md.normalizeLink(url);
-  if (!state.md.validateLink(fullUrl)) return false;
-  if (!silent) {
-    state.pending = state.pending.slice(0, -proto.length);
-    const token_o = state.push("link_open", "a", 1);
-    token_o.attrs = [["href", fullUrl]];
-    token_o.markup = "linkify";
-    token_o.info = "auto";
-    const token_t = state.push("text", "", 0);
-    token_t.content = state.md.normalizeLinkText(url);
-    const token_c = state.push("link_close", "a", -1);
-    token_c.markup = "linkify";
-    token_c.info = "auto";
-  }
-  state.pos += url.length - proto.length;
-  return true;
+	if (!state.md.options.linkify) return false;
+	if (state.linkLevel > 0) return false;
+	const pos = state.pos;
+	const max = state.posMax;
+	if (pos + 3 > max) return false;
+	if (state.src.charCodeAt(pos) !== 58) return false;
+	if (state.src.charCodeAt(pos + 1) !== 47) return false;
+	if (state.src.charCodeAt(pos + 2) !== 47) return false;
+	const match = state.pending.match(SCHEME_RE);
+	if (!match) return false;
+	const proto = match[1];
+	const link$1 = state.md.linkify.matchAtStart(state.src.slice(pos - proto.length));
+	if (!link$1) return false;
+	let url = link$1.url;
+	if (url.length <= proto.length) return false;
+	url = url.replace(/\*+$/, "");
+	const fullUrl = state.md.normalizeLink(url);
+	if (!state.md.validateLink(fullUrl)) return false;
+	if (!silent) {
+		state.pending = state.pending.slice(0, -proto.length);
+		const token_o = state.push("link_open", "a", 1);
+		token_o.attrs = [["href", fullUrl]];
+		token_o.markup = "linkify";
+		token_o.info = "auto";
+		const token_t = state.push("text", "", 0);
+		token_t.content = state.md.normalizeLinkText(url);
+		const token_c = state.push("link_close", "a", -1);
+		token_c.markup = "linkify";
+		token_c.info = "auto";
+	}
+	state.pos += url.length - proto.length;
+	return true;
 }
 
 function newline(state, silent) {
-  let pos = state.pos;
-  if (state.src.charCodeAt(pos) !== 10) {
-    return false;
-  }
-  const pmax = state.pending.length - 1;
-  const max = state.posMax;
-  if (!silent) {
-    if (pmax >= 0 && state.pending.charCodeAt(pmax) === 32) {
-      if (pmax >= 1 && state.pending.charCodeAt(pmax - 1) === 32) {
-        let ws = pmax - 1;
-        while (ws >= 1 && state.pending.charCodeAt(ws - 1) === 32) ws--;
-        state.pending = state.pending.slice(0, ws);
-        state.push("hardbreak", "br", 0);
-      } else {
-        state.pending = state.pending.slice(0, -1);
-        state.push("softbreak", "br", 0);
-      }
-    } else {
-      state.push("softbreak", "br", 0);
-    }
-  }
-  pos++;
-  while (pos < max && isSpace(state.src.charCodeAt(pos))) {
-    pos++;
-  }
-  state.pos = pos;
-  return true;
+	let pos = state.pos;
+	if (state.src.charCodeAt(pos) !== 10) {
+		return false;
+	}
+	const pmax = state.pending.length - 1;
+	const max = state.posMax;
+	if (!silent) {
+		if (pmax >= 0 && state.pending.charCodeAt(pmax) === 32) {
+			if (pmax >= 1 && state.pending.charCodeAt(pmax - 1) === 32) {
+				let ws = pmax - 1;
+				while (ws >= 1 && state.pending.charCodeAt(ws - 1) === 32) ws--;
+				state.pending = state.pending.slice(0, ws);
+				state.push("hardbreak", "br", 0);
+			} else {
+				state.pending = state.pending.slice(0, -1);
+				state.push("softbreak", "br", 0);
+			}
+		} else {
+			state.push("softbreak", "br", 0);
+		}
+	}
+	pos++;
+	while (pos < max && isSpace(state.src.charCodeAt(pos))) {
+		pos++;
+	}
+	state.pos = pos;
+	return true;
 }
 
 const ESCAPED = [];
 for (let i$10 = 0; i$10 < 256; i$10++) {
-  ESCAPED.push(0);
+	ESCAPED.push(0);
 }
-"\\!\"#$%&'()*+,./:;<=>?@[]^_`{|}~-".split("").forEach(function (ch) {
-  ESCAPED[ch.charCodeAt(0)] = 1;
+"\\!\"#$%&'()*+,./:;<=>?@[]^_`{|}~-".split("").forEach(function(ch) {
+	ESCAPED[ch.charCodeAt(0)] = 1;
 });
 function escape(state, silent) {
-  let pos = state.pos;
-  const max = state.posMax;
-  if (state.src.charCodeAt(pos) !== 92) return false;
-  pos++;
-  if (pos >= max) return false;
-  let ch1 = state.src.charCodeAt(pos);
-  if (ch1 === 10) {
-    if (!silent) {
-      state.push("hardbreak", "br", 0);
-    }
-    pos++;
-    while (pos < max) {
-      ch1 = state.src.charCodeAt(pos);
-      if (!isSpace(ch1)) break;
-      pos++;
-    }
-    state.pos = pos;
-    return true;
-  }
-  let escapedStr = state.src[pos];
-  if (ch1 >= 55296 && ch1 <= 56319 && pos + 1 < max) {
-    const ch2 = state.src.charCodeAt(pos + 1);
-    if (ch2 >= 56320 && ch2 <= 57343) {
-      escapedStr += state.src[pos + 1];
-      pos++;
-    }
-  }
-  const origStr = "\\" + escapedStr;
-  if (!silent) {
-    const token = state.push("text_special", "", 0);
-    if (ch1 < 256 && ESCAPED[ch1] !== 0) {
-      token.content = escapedStr;
-    } else {
-      token.content = origStr;
-    }
-    token.markup = origStr;
-    token.info = "escape";
-  }
-  state.pos = pos + 1;
-  return true;
+	let pos = state.pos;
+	const max = state.posMax;
+	if (state.src.charCodeAt(pos) !== 92) return false;
+	pos++;
+	if (pos >= max) return false;
+	let ch1 = state.src.charCodeAt(pos);
+	if (ch1 === 10) {
+		if (!silent) {
+			state.push("hardbreak", "br", 0);
+		}
+		pos++;
+		while (pos < max) {
+			ch1 = state.src.charCodeAt(pos);
+			if (!isSpace(ch1)) break;
+			pos++;
+		}
+		state.pos = pos;
+		return true;
+	}
+	let escapedStr = state.src[pos];
+	if (ch1 >= 55296 && ch1 <= 56319 && pos + 1 < max) {
+		const ch2 = state.src.charCodeAt(pos + 1);
+		if (ch2 >= 56320 && ch2 <= 57343) {
+			escapedStr += state.src[pos + 1];
+			pos++;
+		}
+	}
+	const origStr = "\\" + escapedStr;
+	if (!silent) {
+		const token = state.push("text_special", "", 0);
+		if (ch1 < 256 && ESCAPED[ch1] !== 0) {
+			token.content = escapedStr;
+		} else {
+			token.content = origStr;
+		}
+		token.markup = origStr;
+		token.info = "escape";
+	}
+	state.pos = pos + 1;
+	return true;
 }
 
 function backtick(state, silent) {
-  let pos = state.pos;
-  const ch = state.src.charCodeAt(pos);
-  if (ch !== 96) {
-    return false;
-  }
-  const start = pos;
-  pos++;
-  const max = state.posMax;
-  while (pos < max && state.src.charCodeAt(pos) === 96) {
-    pos++;
-  }
-  const marker = state.src.slice(start, pos);
-  const openerLength = marker.length;
-  if (state.backticksScanned && (state.backticks[openerLength] || 0) <= start) {
-    if (!silent) state.pending += marker;
-    state.pos += openerLength;
-    return true;
-  }
-  let matchEnd = pos;
-  let matchStart;
-  while ((matchStart = state.src.indexOf("`", matchEnd)) !== -1) {
-    matchEnd = matchStart + 1;
-    while (matchEnd < max && state.src.charCodeAt(matchEnd) === 96) {
-      matchEnd++;
-    }
-    const closerLength = matchEnd - matchStart;
-    if (closerLength === openerLength) {
-      if (!silent) {
-        const token = state.push("code_inline", "code", 0);
-        token.markup = marker;
-        token.content = state.src
-          .slice(pos, matchStart)
-          .replace(/\n/g, " ")
-          .replace(/^ (.+) $/, "$1");
-      }
-      state.pos = matchEnd;
-      return true;
-    }
-    state.backticks[closerLength] = matchStart;
-  }
-  state.backticksScanned = true;
-  if (!silent) state.pending += marker;
-  state.pos += openerLength;
-  return true;
+	let pos = state.pos;
+	const ch = state.src.charCodeAt(pos);
+	if (ch !== 96) {
+		return false;
+	}
+	const start = pos;
+	pos++;
+	const max = state.posMax;
+	while (pos < max && state.src.charCodeAt(pos) === 96) {
+		pos++;
+	}
+	const marker = state.src.slice(start, pos);
+	const openerLength = marker.length;
+	if (state.backticksScanned && (state.backticks[openerLength] || 0) <= start) {
+		if (!silent) state.pending += marker;
+		state.pos += openerLength;
+		return true;
+	}
+	let matchEnd = pos;
+	let matchStart;
+	while ((matchStart = state.src.indexOf("`", matchEnd)) !== -1) {
+		matchEnd = matchStart + 1;
+		while (matchEnd < max && state.src.charCodeAt(matchEnd) === 96) {
+			matchEnd++;
+		}
+		const closerLength = matchEnd - matchStart;
+		if (closerLength === openerLength) {
+			if (!silent) {
+				const token = state.push("code_inline", "code", 0);
+				token.markup = marker;
+				token.content = state.src.slice(pos, matchStart).replace(/\n/g, " ").replace(/^ (.+) $/, "$1");
+			}
+			state.pos = matchEnd;
+			return true;
+		}
+		state.backticks[closerLength] = matchStart;
+	}
+	state.backticksScanned = true;
+	if (!silent) state.pending += marker;
+	state.pos += openerLength;
+	return true;
 }
 
 function strikethrough_tokenize(state, silent) {
-  const start = state.pos;
-  const marker = state.src.charCodeAt(start);
-  if (silent) {
-    return false;
-  }
-  if (marker !== 126) {
-    return false;
-  }
-  const scanned = state.scanDelims(state.pos, true);
-  let len = scanned.length;
-  const ch = String.fromCharCode(marker);
-  if (len < 2) {
-    return false;
-  }
-  let token;
-  if (len % 2) {
-    token = state.push("text", "", 0);
-    token.content = ch;
-    len--;
-  }
-  for (let i$10 = 0; i$10 < len; i$10 += 2) {
-    token = state.push("text", "", 0);
-    token.content = ch + ch;
-    state.delimiters.push({
-      marker,
-      length: 0,
-      token: state.tokens.length - 1,
-      end: -1,
-      open: scanned.can_open,
-      close: scanned.can_close,
-    });
-  }
-  state.pos += scanned.length;
-  return true;
+	const start = state.pos;
+	const marker = state.src.charCodeAt(start);
+	if (silent) {
+		return false;
+	}
+	if (marker !== 126) {
+		return false;
+	}
+	const scanned = state.scanDelims(state.pos, true);
+	let len = scanned.length;
+	const ch = String.fromCharCode(marker);
+	if (len < 2) {
+		return false;
+	}
+	let token;
+	if (len % 2) {
+		token = state.push("text", "", 0);
+		token.content = ch;
+		len--;
+	}
+	for (let i$10 = 0; i$10 < len; i$10 += 2) {
+		token = state.push("text", "", 0);
+		token.content = ch + ch;
+		state.delimiters.push({
+			marker,
+			length: 0,
+			token: state.tokens.length - 1,
+			end: -1,
+			open: scanned.can_open,
+			close: scanned.can_close
+		});
+	}
+	state.pos += scanned.length;
+	return true;
 }
 function postProcess$1(state, delimiters) {
-  let token;
-  const loneMarkers = [];
-  const max = delimiters.length;
-  for (let i$10 = 0; i$10 < max; i$10++) {
-    const startDelim = delimiters[i$10];
-    if (startDelim.marker !== 126) {
-      continue;
-    }
-    if (startDelim.end === -1) {
-      continue;
-    }
-    const endDelim = delimiters[startDelim.end];
-    token = state.tokens[startDelim.token];
-    token.type = "s_open";
-    token.tag = "s";
-    token.nesting = 1;
-    token.markup = "~~";
-    token.content = "";
-    token = state.tokens[endDelim.token];
-    token.type = "s_close";
-    token.tag = "s";
-    token.nesting = -1;
-    token.markup = "~~";
-    token.content = "";
-    if (
-      state.tokens[endDelim.token - 1].type === "text" &&
-      state.tokens[endDelim.token - 1].content === "~"
-    ) {
-      loneMarkers.push(endDelim.token - 1);
-    }
-  }
-  while (loneMarkers.length) {
-    const i$10 = loneMarkers.pop();
-    let j$2 = i$10 + 1;
-    while (j$2 < state.tokens.length && state.tokens[j$2].type === "s_close") {
-      j$2++;
-    }
-    j$2--;
-    if (i$10 !== j$2) {
-      token = state.tokens[j$2];
-      state.tokens[j$2] = state.tokens[i$10];
-      state.tokens[i$10] = token;
-    }
-  }
+	let token;
+	const loneMarkers = [];
+	const max = delimiters.length;
+	for (let i$10 = 0; i$10 < max; i$10++) {
+		const startDelim = delimiters[i$10];
+		if (startDelim.marker !== 126) {
+			continue;
+		}
+		if (startDelim.end === -1) {
+			continue;
+		}
+		const endDelim = delimiters[startDelim.end];
+		token = state.tokens[startDelim.token];
+		token.type = "s_open";
+		token.tag = "s";
+		token.nesting = 1;
+		token.markup = "~~";
+		token.content = "";
+		token = state.tokens[endDelim.token];
+		token.type = "s_close";
+		token.tag = "s";
+		token.nesting = -1;
+		token.markup = "~~";
+		token.content = "";
+		if (state.tokens[endDelim.token - 1].type === "text" && state.tokens[endDelim.token - 1].content === "~") {
+			loneMarkers.push(endDelim.token - 1);
+		}
+	}
+	while (loneMarkers.length) {
+		const i$10 = loneMarkers.pop();
+		let j$2 = i$10 + 1;
+		while (j$2 < state.tokens.length && state.tokens[j$2].type === "s_close") {
+			j$2++;
+		}
+		j$2--;
+		if (i$10 !== j$2) {
+			token = state.tokens[j$2];
+			state.tokens[j$2] = state.tokens[i$10];
+			state.tokens[i$10] = token;
+		}
+	}
 }
 function strikethrough_postProcess(state) {
-  const tokens_meta = state.tokens_meta;
-  const max = state.tokens_meta.length;
-  postProcess$1(state, state.delimiters);
-  for (let curr = 0; curr < max; curr++) {
-    if (tokens_meta[curr] && tokens_meta[curr].delimiters) {
-      postProcess$1(state, tokens_meta[curr].delimiters);
-    }
-  }
+	const tokens_meta = state.tokens_meta;
+	const max = state.tokens_meta.length;
+	postProcess$1(state, state.delimiters);
+	for (let curr = 0; curr < max; curr++) {
+		if (tokens_meta[curr] && tokens_meta[curr].delimiters) {
+			postProcess$1(state, tokens_meta[curr].delimiters);
+		}
+	}
 }
 var strikethrough_default = {
-  tokenize: strikethrough_tokenize,
-  postProcess: strikethrough_postProcess,
+	tokenize: strikethrough_tokenize,
+	postProcess: strikethrough_postProcess
 };
 
 function emphasis_tokenize(state, silent) {
-  const start = state.pos;
-  const marker = state.src.charCodeAt(start);
-  if (silent) {
-    return false;
-  }
-  if (marker !== 95 && marker !== 42) {
-    return false;
-  }
-  const scanned = state.scanDelims(state.pos, marker === 42);
-  for (let i$10 = 0; i$10 < scanned.length; i$10++) {
-    const token = state.push("text", "", 0);
-    token.content = String.fromCharCode(marker);
-    state.delimiters.push({
-      marker,
-      length: scanned.length,
-      token: state.tokens.length - 1,
-      end: -1,
-      open: scanned.can_open,
-      close: scanned.can_close,
-    });
-  }
-  state.pos += scanned.length;
-  return true;
+	const start = state.pos;
+	const marker = state.src.charCodeAt(start);
+	if (silent) {
+		return false;
+	}
+	if (marker !== 95 && marker !== 42) {
+		return false;
+	}
+	const scanned = state.scanDelims(state.pos, marker === 42);
+	for (let i$10 = 0; i$10 < scanned.length; i$10++) {
+		const token = state.push("text", "", 0);
+		token.content = String.fromCharCode(marker);
+		state.delimiters.push({
+			marker,
+			length: scanned.length,
+			token: state.tokens.length - 1,
+			end: -1,
+			open: scanned.can_open,
+			close: scanned.can_close
+		});
+	}
+	state.pos += scanned.length;
+	return true;
 }
 function postProcess(state, delimiters) {
-  const max = delimiters.length;
-  for (let i$10 = max - 1; i$10 >= 0; i$10--) {
-    const startDelim = delimiters[i$10];
-    if (startDelim.marker !== 95 && startDelim.marker !== 42) {
-      continue;
-    }
-    if (startDelim.end === -1) {
-      continue;
-    }
-    const endDelim = delimiters[startDelim.end];
-    const isStrong =
-      i$10 > 0 &&
-      delimiters[i$10 - 1].end === startDelim.end + 1 &&
-      delimiters[i$10 - 1].marker === startDelim.marker &&
-      delimiters[i$10 - 1].token === startDelim.token - 1 &&
-      delimiters[startDelim.end + 1].token === endDelim.token + 1;
-    const ch = String.fromCharCode(startDelim.marker);
-    const token_o = state.tokens[startDelim.token];
-    token_o.type = isStrong ? "strong_open" : "em_open";
-    token_o.tag = isStrong ? "strong" : "em";
-    token_o.nesting = 1;
-    token_o.markup = isStrong ? ch + ch : ch;
-    token_o.content = "";
-    const token_c = state.tokens[endDelim.token];
-    token_c.type = isStrong ? "strong_close" : "em_close";
-    token_c.tag = isStrong ? "strong" : "em";
-    token_c.nesting = -1;
-    token_c.markup = isStrong ? ch + ch : ch;
-    token_c.content = "";
-    if (isStrong) {
-      state.tokens[delimiters[i$10 - 1].token].content = "";
-      state.tokens[delimiters[startDelim.end + 1].token].content = "";
-      i$10--;
-    }
-  }
+	const max = delimiters.length;
+	for (let i$10 = max - 1; i$10 >= 0; i$10--) {
+		const startDelim = delimiters[i$10];
+		if (startDelim.marker !== 95 && startDelim.marker !== 42) {
+			continue;
+		}
+		if (startDelim.end === -1) {
+			continue;
+		}
+		const endDelim = delimiters[startDelim.end];
+		const isStrong = i$10 > 0 && delimiters[i$10 - 1].end === startDelim.end + 1 && delimiters[i$10 - 1].marker === startDelim.marker && delimiters[i$10 - 1].token === startDelim.token - 1 && delimiters[startDelim.end + 1].token === endDelim.token + 1;
+		const ch = String.fromCharCode(startDelim.marker);
+		const token_o = state.tokens[startDelim.token];
+		token_o.type = isStrong ? "strong_open" : "em_open";
+		token_o.tag = isStrong ? "strong" : "em";
+		token_o.nesting = 1;
+		token_o.markup = isStrong ? ch + ch : ch;
+		token_o.content = "";
+		const token_c = state.tokens[endDelim.token];
+		token_c.type = isStrong ? "strong_close" : "em_close";
+		token_c.tag = isStrong ? "strong" : "em";
+		token_c.nesting = -1;
+		token_c.markup = isStrong ? ch + ch : ch;
+		token_c.content = "";
+		if (isStrong) {
+			state.tokens[delimiters[i$10 - 1].token].content = "";
+			state.tokens[delimiters[startDelim.end + 1].token].content = "";
+			i$10--;
+		}
+	}
 }
 function emphasis_post_process(state) {
-  const tokens_meta = state.tokens_meta;
-  const max = state.tokens_meta.length;
-  postProcess(state, state.delimiters);
-  for (let curr = 0; curr < max; curr++) {
-    if (tokens_meta[curr] && tokens_meta[curr].delimiters) {
-      postProcess(state, tokens_meta[curr].delimiters);
-    }
-  }
+	const tokens_meta = state.tokens_meta;
+	const max = state.tokens_meta.length;
+	postProcess(state, state.delimiters);
+	for (let curr = 0; curr < max; curr++) {
+		if (tokens_meta[curr] && tokens_meta[curr].delimiters) {
+			postProcess(state, tokens_meta[curr].delimiters);
+		}
+	}
 }
 var emphasis_default = {
-  tokenize: emphasis_tokenize,
-  postProcess: emphasis_post_process,
+	tokenize: emphasis_tokenize,
+	postProcess: emphasis_post_process
 };
 
 function link(state, silent) {
-  let code$1, label, res, ref;
-  let href = "";
-  let title$1 = "";
-  let start = state.pos;
-  let parseReference = true;
-  if (state.src.charCodeAt(state.pos) !== 91) {
-    return false;
-  }
-  const oldPos = state.pos;
-  const max = state.posMax;
-  const labelStart = state.pos + 1;
-  const labelEnd = state.md.helpers.parseLinkLabel(state, state.pos, true);
-  if (labelEnd < 0) {
-    return false;
-  }
-  let pos = labelEnd + 1;
-  if (pos < max && state.src.charCodeAt(pos) === 40) {
-    parseReference = false;
-    pos++;
-    for (; pos < max; pos++) {
-      code$1 = state.src.charCodeAt(pos);
-      if (!isSpace(code$1) && code$1 !== 10) {
-        break;
-      }
-    }
-    if (pos >= max) {
-      return false;
-    }
-    start = pos;
-    res = state.md.helpers.parseLinkDestination(state.src, pos, state.posMax);
-    if (res.ok) {
-      href = state.md.normalizeLink(res.str);
-      if (state.md.validateLink(href)) {
-        pos = res.pos;
-      } else {
-        href = "";
-      }
-      start = pos;
-      for (; pos < max; pos++) {
-        code$1 = state.src.charCodeAt(pos);
-        if (!isSpace(code$1) && code$1 !== 10) {
-          break;
-        }
-      }
-      res = state.md.helpers.parseLinkTitle(state.src, pos, state.posMax);
-      if (pos < max && start !== pos && res.ok) {
-        title$1 = res.str;
-        pos = res.pos;
-        for (; pos < max; pos++) {
-          code$1 = state.src.charCodeAt(pos);
-          if (!isSpace(code$1) && code$1 !== 10) {
-            break;
-          }
-        }
-      }
-    }
-    if (pos >= max || state.src.charCodeAt(pos) !== 41) {
-      parseReference = true;
-    }
-    pos++;
-  }
-  if (parseReference) {
-    if (typeof state.env.references === "undefined") {
-      return false;
-    }
-    if (pos < max && state.src.charCodeAt(pos) === 91) {
-      start = pos + 1;
-      pos = state.md.helpers.parseLinkLabel(state, pos);
-      if (pos >= 0) {
-        label = state.src.slice(start, pos++);
-      } else {
-        pos = labelEnd + 1;
-      }
-    } else {
-      pos = labelEnd + 1;
-    }
-    if (!label) {
-      label = state.src.slice(labelStart, labelEnd);
-    }
-    ref = state.env.references[normalizeReference(label)];
-    if (!ref) {
-      state.pos = oldPos;
-      return false;
-    }
-    href = ref.href;
-    title$1 = ref.title;
-  }
-  if (!silent) {
-    state.pos = labelStart;
-    state.posMax = labelEnd;
-    const token_o = state.push("link_open", "a", 1);
-    const attrs = [["href", href]];
-    token_o.attrs = attrs;
-    if (title$1) {
-      attrs.push(["title", title$1]);
-    }
-    state.linkLevel++;
-    state.md.inline.tokenize(state);
-    state.linkLevel--;
-    state.push("link_close", "a", -1);
-  }
-  state.pos = pos;
-  state.posMax = max;
-  return true;
+	let code$1, label, res, ref;
+	let href = "";
+	let title$1 = "";
+	let start = state.pos;
+	let parseReference = true;
+	if (state.src.charCodeAt(state.pos) !== 91) {
+		return false;
+	}
+	const oldPos = state.pos;
+	const max = state.posMax;
+	const labelStart = state.pos + 1;
+	const labelEnd = state.md.helpers.parseLinkLabel(state, state.pos, true);
+	if (labelEnd < 0) {
+		return false;
+	}
+	let pos = labelEnd + 1;
+	if (pos < max && state.src.charCodeAt(pos) === 40) {
+		parseReference = false;
+		pos++;
+		for (; pos < max; pos++) {
+			code$1 = state.src.charCodeAt(pos);
+			if (!isSpace(code$1) && code$1 !== 10) {
+				break;
+			}
+		}
+		if (pos >= max) {
+			return false;
+		}
+		start = pos;
+		res = state.md.helpers.parseLinkDestination(state.src, pos, state.posMax);
+		if (res.ok) {
+			href = state.md.normalizeLink(res.str);
+			if (state.md.validateLink(href)) {
+				pos = res.pos;
+			} else {
+				href = "";
+			}
+			start = pos;
+			for (; pos < max; pos++) {
+				code$1 = state.src.charCodeAt(pos);
+				if (!isSpace(code$1) && code$1 !== 10) {
+					break;
+				}
+			}
+			res = state.md.helpers.parseLinkTitle(state.src, pos, state.posMax);
+			if (pos < max && start !== pos && res.ok) {
+				title$1 = res.str;
+				pos = res.pos;
+				for (; pos < max; pos++) {
+					code$1 = state.src.charCodeAt(pos);
+					if (!isSpace(code$1) && code$1 !== 10) {
+						break;
+					}
+				}
+			}
+		}
+		if (pos >= max || state.src.charCodeAt(pos) !== 41) {
+			parseReference = true;
+		}
+		pos++;
+	}
+	if (parseReference) {
+		if (typeof state.env.references === "undefined") {
+			return false;
+		}
+		if (pos < max && state.src.charCodeAt(pos) === 91) {
+			start = pos + 1;
+			pos = state.md.helpers.parseLinkLabel(state, pos);
+			if (pos >= 0) {
+				label = state.src.slice(start, pos++);
+			} else {
+				pos = labelEnd + 1;
+			}
+		} else {
+			pos = labelEnd + 1;
+		}
+		if (!label) {
+			label = state.src.slice(labelStart, labelEnd);
+		}
+		ref = state.env.references[normalizeReference(label)];
+		if (!ref) {
+			state.pos = oldPos;
+			return false;
+		}
+		href = ref.href;
+		title$1 = ref.title;
+	}
+	if (!silent) {
+		state.pos = labelStart;
+		state.posMax = labelEnd;
+		const token_o = state.push("link_open", "a", 1);
+		const attrs = [["href", href]];
+		token_o.attrs = attrs;
+		if (title$1) {
+			attrs.push(["title", title$1]);
+		}
+		state.linkLevel++;
+		state.md.inline.tokenize(state);
+		state.linkLevel--;
+		state.push("link_close", "a", -1);
+	}
+	state.pos = pos;
+	state.posMax = max;
+	return true;
 }
 
 function image(state, silent) {
-  let code$1, content, label, pos, ref, res, title$1, start;
-  let href = "";
-  const oldPos = state.pos;
-  const max = state.posMax;
-  if (state.src.charCodeAt(state.pos) !== 33) {
-    return false;
-  }
-  if (state.src.charCodeAt(state.pos + 1) !== 91) {
-    return false;
-  }
-  const labelStart = state.pos + 2;
-  const labelEnd = state.md.helpers.parseLinkLabel(state, state.pos + 1, false);
-  if (labelEnd < 0) {
-    return false;
-  }
-  pos = labelEnd + 1;
-  if (pos < max && state.src.charCodeAt(pos) === 40) {
-    pos++;
-    for (; pos < max; pos++) {
-      code$1 = state.src.charCodeAt(pos);
-      if (!isSpace(code$1) && code$1 !== 10) {
-        break;
-      }
-    }
-    if (pos >= max) {
-      return false;
-    }
-    start = pos;
-    res = state.md.helpers.parseLinkDestination(state.src, pos, state.posMax);
-    if (res.ok) {
-      href = state.md.normalizeLink(res.str);
-      if (state.md.validateLink(href)) {
-        pos = res.pos;
-      } else {
-        href = "";
-      }
-    }
-    start = pos;
-    for (; pos < max; pos++) {
-      code$1 = state.src.charCodeAt(pos);
-      if (!isSpace(code$1) && code$1 !== 10) {
-        break;
-      }
-    }
-    res = state.md.helpers.parseLinkTitle(state.src, pos, state.posMax);
-    if (pos < max && start !== pos && res.ok) {
-      title$1 = res.str;
-      pos = res.pos;
-      for (; pos < max; pos++) {
-        code$1 = state.src.charCodeAt(pos);
-        if (!isSpace(code$1) && code$1 !== 10) {
-          break;
-        }
-      }
-    } else {
-      title$1 = "";
-    }
-    if (pos >= max || state.src.charCodeAt(pos) !== 41) {
-      state.pos = oldPos;
-      return false;
-    }
-    pos++;
-  } else {
-    if (typeof state.env.references === "undefined") {
-      return false;
-    }
-    if (pos < max && state.src.charCodeAt(pos) === 91) {
-      start = pos + 1;
-      pos = state.md.helpers.parseLinkLabel(state, pos);
-      if (pos >= 0) {
-        label = state.src.slice(start, pos++);
-      } else {
-        pos = labelEnd + 1;
-      }
-    } else {
-      pos = labelEnd + 1;
-    }
-    if (!label) {
-      label = state.src.slice(labelStart, labelEnd);
-    }
-    ref = state.env.references[normalizeReference(label)];
-    if (!ref) {
-      state.pos = oldPos;
-      return false;
-    }
-    href = ref.href;
-    title$1 = ref.title;
-  }
-  if (!silent) {
-    content = state.src.slice(labelStart, labelEnd);
-    const tokens = [];
-    state.md.inline.parse(content, state.md, state.env, tokens);
-    const token = state.push("image", "img", 0);
-    const attrs = [
-      ["src", href],
-      ["alt", ""],
-    ];
-    token.attrs = attrs;
-    token.children = tokens;
-    token.content = content;
-    if (title$1) {
-      attrs.push(["title", title$1]);
-    }
-  }
-  state.pos = pos;
-  state.posMax = max;
-  return true;
+	let code$1, content, label, pos, ref, res, title$1, start;
+	let href = "";
+	const oldPos = state.pos;
+	const max = state.posMax;
+	if (state.src.charCodeAt(state.pos) !== 33) {
+		return false;
+	}
+	if (state.src.charCodeAt(state.pos + 1) !== 91) {
+		return false;
+	}
+	const labelStart = state.pos + 2;
+	const labelEnd = state.md.helpers.parseLinkLabel(state, state.pos + 1, false);
+	if (labelEnd < 0) {
+		return false;
+	}
+	pos = labelEnd + 1;
+	if (pos < max && state.src.charCodeAt(pos) === 40) {
+		pos++;
+		for (; pos < max; pos++) {
+			code$1 = state.src.charCodeAt(pos);
+			if (!isSpace(code$1) && code$1 !== 10) {
+				break;
+			}
+		}
+		if (pos >= max) {
+			return false;
+		}
+		start = pos;
+		res = state.md.helpers.parseLinkDestination(state.src, pos, state.posMax);
+		if (res.ok) {
+			href = state.md.normalizeLink(res.str);
+			if (state.md.validateLink(href)) {
+				pos = res.pos;
+			} else {
+				href = "";
+			}
+		}
+		start = pos;
+		for (; pos < max; pos++) {
+			code$1 = state.src.charCodeAt(pos);
+			if (!isSpace(code$1) && code$1 !== 10) {
+				break;
+			}
+		}
+		res = state.md.helpers.parseLinkTitle(state.src, pos, state.posMax);
+		if (pos < max && start !== pos && res.ok) {
+			title$1 = res.str;
+			pos = res.pos;
+			for (; pos < max; pos++) {
+				code$1 = state.src.charCodeAt(pos);
+				if (!isSpace(code$1) && code$1 !== 10) {
+					break;
+				}
+			}
+		} else {
+			title$1 = "";
+		}
+		if (pos >= max || state.src.charCodeAt(pos) !== 41) {
+			state.pos = oldPos;
+			return false;
+		}
+		pos++;
+	} else {
+		if (typeof state.env.references === "undefined") {
+			return false;
+		}
+		if (pos < max && state.src.charCodeAt(pos) === 91) {
+			start = pos + 1;
+			pos = state.md.helpers.parseLinkLabel(state, pos);
+			if (pos >= 0) {
+				label = state.src.slice(start, pos++);
+			} else {
+				pos = labelEnd + 1;
+			}
+		} else {
+			pos = labelEnd + 1;
+		}
+		if (!label) {
+			label = state.src.slice(labelStart, labelEnd);
+		}
+		ref = state.env.references[normalizeReference(label)];
+		if (!ref) {
+			state.pos = oldPos;
+			return false;
+		}
+		href = ref.href;
+		title$1 = ref.title;
+	}
+	if (!silent) {
+		content = state.src.slice(labelStart, labelEnd);
+		const tokens = [];
+		state.md.inline.parse(content, state.md, state.env, tokens);
+		const token = state.push("image", "img", 0);
+		const attrs = [["src", href], ["alt", ""]];
+		token.attrs = attrs;
+		token.children = tokens;
+		token.content = content;
+		if (title$1) {
+			attrs.push(["title", title$1]);
+		}
+	}
+	state.pos = pos;
+	state.posMax = max;
+	return true;
 }
 
-const EMAIL_RE =
-  /^([a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)$/;
+const EMAIL_RE = /^([a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)$/;
 const AUTOLINK_RE = /^([a-zA-Z][a-zA-Z0-9+.-]{1,31}):([^<>\x00-\x20]*)$/;
 function autolink(state, silent) {
-  let pos = state.pos;
-  if (state.src.charCodeAt(pos) !== 60) {
-    return false;
-  }
-  const start = state.pos;
-  const max = state.posMax;
-  for (;;) {
-    if (++pos >= max) return false;
-    const ch = state.src.charCodeAt(pos);
-    if (ch === 60) return false;
-    if (ch === 62) break;
-  }
-  const url = state.src.slice(start + 1, pos);
-  if (AUTOLINK_RE.test(url)) {
-    const fullUrl = state.md.normalizeLink(url);
-    if (!state.md.validateLink(fullUrl)) {
-      return false;
-    }
-    if (!silent) {
-      const token_o = state.push("link_open", "a", 1);
-      token_o.attrs = [["href", fullUrl]];
-      token_o.markup = "autolink";
-      token_o.info = "auto";
-      const token_t = state.push("text", "", 0);
-      token_t.content = state.md.normalizeLinkText(url);
-      const token_c = state.push("link_close", "a", -1);
-      token_c.markup = "autolink";
-      token_c.info = "auto";
-    }
-    state.pos += url.length + 2;
-    return true;
-  }
-  if (EMAIL_RE.test(url)) {
-    const fullUrl = state.md.normalizeLink("mailto:" + url);
-    if (!state.md.validateLink(fullUrl)) {
-      return false;
-    }
-    if (!silent) {
-      const token_o = state.push("link_open", "a", 1);
-      token_o.attrs = [["href", fullUrl]];
-      token_o.markup = "autolink";
-      token_o.info = "auto";
-      const token_t = state.push("text", "", 0);
-      token_t.content = state.md.normalizeLinkText(url);
-      const token_c = state.push("link_close", "a", -1);
-      token_c.markup = "autolink";
-      token_c.info = "auto";
-    }
-    state.pos += url.length + 2;
-    return true;
-  }
-  return false;
+	let pos = state.pos;
+	if (state.src.charCodeAt(pos) !== 60) {
+		return false;
+	}
+	const start = state.pos;
+	const max = state.posMax;
+	for (;;) {
+		if (++pos >= max) return false;
+		const ch = state.src.charCodeAt(pos);
+		if (ch === 60) return false;
+		if (ch === 62) break;
+	}
+	const url = state.src.slice(start + 1, pos);
+	if (AUTOLINK_RE.test(url)) {
+		const fullUrl = state.md.normalizeLink(url);
+		if (!state.md.validateLink(fullUrl)) {
+			return false;
+		}
+		if (!silent) {
+			const token_o = state.push("link_open", "a", 1);
+			token_o.attrs = [["href", fullUrl]];
+			token_o.markup = "autolink";
+			token_o.info = "auto";
+			const token_t = state.push("text", "", 0);
+			token_t.content = state.md.normalizeLinkText(url);
+			const token_c = state.push("link_close", "a", -1);
+			token_c.markup = "autolink";
+			token_c.info = "auto";
+		}
+		state.pos += url.length + 2;
+		return true;
+	}
+	if (EMAIL_RE.test(url)) {
+		const fullUrl = state.md.normalizeLink("mailto:" + url);
+		if (!state.md.validateLink(fullUrl)) {
+			return false;
+		}
+		if (!silent) {
+			const token_o = state.push("link_open", "a", 1);
+			token_o.attrs = [["href", fullUrl]];
+			token_o.markup = "autolink";
+			token_o.info = "auto";
+			const token_t = state.push("text", "", 0);
+			token_t.content = state.md.normalizeLinkText(url);
+			const token_c = state.push("link_close", "a", -1);
+			token_c.markup = "autolink";
+			token_c.info = "auto";
+		}
+		state.pos += url.length + 2;
+		return true;
+	}
+	return false;
 }
 
 function isLinkOpen(str) {
-  return /^<a[>\s]/i.test(str);
+	return /^<a[>\s]/i.test(str);
 }
 function isLinkClose(str) {
-  return /^<\/a\s*>/i.test(str);
+	return /^<\/a\s*>/i.test(str);
 }
 function isLetter(ch) {
-  const lc = ch | 32;
-  return lc >= 97 && lc <= 122;
+	const lc = ch | 32;
+	return lc >= 97 && lc <= 122;
 }
 function html_inline(state, silent) {
-  if (!state.md.options.html) {
-    return false;
-  }
-  const max = state.posMax;
-  const pos = state.pos;
-  if (state.src.charCodeAt(pos) !== 60 || pos + 2 >= max) {
-    return false;
-  }
-  const ch = state.src.charCodeAt(pos + 1);
-  if (ch !== 33 && ch !== 63 && ch !== 47 && !isLetter(ch)) {
-    return false;
-  }
-  const match = state.src.slice(pos).match(HTML_TAG_RE);
-  if (!match) {
-    return false;
-  }
-  if (!silent) {
-    const token = state.push("html_inline", "", 0);
-    token.content = match[0];
-    if (isLinkOpen(token.content)) state.linkLevel++;
-    if (isLinkClose(token.content)) state.linkLevel--;
-  }
-  state.pos += match[0].length;
-  return true;
+	if (!state.md.options.html) {
+		return false;
+	}
+	const max = state.posMax;
+	const pos = state.pos;
+	if (state.src.charCodeAt(pos) !== 60 || pos + 2 >= max) {
+		return false;
+	}
+	const ch = state.src.charCodeAt(pos + 1);
+	if (ch !== 33 && ch !== 63 && ch !== 47 && !isLetter(ch)) {
+		return false;
+	}
+	const match = state.src.slice(pos).match(HTML_TAG_RE);
+	if (!match) {
+		return false;
+	}
+	if (!silent) {
+		const token = state.push("html_inline", "", 0);
+		token.content = match[0];
+		if (isLinkOpen(token.content)) state.linkLevel++;
+		if (isLinkClose(token.content)) state.linkLevel--;
+	}
+	state.pos += match[0].length;
+	return true;
 }
 
 const DIGITAL_RE = /^&#((?:x[a-f0-9]{1,6}|[0-9]{1,7}));/i;
 const NAMED_RE = /^&([a-z][a-z0-9]{1,31});/i;
 function entity(state, silent) {
-  const pos = state.pos;
-  const max = state.posMax;
-  if (state.src.charCodeAt(pos) !== 38) return false;
-  if (pos + 1 >= max) return false;
-  const ch = state.src.charCodeAt(pos + 1);
-  if (ch === 35) {
-    const match = state.src.slice(pos).match(DIGITAL_RE);
-    if (match) {
-      if (!silent) {
-        const code$1 =
-          match[1][0].toLowerCase() === "x"
-            ? parseInt(match[1].slice(1), 16)
-            : parseInt(match[1], 10);
-        const token = state.push("text_special", "", 0);
-        token.content = isValidEntityCode(code$1) ? fromCodePoint(code$1) : fromCodePoint(65533);
-        token.markup = match[0];
-        token.info = "entity";
-      }
-      state.pos += match[0].length;
-      return true;
-    }
-  } else {
-    const match = state.src.slice(pos).match(NAMED_RE);
-    if (match) {
-      const decoded = decodeHTML(match[0]);
-      if (decoded !== match[0]) {
-        if (!silent) {
-          const token = state.push("text_special", "", 0);
-          token.content = decoded;
-          token.markup = match[0];
-          token.info = "entity";
-        }
-        state.pos += match[0].length;
-        return true;
-      }
-    }
-  }
-  return false;
+	const pos = state.pos;
+	const max = state.posMax;
+	if (state.src.charCodeAt(pos) !== 38) return false;
+	if (pos + 1 >= max) return false;
+	const ch = state.src.charCodeAt(pos + 1);
+	if (ch === 35) {
+		const match = state.src.slice(pos).match(DIGITAL_RE);
+		if (match) {
+			if (!silent) {
+				const code$1 = match[1][0].toLowerCase() === "x" ? parseInt(match[1].slice(1), 16) : parseInt(match[1], 10);
+				const token = state.push("text_special", "", 0);
+				token.content = isValidEntityCode(code$1) ? fromCodePoint(code$1) : fromCodePoint(65533);
+				token.markup = match[0];
+				token.info = "entity";
+			}
+			state.pos += match[0].length;
+			return true;
+		}
+	} else {
+		const match = state.src.slice(pos).match(NAMED_RE);
+		if (match) {
+			const decoded = decodeHTML(match[0]);
+			if (decoded !== match[0]) {
+				if (!silent) {
+					const token = state.push("text_special", "", 0);
+					token.content = decoded;
+					token.markup = match[0];
+					token.info = "entity";
+				}
+				state.pos += match[0].length;
+				return true;
+			}
+		}
+	}
+	return false;
 }
 
 function processDelimiters(delimiters) {
-  const openersBottom = {};
-  const max = delimiters.length;
-  if (!max) return;
-  let headerIdx = 0;
-  let lastTokenIdx = -2;
-  const jumps = [];
-  for (let closerIdx = 0; closerIdx < max; closerIdx++) {
-    const closer = delimiters[closerIdx];
-    jumps.push(0);
-    if (delimiters[headerIdx].marker !== closer.marker || lastTokenIdx !== closer.token - 1) {
-      headerIdx = closerIdx;
-    }
-    lastTokenIdx = closer.token;
-    closer.length = closer.length || 0;
-    if (!closer.close) continue;
-    if (!openersBottom.hasOwnProperty(closer.marker)) {
-      openersBottom[closer.marker] = [-1, -1, -1, -1, -1, -1];
-    }
-    const minOpenerIdx = openersBottom[closer.marker][(closer.open ? 3 : 0) + (closer.length % 3)];
-    let openerIdx = headerIdx - jumps[headerIdx] - 1;
-    let newMinOpenerIdx = openerIdx;
-    for (; openerIdx > minOpenerIdx; openerIdx -= jumps[openerIdx] + 1) {
-      const opener = delimiters[openerIdx];
-      if (opener.marker !== closer.marker) continue;
-      if (opener.open && opener.end < 0) {
-        let isOddMatch = false;
-        if (opener.close || closer.open) {
-          if ((opener.length + closer.length) % 3 === 0) {
-            if (opener.length % 3 !== 0 || closer.length % 3 !== 0) {
-              isOddMatch = true;
-            }
-          }
-        }
-        if (!isOddMatch) {
-          const lastJump =
-            openerIdx > 0 && !delimiters[openerIdx - 1].open ? jumps[openerIdx - 1] + 1 : 0;
-          jumps[closerIdx] = closerIdx - openerIdx + lastJump;
-          jumps[openerIdx] = lastJump;
-          closer.open = false;
-          opener.end = closerIdx;
-          opener.close = false;
-          newMinOpenerIdx = -1;
-          lastTokenIdx = -2;
-          break;
-        }
-      }
-    }
-    if (newMinOpenerIdx !== -1) {
-      openersBottom[closer.marker][(closer.open ? 3 : 0) + ((closer.length || 0) % 3)] =
-        newMinOpenerIdx;
-    }
-  }
+	const openersBottom = {};
+	const max = delimiters.length;
+	if (!max) return;
+	let headerIdx = 0;
+	let lastTokenIdx = -2;
+	const jumps = [];
+	for (let closerIdx = 0; closerIdx < max; closerIdx++) {
+		const closer = delimiters[closerIdx];
+		jumps.push(0);
+		if (delimiters[headerIdx].marker !== closer.marker || lastTokenIdx !== closer.token - 1) {
+			headerIdx = closerIdx;
+		}
+		lastTokenIdx = closer.token;
+		closer.length = closer.length || 0;
+		if (!closer.close) continue;
+		if (!openersBottom.hasOwnProperty(closer.marker)) {
+			openersBottom[closer.marker] = [
+				-1,
+				-1,
+				-1,
+				-1,
+				-1,
+				-1
+			];
+		}
+		const minOpenerIdx = openersBottom[closer.marker][(closer.open ? 3 : 0) + closer.length % 3];
+		let openerIdx = headerIdx - jumps[headerIdx] - 1;
+		let newMinOpenerIdx = openerIdx;
+		for (; openerIdx > minOpenerIdx; openerIdx -= jumps[openerIdx] + 1) {
+			const opener = delimiters[openerIdx];
+			if (opener.marker !== closer.marker) continue;
+			if (opener.open && opener.end < 0) {
+				let isOddMatch = false;
+				if (opener.close || closer.open) {
+					if ((opener.length + closer.length) % 3 === 0) {
+						if (opener.length % 3 !== 0 || closer.length % 3 !== 0) {
+							isOddMatch = true;
+						}
+					}
+				}
+				if (!isOddMatch) {
+					const lastJump = openerIdx > 0 && !delimiters[openerIdx - 1].open ? jumps[openerIdx - 1] + 1 : 0;
+					jumps[closerIdx] = closerIdx - openerIdx + lastJump;
+					jumps[openerIdx] = lastJump;
+					closer.open = false;
+					opener.end = closerIdx;
+					opener.close = false;
+					newMinOpenerIdx = -1;
+					lastTokenIdx = -2;
+					break;
+				}
+			}
+		}
+		if (newMinOpenerIdx !== -1) {
+			openersBottom[closer.marker][(closer.open ? 3 : 0) + (closer.length || 0) % 3] = newMinOpenerIdx;
+		}
+	}
 }
 function link_pairs(state) {
-  const tokens_meta = state.tokens_meta;
-  const max = state.tokens_meta.length;
-  processDelimiters(state.delimiters);
-  for (let curr = 0; curr < max; curr++) {
-    if (tokens_meta[curr] && tokens_meta[curr].delimiters) {
-      processDelimiters(tokens_meta[curr].delimiters);
-    }
-  }
+	const tokens_meta = state.tokens_meta;
+	const max = state.tokens_meta.length;
+	processDelimiters(state.delimiters);
+	for (let curr = 0; curr < max; curr++) {
+		if (tokens_meta[curr] && tokens_meta[curr].delimiters) {
+			processDelimiters(tokens_meta[curr].delimiters);
+		}
+	}
 }
 
 function fragments_join(state) {
-  let curr, last;
-  let level = 0;
-  const tokens = state.tokens;
-  const max = state.tokens.length;
-  for (curr = last = 0; curr < max; curr++) {
-    if (tokens[curr].nesting < 0) level--;
-    tokens[curr].level = level;
-    if (tokens[curr].nesting > 0) level++;
-    if (tokens[curr].type === "text" && curr + 1 < max && tokens[curr + 1].type === "text") {
-      tokens[curr + 1].content = tokens[curr].content + tokens[curr + 1].content;
-    } else {
-      if (curr !== last) {
-        tokens[last] = tokens[curr];
-      }
-      last++;
-    }
-  }
-  if (curr !== last) {
-    tokens.length = last;
-  }
+	let curr, last;
+	let level = 0;
+	const tokens = state.tokens;
+	const max = state.tokens.length;
+	for (curr = last = 0; curr < max; curr++) {
+		if (tokens[curr].nesting < 0) level--;
+		tokens[curr].level = level;
+		if (tokens[curr].nesting > 0) level++;
+		if (tokens[curr].type === "text" && curr + 1 < max && tokens[curr + 1].type === "text") {
+			tokens[curr + 1].content = tokens[curr].content + tokens[curr + 1].content;
+		} else {
+			if (curr !== last) {
+				tokens[last] = tokens[curr];
+			}
+			last++;
+		}
+	}
+	if (curr !== last) {
+		tokens.length = last;
+	}
 }
 
 /** internal
- * class ParserInline
- *
- * Tokenizes paragraph content.
- **/
+* class ParserInline
+*
+* Tokenizes paragraph content.
+**/
 const _rules = [
-  ["text", text],
-  ["linkify", linkify],
-  ["newline", newline],
-  ["escape", escape],
-  ["backticks", backtick],
-  ["strikethrough", strikethrough_default.tokenize],
-  ["emphasis", emphasis_default.tokenize],
-  ["link", link],
-  ["image", image],
-  ["autolink", autolink],
-  ["html_inline", html_inline],
-  ["entity", entity],
+	["text", text],
+	["linkify", linkify],
+	["newline", newline],
+	["escape", escape],
+	["backticks", backtick],
+	["strikethrough", strikethrough_default.tokenize],
+	["emphasis", emphasis_default.tokenize],
+	["link", link],
+	["image", image],
+	["autolink", autolink],
+	["html_inline", html_inline],
+	["entity", entity]
 ];
 const _rules2 = [
-  ["balance_pairs", link_pairs],
-  ["strikethrough", strikethrough_default.postProcess],
-  ["emphasis", emphasis_default.postProcess],
-  ["fragments_join", fragments_join],
+	["balance_pairs", link_pairs],
+	["strikethrough", strikethrough_default.postProcess],
+	["emphasis", emphasis_default.postProcess],
+	["fragments_join", fragments_join]
 ];
 /**
- * new ParserInline()
- **/
+* new ParserInline()
+**/
 function ParserInline() {
-  /**
-   * ParserInline#ruler -> Ruler
-   *
-   * [[Ruler]] instance. Keep configuration of inline rules.
-   **/
-  this.ruler = new ruler_default();
-  for (let i$10 = 0; i$10 < _rules.length; i$10++) {
-    this.ruler.push(_rules[i$10][0], _rules[i$10][1]);
-  }
-  /**
-   * ParserInline#ruler2 -> Ruler
-   *
-   * [[Ruler]] instance. Second ruler used for post-processing
-   * (e.g. in emphasis-like rules).
-   **/
-  this.ruler2 = new ruler_default();
-  for (let i$10 = 0; i$10 < _rules2.length; i$10++) {
-    this.ruler2.push(_rules2[i$10][0], _rules2[i$10][1]);
-  }
+	/**
+	* ParserInline#ruler -> Ruler
+	*
+	* [[Ruler]] instance. Keep configuration of inline rules.
+	**/
+	this.ruler = new ruler_default();
+	for (let i$10 = 0; i$10 < _rules.length; i$10++) {
+		this.ruler.push(_rules[i$10][0], _rules[i$10][1]);
+	}
+	/**
+	* ParserInline#ruler2 -> Ruler
+	*
+	* [[Ruler]] instance. Second ruler used for post-processing
+	* (e.g. in emphasis-like rules).
+	**/
+	this.ruler2 = new ruler_default();
+	for (let i$10 = 0; i$10 < _rules2.length; i$10++) {
+		this.ruler2.push(_rules2[i$10][0], _rules2[i$10][1]);
+	}
 }
-ParserInline.prototype.skipToken = function (state) {
-  const pos = state.pos;
-  const rules = this.ruler.getRules("");
-  const len = rules.length;
-  const maxNesting = state.md.options.maxNesting;
-  const cache = state.cache;
-  if (typeof cache[pos] !== "undefined") {
-    state.pos = cache[pos];
-    return;
-  }
-  let ok = false;
-  if (state.level < maxNesting) {
-    for (let i$10 = 0; i$10 < len; i$10++) {
-      state.level++;
-      ok = rules[i$10](state, true);
-      state.level--;
-      if (ok) {
-        if (pos >= state.pos) {
-          throw new Error("inline rule didn't increment state.pos");
-        }
-        break;
-      }
-    }
-  } else {
-    state.pos = state.posMax;
-  }
-  if (!ok) {
-    state.pos++;
-  }
-  cache[pos] = state.pos;
+ParserInline.prototype.skipToken = function(state) {
+	const pos = state.pos;
+	const rules = this.ruler.getRules("");
+	const len = rules.length;
+	const maxNesting = state.md.options.maxNesting;
+	const cache = state.cache;
+	if (typeof cache[pos] !== "undefined") {
+		state.pos = cache[pos];
+		return;
+	}
+	let ok = false;
+	if (state.level < maxNesting) {
+		for (let i$10 = 0; i$10 < len; i$10++) {
+			state.level++;
+			ok = rules[i$10](state, true);
+			state.level--;
+			if (ok) {
+				if (pos >= state.pos) {
+					throw new Error("inline rule didn't increment state.pos");
+				}
+				break;
+			}
+		}
+	} else {
+		state.pos = state.posMax;
+	}
+	if (!ok) {
+		state.pos++;
+	}
+	cache[pos] = state.pos;
 };
-ParserInline.prototype.tokenize = function (state) {
-  const rules = this.ruler.getRules("");
-  const len = rules.length;
-  const end = state.posMax;
-  const maxNesting = state.md.options.maxNesting;
-  while (state.pos < end) {
-    const prevPos = state.pos;
-    let ok = false;
-    if (state.level < maxNesting) {
-      for (let i$10 = 0; i$10 < len; i$10++) {
-        ok = rules[i$10](state, false);
-        if (ok) {
-          if (prevPos >= state.pos) {
-            throw new Error("inline rule didn't increment state.pos");
-          }
-          break;
-        }
-      }
-    }
-    if (ok) {
-      if (state.pos >= end) {
-        break;
-      }
-      continue;
-    }
-    state.pending += state.src[state.pos++];
-  }
-  if (state.pending) {
-    state.pushPending();
-  }
+ParserInline.prototype.tokenize = function(state) {
+	const rules = this.ruler.getRules("");
+	const len = rules.length;
+	const end = state.posMax;
+	const maxNesting = state.md.options.maxNesting;
+	while (state.pos < end) {
+		const prevPos = state.pos;
+		let ok = false;
+		if (state.level < maxNesting) {
+			for (let i$10 = 0; i$10 < len; i$10++) {
+				ok = rules[i$10](state, false);
+				if (ok) {
+					if (prevPos >= state.pos) {
+						throw new Error("inline rule didn't increment state.pos");
+					}
+					break;
+				}
+			}
+		}
+		if (ok) {
+			if (state.pos >= end) {
+				break;
+			}
+			continue;
+		}
+		state.pending += state.src[state.pos++];
+	}
+	if (state.pending) {
+		state.pushPending();
+	}
 };
 /**
- * ParserInline.parse(str, md, env, outTokens)
- *
- * Process input string and push inline tokens into `outTokens`
- **/
-ParserInline.prototype.parse = function (str, md, env, outTokens) {
-  const state = new this.State(str, md, env, outTokens);
-  this.tokenize(state);
-  const rules = this.ruler2.getRules("");
-  const len = rules.length;
-  for (let i$10 = 0; i$10 < len; i$10++) {
-    rules[i$10](state);
-  }
+* ParserInline.parse(str, md, env, outTokens)
+*
+* Process input string and push inline tokens into `outTokens`
+**/
+ParserInline.prototype.parse = function(str, md, env, outTokens) {
+	const state = new this.State(str, md, env, outTokens);
+	this.tokenize(state);
+	const rules = this.ruler2.getRules("");
+	const len = rules.length;
+	for (let i$10 = 0; i$10 < len; i$10++) {
+		rules[i$10](state);
+	}
 };
 ParserInline.prototype.State = state_inline_default;
 var parser_inline_default = ParserInline;
 
 function re_default(opts) {
-  const re = {};
-  opts = opts || {};
-  re.src_Any = regex_default$5.source;
-  re.src_Cc = regex_default$4.source;
-  re.src_Z = regex_default.source;
-  re.src_P = regex_default$2.source;
-  re.src_ZPCc = [re.src_Z, re.src_P, re.src_Cc].join("|");
-  re.src_ZCc = [re.src_Z, re.src_Cc].join("|");
-  const text_separators = "[><｜]";
-  re.src_pseudo_letter = "(?:(?!" + text_separators + "|" + re.src_ZPCc + ")" + re.src_Any + ")";
-  re.src_ip4 =
-    "(?:(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)";
-  re.src_auth = "(?:(?:(?!" + re.src_ZCc + "|[@/\\[\\]()]).)+@)?";
-  re.src_port = "(?::(?:6(?:[0-4]\\d{3}|5(?:[0-4]\\d{2}|5(?:[0-2]\\d|3[0-5])))|[1-5]?\\d{1,4}))?";
-  re.src_host_terminator =
-    "(?=$|" +
-    text_separators +
-    "|" +
-    re.src_ZPCc +
-    ")" +
-    "(?!" +
-    (opts["---"] ? "-(?!--)|" : "-|") +
-    "_|:\\d|\\.-|\\.(?!$|" +
-    re.src_ZPCc +
-    "))";
-  re.src_path =
-    "(?:" +
-    "[/?#]" +
-    "(?:" +
-    "(?!" +
-    re.src_ZCc +
-    "|" +
-    text_separators +
-    "|[()[\\]{}.,\"'?!\\-;]).|" +
-    "\\[(?:(?!" +
-    re.src_ZCc +
-    "|\\]).)*\\]|" +
-    "\\((?:(?!" +
-    re.src_ZCc +
-    "|[)]).)*\\)|" +
-    "\\{(?:(?!" +
-    re.src_ZCc +
-    "|[}]).)*\\}|" +
-    '\\"(?:(?!' +
-    re.src_ZCc +
-    '|["]).)+\\"|' +
-    "\\'(?:(?!" +
-    re.src_ZCc +
-    "|[']).)+\\'|" +
-    "\\'(?=" +
-    re.src_pseudo_letter +
-    "|[-])|" +
-    "\\.{2,}[a-zA-Z0-9%/&]|" +
-    "\\.(?!" +
-    re.src_ZCc +
-    "|[.]|$)|" +
-    (opts["---"] ? "\\-(?!--(?:[^-]|$))(?:-*)|" : "\\-+|") +
-    ",(?!" +
-    re.src_ZCc +
-    "|$)|" +
-    ";(?!" +
-    re.src_ZCc +
-    "|$)|" +
-    "\\!+(?!" +
-    re.src_ZCc +
-    "|[!]|$)|" +
-    "\\?(?!" +
-    re.src_ZCc +
-    "|[?]|$)" +
-    ")+" +
-    "|\\/" +
-    ")?";
-  re.src_email_name = '[\\-;:&=\\+\\$,\\.a-zA-Z0-9_][\\-;:&=\\+\\$,\\"\\.a-zA-Z0-9_]*';
-  re.src_xn = "xn--[a-z0-9\\-]{1,59}";
-  re.src_domain_root = "(?:" + re.src_xn + "|" + re.src_pseudo_letter + "{1,63}" + ")";
-  re.src_domain =
-    "(?:" +
-    re.src_xn +
-    "|" +
-    "(?:" +
-    re.src_pseudo_letter +
-    ")" +
-    "|" +
-    "(?:" +
-    re.src_pseudo_letter +
-    "(?:-|" +
-    re.src_pseudo_letter +
-    "){0,61}" +
-    re.src_pseudo_letter +
-    ")" +
-    ")";
-  re.src_host = "(?:" + "(?:(?:(?:" + re.src_domain + ")\\.)*" + re.src_domain + ")" + ")";
-  re.tpl_host_fuzzy =
-    "(?:" + re.src_ip4 + "|" + "(?:(?:(?:" + re.src_domain + ")\\.)+(?:%TLDS%))" + ")";
-  re.tpl_host_no_ip_fuzzy = "(?:(?:(?:" + re.src_domain + ")\\.)+(?:%TLDS%))";
-  re.src_host_strict = re.src_host + re.src_host_terminator;
-  re.tpl_host_fuzzy_strict = re.tpl_host_fuzzy + re.src_host_terminator;
-  re.src_host_port_strict = re.src_host + re.src_port + re.src_host_terminator;
-  re.tpl_host_port_fuzzy_strict = re.tpl_host_fuzzy + re.src_port + re.src_host_terminator;
-  re.tpl_host_port_no_ip_fuzzy_strict =
-    re.tpl_host_no_ip_fuzzy + re.src_port + re.src_host_terminator;
-  re.tpl_host_fuzzy_test =
-    "localhost|www\\.|\\.\\d{1,3}\\.|(?:\\.(?:%TLDS%)(?:" + re.src_ZPCc + "|>|$))";
-  re.tpl_email_fuzzy =
-    "(^|" +
-    text_separators +
-    '|"|\\(|' +
-    re.src_ZCc +
-    ")" +
-    "(" +
-    re.src_email_name +
-    "@" +
-    re.tpl_host_fuzzy_strict +
-    ")";
-  re.tpl_link_fuzzy =
-    "(^|(?![.:/\\-_@])(?:[$+<=>^`|｜]|" +
-    re.src_ZPCc +
-    "))" +
-    "((?![$+<=>^`|｜])" +
-    re.tpl_host_port_fuzzy_strict +
-    re.src_path +
-    ")";
-  re.tpl_link_no_ip_fuzzy =
-    "(^|(?![.:/\\-_@])(?:[$+<=>^`|｜]|" +
-    re.src_ZPCc +
-    "))" +
-    "((?![$+<=>^`|｜])" +
-    re.tpl_host_port_no_ip_fuzzy_strict +
-    re.src_path +
-    ")";
-  return re;
+	const re = {};
+	opts = opts || {};
+	re.src_Any = regex_default$5.source;
+	re.src_Cc = regex_default$4.source;
+	re.src_Z = regex_default.source;
+	re.src_P = regex_default$2.source;
+	re.src_ZPCc = [
+		re.src_Z,
+		re.src_P,
+		re.src_Cc
+	].join("|");
+	re.src_ZCc = [re.src_Z, re.src_Cc].join("|");
+	const text_separators = "[><｜]";
+	re.src_pseudo_letter = "(?:(?!" + text_separators + "|" + re.src_ZPCc + ")" + re.src_Any + ")";
+	re.src_ip4 = "(?:(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)";
+	re.src_auth = "(?:(?:(?!" + re.src_ZCc + "|[@/\\[\\]()]).)+@)?";
+	re.src_port = "(?::(?:6(?:[0-4]\\d{3}|5(?:[0-4]\\d{2}|5(?:[0-2]\\d|3[0-5])))|[1-5]?\\d{1,4}))?";
+	re.src_host_terminator = "(?=$|" + text_separators + "|" + re.src_ZPCc + ")" + "(?!" + (opts["---"] ? "-(?!--)|" : "-|") + "_|:\\d|\\.-|\\.(?!$|" + re.src_ZPCc + "))";
+	re.src_path = "(?:" + "[/?#]" + "(?:" + "(?!" + re.src_ZCc + "|" + text_separators + "|[()[\\]{}.,\"'?!\\-;]).|" + "\\[(?:(?!" + re.src_ZCc + "|\\]).)*\\]|" + "\\((?:(?!" + re.src_ZCc + "|[)]).)*\\)|" + "\\{(?:(?!" + re.src_ZCc + "|[}]).)*\\}|" + "\\\"(?:(?!" + re.src_ZCc + "|[\"]).)+\\\"|" + "\\'(?:(?!" + re.src_ZCc + "|[']).)+\\'|" + "\\'(?=" + re.src_pseudo_letter + "|[-])|" + "\\.{2,}[a-zA-Z0-9%/&]|" + "\\.(?!" + re.src_ZCc + "|[.]|$)|" + (opts["---"] ? "\\-(?!--(?:[^-]|$))(?:-*)|" : "\\-+|") + ",(?!" + re.src_ZCc + "|$)|" + ";(?!" + re.src_ZCc + "|$)|" + "\\!+(?!" + re.src_ZCc + "|[!]|$)|" + "\\?(?!" + re.src_ZCc + "|[?]|$)" + ")+" + "|\\/" + ")?";
+	re.src_email_name = "[\\-;:&=\\+\\$,\\.a-zA-Z0-9_][\\-;:&=\\+\\$,\\\"\\.a-zA-Z0-9_]*";
+	re.src_xn = "xn--[a-z0-9\\-]{1,59}";
+	re.src_domain_root = "(?:" + re.src_xn + "|" + re.src_pseudo_letter + "{1,63}" + ")";
+	re.src_domain = "(?:" + re.src_xn + "|" + "(?:" + re.src_pseudo_letter + ")" + "|" + "(?:" + re.src_pseudo_letter + "(?:-|" + re.src_pseudo_letter + "){0,61}" + re.src_pseudo_letter + ")" + ")";
+	re.src_host = "(?:" + "(?:(?:(?:" + re.src_domain + ")\\.)*" + re.src_domain + ")" + ")";
+	re.tpl_host_fuzzy = "(?:" + re.src_ip4 + "|" + "(?:(?:(?:" + re.src_domain + ")\\.)+(?:%TLDS%))" + ")";
+	re.tpl_host_no_ip_fuzzy = "(?:(?:(?:" + re.src_domain + ")\\.)+(?:%TLDS%))";
+	re.src_host_strict = re.src_host + re.src_host_terminator;
+	re.tpl_host_fuzzy_strict = re.tpl_host_fuzzy + re.src_host_terminator;
+	re.src_host_port_strict = re.src_host + re.src_port + re.src_host_terminator;
+	re.tpl_host_port_fuzzy_strict = re.tpl_host_fuzzy + re.src_port + re.src_host_terminator;
+	re.tpl_host_port_no_ip_fuzzy_strict = re.tpl_host_no_ip_fuzzy + re.src_port + re.src_host_terminator;
+	re.tpl_host_fuzzy_test = "localhost|www\\.|\\.\\d{1,3}\\.|(?:\\.(?:%TLDS%)(?:" + re.src_ZPCc + "|>|$))";
+	re.tpl_email_fuzzy = "(^|" + text_separators + "|\"|\\(|" + re.src_ZCc + ")" + "(" + re.src_email_name + "@" + re.tpl_host_fuzzy_strict + ")";
+	re.tpl_link_fuzzy = "(^|(?![.:/\\-_@])(?:[$+<=>^`|｜]|" + re.src_ZPCc + "))" + "((?![$+<=>^`|｜])" + re.tpl_host_port_fuzzy_strict + re.src_path + ")";
+	re.tpl_link_no_ip_fuzzy = "(^|(?![.:/\\-_@])(?:[$+<=>^`|｜]|" + re.src_ZPCc + "))" + "((?![$+<=>^`|｜])" + re.tpl_host_port_no_ip_fuzzy_strict + re.src_path + ")";
+	return re;
 }
 
 function assign(obj) {
-  const sources = Array.prototype.slice.call(arguments, 1);
-  sources.forEach(function (source) {
-    if (!source) {
-      return;
-    }
-    Object.keys(source).forEach(function (key) {
-      obj[key] = source[key];
-    });
-  });
-  return obj;
+	const sources = Array.prototype.slice.call(arguments, 1);
+	sources.forEach(function(source) {
+		if (!source) {
+			return;
+		}
+		Object.keys(source).forEach(function(key) {
+			obj[key] = source[key];
+		});
+	});
+	return obj;
 }
 function _class(obj) {
-  return Object.prototype.toString.call(obj);
+	return Object.prototype.toString.call(obj);
 }
 function isString(obj) {
-  return _class(obj) === "[object String]";
+	return _class(obj) === "[object String]";
 }
 function isObject(obj) {
-  return _class(obj) === "[object Object]";
+	return _class(obj) === "[object Object]";
 }
 function isRegExp(obj) {
-  return _class(obj) === "[object RegExp]";
+	return _class(obj) === "[object RegExp]";
 }
 function isFunction(obj) {
-  return _class(obj) === "[object Function]";
+	return _class(obj) === "[object Function]";
 }
 function escapeRE(str) {
-  return str.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&");
+	return str.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&");
 }
 const defaultOptions = {
-  fuzzyLink: true,
-  fuzzyEmail: true,
-  fuzzyIP: false,
+	fuzzyLink: true,
+	fuzzyEmail: true,
+	fuzzyIP: false
 };
 function isOptionsObj(obj) {
-  return Object.keys(obj || {}).reduce(function (acc, k$1) {
-    return acc || defaultOptions.hasOwnProperty(k$1);
-  }, false);
+	return Object.keys(obj || {}).reduce(function(acc, k$1) {
+		return acc || defaultOptions.hasOwnProperty(k$1);
+	}, false);
 }
 const defaultSchemas = {
-  "http:": {
-    validate: function (text$1, pos, self) {
-      const tail = text$1.slice(pos);
-      if (!self.re.http) {
-        self.re.http = new RegExp(
-          "^\\/\\/" + self.re.src_auth + self.re.src_host_port_strict + self.re.src_path,
-          "i",
-        );
-      }
-      if (self.re.http.test(tail)) {
-        return tail.match(self.re.http)[0].length;
-      }
-      return 0;
-    },
-  },
-  "https:": "http:",
-  "ftp:": "http:",
-  "//": {
-    validate: function (text$1, pos, self) {
-      const tail = text$1.slice(pos);
-      if (!self.re.no_http) {
-        self.re.no_http = new RegExp(
-          "^" +
-            self.re.src_auth +
-            "(?:localhost|(?:(?:" +
-            self.re.src_domain +
-            ")\\.)+" +
-            self.re.src_domain_root +
-            ")" +
-            self.re.src_port +
-            self.re.src_host_terminator +
-            self.re.src_path,
-          "i",
-        );
-      }
-      if (self.re.no_http.test(tail)) {
-        if (pos >= 3 && text$1[pos - 3] === ":") {
-          return 0;
-        }
-        if (pos >= 3 && text$1[pos - 3] === "/") {
-          return 0;
-        }
-        return tail.match(self.re.no_http)[0].length;
-      }
-      return 0;
-    },
-  },
-  "mailto:": {
-    validate: function (text$1, pos, self) {
-      const tail = text$1.slice(pos);
-      if (!self.re.mailto) {
-        self.re.mailto = new RegExp(
-          "^" + self.re.src_email_name + "@" + self.re.src_host_strict,
-          "i",
-        );
-      }
-      if (self.re.mailto.test(tail)) {
-        return tail.match(self.re.mailto)[0].length;
-      }
-      return 0;
-    },
-  },
+	"http:": { validate: function(text$1, pos, self) {
+		const tail = text$1.slice(pos);
+		if (!self.re.http) {
+			self.re.http = new RegExp("^\\/\\/" + self.re.src_auth + self.re.src_host_port_strict + self.re.src_path, "i");
+		}
+		if (self.re.http.test(tail)) {
+			return tail.match(self.re.http)[0].length;
+		}
+		return 0;
+	} },
+	"https:": "http:",
+	"ftp:": "http:",
+	"//": { validate: function(text$1, pos, self) {
+		const tail = text$1.slice(pos);
+		if (!self.re.no_http) {
+			self.re.no_http = new RegExp("^" + self.re.src_auth + "(?:localhost|(?:(?:" + self.re.src_domain + ")\\.)+" + self.re.src_domain_root + ")" + self.re.src_port + self.re.src_host_terminator + self.re.src_path, "i");
+		}
+		if (self.re.no_http.test(tail)) {
+			if (pos >= 3 && text$1[pos - 3] === ":") {
+				return 0;
+			}
+			if (pos >= 3 && text$1[pos - 3] === "/") {
+				return 0;
+			}
+			return tail.match(self.re.no_http)[0].length;
+		}
+		return 0;
+	} },
+	"mailto:": { validate: function(text$1, pos, self) {
+		const tail = text$1.slice(pos);
+		if (!self.re.mailto) {
+			self.re.mailto = new RegExp("^" + self.re.src_email_name + "@" + self.re.src_host_strict, "i");
+		}
+		if (self.re.mailto.test(tail)) {
+			return tail.match(self.re.mailto)[0].length;
+		}
+		return 0;
+	} }
 };
-const tlds_2ch_src_re =
-  "a[cdefgilmnoqrstuwxz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvwxyz]|d[ejkmoz]|e[cegrstu]|f[ijkmor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrstuvwxyz]|n[acefgilopruz]|om|p[aefghklmnrstwy]|qa|r[eosuw]|s[abcdeghijklmnortuvxyz]|t[cdfghjklmnortvwz]|u[agksyz]|v[aceginu]|w[fs]|y[et]|z[amw]";
-const tlds_default =
-  "biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф".split("|");
+const tlds_2ch_src_re = "a[cdefgilmnoqrstuwxz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvwxyz]|d[ejkmoz]|e[cegrstu]|f[ijkmor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrstuvwxyz]|n[acefgilopruz]|om|p[aefghklmnrstwy]|qa|r[eosuw]|s[abcdeghijklmnortuvxyz]|t[cdfghjklmnortvwz]|u[agksyz]|v[aceginu]|w[fs]|y[et]|z[amw]";
+const tlds_default = "biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф".split("|");
 function resetScanCache(self) {
-  self.__index__ = -1;
-  self.__text_cache__ = "";
+	self.__index__ = -1;
+	self.__text_cache__ = "";
 }
 function createValidator(re) {
-  return function (text$1, pos) {
-    const tail = text$1.slice(pos);
-    if (re.test(tail)) {
-      return tail.match(re)[0].length;
-    }
-    return 0;
-  };
+	return function(text$1, pos) {
+		const tail = text$1.slice(pos);
+		if (re.test(tail)) {
+			return tail.match(re)[0].length;
+		}
+		return 0;
+	};
 }
 function createNormalizer() {
-  return function (match, self) {
-    self.normalize(match);
-  };
+	return function(match, self) {
+		self.normalize(match);
+	};
 }
 function compile(self) {
-  const re = (self.re = re_default(self.__opts__));
-  const tlds = self.__tlds__.slice();
-  self.onCompile();
-  if (!self.__tlds_replaced__) {
-    tlds.push(tlds_2ch_src_re);
-  }
-  tlds.push(re.src_xn);
-  re.src_tlds = tlds.join("|");
-  function untpl(tpl) {
-    return tpl.replace("%TLDS%", re.src_tlds);
-  }
-  re.email_fuzzy = RegExp(untpl(re.tpl_email_fuzzy), "i");
-  re.link_fuzzy = RegExp(untpl(re.tpl_link_fuzzy), "i");
-  re.link_no_ip_fuzzy = RegExp(untpl(re.tpl_link_no_ip_fuzzy), "i");
-  re.host_fuzzy_test = RegExp(untpl(re.tpl_host_fuzzy_test), "i");
-  const aliases = [];
-  self.__compiled__ = {};
-  function schemaError(name, val) {
-    throw new Error('(LinkifyIt) Invalid schema "' + name + '": ' + val);
-  }
-  Object.keys(self.__schemas__).forEach(function (name) {
-    const val = self.__schemas__[name];
-    if (val === null) {
-      return;
-    }
-    const compiled = {
-      validate: null,
-      link: null,
-    };
-    self.__compiled__[name] = compiled;
-    if (isObject(val)) {
-      if (isRegExp(val.validate)) {
-        compiled.validate = createValidator(val.validate);
-      } else if (isFunction(val.validate)) {
-        compiled.validate = val.validate;
-      } else {
-        schemaError(name, val);
-      }
-      if (isFunction(val.normalize)) {
-        compiled.normalize = val.normalize;
-      } else if (!val.normalize) {
-        compiled.normalize = createNormalizer();
-      } else {
-        schemaError(name, val);
-      }
-      return;
-    }
-    if (isString(val)) {
-      aliases.push(name);
-      return;
-    }
-    schemaError(name, val);
-  });
-  aliases.forEach(function (alias) {
-    if (!self.__compiled__[self.__schemas__[alias]]) {
-      return;
-    }
-    self.__compiled__[alias].validate = self.__compiled__[self.__schemas__[alias]].validate;
-    self.__compiled__[alias].normalize = self.__compiled__[self.__schemas__[alias]].normalize;
-  });
-  self.__compiled__[""] = {
-    validate: null,
-    normalize: createNormalizer(),
-  };
-  const slist = Object.keys(self.__compiled__)
-    .filter(function (name) {
-      return name.length > 0 && self.__compiled__[name];
-    })
-    .map(escapeRE)
-    .join("|");
-  self.re.schema_test = RegExp("(^|(?!_)(?:[><｜]|" + re.src_ZPCc + "))(" + slist + ")", "i");
-  self.re.schema_search = RegExp("(^|(?!_)(?:[><｜]|" + re.src_ZPCc + "))(" + slist + ")", "ig");
-  self.re.schema_at_start = RegExp("^" + self.re.schema_search.source, "i");
-  self.re.pretest = RegExp(
-    "(" + self.re.schema_test.source + ")|(" + self.re.host_fuzzy_test.source + ")|@",
-    "i",
-  );
-  resetScanCache(self);
+	const re = self.re = re_default(self.__opts__);
+	const tlds = self.__tlds__.slice();
+	self.onCompile();
+	if (!self.__tlds_replaced__) {
+		tlds.push(tlds_2ch_src_re);
+	}
+	tlds.push(re.src_xn);
+	re.src_tlds = tlds.join("|");
+	function untpl(tpl) {
+		return tpl.replace("%TLDS%", re.src_tlds);
+	}
+	re.email_fuzzy = RegExp(untpl(re.tpl_email_fuzzy), "i");
+	re.link_fuzzy = RegExp(untpl(re.tpl_link_fuzzy), "i");
+	re.link_no_ip_fuzzy = RegExp(untpl(re.tpl_link_no_ip_fuzzy), "i");
+	re.host_fuzzy_test = RegExp(untpl(re.tpl_host_fuzzy_test), "i");
+	const aliases = [];
+	self.__compiled__ = {};
+	function schemaError(name, val) {
+		throw new Error("(LinkifyIt) Invalid schema \"" + name + "\": " + val);
+	}
+	Object.keys(self.__schemas__).forEach(function(name) {
+		const val = self.__schemas__[name];
+		if (val === null) {
+			return;
+		}
+		const compiled = {
+			validate: null,
+			link: null
+		};
+		self.__compiled__[name] = compiled;
+		if (isObject(val)) {
+			if (isRegExp(val.validate)) {
+				compiled.validate = createValidator(val.validate);
+			} else if (isFunction(val.validate)) {
+				compiled.validate = val.validate;
+			} else {
+				schemaError(name, val);
+			}
+			if (isFunction(val.normalize)) {
+				compiled.normalize = val.normalize;
+			} else if (!val.normalize) {
+				compiled.normalize = createNormalizer();
+			} else {
+				schemaError(name, val);
+			}
+			return;
+		}
+		if (isString(val)) {
+			aliases.push(name);
+			return;
+		}
+		schemaError(name, val);
+	});
+	aliases.forEach(function(alias) {
+		if (!self.__compiled__[self.__schemas__[alias]]) {
+			return;
+		}
+		self.__compiled__[alias].validate = self.__compiled__[self.__schemas__[alias]].validate;
+		self.__compiled__[alias].normalize = self.__compiled__[self.__schemas__[alias]].normalize;
+	});
+	self.__compiled__[""] = {
+		validate: null,
+		normalize: createNormalizer()
+	};
+	const slist = Object.keys(self.__compiled__).filter(function(name) {
+		return name.length > 0 && self.__compiled__[name];
+	}).map(escapeRE).join("|");
+	self.re.schema_test = RegExp("(^|(?!_)(?:[><｜]|" + re.src_ZPCc + "))(" + slist + ")", "i");
+	self.re.schema_search = RegExp("(^|(?!_)(?:[><｜]|" + re.src_ZPCc + "))(" + slist + ")", "ig");
+	self.re.schema_at_start = RegExp("^" + self.re.schema_search.source, "i");
+	self.re.pretest = RegExp("(" + self.re.schema_test.source + ")|(" + self.re.host_fuzzy_test.source + ")|@", "i");
+	resetScanCache(self);
 }
 /**
- * class Match
- *
- * Match result. Single element of array, returned by [[LinkifyIt#match]]
- **/
+* class Match
+*
+* Match result. Single element of array, returned by [[LinkifyIt#match]]
+**/
 function Match(self, shift) {
-  const start = self.__index__;
-  const end = self.__last_index__;
-  const text$1 = self.__text_cache__.slice(start, end);
-  /**
-   * Match#schema -> String
-   *
-   * Prefix (protocol) for matched string.
-   **/
-  this.schema = self.__schema__.toLowerCase();
-  /**
-   * Match#index -> Number
-   *
-   * First position of matched string.
-   **/
-  this.index = start + shift;
-  /**
-   * Match#lastIndex -> Number
-   *
-   * Next position after matched string.
-   **/
-  this.lastIndex = end + shift;
-  /**
-   * Match#raw -> String
-   *
-   * Matched string.
-   **/
-  this.raw = text$1;
-  /**
-   * Match#text -> String
-   *
-   * Notmalized text of matched string.
-   **/
-  this.text = text$1;
-  /**
-   * Match#url -> String
-   *
-   * Normalized url of matched string.
-   **/
-  this.url = text$1;
+	const start = self.__index__;
+	const end = self.__last_index__;
+	const text$1 = self.__text_cache__.slice(start, end);
+	/**
+	* Match#schema -> String
+	*
+	* Prefix (protocol) for matched string.
+	**/
+	this.schema = self.__schema__.toLowerCase();
+	/**
+	* Match#index -> Number
+	*
+	* First position of matched string.
+	**/
+	this.index = start + shift;
+	/**
+	* Match#lastIndex -> Number
+	*
+	* Next position after matched string.
+	**/
+	this.lastIndex = end + shift;
+	/**
+	* Match#raw -> String
+	*
+	* Matched string.
+	**/
+	this.raw = text$1;
+	/**
+	* Match#text -> String
+	*
+	* Notmalized text of matched string.
+	**/
+	this.text = text$1;
+	/**
+	* Match#url -> String
+	*
+	* Normalized url of matched string.
+	**/
+	this.url = text$1;
 }
 function createMatch(self, shift) {
-  const match = new Match(self, shift);
-  self.__compiled__[match.schema].normalize(match, self);
-  return match;
+	const match = new Match(self, shift);
+	self.__compiled__[match.schema].normalize(match, self);
+	return match;
 }
 /**
- * class LinkifyIt
- **/
+* class LinkifyIt
+**/
 /**
- * new LinkifyIt(schemas, options)
- * - schemas (Object): Optional. Additional schemas to validate (prefix/validator)
- * - options (Object): { fuzzyLink|fuzzyEmail|fuzzyIP: true|false }
- *
- * Creates new linkifier instance with optional additional schemas.
- * Can be called without `new` keyword for convenience.
- *
- * By default understands:
- *
- * - `http(s)://...` , `ftp://...`, `mailto:...` & `//...` links
- * - "fuzzy" links and emails (example.com, foo@bar.com).
- *
- * `schemas` is an object, where each key/value describes protocol/rule:
- *
- * - __key__ - link prefix (usually, protocol name with `:` at the end, `skype:`
- *   for example). `linkify-it` makes shure that prefix is not preceeded with
- *   alphanumeric char and symbols. Only whitespaces and punctuation allowed.
- * - __value__ - rule to check tail after link prefix
- *   - _String_ - just alias to existing rule
- *   - _Object_
- *     - _validate_ - validator function (should return matched length on success),
- *       or `RegExp`.
- *     - _normalize_ - optional function to normalize text & url of matched result
- *       (for example, for @twitter mentions).
- *
- * `options`:
- *
- * - __fuzzyLink__ - recognige URL-s without `http(s):` prefix. Default `true`.
- * - __fuzzyIP__ - allow IPs in fuzzy links above. Can conflict with some texts
- *   like version numbers. Default `false`.
- * - __fuzzyEmail__ - recognize emails without `mailto:` prefix.
- *
- **/
+* new LinkifyIt(schemas, options)
+* - schemas (Object): Optional. Additional schemas to validate (prefix/validator)
+* - options (Object): { fuzzyLink|fuzzyEmail|fuzzyIP: true|false }
+*
+* Creates new linkifier instance with optional additional schemas.
+* Can be called without `new` keyword for convenience.
+*
+* By default understands:
+*
+* - `http(s)://...` , `ftp://...`, `mailto:...` & `//...` links
+* - "fuzzy" links and emails (example.com, foo@bar.com).
+*
+* `schemas` is an object, where each key/value describes protocol/rule:
+*
+* - __key__ - link prefix (usually, protocol name with `:` at the end, `skype:`
+*   for example). `linkify-it` makes shure that prefix is not preceeded with
+*   alphanumeric char and symbols. Only whitespaces and punctuation allowed.
+* - __value__ - rule to check tail after link prefix
+*   - _String_ - just alias to existing rule
+*   - _Object_
+*     - _validate_ - validator function (should return matched length on success),
+*       or `RegExp`.
+*     - _normalize_ - optional function to normalize text & url of matched result
+*       (for example, for @twitter mentions).
+*
+* `options`:
+*
+* - __fuzzyLink__ - recognige URL-s without `http(s):` prefix. Default `true`.
+* - __fuzzyIP__ - allow IPs in fuzzy links above. Can conflict with some texts
+*   like version numbers. Default `false`.
+* - __fuzzyEmail__ - recognize emails without `mailto:` prefix.
+*
+**/
 function LinkifyIt(schemas, options) {
-  if (!(this instanceof LinkifyIt)) {
-    return new LinkifyIt(schemas, options);
-  }
-  if (!options) {
-    if (isOptionsObj(schemas)) {
-      options = schemas;
-      schemas = {};
-    }
-  }
-  this.__opts__ = assign({}, defaultOptions, options);
-  this.__index__ = -1;
-  this.__last_index__ = -1;
-  this.__schema__ = "";
-  this.__text_cache__ = "";
-  this.__schemas__ = assign({}, defaultSchemas, schemas);
-  this.__compiled__ = {};
-  this.__tlds__ = tlds_default;
-  this.__tlds_replaced__ = false;
-  this.re = {};
-  compile(this);
+	if (!(this instanceof LinkifyIt)) {
+		return new LinkifyIt(schemas, options);
+	}
+	if (!options) {
+		if (isOptionsObj(schemas)) {
+			options = schemas;
+			schemas = {};
+		}
+	}
+	this.__opts__ = assign({}, defaultOptions, options);
+	this.__index__ = -1;
+	this.__last_index__ = -1;
+	this.__schema__ = "";
+	this.__text_cache__ = "";
+	this.__schemas__ = assign({}, defaultSchemas, schemas);
+	this.__compiled__ = {};
+	this.__tlds__ = tlds_default;
+	this.__tlds_replaced__ = false;
+	this.re = {};
+	compile(this);
 }
 /** chainable
- * LinkifyIt#add(schema, definition)
- * - schema (String): rule name (fixed pattern prefix)
- * - definition (String|RegExp|Object): schema definition
- *
- * Add new rule definition. See constructor description for details.
- **/
+* LinkifyIt#add(schema, definition)
+* - schema (String): rule name (fixed pattern prefix)
+* - definition (String|RegExp|Object): schema definition
+*
+* Add new rule definition. See constructor description for details.
+**/
 LinkifyIt.prototype.add = function add(schema, definition) {
-  this.__schemas__[schema] = definition;
-  compile(this);
-  return this;
+	this.__schemas__[schema] = definition;
+	compile(this);
+	return this;
 };
 /** chainable
- * LinkifyIt#set(options)
- * - options (Object): { fuzzyLink|fuzzyEmail|fuzzyIP: true|false }
- *
- * Set recognition options for links without schema.
- **/
+* LinkifyIt#set(options)
+* - options (Object): { fuzzyLink|fuzzyEmail|fuzzyIP: true|false }
+*
+* Set recognition options for links without schema.
+**/
 LinkifyIt.prototype.set = function set(options) {
-  this.__opts__ = assign(this.__opts__, options);
-  return this;
+	this.__opts__ = assign(this.__opts__, options);
+	return this;
 };
 /**
- * LinkifyIt#test(text) -> Boolean
- *
- * Searches linkifiable pattern and returns `true` on success or `false` on fail.
- **/
+* LinkifyIt#test(text) -> Boolean
+*
+* Searches linkifiable pattern and returns `true` on success or `false` on fail.
+**/
 LinkifyIt.prototype.test = function test(text$1) {
-  this.__text_cache__ = text$1;
-  this.__index__ = -1;
-  if (!text$1.length) {
-    return false;
-  }
-  let m$3, ml, me, len, shift, next, re, tld_pos, at_pos;
-  if (this.re.schema_test.test(text$1)) {
-    re = this.re.schema_search;
-    re.lastIndex = 0;
-    while ((m$3 = re.exec(text$1)) !== null) {
-      len = this.testSchemaAt(text$1, m$3[2], re.lastIndex);
-      if (len) {
-        this.__schema__ = m$3[2];
-        this.__index__ = m$3.index + m$3[1].length;
-        this.__last_index__ = m$3.index + m$3[0].length + len;
-        break;
-      }
-    }
-  }
-  if (this.__opts__.fuzzyLink && this.__compiled__["http:"]) {
-    tld_pos = text$1.search(this.re.host_fuzzy_test);
-    if (tld_pos >= 0) {
-      if (this.__index__ < 0 || tld_pos < this.__index__) {
-        if (
-          (ml = text$1.match(
-            this.__opts__.fuzzyIP ? this.re.link_fuzzy : this.re.link_no_ip_fuzzy,
-          )) !== null
-        ) {
-          shift = ml.index + ml[1].length;
-          if (this.__index__ < 0 || shift < this.__index__) {
-            this.__schema__ = "";
-            this.__index__ = shift;
-            this.__last_index__ = ml.index + ml[0].length;
-          }
-        }
-      }
-    }
-  }
-  if (this.__opts__.fuzzyEmail && this.__compiled__["mailto:"]) {
-    at_pos = text$1.indexOf("@");
-    if (at_pos >= 0) {
-      if ((me = text$1.match(this.re.email_fuzzy)) !== null) {
-        shift = me.index + me[1].length;
-        next = me.index + me[0].length;
-        if (
-          this.__index__ < 0 ||
-          shift < this.__index__ ||
-          (shift === this.__index__ && next > this.__last_index__)
-        ) {
-          this.__schema__ = "mailto:";
-          this.__index__ = shift;
-          this.__last_index__ = next;
-        }
-      }
-    }
-  }
-  return this.__index__ >= 0;
+	this.__text_cache__ = text$1;
+	this.__index__ = -1;
+	if (!text$1.length) {
+		return false;
+	}
+	let m$3, ml, me, len, shift, next, re, tld_pos, at_pos;
+	if (this.re.schema_test.test(text$1)) {
+		re = this.re.schema_search;
+		re.lastIndex = 0;
+		while ((m$3 = re.exec(text$1)) !== null) {
+			len = this.testSchemaAt(text$1, m$3[2], re.lastIndex);
+			if (len) {
+				this.__schema__ = m$3[2];
+				this.__index__ = m$3.index + m$3[1].length;
+				this.__last_index__ = m$3.index + m$3[0].length + len;
+				break;
+			}
+		}
+	}
+	if (this.__opts__.fuzzyLink && this.__compiled__["http:"]) {
+		tld_pos = text$1.search(this.re.host_fuzzy_test);
+		if (tld_pos >= 0) {
+			if (this.__index__ < 0 || tld_pos < this.__index__) {
+				if ((ml = text$1.match(this.__opts__.fuzzyIP ? this.re.link_fuzzy : this.re.link_no_ip_fuzzy)) !== null) {
+					shift = ml.index + ml[1].length;
+					if (this.__index__ < 0 || shift < this.__index__) {
+						this.__schema__ = "";
+						this.__index__ = shift;
+						this.__last_index__ = ml.index + ml[0].length;
+					}
+				}
+			}
+		}
+	}
+	if (this.__opts__.fuzzyEmail && this.__compiled__["mailto:"]) {
+		at_pos = text$1.indexOf("@");
+		if (at_pos >= 0) {
+			if ((me = text$1.match(this.re.email_fuzzy)) !== null) {
+				shift = me.index + me[1].length;
+				next = me.index + me[0].length;
+				if (this.__index__ < 0 || shift < this.__index__ || shift === this.__index__ && next > this.__last_index__) {
+					this.__schema__ = "mailto:";
+					this.__index__ = shift;
+					this.__last_index__ = next;
+				}
+			}
+		}
+	}
+	return this.__index__ >= 0;
 };
 /**
- * LinkifyIt#pretest(text) -> Boolean
- *
- * Very quick check, that can give false positives. Returns true if link MAY BE
- * can exists. Can be used for speed optimization, when you need to check that
- * link NOT exists.
- **/
+* LinkifyIt#pretest(text) -> Boolean
+*
+* Very quick check, that can give false positives. Returns true if link MAY BE
+* can exists. Can be used for speed optimization, when you need to check that
+* link NOT exists.
+**/
 LinkifyIt.prototype.pretest = function pretest(text$1) {
-  return this.re.pretest.test(text$1);
+	return this.re.pretest.test(text$1);
 };
 /**
- * LinkifyIt#testSchemaAt(text, name, position) -> Number
- * - text (String): text to scan
- * - name (String): rule (schema) name
- * - position (Number): text offset to check from
- *
- * Similar to [[LinkifyIt#test]] but checks only specific protocol tail exactly
- * at given position. Returns length of found pattern (0 on fail).
- **/
+* LinkifyIt#testSchemaAt(text, name, position) -> Number
+* - text (String): text to scan
+* - name (String): rule (schema) name
+* - position (Number): text offset to check from
+*
+* Similar to [[LinkifyIt#test]] but checks only specific protocol tail exactly
+* at given position. Returns length of found pattern (0 on fail).
+**/
 LinkifyIt.prototype.testSchemaAt = function testSchemaAt(text$1, schema, pos) {
-  if (!this.__compiled__[schema.toLowerCase()]) {
-    return 0;
-  }
-  return this.__compiled__[schema.toLowerCase()].validate(text$1, pos, this);
+	if (!this.__compiled__[schema.toLowerCase()]) {
+		return 0;
+	}
+	return this.__compiled__[schema.toLowerCase()].validate(text$1, pos, this);
 };
 /**
- * LinkifyIt#match(text) -> Array|null
- *
- * Returns array of found link descriptions or `null` on fail. We strongly
- * recommend to use [[LinkifyIt#test]] first, for best speed.
- *
- * ##### Result match description
- *
- * - __schema__ - link schema, can be empty for fuzzy links, or `//` for
- *   protocol-neutral  links.
- * - __index__ - offset of matched text
- * - __lastIndex__ - index of next char after mathch end
- * - __raw__ - matched text
- * - __text__ - normalized text
- * - __url__ - link, generated from matched text
- **/
+* LinkifyIt#match(text) -> Array|null
+*
+* Returns array of found link descriptions or `null` on fail. We strongly
+* recommend to use [[LinkifyIt#test]] first, for best speed.
+*
+* ##### Result match description
+*
+* - __schema__ - link schema, can be empty for fuzzy links, or `//` for
+*   protocol-neutral  links.
+* - __index__ - offset of matched text
+* - __lastIndex__ - index of next char after mathch end
+* - __raw__ - matched text
+* - __text__ - normalized text
+* - __url__ - link, generated from matched text
+**/
 LinkifyIt.prototype.match = function match(text$1) {
-  const result = [];
-  let shift = 0;
-  if (this.__index__ >= 0 && this.__text_cache__ === text$1) {
-    result.push(createMatch(this, shift));
-    shift = this.__last_index__;
-  }
-  let tail = shift ? text$1.slice(shift) : text$1;
-  while (this.test(tail)) {
-    result.push(createMatch(this, shift));
-    tail = tail.slice(this.__last_index__);
-    shift += this.__last_index__;
-  }
-  if (result.length) {
-    return result;
-  }
-  return null;
+	const result = [];
+	let shift = 0;
+	if (this.__index__ >= 0 && this.__text_cache__ === text$1) {
+		result.push(createMatch(this, shift));
+		shift = this.__last_index__;
+	}
+	let tail = shift ? text$1.slice(shift) : text$1;
+	while (this.test(tail)) {
+		result.push(createMatch(this, shift));
+		tail = tail.slice(this.__last_index__);
+		shift += this.__last_index__;
+	}
+	if (result.length) {
+		return result;
+	}
+	return null;
 };
 /**
- * LinkifyIt#matchAtStart(text) -> Match|null
- *
- * Returns fully-formed (not fuzzy) link if it starts at the beginning
- * of the string, and null otherwise.
- **/
+* LinkifyIt#matchAtStart(text) -> Match|null
+*
+* Returns fully-formed (not fuzzy) link if it starts at the beginning
+* of the string, and null otherwise.
+**/
 LinkifyIt.prototype.matchAtStart = function matchAtStart(text$1) {
-  this.__text_cache__ = text$1;
-  this.__index__ = -1;
-  if (!text$1.length) return null;
-  const m$3 = this.re.schema_at_start.exec(text$1);
-  if (!m$3) return null;
-  const len = this.testSchemaAt(text$1, m$3[2], m$3[0].length);
-  if (!len) return null;
-  this.__schema__ = m$3[2];
-  this.__index__ = m$3.index + m$3[1].length;
-  this.__last_index__ = m$3.index + m$3[0].length + len;
-  return createMatch(this, 0);
+	this.__text_cache__ = text$1;
+	this.__index__ = -1;
+	if (!text$1.length) return null;
+	const m$3 = this.re.schema_at_start.exec(text$1);
+	if (!m$3) return null;
+	const len = this.testSchemaAt(text$1, m$3[2], m$3[0].length);
+	if (!len) return null;
+	this.__schema__ = m$3[2];
+	this.__index__ = m$3.index + m$3[1].length;
+	this.__last_index__ = m$3.index + m$3[0].length + len;
+	return createMatch(this, 0);
 };
 /** chainable
- * LinkifyIt#tlds(list [, keepOld]) -> this
- * - list (Array): list of tlds
- * - keepOld (Boolean): merge with current list if `true` (`false` by default)
- *
- * Load (or merge) new tlds list. Those are user for fuzzy links (without prefix)
- * to avoid false positives. By default this algorythm used:
- *
- * - hostname with any 2-letter root zones are ok.
- * - biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф
- *   are ok.
- * - encoded (`xn--...`) root zones are ok.
- *
- * If list is replaced, then exact match for 2-chars root zones will be checked.
- **/
+* LinkifyIt#tlds(list [, keepOld]) -> this
+* - list (Array): list of tlds
+* - keepOld (Boolean): merge with current list if `true` (`false` by default)
+*
+* Load (or merge) new tlds list. Those are user for fuzzy links (without prefix)
+* to avoid false positives. By default this algorythm used:
+*
+* - hostname with any 2-letter root zones are ok.
+* - biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф
+*   are ok.
+* - encoded (`xn--...`) root zones are ok.
+*
+* If list is replaced, then exact match for 2-chars root zones will be checked.
+**/
 LinkifyIt.prototype.tlds = function tlds(list$1, keepOld) {
-  list$1 = Array.isArray(list$1) ? list$1 : [list$1];
-  if (!keepOld) {
-    this.__tlds__ = list$1.slice();
-    this.__tlds_replaced__ = true;
-    compile(this);
-    return this;
-  }
-  this.__tlds__ = this.__tlds__
-    .concat(list$1)
-    .sort()
-    .filter(function (el, idx, arr) {
-      return el !== arr[idx - 1];
-    })
-    .reverse();
-  compile(this);
-  return this;
+	list$1 = Array.isArray(list$1) ? list$1 : [list$1];
+	if (!keepOld) {
+		this.__tlds__ = list$1.slice();
+		this.__tlds_replaced__ = true;
+		compile(this);
+		return this;
+	}
+	this.__tlds__ = this.__tlds__.concat(list$1).sort().filter(function(el, idx, arr) {
+		return el !== arr[idx - 1];
+	}).reverse();
+	compile(this);
+	return this;
 };
 /**
- * LinkifyIt#normalize(match)
- *
- * Default normalizer (if schema does not define it's own).
- **/
+* LinkifyIt#normalize(match)
+*
+* Default normalizer (if schema does not define it's own).
+**/
 LinkifyIt.prototype.normalize = function normalize$1(match) {
-  if (!match.schema) {
-    match.url = "http://" + match.url;
-  }
-  if (match.schema === "mailto:" && !/^mailto:/i.test(match.url)) {
-    match.url = "mailto:" + match.url;
-  }
+	if (!match.schema) {
+		match.url = "http://" + match.url;
+	}
+	if (match.schema === "mailto:" && !/^mailto:/i.test(match.url)) {
+		match.url = "mailto:" + match.url;
+	}
 };
 /**
- * LinkifyIt#onCompile()
- *
- * Override to modify basic RegExp-s.
- **/
+* LinkifyIt#onCompile()
+*
+* Override to modify basic RegExp-s.
+**/
 LinkifyIt.prototype.onCompile = function onCompile() {};
 var linkify_it_default = LinkifyIt;
 
@@ -17936,1180 +15820,1158 @@ const regexNonASCII = /[^\0-\x7F]/;
 const regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g;
 /** Error messages */
 const errors = {
-  overflow: "Overflow: input needs wider integers to process",
-  "not-basic": "Illegal input >= 0x80 (not a basic code point)",
-  "invalid-input": "Invalid input",
+	"overflow": "Overflow: input needs wider integers to process",
+	"not-basic": "Illegal input >= 0x80 (not a basic code point)",
+	"invalid-input": "Invalid input"
 };
 /** Convenience shortcuts */
 const baseMinusTMin = base - tMin;
 const floor = Math.floor;
 const stringFromCharCode = String.fromCharCode;
 /**
- * A generic error utility function.
- * @private
- * @param {String} type The error type.
- * @returns {Error} Throws a `RangeError` with the applicable error message.
- */
+* A generic error utility function.
+* @private
+* @param {String} type The error type.
+* @returns {Error} Throws a `RangeError` with the applicable error message.
+*/
 function error(type$2) {
-  throw new RangeError(errors[type$2]);
+	throw new RangeError(errors[type$2]);
 }
 /**
- * A generic `Array#map` utility function.
- * @private
- * @param {Array} array The array to iterate over.
- * @param {Function} callback The function that gets called for every array
- * item.
- * @returns {Array} A new array of values returned by the callback function.
- */
+* A generic `Array#map` utility function.
+* @private
+* @param {Array} array The array to iterate over.
+* @param {Function} callback The function that gets called for every array
+* item.
+* @returns {Array} A new array of values returned by the callback function.
+*/
 function map(array, callback) {
-  const result = [];
-  let length = array.length;
-  while (length--) {
-    result[length] = callback(array[length]);
-  }
-  return result;
+	const result = [];
+	let length = array.length;
+	while (length--) {
+		result[length] = callback(array[length]);
+	}
+	return result;
 }
 /**
- * A simple `Array#map`-like wrapper to work with domain name strings or email
- * addresses.
- * @private
- * @param {String} domain The domain name or email address.
- * @param {Function} callback The function that gets called for every
- * character.
- * @returns {String} A new string of characters returned by the callback
- * function.
- */
+* A simple `Array#map`-like wrapper to work with domain name strings or email
+* addresses.
+* @private
+* @param {String} domain The domain name or email address.
+* @param {Function} callback The function that gets called for every
+* character.
+* @returns {String} A new string of characters returned by the callback
+* function.
+*/
 function mapDomain(domain, callback) {
-  const parts = domain.split("@");
-  let result = "";
-  if (parts.length > 1) {
-    result = parts[0] + "@";
-    domain = parts[1];
-  }
-  domain = domain.replace(regexSeparators, ".");
-  const labels = domain.split(".");
-  const encoded = map(labels, callback).join(".");
-  return result + encoded;
+	const parts = domain.split("@");
+	let result = "";
+	if (parts.length > 1) {
+		result = parts[0] + "@";
+		domain = parts[1];
+	}
+	domain = domain.replace(regexSeparators, ".");
+	const labels = domain.split(".");
+	const encoded = map(labels, callback).join(".");
+	return result + encoded;
 }
 /**
- * Creates an array containing the numeric code points of each Unicode
- * character in the string. While JavaScript uses UCS-2 internally,
- * this function will convert a pair of surrogate halves (each of which
- * UCS-2 exposes as separate characters) into a single code point,
- * matching UTF-16.
- * @see `punycode.ucs2.encode`
- * @see <https://mathiasbynens.be/notes/javascript-encoding>
- * @memberOf punycode.ucs2
- * @name decode
- * @param {String} string The Unicode input string (UCS-2).
- * @returns {Array} The new array of code points.
- */
+* Creates an array containing the numeric code points of each Unicode
+* character in the string. While JavaScript uses UCS-2 internally,
+* this function will convert a pair of surrogate halves (each of which
+* UCS-2 exposes as separate characters) into a single code point,
+* matching UTF-16.
+* @see `punycode.ucs2.encode`
+* @see <https://mathiasbynens.be/notes/javascript-encoding>
+* @memberOf punycode.ucs2
+* @name decode
+* @param {String} string The Unicode input string (UCS-2).
+* @returns {Array} The new array of code points.
+*/
 function ucs2decode(string) {
-  const output = [];
-  let counter = 0;
-  const length = string.length;
-  while (counter < length) {
-    const value = string.charCodeAt(counter++);
-    if (value >= 55296 && value <= 56319 && counter < length) {
-      const extra = string.charCodeAt(counter++);
-      if ((extra & 64512) == 56320) {
-        output.push(((value & 1023) << 10) + (extra & 1023) + 65536);
-      } else {
-        output.push(value);
-        counter--;
-      }
-    } else {
-      output.push(value);
-    }
-  }
-  return output;
+	const output = [];
+	let counter = 0;
+	const length = string.length;
+	while (counter < length) {
+		const value = string.charCodeAt(counter++);
+		if (value >= 55296 && value <= 56319 && counter < length) {
+			const extra = string.charCodeAt(counter++);
+			if ((extra & 64512) == 56320) {
+				output.push(((value & 1023) << 10) + (extra & 1023) + 65536);
+			} else {
+				output.push(value);
+				counter--;
+			}
+		} else {
+			output.push(value);
+		}
+	}
+	return output;
 }
 /**
- * Creates a string based on an array of numeric code points.
- * @see `punycode.ucs2.decode`
- * @memberOf punycode.ucs2
- * @name encode
- * @param {Array} codePoints The array of numeric code points.
- * @returns {String} The new Unicode string (UCS-2).
- */
+* Creates a string based on an array of numeric code points.
+* @see `punycode.ucs2.decode`
+* @memberOf punycode.ucs2
+* @name encode
+* @param {Array} codePoints The array of numeric code points.
+* @returns {String} The new Unicode string (UCS-2).
+*/
 const ucs2encode = (codePoints) => String.fromCodePoint(...codePoints);
 /**
- * Converts a basic code point into a digit/integer.
- * @see `digitToBasic()`
- * @private
- * @param {Number} codePoint The basic numeric code point value.
- * @returns {Number} The numeric value of a basic code point (for use in
- * representing integers) in the range `0` to `base - 1`, or `base` if
- * the code point does not represent a value.
- */
-const basicToDigit = function (codePoint) {
-  if (codePoint >= 48 && codePoint < 58) {
-    return 26 + (codePoint - 48);
-  }
-  if (codePoint >= 65 && codePoint < 91) {
-    return codePoint - 65;
-  }
-  if (codePoint >= 97 && codePoint < 123) {
-    return codePoint - 97;
-  }
-  return base;
+* Converts a basic code point into a digit/integer.
+* @see `digitToBasic()`
+* @private
+* @param {Number} codePoint The basic numeric code point value.
+* @returns {Number} The numeric value of a basic code point (for use in
+* representing integers) in the range `0` to `base - 1`, or `base` if
+* the code point does not represent a value.
+*/
+const basicToDigit = function(codePoint) {
+	if (codePoint >= 48 && codePoint < 58) {
+		return 26 + (codePoint - 48);
+	}
+	if (codePoint >= 65 && codePoint < 91) {
+		return codePoint - 65;
+	}
+	if (codePoint >= 97 && codePoint < 123) {
+		return codePoint - 97;
+	}
+	return base;
 };
 /**
- * Converts a digit/integer into a basic code point.
- * @see `basicToDigit()`
- * @private
- * @param {Number} digit The numeric value of a basic code point.
- * @returns {Number} The basic code point whose value (when used for
- * representing integers) is `digit`, which needs to be in the range
- * `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
- * used; else, the lowercase form is used. The behavior is undefined
- * if `flag` is non-zero and `digit` has no uppercase form.
- */
-const digitToBasic = function (digit, flag) {
-  return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
+* Converts a digit/integer into a basic code point.
+* @see `basicToDigit()`
+* @private
+* @param {Number} digit The numeric value of a basic code point.
+* @returns {Number} The basic code point whose value (when used for
+* representing integers) is `digit`, which needs to be in the range
+* `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
+* used; else, the lowercase form is used. The behavior is undefined
+* if `flag` is non-zero and `digit` has no uppercase form.
+*/
+const digitToBasic = function(digit, flag) {
+	return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
 };
 /**
- * Bias adaptation function as per section 3.4 of RFC 3492.
- * https://tools.ietf.org/html/rfc3492#section-3.4
- * @private
- */
-const adapt = function (delta, numPoints, firstTime) {
-  let k$1 = 0;
-  delta = firstTime ? floor(delta / damp) : delta >> 1;
-  delta += floor(delta / numPoints);
-  for (; delta > (baseMinusTMin * tMax) >> 1; k$1 += base) {
-    delta = floor(delta / baseMinusTMin);
-  }
-  return floor(k$1 + ((baseMinusTMin + 1) * delta) / (delta + skew));
+* Bias adaptation function as per section 3.4 of RFC 3492.
+* https://tools.ietf.org/html/rfc3492#section-3.4
+* @private
+*/
+const adapt = function(delta, numPoints, firstTime) {
+	let k$1 = 0;
+	delta = firstTime ? floor(delta / damp) : delta >> 1;
+	delta += floor(delta / numPoints);
+	for (; delta > baseMinusTMin * tMax >> 1; k$1 += base) {
+		delta = floor(delta / baseMinusTMin);
+	}
+	return floor(k$1 + (baseMinusTMin + 1) * delta / (delta + skew));
 };
 /**
- * Converts a Punycode string of ASCII-only symbols to a string of Unicode
- * symbols.
- * @memberOf punycode
- * @param {String} input The Punycode string of ASCII-only symbols.
- * @returns {String} The resulting string of Unicode symbols.
- */
-const decode = function (input) {
-  const output = [];
-  const inputLength = input.length;
-  let i$10 = 0;
-  let n$13 = initialN;
-  let bias = initialBias;
-  let basic = input.lastIndexOf(delimiter);
-  if (basic < 0) {
-    basic = 0;
-  }
-  for (let j$2 = 0; j$2 < basic; ++j$2) {
-    if (input.charCodeAt(j$2) >= 128) {
-      error("not-basic");
-    }
-    output.push(input.charCodeAt(j$2));
-  }
-  for (let index = basic > 0 ? basic + 1 : 0; index < inputLength; ) {
-    const oldi = i$10;
-    for (let w$1 = 1, k$1 = base; ; k$1 += base) {
-      if (index >= inputLength) {
-        error("invalid-input");
-      }
-      const digit = basicToDigit(input.charCodeAt(index++));
-      if (digit >= base) {
-        error("invalid-input");
-      }
-      if (digit > floor((maxInt - i$10) / w$1)) {
-        error("overflow");
-      }
-      i$10 += digit * w$1;
-      const t$7 = k$1 <= bias ? tMin : k$1 >= bias + tMax ? tMax : k$1 - bias;
-      if (digit < t$7) {
-        break;
-      }
-      const baseMinusT = base - t$7;
-      if (w$1 > floor(maxInt / baseMinusT)) {
-        error("overflow");
-      }
-      w$1 *= baseMinusT;
-    }
-    const out = output.length + 1;
-    bias = adapt(i$10 - oldi, out, oldi == 0);
-    if (floor(i$10 / out) > maxInt - n$13) {
-      error("overflow");
-    }
-    n$13 += floor(i$10 / out);
-    i$10 %= out;
-    output.splice(i$10++, 0, n$13);
-  }
-  return String.fromCodePoint(...output);
+* Converts a Punycode string of ASCII-only symbols to a string of Unicode
+* symbols.
+* @memberOf punycode
+* @param {String} input The Punycode string of ASCII-only symbols.
+* @returns {String} The resulting string of Unicode symbols.
+*/
+const decode = function(input) {
+	const output = [];
+	const inputLength = input.length;
+	let i$10 = 0;
+	let n$13 = initialN;
+	let bias = initialBias;
+	let basic = input.lastIndexOf(delimiter);
+	if (basic < 0) {
+		basic = 0;
+	}
+	for (let j$2 = 0; j$2 < basic; ++j$2) {
+		if (input.charCodeAt(j$2) >= 128) {
+			error("not-basic");
+		}
+		output.push(input.charCodeAt(j$2));
+	}
+	for (let index = basic > 0 ? basic + 1 : 0; index < inputLength;) {
+		const oldi = i$10;
+		for (let w$1 = 1, k$1 = base;; k$1 += base) {
+			if (index >= inputLength) {
+				error("invalid-input");
+			}
+			const digit = basicToDigit(input.charCodeAt(index++));
+			if (digit >= base) {
+				error("invalid-input");
+			}
+			if (digit > floor((maxInt - i$10) / w$1)) {
+				error("overflow");
+			}
+			i$10 += digit * w$1;
+			const t$7 = k$1 <= bias ? tMin : k$1 >= bias + tMax ? tMax : k$1 - bias;
+			if (digit < t$7) {
+				break;
+			}
+			const baseMinusT = base - t$7;
+			if (w$1 > floor(maxInt / baseMinusT)) {
+				error("overflow");
+			}
+			w$1 *= baseMinusT;
+		}
+		const out = output.length + 1;
+		bias = adapt(i$10 - oldi, out, oldi == 0);
+		if (floor(i$10 / out) > maxInt - n$13) {
+			error("overflow");
+		}
+		n$13 += floor(i$10 / out);
+		i$10 %= out;
+		output.splice(i$10++, 0, n$13);
+	}
+	return String.fromCodePoint(...output);
 };
 /**
- * Converts a string of Unicode symbols (e.g. a domain name label) to a
- * Punycode string of ASCII-only symbols.
- * @memberOf punycode
- * @param {String} input The string of Unicode symbols.
- * @returns {String} The resulting Punycode string of ASCII-only symbols.
- */
-const encode = function (input) {
-  const output = [];
-  input = ucs2decode(input);
-  const inputLength = input.length;
-  let n$13 = initialN;
-  let delta = 0;
-  let bias = initialBias;
-  for (const currentValue of input) {
-    if (currentValue < 128) {
-      output.push(stringFromCharCode(currentValue));
-    }
-  }
-  const basicLength = output.length;
-  let handledCPCount = basicLength;
-  if (basicLength) {
-    output.push(delimiter);
-  }
-  while (handledCPCount < inputLength) {
-    let m$3 = maxInt;
-    for (const currentValue of input) {
-      if (currentValue >= n$13 && currentValue < m$3) {
-        m$3 = currentValue;
-      }
-    }
-    const handledCPCountPlusOne = handledCPCount + 1;
-    if (m$3 - n$13 > floor((maxInt - delta) / handledCPCountPlusOne)) {
-      error("overflow");
-    }
-    delta += (m$3 - n$13) * handledCPCountPlusOne;
-    n$13 = m$3;
-    for (const currentValue of input) {
-      if (currentValue < n$13 && ++delta > maxInt) {
-        error("overflow");
-      }
-      if (currentValue === n$13) {
-        let q = delta;
-        for (let k$1 = base; ; k$1 += base) {
-          const t$7 = k$1 <= bias ? tMin : k$1 >= bias + tMax ? tMax : k$1 - bias;
-          if (q < t$7) {
-            break;
-          }
-          const qMinusT = q - t$7;
-          const baseMinusT = base - t$7;
-          output.push(stringFromCharCode(digitToBasic(t$7 + (qMinusT % baseMinusT), 0)));
-          q = floor(qMinusT / baseMinusT);
-        }
-        output.push(stringFromCharCode(digitToBasic(q, 0)));
-        bias = adapt(delta, handledCPCountPlusOne, handledCPCount === basicLength);
-        delta = 0;
-        ++handledCPCount;
-      }
-    }
-    ++delta;
-    ++n$13;
-  }
-  return output.join("");
+* Converts a string of Unicode symbols (e.g. a domain name label) to a
+* Punycode string of ASCII-only symbols.
+* @memberOf punycode
+* @param {String} input The string of Unicode symbols.
+* @returns {String} The resulting Punycode string of ASCII-only symbols.
+*/
+const encode = function(input) {
+	const output = [];
+	input = ucs2decode(input);
+	const inputLength = input.length;
+	let n$13 = initialN;
+	let delta = 0;
+	let bias = initialBias;
+	for (const currentValue of input) {
+		if (currentValue < 128) {
+			output.push(stringFromCharCode(currentValue));
+		}
+	}
+	const basicLength = output.length;
+	let handledCPCount = basicLength;
+	if (basicLength) {
+		output.push(delimiter);
+	}
+	while (handledCPCount < inputLength) {
+		let m$3 = maxInt;
+		for (const currentValue of input) {
+			if (currentValue >= n$13 && currentValue < m$3) {
+				m$3 = currentValue;
+			}
+		}
+		const handledCPCountPlusOne = handledCPCount + 1;
+		if (m$3 - n$13 > floor((maxInt - delta) / handledCPCountPlusOne)) {
+			error("overflow");
+		}
+		delta += (m$3 - n$13) * handledCPCountPlusOne;
+		n$13 = m$3;
+		for (const currentValue of input) {
+			if (currentValue < n$13 && ++delta > maxInt) {
+				error("overflow");
+			}
+			if (currentValue === n$13) {
+				let q = delta;
+				for (let k$1 = base;; k$1 += base) {
+					const t$7 = k$1 <= bias ? tMin : k$1 >= bias + tMax ? tMax : k$1 - bias;
+					if (q < t$7) {
+						break;
+					}
+					const qMinusT = q - t$7;
+					const baseMinusT = base - t$7;
+					output.push(stringFromCharCode(digitToBasic(t$7 + qMinusT % baseMinusT, 0)));
+					q = floor(qMinusT / baseMinusT);
+				}
+				output.push(stringFromCharCode(digitToBasic(q, 0)));
+				bias = adapt(delta, handledCPCountPlusOne, handledCPCount === basicLength);
+				delta = 0;
+				++handledCPCount;
+			}
+		}
+		++delta;
+		++n$13;
+	}
+	return output.join("");
 };
 /**
- * Converts a Punycode string representing a domain name or an email address
- * to Unicode. Only the Punycoded parts of the input will be converted, i.e.
- * it doesn't matter if you call it on a string that has already been
- * converted to Unicode.
- * @memberOf punycode
- * @param {String} input The Punycoded domain name or email address to
- * convert to Unicode.
- * @returns {String} The Unicode representation of the given Punycode
- * string.
- */
-const toUnicode = function (input) {
-  return mapDomain(input, function (string) {
-    return regexPunycode.test(string) ? decode(string.slice(4).toLowerCase()) : string;
-  });
+* Converts a Punycode string representing a domain name or an email address
+* to Unicode. Only the Punycoded parts of the input will be converted, i.e.
+* it doesn't matter if you call it on a string that has already been
+* converted to Unicode.
+* @memberOf punycode
+* @param {String} input The Punycoded domain name or email address to
+* convert to Unicode.
+* @returns {String} The Unicode representation of the given Punycode
+* string.
+*/
+const toUnicode = function(input) {
+	return mapDomain(input, function(string) {
+		return regexPunycode.test(string) ? decode(string.slice(4).toLowerCase()) : string;
+	});
 };
 /**
- * Converts a Unicode string representing a domain name or an email address to
- * Punycode. Only the non-ASCII parts of the domain name will be converted,
- * i.e. it doesn't matter if you call it with a domain that's already in
- * ASCII.
- * @memberOf punycode
- * @param {String} input The domain name or email address to convert, as a
- * Unicode string.
- * @returns {String} The Punycode representation of the given domain name or
- * email address.
- */
-const toASCII = function (input) {
-  return mapDomain(input, function (string) {
-    return regexNonASCII.test(string) ? "xn--" + encode(string) : string;
-  });
+* Converts a Unicode string representing a domain name or an email address to
+* Punycode. Only the non-ASCII parts of the domain name will be converted,
+* i.e. it doesn't matter if you call it with a domain that's already in
+* ASCII.
+* @memberOf punycode
+* @param {String} input The domain name or email address to convert, as a
+* Unicode string.
+* @returns {String} The Punycode representation of the given domain name or
+* email address.
+*/
+const toASCII = function(input) {
+	return mapDomain(input, function(string) {
+		return regexNonASCII.test(string) ? "xn--" + encode(string) : string;
+	});
 };
 /** Define the public API */
 const punycode = {
-  version: "2.3.1",
-  ucs2: {
-    decode: ucs2decode,
-    encode: ucs2encode,
-  },
-  decode: decode,
-  encode: encode,
-  toASCII: toASCII,
-  toUnicode: toUnicode,
+	"version": "2.3.1",
+	"ucs2": {
+		"decode": ucs2decode,
+		"encode": ucs2encode
+	},
+	"decode": decode,
+	"encode": encode,
+	"toASCII": toASCII,
+	"toUnicode": toUnicode
 };
 var punycode_es6_default = punycode;
 
 var default_default = {
-  options: {
-    html: false,
-    xhtmlOut: false,
-    breaks: false,
-    langPrefix: "language-",
-    linkify: false,
-    typographer: false,
-    quotes: "“”‘’",
-    highlight: null,
-    maxNesting: 100,
-  },
-  components: {
-    core: {},
-    block: {},
-    inline: {},
-  },
+	options: {
+		html: false,
+		xhtmlOut: false,
+		breaks: false,
+		langPrefix: "language-",
+		linkify: false,
+		typographer: false,
+		quotes: "“”‘’",
+		highlight: null,
+		maxNesting: 100
+	},
+	components: {
+		core: {},
+		block: {},
+		inline: {}
+	}
 };
 
 var zero_default = {
-  options: {
-    html: false,
-    xhtmlOut: false,
-    breaks: false,
-    langPrefix: "language-",
-    linkify: false,
-    typographer: false,
-    quotes: "“”‘’",
-    highlight: null,
-    maxNesting: 20,
-  },
-  components: {
-    core: { rules: ["normalize", "block", "inline", "text_join"] },
-    block: { rules: ["paragraph"] },
-    inline: {
-      rules: ["text"],
-      rules2: ["balance_pairs", "fragments_join"],
-    },
-  },
+	options: {
+		html: false,
+		xhtmlOut: false,
+		breaks: false,
+		langPrefix: "language-",
+		linkify: false,
+		typographer: false,
+		quotes: "“”‘’",
+		highlight: null,
+		maxNesting: 20
+	},
+	components: {
+		core: { rules: [
+			"normalize",
+			"block",
+			"inline",
+			"text_join"
+		] },
+		block: { rules: ["paragraph"] },
+		inline: {
+			rules: ["text"],
+			rules2: ["balance_pairs", "fragments_join"]
+		}
+	}
 };
 
 var commonmark_default = {
-  options: {
-    html: true,
-    xhtmlOut: true,
-    breaks: false,
-    langPrefix: "language-",
-    linkify: false,
-    typographer: false,
-    quotes: "“”‘’",
-    highlight: null,
-    maxNesting: 20,
-  },
-  components: {
-    core: { rules: ["normalize", "block", "inline", "text_join"] },
-    block: {
-      rules: [
-        "blockquote",
-        "code",
-        "fence",
-        "heading",
-        "hr",
-        "html_block",
-        "lheading",
-        "list",
-        "reference",
-        "paragraph",
-      ],
-    },
-    inline: {
-      rules: [
-        "autolink",
-        "backticks",
-        "emphasis",
-        "entity",
-        "escape",
-        "html_inline",
-        "image",
-        "link",
-        "newline",
-        "text",
-      ],
-      rules2: ["balance_pairs", "emphasis", "fragments_join"],
-    },
-  },
+	options: {
+		html: true,
+		xhtmlOut: true,
+		breaks: false,
+		langPrefix: "language-",
+		linkify: false,
+		typographer: false,
+		quotes: "“”‘’",
+		highlight: null,
+		maxNesting: 20
+	},
+	components: {
+		core: { rules: [
+			"normalize",
+			"block",
+			"inline",
+			"text_join"
+		] },
+		block: { rules: [
+			"blockquote",
+			"code",
+			"fence",
+			"heading",
+			"hr",
+			"html_block",
+			"lheading",
+			"list",
+			"reference",
+			"paragraph"
+		] },
+		inline: {
+			rules: [
+				"autolink",
+				"backticks",
+				"emphasis",
+				"entity",
+				"escape",
+				"html_inline",
+				"image",
+				"link",
+				"newline",
+				"text"
+			],
+			rules2: [
+				"balance_pairs",
+				"emphasis",
+				"fragments_join"
+			]
+		}
+	}
 };
 
 const config = {
-  default: default_default,
-  zero: zero_default,
-  commonmark: commonmark_default,
+	default: default_default,
+	zero: zero_default,
+	commonmark: commonmark_default
 };
 const BAD_PROTO_RE = /^(vbscript|javascript|file|data):/;
 const GOOD_DATA_RE = /^data:image\/(gif|png|jpeg|webp);/;
 function validateLink(url) {
-  const str = url.trim().toLowerCase();
-  return BAD_PROTO_RE.test(str) ? GOOD_DATA_RE.test(str) : true;
+	const str = url.trim().toLowerCase();
+	return BAD_PROTO_RE.test(str) ? GOOD_DATA_RE.test(str) : true;
 }
-const RECODE_HOSTNAME_FOR = ["http:", "https:", "mailto:"];
+const RECODE_HOSTNAME_FOR = [
+	"http:",
+	"https:",
+	"mailto:"
+];
 function normalizeLink(url) {
-  const parsed = parse_default(url, true);
-  if (parsed.hostname) {
-    if (!parsed.protocol || RECODE_HOSTNAME_FOR.indexOf(parsed.protocol) >= 0) {
-      try {
-        parsed.hostname = punycode_es6_default.toASCII(parsed.hostname);
-      } catch (er) {}
-    }
-  }
-  return encode_default(format(parsed));
+	const parsed = parse_default(url, true);
+	if (parsed.hostname) {
+		if (!parsed.protocol || RECODE_HOSTNAME_FOR.indexOf(parsed.protocol) >= 0) {
+			try {
+				parsed.hostname = punycode_es6_default.toASCII(parsed.hostname);
+			} catch (er) {}
+		}
+	}
+	return encode_default(format(parsed));
 }
 function normalizeLinkText(url) {
-  const parsed = parse_default(url, true);
-  if (parsed.hostname) {
-    if (!parsed.protocol || RECODE_HOSTNAME_FOR.indexOf(parsed.protocol) >= 0) {
-      try {
-        parsed.hostname = punycode_es6_default.toUnicode(parsed.hostname);
-      } catch (er) {}
-    }
-  }
-  return decode_default(format(parsed), decode_default.defaultChars + "%");
+	const parsed = parse_default(url, true);
+	if (parsed.hostname) {
+		if (!parsed.protocol || RECODE_HOSTNAME_FOR.indexOf(parsed.protocol) >= 0) {
+			try {
+				parsed.hostname = punycode_es6_default.toUnicode(parsed.hostname);
+			} catch (er) {}
+		}
+	}
+	return decode_default(format(parsed), decode_default.defaultChars + "%");
 }
 /**
- * class MarkdownIt
- *
- * Main parser/renderer class.
- *
- * ##### Usage
- *
- * ```javascript
- * // node.js, "classic" way:
- * var MarkdownIt = require('markdown-it'),
- *     md = new MarkdownIt();
- * var result = md.render('# markdown-it rulezz!');
- *
- * // node.js, the same, but with sugar:
- * var md = require('markdown-it')();
- * var result = md.render('# markdown-it rulezz!');
- *
- * // browser without AMD, added to "window" on script load
- * // Note, there are no dash.
- * var md = window.markdownit();
- * var result = md.render('# markdown-it rulezz!');
- * ```
- *
- * Single line rendering, without paragraph wrap:
- *
- * ```javascript
- * var md = require('markdown-it')();
- * var result = md.renderInline('__markdown-it__ rulezz!');
- * ```
- **/
+* class MarkdownIt
+*
+* Main parser/renderer class.
+*
+* ##### Usage
+*
+* ```javascript
+* // node.js, "classic" way:
+* var MarkdownIt = require('markdown-it'),
+*     md = new MarkdownIt();
+* var result = md.render('# markdown-it rulezz!');
+*
+* // node.js, the same, but with sugar:
+* var md = require('markdown-it')();
+* var result = md.render('# markdown-it rulezz!');
+*
+* // browser without AMD, added to "window" on script load
+* // Note, there are no dash.
+* var md = window.markdownit();
+* var result = md.render('# markdown-it rulezz!');
+* ```
+*
+* Single line rendering, without paragraph wrap:
+*
+* ```javascript
+* var md = require('markdown-it')();
+* var result = md.renderInline('__markdown-it__ rulezz!');
+* ```
+**/
 /**
- * new MarkdownIt([presetName, options])
- * - presetName (String): optional, `commonmark` / `zero`
- * - options (Object)
- *
- * Creates parser instanse with given config. Can be called without `new`.
- *
- * ##### presetName
- *
- * MarkdownIt provides named presets as a convenience to quickly
- * enable/disable active syntax rules and options for common use cases.
- *
- * - ["commonmark"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/commonmark.mjs) -
- *   configures parser to strict [CommonMark](http://commonmark.org/) mode.
- * - [default](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/default.mjs) -
- *   similar to GFM, used when no preset name given. Enables all available rules,
- *   but still without html, typographer & autolinker.
- * - ["zero"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/zero.mjs) -
- *   all rules disabled. Useful to quickly setup your config via `.enable()`.
- *   For example, when you need only `bold` and `italic` markup and nothing else.
- *
- * ##### options:
- *
- * - __html__ - `false`. Set `true` to enable HTML tags in source. Be careful!
- *   That's not safe! You may need external sanitizer to protect output from XSS.
- *   It's better to extend features via plugins, instead of enabling HTML.
- * - __xhtmlOut__ - `false`. Set `true` to add '/' when closing single tags
- *   (`<br />`). This is needed only for full CommonMark compatibility. In real
- *   world you will need HTML output.
- * - __breaks__ - `false`. Set `true` to convert `\n` in paragraphs into `<br>`.
- * - __langPrefix__ - `language-`. CSS language class prefix for fenced blocks.
- *   Can be useful for external highlighters.
- * - __linkify__ - `false`. Set `true` to autoconvert URL-like text to links.
- * - __typographer__  - `false`. Set `true` to enable [some language-neutral
- *   replacement](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/replacements.mjs) +
- *   quotes beautification (smartquotes).
- * - __quotes__ - `“”‘’`, String or Array. Double + single quotes replacement
- *   pairs, when typographer enabled and smartquotes on. For example, you can
- *   use `'«»„“'` for Russian, `'„“‚‘'` for German, and
- *   `['«\xA0', '\xA0»', '‹\xA0', '\xA0›']` for French (including nbsp).
- * - __highlight__ - `null`. Highlighter function for fenced code blocks.
- *   Highlighter `function (str, lang)` should return escaped HTML. It can also
- *   return empty string if the source was not changed and should be escaped
- *   externaly. If result starts with <pre... internal wrapper is skipped.
- *
- * ##### Example
- *
- * ```javascript
- * // commonmark mode
- * var md = require('markdown-it')('commonmark');
- *
- * // default mode
- * var md = require('markdown-it')();
- *
- * // enable everything
- * var md = require('markdown-it')({
- *   html: true,
- *   linkify: true,
- *   typographer: true
- * });
- * ```
- *
- * ##### Syntax highlighting
- *
- * ```js
- * var hljs = require('highlight.js') // https://highlightjs.org/
- *
- * var md = require('markdown-it')({
- *   highlight: function (str, lang) {
- *     if (lang && hljs.getLanguage(lang)) {
- *       try {
- *         return hljs.highlight(str, { language: lang, ignoreIllegals: true }).value;
- *       } catch (__) {}
- *     }
- *
- *     return ''; // use external default escaping
- *   }
- * });
- * ```
- *
- * Or with full wrapper override (if you need assign class to `<pre>` or `<code>`):
- *
- * ```javascript
- * var hljs = require('highlight.js') // https://highlightjs.org/
- *
- * // Actual default values
- * var md = require('markdown-it')({
- *   highlight: function (str, lang) {
- *     if (lang && hljs.getLanguage(lang)) {
- *       try {
- *         return '<pre><code class="hljs">' +
- *                hljs.highlight(str, { language: lang, ignoreIllegals: true }).value +
- *                '</code></pre>';
- *       } catch (__) {}
- *     }
- *
- *     return '<pre><code class="hljs">' + md.utils.escapeHtml(str) + '</code></pre>';
- *   }
- * });
- * ```
- *
- **/
+* new MarkdownIt([presetName, options])
+* - presetName (String): optional, `commonmark` / `zero`
+* - options (Object)
+*
+* Creates parser instanse with given config. Can be called without `new`.
+*
+* ##### presetName
+*
+* MarkdownIt provides named presets as a convenience to quickly
+* enable/disable active syntax rules and options for common use cases.
+*
+* - ["commonmark"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/commonmark.mjs) -
+*   configures parser to strict [CommonMark](http://commonmark.org/) mode.
+* - [default](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/default.mjs) -
+*   similar to GFM, used when no preset name given. Enables all available rules,
+*   but still without html, typographer & autolinker.
+* - ["zero"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/zero.mjs) -
+*   all rules disabled. Useful to quickly setup your config via `.enable()`.
+*   For example, when you need only `bold` and `italic` markup and nothing else.
+*
+* ##### options:
+*
+* - __html__ - `false`. Set `true` to enable HTML tags in source. Be careful!
+*   That's not safe! You may need external sanitizer to protect output from XSS.
+*   It's better to extend features via plugins, instead of enabling HTML.
+* - __xhtmlOut__ - `false`. Set `true` to add '/' when closing single tags
+*   (`<br />`). This is needed only for full CommonMark compatibility. In real
+*   world you will need HTML output.
+* - __breaks__ - `false`. Set `true` to convert `\n` in paragraphs into `<br>`.
+* - __langPrefix__ - `language-`. CSS language class prefix for fenced blocks.
+*   Can be useful for external highlighters.
+* - __linkify__ - `false`. Set `true` to autoconvert URL-like text to links.
+* - __typographer__  - `false`. Set `true` to enable [some language-neutral
+*   replacement](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/replacements.mjs) +
+*   quotes beautification (smartquotes).
+* - __quotes__ - `“”‘’`, String or Array. Double + single quotes replacement
+*   pairs, when typographer enabled and smartquotes on. For example, you can
+*   use `'«»„“'` for Russian, `'„“‚‘'` for German, and
+*   `['«\xA0', '\xA0»', '‹\xA0', '\xA0›']` for French (including nbsp).
+* - __highlight__ - `null`. Highlighter function for fenced code blocks.
+*   Highlighter `function (str, lang)` should return escaped HTML. It can also
+*   return empty string if the source was not changed and should be escaped
+*   externaly. If result starts with <pre... internal wrapper is skipped.
+*
+* ##### Example
+*
+* ```javascript
+* // commonmark mode
+* var md = require('markdown-it')('commonmark');
+*
+* // default mode
+* var md = require('markdown-it')();
+*
+* // enable everything
+* var md = require('markdown-it')({
+*   html: true,
+*   linkify: true,
+*   typographer: true
+* });
+* ```
+*
+* ##### Syntax highlighting
+*
+* ```js
+* var hljs = require('highlight.js') // https://highlightjs.org/
+*
+* var md = require('markdown-it')({
+*   highlight: function (str, lang) {
+*     if (lang && hljs.getLanguage(lang)) {
+*       try {
+*         return hljs.highlight(str, { language: lang, ignoreIllegals: true }).value;
+*       } catch (__) {}
+*     }
+*
+*     return ''; // use external default escaping
+*   }
+* });
+* ```
+*
+* Or with full wrapper override (if you need assign class to `<pre>` or `<code>`):
+*
+* ```javascript
+* var hljs = require('highlight.js') // https://highlightjs.org/
+*
+* // Actual default values
+* var md = require('markdown-it')({
+*   highlight: function (str, lang) {
+*     if (lang && hljs.getLanguage(lang)) {
+*       try {
+*         return '<pre><code class="hljs">' +
+*                hljs.highlight(str, { language: lang, ignoreIllegals: true }).value +
+*                '</code></pre>';
+*       } catch (__) {}
+*     }
+*
+*     return '<pre><code class="hljs">' + md.utils.escapeHtml(str) + '</code></pre>';
+*   }
+* });
+* ```
+*
+**/
 function MarkdownIt(presetName, options) {
-  if (!(this instanceof MarkdownIt)) {
-    return new MarkdownIt(presetName, options);
-  }
-  if (!options) {
-    if (!isString$1(presetName)) {
-      options = presetName || {};
-      presetName = "default";
-    }
-  }
-  /**
-   * MarkdownIt#inline -> ParserInline
-   *
-   * Instance of [[ParserInline]]. You may need it to add new rules when
-   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and
-   * [[MarkdownIt.enable]].
-   **/
-  this.inline = new parser_inline_default();
-  /**
-   * MarkdownIt#block -> ParserBlock
-   *
-   * Instance of [[ParserBlock]]. You may need it to add new rules when
-   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and
-   * [[MarkdownIt.enable]].
-   **/
-  this.block = new parser_block_default();
-  /**
-   * MarkdownIt#core -> Core
-   *
-   * Instance of [[Core]] chain executor. You may need it to add new rules when
-   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and
-   * [[MarkdownIt.enable]].
-   **/
-  this.core = new parser_core_default();
-  /**
-   * MarkdownIt#renderer -> Renderer
-   *
-   * Instance of [[Renderer]]. Use it to modify output look. Or to add rendering
-   * rules for new token types, generated by plugins.
-   *
-   * ##### Example
-   *
-   * ```javascript
-   * var md = require('markdown-it')();
-   *
-   * function myToken(tokens, idx, options, env, self) {
-   *   //...
-   *   return result;
-   * };
-   *
-   * md.renderer.rules['my_token'] = myToken
-   * ```
-   *
-   * See [[Renderer]] docs and [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.mjs).
-   **/
-  this.renderer = new renderer_default();
-  /**
-   * MarkdownIt#linkify -> LinkifyIt
-   *
-   * [linkify-it](https://github.com/markdown-it/linkify-it) instance.
-   * Used by [linkify](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/linkify.mjs)
-   * rule.
-   **/
-  this.linkify = new linkify_it_default();
-  /**
-   * MarkdownIt#validateLink(url) -> Boolean
-   *
-   * Link validation function. CommonMark allows too much in links. By default
-   * we disable `javascript:`, `vbscript:`, `file:` schemas, and almost all `data:...` schemas
-   * except some embedded image types.
-   *
-   * You can change this behaviour:
-   *
-   * ```javascript
-   * var md = require('markdown-it')();
-   * // enable everything
-   * md.validateLink = function () { return true; }
-   * ```
-   **/
-  this.validateLink = validateLink;
-  /**
-   * MarkdownIt#normalizeLink(url) -> String
-   *
-   * Function used to encode link url to a machine-readable format,
-   * which includes url-encoding, punycode, etc.
-   **/
-  this.normalizeLink = normalizeLink;
-  /**
-   * MarkdownIt#normalizeLinkText(url) -> String
-   *
-   * Function used to decode link url to a human-readable format`
-   **/
-  this.normalizeLinkText = normalizeLinkText;
-  /**
-   * MarkdownIt#utils -> utils
-   *
-   * Assorted utility functions, useful to write plugins. See details
-   * [here](https://github.com/markdown-it/markdown-it/blob/master/lib/common/utils.mjs).
-   **/
-  this.utils = utils_exports;
-  /**
-   * MarkdownIt#helpers -> helpers
-   *
-   * Link components parser functions, useful to write plugins. See details
-   * [here](https://github.com/markdown-it/markdown-it/blob/master/lib/helpers).
-   **/
-  this.helpers = assign$1({}, helpers_exports);
-  this.options = {};
-  this.configure(presetName);
-  if (options) {
-    this.set(options);
-  }
+	if (!(this instanceof MarkdownIt)) {
+		return new MarkdownIt(presetName, options);
+	}
+	if (!options) {
+		if (!isString$1(presetName)) {
+			options = presetName || {};
+			presetName = "default";
+		}
+	}
+	/**
+	* MarkdownIt#inline -> ParserInline
+	*
+	* Instance of [[ParserInline]]. You may need it to add new rules when
+	* writing plugins. For simple rules control use [[MarkdownIt.disable]] and
+	* [[MarkdownIt.enable]].
+	**/
+	this.inline = new parser_inline_default();
+	/**
+	* MarkdownIt#block -> ParserBlock
+	*
+	* Instance of [[ParserBlock]]. You may need it to add new rules when
+	* writing plugins. For simple rules control use [[MarkdownIt.disable]] and
+	* [[MarkdownIt.enable]].
+	**/
+	this.block = new parser_block_default();
+	/**
+	* MarkdownIt#core -> Core
+	*
+	* Instance of [[Core]] chain executor. You may need it to add new rules when
+	* writing plugins. For simple rules control use [[MarkdownIt.disable]] and
+	* [[MarkdownIt.enable]].
+	**/
+	this.core = new parser_core_default();
+	/**
+	* MarkdownIt#renderer -> Renderer
+	*
+	* Instance of [[Renderer]]. Use it to modify output look. Or to add rendering
+	* rules for new token types, generated by plugins.
+	*
+	* ##### Example
+	*
+	* ```javascript
+	* var md = require('markdown-it')();
+	*
+	* function myToken(tokens, idx, options, env, self) {
+	*   //...
+	*   return result;
+	* };
+	*
+	* md.renderer.rules['my_token'] = myToken
+	* ```
+	*
+	* See [[Renderer]] docs and [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.mjs).
+	**/
+	this.renderer = new renderer_default();
+	/**
+	* MarkdownIt#linkify -> LinkifyIt
+	*
+	* [linkify-it](https://github.com/markdown-it/linkify-it) instance.
+	* Used by [linkify](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/linkify.mjs)
+	* rule.
+	**/
+	this.linkify = new linkify_it_default();
+	/**
+	* MarkdownIt#validateLink(url) -> Boolean
+	*
+	* Link validation function. CommonMark allows too much in links. By default
+	* we disable `javascript:`, `vbscript:`, `file:` schemas, and almost all `data:...` schemas
+	* except some embedded image types.
+	*
+	* You can change this behaviour:
+	*
+	* ```javascript
+	* var md = require('markdown-it')();
+	* // enable everything
+	* md.validateLink = function () { return true; }
+	* ```
+	**/
+	this.validateLink = validateLink;
+	/**
+	* MarkdownIt#normalizeLink(url) -> String
+	*
+	* Function used to encode link url to a machine-readable format,
+	* which includes url-encoding, punycode, etc.
+	**/
+	this.normalizeLink = normalizeLink;
+	/**
+	* MarkdownIt#normalizeLinkText(url) -> String
+	*
+	* Function used to decode link url to a human-readable format`
+	**/
+	this.normalizeLinkText = normalizeLinkText;
+	/**
+	* MarkdownIt#utils -> utils
+	*
+	* Assorted utility functions, useful to write plugins. See details
+	* [here](https://github.com/markdown-it/markdown-it/blob/master/lib/common/utils.mjs).
+	**/
+	this.utils = utils_exports;
+	/**
+	* MarkdownIt#helpers -> helpers
+	*
+	* Link components parser functions, useful to write plugins. See details
+	* [here](https://github.com/markdown-it/markdown-it/blob/master/lib/helpers).
+	**/
+	this.helpers = assign$1({}, helpers_exports);
+	this.options = {};
+	this.configure(presetName);
+	if (options) {
+		this.set(options);
+	}
 }
 /** chainable
- * MarkdownIt.set(options)
- *
- * Set parser options (in the same format as in constructor). Probably, you
- * will never need it, but you can change options after constructor call.
- *
- * ##### Example
- *
- * ```javascript
- * var md = require('markdown-it')()
- *             .set({ html: true, breaks: true })
- *             .set({ typographer, true });
- * ```
- *
- * __Note:__ To achieve the best possible performance, don't modify a
- * `markdown-it` instance options on the fly. If you need multiple configurations
- * it's best to create multiple instances and initialize each with separate
- * config.
- **/
-MarkdownIt.prototype.set = function (options) {
-  assign$1(this.options, options);
-  return this;
+* MarkdownIt.set(options)
+*
+* Set parser options (in the same format as in constructor). Probably, you
+* will never need it, but you can change options after constructor call.
+*
+* ##### Example
+*
+* ```javascript
+* var md = require('markdown-it')()
+*             .set({ html: true, breaks: true })
+*             .set({ typographer, true });
+* ```
+*
+* __Note:__ To achieve the best possible performance, don't modify a
+* `markdown-it` instance options on the fly. If you need multiple configurations
+* it's best to create multiple instances and initialize each with separate
+* config.
+**/
+MarkdownIt.prototype.set = function(options) {
+	assign$1(this.options, options);
+	return this;
 };
 /** chainable, internal
- * MarkdownIt.configure(presets)
- *
- * Batch load of all options and compenent settings. This is internal method,
- * and you probably will not need it. But if you will - see available presets
- * and data structure [here](https://github.com/markdown-it/markdown-it/tree/master/lib/presets)
- *
- * We strongly recommend to use presets instead of direct config loads. That
- * will give better compatibility with next versions.
- **/
-MarkdownIt.prototype.configure = function (presets) {
-  const self = this;
-  if (isString$1(presets)) {
-    const presetName = presets;
-    presets = config[presetName];
-    if (!presets) {
-      throw new Error('Wrong `markdown-it` preset "' + presetName + '", check name');
-    }
-  }
-  if (!presets) {
-    throw new Error("Wrong `markdown-it` preset, can't be empty");
-  }
-  if (presets.options) {
-    self.set(presets.options);
-  }
-  if (presets.components) {
-    Object.keys(presets.components).forEach(function (name) {
-      if (presets.components[name].rules) {
-        self[name].ruler.enableOnly(presets.components[name].rules);
-      }
-      if (presets.components[name].rules2) {
-        self[name].ruler2.enableOnly(presets.components[name].rules2);
-      }
-    });
-  }
-  return this;
+* MarkdownIt.configure(presets)
+*
+* Batch load of all options and compenent settings. This is internal method,
+* and you probably will not need it. But if you will - see available presets
+* and data structure [here](https://github.com/markdown-it/markdown-it/tree/master/lib/presets)
+*
+* We strongly recommend to use presets instead of direct config loads. That
+* will give better compatibility with next versions.
+**/
+MarkdownIt.prototype.configure = function(presets) {
+	const self = this;
+	if (isString$1(presets)) {
+		const presetName = presets;
+		presets = config[presetName];
+		if (!presets) {
+			throw new Error("Wrong `markdown-it` preset \"" + presetName + "\", check name");
+		}
+	}
+	if (!presets) {
+		throw new Error("Wrong `markdown-it` preset, can't be empty");
+	}
+	if (presets.options) {
+		self.set(presets.options);
+	}
+	if (presets.components) {
+		Object.keys(presets.components).forEach(function(name) {
+			if (presets.components[name].rules) {
+				self[name].ruler.enableOnly(presets.components[name].rules);
+			}
+			if (presets.components[name].rules2) {
+				self[name].ruler2.enableOnly(presets.components[name].rules2);
+			}
+		});
+	}
+	return this;
 };
 /** chainable
- * MarkdownIt.enable(list, ignoreInvalid)
- * - list (String|Array): rule name or list of rule names to enable
- * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
- *
- * Enable list or rules. It will automatically find appropriate components,
- * containing rules with given names. If rule not found, and `ignoreInvalid`
- * not set - throws exception.
- *
- * ##### Example
- *
- * ```javascript
- * var md = require('markdown-it')()
- *             .enable(['sub', 'sup'])
- *             .disable('smartquotes');
- * ```
- **/
-MarkdownIt.prototype.enable = function (list$1, ignoreInvalid) {
-  let result = [];
-  if (!Array.isArray(list$1)) {
-    list$1 = [list$1];
-  }
-  ["core", "block", "inline"].forEach(function (chain) {
-    result = result.concat(this[chain].ruler.enable(list$1, true));
-  }, this);
-  result = result.concat(this.inline.ruler2.enable(list$1, true));
-  const missed = list$1.filter(function (name) {
-    return result.indexOf(name) < 0;
-  });
-  if (missed.length && !ignoreInvalid) {
-    throw new Error("MarkdownIt. Failed to enable unknown rule(s): " + missed);
-  }
-  return this;
+* MarkdownIt.enable(list, ignoreInvalid)
+* - list (String|Array): rule name or list of rule names to enable
+* - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
+*
+* Enable list or rules. It will automatically find appropriate components,
+* containing rules with given names. If rule not found, and `ignoreInvalid`
+* not set - throws exception.
+*
+* ##### Example
+*
+* ```javascript
+* var md = require('markdown-it')()
+*             .enable(['sub', 'sup'])
+*             .disable('smartquotes');
+* ```
+**/
+MarkdownIt.prototype.enable = function(list$1, ignoreInvalid) {
+	let result = [];
+	if (!Array.isArray(list$1)) {
+		list$1 = [list$1];
+	}
+	[
+		"core",
+		"block",
+		"inline"
+	].forEach(function(chain) {
+		result = result.concat(this[chain].ruler.enable(list$1, true));
+	}, this);
+	result = result.concat(this.inline.ruler2.enable(list$1, true));
+	const missed = list$1.filter(function(name) {
+		return result.indexOf(name) < 0;
+	});
+	if (missed.length && !ignoreInvalid) {
+		throw new Error("MarkdownIt. Failed to enable unknown rule(s): " + missed);
+	}
+	return this;
 };
 /** chainable
- * MarkdownIt.disable(list, ignoreInvalid)
- * - list (String|Array): rule name or list of rule names to disable.
- * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
- *
- * The same as [[MarkdownIt.enable]], but turn specified rules off.
- **/
-MarkdownIt.prototype.disable = function (list$1, ignoreInvalid) {
-  let result = [];
-  if (!Array.isArray(list$1)) {
-    list$1 = [list$1];
-  }
-  ["core", "block", "inline"].forEach(function (chain) {
-    result = result.concat(this[chain].ruler.disable(list$1, true));
-  }, this);
-  result = result.concat(this.inline.ruler2.disable(list$1, true));
-  const missed = list$1.filter(function (name) {
-    return result.indexOf(name) < 0;
-  });
-  if (missed.length && !ignoreInvalid) {
-    throw new Error("MarkdownIt. Failed to disable unknown rule(s): " + missed);
-  }
-  return this;
+* MarkdownIt.disable(list, ignoreInvalid)
+* - list (String|Array): rule name or list of rule names to disable.
+* - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
+*
+* The same as [[MarkdownIt.enable]], but turn specified rules off.
+**/
+MarkdownIt.prototype.disable = function(list$1, ignoreInvalid) {
+	let result = [];
+	if (!Array.isArray(list$1)) {
+		list$1 = [list$1];
+	}
+	[
+		"core",
+		"block",
+		"inline"
+	].forEach(function(chain) {
+		result = result.concat(this[chain].ruler.disable(list$1, true));
+	}, this);
+	result = result.concat(this.inline.ruler2.disable(list$1, true));
+	const missed = list$1.filter(function(name) {
+		return result.indexOf(name) < 0;
+	});
+	if (missed.length && !ignoreInvalid) {
+		throw new Error("MarkdownIt. Failed to disable unknown rule(s): " + missed);
+	}
+	return this;
 };
 /** chainable
- * MarkdownIt.use(plugin, params)
- *
- * Load specified plugin with given params into current parser instance.
- * It's just a sugar to call `plugin(md, params)` with curring.
- *
- * ##### Example
- *
- * ```javascript
- * var iterator = require('markdown-it-for-inline');
- * var md = require('markdown-it')()
- *             .use(iterator, 'foo_replace', 'text', function (tokens, idx) {
- *               tokens[idx].content = tokens[idx].content.replace(/foo/g, 'bar');
- *             });
- * ```
- **/
-MarkdownIt.prototype.use = function (plugin) {
-  const args = [this].concat(Array.prototype.slice.call(arguments, 1));
-  plugin.apply(plugin, args);
-  return this;
+* MarkdownIt.use(plugin, params)
+*
+* Load specified plugin with given params into current parser instance.
+* It's just a sugar to call `plugin(md, params)` with curring.
+*
+* ##### Example
+*
+* ```javascript
+* var iterator = require('markdown-it-for-inline');
+* var md = require('markdown-it')()
+*             .use(iterator, 'foo_replace', 'text', function (tokens, idx) {
+*               tokens[idx].content = tokens[idx].content.replace(/foo/g, 'bar');
+*             });
+* ```
+**/
+MarkdownIt.prototype.use = function(plugin) {
+	const args = [this].concat(Array.prototype.slice.call(arguments, 1));
+	plugin.apply(plugin, args);
+	return this;
 };
 /** internal
- * MarkdownIt.parse(src, env) -> Array
- * - src (String): source string
- * - env (Object): environment sandbox
- *
- * Parse input string and return list of block tokens (special token type
- * "inline" will contain list of inline tokens). You should not call this
- * method directly, until you write custom renderer (for example, to produce
- * AST).
- *
- * `env` is used to pass data between "distributed" rules and return additional
- * metadata like reference info, needed for the renderer. It also can be used to
- * inject data in specific cases. Usually, you will be ok to pass `{}`,
- * and then pass updated object to renderer.
- **/
-MarkdownIt.prototype.parse = function (src, env) {
-  if (typeof src !== "string") {
-    throw new Error("Input data should be a String");
-  }
-  const state = new this.core.State(src, this, env);
-  this.core.process(state);
-  return state.tokens;
+* MarkdownIt.parse(src, env) -> Array
+* - src (String): source string
+* - env (Object): environment sandbox
+*
+* Parse input string and return list of block tokens (special token type
+* "inline" will contain list of inline tokens). You should not call this
+* method directly, until you write custom renderer (for example, to produce
+* AST).
+*
+* `env` is used to pass data between "distributed" rules and return additional
+* metadata like reference info, needed for the renderer. It also can be used to
+* inject data in specific cases. Usually, you will be ok to pass `{}`,
+* and then pass updated object to renderer.
+**/
+MarkdownIt.prototype.parse = function(src, env) {
+	if (typeof src !== "string") {
+		throw new Error("Input data should be a String");
+	}
+	const state = new this.core.State(src, this, env);
+	this.core.process(state);
+	return state.tokens;
 };
 /**
- * MarkdownIt.render(src [, env]) -> String
- * - src (String): source string
- * - env (Object): environment sandbox
- *
- * Render markdown string into html. It does all magic for you :).
- *
- * `env` can be used to inject additional metadata (`{}` by default).
- * But you will not need it with high probability. See also comment
- * in [[MarkdownIt.parse]].
- **/
-MarkdownIt.prototype.render = function (src, env) {
-  env = env || {};
-  return this.renderer.render(this.parse(src, env), this.options, env);
+* MarkdownIt.render(src [, env]) -> String
+* - src (String): source string
+* - env (Object): environment sandbox
+*
+* Render markdown string into html. It does all magic for you :).
+*
+* `env` can be used to inject additional metadata (`{}` by default).
+* But you will not need it with high probability. See also comment
+* in [[MarkdownIt.parse]].
+**/
+MarkdownIt.prototype.render = function(src, env) {
+	env = env || {};
+	return this.renderer.render(this.parse(src, env), this.options, env);
 };
 /** internal
- * MarkdownIt.parseInline(src, env) -> Array
- * - src (String): source string
- * - env (Object): environment sandbox
- *
- * The same as [[MarkdownIt.parse]] but skip all block rules. It returns the
- * block tokens list with the single `inline` element, containing parsed inline
- * tokens in `children` property. Also updates `env` object.
- **/
-MarkdownIt.prototype.parseInline = function (src, env) {
-  const state = new this.core.State(src, this, env);
-  state.inlineMode = true;
-  this.core.process(state);
-  return state.tokens;
+* MarkdownIt.parseInline(src, env) -> Array
+* - src (String): source string
+* - env (Object): environment sandbox
+*
+* The same as [[MarkdownIt.parse]] but skip all block rules. It returns the
+* block tokens list with the single `inline` element, containing parsed inline
+* tokens in `children` property. Also updates `env` object.
+**/
+MarkdownIt.prototype.parseInline = function(src, env) {
+	const state = new this.core.State(src, this, env);
+	state.inlineMode = true;
+	this.core.process(state);
+	return state.tokens;
 };
 /**
- * MarkdownIt.renderInline(src [, env]) -> String
- * - src (String): source string
- * - env (Object): environment sandbox
- *
- * Similar to [[MarkdownIt.render]] but for single paragraph content. Result
- * will NOT be wrapped into `<p>` tags.
- **/
-MarkdownIt.prototype.renderInline = function (src, env) {
-  env = env || {};
-  return this.renderer.render(this.parseInline(src, env), this.options, env);
+* MarkdownIt.renderInline(src [, env]) -> String
+* - src (String): source string
+* - env (Object): environment sandbox
+*
+* Similar to [[MarkdownIt.render]] but for single paragraph content. Result
+* will NOT be wrapped into `<p>` tags.
+**/
+MarkdownIt.prototype.renderInline = function(src, env) {
+	env = env || {};
+	return this.renderer.render(this.parseInline(src, env), this.options, env);
 };
 var lib_default = MarkdownIt;
 
 /**
- * This is only safe for (and intended to be used for) text node positions. If
- * you are using attribute position, then this is only safe if the attribute
- * value is surrounded by double-quotes, and is unsafe otherwise (because the
- * value could break out of the attribute value and e.g. add another attribute).
- */
+* This is only safe for (and intended to be used for) text node positions. If
+* you are using attribute position, then this is only safe if the attribute
+* value is surrounded by double-quotes, and is unsafe otherwise (because the
+* value could break out of the attribute value and e.g. add another attribute).
+*/
 function escapeNodeText(str) {
-  const frag = document.createElement("div");
-  D(b`${str}`, frag);
-  return frag.innerHTML.replaceAll(/<!--([^-]*)-->/gim, "");
+	const frag = document.createElement("div");
+	D(b`${str}`, frag);
+	return frag.innerHTML.replaceAll(/<!--([^-]*)-->/gim, "");
 }
 function unescapeNodeText(str) {
-  if (!str) {
-    return "";
-  }
-  const frag = document.createElement("textarea");
-  frag.innerHTML = str;
-  return frag.value;
+	if (!str) {
+		return "";
+	}
+	const frag = document.createElement("textarea");
+	frag.innerHTML = str;
+	return frag.value;
 }
 
 var MarkdownDirective = class extends i$5 {
-  #markdownIt = lib_default({
-    highlight: (str, lang) => {
-      switch (lang) {
-        case "html": {
-          const iframe = document.createElement("iframe");
-          iframe.classList.add("html-view");
-          iframe.srcdoc = str;
-          iframe.sandbox = "";
-          return iframe.innerHTML;
-        }
-        default:
-          return escapeNodeText(str);
-      }
-    },
-  });
-  #lastValue = null;
-  #lastTagClassMap = null;
-  update(_part, [value, tagClassMap]) {
-    if (this.#lastValue === value && JSON.stringify(tagClassMap) === this.#lastTagClassMap) {
-      return E;
-    }
-    this.#lastValue = value;
-    this.#lastTagClassMap = JSON.stringify(tagClassMap);
-    return this.render(value, tagClassMap);
-  }
-  #originalClassMap = new Map();
-  #applyTagClassMap(tagClassMap) {
-    Object.entries(tagClassMap).forEach(([tag]) => {
-      let tokenName;
-      switch (tag) {
-        case "p":
-          tokenName = "paragraph";
-          break;
-        case "h1":
-        case "h2":
-        case "h3":
-        case "h4":
-        case "h5":
-        case "h6":
-          tokenName = "heading";
-          break;
-        case "ul":
-          tokenName = "bullet_list";
-          break;
-        case "ol":
-          tokenName = "ordered_list";
-          break;
-        case "li":
-          tokenName = "list_item";
-          break;
-        case "a":
-          tokenName = "link";
-          break;
-        case "strong":
-          tokenName = "strong";
-          break;
-        case "em":
-          tokenName = "em";
-          break;
-      }
-      if (!tokenName) {
-        return;
-      }
-      const key = `${tokenName}_open`;
-      this.#markdownIt.renderer.rules[key] = (tokens, idx, options, _env, self) => {
-        const token = tokens[idx];
-        const tokenClasses = tagClassMap[token.tag] ?? [];
-        for (const clazz of tokenClasses) {
-          token.attrJoin("class", clazz);
-        }
-        return self.renderToken(tokens, idx, options);
-      };
-    });
-  }
-  #unapplyTagClassMap() {
-    for (const [key] of this.#originalClassMap) {
-      delete this.#markdownIt.renderer.rules[key];
-    }
-    this.#originalClassMap.clear();
-  }
-  /**
-   * Renders the markdown string to HTML using MarkdownIt.
-   *
-   * Note: MarkdownIt doesn't enable HTML in its output, so we render the
-   * value directly without further sanitization.
-   * @see https://github.com/markdown-it/markdown-it/blob/master/docs/security.md
-   */
-  render(value, tagClassMap) {
-    if (tagClassMap) {
-      this.#applyTagClassMap(tagClassMap);
-    }
-    const htmlString = this.#markdownIt.render(value);
-    this.#unapplyTagClassMap();
-    return o(htmlString);
-  }
+	#markdownIt = lib_default({ highlight: (str, lang) => {
+		switch (lang) {
+			case "html": {
+				const iframe = document.createElement("iframe");
+				iframe.classList.add("html-view");
+				iframe.srcdoc = str;
+				iframe.sandbox = "";
+				return iframe.innerHTML;
+			}
+			default: return escapeNodeText(str);
+		}
+	} });
+	#lastValue = null;
+	#lastTagClassMap = null;
+	update(_part, [value, tagClassMap]) {
+		if (this.#lastValue === value && JSON.stringify(tagClassMap) === this.#lastTagClassMap) {
+			return E;
+		}
+		this.#lastValue = value;
+		this.#lastTagClassMap = JSON.stringify(tagClassMap);
+		return this.render(value, tagClassMap);
+	}
+	#originalClassMap = new Map();
+	#applyTagClassMap(tagClassMap) {
+		Object.entries(tagClassMap).forEach(([tag]) => {
+			let tokenName;
+			switch (tag) {
+				case "p":
+					tokenName = "paragraph";
+					break;
+				case "h1":
+				case "h2":
+				case "h3":
+				case "h4":
+				case "h5":
+				case "h6":
+					tokenName = "heading";
+					break;
+				case "ul":
+					tokenName = "bullet_list";
+					break;
+				case "ol":
+					tokenName = "ordered_list";
+					break;
+				case "li":
+					tokenName = "list_item";
+					break;
+				case "a":
+					tokenName = "link";
+					break;
+				case "strong":
+					tokenName = "strong";
+					break;
+				case "em":
+					tokenName = "em";
+					break;
+			}
+			if (!tokenName) {
+				return;
+			}
+			const key = `${tokenName}_open`;
+			this.#markdownIt.renderer.rules[key] = (tokens, idx, options, _env, self) => {
+				const token = tokens[idx];
+				const tokenClasses = tagClassMap[token.tag] ?? [];
+				for (const clazz of tokenClasses) {
+					token.attrJoin("class", clazz);
+				}
+				return self.renderToken(tokens, idx, options);
+			};
+		});
+	}
+	#unapplyTagClassMap() {
+		for (const [key] of this.#originalClassMap) {
+			delete this.#markdownIt.renderer.rules[key];
+		}
+		this.#originalClassMap.clear();
+	}
+	/**
+	* Renders the markdown string to HTML using MarkdownIt.
+	*
+	* Note: MarkdownIt doesn't enable HTML in its output, so we render the
+	* value directly without further sanitization.
+	* @see https://github.com/markdown-it/markdown-it/blob/master/docs/security.md
+	*/
+	render(value, tagClassMap) {
+		if (tagClassMap) {
+			this.#applyTagClassMap(tagClassMap);
+		}
+		const htmlString = this.#markdownIt.render(value);
+		this.#unapplyTagClassMap();
+		return o(htmlString);
+	}
 };
 const markdown = e$10(MarkdownDirective);
 const markdownItStandalone = lib_default();
 function renderMarkdownToHtmlString(value) {
-  return markdownItStandalone.render(value);
+	return markdownItStandalone.render(value);
 }
 
-var __esDecorate$1 =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers$1 =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate$1 = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers$1 = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Text = (() => {
-  let _classDecorators = [t$1("a2ui-text")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _text_decorators;
-  let _text_initializers = [];
-  let _text_extraInitializers = [];
-  let _usageHint_decorators;
-  let _usageHint_initializers = [];
-  let _usageHint_extraInitializers = [];
-  var Text = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _text_decorators = [n$6()];
-      _usageHint_decorators = [
-        n$6({
-          reflect: true,
-          attribute: "usage-hint",
-        }),
-      ];
-      __esDecorate$1(
-        this,
-        null,
-        _text_decorators,
-        {
-          kind: "accessor",
-          name: "text",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "text" in obj,
-            get: (obj) => obj.text,
-            set: (obj, value) => {
-              obj.text = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _text_initializers,
-        _text_extraInitializers,
-      );
-      __esDecorate$1(
-        this,
-        null,
-        _usageHint_decorators,
-        {
-          kind: "accessor",
-          name: "usageHint",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "usageHint" in obj,
-            get: (obj) => obj.usageHint,
-            set: (obj, value) => {
-              obj.usageHint = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _usageHint_initializers,
-        _usageHint_extraInitializers,
-      );
-      __esDecorate$1(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Text = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #text_accessor_storage = __runInitializers$1(this, _text_initializers, null);
-    get text() {
-      return this.#text_accessor_storage;
-    }
-    set text(value) {
-      this.#text_accessor_storage = value;
-    }
-    #usageHint_accessor_storage =
-      (__runInitializers$1(this, _text_extraInitializers),
-      __runInitializers$1(this, _usageHint_initializers, null));
-    get usageHint() {
-      return this.#usageHint_accessor_storage;
-    }
-    set usageHint(value) {
-      this.#usageHint_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-text")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _text_decorators;
+	let _text_initializers = [];
+	let _text_extraInitializers = [];
+	let _usageHint_decorators;
+	let _usageHint_initializers = [];
+	let _usageHint_extraInitializers = [];
+	var Text = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_text_decorators = [n$6()];
+			_usageHint_decorators = [n$6({
+				reflect: true,
+				attribute: "usage-hint"
+			})];
+			__esDecorate$1(this, null, _text_decorators, {
+				kind: "accessor",
+				name: "text",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "text" in obj,
+					get: (obj) => obj.text,
+					set: (obj, value) => {
+						obj.text = value;
+					}
+				},
+				metadata: _metadata
+			}, _text_initializers, _text_extraInitializers);
+			__esDecorate$1(this, null, _usageHint_decorators, {
+				kind: "accessor",
+				name: "usageHint",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "usageHint" in obj,
+					get: (obj) => obj.usageHint,
+					set: (obj, value) => {
+						obj.usageHint = value;
+					}
+				},
+				metadata: _metadata
+			}, _usageHint_initializers, _usageHint_extraInitializers);
+			__esDecorate$1(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Text = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#text_accessor_storage = __runInitializers$1(this, _text_initializers, null);
+		get text() {
+			return this.#text_accessor_storage;
+		}
+		set text(value) {
+			this.#text_accessor_storage = value;
+		}
+		#usageHint_accessor_storage = (__runInitializers$1(this, _text_extraInitializers), __runInitializers$1(this, _usageHint_initializers, null));
+		get usageHint() {
+			return this.#usageHint_accessor_storage;
+		}
+		set usageHint(value) {
+			this.#usageHint_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       :host {
         display: block;
         flex: var(--weight);
@@ -19123,226 +16985,198 @@ let Text = (() => {
         line-height: inherit;
         font: inherit;
       }
-    `,
-      ];
-    }
-    #renderText() {
-      let textValue = null;
-      if (this.text && typeof this.text === "object") {
-        if ("literalString" in this.text && this.text.literalString) {
-          textValue = this.text.literalString;
-        } else if ("literal" in this.text && this.text.literal !== undefined) {
-          textValue = this.text.literal;
-        } else if (this.text && "path" in this.text && this.text.path) {
-          if (!this.processor || !this.component) {
-            return b`(no model)`;
-          }
-          const value = this.processor.getData(
-            this.component,
-            this.text.path,
-            this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-          );
-          if (value !== null && value !== undefined) {
-            textValue = value.toString();
-          }
-        }
-      }
-      if (textValue === null || textValue === undefined) {
-        return b`(empty)`;
-      }
-      let markdownText = textValue;
-      switch (this.usageHint) {
-        case "h1":
-          markdownText = `# ${markdownText}`;
-          break;
-        case "h2":
-          markdownText = `## ${markdownText}`;
-          break;
-        case "h3":
-          markdownText = `### ${markdownText}`;
-          break;
-        case "h4":
-          markdownText = `#### ${markdownText}`;
-          break;
-        case "h5":
-          markdownText = `##### ${markdownText}`;
-          break;
-        case "caption":
-          markdownText = `*${markdownText}*`;
-          break;
-        default:
-          break;
-      }
-      return b`${markdown(markdownText, appendToAll(this.theme.markdown, ["ol", "ul", "li"], {}))}`;
-    }
-    #areHintedStyles(styles) {
-      if (typeof styles !== "object") return false;
-      if (Array.isArray(styles)) return false;
-      if (!styles) return false;
-      const expected = ["h1", "h2", "h3", "h4", "h5", "h6", "caption", "body"];
-      return expected.every((v$2) => v$2 in styles);
-    }
-    #getAdditionalStyles() {
-      let additionalStyles = {};
-      const styles = this.theme.additionalStyles?.Text;
-      if (!styles) return additionalStyles;
-      if (this.#areHintedStyles(styles)) {
-        const hint = this.usageHint ?? "body";
-        additionalStyles = styles[hint];
-      } else {
-        additionalStyles = styles;
-      }
-      return additionalStyles;
-    }
-    render() {
-      const classes = merge(
-        this.theme.components.Text.all,
-        this.usageHint ? this.theme.components.Text[this.usageHint] : {},
-      );
-      return b`<section
+    `];
+		}
+		#renderText() {
+			let textValue = null;
+			if (this.text && typeof this.text === "object") {
+				if ("literalString" in this.text && this.text.literalString) {
+					textValue = this.text.literalString;
+				} else if ("literal" in this.text && this.text.literal !== undefined) {
+					textValue = this.text.literal;
+				} else if (this.text && "path" in this.text && this.text.path) {
+					if (!this.processor || !this.component) {
+						return b`(no model)`;
+					}
+					const value = this.processor.getData(this.component, this.text.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+					if (value !== null && value !== undefined) {
+						textValue = value.toString();
+					}
+				}
+			}
+			if (textValue === null || textValue === undefined) {
+				return b`(empty)`;
+			}
+			let markdownText = textValue;
+			switch (this.usageHint) {
+				case "h1":
+					markdownText = `# ${markdownText}`;
+					break;
+				case "h2":
+					markdownText = `## ${markdownText}`;
+					break;
+				case "h3":
+					markdownText = `### ${markdownText}`;
+					break;
+				case "h4":
+					markdownText = `#### ${markdownText}`;
+					break;
+				case "h5":
+					markdownText = `##### ${markdownText}`;
+					break;
+				case "caption":
+					markdownText = `*${markdownText}*`;
+					break;
+				default: break;
+			}
+			return b`${markdown(markdownText, appendToAll(this.theme.markdown, [
+				"ol",
+				"ul",
+				"li"
+			], {}))}`;
+		}
+		#areHintedStyles(styles) {
+			if (typeof styles !== "object") return false;
+			if (Array.isArray(styles)) return false;
+			if (!styles) return false;
+			const expected = [
+				"h1",
+				"h2",
+				"h3",
+				"h4",
+				"h5",
+				"h6",
+				"caption",
+				"body"
+			];
+			return expected.every((v$2) => v$2 in styles);
+		}
+		#getAdditionalStyles() {
+			let additionalStyles = {};
+			const styles = this.theme.additionalStyles?.Text;
+			if (!styles) return additionalStyles;
+			if (this.#areHintedStyles(styles)) {
+				const hint = this.usageHint ?? "body";
+				additionalStyles = styles[hint];
+			} else {
+				additionalStyles = styles;
+			}
+			return additionalStyles;
+		}
+		render() {
+			const classes = merge(this.theme.components.Text.all, this.usageHint ? this.theme.components.Text[this.usageHint] : {});
+			return b`<section
       class=${e$2(classes)}
       style=${this.theme.additionalStyles?.Text ? o$2(this.#getAdditionalStyles()) : A}
     >
       ${this.#renderText()}
     </section>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers$1(this, _usageHint_extraInitializers);
-    }
-    static {
-      __runInitializers$1(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Text = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers$1(this, _usageHint_extraInitializers);
+		}
+		static {
+			__runInitializers$1(_classThis, _classExtraInitializers);
+		}
+	};
+	return Text = _classThis;
 })();
 
-var __esDecorate =
-  (void 0 && (void 0).__esDecorate) ||
-  function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f$4) {
-      if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
-      return f$4;
-    }
-    var kind = contextIn.kind,
-      key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? (contextIn["static"] ? ctor : ctor.prototype) : null;
-    var descriptor =
-      descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _$1,
-      done = false;
-    for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
-      var context = {};
-      for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
-      for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
-      context.addInitializer = function (f$4) {
-        if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-        extraInitializers.push(accept(f$4 || null));
-      };
-      var result = (0, decorators[i$10])(
-        kind === "accessor"
-          ? {
-              get: descriptor.get,
-              set: descriptor.set,
-            }
-          : descriptor[key],
-        context,
-      );
-      if (kind === "accessor") {
-        if (result === void 0) continue;
-        if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-        if ((_$1 = accept(result.get))) descriptor.get = _$1;
-        if ((_$1 = accept(result.set))) descriptor.set = _$1;
-        if ((_$1 = accept(result.init))) initializers.unshift(_$1);
-      } else if ((_$1 = accept(result))) {
-        if (kind === "field") initializers.unshift(_$1);
-        else descriptor[key] = _$1;
-      }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-  };
-var __runInitializers =
-  (void 0 && (void 0).__runInitializers) ||
-  function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i$10 = 0; i$10 < initializers.length; i$10++) {
-      value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
-    }
-    return useValue ? value : void 0;
-  };
+var __esDecorate = void 0 && (void 0).__esDecorate || function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+	function accept(f$4) {
+		if (f$4 !== void 0 && typeof f$4 !== "function") throw new TypeError("Function expected");
+		return f$4;
+	}
+	var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+	var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+	var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+	var _$1, done = false;
+	for (var i$10 = decorators.length - 1; i$10 >= 0; i$10--) {
+		var context = {};
+		for (var p$3 in contextIn) context[p$3] = p$3 === "access" ? {} : contextIn[p$3];
+		for (var p$3 in contextIn.access) context.access[p$3] = contextIn.access[p$3];
+		context.addInitializer = function(f$4) {
+			if (done) throw new TypeError("Cannot add initializers after decoration has completed");
+			extraInitializers.push(accept(f$4 || null));
+		};
+		var result = (0, decorators[i$10])(kind === "accessor" ? {
+			get: descriptor.get,
+			set: descriptor.set
+		} : descriptor[key], context);
+		if (kind === "accessor") {
+			if (result === void 0) continue;
+			if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+			if (_$1 = accept(result.get)) descriptor.get = _$1;
+			if (_$1 = accept(result.set)) descriptor.set = _$1;
+			if (_$1 = accept(result.init)) initializers.unshift(_$1);
+		} else if (_$1 = accept(result)) {
+			if (kind === "field") initializers.unshift(_$1);
+			else descriptor[key] = _$1;
+		}
+	}
+	if (target) Object.defineProperty(target, contextIn.name, descriptor);
+	done = true;
+};
+var __runInitializers = void 0 && (void 0).__runInitializers || function(thisArg, initializers, value) {
+	var useValue = arguments.length > 2;
+	for (var i$10 = 0; i$10 < initializers.length; i$10++) {
+		value = useValue ? initializers[i$10].call(thisArg, value) : initializers[i$10].call(thisArg);
+	}
+	return useValue ? value : void 0;
+};
 let Video = (() => {
-  let _classDecorators = [t$1("a2ui-video")];
-  let _classDescriptor;
-  let _classExtraInitializers = [];
-  let _classThis;
-  let _classSuper = Root;
-  let _url_decorators;
-  let _url_initializers = [];
-  let _url_extraInitializers = [];
-  var Video = class extends _classSuper {
-    static {
-      _classThis = this;
-    }
-    static {
-      const _metadata =
-        typeof Symbol === "function" && Symbol.metadata
-          ? Object.create(_classSuper[Symbol.metadata] ?? null)
-          : void 0;
-      _url_decorators = [n$6()];
-      __esDecorate(
-        this,
-        null,
-        _url_decorators,
-        {
-          kind: "accessor",
-          name: "url",
-          static: false,
-          private: false,
-          access: {
-            has: (obj) => "url" in obj,
-            get: (obj) => obj.url,
-            set: (obj, value) => {
-              obj.url = value;
-            },
-          },
-          metadata: _metadata,
-        },
-        _url_initializers,
-        _url_extraInitializers,
-      );
-      __esDecorate(
-        null,
-        (_classDescriptor = { value: _classThis }),
-        _classDecorators,
-        {
-          kind: "class",
-          name: _classThis.name,
-          metadata: _metadata,
-        },
-        null,
-        _classExtraInitializers,
-      );
-      Video = _classThis = _classDescriptor.value;
-      if (_metadata)
-        Object.defineProperty(_classThis, Symbol.metadata, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value: _metadata,
-        });
-    }
-    #url_accessor_storage = __runInitializers(this, _url_initializers, null);
-    get url() {
-      return this.#url_accessor_storage;
-    }
-    set url(value) {
-      this.#url_accessor_storage = value;
-    }
-    static {
-      this.styles = [
-        structuralStyles,
-        i$9`
+	let _classDecorators = [t$1("a2ui-video")];
+	let _classDescriptor;
+	let _classExtraInitializers = [];
+	let _classThis;
+	let _classSuper = Root;
+	let _url_decorators;
+	let _url_initializers = [];
+	let _url_extraInitializers = [];
+	var Video = class extends _classSuper {
+		static {
+			_classThis = this;
+		}
+		static {
+			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+			_url_decorators = [n$6()];
+			__esDecorate(this, null, _url_decorators, {
+				kind: "accessor",
+				name: "url",
+				static: false,
+				private: false,
+				access: {
+					has: (obj) => "url" in obj,
+					get: (obj) => obj.url,
+					set: (obj, value) => {
+						obj.url = value;
+					}
+				},
+				metadata: _metadata
+			}, _url_initializers, _url_extraInitializers);
+			__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, {
+				kind: "class",
+				name: _classThis.name,
+				metadata: _metadata
+			}, null, _classExtraInitializers);
+			Video = _classThis = _classDescriptor.value;
+			if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, {
+				enumerable: true,
+				configurable: true,
+				writable: true,
+				value: _metadata
+			});
+		}
+		#url_accessor_storage = __runInitializers(this, _url_initializers, null);
+		get url() {
+			return this.#url_accessor_storage;
+		}
+		set url(value) {
+			this.#url_accessor_storage = value;
+		}
+		static {
+			this.styles = [structuralStyles, i$9`
       * {
         box-sizing: border-box;
       }
@@ -19358,71 +17192,66 @@ let Video = (() => {
         display: block;
         width: 100%;
       }
-    `,
-      ];
-    }
-    #renderVideo() {
-      if (!this.url) {
-        return A;
-      }
-      if (this.url && typeof this.url === "object") {
-        if ("literalString" in this.url) {
-          return b`<video controls src=${this.url.literalString} />`;
-        } else if ("literal" in this.url) {
-          return b`<video controls src=${this.url.literal} />`;
-        } else if (this.url && "path" in this.url && this.url.path) {
-          if (!this.processor || !this.component) {
-            return b`(no processor)`;
-          }
-          const videoUrl = this.processor.getData(
-            this.component,
-            this.url.path,
-            this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID,
-          );
-          if (!videoUrl) {
-            return b`Invalid video URL`;
-          }
-          if (typeof videoUrl !== "string") {
-            return b`Invalid video URL`;
-          }
-          return b`<video controls src=${videoUrl} />`;
-        }
-      }
-      return b`(empty)`;
-    }
-    render() {
-      return b`<section
+    `];
+		}
+		#renderVideo() {
+			if (!this.url) {
+				return A;
+			}
+			if (this.url && typeof this.url === "object") {
+				if ("literalString" in this.url) {
+					return b`<video controls src=${this.url.literalString} />`;
+				} else if ("literal" in this.url) {
+					return b`<video controls src=${this.url.literal} />`;
+				} else if (this.url && "path" in this.url && this.url.path) {
+					if (!this.processor || !this.component) {
+						return b`(no processor)`;
+					}
+					const videoUrl = this.processor.getData(this.component, this.url.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
+					if (!videoUrl) {
+						return b`Invalid video URL`;
+					}
+					if (typeof videoUrl !== "string") {
+						return b`Invalid video URL`;
+					}
+					return b`<video controls src=${videoUrl} />`;
+				}
+			}
+			return b`(empty)`;
+		}
+		render() {
+			return b`<section
       class=${e$2(this.theme.components.Video)}
       style=${this.theme.additionalStyles?.Video ? o$2(this.theme.additionalStyles?.Video) : A}
     >
       ${this.#renderVideo()}
     </section>`;
-    }
-    constructor() {
-      super(...arguments);
-      __runInitializers(this, _url_extraInitializers);
-    }
-    static {
-      __runInitializers(_classThis, _classExtraInitializers);
-    }
-  };
-  return (Video = _classThis);
+		}
+		constructor() {
+			super(...arguments);
+			__runInitializers(this, _url_extraInitializers);
+		}
+		static {
+			__runInitializers(_classThis, _classExtraInitializers);
+		}
+	};
+	return Video = _classThis;
 })();
 
 function registerCustomComponents() {}
 
 /**
- * Type-safely retrieves a custom element constructor using the tagName map.
- * @param tagName The tag name to look up (must exist in HTMLElementTagNameMap).
- * @returns The specific constructor type or undefined.
- */
+* Type-safely retrieves a custom element constructor using the tagName map.
+* @param tagName The tag name to look up (must exist in HTMLElementTagNameMap).
+* @returns The specific constructor type or undefined.
+*/
 function instanceOf(tagName) {
-  const ctor = customElements.get(tagName);
-  if (!ctor) {
-    console.warn("No element definition for", tagName);
-    return;
-  }
-  return new ctor();
+	const ctor = customElements.get(tagName);
+	if (!ctor) {
+		console.warn("No element definition for", tagName);
+		return;
+	}
+	return new ctor();
 }
 
 const modalStyles = i$9`
@@ -19447,200 +17276,196 @@ const modalStyles = i$9`
 `;
 const modalElement = customElements.get("a2ui-modal");
 if (modalElement && Array.isArray(modalElement.styles)) {
-  modalElement.styles = [...modalElement.styles, modalStyles];
+	modalElement.styles = [...modalElement.styles, modalStyles];
 }
 const empty = Object.freeze({});
 const emptyClasses = () => ({});
 const textHintStyles = () => ({
-  h1: {},
-  h2: {},
-  h3: {},
-  h4: {},
-  h5: {},
-  body: {},
-  caption: {},
+	h1: {},
+	h2: {},
+	h3: {},
+	h4: {},
+	h5: {},
+	body: {},
+	caption: {}
 });
 const isAndroid = /Android/i.test(globalThis.navigator?.userAgent ?? "");
 const cardShadow = isAndroid ? "0 2px 10px rgba(0,0,0,.18)" : "0 10px 30px rgba(0,0,0,.35)";
-const buttonShadow = isAndroid
-  ? "0 2px 10px rgba(6, 182, 212, 0.14)"
-  : "0 10px 25px rgba(6, 182, 212, 0.18)";
-const statusShadow = isAndroid
-  ? "0 2px 10px rgba(0, 0, 0, 0.18)"
-  : "0 10px 24px rgba(0, 0, 0, 0.25)";
+const buttonShadow = isAndroid ? "0 2px 10px rgba(6, 182, 212, 0.14)" : "0 10px 25px rgba(6, 182, 212, 0.18)";
+const statusShadow = isAndroid ? "0 2px 10px rgba(0, 0, 0, 0.18)" : "0 10px 24px rgba(0, 0, 0, 0.25)";
 const statusBlur = isAndroid ? "10px" : "14px";
 const clawdbotTheme = {
-  components: {
-    AudioPlayer: emptyClasses(),
-    Button: emptyClasses(),
-    Card: emptyClasses(),
-    Column: emptyClasses(),
-    CheckBox: {
-      container: emptyClasses(),
-      element: emptyClasses(),
-      label: emptyClasses(),
-    },
-    DateTimeInput: {
-      container: emptyClasses(),
-      element: emptyClasses(),
-      label: emptyClasses(),
-    },
-    Divider: emptyClasses(),
-    Image: {
-      all: emptyClasses(),
-      icon: emptyClasses(),
-      avatar: emptyClasses(),
-      smallFeature: emptyClasses(),
-      mediumFeature: emptyClasses(),
-      largeFeature: emptyClasses(),
-      header: emptyClasses(),
-    },
-    Icon: emptyClasses(),
-    List: emptyClasses(),
-    Modal: {
-      backdrop: emptyClasses(),
-      element: emptyClasses(),
-    },
-    MultipleChoice: {
-      container: emptyClasses(),
-      element: emptyClasses(),
-      label: emptyClasses(),
-    },
-    Row: emptyClasses(),
-    Slider: {
-      container: emptyClasses(),
-      element: emptyClasses(),
-      label: emptyClasses(),
-    },
-    Tabs: {
-      container: emptyClasses(),
-      element: emptyClasses(),
-      controls: {
-        all: emptyClasses(),
-        selected: emptyClasses(),
-      },
-    },
-    Text: {
-      all: emptyClasses(),
-      h1: emptyClasses(),
-      h2: emptyClasses(),
-      h3: emptyClasses(),
-      h4: emptyClasses(),
-      h5: emptyClasses(),
-      caption: emptyClasses(),
-      body: emptyClasses(),
-    },
-    TextField: {
-      container: emptyClasses(),
-      element: emptyClasses(),
-      label: emptyClasses(),
-    },
-    Video: emptyClasses(),
-  },
-  elements: {
-    a: emptyClasses(),
-    audio: emptyClasses(),
-    body: emptyClasses(),
-    button: emptyClasses(),
-    h1: emptyClasses(),
-    h2: emptyClasses(),
-    h3: emptyClasses(),
-    h4: emptyClasses(),
-    h5: emptyClasses(),
-    iframe: emptyClasses(),
-    input: emptyClasses(),
-    p: emptyClasses(),
-    pre: emptyClasses(),
-    textarea: emptyClasses(),
-    video: emptyClasses(),
-  },
-  markdown: {
-    p: [],
-    h1: [],
-    h2: [],
-    h3: [],
-    h4: [],
-    h5: [],
-    ul: [],
-    ol: [],
-    li: [],
-    a: [],
-    strong: [],
-    em: [],
-  },
-  additionalStyles: {
-    Card: {
-      background: "linear-gradient(180deg, rgba(255,255,255,.06), rgba(255,255,255,.03))",
-      border: "1px solid rgba(255,255,255,.09)",
-      borderRadius: "14px",
-      padding: "14px",
-      boxShadow: cardShadow,
-    },
-    Modal: {
-      background: "rgba(12, 16, 24, 0.92)",
-      border: "1px solid rgba(255,255,255,.12)",
-      borderRadius: "16px",
-      padding: "16px",
-      boxShadow: "0 30px 80px rgba(0,0,0,.6)",
-      width: "min(520px, calc(100vw - 48px))",
-    },
-    Column: { gap: "10px" },
-    Row: {
-      gap: "10px",
-      alignItems: "center",
-    },
-    Divider: { opacity: "0.25" },
-    Button: {
-      background: "linear-gradient(135deg, #22c55e 0%, #06b6d4 100%)",
-      border: "0",
-      borderRadius: "12px",
-      padding: "10px 14px",
-      color: "#071016",
-      fontWeight: "650",
-      cursor: "pointer",
-      boxShadow: buttonShadow,
-    },
-    Text: {
-      ...textHintStyles(),
-      h1: {
-        fontSize: "20px",
-        fontWeight: "750",
-        margin: "0 0 6px 0",
-      },
-      h2: {
-        fontSize: "16px",
-        fontWeight: "700",
-        margin: "0 0 6px 0",
-      },
-      body: {
-        fontSize: "13px",
-        lineHeight: "1.4",
-      },
-      caption: { opacity: "0.8" },
-    },
-    TextField: {
-      display: "grid",
-      gap: "6px",
-    },
-    Image: { borderRadius: "12px" },
-  },
+	components: {
+		AudioPlayer: emptyClasses(),
+		Button: emptyClasses(),
+		Card: emptyClasses(),
+		Column: emptyClasses(),
+		CheckBox: {
+			container: emptyClasses(),
+			element: emptyClasses(),
+			label: emptyClasses()
+		},
+		DateTimeInput: {
+			container: emptyClasses(),
+			element: emptyClasses(),
+			label: emptyClasses()
+		},
+		Divider: emptyClasses(),
+		Image: {
+			all: emptyClasses(),
+			icon: emptyClasses(),
+			avatar: emptyClasses(),
+			smallFeature: emptyClasses(),
+			mediumFeature: emptyClasses(),
+			largeFeature: emptyClasses(),
+			header: emptyClasses()
+		},
+		Icon: emptyClasses(),
+		List: emptyClasses(),
+		Modal: {
+			backdrop: emptyClasses(),
+			element: emptyClasses()
+		},
+		MultipleChoice: {
+			container: emptyClasses(),
+			element: emptyClasses(),
+			label: emptyClasses()
+		},
+		Row: emptyClasses(),
+		Slider: {
+			container: emptyClasses(),
+			element: emptyClasses(),
+			label: emptyClasses()
+		},
+		Tabs: {
+			container: emptyClasses(),
+			element: emptyClasses(),
+			controls: {
+				all: emptyClasses(),
+				selected: emptyClasses()
+			}
+		},
+		Text: {
+			all: emptyClasses(),
+			h1: emptyClasses(),
+			h2: emptyClasses(),
+			h3: emptyClasses(),
+			h4: emptyClasses(),
+			h5: emptyClasses(),
+			caption: emptyClasses(),
+			body: emptyClasses()
+		},
+		TextField: {
+			container: emptyClasses(),
+			element: emptyClasses(),
+			label: emptyClasses()
+		},
+		Video: emptyClasses()
+	},
+	elements: {
+		a: emptyClasses(),
+		audio: emptyClasses(),
+		body: emptyClasses(),
+		button: emptyClasses(),
+		h1: emptyClasses(),
+		h2: emptyClasses(),
+		h3: emptyClasses(),
+		h4: emptyClasses(),
+		h5: emptyClasses(),
+		iframe: emptyClasses(),
+		input: emptyClasses(),
+		p: emptyClasses(),
+		pre: emptyClasses(),
+		textarea: emptyClasses(),
+		video: emptyClasses()
+	},
+	markdown: {
+		p: [],
+		h1: [],
+		h2: [],
+		h3: [],
+		h4: [],
+		h5: [],
+		ul: [],
+		ol: [],
+		li: [],
+		a: [],
+		strong: [],
+		em: []
+	},
+	additionalStyles: {
+		Card: {
+			background: "linear-gradient(180deg, rgba(255,255,255,.06), rgba(255,255,255,.03))",
+			border: "1px solid rgba(255,255,255,.09)",
+			borderRadius: "14px",
+			padding: "14px",
+			boxShadow: cardShadow
+		},
+		Modal: {
+			background: "rgba(12, 16, 24, 0.92)",
+			border: "1px solid rgba(255,255,255,.12)",
+			borderRadius: "16px",
+			padding: "16px",
+			boxShadow: "0 30px 80px rgba(0,0,0,.6)",
+			width: "min(520px, calc(100vw - 48px))"
+		},
+		Column: { gap: "10px" },
+		Row: {
+			gap: "10px",
+			alignItems: "center"
+		},
+		Divider: { opacity: "0.25" },
+		Button: {
+			background: "linear-gradient(135deg, #22c55e 0%, #06b6d4 100%)",
+			border: "0",
+			borderRadius: "12px",
+			padding: "10px 14px",
+			color: "#071016",
+			fontWeight: "650",
+			cursor: "pointer",
+			boxShadow: buttonShadow
+		},
+		Text: {
+			...textHintStyles(),
+			h1: {
+				fontSize: "20px",
+				fontWeight: "750",
+				margin: "0 0 6px 0"
+			},
+			h2: {
+				fontSize: "16px",
+				fontWeight: "700",
+				margin: "0 0 6px 0"
+			},
+			body: {
+				fontSize: "13px",
+				lineHeight: "1.4"
+			},
+			caption: { opacity: "0.8" }
+		},
+		TextField: {
+			display: "grid",
+			gap: "6px"
+		},
+		Image: { borderRadius: "12px" }
+	}
 };
 var ClawdbotA2UIHost = class extends i$6 {
-  static properties = {
-    surfaces: { state: true },
-    pendingAction: { state: true },
-    toast: { state: true },
-  };
-  #processor = Data.createSignalA2uiMessageProcessor();
-  #themeProvider = new i$3(this, {
-    context: themeContext,
-    initialValue: clawdbotTheme,
-  });
-  surfaces = [];
-  pendingAction = null;
-  toast = null;
-  #statusListener = null;
-  static styles = i$9`
+	static properties = {
+		surfaces: { state: true },
+		pendingAction: { state: true },
+		toast: { state: true }
+	};
+	#processor = Data.createSignalA2uiMessageProcessor();
+	#themeProvider = new i$3(this, {
+		context: themeContext,
+		initialValue: clawdbotTheme
+	});
+	surfaces = [];
+	pendingAction = null;
+	toast = null;
+	#statusListener = null;
+	static styles = i$9`
     :host {
       display: block;
       height: 100%;
@@ -19743,219 +17568,201 @@ var ClawdbotA2UIHost = class extends i$6 {
       }
     }
   `;
-  connectedCallback() {
-    super.connectedCallback();
-    globalThis.clawdbotA2UI = {
-      applyMessages: (messages) => this.applyMessages(messages),
-      reset: () => this.reset(),
-      getSurfaces: () => Array.from(this.#processor.getSurfaces().keys()),
-    };
-    this.addEventListener("a2uiaction", (evt) => this.#handleA2UIAction(evt));
-    this.#statusListener = (evt) => this.#handleActionStatus(evt);
-    globalThis.addEventListener("clawdbot:a2ui-action-status", this.#statusListener);
-    this.#syncSurfaces();
-  }
-  disconnectedCallback() {
-    super.disconnectedCallback();
-    if (this.#statusListener) {
-      globalThis.removeEventListener("clawdbot:a2ui-action-status", this.#statusListener);
-      this.#statusListener = null;
-    }
-  }
-  #makeActionId() {
-    return (
-      globalThis.crypto?.randomUUID?.() ??
-      `a2ui_${Date.now()}_${Math.random().toString(16).slice(2)}`
-    );
-  }
-  #setToast(text$1, kind = "ok", timeoutMs = 1400) {
-    const toast = {
-      text: text$1,
-      kind,
-      expiresAt: Date.now() + timeoutMs,
-    };
-    this.toast = toast;
-    this.requestUpdate();
-    setTimeout(() => {
-      if (this.toast === toast) {
-        this.toast = null;
-        this.requestUpdate();
-      }
-    }, timeoutMs + 30);
-  }
-  #handleActionStatus(evt) {
-    const detail = evt?.detail ?? null;
-    if (!detail || typeof detail.id !== "string") return;
-    if (!this.pendingAction || this.pendingAction.id !== detail.id) return;
-    if (detail.ok) {
-      this.pendingAction = {
-        ...this.pendingAction,
-        phase: "sent",
-        sentAt: Date.now(),
-      };
-    } else {
-      const msg = typeof detail.error === "string" && detail.error ? detail.error : "send failed";
-      this.pendingAction = {
-        ...this.pendingAction,
-        phase: "error",
-        error: msg,
-      };
-      this.#setToast(`Failed: ${msg}`, "error", 4500);
-    }
-    this.requestUpdate();
-  }
-  #handleA2UIAction(evt) {
-    const payload = evt?.detail ?? evt?.payload ?? null;
-    if (!payload || payload.eventType !== "a2ui.action") {
-      return;
-    }
-    const action = payload.action;
-    const name = action?.name;
-    if (!name) {
-      return;
-    }
-    const sourceComponentId = payload.sourceComponentId ?? "";
-    const surfaces = this.#processor.getSurfaces();
-    let surfaceId = null;
-    let sourceNode = null;
-    for (const [sid, surface] of surfaces.entries()) {
-      const node = surface?.components?.get?.(sourceComponentId) ?? null;
-      if (node) {
-        surfaceId = sid;
-        sourceNode = node;
-        break;
-      }
-    }
-    const context = {};
-    const ctxItems = Array.isArray(action?.context) ? action.context : [];
-    for (const item of ctxItems) {
-      const key = item?.key;
-      const value = item?.value ?? null;
-      if (!key || !value) continue;
-      if (typeof value.path === "string") {
-        const resolved = sourceNode
-          ? this.#processor.getData(sourceNode, value.path, surfaceId ?? undefined)
-          : null;
-        context[key] = resolved;
-        continue;
-      }
-      if (Object.prototype.hasOwnProperty.call(value, "literalString")) {
-        context[key] = value.literalString ?? "";
-        continue;
-      }
-      if (Object.prototype.hasOwnProperty.call(value, "literalNumber")) {
-        context[key] = value.literalNumber ?? 0;
-        continue;
-      }
-      if (Object.prototype.hasOwnProperty.call(value, "literalBoolean")) {
-        context[key] = value.literalBoolean ?? false;
-        continue;
-      }
-    }
-    const actionId = this.#makeActionId();
-    this.pendingAction = {
-      id: actionId,
-      name,
-      phase: "sending",
-      startedAt: Date.now(),
-    };
-    this.requestUpdate();
-    const userAction = {
-      id: actionId,
-      name,
-      surfaceId: surfaceId ?? "main",
-      sourceComponentId,
-      timestamp: new Date().toISOString(),
-      ...(Object.keys(context).length ? { context } : {}),
-    };
-    globalThis.__clawdbotLastA2UIAction = userAction;
-    const handler =
-      globalThis.webkit?.messageHandlers?.clawdbotCanvasA2UIAction ??
-      globalThis.clawdbotCanvasA2UIAction;
-    if (handler?.postMessage) {
-      try {
-        if (handler === globalThis.clawdbotCanvasA2UIAction) {
-          handler.postMessage(JSON.stringify({ userAction }));
-        } else {
-          handler.postMessage({ userAction });
-        }
-      } catch (e$14) {
-        const msg = String(e$14?.message ?? e$14);
-        this.pendingAction = {
-          id: actionId,
-          name,
-          phase: "error",
-          startedAt: Date.now(),
-          error: msg,
-        };
-        this.#setToast(`Failed: ${msg}`, "error", 4500);
-      }
-    } else {
-      this.pendingAction = {
-        id: actionId,
-        name,
-        phase: "error",
-        startedAt: Date.now(),
-        error: "missing native bridge",
-      };
-      this.#setToast("Failed: missing native bridge", "error", 4500);
-    }
-  }
-  applyMessages(messages) {
-    if (!Array.isArray(messages)) {
-      throw new Error("A2UI: expected messages array");
-    }
-    this.#processor.processMessages(messages);
-    this.#syncSurfaces();
-    if (this.pendingAction?.phase === "sent") {
-      this.#setToast(`Updated: ${this.pendingAction.name}`, "ok", 1100);
-      this.pendingAction = null;
-    }
-    this.requestUpdate();
-    return {
-      ok: true,
-      surfaces: this.surfaces.map(([id]) => id),
-    };
-  }
-  reset() {
-    this.#processor.clearSurfaces();
-    this.#syncSurfaces();
-    this.pendingAction = null;
-    this.requestUpdate();
-    return { ok: true };
-  }
-  #syncSurfaces() {
-    this.surfaces = Array.from(this.#processor.getSurfaces().entries());
-  }
-  render() {
-    if (this.surfaces.length === 0) {
-      return b`<div class="empty">
+	connectedCallback() {
+		super.connectedCallback();
+		globalThis.clawdbotA2UI = {
+			applyMessages: (messages) => this.applyMessages(messages),
+			reset: () => this.reset(),
+			getSurfaces: () => Array.from(this.#processor.getSurfaces().keys())
+		};
+		this.addEventListener("a2uiaction", (evt) => this.#handleA2UIAction(evt));
+		this.#statusListener = (evt) => this.#handleActionStatus(evt);
+		globalThis.addEventListener("clawdbot:a2ui-action-status", this.#statusListener);
+		this.#syncSurfaces();
+	}
+	disconnectedCallback() {
+		super.disconnectedCallback();
+		if (this.#statusListener) {
+			globalThis.removeEventListener("clawdbot:a2ui-action-status", this.#statusListener);
+			this.#statusListener = null;
+		}
+	}
+	#makeActionId() {
+		return globalThis.crypto?.randomUUID?.() ?? `a2ui_${Date.now()}_${Math.random().toString(16).slice(2)}`;
+	}
+	#setToast(text$1, kind = "ok", timeoutMs = 1400) {
+		const toast = {
+			text: text$1,
+			kind,
+			expiresAt: Date.now() + timeoutMs
+		};
+		this.toast = toast;
+		this.requestUpdate();
+		setTimeout(() => {
+			if (this.toast === toast) {
+				this.toast = null;
+				this.requestUpdate();
+			}
+		}, timeoutMs + 30);
+	}
+	#handleActionStatus(evt) {
+		const detail = evt?.detail ?? null;
+		if (!detail || typeof detail.id !== "string") return;
+		if (!this.pendingAction || this.pendingAction.id !== detail.id) return;
+		if (detail.ok) {
+			this.pendingAction = {
+				...this.pendingAction,
+				phase: "sent",
+				sentAt: Date.now()
+			};
+		} else {
+			const msg = typeof detail.error === "string" && detail.error ? detail.error : "send failed";
+			this.pendingAction = {
+				...this.pendingAction,
+				phase: "error",
+				error: msg
+			};
+			this.#setToast(`Failed: ${msg}`, "error", 4500);
+		}
+		this.requestUpdate();
+	}
+	#handleA2UIAction(evt) {
+		const payload = evt?.detail ?? evt?.payload ?? null;
+		if (!payload || payload.eventType !== "a2ui.action") {
+			return;
+		}
+		const action = payload.action;
+		const name = action?.name;
+		if (!name) {
+			return;
+		}
+		const sourceComponentId = payload.sourceComponentId ?? "";
+		const surfaces = this.#processor.getSurfaces();
+		let surfaceId = null;
+		let sourceNode = null;
+		for (const [sid, surface] of surfaces.entries()) {
+			const node = surface?.components?.get?.(sourceComponentId) ?? null;
+			if (node) {
+				surfaceId = sid;
+				sourceNode = node;
+				break;
+			}
+		}
+		const context = {};
+		const ctxItems = Array.isArray(action?.context) ? action.context : [];
+		for (const item of ctxItems) {
+			const key = item?.key;
+			const value = item?.value ?? null;
+			if (!key || !value) continue;
+			if (typeof value.path === "string") {
+				const resolved = sourceNode ? this.#processor.getData(sourceNode, value.path, surfaceId ?? undefined) : null;
+				context[key] = resolved;
+				continue;
+			}
+			if (Object.prototype.hasOwnProperty.call(value, "literalString")) {
+				context[key] = value.literalString ?? "";
+				continue;
+			}
+			if (Object.prototype.hasOwnProperty.call(value, "literalNumber")) {
+				context[key] = value.literalNumber ?? 0;
+				continue;
+			}
+			if (Object.prototype.hasOwnProperty.call(value, "literalBoolean")) {
+				context[key] = value.literalBoolean ?? false;
+				continue;
+			}
+		}
+		const actionId = this.#makeActionId();
+		this.pendingAction = {
+			id: actionId,
+			name,
+			phase: "sending",
+			startedAt: Date.now()
+		};
+		this.requestUpdate();
+		const userAction = {
+			id: actionId,
+			name,
+			surfaceId: surfaceId ?? "main",
+			sourceComponentId,
+			timestamp: new Date().toISOString(),
+			...Object.keys(context).length ? { context } : {}
+		};
+		globalThis.__clawdbotLastA2UIAction = userAction;
+		const handler = globalThis.webkit?.messageHandlers?.clawdbotCanvasA2UIAction ?? globalThis.clawdbotCanvasA2UIAction;
+		if (handler?.postMessage) {
+			try {
+				if (handler === globalThis.clawdbotCanvasA2UIAction) {
+					handler.postMessage(JSON.stringify({ userAction }));
+				} else {
+					handler.postMessage({ userAction });
+				}
+			} catch (e$14) {
+				const msg = String(e$14?.message ?? e$14);
+				this.pendingAction = {
+					id: actionId,
+					name,
+					phase: "error",
+					startedAt: Date.now(),
+					error: msg
+				};
+				this.#setToast(`Failed: ${msg}`, "error", 4500);
+			}
+		} else {
+			this.pendingAction = {
+				id: actionId,
+				name,
+				phase: "error",
+				startedAt: Date.now(),
+				error: "missing native bridge"
+			};
+			this.#setToast("Failed: missing native bridge", "error", 4500);
+		}
+	}
+	applyMessages(messages) {
+		if (!Array.isArray(messages)) {
+			throw new Error("A2UI: expected messages array");
+		}
+		this.#processor.processMessages(messages);
+		this.#syncSurfaces();
+		if (this.pendingAction?.phase === "sent") {
+			this.#setToast(`Updated: ${this.pendingAction.name}`, "ok", 1100);
+			this.pendingAction = null;
+		}
+		this.requestUpdate();
+		return {
+			ok: true,
+			surfaces: this.surfaces.map(([id]) => id)
+		};
+	}
+	reset() {
+		this.#processor.clearSurfaces();
+		this.#syncSurfaces();
+		this.pendingAction = null;
+		this.requestUpdate();
+		return { ok: true };
+	}
+	#syncSurfaces() {
+		this.surfaces = Array.from(this.#processor.getSurfaces().entries());
+	}
+	render() {
+		if (this.surfaces.length === 0) {
+			return b`<div class="empty">
         <div class="empty-title">Canvas (A2UI)</div>
         <div>Waiting for A2UI messages…</div>
       </div>`;
-    }
-    const statusText =
-      this.pendingAction?.phase === "sent"
-        ? `Working: ${this.pendingAction.name}`
-        : this.pendingAction?.phase === "sending"
-          ? `Sending: ${this.pendingAction.name}`
-          : this.pendingAction?.phase === "error"
-            ? `Failed: ${this.pendingAction.name}`
-            : "";
-    return b`
+		}
+		const statusText = this.pendingAction?.phase === "sent" ? `Working: ${this.pendingAction.name}` : this.pendingAction?.phase === "sending" ? `Sending: ${this.pendingAction.name}` : this.pendingAction?.phase === "error" ? `Failed: ${this.pendingAction.name}` : "";
+		return b`
       ${this.pendingAction && this.pendingAction.phase !== "error" ? b`<div class="status"><div class="spinner"></div><div>${statusText}</div></div>` : ""}
       ${this.toast ? b`<div class="toast ${this.toast.kind === "error" ? "error" : ""}">${this.toast.text}</div>` : ""}
       <section id="surfaces">
-      ${c$2(
-        this.surfaces,
-        ([surfaceId]) => surfaceId,
-        ([surfaceId, surface]) => b`<a2ui-surface
+      ${c$2(this.surfaces, ([surfaceId]) => surfaceId, ([surfaceId, surface]) => b`<a2ui-surface
           .surfaceId=${surfaceId}
           .surface=${surface}
           .processor=${this.#processor}
-        ></a2ui-surface>`,
-      )}
+        ></a2ui-surface>`)}
     </section>`;
-  }
+	}
 };
 customElements.define("clawdbot-a2ui-host", ClawdbotA2UIHost);

From e4b3c8b98d741db2dbd90da7a82d76cb93d92cdd Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:10:29 +0000
Subject: [PATCH 052/171] fix(macos): switch connection mode to menu

---
 apps/macos/Sources/Clawdbot/GeneralSettings.swift | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/GeneralSettings.swift b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
index 8210cacd1..f6ac522bf 100644
--- a/apps/macos/Sources/Clawdbot/GeneralSettings.swift
+++ b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
@@ -187,13 +187,14 @@ struct GeneralSettings: View {
                 .font(.title3.weight(.semibold))
                 .frame(maxWidth: .infinity, alignment: .leading)
 
-            Picker("", selection: self.$state.connectionMode) {
+            Picker("Mode", selection: self.$state.connectionMode) {
                 Text("Not configured").tag(AppState.ConnectionMode.unconfigured)
                 Text("Local (this Mac)").tag(AppState.ConnectionMode.local)
                 Text("Remote over SSH").tag(AppState.ConnectionMode.remote)
             }
-            .pickerStyle(.segmented)
-            .frame(width: 380, alignment: .leading)
+            .pickerStyle(.menu)
+            .labelsHidden()
+            .frame(width: 260, alignment: .leading)
 
             if self.state.connectionMode == .unconfigured {
                 Text("Pick Local or Remote to start the Gateway.")

From 6492e90c1b075f247c6b0f43e32f2cbb6e3aca97 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:23:30 +0000
Subject: [PATCH 053/171] feat: add auth-aware cache defaults

---
 docs/concepts/session-pruning.md           |  11 ++
 docs/gateway/configuration.md              |   2 +-
 docs/gateway/heartbeat.md                  |   4 +-
 docs/token-use.md                          |  35 +++++++
 src/config/config.pruning-defaults.test.ts |  83 +++++++++++++++
 src/config/defaults.ts                     | 114 ++++++++++++++++++++-
 6 files changed, 245 insertions(+), 4 deletions(-)

diff --git a/docs/concepts/session-pruning.md b/docs/concepts/session-pruning.md
index fdd5080e0..c49fe5370 100644
--- a/docs/concepts/session-pruning.md
+++ b/docs/concepts/session-pruning.md
@@ -15,6 +15,17 @@ Session pruning trims **old tool results** from the in-memory context right befo
  - For best results, match `ttl` to your model `cacheControlTtl`.
  - After a prune, the TTL window resets so subsequent requests keep cache until `ttl` expires again.
 
+## Smart defaults (Anthropic)
+- **OAuth or setup-token** profiles: enable `cache-ttl` pruning and set heartbeat to `1h`.
+- **API key** profiles: enable `cache-ttl` pruning, set heartbeat to `30m`, and default `cacheControlTtl` to `1h` on Anthropic models.
+- If you set any of these values explicitly, Clawdbot does **not** override them.
+
+## What this improves (cost + cache behavior)
+- **Why prune:** Anthropic prompt caching only applies within the TTL. If a session goes idle past the TTL, the next request re-caches the full prompt unless you trim it first.
+- **What gets cheaper:** pruning reduces the **cacheWrite** size for that first request after the TTL expires.
+- **Why the TTL reset matters:** once pruning runs, the cache window resets, so follow‑up requests can reuse the freshly cached prompt instead of re-caching the full history again.
+- **What it does not do:** pruning doesn’t add tokens or “double” costs; it only changes what gets cached on that first post‑TTL request.
+
 ## What can be pruned
 - Only `toolResult` messages.
 - User + assistant messages are **never** modified.
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index b6fd7d141..dafbc5830 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -1600,7 +1600,7 @@ Notes / current limitations:
 - After a prune, the TTL window resets so subsequent requests keep cache until `ttl` expires again.
 - For best results, match `contextPruning.ttl` to the model `cacheControlTtl` you set in `agents.defaults.models.*.params`.
 
-Default (off):
+Default (off, unless Anthropic auth profiles are detected):
 ```json5
 {
   agents: { defaults: { contextPruning: { mode: "off" } } }
diff --git a/docs/gateway/heartbeat.md b/docs/gateway/heartbeat.md
index 639ee23cb..3b882f592 100644
--- a/docs/gateway/heartbeat.md
+++ b/docs/gateway/heartbeat.md
@@ -10,7 +10,7 @@ surface anything that needs attention without spamming you.
 
 ## Quick start (beginner)
 
-1. Leave heartbeats enabled (default is `30m`) or set your own cadence.
+1. Leave heartbeats enabled (default is `30m`, or `1h` for Anthropic OAuth/setup-token) or set your own cadence.
 2. Create a tiny `HEARTBEAT.md` checklist in the agent workspace (optional but recommended).
 3. Decide where heartbeat messages should go (`target: "last"` is the default).
 4. Optional: enable heartbeat reasoning delivery for transparency.
@@ -33,7 +33,7 @@ Example config:
 
 ## Defaults
 
-- Interval: `30m` (set `agents.defaults.heartbeat.every` or per-agent `agents.list[].heartbeat.every`; use `0m` to disable).
+- Interval: `30m` (or `1h` when Anthropic OAuth/setup-token is the detected auth mode). Set `agents.defaults.heartbeat.every` or per-agent `agents.list[].heartbeat.every`; use `0m` to disable.
 - Prompt body (configurable via `agents.defaults.heartbeat.prompt`):
   `Read HEARTBEAT.md if it exists (workspace context). Follow it strictly. Do not infer or repeat old tasks from prior chats. If nothing needs attention, reply HEARTBEAT_OK.`
 - The heartbeat prompt is sent **verbatim** as the user message. The system
diff --git a/docs/token-use.md b/docs/token-use.md
index c27412ff7..f73bbb970 100644
--- a/docs/token-use.md
+++ b/docs/token-use.md
@@ -65,6 +65,41 @@ These are **USD per 1M tokens** for `input`, `output`, `cacheRead`, and
 `cacheWrite`. If pricing is missing, Clawdbot shows tokens only. OAuth tokens
 never show dollar cost.
 
+## Cache TTL and pruning impact
+
+Provider prompt caching only applies within the cache TTL window. Clawdbot can
+optionally run **cache-ttl pruning**: it prunes the session once the cache TTL
+has expired, then resets the cache window so subsequent requests can re-use the
+freshly cached context instead of re-caching the full history. This keeps cache
+write costs lower when a session goes idle past the TTL.
+
+Configure it in [Gateway configuration](/gateway/configuration) and see the
+behavior details in [Session pruning](/concepts/session-pruning).
+
+Heartbeat can keep the cache **warm** across idle gaps. If your model cache TTL
+is `1h`, setting the heartbeat interval just under that (e.g., `55m`) can avoid
+re-caching the full prompt, reducing cache write costs.
+
+For Anthropic API pricing, cache reads are significantly cheaper than input
+tokens, while cache writes are billed at a higher multiplier. See Anthropic’s
+prompt caching pricing for the latest rates and TTL multipliers:
+https://docs.anthropic.com/docs/build-with-claude/prompt-caching
+
+### Example: keep 1h cache warm with heartbeat
+
+```yaml
+agents:
+  defaults:
+    model:
+      primary: "anthropic/claude-opus-4-5"
+    models:
+      "anthropic/claude-opus-4-5":
+        params:
+          cacheControlTtl: "1h"
+    heartbeat:
+      every: "55m"
+```
+
 ## Tips for reducing token pressure
 
 - Use `/compact` to summarize long sessions.
diff --git a/src/config/config.pruning-defaults.test.ts b/src/config/config.pruning-defaults.test.ts
index 8bc4d7e20..0eadd862a 100644
--- a/src/config/config.pruning-defaults.test.ts
+++ b/src/config/config.pruning-defaults.test.ts
@@ -5,6 +5,10 @@ import { withTempHome } from "./test-helpers.js";
 
 describe("config pruning defaults", () => {
   it("does not enable contextPruning by default", async () => {
+    const prevApiKey = process.env.ANTHROPIC_API_KEY;
+    const prevOauthToken = process.env.ANTHROPIC_OAUTH_TOKEN;
+    process.env.ANTHROPIC_API_KEY = "";
+    process.env.ANTHROPIC_OAUTH_TOKEN = "";
     await withTempHome(async (home) => {
       const configDir = path.join(home, ".clawdbot");
       await fs.mkdir(configDir, { recursive: true });
@@ -20,6 +24,85 @@ describe("config pruning defaults", () => {
 
       expect(cfg.agents?.defaults?.contextPruning?.mode).toBeUndefined();
     });
+    if (prevApiKey === undefined) {
+      delete process.env.ANTHROPIC_API_KEY;
+    } else {
+      process.env.ANTHROPIC_API_KEY = prevApiKey;
+    }
+    if (prevOauthToken === undefined) {
+      delete process.env.ANTHROPIC_OAUTH_TOKEN;
+    } else {
+      process.env.ANTHROPIC_OAUTH_TOKEN = prevOauthToken;
+    }
+  });
+
+  it("enables cache-ttl pruning + 1h heartbeat for Anthropic OAuth", async () => {
+    await withTempHome(async (home) => {
+      const configDir = path.join(home, ".clawdbot");
+      await fs.mkdir(configDir, { recursive: true });
+      await fs.writeFile(
+        path.join(configDir, "clawdbot.json"),
+        JSON.stringify(
+          {
+            auth: {
+              profiles: {
+                "anthropic:me": { provider: "anthropic", mode: "oauth", email: "me@example.com" },
+              },
+            },
+            agents: { defaults: {} },
+          },
+          null,
+          2,
+        ),
+        "utf-8",
+      );
+
+      vi.resetModules();
+      const { loadConfig } = await import("./config.js");
+      const cfg = loadConfig();
+
+      expect(cfg.agents?.defaults?.contextPruning?.mode).toBe("cache-ttl");
+      expect(cfg.agents?.defaults?.contextPruning?.ttl).toBe("1h");
+      expect(cfg.agents?.defaults?.heartbeat?.every).toBe("1h");
+    });
+  });
+
+  it("enables cache-ttl pruning + 1h cache TTL for Anthropic API keys", async () => {
+    await withTempHome(async (home) => {
+      const configDir = path.join(home, ".clawdbot");
+      await fs.mkdir(configDir, { recursive: true });
+      await fs.writeFile(
+        path.join(configDir, "clawdbot.json"),
+        JSON.stringify(
+          {
+            auth: {
+              profiles: {
+                "anthropic:api": { provider: "anthropic", mode: "api_key" },
+              },
+            },
+            agents: {
+              defaults: {
+                model: { primary: "anthropic/claude-opus-4-5" },
+              },
+            },
+          },
+          null,
+          2,
+        ),
+        "utf-8",
+      );
+
+      vi.resetModules();
+      const { loadConfig } = await import("./config.js");
+      const cfg = loadConfig();
+
+      expect(cfg.agents?.defaults?.contextPruning?.mode).toBe("cache-ttl");
+      expect(cfg.agents?.defaults?.contextPruning?.ttl).toBe("1h");
+      expect(cfg.agents?.defaults?.heartbeat?.every).toBe("30m");
+      expect(
+        cfg.agents?.defaults?.models?.["anthropic/claude-opus-4-5"]?.params?.cacheControlTtl,
+      ).toBe("1h");
+    });
   });
 
   it("does not override explicit contextPruning mode", async () => {
diff --git a/src/config/defaults.ts b/src/config/defaults.ts
index 9976a64ef..c88c1625f 100644
--- a/src/config/defaults.ts
+++ b/src/config/defaults.ts
@@ -1,3 +1,4 @@
+import { parseModelRef } from "../agents/model-selection.js";
 import { resolveTalkApiKey } from "./talk.js";
 import type { ClawdbotConfig } from "./types.js";
 import { DEFAULT_AGENT_MAX_CONCURRENT, DEFAULT_SUBAGENT_MAX_CONCURRENT } from "./agent-limits.js";
@@ -6,6 +7,8 @@ type WarnState = { warned: boolean };
 
 let defaultWarnState: WarnState = { warned: false };
 
+type AnthropicAuthDefaultsMode = "api_key" | "oauth";
+
 const DEFAULT_MODEL_ALIASES: Readonly<Record<string, string>> = {
   // Anthropic (pi-ai catalog uses "latest" ids without date suffix)
   opus: "anthropic/claude-opus-4-5",
@@ -20,6 +23,40 @@ const DEFAULT_MODEL_ALIASES: Readonly<Record<string, string>> = {
   "gemini-flash": "google/gemini-3-flash-preview",
 };
 
+function resolveAnthropicDefaultAuthMode(cfg: ClawdbotConfig): AnthropicAuthDefaultsMode | null {
+  const profiles = cfg.auth?.profiles ?? {};
+  const anthropicProfiles = Object.entries(profiles).filter(
+    ([, profile]) => profile?.provider === "anthropic",
+  );
+
+  const order = cfg.auth?.order?.anthropic ?? [];
+  for (const profileId of order) {
+    const entry = profiles[profileId];
+    if (!entry || entry.provider !== "anthropic") continue;
+    if (entry.mode === "api_key") return "api_key";
+    if (entry.mode === "oauth" || entry.mode === "token") return "oauth";
+  }
+
+  const hasApiKey = anthropicProfiles.some(([, profile]) => profile?.mode === "api_key");
+  const hasOauth = anthropicProfiles.some(
+    ([, profile]) => profile?.mode === "oauth" || profile?.mode === "token",
+  );
+  if (hasApiKey && !hasOauth) return "api_key";
+  if (hasOauth && !hasApiKey) return "oauth";
+
+  if (process.env.ANTHROPIC_OAUTH_TOKEN?.trim()) return "oauth";
+  if (process.env.ANTHROPIC_API_KEY?.trim()) return "api_key";
+  return null;
+}
+
+function resolvePrimaryModelRef(raw?: string): string | null {
+  if (!raw || typeof raw !== "string") return null;
+  const trimmed = raw.trim();
+  if (!trimmed) return null;
+  const aliasKey = trimmed.toLowerCase();
+  return DEFAULT_MODEL_ALIASES[aliasKey] ?? trimmed;
+}
+
 export type SessionDefaultsOptions = {
   warn?: (message: string) => void;
   warnState?: WarnState;
@@ -157,7 +194,82 @@ export function applyLoggingDefaults(cfg: ClawdbotConfig): ClawdbotConfig {
 }
 
 export function applyContextPruningDefaults(cfg: ClawdbotConfig): ClawdbotConfig {
-  return cfg;
+  const defaults = cfg.agents?.defaults;
+  if (!defaults) return cfg;
+
+  const authMode = resolveAnthropicDefaultAuthMode(cfg);
+  if (!authMode) return cfg;
+
+  let mutated = false;
+  const nextDefaults = { ...defaults };
+
+  if (defaults.contextPruning?.mode === undefined) {
+    nextDefaults.contextPruning = {
+      ...(defaults.contextPruning ?? {}),
+      mode: "cache-ttl",
+      ttl: defaults.contextPruning?.ttl ?? "1h",
+    };
+    mutated = true;
+  }
+
+  if (defaults.heartbeat?.every === undefined) {
+    nextDefaults.heartbeat = {
+      ...(defaults.heartbeat ?? {}),
+      every: authMode === "oauth" ? "1h" : "30m",
+    };
+    mutated = true;
+  }
+
+  if (authMode === "api_key") {
+    const nextModels = defaults.models ? { ...defaults.models } : {};
+    let modelsMutated = false;
+
+    for (const [key, entry] of Object.entries(nextModels)) {
+      const parsed = parseModelRef(key, "anthropic");
+      if (!parsed || parsed.provider !== "anthropic") continue;
+      const current = entry ?? {};
+      const params = (current as { params?: Record<string, unknown> }).params ?? {};
+      if (typeof params.cacheControlTtl === "string") continue;
+      nextModels[key] = {
+        ...(current as Record<string, unknown>),
+        params: { ...params, cacheControlTtl: "1h" },
+      };
+      modelsMutated = true;
+    }
+
+    const primary = resolvePrimaryModelRef(defaults.model?.primary ?? undefined);
+    if (primary) {
+      const parsedPrimary = parseModelRef(primary, "anthropic");
+      if (parsedPrimary?.provider === "anthropic") {
+        const key = `${parsedPrimary.provider}/${parsedPrimary.model}`;
+        const entry = nextModels[key];
+        const current = entry ?? {};
+        const params = (current as { params?: Record<string, unknown> }).params ?? {};
+        if (typeof params.cacheControlTtl !== "string") {
+          nextModels[key] = {
+            ...(current as Record<string, unknown>),
+            params: { ...params, cacheControlTtl: "1h" },
+          };
+          modelsMutated = true;
+        }
+      }
+    }
+
+    if (modelsMutated) {
+      nextDefaults.models = nextModels;
+      mutated = true;
+    }
+  }
+
+  if (!mutated) return cfg;
+
+  return {
+    ...cfg,
+    agents: {
+      ...cfg.agents,
+      defaults: nextDefaults,
+    },
+  };
 }
 
 export function applyCompactionDefaults(cfg: ClawdbotConfig): ClawdbotConfig {

From 0d3b8f6ac3dfbd52f8909bb3016f2db04f50dce3 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:24:12 +0000
Subject: [PATCH 054/171] feat: make nodes run exec-style

---
 CHANGELOG.md                         |   1 +
 docs/cli/nodes.md                    |  15 ++
 src/cli/nodes-cli.coverage.test.ts   |  56 ++++++
 src/cli/nodes-cli/register.invoke.ts | 244 ++++++++++++++++++++++++++-
 src/infra/exec-approvals.ts          |  37 +++-
 5 files changed, 338 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2691cde9b..acb3cb33a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Docs: https://docs.clawd.bot
 - CLI: exec approvals mutations render tables instead of raw JSON.
 - Exec approvals: support wildcard agent allowlists (`*`) across all agents.
 - Nodes: expose node PATH in status/describe and bootstrap PATH for node-host execution.
+- Nodes: run always uses exec approvals + defaults, with raw shell mode and ask/security overrides. https://docs.clawd.bot/cli/nodes
 - CLI: flatten node service commands under `clawdbot node` and remove `service node` docs.
 - CLI: move gateway service commands under `clawdbot gateway` and add `gateway probe` for reachability.
 - Sessions: add per-channel reset overrides via `session.resetByChannel`. (#1353) Thanks @cash-echo-bot.
diff --git a/docs/cli/nodes.md b/docs/cli/nodes.md
index b76bf4d36..4064006ee 100644
--- a/docs/cli/nodes.md
+++ b/docs/cli/nodes.md
@@ -36,4 +36,19 @@ filter to nodes that connected within a duration (e.g. `24h`, `7d`).
 ```bash
 clawdbot nodes invoke --node <id|name|ip> --command <command> --params <json>
 clawdbot nodes run --node <id|name|ip> <command...>
+clawdbot nodes run --raw "git status"
+clawdbot nodes run --agent main --node <id|name|ip> --raw "git status"
 ```
+
+### Exec-style defaults
+
+`nodes run` mirrors the model’s exec behavior (defaults + approvals):
+
+- Reads `tools.exec.*` (plus `agents.list[].tools.exec.*` overrides).
+- Uses exec approvals (`exec.approval.request`) before invoking `system.run`.
+- `--node` can be omitted when `tools.exec.node` is set.
+
+Flags:
+- `--raw <command>`: run a shell string (`/bin/sh -lc` or `cmd.exe /c`).
+- `--agent <id>`: agent-scoped approvals/allowlists (defaults to configured agent).
+- `--ask <off|on-miss|always>`, `--security <deny|allowlist|full>`: overrides.
diff --git a/src/cli/nodes-cli.coverage.test.ts b/src/cli/nodes-cli.coverage.test.ts
index 8c7af5c03..7e6e482dd 100644
--- a/src/cli/nodes-cli.coverage.test.ts
+++ b/src/cli/nodes-cli.coverage.test.ts
@@ -27,6 +27,25 @@ const callGateway = vi.fn(async (opts: { method?: string }) => {
       },
     };
   }
+  if (opts.method === "exec.approvals.get") {
+    return {
+      path: "/tmp/exec-approvals.json",
+      exists: true,
+      hash: "hash",
+      file: {
+        version: 1,
+        defaults: {
+          security: "allowlist",
+          ask: "on-miss",
+          askFallback: "deny",
+        },
+        agents: {},
+      },
+    };
+  }
+  if (opts.method === "exec.approval.request") {
+    return { decision: "allow-once" };
+  }
   return { ok: true };
 });
 
@@ -51,6 +70,10 @@ vi.mock("../runtime.js", () => ({
   defaultRuntime,
 }));
 
+vi.mock("../config/config.js", () => ({
+  loadConfig: () => ({}),
+}));
+
 describe("nodes-cli coverage", () => {
   it("lists nodes via node.list", async () => {
     runtimeLogs.length = 0;
@@ -112,10 +135,43 @@ describe("nodes-cli coverage", () => {
       env: { FOO: "bar" },
       timeoutMs: 1200,
       needsScreenRecording: true,
+      agentId: "main",
+      approved: true,
+      approvalDecision: "allow-once",
     });
     expect(invoke?.params?.timeoutMs).toBe(5000);
   });
 
+  it("invokes system.run with raw command", async () => {
+    runtimeLogs.length = 0;
+    runtimeErrors.length = 0;
+    callGateway.mockClear();
+    randomIdempotencyKey.mockClear();
+
+    const { registerNodesCli } = await import("./nodes-cli.js");
+    const program = new Command();
+    program.exitOverride();
+    registerNodesCli(program);
+
+    await program.parseAsync(
+      ["nodes", "run", "--agent", "main", "--node", "mac-1", "--raw", "echo hi"],
+      { from: "user" },
+    );
+
+    const invoke = callGateway.mock.calls.find((call) => call[0]?.method === "node.invoke")?.[0];
+
+    expect(invoke).toBeTruthy();
+    expect(invoke?.params?.idempotencyKey).toBe("rk_test");
+    expect(invoke?.params?.command).toBe("system.run");
+    expect(invoke?.params?.params).toMatchObject({
+      command: ["/bin/sh", "-lc", "echo hi"],
+      rawCommand: "echo hi",
+      agentId: "main",
+      approved: true,
+      approvalDecision: "allow-once",
+    });
+  });
+
   it("invokes system.notify with provided fields", async () => {
     runtimeLogs.length = 0;
     runtimeErrors.length = 0;
diff --git a/src/cli/nodes-cli/register.invoke.ts b/src/cli/nodes-cli/register.invoke.ts
index 940e579a3..9e893b9f5 100644
--- a/src/cli/nodes-cli/register.invoke.ts
+++ b/src/cli/nodes-cli/register.invoke.ts
@@ -1,10 +1,122 @@
+import path from "node:path";
 import type { Command } from "commander";
 import { randomIdempotencyKey } from "../../gateway/call.js";
 import { defaultRuntime } from "../../runtime.js";
 import { parseEnvPairs, parseTimeoutMs } from "../nodes-run.js";
 import { getNodesTheme, runNodesCommand } from "./cli-utils.js";
+import { parseNodeList } from "./format.js";
 import { callGatewayCli, nodesCallOpts, resolveNodeId, unauthorizedHintForMessage } from "./rpc.js";
 import type { NodesRpcOpts } from "./types.js";
+import { loadConfig } from "../../config/config.js";
+import { resolveAgentConfig, resolveDefaultAgentId } from "../../agents/agent-scope.js";
+import {
+  type ExecApprovalsFile,
+  type ExecAsk,
+  type ExecSecurity,
+  maxAsk,
+  minSecurity,
+  resolveExecApprovalsFromFile,
+} from "../../infra/exec-approvals.js";
+import { buildNodeShellCommand } from "../../infra/node-shell.js";
+
+type NodesRunOpts = NodesRpcOpts & {
+  node?: string;
+  cwd?: string;
+  env?: string[];
+  commandTimeout?: string;
+  needsScreenRecording?: boolean;
+  invokeTimeout?: string;
+  idempotencyKey?: string;
+  agent?: string;
+  ask?: string;
+  security?: string;
+  raw?: string;
+};
+
+type ExecDefaults = {
+  security?: ExecSecurity;
+  ask?: ExecAsk;
+  node?: string;
+  pathPrepend?: string[];
+};
+
+function normalizeExecSecurity(value?: string | null): ExecSecurity | null {
+  const normalized = value?.trim().toLowerCase();
+  if (normalized === "deny" || normalized === "allowlist" || normalized === "full") {
+    return normalized;
+  }
+  return null;
+}
+
+function normalizeExecAsk(value?: string | null): ExecAsk | null {
+  const normalized = value?.trim().toLowerCase();
+  if (normalized === "off" || normalized === "on-miss" || normalized === "always") {
+    return normalized as ExecAsk;
+  }
+  return null;
+}
+
+function mergePathPrepend(existing: string | undefined, prepend: string[]) {
+  if (prepend.length === 0) return existing;
+  const partsExisting = (existing ?? "")
+    .split(path.delimiter)
+    .map((part) => part.trim())
+    .filter(Boolean);
+  const merged: string[] = [];
+  const seen = new Set<string>();
+  for (const part of [...prepend, ...partsExisting]) {
+    if (seen.has(part)) continue;
+    seen.add(part);
+    merged.push(part);
+  }
+  return merged.join(path.delimiter);
+}
+
+function applyPathPrepend(
+  env: Record<string, string>,
+  prepend: string[] | undefined,
+  options?: { requireExisting?: boolean },
+) {
+  if (!Array.isArray(prepend) || prepend.length === 0) return;
+  if (options?.requireExisting && !env.PATH) return;
+  const merged = mergePathPrepend(env.PATH, prepend);
+  if (merged) env.PATH = merged;
+}
+
+function resolveExecDefaults(
+  cfg: ReturnType<typeof loadConfig> | undefined,
+  agentId: string | undefined,
+): ExecDefaults | undefined {
+  const globalExec = cfg?.tools?.exec;
+  if (!agentId) {
+    return globalExec
+      ? {
+          security: globalExec.security,
+          ask: globalExec.ask,
+          node: globalExec.node,
+          pathPrepend: globalExec.pathPrepend,
+        }
+      : undefined;
+  }
+  const agentExec = resolveAgentConfig(cfg, agentId)?.tools?.exec;
+  return {
+    security: agentExec?.security ?? globalExec?.security,
+    ask: agentExec?.ask ?? globalExec?.ask,
+    node: agentExec?.node ?? globalExec?.node,
+    pathPrepend: agentExec?.pathPrepend ?? globalExec?.pathPrepend,
+  };
+}
+
+async function resolveNodePlatform(opts: NodesRpcOpts, nodeId: string): Promise<string | null> {
+  try {
+    const res = (await callGatewayCli("node.list", opts, {})) as unknown;
+    const nodes = parseNodeList(res);
+    const match = nodes.find((node) => node.nodeId === nodeId);
+    return typeof match?.platform === "string" ? match.platform : null;
+  } catch {
+    return null;
+  }
+}
 
 export function registerNodesInvokeCommands(nodes: Command) {
   nodesCallOpts(
@@ -52,39 +164,157 @@ export function registerNodesInvokeCommands(nodes: Command) {
     nodes
       .command("run")
       .description("Run a shell command on a node (mac only)")
-      .requiredOption("--node <idOrNameOrIp>", "Node id, name, or IP")
+      .option("--node <idOrNameOrIp>", "Node id, name, or IP")
       .option("--cwd <path>", "Working directory")
       .option(
         "--env <key=val>",
         "Environment override (repeatable)",
         (value: string, prev: string[] = []) => [...prev, value],
       )
+      .option("--raw <command>", "Run a raw shell command string (sh -lc / cmd.exe /c)")
+      .option("--agent <id>", "Agent id (default: configured default agent)")
+      .option("--ask <mode>", "Exec ask mode (off|on-miss|always)")
+      .option("--security <mode>", "Exec security mode (deny|allowlist|full)")
       .option("--command-timeout <ms>", "Command timeout (ms)")
       .option("--needs-screen-recording", "Require screen recording permission")
       .option("--invoke-timeout <ms>", "Node invoke timeout in ms (default 30000)", "30000")
-      .argument("<command...>", "Command and args")
-      .action(async (command: string[], opts: NodesRpcOpts) => {
+      .argument("[command...]", "Command and args")
+      .action(async (command: string[], opts: NodesRunOpts) => {
         await runNodesCommand("run", async () => {
-          const nodeId = await resolveNodeId(opts, String(opts.node ?? ""));
-          if (!Array.isArray(command) || command.length === 0) {
+          const cfg = loadConfig();
+          const agentId = opts.agent?.trim() || resolveDefaultAgentId(cfg);
+          const execDefaults = resolveExecDefaults(cfg, agentId);
+          const raw = typeof opts.raw === "string" ? opts.raw.trim() : "";
+          if (raw && Array.isArray(command) && command.length > 0) {
+            throw new Error("use --raw or argv, not both");
+          }
+          if (!raw && (!Array.isArray(command) || command.length === 0)) {
             throw new Error("command required");
           }
+
+          const nodeQuery = String(opts.node ?? "").trim() || execDefaults?.node?.trim() || "";
+          if (!nodeQuery) {
+            throw new Error("node required (set --node or tools.exec.node)");
+          }
+          const nodeId = await resolveNodeId(opts, nodeQuery);
+
           const env = parseEnvPairs(opts.env);
           const timeoutMs = parseTimeoutMs(opts.commandTimeout);
           const invokeTimeout = parseTimeoutMs(opts.invokeTimeout);
 
+          let argv = Array.isArray(command) ? command : [];
+          let rawCommand: string | undefined;
+          if (raw) {
+            rawCommand = raw;
+            const platform = await resolveNodePlatform(opts, nodeId);
+            argv = buildNodeShellCommand(rawCommand, platform ?? undefined);
+          }
+
+          const nodeEnv = env ? { ...env } : undefined;
+          if (nodeEnv) {
+            applyPathPrepend(nodeEnv, execDefaults?.pathPrepend, { requireExisting: true });
+          }
+
+          let approvedByAsk = false;
+          let approvalDecision: "allow-once" | "allow-always" | null = null;
+          const configuredSecurity = normalizeExecSecurity(execDefaults?.security) ?? "allowlist";
+          const requestedSecurity = normalizeExecSecurity(opts.security);
+          if (opts.security && !requestedSecurity) {
+            throw new Error("invalid --security (use deny|allowlist|full)");
+          }
+          const configuredAsk = normalizeExecAsk(execDefaults?.ask) ?? "on-miss";
+          const requestedAsk = normalizeExecAsk(opts.ask);
+          if (opts.ask && !requestedAsk) {
+            throw new Error("invalid --ask (use off|on-miss|always)");
+          }
+          const security = minSecurity(configuredSecurity, requestedSecurity ?? configuredSecurity);
+          const ask = maxAsk(configuredAsk, requestedAsk ?? configuredAsk);
+
+          const approvalsSnapshot = (await callGatewayCli("exec.approvals.get", opts, {})) as {
+            file?: unknown;
+          } | null;
+          const approvalsFile =
+            approvalsSnapshot && typeof approvalsSnapshot === "object"
+              ? approvalsSnapshot.file
+              : undefined;
+          if (!approvalsFile || typeof approvalsFile !== "object") {
+            throw new Error("exec approvals unavailable");
+          }
+          const approvals = resolveExecApprovalsFromFile({
+            file: approvalsFile as ExecApprovalsFile,
+            agentId,
+            overrides: { security: "allowlist" },
+          });
+          const hostSecurity = minSecurity(security, approvals.agent.security);
+          const hostAsk = maxAsk(ask, approvals.agent.ask);
+          const askFallback = approvals.agent.askFallback;
+
+          if (hostSecurity === "deny") {
+            throw new Error("exec denied: host=node security=deny");
+          }
+
+          const requiresAsk = hostAsk === "always" || hostAsk === "on-miss";
+          if (requiresAsk) {
+            const decisionResult = (await callGatewayCli("exec.approval.request", opts, {
+              command: rawCommand ?? argv.join(" "),
+              cwd: opts.cwd,
+              host: "node",
+              security: hostSecurity,
+              ask: hostAsk,
+              agentId,
+              resolvedPath: null,
+              sessionKey: null,
+              timeoutMs: 120_000,
+            })) as { decision?: string } | null;
+            const decision =
+              decisionResult && typeof decisionResult === "object"
+                ? (decisionResult.decision ?? null)
+                : null;
+            if (decision === "deny") {
+              throw new Error("exec denied: user denied");
+            }
+            if (!decision) {
+              if (askFallback === "full") {
+                approvedByAsk = true;
+                approvalDecision = "allow-once";
+              } else if (askFallback === "allowlist") {
+                // defer allowlist enforcement to node host
+              } else {
+                throw new Error("exec denied: approval required (approval UI not available)");
+              }
+            }
+            if (decision === "allow-once") {
+              approvedByAsk = true;
+              approvalDecision = "allow-once";
+            }
+            if (decision === "allow-always") {
+              approvedByAsk = true;
+              approvalDecision = "allow-always";
+            }
+          }
+
           const invokeParams: Record<string, unknown> = {
             nodeId,
             command: "system.run",
             params: {
-              command,
+              command: argv,
               cwd: opts.cwd,
-              env,
+              env: nodeEnv,
               timeoutMs,
               needsScreenRecording: opts.needsScreenRecording === true,
             },
             idempotencyKey: String(opts.idempotencyKey ?? randomIdempotencyKey()),
           };
+          if (agentId) {
+            (invokeParams.params as Record<string, unknown>).agentId = agentId;
+          }
+          if (rawCommand) {
+            (invokeParams.params as Record<string, unknown>).rawCommand = rawCommand;
+          }
+          (invokeParams.params as Record<string, unknown>).approved = approvedByAsk;
+          if (approvalDecision) {
+            (invokeParams.params as Record<string, unknown>).approvalDecision = approvalDecision;
+          }
           if (invokeTimeout !== undefined) {
             invokeParams.timeoutMs = invokeTimeout;
           }
diff --git a/src/infra/exec-approvals.ts b/src/infra/exec-approvals.ts
index 5dd5fe26a..ad4846e9c 100644
--- a/src/infra/exec-approvals.ts
+++ b/src/infra/exec-approvals.ts
@@ -210,14 +210,33 @@ export function resolveExecApprovals(
   overrides?: ExecApprovalsDefaultOverrides,
 ): ExecApprovalsResolved {
   const file = ensureExecApprovals();
+  return resolveExecApprovalsFromFile({
+    file,
+    agentId,
+    overrides,
+    path: resolveExecApprovalsPath(),
+    socketPath: expandHome(file.socket?.path ?? resolveExecApprovalsSocketPath()),
+    token: file.socket?.token ?? "",
+  });
+}
+
+export function resolveExecApprovalsFromFile(params: {
+  file: ExecApprovalsFile;
+  agentId?: string;
+  overrides?: ExecApprovalsDefaultOverrides;
+  path?: string;
+  socketPath?: string;
+  token?: string;
+}): ExecApprovalsResolved {
+  const file = normalizeExecApprovals(params.file);
   const defaults = file.defaults ?? {};
-  const agentKey = agentId ?? "default";
+  const agentKey = params.agentId ?? "default";
   const agent = file.agents?.[agentKey] ?? {};
   const wildcard = file.agents?.["*"] ?? {};
-  const fallbackSecurity = overrides?.security ?? DEFAULT_SECURITY;
-  const fallbackAsk = overrides?.ask ?? DEFAULT_ASK;
-  const fallbackAskFallback = overrides?.askFallback ?? DEFAULT_ASK_FALLBACK;
-  const fallbackAutoAllowSkills = overrides?.autoAllowSkills ?? DEFAULT_AUTO_ALLOW_SKILLS;
+  const fallbackSecurity = params.overrides?.security ?? DEFAULT_SECURITY;
+  const fallbackAsk = params.overrides?.ask ?? DEFAULT_ASK;
+  const fallbackAskFallback = params.overrides?.askFallback ?? DEFAULT_ASK_FALLBACK;
+  const fallbackAutoAllowSkills = params.overrides?.autoAllowSkills ?? DEFAULT_AUTO_ALLOW_SKILLS;
   const resolvedDefaults: Required<ExecApprovalsDefaults> = {
     security: normalizeSecurity(defaults.security, fallbackSecurity),
     ask: normalizeAsk(defaults.ask, fallbackAsk),
@@ -246,9 +265,11 @@ export function resolveExecApprovals(
     ...(Array.isArray(agent.allowlist) ? agent.allowlist : []),
   ];
   return {
-    path: resolveExecApprovalsPath(),
-    socketPath: expandHome(file.socket?.path ?? resolveExecApprovalsSocketPath()),
-    token: file.socket?.token ?? "",
+    path: params.path ?? resolveExecApprovalsPath(),
+    socketPath: expandHome(
+      params.socketPath ?? file.socket?.path ?? resolveExecApprovalsSocketPath(),
+    ),
+    token: params.token ?? file.socket?.token ?? "",
     defaults: resolvedDefaults,
     agent: resolvedAgent,
     allowlist,

From ad7ef27f6648a9c9dd1b6d74150b62982394a77a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:25:28 +0000
Subject: [PATCH 055/171] refactor(macos): tidy settings layout

---
 .../Sources/Clawdbot/DebugSettings.swift      | 16 ++++++++++++++
 .../Sources/Clawdbot/GeneralSettings.swift    | 21 -------------------
 .../Clawdbot/PermissionsSettings.swift        | 20 ++----------------
 3 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/DebugSettings.swift b/apps/macos/Sources/Clawdbot/DebugSettings.swift
index 26a1f9830..542c69112 100644
--- a/apps/macos/Sources/Clawdbot/DebugSettings.swift
+++ b/apps/macos/Sources/Clawdbot/DebugSettings.swift
@@ -484,6 +484,22 @@ struct DebugSettings: View {
                     }
                 }
 
+                VStack(alignment: .leading, spacing: 6) {
+                    Text(
+                        "Note: macOS may require restarting Clawdbot after enabling Accessibility or Screen Recording.")
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .fixedSize(horizontal: false, vertical: true)
+
+                    Button {
+                        LaunchdManager.startClawdbot()
+                    } label: {
+                        Label("Restart Clawdbot", systemImage: "arrow.counterclockwise")
+                    }
+                    .buttonStyle(.bordered)
+                    .controlSize(.small)
+                }
+
                 HStack(spacing: 8) {
                     Button("Restart app") { DebugActions.restartApp() }
                     Button("Restart onboarding") { DebugActions.restartOnboarding() }
diff --git a/apps/macos/Sources/Clawdbot/GeneralSettings.swift b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
index f6ac522bf..22779dd18 100644
--- a/apps/macos/Sources/Clawdbot/GeneralSettings.swift
+++ b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
@@ -29,25 +29,6 @@ struct GeneralSettings: View {
     var body: some View {
         ScrollView(.vertical) {
             VStack(alignment: .leading, spacing: 18) {
-                if !self.state.onboardingSeen {
-                    Button {
-                        DebugActions.restartOnboarding()
-                    } label: {
-                        HStack(spacing: 8) {
-                            Label("Complete onboarding to finish setup", systemImage: "arrow.counterclockwise")
-                                .font(.callout.weight(.semibold))
-                                .foregroundStyle(Color.accentColor)
-                            Spacer(minLength: 0)
-                            Image(systemName: "chevron.right")
-                                .font(.caption.weight(.semibold))
-                                .foregroundStyle(.tertiary)
-                        }
-                        .contentShape(Rectangle())
-                    }
-                    .buttonStyle(.plain)
-                    .padding(.bottom, 2)
-                }
-
                 VStack(alignment: .leading, spacing: 12) {
                     SettingsToggleRow(
                         title: "Clawdbot active",
@@ -83,8 +64,6 @@ struct GeneralSettings: View {
                         subtitle: "Allow the agent to capture a photo or short video via the built-in camera.",
                         binding: self.$cameraEnabled)
 
-                    SystemRunSettingsView()
-
                     VStack(alignment: .leading, spacing: 6) {
                         Text("Location Access")
                             .font(.body)
diff --git a/apps/macos/Sources/Clawdbot/PermissionsSettings.swift b/apps/macos/Sources/Clawdbot/PermissionsSettings.swift
index d7ee5339c..279c938ff 100644
--- a/apps/macos/Sources/Clawdbot/PermissionsSettings.swift
+++ b/apps/macos/Sources/Clawdbot/PermissionsSettings.swift
@@ -8,6 +8,8 @@ struct PermissionsSettings: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 14) {
+            SystemRunSettingsView()
+
             Text("Allow these so Clawdbot can notify and capture when needed.")
                 .padding(.top, 4)
 
@@ -46,24 +48,6 @@ struct PermissionStatusList: View {
             .padding(.top, 2)
             .help("Refresh status")
 
-            if (self.status[.accessibility] ?? false) == false || (self.status[.screenRecording] ?? false) == false {
-                VStack(alignment: .leading, spacing: 8) {
-                    Text(
-                        "Note: macOS may require restarting Clawdbot after enabling Accessibility or Screen Recording.")
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                        .fixedSize(horizontal: false, vertical: true)
-
-                    Button {
-                        LaunchdManager.startClawdbot()
-                    } label: {
-                        Label("Restart Clawdbot", systemImage: "arrow.counterclockwise")
-                    }
-                    .buttonStyle(.bordered)
-                    .controlSize(.small)
-                }
-                .padding(.top, 4)
-            }
         }
     }
 

From 717fb9e4139ed61805301ae811851e6c786e77ce Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:26:10 +0000
Subject: [PATCH 056/171] refactor(macos): drop CLI install UI

---
 .../Sources/Clawdbot/GeneralSettings.swift    | 78 -------------------
 1 file changed, 78 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/GeneralSettings.swift b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
index 22779dd18..b2fdac6f0 100644
--- a/apps/macos/Sources/Clawdbot/GeneralSettings.swift
+++ b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
@@ -15,10 +15,6 @@ struct GeneralSettings: View {
     private let gatewayManager = GatewayProcessManager.shared
     @State private var gatewayDiscovery = GatewayDiscoveryModel(
         localDisplayName: InstanceIdentity.displayName)
-    @State private var isInstallingCLI = false
-    @State private var cliStatus: String?
-    @State private var cliInstalled = false
-    @State private var cliInstallLocation: String?
     @State private var gatewayStatus: GatewayEnvironmentStatus = .checking
     @State private var remoteStatus: RemoteStatus = .idle
     @State private var showRemoteAdvanced = false
@@ -109,7 +105,6 @@ struct GeneralSettings: View {
         }
         .onAppear {
             guard !self.isPreview else { return }
-            self.refreshCLIStatus()
             self.refreshGatewayStatus()
             self.lastLocationModeRaw = self.locationModeRaw
         }
@@ -197,7 +192,6 @@ struct GeneralSettings: View {
                 self.remoteCard
             }
 
-            self.cliInstaller
         }
     }
 
@@ -326,59 +320,6 @@ struct GeneralSettings: View {
         return message == self.controlStatusLine
     }
 
-    private var cliInstaller: some View {
-        VStack(alignment: .leading, spacing: 8) {
-            HStack(spacing: 10) {
-                Button {
-                    Task { await self.installCLI() }
-                } label: {
-                    let title = self.cliInstalled ? "Reinstall CLI" : "Install CLI"
-                    ZStack {
-                        Text(title)
-                            .opacity(self.isInstallingCLI ? 0 : 1)
-                        if self.isInstallingCLI {
-                            ProgressView()
-                                .controlSize(.mini)
-                        }
-                    }
-                    .frame(minWidth: 150)
-                }
-                .disabled(self.isInstallingCLI)
-
-                if self.isInstallingCLI {
-                    Text("Working...")
-                        .font(.callout)
-                        .foregroundStyle(.secondary)
-                } else if self.cliInstalled {
-                    Label("Installed", systemImage: "checkmark.circle.fill")
-                        .font(.callout)
-                        .foregroundStyle(.secondary)
-                } else {
-                    Text("Not installed")
-                        .font(.callout)
-                        .foregroundStyle(.secondary)
-                }
-            }
-
-            if let status = cliStatus {
-                Text(status)
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-                    .lineLimit(2)
-            } else if let installLocation = self.cliInstallLocation {
-                Text("Found at \(installLocation)")
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-                    .lineLimit(2)
-            } else {
-                Text("Installs a user-space Node 22+ runtime and the CLI (no Homebrew).")
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-                    .lineLimit(2)
-            }
-        }
-    }
-
     private var gatewayInstallerCard: some View {
         VStack(alignment: .leading, spacing: 8) {
             HStack(spacing: 10) {
@@ -434,22 +375,6 @@ struct GeneralSettings: View {
         .cornerRadius(10)
     }
 
-    private func installCLI() async {
-        guard !self.isInstallingCLI else { return }
-        self.isInstallingCLI = true
-        defer { isInstallingCLI = false }
-        await CLIInstaller.install { status in
-            self.cliStatus = status
-            self.refreshCLIStatus()
-        }
-    }
-
-    private func refreshCLIStatus() {
-        let installLocation = CLIInstaller.installedLocation()
-        self.cliInstallLocation = installLocation
-        self.cliInstalled = installLocation != nil
-    }
-
     private func refreshGatewayStatus() {
         Task {
             let status = await Task.detached(priority: .utility) {
@@ -743,9 +668,6 @@ extension GeneralSettings {
             message: "Gateway ready")
         view.remoteStatus = .failed("SSH failed")
         view.showRemoteAdvanced = true
-        view.cliInstalled = true
-        view.cliInstallLocation = "/usr/local/bin/clawdbot"
-        view.cliStatus = "Installed"
         _ = view.body
 
         state.connectionMode = .unconfigured

From 31943dcecb8dbe0650d08514be19e9ed2eadfe6a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:30:29 +0000
Subject: [PATCH 057/171] feat: add heartbeat active hours

---
 docs/gateway/configuration.md                 |  4 +
 docs/gateway/heartbeat.md                     |  4 +
 src/config/types.agent-defaults.ts            |  9 ++
 src/config/zod-schema.agent-runtime.ts        | 44 ++++++++++
 ...tbeat-runner.returns-default-unset.test.ts | 24 ++++++
 src/infra/heartbeat-runner.ts                 | 82 ++++++++++++++++++-
 6 files changed, 166 insertions(+), 1 deletion(-)

diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index dafbc5830..51d3c46fb 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -1737,6 +1737,10 @@ Z.AI models are available as `zai/<model>` (e.g. `zai/glm-4.7`) and require
   `30m`. Set `0m` to disable.
 - `model`: optional override model for heartbeat runs (`provider/model`).
 - `includeReasoning`: when `true`, heartbeats will also deliver the separate `Reasoning:` message when available (same shape as `/reasoning on`). Default: `false`.
+- `activeHours`: optional local-time window that controls when heartbeats run.
+  - `start`: start time (HH:MM, 24h). Inclusive.
+  - `end`: end time (HH:MM, 24h). Exclusive. Use `"24:00"` for end-of-day.
+  - `timezone`: `"user"` (default), `"local"`, or an IANA timezone id.
 - `target`: optional delivery channel (`last`, `whatsapp`, `telegram`, `discord`, `slack`, `signal`, `imessage`, `none`). Default: `last`.
 - `to`: optional recipient override (channel-specific id, e.g. E.164 for WhatsApp, chat id for Telegram).
 - `prompt`: optional override for the heartbeat body (default: `Read HEARTBEAT.md if it exists (workspace context). Follow it strictly. Do not infer or repeat old tasks from prior chats. If nothing needs attention, reply HEARTBEAT_OK.`). Overrides are sent verbatim; include a `Read HEARTBEAT.md` line if you still want the file read.
diff --git a/docs/gateway/heartbeat.md b/docs/gateway/heartbeat.md
index 3b882f592..d1099dcf5 100644
--- a/docs/gateway/heartbeat.md
+++ b/docs/gateway/heartbeat.md
@@ -14,6 +14,7 @@ surface anything that needs attention without spamming you.
 2. Create a tiny `HEARTBEAT.md` checklist in the agent workspace (optional but recommended).
 3. Decide where heartbeat messages should go (`target: "last"` is the default).
 4. Optional: enable heartbeat reasoning delivery for transparency.
+5. Optional: restrict heartbeats to active hours (local time).
 
 Example config:
 
@@ -24,6 +25,7 @@ Example config:
       heartbeat: {
         every: "30m",
         target: "last",
+        // activeHours: { start: "08:00", end: "24:00", timezone: "user" },
         // includeReasoning: true, // optional: send separate `Reasoning:` message too
       }
     }
@@ -38,6 +40,8 @@ Example config:
   `Read HEARTBEAT.md if it exists (workspace context). Follow it strictly. Do not infer or repeat old tasks from prior chats. If nothing needs attention, reply HEARTBEAT_OK.`
 - The heartbeat prompt is sent **verbatim** as the user message. The system
   prompt includes a “Heartbeat” section and the run is flagged internally.
+- Active hours (`heartbeat.activeHours`) are checked in the configured timezone.
+  Outside the window, heartbeats are skipped until the next tick inside the window.
 
 ## What the heartbeat prompt is for
 
diff --git a/src/config/types.agent-defaults.ts b/src/config/types.agent-defaults.ts
index 0fcdcf49b..35d7548ab 100644
--- a/src/config/types.agent-defaults.ts
+++ b/src/config/types.agent-defaults.ts
@@ -162,6 +162,15 @@ export type AgentDefaultsConfig = {
   heartbeat?: {
     /** Heartbeat interval (duration string, default unit: minutes; default: 30m). */
     every?: string;
+    /** Optional active-hours window (local time); heartbeats run only inside this window. */
+    activeHours?: {
+      /** Start time (24h, HH:MM). Inclusive. */
+      start?: string;
+      /** End time (24h, HH:MM). Exclusive. Use "24:00" for end-of-day. */
+      end?: string;
+      /** Timezone for the window ("user", "local", or IANA TZ id). Default: "user". */
+      timezone?: string;
+    };
     /** Heartbeat model override (provider/model). */
     model?: string;
     /** Delivery target (last|whatsapp|telegram|discord|slack|msteams|signal|imessage|none). */
diff --git a/src/config/zod-schema.agent-runtime.ts b/src/config/zod-schema.agent-runtime.ts
index 40dea6eb4..293475506 100644
--- a/src/config/zod-schema.agent-runtime.ts
+++ b/src/config/zod-schema.agent-runtime.ts
@@ -11,6 +11,14 @@ import {
 export const HeartbeatSchema = z
   .object({
     every: z.string().optional(),
+    activeHours: z
+      .object({
+        start: z.string().optional(),
+        end: z.string().optional(),
+        timezone: z.string().optional(),
+      })
+      .strict()
+      .optional(),
     model: z.string().optional(),
     includeReasoning: z.boolean().optional(),
     target: z
@@ -42,6 +50,42 @@ export const HeartbeatSchema = z
         message: "invalid duration (use ms, s, m, h)",
       });
     }
+
+    const active = val.activeHours;
+    if (!active) return;
+    const timePattern = /^([01]\d|2[0-3]|24):([0-5]\d)$/;
+    const validateTime = (raw: string | undefined, opts: { allow24: boolean }, path: string) => {
+      if (!raw) return;
+      if (!timePattern.test(raw)) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: ["activeHours", path],
+          message: 'invalid time (use "HH:MM" 24h format)',
+        });
+        return;
+      }
+      const [hourStr, minuteStr] = raw.split(":");
+      const hour = Number(hourStr);
+      const minute = Number(minuteStr);
+      if (hour === 24 && minute !== 0) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: ["activeHours", path],
+          message: "invalid time (24:00 is the only allowed 24:xx value)",
+        });
+        return;
+      }
+      if (hour === 24 && !opts.allow24) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: ["activeHours", path],
+          message: "invalid time (start cannot be 24:00)",
+        });
+      }
+    };
+
+    validateTime(active.start, { allow24: false }, "start");
+    validateTime(active.end, { allow24: true }, "end");
   })
   .optional();
 
diff --git a/src/infra/heartbeat-runner.returns-default-unset.test.ts b/src/infra/heartbeat-runner.returns-default-unset.test.ts
index 5ba1d8db6..c65475d13 100644
--- a/src/infra/heartbeat-runner.returns-default-unset.test.ts
+++ b/src/infra/heartbeat-runner.returns-default-unset.test.ts
@@ -300,6 +300,30 @@ describe("runHeartbeatOnce", () => {
     }
   });
 
+  it("skips outside active hours", async () => {
+    const cfg: ClawdbotConfig = {
+      agents: {
+        defaults: {
+          userTimezone: "UTC",
+          heartbeat: {
+            every: "30m",
+            activeHours: { start: "08:00", end: "24:00", timezone: "user" },
+          },
+        },
+      },
+    };
+
+    const res = await runHeartbeatOnce({
+      cfg,
+      deps: { nowMs: () => Date.UTC(2025, 0, 1, 7, 0, 0) },
+    });
+
+    expect(res.status).toBe("skipped");
+    if (res.status === "skipped") {
+      expect(res.reason).toBe("quiet-hours");
+    }
+  });
+
   it("uses the last non-empty payload for delivery", async () => {
     const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-hb-"));
     const storePath = path.join(tmpDir, "sessions.json");
diff --git a/src/infra/heartbeat-runner.ts b/src/infra/heartbeat-runner.ts
index 820cbdf5c..012fff229 100644
--- a/src/infra/heartbeat-runner.ts
+++ b/src/infra/heartbeat-runner.ts
@@ -1,4 +1,5 @@
 import { resolveAgentConfig, resolveDefaultAgentId } from "../agents/agent-scope.js";
+import { resolveUserTimezone } from "../agents/date-time.js";
 import { resolveEffectiveMessagesConfig } from "../agents/identity.js";
 import {
   DEFAULT_HEARTBEAT_ACK_MAX_CHARS,
@@ -69,6 +70,81 @@ export type HeartbeatSummary = {
 };
 
 const DEFAULT_HEARTBEAT_TARGET = "last";
+const ACTIVE_HOURS_TIME_PATTERN = /^([01]\d|2[0-3]|24):([0-5]\d)$/;
+
+function resolveActiveHoursTimezone(cfg: ClawdbotConfig, raw?: string): string {
+  const trimmed = raw?.trim();
+  if (!trimmed || trimmed === "user") {
+    return resolveUserTimezone(cfg.agents?.defaults?.userTimezone);
+  }
+  if (trimmed === "local") {
+    const host = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    return host?.trim() || "UTC";
+  }
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone: trimmed }).format(new Date());
+    return trimmed;
+  } catch {
+    return resolveUserTimezone(cfg.agents?.defaults?.userTimezone);
+  }
+}
+
+function parseActiveHoursTime(raw?: string, opts: { allow24: boolean }): number | null {
+  if (!raw || !ACTIVE_HOURS_TIME_PATTERN.test(raw)) return null;
+  const [hourStr, minuteStr] = raw.split(":");
+  const hour = Number(hourStr);
+  const minute = Number(minuteStr);
+  if (!Number.isFinite(hour) || !Number.isFinite(minute)) return null;
+  if (hour === 24) {
+    if (!opts.allow24 || minute !== 0) return null;
+    return 24 * 60;
+  }
+  return hour * 60 + minute;
+}
+
+function resolveMinutesInTimeZone(nowMs: number, timeZone: string): number | null {
+  try {
+    const parts = new Intl.DateTimeFormat("en-US", {
+      timeZone,
+      hour: "2-digit",
+      minute: "2-digit",
+      hourCycle: "h23",
+    }).formatToParts(new Date(nowMs));
+    const map: Record<string, string> = {};
+    for (const part of parts) {
+      if (part.type !== "literal") map[part.type] = part.value;
+    }
+    const hour = Number(map.hour);
+    const minute = Number(map.minute);
+    if (!Number.isFinite(hour) || !Number.isFinite(minute)) return null;
+    return hour * 60 + minute;
+  } catch {
+    return null;
+  }
+}
+
+function isWithinActiveHours(
+  cfg: ClawdbotConfig,
+  heartbeat?: HeartbeatConfig,
+  nowMs?: number,
+): boolean {
+  const active = heartbeat?.activeHours;
+  if (!active) return true;
+
+  const startMin = parseActiveHoursTime(active.start, { allow24: false });
+  const endMin = parseActiveHoursTime(active.end, { allow24: true });
+  if (startMin === null || endMin === null) return true;
+  if (startMin === endMin) return true;
+
+  const timeZone = resolveActiveHoursTimezone(cfg, active.timezone);
+  const currentMin = resolveMinutesInTimeZone(nowMs ?? Date.now(), timeZone);
+  if (currentMin === null) return true;
+
+  if (endMin > startMin) {
+    return currentMin >= startMin && currentMin < endMin;
+  }
+  return currentMin >= startMin || currentMin < endMin;
+}
 
 type HeartbeatAgentState = {
   agentId: string;
@@ -341,12 +417,16 @@ export async function runHeartbeatOnce(opts: {
     return { status: "skipped", reason: "disabled" };
   }
 
+  const startedAt = opts.deps?.nowMs?.() ?? Date.now();
+  if (!isWithinActiveHours(cfg, heartbeat, startedAt)) {
+    return { status: "skipped", reason: "quiet-hours" };
+  }
+
   const queueSize = (opts.deps?.getQueueSize ?? getQueueSize)(CommandLane.Main);
   if (queueSize > 0) {
     return { status: "skipped", reason: "requests-in-flight" };
   }
 
-  const startedAt = opts.deps?.nowMs?.() ?? Date.now();
   const { entry, sessionKey, storePath } = resolveHeartbeatSession(cfg, agentId);
   const previousUpdatedAt = entry?.updatedAt;
   const delivery = resolveHeartbeatDeliveryTarget({ cfg, entry, heartbeat });

From 483a50f1075a27d3584965c9c63edb7034ad9cf8 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:32:38 +0000
Subject: [PATCH 058/171] fix: correct nodes exec config typing

---
 src/cli/nodes-cli/register.invoke.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cli/nodes-cli/register.invoke.ts b/src/cli/nodes-cli/register.invoke.ts
index 9e893b9f5..02c013cee 100644
--- a/src/cli/nodes-cli/register.invoke.ts
+++ b/src/cli/nodes-cli/register.invoke.ts
@@ -84,7 +84,7 @@ function applyPathPrepend(
 }
 
 function resolveExecDefaults(
-  cfg: ReturnType<typeof loadConfig> | undefined,
+  cfg: ReturnType<typeof loadConfig>,
   agentId: string | undefined,
 ): ExecDefaults | undefined {
   const globalExec = cfg?.tools?.exec;

From 76600e80baba2c5d13fad602ae88f5d7b190a2ae Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:33:19 +0000
Subject: [PATCH 059/171] docs: simplify heartbeat active hours example

---
 docs/gateway/heartbeat.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/gateway/heartbeat.md b/docs/gateway/heartbeat.md
index d1099dcf5..3c5740da3 100644
--- a/docs/gateway/heartbeat.md
+++ b/docs/gateway/heartbeat.md
@@ -25,7 +25,7 @@ Example config:
       heartbeat: {
         every: "30m",
         target: "last",
-        // activeHours: { start: "08:00", end: "24:00", timezone: "user" },
+        // activeHours: { start: "08:00", end: "24:00" },
         // includeReasoning: true, // optional: send separate `Reasoning:` message too
       }
     }

From 45c1ccdfcfc21f742d30b99becc80046fc9d0728 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:01:12 +0000
Subject: [PATCH 060/171] refactor: unify threading contexts

---
 extensions/slack/src/channel.ts               |  14 +-
 .../reply/agent-runner-utils.test.ts          |  17 ++
 src/auto-reply/reply/agent-runner-utils.ts    |  13 +-
 src/channels/dock.ts                          |  57 +++---
 src/channels/plugins/types.core.ts            |   2 +
 src/plugin-sdk/index.ts                       |   1 +
 src/slack/monitor.test-helpers.ts             | 145 +++++++++++++++
 ...es-thread-replies-replytoid-is-set.test.ts | 164 +++--------------
 ...ends-tool-summaries-responseprefix.test.ts | 174 +++---------------
 ...p-level-replies-replytomode-is-all.test.ts | 166 +++--------------
 .../prepare.inbound-contract.test.ts          |  68 +++++++
 src/slack/monitor/message-handler/prepare.ts  |  13 +-
 src/slack/threading-tool-context.ts           |  29 +++
 src/slack/threading.test.ts                   |  33 +++-
 src/slack/threading.ts                        |  37 +++-
 15 files changed, 452 insertions(+), 481 deletions(-)
 create mode 100644 src/slack/monitor.test-helpers.ts
 create mode 100644 src/slack/threading-tool-context.ts

diff --git a/extensions/slack/src/channel.ts b/extensions/slack/src/channel.ts
index 7aec49daf..9e17ca8bd 100644
--- a/extensions/slack/src/channel.ts
+++ b/extensions/slack/src/channel.ts
@@ -20,6 +20,7 @@ import {
   resolveDefaultSlackAccountId,
   resolveSlackAccount,
   resolveSlackGroupRequireMention,
+  buildSlackThreadingToolContext,
   setAccountEnabledInConfigSection,
   slackOnboardingAdapter,
   SlackConfigSchema,
@@ -164,18 +165,7 @@ export const slackPlugin: ChannelPlugin<ResolvedSlackAccount> = {
     resolveReplyToMode: ({ cfg, accountId }) =>
       resolveSlackAccount({ cfg, accountId }).replyToMode ?? "off",
     allowTagsWhenOff: true,
-    buildToolContext: ({ cfg, accountId, context, hasRepliedRef }) => {
-      const configuredReplyToMode = resolveSlackAccount({ cfg, accountId }).replyToMode ?? "off";
-      const effectiveReplyToMode = context.ThreadLabel ? "all" : configuredReplyToMode;
-      return {
-        currentChannelId: context.To?.startsWith("channel:")
-          ? context.To.slice("channel:".length)
-          : undefined,
-        currentThreadTs: context.ReplyToId,
-        replyToMode: effectiveReplyToMode,
-        hasRepliedRef,
-      };
-    },
+    buildToolContext: (params) => buildSlackThreadingToolContext(params),
   },
   messaging: {
     normalizeTarget: normalizeSlackMessagingTarget,
diff --git a/src/auto-reply/reply/agent-runner-utils.test.ts b/src/auto-reply/reply/agent-runner-utils.test.ts
index d9a5b5446..1d7d38bbc 100644
--- a/src/auto-reply/reply/agent-runner-utils.test.ts
+++ b/src/auto-reply/reply/agent-runner-utils.test.ts
@@ -87,4 +87,21 @@ describe("buildThreadingToolContext", () => {
 
     expect(result.currentChannelId).toBe("chat_id:7");
   });
+
+  it("prefers MessageThreadId for Slack tool threading", () => {
+    const sessionCtx = {
+      Provider: "slack",
+      To: "channel:C1",
+      MessageThreadId: "123.456",
+    } as TemplateContext;
+
+    const result = buildThreadingToolContext({
+      sessionCtx,
+      config: { channels: { slack: { replyToMode: "all" } } } as ClawdbotConfig,
+      hasRepliedRef: undefined,
+    });
+
+    expect(result.currentChannelId).toBe("C1");
+    expect(result.currentThreadTs).toBe("123.456");
+  });
 });
diff --git a/src/auto-reply/reply/agent-runner-utils.ts b/src/auto-reply/reply/agent-runner-utils.ts
index b1b3ae890..0481ce74e 100644
--- a/src/auto-reply/reply/agent-runner-utils.ts
+++ b/src/auto-reply/reply/agent-runner-utils.ts
@@ -24,18 +24,11 @@ export function buildThreadingToolContext(params: {
   const rawProvider = sessionCtx.Provider?.trim().toLowerCase();
   if (!rawProvider) return {};
   const provider = normalizeChannelId(rawProvider);
-  // WhatsApp context isolation keys off conversation id, not the bot's own number.
-  const threadingTo =
-    rawProvider === "whatsapp"
-      ? (sessionCtx.From ?? sessionCtx.To)
-      : rawProvider === "imessage" && sessionCtx.ChatType === "direct"
-        ? (sessionCtx.From ?? sessionCtx.To)
-        : sessionCtx.To;
   // Fallback for unrecognized/plugin channels (e.g., BlueBubbles before plugin registry init)
   const dock = provider ? getChannelDock(provider) : undefined;
   if (!dock?.threading?.buildToolContext) {
     return {
-      currentChannelId: threadingTo?.trim() || undefined,
+      currentChannelId: sessionCtx.To?.trim() || undefined,
       currentChannelProvider: provider ?? (rawProvider as ChannelId),
       hasRepliedRef,
     };
@@ -46,7 +39,9 @@ export function buildThreadingToolContext(params: {
       accountId: sessionCtx.AccountId,
       context: {
         Channel: sessionCtx.Provider,
-        To: threadingTo,
+        From: sessionCtx.From,
+        To: sessionCtx.To,
+        ChatType: sessionCtx.ChatType,
         ReplyToId: sessionCtx.ReplyToId,
         ThreadLabel: sessionCtx.ThreadLabel,
         MessageThreadId: sessionCtx.MessageThreadId,
diff --git a/src/channels/dock.ts b/src/channels/dock.ts
index 92199a0f2..45bca496f 100644
--- a/src/channels/dock.ts
+++ b/src/channels/dock.ts
@@ -3,6 +3,7 @@ import { resolveDiscordAccount } from "../discord/accounts.js";
 import { resolveIMessageAccount } from "../imessage/accounts.js";
 import { resolveSignalAccount } from "../signal/accounts.js";
 import { resolveSlackAccount } from "../slack/accounts.js";
+import { buildSlackThreadingToolContext } from "../slack/threading-tool-context.js";
 import { resolveTelegramAccount } from "../telegram/accounts.js";
 import { normalizeE164 } from "../utils.js";
 import { resolveWhatsAppAccount } from "../web/accounts.js";
@@ -150,11 +151,14 @@ const DOCKS: Record<ChatChannelId, ChannelDock> = {
       },
     },
     threading: {
-      buildToolContext: ({ context, hasRepliedRef }) => ({
-        currentChannelId: context.To?.trim() || undefined,
-        currentThreadTs: context.ReplyToId,
-        hasRepliedRef,
-      }),
+      buildToolContext: ({ context, hasRepliedRef }) => {
+        const channelId = context.From?.trim() || context.To?.trim() || undefined;
+        return {
+          currentChannelId: channelId,
+          currentThreadTs: context.ReplyToId,
+          hasRepliedRef,
+        };
+      },
     },
   },
   discord: {
@@ -221,18 +225,7 @@ const DOCKS: Record<ChatChannelId, ChannelDock> = {
       resolveReplyToMode: ({ cfg, accountId }) =>
         resolveSlackAccount({ cfg, accountId }).replyToMode ?? "off",
       allowTagsWhenOff: true,
-      buildToolContext: ({ cfg, accountId, context, hasRepliedRef }) => {
-        const configuredReplyToMode = resolveSlackAccount({ cfg, accountId }).replyToMode ?? "off";
-        const effectiveReplyToMode = context.ThreadLabel ? "all" : configuredReplyToMode;
-        return {
-          currentChannelId: context.To?.startsWith("channel:")
-            ? context.To.slice("channel:".length)
-            : undefined,
-          currentThreadTs: context.ReplyToId,
-          replyToMode: effectiveReplyToMode,
-          hasRepliedRef,
-        };
-      },
+      buildToolContext: (params) => buildSlackThreadingToolContext(params),
     },
   },
   signal: {
@@ -259,11 +252,16 @@ const DOCKS: Record<ChatChannelId, ChannelDock> = {
           .filter(Boolean),
     },
     threading: {
-      buildToolContext: ({ context, hasRepliedRef }) => ({
-        currentChannelId: context.To?.trim() || undefined,
-        currentThreadTs: context.ReplyToId,
-        hasRepliedRef,
-      }),
+      buildToolContext: ({ context, hasRepliedRef }) => {
+        const isDirect = context.ChatType?.toLowerCase() === "direct";
+        const channelId =
+          (isDirect ? (context.From ?? context.To) : context.To)?.trim() || undefined;
+        return {
+          currentChannelId: channelId,
+          currentThreadTs: context.ReplyToId,
+          hasRepliedRef,
+        };
+      },
     },
   },
   imessage: {
@@ -286,11 +284,16 @@ const DOCKS: Record<ChatChannelId, ChannelDock> = {
       resolveRequireMention: resolveIMessageGroupRequireMention,
     },
     threading: {
-      buildToolContext: ({ context, hasRepliedRef }) => ({
-        currentChannelId: context.To?.trim() || undefined,
-        currentThreadTs: context.ReplyToId,
-        hasRepliedRef,
-      }),
+      buildToolContext: ({ context, hasRepliedRef }) => {
+        const isDirect = context.ChatType?.toLowerCase() === "direct";
+        const channelId =
+          (isDirect ? (context.From ?? context.To) : context.To)?.trim() || undefined;
+        return {
+          currentChannelId: channelId,
+          currentThreadTs: context.ReplyToId,
+          hasRepliedRef,
+        };
+      },
     },
   },
 };
diff --git a/src/channels/plugins/types.core.ts b/src/channels/plugins/types.core.ts
index dced4e14c..af3707712 100644
--- a/src/channels/plugins/types.core.ts
+++ b/src/channels/plugins/types.core.ts
@@ -210,7 +210,9 @@ export type ChannelThreadingAdapter = {
 
 export type ChannelThreadingContext = {
   Channel?: string;
+  From?: string;
   To?: string;
+  ChatType?: string;
   ReplyToId?: string;
   ReplyToIdFull?: string;
   ThreadLabel?: string;
diff --git a/src/plugin-sdk/index.ts b/src/plugin-sdk/index.ts
index 8bef1da37..1afc00aa4 100644
--- a/src/plugin-sdk/index.ts
+++ b/src/plugin-sdk/index.ts
@@ -235,6 +235,7 @@ export {
   looksLikeSlackTargetId,
   normalizeSlackMessagingTarget,
 } from "../channels/plugins/normalize/slack.js";
+export { buildSlackThreadingToolContext } from "../slack/threading-tool-context.js";
 
 // Channel: Telegram
 export {
diff --git a/src/slack/monitor.test-helpers.ts b/src/slack/monitor.test-helpers.ts
new file mode 100644
index 000000000..d1159839e
--- /dev/null
+++ b/src/slack/monitor.test-helpers.ts
@@ -0,0 +1,145 @@
+import { vi } from "vitest";
+
+type SlackHandler = (args: unknown) => Promise<void>;
+
+const slackTestState = vi.hoisted(() => ({
+  config: {} as Record<string, unknown>,
+  sendMock: vi.fn(),
+  replyMock: vi.fn(),
+  updateLastRouteMock: vi.fn(),
+  reactMock: vi.fn(),
+  readAllowFromStoreMock: vi.fn(),
+  upsertPairingRequestMock: vi.fn(),
+}));
+
+export const getSlackTestState = () => slackTestState;
+
+export const getSlackHandlers = () =>
+  (
+    globalThis as {
+      __slackHandlers?: Map<string, SlackHandler>;
+    }
+  ).__slackHandlers;
+
+export const getSlackClient = () =>
+  (globalThis as { __slackClient?: Record<string, unknown> }).__slackClient;
+
+export const flush = () => new Promise((resolve) => setTimeout(resolve, 0));
+
+export async function waitForSlackEvent(name: string) {
+  for (let i = 0; i < 10; i += 1) {
+    if (getSlackHandlers()?.has(name)) return;
+    await flush();
+  }
+}
+
+export const defaultSlackTestConfig = () => ({
+  messages: {
+    responsePrefix: "PFX",
+    ackReaction: "👀",
+    ackReactionScope: "group-mentions",
+  },
+  channels: {
+    slack: {
+      dm: { enabled: true, policy: "open", allowFrom: ["*"] },
+      groupPolicy: "open",
+    },
+  },
+});
+
+export function resetSlackTestState(config: Record<string, unknown> = defaultSlackTestConfig()) {
+  slackTestState.config = config;
+  slackTestState.sendMock.mockReset().mockResolvedValue(undefined);
+  slackTestState.replyMock.mockReset();
+  slackTestState.updateLastRouteMock.mockReset();
+  slackTestState.reactMock.mockReset();
+  slackTestState.readAllowFromStoreMock.mockReset().mockResolvedValue([]);
+  slackTestState.upsertPairingRequestMock.mockReset().mockResolvedValue({
+    code: "PAIRCODE",
+    created: true,
+  });
+  getSlackHandlers()?.clear();
+}
+
+vi.mock("../config/config.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../config/config.js")>();
+  return {
+    ...actual,
+    loadConfig: () => slackTestState.config,
+  };
+});
+
+vi.mock("../auto-reply/reply.js", () => ({
+  getReplyFromConfig: (...args: unknown[]) => slackTestState.replyMock(...args),
+}));
+
+vi.mock("./resolve-channels.js", () => ({
+  resolveSlackChannelAllowlist: async ({ entries }: { entries: string[] }) =>
+    entries.map((input) => ({ input, resolved: false })),
+}));
+
+vi.mock("./resolve-users.js", () => ({
+  resolveSlackUserAllowlist: async ({ entries }: { entries: string[] }) =>
+    entries.map((input) => ({ input, resolved: false })),
+}));
+
+vi.mock("./send.js", () => ({
+  sendMessageSlack: (...args: unknown[]) => slackTestState.sendMock(...args),
+}));
+
+vi.mock("../pairing/pairing-store.js", () => ({
+  readChannelAllowFromStore: (...args: unknown[]) => slackTestState.readAllowFromStoreMock(...args),
+  upsertChannelPairingRequest: (...args: unknown[]) =>
+    slackTestState.upsertPairingRequestMock(...args),
+}));
+
+vi.mock("../config/sessions.js", () => ({
+  resolveStorePath: vi.fn(() => "/tmp/clawdbot-sessions.json"),
+  updateLastRoute: (...args: unknown[]) => slackTestState.updateLastRouteMock(...args),
+  resolveSessionKey: vi.fn(),
+  readSessionUpdatedAt: vi.fn(() => undefined),
+  recordSessionMetaFromInbound: vi.fn().mockResolvedValue(undefined),
+}));
+
+vi.mock("@slack/bolt", () => {
+  const handlers = new Map<string, SlackHandler>();
+  (globalThis as { __slackHandlers?: typeof handlers }).__slackHandlers = handlers;
+  const client = {
+    auth: { test: vi.fn().mockResolvedValue({ user_id: "bot-user" }) },
+    conversations: {
+      info: vi.fn().mockResolvedValue({
+        channel: { name: "dm", is_im: true },
+      }),
+      replies: vi.fn().mockResolvedValue({ messages: [] }),
+    },
+    users: {
+      info: vi.fn().mockResolvedValue({
+        user: { profile: { display_name: "Ada" } },
+      }),
+    },
+    assistant: {
+      threads: {
+        setStatus: vi.fn().mockResolvedValue({ ok: true }),
+      },
+    },
+    reactions: {
+      add: (...args: unknown[]) => slackTestState.reactMock(...args),
+    },
+  };
+  (globalThis as { __slackClient?: typeof client }).__slackClient = client;
+  class App {
+    client = client;
+    event(name: string, handler: SlackHandler) {
+      handlers.set(name, handler);
+    }
+    command() {
+      /* no-op */
+    }
+    start = vi.fn().mockResolvedValue(undefined);
+    stop = vi.fn().mockResolvedValue(undefined);
+  }
+  class HTTPReceiver {
+    requestListener = vi.fn();
+  }
+  return { App, HTTPReceiver, default: { App, HTTPReceiver } };
+});
diff --git a/src/slack/monitor.tool-result.forces-thread-replies-replytoid-is-set.test.ts b/src/slack/monitor.tool-result.forces-thread-replies-replytoid-is-set.test.ts
index 5ecb206f0..c4b4b96ed 100644
--- a/src/slack/monitor.tool-result.forces-thread-replies-replytoid-is-set.test.ts
+++ b/src/slack/monitor.tool-result.forces-thread-replies-replytoid-is-set.test.ts
@@ -1,143 +1,29 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
+import {
+  defaultSlackTestConfig,
+  flush,
+  getSlackClient,
+  getSlackHandlers,
+  getSlackTestState,
+  resetSlackTestState,
+  waitForSlackEvent,
+} from "./monitor.test-helpers.js";
 import { monitorSlackProvider } from "./monitor.js";
 
-const sendMock = vi.fn();
-const replyMock = vi.fn();
-const updateLastRouteMock = vi.fn();
-const reactMock = vi.fn();
-let config: Record<string, unknown> = {};
-const readAllowFromStoreMock = vi.fn();
-const upsertPairingRequestMock = vi.fn();
-const getSlackHandlers = () =>
-  (
-    globalThis as {
-      __slackHandlers?: Map<string, (args: unknown) => Promise<void>>;
-    }
-  ).__slackHandlers;
-const getSlackClient = () =>
-  (globalThis as { __slackClient?: Record<string, unknown> }).__slackClient;
-
-vi.mock("../config/config.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../config/config.js")>();
-  return {
-    ...actual,
-    loadConfig: () => config,
-  };
-});
-
-vi.mock("../auto-reply/reply.js", () => ({
-  getReplyFromConfig: (...args: unknown[]) => replyMock(...args),
-}));
-
-vi.mock("./resolve-channels.js", () => ({
-  resolveSlackChannelAllowlist: async ({ entries }: { entries: string[] }) =>
-    entries.map((input) => ({ input, resolved: false })),
-}));
-
-vi.mock("./resolve-users.js", () => ({
-  resolveSlackUserAllowlist: async ({ entries }: { entries: string[] }) =>
-    entries.map((input) => ({ input, resolved: false })),
-}));
-
-vi.mock("./send.js", () => ({
-  sendMessageSlack: (...args: unknown[]) => sendMock(...args),
-}));
-
-vi.mock("../pairing/pairing-store.js", () => ({
-  readChannelAllowFromStore: (...args: unknown[]) => readAllowFromStoreMock(...args),
-  upsertChannelPairingRequest: (...args: unknown[]) => upsertPairingRequestMock(...args),
-}));
-
-vi.mock("../config/sessions.js", () => ({
-  resolveStorePath: vi.fn(() => "/tmp/clawdbot-sessions.json"),
-  updateLastRoute: (...args: unknown[]) => updateLastRouteMock(...args),
-  resolveSessionKey: vi.fn(),
-  readSessionUpdatedAt: vi.fn(() => undefined),
-  recordSessionMetaFromInbound: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock("@slack/bolt", () => {
-  const handlers = new Map<string, (args: unknown) => Promise<void>>();
-  (globalThis as { __slackHandlers?: typeof handlers }).__slackHandlers = handlers;
-  const client = {
-    auth: { test: vi.fn().mockResolvedValue({ user_id: "bot-user" }) },
-    conversations: {
-      info: vi.fn().mockResolvedValue({
-        channel: { name: "dm", is_im: true },
-      }),
-      replies: vi.fn().mockResolvedValue({ messages: [] }),
-    },
-    users: {
-      info: vi.fn().mockResolvedValue({
-        user: { profile: { display_name: "Ada" } },
-      }),
-    },
-    assistant: {
-      threads: {
-        setStatus: vi.fn().mockResolvedValue({ ok: true }),
-      },
-    },
-    reactions: {
-      add: (...args: unknown[]) => reactMock(...args),
-    },
-  };
-  (globalThis as { __slackClient?: typeof client }).__slackClient = client;
-  class App {
-    client = client;
-    event(name: string, handler: (args: unknown) => Promise<void>) {
-      handlers.set(name, handler);
-    }
-    command() {
-      /* no-op */
-    }
-    start = vi.fn().mockResolvedValue(undefined);
-    stop = vi.fn().mockResolvedValue(undefined);
-  }
-  class HTTPReceiver {
-    requestListener = vi.fn();
-  }
-  return { App, HTTPReceiver, default: { App, HTTPReceiver } };
-});
-
-const flush = () => new Promise((resolve) => setTimeout(resolve, 0));
-
-async function waitForEvent(name: string) {
-  for (let i = 0; i < 10; i += 1) {
-    if (getSlackHandlers()?.has(name)) return;
-    await flush();
-  }
-}
+const slackTestState = getSlackTestState();
+const { sendMock, replyMock, reactMock, upsertPairingRequestMock } = slackTestState;
 
 beforeEach(() => {
   resetInboundDedupe();
-  getSlackHandlers()?.clear();
-  config = {
-    messages: {
-      responsePrefix: "PFX",
-      ackReaction: "👀",
-      ackReactionScope: "group-mentions",
-    },
-    channels: {
-      slack: {
-        dm: { enabled: true, policy: "open", allowFrom: ["*"] },
-        groupPolicy: "open",
-      },
-    },
-  };
-  sendMock.mockReset().mockResolvedValue(undefined);
-  replyMock.mockReset();
-  updateLastRouteMock.mockReset();
-  reactMock.mockReset();
-  readAllowFromStoreMock.mockReset().mockResolvedValue([]);
-  upsertPairingRequestMock.mockReset().mockResolvedValue({ code: "PAIRCODE", created: true });
+  resetSlackTestState(defaultSlackTestConfig());
 });
 
 describe("monitorSlackProvider tool results", () => {
   it("forces thread replies when replyToId is set", async () => {
     replyMock.mockResolvedValue({ text: "forced reply", replyToId: "555" });
-    config = {
+    slackTestState.config = {
       messages: {
         responsePrefix: "PFX",
         ackReaction: "👀",
@@ -158,7 +44,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -199,7 +85,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -226,12 +112,12 @@ describe("monitorSlackProvider tool results", () => {
   });
 
   it("replies with pairing code when dmPolicy is pairing and no allowFrom is set", async () => {
-    config = {
-      ...config,
+    slackTestState.config = {
+      ...slackTestState.config,
       channels: {
-        ...config.channels,
+        ...slackTestState.config.channels,
         slack: {
-          ...config.channels?.slack,
+          ...slackTestState.config.channels?.slack,
           dm: { enabled: true, policy: "pairing", allowFrom: [] },
         },
       },
@@ -244,7 +130,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -271,12 +157,12 @@ describe("monitorSlackProvider tool results", () => {
   });
 
   it("does not resend pairing code when a request is already pending", async () => {
-    config = {
-      ...config,
+    slackTestState.config = {
+      ...slackTestState.config,
       channels: {
-        ...config.channels,
+        ...slackTestState.config.channels,
         slack: {
-          ...config.channels?.slack,
+          ...slackTestState.config.channels?.slack,
           dm: { enabled: true, policy: "pairing", allowFrom: [] },
         },
       },
@@ -292,7 +178,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
diff --git a/src/slack/monitor.tool-result.sends-tool-summaries-responseprefix.test.ts b/src/slack/monitor.tool-result.sends-tool-summaries-responseprefix.test.ts
index 67f72e2e1..7f5ffa03c 100644
--- a/src/slack/monitor.tool-result.sends-tool-summaries-responseprefix.test.ts
+++ b/src/slack/monitor.tool-result.sends-tool-summaries-responseprefix.test.ts
@@ -3,137 +3,23 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import { HISTORY_CONTEXT_MARKER } from "../auto-reply/reply/history.js";
 import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
 import { CURRENT_MESSAGE_MARKER } from "../auto-reply/reply/mentions.js";
+import {
+  defaultSlackTestConfig,
+  flush,
+  getSlackTestState,
+  getSlackClient,
+  getSlackHandlers,
+  resetSlackTestState,
+  waitForSlackEvent,
+} from "./monitor.test-helpers.js";
 import { monitorSlackProvider } from "./monitor.js";
 
-const sendMock = vi.fn();
-const replyMock = vi.fn();
-const updateLastRouteMock = vi.fn();
-const reactMock = vi.fn();
-let config: Record<string, unknown> = {};
-const readAllowFromStoreMock = vi.fn();
-const upsertPairingRequestMock = vi.fn();
-const getSlackHandlers = () =>
-  (
-    globalThis as {
-      __slackHandlers?: Map<string, (args: unknown) => Promise<void>>;
-    }
-  ).__slackHandlers;
-const getSlackClient = () =>
-  (globalThis as { __slackClient?: Record<string, unknown> }).__slackClient;
-
-vi.mock("../config/config.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../config/config.js")>();
-  return {
-    ...actual,
-    loadConfig: () => config,
-  };
-});
-
-vi.mock("../auto-reply/reply.js", () => ({
-  getReplyFromConfig: (...args: unknown[]) => replyMock(...args),
-}));
-
-vi.mock("./resolve-channels.js", () => ({
-  resolveSlackChannelAllowlist: async ({ entries }: { entries: string[] }) =>
-    entries.map((input) => ({ input, resolved: false })),
-}));
-
-vi.mock("./resolve-users.js", () => ({
-  resolveSlackUserAllowlist: async ({ entries }: { entries: string[] }) =>
-    entries.map((input) => ({ input, resolved: false })),
-}));
-
-vi.mock("./send.js", () => ({
-  sendMessageSlack: (...args: unknown[]) => sendMock(...args),
-}));
-
-vi.mock("../pairing/pairing-store.js", () => ({
-  readChannelAllowFromStore: (...args: unknown[]) => readAllowFromStoreMock(...args),
-  upsertChannelPairingRequest: (...args: unknown[]) => upsertPairingRequestMock(...args),
-}));
-
-vi.mock("../config/sessions.js", () => ({
-  resolveStorePath: vi.fn(() => "/tmp/clawdbot-sessions.json"),
-  updateLastRoute: (...args: unknown[]) => updateLastRouteMock(...args),
-  resolveSessionKey: vi.fn(),
-  readSessionUpdatedAt: vi.fn(() => undefined),
-  recordSessionMetaFromInbound: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock("@slack/bolt", () => {
-  const handlers = new Map<string, (args: unknown) => Promise<void>>();
-  (globalThis as { __slackHandlers?: typeof handlers }).__slackHandlers = handlers;
-  const client = {
-    auth: { test: vi.fn().mockResolvedValue({ user_id: "bot-user" }) },
-    conversations: {
-      info: vi.fn().mockResolvedValue({
-        channel: { name: "dm", is_im: true },
-      }),
-      replies: vi.fn().mockResolvedValue({ messages: [] }),
-    },
-    users: {
-      info: vi.fn().mockResolvedValue({
-        user: { profile: { display_name: "Ada" } },
-      }),
-    },
-    assistant: {
-      threads: {
-        setStatus: vi.fn().mockResolvedValue({ ok: true }),
-      },
-    },
-    reactions: {
-      add: (...args: unknown[]) => reactMock(...args),
-    },
-  };
-  (globalThis as { __slackClient?: typeof client }).__slackClient = client;
-  class App {
-    client = client;
-    event(name: string, handler: (args: unknown) => Promise<void>) {
-      handlers.set(name, handler);
-    }
-    command() {
-      /* no-op */
-    }
-    start = vi.fn().mockResolvedValue(undefined);
-    stop = vi.fn().mockResolvedValue(undefined);
-  }
-  class HTTPReceiver {
-    requestListener = vi.fn();
-  }
-  return { App, HTTPReceiver, default: { App, HTTPReceiver } };
-});
-
-const flush = () => new Promise((resolve) => setTimeout(resolve, 0));
-
-async function waitForEvent(name: string) {
-  for (let i = 0; i < 10; i += 1) {
-    if (getSlackHandlers()?.has(name)) return;
-    await flush();
-  }
-}
+const slackTestState = getSlackTestState();
+const { sendMock, replyMock } = slackTestState;
 
 beforeEach(() => {
   resetInboundDedupe();
-  getSlackHandlers()?.clear();
-  config = {
-    messages: {
-      responsePrefix: "PFX",
-      ackReaction: "👀",
-      ackReactionScope: "group-mentions",
-    },
-    channels: {
-      slack: {
-        dm: { enabled: true, policy: "open", allowFrom: ["*"] },
-        groupPolicy: "open",
-      },
-    },
-  };
-  sendMock.mockReset().mockResolvedValue(undefined);
-  replyMock.mockReset();
-  updateLastRouteMock.mockReset();
-  reactMock.mockReset();
-  readAllowFromStoreMock.mockReset().mockResolvedValue([]);
-  upsertPairingRequestMock.mockReset().mockResolvedValue({ code: "PAIRCODE", created: true });
+  resetSlackTestState(defaultSlackTestConfig());
 });
 
 describe("monitorSlackProvider tool results", () => {
@@ -150,7 +36,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -190,7 +76,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -215,7 +101,7 @@ describe("monitorSlackProvider tool results", () => {
   });
 
   it("does not derive responsePrefix from routed agent identity when unset", async () => {
-    config = {
+    slackTestState.config = {
       agents: {
         list: [
           {
@@ -256,7 +142,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -281,7 +167,7 @@ describe("monitorSlackProvider tool results", () => {
   });
 
   it("preserves RawBody without injecting processed room history", async () => {
-    config = {
+    slackTestState.config = {
       messages: { ackReactionScope: "group-mentions" },
       channels: {
         slack: {
@@ -305,7 +191,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -344,7 +230,7 @@ describe("monitorSlackProvider tool results", () => {
   });
 
   it("scopes thread history to the thread by default", async () => {
-    config = {
+    slackTestState.config = {
       messages: { ackReactionScope: "group-mentions" },
       channels: {
         slack: {
@@ -368,7 +254,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -431,7 +317,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -470,7 +356,7 @@ describe("monitorSlackProvider tool results", () => {
   });
 
   it("accepts channel messages when mentionPatterns match", async () => {
-    config = {
+    slackTestState.config = {
       messages: {
         responsePrefix: "PFX",
         groupChat: { mentionPatterns: ["\\bclawd\\b"] },
@@ -491,7 +377,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -515,7 +401,7 @@ describe("monitorSlackProvider tool results", () => {
   });
 
   it("treats replies to bot threads as implicit mentions", async () => {
-    config = {
+    slackTestState.config = {
       channels: {
         slack: {
           dm: { enabled: true, policy: "open", allowFrom: ["*"] },
@@ -532,7 +418,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -558,7 +444,7 @@ describe("monitorSlackProvider tool results", () => {
   });
 
   it("accepts channel messages without mention when channels.slack.requireMention is false", async () => {
-    config = {
+    slackTestState.config = {
       channels: {
         slack: {
           dm: { enabled: true, policy: "open", allowFrom: ["*"] },
@@ -576,7 +462,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -610,7 +496,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -635,7 +521,7 @@ describe("monitorSlackProvider tool results", () => {
 
   it("threads replies when incoming message is in a thread", async () => {
     replyMock.mockResolvedValue({ text: "thread reply" });
-    config = {
+    slackTestState.config = {
       messages: {
         responsePrefix: "PFX",
         ackReaction: "👀",
@@ -656,7 +542,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
diff --git a/src/slack/monitor.tool-result.threads-top-level-replies-replytomode-is-all.test.ts b/src/slack/monitor.tool-result.threads-top-level-replies-replytomode-is-all.test.ts
index 609d576fd..2ace208d9 100644
--- a/src/slack/monitor.tool-result.threads-top-level-replies-replytomode-is-all.test.ts
+++ b/src/slack/monitor.tool-result.threads-top-level-replies-replytomode-is-all.test.ts
@@ -1,143 +1,29 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 
 import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
+import {
+  defaultSlackTestConfig,
+  flush,
+  getSlackClient,
+  getSlackHandlers,
+  getSlackTestState,
+  resetSlackTestState,
+  waitForSlackEvent,
+} from "./monitor.test-helpers.js";
 import { monitorSlackProvider } from "./monitor.js";
 
-const sendMock = vi.fn();
-const replyMock = vi.fn();
-const updateLastRouteMock = vi.fn();
-const reactMock = vi.fn();
-let config: Record<string, unknown> = {};
-const readAllowFromStoreMock = vi.fn();
-const upsertPairingRequestMock = vi.fn();
-const getSlackHandlers = () =>
-  (
-    globalThis as {
-      __slackHandlers?: Map<string, (args: unknown) => Promise<void>>;
-    }
-  ).__slackHandlers;
-const getSlackClient = () =>
-  (globalThis as { __slackClient?: Record<string, unknown> }).__slackClient;
-
-vi.mock("../config/config.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../config/config.js")>();
-  return {
-    ...actual,
-    loadConfig: () => config,
-  };
-});
-
-vi.mock("../auto-reply/reply.js", () => ({
-  getReplyFromConfig: (...args: unknown[]) => replyMock(...args),
-}));
-
-vi.mock("./resolve-channels.js", () => ({
-  resolveSlackChannelAllowlist: async ({ entries }: { entries: string[] }) =>
-    entries.map((input) => ({ input, resolved: false })),
-}));
-
-vi.mock("./resolve-users.js", () => ({
-  resolveSlackUserAllowlist: async ({ entries }: { entries: string[] }) =>
-    entries.map((input) => ({ input, resolved: false })),
-}));
-
-vi.mock("./send.js", () => ({
-  sendMessageSlack: (...args: unknown[]) => sendMock(...args),
-}));
-
-vi.mock("../pairing/pairing-store.js", () => ({
-  readChannelAllowFromStore: (...args: unknown[]) => readAllowFromStoreMock(...args),
-  upsertChannelPairingRequest: (...args: unknown[]) => upsertPairingRequestMock(...args),
-}));
-
-vi.mock("../config/sessions.js", () => ({
-  resolveStorePath: vi.fn(() => "/tmp/clawdbot-sessions.json"),
-  updateLastRoute: (...args: unknown[]) => updateLastRouteMock(...args),
-  resolveSessionKey: vi.fn(),
-  readSessionUpdatedAt: vi.fn(() => undefined),
-  recordSessionMetaFromInbound: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock("@slack/bolt", () => {
-  const handlers = new Map<string, (args: unknown) => Promise<void>>();
-  (globalThis as { __slackHandlers?: typeof handlers }).__slackHandlers = handlers;
-  const client = {
-    auth: { test: vi.fn().mockResolvedValue({ user_id: "bot-user" }) },
-    conversations: {
-      info: vi.fn().mockResolvedValue({
-        channel: { name: "dm", is_im: true },
-      }),
-      replies: vi.fn().mockResolvedValue({ messages: [] }),
-    },
-    users: {
-      info: vi.fn().mockResolvedValue({
-        user: { profile: { display_name: "Ada" } },
-      }),
-    },
-    assistant: {
-      threads: {
-        setStatus: vi.fn().mockResolvedValue({ ok: true }),
-      },
-    },
-    reactions: {
-      add: (...args: unknown[]) => reactMock(...args),
-    },
-  };
-  (globalThis as { __slackClient?: typeof client }).__slackClient = client;
-  class App {
-    client = client;
-    event(name: string, handler: (args: unknown) => Promise<void>) {
-      handlers.set(name, handler);
-    }
-    command() {
-      /* no-op */
-    }
-    start = vi.fn().mockResolvedValue(undefined);
-    stop = vi.fn().mockResolvedValue(undefined);
-  }
-  class HTTPReceiver {
-    requestListener = vi.fn();
-  }
-  return { App, HTTPReceiver, default: { App, HTTPReceiver } };
-});
-
-const flush = () => new Promise((resolve) => setTimeout(resolve, 0));
-
-async function waitForEvent(name: string) {
-  for (let i = 0; i < 10; i += 1) {
-    if (getSlackHandlers()?.has(name)) return;
-    await flush();
-  }
-}
+const slackTestState = getSlackTestState();
+const { sendMock, replyMock } = slackTestState;
 
 beforeEach(() => {
   resetInboundDedupe();
-  getSlackHandlers()?.clear();
-  config = {
-    messages: {
-      responsePrefix: "PFX",
-      ackReaction: "👀",
-      ackReactionScope: "group-mentions",
-    },
-    channels: {
-      slack: {
-        dm: { enabled: true, policy: "open", allowFrom: ["*"] },
-        groupPolicy: "open",
-      },
-    },
-  };
-  sendMock.mockReset().mockResolvedValue(undefined);
-  replyMock.mockReset();
-  updateLastRouteMock.mockReset();
-  reactMock.mockReset();
-  readAllowFromStoreMock.mockReset().mockResolvedValue([]);
-  upsertPairingRequestMock.mockReset().mockResolvedValue({ code: "PAIRCODE", created: true });
+  resetSlackTestState(defaultSlackTestConfig());
 });
 
 describe("monitorSlackProvider tool results", () => {
   it("threads top-level replies when replyToMode is all", async () => {
     replyMock.mockResolvedValue({ text: "thread reply" });
-    config = {
+    slackTestState.config = {
       messages: {
         responsePrefix: "PFX",
         ackReaction: "👀",
@@ -158,7 +44,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -191,7 +77,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -224,7 +110,7 @@ describe("monitorSlackProvider tool results", () => {
   it("keeps thread parent inheritance opt-in", async () => {
     replyMock.mockResolvedValue({ text: "thread reply" });
 
-    config = {
+    slackTestState.config = {
       messages: { responsePrefix: "PFX" },
       channels: {
         slack: {
@@ -242,7 +128,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -286,7 +172,7 @@ describe("monitorSlackProvider tool results", () => {
       });
     }
 
-    config = {
+    slackTestState.config = {
       messages: { responsePrefix: "PFX" },
       channels: {
         slack: {
@@ -303,7 +189,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -338,7 +224,7 @@ describe("monitorSlackProvider tool results", () => {
 
   it("scopes thread session keys to the routed agent", async () => {
     replyMock.mockResolvedValue({ text: "ok" });
-    config = {
+    slackTestState.config = {
       messages: { responsePrefix: "PFX" },
       channels: {
         slack: {
@@ -369,7 +255,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -400,7 +286,7 @@ describe("monitorSlackProvider tool results", () => {
 
   it("keeps replies in channel root when message is not threaded (replyToMode off)", async () => {
     replyMock.mockResolvedValue({ text: "root reply" });
-    config = {
+    slackTestState.config = {
       messages: {
         responsePrefix: "PFX",
         ackReaction: "👀",
@@ -421,7 +307,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
@@ -446,7 +332,7 @@ describe("monitorSlackProvider tool results", () => {
 
   it("threads first reply when replyToMode is first and message is not threaded", async () => {
     replyMock.mockResolvedValue({ text: "first reply" });
-    config = {
+    slackTestState.config = {
       messages: {
         responsePrefix: "PFX",
         ackReaction: "👀",
@@ -467,7 +353,7 @@ describe("monitorSlackProvider tool results", () => {
       abortSignal: controller.signal,
     });
 
-    await waitForEvent("message");
+    await waitForSlackEvent("message");
     const handler = getSlackHandlers()?.get("message");
     if (!handler) throw new Error("Slack message handler not registered");
 
diff --git a/src/slack/monitor/message-handler/prepare.inbound-contract.test.ts b/src/slack/monitor/message-handler/prepare.inbound-contract.test.ts
index f0983d16b..d435aa589 100644
--- a/src/slack/monitor/message-handler/prepare.inbound-contract.test.ts
+++ b/src/slack/monitor/message-handler/prepare.inbound-contract.test.ts
@@ -77,4 +77,72 @@ describe("slack prepareSlackMessage inbound contract", () => {
     expect(prepared).toBeTruthy();
     expectInboundContextContract(prepared!.ctxPayload as any);
   });
+
+  it("sets MessageThreadId for top-level messages when replyToMode=all", async () => {
+    const slackCtx = createSlackMonitorContext({
+      cfg: {
+        channels: { slack: { enabled: true, replyToMode: "all" } },
+      } as ClawdbotConfig,
+      accountId: "default",
+      botToken: "token",
+      app: { client: {} } as App,
+      runtime: {} as RuntimeEnv,
+      botUserId: "B1",
+      teamId: "T1",
+      apiAppId: "A1",
+      historyLimit: 0,
+      sessionScope: "per-sender",
+      mainKey: "main",
+      dmEnabled: true,
+      dmPolicy: "open",
+      allowFrom: [],
+      groupDmEnabled: true,
+      groupDmChannels: [],
+      defaultRequireMention: true,
+      groupPolicy: "open",
+      useAccessGroups: false,
+      reactionMode: "off",
+      reactionAllowlist: [],
+      replyToMode: "all",
+      threadHistoryScope: "thread",
+      threadInheritParent: false,
+      slashCommand: {
+        enabled: false,
+        name: "clawd",
+        sessionPrefix: "slack:slash",
+        ephemeral: true,
+      },
+      textLimit: 4000,
+      ackReactionScope: "group-mentions",
+      mediaMaxBytes: 1024,
+      removeAckAfterReply: false,
+    });
+    slackCtx.resolveUserName = async () => ({ name: "Alice" }) as any;
+
+    const account: ResolvedSlackAccount = {
+      accountId: "default",
+      enabled: true,
+      botTokenSource: "config",
+      appTokenSource: "config",
+      config: { replyToMode: "all" },
+    };
+
+    const message: SlackMessageEvent = {
+      channel: "D123",
+      channel_type: "im",
+      user: "U1",
+      text: "hi",
+      ts: "1.000",
+    } as SlackMessageEvent;
+
+    const prepared = await prepareSlackMessage({
+      ctx: slackCtx,
+      account,
+      message,
+      opts: { source: "message" },
+    });
+
+    expect(prepared).toBeTruthy();
+    expect(prepared!.ctxPayload.MessageThreadId).toBe("1.000");
+  });
 });
diff --git a/src/slack/monitor/message-handler/prepare.ts b/src/slack/monitor/message-handler/prepare.ts
index b1d9a15c6..c76ae4285 100644
--- a/src/slack/monitor/message-handler/prepare.ts
+++ b/src/slack/monitor/message-handler/prepare.ts
@@ -33,6 +33,7 @@ import type { ResolvedSlackAccount } from "../../accounts.js";
 import { reactSlackMessage } from "../../actions.js";
 import { sendMessageSlack } from "../../send.js";
 import type { SlackMessageEvent } from "../../types.js";
+import { resolveSlackThreadContext } from "../../threading.js";
 
 import { resolveSlackAllowListMatch, resolveSlackUserAllowed } from "../allow-list.js";
 import { resolveSlackEffectiveAllowFrom } from "../auth.js";
@@ -188,9 +189,9 @@ export async function prepareSlackMessage(params: {
   });
 
   const baseSessionKey = route.sessionKey;
-  const threadTs = message.thread_ts;
-  const hasThreadTs = typeof threadTs === "string" && threadTs.length > 0;
-  const isThreadReply = hasThreadTs && (threadTs !== message.ts || Boolean(message.parent_user_id));
+  const threadContext = resolveSlackThreadContext({ message, replyToMode: ctx.replyToMode });
+  const threadTs = threadContext.incomingThreadTs;
+  const isThreadReply = threadContext.isThreadReply;
   const threadKeys = resolveThreadSessionKeys({
     baseSessionKey,
     threadId: isThreadReply ? threadTs : undefined,
@@ -474,9 +475,9 @@ export async function prepareSlackMessage(params: {
     Provider: "slack" as const,
     Surface: "slack" as const,
     MessageSid: message.ts,
-    ReplyToId: message.thread_ts ?? message.ts,
-    // Preserve thread context for routed tool notifications (thread replies only).
-    MessageThreadId: isThreadReply ? threadTs : undefined,
+    ReplyToId: threadContext.replyToId,
+    // Preserve thread context for routed tool notifications.
+    MessageThreadId: threadContext.messageThreadId,
     ParentSessionKey: threadKeys.parentSessionKey,
     ThreadStarterBody: threadStarterBody,
     ThreadLabel: threadLabel,
diff --git a/src/slack/threading-tool-context.ts b/src/slack/threading-tool-context.ts
new file mode 100644
index 000000000..eeba12277
--- /dev/null
+++ b/src/slack/threading-tool-context.ts
@@ -0,0 +1,29 @@
+import type {
+  ChannelThreadingContext,
+  ChannelThreadingToolContext,
+} from "../channels/plugins/types.js";
+import type { ClawdbotConfig } from "../config/config.js";
+import { resolveSlackAccount } from "./accounts.js";
+
+export function buildSlackThreadingToolContext(params: {
+  cfg: ClawdbotConfig;
+  accountId?: string | null;
+  context: ChannelThreadingContext;
+  hasRepliedRef?: { value: boolean };
+}): ChannelThreadingToolContext {
+  const configuredReplyToMode =
+    resolveSlackAccount({
+      cfg: params.cfg,
+      accountId: params.accountId,
+    }).replyToMode ?? "off";
+  const effectiveReplyToMode = params.context.ThreadLabel ? "all" : configuredReplyToMode;
+  const threadId = params.context.MessageThreadId ?? params.context.ReplyToId;
+  return {
+    currentChannelId: params.context.To?.startsWith("channel:")
+      ? params.context.To.slice("channel:".length)
+      : undefined,
+    currentThreadTs: threadId != null ? String(threadId) : undefined,
+    replyToMode: effectiveReplyToMode,
+    hasRepliedRef: params.hasRepliedRef,
+  };
+}
diff --git a/src/slack/threading.test.ts b/src/slack/threading.test.ts
index 08ff766a9..837d3ddbc 100644
--- a/src/slack/threading.test.ts
+++ b/src/slack/threading.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import { resolveSlackThreadTargets } from "./threading.js";
+import { resolveSlackThreadContext, resolveSlackThreadTargets } from "./threading.js";
 
 describe("resolveSlackThreadTargets", () => {
   it("threads replies when message is already threaded", () => {
@@ -45,4 +45,35 @@ describe("resolveSlackThreadTargets", () => {
     expect(replyThreadTs).toBeUndefined();
     expect(statusThreadTs).toBe("123");
   });
+
+  it("sets messageThreadId for top-level messages when replyToMode is all", () => {
+    const context = resolveSlackThreadContext({
+      replyToMode: "all",
+      message: {
+        type: "message",
+        channel: "C1",
+        ts: "123",
+      },
+    });
+
+    expect(context.isThreadReply).toBe(false);
+    expect(context.messageThreadId).toBe("123");
+    expect(context.replyToId).toBe("123");
+  });
+
+  it("prefers thread_ts as messageThreadId for replies", () => {
+    const context = resolveSlackThreadContext({
+      replyToMode: "off",
+      message: {
+        type: "message",
+        channel: "C1",
+        ts: "123",
+        thread_ts: "456",
+      },
+    });
+
+    expect(context.isThreadReply).toBe(true);
+    expect(context.messageThreadId).toBe("456");
+    expect(context.replyToId).toBe("456");
+  });
 });
diff --git a/src/slack/threading.ts b/src/slack/threading.ts
index f02de2aa4..3a95beb2e 100644
--- a/src/slack/threading.ts
+++ b/src/slack/threading.ts
@@ -1,13 +1,44 @@
 import type { ReplyToMode } from "../config/types.js";
 import type { SlackAppMentionEvent, SlackMessageEvent } from "./types.js";
 
+export type SlackThreadContext = {
+  incomingThreadTs?: string;
+  messageTs?: string;
+  isThreadReply: boolean;
+  replyToId?: string;
+  messageThreadId?: string;
+};
+
+export function resolveSlackThreadContext(params: {
+  message: SlackMessageEvent | SlackAppMentionEvent;
+  replyToMode: ReplyToMode;
+}): SlackThreadContext {
+  const incomingThreadTs = params.message.thread_ts;
+  const eventTs = params.message.event_ts;
+  const messageTs = params.message.ts ?? eventTs;
+  const hasThreadTs = typeof incomingThreadTs === "string" && incomingThreadTs.length > 0;
+  const isThreadReply =
+    hasThreadTs && (incomingThreadTs !== messageTs || Boolean(params.message.parent_user_id));
+  const replyToId = incomingThreadTs ?? messageTs;
+  const messageThreadId = isThreadReply
+    ? incomingThreadTs
+    : params.replyToMode === "all"
+      ? messageTs
+      : undefined;
+  return {
+    incomingThreadTs,
+    messageTs,
+    isThreadReply,
+    replyToId,
+    messageThreadId,
+  };
+}
+
 export function resolveSlackThreadTargets(params: {
   message: SlackMessageEvent | SlackAppMentionEvent;
   replyToMode: ReplyToMode;
 }) {
-  const incomingThreadTs = params.message.thread_ts;
-  const eventTs = params.message.event_ts;
-  const messageTs = params.message.ts ?? eventTs;
+  const { incomingThreadTs, messageTs } = resolveSlackThreadContext(params);
   const replyThreadTs = incomingThreadTs ?? (params.replyToMode === "all" ? messageTs : undefined);
   const statusThreadTs = replyThreadTs ?? messageTs;
   return { replyThreadTs, statusThreadTs };

From b5fd66c92dc5cd8b39b8ce72b1944b8ed5a0f06f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:35:39 +0000
Subject: [PATCH 061/171] fix: add explicit tailnet gateway bind

---
 CHANGELOG.md                                  |  5 +----
 docs/cli/gateway.md                           |  2 +-
 docs/cli/index.md                             |  4 ++--
 docs/gateway/configuration.md                 |  9 +++++++-
 docs/gateway/remote.md                        |  2 +-
 docs/gateway/security.md                      |  2 +-
 docs/gateway/tailscale.md                     | 21 +++++++++++++++++++
 docs/gateway/troubleshooting.md               |  4 ++--
 docs/start/faq.md                             |  2 +-
 src/cli/daemon-cli/shared.ts                  |  2 +-
 src/cli/daemon-cli/status.gather.ts           |  3 ++-
 src/cli/gateway-cli/run.ts                    | 10 ++++++---
 src/cli/program/register.onboard.ts           |  2 +-
 src/commands/configure.gateway.ts             | 21 ++++++++++++-------
 src/commands/onboard-helpers.test.ts          | 20 ++++++++++++++++++
 src/commands/onboard-helpers.ts               |  4 ++--
 src/commands/onboard-non-interactive/local.ts |  2 +-
 src/commands/onboard-types.ts                 |  2 +-
 ...etection.rejects-routing-allowfrom.test.ts |  6 +++---
 src/config/legacy.migrations.part-3.ts        | 17 ---------------
 src/config/types.gateway.ts                   |  5 +++--
 src/config/zod-schema.ts                      |  8 ++++++-
 src/gateway/call.test.ts                      | 14 +++++++++++--
 src/gateway/call.ts                           |  2 +-
 src/gateway/net.ts                            | 13 +++++++++---
 src/gateway/server.impl.ts                    |  2 +-
 src/macos/gateway-daemon.ts                   |  8 +++++--
 src/wizard/onboarding.gateway-config.ts       |  9 ++++----
 src/wizard/onboarding.ts                      |  9 ++++++--
 src/wizard/onboarding.types.ts                |  4 ++--
 30 files changed, 143 insertions(+), 71 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acb3cb33a..2dd40fbd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,22 +5,19 @@ Docs: https://docs.clawd.bot
 ## 2026.1.21
 
 ### Changes
-- Caching: make tool-result pruning TTL-aware so cache reuse stays stable and token usage drops.
 - CLI: default exec approvals to the local host, add gateway/node targeting flags, and show target details in allowlist output.
 - CLI: exec approvals mutations render tables instead of raw JSON.
 - Exec approvals: support wildcard agent allowlists (`*`) across all agents.
 - Nodes: expose node PATH in status/describe and bootstrap PATH for node-host execution.
-- Nodes: run always uses exec approvals + defaults, with raw shell mode and ask/security overrides. https://docs.clawd.bot/cli/nodes
 - CLI: flatten node service commands under `clawdbot node` and remove `service node` docs.
 - CLI: move gateway service commands under `clawdbot gateway` and add `gateway probe` for reachability.
 - Sessions: add per-channel reset overrides via `session.resetByChannel`. (#1353) Thanks @cash-echo-bot.
 
 ### Fixes
-- Embedded runner: drop obsolete pi-mono transcript workarounds now handled upstream.
+- Gateway: keep auto bind loopback-first and add explicit tailnet binding to avoid Tailscale taking over local UI. (#1380)
 - Embedded runner: persist injected history images so attachments aren’t reloaded each turn. (#1374) Thanks @Nicell.
 - Nodes tool: include agent/node/gateway context in tool failure logs to speed approval debugging.
 - macOS: exec approvals now respect wildcard agent allowlists (`*`).
-- macOS: bundle and cache the model catalog instead of reading from a local pi-mono checkout.
 - macOS: allow SSH agent auth when no identity file is set. (#1384) Thanks @ameno-.
 - UI: remove the chat stop button and keep the composer aligned to the bottom edge.
 - Typing: start instant typing indicators at run start so DMs and mentions show immediately.
diff --git a/docs/cli/gateway.md b/docs/cli/gateway.md
index 1334bfe87..253130780 100644
--- a/docs/cli/gateway.md
+++ b/docs/cli/gateway.md
@@ -40,7 +40,7 @@ Notes:
 ### Options
 
 - `--port <port>`: WebSocket port (default comes from config/env; usually `18789`).
-- `--bind <loopback|lan|tailnet|auto>`: listener bind mode.
+- `--bind <loopback|lan|tailnet|auto|custom>`: listener bind mode.
 - `--auth <token|password>`: auth mode override.
 - `--token <token>`: token override (also sets `CLAWDBOT_GATEWAY_TOKEN` for the process).
 - `--password <password>`: password override (also sets `CLAWDBOT_GATEWAY_PASSWORD` for the process).
diff --git a/docs/cli/index.md b/docs/cli/index.md
index 710c87eca..1166d7508 100644
--- a/docs/cli/index.md
+++ b/docs/cli/index.md
@@ -310,7 +310,7 @@ Options:
 - `--minimax-api-key <key>`
 - `--opencode-zen-api-key <key>`
 - `--gateway-port <port>`
-- `--gateway-bind <loopback|lan|tailnet|auto>`
+- `--gateway-bind <loopback|lan|tailnet|auto|custom>`
 - `--gateway-auth <off|token|password>`
 - `--gateway-token <token>`
 - `--gateway-password <password>`
@@ -596,7 +596,7 @@ Run the WebSocket Gateway.
 
 Options:
 - `--port <port>`
-- `--bind <loopback|tailnet|lan|auto>`
+- `--bind <loopback|tailnet|lan|auto|custom>`
 - `--token <token>`
 - `--auth <token|password>`
 - `--password <password>`
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index 51d3c46fb..dbc157c8c 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -2647,6 +2647,13 @@ Defaults:
 - bind: `loopback`
 - port: `18789` (single port for WS + HTTP)
 
+Bind modes:
+- `loopback`: `127.0.0.1` (local-only)
+- `lan`: `0.0.0.0` (all interfaces)
+- `tailnet`: Tailscale IPv4 address (100.64.0.0/10)
+- `auto`: prefer loopback, fall back to LAN if loopback cannot bind
+- `custom`: `gateway.customBindHost` (IPv4), fallback to LAN if unavailable
+
 ```json5
 {
   gateway: {
@@ -2677,7 +2684,7 @@ Notes:
 - OpenAI Chat Completions endpoint: **disabled by default**; enable with `gateway.http.endpoints.chatCompletions.enabled: true`.
 - OpenResponses endpoint: **disabled by default**; enable with `gateway.http.endpoints.responses.enabled: true`.
 - Precedence: `--port` > `CLAWDBOT_GATEWAY_PORT` > `gateway.port` > default `18789`.
-- Non-loopback binds (`lan`/`tailnet`/`auto`) require auth. Use `gateway.auth.token` (or `CLAWDBOT_GATEWAY_TOKEN`).
+- Non-loopback binds (`lan`/`tailnet`/`custom`, or `auto` when loopback is unavailable) require auth. Use `gateway.auth.token` (or `CLAWDBOT_GATEWAY_TOKEN`).
 - The onboarding wizard generates a gateway token by default (even on loopback).
 - `gateway.remote.token` is **only** for remote CLI calls; it does not enable local gateway auth. `gateway.token` is ignored.
 
diff --git a/docs/gateway/remote.md b/docs/gateway/remote.md
index 99ccb6326..800d9761e 100644
--- a/docs/gateway/remote.md
+++ b/docs/gateway/remote.md
@@ -112,7 +112,7 @@ Runbook: [macOS remote access](/platforms/mac/remote).
 Short version: **keep the Gateway loopback-only** unless you’re sure you need a bind.
 
 - **Loopback + SSH/Tailscale Serve** is the safest default (no public exposure).
-- **Non-loopback binds** (`lan`/`tailnet`/`auto`) must use auth tokens/passwords.
+- **Non-loopback binds** (`lan`/`tailnet`/`custom`, or `auto` when loopback is unavailable) must use auth tokens/passwords.
 - `gateway.remote.token` is **only** for remote CLI calls — it does **not** enable local auth.
 - `gateway.remote.tlsFingerprint` pins the remote TLS cert when using `wss://`.
 - **Tailscale Serve** can authenticate via identity headers when `gateway.auth.allowTailscale: true`.
diff --git a/docs/gateway/security.md b/docs/gateway/security.md
index 4afe2d380..cd9a80126 100644
--- a/docs/gateway/security.md
+++ b/docs/gateway/security.md
@@ -237,7 +237,7 @@ The Gateway multiplexes **WebSocket + HTTP** on a single port:
 
 Bind mode controls where the Gateway listens:
 - `gateway.bind: "loopback"` (default): only local clients can connect.
-- Non-loopback binds (`"lan"`, `"tailnet"`, `"auto"`) expand the attack surface. Only use them with `gateway.auth` enabled and a real firewall.
+- Non-loopback binds (`"lan"`, `"tailnet"`, `"custom"`) expand the attack surface. Only use them with `gateway.auth` enabled and a real firewall.
 
 Rules of thumb:
 - Prefer Tailscale Serve over LAN binds (Serve keeps the Gateway on loopback, and Tailscale handles access).
diff --git a/docs/gateway/tailscale.md b/docs/gateway/tailscale.md
index a7b9d6fbe..10477f90c 100644
--- a/docs/gateway/tailscale.md
+++ b/docs/gateway/tailscale.md
@@ -46,6 +46,25 @@ force `gateway.auth.mode: "password"`.
 
 Open: `https://<magicdns>/` (or your configured `gateway.controlUi.basePath`)
 
+### Tailnet-only (bind to Tailnet IP)
+
+Use this when you want the Gateway to listen directly on the Tailnet IP (no Serve/Funnel).
+
+```json5
+{
+  gateway: {
+    bind: "tailnet",
+    auth: { mode: "token", token: "your-token" }
+  }
+}
+```
+
+Connect from another Tailnet device:
+- Control UI: `http://<tailscale-ip>:18789/`
+- WebSocket: `ws://<tailscale-ip>:18789`
+
+Note: loopback (`http://127.0.0.1:18789`) will **not** work in this mode.
+
 ### Public internet (Funnel + shared password)
 
 ```json5
@@ -73,6 +92,8 @@ clawdbot gateway --tailscale funnel --auth password
 - `tailscale.mode: "funnel"` refuses to start unless auth mode is `password` to avoid public exposure.
 - Set `gateway.tailscale.resetOnExit` if you want Clawdbot to undo `tailscale serve`
   or `tailscale funnel` configuration on shutdown.
+- `gateway.bind: "tailnet"` is a direct Tailnet bind (no HTTPS, no Serve/Funnel).
+- `gateway.bind: "auto"` prefers loopback; use `tailnet` if you want Tailnet-only.
 - Serve/Funnel only expose the **Gateway control UI + WS**. Node **bridge** traffic
   uses the separate bridge port (default `18790`) and is **not** proxied by Serve.
 
diff --git a/docs/gateway/troubleshooting.md b/docs/gateway/troubleshooting.md
index 93f5d64bc..ad21290af 100644
--- a/docs/gateway/troubleshooting.md
+++ b/docs/gateway/troubleshooting.md
@@ -112,7 +112,7 @@ the Gateway likely refused to bind.
 - `gateway.mode` must be `local` for `clawdbot gateway` and the service.
 - If you set `gateway.mode=remote`, the **CLI defaults** to a remote URL. The service can still be running locally, but your CLI may be probing the wrong place. Use `clawdbot gateway status` to see the service’s resolved port + probe target (or pass `--url`).
 - `clawdbot gateway status` and `clawdbot doctor` surface the **last gateway error** from logs when the service looks running but the port is closed.
-- Non-loopback binds (`lan`/`tailnet`/`auto`) require auth:
+- Non-loopback binds (`lan`/`tailnet`/`custom`, or `auto` when loopback is unavailable) require auth:
   `gateway.auth.token` (or `CLAWDBOT_GATEWAY_TOKEN`).
 - `gateway.remote.token` is for remote CLI calls only; it does **not** enable local auth.
 - `gateway.token` is ignored; use `gateway.auth.token`.
@@ -127,7 +127,7 @@ the Gateway likely refused to bind.
 - Fix: run `clawdbot doctor` to update it (or `clawdbot gateway install --force` for a full rewrite).
 
 **If `Last gateway error:` mentions “refusing to bind … without auth”**
-- You set `gateway.bind` to a non-loopback mode (`lan`/`tailnet`/`auto`) but left auth off.
+- You set `gateway.bind` to a non-loopback mode (`lan`/`tailnet`/`custom`, or `auto` when loopback is unavailable) but left auth off.
 - Fix: set `gateway.auth.mode` + `gateway.auth.token` (or export `CLAWDBOT_GATEWAY_TOKEN`) and restart the service.
 
 **If `clawdbot gateway status` says `bind=tailnet` but no tailnet interface was found**
diff --git a/docs/start/faq.md b/docs/start/faq.md
index 92b6c645e..4b849b823 100644
--- a/docs/start/faq.md
+++ b/docs/start/faq.md
@@ -1415,7 +1415,7 @@ Fix:
 - Start Tailscale on that host (so it has a 100.x address), or
 - Switch to `gateway.bind: "loopback"` / `"lan"`.
   
-Note: `tailnet` is legacy and is migrated to `auto` by Doctor. Prefer `gateway.bind: "auto"` when using Tailscale.
+Note: `tailnet` is explicit. `auto` prefers loopback; use `gateway.bind: "tailnet"` when you want a tailnet-only bind.
 
 ### Can I run multiple Gateways on the same host?
 
diff --git a/src/cli/daemon-cli/shared.ts b/src/cli/daemon-cli/shared.ts
index 1e0d82dce..eba270610 100644
--- a/src/cli/daemon-cli/shared.ts
+++ b/src/cli/daemon-cli/shared.ts
@@ -46,7 +46,7 @@ export function pickProbeHostForBind(
   if (bindMode === "custom" && customBindHost?.trim()) {
     return customBindHost.trim();
   }
-  if (bindMode === "auto") return tailnetIPv4 ?? "127.0.0.1";
+  if (bindMode === "tailnet") return tailnetIPv4 ?? "127.0.0.1";
   return "127.0.0.1";
 }
 
diff --git a/src/cli/daemon-cli/status.gather.ts b/src/cli/daemon-cli/status.gather.ts
index 1a2239cb9..c4b97aa53 100644
--- a/src/cli/daemon-cli/status.gather.ts
+++ b/src/cli/daemon-cli/status.gather.ts
@@ -172,7 +172,8 @@ export async function gatherDaemonStatus(
     | "auto"
     | "lan"
     | "loopback"
-    | "custom";
+    | "custom"
+    | "tailnet";
   const customBindHost = daemonCfg.gateway?.customBindHost;
   const bindHost = await resolveGatewayBindHost(bindMode, customBindHost);
   const tailnetIPv4 = pickPrimaryTailnetIPv4();
diff --git a/src/cli/gateway-cli/run.ts b/src/cli/gateway-cli/run.ts
index e75899fb4..1c2e8273c 100644
--- a/src/cli/gateway-cli/run.ts
+++ b/src/cli/gateway-cli/run.ts
@@ -174,11 +174,15 @@ async function runGatewayCommand(opts: GatewayRunOpts) {
   }
   const bindRaw = toOptionString(opts.bind) ?? cfg.gateway?.bind ?? "loopback";
   const bind =
-    bindRaw === "loopback" || bindRaw === "lan" || bindRaw === "auto" || bindRaw === "custom"
+    bindRaw === "loopback" ||
+    bindRaw === "lan" ||
+    bindRaw === "auto" ||
+    bindRaw === "custom" ||
+    bindRaw === "tailnet"
       ? bindRaw
       : null;
   if (!bind) {
-    defaultRuntime.error('Invalid --bind (use "loopback", "lan", "auto", or "custom")');
+    defaultRuntime.error('Invalid --bind (use "loopback", "lan", "tailnet", "auto", or "custom")');
     defaultRuntime.exit(1);
     return;
   }
@@ -304,7 +308,7 @@ export function addGatewayRunCommand(cmd: Command): Command {
     .option("--port <port>", "Port for the gateway WebSocket")
     .option(
       "--bind <mode>",
-      'Bind mode ("loopback"|"tailnet"|"lan"|"auto"). Defaults to config gateway.bind (or loopback).',
+      'Bind mode ("loopback"|"lan"|"tailnet"|"auto"|"custom"). Defaults to config gateway.bind (or loopback).',
     )
     .option(
       "--token <token>",
diff --git a/src/cli/program/register.onboard.ts b/src/cli/program/register.onboard.ts
index 9b1ebed06..f2f75d3cc 100644
--- a/src/cli/program/register.onboard.ts
+++ b/src/cli/program/register.onboard.ts
@@ -76,7 +76,7 @@ export function registerOnboardCommand(program: Command) {
     .option("--synthetic-api-key <key>", "Synthetic API key")
     .option("--opencode-zen-api-key <key>", "OpenCode Zen API key")
     .option("--gateway-port <port>", "Gateway port")
-    .option("--gateway-bind <mode>", "Gateway bind: loopback|lan|auto|custom")
+    .option("--gateway-bind <mode>", "Gateway bind: loopback|tailnet|lan|auto|custom")
     .option("--gateway-auth <mode>", "Gateway auth: off|token|password")
     .option("--gateway-token <token>", "Gateway token (token auth)")
     .option("--gateway-password <password>", "Gateway password (password auth)")
diff --git a/src/commands/configure.gateway.ts b/src/commands/configure.gateway.ts
index 120a7776a..ba44c3dcf 100644
--- a/src/commands/configure.gateway.ts
+++ b/src/commands/configure.gateway.ts
@@ -31,21 +31,26 @@ export async function promptGatewayConfig(
     await select({
       message: "Gateway bind mode",
       options: [
+        {
+          value: "loopback",
+          label: "Loopback (Local only)",
+          hint: "Bind to 127.0.0.1 - secure, local-only access",
+        },
+        {
+          value: "tailnet",
+          label: "Tailnet (Tailscale IP)",
+          hint: "Bind to your Tailscale IP only (100.x.x.x)",
+        },
         {
           value: "auto",
-          label: "Auto (Tailnet → LAN)",
-          hint: "Prefer Tailnet IP, fall back to all interfaces if unavailable",
+          label: "Auto (Loopback → LAN)",
+          hint: "Prefer loopback; fall back to all interfaces if unavailable",
         },
         {
           value: "lan",
           label: "LAN (All interfaces)",
           hint: "Bind to 0.0.0.0 - accessible from anywhere on your network",
         },
-        {
-          value: "loopback",
-          label: "Loopback (Local only)",
-          hint: "Bind to 127.0.0.1 - secure, local-only access",
-        },
         {
           value: "custom",
           label: "Custom IP",
@@ -54,7 +59,7 @@ export async function promptGatewayConfig(
       ],
     }),
     runtime,
-  ) as "auto" | "lan" | "loopback" | "custom";
+  ) as "auto" | "lan" | "loopback" | "custom" | "tailnet";
 
   let customBindHost: string | undefined;
   if (bind === "custom") {
diff --git a/src/commands/onboard-helpers.test.ts b/src/commands/onboard-helpers.test.ts
index 20892d312..6a8dd21b8 100644
--- a/src/commands/onboard-helpers.test.ts
+++ b/src/commands/onboard-helpers.test.ts
@@ -71,4 +71,24 @@ describe("resolveControlUiLinks", () => {
     expect(links.httpUrl).toBe("http://127.0.0.1:18789/");
     expect(links.wsUrl).toBe("ws://127.0.0.1:18789");
   });
+
+  it("uses tailnet IP for tailnet bind", () => {
+    mocks.pickPrimaryTailnetIPv4.mockReturnValueOnce("100.64.0.9");
+    const links = resolveControlUiLinks({
+      port: 18789,
+      bind: "tailnet",
+    });
+    expect(links.httpUrl).toBe("http://100.64.0.9:18789/");
+    expect(links.wsUrl).toBe("ws://100.64.0.9:18789");
+  });
+
+  it("keeps loopback for auto even when tailnet is present", () => {
+    mocks.pickPrimaryTailnetIPv4.mockReturnValueOnce("100.64.0.9");
+    const links = resolveControlUiLinks({
+      port: 18789,
+      bind: "auto",
+    });
+    expect(links.httpUrl).toBe("http://127.0.0.1:18789/");
+    expect(links.wsUrl).toBe("ws://127.0.0.1:18789");
+  });
 });
diff --git a/src/commands/onboard-helpers.ts b/src/commands/onboard-helpers.ts
index b609ee3b7..2e1ac091c 100644
--- a/src/commands/onboard-helpers.ts
+++ b/src/commands/onboard-helpers.ts
@@ -366,7 +366,7 @@ export const DEFAULT_WORKSPACE = DEFAULT_AGENT_WORKSPACE_DIR;
 
 export function resolveControlUiLinks(params: {
   port: number;
-  bind?: "auto" | "lan" | "loopback" | "custom";
+  bind?: "auto" | "lan" | "loopback" | "custom" | "tailnet";
   customBindHost?: string;
   basePath?: string;
 }): { httpUrl: string; wsUrl: string } {
@@ -378,7 +378,7 @@ export function resolveControlUiLinks(params: {
     if (bind === "custom" && customBindHost && isValidIPv4(customBindHost)) {
       return customBindHost;
     }
-    if (bind === "auto" && tailnetIPv4) return tailnetIPv4 ?? "127.0.0.1";
+    if (bind === "tailnet" && tailnetIPv4) return tailnetIPv4 ?? "127.0.0.1";
     return "127.0.0.1";
   })();
   const basePath = normalizeControlUiBasePath(params.basePath);
diff --git a/src/commands/onboard-non-interactive/local.ts b/src/commands/onboard-non-interactive/local.ts
index 8d4088e46..73c0d1582 100644
--- a/src/commands/onboard-non-interactive/local.ts
+++ b/src/commands/onboard-non-interactive/local.ts
@@ -91,7 +91,7 @@ export async function runNonInteractiveOnboardingLocal(params: {
   const daemonRuntimeRaw = opts.daemonRuntime ?? DEFAULT_GATEWAY_DAEMON_RUNTIME;
   if (!opts.skipHealth) {
     const links = resolveControlUiLinks({
-      bind: gatewayResult.bind as "auto" | "lan" | "loopback" | "custom",
+      bind: gatewayResult.bind as "auto" | "lan" | "loopback" | "custom" | "tailnet",
       port: gatewayResult.port,
       customBindHost: nextConfig.gateway?.customBindHost,
       basePath: undefined,
diff --git a/src/commands/onboard-types.ts b/src/commands/onboard-types.ts
index 90bae1025..2a445053d 100644
--- a/src/commands/onboard-types.ts
+++ b/src/commands/onboard-types.ts
@@ -33,7 +33,7 @@ export type AuthChoice =
   | "skip";
 export type GatewayAuthChoice = "off" | "token" | "password";
 export type ResetScope = "config" | "config+creds+sessions" | "full";
-export type GatewayBind = "loopback" | "lan" | "auto" | "custom";
+export type GatewayBind = "loopback" | "lan" | "auto" | "custom" | "tailnet";
 export type TailscaleMode = "off" | "serve" | "funnel";
 export type NodeManagerChoice = "npm" | "pnpm" | "bun";
 export type ChannelChoice = ChannelId;
diff --git a/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts b/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts
index 92f0f74cb..83b96e739 100644
--- a/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts
+++ b/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts
@@ -218,14 +218,14 @@ describe("legacy config detection", () => {
     expect(res.config?.gateway?.auth?.mode).toBe("token");
     expect((res.config?.gateway as { token?: string })?.token).toBeUndefined();
   });
-  it("migrates gateway.bind from 'tailnet' to 'auto'", async () => {
+  it("keeps gateway.bind tailnet", async () => {
     vi.resetModules();
     const { migrateLegacyConfig } = await import("./config.js");
     const res = migrateLegacyConfig({
       gateway: { bind: "tailnet" as const },
     });
-    expect(res.changes).toContain("Migrated gateway.bind from 'tailnet' to 'auto'.");
-    expect(res.config?.gateway?.bind).toBe("auto");
+    expect(res.changes).not.toContain("Migrated gateway.bind from 'tailnet' to 'auto'.");
+    expect(res.config?.gateway?.bind).toBe("tailnet");
   });
   it('rejects telegram.dmPolicy="open" without allowFrom "*"', async () => {
     vi.resetModules();
diff --git a/src/config/legacy.migrations.part-3.ts b/src/config/legacy.migrations.part-3.ts
index 111053fc0..fc34b1768 100644
--- a/src/config/legacy.migrations.part-3.ts
+++ b/src/config/legacy.migrations.part-3.ts
@@ -143,21 +143,4 @@ export const LEGACY_CONFIG_MIGRATIONS_PART_3: LegacyConfigMigration[] = [
       delete raw.identity;
     },
   },
-  {
-    id: "bind-tailnet->auto",
-    describe: "Remap gateway bind 'tailnet' to 'auto'",
-    apply: (raw, changes) => {
-      const migrateBind = (obj: Record<string, unknown> | null | undefined, key: string) => {
-        if (!obj) return;
-        const bind = obj.bind;
-        if (bind === "tailnet") {
-          obj.bind = "auto";
-          changes.push(`Migrated ${key}.bind from 'tailnet' to 'auto'.`);
-        }
-      };
-
-      const gateway = getRecord(raw.gateway);
-      migrateBind(gateway, "gateway");
-    },
-  },
 ];
diff --git a/src/config/types.gateway.ts b/src/config/types.gateway.ts
index 700a611af..ebc65abd4 100644
--- a/src/config/types.gateway.ts
+++ b/src/config/types.gateway.ts
@@ -1,4 +1,4 @@
-export type GatewayBindMode = "auto" | "lan" | "loopback" | "custom";
+export type GatewayBindMode = "auto" | "lan" | "loopback" | "custom" | "tailnet";
 
 export type GatewayTlsConfig = {
   /** Enable TLS for the gateway server. */
@@ -189,9 +189,10 @@ export type GatewayConfig = {
   mode?: "local" | "remote";
   /**
    * Bind address policy for the Gateway WebSocket + Control UI HTTP server.
-   * - auto: Tailnet IPv4 if available, else 0.0.0.0 (fallback to all interfaces)
+   * - auto: Loopback (127.0.0.1) if available, else 0.0.0.0 (fallback to all interfaces)
    * - lan: 0.0.0.0 (all interfaces, no fallback)
    * - loopback: 127.0.0.1 (local-only)
+   * - tailnet: Tailnet IPv4 if available (100.64.0.0/10), else loopback
    * - custom: User-specified IP, fallback to 0.0.0.0 if unavailable (requires customBindHost)
    * Default: loopback (127.0.0.1).
    */
diff --git a/src/config/zod-schema.ts b/src/config/zod-schema.ts
index 41fbdd57d..213f1d1fd 100644
--- a/src/config/zod-schema.ts
+++ b/src/config/zod-schema.ts
@@ -270,7 +270,13 @@ export const ClawdbotSchema = z
         port: z.number().int().positive().optional(),
         mode: z.union([z.literal("local"), z.literal("remote")]).optional(),
         bind: z
-          .union([z.literal("auto"), z.literal("lan"), z.literal("loopback"), z.literal("custom")])
+          .union([
+            z.literal("auto"),
+            z.literal("lan"),
+            z.literal("loopback"),
+            z.literal("custom"),
+            z.literal("tailnet"),
+          ])
           .optional(),
         controlUi: z
           .object({
diff --git a/src/gateway/call.test.ts b/src/gateway/call.test.ts
index bb0762671..a0a0d8583 100644
--- a/src/gateway/call.test.ts
+++ b/src/gateway/call.test.ts
@@ -72,14 +72,14 @@ describe("callGateway url resolution", () => {
     closeReason = "";
   });
 
-  it("uses tailnet IP when local bind is auto and tailnet is present", async () => {
+  it("keeps loopback when local bind is auto even if tailnet is present", async () => {
     loadConfig.mockReturnValue({ gateway: { mode: "local", bind: "auto" } });
     resolveGatewayPort.mockReturnValue(18800);
     pickPrimaryTailnetIPv4.mockReturnValue("100.64.0.1");
 
     await callGateway({ method: "health" });
 
-    expect(lastClientOptions?.url).toBe("ws://100.64.0.1:18800");
+    expect(lastClientOptions?.url).toBe("ws://127.0.0.1:18800");
   });
 
   it("falls back to loopback when local bind is auto without tailnet IP", async () => {
@@ -92,6 +92,16 @@ describe("callGateway url resolution", () => {
     expect(lastClientOptions?.url).toBe("ws://127.0.0.1:18800");
   });
 
+  it("uses tailnet IP when local bind is tailnet and tailnet is present", async () => {
+    loadConfig.mockReturnValue({ gateway: { mode: "local", bind: "tailnet" } });
+    resolveGatewayPort.mockReturnValue(18800);
+    pickPrimaryTailnetIPv4.mockReturnValue("100.64.0.1");
+
+    await callGateway({ method: "health" });
+
+    expect(lastClientOptions?.url).toBe("ws://100.64.0.1:18800");
+  });
+
   it("uses url override in remote mode even when remote url is missing", async () => {
     loadConfig.mockReturnValue({
       gateway: { mode: "remote", bind: "loopback", remote: {} },
diff --git a/src/gateway/call.ts b/src/gateway/call.ts
index 3e630ecf5..90a502a52 100644
--- a/src/gateway/call.ts
+++ b/src/gateway/call.ts
@@ -63,7 +63,7 @@ export function buildGatewayConnectionDetails(
   const localPort = resolveGatewayPort(config);
   const tailnetIPv4 = pickPrimaryTailnetIPv4();
   const bindMode = config.gateway?.bind ?? "loopback";
-  const preferTailnet = bindMode === "auto" && !!tailnetIPv4;
+  const preferTailnet = bindMode === "tailnet" && !!tailnetIPv4;
   const scheme = tlsEnabled ? "wss" : "ws";
   const localUrl =
     preferTailnet && tailnetIPv4
diff --git a/src/gateway/net.ts b/src/gateway/net.ts
index 890a5eee9..5e04e2c4c 100644
--- a/src/gateway/net.ts
+++ b/src/gateway/net.ts
@@ -33,7 +33,8 @@ export function isLocalGatewayAddress(ip: string | undefined): boolean {
  * Modes:
  * - loopback: 127.0.0.1 (rarely fails, but handled gracefully)
  * - lan: always 0.0.0.0 (no fallback)
- * - auto: Tailnet IPv4 if available, else 0.0.0.0
+ * - tailnet: Tailnet IPv4 if available, else loopback
+ * - auto: Loopback if available, else 0.0.0.0
  * - custom: User-specified IP, fallback to 0.0.0.0 if unavailable
  *
  * @returns The bind address to use (never null)
@@ -50,6 +51,13 @@ export async function resolveGatewayBindHost(
     return "0.0.0.0"; // extreme fallback
   }
 
+  if (mode === "tailnet") {
+    const tailnetIP = pickPrimaryTailnetIPv4();
+    if (tailnetIP && (await canBindTo(tailnetIP))) return tailnetIP;
+    if (await canBindTo("127.0.0.1")) return "127.0.0.1";
+    return "0.0.0.0";
+  }
+
   if (mode === "lan") {
     return "0.0.0.0";
   }
@@ -64,8 +72,7 @@ export async function resolveGatewayBindHost(
   }
 
   if (mode === "auto") {
-    const tailnetIP = pickPrimaryTailnetIPv4();
-    if (tailnetIP && (await canBindTo(tailnetIP))) return tailnetIP;
+    if (await canBindTo("127.0.0.1")) return "127.0.0.1";
     return "0.0.0.0";
   }
 
diff --git a/src/gateway/server.impl.ts b/src/gateway/server.impl.ts
index 33a0d9152..d2242fa2a 100644
--- a/src/gateway/server.impl.ts
+++ b/src/gateway/server.impl.ts
@@ -97,7 +97,7 @@ export type GatewayServerOptions = {
    * - loopback: 127.0.0.1
    * - lan: 0.0.0.0
    * - tailnet: bind only to the Tailscale IPv4 address (100.64.0.0/10)
-   * - auto: prefer tailnet, else LAN
+   * - auto: prefer loopback, else LAN
    */
   bind?: import("../config/config.js").GatewayBindMode;
   /**
diff --git a/src/macos/gateway-daemon.ts b/src/macos/gateway-daemon.ts
index a8dfd773e..03379a6df 100644
--- a/src/macos/gateway-daemon.ts
+++ b/src/macos/gateway-daemon.ts
@@ -87,11 +87,15 @@ async function main() {
     cfg.gateway?.bind ??
     "loopback";
   const bind =
-    bindRaw === "loopback" || bindRaw === "lan" || bindRaw === "auto" || bindRaw === "custom"
+    bindRaw === "loopback" ||
+    bindRaw === "lan" ||
+    bindRaw === "auto" ||
+    bindRaw === "custom" ||
+    bindRaw === "tailnet"
       ? bindRaw
       : null;
   if (!bind) {
-    defaultRuntime.error('Invalid --bind (use "loopback", "lan", "auto", or "custom")');
+    defaultRuntime.error('Invalid --bind (use "loopback", "lan", "tailnet", "auto", or "custom")');
     process.exit(1);
   }
 
diff --git a/src/wizard/onboarding.gateway-config.ts b/src/wizard/onboarding.gateway-config.ts
index 90a3de370..4974615eb 100644
--- a/src/wizard/onboarding.gateway-config.ts
+++ b/src/wizard/onboarding.gateway-config.ts
@@ -52,12 +52,13 @@ export async function configureGatewayForOnboarding(
           message: "Gateway bind",
           options: [
             { value: "loopback", label: "Loopback (127.0.0.1)" },
-            { value: "lan", label: "LAN" },
-            { value: "auto", label: "Auto" },
+            { value: "lan", label: "LAN (0.0.0.0)" },
+            { value: "tailnet", label: "Tailnet (Tailscale IP)" },
+            { value: "auto", label: "Auto (Loopback → LAN)" },
             { value: "custom", label: "Custom IP" },
           ],
-        })) as "loopback" | "lan" | "auto" | "custom")
-  ) as "loopback" | "lan" | "auto" | "custom";
+        })) as "loopback" | "lan" | "auto" | "custom" | "tailnet")
+  ) as "loopback" | "lan" | "auto" | "custom" | "tailnet";
 
   let customBindHost = quickstartGateway.customBindHost;
   if (bind === "custom") {
diff --git a/src/wizard/onboarding.ts b/src/wizard/onboarding.ts
index 96bc0058f..0ec2a7fc0 100644
--- a/src/wizard/onboarding.ts
+++ b/src/wizard/onboarding.ts
@@ -177,7 +177,11 @@ export async function runOnboardingWizard(
 
     const bindRaw = baseConfig.gateway?.bind;
     const bind =
-      bindRaw === "loopback" || bindRaw === "lan" || bindRaw === "auto" || bindRaw === "custom"
+      bindRaw === "loopback" ||
+      bindRaw === "lan" ||
+      bindRaw === "auto" ||
+      bindRaw === "custom" ||
+      bindRaw === "tailnet"
         ? bindRaw
         : "loopback";
 
@@ -213,10 +217,11 @@ export async function runOnboardingWizard(
   })();
 
   if (flow === "quickstart") {
-    const formatBind = (value: "loopback" | "lan" | "auto" | "custom") => {
+    const formatBind = (value: "loopback" | "lan" | "auto" | "custom" | "tailnet") => {
       if (value === "loopback") return "Loopback (127.0.0.1)";
       if (value === "lan") return "LAN";
       if (value === "custom") return "Custom IP";
+      if (value === "tailnet") return "Tailnet (Tailscale IP)";
       return "Auto";
     };
     const formatAuth = (value: GatewayAuthChoice) => {
diff --git a/src/wizard/onboarding.types.ts b/src/wizard/onboarding.types.ts
index f99ad16de..e49509d41 100644
--- a/src/wizard/onboarding.types.ts
+++ b/src/wizard/onboarding.types.ts
@@ -5,7 +5,7 @@ export type WizardFlow = "quickstart" | "advanced";
 export type QuickstartGatewayDefaults = {
   hasExisting: boolean;
   port: number;
-  bind: "loopback" | "lan" | "auto" | "custom";
+  bind: "loopback" | "lan" | "auto" | "custom" | "tailnet";
   authMode: GatewayAuthChoice;
   tailscaleMode: "off" | "serve" | "funnel";
   token?: string;
@@ -16,7 +16,7 @@ export type QuickstartGatewayDefaults = {
 
 export type GatewayWizardSettings = {
   port: number;
-  bind: "loopback" | "lan" | "auto" | "custom";
+  bind: "loopback" | "lan" | "auto" | "custom" | "tailnet";
   customBindHost?: string;
   authMode: GatewayAuthChoice;
   gatewayToken?: string;

From acd40e1780d617586fb1a87c18168f9cb1da2a48 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 20:53:50 +0000
Subject: [PATCH 062/171] docs: add showcase video

---
 docs/start/showcase.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/start/showcase.md b/docs/start/showcase.md
index b4c920d3c..c57790de7 100644
--- a/docs/start/showcase.md
+++ b/docs/start/showcase.md
@@ -60,6 +60,28 @@ Full setup walkthrough (28m) by VelvetShark.
 
 [Watch on YouTube](https://www.youtube.com/watch?v=mMSKQvlmFuQ)
 
+<div
+  style={{
+    position: "relative",
+    paddingBottom: "56.25%",
+    height: 0,
+    overflow: "hidden",
+    borderRadius: 16,
+  }}
+>
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/5kkIJNUGFho"
+    title="Clawdbot community showcase"
+    style={{ position: "absolute", top: 0, left: 0, width: "100%", height: "100%" }}
+    frameBorder="0"
+    loading="lazy"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+    allowFullScreen
+  />
+</div>
+
+[Watch on YouTube](https://www.youtube.com/watch?v=5kkIJNUGFho)
+
 ## 🆕 Fresh from Discord
 
 <CardGroup cols={2}>

From 310f9166759845efbebba8745d6100b8772be4b7 Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vigneshnatarajan92@gmail.com>
Date: Wed, 21 Jan 2026 12:54:02 -0800
Subject: [PATCH 063/171] fix(models): handle out-of-range pages

---
 src/auto-reply/reply/commands-models.test.ts |  9 ++++++
 src/auto-reply/reply/commands-models.ts      | 33 ++++++++++++++++----
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/auto-reply/reply/commands-models.test.ts b/src/auto-reply/reply/commands-models.test.ts
index 0dd321399..d225db991 100644
--- a/src/auto-reply/reply/commands-models.test.ts
+++ b/src/auto-reply/reply/commands-models.test.ts
@@ -74,11 +74,20 @@ describe("/models command", () => {
     const result = await handleCommands(params);
     expect(result.shouldContinue).toBe(false);
     expect(result.reply?.text).toContain("Models (anthropic)");
+    expect(result.reply?.text).toContain("page 1/");
     expect(result.reply?.text).toContain("anthropic/claude-opus-4-5");
     expect(result.reply?.text).toContain("Switch: /model <provider/model>");
     expect(result.reply?.text).toContain("All: /models anthropic all");
   });
 
+  it("errors on out-of-range pages", async () => {
+    const params = buildParams("/models anthropic 4", cfg);
+    const result = await handleCommands(params);
+    expect(result.shouldContinue).toBe(false);
+    expect(result.reply?.text).toContain("Page out of range");
+    expect(result.reply?.text).toContain("valid: 1-");
+  });
+
   it("handles unknown providers", async () => {
     const params = buildParams("/models not-a-provider", cfg);
     const result = await handleCommands(params);
diff --git a/src/auto-reply/reply/commands-models.ts b/src/auto-reply/reply/commands-models.ts
index fbc5560f5..3bb545746 100644
--- a/src/auto-reply/reply/commands-models.ts
+++ b/src/auto-reply/reply/commands-models.ts
@@ -143,23 +143,44 @@ export const handleModelsCommand: CommandHandler = async (params, allowTextComma
   const models = [...(byProvider.get(provider) ?? new Set<string>())].sort();
   const total = models.length;
 
+  if (total === 0) {
+    const lines: string[] = [
+      `Models (${provider}) — none`,
+      "",
+      "Browse: /models",
+      "Switch: /model <provider/model>",
+    ];
+    return { reply: { text: lines.join("\n") }, shouldContinue: false };
+  }
+
   const effectivePageSize = all ? total : pageSize;
-  const startIndex = (page - 1) * effectivePageSize;
+  const pageCount = effectivePageSize > 0 ? Math.ceil(total / effectivePageSize) : 1;
+  const safePage = all ? 1 : Math.max(1, Math.min(page, pageCount));
+
+  if (!all && page !== safePage) {
+    const lines: string[] = [
+      `Page out of range: ${page} (valid: 1-${pageCount})`,
+      "",
+      `Try: /models ${provider} ${safePage}`,
+      `All: /models ${provider} all`,
+    ];
+    return { reply: { text: lines.join("\n") }, shouldContinue: false };
+  }
+
+  const startIndex = (safePage - 1) * effectivePageSize;
   const endIndexExclusive = Math.min(total, startIndex + effectivePageSize);
   const pageModels = models.slice(startIndex, endIndexExclusive);
 
-  const header = `Models (${provider}) — showing ${startIndex + 1}-${endIndexExclusive} of ${total}`;
+  const header = `Models (${provider}) — showing ${startIndex + 1}-${endIndexExclusive} of ${total} (page ${safePage}/${pageCount})`;
 
   const lines: string[] = [header];
   for (const id of pageModels) {
     lines.push(`- ${provider}/${id}`);
   }
 
-  const pageCount = effectivePageSize > 0 ? Math.ceil(total / effectivePageSize) : 1;
-
   lines.push("", "Switch: /model <provider/model>");
-  if (!all && page < pageCount) {
-    lines.push(`More: /models ${provider} ${page + 1}`);
+  if (!all && safePage < pageCount) {
+    lines.push(`More: /models ${provider} ${safePage + 1}`);
   }
   if (!all) {
     lines.push(`All: /models ${provider} all`);

From 6e044b5f2f49cc7bd416093b952eacb3fcb4b68c Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vigneshnatarajan92@gmail.com>
Date: Wed, 21 Jan 2026 13:14:18 -0800
Subject: [PATCH 064/171] fix(models): include configured providers/models +
 ignore page with all

---
 src/auto-reply/reply/commands-models.test.ts | 35 +++++++++++++
 src/auto-reply/reply/commands-models.ts      | 55 +++++++++++++++++---
 2 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/src/auto-reply/reply/commands-models.test.ts b/src/auto-reply/reply/commands-models.test.ts
index d225db991..c32abfc7d 100644
--- a/src/auto-reply/reply/commands-models.test.ts
+++ b/src/auto-reply/reply/commands-models.test.ts
@@ -80,6 +80,16 @@ describe("/models command", () => {
     expect(result.reply?.text).toContain("All: /models anthropic all");
   });
 
+  it("ignores page argument when all flag is present", async () => {
+    const params = buildParams("/models anthropic 3 all", cfg);
+    const result = await handleCommands(params);
+    expect(result.shouldContinue).toBe(false);
+    expect(result.reply?.text).toContain("Models (anthropic)");
+    expect(result.reply?.text).toContain("page 1/1");
+    expect(result.reply?.text).toContain("anthropic/claude-opus-4-5");
+    expect(result.reply?.text).not.toContain("Page out of range");
+  });
+
   it("errors on out-of-range pages", async () => {
     const params = buildParams("/models anthropic 4", cfg);
     const result = await handleCommands(params);
@@ -95,4 +105,29 @@ describe("/models command", () => {
     expect(result.reply?.text).toContain("Unknown provider");
     expect(result.reply?.text).toContain("Available providers");
   });
+
+  it("lists configured models outside the curated catalog", async () => {
+    const customCfg = {
+      commands: { text: true },
+      agents: {
+        defaults: {
+          model: {
+            primary: "localai/ultra-chat",
+            fallbacks: ["anthropic/claude-opus-4-5"],
+          },
+          imageModel: "visionpro/studio-v1",
+        },
+      },
+    } as unknown as ClawdbotConfig;
+
+    const providerList = await handleCommands(buildParams("/models", customCfg));
+    expect(providerList.reply?.text).toContain("localai");
+    expect(providerList.reply?.text).toContain("visionpro");
+
+    const result = await handleCommands(buildParams("/models localai", customCfg));
+    expect(result.shouldContinue).toBe(false);
+    expect(result.reply?.text).toContain("Models (localai)");
+    expect(result.reply?.text).toContain("localai/ultra-chat");
+    expect(result.reply?.text).not.toContain("Unknown provider");
+  });
 });
diff --git a/src/auto-reply/reply/commands-models.ts b/src/auto-reply/reply/commands-models.ts
index 3bb545746..652c8d0e8 100644
--- a/src/auto-reply/reply/commands-models.ts
+++ b/src/auto-reply/reply/commands-models.ts
@@ -1,8 +1,10 @@
 import { loadModelCatalog } from "../../agents/model-catalog.js";
 import {
   buildAllowedModelSet,
+  buildModelAliasIndex,
   normalizeProviderId,
   resolveConfiguredModelRef,
+  resolveModelRefFromString,
 } from "../../agents/model-selection.js";
 import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "../../agents/defaults.js";
 import type { ReplyPayload } from "../types.js";
@@ -89,6 +91,11 @@ export const handleModelsCommand: CommandHandler = async (params, allowTextComma
     defaultModel: resolvedDefault.model,
   });
 
+  const aliasIndex = buildModelAliasIndex({
+    cfg: params.cfg,
+    defaultProvider: resolvedDefault.provider,
+  });
+
   const byProvider = new Map<string, Set<string>>();
   const add = (p: string, m: string) => {
     const key = normalizeProviderId(p);
@@ -97,22 +104,54 @@ export const handleModelsCommand: CommandHandler = async (params, allowTextComma
     byProvider.set(key, set);
   };
 
+  const addRawModelRef = (raw?: string) => {
+    const trimmed = raw?.trim();
+    if (!trimmed) return;
+    const resolved = resolveModelRefFromString({
+      raw: trimmed,
+      defaultProvider: resolvedDefault.provider,
+      aliasIndex,
+    });
+    if (!resolved) return;
+    add(resolved.ref.provider, resolved.ref.model);
+  };
+
+  const addModelConfigEntries = () => {
+    const modelConfig = params.cfg.agents?.defaults?.model;
+    if (typeof modelConfig === "string") {
+      addRawModelRef(modelConfig);
+    } else if (modelConfig && typeof modelConfig === "object") {
+      addRawModelRef(modelConfig.primary);
+      for (const fallback of modelConfig.fallbacks ?? []) {
+        addRawModelRef(fallback);
+      }
+    }
+
+    const imageConfig = params.cfg.agents?.defaults?.imageModel;
+    if (typeof imageConfig === "string") {
+      addRawModelRef(imageConfig);
+    } else if (imageConfig && typeof imageConfig === "object") {
+      addRawModelRef(imageConfig.primary);
+      for (const fallback of imageConfig.fallbacks ?? []) {
+        addRawModelRef(fallback);
+      }
+    }
+  };
+
   for (const entry of allowed.allowedCatalog) {
     add(entry.provider, entry.id);
   }
 
   // Include config-only allowlist keys that aren't in the curated catalog.
   for (const raw of Object.keys(params.cfg.agents?.defaults?.models ?? {})) {
-    const rawKey = String(raw ?? "").trim();
-    if (!rawKey) continue;
-    const slash = rawKey.indexOf("/");
-    if (slash === -1) continue;
-    const p = normalizeProviderId(rawKey.slice(0, slash));
-    const m = rawKey.slice(slash + 1).trim();
-    if (!p || !m) continue;
-    add(p, m);
+    addRawModelRef(raw);
   }
 
+  // Ensure configured defaults/fallbacks/image models show up even when the
+  // curated catalog doesn't know about them (custom providers, dev builds, etc.).
+  add(resolvedDefault.provider, resolvedDefault.model);
+  addModelConfigEntries();
+
   const providers = [...byProvider.keys()].sort();
 
   if (!provider) {

From 3b18efdd2521a7ecc30df9880c7c059e9f096f98 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 21:44:28 +0000
Subject: [PATCH 065/171] feat: tighten exec allowlist gating

---
 CHANGELOG.md                           |   1 +
 docs/tools/exec-approvals.md           |  10 +
 docs/tools/exec.md                     |  11 +-
 src/agents/bash-tools.exec.ts          |  74 ++++--
 src/cli/nodes-cli.coverage.test.ts     |   2 +-
 src/cli/nodes-cli/register.invoke.ts   |   7 +-
 src/config/schema.ts                   |   3 +
 src/config/types.tools.ts              |   2 +
 src/config/zod-schema.agent-runtime.ts |   2 +
 src/infra/exec-approvals.test.ts       |  84 ++++++-
 src/infra/exec-approvals.ts            | 323 ++++++++++++++++++++++++-
 src/node-host/runner.ts                |  79 +++++-
 12 files changed, 541 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dd40fbd5..b5271e2ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Docs: https://docs.clawd.bot
 - CLI: default exec approvals to the local host, add gateway/node targeting flags, and show target details in allowlist output.
 - CLI: exec approvals mutations render tables instead of raw JSON.
 - Exec approvals: support wildcard agent allowlists (`*`) across all agents.
+- Exec approvals: allowlist matches resolved binary paths only, add safe stdin-only bins, and tighten allowlist shell parsing.
 - Nodes: expose node PATH in status/describe and bootstrap PATH for node-host execution.
 - CLI: flatten node service commands under `clawdbot node` and remove `service node` docs.
 - CLI: move gateway service commands under `clawdbot gateway` and add `gateway probe` for reachability.
diff --git a/docs/tools/exec-approvals.md b/docs/tools/exec-approvals.md
index c6dccaab5..b96273664 100644
--- a/docs/tools/exec-approvals.md
+++ b/docs/tools/exec-approvals.md
@@ -87,6 +87,7 @@ If a prompt is required but no UI is reachable, fallback decides:
 
 Allowlists are **per agent**. If multiple agents exist, switch which agent you’re
 editing in the macOS app. Patterns are **case-insensitive glob matches**.
+Patterns should resolve to **binary paths** (basename-only entries are ignored).
 
 Examples:
 - `~/Projects/**/bin/bird`
@@ -104,6 +105,15 @@ When **Auto-allow skill CLIs** is enabled, executables referenced by known skill
 are treated as allowlisted on nodes (macOS node or headless node host). This uses the Bridge RPC to ask the
 gateway for the skill bin list. Disable this if you want strict manual allowlists.
 
+## Safe bins (stdin-only)
+
+`tools.exec.safeBins` defines a small list of **stdin-only** binaries (for example `jq`)
+that can run in allowlist mode **without** explicit allowlist entries. Safe bins reject
+positional file args and path-like tokens, so they can only operate on the incoming stream.
+Shell chaining and redirections are not auto-allowed in allowlist mode.
+
+Default safe bins: `jq`, `grep`, `cut`, `sort`, `uniq`, `head`, `tail`, `tr`, `wc`.
+
 ## Control UI editing
 
 Use the **Control UI → Nodes → Exec approvals** card to edit defaults, per‑agent
diff --git a/docs/tools/exec.md b/docs/tools/exec.md
index 759f0fe30..3a4f8297f 100644
--- a/docs/tools/exec.md
+++ b/docs/tools/exec.md
@@ -43,6 +43,7 @@ Notes:
 - `tools.exec.ask` (default: `on-miss`)
 - `tools.exec.node` (default: unset)
 - `tools.exec.pathPrepend`: list of directories to prepend to `PATH` for exec runs.
+- `tools.exec.safeBins`: stdin-only safe binaries that can run without explicit allowlist entries.
 
 Example:
 ```json5
@@ -64,7 +65,8 @@ Example:
 - `host=sandbox`: runs `sh -lc` (login shell) inside the container, so `/etc/profile` may reset `PATH`.
   Clawdbot prepends `env.PATH` after profile sourcing; `tools.exec.pathPrepend` applies here too.
 - `host=node`: only env overrides you pass are sent to the node. `tools.exec.pathPrepend` only applies
-  if the exec call already sets `env.PATH`.
+  if the exec call already sets `env.PATH`. Node PATH overrides are accepted only when they prepend
+  the node host PATH (no replacement).
 
 Per-agent node binding (use the agent list index in config):
 
@@ -90,6 +92,13 @@ Example:
 Sandboxed agents can require per-request approval before `exec` runs on the gateway or node host.
 See [Exec approvals](/tools/exec-approvals) for the policy, allowlist, and UI flow.
 
+## Allowlist + safe bins
+
+Allowlist enforcement matches **resolved binary paths only** (no basename matches). When
+`security=allowlist`, shell commands are auto-allowed only if every pipeline segment is
+allowlisted or a safe bin. Chaining (`;`, `&&`, `||`) and redirections are rejected in
+allowlist mode.
+
 ## Examples
 
 Foreground:
diff --git a/src/agents/bash-tools.exec.ts b/src/agents/bash-tools.exec.ts
index 7f5091d8c..b13003d8b 100644
--- a/src/agents/bash-tools.exec.ts
+++ b/src/agents/bash-tools.exec.ts
@@ -8,12 +8,15 @@ import {
   type ExecAsk,
   type ExecHost,
   type ExecSecurity,
+  type ExecAllowlistEntry,
   addAllowlistEntry,
+  analyzeShellCommand,
+  isSafeBinUsage,
   matchAllowlist,
   maxAsk,
   minSecurity,
+  resolveSafeBins,
   recordAllowlistUse,
-  resolveCommandResolution,
   resolveExecApprovals,
 } from "../infra/exec-approvals.js";
 import { requestHeartbeatNow } from "../infra/heartbeat-wake.js";
@@ -94,6 +97,7 @@ export type ExecToolDefaults = {
   ask?: ExecAsk;
   node?: string;
   pathPrepend?: string[];
+  safeBins?: string[];
   agentId?: string;
   backgroundMs?: number;
   timeoutSec?: number;
@@ -298,6 +302,7 @@ export function createExecTool(
       ? defaults.timeoutSec
       : 1800;
   const defaultPathPrepend = normalizePathPrepend(defaults?.pathPrepend);
+  const safeBins = resolveSafeBins(defaults?.safeBins);
   const notifyOnExit = defaults?.notifyOnExit !== false;
   const notifySessionKey = defaults?.sessionKey?.trim() || undefined;
 
@@ -593,13 +598,27 @@ export function createExecTool(
         if (hostSecurity === "deny") {
           throw new Error("exec denied: host=gateway security=deny");
         }
-
-        const resolution = resolveCommandResolution(params.command, workdir, env);
-        const allowlistMatch =
-          hostSecurity === "allowlist" ? matchAllowlist(approvals.allowlist, resolution) : null;
+        const analysis = analyzeShellCommand({ command: params.command, cwd: workdir, env });
+        const allowlistMatches: ExecAllowlistEntry[] = [];
+        let allowlistSatisfied = false;
+        if (hostSecurity === "allowlist" && analysis.ok && analysis.segments.length > 0) {
+          allowlistSatisfied = analysis.segments.every((segment) => {
+            const match = matchAllowlist(approvals.allowlist, segment.resolution);
+            if (match) allowlistMatches.push(match);
+            const safe = isSafeBinUsage({
+              argv: segment.argv,
+              resolution: segment.resolution,
+              safeBins,
+              cwd: workdir,
+            });
+            return Boolean(match || safe);
+          });
+        }
         const requiresAsk =
           hostAsk === "always" ||
-          (hostAsk === "on-miss" && hostSecurity === "allowlist" && !allowlistMatch);
+          (hostAsk === "on-miss" &&
+            hostSecurity === "allowlist" &&
+            (!analysis.ok || !allowlistSatisfied));
 
         let approvedByAsk = false;
         if (requiresAsk) {
@@ -613,7 +632,7 @@ export function createExecTool(
               security: hostSecurity,
               ask: hostAsk,
               agentId: defaults?.agentId,
-              resolvedPath: resolution?.resolvedPath ?? null,
+              resolvedPath: analysis.segments[0]?.resolution?.resolvedPath ?? null,
               sessionKey: defaults?.sessionKey ?? null,
               timeoutMs: 120_000,
             },
@@ -630,7 +649,7 @@ export function createExecTool(
             if (askFallback === "full") {
               approvedByAsk = true;
             } else if (askFallback === "allowlist") {
-              if (!allowlistMatch) {
+              if (!analysis.ok || !allowlistSatisfied) {
                 throw new Error("exec denied: approval required (approval UI not available)");
               }
               approvedByAsk = true;
@@ -644,30 +663,37 @@ export function createExecTool(
           if (decision === "allow-always") {
             approvedByAsk = true;
             if (hostSecurity === "allowlist") {
-              const pattern =
-                resolution?.resolvedPath ??
-                resolution?.rawExecutable ??
-                params.command.split(/\s+/).shift() ??
-                "";
-              if (pattern) {
-                addAllowlistEntry(approvals.file, defaults?.agentId, pattern);
+              for (const segment of analysis.segments) {
+                const pattern = segment.resolution?.resolvedPath ?? "";
+                if (pattern) {
+                  addAllowlistEntry(approvals.file, defaults?.agentId, pattern);
+                }
               }
             }
           }
         }
 
-        if (hostSecurity === "allowlist" && !allowlistMatch && !approvedByAsk) {
+        if (
+          hostSecurity === "allowlist" &&
+          (!analysis.ok || !allowlistSatisfied) &&
+          !approvedByAsk
+        ) {
           throw new Error("exec denied: allowlist miss");
         }
 
-        if (allowlistMatch) {
-          recordAllowlistUse(
-            approvals.file,
-            defaults?.agentId,
-            allowlistMatch,
-            params.command,
-            resolution?.resolvedPath,
-          );
+        if (allowlistMatches.length > 0) {
+          const seen = new Set<string>();
+          for (const match of allowlistMatches) {
+            if (seen.has(match.pattern)) continue;
+            seen.add(match.pattern);
+            recordAllowlistUse(
+              approvals.file,
+              defaults?.agentId,
+              match,
+              params.command,
+              analysis.segments[0]?.resolution?.resolvedPath,
+            );
+          }
         }
       }
 
diff --git a/src/cli/nodes-cli.coverage.test.ts b/src/cli/nodes-cli.coverage.test.ts
index 7e6e482dd..13fc36caf 100644
--- a/src/cli/nodes-cli.coverage.test.ts
+++ b/src/cli/nodes-cli.coverage.test.ts
@@ -27,7 +27,7 @@ const callGateway = vi.fn(async (opts: { method?: string }) => {
       },
     };
   }
-  if (opts.method === "exec.approvals.get") {
+  if (opts.method === "exec.approvals.node.get") {
     return {
       path: "/tmp/exec-approvals.json",
       exists: true,
diff --git a/src/cli/nodes-cli/register.invoke.ts b/src/cli/nodes-cli/register.invoke.ts
index 02c013cee..4cad89315 100644
--- a/src/cli/nodes-cli/register.invoke.ts
+++ b/src/cli/nodes-cli/register.invoke.ts
@@ -38,6 +38,7 @@ type ExecDefaults = {
   ask?: ExecAsk;
   node?: string;
   pathPrepend?: string[];
+  safeBins?: string[];
 };
 
 function normalizeExecSecurity(value?: string | null): ExecSecurity | null {
@@ -95,6 +96,7 @@ function resolveExecDefaults(
           ask: globalExec.ask,
           node: globalExec.node,
           pathPrepend: globalExec.pathPrepend,
+          safeBins: globalExec.safeBins,
         }
       : undefined;
   }
@@ -104,6 +106,7 @@ function resolveExecDefaults(
     ask: agentExec?.ask ?? globalExec?.ask,
     node: agentExec?.node ?? globalExec?.node,
     pathPrepend: agentExec?.pathPrepend ?? globalExec?.pathPrepend,
+    safeBins: agentExec?.safeBins ?? globalExec?.safeBins,
   };
 }
 
@@ -230,7 +233,9 @@ export function registerNodesInvokeCommands(nodes: Command) {
           const security = minSecurity(configuredSecurity, requestedSecurity ?? configuredSecurity);
           const ask = maxAsk(configuredAsk, requestedAsk ?? configuredAsk);
 
-          const approvalsSnapshot = (await callGatewayCli("exec.approvals.get", opts, {})) as {
+          const approvalsSnapshot = (await callGatewayCli("exec.approvals.node.get", opts, {
+            nodeId,
+          })) as {
             file?: unknown;
           } | null;
           const approvalsFile =
diff --git a/src/config/schema.ts b/src/config/schema.ts
index 1ba527439..bf25f0adb 100644
--- a/src/config/schema.ts
+++ b/src/config/schema.ts
@@ -166,6 +166,7 @@ const FIELD_LABELS: Record<string, string> = {
   "tools.exec.ask": "Exec Ask",
   "tools.exec.node": "Exec Node Binding",
   "tools.exec.pathPrepend": "Exec PATH Prepend",
+  "tools.exec.safeBins": "Exec Safe Bins",
   "tools.message.allowCrossContextSend": "Allow Cross-Context Messaging",
   "tools.message.crossContext.allowWithinProvider": "Allow Cross-Context (Same Provider)",
   "tools.message.crossContext.allowAcrossProviders": "Allow Cross-Context (Across Providers)",
@@ -367,6 +368,8 @@ const FIELD_HELP: Record<string, string> = {
   "tools.exec.notifyOnExit":
     "When true (default), backgrounded exec sessions enqueue a system event and request a heartbeat on exit.",
   "tools.exec.pathPrepend": "Directories to prepend to PATH for exec runs (gateway/sandbox).",
+  "tools.exec.safeBins":
+    "Allow stdin-only safe binaries to run without explicit allowlist entries.",
   "tools.message.allowCrossContextSend":
     "Legacy override: allow cross-context sends across all providers.",
   "tools.message.crossContext.allowWithinProvider":
diff --git a/src/config/types.tools.ts b/src/config/types.tools.ts
index b68d9f5dd..7ce292935 100644
--- a/src/config/types.tools.ts
+++ b/src/config/types.tools.ts
@@ -131,6 +131,8 @@ export type ExecToolConfig = {
   node?: string;
   /** Directories to prepend to PATH when running exec (gateway/sandbox). */
   pathPrepend?: string[];
+  /** Safe stdin-only binaries that can run without allowlist entries. */
+  safeBins?: string[];
   /** Default time (ms) before an exec command auto-backgrounds. */
   backgroundMs?: number;
   /** Default timeout (seconds) before auto-killing exec commands. */
diff --git a/src/config/zod-schema.agent-runtime.ts b/src/config/zod-schema.agent-runtime.ts
index 293475506..ba6eb1db9 100644
--- a/src/config/zod-schema.agent-runtime.ts
+++ b/src/config/zod-schema.agent-runtime.ts
@@ -257,6 +257,7 @@ export const AgentToolsSchema = z
         ask: z.enum(["off", "on-miss", "always"]).optional(),
         node: z.string().optional(),
         pathPrepend: z.array(z.string()).optional(),
+        safeBins: z.array(z.string()).optional(),
         backgroundMs: z.number().int().positive().optional(),
         timeoutSec: z.number().int().positive().optional(),
         cleanupMs: z.number().int().positive().optional(),
@@ -485,6 +486,7 @@ export const ToolsSchema = z
         ask: z.enum(["off", "on-miss", "always"]).optional(),
         node: z.string().optional(),
         pathPrepend: z.array(z.string()).optional(),
+        safeBins: z.array(z.string()).optional(),
         backgroundMs: z.number().int().positive().optional(),
         timeoutSec: z.number().int().positive().optional(),
         cleanupMs: z.number().int().positive().optional(),
diff --git a/src/infra/exec-approvals.test.ts b/src/infra/exec-approvals.test.ts
index bfd29ab9e..e0ff6a33b 100644
--- a/src/infra/exec-approvals.test.ts
+++ b/src/infra/exec-approvals.test.ts
@@ -5,9 +5,13 @@ import path from "node:path";
 import { describe, expect, it, vi } from "vitest";
 
 import {
+  analyzeArgvCommand,
+  analyzeShellCommand,
+  isSafeBinUsage,
   matchAllowlist,
   maxAsk,
   minSecurity,
+  normalizeSafeBins,
   resolveCommandResolution,
   resolveExecApprovals,
   type ExecAllowlistEntry,
@@ -18,7 +22,7 @@ function makeTempDir() {
 }
 
 describe("exec approvals allowlist matching", () => {
-  it("matches by executable name (case-insensitive)", () => {
+  it("ignores basename-only patterns", () => {
     const resolution = {
       rawExecutable: "rg",
       resolvedPath: "/opt/homebrew/bin/rg",
@@ -26,7 +30,7 @@ describe("exec approvals allowlist matching", () => {
     };
     const entries: ExecAllowlistEntry[] = [{ pattern: "RG" }];
     const match = matchAllowlist(entries, resolution);
-    expect(match?.pattern).toBe("RG");
+    expect(match).toBeNull();
   });
 
   it("matches by resolved path with **", () => {
@@ -51,7 +55,7 @@ describe("exec approvals allowlist matching", () => {
     expect(match).toBeNull();
   });
 
-  it("falls back to raw executable when no resolved path", () => {
+  it("requires a resolved path", () => {
     const resolution = {
       rawExecutable: "bin/rg",
       resolvedPath: undefined,
@@ -59,7 +63,7 @@ describe("exec approvals allowlist matching", () => {
     };
     const entries: ExecAllowlistEntry[] = [{ pattern: "bin/rg" }];
     const match = matchAllowlist(entries, resolution);
-    expect(match?.pattern).toBe("bin/rg");
+    expect(match).toBeNull();
   });
 });
 
@@ -70,6 +74,7 @@ describe("exec approvals command resolution", () => {
     fs.mkdirSync(binDir, { recursive: true });
     const exe = path.join(binDir, "rg");
     fs.writeFileSync(exe, "");
+    fs.chmodSync(exe, 0o755);
     const res = resolveCommandResolution("rg -n foo", undefined, { PATH: binDir });
     expect(res?.resolvedPath).toBe(exe);
     expect(res?.executableName).toBe("rg");
@@ -81,6 +86,7 @@ describe("exec approvals command resolution", () => {
     const script = path.join(cwd, "scripts", "run.sh");
     fs.mkdirSync(path.dirname(script), { recursive: true });
     fs.writeFileSync(script, "");
+    fs.chmodSync(script, 0o755);
     const res = resolveCommandResolution("./scripts/run.sh --flag", cwd, undefined);
     expect(res?.resolvedPath).toBe(script);
   });
@@ -91,11 +97,81 @@ describe("exec approvals command resolution", () => {
     const script = path.join(cwd, "bin", "tool");
     fs.mkdirSync(path.dirname(script), { recursive: true });
     fs.writeFileSync(script, "");
+    fs.chmodSync(script, 0o755);
     const res = resolveCommandResolution('"./bin/tool" --version', cwd, undefined);
     expect(res?.resolvedPath).toBe(script);
   });
 });
 
+describe("exec approvals shell parsing", () => {
+  it("parses simple pipelines", () => {
+    const res = analyzeShellCommand({ command: "echo ok | jq .foo" });
+    expect(res.ok).toBe(true);
+    expect(res.segments.map((seg) => seg.argv[0])).toEqual(["echo", "jq"]);
+  });
+
+  it("rejects chained commands", () => {
+    const res = analyzeShellCommand({ command: "ls && rm -rf /" });
+    expect(res.ok).toBe(false);
+  });
+
+  it("parses argv commands", () => {
+    const res = analyzeArgvCommand({ argv: ["/bin/echo", "ok"] });
+    expect(res.ok).toBe(true);
+    expect(res.segments[0]?.argv).toEqual(["/bin/echo", "ok"]);
+  });
+});
+
+describe("exec approvals safe bins", () => {
+  it("allows safe bins with non-path args", () => {
+    const dir = makeTempDir();
+    const binDir = path.join(dir, "bin");
+    fs.mkdirSync(binDir, { recursive: true });
+    const exe = path.join(binDir, "jq");
+    fs.writeFileSync(exe, "");
+    fs.chmodSync(exe, 0o755);
+    const res = analyzeShellCommand({
+      command: "jq .foo",
+      cwd: dir,
+      env: { PATH: binDir },
+    });
+    expect(res.ok).toBe(true);
+    const segment = res.segments[0];
+    const ok = isSafeBinUsage({
+      argv: segment.argv,
+      resolution: segment.resolution,
+      safeBins: normalizeSafeBins(["jq"]),
+      cwd: dir,
+    });
+    expect(ok).toBe(true);
+  });
+
+  it("blocks safe bins with file args", () => {
+    const dir = makeTempDir();
+    const binDir = path.join(dir, "bin");
+    fs.mkdirSync(binDir, { recursive: true });
+    const exe = path.join(binDir, "jq");
+    fs.writeFileSync(exe, "");
+    fs.chmodSync(exe, 0o755);
+    const file = path.join(dir, "secret.json");
+    fs.writeFileSync(file, "{}");
+    const res = analyzeShellCommand({
+      command: "jq .foo secret.json",
+      cwd: dir,
+      env: { PATH: binDir },
+    });
+    expect(res.ok).toBe(true);
+    const segment = res.segments[0];
+    const ok = isSafeBinUsage({
+      argv: segment.argv,
+      resolution: segment.resolution,
+      safeBins: normalizeSafeBins(["jq"]),
+      cwd: dir,
+    });
+    expect(ok).toBe(false);
+  });
+});
+
 describe("exec approvals policy helpers", () => {
   it("minSecurity returns the more restrictive value", () => {
     expect(minSecurity("deny", "full")).toBe("deny");
diff --git a/src/infra/exec-approvals.ts b/src/infra/exec-approvals.ts
index ad4846e9c..06d58b0d5 100644
--- a/src/infra/exec-approvals.ts
+++ b/src/infra/exec-approvals.ts
@@ -60,6 +60,7 @@ const DEFAULT_ASK_FALLBACK: ExecSecurity = "deny";
 const DEFAULT_AUTO_ALLOW_SKILLS = false;
 const DEFAULT_SOCKET = "~/.clawdbot/exec-approvals.sock";
 const DEFAULT_FILE = "~/.clawdbot/exec-approvals.json";
+export const DEFAULT_SAFE_BINS = ["jq", "grep", "cut", "sort", "uniq", "head", "tail", "tr", "wc"];
 
 function hashExecApprovalsRaw(raw: string | null): string {
   return crypto
@@ -283,6 +284,19 @@ type CommandResolution = {
   executableName: string;
 };
 
+function isExecutableFile(filePath: string): boolean {
+  try {
+    const stat = fs.statSync(filePath);
+    if (!stat.isFile()) return false;
+    if (process.platform !== "win32") {
+      fs.accessSync(filePath, fs.constants.X_OK);
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function parseFirstToken(command: string): string | null {
   const trimmed = command.trim();
   if (!trimmed) return null;
@@ -299,15 +313,26 @@ function parseFirstToken(command: string): string | null {
 function resolveExecutablePath(rawExecutable: string, cwd?: string, env?: NodeJS.ProcessEnv) {
   const expanded = rawExecutable.startsWith("~") ? expandHome(rawExecutable) : rawExecutable;
   if (expanded.includes("/") || expanded.includes("\\")) {
-    if (path.isAbsolute(expanded)) return expanded;
+    if (path.isAbsolute(expanded)) {
+      return isExecutableFile(expanded) ? expanded : undefined;
+    }
     const base = cwd && cwd.trim() ? cwd.trim() : process.cwd();
-    return path.resolve(base, expanded);
+    const candidate = path.resolve(base, expanded);
+    return isExecutableFile(candidate) ? candidate : undefined;
   }
   const envPath = env?.PATH ?? process.env.PATH ?? "";
   const entries = envPath.split(path.delimiter).filter(Boolean);
+  const extensions =
+    process.platform === "win32"
+      ? (env?.PATHEXT ?? process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM")
+          .split(";")
+          .map((ext) => ext.toLowerCase())
+      : [""];
   for (const entry of entries) {
-    const candidate = path.join(entry, expanded);
-    if (fs.existsSync(candidate)) return candidate;
+    for (const ext of extensions) {
+      const candidate = path.join(entry, expanded + ext);
+      if (isExecutableFile(candidate)) return candidate;
+    }
   }
   return undefined;
 }
@@ -324,6 +349,18 @@ export function resolveCommandResolution(
   return { rawExecutable, resolvedPath, executableName };
 }
 
+export function resolveCommandResolutionFromArgv(
+  argv: string[],
+  cwd?: string,
+  env?: NodeJS.ProcessEnv,
+): CommandResolution | null {
+  const rawExecutable = argv[0]?.trim();
+  if (!rawExecutable) return null;
+  const resolvedPath = resolveExecutablePath(rawExecutable, cwd, env);
+  const executableName = resolvedPath ? path.basename(resolvedPath) : rawExecutable;
+  return { rawExecutable, resolvedPath, executableName };
+}
+
 function normalizeMatchTarget(value: string): string {
   return value.replace(/\\\\/g, "/").toLowerCase();
 }
@@ -370,24 +407,284 @@ export function matchAllowlist(
   entries: ExecAllowlistEntry[],
   resolution: CommandResolution | null,
 ): ExecAllowlistEntry | null {
-  if (!entries.length || !resolution) return null;
-  const rawExecutable = resolution.rawExecutable;
+  if (!entries.length || !resolution?.resolvedPath) return null;
   const resolvedPath = resolution.resolvedPath;
-  const executableName = resolution.executableName;
   for (const entry of entries) {
     const pattern = entry.pattern?.trim();
     if (!pattern) continue;
     const hasPath = pattern.includes("/") || pattern.includes("\\") || pattern.includes("~");
-    if (hasPath) {
-      const target = resolvedPath ?? rawExecutable;
-      if (target && matchesPattern(pattern, target)) return entry;
-      continue;
-    }
-    if (executableName && matchesPattern(pattern, executableName)) return entry;
+    if (!hasPath) continue;
+    if (matchesPattern(pattern, resolvedPath)) return entry;
   }
   return null;
 }
 
+export type ExecCommandSegment = {
+  raw: string;
+  argv: string[];
+  resolution: CommandResolution | null;
+};
+
+export type ExecCommandAnalysis = {
+  ok: boolean;
+  reason?: string;
+  segments: ExecCommandSegment[];
+};
+
+const DISALLOWED_TOKENS = new Set([";", "&", ">", "<", "`", "\n", "\r", "(", ")"]);
+
+function splitShellPipeline(command: string): { ok: boolean; reason?: string; segments: string[] } {
+  const segments: string[] = [];
+  let buf = "";
+  let inSingle = false;
+  let inDouble = false;
+  let escaped = false;
+
+  const pushSegment = () => {
+    const trimmed = buf.trim();
+    if (!trimmed) {
+      return false;
+    }
+    segments.push(trimmed);
+    buf = "";
+    return true;
+  };
+
+  for (let i = 0; i < command.length; i += 1) {
+    const ch = command[i];
+    if (escaped) {
+      buf += ch;
+      escaped = false;
+      continue;
+    }
+    if (!inSingle && ch === "\\") {
+      escaped = true;
+      buf += ch;
+      continue;
+    }
+    if (inSingle) {
+      if (ch === "'") inSingle = false;
+      buf += ch;
+      continue;
+    }
+    if (inDouble) {
+      if (ch === '"') inDouble = false;
+      buf += ch;
+      continue;
+    }
+    if (ch === "'") {
+      inSingle = true;
+      buf += ch;
+      continue;
+    }
+    if (ch === '"') {
+      inDouble = true;
+      buf += ch;
+      continue;
+    }
+    if (ch === "|" && command[i + 1] === "|") {
+      return { ok: false, reason: "unsupported shell token: ||", segments: [] };
+    }
+    if (ch === "|" && command[i + 1] === "&") {
+      return { ok: false, reason: "unsupported shell token: |&", segments: [] };
+    }
+    if (ch === "|") {
+      if (!pushSegment()) {
+        return { ok: false, reason: "empty pipeline segment", segments: [] };
+      }
+      continue;
+    }
+    if (DISALLOWED_TOKENS.has(ch)) {
+      return { ok: false, reason: `unsupported shell token: ${ch}`, segments: [] };
+    }
+    if (ch === "$" && command[i + 1] === "(") {
+      return { ok: false, reason: "unsupported shell token: $()", segments: [] };
+    }
+    buf += ch;
+  }
+
+  if (escaped || inSingle || inDouble) {
+    return { ok: false, reason: "unterminated shell quote/escape", segments: [] };
+  }
+  if (!pushSegment()) {
+    return { ok: false, reason: "empty command", segments: [] };
+  }
+  return { ok: true, segments };
+}
+
+function tokenizeShellSegment(segment: string): string[] | null {
+  const tokens: string[] = [];
+  let buf = "";
+  let inSingle = false;
+  let inDouble = false;
+  let escaped = false;
+
+  const pushToken = () => {
+    if (buf.length > 0) {
+      tokens.push(buf);
+      buf = "";
+    }
+  };
+
+  for (let i = 0; i < segment.length; i += 1) {
+    const ch = segment[i];
+    if (escaped) {
+      buf += ch;
+      escaped = false;
+      continue;
+    }
+    if (!inSingle && ch === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (inSingle) {
+      if (ch === "'") {
+        inSingle = false;
+      } else {
+        buf += ch;
+      }
+      continue;
+    }
+    if (inDouble) {
+      if (ch === '"') {
+        inDouble = false;
+      } else {
+        buf += ch;
+      }
+      continue;
+    }
+    if (ch === "'") {
+      inSingle = true;
+      continue;
+    }
+    if (ch === '"') {
+      inDouble = true;
+      continue;
+    }
+    if (/\s/.test(ch)) {
+      pushToken();
+      continue;
+    }
+    buf += ch;
+  }
+
+  if (escaped || inSingle || inDouble) {
+    return null;
+  }
+  pushToken();
+  return tokens;
+}
+
+export function analyzeShellCommand(params: {
+  command: string;
+  cwd?: string;
+  env?: NodeJS.ProcessEnv;
+}): ExecCommandAnalysis {
+  const split = splitShellPipeline(params.command);
+  if (!split.ok) {
+    return { ok: false, reason: split.reason, segments: [] };
+  }
+  const segments: ExecCommandSegment[] = [];
+  for (const raw of split.segments) {
+    const argv = tokenizeShellSegment(raw);
+    if (!argv || argv.length === 0) {
+      return { ok: false, reason: "unable to parse shell segment", segments: [] };
+    }
+    segments.push({
+      raw,
+      argv,
+      resolution: resolveCommandResolutionFromArgv(argv, params.cwd, params.env),
+    });
+  }
+  return { ok: true, segments };
+}
+
+export function analyzeArgvCommand(params: {
+  argv: string[];
+  cwd?: string;
+  env?: NodeJS.ProcessEnv;
+}): ExecCommandAnalysis {
+  const argv = params.argv.filter((entry) => entry.trim().length > 0);
+  if (argv.length === 0) {
+    return { ok: false, reason: "empty argv", segments: [] };
+  }
+  return {
+    ok: true,
+    segments: [
+      {
+        raw: argv.join(" "),
+        argv,
+        resolution: resolveCommandResolutionFromArgv(argv, params.cwd, params.env),
+      },
+    ],
+  };
+}
+
+function isPathLikeToken(value: string): boolean {
+  const trimmed = value.trim();
+  if (!trimmed) return false;
+  if (trimmed === "-") return false;
+  if (trimmed.startsWith("./") || trimmed.startsWith("../") || trimmed.startsWith("~")) return true;
+  if (trimmed.startsWith("/")) return true;
+  return /^[A-Za-z]:[\\/]/.test(trimmed);
+}
+
+function defaultFileExists(filePath: string): boolean {
+  try {
+    return fs.existsSync(filePath);
+  } catch {
+    return false;
+  }
+}
+
+export function normalizeSafeBins(entries?: string[]): Set<string> {
+  if (!Array.isArray(entries)) return new Set();
+  const normalized = entries
+    .map((entry) => entry.trim().toLowerCase())
+    .filter((entry) => entry.length > 0);
+  return new Set(normalized);
+}
+
+export function resolveSafeBins(entries?: string[] | null): Set<string> {
+  if (entries === undefined) return normalizeSafeBins(DEFAULT_SAFE_BINS);
+  return normalizeSafeBins(entries ?? []);
+}
+
+export function isSafeBinUsage(params: {
+  argv: string[];
+  resolution: CommandResolution | null;
+  safeBins: Set<string>;
+  cwd?: string;
+  fileExists?: (filePath: string) => boolean;
+}): boolean {
+  if (params.safeBins.size === 0) return false;
+  const resolution = params.resolution;
+  const execName = resolution?.executableName?.toLowerCase();
+  if (!execName || !params.safeBins.has(execName)) return false;
+  if (!resolution?.resolvedPath) return false;
+  const cwd = params.cwd ?? process.cwd();
+  const exists = params.fileExists ?? defaultFileExists;
+  const argv = params.argv.slice(1);
+  for (let i = 0; i < argv.length; i += 1) {
+    const token = argv[i];
+    if (!token) continue;
+    if (token === "-") continue;
+    if (token.startsWith("-")) {
+      const eqIndex = token.indexOf("=");
+      if (eqIndex > 0) {
+        const value = token.slice(eqIndex + 1);
+        if (value && (isPathLikeToken(value) || exists(path.resolve(cwd, value)))) {
+          return false;
+        }
+      }
+      continue;
+    }
+    if (isPathLikeToken(token)) return false;
+    if (exists(path.resolve(cwd, token))) return false;
+  }
+  return true;
+}
+
 export function recordAllowlistUse(
   approvals: ExecApprovalsFile,
   agentId: string | undefined,
diff --git a/src/node-host/runner.ts b/src/node-host/runner.ts
index 8d56881dc..ea320fb21 100644
--- a/src/node-host/runner.ts
+++ b/src/node-host/runner.ts
@@ -4,12 +4,16 @@ import fs from "node:fs";
 import path from "node:path";
 
 import {
+  type ExecAllowlistEntry,
   addAllowlistEntry,
+  analyzeArgvCommand,
+  analyzeShellCommand,
+  isSafeBinUsage,
   matchAllowlist,
   normalizeExecApprovals,
   recordAllowlistUse,
-  resolveCommandResolution,
   resolveExecApprovals,
+  resolveSafeBins,
   ensureExecApprovals,
   readExecApprovalsSnapshot,
   resolveExecApprovalsSocketPath,
@@ -25,6 +29,7 @@ import {
 import { getMachineDisplayName } from "../infra/machine-name.js";
 import { loadOrCreateDeviceIdentity } from "../infra/device-identity.js";
 import { loadConfig } from "../config/config.js";
+import { resolveAgentConfig } from "../agents/agent-scope.js";
 import { ensureClawdbotCliOnPath } from "../infra/path-env.js";
 import { VERSION } from "../version.js";
 import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";
@@ -110,7 +115,6 @@ const execHostFallbackAllowed =
   process.env.CLAWDBOT_NODE_EXEC_FALLBACK?.trim().toLowerCase() !== "0";
 
 const blockedEnvKeys = new Set([
-  "PATH",
   "NODE_OPTIONS",
   "PYTHONHOME",
   "PYTHONPATH",
@@ -156,10 +160,24 @@ function sanitizeEnv(
 ): Record<string, string> | undefined {
   if (!overrides) return undefined;
   const merged = { ...process.env } as Record<string, string>;
+  const basePath = process.env.PATH ?? DEFAULT_NODE_PATH;
   for (const [rawKey, value] of Object.entries(overrides)) {
     const key = rawKey.trim();
     if (!key) continue;
     const upper = key.toUpperCase();
+    if (upper === "PATH") {
+      const trimmed = value.trim();
+      if (!trimmed) continue;
+      if (!basePath || trimmed === basePath) {
+        merged[key] = trimmed;
+        continue;
+      }
+      const suffix = `${path.delimiter}${basePath}`;
+      if (trimmed.endsWith(suffix)) {
+        merged[key] = trimmed;
+      }
+      continue;
+    }
     if (blockedEnvKeys.has(upper)) continue;
     if (blockedEnvPrefixes.some((prefix) => upper.startsWith(prefix))) continue;
     merged[key] = value;
@@ -567,12 +585,32 @@ async function handleInvoke(
   const sessionKey = params.sessionKey?.trim() || "node";
   const runId = crypto.randomUUID();
   const env = sanitizeEnv(params.env ?? undefined);
-  const resolution = resolveCommandResolution(cmdText, params.cwd ?? undefined, env);
-  const allowlistMatch =
-    security === "allowlist" ? matchAllowlist(approvals.allowlist, resolution) : null;
+  const analysis = rawCommand
+    ? analyzeShellCommand({ command: rawCommand, cwd: params.cwd ?? undefined, env })
+    : analyzeArgvCommand({ argv, cwd: params.cwd ?? undefined, env });
+  const cfg = loadConfig();
+  const agentExec = resolveAgentConfig(cfg, agentId)?.tools?.exec;
+  const safeBins = resolveSafeBins(agentExec?.safeBins ?? cfg.tools?.exec?.safeBins);
+  const allowlistMatches: ExecAllowlistEntry[] = [];
   const bins = autoAllowSkills ? await skillBins.current() : new Set<string>();
-  const skillAllow =
-    autoAllowSkills && resolution?.executableName ? bins.has(resolution.executableName) : false;
+  const allowlistSatisfied =
+    security === "allowlist" && analysis.ok && analysis.segments.length > 0
+      ? analysis.segments.every((segment) => {
+          const match = matchAllowlist(approvals.allowlist, segment.resolution);
+          if (match) allowlistMatches.push(match);
+          const safe = isSafeBinUsage({
+            argv: segment.argv,
+            resolution: segment.resolution,
+            safeBins,
+            cwd: params.cwd ?? undefined,
+          });
+          const skillAllow =
+            autoAllowSkills && segment.resolution?.executableName
+              ? bins.has(segment.resolution.executableName)
+              : false;
+          return Boolean(match || safe || skillAllow);
+        })
+      : false;
 
   const useMacAppExec = process.platform === "darwin";
   if (useMacAppExec) {
@@ -678,7 +716,7 @@ async function handleInvoke(
 
   const requiresAsk =
     ask === "always" ||
-    (ask === "on-miss" && security === "allowlist" && !allowlistMatch && !skillAllow);
+    (ask === "on-miss" && security === "allowlist" && (!analysis.ok || !allowlistSatisfied));
 
   const approvalDecision =
     params.approvalDecision === "allow-once" || params.approvalDecision === "allow-always"
@@ -704,11 +742,15 @@ async function handleInvoke(
     return;
   }
   if (approvalDecision === "allow-always" && security === "allowlist") {
-    const pattern = resolution?.resolvedPath ?? resolution?.rawExecutable ?? argv[0] ?? "";
-    if (pattern) addAllowlistEntry(approvals.file, agentId, pattern);
+    if (analysis.ok) {
+      for (const segment of analysis.segments) {
+        const pattern = segment.resolution?.resolvedPath ?? "";
+        if (pattern) addAllowlistEntry(approvals.file, agentId, pattern);
+      }
+    }
   }
 
-  if (security === "allowlist" && !allowlistMatch && !skillAllow && !approvedByAsk) {
+  if (security === "allowlist" && (!analysis.ok || !allowlistSatisfied) && !approvedByAsk) {
     await sendNodeEvent(
       client,
       "exec.denied",
@@ -727,8 +769,19 @@ async function handleInvoke(
     return;
   }
 
-  if (allowlistMatch) {
-    recordAllowlistUse(approvals.file, agentId, allowlistMatch, cmdText, resolution?.resolvedPath);
+  if (allowlistMatches.length > 0) {
+    const seen = new Set<string>();
+    for (const match of allowlistMatches) {
+      if (!match?.pattern || seen.has(match.pattern)) continue;
+      seen.add(match.pattern);
+      recordAllowlistUse(
+        approvals.file,
+        agentId,
+        match,
+        cmdText,
+        analysis.segments[0]?.resolution?.resolvedPath,
+      );
+    }
   }
 
   if (params.needsScreenRecording === true) {

From 05a254746eae96f8cd7abb3cb5c4330ec5d94260 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 22:46:19 +0000
Subject: [PATCH 066/171] fix(gateway): enforce singleton lock

---
 CHANGELOG.md                    |   1 +
 src/cli/gateway-cli/run-loop.ts |   3 +
 src/infra/gateway-lock.test.ts  |  55 ++++++++++++
 src/infra/gateway-lock.ts       | 144 ++++++++++++++++++++++++++++++++
 src/macos/gateway-daemon.ts     |  13 +++
 5 files changed, 216 insertions(+)
 create mode 100644 src/infra/gateway-lock.test.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5271e2ed..cb3bdd616 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ Docs: https://docs.clawd.bot
 - Nodes tool: include agent/node/gateway context in tool failure logs to speed approval debugging.
 - macOS: exec approvals now respect wildcard agent allowlists (`*`).
 - macOS: allow SSH agent auth when no identity file is set. (#1384) Thanks @ameno-.
+- Gateway: prevent multiple gateways from sharing the same config/state at once (singleton lock).
 - UI: remove the chat stop button and keep the composer aligned to the bottom edge.
 - Typing: start instant typing indicators at run start so DMs and mentions show immediately.
 - Configure: restrict the model allowlist picker to OAuth-compatible Anthropic models and preselect Opus 4.5.
diff --git a/src/cli/gateway-cli/run-loop.ts b/src/cli/gateway-cli/run-loop.ts
index 21e32e91b..358d9a3cb 100644
--- a/src/cli/gateway-cli/run-loop.ts
+++ b/src/cli/gateway-cli/run-loop.ts
@@ -1,4 +1,5 @@
 import type { startGatewayServer } from "../../gateway/server.js";
+import { acquireGatewayLock } from "../../infra/gateway-lock.js";
 import {
   consumeGatewaySigusr1RestartAuthorization,
   isGatewaySigusr1RestartExternallyAllowed,
@@ -14,6 +15,7 @@ export async function runGatewayLoop(params: {
   start: () => Promise<Awaited<ReturnType<typeof startGatewayServer>>>;
   runtime: typeof defaultRuntime;
 }) {
+  const lock = await acquireGatewayLock();
   let server: Awaited<ReturnType<typeof startGatewayServer>> | null = null;
   let shuttingDown = false;
   let restartResolver: (() => void) | null = null;
@@ -96,6 +98,7 @@ export async function runGatewayLoop(params: {
       });
     }
   } finally {
+    await lock?.release();
     cleanupSignals();
   }
 }
diff --git a/src/infra/gateway-lock.test.ts b/src/infra/gateway-lock.test.ts
new file mode 100644
index 000000000..1e4e90cac
--- /dev/null
+++ b/src/infra/gateway-lock.test.ts
@@ -0,0 +1,55 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { describe, expect, it } from "vitest";
+
+import { acquireGatewayLock, GatewayLockError } from "./gateway-lock.js";
+
+async function makeEnv() {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gateway-lock-"));
+  const configPath = path.join(dir, "clawdbot.json");
+  await fs.writeFile(configPath, "{}", "utf8");
+  return {
+    env: {
+      ...process.env,
+      CLAWDBOT_STATE_DIR: dir,
+      CLAWDBOT_CONFIG_PATH: configPath,
+    },
+    cleanup: async () => {
+      await fs.rm(dir, { recursive: true, force: true });
+    },
+  };
+}
+
+describe("gateway lock", () => {
+  it("blocks concurrent acquisition until release", async () => {
+    const { env, cleanup } = await makeEnv();
+    const lock = await acquireGatewayLock({
+      env,
+      allowInTests: true,
+      timeoutMs: 200,
+      pollIntervalMs: 20,
+    });
+    expect(lock).not.toBeNull();
+
+    await expect(
+      acquireGatewayLock({
+        env,
+        allowInTests: true,
+        timeoutMs: 200,
+        pollIntervalMs: 20,
+      }),
+    ).rejects.toBeInstanceOf(GatewayLockError);
+
+    await lock?.release();
+    const lock2 = await acquireGatewayLock({
+      env,
+      allowInTests: true,
+      timeoutMs: 200,
+      pollIntervalMs: 20,
+    });
+    await lock2?.release();
+    await cleanup();
+  });
+});
diff --git a/src/infra/gateway-lock.ts b/src/infra/gateway-lock.ts
index f77c7fcf0..bab197f36 100644
--- a/src/infra/gateway-lock.ts
+++ b/src/infra/gateway-lock.ts
@@ -1,3 +1,33 @@
+import { createHash } from "node:crypto";
+import fs from "node:fs/promises";
+import path from "node:path";
+
+import { resolveConfigPath, resolveStateDir } from "../config/paths.js";
+
+const DEFAULT_TIMEOUT_MS = 5000;
+const DEFAULT_POLL_INTERVAL_MS = 100;
+const DEFAULT_STALE_MS = 30_000;
+
+type LockPayload = {
+  pid: number;
+  createdAt: string;
+  configPath: string;
+};
+
+export type GatewayLockHandle = {
+  lockPath: string;
+  configPath: string;
+  release: () => Promise<void>;
+};
+
+export type GatewayLockOptions = {
+  env?: NodeJS.ProcessEnv;
+  timeoutMs?: number;
+  pollIntervalMs?: number;
+  staleMs?: number;
+  allowInTests?: boolean;
+};
+
 export class GatewayLockError extends Error {
   constructor(
     message: string,
@@ -7,3 +37,117 @@ export class GatewayLockError extends Error {
     this.name = "GatewayLockError";
   }
 }
+
+function isAlive(pid: number): boolean {
+  if (!Number.isFinite(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+async function readLockPayload(lockPath: string): Promise<LockPayload | null> {
+  try {
+    const raw = await fs.readFile(lockPath, "utf8");
+    const parsed = JSON.parse(raw) as Partial<LockPayload>;
+    if (typeof parsed.pid !== "number") return null;
+    if (typeof parsed.createdAt !== "string") return null;
+    if (typeof parsed.configPath !== "string") return null;
+    return {
+      pid: parsed.pid,
+      createdAt: parsed.createdAt,
+      configPath: parsed.configPath,
+    };
+  } catch {
+    return null;
+  }
+}
+
+function resolveGatewayLockPath(env: NodeJS.ProcessEnv) {
+  const stateDir = resolveStateDir(env);
+  const configPath = resolveConfigPath(env, stateDir);
+  const hash = createHash("sha1").update(configPath).digest("hex").slice(0, 8);
+  const lockPath = path.join(stateDir, `gateway.${hash}.lock`);
+  return { lockPath, configPath };
+}
+
+export async function acquireGatewayLock(
+  opts: GatewayLockOptions = {},
+): Promise<GatewayLockHandle | null> {
+  const env = opts.env ?? process.env;
+  const allowInTests = opts.allowInTests === true;
+  if (
+    env.CLAWDBOT_ALLOW_MULTI_GATEWAY === "1" ||
+    (!allowInTests && (env.VITEST || env.NODE_ENV === "test"))
+  ) {
+    return null;
+  }
+
+  const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  const pollIntervalMs = opts.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
+  const staleMs = opts.staleMs ?? DEFAULT_STALE_MS;
+  const { lockPath, configPath } = resolveGatewayLockPath(env);
+  await fs.mkdir(path.dirname(lockPath), { recursive: true });
+
+  const startedAt = Date.now();
+  let lastPayload: LockPayload | null = null;
+
+  while (Date.now() - startedAt < timeoutMs) {
+    try {
+      const handle = await fs.open(lockPath, "wx");
+      const payload: LockPayload = {
+        pid: process.pid,
+        createdAt: new Date().toISOString(),
+        configPath,
+      };
+      await handle.writeFile(JSON.stringify(payload), "utf8");
+      return {
+        lockPath,
+        configPath,
+        release: async () => {
+          await handle.close().catch(() => undefined);
+          await fs.rm(lockPath, { force: true });
+        },
+      };
+    } catch (err) {
+      const code = (err as { code?: unknown }).code;
+      if (code !== "EEXIST") {
+        throw new GatewayLockError(`failed to acquire gateway lock at ${lockPath}`, err);
+      }
+
+      lastPayload = await readLockPayload(lockPath);
+      const ownerPid = lastPayload?.pid;
+      const ownerAlive = ownerPid ? isAlive(ownerPid) : false;
+      if (!ownerAlive && ownerPid) {
+        await fs.rm(lockPath, { force: true });
+        continue;
+      }
+      if (!ownerAlive) {
+        let stale = false;
+        if (lastPayload?.createdAt) {
+          const createdAt = Date.parse(lastPayload.createdAt);
+          stale = Number.isFinite(createdAt) ? Date.now() - createdAt > staleMs : false;
+        }
+        if (!stale) {
+          try {
+            const st = await fs.stat(lockPath);
+            stale = Date.now() - st.mtimeMs > staleMs;
+          } catch {
+            stale = true;
+          }
+        }
+        if (stale) {
+          await fs.rm(lockPath, { force: true });
+          continue;
+        }
+      }
+
+      await new Promise((r) => setTimeout(r, pollIntervalMs));
+    }
+  }
+
+  const owner = lastPayload?.pid ? ` (pid ${lastPayload.pid})` : "";
+  throw new GatewayLockError(`gateway already running${owner}; lock timeout after ${timeoutMs}ms`);
+}
diff --git a/src/macos/gateway-daemon.ts b/src/macos/gateway-daemon.ts
index 03379a6df..0b045e254 100644
--- a/src/macos/gateway-daemon.ts
+++ b/src/macos/gateway-daemon.ts
@@ -45,6 +45,7 @@ async function main() {
     { startGatewayServer },
     { setGatewayWsLogStyle },
     { setVerbose },
+    { acquireGatewayLock, GatewayLockError },
     { consumeGatewaySigusr1RestartAuthorization, isGatewaySigusr1RestartExternallyAllowed },
     { defaultRuntime },
     { enableConsoleCapture, setConsoleTimestampPrefix },
@@ -53,6 +54,7 @@ async function main() {
     import("../gateway/server.js"),
     import("../gateway/ws-logging.js"),
     import("../globals.js"),
+    import("../infra/gateway-lock.js"),
     import("../infra/restart.js"),
     import("../runtime.js"),
     import("../logging.js"),
@@ -103,6 +105,7 @@ async function main() {
   if (token) process.env.CLAWDBOT_GATEWAY_TOKEN = token;
 
   let server: Awaited<ReturnType<typeof startGatewayServer>> | null = null;
+  let lock: Awaited<ReturnType<typeof acquireGatewayLock>> | null = null;
   let shuttingDown = false;
   let forceExitTimer: ReturnType<typeof setTimeout> | null = null;
   let restartResolver: (() => void) | null = null;
@@ -177,6 +180,15 @@ async function main() {
   process.on("SIGUSR1", onSigusr1);
 
   try {
+    try {
+      lock = await acquireGatewayLock();
+    } catch (err) {
+      if (err instanceof GatewayLockError) {
+        defaultRuntime.error(`Gateway start blocked: ${err.message}`);
+        process.exit(1);
+      }
+      throw err;
+    }
     // eslint-disable-next-line no-constant-condition
     while (true) {
       try {
@@ -191,6 +203,7 @@ async function main() {
       });
     }
   } finally {
+    await lock?.release();
     cleanupSignals();
   }
 }

From 28e547f12064b848898eec5bc5263a92e444cf5b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 22:57:56 +0000
Subject: [PATCH 067/171] fix: stabilize ci

---
 .../ClawdbotProtocol/GatewayModels.swift      |  4 +
 .../ClawdbotProtocol/GatewayModels.swift      |  4 +
 ...uick-model-picker-grouped-by-model.test.ts | 81 +++++--------------
 .../reply/directive-handling.model.ts         |  1 -
 src/auto-reply/reply/model-selection.ts       |  5 +-
 ...etection.rejects-routing-allowfrom.test.ts | 10 ++-
 src/config/defaults.ts                        |  6 +-
 src/gateway/server-constants.ts               |  9 ++-
 src/gateway/server.auth.test.ts               | 21 +++--
 src/gateway/server/ws-connection.ts           |  5 +-
 src/infra/heartbeat-runner.ts                 |  6 +-
 src/node-host/runner.ts                       |  2 +-
 12 files changed, 75 insertions(+), 79 deletions(-)

diff --git a/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift b/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
index 04c3bab09..eb4fa6818 100644
--- a/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
+++ b/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
@@ -18,6 +18,7 @@ public struct ConnectParams: Codable, Sendable {
     public let caps: [String]?
     public let commands: [String]?
     public let permissions: [String: AnyCodable]?
+    public let pathenv: String?
     public let role: String?
     public let scopes: [String]?
     public let device: [String: AnyCodable]?
@@ -32,6 +33,7 @@ public struct ConnectParams: Codable, Sendable {
         caps: [String]?,
         commands: [String]?,
         permissions: [String: AnyCodable]?,
+        pathenv: String?,
         role: String?,
         scopes: [String]?,
         device: [String: AnyCodable]?,
@@ -45,6 +47,7 @@ public struct ConnectParams: Codable, Sendable {
         self.caps = caps
         self.commands = commands
         self.permissions = permissions
+        self.pathenv = pathenv
         self.role = role
         self.scopes = scopes
         self.device = device
@@ -59,6 +62,7 @@ public struct ConnectParams: Codable, Sendable {
         case caps
         case commands
         case permissions
+        case pathenv = "pathEnv"
         case role
         case scopes
         case device
diff --git a/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift b/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
index 04c3bab09..eb4fa6818 100644
--- a/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
+++ b/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
@@ -18,6 +18,7 @@ public struct ConnectParams: Codable, Sendable {
     public let caps: [String]?
     public let commands: [String]?
     public let permissions: [String: AnyCodable]?
+    public let pathenv: String?
     public let role: String?
     public let scopes: [String]?
     public let device: [String: AnyCodable]?
@@ -32,6 +33,7 @@ public struct ConnectParams: Codable, Sendable {
         caps: [String]?,
         commands: [String]?,
         permissions: [String: AnyCodable]?,
+        pathenv: String?,
         role: String?,
         scopes: [String]?,
         device: [String: AnyCodable]?,
@@ -45,6 +47,7 @@ public struct ConnectParams: Codable, Sendable {
         self.caps = caps
         self.commands = commands
         self.permissions = permissions
+        self.pathenv = pathenv
         self.role = role
         self.scopes = scopes
         self.device = device
@@ -59,6 +62,7 @@ public struct ConnectParams: Codable, Sendable {
         case caps
         case commands
         case permissions
+        case pathenv = "pathEnv"
         case role
         case scopes
         case device
diff --git a/src/auto-reply/reply.triggers.trigger-handling.shows-quick-model-picker-grouped-by-model.test.ts b/src/auto-reply/reply.triggers.trigger-handling.shows-quick-model-picker-grouped-by-model.test.ts
index ae1ddd8bc..0de7dedb6 100644
--- a/src/auto-reply/reply.triggers.trigger-handling.shows-quick-model-picker-grouped-by-model.test.ts
+++ b/src/auto-reply/reply.triggers.trigger-handling.shows-quick-model-picker-grouped-by-model.test.ts
@@ -95,7 +95,7 @@ afterEach(() => {
 });
 
 describe("trigger handling", () => {
-  it("shows a quick /model picker listing provider/model pairs", async () => {
+  it("shows a /model summary and points to /models", async () => {
     await withTempHome(async (home) => {
       const cfg = makeCfg(home);
       const res = await getReplyFromConfig(
@@ -115,23 +115,20 @@ describe("trigger handling", () => {
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
       const normalized = normalizeTestText(text ?? "");
-      expect(normalized).toContain("Pick: /model <#> or /model <provider/model>");
-      // Each provider/model combo is listed separately for clear selection
-      expect(normalized).toContain("anthropic/claude-opus-4-5");
-      expect(normalized).toContain("openrouter/anthropic/claude-opus-4-5");
-      expect(normalized).toContain("openai/gpt-5.2");
-      expect(normalized).toContain("openai-codex/gpt-5.2");
+      expect(normalized).toContain("Current: anthropic/claude-opus-4-5");
+      expect(normalized).toContain("Switch: /model <provider/model>");
+      expect(normalized).toContain("Browse: /models (providers) or /models <provider> (models)");
       expect(normalized).toContain("More: /model status");
       expect(normalized).not.toContain("reasoning");
       expect(normalized).not.toContain("image");
     });
   });
-  it("orders provider/model pairs by provider preference", async () => {
+  it("moves /model list to /models", async () => {
     await withTempHome(async (home) => {
       const cfg = makeCfg(home);
       const res = await getReplyFromConfig(
         {
-          Body: "/model",
+          Body: "/model list",
           From: "telegram:111",
           To: "telegram:111",
           ChatType: "direct",
@@ -146,54 +143,19 @@ describe("trigger handling", () => {
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
       const normalized = normalizeTestText(text ?? "");
-      const anthropicIndex = normalized.indexOf("anthropic/claude-opus-4-5");
-      const openrouterIndex = normalized.indexOf("openrouter/anthropic/claude-opus-4-5");
-      const openaiIndex = normalized.indexOf("openai/gpt-4.1-mini");
-      const codexIndex = normalized.indexOf("openai-codex/gpt-5.2");
-      expect(anthropicIndex).toBeGreaterThanOrEqual(0);
-      expect(openrouterIndex).toBeGreaterThanOrEqual(0);
-      expect(openaiIndex).toBeGreaterThanOrEqual(0);
-      expect(codexIndex).toBeGreaterThanOrEqual(0);
-      expect(anthropicIndex).toBeLessThan(openrouterIndex);
-      expect(openaiIndex).toBeLessThan(codexIndex);
+      expect(normalized).toContain("Model listing moved.");
+      expect(normalized).toContain("Use: /models (providers) or /models <provider> (models)");
+      expect(normalized).toContain("Switch: /model <provider/model>");
     });
   });
-  it("selects the exact provider/model pair for openrouter by index", async () => {
+  it("selects the exact provider/model pair for openrouter", async () => {
     await withTempHome(async (home) => {
       const cfg = makeCfg(home);
       const sessionKey = "telegram:slash:111";
-      const list = await getReplyFromConfig(
-        {
-          Body: "/model",
-          From: "telegram:111",
-          To: "telegram:111",
-          ChatType: "direct",
-          Provider: "telegram",
-          Surface: "telegram",
-          SessionKey: sessionKey,
-          CommandAuthorized: true,
-        },
-        {},
-        cfg,
-      );
-
-      const listText = Array.isArray(list) ? list[0]?.text : list?.text;
-      const lines = normalizeTestText(listText ?? "")
-        .split("\n")
-        .map((line) => line.trim())
-        .filter(Boolean);
-      const targetLine = lines.find((line) =>
-        line.includes("openrouter/anthropic/claude-opus-4-5"),
-      );
-      expect(targetLine).toBeDefined();
-      const match = targetLine?.match(/^(\d+)\)/);
-      expect(match?.[1]).toBeDefined();
-      const index = Number.parseInt(match?.[1] ?? "", 10);
-      expect(Number.isFinite(index)).toBe(true);
 
       const res = await getReplyFromConfig(
         {
-          Body: `/model ${index}`,
+          Body: "/model openrouter/anthropic/claude-opus-4-5",
           From: "telegram:111",
           To: "telegram:111",
           ChatType: "direct",
@@ -237,24 +199,24 @@ describe("trigger handling", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(normalizeTestText(text ?? "")).toContain(
-        'Invalid model selection "99". Use /model to list.',
-      );
+      const normalized = normalizeTestText(text ?? "");
+      expect(normalized).toContain("Numeric model selection is not supported in chat.");
+      expect(normalized).toContain("Browse: /models or /models <provider>");
+      expect(normalized).toContain("Switch: /model <provider/model>");
 
       const store = loadSessionStore(cfg.session.store);
       expect(store[sessionKey]?.providerOverride).toBeUndefined();
       expect(store[sessionKey]?.modelOverride).toBeUndefined();
     });
   });
-  it("selects exact provider/model combo by index via /model <#>", async () => {
+  it("resets to the default model via /model <provider/model>", async () => {
     await withTempHome(async (home) => {
       const cfg = makeCfg(home);
       const sessionKey = "telegram:slash:111";
 
-      // /model 1 should select the first item (anthropic/claude-opus-4-5)
       const res = await getReplyFromConfig(
         {
-          Body: "/model 1",
+          Body: "/model anthropic/claude-opus-4-5",
           From: "telegram:111",
           To: "telegram:111",
           ChatType: "direct",
@@ -268,8 +230,9 @@ describe("trigger handling", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      // Selecting the default model shows "reset to default" instead of "set to"
-      expect(normalizeTestText(text ?? "")).toContain("anthropic/claude-opus-4-5");
+      expect(normalizeTestText(text ?? "")).toContain(
+        "Model reset to default (anthropic/claude-opus-4-5)",
+      );
 
       const store = loadSessionStore(cfg.session.store);
       // When selecting the default, overrides are cleared
@@ -277,14 +240,14 @@ describe("trigger handling", () => {
       expect(store[sessionKey]?.modelOverride).toBeUndefined();
     });
   });
-  it("selects a model by index via /model <#>", async () => {
+  it("selects a model via /model <provider/model>", async () => {
     await withTempHome(async (home) => {
       const cfg = makeCfg(home);
       const sessionKey = "telegram:slash:111";
 
       const res = await getReplyFromConfig(
         {
-          Body: "/model 3",
+          Body: "/model openai/gpt-5.2",
           From: "telegram:111",
           To: "telegram:111",
           ChatType: "direct",
diff --git a/src/auto-reply/reply/directive-handling.model.ts b/src/auto-reply/reply/directive-handling.model.ts
index 6cfef7828..0f5782a6f 100644
--- a/src/auto-reply/reply/directive-handling.model.ts
+++ b/src/auto-reply/reply/directive-handling.model.ts
@@ -16,7 +16,6 @@ import {
   resolveProfileOverride,
 } from "./directive-handling.auth.js";
 import {
-  buildModelPickerItems,
   type ModelPickerCatalogEntry,
   resolveProviderEndpointLabel,
 } from "./directive-handling.model-picker.js";
diff --git a/src/auto-reply/reply/model-selection.ts b/src/auto-reply/reply/model-selection.ts
index fe06c1c06..7bee7c8bd 100644
--- a/src/auto-reply/reply/model-selection.ts
+++ b/src/auto-reply/reply/model-selection.ts
@@ -54,9 +54,8 @@ function boundedLevenshteinDistance(a: string, b: string, maxDistance: number):
   if (Math.abs(aLen - bLen) > maxDistance) return null;
 
   // Standard DP with early exit. O(maxDistance * minLen) in common cases.
-  const prev = new Array<number>(bLen + 1);
-  const curr = new Array<number>(bLen + 1);
-  for (let j = 0; j <= bLen; j++) prev[j] = j;
+  const prev = Array.from({ length: bLen + 1 }, (_, idx) => idx);
+  const curr = Array.from({ length: bLen + 1 }, () => 0);
 
   for (let i = 1; i <= aLen; i++) {
     curr[0] = i;
diff --git a/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts b/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts
index 83b96e739..fd0f2f296 100644
--- a/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts
+++ b/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts
@@ -220,12 +220,18 @@ describe("legacy config detection", () => {
   });
   it("keeps gateway.bind tailnet", async () => {
     vi.resetModules();
-    const { migrateLegacyConfig } = await import("./config.js");
+    const { migrateLegacyConfig, validateConfigObject } = await import("./config.js");
     const res = migrateLegacyConfig({
       gateway: { bind: "tailnet" as const },
     });
     expect(res.changes).not.toContain("Migrated gateway.bind from 'tailnet' to 'auto'.");
-    expect(res.config?.gateway?.bind).toBe("tailnet");
+    expect(res.config).toBeNull();
+
+    const validated = validateConfigObject({ gateway: { bind: "tailnet" as const } });
+    expect(validated.ok).toBe(true);
+    if (validated.ok) {
+      expect(validated.config.gateway?.bind).toBe("tailnet");
+    }
   });
   it('rejects telegram.dmPolicy="open" without allowFrom "*"', async () => {
     vi.resetModules();
diff --git a/src/config/defaults.ts b/src/config/defaults.ts
index c88c1625f..b4b346719 100644
--- a/src/config/defaults.ts
+++ b/src/config/defaults.ts
@@ -202,10 +202,12 @@ export function applyContextPruningDefaults(cfg: ClawdbotConfig): ClawdbotConfig
 
   let mutated = false;
   const nextDefaults = { ...defaults };
+  const contextPruning = defaults.contextPruning ?? {};
+  const heartbeat = defaults.heartbeat ?? {};
 
   if (defaults.contextPruning?.mode === undefined) {
     nextDefaults.contextPruning = {
-      ...(defaults.contextPruning ?? {}),
+      ...contextPruning,
       mode: "cache-ttl",
       ttl: defaults.contextPruning?.ttl ?? "1h",
     };
@@ -214,7 +216,7 @@ export function applyContextPruningDefaults(cfg: ClawdbotConfig): ClawdbotConfig
 
   if (defaults.heartbeat?.every === undefined) {
     nextDefaults.heartbeat = {
-      ...(defaults.heartbeat ?? {}),
+      ...heartbeat,
       every: authMode === "oauth" ? "1h" : "30m",
     };
     mutated = true;
diff --git a/src/gateway/server-constants.ts b/src/gateway/server-constants.ts
index b3c7898c2..58053a285 100644
--- a/src/gateway/server-constants.ts
+++ b/src/gateway/server-constants.ts
@@ -2,7 +2,14 @@ export const MAX_PAYLOAD_BYTES = 512 * 1024; // cap incoming frame size
 export const MAX_BUFFERED_BYTES = 1.5 * 1024 * 1024; // per-connection send buffer limit
 
 export const MAX_CHAT_HISTORY_MESSAGES_BYTES = 6 * 1024 * 1024; // keep history responses comfortably under client WS limits
-export const HANDSHAKE_TIMEOUT_MS = 10_000;
+export const DEFAULT_HANDSHAKE_TIMEOUT_MS = 10_000;
+export const getHandshakeTimeoutMs = () => {
+  if (process.env.VITEST && process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS) {
+    const parsed = Number(process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS);
+    if (Number.isFinite(parsed) && parsed > 0) return parsed;
+  }
+  return DEFAULT_HANDSHAKE_TIMEOUT_MS;
+};
 export const TICK_INTERVAL_MS = 30_000;
 export const HEALTH_REFRESH_INTERVAL_MS = 60_000;
 export const DEDUPE_TTL_MS = 5 * 60_000;
diff --git a/src/gateway/server.auth.test.ts b/src/gateway/server.auth.test.ts
index d36c6c825..e3be7fde7 100644
--- a/src/gateway/server.auth.test.ts
+++ b/src/gateway/server.auth.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test, vi } from "vitest";
 import { WebSocket } from "ws";
 import { PROTOCOL_VERSION } from "./protocol/index.js";
-import { HANDSHAKE_TIMEOUT_MS } from "./server-constants.js";
+import { getHandshakeTimeoutMs } from "./server-constants.js";
 import {
   connectReq,
   getFreePort,
@@ -28,10 +28,21 @@ async function waitForWsClose(ws: WebSocket, timeoutMs: number): Promise<boolean
 describe("gateway server auth/connect", () => {
   test("closes silent handshakes after timeout", { timeout: 60_000 }, async () => {
     vi.useRealTimers();
-    const { server, ws } = await startServerWithClient();
-    const closed = await waitForWsClose(ws, HANDSHAKE_TIMEOUT_MS + 2_000);
-    expect(closed).toBe(true);
-    await server.close();
+    const prevHandshakeTimeout = process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS;
+    process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS = "250";
+    try {
+      const { server, ws } = await startServerWithClient();
+      const handshakeTimeoutMs = getHandshakeTimeoutMs();
+      const closed = await waitForWsClose(ws, handshakeTimeoutMs + 2_000);
+      expect(closed).toBe(true);
+      await server.close();
+    } finally {
+      if (prevHandshakeTimeout === undefined) {
+        delete process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS;
+      } else {
+        process.env.CLAWDBOT_TEST_HANDSHAKE_TIMEOUT_MS = prevHandshakeTimeout;
+      }
+    }
   });
 
   test("connect (req) handshake returns hello-ok payload", async () => {
diff --git a/src/gateway/server/ws-connection.ts b/src/gateway/server/ws-connection.ts
index a50e51480..2d15b1d01 100644
--- a/src/gateway/server/ws-connection.ts
+++ b/src/gateway/server/ws-connection.ts
@@ -8,7 +8,7 @@ import { isWebchatClient } from "../../utils/message-channel.js";
 
 import type { ResolvedGatewayAuth } from "../auth.js";
 import { isLoopbackAddress } from "../net.js";
-import { HANDSHAKE_TIMEOUT_MS } from "../server-constants.js";
+import { getHandshakeTimeoutMs } from "../server-constants.js";
 import type { GatewayRequestContext, GatewayRequestHandlers } from "../server-methods/types.js";
 import { formatError } from "../server-utils.js";
 import { logWs } from "../ws-log.js";
@@ -210,6 +210,7 @@ export function attachGatewayWsConnectionHandler(params: {
       close();
     });
 
+    const handshakeTimeoutMs = getHandshakeTimeoutMs();
     const handshakeTimer = setTimeout(() => {
       if (!client) {
         handshakeState = "failed";
@@ -219,7 +220,7 @@ export function attachGatewayWsConnectionHandler(params: {
         logWsControl.warn(`handshake timeout conn=${connId} remote=${remoteAddr ?? "?"}`);
         close();
       }
-    }, HANDSHAKE_TIMEOUT_MS);
+    }, handshakeTimeoutMs);
 
     attachGatewayWsMessageHandler({
       socket,
diff --git a/src/infra/heartbeat-runner.ts b/src/infra/heartbeat-runner.ts
index 012fff229..92853a1f0 100644
--- a/src/infra/heartbeat-runner.ts
+++ b/src/infra/heartbeat-runner.ts
@@ -89,7 +89,7 @@ function resolveActiveHoursTimezone(cfg: ClawdbotConfig, raw?: string): string {
   }
 }
 
-function parseActiveHoursTime(raw?: string, opts: { allow24: boolean }): number | null {
+function parseActiveHoursTime(opts: { allow24: boolean }, raw?: string): number | null {
   if (!raw || !ACTIVE_HOURS_TIME_PATTERN.test(raw)) return null;
   const [hourStr, minuteStr] = raw.split(":");
   const hour = Number(hourStr);
@@ -131,8 +131,8 @@ function isWithinActiveHours(
   const active = heartbeat?.activeHours;
   if (!active) return true;
 
-  const startMin = parseActiveHoursTime(active.start, { allow24: false });
-  const endMin = parseActiveHoursTime(active.end, { allow24: true });
+  const startMin = parseActiveHoursTime({ allow24: false }, active.start);
+  const endMin = parseActiveHoursTime({ allow24: true }, active.end);
   if (startMin === null || endMin === null) return true;
   if (startMin === endMin) return true;
 
diff --git a/src/node-host/runner.ts b/src/node-host/runner.ts
index ea320fb21..09a148ca4 100644
--- a/src/node-host/runner.ts
+++ b/src/node-host/runner.ts
@@ -589,7 +589,7 @@ async function handleInvoke(
     ? analyzeShellCommand({ command: rawCommand, cwd: params.cwd ?? undefined, env })
     : analyzeArgvCommand({ argv, cwd: params.cwd ?? undefined, env });
   const cfg = loadConfig();
-  const agentExec = resolveAgentConfig(cfg, agentId)?.tools?.exec;
+  const agentExec = agentId ? resolveAgentConfig(cfg, agentId)?.tools?.exec : undefined;
   const safeBins = resolveSafeBins(agentExec?.safeBins ?? cfg.tools?.exec?.safeBins);
   const allowlistMatches: ExecAllowlistEntry[] = [];
   const bins = autoAllowSkills ? await skillBins.current() : new Set<string>();

From cd65e8e755ec4bedb15567154b6242baa646491f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 23:05:11 +0000
Subject: [PATCH 068/171] fix: type gateway lock handle

---
 src/macos/gateway-daemon.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/macos/gateway-daemon.ts b/src/macos/gateway-daemon.ts
index 0b045e254..3999ddf9e 100644
--- a/src/macos/gateway-daemon.ts
+++ b/src/macos/gateway-daemon.ts
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import process from "node:process";
+import type { GatewayLockHandle } from "../infra/gateway-lock.js";
 
 declare const __CLAWDBOT_VERSION__: string;
 
@@ -58,7 +59,7 @@ async function main() {
     import("../infra/restart.js"),
     import("../runtime.js"),
     import("../logging.js"),
-  ]);
+  ] as const);
 
   enableConsoleCapture();
   setConsoleTimestampPrefix(true);
@@ -105,7 +106,7 @@ async function main() {
   if (token) process.env.CLAWDBOT_GATEWAY_TOKEN = token;
 
   let server: Awaited<ReturnType<typeof startGatewayServer>> | null = null;
-  let lock: Awaited<ReturnType<typeof acquireGatewayLock>> | null = null;
+  let lock: GatewayLockHandle | null = null;
   let shuttingDown = false;
   let forceExitTimer: ReturnType<typeof setTimeout> | null = null;
   let restartResolver: (() => void) | null = null;
@@ -203,7 +204,7 @@ async function main() {
       });
     }
   } finally {
-    await lock?.release();
+    await (lock as GatewayLockHandle | null)?.release();
     cleanupSignals();
   }
 }

From b4776af38cc96271adf9c8df21566d411a6ff2ec Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 23:27:40 +0000
Subject: [PATCH 069/171] docs: clarify mac packaging guidance

---
 AGENTS.md                     | 1 +
 docs/platforms/mac/release.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AGENTS.md b/AGENTS.md
index 1b1a5b209..285630310 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -29,6 +29,7 @@
 - Prefer Bun for TypeScript execution (scripts, dev, tests): `bun <file.ts>` / `bunx <tool>`.
 - Run CLI in dev: `pnpm clawdbot ...` (bun) or `pnpm dev`.
 - Node remains supported for running built output (`dist/*`) and production installs.
+- Mac packaging (dev): `scripts/package-mac-app.sh` defaults to current arch. Release checklist: `docs/platforms/mac/release.md`.
 - Type-check/build: `pnpm build` (tsc)
 - Lint/format: `pnpm lint` (oxlint), `pnpm format` (oxfmt)
 - Tests: `pnpm test` (vitest); coverage: `pnpm test:coverage`
diff --git a/docs/platforms/mac/release.md b/docs/platforms/mac/release.md
index 9e2dd1bbb..077cdd342 100644
--- a/docs/platforms/mac/release.md
+++ b/docs/platforms/mac/release.md
@@ -24,6 +24,7 @@ This app now ships Sparkle auto-updates. Release builds must be Developer ID–s
 Notes:
 - `APP_BUILD` maps to `CFBundleVersion`/`sparkle:version`; keep it numeric + monotonic (no `-beta`), or Sparkle compares it as equal.
 - Defaults to the current architecture (`$(uname -m)`). For release/universal builds, set `BUILD_ARCHS="arm64 x86_64"` (or `BUILD_ARCHS=all`).
+- Use `scripts/package-mac-dist.sh` for release artifacts (zip + DMG + notarization). Use `scripts/package-mac-app.sh` for local/dev packaging.
 
 ```bash
 # From repo root; set release IDs so Sparkle feed is enabled.

From f76e3c14192704d8d5e0af30a360d222283cd91f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 21 Jan 2026 23:58:30 +0000
Subject: [PATCH 070/171] fix: enforce secure control ui auth

---
 CHANGELOG.md                                  |  3 +
 docs/gateway/configuration.md                 |  2 +
 docs/gateway/protocol.md                      |  1 +
 docs/gateway/security.md                      |  9 ++
 docs/gateway/troubleshooting.md               | 13 +++
 docs/help/troubleshooting.md                  |  5 ++
 docs/web/control-ui.md                        | 27 ++++++
 src/config/schema.ts                          |  3 +
 src/config/types.gateway.ts                   |  2 +
 src/config/zod-schema.ts                      |  1 +
 src/gateway/server.auth.test.ts               | 47 +++++++++++
 .../server/ws-connection/message-handler.ts   | 66 +++++++++++----
 src/gateway/test-helpers.mocks.ts             |  2 +
 src/gateway/test-helpers.server.ts            |  4 +-
 src/security/audit.test.ts                    | 23 +++++
 src/security/audit.ts                         | 11 +++
 ui/src/ui/gateway.ts                          | 84 ++++++++++++-------
 ui/src/ui/views/overview.ts                   | 39 +++++++++
 18 files changed, 294 insertions(+), 48 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb3bdd616..ecf10530a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@ Docs: https://docs.clawd.bot
 - CLI: move gateway service commands under `clawdbot gateway` and add `gateway probe` for reachability.
 - Sessions: add per-channel reset overrides via `session.resetByChannel`. (#1353) Thanks @cash-echo-bot.
 
+### Breaking
+- **BREAKING:** Control UI now rejects insecure HTTP without device identity by default. Use HTTPS (Tailscale Serve) or set `gateway.controlUi.allowInsecureAuth: true` to allow token-only auth. https://docs.clawd.bot/web/control-ui#insecure-http
+
 ### Fixes
 - Gateway: keep auto bind loopback-first and add explicit tailnet binding to avoid Tailscale taking over local UI. (#1380)
 - Embedded runner: persist injected history images so attachments aren’t reloaded each turn. (#1374) Thanks @Nicell.
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index dbc157c8c..00fd9e30f 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -2671,6 +2671,8 @@ Control UI base path:
 - `gateway.controlUi.basePath` sets the URL prefix where the Control UI is served.
 - Examples: `"/ui"`, `"/clawdbot"`, `"/apps/clawdbot"`.
 - Default: root (`/`) (unchanged).
+- `gateway.controlUi.allowInsecureAuth` allows token-only auth over **HTTP** (no device identity).
+  Default: `false`. Prefer HTTPS (Tailscale Serve) or `127.0.0.1`.
 
 Related docs:
 - [Control UI](/web/control-ui)
diff --git a/docs/gateway/protocol.md b/docs/gateway/protocol.md
index 85cf1cbd9..fc6682708 100644
--- a/docs/gateway/protocol.md
+++ b/docs/gateway/protocol.md
@@ -198,6 +198,7 @@ The Gateway treats these as **claims** and enforces server-side allowlists.
 - **Local** connects include loopback and the gateway host’s own tailnet address
   (so same‑host tailnet binds can still auto‑approve).
 - All WS clients must include `device` identity during `connect` (operator + node).
+  Control UI can omit it **only** when `gateway.controlUi.allowInsecureAuth` is enabled.
 - Non-local connections must sign the server-provided `connect.challenge` nonce.
 
 ## TLS + pinning
diff --git a/docs/gateway/security.md b/docs/gateway/security.md
index cd9a80126..e429205ef 100644
--- a/docs/gateway/security.md
+++ b/docs/gateway/security.md
@@ -52,6 +52,15 @@ When the audit prints findings, treat this as a priority order:
 5. **Plugins/extensions**: only load what you explicitly trust.
 6. **Model choice**: prefer modern, instruction-hardened models for any bot with tools.
 
+## Control UI over HTTP
+
+The Control UI needs a **secure context** (HTTPS or localhost) to generate device
+identity. If you enable `gateway.controlUi.allowInsecureAuth`, the UI falls back
+to **token-only auth** on plain HTTP and skips device pairing. This is a security
+downgrade—prefer HTTPS (Tailscale Serve) or open the UI on `127.0.0.1`.
+
+`clawdbot security audit` warns when this setting is enabled.
+
 ## Local session logs live on disk
 
 Clawdbot stores session transcripts on disk under `~/.clawdbot/agents/<agentId>/sessions/*.jsonl`.
diff --git a/docs/gateway/troubleshooting.md b/docs/gateway/troubleshooting.md
index ad21290af..803360439 100644
--- a/docs/gateway/troubleshooting.md
+++ b/docs/gateway/troubleshooting.md
@@ -31,6 +31,19 @@ See also: [Health checks](/gateway/health) and [Logging](/logging).
 
 ## Common Issues
 
+### Control UI fails on HTTP ("device identity required" / "connect failed")
+
+If you open the dashboard over plain HTTP (e.g. `http://<lan-ip>:18789/` or
+`http://<tailscale-ip>:18789/`), the browser runs in a **non-secure context** and
+blocks WebCrypto, so device identity can’t be generated.
+
+**Fix:**
+- Prefer HTTPS via [Tailscale Serve](/gateway/tailscale).
+- Or open locally on the gateway host: `http://127.0.0.1:18789/`.
+- If you must stay on HTTP, enable `gateway.controlUi.allowInsecureAuth: true` and
+  use a gateway token (token-only; no device identity/pairing). See
+  [Control UI](/web/control-ui#insecure-http).
+
 ### CI Secrets Scan Failed
 
 This means `detect-secrets` found new candidates not yet in the baseline.
diff --git a/docs/help/troubleshooting.md b/docs/help/troubleshooting.md
index b6219a924..94e769764 100644
--- a/docs/help/troubleshooting.md
+++ b/docs/help/troubleshooting.md
@@ -38,6 +38,11 @@ Almost always a Node/npm PATH issue. Start here:
 - [Gateway troubleshooting](/gateway/troubleshooting)
 - [Gateway authentication](/gateway/authentication)
 
+### Control UI fails on HTTP (device identity required)
+
+- [Gateway troubleshooting](/gateway/troubleshooting)
+- [Control UI](/web/control-ui#insecure-http)
+
 ### Service says running, but RPC probe fails
 
 - [Gateway troubleshooting](/gateway/troubleshooting)
diff --git a/docs/web/control-ui.md b/docs/web/control-ui.md
index b1102c47d..0d473c858 100644
--- a/docs/web/control-ui.md
+++ b/docs/web/control-ui.md
@@ -86,6 +86,33 @@ Then open:
 
 Paste the token into the UI settings (sent as `connect.params.auth.token`).
 
+## Insecure HTTP
+
+If you open the dashboard over plain HTTP (`http://<lan-ip>` or `http://<tailscale-ip>`),
+the browser runs in a **non-secure context** and blocks WebCrypto. By default,
+Clawdbot **blocks** Control UI connections without device identity.
+
+**Recommended fix:** use HTTPS (Tailscale Serve) or open the UI locally:
+- `https://<magicdns>/` (Serve)
+- `http://127.0.0.1:18789/` (on the gateway host)
+
+**Downgrade example (token-only over HTTP):**
+
+```json5
+{
+  gateway: {
+    controlUi: { allowInsecureAuth: true },
+    bind: "tailnet",
+    auth: { mode: "token", token: "replace-me" }
+  }
+}
+```
+
+This disables device identity + pairing for the Control UI. Use only if you
+trust the network.
+
+See [Tailscale](/gateway/tailscale) for HTTPS setup guidance.
+
 ## Building the UI
 
 The Gateway serves static files from `dist/control-ui`. Build them with:
diff --git a/src/config/schema.ts b/src/config/schema.ts
index bf25f0adb..324f7189b 100644
--- a/src/config/schema.ts
+++ b/src/config/schema.ts
@@ -187,6 +187,7 @@ const FIELD_LABELS: Record<string, string> = {
   "tools.web.fetch.maxRedirects": "Web Fetch Max Redirects",
   "tools.web.fetch.userAgent": "Web Fetch User-Agent",
   "gateway.controlUi.basePath": "Control UI Base Path",
+  "gateway.controlUi.allowInsecureAuth": "Allow Insecure Control UI Auth",
   "gateway.http.endpoints.chatCompletions.enabled": "OpenAI Chat Completions Endpoint",
   "gateway.reload.mode": "Config Reload Mode",
   "gateway.reload.debounceMs": "Config Reload Debounce (ms)",
@@ -345,6 +346,8 @@ const FIELD_HELP: Record<string, string> = {
   "gateway.auth.password": "Required for Tailscale funnel.",
   "gateway.controlUi.basePath":
     "Optional URL prefix where the Control UI is served (e.g. /clawdbot).",
+  "gateway.controlUi.allowInsecureAuth":
+    "Allow Control UI auth over insecure HTTP (token-only; not recommended).",
   "gateway.http.endpoints.chatCompletions.enabled":
     "Enable the OpenAI-compatible `POST /v1/chat/completions` endpoint (default: false).",
   "gateway.reload.mode": 'Hot reload strategy for config changes ("hybrid" recommended).',
diff --git a/src/config/types.gateway.ts b/src/config/types.gateway.ts
index ebc65abd4..cb57d72ce 100644
--- a/src/config/types.gateway.ts
+++ b/src/config/types.gateway.ts
@@ -51,6 +51,8 @@ export type GatewayControlUiConfig = {
   enabled?: boolean;
   /** Optional base path prefix for the Control UI (e.g. "/clawdbot"). */
   basePath?: string;
+  /** Allow token-only auth over insecure HTTP (default: false). */
+  allowInsecureAuth?: boolean;
 };
 
 export type GatewayAuthMode = "token" | "password";
diff --git a/src/config/zod-schema.ts b/src/config/zod-schema.ts
index 213f1d1fd..c9754934a 100644
--- a/src/config/zod-schema.ts
+++ b/src/config/zod-schema.ts
@@ -282,6 +282,7 @@ export const ClawdbotSchema = z
           .object({
             enabled: z.boolean().optional(),
             basePath: z.string().optional(),
+            allowInsecureAuth: z.boolean().optional(),
           })
           .strict()
           .optional(),
diff --git a/src/gateway/server.auth.test.ts b/src/gateway/server.auth.test.ts
index e3be7fde7..0bc7b8374 100644
--- a/src/gateway/server.auth.test.ts
+++ b/src/gateway/server.auth.test.ts
@@ -11,6 +11,7 @@ import {
   startServerWithClient,
   testState,
 } from "./test-helpers.js";
+import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";
 
 installGatewayTestHooks();
 
@@ -127,6 +128,52 @@ describe("gateway server auth/connect", () => {
     await server.close();
   });
 
+  test("rejects control ui without device identity by default", async () => {
+    const { server, ws, prevToken } = await startServerWithClient("secret");
+    const res = await connectReq(ws, {
+      token: "secret",
+      device: null,
+      client: {
+        id: GATEWAY_CLIENT_NAMES.CONTROL_UI,
+        version: "1.0.0",
+        platform: "web",
+        mode: GATEWAY_CLIENT_MODES.WEBCHAT,
+      },
+    });
+    expect(res.ok).toBe(false);
+    expect(res.error?.message ?? "").toContain("secure context");
+    ws.close();
+    await server.close();
+    if (prevToken === undefined) {
+      delete process.env.CLAWDBOT_GATEWAY_TOKEN;
+    } else {
+      process.env.CLAWDBOT_GATEWAY_TOKEN = prevToken;
+    }
+  });
+
+  test("allows control ui without device identity when insecure auth is enabled", async () => {
+    testState.gatewayControlUi = { allowInsecureAuth: true };
+    const { server, ws, prevToken } = await startServerWithClient("secret");
+    const res = await connectReq(ws, {
+      token: "secret",
+      device: null,
+      client: {
+        id: GATEWAY_CLIENT_NAMES.CONTROL_UI,
+        version: "1.0.0",
+        platform: "web",
+        mode: GATEWAY_CLIENT_MODES.WEBCHAT,
+      },
+    });
+    expect(res.ok).toBe(true);
+    ws.close();
+    await server.close();
+    if (prevToken === undefined) {
+      delete process.env.CLAWDBOT_GATEWAY_TOKEN;
+    } else {
+      process.env.CLAWDBOT_GATEWAY_TOKEN = prevToken;
+    }
+  });
+
   test("accepts device token auth for paired device", async () => {
     const { loadOrCreateDeviceIdentity } = await import("../infra/device-identity.js");
     const { approveDevicePairing, getPairedDevice, listDevicePairing } =
diff --git a/src/gateway/server/ws-connection/message-handler.ts b/src/gateway/server/ws-connection/message-handler.ts
index fa53f5ffe..665a74d05 100644
--- a/src/gateway/server/ws-connection/message-handler.ts
+++ b/src/gateway/server/ws-connection/message-handler.ts
@@ -39,6 +39,7 @@ import {
   validateConnectParams,
   validateRequestFrame,
 } from "../../protocol/index.js";
+import { GATEWAY_CLIENT_IDS } from "../../protocol/client-info.js";
 import { MAX_BUFFERED_BYTES, MAX_PAYLOAD_BYTES, TICK_INTERVAL_MS } from "../../server-constants.js";
 import type { GatewayRequestContext, GatewayRequestHandlers } from "../../server-methods/types.js";
 import { handleGatewayRequest } from "../../server-methods.js";
@@ -293,24 +294,53 @@ export function attachGatewayWsMessageHandler(params: {
 
         const device = connectParams.device;
         let devicePublicKey: string | null = null;
-        // Allow token-authenticated connections (e.g., control-ui) to skip device identity
-        const hasTokenAuth = !!connectParams.auth?.token;
-        if (!device && !hasTokenAuth) {
-          setHandshakeState("failed");
-          setCloseCause("device-required", {
-            client: connectParams.client.id,
-            clientDisplayName: connectParams.client.displayName,
-            mode: connectParams.client.mode,
-            version: connectParams.client.version,
-          });
-          send({
-            type: "res",
-            id: frame.id,
-            ok: false,
-            error: errorShape(ErrorCodes.NOT_PAIRED, "device identity required"),
-          });
-          close(1008, "device identity required");
-          return;
+        const hasTokenAuth = Boolean(connectParams.auth?.token);
+        const hasPasswordAuth = Boolean(connectParams.auth?.password);
+        const isControlUi = connectParams.client.id === GATEWAY_CLIENT_IDS.CONTROL_UI;
+
+        if (!device) {
+          const allowInsecureControlUi =
+            isControlUi && loadConfig().gateway?.controlUi?.allowInsecureAuth === true;
+          const canSkipDevice =
+            isControlUi && allowInsecureControlUi ? hasTokenAuth || hasPasswordAuth : hasTokenAuth;
+
+          if (isControlUi && !allowInsecureControlUi) {
+            const errorMessage = "control ui requires HTTPS or localhost (secure context)";
+            setHandshakeState("failed");
+            setCloseCause("control-ui-insecure-auth", {
+              client: connectParams.client.id,
+              clientDisplayName: connectParams.client.displayName,
+              mode: connectParams.client.mode,
+              version: connectParams.client.version,
+            });
+            send({
+              type: "res",
+              id: frame.id,
+              ok: false,
+              error: errorShape(ErrorCodes.INVALID_REQUEST, errorMessage),
+            });
+            close(1008, errorMessage);
+            return;
+          }
+
+          // Allow token-authenticated connections (e.g., control-ui) to skip device identity
+          if (!canSkipDevice) {
+            setHandshakeState("failed");
+            setCloseCause("device-required", {
+              client: connectParams.client.id,
+              clientDisplayName: connectParams.client.displayName,
+              mode: connectParams.client.mode,
+              version: connectParams.client.version,
+            });
+            send({
+              type: "res",
+              id: frame.id,
+              ok: false,
+              error: errorShape(ErrorCodes.NOT_PAIRED, "device identity required"),
+            });
+            close(1008, "device identity required");
+            return;
+          }
         }
         if (device) {
           const derivedId = deriveDeviceIdFromPublicKey(device.publicKey);
diff --git a/src/gateway/test-helpers.mocks.ts b/src/gateway/test-helpers.mocks.ts
index 57b2319b9..993e64c32 100644
--- a/src/gateway/test-helpers.mocks.ts
+++ b/src/gateway/test-helpers.mocks.ts
@@ -210,6 +210,7 @@ export const testState = {
   cronEnabled: false as boolean | undefined,
   gatewayBind: undefined as "auto" | "lan" | "tailnet" | "loopback" | undefined,
   gatewayAuth: undefined as Record<string, unknown> | undefined,
+  gatewayControlUi: undefined as Record<string, unknown> | undefined,
   hooksConfig: undefined as HooksConfig | undefined,
   canvasHostPort: undefined as number | undefined,
   legacyIssues: [] as Array<{ path: string; message: string }>,
@@ -443,6 +444,7 @@ vi.mock("../config/config.js", async () => {
           : {};
       if (testState.gatewayBind) fileGateway.bind = testState.gatewayBind;
       if (testState.gatewayAuth) fileGateway.auth = testState.gatewayAuth;
+      if (testState.gatewayControlUi) fileGateway.controlUi = testState.gatewayControlUi;
       const gateway = Object.keys(fileGateway).length > 0 ? fileGateway : undefined;
 
       const fileCanvasHost =
diff --git a/src/gateway/test-helpers.server.ts b/src/gateway/test-helpers.server.ts
index e3668815f..c72683824 100644
--- a/src/gateway/test-helpers.server.ts
+++ b/src/gateway/test-helpers.server.ts
@@ -101,6 +101,7 @@ export function installGatewayTestHooks() {
     testTailnetIPv4.value = undefined;
     testState.gatewayBind = undefined;
     testState.gatewayAuth = undefined;
+    testState.gatewayControlUi = undefined;
     testState.hooksConfig = undefined;
     testState.canvasHostPort = undefined;
     testState.legacyIssues = [];
@@ -280,7 +281,7 @@ export async function connectReq(
       signature: string;
       signedAt: number;
       nonce?: string;
-    };
+    } | null;
   },
 ): Promise<ConnectResponse> {
   const { randomUUID } = await import("node:crypto");
@@ -294,6 +295,7 @@ export async function connectReq(
   const role = opts?.role ?? "operator";
   const requestedScopes = Array.isArray(opts?.scopes) ? opts?.scopes : [];
   const device = (() => {
+    if (opts?.device === null) return undefined;
     if (opts?.device) return opts.device;
     const identity = loadOrCreateDeviceIdentity();
     const signedAtMs = Date.now();
diff --git a/src/security/audit.test.ts b/src/security/audit.test.ts
index 5232709f9..78e5ce69d 100644
--- a/src/security/audit.test.ts
+++ b/src/security/audit.test.ts
@@ -227,6 +227,29 @@ describe("security audit", () => {
     }
   });
 
+  it("warns when control UI allows insecure auth", async () => {
+    const cfg: ClawdbotConfig = {
+      gateway: {
+        controlUi: { allowInsecureAuth: true },
+      },
+    };
+
+    const res = await runSecurityAudit({
+      config: cfg,
+      includeFilesystem: false,
+      includeChannelSecurity: false,
+    });
+
+    expect(res.findings).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          checkId: "gateway.control_ui.insecure_auth",
+          severity: "warn",
+        }),
+      ]),
+    );
+  });
+
   it("warns when multiple DM senders share the main session", async () => {
     const cfg: ClawdbotConfig = { session: { dmScope: "main" } };
     const plugins: ChannelPlugin[] = [
diff --git a/src/security/audit.ts b/src/security/audit.ts
index b5ad31aba..87e6e3397 100644
--- a/src/security/audit.ts
+++ b/src/security/audit.ts
@@ -235,6 +235,17 @@ function collectGatewayConfigFindings(cfg: ClawdbotConfig): SecurityAuditFinding
     });
   }
 
+  if (cfg.gateway?.controlUi?.allowInsecureAuth === true) {
+    findings.push({
+      checkId: "gateway.control_ui.insecure_auth",
+      severity: "warn",
+      title: "Control UI allows insecure HTTP auth",
+      detail:
+        "gateway.controlUi.allowInsecureAuth=true allows token-only auth over HTTP and skips device identity.",
+      remediation: "Disable it or switch to HTTPS (Tailscale Serve) or localhost.",
+    });
+  }
+
   const token =
     typeof auth.token === "string" && auth.token.trim().length > 0 ? auth.token.trim() : null;
   if (auth.mode === "token" && token && token.length < 24) {
diff --git a/ui/src/ui/gateway.ts b/ui/src/ui/gateway.ts
index 37ab5e2cd..5f1ab01ff 100644
--- a/ui/src/ui/gateway.ts
+++ b/ui/src/ui/gateway.ts
@@ -126,15 +126,27 @@ export class GatewayBrowserClient {
       window.clearTimeout(this.connectTimer);
       this.connectTimer = null;
     }
-    const deviceIdentity = await loadOrCreateDeviceIdentity();
+
+    // crypto.subtle is only available in secure contexts (HTTPS, localhost).
+    // Over plain HTTP, we skip device identity and fall back to token-only auth.
+    // Gateways may reject this unless gateway.controlUi.allowInsecureAuth is enabled.
+    const isSecureContext = typeof crypto !== "undefined" && !!crypto.subtle;
+
     const scopes = ["operator.admin", "operator.approvals", "operator.pairing"];
     const role = "operator";
-    const storedToken = loadDeviceAuthToken({
-      deviceId: deviceIdentity.deviceId,
-      role,
-    })?.token;
-    const authToken = storedToken ?? this.opts.token;
-    const canFallbackToShared = Boolean(storedToken && this.opts.token);
+    let deviceIdentity: Awaited<ReturnType<typeof loadOrCreateDeviceIdentity>> | null = null;
+    let canFallbackToShared = false;
+    let authToken = this.opts.token;
+
+    if (isSecureContext) {
+      deviceIdentity = await loadOrCreateDeviceIdentity();
+      const storedToken = loadDeviceAuthToken({
+        deviceId: deviceIdentity.deviceId,
+        role,
+      })?.token;
+      authToken = storedToken ?? this.opts.token;
+      canFallbackToShared = Boolean(storedToken && this.opts.token);
+    }
     const auth =
       authToken || this.opts.password
         ? {
@@ -142,19 +154,39 @@ export class GatewayBrowserClient {
             password: this.opts.password,
           }
         : undefined;
-    const signedAtMs = Date.now();
-    const nonce = this.connectNonce ?? undefined;
-    const payload = buildDeviceAuthPayload({
-      deviceId: deviceIdentity.deviceId,
-      clientId: this.opts.clientName ?? GATEWAY_CLIENT_NAMES.CONTROL_UI,
-      clientMode: this.opts.mode ?? GATEWAY_CLIENT_MODES.WEBCHAT,
-      role,
-      scopes,
-      signedAtMs,
-      token: authToken ?? null,
-      nonce,
-    });
-    const signature = await signDevicePayload(deviceIdentity.privateKey, payload);
+
+    let device:
+      | {
+          id: string;
+          publicKey: string;
+          signature: string;
+          signedAt: number;
+          nonce: string | undefined;
+        }
+      | undefined;
+
+    if (isSecureContext && deviceIdentity) {
+      const signedAtMs = Date.now();
+      const nonce = this.connectNonce ?? undefined;
+      const payload = buildDeviceAuthPayload({
+        deviceId: deviceIdentity.deviceId,
+        clientId: this.opts.clientName ?? GATEWAY_CLIENT_NAMES.CONTROL_UI,
+        clientMode: this.opts.mode ?? GATEWAY_CLIENT_MODES.WEBCHAT,
+        role,
+        scopes,
+        signedAtMs,
+        token: authToken ?? null,
+        nonce,
+      });
+      const signature = await signDevicePayload(deviceIdentity.privateKey, payload);
+      device = {
+        id: deviceIdentity.deviceId,
+        publicKey: deviceIdentity.publicKey,
+        signature,
+        signedAt: signedAtMs,
+        nonce,
+      };
+    }
     const params = {
       minProtocol: 3,
       maxProtocol: 3,
@@ -167,13 +199,7 @@ export class GatewayBrowserClient {
       },
       role,
       scopes,
-      device: {
-        id: deviceIdentity.deviceId,
-        publicKey: deviceIdentity.publicKey,
-        signature,
-        signedAt: signedAtMs,
-        nonce,
-      },
+      device,
       caps: [],
       auth,
       userAgent: navigator.userAgent,
@@ -182,7 +208,7 @@ export class GatewayBrowserClient {
 
     void this.request<GatewayHelloOk>("connect", params)
       .then((hello) => {
-        if (hello?.auth?.deviceToken) {
+        if (hello?.auth?.deviceToken && deviceIdentity) {
           storeDeviceAuthToken({
             deviceId: deviceIdentity.deviceId,
             role: hello.auth.role ?? role,
@@ -194,7 +220,7 @@ export class GatewayBrowserClient {
         this.opts.onHello?.(hello);
       })
       .catch(() => {
-        if (canFallbackToShared) {
+        if (canFallbackToShared && deviceIdentity) {
           clearDeviceAuthToken({ deviceId: deviceIdentity.deviceId, role });
         }
         this.ws?.close(CONNECT_FAILED_CLOSE_CODE, "connect failed");
diff --git a/ui/src/ui/views/overview.ts b/ui/src/ui/views/overview.ts
index eb7e81948..6b51ed811 100644
--- a/ui/src/ui/views/overview.ts
+++ b/ui/src/ui/views/overview.ts
@@ -77,6 +77,44 @@ export function renderOverview(props: OverviewProps) {
       </div>
     `;
   })();
+  const insecureContextHint = (() => {
+    if (props.connected || !props.lastError) return null;
+    const isSecureContext = typeof window !== "undefined" ? window.isSecureContext : true;
+    if (isSecureContext !== false) return null;
+    const lower = props.lastError.toLowerCase();
+    if (!lower.includes("secure context") && !lower.includes("device identity required")) {
+      return null;
+    }
+    return html`
+      <div class="muted" style="margin-top: 8px;">
+        This page is HTTP, so the browser blocks device identity. Use HTTPS (Tailscale Serve) or
+        open <span class="mono">http://127.0.0.1:18789</span> on the gateway host.
+        <div style="margin-top: 6px;">
+          If you must stay on HTTP, set
+          <span class="mono">gateway.controlUi.allowInsecureAuth: true</span> (token-only).
+        </div>
+        <div style="margin-top: 6px;">
+          <a
+            class="session-link"
+            href="https://docs.clawd.bot/gateway/tailscale"
+            target="_blank"
+            rel="noreferrer"
+            title="Tailscale Serve docs (opens in new tab)"
+            >Docs: Tailscale Serve</a
+          >
+          <span class="muted"> · </span>
+          <a
+            class="session-link"
+            href="https://docs.clawd.bot/web/control-ui#insecure-http"
+            target="_blank"
+            rel="noreferrer"
+            title="Insecure HTTP docs (opens in new tab)"
+            >Docs: Insecure HTTP</a
+          >
+        </div>
+      </div>
+    `;
+  })();
 
   return html`
     <section class="grid grid-cols-2">
@@ -167,6 +205,7 @@ export function renderOverview(props: OverviewProps) {
           ? html`<div class="callout danger" style="margin-top: 14px;">
               <div>${props.lastError}</div>
               ${authHint ?? ""}
+              ${insecureContextHint ?? ""}
             </div>`
           : html`<div class="callout" style="margin-top: 14px;">
               Use Channels to link WhatsApp, Telegram, Discord, Signal, or iMessage.

From 7eef176afc0a64e88b5fdc4a034d45a213319b61 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 00:21:04 +0000
Subject: [PATCH 071/171] fix: warn on unset gateway.mode

---
 CHANGELOG.md                    |  8 ++++++++
 docs/gateway/troubleshooting.md | 28 ++++++++++++++++++++++++++++
 src/commands/doctor.ts          | 13 +++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecf10530a..40e4b141a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,14 @@ Docs: https://docs.clawd.bot
 - BlueBubbles: resolve short message IDs safely and expose full IDs in templates. (#1387) Thanks @tyler6204.
 - Infra: preserve fetch helper methods when wrapping abort signals. (#1387)
 
+## 2026.1.22
+
+### Changes
+- Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
+
+### Fixes
+- Doctor: warn when gateway.mode is unset with configure/config guidance.
+
 ## 2026.1.20
 
 ### Changes
diff --git a/docs/gateway/troubleshooting.md b/docs/gateway/troubleshooting.md
index 803360439..1e9f595a7 100644
--- a/docs/gateway/troubleshooting.md
+++ b/docs/gateway/troubleshooting.md
@@ -82,6 +82,34 @@ Doctor/service will show runtime state (PID/last exit) and log hints.
 
 See [/logging](/logging) for a full overview of formats, config, and access.
 
+### "Gateway start blocked: set gateway.mode=local"
+
+This means the config exists but `gateway.mode` is unset (or not `local`), so the
+Gateway refuses to start.
+
+**Fix (recommended):**
+- Run the wizard and set the Gateway run mode to **Local**:
+  ```bash
+  clawdbot configure
+  ```
+- Or set it directly:
+  ```bash
+  clawdbot config set gateway.mode local
+  ```
+
+**If you meant to run a remote Gateway instead:**
+- Set a remote URL and keep `gateway.mode=remote`:
+  ```bash
+  clawdbot config set gateway.mode remote
+  clawdbot config set gateway.remote.url "wss://gateway.example.com"
+  ```
+
+**Ad-hoc/dev only:** pass `--allow-unconfigured` to start the gateway without
+`gateway.mode=local`.
+
+**No config file yet?** Run `clawdbot setup` to create a starter config, then rerun
+the gateway.
+
 ### Service Environment (PATH + runtime)
 
 The gateway service runs with a **minimal PATH** to avoid shell/manager cruft:
diff --git a/src/commands/doctor.ts b/src/commands/doctor.ts
index 2bc17db11..0ec3bd296 100644
--- a/src/commands/doctor.ts
+++ b/src/commands/doctor.ts
@@ -87,6 +87,19 @@ export async function doctorCommand(
   });
   let cfg: ClawdbotConfig = configResult.cfg;
 
+  const configPath = configResult.path ?? CONFIG_PATH_CLAWDBOT;
+  if (!cfg.gateway?.mode) {
+    const lines = [
+      "gateway.mode is unset; gateway start will be blocked.",
+      `Fix: run ${formatCliCommand("clawdbot configure")} and set Gateway mode (local/remote).`,
+      `Or set directly: ${formatCliCommand("clawdbot config set gateway.mode local")}`,
+    ];
+    if (!fs.existsSync(configPath)) {
+      lines.push(`Missing config: run ${formatCliCommand("clawdbot setup")} first.`);
+    }
+    note(lines.join("\n"), "Gateway");
+  }
+
   cfg = await maybeRepairAnthropicOAuthProfileId(cfg, prompter);
   await noteAuthProfileHealth({
     cfg,

From 8255e4649ccdd6e0efab55d3a61f55618818d3ee Mon Sep 17 00:00:00 2001
From: Clawd <clawd@clawdbot.dev>
Date: Wed, 21 Jan 2026 19:12:36 +0000
Subject: [PATCH 072/171] fix(mac): default to universal binary for
 distribution builds

Closes #1393

The distribution script (package-mac-dist.sh) now defaults BUILD_ARCHS to 'all',
producing universal binaries that run natively on both Apple Silicon and Intel Macs.

Previously, the script inherited the host architecture default from package-mac-app.sh,
which meant release builds done on ARM Macs only included ARM binaries.
---
 scripts/package-mac-dist.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/package-mac-dist.sh b/scripts/package-mac-dist.sh
index 8ea373a8b..1cc17f1da 100755
--- a/scripts/package-mac-dist.sh
+++ b/scripts/package-mac-dist.sh
@@ -10,6 +10,9 @@ set -euo pipefail
 
 ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 
+# Default to universal binary for distribution builds (supports both Apple Silicon and Intel Macs)
+export BUILD_ARCHS="${BUILD_ARCHS:-all}"
+
 "$ROOT_DIR/scripts/package-mac-app.sh"
 
 APP="$ROOT_DIR/dist/Clawdbot.app"

From 1cce83b21e973eb604fa136633692874d1a6133b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 00:26:48 +0000
Subject: [PATCH 073/171] fix: refine model directive handling

---
 CHANGELOG.md                                  |  1 +
 src/auto-reply/model.test.ts                  |  4 +-
 src/auto-reply/model.ts                       |  2 +-
 ...ists-allowlisted-models-model-list.test.ts | 26 +++++------
 ...l-verbose-during-flight-run-toggle.test.ts |  7 ++-
 .../reply/directive-handling.model.ts         | 45 ++++++++++++++-----
 6 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb3bdd616..db9e20c78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ Docs: https://docs.clawd.bot
 - Discord: honor wildcard channel configs via shared match helpers. (#1334) Thanks @pvoo.
 - BlueBubbles: resolve short message IDs safely and expose full IDs in templates. (#1387) Thanks @tyler6204.
 - Infra: preserve fetch helper methods when wrapping abort signals. (#1387)
+- macOS: default distribution packaging to universal binaries. (#1396) Thanks @JustYannicc.
 
 ## 2026.1.20
 
diff --git a/src/auto-reply/model.test.ts b/src/auto-reply/model.test.ts
index a2bbf5f92..4a5aa7714 100644
--- a/src/auto-reply/model.test.ts
+++ b/src/auto-reply/model.test.ts
@@ -114,10 +114,10 @@ describe("extractModelDirective", () => {
   });
 
   describe("edge cases", () => {
-    it("preserves spacing when /model is followed by a path segment", () => {
+    it("absorbs path-like segments when /model includes extra slashes", () => {
       const result = extractModelDirective("thats not /model gpt-5/tmp/hello");
       expect(result.hasDirective).toBe(true);
-      expect(result.cleaned).toBe("thats not /hello");
+      expect(result.cleaned).toBe("thats not");
     });
 
     it("handles alias with special regex characters", () => {
diff --git a/src/auto-reply/model.ts b/src/auto-reply/model.ts
index 46ea44db1..24dd8ea0c 100644
--- a/src/auto-reply/model.ts
+++ b/src/auto-reply/model.ts
@@ -14,7 +14,7 @@ export function extractModelDirective(
   if (!body) return { cleaned: "", hasDirective: false };
 
   const modelMatch = body.match(
-    /(?:^|\s)\/models?(?=$|\s|:)\s*:?\s*([A-Za-z0-9_.:@-]+(?:\/[A-Za-z0-9_.:@-]+)?)?/i,
+    /(?:^|\s)\/models?(?=$|\s|:)\s*:?\s*([A-Za-z0-9_.:@-]+(?:\/[A-Za-z0-9_.:@-]+)*)?/i,
   );
 
   const aliases = (options?.aliases ?? []).map((alias) => alias.trim()).filter(Boolean);
diff --git a/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts b/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
index ffac7deab..45a994432 100644
--- a/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
@@ -84,9 +84,9 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Pick: /model <#> or /model <provider/model>");
-      expect(text).toContain("anthropic/claude-opus-4-5");
-      expect(text).toContain("openai/gpt-4.1-mini");
+      expect(text).toContain("Model listing moved.");
+      expect(text).toContain("Use: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("Switch: /model <provider/model>");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -115,9 +115,9 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Pick: /model <#> or /model <provider/model>");
-      expect(text).toContain("anthropic/claude-opus-4-5");
-      expect(text).toContain("openai/gpt-4.1-mini");
+      expect(text).toContain("Current: anthropic/claude-opus-4-5");
+      expect(text).toContain("Browse: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("More: /model status");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -150,10 +150,9 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("anthropic/claude-opus-4-5");
-      expect(text).toContain("openai/gpt-4.1-mini");
-      expect(text).toContain("minimax/MiniMax-M2.1");
-      expect(text).toContain("xai/grok-4");
+      expect(text).toContain("Model listing moved.");
+      expect(text).toContain("Use: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("Switch: /model <provider/model>");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -202,9 +201,9 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("anthropic/claude-opus-4-5");
-      expect(text).toContain("openai/gpt-4.1-mini");
-      expect(text).toContain("minimax/MiniMax-M2.1");
+      expect(text).toContain("Model listing moved.");
+      expect(text).toContain("Use: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("Switch: /model <provider/model>");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -231,6 +230,7 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
+      expect(text).toContain("Model listing moved.");
       expect(text).not.toContain("missing (missing)");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
diff --git a/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts b/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
index 8ed532b0d..c271adef3 100644
--- a/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
@@ -211,10 +211,9 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("anthropic/claude-opus-4-5");
-      expect(text).toContain("Pick: /model <#> or /model <provider/model>");
-      expect(text).toContain("openai/gpt-4.1-mini");
-      expect(text).not.toContain("claude-sonnet-4-1");
+      expect(text).toContain("Current: anthropic/claude-opus-4-5");
+      expect(text).toContain("Browse: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("More: /model status");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
diff --git a/src/auto-reply/reply/directive-handling.model.ts b/src/auto-reply/reply/directive-handling.model.ts
index 0f5782a6f..dd2f98914 100644
--- a/src/auto-reply/reply/directive-handling.model.ts
+++ b/src/auto-reply/reply/directive-handling.model.ts
@@ -341,16 +341,41 @@ export function resolveModelSelectionFromDirective(params: {
 
     if (resolved.selection) {
       const suggestion = `${resolved.selection.provider}/${resolved.selection.model}`;
-      return {
-        errorText: [
-          `Unrecognized model: ${raw}`,
-          "",
-          `Did you mean: ${suggestion}`,
-          `Try: /model ${suggestion}`,
-          "",
-          "Browse: /models or /models <provider>",
-        ].join("\n"),
-      };
+      const rawHasSlash = raw.includes("/");
+      const shouldAutoSelect = (() => {
+        if (!rawHasSlash) return true;
+        const slash = raw.indexOf("/");
+        if (slash <= 0) return true;
+        const rawProvider = normalizeProviderId(raw.slice(0, slash));
+        const rawFragment = raw
+          .slice(slash + 1)
+          .trim()
+          .toLowerCase();
+        if (!rawFragment) return false;
+        const resolvedProvider = normalizeProviderId(resolved.selection.provider);
+        if (rawProvider !== resolvedProvider) return false;
+        const resolvedModel = resolved.selection.model.toLowerCase();
+        return (
+          resolvedModel.startsWith(rawFragment) ||
+          resolvedModel.includes(rawFragment) ||
+          rawFragment.startsWith(resolvedModel)
+        );
+      })();
+
+      if (shouldAutoSelect) {
+        modelSelection = resolved.selection;
+      } else {
+        return {
+          errorText: [
+            `Unrecognized model: ${raw}`,
+            "",
+            `Did you mean: ${suggestion}`,
+            `Try: /model ${suggestion}`,
+            "",
+            "Browse: /models or /models <provider>",
+          ].join("\n"),
+        };
+      }
     }
   }
 

From 429a2d784938c47db06128cbbc785487bf123bfc Mon Sep 17 00:00:00 2001
From: Clawd <clawd@clawdbot.dev>
Date: Wed, 21 Jan 2026 19:12:36 +0000
Subject: [PATCH 074/171] fix(mac): default to universal binary for
 distribution builds

Closes #1393

The distribution script (package-mac-dist.sh) now defaults BUILD_ARCHS to 'all',
producing universal binaries that run natively on both Apple Silicon and Intel Macs.

Previously, the script inherited the host architecture default from package-mac-app.sh,
which meant release builds done on ARM Macs only included ARM binaries.
---
 scripts/package-mac-dist.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/package-mac-dist.sh b/scripts/package-mac-dist.sh
index 8ea373a8b..1cc17f1da 100755
--- a/scripts/package-mac-dist.sh
+++ b/scripts/package-mac-dist.sh
@@ -10,6 +10,9 @@ set -euo pipefail
 
 ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 
+# Default to universal binary for distribution builds (supports both Apple Silicon and Intel Macs)
+export BUILD_ARCHS="${BUILD_ARCHS:-all}"
+
 "$ROOT_DIR/scripts/package-mac-app.sh"
 
 APP="$ROOT_DIR/dist/Clawdbot.app"

From 2b254a9b39cc4826dd66608400008b1e3073efdb Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 00:26:48 +0000
Subject: [PATCH 075/171] fix: refine model directive handling

---
 CHANGELOG.md                                  |  1 +
 src/auto-reply/model.test.ts                  |  4 +-
 src/auto-reply/model.ts                       |  2 +-
 ...ists-allowlisted-models-model-list.test.ts | 26 +++++------
 ...l-verbose-during-flight-run-toggle.test.ts |  7 ++-
 .../reply/directive-handling.model.ts         | 45 ++++++++++++++-----
 6 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40e4b141a..3033c6f71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ Docs: https://docs.clawd.bot
 - Discord: honor wildcard channel configs via shared match helpers. (#1334) Thanks @pvoo.
 - BlueBubbles: resolve short message IDs safely and expose full IDs in templates. (#1387) Thanks @tyler6204.
 - Infra: preserve fetch helper methods when wrapping abort signals. (#1387)
+- macOS: default distribution packaging to universal binaries. (#1396) Thanks @JustYannicc.
 
 ## 2026.1.22
 
diff --git a/src/auto-reply/model.test.ts b/src/auto-reply/model.test.ts
index a2bbf5f92..4a5aa7714 100644
--- a/src/auto-reply/model.test.ts
+++ b/src/auto-reply/model.test.ts
@@ -114,10 +114,10 @@ describe("extractModelDirective", () => {
   });
 
   describe("edge cases", () => {
-    it("preserves spacing when /model is followed by a path segment", () => {
+    it("absorbs path-like segments when /model includes extra slashes", () => {
       const result = extractModelDirective("thats not /model gpt-5/tmp/hello");
       expect(result.hasDirective).toBe(true);
-      expect(result.cleaned).toBe("thats not /hello");
+      expect(result.cleaned).toBe("thats not");
     });
 
     it("handles alias with special regex characters", () => {
diff --git a/src/auto-reply/model.ts b/src/auto-reply/model.ts
index 46ea44db1..24dd8ea0c 100644
--- a/src/auto-reply/model.ts
+++ b/src/auto-reply/model.ts
@@ -14,7 +14,7 @@ export function extractModelDirective(
   if (!body) return { cleaned: "", hasDirective: false };
 
   const modelMatch = body.match(
-    /(?:^|\s)\/models?(?=$|\s|:)\s*:?\s*([A-Za-z0-9_.:@-]+(?:\/[A-Za-z0-9_.:@-]+)?)?/i,
+    /(?:^|\s)\/models?(?=$|\s|:)\s*:?\s*([A-Za-z0-9_.:@-]+(?:\/[A-Za-z0-9_.:@-]+)*)?/i,
   );
 
   const aliases = (options?.aliases ?? []).map((alias) => alias.trim()).filter(Boolean);
diff --git a/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts b/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
index ffac7deab..45a994432 100644
--- a/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
@@ -84,9 +84,9 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Pick: /model <#> or /model <provider/model>");
-      expect(text).toContain("anthropic/claude-opus-4-5");
-      expect(text).toContain("openai/gpt-4.1-mini");
+      expect(text).toContain("Model listing moved.");
+      expect(text).toContain("Use: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("Switch: /model <provider/model>");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -115,9 +115,9 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Pick: /model <#> or /model <provider/model>");
-      expect(text).toContain("anthropic/claude-opus-4-5");
-      expect(text).toContain("openai/gpt-4.1-mini");
+      expect(text).toContain("Current: anthropic/claude-opus-4-5");
+      expect(text).toContain("Browse: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("More: /model status");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -150,10 +150,9 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("anthropic/claude-opus-4-5");
-      expect(text).toContain("openai/gpt-4.1-mini");
-      expect(text).toContain("minimax/MiniMax-M2.1");
-      expect(text).toContain("xai/grok-4");
+      expect(text).toContain("Model listing moved.");
+      expect(text).toContain("Use: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("Switch: /model <provider/model>");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -202,9 +201,9 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("anthropic/claude-opus-4-5");
-      expect(text).toContain("openai/gpt-4.1-mini");
-      expect(text).toContain("minimax/MiniMax-M2.1");
+      expect(text).toContain("Model listing moved.");
+      expect(text).toContain("Use: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("Switch: /model <provider/model>");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -231,6 +230,7 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
+      expect(text).toContain("Model listing moved.");
       expect(text).not.toContain("missing (missing)");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
diff --git a/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts b/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
index 8ed532b0d..c271adef3 100644
--- a/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
@@ -211,10 +211,9 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("anthropic/claude-opus-4-5");
-      expect(text).toContain("Pick: /model <#> or /model <provider/model>");
-      expect(text).toContain("openai/gpt-4.1-mini");
-      expect(text).not.toContain("claude-sonnet-4-1");
+      expect(text).toContain("Current: anthropic/claude-opus-4-5");
+      expect(text).toContain("Browse: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("More: /model status");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
diff --git a/src/auto-reply/reply/directive-handling.model.ts b/src/auto-reply/reply/directive-handling.model.ts
index 0f5782a6f..dd2f98914 100644
--- a/src/auto-reply/reply/directive-handling.model.ts
+++ b/src/auto-reply/reply/directive-handling.model.ts
@@ -341,16 +341,41 @@ export function resolveModelSelectionFromDirective(params: {
 
     if (resolved.selection) {
       const suggestion = `${resolved.selection.provider}/${resolved.selection.model}`;
-      return {
-        errorText: [
-          `Unrecognized model: ${raw}`,
-          "",
-          `Did you mean: ${suggestion}`,
-          `Try: /model ${suggestion}`,
-          "",
-          "Browse: /models or /models <provider>",
-        ].join("\n"),
-      };
+      const rawHasSlash = raw.includes("/");
+      const shouldAutoSelect = (() => {
+        if (!rawHasSlash) return true;
+        const slash = raw.indexOf("/");
+        if (slash <= 0) return true;
+        const rawProvider = normalizeProviderId(raw.slice(0, slash));
+        const rawFragment = raw
+          .slice(slash + 1)
+          .trim()
+          .toLowerCase();
+        if (!rawFragment) return false;
+        const resolvedProvider = normalizeProviderId(resolved.selection.provider);
+        if (rawProvider !== resolvedProvider) return false;
+        const resolvedModel = resolved.selection.model.toLowerCase();
+        return (
+          resolvedModel.startsWith(rawFragment) ||
+          resolvedModel.includes(rawFragment) ||
+          rawFragment.startsWith(resolvedModel)
+        );
+      })();
+
+      if (shouldAutoSelect) {
+        modelSelection = resolved.selection;
+      } else {
+        return {
+          errorText: [
+            `Unrecognized model: ${raw}`,
+            "",
+            `Did you mean: ${suggestion}`,
+            `Try: /model ${suggestion}`,
+            "",
+            "Browse: /models or /models <provider>",
+          ].join("\n"),
+        };
+      }
     }
   }
 

From d0f9e22a4b0e693da2680ed7cf9a5da4c8eaad00 Mon Sep 17 00:00:00 2001
From: zerone0x <hi@trine.dev>
Date: Wed, 21 Jan 2026 17:49:10 +0800
Subject: [PATCH 076/171] fix(agents): use alphanumeric-only tool call IDs for
 OpenRouter compatibility

Some providers like Mistral via OpenRouter require strictly alphanumeric
tool call IDs. The error message indicates: "Tool call id was
whatsapp_login_1768799841527_1 but must be a-z, A-Z, 0-9, with a length
of 9."

Changes:
- Update sanitizeToolCallId to strip all non-alphanumeric characters
  (previously allowed underscores and hyphens)
- Update makeUniqueToolId to use alphanumeric suffixes (x2, x3, etc.)
  instead of underscores
- Update isValidCloudCodeAssistToolId to validate alphanumeric-only IDs
- Update tests to reflect stricter sanitization

Fixes #1359

Co-Authored-By: Claude <noreply@anthropic.com>
---
 ...ool-call-tool-result-ids-unchanged.test.ts |  7 ++--
 ...ssistant-text-blocks-but-preserves.test.ts |  9 ++---
 ...mbedded-helpers.sanitizetoolcallid.test.ts | 12 ++++---
 src/agents/tool-call-id.test.ts               | 35 +++++++++++++++++--
 src/agents/tool-call-id.ts                    | 31 ++++++++--------
 5 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts
index f8822feea..22a885e9f 100644
--- a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts
+++ b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts
@@ -50,7 +50,7 @@ describe("sanitizeSessionMessagesImages", () => {
     expect(toolResult.role).toBe("toolResult");
     expect(toolResult.toolCallId).toBe("call_123|fc_456");
   });
-  it("sanitizes tool call + tool result IDs when enabled", async () => {
+  it("sanitizes tool call + tool result IDs when enabled (alphanumeric only)", async () => {
     const input = [
       {
         role: "assistant",
@@ -82,14 +82,15 @@ describe("sanitizeSessionMessagesImages", () => {
     const toolCall = (assistant.content as Array<{ type?: string; id?: string }>).find(
       (b) => b.type === "toolCall",
     );
-    expect(toolCall?.id).toBe("call_123_fc_456");
+    // Sanitization strips all non-alphanumeric characters for Mistral/OpenRouter compatibility
+    expect(toolCall?.id).toBe("call123fc456");
 
     const toolResult = out[1] as unknown as {
       role?: string;
       toolCallId?: string;
     };
     expect(toolResult.role).toBe("toolResult");
-    expect(toolResult.toolCallId).toBe("call_123_fc_456");
+    expect(toolResult.toolCallId).toBe("call123fc456");
   });
   it("drops assistant blocks after a tool call when enforceToolCallLast is enabled", async () => {
     const input = [
diff --git a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts
index bf2be6ef5..ff14577bf 100644
--- a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts
+++ b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts
@@ -30,7 +30,7 @@ describe("sanitizeSessionMessagesImages", () => {
     expect(content).toHaveLength(1);
     expect((content as Array<{ type?: string }>)[0]?.type).toBe("toolCall");
   });
-  it("sanitizes tool ids for assistant blocks and tool results when enabled", async () => {
+  it("sanitizes tool ids for assistant blocks and tool results when enabled (alphanumeric only)", async () => {
     const input = [
       {
         role: "assistant",
@@ -55,12 +55,13 @@ describe("sanitizeSessionMessagesImages", () => {
       sanitizeToolCallIds: true,
     });
 
+    // Sanitization strips all non-alphanumeric characters for Mistral/OpenRouter compatibility
     const assistant = out[0] as { content?: Array<{ id?: string }> };
-    expect(assistant.content?.[0]?.id).toBe("call_abc_item_123");
-    expect(assistant.content?.[1]?.id).toBe("call_abc_item_456");
+    expect(assistant.content?.[0]?.id).toBe("callabcitem123");
+    expect(assistant.content?.[1]?.id).toBe("callabcitem456");
 
     const toolResult = out[1] as { toolUseId?: string };
-    expect(toolResult.toolUseId).toBe("call_abc_item_123");
+    expect(toolResult.toolUseId).toBe("callabcitem123");
   });
   it("filters whitespace-only assistant text blocks", async () => {
     const input = [
diff --git a/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts b/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts
index 19fec5aaa..b7fe91210 100644
--- a/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts
+++ b/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts
@@ -10,13 +10,15 @@ const _makeFile = (overrides: Partial<WorkspaceBootstrapFile>): WorkspaceBootstr
   ...overrides,
 });
 describe("sanitizeToolCallId", () => {
-  it("keeps valid tool call IDs", () => {
-    expect(sanitizeToolCallId("call_abc-123")).toBe("call_abc-123");
+  it("keeps valid alphanumeric tool call IDs", () => {
+    expect(sanitizeToolCallId("callabc123")).toBe("callabc123");
   });
-  it("replaces invalid characters with underscores", () => {
-    expect(sanitizeToolCallId("call_abc|item:456")).toBe("call_abc_item_456");
+  it("strips non-alphanumeric characters (Mistral/OpenRouter compatibility)", () => {
+    expect(sanitizeToolCallId("call_abc-123")).toBe("callabc123");
+    expect(sanitizeToolCallId("call_abc|item:456")).toBe("callabcitem456");
+    expect(sanitizeToolCallId("whatsapp_login_1768799841527_1")).toBe("whatsapplogin17687998415271");
   });
   it("returns default for empty IDs", () => {
-    expect(sanitizeToolCallId("")).toBe("default_tool_id");
+    expect(sanitizeToolCallId("")).toBe("defaulttoolid");
   });
 });
diff --git a/src/agents/tool-call-id.test.ts b/src/agents/tool-call-id.test.ts
index 0d9fb1341..a6e85d327 100644
--- a/src/agents/tool-call-id.test.ts
+++ b/src/agents/tool-call-id.test.ts
@@ -7,15 +7,15 @@ import {
 } from "./tool-call-id.js";
 
 describe("sanitizeToolCallIdsForCloudCodeAssist", () => {
-  it("is a no-op for already-valid non-colliding IDs", () => {
+  it("is a no-op for already-valid non-colliding alphanumeric IDs", () => {
     const input = [
       {
         role: "assistant",
-        content: [{ type: "toolCall", id: "call_1", name: "read", arguments: {} }],
+        content: [{ type: "toolCall", id: "call1", name: "read", arguments: {} }],
       },
       {
         role: "toolResult",
-        toolCallId: "call_1",
+        toolCallId: "call1",
         toolName: "read",
         content: [{ type: "text", text: "ok" }],
       },
@@ -25,6 +25,35 @@ describe("sanitizeToolCallIdsForCloudCodeAssist", () => {
     expect(out).toBe(input);
   });
 
+  it("strips underscores from tool call IDs (Mistral/OpenRouter compatibility)", () => {
+    const input = [
+      {
+        role: "assistant",
+        content: [
+          { type: "toolCall", id: "whatsapp_login_1768799841527_1", name: "login", arguments: {} },
+        ],
+      },
+      {
+        role: "toolResult",
+        toolCallId: "whatsapp_login_1768799841527_1",
+        toolName: "login",
+        content: [{ type: "text", text: "ok" }],
+      },
+    ] satisfies AgentMessage[];
+
+    const out = sanitizeToolCallIdsForCloudCodeAssist(input);
+    expect(out).not.toBe(input);
+
+    const assistant = out[0] as Extract<AgentMessage, { role: "assistant" }>;
+    const toolCall = assistant.content?.[0] as { id?: string };
+    // ID should be alphanumeric only, no underscores
+    expect(toolCall.id).toBe("whatsapplogin17687998415271");
+    expect(isValidCloudCodeAssistToolId(toolCall.id as string)).toBe(true);
+
+    const result = out[1] as Extract<AgentMessage, { role: "toolResult" }>;
+    expect(result.toolCallId).toBe(toolCall.id);
+  });
+
   it("avoids collisions when sanitization would produce duplicate IDs", () => {
     const input = [
       {
diff --git a/src/agents/tool-call-id.ts b/src/agents/tool-call-id.ts
index c4aec7e5b..736454536 100644
--- a/src/agents/tool-call-id.ts
+++ b/src/agents/tool-call-id.ts
@@ -3,20 +3,19 @@ import { createHash } from "node:crypto";
 import type { AgentMessage } from "@mariozechner/pi-agent-core";
 
 export function sanitizeToolCallId(id: string): string {
-  if (!id || typeof id !== "string") return "default_tool_id";
+  if (!id || typeof id !== "string") return "defaulttoolid";
 
-  const cloudCodeAssistPatternReplacement = id.replace(/[^a-zA-Z0-9_-]/g, "_");
-  const trimmedInvalidStartChars = cloudCodeAssistPatternReplacement.replace(
-    /^[^a-zA-Z0-9_-]+/,
-    "",
-  );
+  // Some providers (e.g. Mistral via OpenRouter) require strictly alphanumeric tool call IDs.
+  // Strip all non-alphanumeric characters to ensure maximum compatibility.
+  const alphanumericOnly = id.replace(/[^a-zA-Z0-9]/g, "");
 
-  return trimmedInvalidStartChars.length > 0 ? trimmedInvalidStartChars : "sanitized_tool_id";
+  return alphanumericOnly.length > 0 ? alphanumericOnly : "sanitizedtoolid";
 }
 
 export function isValidCloudCodeAssistToolId(id: string): boolean {
   if (!id || typeof id !== "string") return false;
-  return /^[a-zA-Z0-9_-]+$/.test(id);
+  // Strictly alphanumeric for maximum provider compatibility (e.g. Mistral via OpenRouter).
+  return /^[a-zA-Z0-9]+$/.test(id);
 }
 
 function shortHash(text: string): string {
@@ -29,19 +28,20 @@ function makeUniqueToolId(params: { id: string; used: Set<string> }): string {
   const base = sanitizeToolCallId(params.id).slice(0, MAX_LEN);
   if (!params.used.has(base)) return base;
 
+  // Use alphanumeric-only suffixes to maintain strict compatibility.
   const hash = shortHash(params.id);
-  const maxBaseLen = MAX_LEN - 1 - hash.length;
+  const maxBaseLen = MAX_LEN - hash.length;
   const clippedBase = base.length > maxBaseLen ? base.slice(0, maxBaseLen) : base;
-  const candidate = `${clippedBase}_${hash}`;
+  const candidate = `${clippedBase}${hash}`;
   if (!params.used.has(candidate)) return candidate;
 
   for (let i = 2; i < 1000; i += 1) {
-    const suffix = `_${i}`;
+    const suffix = `x${i}`;
     const next = `${candidate.slice(0, MAX_LEN - suffix.length)}${suffix}`;
     if (!params.used.has(next)) return next;
   }
 
-  const ts = `_${Date.now()}`;
+  const ts = `t${Date.now()}`;
   return `${candidate.slice(0, MAX_LEN - ts.length)}${ts}`;
 }
 
@@ -101,9 +101,10 @@ function rewriteToolResultIds(params: {
 }
 
 export function sanitizeToolCallIdsForCloudCodeAssist(messages: AgentMessage[]): AgentMessage[] {
-  // Cloud Code Assist requires tool IDs matching ^[a-zA-Z0-9_-]+$.
-  // Sanitization can introduce collisions (e.g. `a|b` and `a:b` -> `a_b`).
-  // Fix by applying a stable, transcript-wide mapping and de-duping via suffix.
+  // Some providers (e.g. Mistral via OpenRouter) require strictly alphanumeric tool IDs.
+  // Use ^[a-zA-Z0-9]+$ pattern for maximum compatibility across all providers.
+  // Sanitization can introduce collisions (e.g. `a|b` and `a:b` -> `ab`).
+  // Fix by applying a stable, transcript-wide mapping and de-duping via hash suffix.
   const map = new Map<string, string>();
   const used = new Set<string>();
 

From d51eca64ccc6c54160c8dee6e7a26a1c467bf9a1 Mon Sep 17 00:00:00 2001
From: zerone0x <hi@trine.dev>
Date: Wed, 21 Jan 2026 21:32:53 +0800
Subject: [PATCH 077/171] fix(agents): make tool call ID sanitization
 conditional with standard/strict modes

- Add ToolCallIdMode type ('standard' | 'strict') for provider compatibility
- Standard mode (default): allows [a-zA-Z0-9_-] for readable session logs
- Strict mode: only [a-zA-Z0-9] for Mistral via OpenRouter
- Update sanitizeSessionMessagesImages to accept toolCallIdMode option
- Export ToolCallIdMode from pi-embedded-helpers barrel

Addresses review feedback on PR #1372 about readability.
---
 ...ool-call-tool-result-ids-unchanged.test.ts |  57 +++-
 ...ssistant-text-blocks-but-preserves.test.ts |  48 ++-
 ...mbedded-helpers.sanitizetoolcallid.test.ts |  43 ++-
 src/agents/pi-embedded-helpers.ts             |   1 +
 src/agents/pi-embedded-helpers/images.ts      |   5 +-
 src/agents/tool-call-id.test.ts               | 318 +++++++++++-------
 src/agents/tool-call-id.ts                    |  77 +++--
 7 files changed, 369 insertions(+), 180 deletions(-)

diff --git a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts
index 22a885e9f..a715dacfb 100644
--- a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts
+++ b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts
@@ -1,15 +1,7 @@
 import type { AgentMessage } from "@mariozechner/pi-agent-core";
 import { describe, expect, it } from "vitest";
 import { sanitizeSessionMessagesImages } from "./pi-embedded-helpers.js";
-import { DEFAULT_AGENTS_FILENAME } from "./workspace.js";
 
-const _makeFile = (overrides: Partial<WorkspaceBootstrapFile>): WorkspaceBootstrapFile => ({
-  name: DEFAULT_AGENTS_FILENAME,
-  path: "/tmp/AGENTS.md",
-  content: "",
-  missing: false,
-  ...overrides,
-});
 describe("sanitizeSessionMessagesImages", () => {
   it("keeps tool call + tool result IDs unchanged by default", async () => {
     const input = [
@@ -50,7 +42,8 @@ describe("sanitizeSessionMessagesImages", () => {
     expect(toolResult.role).toBe("toolResult");
     expect(toolResult.toolCallId).toBe("call_123|fc_456");
   });
-  it("sanitizes tool call + tool result IDs when enabled (alphanumeric only)", async () => {
+
+  it("sanitizes tool call + tool result IDs in standard mode (preserves underscores)", async () => {
     const input = [
       {
         role: "assistant",
@@ -82,7 +75,51 @@ describe("sanitizeSessionMessagesImages", () => {
     const toolCall = (assistant.content as Array<{ type?: string; id?: string }>).find(
       (b) => b.type === "toolCall",
     );
-    // Sanitization strips all non-alphanumeric characters for Mistral/OpenRouter compatibility
+    // Standard mode preserves underscores for readability, replaces invalid chars
+    expect(toolCall?.id).toBe("call_123_fc_456");
+
+    const toolResult = out[1] as unknown as {
+      role?: string;
+      toolCallId?: string;
+    };
+    expect(toolResult.role).toBe("toolResult");
+    expect(toolResult.toolCallId).toBe("call_123_fc_456");
+  });
+
+  it("sanitizes tool call + tool result IDs in strict mode (alphanumeric only)", async () => {
+    const input = [
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "toolCall",
+            id: "call_123|fc_456",
+            name: "read",
+            arguments: { path: "package.json" },
+          },
+        ],
+      },
+      {
+        role: "toolResult",
+        toolCallId: "call_123|fc_456",
+        toolName: "read",
+        content: [{ type: "text", text: "ok" }],
+        isError: false,
+      },
+    ] satisfies AgentMessage[];
+
+    const out = await sanitizeSessionMessagesImages(input, "test", {
+      sanitizeToolCallIds: true,
+      toolCallIdMode: "strict",
+    });
+
+    const assistant = out[0] as unknown as { role?: string; content?: unknown };
+    expect(assistant.role).toBe("assistant");
+    expect(Array.isArray(assistant.content)).toBe(true);
+    const toolCall = (assistant.content as Array<{ type?: string; id?: string }>).find(
+      (b) => b.type === "toolCall",
+    );
+    // Strict mode strips all non-alphanumeric characters for Mistral/OpenRouter compatibility
     expect(toolCall?.id).toBe("call123fc456");
 
     const toolResult = out[1] as unknown as {
diff --git a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts
index ff14577bf..6ce18c3fc 100644
--- a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts
+++ b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts
@@ -1,15 +1,7 @@
 import type { AgentMessage } from "@mariozechner/pi-agent-core";
 import { describe, expect, it } from "vitest";
 import { sanitizeSessionMessagesImages } from "./pi-embedded-helpers.js";
-import { DEFAULT_AGENTS_FILENAME } from "./workspace.js";
 
-const _makeFile = (overrides: Partial<WorkspaceBootstrapFile>): WorkspaceBootstrapFile => ({
-  name: DEFAULT_AGENTS_FILENAME,
-  path: "/tmp/AGENTS.md",
-  content: "",
-  missing: false,
-  ...overrides,
-});
 describe("sanitizeSessionMessagesImages", () => {
   it("removes empty assistant text blocks but preserves tool calls", async () => {
     const input = [
@@ -30,7 +22,8 @@ describe("sanitizeSessionMessagesImages", () => {
     expect(content).toHaveLength(1);
     expect((content as Array<{ type?: string }>)[0]?.type).toBe("toolCall");
   });
-  it("sanitizes tool ids for assistant blocks and tool results when enabled (alphanumeric only)", async () => {
+
+  it("sanitizes tool ids in standard mode (preserves underscores)", async () => {
     const input = [
       {
         role: "assistant",
@@ -55,7 +48,42 @@ describe("sanitizeSessionMessagesImages", () => {
       sanitizeToolCallIds: true,
     });
 
-    // Sanitization strips all non-alphanumeric characters for Mistral/OpenRouter compatibility
+    // Standard mode preserves underscores for readability
+    const assistant = out[0] as { content?: Array<{ id?: string }> };
+    expect(assistant.content?.[0]?.id).toBe("call_abc_item_123");
+    expect(assistant.content?.[1]?.id).toBe("call_abc_item_456");
+
+    const toolResult = out[1] as { toolUseId?: string };
+    expect(toolResult.toolUseId).toBe("call_abc_item_123");
+  });
+
+  it("sanitizes tool ids in strict mode (alphanumeric only)", async () => {
+    const input = [
+      {
+        role: "assistant",
+        content: [
+          { type: "toolUse", id: "call_abc|item:123", name: "test", input: {} },
+          {
+            type: "toolCall",
+            id: "call_abc|item:456",
+            name: "exec",
+            arguments: {},
+          },
+        ],
+      },
+      {
+        role: "toolResult",
+        toolUseId: "call_abc|item:123",
+        content: [{ type: "text", text: "ok" }],
+      },
+    ] satisfies AgentMessage[];
+
+    const out = await sanitizeSessionMessagesImages(input, "test", {
+      sanitizeToolCallIds: true,
+      toolCallIdMode: "strict",
+    });
+
+    // Strict mode strips all non-alphanumeric characters for Mistral/OpenRouter compatibility
     const assistant = out[0] as { content?: Array<{ id?: string }> };
     expect(assistant.content?.[0]?.id).toBe("callabcitem123");
     expect(assistant.content?.[1]?.id).toBe("callabcitem456");
diff --git a/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts b/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts
index b7fe91210..b4c6e9396 100644
--- a/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts
+++ b/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts
@@ -1,24 +1,33 @@
 import { describe, expect, it } from "vitest";
 import { sanitizeToolCallId } from "./pi-embedded-helpers.js";
-import { DEFAULT_AGENTS_FILENAME } from "./workspace.js";
 
-const _makeFile = (overrides: Partial<WorkspaceBootstrapFile>): WorkspaceBootstrapFile => ({
-  name: DEFAULT_AGENTS_FILENAME,
-  path: "/tmp/AGENTS.md",
-  content: "",
-  missing: false,
-  ...overrides,
-});
 describe("sanitizeToolCallId", () => {
-  it("keeps valid alphanumeric tool call IDs", () => {
-    expect(sanitizeToolCallId("callabc123")).toBe("callabc123");
+  describe("standard mode (default)", () => {
+    it("keeps valid alphanumeric tool call IDs", () => {
+      expect(sanitizeToolCallId("callabc123")).toBe("callabc123");
+    });
+    it("keeps underscores and hyphens for readability", () => {
+      expect(sanitizeToolCallId("call_abc-123")).toBe("call_abc-123");
+      expect(sanitizeToolCallId("call_abc_def")).toBe("call_abc_def");
+    });
+    it("replaces invalid characters with underscores", () => {
+      expect(sanitizeToolCallId("call_abc|item:456")).toBe("call_abc_item_456");
+    });
+    it("returns default for empty IDs", () => {
+      expect(sanitizeToolCallId("")).toBe("default_tool_id");
+    });
   });
-  it("strips non-alphanumeric characters (Mistral/OpenRouter compatibility)", () => {
-    expect(sanitizeToolCallId("call_abc-123")).toBe("callabc123");
-    expect(sanitizeToolCallId("call_abc|item:456")).toBe("callabcitem456");
-    expect(sanitizeToolCallId("whatsapp_login_1768799841527_1")).toBe("whatsapplogin17687998415271");
-  });
-  it("returns default for empty IDs", () => {
-    expect(sanitizeToolCallId("")).toBe("defaulttoolid");
+
+  describe("strict mode (for Mistral/OpenRouter)", () => {
+    it("strips all non-alphanumeric characters", () => {
+      expect(sanitizeToolCallId("call_abc-123", "strict")).toBe("callabc123");
+      expect(sanitizeToolCallId("call_abc|item:456", "strict")).toBe("callabcitem456");
+      expect(sanitizeToolCallId("whatsapp_login_1768799841527_1", "strict")).toBe(
+        "whatsapplogin17687998415271",
+      );
+    });
+    it("returns default for empty IDs", () => {
+      expect(sanitizeToolCallId("", "strict")).toBe("defaulttoolid");
+    });
   });
 });
diff --git a/src/agents/pi-embedded-helpers.ts b/src/agents/pi-embedded-helpers.ts
index 85d16af12..01cb90ef7 100644
--- a/src/agents/pi-embedded-helpers.ts
+++ b/src/agents/pi-embedded-helpers.ts
@@ -50,4 +50,5 @@ export {
 } from "./pi-embedded-helpers/turns.js";
 export type { EmbeddedContextFile, FailoverReason } from "./pi-embedded-helpers/types.js";
 
+export type { ToolCallIdMode } from "./tool-call-id.js";
 export { isValidCloudCodeAssistToolId, sanitizeToolCallId } from "./tool-call-id.js";
diff --git a/src/agents/pi-embedded-helpers/images.ts b/src/agents/pi-embedded-helpers/images.ts
index a53c27a00..862067b26 100644
--- a/src/agents/pi-embedded-helpers/images.ts
+++ b/src/agents/pi-embedded-helpers/images.ts
@@ -1,5 +1,6 @@
 import type { AgentMessage, AgentToolResult } from "@mariozechner/pi-agent-core";
 
+import type { ToolCallIdMode } from "../tool-call-id.js";
 import { sanitizeToolCallIdsForCloudCodeAssist } from "../tool-call-id.js";
 import { sanitizeContentBlocksImages } from "../tool-images.js";
 import { stripThoughtSignatures } from "./bootstrap.js";
@@ -32,6 +33,8 @@ export async function sanitizeSessionMessagesImages(
   label: string,
   options?: {
     sanitizeToolCallIds?: boolean;
+    /** Mode for tool call ID sanitization: "standard" (default, preserves _-) or "strict" (alphanumeric only) */
+    toolCallIdMode?: ToolCallIdMode;
     enforceToolCallLast?: boolean;
     preserveSignatures?: boolean;
     sanitizeThoughtSignatures?: {
@@ -43,7 +46,7 @@ export async function sanitizeSessionMessagesImages(
   // We sanitize historical session messages because Anthropic can reject a request
   // if the transcript contains oversized base64 images (see MAX_IMAGE_DIMENSION_PX).
   const sanitizedIds = options?.sanitizeToolCallIds
-    ? sanitizeToolCallIdsForCloudCodeAssist(messages)
+    ? sanitizeToolCallIdsForCloudCodeAssist(messages, options.toolCallIdMode)
     : messages;
   const out: AgentMessage[] = [];
   for (const msg of sanitizedIds) {
diff --git a/src/agents/tool-call-id.test.ts b/src/agents/tool-call-id.test.ts
index a6e85d327..a76fa93d7 100644
--- a/src/agents/tool-call-id.test.ts
+++ b/src/agents/tool-call-id.test.ts
@@ -7,135 +7,213 @@ import {
 } from "./tool-call-id.js";
 
 describe("sanitizeToolCallIdsForCloudCodeAssist", () => {
-  it("is a no-op for already-valid non-colliding alphanumeric IDs", () => {
-    const input = [
-      {
-        role: "assistant",
-        content: [{ type: "toolCall", id: "call1", name: "read", arguments: {} }],
-      },
-      {
-        role: "toolResult",
-        toolCallId: "call1",
-        toolName: "read",
-        content: [{ type: "text", text: "ok" }],
-      },
-    ] satisfies AgentMessage[];
+  describe("standard mode (default)", () => {
+    it("is a no-op for already-valid non-colliding IDs", () => {
+      const input = [
+        {
+          role: "assistant",
+          content: [{ type: "toolCall", id: "call_1", name: "read", arguments: {} }],
+        },
+        {
+          role: "toolResult",
+          toolCallId: "call_1",
+          toolName: "read",
+          content: [{ type: "text", text: "ok" }],
+        },
+      ] satisfies AgentMessage[];
 
-    const out = sanitizeToolCallIdsForCloudCodeAssist(input);
-    expect(out).toBe(input);
+      const out = sanitizeToolCallIdsForCloudCodeAssist(input);
+      expect(out).toBe(input);
+    });
+
+    it("replaces invalid characters with underscores (preserves readability)", () => {
+      const input = [
+        {
+          role: "assistant",
+          content: [
+            { type: "toolCall", id: "call|item:123", name: "read", arguments: {} },
+          ],
+        },
+        {
+          role: "toolResult",
+          toolCallId: "call|item:123",
+          toolName: "read",
+          content: [{ type: "text", text: "ok" }],
+        },
+      ] satisfies AgentMessage[];
+
+      const out = sanitizeToolCallIdsForCloudCodeAssist(input);
+      expect(out).not.toBe(input);
+
+      const assistant = out[0] as Extract<AgentMessage, { role: "assistant" }>;
+      const toolCall = assistant.content?.[0] as { id?: string };
+      // Standard mode preserves underscores for readability
+      expect(toolCall.id).toBe("call_item_123");
+      expect(isValidCloudCodeAssistToolId(toolCall.id as string)).toBe(true);
+
+      const result = out[1] as Extract<AgentMessage, { role: "toolResult" }>;
+      expect(result.toolCallId).toBe(toolCall.id);
+    });
+
+    it("avoids collisions when sanitization would produce duplicate IDs", () => {
+      const input = [
+        {
+          role: "assistant",
+          content: [
+            { type: "toolCall", id: "call_a|b", name: "read", arguments: {} },
+            { type: "toolCall", id: "call_a:b", name: "read", arguments: {} },
+          ],
+        },
+        {
+          role: "toolResult",
+          toolCallId: "call_a|b",
+          toolName: "read",
+          content: [{ type: "text", text: "one" }],
+        },
+        {
+          role: "toolResult",
+          toolCallId: "call_a:b",
+          toolName: "read",
+          content: [{ type: "text", text: "two" }],
+        },
+      ] satisfies AgentMessage[];
+
+      const out = sanitizeToolCallIdsForCloudCodeAssist(input);
+      expect(out).not.toBe(input);
+
+      const assistant = out[0] as Extract<AgentMessage, { role: "assistant" }>;
+      const a = assistant.content?.[0] as { id?: string };
+      const b = assistant.content?.[1] as { id?: string };
+      expect(typeof a.id).toBe("string");
+      expect(typeof b.id).toBe("string");
+      expect(a.id).not.toBe(b.id);
+      expect(isValidCloudCodeAssistToolId(a.id as string)).toBe(true);
+      expect(isValidCloudCodeAssistToolId(b.id as string)).toBe(true);
+
+      const r1 = out[1] as Extract<AgentMessage, { role: "toolResult" }>;
+      const r2 = out[2] as Extract<AgentMessage, { role: "toolResult" }>;
+      expect(r1.toolCallId).toBe(a.id);
+      expect(r2.toolCallId).toBe(b.id);
+    });
+
+    it("caps tool call IDs at 40 chars while preserving uniqueness", () => {
+      const longA = `call_${"a".repeat(60)}`;
+      const longB = `call_${"a".repeat(59)}b`;
+      const input = [
+        {
+          role: "assistant",
+          content: [
+            { type: "toolCall", id: longA, name: "read", arguments: {} },
+            { type: "toolCall", id: longB, name: "read", arguments: {} },
+          ],
+        },
+        {
+          role: "toolResult",
+          toolCallId: longA,
+          toolName: "read",
+          content: [{ type: "text", text: "one" }],
+        },
+        {
+          role: "toolResult",
+          toolCallId: longB,
+          toolName: "read",
+          content: [{ type: "text", text: "two" }],
+        },
+      ] satisfies AgentMessage[];
+
+      const out = sanitizeToolCallIdsForCloudCodeAssist(input);
+      const assistant = out[0] as Extract<AgentMessage, { role: "assistant" }>;
+      const a = assistant.content?.[0] as { id?: string };
+      const b = assistant.content?.[1] as { id?: string };
+
+      expect(typeof a.id).toBe("string");
+      expect(typeof b.id).toBe("string");
+      expect(a.id).not.toBe(b.id);
+      expect(a.id?.length).toBeLessThanOrEqual(40);
+      expect(b.id?.length).toBeLessThanOrEqual(40);
+      expect(isValidCloudCodeAssistToolId(a.id as string)).toBe(true);
+      expect(isValidCloudCodeAssistToolId(b.id as string)).toBe(true);
+
+      const r1 = out[1] as Extract<AgentMessage, { role: "toolResult" }>;
+      const r2 = out[2] as Extract<AgentMessage, { role: "toolResult" }>;
+      expect(r1.toolCallId).toBe(a.id);
+      expect(r2.toolCallId).toBe(b.id);
+    });
   });
 
-  it("strips underscores from tool call IDs (Mistral/OpenRouter compatibility)", () => {
-    const input = [
-      {
-        role: "assistant",
-        content: [
-          { type: "toolCall", id: "whatsapp_login_1768799841527_1", name: "login", arguments: {} },
-        ],
-      },
-      {
-        role: "toolResult",
-        toolCallId: "whatsapp_login_1768799841527_1",
-        toolName: "login",
-        content: [{ type: "text", text: "ok" }],
-      },
-    ] satisfies AgentMessage[];
+  describe("strict mode (for Mistral/OpenRouter)", () => {
+    it("strips underscores and hyphens from tool call IDs", () => {
+      const input = [
+        {
+          role: "assistant",
+          content: [
+            { type: "toolCall", id: "whatsapp_login_1768799841527_1", name: "login", arguments: {} },
+          ],
+        },
+        {
+          role: "toolResult",
+          toolCallId: "whatsapp_login_1768799841527_1",
+          toolName: "login",
+          content: [{ type: "text", text: "ok" }],
+        },
+      ] satisfies AgentMessage[];
 
-    const out = sanitizeToolCallIdsForCloudCodeAssist(input);
-    expect(out).not.toBe(input);
+      const out = sanitizeToolCallIdsForCloudCodeAssist(input, "strict");
+      expect(out).not.toBe(input);
 
-    const assistant = out[0] as Extract<AgentMessage, { role: "assistant" }>;
-    const toolCall = assistant.content?.[0] as { id?: string };
-    // ID should be alphanumeric only, no underscores
-    expect(toolCall.id).toBe("whatsapplogin17687998415271");
-    expect(isValidCloudCodeAssistToolId(toolCall.id as string)).toBe(true);
+      const assistant = out[0] as Extract<AgentMessage, { role: "assistant" }>;
+      const toolCall = assistant.content?.[0] as { id?: string };
+      // Strict mode strips all non-alphanumeric characters
+      expect(toolCall.id).toBe("whatsapplogin17687998415271");
+      expect(isValidCloudCodeAssistToolId(toolCall.id as string, "strict")).toBe(true);
 
-    const result = out[1] as Extract<AgentMessage, { role: "toolResult" }>;
-    expect(result.toolCallId).toBe(toolCall.id);
-  });
+      const result = out[1] as Extract<AgentMessage, { role: "toolResult" }>;
+      expect(result.toolCallId).toBe(toolCall.id);
+    });
 
-  it("avoids collisions when sanitization would produce duplicate IDs", () => {
-    const input = [
-      {
-        role: "assistant",
-        content: [
-          { type: "toolCall", id: "call_a|b", name: "read", arguments: {} },
-          { type: "toolCall", id: "call_a:b", name: "read", arguments: {} },
-        ],
-      },
-      {
-        role: "toolResult",
-        toolCallId: "call_a|b",
-        toolName: "read",
-        content: [{ type: "text", text: "one" }],
-      },
-      {
-        role: "toolResult",
-        toolCallId: "call_a:b",
-        toolName: "read",
-        content: [{ type: "text", text: "two" }],
-      },
-    ] satisfies AgentMessage[];
+    it("avoids collisions with alphanumeric-only suffixes", () => {
+      const input = [
+        {
+          role: "assistant",
+          content: [
+            { type: "toolCall", id: "call_a|b", name: "read", arguments: {} },
+            { type: "toolCall", id: "call_a:b", name: "read", arguments: {} },
+          ],
+        },
+        {
+          role: "toolResult",
+          toolCallId: "call_a|b",
+          toolName: "read",
+          content: [{ type: "text", text: "one" }],
+        },
+        {
+          role: "toolResult",
+          toolCallId: "call_a:b",
+          toolName: "read",
+          content: [{ type: "text", text: "two" }],
+        },
+      ] satisfies AgentMessage[];
 
-    const out = sanitizeToolCallIdsForCloudCodeAssist(input);
-    expect(out).not.toBe(input);
+      const out = sanitizeToolCallIdsForCloudCodeAssist(input, "strict");
+      expect(out).not.toBe(input);
 
-    const assistant = out[0] as Extract<AgentMessage, { role: "assistant" }>;
-    const a = assistant.content?.[0] as { id?: string };
-    const b = assistant.content?.[1] as { id?: string };
-    expect(typeof a.id).toBe("string");
-    expect(typeof b.id).toBe("string");
-    expect(a.id).not.toBe(b.id);
-    expect(isValidCloudCodeAssistToolId(a.id as string)).toBe(true);
-    expect(isValidCloudCodeAssistToolId(b.id as string)).toBe(true);
+      const assistant = out[0] as Extract<AgentMessage, { role: "assistant" }>;
+      const a = assistant.content?.[0] as { id?: string };
+      const b = assistant.content?.[1] as { id?: string };
+      expect(typeof a.id).toBe("string");
+      expect(typeof b.id).toBe("string");
+      expect(a.id).not.toBe(b.id);
+      // Both should be strictly alphanumeric
+      expect(isValidCloudCodeAssistToolId(a.id as string, "strict")).toBe(true);
+      expect(isValidCloudCodeAssistToolId(b.id as string, "strict")).toBe(true);
+      // Should not contain underscores or hyphens
+      expect(a.id).not.toMatch(/[_-]/);
+      expect(b.id).not.toMatch(/[_-]/);
 
-    const r1 = out[1] as Extract<AgentMessage, { role: "toolResult" }>;
-    const r2 = out[2] as Extract<AgentMessage, { role: "toolResult" }>;
-    expect(r1.toolCallId).toBe(a.id);
-    expect(r2.toolCallId).toBe(b.id);
-  });
-
-  it("caps tool call IDs at 40 chars while preserving uniqueness", () => {
-    const longA = `call_${"a".repeat(60)}`;
-    const longB = `call_${"a".repeat(59)}b`;
-    const input = [
-      {
-        role: "assistant",
-        content: [
-          { type: "toolCall", id: longA, name: "read", arguments: {} },
-          { type: "toolCall", id: longB, name: "read", arguments: {} },
-        ],
-      },
-      {
-        role: "toolResult",
-        toolCallId: longA,
-        toolName: "read",
-        content: [{ type: "text", text: "one" }],
-      },
-      {
-        role: "toolResult",
-        toolCallId: longB,
-        toolName: "read",
-        content: [{ type: "text", text: "two" }],
-      },
-    ] satisfies AgentMessage[];
-
-    const out = sanitizeToolCallIdsForCloudCodeAssist(input);
-    const assistant = out[0] as Extract<AgentMessage, { role: "assistant" }>;
-    const a = assistant.content?.[0] as { id?: string };
-    const b = assistant.content?.[1] as { id?: string };
-
-    expect(typeof a.id).toBe("string");
-    expect(typeof b.id).toBe("string");
-    expect(a.id).not.toBe(b.id);
-    expect(a.id?.length).toBeLessThanOrEqual(40);
-    expect(b.id?.length).toBeLessThanOrEqual(40);
-    expect(isValidCloudCodeAssistToolId(a.id as string)).toBe(true);
-    expect(isValidCloudCodeAssistToolId(b.id as string)).toBe(true);
-
-    const r1 = out[1] as Extract<AgentMessage, { role: "toolResult" }>;
-    const r2 = out[2] as Extract<AgentMessage, { role: "toolResult" }>;
-    expect(r1.toolCallId).toBe(a.id);
-    expect(r2.toolCallId).toBe(b.id);
+      const r1 = out[1] as Extract<AgentMessage, { role: "toolResult" }>;
+      const r2 = out[2] as Extract<AgentMessage, { role: "toolResult" }>;
+      expect(r1.toolCallId).toBe(a.id);
+      expect(r2.toolCallId).toBe(b.id);
+    });
   });
 });
diff --git a/src/agents/tool-call-id.ts b/src/agents/tool-call-id.ts
index 736454536..c2cd892cc 100644
--- a/src/agents/tool-call-id.ts
+++ b/src/agents/tool-call-id.ts
@@ -2,46 +2,70 @@ import { createHash } from "node:crypto";
 
 import type { AgentMessage } from "@mariozechner/pi-agent-core";
 
-export function sanitizeToolCallId(id: string): string {
-  if (!id || typeof id !== "string") return "defaulttoolid";
+export type ToolCallIdMode = "standard" | "strict";
 
-  // Some providers (e.g. Mistral via OpenRouter) require strictly alphanumeric tool call IDs.
-  // Strip all non-alphanumeric characters to ensure maximum compatibility.
-  const alphanumericOnly = id.replace(/[^a-zA-Z0-9]/g, "");
+/**
+ * Sanitize a tool call ID to be compatible with various providers.
+ *
+ * - "standard" mode: allows [a-zA-Z0-9_-], better readability (default)
+ * - "strict" mode: only [a-zA-Z0-9], required for Mistral via OpenRouter
+ */
+export function sanitizeToolCallId(id: string, mode: ToolCallIdMode = "standard"): string {
+  if (!id || typeof id !== "string") {
+    return mode === "strict" ? "defaulttoolid" : "default_tool_id";
+  }
 
-  return alphanumericOnly.length > 0 ? alphanumericOnly : "sanitizedtoolid";
+  if (mode === "strict") {
+    // Some providers (e.g. Mistral via OpenRouter) require strictly alphanumeric tool call IDs.
+    const alphanumericOnly = id.replace(/[^a-zA-Z0-9]/g, "");
+    return alphanumericOnly.length > 0 ? alphanumericOnly : "sanitizedtoolid";
+  }
+
+  // Standard mode: allow underscores and hyphens for better readability in logs
+  const sanitized = id.replace(/[^a-zA-Z0-9_-]/g, "_");
+  const trimmed = sanitized.replace(/^[^a-zA-Z0-9_-]+/, "");
+  return trimmed.length > 0 ? trimmed : "sanitized_tool_id";
 }
 
-export function isValidCloudCodeAssistToolId(id: string): boolean {
+export function isValidCloudCodeAssistToolId(id: string, mode: ToolCallIdMode = "standard"): boolean {
   if (!id || typeof id !== "string") return false;
-  // Strictly alphanumeric for maximum provider compatibility (e.g. Mistral via OpenRouter).
-  return /^[a-zA-Z0-9]+$/.test(id);
+  if (mode === "strict") {
+    // Strictly alphanumeric for providers like Mistral via OpenRouter
+    return /^[a-zA-Z0-9]+$/.test(id);
+  }
+  // Standard mode allows underscores and hyphens
+  return /^[a-zA-Z0-9_-]+$/.test(id);
 }
 
 function shortHash(text: string): string {
   return createHash("sha1").update(text).digest("hex").slice(0, 8);
 }
 
-function makeUniqueToolId(params: { id: string; used: Set<string> }): string {
+function makeUniqueToolId(params: {
+  id: string;
+  used: Set<string>;
+  mode: ToolCallIdMode;
+}): string {
   const MAX_LEN = 40;
 
-  const base = sanitizeToolCallId(params.id).slice(0, MAX_LEN);
+  const base = sanitizeToolCallId(params.id, params.mode).slice(0, MAX_LEN);
   if (!params.used.has(base)) return base;
 
-  // Use alphanumeric-only suffixes to maintain strict compatibility.
   const hash = shortHash(params.id);
-  const maxBaseLen = MAX_LEN - hash.length;
+  // Use separator based on mode: underscore for standard (readable), none for strict
+  const separator = params.mode === "strict" ? "" : "_";
+  const maxBaseLen = MAX_LEN - separator.length - hash.length;
   const clippedBase = base.length > maxBaseLen ? base.slice(0, maxBaseLen) : base;
-  const candidate = `${clippedBase}${hash}`;
+  const candidate = `${clippedBase}${separator}${hash}`;
   if (!params.used.has(candidate)) return candidate;
 
   for (let i = 2; i < 1000; i += 1) {
-    const suffix = `x${i}`;
+    const suffix = params.mode === "strict" ? `x${i}` : `_${i}`;
     const next = `${candidate.slice(0, MAX_LEN - suffix.length)}${suffix}`;
     if (!params.used.has(next)) return next;
   }
 
-  const ts = `t${Date.now()}`;
+  const ts = params.mode === "strict" ? `t${Date.now()}` : `_${Date.now()}`;
   return `${candidate.slice(0, MAX_LEN - ts.length)}${ts}`;
 }
 
@@ -100,18 +124,27 @@ function rewriteToolResultIds(params: {
   } as Extract<AgentMessage, { role: "toolResult" }>;
 }
 
-export function sanitizeToolCallIdsForCloudCodeAssist(messages: AgentMessage[]): AgentMessage[] {
-  // Some providers (e.g. Mistral via OpenRouter) require strictly alphanumeric tool IDs.
-  // Use ^[a-zA-Z0-9]+$ pattern for maximum compatibility across all providers.
-  // Sanitization can introduce collisions (e.g. `a|b` and `a:b` -> `ab`).
-  // Fix by applying a stable, transcript-wide mapping and de-duping via hash suffix.
+/**
+ * Sanitize tool call IDs for provider compatibility.
+ *
+ * @param messages - The messages to sanitize
+ * @param mode - "standard" (default, allows _-) or "strict" (alphanumeric only for Mistral/OpenRouter)
+ */
+export function sanitizeToolCallIdsForCloudCodeAssist(
+  messages: AgentMessage[],
+  mode: ToolCallIdMode = "standard",
+): AgentMessage[] {
+  // Standard mode: allows [a-zA-Z0-9_-] for better readability in session logs
+  // Strict mode: only [a-zA-Z0-9] for providers like Mistral via OpenRouter
+  // Sanitization can introduce collisions (e.g. `a|b` and `a:b` -> `a_b` or `ab`).
+  // Fix by applying a stable, transcript-wide mapping and de-duping via suffix.
   const map = new Map<string, string>();
   const used = new Set<string>();
 
   const resolve = (id: string) => {
     const existing = map.get(id);
     if (existing) return existing;
-    const next = makeUniqueToolId({ id, used });
+    const next = makeUniqueToolId({ id, used, mode });
     map.set(id, next);
     used.add(next);
     return next;

From 7d93de710ebbb163c6c8628b35fa54c43ccbb95d Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 00:42:04 +0000
Subject: [PATCH 078/171] fix: remove setup-token run option in onboarding

---
 CHANGELOG.md                        | 1 +
 docs/concepts/model-providers.md    | 2 +-
 docs/providers/anthropic.md         | 9 ++-------
 docs/start/faq.md                   | 6 +++---
 docs/start/wizard.md                | 5 ++---
 src/commands/auth-choice-options.ts | 8 +-------
 6 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88375f48b..8259f93ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Docs: https://docs.clawd.bot
 
 ### Changes
 - Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
+- Onboarding: remove the run setup-token auth option (paste setup-token or reuse CLI creds instead).
 
 ### Fixes
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
diff --git a/docs/concepts/model-providers.md b/docs/concepts/model-providers.md
index 12c5afe5b..fd21e4a57 100644
--- a/docs/concepts/model-providers.md
+++ b/docs/concepts/model-providers.md
@@ -38,7 +38,7 @@ Clawdbot ships with the pi‑ai catalog. These providers require **no**
 - Provider: `anthropic`
 - Auth: `ANTHROPIC_API_KEY` or `claude setup-token`
 - Example model: `anthropic/claude-opus-4-5`
-- CLI: `clawdbot onboard --auth-choice setup-token`
+- CLI: `clawdbot onboard --auth-choice token` (paste setup-token) or `clawdbot models auth paste-token --provider anthropic`
 
 ```json5
 {
diff --git a/docs/providers/anthropic.md b/docs/providers/anthropic.md
index f09d1c870..b49550220 100644
--- a/docs/providers/anthropic.md
+++ b/docs/providers/anthropic.md
@@ -70,11 +70,9 @@ Setup-tokens are created by the **Claude Code CLI**, not the Anthropic Console.
 claude setup-token
 ```
 
-Paste the token into Clawdbot (wizard: **Anthropic token (paste setup-token)**), or let Clawdbot run the command locally:
+Paste the token into Clawdbot (wizard: **Anthropic token (paste setup-token)**), or run it on the gateway host:
 
 ```bash
-clawdbot onboard --auth-choice setup-token
-# or
 clawdbot models auth setup-token --provider anthropic
 ```
 
@@ -87,9 +85,6 @@ clawdbot models auth paste-token --provider anthropic
 ### CLI setup
 
 ```bash
-# Run setup-token locally (wizard can run it for you)
-clawdbot onboard --auth-choice setup-token
-
 # Reuse Claude Code CLI OAuth credentials if already logged in
 clawdbot onboard --auth-choice claude-cli
 ```
@@ -104,7 +99,7 @@ clawdbot onboard --auth-choice claude-cli
 
 ## Notes
 
-- The wizard can run `claude setup-token` locally and store the token, or you can paste a token generated elsewhere.
+- Generate the setup-token with `claude setup-token` and paste it, or run `clawdbot models auth setup-token` on the gateway host.
 - Clawdbot writes `auth.profiles["anthropic:claude-cli"].mode` as `"oauth"` so the profile
   accepts both OAuth and setup-token credentials. Older configs using `"token"` are
   auto-migrated on load.
diff --git a/docs/start/faq.md b/docs/start/faq.md
index 4b849b823..ff45c89b0 100644
--- a/docs/start/faq.md
+++ b/docs/start/faq.md
@@ -241,7 +241,7 @@ It also warns if your configured model is unknown or missing auth.
 
 ### How does Anthropic "setup-token" auth work?
 
-`claude setup-token` generates a **token string** via the Claude Code CLI (it is not available in the web console). You can run it on **any machine**. If you run it on the gateway host, the wizard can auto-detect the CLI credentials. If you run it elsewhere, choose **Anthropic token (paste setup-token)** and paste the string. The token is stored as an auth profile for the **anthropic** provider and used like an API key or OAuth profile. More detail: [OAuth](/concepts/oauth).
+`claude setup-token` generates a **token string** via the Claude Code CLI (it is not available in the web console). You can run it on **any machine**. If Claude Code CLI credentials are present on the gateway host, Clawdbot can reuse them; otherwise choose **Anthropic token (paste setup-token)** and paste the string. The token is stored as an auth profile for the **anthropic** provider and used like an API key or OAuth profile. More detail: [OAuth](/concepts/oauth).
 
 Clawdbot keeps `auth.profiles["anthropic:claude-cli"].mode` set to `"oauth"` so
 the profile accepts both OAuth and setup-token credentials; older `"token"` mode
@@ -255,11 +255,11 @@ It is **not** in the Anthropic Console. The setup-token is generated by the **Cl
 claude setup-token
 ```
 
-Copy the token it prints, then choose **Anthropic token (paste setup-token)** in the wizard. If you want Clawdbot to run the command for you, use `clawdbot onboard --auth-choice setup-token` or `clawdbot models auth setup-token --provider anthropic`. If you ran `claude setup-token` elsewhere, paste it on the gateway host with `clawdbot models auth paste-token --provider anthropic`. See [Anthropic](/providers/anthropic).
+Copy the token it prints, then choose **Anthropic token (paste setup-token)** in the wizard. If you want to run it on the gateway host, use `clawdbot models auth setup-token --provider anthropic`. If you ran `claude setup-token` elsewhere, paste it on the gateway host with `clawdbot models auth paste-token --provider anthropic`. See [Anthropic](/providers/anthropic).
 
 ### Do you support Claude subscription auth (Claude Code OAuth)?
 
-Yes. Clawdbot can **reuse Claude Code CLI credentials** (OAuth) and also supports **setup-token**. If you have a Claude subscription, we recommend **setup-token** for long‑running setups (requires Claude Pro/Max + the `claude` CLI). You can generate it anywhere and paste it on the gateway host, or run it locally on the gateway so it auto-syncs. OAuth reuse is supported, but avoid logging in separately via Clawdbot and Claude Code to prevent token conflicts. See [Anthropic](/providers/anthropic) and [OAuth](/concepts/oauth).
+Yes. Clawdbot can **reuse Claude Code CLI credentials** (OAuth) and also supports **setup-token**. If you have a Claude subscription, we recommend **setup-token** for long‑running setups (requires Claude Pro/Max + the `claude` CLI). You can generate it anywhere and paste it on the gateway host. OAuth reuse is supported, but avoid logging in separately via Clawdbot and Claude Code to prevent token conflicts. See [Anthropic](/providers/anthropic) and [OAuth](/concepts/oauth).
 
 Note: Claude subscription access is governed by Anthropic’s terms. For production or multi‑user workloads, API keys are usually the safer choice.
 
diff --git a/docs/start/wizard.md b/docs/start/wizard.md
index 8be09ca31..f3231b873 100644
--- a/docs/start/wizard.md
+++ b/docs/start/wizard.md
@@ -45,7 +45,7 @@ The wizard starts with **QuickStart** (defaults) vs **Advanced** (full control).
 ## What the wizard does
 
 **Local mode (default)** walks you through:
-  - Model/auth (OpenAI Code (Codex) subscription OAuth, Anthropic API key (recommended) or `claude setup-token`, plus MiniMax/GLM/Moonshot/AI Gateway options)
+  - Model/auth (OpenAI Code (Codex) subscription OAuth, Anthropic API key (recommended) or setup-token (paste), plus MiniMax/GLM/Moonshot/AI Gateway options)
 - Workspace location + bootstrap files
 - Gateway settings (port/bind/auth/tailscale)
 - Providers (Telegram, WhatsApp, Discord, Signal)
@@ -79,9 +79,8 @@ Tip: `--json` does **not** imply non-interactive mode. Use `--non-interactive` (
 
 2) **Model/Auth**
    - **Anthropic API key (recommended)**: uses `ANTHROPIC_API_KEY` if present or prompts for a key, then saves it for daemon use.
-   - **Anthropic token (setup-token)**: run `claude setup-token` locally (the wizard can run it for you and reuse the token) or run it elsewhere and paste the token.
    - **Anthropic OAuth (Claude Code CLI)**: on macOS the wizard checks Keychain item "Claude Code-credentials" (choose "Always Allow" so launchd starts don't block); on Linux/Windows it reuses `~/.claude/.credentials.json` if present.
-   - **Anthropic token (paste setup-token)**: run `claude setup-token` in your terminal, then paste the token (you can name it; blank = default).
+   - **Anthropic token (paste setup-token)**: run `claude setup-token` on any machine, then paste the token (you can name it; blank = default).
    - **OpenAI Code (Codex) subscription (Codex CLI)**: if `~/.codex/auth.json` exists, the wizard can reuse it.
    - **OpenAI Code (Codex) subscription (OAuth)**: browser flow; paste the `code#state`.
      - Sets `agents.defaults.model` to `openai-codex/gpt-5.2` when model is unset or `openai/*`.
diff --git a/src/commands/auth-choice-options.ts b/src/commands/auth-choice-options.ts
index b15a3e644..61ea1f31b 100644
--- a/src/commands/auth-choice-options.ts
+++ b/src/commands/auth-choice-options.ts
@@ -46,7 +46,7 @@ const AUTH_CHOICE_GROUP_DEFS: {
     value: "anthropic",
     label: "Anthropic",
     hint: "Claude Code CLI + API key",
-    choices: ["claude-cli", "setup-token", "token", "apiKey"],
+    choices: ["claude-cli", "token", "apiKey"],
   },
   {
     value: "minimax",
@@ -170,12 +170,6 @@ export function buildAuthChoiceOptions(params: {
     });
   }
 
-  options.push({
-    value: "setup-token",
-    label: "Anthropic token (run setup-token)",
-    hint: "runs `claude setup-token` · opens browser for fresh OAuth login",
-  });
-
   options.push({
     value: "token",
     label: "Anthropic token (paste setup-token)",

From 0704fe7dbbf1a204724a9bb98ddc1037d0258129 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 00:38:48 +0000
Subject: [PATCH 079/171] fix: enforce Mistral tool call ids (#1372) (thanks
 @zerone0x)

---
 CHANGELOG.md                                  |  1 +
 ...ool-call-tool-result-ids-unchanged.test.ts |  2 +-
 ...ssistant-text-blocks-but-preserves.test.ts |  2 +-
 ...mbedded-helpers.sanitizetoolcallid.test.ts | 12 +++-
 src/agents/pi-embedded-helpers/images.ts      |  7 ++-
 ...ed-runner.sanitize-session-history.test.ts | 19 ++++++
 src/agents/pi-embedded-runner/google.ts       | 27 ++++++++-
 src/agents/tool-call-id.test.ts               | 59 +++++++++++++++++--
 src/agents/tool-call-id.ts                    | 55 ++++++++++++-----
 ...ists-allowlisted-models-model-list.test.ts | 13 ++--
 ...tches-fuzzy-selection-is-ambiguous.test.ts | 11 ++--
 ...uzzy-model-matches-model-directive.test.ts | 33 ++++++-----
 ...l-verbose-during-flight-run-toggle.test.ts |  3 +-
 13 files changed, 193 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88375f48b..23dc120e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ Docs: https://docs.clawd.bot
 
 ### Fixes
 - Gateway: keep auto bind loopback-first and add explicit tailnet binding to avoid Tailscale taking over local UI. (#1380)
+- Agents: enforce 9-char alphanumeric tool call ids for Mistral providers. (#1372) Thanks @zerone0x.
 - Embedded runner: persist injected history images so attachments aren’t reloaded each turn. (#1374) Thanks @Nicell.
 - Nodes tool: include agent/node/gateway context in tool failure logs to speed approval debugging.
 - macOS: exec approvals now respect wildcard agent allowlists (`*`).
diff --git a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts
index a715dacfb..377bc53fe 100644
--- a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts
+++ b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.keeps-tool-call-tool-result-ids-unchanged.test.ts
@@ -119,7 +119,7 @@ describe("sanitizeSessionMessagesImages", () => {
     const toolCall = (assistant.content as Array<{ type?: string; id?: string }>).find(
       (b) => b.type === "toolCall",
     );
-    // Strict mode strips all non-alphanumeric characters for Mistral/OpenRouter compatibility
+    // Strict mode strips all non-alphanumeric characters
     expect(toolCall?.id).toBe("call123fc456");
 
     const toolResult = out[1] as unknown as {
diff --git a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts
index 6ce18c3fc..6c12dfacf 100644
--- a/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts
+++ b/src/agents/pi-embedded-helpers.sanitize-session-messages-images.removes-empty-assistant-text-blocks-but-preserves.test.ts
@@ -83,7 +83,7 @@ describe("sanitizeSessionMessagesImages", () => {
       toolCallIdMode: "strict",
     });
 
-    // Strict mode strips all non-alphanumeric characters for Mistral/OpenRouter compatibility
+    // Strict mode strips all non-alphanumeric characters
     const assistant = out[0] as { content?: Array<{ id?: string }> };
     expect(assistant.content?.[0]?.id).toBe("callabcitem123");
     expect(assistant.content?.[1]?.id).toBe("callabcitem456");
diff --git a/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts b/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts
index b4c6e9396..9569afbf3 100644
--- a/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts
+++ b/src/agents/pi-embedded-helpers.sanitizetoolcallid.test.ts
@@ -18,7 +18,7 @@ describe("sanitizeToolCallId", () => {
     });
   });
 
-  describe("strict mode (for Mistral/OpenRouter)", () => {
+  describe("strict mode (alphanumeric only)", () => {
     it("strips all non-alphanumeric characters", () => {
       expect(sanitizeToolCallId("call_abc-123", "strict")).toBe("callabc123");
       expect(sanitizeToolCallId("call_abc|item:456", "strict")).toBe("callabcitem456");
@@ -30,4 +30,14 @@ describe("sanitizeToolCallId", () => {
       expect(sanitizeToolCallId("", "strict")).toBe("defaulttoolid");
     });
   });
+
+  describe("strict9 mode (Mistral tool call IDs)", () => {
+    it("returns alphanumeric IDs with length 9", () => {
+      const out = sanitizeToolCallId("call_abc|item:456", "strict9");
+      expect(out).toMatch(/^[a-zA-Z0-9]{9}$/);
+    });
+    it("returns default for empty IDs", () => {
+      expect(sanitizeToolCallId("", "strict9")).toMatch(/^[a-zA-Z0-9]{9}$/);
+    });
+  });
 });
diff --git a/src/agents/pi-embedded-helpers/images.ts b/src/agents/pi-embedded-helpers/images.ts
index 862067b26..13376e68c 100644
--- a/src/agents/pi-embedded-helpers/images.ts
+++ b/src/agents/pi-embedded-helpers/images.ts
@@ -33,7 +33,12 @@ export async function sanitizeSessionMessagesImages(
   label: string,
   options?: {
     sanitizeToolCallIds?: boolean;
-    /** Mode for tool call ID sanitization: "standard" (default, preserves _-) or "strict" (alphanumeric only) */
+    /**
+     * Mode for tool call ID sanitization:
+     * - "standard" (default, preserves _-)
+     * - "strict" (alphanumeric only)
+     * - "strict9" (alphanumeric only, length 9)
+     */
     toolCallIdMode?: ToolCallIdMode;
     enforceToolCallLast?: boolean;
     preserveSignatures?: boolean;
diff --git a/src/agents/pi-embedded-runner.sanitize-session-history.test.ts b/src/agents/pi-embedded-runner.sanitize-session-history.test.ts
index 87c149d9a..c7a9b3d05 100644
--- a/src/agents/pi-embedded-runner.sanitize-session-history.test.ts
+++ b/src/agents/pi-embedded-runner.sanitize-session-history.test.ts
@@ -54,6 +54,25 @@ describe("sanitizeSessionHistory", () => {
     );
   });
 
+  it("sanitizes tool call ids with strict9 for Mistral models", async () => {
+    vi.mocked(helpers.isGoogleModelApi).mockReturnValue(false);
+
+    await sanitizeSessionHistory({
+      messages: mockMessages,
+      modelApi: "openai-responses",
+      provider: "openrouter",
+      modelId: "mistralai/devstral-2512:free",
+      sessionManager: mockSessionManager,
+      sessionId: "test-session",
+    });
+
+    expect(helpers.sanitizeSessionMessagesImages).toHaveBeenCalledWith(
+      mockMessages,
+      "session:history",
+      expect.objectContaining({ sanitizeToolCallIds: true, toolCallIdMode: "strict9" }),
+    );
+  });
+
   it("does not sanitize tool call ids for non-Google, non-OpenAI APIs", async () => {
     vi.mocked(helpers.isGoogleModelApi).mockReturnValue(false);
 
diff --git a/src/agents/pi-embedded-runner/google.ts b/src/agents/pi-embedded-runner/google.ts
index 558098c20..6050090a4 100644
--- a/src/agents/pi-embedded-runner/google.ts
+++ b/src/agents/pi-embedded-runner/google.ts
@@ -14,6 +14,8 @@ import { log } from "./logger.js";
 import { describeUnknownError } from "./utils.js";
 import { isAntigravityClaude } from "../pi-embedded-helpers/google.js";
 import { cleanToolSchemaForGemini } from "../pi-tools.schema.js";
+import { normalizeProviderId } from "../model-selection.js";
+import type { ToolCallIdMode } from "../tool-call-id.js";
 
 const GOOGLE_TURN_ORDERING_CUSTOM_TYPE = "google-turn-ordering-bootstrap";
 const GOOGLE_SCHEMA_UNSUPPORTED_KEYWORDS = new Set([
@@ -44,12 +46,29 @@ const OPENAI_TOOL_CALL_ID_APIS = new Set([
   "openai-responses",
   "openai-codex-responses",
 ]);
+const MISTRAL_MODEL_HINTS = [
+  "mistral",
+  "mixtral",
+  "codestral",
+  "pixtral",
+  "devstral",
+  "ministral",
+  "mistralai",
+];
 
 function shouldSanitizeToolCallIds(modelApi?: string | null): boolean {
   if (!modelApi) return false;
   return isGoogleModelApi(modelApi) || OPENAI_TOOL_CALL_ID_APIS.has(modelApi);
 }
 
+function isMistralModel(params: { provider?: string | null; modelId?: string | null }): boolean {
+  const provider = normalizeProviderId(params.provider ?? "");
+  if (provider === "mistral") return true;
+  const modelId = (params.modelId ?? "").toLowerCase();
+  if (!modelId) return false;
+  return MISTRAL_MODEL_HINTS.some((hint) => modelId.includes(hint));
+}
+
 function findUnsupportedSchemaKeywords(schema: unknown, path: string): string[] {
   if (!schema || typeof schema !== "object") return [];
   if (Array.isArray(schema)) {
@@ -191,12 +210,16 @@ export async function sanitizeSessionHistory(params: {
   sessionId: string;
 }): Promise<AgentMessage[]> {
   const isAntigravityClaudeModel = isAntigravityClaude(params.modelApi, params.modelId);
-  const provider = (params.provider ?? "").toLowerCase();
+  const provider = normalizeProviderId(params.provider ?? "");
   const modelId = (params.modelId ?? "").toLowerCase();
   const isOpenRouterGemini =
     (provider === "openrouter" || provider === "opencode") && modelId.includes("gemini");
+  const isMistral = isMistralModel({ provider, modelId });
+  const toolCallIdMode: ToolCallIdMode | undefined = isMistral ? "strict9" : undefined;
+  const sanitizeToolCallIds = shouldSanitizeToolCallIds(params.modelApi) || isMistral;
   const sanitizedImages = await sanitizeSessionMessagesImages(params.messages, "session:history", {
-    sanitizeToolCallIds: shouldSanitizeToolCallIds(params.modelApi),
+    sanitizeToolCallIds,
+    toolCallIdMode,
     enforceToolCallLast: params.modelApi === "anthropic-messages",
     preserveSignatures: params.modelApi === "google-antigravity" && isAntigravityClaudeModel,
     sanitizeThoughtSignatures: isOpenRouterGemini
diff --git a/src/agents/tool-call-id.test.ts b/src/agents/tool-call-id.test.ts
index a76fa93d7..897bdf512 100644
--- a/src/agents/tool-call-id.test.ts
+++ b/src/agents/tool-call-id.test.ts
@@ -30,9 +30,7 @@ describe("sanitizeToolCallIdsForCloudCodeAssist", () => {
       const input = [
         {
           role: "assistant",
-          content: [
-            { type: "toolCall", id: "call|item:123", name: "read", arguments: {} },
-          ],
+          content: [{ type: "toolCall", id: "call|item:123", name: "read", arguments: {} }],
         },
         {
           role: "toolResult",
@@ -141,13 +139,18 @@ describe("sanitizeToolCallIdsForCloudCodeAssist", () => {
     });
   });
 
-  describe("strict mode (for Mistral/OpenRouter)", () => {
+  describe("strict mode (alphanumeric only)", () => {
     it("strips underscores and hyphens from tool call IDs", () => {
       const input = [
         {
           role: "assistant",
           content: [
-            { type: "toolCall", id: "whatsapp_login_1768799841527_1", name: "login", arguments: {} },
+            {
+              type: "toolCall",
+              id: "whatsapp_login_1768799841527_1",
+              name: "login",
+              arguments: {},
+            },
           ],
         },
         {
@@ -216,4 +219,50 @@ describe("sanitizeToolCallIdsForCloudCodeAssist", () => {
       expect(r2.toolCallId).toBe(b.id);
     });
   });
+
+  describe("strict9 mode (Mistral tool call IDs)", () => {
+    it("enforces alphanumeric IDs with length 9", () => {
+      const input = [
+        {
+          role: "assistant",
+          content: [
+            { type: "toolCall", id: "call_abc|item:123", name: "read", arguments: {} },
+            { type: "toolCall", id: "call_abc|item:456", name: "read", arguments: {} },
+          ],
+        },
+        {
+          role: "toolResult",
+          toolCallId: "call_abc|item:123",
+          toolName: "read",
+          content: [{ type: "text", text: "one" }],
+        },
+        {
+          role: "toolResult",
+          toolCallId: "call_abc|item:456",
+          toolName: "read",
+          content: [{ type: "text", text: "two" }],
+        },
+      ] satisfies AgentMessage[];
+
+      const out = sanitizeToolCallIdsForCloudCodeAssist(input, "strict9");
+      expect(out).not.toBe(input);
+
+      const assistant = out[0] as Extract<AgentMessage, { role: "assistant" }>;
+      const a = assistant.content?.[0] as { id?: string };
+      const b = assistant.content?.[1] as { id?: string };
+
+      expect(typeof a.id).toBe("string");
+      expect(typeof b.id).toBe("string");
+      expect(a.id).not.toBe(b.id);
+      expect(a.id?.length).toBe(9);
+      expect(b.id?.length).toBe(9);
+      expect(isValidCloudCodeAssistToolId(a.id as string, "strict9")).toBe(true);
+      expect(isValidCloudCodeAssistToolId(b.id as string, "strict9")).toBe(true);
+
+      const r1 = out[1] as Extract<AgentMessage, { role: "toolResult" }>;
+      const r2 = out[2] as Extract<AgentMessage, { role: "toolResult" }>;
+      expect(r1.toolCallId).toBe(a.id);
+      expect(r2.toolCallId).toBe(b.id);
+    });
+  });
 });
diff --git a/src/agents/tool-call-id.ts b/src/agents/tool-call-id.ts
index c2cd892cc..d5d3cf078 100644
--- a/src/agents/tool-call-id.ts
+++ b/src/agents/tool-call-id.ts
@@ -2,50 +2,76 @@ import { createHash } from "node:crypto";
 
 import type { AgentMessage } from "@mariozechner/pi-agent-core";
 
-export type ToolCallIdMode = "standard" | "strict";
+export type ToolCallIdMode = "standard" | "strict" | "strict9";
+
+const STRICT9_LEN = 9;
 
 /**
  * Sanitize a tool call ID to be compatible with various providers.
  *
  * - "standard" mode: allows [a-zA-Z0-9_-], better readability (default)
- * - "strict" mode: only [a-zA-Z0-9], required for Mistral via OpenRouter
+ * - "strict" mode: only [a-zA-Z0-9]
+ * - "strict9" mode: only [a-zA-Z0-9], length 9 (Mistral tool call requirement)
  */
 export function sanitizeToolCallId(id: string, mode: ToolCallIdMode = "standard"): string {
   if (!id || typeof id !== "string") {
+    if (mode === "strict9") return "defaultid";
     return mode === "strict" ? "defaulttoolid" : "default_tool_id";
   }
 
   if (mode === "strict") {
-    // Some providers (e.g. Mistral via OpenRouter) require strictly alphanumeric tool call IDs.
+    // Some providers require strictly alphanumeric tool call IDs.
     const alphanumericOnly = id.replace(/[^a-zA-Z0-9]/g, "");
     return alphanumericOnly.length > 0 ? alphanumericOnly : "sanitizedtoolid";
   }
 
+  if (mode === "strict9") {
+    const alphanumericOnly = id.replace(/[^a-zA-Z0-9]/g, "");
+    if (alphanumericOnly.length >= STRICT9_LEN) return alphanumericOnly.slice(0, STRICT9_LEN);
+    if (alphanumericOnly.length > 0) return shortHash(alphanumericOnly, STRICT9_LEN);
+    return shortHash("sanitized", STRICT9_LEN);
+  }
+
   // Standard mode: allow underscores and hyphens for better readability in logs
   const sanitized = id.replace(/[^a-zA-Z0-9_-]/g, "_");
   const trimmed = sanitized.replace(/^[^a-zA-Z0-9_-]+/, "");
   return trimmed.length > 0 ? trimmed : "sanitized_tool_id";
 }
 
-export function isValidCloudCodeAssistToolId(id: string, mode: ToolCallIdMode = "standard"): boolean {
+export function isValidCloudCodeAssistToolId(
+  id: string,
+  mode: ToolCallIdMode = "standard",
+): boolean {
   if (!id || typeof id !== "string") return false;
   if (mode === "strict") {
-    // Strictly alphanumeric for providers like Mistral via OpenRouter
+    // Strictly alphanumeric for providers with tighter tool ID constraints
     return /^[a-zA-Z0-9]+$/.test(id);
   }
+  if (mode === "strict9") {
+    return /^[a-zA-Z0-9]{9}$/.test(id);
+  }
   // Standard mode allows underscores and hyphens
   return /^[a-zA-Z0-9_-]+$/.test(id);
 }
 
-function shortHash(text: string): string {
-  return createHash("sha1").update(text).digest("hex").slice(0, 8);
+function shortHash(text: string, length = 8): string {
+  return createHash("sha1").update(text).digest("hex").slice(0, length);
 }
 
-function makeUniqueToolId(params: {
-  id: string;
-  used: Set<string>;
-  mode: ToolCallIdMode;
-}): string {
+function makeUniqueToolId(params: { id: string; used: Set<string>; mode: ToolCallIdMode }): string {
+  if (params.mode === "strict9") {
+    const base = sanitizeToolCallId(params.id, params.mode);
+    const candidate = base.length >= STRICT9_LEN ? base.slice(0, STRICT9_LEN) : "";
+    if (candidate && !params.used.has(candidate)) return candidate;
+
+    for (let i = 0; i < 1000; i += 1) {
+      const hashed = shortHash(`${params.id}:${i}`, STRICT9_LEN);
+      if (!params.used.has(hashed)) return hashed;
+    }
+
+    return shortHash(`${params.id}:${Date.now()}`, STRICT9_LEN);
+  }
+
   const MAX_LEN = 40;
 
   const base = sanitizeToolCallId(params.id, params.mode).slice(0, MAX_LEN);
@@ -128,14 +154,15 @@ function rewriteToolResultIds(params: {
  * Sanitize tool call IDs for provider compatibility.
  *
  * @param messages - The messages to sanitize
- * @param mode - "standard" (default, allows _-) or "strict" (alphanumeric only for Mistral/OpenRouter)
+ * @param mode - "standard" (default, allows _-), "strict" (alphanumeric only), or "strict9" (alphanumeric length 9)
  */
 export function sanitizeToolCallIdsForCloudCodeAssist(
   messages: AgentMessage[],
   mode: ToolCallIdMode = "standard",
 ): AgentMessage[] {
   // Standard mode: allows [a-zA-Z0-9_-] for better readability in session logs
-  // Strict mode: only [a-zA-Z0-9] for providers like Mistral via OpenRouter
+  // Strict mode: only [a-zA-Z0-9]
+  // Strict9 mode: only [a-zA-Z0-9], length 9 (Mistral tool call requirement)
   // Sanitization can introduce collisions (e.g. `a|b` and `a:b` -> `a_b` or `ab`).
   // Fix by applying a stable, transcript-wide mapping and de-duping via suffix.
   const map = new Map<string, string>();
diff --git a/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts b/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
index 45a994432..2b42977cb 100644
--- a/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
@@ -60,7 +60,7 @@ describe("directive behavior", () => {
     vi.restoreAllMocks();
   });
 
-  it("lists allowlisted models on /model list", async () => {
+  it("moves /model list to /models", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       const storePath = path.join(home, "sessions.json");
@@ -90,7 +90,7 @@ describe("directive behavior", () => {
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
-  it("falls back to configured models when catalog is unavailable", async () => {
+  it("shows summary on /model when catalog is unavailable", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       vi.mocked(loadModelCatalog).mockResolvedValueOnce([]);
@@ -116,12 +116,13 @@ describe("directive behavior", () => {
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
       expect(text).toContain("Current: anthropic/claude-opus-4-5");
+      expect(text).toContain("Switch: /model <provider/model>");
       expect(text).toContain("Browse: /models (providers) or /models <provider> (models)");
       expect(text).toContain("More: /model status");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
-  it("includes catalog models when no allowlist is set", async () => {
+  it("moves /model list to /models even when no allowlist is set", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       vi.mocked(loadModelCatalog).mockResolvedValueOnce([
@@ -156,7 +157,7 @@ describe("directive behavior", () => {
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
-  it("merges config allowlist models even when catalog is present", async () => {
+  it("moves /model list to /models even when catalog is present", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       // Catalog present but missing custom providers: /model should still include
@@ -207,7 +208,7 @@ describe("directive behavior", () => {
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
-  it("does not repeat missing auth labels on /model list", async () => {
+  it("moves /model list to /models without listing auth labels", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       const storePath = path.join(home, "sessions.json");
@@ -231,6 +232,8 @@ describe("directive behavior", () => {
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
       expect(text).toContain("Model listing moved.");
+      expect(text).toContain("Use: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("Switch: /model <provider/model>");
       expect(text).not.toContain("missing (missing)");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
diff --git a/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts b/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts
index e42ced2db..271027882 100644
--- a/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts
@@ -67,7 +67,7 @@ describe("directive behavior", () => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       const storePath = path.join(home, "sessions.json");
 
-      await getReplyFromConfig(
+      const res = await getReplyFromConfig(
         { Body: "/model ki", From: "+1222", To: "+1222", CommandAuthorized: true },
         {},
         {
@@ -103,10 +103,11 @@ describe("directive behavior", () => {
         },
       );
 
-      assertModelSelection(storePath, {
-        model: "kimi-k2-0905-preview",
-        provider: "moonshot",
-      });
+      const text = Array.isArray(res) ? res[0]?.text : res?.text;
+      expect(text).toContain("Unrecognized model: ki");
+      expect(text).toContain("Did you mean: moonshot/kimi-k2-0905-preview");
+      expect(text).toContain("Try: /model moonshot/kimi-k2-0905-preview");
+      assertModelSelection(storePath);
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
diff --git a/src/auto-reply/reply.directive.directive-behavior.supports-fuzzy-model-matches-model-directive.test.ts b/src/auto-reply/reply.directive.directive-behavior.supports-fuzzy-model-matches-model-directive.test.ts
index c78919f97..cc7f54b22 100644
--- a/src/auto-reply/reply.directive.directive-behavior.supports-fuzzy-model-matches-model-directive.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.supports-fuzzy-model-matches-model-directive.test.ts
@@ -65,7 +65,7 @@ describe("directive behavior", () => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       const storePath = path.join(home, "sessions.json");
 
-      await getReplyFromConfig(
+      const res = await getReplyFromConfig(
         { Body: "/model kimi", From: "+1222", To: "+1222", CommandAuthorized: true },
         {},
         {
@@ -94,10 +94,11 @@ describe("directive behavior", () => {
         },
       );
 
-      assertModelSelection(storePath, {
-        model: "kimi-k2-0905-preview",
-        provider: "moonshot",
-      });
+      const text = Array.isArray(res) ? res[0]?.text : res?.text;
+      expect(text).toContain("Unrecognized model: kimi");
+      expect(text).toContain("Did you mean: moonshot/kimi-k2-0905-preview");
+      expect(text).toContain("Try: /model moonshot/kimi-k2-0905-preview");
+      assertModelSelection(storePath);
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -106,7 +107,7 @@ describe("directive behavior", () => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       const storePath = path.join(home, "sessions.json");
 
-      await getReplyFromConfig(
+      const res = await getReplyFromConfig(
         {
           Body: "/model kimi-k2-0905-preview",
           From: "+1222",
@@ -140,10 +141,11 @@ describe("directive behavior", () => {
         },
       );
 
-      assertModelSelection(storePath, {
-        model: "kimi-k2-0905-preview",
-        provider: "moonshot",
-      });
+      const text = Array.isArray(res) ? res[0]?.text : res?.text;
+      expect(text).toContain("Unrecognized model: kimi-k2-0905-preview");
+      expect(text).toContain("Did you mean: moonshot/kimi-k2-0905-preview");
+      expect(text).toContain("Try: /model moonshot/kimi-k2-0905-preview");
+      assertModelSelection(storePath);
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -152,7 +154,7 @@ describe("directive behavior", () => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       const storePath = path.join(home, "sessions.json");
 
-      await getReplyFromConfig(
+      const res = await getReplyFromConfig(
         { Body: "/model moonshot/kimi", From: "+1222", To: "+1222", CommandAuthorized: true },
         {},
         {
@@ -181,10 +183,11 @@ describe("directive behavior", () => {
         },
       );
 
-      assertModelSelection(storePath, {
-        model: "kimi-k2-0905-preview",
-        provider: "moonshot",
-      });
+      const text = Array.isArray(res) ? res[0]?.text : res?.text;
+      expect(text).toContain("Unrecognized model: moonshot/kimi");
+      expect(text).toContain("Did you mean: moonshot/kimi-k2-0905-preview");
+      expect(text).toContain("Try: /model moonshot/kimi-k2-0905-preview");
+      assertModelSelection(storePath);
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
diff --git a/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts b/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
index c271adef3..c3d6a5fdd 100644
--- a/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
@@ -187,7 +187,7 @@ describe("directive behavior", () => {
       expect(runEmbeddedPiAgent).toHaveBeenCalledOnce();
     });
   });
-  it("lists allowlisted models on /model", async () => {
+  it("shows summary on /model", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       const storePath = path.join(home, "sessions.json");
@@ -212,6 +212,7 @@ describe("directive behavior", () => {
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
       expect(text).toContain("Current: anthropic/claude-opus-4-5");
+      expect(text).toContain("Switch: /model <provider/model>");
       expect(text).toContain("Browse: /models (providers) or /models <provider> (models)");
       expect(text).toContain("More: /model status");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();

From 1092b30531416ad3550af6a8dc5e31f858b6c9bc Mon Sep 17 00:00:00 2001
From: Nimrod Gutman <nimrod.g@singular.net>
Date: Wed, 21 Jan 2026 20:31:12 +0200
Subject: [PATCH 080/171] fix(node): handle invoke approvals and errors

---
 .../Clawdbot/NodeMode/MacNodeRuntime.swift    | 58 +++++++++++++++++--
 .../Sources/ClawdbotKit/GatewayChannel.swift  |  9 ++-
 .../ClawdbotKit/GatewayNodeSession.swift      |  4 +-
 .../Sources/ClawdbotKit/SystemCommands.swift  |  5 +-
 4 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift b/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift
index 16f340415..ae8d87136 100644
--- a/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift
+++ b/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift
@@ -486,8 +486,10 @@ actor MacNodeRuntime {
             return false
         }()
 
-        let approvedByAsk = params.approved == true
-        if requiresAsk, !approvedByAsk {
+        let decisionFromParams = Self.parseApprovalDecision(params.approvalDecision)
+        var approvedByAsk = params.approved == true || decisionFromParams != nil
+        var persistAllowlist = decisionFromParams == .allowAlways
+        if decisionFromParams == .deny {
             await self.emitExecEvent(
                 "exec.denied",
                 payload: ExecEventPayload(
@@ -495,11 +497,53 @@ actor MacNodeRuntime {
                     runId: runId,
                     host: "node",
                     command: displayCommand,
-                    reason: "approval-required"))
+                    reason: "user-denied"))
             return Self.errorResponse(
                 req,
                 code: .unavailable,
-                message: "SYSTEM_RUN_DENIED: approval required")
+                message: "SYSTEM_RUN_DENIED: user denied")
+        }
+        if requiresAsk, !approvedByAsk {
+            let decision = await MainActor.run {
+                ExecApprovalsPromptPresenter.prompt(
+                    ExecApprovalPromptRequest(
+                        command: displayCommand,
+                        cwd: params.cwd,
+                        host: "node",
+                        security: security.rawValue,
+                        ask: ask.rawValue,
+                        agentId: agentId,
+                        resolvedPath: resolution?.resolvedPath))
+            }
+            switch decision {
+            case .deny:
+                await self.emitExecEvent(
+                    "exec.denied",
+                    payload: ExecEventPayload(
+                        sessionKey: sessionKey,
+                        runId: runId,
+                        host: "node",
+                        command: displayCommand,
+                        reason: "user-denied"))
+                return Self.errorResponse(
+                    req,
+                    code: .unavailable,
+                    message: "SYSTEM_RUN_DENIED: user denied")
+            case .allowAlways:
+                approvedByAsk = true
+                persistAllowlist = true
+            case .allowOnce:
+                approvedByAsk = true
+            }
+        }
+        if persistAllowlist, security == .allowlist {
+            let pattern = resolution?.resolvedPath
+                ?? resolution?.rawExecutable
+                ?? command.first
+                ?? ""
+            if !pattern.isEmpty {
+                ExecApprovalsStore.addAllowlistEntry(agentId: agentId, pattern: pattern)
+            }
         }
 
         if security == .allowlist, allowlistMatch == nil, !skillAllow, !approvedByAsk {
@@ -763,6 +807,12 @@ extension MacNodeRuntime {
         UserDefaults.standard.object(forKey: cameraEnabledKey) as? Bool ?? false
     }
 
+    private static func parseApprovalDecision(_ raw: String?) -> ExecApprovalDecision? {
+        let trimmed = raw?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        guard !trimmed.isEmpty else { return nil }
+        return ExecApprovalDecision(rawValue: trimmed)
+    }
+
     private static let blockedEnvKeys: Set<String> = [
         "PATH",
         "NODE_OPTIONS",
diff --git a/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayChannel.swift b/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayChannel.swift
index 813af5c0a..90a19a64b 100644
--- a/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayChannel.swift
+++ b/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayChannel.swift
@@ -571,7 +571,14 @@ public actor GatewayChannelActor {
             id: id,
             method: method,
             params: paramsObject)
-        let data = try self.encoder.encode(frame)
+        let data: Data
+        do {
+            data = try self.encoder.encode(frame)
+        } catch {
+            self.logger.error(
+                "gateway request encode failed \(method, privacy: .public) error=\(error.localizedDescription, privacy: .public)")
+            throw error
+        }
         let response = try await withCheckedThrowingContinuation { (cont: CheckedContinuation<GatewayFrame, Error>) in
             self.pending[id] = cont
             Task { [weak self] in
diff --git a/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayNodeSession.swift b/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayNodeSession.swift
index 2cc26a51d..a2ac2ad6d 100644
--- a/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayNodeSession.swift
+++ b/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayNodeSession.swift
@@ -219,8 +219,8 @@ public actor GatewayNodeSession {
         }
         if let error = response.error {
             params["error"] = AnyCodable([
-                "code": AnyCodable(error.code.rawValue),
-                "message": AnyCodable(error.message),
+                "code": error.code.rawValue,
+                "message": error.message,
             ])
         }
         do {
diff --git a/apps/shared/ClawdbotKit/Sources/ClawdbotKit/SystemCommands.swift b/apps/shared/ClawdbotKit/Sources/ClawdbotKit/SystemCommands.swift
index 89857da9d..bfe980f41 100644
--- a/apps/shared/ClawdbotKit/Sources/ClawdbotKit/SystemCommands.swift
+++ b/apps/shared/ClawdbotKit/Sources/ClawdbotKit/SystemCommands.swift
@@ -30,6 +30,7 @@ public struct ClawdbotSystemRunParams: Codable, Sendable, Equatable {
     public var agentId: String?
     public var sessionKey: String?
     public var approved: Bool?
+    public var approvalDecision: String?
 
     public init(
         command: [String],
@@ -40,7 +41,8 @@ public struct ClawdbotSystemRunParams: Codable, Sendable, Equatable {
         needsScreenRecording: Bool? = nil,
         agentId: String? = nil,
         sessionKey: String? = nil,
-        approved: Bool? = nil)
+        approved: Bool? = nil,
+        approvalDecision: String? = nil)
     {
         self.command = command
         self.rawCommand = rawCommand
@@ -51,6 +53,7 @@ public struct ClawdbotSystemRunParams: Codable, Sendable, Equatable {
         self.agentId = agentId
         self.sessionKey = sessionKey
         self.approved = approved
+        self.approvalDecision = approvalDecision
     }
 }
 

From 4997a5b93f0f8dd35a84db12e8f88fd79b6be2ad Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 00:43:21 +0000
Subject: [PATCH 081/171] fix: improve macOS exec approvals

---
 CHANGELOG.md                                  |  1 +
 .../Sources/Clawdbot/ExecApprovals.swift      | 24 ++++++++
 .../Clawdbot/ExecApprovalsSocket.swift        | 26 ++------
 .../Clawdbot/NodeMode/MacNodeRuntime.swift    | 30 ++++------
 .../ExecApprovalHelpersTests.swift            | 60 +++++++++++++++++++
 5 files changed, 100 insertions(+), 41 deletions(-)
 create mode 100644 apps/macos/Tests/ClawdbotIPCTests/ExecApprovalHelpersTests.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8259f93ae..222ba1dac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ Docs: https://docs.clawd.bot
 - **BREAKING:** Control UI now rejects insecure HTTP without device identity by default. Use HTTPS (Tailscale Serve) or set `gateway.controlUi.allowInsecureAuth: true` to allow token-only auth. https://docs.clawd.bot/web/control-ui#insecure-http
 
 ### Fixes
+- Nodes/macOS: prompt on allowlist miss for node exec approvals, persist allowlist decisions, and flatten node invoke errors. (#1394) Thanks @ngutman.
 - Gateway: keep auto bind loopback-first and add explicit tailnet binding to avoid Tailscale taking over local UI. (#1380)
 - Embedded runner: persist injected history images so attachments aren’t reloaded each turn. (#1374) Thanks @Nicell.
 - Nodes tool: include agent/node/gateway context in tool failure logs to speed approval debugging.
diff --git a/apps/macos/Sources/Clawdbot/ExecApprovals.swift b/apps/macos/Sources/Clawdbot/ExecApprovals.swift
index 15a0eeb71..122176592 100644
--- a/apps/macos/Sources/Clawdbot/ExecApprovals.swift
+++ b/apps/macos/Sources/Clawdbot/ExecApprovals.swift
@@ -554,6 +554,30 @@ enum ExecCommandFormatter {
     }
 }
 
+enum ExecApprovalHelpers {
+    static func parseDecision(_ raw: String?) -> ExecApprovalDecision? {
+        let trimmed = raw?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        guard !trimmed.isEmpty else { return nil }
+        return ExecApprovalDecision(rawValue: trimmed)
+    }
+
+    static func requiresAsk(
+        ask: ExecAsk,
+        security: ExecSecurity,
+        allowlistMatch: ExecAllowlistEntry?,
+        skillAllow: Bool) -> Bool
+    {
+        if ask == .always { return true }
+        if ask == .onMiss, security == .allowlist, allowlistMatch == nil, !skillAllow { return true }
+        return false
+    }
+
+    static func allowlistPattern(command: [String], resolution: ExecCommandResolution?) -> String? {
+        let pattern = resolution?.resolvedPath ?? resolution?.rawExecutable ?? command.first ?? ""
+        return pattern.isEmpty ? nil : pattern
+    }
+}
+
 enum ExecAllowlistMatcher {
     static func match(entries: [ExecAllowlistEntry], resolution: ExecCommandResolution?) -> ExecAllowlistEntry? {
         guard let resolution, !entries.isEmpty else { return nil }
diff --git a/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift b/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift
index 268d155a0..dcbc0a9bb 100644
--- a/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift
+++ b/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift
@@ -314,7 +314,7 @@ private enum ExecHostExecutor {
         }
 
         var approvedByAsk = approvalDecision != nil
-        if self.requiresAsk(
+        if ExecApprovalHelpers.requiresAsk(
             ask: context.ask,
             security: context.security,
             allowlistMatch: context.allowlistMatch,
@@ -417,36 +417,20 @@ private enum ExecHostExecutor {
             skillAllow: skillAllow)
     }
 
-    private static func requiresAsk(
-        ask: ExecAsk,
-        security: ExecSecurity,
-        allowlistMatch: ExecAllowlistEntry?,
-        skillAllow: Bool) -> Bool
-    {
-        if ask == .always { return true }
-        if ask == .onMiss, security == .allowlist, allowlistMatch == nil, !skillAllow { return true }
-        return false
-    }
-
     private static func persistAllowlistEntry(
         decision: ExecApprovalDecision?,
         context: ExecApprovalContext)
     {
         guard decision == .allowAlways, context.security == .allowlist else { return }
-        guard let pattern = self.allowlistPattern(command: context.command, resolution: context.resolution) else {
+        guard let pattern = ExecApprovalHelpers.allowlistPattern(
+            command: context.command,
+            resolution: context.resolution)
+        else {
             return
         }
         ExecApprovalsStore.addAllowlistEntry(agentId: context.trimmedAgent, pattern: pattern)
     }
 
-    private static func allowlistPattern(
-        command: [String],
-        resolution: ExecCommandResolution?) -> String?
-    {
-        let pattern = resolution?.resolvedPath ?? resolution?.rawExecutable ?? command.first ?? ""
-        return pattern.isEmpty ? nil : pattern
-    }
-
     private static func ensureScreenRecordingAccess(_ needsScreenRecording: Bool?) async -> ExecHostResponse? {
         guard needsScreenRecording == true else { return nil }
         let authorized = await PermissionManager
diff --git a/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift b/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift
index ae8d87136..8c6f3f776 100644
--- a/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift
+++ b/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift
@@ -480,13 +480,13 @@ actor MacNodeRuntime {
                 message: "SYSTEM_RUN_DISABLED: security=deny")
         }
 
-        let requiresAsk: Bool = {
-            if ask == .always { return true }
-            if ask == .onMiss, security == .allowlist, allowlistMatch == nil, !skillAllow { return true }
-            return false
-        }()
+        let requiresAsk = ExecApprovalHelpers.requiresAsk(
+            ask: ask,
+            security: security,
+            allowlistMatch: allowlistMatch,
+            skillAllow: skillAllow)
 
-        let decisionFromParams = Self.parseApprovalDecision(params.approvalDecision)
+        let decisionFromParams = ExecApprovalHelpers.parseDecision(params.approvalDecision)
         var approvedByAsk = params.approved == true || decisionFromParams != nil
         var persistAllowlist = decisionFromParams == .allowAlways
         if decisionFromParams == .deny {
@@ -536,14 +536,10 @@ actor MacNodeRuntime {
                 approvedByAsk = true
             }
         }
-        if persistAllowlist, security == .allowlist {
-            let pattern = resolution?.resolvedPath
-                ?? resolution?.rawExecutable
-                ?? command.first
-                ?? ""
-            if !pattern.isEmpty {
-                ExecApprovalsStore.addAllowlistEntry(agentId: agentId, pattern: pattern)
-            }
+        if persistAllowlist, security == .allowlist,
+           let pattern = ExecApprovalHelpers.allowlistPattern(command: command, resolution: resolution)
+        {
+            ExecApprovalsStore.addAllowlistEntry(agentId: agentId, pattern: pattern)
         }
 
         if security == .allowlist, allowlistMatch == nil, !skillAllow, !approvedByAsk {
@@ -807,12 +803,6 @@ extension MacNodeRuntime {
         UserDefaults.standard.object(forKey: cameraEnabledKey) as? Bool ?? false
     }
 
-    private static func parseApprovalDecision(_ raw: String?) -> ExecApprovalDecision? {
-        let trimmed = raw?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        guard !trimmed.isEmpty else { return nil }
-        return ExecApprovalDecision(rawValue: trimmed)
-    }
-
     private static let blockedEnvKeys: Set<String> = [
         "PATH",
         "NODE_OPTIONS",
diff --git a/apps/macos/Tests/ClawdbotIPCTests/ExecApprovalHelpersTests.swift b/apps/macos/Tests/ClawdbotIPCTests/ExecApprovalHelpersTests.swift
new file mode 100644
index 000000000..a1774d49f
--- /dev/null
+++ b/apps/macos/Tests/ClawdbotIPCTests/ExecApprovalHelpersTests.swift
@@ -0,0 +1,60 @@
+import Foundation
+import Testing
+@testable import Clawdbot
+
+@Suite struct ExecApprovalHelpersTests {
+    @Test func parseDecisionTrimsAndRejectsInvalid() {
+        #expect(ExecApprovalHelpers.parseDecision("allow-once") == .allowOnce)
+        #expect(ExecApprovalHelpers.parseDecision(" allow-always ") == .allowAlways)
+        #expect(ExecApprovalHelpers.parseDecision("deny") == .deny)
+        #expect(ExecApprovalHelpers.parseDecision("") == nil)
+        #expect(ExecApprovalHelpers.parseDecision("nope") == nil)
+    }
+
+    @Test func allowlistPatternPrefersResolution() {
+        let resolved = ExecCommandResolution(
+            rawExecutable: "rg",
+            resolvedPath: "/opt/homebrew/bin/rg",
+            executableName: "rg",
+            cwd: nil)
+        #expect(ExecApprovalHelpers.allowlistPattern(command: ["rg"], resolution: resolved) == resolved.resolvedPath)
+
+        let rawOnly = ExecCommandResolution(
+            rawExecutable: "rg",
+            resolvedPath: nil,
+            executableName: "rg",
+            cwd: nil)
+        #expect(ExecApprovalHelpers.allowlistPattern(command: ["rg"], resolution: rawOnly) == "rg")
+        #expect(ExecApprovalHelpers.allowlistPattern(command: ["rg"], resolution: nil) == "rg")
+        #expect(ExecApprovalHelpers.allowlistPattern(command: [], resolution: nil) == nil)
+    }
+
+    @Test func requiresAskMatchesPolicy() {
+        let entry = ExecAllowlistEntry(pattern: "/bin/ls", lastUsedAt: nil, lastUsedCommand: nil, lastResolvedPath: nil)
+        #expect(ExecApprovalHelpers.requiresAsk(
+            ask: .always,
+            security: .deny,
+            allowlistMatch: nil,
+            skillAllow: false))
+        #expect(ExecApprovalHelpers.requiresAsk(
+            ask: .onMiss,
+            security: .allowlist,
+            allowlistMatch: nil,
+            skillAllow: false))
+        #expect(!ExecApprovalHelpers.requiresAsk(
+            ask: .onMiss,
+            security: .allowlist,
+            allowlistMatch: entry,
+            skillAllow: false))
+        #expect(!ExecApprovalHelpers.requiresAsk(
+            ask: .onMiss,
+            security: .allowlist,
+            allowlistMatch: nil,
+            skillAllow: true))
+        #expect(!ExecApprovalHelpers.requiresAsk(
+            ask: .off,
+            security: .allowlist,
+            allowlistMatch: nil,
+            skillAllow: false))
+    }
+}

From 7e1a17e5e6d3f906e8aefae2808ed543b2f095e5 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 00:49:02 +0000
Subject: [PATCH 082/171] fix: unify exec approval ids

---
 docs/gateway/bridge-protocol.md               |    4 +-
 docs/tools/exec-approvals.md                  |   12 +-
 docs/tools/exec.md                            |    6 +
 .../bash-tools.exec.approval-id.test.ts       |   71 ++
 src/agents/bash-tools.exec.ts                 | 1129 +++++++++++------
 src/agents/pi-tools.ts                        |    3 +
 src/config/schema.ts                          |    1 +
 src/config/types.tools.ts                     |    2 +
 src/config/zod-schema.agent-runtime.ts        |    1 +
 src/gateway/exec-approval-manager.ts          |   10 +-
 src/gateway/protocol/schema/exec-approvals.ts |    1 +
 .../server-methods/exec-approval.test.ts      |  116 ++
 src/gateway/server-methods/exec-approval.ts   |   12 +-
 src/node-host/runner.ts                       |   14 +-
 14 files changed, 966 insertions(+), 416 deletions(-)
 create mode 100644 src/agents/bash-tools.exec.approval-id.test.ts

diff --git a/docs/gateway/bridge-protocol.md b/docs/gateway/bridge-protocol.md
index 1e43ccc75..47ff09b4d 100644
--- a/docs/gateway/bridge-protocol.md
+++ b/docs/gateway/bridge-protocol.md
@@ -58,8 +58,8 @@ Exact allowlist is enforced in `src/gateway/server-bridge.ts`.
 
 ## Exec lifecycle events
 
-Nodes can emit `exec.started`, `exec.finished`, or `exec.denied` events to surface
-system.run activity. These are mapped to system events in the gateway.
+Nodes can emit `exec.finished` or `exec.denied` events to surface system.run activity.
+These are mapped to system events in the gateway. (Legacy nodes may still emit `exec.started`.)
 
 Payload fields (all optional unless noted):
 - `sessionKey` (required): agent session to receive the system event.
diff --git a/docs/tools/exec-approvals.md b/docs/tools/exec-approvals.md
index b96273664..517b73fbe 100644
--- a/docs/tools/exec-approvals.md
+++ b/docs/tools/exec-approvals.md
@@ -134,6 +134,10 @@ When a prompt is required, the gateway broadcasts `exec.approval.requested` to o
 The Control UI and macOS app resolve it via `exec.approval.resolve`, then the gateway forwards the
 approved request to the node host.
 
+When approvals are required, the exec tool returns immediately with an approval id. Use that id to
+correlate later system events (`Exec finished` / `Exec denied`). If no decision arrives before the
+timeout, the request is treated as an approval timeout and surfaced as a denial reason.
+
 The confirmation dialog includes:
 - command + args
 - cwd
@@ -162,11 +166,13 @@ Security notes:
 ## System events
 
 Exec lifecycle is surfaced as system messages:
-- `exec.started`
-- `exec.finished`
-- `exec.denied`
+- `Exec running` (only if the command exceeds the running notice threshold)
+- `Exec finished`
+- `Exec denied`
 
 These are posted to the agent’s session after the node reports the event.
+Gateway-host exec approvals emit the same lifecycle events when the command finishes (and optionally when running longer than the threshold).
+Approval-gated execs reuse the approval id as the `runId` in these messages for easy correlation.
 
 ## Implications
 
diff --git a/docs/tools/exec.md b/docs/tools/exec.md
index 3a4f8297f..b5c53593c 100644
--- a/docs/tools/exec.md
+++ b/docs/tools/exec.md
@@ -38,6 +38,7 @@ Notes:
 ## Config
 
 - `tools.exec.notifyOnExit` (default: true): when true, backgrounded exec sessions enqueue a system event and request a heartbeat on exit.
+- `tools.exec.approvalRunningNoticeMs` (default: 10000): emit a single “running” notice when an approval-gated exec runs longer than this (0 disables).
 - `tools.exec.host` (default: `sandbox`)
 - `tools.exec.security` (default: `deny` for sandbox, `allowlist` for gateway + node when unset)
 - `tools.exec.ask` (default: `on-miss`)
@@ -92,6 +93,11 @@ Example:
 Sandboxed agents can require per-request approval before `exec` runs on the gateway or node host.
 See [Exec approvals](/tools/exec-approvals) for the policy, allowlist, and UI flow.
 
+When approvals are required, the exec tool returns immediately with
+`status: "approval-pending"` and an approval id. Once approved (or denied / timed out),
+the Gateway emits system events (`Exec finished` / `Exec denied`). If the command is still
+running after `tools.exec.approvalRunningNoticeMs`, a single `Exec running` notice is emitted.
+
 ## Allowlist + safe bins
 
 Allowlist enforcement matches **resolved binary paths only** (no basename matches). When
diff --git a/src/agents/bash-tools.exec.approval-id.test.ts b/src/agents/bash-tools.exec.approval-id.test.ts
new file mode 100644
index 000000000..54f6d7150
--- /dev/null
+++ b/src/agents/bash-tools.exec.approval-id.test.ts
@@ -0,0 +1,71 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("./tools/gateway.js", () => ({
+  callGatewayTool: vi.fn(),
+}));
+
+vi.mock("./tools/nodes-utils.js", () => ({
+  listNodes: vi.fn(async () => [
+    { nodeId: "node-1", commands: ["system.run"], platform: "darwin" },
+  ]),
+  resolveNodeIdFromList: vi.fn((nodes: Array<{ nodeId: string }>) => nodes[0]?.nodeId),
+}));
+
+describe("exec approvals", () => {
+  let previousHome: string | undefined;
+
+  beforeEach(async () => {
+    previousHome = process.env.HOME;
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-test-"));
+    process.env.HOME = tempDir;
+  });
+
+  afterEach(() => {
+    vi.resetAllMocks();
+    if (previousHome === undefined) {
+      delete process.env.HOME;
+    } else {
+      process.env.HOME = previousHome;
+    }
+  });
+
+  it("reuses approval id as the node runId", async () => {
+    const { callGatewayTool } = await import("./tools/gateway.js");
+    let invokeParams: unknown;
+    let resolveInvoke: (() => void) | undefined;
+    const invokeSeen = new Promise<void>((resolve) => {
+      resolveInvoke = resolve;
+    });
+
+    vi.mocked(callGatewayTool).mockImplementation(async (method, _opts, params) => {
+      if (method === "exec.approval.request") {
+        return { decision: "allow-once" };
+      }
+      if (method === "node.invoke") {
+        invokeParams = params;
+        resolveInvoke?.();
+        return { ok: true };
+      }
+      return { ok: true };
+    });
+
+    const { createExecTool } = await import("./bash-tools.exec.js");
+    const tool = createExecTool({
+      host: "node",
+      ask: "always",
+      approvalRunningNoticeMs: 0,
+    });
+
+    const result = await tool.execute("call1", { command: "ls -la" });
+    expect(result.details.status).toBe("approval-pending");
+    const approvalId = (result.details as { approvalId: string }).approvalId;
+
+    await invokeSeen;
+
+    const runId = (invokeParams as { params?: { runId?: string } } | undefined)?.params?.runId;
+    expect(runId).toBe(approvalId);
+  });
+});
diff --git a/src/agents/bash-tools.exec.ts b/src/agents/bash-tools.exec.ts
index b13003d8b..32655f6a9 100644
--- a/src/agents/bash-tools.exec.ts
+++ b/src/agents/bash-tools.exec.ts
@@ -70,6 +70,10 @@ const DEFAULT_PENDING_MAX_OUTPUT = clampNumber(
 const DEFAULT_PATH =
   process.env.PATH ?? "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
 const DEFAULT_NOTIFY_TAIL_CHARS = 400;
+const DEFAULT_APPROVAL_TIMEOUT_MS = 120_000;
+const DEFAULT_APPROVAL_REQUEST_TIMEOUT_MS = 130_000;
+const DEFAULT_APPROVAL_RUNNING_NOTICE_MS = 10_000;
+const APPROVAL_SLUG_LENGTH = 8;
 
 type PtyExitEvent = { exitCode: number; signal?: number };
 type PtyListener<T> = (event: T) => void;
@@ -91,6 +95,24 @@ type PtySpawn = (
   },
 ) => PtyHandle;
 
+type ExecProcessOutcome = {
+  status: "completed" | "failed";
+  exitCode: number | null;
+  exitSignal: NodeJS.Signals | number | null;
+  durationMs: number;
+  aggregated: string;
+  timedOut: boolean;
+  reason?: string;
+};
+
+type ExecProcessHandle = {
+  session: ProcessSession;
+  startedAt: number;
+  pid?: number;
+  promise: Promise<ExecProcessOutcome>;
+  kill: () => void;
+};
+
 export type ExecToolDefaults = {
   host?: ExecHost;
   security?: ExecSecurity;
@@ -101,6 +123,7 @@ export type ExecToolDefaults = {
   agentId?: string;
   backgroundMs?: number;
   timeoutSec?: number;
+  approvalRunningNoticeMs?: number;
   sandbox?: BashSandboxConfig;
   elevated?: ExecElevatedDefaults;
   allowBackground?: boolean;
@@ -182,6 +205,16 @@ export type ExecToolDetails =
       durationMs: number;
       aggregated: string;
       cwd?: string;
+    }
+  | {
+      status: "approval-pending";
+      approvalId: string;
+      approvalSlug: string;
+      expiresAtMs: number;
+      host: ExecHost;
+      command: string;
+      cwd?: string;
+      nodeId?: string;
     };
 
 function normalizeExecHost(value?: string | null): ExecHost | null {
@@ -286,6 +319,326 @@ function maybeNotifyOnExit(session: ProcessSession, status: "completed" | "faile
   requestHeartbeatNow({ reason: `exec:${session.id}:exit` });
 }
 
+function createApprovalSlug(id: string) {
+  return id.slice(0, APPROVAL_SLUG_LENGTH);
+}
+
+function resolveApprovalRunningNoticeMs(value?: number) {
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    return DEFAULT_APPROVAL_RUNNING_NOTICE_MS;
+  }
+  if (value <= 0) return 0;
+  return Math.floor(value);
+}
+
+function emitExecSystemEvent(text: string, opts: { sessionKey?: string; contextKey?: string }) {
+  const sessionKey = opts.sessionKey?.trim();
+  if (!sessionKey) return;
+  enqueueSystemEvent(text, { sessionKey, contextKey: opts.contextKey });
+  requestHeartbeatNow({ reason: "exec-event" });
+}
+
+async function runExecProcess(opts: {
+  command: string;
+  workdir: string;
+  env: Record<string, string>;
+  sandbox?: BashSandboxConfig;
+  containerWorkdir?: string | null;
+  usePty: boolean;
+  warnings: string[];
+  maxOutput: number;
+  pendingMaxOutput: number;
+  notifyOnExit: boolean;
+  scopeKey?: string;
+  sessionKey?: string;
+  timeoutSec: number;
+  onUpdate?: (partialResult: AgentToolResult<ExecToolDetails>) => void;
+}): Promise<ExecProcessHandle> {
+  const startedAt = Date.now();
+  const sessionId = createSessionSlug();
+  let child: ChildProcessWithoutNullStreams | null = null;
+  let pty: PtyHandle | null = null;
+  let stdin: SessionStdin | undefined;
+
+  if (opts.sandbox) {
+    child = spawn(
+      "docker",
+      buildDockerExecArgs({
+        containerName: opts.sandbox.containerName,
+        command: opts.command,
+        workdir: opts.containerWorkdir ?? opts.sandbox.containerWorkdir,
+        env: opts.env,
+        tty: opts.usePty,
+      }),
+      {
+        cwd: opts.workdir,
+        env: process.env,
+        detached: process.platform !== "win32",
+        stdio: ["pipe", "pipe", "pipe"],
+        windowsHide: true,
+      },
+    ) as ChildProcessWithoutNullStreams;
+    stdin = child.stdin;
+  } else if (opts.usePty) {
+    const ptyModule = (await import("@lydell/node-pty")) as unknown as {
+      spawn?: PtySpawn;
+      default?: { spawn?: PtySpawn };
+    };
+    const spawnPty = ptyModule.spawn ?? ptyModule.default?.spawn;
+    if (!spawnPty) {
+      throw new Error("PTY support is unavailable (node-pty spawn not found).");
+    }
+    const { shell, args: shellArgs } = getShellConfig();
+    pty = spawnPty(shell, [...shellArgs, opts.command], {
+      cwd: opts.workdir,
+      env: opts.env,
+      name: process.env.TERM ?? "xterm-256color",
+      cols: 120,
+      rows: 30,
+    });
+    stdin = {
+      destroyed: false,
+      write: (data, cb) => {
+        try {
+          pty?.write(data);
+          cb?.(null);
+        } catch (err) {
+          cb?.(err as Error);
+        }
+      },
+      end: () => {
+        try {
+          const eof = process.platform === "win32" ? "\x1a" : "\x04";
+          pty?.write(eof);
+        } catch {
+          // ignore EOF errors
+        }
+      },
+    };
+  } else {
+    const { shell, args: shellArgs } = getShellConfig();
+    child = spawn(shell, [...shellArgs, opts.command], {
+      cwd: opts.workdir,
+      env: opts.env,
+      detached: process.platform !== "win32",
+      stdio: ["pipe", "pipe", "pipe"],
+      windowsHide: true,
+    }) as ChildProcessWithoutNullStreams;
+    stdin = child.stdin;
+  }
+
+  const session = {
+    id: sessionId,
+    command: opts.command,
+    scopeKey: opts.scopeKey,
+    sessionKey: opts.sessionKey,
+    notifyOnExit: opts.notifyOnExit,
+    exitNotified: false,
+    child: child ?? undefined,
+    stdin,
+    pid: child?.pid ?? pty?.pid,
+    startedAt,
+    cwd: opts.workdir,
+    maxOutputChars: opts.maxOutput,
+    pendingMaxOutputChars: opts.pendingMaxOutput,
+    totalOutputChars: 0,
+    pendingStdout: [],
+    pendingStderr: [],
+    pendingStdoutChars: 0,
+    pendingStderrChars: 0,
+    aggregated: "",
+    tail: "",
+    exited: false,
+    exitCode: undefined as number | null | undefined,
+    exitSignal: undefined as NodeJS.Signals | number | null | undefined,
+    truncated: false,
+    backgrounded: false,
+  } satisfies ProcessSession;
+  addSession(session);
+
+  let settled = false;
+  let timeoutTimer: NodeJS.Timeout | null = null;
+  let timeoutFinalizeTimer: NodeJS.Timeout | null = null;
+  let timedOut = false;
+  const timeoutFinalizeMs = 1000;
+  let resolveFn: ((outcome: ExecProcessOutcome) => void) | null = null;
+
+  const settle = (outcome: ExecProcessOutcome) => {
+    if (settled) return;
+    settled = true;
+    resolveFn?.(outcome);
+  };
+
+  const finalizeTimeout = () => {
+    if (session.exited) return;
+    markExited(session, null, "SIGKILL", "failed");
+    maybeNotifyOnExit(session, "failed");
+    const aggregated = session.aggregated.trim();
+    const reason = `Command timed out after ${opts.timeoutSec} seconds`;
+    settle({
+      status: "failed",
+      exitCode: null,
+      exitSignal: "SIGKILL",
+      durationMs: Date.now() - startedAt,
+      aggregated,
+      timedOut: true,
+      reason: aggregated ? `${aggregated}\n\n${reason}` : reason,
+    });
+  };
+
+  const onTimeout = () => {
+    timedOut = true;
+    killSession(session);
+    if (!timeoutFinalizeTimer) {
+      timeoutFinalizeTimer = setTimeout(() => {
+        finalizeTimeout();
+      }, timeoutFinalizeMs);
+    }
+  };
+
+  if (opts.timeoutSec > 0) {
+    timeoutTimer = setTimeout(() => {
+      onTimeout();
+    }, opts.timeoutSec * 1000);
+  }
+
+  const emitUpdate = () => {
+    if (!opts.onUpdate) return;
+    const tailText = session.tail || session.aggregated;
+    const warningText = opts.warnings.length ? `${opts.warnings.join("\n")}\n\n` : "";
+    opts.onUpdate({
+      content: [{ type: "text", text: warningText + (tailText || "") }],
+      details: {
+        status: "running",
+        sessionId,
+        pid: session.pid ?? undefined,
+        startedAt,
+        cwd: session.cwd,
+        tail: session.tail,
+      },
+    });
+  };
+
+  const handleStdout = (data: string) => {
+    const str = sanitizeBinaryOutput(data.toString());
+    for (const chunk of chunkString(str)) {
+      appendOutput(session, "stdout", chunk);
+      emitUpdate();
+    }
+  };
+
+  const handleStderr = (data: string) => {
+    const str = sanitizeBinaryOutput(data.toString());
+    for (const chunk of chunkString(str)) {
+      appendOutput(session, "stderr", chunk);
+      emitUpdate();
+    }
+  };
+
+  if (pty) {
+    const cursorResponse = buildCursorPositionResponse();
+    pty.onData((data) => {
+      const raw = data.toString();
+      const { cleaned, requests } = stripDsrRequests(raw);
+      if (requests > 0) {
+        for (let i = 0; i < requests; i += 1) {
+          pty.write(cursorResponse);
+        }
+      }
+      handleStdout(cleaned);
+    });
+  } else if (child) {
+    child.stdout.on("data", handleStdout);
+    child.stderr.on("data", handleStderr);
+  }
+
+  const promise = new Promise<ExecProcessOutcome>((resolve) => {
+    resolveFn = resolve;
+    const handleExit = (code: number | null, exitSignal: NodeJS.Signals | number | null) => {
+      if (timeoutTimer) clearTimeout(timeoutTimer);
+      if (timeoutFinalizeTimer) clearTimeout(timeoutFinalizeTimer);
+      const durationMs = Date.now() - startedAt;
+      const wasSignal = exitSignal != null;
+      const isSuccess = code === 0 && !wasSignal && !timedOut;
+      const status: "completed" | "failed" = isSuccess ? "completed" : "failed";
+      markExited(session, code, exitSignal, status);
+      maybeNotifyOnExit(session, status);
+      if (!session.child && session.stdin) {
+        session.stdin.destroyed = true;
+      }
+
+      if (settled) return;
+      const aggregated = session.aggregated.trim();
+      if (!isSuccess) {
+        const reason = timedOut
+          ? `Command timed out after ${opts.timeoutSec} seconds`
+          : wasSignal && exitSignal
+            ? `Command aborted by signal ${exitSignal}`
+            : code === null
+              ? "Command aborted before exit code was captured"
+              : `Command exited with code ${code}`;
+        const message = aggregated ? `${aggregated}\n\n${reason}` : reason;
+        settle({
+          status: "failed",
+          exitCode: code ?? null,
+          exitSignal: exitSignal ?? null,
+          durationMs,
+          aggregated,
+          timedOut,
+          reason: message,
+        });
+        return;
+      }
+      settle({
+        status: "completed",
+        exitCode: code ?? 0,
+        exitSignal: exitSignal ?? null,
+        durationMs,
+        aggregated,
+        timedOut: false,
+      });
+    };
+
+    if (pty) {
+      pty.onExit((event) => {
+        const rawSignal = event.signal ?? null;
+        const normalizedSignal = rawSignal === 0 ? null : rawSignal;
+        handleExit(event.exitCode ?? null, normalizedSignal);
+      });
+    } else if (child) {
+      child.once("close", (code, exitSignal) => {
+        handleExit(code, exitSignal);
+      });
+
+      child.once("error", (err) => {
+        if (timeoutTimer) clearTimeout(timeoutTimer);
+        if (timeoutFinalizeTimer) clearTimeout(timeoutFinalizeTimer);
+        markExited(session, null, null, "failed");
+        maybeNotifyOnExit(session, "failed");
+        const aggregated = session.aggregated.trim();
+        const message = aggregated ? `${aggregated}\n\n${String(err)}` : String(err);
+        settle({
+          status: "failed",
+          exitCode: null,
+          exitSignal: null,
+          durationMs: Date.now() - startedAt,
+          aggregated,
+          timedOut,
+          reason: message,
+        });
+      });
+    }
+  });
+
+  return {
+    session,
+    startedAt,
+    pid: session.pid ?? undefined,
+    promise,
+    kill: () => killSession(session),
+  };
+}
+
 export function createExecTool(
   defaults?: ExecToolDefaults,
   // biome-ignore lint/suspicious/noExplicitAny: TypeBox schema type from pi-agent-core uses a different module instance.
@@ -305,6 +658,7 @@ export function createExecTool(
   const safeBins = resolveSafeBins(defaults?.safeBins);
   const notifyOnExit = defaults?.notifyOnExit !== false;
   const notifySessionKey = defaults?.sessionKey?.trim() || undefined;
+  const approvalRunningNoticeMs = resolveApprovalRunningNoticeMs(defaults?.approvalRunningNoticeMs);
 
   return {
     name: "exec",
@@ -334,8 +688,6 @@ export function createExecTool(
 
       const maxOutput = DEFAULT_MAX_OUTPUT;
       const pendingMaxOutput = DEFAULT_PENDING_MAX_OUTPUT;
-      const startedAt = Date.now();
-      const sessionId = createSessionSlug();
       const warnings: string[] = [];
       const backgroundRequested = params.background === true;
       const yieldRequested = typeof params.yieldMs === "number";
@@ -385,12 +737,7 @@ export function createExecTool(
               .join("\n"),
           );
         }
-        logInfo(
-          `exec: elevated command (${sessionId.slice(0, 8)}) ${truncateMiddle(
-            params.command,
-            120,
-          )}`,
-        );
+        logInfo(`exec: elevated command ${truncateMiddle(params.command, 120)}`);
       }
       const configuredHost = defaults?.host ?? "sandbox";
       const requestedHost = normalizeExecHost(params.host) ?? null;
@@ -431,7 +778,6 @@ export function createExecTool(
         workdir = resolveWorkdir(rawWorkdir, warnings);
       }
 
-      const { shell, args: shellArgs } = getShellConfig();
       const baseEnv = coerceEnv(process.env);
       const mergedEnv = params.env ? { ...baseEnv, ...params.env } : baseEnv;
       const env = sandbox
@@ -500,69 +846,158 @@ export function createExecTool(
           applyPathPrepend(nodeEnv, defaultPathPrepend, { requireExisting: true });
         }
         const requiresAsk = hostAsk === "always" || hostAsk === "on-miss";
-
-        let approvedByAsk = false;
-        let approvalDecision: "allow-once" | "allow-always" | null = null;
-        if (requiresAsk) {
-          const decisionResult = (await callGatewayTool(
-            "exec.approval.request",
-            { timeoutMs: 130_000 },
-            {
-              command: params.command,
+        const commandText = params.command;
+        const invokeTimeoutMs = Math.max(
+          10_000,
+          (typeof params.timeout === "number" ? params.timeout : defaultTimeoutSec) * 1000 + 5_000,
+        );
+        const buildInvokeParams = (
+          approvedByAsk: boolean,
+          approvalDecision: "allow-once" | "allow-always" | null,
+          runId?: string,
+        ) =>
+          ({
+            nodeId,
+            command: "system.run",
+            params: {
+              command: argv,
+              rawCommand: params.command,
               cwd: workdir,
-              host: "node",
-              security: hostSecurity,
-              ask: hostAsk,
+              env: nodeEnv,
+              timeoutMs: typeof params.timeout === "number" ? params.timeout * 1000 : undefined,
               agentId: defaults?.agentId,
-              resolvedPath: null,
-              sessionKey: defaults?.sessionKey ?? null,
-              timeoutMs: 120_000,
+              sessionKey: defaults?.sessionKey,
+              approved: approvedByAsk,
+              approvalDecision: approvalDecision ?? undefined,
+              runId: runId ?? undefined,
             },
-          )) as { decision?: string } | null;
-          const decision =
-            decisionResult && typeof decisionResult === "object"
-              ? (decisionResult.decision ?? null)
-              : null;
+            idempotencyKey: crypto.randomUUID(),
+          }) satisfies Record<string, unknown>;
 
-          if (decision === "deny") {
-            throw new Error("exec denied: user denied");
-          }
-          if (!decision) {
-            if (askFallback === "full") {
+        if (requiresAsk) {
+          const approvalId = crypto.randomUUID();
+          const approvalSlug = createApprovalSlug(approvalId);
+          const expiresAtMs = Date.now() + DEFAULT_APPROVAL_TIMEOUT_MS;
+          const contextKey = `exec:${approvalId}`;
+          const noticeSeconds = Math.max(1, Math.round(approvalRunningNoticeMs / 1000));
+          const warningText = warnings.length ? `${warnings.join("\n")}\n\n` : "";
+
+          void (async () => {
+            let decision: string | null = null;
+            try {
+              const decisionResult = (await callGatewayTool(
+                "exec.approval.request",
+                { timeoutMs: DEFAULT_APPROVAL_REQUEST_TIMEOUT_MS },
+                {
+                  id: approvalId,
+                  command: commandText,
+                  cwd: workdir,
+                  host: "node",
+                  security: hostSecurity,
+                  ask: hostAsk,
+                  agentId: defaults?.agentId,
+                  resolvedPath: null,
+                  sessionKey: defaults?.sessionKey ?? null,
+                  timeoutMs: DEFAULT_APPROVAL_TIMEOUT_MS,
+                },
+              )) as { decision?: string } | null;
+              decision =
+                decisionResult && typeof decisionResult === "object"
+                  ? (decisionResult.decision ?? null)
+                  : null;
+            } catch {
+              emitExecSystemEvent(
+                `Exec denied (node=${nodeId} id=${approvalId}, approval-request-failed): ${commandText}`,
+                { sessionKey: notifySessionKey, contextKey },
+              );
+              return;
+            }
+
+            let approvedByAsk = false;
+            let approvalDecision: "allow-once" | "allow-always" | null = null;
+            let deniedReason: string | null = null;
+
+            if (decision === "deny") {
+              deniedReason = "user-denied";
+            } else if (!decision) {
+              if (askFallback === "full") {
+                approvedByAsk = true;
+                approvalDecision = "allow-once";
+              } else if (askFallback === "allowlist") {
+                // Defer allowlist enforcement to the node host.
+              } else {
+                deniedReason = "approval-timeout";
+              }
+            } else if (decision === "allow-once") {
               approvedByAsk = true;
               approvalDecision = "allow-once";
-            } else if (askFallback === "allowlist") {
-              // Defer allowlist enforcement to the node host.
-            } else {
-              throw new Error("exec denied: approval required (approval UI not available)");
+            } else if (decision === "allow-always") {
+              approvedByAsk = true;
+              approvalDecision = "allow-always";
             }
-          }
-          if (decision === "allow-once") {
-            approvedByAsk = true;
-            approvalDecision = "allow-once";
-          }
-          if (decision === "allow-always") {
-            approvedByAsk = true;
-            approvalDecision = "allow-always";
-          }
+
+            if (deniedReason) {
+              emitExecSystemEvent(
+                `Exec denied (node=${nodeId} id=${approvalId}, ${deniedReason}): ${commandText}`,
+                { sessionKey: notifySessionKey, contextKey },
+              );
+              return;
+            }
+
+            let runningTimer: NodeJS.Timeout | null = null;
+            if (approvalRunningNoticeMs > 0) {
+              runningTimer = setTimeout(() => {
+                emitExecSystemEvent(
+                  `Exec running (node=${nodeId} id=${approvalId}, >${noticeSeconds}s): ${commandText}`,
+                  { sessionKey: notifySessionKey, contextKey },
+                );
+              }, approvalRunningNoticeMs);
+            }
+
+            try {
+              await callGatewayTool(
+                "node.invoke",
+                { timeoutMs: invokeTimeoutMs },
+                buildInvokeParams(approvedByAsk, approvalDecision, approvalId),
+              );
+            } catch {
+              emitExecSystemEvent(
+                `Exec denied (node=${nodeId} id=${approvalId}, invoke-failed): ${commandText}`,
+                { sessionKey: notifySessionKey, contextKey },
+              );
+            } finally {
+              if (runningTimer) clearTimeout(runningTimer);
+            }
+          })();
+
+          return {
+            content: [
+              {
+                type: "text",
+                text:
+                  `${warningText}Approval required (id ${approvalSlug}). ` +
+                  "Approve to run; updates will arrive after completion.",
+              },
+            ],
+            details: {
+              status: "approval-pending",
+              approvalId,
+              approvalSlug,
+              expiresAtMs,
+              host: "node",
+              command: commandText,
+              cwd: workdir,
+              nodeId,
+            },
+          };
         }
-        const invokeParams: Record<string, unknown> = {
-          nodeId,
-          command: "system.run",
-          params: {
-            command: argv,
-            rawCommand: params.command,
-            cwd: workdir,
-            env: nodeEnv,
-            timeoutMs: typeof params.timeout === "number" ? params.timeout * 1000 : undefined,
-            agentId: defaults?.agentId,
-            sessionKey: defaults?.sessionKey,
-            approved: approvedByAsk,
-            approvalDecision: approvalDecision ?? undefined,
-          },
-          idempotencyKey: crypto.randomUUID(),
-        };
-        const raw = (await callGatewayTool("node.invoke", {}, invokeParams)) as {
+
+        const startedAt = Date.now();
+        const raw = (await callGatewayTool(
+          "node.invoke",
+          { timeoutMs: invokeTimeoutMs },
+          buildInvokeParams(false, null),
+        )) as {
           payload?: {
             exitCode?: number;
             timedOut?: boolean;
@@ -620,64 +1055,183 @@ export function createExecTool(
             hostSecurity === "allowlist" &&
             (!analysis.ok || !allowlistSatisfied));
 
-        let approvedByAsk = false;
         if (requiresAsk) {
-          const decisionResult = (await callGatewayTool(
-            "exec.approval.request",
-            { timeoutMs: 130_000 },
-            {
-              command: params.command,
-              cwd: workdir,
-              host: "gateway",
-              security: hostSecurity,
-              ask: hostAsk,
-              agentId: defaults?.agentId,
-              resolvedPath: analysis.segments[0]?.resolution?.resolvedPath ?? null,
-              sessionKey: defaults?.sessionKey ?? null,
-              timeoutMs: 120_000,
-            },
-          )) as { decision?: string } | null;
-          const decision =
-            decisionResult && typeof decisionResult === "object"
-              ? (decisionResult.decision ?? null)
-              : null;
+          const approvalId = crypto.randomUUID();
+          const approvalSlug = createApprovalSlug(approvalId);
+          const expiresAtMs = Date.now() + DEFAULT_APPROVAL_TIMEOUT_MS;
+          const contextKey = `exec:${approvalId}`;
+          const resolvedPath = analysis.segments[0]?.resolution?.resolvedPath ?? null;
+          const noticeSeconds = Math.max(1, Math.round(approvalRunningNoticeMs / 1000));
+          const commandText = params.command;
+          const effectiveTimeout =
+            typeof params.timeout === "number" ? params.timeout : defaultTimeoutSec;
+          const warningText = warnings.length ? `${warnings.join("\n")}\n\n` : "";
 
-          if (decision === "deny") {
-            throw new Error("exec denied: user denied");
-          }
-          if (!decision) {
-            if (askFallback === "full") {
-              approvedByAsk = true;
-            } else if (askFallback === "allowlist") {
-              if (!analysis.ok || !allowlistSatisfied) {
-                throw new Error("exec denied: approval required (approval UI not available)");
-              }
-              approvedByAsk = true;
-            } else {
-              throw new Error("exec denied: approval required (approval UI not available)");
+          void (async () => {
+            let decision: string | null = null;
+            try {
+              const decisionResult = (await callGatewayTool(
+                "exec.approval.request",
+                { timeoutMs: DEFAULT_APPROVAL_REQUEST_TIMEOUT_MS },
+                {
+                  id: approvalId,
+                  command: commandText,
+                  cwd: workdir,
+                  host: "gateway",
+                  security: hostSecurity,
+                  ask: hostAsk,
+                  agentId: defaults?.agentId,
+                  resolvedPath,
+                  sessionKey: defaults?.sessionKey ?? null,
+                  timeoutMs: DEFAULT_APPROVAL_TIMEOUT_MS,
+                },
+              )) as { decision?: string } | null;
+              decision =
+                decisionResult && typeof decisionResult === "object"
+                  ? (decisionResult.decision ?? null)
+                  : null;
+            } catch {
+              emitExecSystemEvent(
+                `Exec denied (gateway id=${approvalId}, approval-request-failed): ${commandText}`,
+                { sessionKey: notifySessionKey, contextKey },
+              );
+              return;
             }
-          }
-          if (decision === "allow-once") {
-            approvedByAsk = true;
-          }
-          if (decision === "allow-always") {
-            approvedByAsk = true;
-            if (hostSecurity === "allowlist") {
-              for (const segment of analysis.segments) {
-                const pattern = segment.resolution?.resolvedPath ?? "";
-                if (pattern) {
-                  addAllowlistEntry(approvals.file, defaults?.agentId, pattern);
+
+            let approvedByAsk = false;
+            let deniedReason: string | null = null;
+
+            if (decision === "deny") {
+              deniedReason = "user-denied";
+            } else if (!decision) {
+              if (askFallback === "full") {
+                approvedByAsk = true;
+              } else if (askFallback === "allowlist") {
+                if (!analysis.ok || !allowlistSatisfied) {
+                  deniedReason = "approval-timeout (allowlist-miss)";
+                } else {
+                  approvedByAsk = true;
+                }
+              } else {
+                deniedReason = "approval-timeout";
+              }
+            } else if (decision === "allow-once") {
+              approvedByAsk = true;
+            } else if (decision === "allow-always") {
+              approvedByAsk = true;
+              if (hostSecurity === "allowlist") {
+                for (const segment of analysis.segments) {
+                  const pattern = segment.resolution?.resolvedPath ?? "";
+                  if (pattern) {
+                    addAllowlistEntry(approvals.file, defaults?.agentId, pattern);
+                  }
                 }
               }
             }
-          }
+
+            if (
+              hostSecurity === "allowlist" &&
+              (!analysis.ok || !allowlistSatisfied) &&
+              !approvedByAsk
+            ) {
+              deniedReason = deniedReason ?? "allowlist-miss";
+            }
+
+            if (deniedReason) {
+              emitExecSystemEvent(
+                `Exec denied (gateway id=${approvalId}, ${deniedReason}): ${commandText}`,
+                { sessionKey: notifySessionKey, contextKey },
+              );
+              return;
+            }
+
+            if (allowlistMatches.length > 0) {
+              const seen = new Set<string>();
+              for (const match of allowlistMatches) {
+                if (seen.has(match.pattern)) continue;
+                seen.add(match.pattern);
+                recordAllowlistUse(
+                  approvals.file,
+                  defaults?.agentId,
+                  match,
+                  commandText,
+                  resolvedPath ?? undefined,
+                );
+              }
+            }
+
+            let run: ExecProcessHandle | null = null;
+            try {
+              run = await runExecProcess({
+                command: commandText,
+                workdir,
+                env,
+                sandbox: undefined,
+                containerWorkdir: null,
+                usePty: params.pty === true && !sandbox,
+                warnings,
+                maxOutput,
+                pendingMaxOutput,
+                notifyOnExit: false,
+                scopeKey: defaults?.scopeKey,
+                sessionKey: notifySessionKey,
+                timeoutSec: effectiveTimeout,
+              });
+            } catch {
+              emitExecSystemEvent(
+                `Exec denied (gateway id=${approvalId}, spawn-failed): ${commandText}`,
+                { sessionKey: notifySessionKey, contextKey },
+              );
+              return;
+            }
+
+            markBackgrounded(run.session);
+
+            let runningTimer: NodeJS.Timeout | null = null;
+            if (approvalRunningNoticeMs > 0) {
+              runningTimer = setTimeout(() => {
+                emitExecSystemEvent(
+                  `Exec running (gateway id=${approvalId}, session=${run?.session.id}, >${noticeSeconds}s): ${commandText}`,
+                  { sessionKey: notifySessionKey, contextKey },
+                );
+              }, approvalRunningNoticeMs);
+            }
+
+            const outcome = await run.promise;
+            if (runningTimer) clearTimeout(runningTimer);
+            const output = normalizeNotifyOutput(
+              tail(outcome.aggregated || "", DEFAULT_NOTIFY_TAIL_CHARS),
+            );
+            const exitLabel = outcome.timedOut ? "timeout" : `code ${outcome.exitCode ?? "?"}`;
+            const summary = output
+              ? `Exec finished (gateway id=${approvalId}, session=${run.session.id}, ${exitLabel})\n${output}`
+              : `Exec finished (gateway id=${approvalId}, session=${run.session.id}, ${exitLabel})`;
+            emitExecSystemEvent(summary, { sessionKey: notifySessionKey, contextKey });
+          })();
+
+          return {
+            content: [
+              {
+                type: "text",
+                text:
+                  `${warningText}` +
+                  `Approval required (id ${approvalSlug}). ` +
+                  "Approve to run; updates will arrive after completion.",
+              },
+            ],
+            details: {
+              status: "approval-pending",
+              approvalId,
+              approvalSlug,
+              expiresAtMs,
+              host: "gateway",
+              command: params.command,
+              cwd: workdir,
+            },
+          };
         }
 
-        if (
-          hostSecurity === "allowlist" &&
-          (!analysis.ok || !allowlistSatisfied) &&
-          !approvedByAsk
-        ) {
+        if (hostSecurity === "allowlist" && (!analysis.ok || !allowlistSatisfied)) {
           throw new Error("exec denied: allowlist miss");
         }
 
@@ -697,241 +1251,70 @@ export function createExecTool(
         }
       }
 
-      const usePty = params.pty === true && !sandbox;
-      let child: ChildProcessWithoutNullStreams | null = null;
-      let pty: PtyHandle | null = null;
-      let stdin: SessionStdin | undefined;
-
-      if (sandbox) {
-        child = spawn(
-          "docker",
-          buildDockerExecArgs({
-            containerName: sandbox.containerName,
-            command: params.command,
-            workdir: containerWorkdir ?? sandbox.containerWorkdir,
-            env,
-            tty: params.pty === true,
-          }),
-          {
-            cwd: workdir,
-            env: process.env,
-            detached: process.platform !== "win32",
-            stdio: ["pipe", "pipe", "pipe"],
-            windowsHide: true,
-          },
-        ) as ChildProcessWithoutNullStreams;
-        stdin = child.stdin;
-      } else if (usePty) {
-        const ptyModule = (await import("@lydell/node-pty")) as unknown as {
-          spawn?: PtySpawn;
-          default?: { spawn?: PtySpawn };
-        };
-        const spawnPty = ptyModule.spawn ?? ptyModule.default?.spawn;
-        if (!spawnPty) {
-          throw new Error("PTY support is unavailable (node-pty spawn not found).");
-        }
-        pty = spawnPty(shell, [...shellArgs, params.command], {
-          cwd: workdir,
-          env,
-          name: process.env.TERM ?? "xterm-256color",
-          cols: 120,
-          rows: 30,
-        });
-        stdin = {
-          destroyed: false,
-          write: (data, cb) => {
-            try {
-              pty?.write(data);
-              cb?.(null);
-            } catch (err) {
-              cb?.(err as Error);
-            }
-          },
-          end: () => {
-            try {
-              const eof = process.platform === "win32" ? "\x1a" : "\x04";
-              pty?.write(eof);
-            } catch {
-              // ignore EOF errors
-            }
-          },
-        };
-      } else {
-        child = spawn(shell, [...shellArgs, params.command], {
-          cwd: workdir,
-          env,
-          detached: process.platform !== "win32",
-          stdio: ["pipe", "pipe", "pipe"],
-          windowsHide: true,
-        }) as ChildProcessWithoutNullStreams;
-        stdin = child.stdin;
-      }
-
-      const session = {
-        id: sessionId,
-        command: params.command,
-        scopeKey: defaults?.scopeKey,
-        sessionKey: notifySessionKey,
-        notifyOnExit,
-        exitNotified: false,
-        child: child ?? undefined,
-        stdin,
-        pid: child?.pid ?? pty?.pid,
-        startedAt,
-        cwd: workdir,
-        maxOutputChars: maxOutput,
-        pendingMaxOutputChars: pendingMaxOutput,
-        totalOutputChars: 0,
-        pendingStdout: [],
-        pendingStderr: [],
-        pendingStdoutChars: 0,
-        pendingStderrChars: 0,
-        aggregated: "",
-        tail: "",
-        exited: false,
-        exitCode: undefined as number | null | undefined,
-        exitSignal: undefined as NodeJS.Signals | number | null | undefined,
-        truncated: false,
-        backgrounded: false,
-      };
-      addSession(session);
-
-      let settled = false;
-      let yielded = false;
-      let yieldTimer: NodeJS.Timeout | null = null;
-      let timeoutTimer: NodeJS.Timeout | null = null;
-      let timeoutFinalizeTimer: NodeJS.Timeout | null = null;
-      let timedOut = false;
-      const timeoutFinalizeMs = 1000;
-      let rejectFn: ((err: Error) => void) | null = null;
-
-      const settle = (fn: () => void) => {
-        if (settled) return;
-        settled = true;
-        fn();
-      };
-
       const effectiveTimeout =
         typeof params.timeout === "number" ? params.timeout : defaultTimeoutSec;
-      const finalizeTimeout = () => {
-        if (session.exited) return;
-        markExited(session, null, "SIGKILL", "failed");
-        maybeNotifyOnExit(session, "failed");
-        if (settled || !rejectFn) return;
-        const aggregated = session.aggregated.trim();
-        const reason = `Command timed out after ${effectiveTimeout} seconds`;
-        const message = aggregated ? `${aggregated}\n\n${reason}` : reason;
-        settle(() => rejectFn?.(new Error(message)));
-      };
+      const warningText = warnings.length ? `${warnings.join("\n")}\n\n` : "";
+      const usePty = params.pty === true && !sandbox;
+      const run = await runExecProcess({
+        command: params.command,
+        workdir,
+        env,
+        sandbox,
+        containerWorkdir,
+        usePty,
+        warnings,
+        maxOutput,
+        pendingMaxOutput,
+        notifyOnExit,
+        scopeKey: defaults?.scopeKey,
+        sessionKey: notifySessionKey,
+        timeoutSec: effectiveTimeout,
+        onUpdate,
+      });
+
+      let yielded = false;
+      let yieldTimer: NodeJS.Timeout | null = null;
 
       // Tool-call abort should not kill backgrounded sessions; timeouts still must.
       const onAbortSignal = () => {
-        if (yielded || session.backgrounded) return;
-        killSession(session);
-      };
-
-      // Timeouts always terminate, even for backgrounded sessions.
-      const onTimeout = () => {
-        timedOut = true;
-        killSession(session);
-        if (!timeoutFinalizeTimer) {
-          timeoutFinalizeTimer = setTimeout(() => {
-            finalizeTimeout();
-          }, timeoutFinalizeMs);
-        }
+        if (yielded || run.session.backgrounded) return;
+        run.kill();
       };
 
       if (signal?.aborted) onAbortSignal();
       else if (signal) {
         signal.addEventListener("abort", onAbortSignal, { once: true });
       }
-      if (effectiveTimeout > 0) {
-        timeoutTimer = setTimeout(() => {
-          onTimeout();
-        }, effectiveTimeout * 1000);
-      }
-
-      const emitUpdate = () => {
-        if (!onUpdate) return;
-        const tailText = session.tail || session.aggregated;
-        const warningText = warnings.length ? `${warnings.join("\n")}\n\n` : "";
-        onUpdate({
-          content: [{ type: "text", text: warningText + (tailText || "") }],
-          details: {
-            status: "running",
-            sessionId,
-            pid: session.pid ?? undefined,
-            startedAt,
-            cwd: session.cwd,
-            tail: session.tail,
-          },
-        });
-      };
-
-      const handleStdout = (data: string) => {
-        const str = sanitizeBinaryOutput(data.toString());
-        for (const chunk of chunkString(str)) {
-          appendOutput(session, "stdout", chunk);
-          emitUpdate();
-        }
-      };
-
-      const handleStderr = (data: string) => {
-        const str = sanitizeBinaryOutput(data.toString());
-        for (const chunk of chunkString(str)) {
-          appendOutput(session, "stderr", chunk);
-          emitUpdate();
-        }
-      };
-
-      if (pty) {
-        const cursorResponse = buildCursorPositionResponse();
-        pty.onData((data) => {
-          const raw = data.toString();
-          const { cleaned, requests } = stripDsrRequests(raw);
-          if (requests > 0) {
-            for (let i = 0; i < requests; i += 1) {
-              pty.write(cursorResponse);
-            }
-          }
-          handleStdout(cleaned);
-        });
-      } else if (child) {
-        child.stdout.on("data", handleStdout);
-        child.stderr.on("data", handleStderr);
-      }
 
       return new Promise<AgentToolResult<ExecToolDetails>>((resolve, reject) => {
-        rejectFn = reject;
-        const resolveRunning = () => {
-          settle(() =>
-            resolve({
-              content: [
-                {
-                  type: "text",
-                  text:
-                    `${warnings.length ? `${warnings.join("\n")}\n\n` : ""}` +
-                    `Command still running (session ${sessionId}, pid ${session.pid ?? "n/a"}). ` +
-                    "Use process (list/poll/log/write/kill/clear/remove) for follow-up.",
-                },
-              ],
-              details: {
-                status: "running",
-                sessionId,
-                pid: session.pid ?? undefined,
-                startedAt,
-                cwd: session.cwd,
-                tail: session.tail,
+        const resolveRunning = () =>
+          resolve({
+            content: [
+              {
+                type: "text",
+                text:
+                  `${warningText}` +
+                  `Command still running (session ${run.session.id}, pid ${
+                    run.session.pid ?? "n/a"
+                  }). ` +
+                  "Use process (list/poll/log/write/kill/clear/remove) for follow-up.",
               },
-            }),
-          );
-        };
+            ],
+            details: {
+              status: "running",
+              sessionId: run.session.id,
+              pid: run.session.pid ?? undefined,
+              startedAt: run.startedAt,
+              cwd: run.session.cwd,
+              tail: run.session.tail,
+            },
+          });
 
         const onYieldNow = () => {
           if (yieldTimer) clearTimeout(yieldTimer);
-          if (settled) return;
+          if (yielded) return;
           yielded = true;
-          markBackgrounded(session);
+          markBackgrounded(run.session);
           resolveRunning();
         };
 
@@ -940,87 +1323,43 @@ export function createExecTool(
             onYieldNow();
           } else {
             yieldTimer = setTimeout(() => {
-              if (settled) return;
+              if (yielded) return;
               yielded = true;
-              markBackgrounded(session);
+              markBackgrounded(run.session);
               resolveRunning();
             }, yieldWindow);
           }
         }
 
-        const handleExit = (code: number | null, exitSignal: NodeJS.Signals | number | null) => {
-          if (yieldTimer) clearTimeout(yieldTimer);
-          if (timeoutTimer) clearTimeout(timeoutTimer);
-          if (timeoutFinalizeTimer) clearTimeout(timeoutFinalizeTimer);
-          const durationMs = Date.now() - startedAt;
-          const wasSignal = exitSignal != null;
-          const isSuccess = code === 0 && !wasSignal && !signal?.aborted && !timedOut;
-          const status: "completed" | "failed" = isSuccess ? "completed" : "failed";
-          markExited(session, code, exitSignal, status);
-          maybeNotifyOnExit(session, status);
-          if (!session.child && session.stdin) {
-            session.stdin.destroyed = true;
-          }
-
-          if (yielded || session.backgrounded) return;
-
-          const aggregated = session.aggregated.trim();
-          if (!isSuccess) {
-            const reason = timedOut
-              ? `Command timed out after ${effectiveTimeout} seconds`
-              : wasSignal && exitSignal
-                ? `Command aborted by signal ${exitSignal}`
-                : code === null
-                  ? "Command aborted before exit code was captured"
-                  : `Command exited with code ${code}`;
-            const message = aggregated ? `${aggregated}\n\n${reason}` : reason;
-            settle(() => reject(new Error(message)));
-            return;
-          }
-
-          settle(() =>
+        run.promise
+          .then((outcome) => {
+            if (yieldTimer) clearTimeout(yieldTimer);
+            if (yielded || run.session.backgrounded) return;
+            if (outcome.status === "failed") {
+              reject(new Error(outcome.reason ?? "Command failed."));
+              return;
+            }
             resolve({
               content: [
                 {
                   type: "text",
-                  text:
-                    `${warnings.length ? `${warnings.join("\n")}\n\n` : ""}` +
-                    (aggregated || "(no output)"),
+                  text: `${warningText}${outcome.aggregated || "(no output)"}`,
                 },
               ],
               details: {
                 status: "completed",
-                exitCode: code ?? 0,
-                durationMs,
-                aggregated,
-                cwd: session.cwd,
+                exitCode: outcome.exitCode ?? 0,
+                durationMs: outcome.durationMs,
+                aggregated: outcome.aggregated,
+                cwd: run.session.cwd,
               },
-            }),
-          );
-        };
-
-        // `exit` can fire before stdio fully flushes (notably on Windows).
-        // `close` waits for streams to close, so aggregated output is complete.
-        if (pty) {
-          pty.onExit((event) => {
-            const rawSignal = event.signal ?? null;
-            const normalizedSignal = rawSignal === 0 ? null : rawSignal;
-            handleExit(event.exitCode ?? null, normalizedSignal);
-          });
-        } else if (child) {
-          child.once("close", (code, exitSignal) => {
-            handleExit(code, exitSignal);
-          });
-
-          child.once("error", (err) => {
+            });
+          })
+          .catch((err) => {
             if (yieldTimer) clearTimeout(yieldTimer);
-            if (timeoutTimer) clearTimeout(timeoutTimer);
-            if (timeoutFinalizeTimer) clearTimeout(timeoutFinalizeTimer);
-            markExited(session, null, null, "failed");
-            maybeNotifyOnExit(session, "failed");
-            settle(() => reject(err));
+            if (yielded || run.session.backgrounded) return;
+            reject(err as Error);
           });
-        }
       });
     },
   };
diff --git a/src/agents/pi-tools.ts b/src/agents/pi-tools.ts
index 677f391da..c61e3b694 100644
--- a/src/agents/pi-tools.ts
+++ b/src/agents/pi-tools.ts
@@ -84,6 +84,7 @@ function resolveExecConfig(cfg: ClawdbotConfig | undefined) {
     pathPrepend: globalExec?.pathPrepend,
     backgroundMs: globalExec?.backgroundMs,
     timeoutSec: globalExec?.timeoutSec,
+    approvalRunningNoticeMs: globalExec?.approvalRunningNoticeMs,
     cleanupMs: globalExec?.cleanupMs,
     notifyOnExit: globalExec?.notifyOnExit,
     applyPatch: globalExec?.applyPatch,
@@ -219,6 +220,8 @@ export function createClawdbotCodingTools(options?: {
     messageProvider: options?.messageProvider,
     backgroundMs: options?.exec?.backgroundMs ?? execConfig.backgroundMs,
     timeoutSec: options?.exec?.timeoutSec ?? execConfig.timeoutSec,
+    approvalRunningNoticeMs:
+      options?.exec?.approvalRunningNoticeMs ?? execConfig.approvalRunningNoticeMs,
     notifyOnExit: options?.exec?.notifyOnExit ?? execConfig.notifyOnExit,
     sandbox: sandbox
       ? {
diff --git a/src/config/schema.ts b/src/config/schema.ts
index 324f7189b..cd22e94d9 100644
--- a/src/config/schema.ts
+++ b/src/config/schema.ts
@@ -161,6 +161,7 @@ const FIELD_LABELS: Record<string, string> = {
   "tools.exec.applyPatch.enabled": "Enable apply_patch",
   "tools.exec.applyPatch.allowModels": "apply_patch Model Allowlist",
   "tools.exec.notifyOnExit": "Exec Notify On Exit",
+  "tools.exec.approvalRunningNoticeMs": "Exec Approval Running Notice (ms)",
   "tools.exec.host": "Exec Host",
   "tools.exec.security": "Exec Security",
   "tools.exec.ask": "Exec Ask",
diff --git a/src/config/types.tools.ts b/src/config/types.tools.ts
index 7ce292935..cb0d28f4b 100644
--- a/src/config/types.tools.ts
+++ b/src/config/types.tools.ts
@@ -137,6 +137,8 @@ export type ExecToolConfig = {
   backgroundMs?: number;
   /** Default timeout (seconds) before auto-killing exec commands. */
   timeoutSec?: number;
+  /** Emit a running notice (ms) when approval-backed exec runs long (default: 10000, 0 = off). */
+  approvalRunningNoticeMs?: number;
   /** How long to keep finished sessions in memory (ms). */
   cleanupMs?: number;
   /** Emit a system event and heartbeat when a backgrounded exec exits. */
diff --git a/src/config/zod-schema.agent-runtime.ts b/src/config/zod-schema.agent-runtime.ts
index ba6eb1db9..b01fd264b 100644
--- a/src/config/zod-schema.agent-runtime.ts
+++ b/src/config/zod-schema.agent-runtime.ts
@@ -260,6 +260,7 @@ export const AgentToolsSchema = z
         safeBins: z.array(z.string()).optional(),
         backgroundMs: z.number().int().positive().optional(),
         timeoutSec: z.number().int().positive().optional(),
+        approvalRunningNoticeMs: z.number().int().nonnegative().optional(),
         cleanupMs: z.number().int().positive().optional(),
         notifyOnExit: z.boolean().optional(),
         applyPatch: z
diff --git a/src/gateway/exec-approval-manager.ts b/src/gateway/exec-approval-manager.ts
index 7e2540496..5e51f2abc 100644
--- a/src/gateway/exec-approval-manager.ts
+++ b/src/gateway/exec-approval-manager.ts
@@ -33,11 +33,15 @@ type PendingEntry = {
 export class ExecApprovalManager {
   private pending = new Map<string, PendingEntry>();
 
-  create(request: ExecApprovalRequestPayload, timeoutMs: number): ExecApprovalRecord {
+  create(
+    request: ExecApprovalRequestPayload,
+    timeoutMs: number,
+    id?: string | null,
+  ): ExecApprovalRecord {
     const now = Date.now();
-    const id = randomUUID();
+    const resolvedId = id && id.trim().length > 0 ? id.trim() : randomUUID();
     const record: ExecApprovalRecord = {
-      id,
+      id: resolvedId,
       request,
       createdAtMs: now,
       expiresAtMs: now + timeoutMs,
diff --git a/src/gateway/protocol/schema/exec-approvals.ts b/src/gateway/protocol/schema/exec-approvals.ts
index ae2caf77c..9f1a25d38 100644
--- a/src/gateway/protocol/schema/exec-approvals.ts
+++ b/src/gateway/protocol/schema/exec-approvals.ts
@@ -89,6 +89,7 @@ export const ExecApprovalsNodeSetParamsSchema = Type.Object(
 
 export const ExecApprovalRequestParamsSchema = Type.Object(
   {
+    id: Type.Optional(NonEmptyString),
     command: NonEmptyString,
     cwd: Type.Optional(Type.String()),
     host: Type.Optional(Type.String()),
diff --git a/src/gateway/server-methods/exec-approval.test.ts b/src/gateway/server-methods/exec-approval.test.ts
index 1d0328532..4682e6e1a 100644
--- a/src/gateway/server-methods/exec-approval.test.ts
+++ b/src/gateway/server-methods/exec-approval.test.ts
@@ -60,4 +60,120 @@ describe("exec approval handlers", () => {
     );
     expect(broadcasts.some((entry) => entry.event === "exec.approval.resolved")).toBe(true);
   });
+
+  it("accepts explicit approval ids", async () => {
+    const manager = new ExecApprovalManager();
+    const handlers = createExecApprovalHandlers(manager);
+    const broadcasts: Array<{ event: string; payload: unknown }> = [];
+
+    const respond = vi.fn();
+    const context = {
+      broadcast: (event: string, payload: unknown) => {
+        broadcasts.push({ event, payload });
+      },
+    };
+
+    const requestPromise = handlers["exec.approval.request"]({
+      params: {
+        id: "approval-123",
+        command: "echo ok",
+        cwd: "/tmp",
+        host: "gateway",
+        timeoutMs: 2000,
+      },
+      respond,
+      context: context as unknown as Parameters<
+        (typeof handlers)["exec.approval.request"]
+      >[0]["context"],
+      client: null,
+      req: { id: "req-1", type: "req", method: "exec.approval.request" },
+      isWebchatConnect: noop,
+    });
+
+    const requested = broadcasts.find((entry) => entry.event === "exec.approval.requested");
+    const id = (requested?.payload as { id?: string })?.id ?? "";
+    expect(id).toBe("approval-123");
+
+    const resolveRespond = vi.fn();
+    await handlers["exec.approval.resolve"]({
+      params: { id, decision: "allow-once" },
+      respond: resolveRespond,
+      context: context as unknown as Parameters<
+        (typeof handlers)["exec.approval.resolve"]
+      >[0]["context"],
+      client: { connect: { client: { id: "cli", displayName: "CLI" } } },
+      req: { id: "req-2", type: "req", method: "exec.approval.resolve" },
+      isWebchatConnect: noop,
+    });
+
+    await requestPromise;
+    expect(respond).toHaveBeenCalledWith(
+      true,
+      expect.objectContaining({ id: "approval-123", decision: "allow-once" }),
+      undefined,
+    );
+  });
+
+  it("rejects duplicate approval ids", async () => {
+    const manager = new ExecApprovalManager();
+    const handlers = createExecApprovalHandlers(manager);
+    const respondA = vi.fn();
+    const respondB = vi.fn();
+    const broadcasts: Array<{ event: string; payload: unknown }> = [];
+    const context = {
+      broadcast: (event: string, payload: unknown) => {
+        broadcasts.push({ event, payload });
+      },
+    };
+
+    const requestPromise = handlers["exec.approval.request"]({
+      params: {
+        id: "dup-1",
+        command: "echo ok",
+      },
+      respond: respondA,
+      context: context as unknown as Parameters<
+        (typeof handlers)["exec.approval.request"]
+      >[0]["context"],
+      client: null,
+      req: { id: "req-1", type: "req", method: "exec.approval.request" },
+      isWebchatConnect: noop,
+    });
+
+    await handlers["exec.approval.request"]({
+      params: {
+        id: "dup-1",
+        command: "echo again",
+      },
+      respond: respondB,
+      context: context as unknown as Parameters<
+        (typeof handlers)["exec.approval.request"]
+      >[0]["context"],
+      client: null,
+      req: { id: "req-2", type: "req", method: "exec.approval.request" },
+      isWebchatConnect: noop,
+    });
+
+    expect(respondB).toHaveBeenCalledWith(
+      false,
+      undefined,
+      expect.objectContaining({ message: "approval id already pending" }),
+    );
+
+    const requested = broadcasts.find((entry) => entry.event === "exec.approval.requested");
+    const id = (requested?.payload as { id?: string })?.id ?? "";
+    const resolveRespond = vi.fn();
+    await handlers["exec.approval.resolve"]({
+      params: { id, decision: "deny" },
+      respond: resolveRespond,
+      context: context as unknown as Parameters<
+        (typeof handlers)["exec.approval.resolve"]
+      >[0]["context"],
+      client: { connect: { client: { id: "cli", displayName: "CLI" } } },
+      req: { id: "req-3", type: "req", method: "exec.approval.resolve" },
+      isWebchatConnect: noop,
+    });
+
+    await requestPromise;
+  });
 });
diff --git a/src/gateway/server-methods/exec-approval.ts b/src/gateway/server-methods/exec-approval.ts
index 683c70a1e..8fb13cea0 100644
--- a/src/gateway/server-methods/exec-approval.ts
+++ b/src/gateway/server-methods/exec-approval.ts
@@ -26,6 +26,7 @@ export function createExecApprovalHandlers(manager: ExecApprovalManager): Gatewa
         return;
       }
       const p = params as {
+        id?: string;
         command: string;
         cwd?: string;
         host?: string;
@@ -37,6 +38,15 @@ export function createExecApprovalHandlers(manager: ExecApprovalManager): Gatewa
         timeoutMs?: number;
       };
       const timeoutMs = typeof p.timeoutMs === "number" ? p.timeoutMs : 120_000;
+      const explicitId = typeof p.id === "string" && p.id.trim().length > 0 ? p.id.trim() : null;
+      if (explicitId && manager.getSnapshot(explicitId)) {
+        respond(
+          false,
+          undefined,
+          errorShape(ErrorCodes.INVALID_REQUEST, "approval id already pending"),
+        );
+        return;
+      }
       const request = {
         command: p.command,
         cwd: p.cwd ?? null,
@@ -47,7 +57,7 @@ export function createExecApprovalHandlers(manager: ExecApprovalManager): Gatewa
         resolvedPath: p.resolvedPath ?? null,
         sessionKey: p.sessionKey ?? null,
       };
-      const record = manager.create(request, timeoutMs);
+      const record = manager.create(request, timeoutMs, explicitId);
       context.broadcast(
         "exec.approval.requested",
         {
diff --git a/src/node-host/runner.ts b/src/node-host/runner.ts
index 09a148ca4..0d4892e35 100644
--- a/src/node-host/runner.ts
+++ b/src/node-host/runner.ts
@@ -57,6 +57,7 @@ type SystemRunParams = {
   sessionKey?: string | null;
   approved?: boolean | null;
   approvalDecision?: string | null;
+  runId?: string | null;
 };
 
 type SystemWhichParams = {
@@ -583,7 +584,7 @@ async function handleInvoke(
   const ask = approvals.agent.ask;
   const autoAllowSkills = approvals.agent.autoAllowSkills;
   const sessionKey = params.sessionKey?.trim() || "node";
-  const runId = crypto.randomUUID();
+  const runId = params.runId?.trim() || crypto.randomUUID();
   const env = sanitizeEnv(params.env ?? undefined);
   const analysis = rawCommand
     ? analyzeShellCommand({ command: rawCommand, cwd: params.cwd ?? undefined, env })
@@ -803,17 +804,6 @@ async function handleInvoke(
     return;
   }
 
-  await sendNodeEvent(
-    client,
-    "exec.started",
-    buildExecEventPayload({
-      sessionKey,
-      runId,
-      host: "node",
-      command: cmdText,
-    }),
-  );
-
   const result = await runCommand(
     argv,
     params.cwd?.trim() || undefined,

From 758f30eb7d956d617abb783b6e189a41b9aad980 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 00:59:36 +0000
Subject: [PATCH 083/171] refactor: satisfy swiftlint

---
 .../Sources/Clawdbot/ExecApprovals.swift      |   6 +-
 .../Sources/Clawdbot/GeneralSettings.swift    |   1 -
 .../Clawdbot/NodeMode/MacNodeRuntime.swift    | 165 ++++++++++++------
 .../Clawdbot/PermissionsSettings.swift        |   1 -
 .../Sources/Clawdbot/TailscaleService.swift   |   2 +-
 .../GatewayEnvironmentTests.swift             |   5 +-
 6 files changed, 118 insertions(+), 62 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/ExecApprovals.swift b/apps/macos/Sources/Clawdbot/ExecApprovals.swift
index 122176592..ad1a18300 100644
--- a/apps/macos/Sources/Clawdbot/ExecApprovals.swift
+++ b/apps/macos/Sources/Clawdbot/ExecApprovals.swift
@@ -280,8 +280,10 @@ enum ExecApprovalsStore {
         let resolvedAgent = ExecApprovalsResolvedDefaults(
             security: agentEntry.security ?? wildcardEntry.security ?? resolvedDefaults.security,
             ask: agentEntry.ask ?? wildcardEntry.ask ?? resolvedDefaults.ask,
-            askFallback: agentEntry.askFallback ?? wildcardEntry.askFallback ?? resolvedDefaults.askFallback,
-            autoAllowSkills: agentEntry.autoAllowSkills ?? wildcardEntry.autoAllowSkills ?? resolvedDefaults.autoAllowSkills)
+            askFallback: agentEntry.askFallback ?? wildcardEntry.askFallback
+                ?? resolvedDefaults.askFallback,
+            autoAllowSkills: agentEntry.autoAllowSkills ?? wildcardEntry.autoAllowSkills
+                ?? resolvedDefaults.autoAllowSkills)
         let allowlist = ((wildcardEntry.allowlist ?? []) + (agentEntry.allowlist ?? []))
             .map { entry in
                 ExecAllowlistEntry(
diff --git a/apps/macos/Sources/Clawdbot/GeneralSettings.swift b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
index b2fdac6f0..5c64f0d63 100644
--- a/apps/macos/Sources/Clawdbot/GeneralSettings.swift
+++ b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
@@ -191,7 +191,6 @@ struct GeneralSettings: View {
             if self.state.connectionMode == .remote {
                 self.remoteCard
             }
-
         }
     }
 
diff --git a/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift b/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift
index 8c6f3f776..184164262 100644
--- a/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift
+++ b/apps/macos/Sources/Clawdbot/NodeMode/MacNodeRuntime.swift
@@ -480,62 +480,22 @@ actor MacNodeRuntime {
                 message: "SYSTEM_RUN_DISABLED: security=deny")
         }
 
-        let requiresAsk = ExecApprovalHelpers.requiresAsk(
-            ask: ask,
-            security: security,
-            allowlistMatch: allowlistMatch,
-            skillAllow: skillAllow)
-
-        let decisionFromParams = ExecApprovalHelpers.parseDecision(params.approvalDecision)
-        var approvedByAsk = params.approved == true || decisionFromParams != nil
-        var persistAllowlist = decisionFromParams == .allowAlways
-        if decisionFromParams == .deny {
-            await self.emitExecEvent(
-                "exec.denied",
-                payload: ExecEventPayload(
-                    sessionKey: sessionKey,
-                    runId: runId,
-                    host: "node",
-                    command: displayCommand,
-                    reason: "user-denied"))
-            return Self.errorResponse(
-                req,
-                code: .unavailable,
-                message: "SYSTEM_RUN_DENIED: user denied")
-        }
-        if requiresAsk, !approvedByAsk {
-            let decision = await MainActor.run {
-                ExecApprovalsPromptPresenter.prompt(
-                    ExecApprovalPromptRequest(
-                        command: displayCommand,
-                        cwd: params.cwd,
-                        host: "node",
-                        security: security.rawValue,
-                        ask: ask.rawValue,
-                        agentId: agentId,
-                        resolvedPath: resolution?.resolvedPath))
-            }
-            switch decision {
-            case .deny:
-                await self.emitExecEvent(
-                    "exec.denied",
-                    payload: ExecEventPayload(
-                        sessionKey: sessionKey,
-                        runId: runId,
-                        host: "node",
-                        command: displayCommand,
-                        reason: "user-denied"))
-                return Self.errorResponse(
-                    req,
-                    code: .unavailable,
-                    message: "SYSTEM_RUN_DENIED: user denied")
-            case .allowAlways:
-                approvedByAsk = true
-                persistAllowlist = true
-            case .allowOnce:
-                approvedByAsk = true
-            }
-        }
+        let approval = await self.resolveSystemRunApproval(
+            req: req,
+            params: params,
+            context: ExecRunContext(
+                displayCommand: displayCommand,
+                security: security,
+                ask: ask,
+                agentId: agentId,
+                resolution: resolution,
+                allowlistMatch: allowlistMatch,
+                skillAllow: skillAllow,
+                sessionKey: sessionKey,
+                runId: runId))
+        if let response = approval.response { return response }
+        let approvedByAsk = approval.approvedByAsk
+        let persistAllowlist = approval.persistAllowlist
         if persistAllowlist, security == .allowlist,
            let pattern = ExecApprovalHelpers.allowlistPattern(command: command, resolution: resolution)
         {
@@ -659,6 +619,99 @@ actor MacNodeRuntime {
         return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: payload)
     }
 
+    private struct ExecApprovalOutcome {
+        var approvedByAsk: Bool
+        var persistAllowlist: Bool
+        var response: BridgeInvokeResponse?
+    }
+
+    private struct ExecRunContext {
+        var displayCommand: String
+        var security: ExecSecurity
+        var ask: ExecAsk
+        var agentId: String?
+        var resolution: ExecCommandResolution?
+        var allowlistMatch: ExecAllowlistEntry?
+        var skillAllow: Bool
+        var sessionKey: String
+        var runId: String
+    }
+
+    private func resolveSystemRunApproval(
+        req: BridgeInvokeRequest,
+        params: ClawdbotSystemRunParams,
+        context: ExecRunContext) async -> ExecApprovalOutcome
+    {
+        let requiresAsk = ExecApprovalHelpers.requiresAsk(
+            ask: context.ask,
+            security: context.security,
+            allowlistMatch: context.allowlistMatch,
+            skillAllow: context.skillAllow)
+
+        let decisionFromParams = ExecApprovalHelpers.parseDecision(params.approvalDecision)
+        var approvedByAsk = params.approved == true || decisionFromParams != nil
+        var persistAllowlist = decisionFromParams == .allowAlways
+        if decisionFromParams == .deny {
+            await self.emitExecEvent(
+                "exec.denied",
+                payload: ExecEventPayload(
+                    sessionKey: context.sessionKey,
+                    runId: context.runId,
+                    host: "node",
+                    command: context.displayCommand,
+                    reason: "user-denied"))
+            return ExecApprovalOutcome(
+                approvedByAsk: approvedByAsk,
+                persistAllowlist: persistAllowlist,
+                response: Self.errorResponse(
+                    req,
+                    code: .unavailable,
+                    message: "SYSTEM_RUN_DENIED: user denied"))
+        }
+
+        if requiresAsk, !approvedByAsk {
+            let decision = await MainActor.run {
+                ExecApprovalsPromptPresenter.prompt(
+                    ExecApprovalPromptRequest(
+                        command: context.displayCommand,
+                        cwd: params.cwd,
+                        host: "node",
+                        security: context.security.rawValue,
+                        ask: context.ask.rawValue,
+                        agentId: context.agentId,
+                        resolvedPath: context.resolution?.resolvedPath))
+            }
+            switch decision {
+            case .deny:
+                await self.emitExecEvent(
+                    "exec.denied",
+                    payload: ExecEventPayload(
+                        sessionKey: context.sessionKey,
+                        runId: context.runId,
+                        host: "node",
+                        command: context.displayCommand,
+                        reason: "user-denied"))
+                return ExecApprovalOutcome(
+                    approvedByAsk: approvedByAsk,
+                    persistAllowlist: persistAllowlist,
+                    response: Self.errorResponse(
+                        req,
+                        code: .unavailable,
+                        message: "SYSTEM_RUN_DENIED: user denied"))
+            case .allowAlways:
+                approvedByAsk = true
+                persistAllowlist = true
+            case .allowOnce:
+                approvedByAsk = true
+            }
+        }
+
+        return ExecApprovalOutcome(
+            approvedByAsk: approvedByAsk,
+            persistAllowlist: persistAllowlist,
+            response: nil)
+    }
+
     private func handleSystemExecApprovalsGet(_ req: BridgeInvokeRequest) async throws -> BridgeInvokeResponse {
         _ = ExecApprovalsStore.ensureFile()
         let snapshot = ExecApprovalsStore.readSnapshot()
diff --git a/apps/macos/Sources/Clawdbot/PermissionsSettings.swift b/apps/macos/Sources/Clawdbot/PermissionsSettings.swift
index 279c938ff..edce7f41b 100644
--- a/apps/macos/Sources/Clawdbot/PermissionsSettings.swift
+++ b/apps/macos/Sources/Clawdbot/PermissionsSettings.swift
@@ -47,7 +47,6 @@ struct PermissionStatusList: View {
             .font(.footnote)
             .padding(.top, 2)
             .help("Refresh status")
-
         }
     }
 
diff --git a/apps/macos/Sources/Clawdbot/TailscaleService.swift b/apps/macos/Sources/Clawdbot/TailscaleService.swift
index 57424f6a0..413e8d0c8 100644
--- a/apps/macos/Sources/Clawdbot/TailscaleService.swift
+++ b/apps/macos/Sources/Clawdbot/TailscaleService.swift
@@ -221,6 +221,6 @@ final class TailscaleService {
     }
 
     nonisolated static func fallbackTailnetIPv4() -> String? {
-        Self.detectTailnetIPv4()
+        self.detectTailnetIPv4()
     }
 }
diff --git a/apps/macos/Tests/ClawdbotIPCTests/GatewayEnvironmentTests.swift b/apps/macos/Tests/ClawdbotIPCTests/GatewayEnvironmentTests.swift
index 36bed4aa6..9446919e7 100644
--- a/apps/macos/Tests/ClawdbotIPCTests/GatewayEnvironmentTests.swift
+++ b/apps/macos/Tests/ClawdbotIPCTests/GatewayEnvironmentTests.swift
@@ -48,7 +48,10 @@ import Testing
 
     @Test func expectedGatewayVersionFromStringUsesParser() {
         #expect(GatewayEnvironment.expectedGatewayVersion(from: "v9.1.2") == Semver(major: 9, minor: 1, patch: 2))
-        #expect(GatewayEnvironment.expectedGatewayVersion(from: "2026.1.11-4") == Semver(major: 2026, minor: 1, patch: 11))
+        #expect(GatewayEnvironment.expectedGatewayVersion(from: "2026.1.11-4") == Semver(
+            major: 2026,
+            minor: 1,
+            patch: 11))
         #expect(GatewayEnvironment.expectedGatewayVersion(from: nil) == nil)
     }
 }

From f5cec1dd8bb8587967c53abc7fdbbeabbb0e3e1f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 01:16:59 +0000
Subject: [PATCH 084/171] test: update fuzzy model selection expectations
 (#1372) (thanks @zerone0x)

---
 ...tches-fuzzy-selection-is-ambiguous.test.ts |  9 ++++---
 ...uzzy-model-matches-model-directive.test.ts | 27 ++++++++++---------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts b/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts
index 271027882..b636b85d6 100644
--- a/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts
@@ -104,10 +104,11 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Unrecognized model: ki");
-      expect(text).toContain("Did you mean: moonshot/kimi-k2-0905-preview");
-      expect(text).toContain("Try: /model moonshot/kimi-k2-0905-preview");
-      assertModelSelection(storePath);
+      expect(text).toContain("Model set to Kimi (moonshot/kimi-k2-0905-preview).");
+      assertModelSelection(storePath, {
+        provider: "moonshot",
+        model: "kimi-k2-0905-preview",
+      });
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
diff --git a/src/auto-reply/reply.directive.directive-behavior.supports-fuzzy-model-matches-model-directive.test.ts b/src/auto-reply/reply.directive.directive-behavior.supports-fuzzy-model-matches-model-directive.test.ts
index cc7f54b22..2f0a6cc21 100644
--- a/src/auto-reply/reply.directive.directive-behavior.supports-fuzzy-model-matches-model-directive.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.supports-fuzzy-model-matches-model-directive.test.ts
@@ -95,10 +95,11 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Unrecognized model: kimi");
-      expect(text).toContain("Did you mean: moonshot/kimi-k2-0905-preview");
-      expect(text).toContain("Try: /model moonshot/kimi-k2-0905-preview");
-      assertModelSelection(storePath);
+      expect(text).toContain("Model set to moonshot/kimi-k2-0905-preview.");
+      assertModelSelection(storePath, {
+        provider: "moonshot",
+        model: "kimi-k2-0905-preview",
+      });
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -142,10 +143,11 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Unrecognized model: kimi-k2-0905-preview");
-      expect(text).toContain("Did you mean: moonshot/kimi-k2-0905-preview");
-      expect(text).toContain("Try: /model moonshot/kimi-k2-0905-preview");
-      assertModelSelection(storePath);
+      expect(text).toContain("Model set to moonshot/kimi-k2-0905-preview.");
+      assertModelSelection(storePath, {
+        provider: "moonshot",
+        model: "kimi-k2-0905-preview",
+      });
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
@@ -184,10 +186,11 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Unrecognized model: moonshot/kimi");
-      expect(text).toContain("Did you mean: moonshot/kimi-k2-0905-preview");
-      expect(text).toContain("Try: /model moonshot/kimi-k2-0905-preview");
-      assertModelSelection(storePath);
+      expect(text).toContain("Model set to moonshot/kimi-k2-0905-preview.");
+      assertModelSelection(storePath, {
+        provider: "moonshot",
+        model: "kimi-k2-0905-preview",
+      });
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });

From db61451c6737d1fcc3e24ba26bb20cc03d256db4 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 01:30:06 +0000
Subject: [PATCH 085/171] fix: handle Windows safe-bin exe names

---
 .../Sources/ClawdbotProtocol/GatewayModels.swift      |  4 ++++
 .../Sources/ClawdbotProtocol/GatewayModels.swift      |  4 ++++
 src/infra/exec-approvals.test.ts                      | 11 +++++++----
 src/infra/exec-approvals.ts                           |  6 +++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift b/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
index eb4fa6818..7d8189248 100644
--- a/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
+++ b/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
@@ -1908,6 +1908,7 @@ public struct ExecApprovalsSnapshot: Codable, Sendable {
 }
 
 public struct ExecApprovalRequestParams: Codable, Sendable {
+    public let id: String?
     public let command: String
     public let cwd: String?
     public let host: String?
@@ -1919,6 +1920,7 @@ public struct ExecApprovalRequestParams: Codable, Sendable {
     public let timeoutms: Int?
 
     public init(
+        id: String?,
         command: String,
         cwd: String?,
         host: String?,
@@ -1929,6 +1931,7 @@ public struct ExecApprovalRequestParams: Codable, Sendable {
         sessionkey: String?,
         timeoutms: Int?
     ) {
+        self.id = id
         self.command = command
         self.cwd = cwd
         self.host = host
@@ -1940,6 +1943,7 @@ public struct ExecApprovalRequestParams: Codable, Sendable {
         self.timeoutms = timeoutms
     }
     private enum CodingKeys: String, CodingKey {
+        case id
         case command
         case cwd
         case host
diff --git a/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift b/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
index eb4fa6818..7d8189248 100644
--- a/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
+++ b/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
@@ -1908,6 +1908,7 @@ public struct ExecApprovalsSnapshot: Codable, Sendable {
 }
 
 public struct ExecApprovalRequestParams: Codable, Sendable {
+    public let id: String?
     public let command: String
     public let cwd: String?
     public let host: String?
@@ -1919,6 +1920,7 @@ public struct ExecApprovalRequestParams: Codable, Sendable {
     public let timeoutms: Int?
 
     public init(
+        id: String?,
         command: String,
         cwd: String?,
         host: String?,
@@ -1929,6 +1931,7 @@ public struct ExecApprovalRequestParams: Codable, Sendable {
         sessionkey: String?,
         timeoutms: Int?
     ) {
+        self.id = id
         self.command = command
         self.cwd = cwd
         self.host = host
@@ -1940,6 +1943,7 @@ public struct ExecApprovalRequestParams: Codable, Sendable {
         self.timeoutms = timeoutms
     }
     private enum CodingKeys: String, CodingKey {
+        case id
         case command
         case cwd
         case host
diff --git a/src/infra/exec-approvals.test.ts b/src/infra/exec-approvals.test.ts
index e0ff6a33b..cbafad759 100644
--- a/src/infra/exec-approvals.test.ts
+++ b/src/infra/exec-approvals.test.ts
@@ -72,12 +72,13 @@ describe("exec approvals command resolution", () => {
     const dir = makeTempDir();
     const binDir = path.join(dir, "bin");
     fs.mkdirSync(binDir, { recursive: true });
-    const exe = path.join(binDir, "rg");
+    const exeName = process.platform === "win32" ? "rg.exe" : "rg";
+    const exe = path.join(binDir, exeName);
     fs.writeFileSync(exe, "");
     fs.chmodSync(exe, 0o755);
     const res = resolveCommandResolution("rg -n foo", undefined, { PATH: binDir });
     expect(res?.resolvedPath).toBe(exe);
-    expect(res?.executableName).toBe("rg");
+    expect(res?.executableName).toBe(exeName);
   });
 
   it("resolves relative paths against cwd", () => {
@@ -127,7 +128,8 @@ describe("exec approvals safe bins", () => {
     const dir = makeTempDir();
     const binDir = path.join(dir, "bin");
     fs.mkdirSync(binDir, { recursive: true });
-    const exe = path.join(binDir, "jq");
+    const exeName = process.platform === "win32" ? "jq.exe" : "jq";
+    const exe = path.join(binDir, exeName);
     fs.writeFileSync(exe, "");
     fs.chmodSync(exe, 0o755);
     const res = analyzeShellCommand({
@@ -150,7 +152,8 @@ describe("exec approvals safe bins", () => {
     const dir = makeTempDir();
     const binDir = path.join(dir, "bin");
     fs.mkdirSync(binDir, { recursive: true });
-    const exe = path.join(binDir, "jq");
+    const exeName = process.platform === "win32" ? "jq.exe" : "jq";
+    const exe = path.join(binDir, exeName);
     fs.writeFileSync(exe, "");
     fs.chmodSync(exe, 0o755);
     const file = path.join(dir, "secret.json");
diff --git a/src/infra/exec-approvals.ts b/src/infra/exec-approvals.ts
index 06d58b0d5..ee8b1c541 100644
--- a/src/infra/exec-approvals.ts
+++ b/src/infra/exec-approvals.ts
@@ -660,7 +660,11 @@ export function isSafeBinUsage(params: {
   if (params.safeBins.size === 0) return false;
   const resolution = params.resolution;
   const execName = resolution?.executableName?.toLowerCase();
-  if (!execName || !params.safeBins.has(execName)) return false;
+  if (!execName) return false;
+  const matchesSafeBin =
+    params.safeBins.has(execName) ||
+    (process.platform === "win32" && params.safeBins.has(path.parse(execName).name));
+  if (!matchesSafeBin) return false;
   if (!resolution?.resolvedPath) return false;
   const cwd = params.cwd ?? process.cwd();
   const exists = params.fileExists ?? defaultFileExists;

From 7725dd67953657889dc5bd614975b9c1b2e07bab Mon Sep 17 00:00:00 2001
From: Zach Knickerbocker <zach@merchbase.co>
Date: Mon, 19 Jan 2026 15:42:07 -0500
Subject: [PATCH 086/171] feat: configurable heartbeat session

---
 docs/channels/whatsapp.md                     |   1 +
 docs/gateway/configuration.md                 | 120 +++-----
 docs/gateway/heartbeat.md                     |  16 +-
 src/config/types.agent-defaults.ts            |   2 +
 src/config/zod-schema.agent-runtime.ts        |   1 +
 ...espects-ackmaxchars-heartbeat-acks.test.ts |  15 +-
 ...tbeat-runner.returns-default-unset.test.ts |  92 +++++-
 src/infra/heartbeat-runner.ts                 | 281 +++++-------------
 8 files changed, 230 insertions(+), 298 deletions(-)

diff --git a/docs/channels/whatsapp.md b/docs/channels/whatsapp.md
index 45a4798a2..a496d1654 100644
--- a/docs/channels/whatsapp.md
+++ b/docs/channels/whatsapp.md
@@ -334,6 +334,7 @@ WhatsApp sends audio as **voice notes** (PTT bubble).
 - `agents.defaults.heartbeat.model` (optional override)
 - `agents.defaults.heartbeat.target`
 - `agents.defaults.heartbeat.to`
+- `agents.defaults.heartbeat.session`
 - `agents.list[].heartbeat.*` (per-agent overrides)
 - `session.*` (scope, idle, store, mainKey)
 - `web.enabled` (disable channel startup when false)
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index 00fd9e30f..6cdc39394 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -24,7 +24,7 @@ Unknown keys, malformed types, or invalid values cause the Gateway to **refuse t
 
 When validation fails:
 - The Gateway does not boot.
-- Only diagnostic commands are allowed (for example: `clawdbot doctor`, `clawdbot logs`, `clawdbot health`, `clawdbot status`, `clawdbot gateway status`, `clawdbot gateway probe`, `clawdbot help`).
+- Only diagnostic commands are allowed (for example: `clawdbot doctor`, `clawdbot logs`, `clawdbot health`, `clawdbot status`, `clawdbot service`, `clawdbot help`).
 - Run `clawdbot doctor` to see the exact issues.
 - Run `clawdbot doctor --fix` (or `--yes`) to apply migrations/repairs.
 
@@ -1414,7 +1414,7 @@ Each `agents.defaults.models` entry can include:
 - `alias` (optional model shortcut, e.g. `/opus`).
 - `params` (optional provider-specific API params passed through to the model request).
 
-`params` is also applied to streaming runs (embedded agent + compaction). Supported keys today: `temperature`, `maxTokens`, `cacheControlTtl` (`"5m"` or `"1h"`, Anthropic API + OpenRouter Anthropic models only; ignored for Anthropic OAuth/Claude Code tokens). These merge with call-time options; caller-supplied values win. `temperature` is an advanced knob—leave unset unless you know the model’s defaults and need a change. Clawdbot includes the `extended-cache-ttl-2025-04-11` beta flag for Anthropic API; keep it if you override provider headers.
+`params` is also applied to streaming runs (embedded agent + compaction). Supported keys today: `temperature`, `maxTokens`. These merge with call-time options; caller-supplied values win. `temperature` is an advanced knob—leave unset unless you know the model’s defaults and need a change.
 
 Example:
 
@@ -1569,7 +1569,7 @@ Example:
 }
 ```
 
-#### `agents.defaults.contextPruning` (TTL-aware tool-result pruning)
+#### `agents.defaults.contextPruning` (tool-result pruning)
 
 `agents.defaults.contextPruning` prunes **old tool results** from the in-memory context right before a request is sent to the LLM.
 It does **not** modify the session history on disk (`*.jsonl` remains complete).
@@ -1580,9 +1580,11 @@ High level:
 - Never touches user/assistant messages.
 - Protects the last `keepLastAssistants` assistant messages (no tool results after that point are pruned).
 - Protects the bootstrap prefix (nothing before the first user message is pruned).
-- Mode:
-  - `cache-ttl`: pruning only runs when the last Anthropic call for the session is **older** than `ttl`.
-    When it runs, it uses the same soft-trim + hard-clear behavior as before.
+- Modes:
+  - `adaptive`: soft-trims oversized tool results (keep head/tail) when the estimated context ratio crosses `softTrimRatio`.
+    Then hard-clears the oldest eligible tool results when the estimated context ratio crosses `hardClearRatio` **and**
+    there’s enough prunable tool-result bulk (`minPrunableToolChars`).
+  - `aggressive`: always replaces eligible tool results before the cutoff with the `hardClear.placeholder` (no ratio checks).
 
 Soft vs hard pruning (what changes in the context sent to the LLM):
 - **Soft-trim**: only for *oversized* tool results. Keeps the beginning + end and inserts `...` in the middle.
@@ -1596,41 +1598,44 @@ Notes / current limitations:
 - Tool results containing **image blocks are skipped** (never trimmed/cleared) right now.
 - The estimated “context ratio” is based on **characters** (approximate), not exact tokens.
 - If the session doesn’t contain at least `keepLastAssistants` assistant messages yet, pruning is skipped.
-- `cache-ttl` only activates for Anthropic API calls (and OpenRouter Anthropic models).
-- After a prune, the TTL window resets so subsequent requests keep cache until `ttl` expires again.
-- For best results, match `contextPruning.ttl` to the model `cacheControlTtl` you set in `agents.defaults.models.*.params`.
+- In `aggressive` mode, `hardClear.enabled` is ignored (eligible tool results are always replaced with `hardClear.placeholder`).
 
-Default (off, unless Anthropic auth profiles are detected):
+Default (adaptive):
+```json5
+{
+  agents: { defaults: { contextPruning: { mode: "adaptive" } } }
+}
+```
+
+To disable:
 ```json5
 {
   agents: { defaults: { contextPruning: { mode: "off" } } }
 }
 ```
 
-Enable TTL-aware pruning:
+Defaults (when `mode` is `"adaptive"` or `"aggressive"`):
+- `keepLastAssistants`: `3`
+- `softTrimRatio`: `0.3` (adaptive only)
+- `hardClearRatio`: `0.5` (adaptive only)
+- `minPrunableToolChars`: `50000` (adaptive only)
+- `softTrim`: `{ maxChars: 4000, headChars: 1500, tailChars: 1500 }` (adaptive only)
+- `hardClear`: `{ enabled: true, placeholder: "[Old tool result content cleared]" }`
+
+Example (aggressive, minimal):
 ```json5
 {
-  agents: { defaults: { contextPruning: { mode: "cache-ttl" } } }
+  agents: { defaults: { contextPruning: { mode: "aggressive" } } }
 }
 ```
 
-Defaults (when `mode` is `"cache-ttl"`):
-- `ttl`: `"5m"`
-- `keepLastAssistants`: `3`
-- `softTrimRatio`: `0.3`
-- `hardClearRatio`: `0.5`
-- `minPrunableToolChars`: `50000`
-- `softTrim`: `{ maxChars: 4000, headChars: 1500, tailChars: 1500 }`
-- `hardClear`: `{ enabled: true, placeholder: "[Old tool result content cleared]" }`
-
-Example (cache-ttl tuned):
+Example (adaptive tuned):
 ```json5
 {
   agents: {
     defaults: {
       contextPruning: {
-        mode: "cache-ttl",
-        ttl: "5m",
+        mode: "adaptive",
         keepLastAssistants: 3,
         softTrimRatio: 0.3,
         hardClearRatio: 0.5,
@@ -1737,12 +1742,9 @@ Z.AI models are available as `zai/<model>` (e.g. `zai/glm-4.7`) and require
   `30m`. Set `0m` to disable.
 - `model`: optional override model for heartbeat runs (`provider/model`).
 - `includeReasoning`: when `true`, heartbeats will also deliver the separate `Reasoning:` message when available (same shape as `/reasoning on`). Default: `false`.
-- `activeHours`: optional local-time window that controls when heartbeats run.
-  - `start`: start time (HH:MM, 24h). Inclusive.
-  - `end`: end time (HH:MM, 24h). Exclusive. Use `"24:00"` for end-of-day.
-  - `timezone`: `"user"` (default), `"local"`, or an IANA timezone id.
-- `target`: optional delivery channel (`last`, `whatsapp`, `telegram`, `discord`, `slack`, `signal`, `imessage`, `none`). Default: `last`.
+- `session`: optional session key to control which session the heartbeat runs in. Default: `main`.
 - `to`: optional recipient override (channel-specific id, e.g. E.164 for WhatsApp, chat id for Telegram).
+- `target`: optional delivery channel (`last`, `whatsapp`, `telegram`, `discord`, `slack`, `msteams`, `signal`, `imessage`, `none`). Default: `last`.
 - `prompt`: optional override for the heartbeat body (default: `Read HEARTBEAT.md if it exists (workspace context). Follow it strictly. Do not infer or repeat old tasks from prior chats. If nothing needs attention, reply HEARTBEAT_OK.`). Overrides are sent verbatim; include a `Read HEARTBEAT.md` line if you still want the file read.
 - `ackMaxChars`: max chars allowed after `HEARTBEAT_OK` before delivery (default: 300).
 
@@ -1773,7 +1775,6 @@ Note: `applyPatch` is only under `tools.exec`.
 - `tools.web.fetch.maxChars` (default 50000)
 - `tools.web.fetch.timeoutSeconds` (default 30)
 - `tools.web.fetch.cacheTtlMinutes` (default 15)
-- `tools.web.fetch.maxRedirects` (default 3)
 - `tools.web.fetch.userAgent` (optional override)
 - `tools.web.fetch.readability` (default true; disable to use basic HTML cleanup only)
 - `tools.web.fetch.firecrawl.enabled` (default true when an API key is set)
@@ -1840,7 +1841,7 @@ Example:
 
 `agents.defaults.subagents` configures sub-agent defaults:
 - `model`: default model for spawned sub-agents (string or `{ primary, fallbacks }`). If omitted, sub-agents inherit the caller’s model unless overridden per agent or per call.
-- `maxConcurrent`: max concurrent sub-agent runs (default 8)
+- `maxConcurrent`: max concurrent sub-agent runs (default 1)
 - `archiveAfterMinutes`: auto-archive sub-agent sessions after N minutes (default 60; set `0` to disable)
 - Per-subagent tool policy: `tools.subagents.tools.allow` / `tools.subagents.tools.deny` (deny wins)
 
@@ -1974,7 +1975,7 @@ Notes:
 
 `agents.defaults.maxConcurrent` sets the maximum number of embedded agent runs that can
 execute in parallel across sessions. Each session is still serialized (one run
-per session key at a time). Default: 4.
+per session key at a time). Default: 1.
 
 ### `agents.defaults.sandbox`
 
@@ -2452,9 +2453,6 @@ Controls session scoping, reset policy, reset triggers, and where the session st
       dm: { mode: "idle", idleMinutes: 240 },
       group: { mode: "idle", idleMinutes: 120 }
     },
-    resetByChannel: {
-      discord: { mode: "idle", idleMinutes: 10080 }
-    },
     resetTriggers: ["/new", "/reset"],
     // Default is already per-agent under ~/.clawdbot/agents/<agentId>/sessions/sessions.json
     // You can override with {agentId} templating:
@@ -2490,7 +2488,7 @@ Fields:
   - `idleMinutes`: sliding idle window in minutes. When daily + idle are both configured, whichever expires first wins.
 - `resetByType`: per-session overrides for `dm`, `group`, and `thread`.
   - If you only set legacy `session.idleMinutes` without any `reset`/`resetByType`, Clawdbot stays in idle-only mode for backward compatibility.
-- `resetByChannel`: channel-specific reset policy overrides (keyed by channel id, applies to all session types for that channel; overrides `reset`/`resetByType`).
+- `heartbeatIdleMinutes`: optional idle override for heartbeat checks (daily reset still applies when enabled).
 - `agentToAgent.maxPingPongTurns`: max reply-back turns between requester/target (0–5, default 5).
 - `sendPolicy.default`: `allow` or `deny` fallback when no rule matches.
 - `sendPolicy.rules[]`: match by `channel`, `chatType` (`direct|group|room`), or `keyPrefix` (e.g. `cron:`). First deny wins; otherwise allow.
@@ -2617,13 +2615,10 @@ Defaults:
     // noSandbox: false,
     // executablePath: "/Applications/Brave Browser.app/Contents/MacOS/Brave Browser",
     // attachOnly: false, // set true when tunneling a remote CDP to localhost
-    // snapshotDefaults: { mode: "efficient" }, // tool/CLI default snapshot preset
   }
 }
 ```
 
-Note: `browser.snapshotDefaults` only affects Clawdbot's browser tool + CLI. Direct HTTP clients must pass `mode` explicitly.
-
 ### `ui` (Appearance)
 
 Optional accent color used by the native apps for UI chrome (e.g. Talk Mode bubble tint).
@@ -2647,13 +2642,6 @@ Defaults:
 - bind: `loopback`
 - port: `18789` (single port for WS + HTTP)
 
-Bind modes:
-- `loopback`: `127.0.0.1` (local-only)
-- `lan`: `0.0.0.0` (all interfaces)
-- `tailnet`: Tailscale IPv4 address (100.64.0.0/10)
-- `auto`: prefer loopback, fall back to LAN if loopback cannot bind
-- `custom`: `gateway.customBindHost` (IPv4), fallback to LAN if unavailable
-
 ```json5
 {
   gateway: {
@@ -2684,15 +2672,14 @@ Notes:
 - `clawdbot gateway` refuses to start unless `gateway.mode` is set to `local` (or you pass the override flag).
 - `gateway.port` controls the single multiplexed port used for WebSocket + HTTP (control UI, hooks, A2UI).
 - OpenAI Chat Completions endpoint: **disabled by default**; enable with `gateway.http.endpoints.chatCompletions.enabled: true`.
-- OpenResponses endpoint: **disabled by default**; enable with `gateway.http.endpoints.responses.enabled: true`.
 - Precedence: `--port` > `CLAWDBOT_GATEWAY_PORT` > `gateway.port` > default `18789`.
-- Non-loopback binds (`lan`/`tailnet`/`custom`, or `auto` when loopback is unavailable) require auth. Use `gateway.auth.token` (or `CLAWDBOT_GATEWAY_TOKEN`).
+- Non-loopback binds (`lan`/`tailnet`/`auto`) require auth. Use `gateway.auth.token` (or `CLAWDBOT_GATEWAY_TOKEN`).
 - The onboarding wizard generates a gateway token by default (even on loopback).
 - `gateway.remote.token` is **only** for remote CLI calls; it does not enable local gateway auth. `gateway.token` is ignored.
 
 Auth and Tailscale:
 - `gateway.auth.mode` sets the handshake requirements (`token` or `password`).
-- `gateway.auth.token` stores the shared token for token auth (used by the CLI on the same machine and as the bootstrap credential for device pairing).
+- `gateway.auth.token` stores the shared token for token auth (used by the CLI on the same machine).
 - When `gateway.auth.mode` is set, only that method is accepted (plus optional Tailscale headers).
 - `gateway.auth.password` can be set here, or via `CLAWDBOT_GATEWAY_PASSWORD` (recommended).
 - `gateway.auth.allowTailscale` allows Tailscale Serve identity headers
@@ -2701,9 +2688,6 @@ Auth and Tailscale:
   `true`, Serve requests do not need a token/password; set `false` to require
   explicit credentials. Defaults to `true` when `tailscale.mode = "serve"` and
   auth mode is not `password`.
-- After pairing, the Gateway issues **device tokens** scoped to the device role + scopes.
-  These are returned in `hello-ok.auth.deviceToken`; clients should persist and reuse them
-  instead of the shared token. Rotate/revoke via `device.token.rotate`/`device.token.revoke`.
 - `gateway.tailscale.mode: "serve"` uses Tailscale Serve (tailnet only, loopback bind).
 - `gateway.tailscale.mode: "funnel"` exposes the dashboard publicly; requires auth.
 - `gateway.tailscale.resetOnExit` resets Serve/Funnel config on shutdown.
@@ -2712,7 +2696,6 @@ Remote client defaults (CLI):
 - `gateway.remote.url` sets the default Gateway WebSocket URL for CLI calls when `gateway.mode = "remote"`.
 - `gateway.remote.token` supplies the token for remote calls (leave unset for no auth).
 - `gateway.remote.password` supplies the password for remote calls (leave unset for no auth).
-- `gateway.remote.tlsFingerprint` pins the gateway TLS cert fingerprint (sha256).
 
 macOS app behavior:
 - Clawdbot.app watches `~/.clawdbot/clawdbot.json` and switches modes live when `gateway.mode` or `gateway.remote.url` changes.
@@ -2726,36 +2709,12 @@ macOS app behavior:
     remote: {
       url: "ws://gateway.tailnet:18789",
       token: "your-token",
-      password: "your-password",
-      tlsFingerprint: "sha256:ab12cd34..."
+      password: "your-password"
     }
   }
 }
 ```
 
-### `gateway.nodes` (Node command allowlist)
-
-The Gateway enforces a per-platform command allowlist for `node.invoke`. Nodes must both
-**declare** a command and have it **allowed** by the Gateway to run it.
-
-Use this section to extend or deny commands:
-
-```json5
-{
-  gateway: {
-    nodes: {
-      allowCommands: ["custom.vendor.command"], // extra commands beyond defaults
-      denyCommands: ["sms.send"]      // block a command even if declared
-    }
-  }
-}
-```
-
-Notes:
-- `allowCommands` extends the built-in per-platform defaults.
-- `denyCommands` always wins (even if the node claims the command).
-- `node.invoke` rejects commands that are not declared by the node.
-
 ### `gateway.reload` (Config hot reload)
 
 The Gateway watches `~/.clawdbot/clawdbot.json` (or `CLAWDBOT_CONFIG_PATH`) and applies changes automatically.
@@ -3003,7 +2962,7 @@ Auto-generated certs require `openssl` on PATH; if generation fails, the bridge
 
 ### `discovery.wideArea` (Wide-Area Bonjour / unicast DNS‑SD)
 
-When enabled, the Gateway writes a unicast DNS-SD zone for `_clawdbot-gw._tcp` under `~/.clawdbot/dns/` using the standard discovery domain `clawdbot.internal.`
+When enabled, the Gateway writes a unicast DNS-SD zone for `_clawdbot-bridge._tcp` under `~/.clawdbot/dns/` using the standard discovery domain `clawdbot.internal.`
 
 To make iOS/Android discover across networks (Vienna ⇄ London), pair this with:
 - a DNS server on the gateway host serving `clawdbot.internal.` (CoreDNS is recommended)
@@ -3033,9 +2992,6 @@ Template placeholders are expanded in `tools.media.*.models[].args` and `tools.m
 | `{{From}}` | Sender identifier (E.164 for WhatsApp; may differ per channel) |
 | `{{To}}` | Destination identifier |
 | `{{MessageSid}}` | Channel message id (when available) |
-| `{{MessageSidFull}}` | Provider-specific full message id when `MessageSid` is shortened |
-| `{{ReplyToId}}` | Reply-to message id (when available) |
-| `{{ReplyToIdFull}}` | Provider-specific full reply-to id when `ReplyToId` is shortened |
 | `{{SessionId}}` | Current session UUID |
 | `{{IsNewSession}}` | `"true"` when a new session was created |
 | `{{MediaUrl}}` | Inbound media pseudo-URL (if present) |
diff --git a/docs/gateway/heartbeat.md b/docs/gateway/heartbeat.md
index 3c5740da3..cc6c2a7d5 100644
--- a/docs/gateway/heartbeat.md
+++ b/docs/gateway/heartbeat.md
@@ -127,18 +127,26 @@ Example: two agents, only the second agent runs heartbeats.
 - `every`: heartbeat interval (duration string; default unit = minutes).
 - `model`: optional model override for heartbeat runs (`provider/model`).
 - `includeReasoning`: when enabled, also deliver the separate `Reasoning:` message when available (same shape as `/reasoning on`).
+- `session`: optional session key for heartbeat runs.
+  - `main` (default): agent main session.
+  - Explicit session key (copy from `clawdbot sessions --json` or the [sessions CLI](/cli/sessions)).
+  - Session key formats: see [Sessions](/concepts/session) and [Groups](/concepts/groups).
 - `target`:
   - `last` (default): deliver to the last used external channel.
-  - explicit channel: `whatsapp` / `telegram` / `discord` / `slack` / `signal` / `imessage`.
+  - explicit channel: `whatsapp` / `telegram` / `discord` / `slack` / `msteams` / `signal` / `imessage`.
   - `none`: run the heartbeat but **do not deliver** externally.
-- `to`: optional recipient override (E.164 for WhatsApp, chat id for Telegram, etc.).
+- `to`: optional recipient override (channel-specific id, e.g. E.164 for WhatsApp or a Telegram chat id).
 - `prompt`: overrides the default prompt body (not merged).
 - `ackMaxChars`: max chars allowed after `HEARTBEAT_OK` before delivery.
 
 ## Delivery behavior
 
-- Heartbeats run in each agent’s **main session** (`agent:<id>:<mainKey>`), or `global`
-  when `session.scope = "global"`.
+- Heartbeats run in the agent’s main session by default (`agent:<id>:<mainKey>`),
+  or `global` when `session.scope = "global"`. Set `session` to override to a
+  specific channel session (Discord/WhatsApp/etc.).
+- `session` only affects the run context; delivery is controlled by `target` and `to`.
+- To deliver to a specific channel/recipient, set `target` + `to`. With
+  `target: "last"`, delivery uses the last external channel for that session.
 - If the main queue is busy, the heartbeat is skipped and retried later.
 - If `target` resolves to no external destination, the run still happens but no
   outbound message is sent.
diff --git a/src/config/types.agent-defaults.ts b/src/config/types.agent-defaults.ts
index 35d7548ab..11f7cf10d 100644
--- a/src/config/types.agent-defaults.ts
+++ b/src/config/types.agent-defaults.ts
@@ -173,6 +173,8 @@ export type AgentDefaultsConfig = {
     };
     /** Heartbeat model override (provider/model). */
     model?: string;
+    /** Session key for heartbeat runs ("main" or explicit session key). */
+    session?: string;
     /** Delivery target (last|whatsapp|telegram|discord|slack|msteams|signal|imessage|none). */
     target?:
       | "last"
diff --git a/src/config/zod-schema.agent-runtime.ts b/src/config/zod-schema.agent-runtime.ts
index b01fd264b..d34165907 100644
--- a/src/config/zod-schema.agent-runtime.ts
+++ b/src/config/zod-schema.agent-runtime.ts
@@ -20,6 +20,7 @@ export const HeartbeatSchema = z
       .strict()
       .optional(),
     model: z.string().optional(),
+    session: z.string().optional(),
     includeReasoning: z.boolean().optional(),
     target: z
       .union([
diff --git a/src/infra/heartbeat-runner.respects-ackmaxchars-heartbeat-acks.test.ts b/src/infra/heartbeat-runner.respects-ackmaxchars-heartbeat-acks.test.ts
index aa961a301..7e7ae0b78 100644
--- a/src/infra/heartbeat-runner.respects-ackmaxchars-heartbeat-acks.test.ts
+++ b/src/infra/heartbeat-runner.respects-ackmaxchars-heartbeat-acks.test.ts
@@ -41,7 +41,6 @@ describe("resolveHeartbeatIntervalMs", () => {
             heartbeat: {
               every: "5m",
               target: "whatsapp",
-              to: "+1555",
               ackMaxChars: 0,
             },
           },
@@ -58,6 +57,7 @@ describe("resolveHeartbeatIntervalMs", () => {
             [sessionKey]: {
               sessionId: "sid",
               updatedAt: Date.now(),
+              lastChannel: "whatsapp",
               lastProvider: "whatsapp",
               lastTo: "+1555",
             },
@@ -102,7 +102,6 @@ describe("resolveHeartbeatIntervalMs", () => {
             heartbeat: {
               every: "5m",
               target: "whatsapp",
-              to: "+1555",
             },
           },
         },
@@ -118,6 +117,7 @@ describe("resolveHeartbeatIntervalMs", () => {
             [sessionKey]: {
               sessionId: "sid",
               updatedAt: Date.now(),
+              lastChannel: "whatsapp",
               lastProvider: "whatsapp",
               lastTo: "+1555",
             },
@@ -164,7 +164,6 @@ describe("resolveHeartbeatIntervalMs", () => {
             heartbeat: {
               every: "5m",
               target: "whatsapp",
-              to: "+1555",
             },
           },
         },
@@ -180,6 +179,7 @@ describe("resolveHeartbeatIntervalMs", () => {
             [sessionKey]: {
               sessionId: "sid",
               updatedAt: originalUpdatedAt,
+              lastChannel: "whatsapp",
               lastProvider: "whatsapp",
               lastTo: "+1555",
             },
@@ -231,7 +231,7 @@ describe("resolveHeartbeatIntervalMs", () => {
       const cfg: ClawdbotConfig = {
         agents: {
           defaults: {
-            heartbeat: { every: "5m", target: "whatsapp", to: "+1555" },
+            heartbeat: { every: "5m", target: "whatsapp" },
           },
         },
         channels: { whatsapp: { allowFrom: ["*"] } },
@@ -246,6 +246,7 @@ describe("resolveHeartbeatIntervalMs", () => {
             [sessionKey]: {
               sessionId: "sid",
               updatedAt: Date.now(),
+              lastChannel: "whatsapp",
               lastProvider: "whatsapp",
               lastTo: "+1555",
             },
@@ -291,7 +292,7 @@ describe("resolveHeartbeatIntervalMs", () => {
       const cfg: ClawdbotConfig = {
         agents: {
           defaults: {
-            heartbeat: { every: "5m", target: "telegram", to: "123456" },
+            heartbeat: { every: "5m", target: "telegram" },
           },
         },
         channels: { telegram: { botToken: "test-bot-token-123" } },
@@ -306,6 +307,7 @@ describe("resolveHeartbeatIntervalMs", () => {
             [sessionKey]: {
               sessionId: "sid",
               updatedAt: Date.now(),
+              lastChannel: "telegram",
               lastProvider: "telegram",
               lastTo: "123456",
             },
@@ -357,7 +359,7 @@ describe("resolveHeartbeatIntervalMs", () => {
       const cfg: ClawdbotConfig = {
         agents: {
           defaults: {
-            heartbeat: { every: "5m", target: "telegram", to: "123456" },
+            heartbeat: { every: "5m", target: "telegram" },
           },
         },
         channels: {
@@ -378,6 +380,7 @@ describe("resolveHeartbeatIntervalMs", () => {
             [sessionKey]: {
               sessionId: "sid",
               updatedAt: Date.now(),
+              lastChannel: "telegram",
               lastProvider: "telegram",
               lastTo: "123456",
             },
diff --git a/src/infra/heartbeat-runner.returns-default-unset.test.ts b/src/infra/heartbeat-runner.returns-default-unset.test.ts
index c65475d13..fc2027ccf 100644
--- a/src/infra/heartbeat-runner.returns-default-unset.test.ts
+++ b/src/infra/heartbeat-runner.returns-default-unset.test.ts
@@ -11,6 +11,7 @@ import {
   resolveMainSessionKey,
   resolveStorePath,
 } from "../config/sessions.js";
+import { buildAgentPeerSessionKey } from "../routing/session-key.js";
 import {
   isHeartbeatEnabledForAgent,
   resolveHeartbeatIntervalMs,
@@ -332,7 +333,7 @@ describe("runHeartbeatOnce", () => {
       const cfg: ClawdbotConfig = {
         agents: {
           defaults: {
-            heartbeat: { every: "5m", target: "whatsapp", to: "+1555" },
+            heartbeat: { every: "5m", target: "whatsapp" },
           },
         },
         channels: { whatsapp: { allowFrom: ["*"] } },
@@ -395,7 +396,7 @@ describe("runHeartbeatOnce", () => {
             { id: "main", default: true },
             {
               id: "ops",
-              heartbeat: { every: "5m", target: "whatsapp", to: "+1555", prompt: "Ops check" },
+              heartbeat: { every: "5m", target: "whatsapp", prompt: "Ops check" },
             },
           ],
         },
@@ -451,6 +452,86 @@ describe("runHeartbeatOnce", () => {
     }
   });
 
+  it("runs heartbeats in the explicit session key when configured", async () => {
+    const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-hb-"));
+    const storePath = path.join(tmpDir, "sessions.json");
+    const replySpy = vi.spyOn(replyModule, "getReplyFromConfig");
+    try {
+      const groupId = "120363401234567890@g.us";
+      const cfg: ClawdbotConfig = {
+        agents: {
+          defaults: {
+            heartbeat: {
+              every: "5m",
+              target: "last",
+            },
+          },
+        },
+        channels: { whatsapp: { allowFrom: ["*"] } },
+        session: { store: storePath },
+      };
+      const mainSessionKey = resolveMainSessionKey(cfg);
+      const agentId = resolveAgentIdFromSessionKey(mainSessionKey);
+      const groupSessionKey = buildAgentPeerSessionKey({
+        agentId,
+        channel: "whatsapp",
+        peerKind: "group",
+        peerId: groupId,
+      });
+      cfg.agents?.defaults?.heartbeat && (cfg.agents.defaults.heartbeat.session = groupSessionKey);
+
+      await fs.writeFile(
+        storePath,
+        JSON.stringify(
+          {
+            [mainSessionKey]: {
+              sessionId: "sid-main",
+              updatedAt: Date.now(),
+              lastChannel: "whatsapp",
+              lastTo: "+1555",
+            },
+            [groupSessionKey]: {
+              sessionId: "sid-group",
+              updatedAt: Date.now() + 10_000,
+              lastChannel: "whatsapp",
+              lastTo: groupId,
+            },
+          },
+          null,
+          2,
+        ),
+      );
+
+      replySpy.mockResolvedValue([{ text: "Group alert" }]);
+      const sendWhatsApp = vi.fn().mockResolvedValue({
+        messageId: "m1",
+        toJid: "jid",
+      });
+
+      await runHeartbeatOnce({
+        cfg,
+        deps: {
+          sendWhatsApp,
+          getQueueSize: () => 0,
+          nowMs: () => 0,
+          webAuthExists: async () => true,
+          hasActiveWebListener: () => true,
+        },
+      });
+
+      expect(sendWhatsApp).toHaveBeenCalledTimes(1);
+      expect(sendWhatsApp).toHaveBeenCalledWith(groupId, "Group alert", expect.any(Object));
+      expect(replySpy).toHaveBeenCalledWith(
+        expect.objectContaining({ SessionKey: groupSessionKey }),
+        { isHeartbeat: true },
+        cfg,
+      );
+    } finally {
+      replySpy.mockRestore();
+      await fs.rm(tmpDir, { recursive: true, force: true });
+    }
+  });
+
   it("suppresses duplicate heartbeat payloads within 24h", async () => {
     const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-hb-"));
     const storePath = path.join(tmpDir, "sessions.json");
@@ -459,7 +540,7 @@ describe("runHeartbeatOnce", () => {
       const cfg: ClawdbotConfig = {
         agents: {
           defaults: {
-            heartbeat: { every: "5m", target: "whatsapp", to: "+1555" },
+            heartbeat: { every: "5m", target: "whatsapp" },
           },
         },
         channels: { whatsapp: { allowFrom: ["*"] } },
@@ -517,7 +598,6 @@ describe("runHeartbeatOnce", () => {
             heartbeat: {
               every: "5m",
               target: "whatsapp",
-              to: "+1555",
               includeReasoning: true,
             },
           },
@@ -534,6 +614,7 @@ describe("runHeartbeatOnce", () => {
             [sessionKey]: {
               sessionId: "sid",
               updatedAt: Date.now(),
+              lastChannel: "whatsapp",
               lastProvider: "whatsapp",
               lastTo: "+1555",
             },
@@ -588,7 +669,6 @@ describe("runHeartbeatOnce", () => {
             heartbeat: {
               every: "5m",
               target: "whatsapp",
-              to: "+1555",
               includeReasoning: true,
             },
           },
@@ -605,6 +685,7 @@ describe("runHeartbeatOnce", () => {
             [sessionKey]: {
               sessionId: "sid",
               updatedAt: Date.now(),
+              lastChannel: "whatsapp",
               lastProvider: "whatsapp",
               lastTo: "+1555",
             },
@@ -672,6 +753,7 @@ describe("runHeartbeatOnce", () => {
             [sessionKey]: {
               sessionId: "sid",
               updatedAt: Date.now(),
+              lastChannel: "whatsapp",
               lastProvider: "whatsapp",
               lastTo: "+1555",
             },
diff --git a/src/infra/heartbeat-runner.ts b/src/infra/heartbeat-runner.ts
index 92853a1f0..5a66714fd 100644
--- a/src/infra/heartbeat-runner.ts
+++ b/src/infra/heartbeat-runner.ts
@@ -1,5 +1,4 @@
 import { resolveAgentConfig, resolveDefaultAgentId } from "../agents/agent-scope.js";
-import { resolveUserTimezone } from "../agents/date-time.js";
 import { resolveEffectiveMessagesConfig } from "../agents/identity.js";
 import {
   DEFAULT_HEARTBEAT_ACK_MAX_CHARS,
@@ -16,6 +15,8 @@ import type { ClawdbotConfig } from "../config/config.js";
 import { loadConfig } from "../config/config.js";
 import {
   loadSessionStore,
+  canonicalizeMainSessionAlias,
+  resolveAgentIdFromSessionKey,
   resolveAgentMainSessionKey,
   resolveStorePath,
   saveSessionStore,
@@ -25,9 +26,8 @@ import type { AgentDefaultsConfig } from "../config/types.agent-defaults.js";
 import { formatErrorMessage } from "../infra/errors.js";
 import { createSubsystemLogger } from "../logging/subsystem.js";
 import { getQueueSize } from "../process/command-queue.js";
-import { CommandLane } from "../process/lanes.js";
 import { defaultRuntime, type RuntimeEnv } from "../runtime.js";
-import { normalizeAgentId } from "../routing/session-key.js";
+import { normalizeAgentId, toAgentStoreSessionKey } from "../routing/session-key.js";
 import { emitHeartbeatEvent } from "./heartbeat-events.js";
 import {
   type HeartbeatRunResult,
@@ -70,94 +70,6 @@ export type HeartbeatSummary = {
 };
 
 const DEFAULT_HEARTBEAT_TARGET = "last";
-const ACTIVE_HOURS_TIME_PATTERN = /^([01]\d|2[0-3]|24):([0-5]\d)$/;
-
-function resolveActiveHoursTimezone(cfg: ClawdbotConfig, raw?: string): string {
-  const trimmed = raw?.trim();
-  if (!trimmed || trimmed === "user") {
-    return resolveUserTimezone(cfg.agents?.defaults?.userTimezone);
-  }
-  if (trimmed === "local") {
-    const host = Intl.DateTimeFormat().resolvedOptions().timeZone;
-    return host?.trim() || "UTC";
-  }
-  try {
-    new Intl.DateTimeFormat("en-US", { timeZone: trimmed }).format(new Date());
-    return trimmed;
-  } catch {
-    return resolveUserTimezone(cfg.agents?.defaults?.userTimezone);
-  }
-}
-
-function parseActiveHoursTime(opts: { allow24: boolean }, raw?: string): number | null {
-  if (!raw || !ACTIVE_HOURS_TIME_PATTERN.test(raw)) return null;
-  const [hourStr, minuteStr] = raw.split(":");
-  const hour = Number(hourStr);
-  const minute = Number(minuteStr);
-  if (!Number.isFinite(hour) || !Number.isFinite(minute)) return null;
-  if (hour === 24) {
-    if (!opts.allow24 || minute !== 0) return null;
-    return 24 * 60;
-  }
-  return hour * 60 + minute;
-}
-
-function resolveMinutesInTimeZone(nowMs: number, timeZone: string): number | null {
-  try {
-    const parts = new Intl.DateTimeFormat("en-US", {
-      timeZone,
-      hour: "2-digit",
-      minute: "2-digit",
-      hourCycle: "h23",
-    }).formatToParts(new Date(nowMs));
-    const map: Record<string, string> = {};
-    for (const part of parts) {
-      if (part.type !== "literal") map[part.type] = part.value;
-    }
-    const hour = Number(map.hour);
-    const minute = Number(map.minute);
-    if (!Number.isFinite(hour) || !Number.isFinite(minute)) return null;
-    return hour * 60 + minute;
-  } catch {
-    return null;
-  }
-}
-
-function isWithinActiveHours(
-  cfg: ClawdbotConfig,
-  heartbeat?: HeartbeatConfig,
-  nowMs?: number,
-): boolean {
-  const active = heartbeat?.activeHours;
-  if (!active) return true;
-
-  const startMin = parseActiveHoursTime({ allow24: false }, active.start);
-  const endMin = parseActiveHoursTime({ allow24: true }, active.end);
-  if (startMin === null || endMin === null) return true;
-  if (startMin === endMin) return true;
-
-  const timeZone = resolveActiveHoursTimezone(cfg, active.timezone);
-  const currentMin = resolveMinutesInTimeZone(nowMs ?? Date.now(), timeZone);
-  if (currentMin === null) return true;
-
-  if (endMin > startMin) {
-    return currentMin >= startMin && currentMin < endMin;
-  }
-  return currentMin >= startMin || currentMin < endMin;
-}
-
-type HeartbeatAgentState = {
-  agentId: string;
-  heartbeat?: HeartbeatConfig;
-  intervalMs: number;
-  lastRunMs?: number;
-  nextDueMs: number;
-};
-
-export type HeartbeatRunner = {
-  stop: () => void;
-  updateConfig: (cfg: ClawdbotConfig) => void;
-};
 
 function hasExplicitHeartbeatAgents(cfg: ClawdbotConfig) {
   const list = cfg.agents?.list ?? [];
@@ -286,17 +198,53 @@ function resolveHeartbeatAckMaxChars(cfg: ClawdbotConfig, heartbeat?: HeartbeatC
   );
 }
 
-function resolveHeartbeatSession(cfg: ClawdbotConfig, agentId?: string) {
+function resolveHeartbeatSession(
+  cfg: ClawdbotConfig,
+  agentId?: string,
+  heartbeat?: HeartbeatConfig,
+) {
   const sessionCfg = cfg.session;
   const scope = sessionCfg?.scope ?? "per-sender";
   const resolvedAgentId = normalizeAgentId(agentId ?? resolveDefaultAgentId(cfg));
-  const sessionKey =
+  const mainSessionKey =
     scope === "global" ? "global" : resolveAgentMainSessionKey({ cfg, agentId: resolvedAgentId });
   const storeAgentId = scope === "global" ? resolveDefaultAgentId(cfg) : resolvedAgentId;
   const storePath = resolveStorePath(sessionCfg?.store, { agentId: storeAgentId });
   const store = loadSessionStore(storePath);
-  const entry = store[sessionKey];
-  return { sessionKey, storePath, store, entry };
+  const mainEntry = store[mainSessionKey];
+
+  if (scope === "global") {
+    return { sessionKey: mainSessionKey, storePath, store, entry: mainEntry };
+  }
+
+  const trimmed = heartbeat?.session?.trim() ?? "";
+  if (!trimmed) {
+    return { sessionKey: mainSessionKey, storePath, store, entry: mainEntry };
+  }
+
+  const normalized = trimmed.toLowerCase();
+  if (normalized === "main" || normalized === "global") {
+    return { sessionKey: mainSessionKey, storePath, store, entry: mainEntry };
+  }
+
+  const candidate = toAgentStoreSessionKey({
+    agentId: resolvedAgentId,
+    requestKey: trimmed,
+    mainKey: cfg.session?.mainKey,
+  });
+  const canonical = canonicalizeMainSessionAlias({
+    cfg,
+    agentId: resolvedAgentId,
+    sessionKey: candidate,
+  });
+  if (canonical !== "global") {
+    const sessionAgentId = resolveAgentIdFromSessionKey(canonical);
+    if (sessionAgentId === normalizeAgentId(resolvedAgentId)) {
+      return { sessionKey: canonical, storePath, store, entry: store[canonical] };
+    }
+  }
+
+  return { sessionKey: mainSessionKey, storePath, store, entry: mainEntry };
 }
 
 function resolveHeartbeatReplyPayload(
@@ -417,17 +365,13 @@ export async function runHeartbeatOnce(opts: {
     return { status: "skipped", reason: "disabled" };
   }
 
-  const startedAt = opts.deps?.nowMs?.() ?? Date.now();
-  if (!isWithinActiveHours(cfg, heartbeat, startedAt)) {
-    return { status: "skipped", reason: "quiet-hours" };
-  }
-
-  const queueSize = (opts.deps?.getQueueSize ?? getQueueSize)(CommandLane.Main);
+  const queueSize = (opts.deps?.getQueueSize ?? getQueueSize)("main");
   if (queueSize > 0) {
     return { status: "skipped", reason: "requests-in-flight" };
   }
 
-  const { entry, sessionKey, storePath } = resolveHeartbeatSession(cfg, agentId);
+  const startedAt = opts.deps?.nowMs?.() ?? Date.now();
+  const { entry, sessionKey, storePath } = resolveHeartbeatSession(cfg, agentId, heartbeat);
   const previousUpdatedAt = entry?.updatedAt;
   const delivery = resolveHeartbeatDeliveryTarget({ cfg, entry, heartbeat });
   const lastChannel = delivery.lastChannel;
@@ -632,97 +576,24 @@ export function startHeartbeatRunner(opts: {
   cfg?: ClawdbotConfig;
   runtime?: RuntimeEnv;
   abortSignal?: AbortSignal;
-  runOnce?: typeof runHeartbeatOnce;
-}): HeartbeatRunner {
+}) {
+  const cfg = opts.cfg ?? loadConfig();
+  const heartbeatAgents = resolveHeartbeatAgents(cfg);
+  const intervals = heartbeatAgents
+    .map((agent) => resolveHeartbeatIntervalMs(cfg, undefined, agent.heartbeat))
+    .filter((value): value is number => typeof value === "number");
+  const intervalMs = intervals.length > 0 ? Math.min(...intervals) : null;
+  if (!intervalMs) {
+    log.info("heartbeat: disabled", { enabled: false });
+  }
+
   const runtime = opts.runtime ?? defaultRuntime;
-  const runOnce = opts.runOnce ?? runHeartbeatOnce;
-  const state = {
-    cfg: opts.cfg ?? loadConfig(),
-    runtime,
-    agents: new Map<string, HeartbeatAgentState>(),
-    timer: null as NodeJS.Timeout | null,
-    stopped: false,
-  };
-  let initialized = false;
-
-  const resolveNextDue = (now: number, intervalMs: number, prevState?: HeartbeatAgentState) => {
-    if (typeof prevState?.lastRunMs === "number") {
-      return prevState.lastRunMs + intervalMs;
-    }
-    if (prevState && prevState.intervalMs === intervalMs && prevState.nextDueMs > now) {
-      return prevState.nextDueMs;
-    }
-    return now + intervalMs;
-  };
-
-  const scheduleNext = () => {
-    if (state.stopped) return;
-    if (state.timer) {
-      clearTimeout(state.timer);
-      state.timer = null;
-    }
-    if (state.agents.size === 0) return;
-    const now = Date.now();
-    let nextDue = Number.POSITIVE_INFINITY;
-    for (const agent of state.agents.values()) {
-      if (agent.nextDueMs < nextDue) nextDue = agent.nextDueMs;
-    }
-    if (!Number.isFinite(nextDue)) return;
-    const delay = Math.max(0, nextDue - now);
-    state.timer = setTimeout(() => {
-      requestHeartbeatNow({ reason: "interval", coalesceMs: 0 });
-    }, delay);
-    state.timer.unref?.();
-  };
-
-  const updateConfig = (cfg: ClawdbotConfig) => {
-    if (state.stopped) return;
-    const now = Date.now();
-    const prevAgents = state.agents;
-    const prevEnabled = prevAgents.size > 0;
-    const nextAgents = new Map<string, HeartbeatAgentState>();
-    const intervals: number[] = [];
-    for (const agent of resolveHeartbeatAgents(cfg)) {
-      const intervalMs = resolveHeartbeatIntervalMs(cfg, undefined, agent.heartbeat);
-      if (!intervalMs) continue;
-      intervals.push(intervalMs);
-      const prevState = prevAgents.get(agent.agentId);
-      const nextDueMs = resolveNextDue(now, intervalMs, prevState);
-      nextAgents.set(agent.agentId, {
-        agentId: agent.agentId,
-        heartbeat: agent.heartbeat,
-        intervalMs,
-        lastRunMs: prevState?.lastRunMs,
-        nextDueMs,
-      });
-    }
-
-    state.cfg = cfg;
-    state.agents = nextAgents;
-    const nextEnabled = nextAgents.size > 0;
-    if (!initialized) {
-      if (!nextEnabled) {
-        log.info("heartbeat: disabled", { enabled: false });
-      } else {
-        log.info("heartbeat: started", { intervalMs: Math.min(...intervals) });
-      }
-      initialized = true;
-    } else if (prevEnabled !== nextEnabled) {
-      if (!nextEnabled) {
-        log.info("heartbeat: disabled", { enabled: false });
-      } else {
-        log.info("heartbeat: started", { intervalMs: Math.min(...intervals) });
-      }
-    }
-
-    scheduleNext();
-  };
-
+  const lastRunByAgent = new Map<string, number>();
   const run: HeartbeatWakeHandler = async (params) => {
     if (!heartbeatsEnabled) {
       return { status: "skipped", reason: "disabled" } satisfies HeartbeatRunResult;
     }
-    if (state.agents.size === 0) {
+    if (heartbeatAgents.length === 0) {
       return { status: "skipped", reason: "disabled" } satisfies HeartbeatRunResult;
     }
 
@@ -732,44 +603,52 @@ export function startHeartbeatRunner(opts: {
     const now = startedAt;
     let ran = false;
 
-    for (const agent of state.agents.values()) {
-      if (isInterval && now < agent.nextDueMs) {
+    for (const agent of heartbeatAgents) {
+      const agentIntervalMs = resolveHeartbeatIntervalMs(cfg, undefined, agent.heartbeat);
+      if (!agentIntervalMs) continue;
+      const lastRun = lastRunByAgent.get(agent.agentId);
+      if (isInterval && typeof lastRun === "number" && now - lastRun < agentIntervalMs) {
         continue;
       }
 
-      const res = await runOnce({
-        cfg: state.cfg,
+      const res = await runHeartbeatOnce({
+        cfg,
         agentId: agent.agentId,
         heartbeat: agent.heartbeat,
         reason,
-        deps: { runtime: state.runtime },
+        deps: { runtime },
       });
       if (res.status === "skipped" && res.reason === "requests-in-flight") {
         return res;
       }
       if (res.status !== "skipped" || res.reason !== "disabled") {
-        agent.lastRunMs = now;
-        agent.nextDueMs = now + agent.intervalMs;
+        lastRunByAgent.set(agent.agentId, now);
       }
       if (res.status === "ran") ran = true;
     }
 
-    scheduleNext();
     if (ran) return { status: "ran", durationMs: Date.now() - startedAt };
     return { status: "skipped", reason: isInterval ? "not-due" : "disabled" };
   };
 
   setHeartbeatWakeHandler(async (params) => run({ reason: params.reason }));
-  updateConfig(state.cfg);
+
+  let timer: NodeJS.Timeout | null = null;
+  if (intervalMs) {
+    timer = setInterval(() => {
+      requestHeartbeatNow({ reason: "interval", coalesceMs: 0 });
+    }, intervalMs);
+    timer.unref?.();
+    log.info("heartbeat: started", { intervalMs });
+  }
 
   const cleanup = () => {
-    state.stopped = true;
     setHeartbeatWakeHandler(null);
-    if (state.timer) clearTimeout(state.timer);
-    state.timer = null;
+    if (timer) clearInterval(timer);
+    timer = null;
   };
 
   opts.abortSignal?.addEventListener("abort", cleanup, { once: true });
 
-  return { stop: cleanup, updateConfig };
+  return { stop: cleanup };
 }

From 39073d5196e15045c07d69fa05c31cc270c2394f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 01:08:11 +0000
Subject: [PATCH 087/171] fix: finish model list alias + heartbeat session
 (#1256) (thanks @zknicker)

---
 CHANGELOG.md                                  |   1 +
 ...ists-allowlisted-models-model-list.test.ts |  37 +--
 ...l-verbose-during-flight-run-toggle.test.ts |   1 +
 ...uick-model-picker-grouped-by-model.test.ts |   6 +-
 src/auto-reply/reply/commands-models.ts       |  31 ++-
 .../directive-handling.model.chat-ux.test.ts  |  12 +-
 .../reply/directive-handling.model.ts         |  51 +---
 ...tbeat-runner.returns-default-unset.test.ts |   4 +-
 src/infra/heartbeat-runner.ts                 | 233 +++++++++++++++---
 9 files changed, 259 insertions(+), 117 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a7af418e..8a6ae14d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Docs: https://docs.clawd.bot
 ## 2026.1.21
 
 ### Changes
+- Heartbeat: allow running heartbeats in an explicit session key. (#1256) Thanks @zknicker.
 - CLI: default exec approvals to the local host, add gateway/node targeting flags, and show target details in allowlist output.
 - CLI: exec approvals mutations render tables instead of raw JSON.
 - Exec approvals: support wildcard agent allowlists (`*`) across all agents.
diff --git a/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts b/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
index 2b42977cb..66f4ebee1 100644
--- a/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.lists-allowlisted-models-model-list.test.ts
@@ -60,7 +60,7 @@ describe("directive behavior", () => {
     vi.restoreAllMocks();
   });
 
-  it("moves /model list to /models", async () => {
+  it("aliases /model list to /models", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       const storePath = path.join(home, "sessions.json");
@@ -84,13 +84,15 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Model listing moved.");
-      expect(text).toContain("Use: /models (providers) or /models <provider> (models)");
+      expect(text).toContain("Providers:");
+      expect(text).toContain("- anthropic");
+      expect(text).toContain("- openai");
+      expect(text).toContain("Use: /models <provider>");
       expect(text).toContain("Switch: /model <provider/model>");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
-  it("shows summary on /model when catalog is unavailable", async () => {
+  it("shows current model when catalog is unavailable", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       vi.mocked(loadModelCatalog).mockResolvedValueOnce([]);
@@ -122,10 +124,10 @@ describe("directive behavior", () => {
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
-  it("moves /model list to /models even when no allowlist is set", async () => {
+  it("includes catalog providers when no allowlist is set", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
-      vi.mocked(loadModelCatalog).mockResolvedValueOnce([
+      vi.mocked(loadModelCatalog).mockResolvedValue([
         { id: "claude-opus-4-5", name: "Opus 4.5", provider: "anthropic" },
         { id: "gpt-4.1-mini", name: "GPT-4.1 Mini", provider: "openai" },
         { id: "grok-4", name: "Grok 4", provider: "xai" },
@@ -151,13 +153,15 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Model listing moved.");
-      expect(text).toContain("Use: /models (providers) or /models <provider> (models)");
-      expect(text).toContain("Switch: /model <provider/model>");
+      expect(text).toContain("Providers:");
+      expect(text).toContain("- anthropic");
+      expect(text).toContain("- openai");
+      expect(text).toContain("- xai");
+      expect(text).toContain("Use: /models <provider>");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
-  it("moves /model list to /models even when catalog is present", async () => {
+  it("lists config-only providers when catalog is present", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       // Catalog present but missing custom providers: /model should still include
@@ -173,7 +177,7 @@ describe("directive behavior", () => {
       const storePath = path.join(home, "sessions.json");
 
       const res = await getReplyFromConfig(
-        { Body: "/model list", From: "+1222", To: "+1222", CommandAuthorized: true },
+        { Body: "/models minimax", From: "+1222", To: "+1222", CommandAuthorized: true },
         {},
         {
           agents: {
@@ -202,13 +206,12 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Model listing moved.");
-      expect(text).toContain("Use: /models (providers) or /models <provider> (models)");
-      expect(text).toContain("Switch: /model <provider/model>");
+      expect(text).toContain("Model set to minimax");
+      expect(text).toContain("minimax/MiniMax-M2.1");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
-  it("moves /model list to /models without listing auth labels", async () => {
+  it("does not repeat missing auth labels on /model list", async () => {
     await withTempHome(async (home) => {
       vi.mocked(runEmbeddedPiAgent).mockReset();
       const storePath = path.join(home, "sessions.json");
@@ -231,9 +234,7 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Model listing moved.");
-      expect(text).toContain("Use: /models (providers) or /models <provider> (models)");
-      expect(text).toContain("Switch: /model <provider/model>");
+      expect(text).toContain("Providers:");
       expect(text).not.toContain("missing (missing)");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
diff --git a/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts b/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
index c3d6a5fdd..74cd2b13e 100644
--- a/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.updates-tool-verbose-during-flight-run-toggle.test.ts
@@ -215,6 +215,7 @@ describe("directive behavior", () => {
       expect(text).toContain("Switch: /model <provider/model>");
       expect(text).toContain("Browse: /models (providers) or /models <provider> (models)");
       expect(text).toContain("More: /model status");
+      expect(text).not.toContain("openai/gpt-4.1-mini");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
diff --git a/src/auto-reply/reply.triggers.trigger-handling.shows-quick-model-picker-grouped-by-model.test.ts b/src/auto-reply/reply.triggers.trigger-handling.shows-quick-model-picker-grouped-by-model.test.ts
index 0de7dedb6..876225295 100644
--- a/src/auto-reply/reply.triggers.trigger-handling.shows-quick-model-picker-grouped-by-model.test.ts
+++ b/src/auto-reply/reply.triggers.trigger-handling.shows-quick-model-picker-grouped-by-model.test.ts
@@ -123,7 +123,7 @@ describe("trigger handling", () => {
       expect(normalized).not.toContain("image");
     });
   });
-  it("moves /model list to /models", async () => {
+  it("aliases /model list to /models", async () => {
     await withTempHome(async (home) => {
       const cfg = makeCfg(home);
       const res = await getReplyFromConfig(
@@ -143,8 +143,8 @@ describe("trigger handling", () => {
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
       const normalized = normalizeTestText(text ?? "");
-      expect(normalized).toContain("Model listing moved.");
-      expect(normalized).toContain("Use: /models (providers) or /models <provider> (models)");
+      expect(normalized).toContain("Providers:");
+      expect(normalized).toContain("Use: /models <provider>");
       expect(normalized).toContain("Switch: /model <provider/model>");
     });
   });
diff --git a/src/auto-reply/reply/commands-models.ts b/src/auto-reply/reply/commands-models.ts
index 652c8d0e8..c7761a8be 100644
--- a/src/auto-reply/reply/commands-models.ts
+++ b/src/auto-reply/reply/commands-models.ts
@@ -7,6 +7,7 @@ import {
   resolveModelRefFromString,
 } from "../../agents/model-selection.js";
 import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "../../agents/defaults.js";
+import type { ClawdbotConfig } from "../../config/config.js";
 import type { ReplyPayload } from "../types.js";
 import type { CommandHandler } from "./commands-types.js";
 
@@ -68,10 +69,11 @@ function parseModelsArgs(raw: string): {
   };
 }
 
-export const handleModelsCommand: CommandHandler = async (params, allowTextCommands) => {
-  if (!allowTextCommands) return null;
-
-  const body = params.command.commandBodyNormalized.trim();
+export async function resolveModelsCommandReply(params: {
+  cfg: ClawdbotConfig;
+  commandBodyNormalized: string;
+}): Promise<ReplyPayload | null> {
+  const body = params.commandBodyNormalized.trim();
   if (!body.startsWith("/models")) return null;
 
   const argText = body.replace(/^\/models\b/i, "").trim();
@@ -164,7 +166,7 @@ export const handleModelsCommand: CommandHandler = async (params, allowTextComma
       "Use: /models <provider>",
       "Switch: /model <provider/model>",
     ];
-    return { reply: { text: lines.join("\n") }, shouldContinue: false };
+    return { text: lines.join("\n") };
   }
 
   if (!byProvider.has(provider)) {
@@ -176,7 +178,7 @@ export const handleModelsCommand: CommandHandler = async (params, allowTextComma
       "",
       "Use: /models <provider>",
     ];
-    return { reply: { text: lines.join("\n") }, shouldContinue: false };
+    return { text: lines.join("\n") };
   }
 
   const models = [...(byProvider.get(provider) ?? new Set<string>())].sort();
@@ -189,7 +191,7 @@ export const handleModelsCommand: CommandHandler = async (params, allowTextComma
       "Browse: /models",
       "Switch: /model <provider/model>",
     ];
-    return { reply: { text: lines.join("\n") }, shouldContinue: false };
+    return { text: lines.join("\n") };
   }
 
   const effectivePageSize = all ? total : pageSize;
@@ -203,7 +205,7 @@ export const handleModelsCommand: CommandHandler = async (params, allowTextComma
       `Try: /models ${provider} ${safePage}`,
       `All: /models ${provider} all`,
     ];
-    return { reply: { text: lines.join("\n") }, shouldContinue: false };
+    return { text: lines.join("\n") };
   }
 
   const startIndex = (safePage - 1) * effectivePageSize;
@@ -226,5 +228,16 @@ export const handleModelsCommand: CommandHandler = async (params, allowTextComma
   }
 
   const payload: ReplyPayload = { text: lines.join("\n") };
-  return { reply: payload, shouldContinue: false };
+  return payload;
+}
+
+export const handleModelsCommand: CommandHandler = async (params, allowTextCommands) => {
+  if (!allowTextCommands) return null;
+
+  const reply = await resolveModelsCommandReply({
+    cfg: params.cfg,
+    commandBodyNormalized: params.command.commandBodyNormalized,
+  });
+  if (!reply) return null;
+  return { reply, shouldContinue: false };
 };
diff --git a/src/auto-reply/reply/directive-handling.model.chat-ux.test.ts b/src/auto-reply/reply/directive-handling.model.chat-ux.test.ts
index 1e8b2dc7b..c1e2ab7d9 100644
--- a/src/auto-reply/reply/directive-handling.model.chat-ux.test.ts
+++ b/src/auto-reply/reply/directive-handling.model.chat-ux.test.ts
@@ -36,7 +36,7 @@ describe("/model chat UX", () => {
     expect(reply?.text).toContain("Switch: /model <provider/model>");
   });
 
-  it("suggests closest match for typos without switching", () => {
+  it("auto-applies closest match for typos", () => {
     const directives = parseInlineDirectives("/model anthropic/claud-opus-4-5");
     const cfg = { commands: { text: true } } as unknown as ClawdbotConfig;
 
@@ -52,9 +52,11 @@ describe("/model chat UX", () => {
       provider: "anthropic",
     });
 
-    expect(resolved.modelSelection).toBeUndefined();
-    expect(resolved.errorText).toContain("Did you mean:");
-    expect(resolved.errorText).toContain("anthropic/claude-opus-4-5");
-    expect(resolved.errorText).toContain("Try: /model anthropic/claude-opus-4-5");
+    expect(resolved.modelSelection).toEqual({
+      provider: "anthropic",
+      model: "claude-opus-4-5",
+      isDefault: true,
+    });
+    expect(resolved.errorText).toBeUndefined();
   });
 });
diff --git a/src/auto-reply/reply/directive-handling.model.ts b/src/auto-reply/reply/directive-handling.model.ts
index dd2f98914..667eb4b90 100644
--- a/src/auto-reply/reply/directive-handling.model.ts
+++ b/src/auto-reply/reply/directive-handling.model.ts
@@ -20,6 +20,7 @@ import {
   resolveProviderEndpointLabel,
 } from "./directive-handling.model-picker.js";
 import type { InlineDirectives } from "./directive-handling.parse.js";
+import { resolveModelsCommandReply } from "./commands-models.js";
 import { type ModelDirectiveSelection, resolveModelDirectiveSelection } from "./model-selection.js";
 
 function buildModelPickerCatalog(params: {
@@ -185,14 +186,11 @@ export async function maybeHandleModelDirectiveInfo(params: {
   });
 
   if (wantsLegacyList) {
-    return {
-      text: [
-        "Model listing moved.",
-        "",
-        "Use: /models (providers) or /models <provider> (models)",
-        "Switch: /model <provider/model>",
-      ].join("\n"),
-    };
+    const reply = await resolveModelsCommandReply({
+      cfg: params.cfg,
+      commandBodyNormalized: "/models",
+    });
+    return reply ?? { text: "No models available." };
   }
 
   if (wantsSummary) {
@@ -340,42 +338,7 @@ export function resolveModelSelectionFromDirective(params: {
     }
 
     if (resolved.selection) {
-      const suggestion = `${resolved.selection.provider}/${resolved.selection.model}`;
-      const rawHasSlash = raw.includes("/");
-      const shouldAutoSelect = (() => {
-        if (!rawHasSlash) return true;
-        const slash = raw.indexOf("/");
-        if (slash <= 0) return true;
-        const rawProvider = normalizeProviderId(raw.slice(0, slash));
-        const rawFragment = raw
-          .slice(slash + 1)
-          .trim()
-          .toLowerCase();
-        if (!rawFragment) return false;
-        const resolvedProvider = normalizeProviderId(resolved.selection.provider);
-        if (rawProvider !== resolvedProvider) return false;
-        const resolvedModel = resolved.selection.model.toLowerCase();
-        return (
-          resolvedModel.startsWith(rawFragment) ||
-          resolvedModel.includes(rawFragment) ||
-          rawFragment.startsWith(resolvedModel)
-        );
-      })();
-
-      if (shouldAutoSelect) {
-        modelSelection = resolved.selection;
-      } else {
-        return {
-          errorText: [
-            `Unrecognized model: ${raw}`,
-            "",
-            `Did you mean: ${suggestion}`,
-            `Try: /model ${suggestion}`,
-            "",
-            "Browse: /models or /models <provider>",
-          ].join("\n"),
-        };
-      }
+      modelSelection = resolved.selection;
     }
   }
 
diff --git a/src/infra/heartbeat-runner.returns-default-unset.test.ts b/src/infra/heartbeat-runner.returns-default-unset.test.ts
index fc2027ccf..e52c578e7 100644
--- a/src/infra/heartbeat-runner.returns-default-unset.test.ts
+++ b/src/infra/heartbeat-runner.returns-default-unset.test.ts
@@ -478,7 +478,9 @@ describe("runHeartbeatOnce", () => {
         peerKind: "group",
         peerId: groupId,
       });
-      cfg.agents?.defaults?.heartbeat && (cfg.agents.defaults.heartbeat.session = groupSessionKey);
+      if (cfg.agents?.defaults?.heartbeat) {
+        cfg.agents.defaults.heartbeat.session = groupSessionKey;
+      }
 
       await fs.writeFile(
         storePath,
diff --git a/src/infra/heartbeat-runner.ts b/src/infra/heartbeat-runner.ts
index 5a66714fd..c39ac6923 100644
--- a/src/infra/heartbeat-runner.ts
+++ b/src/infra/heartbeat-runner.ts
@@ -1,4 +1,5 @@
 import { resolveAgentConfig, resolveDefaultAgentId } from "../agents/agent-scope.js";
+import { resolveUserTimezone } from "../agents/date-time.js";
 import { resolveEffectiveMessagesConfig } from "../agents/identity.js";
 import {
   DEFAULT_HEARTBEAT_ACK_MAX_CHARS,
@@ -14,8 +15,8 @@ import { parseDurationMs } from "../cli/parse-duration.js";
 import type { ClawdbotConfig } from "../config/config.js";
 import { loadConfig } from "../config/config.js";
 import {
-  loadSessionStore,
   canonicalizeMainSessionAlias,
+  loadSessionStore,
   resolveAgentIdFromSessionKey,
   resolveAgentMainSessionKey,
   resolveStorePath,
@@ -26,6 +27,7 @@ import type { AgentDefaultsConfig } from "../config/types.agent-defaults.js";
 import { formatErrorMessage } from "../infra/errors.js";
 import { createSubsystemLogger } from "../logging/subsystem.js";
 import { getQueueSize } from "../process/command-queue.js";
+import { CommandLane } from "../process/lanes.js";
 import { defaultRuntime, type RuntimeEnv } from "../runtime.js";
 import { normalizeAgentId, toAgentStoreSessionKey } from "../routing/session-key.js";
 import { emitHeartbeatEvent } from "./heartbeat-events.js";
@@ -70,6 +72,94 @@ export type HeartbeatSummary = {
 };
 
 const DEFAULT_HEARTBEAT_TARGET = "last";
+const ACTIVE_HOURS_TIME_PATTERN = /^([01]\d|2[0-3]|24):([0-5]\d)$/;
+
+function resolveActiveHoursTimezone(cfg: ClawdbotConfig, raw?: string): string {
+  const trimmed = raw?.trim();
+  if (!trimmed || trimmed === "user") {
+    return resolveUserTimezone(cfg.agents?.defaults?.userTimezone);
+  }
+  if (trimmed === "local") {
+    const host = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    return host?.trim() || "UTC";
+  }
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone: trimmed }).format(new Date());
+    return trimmed;
+  } catch {
+    return resolveUserTimezone(cfg.agents?.defaults?.userTimezone);
+  }
+}
+
+function parseActiveHoursTime(opts: { allow24: boolean }, raw?: string): number | null {
+  if (!raw || !ACTIVE_HOURS_TIME_PATTERN.test(raw)) return null;
+  const [hourStr, minuteStr] = raw.split(":");
+  const hour = Number(hourStr);
+  const minute = Number(minuteStr);
+  if (!Number.isFinite(hour) || !Number.isFinite(minute)) return null;
+  if (hour === 24) {
+    if (!opts.allow24 || minute !== 0) return null;
+    return 24 * 60;
+  }
+  return hour * 60 + minute;
+}
+
+function resolveMinutesInTimeZone(nowMs: number, timeZone: string): number | null {
+  try {
+    const parts = new Intl.DateTimeFormat("en-US", {
+      timeZone,
+      hour: "2-digit",
+      minute: "2-digit",
+      hourCycle: "h23",
+    }).formatToParts(new Date(nowMs));
+    const map: Record<string, string> = {};
+    for (const part of parts) {
+      if (part.type !== "literal") map[part.type] = part.value;
+    }
+    const hour = Number(map.hour);
+    const minute = Number(map.minute);
+    if (!Number.isFinite(hour) || !Number.isFinite(minute)) return null;
+    return hour * 60 + minute;
+  } catch {
+    return null;
+  }
+}
+
+function isWithinActiveHours(
+  cfg: ClawdbotConfig,
+  heartbeat?: HeartbeatConfig,
+  nowMs?: number,
+): boolean {
+  const active = heartbeat?.activeHours;
+  if (!active) return true;
+
+  const startMin = parseActiveHoursTime({ allow24: false }, active.start);
+  const endMin = parseActiveHoursTime({ allow24: true }, active.end);
+  if (startMin === null || endMin === null) return true;
+  if (startMin === endMin) return true;
+
+  const timeZone = resolveActiveHoursTimezone(cfg, active.timezone);
+  const currentMin = resolveMinutesInTimeZone(nowMs ?? Date.now(), timeZone);
+  if (currentMin === null) return true;
+
+  if (endMin > startMin) {
+    return currentMin >= startMin && currentMin < endMin;
+  }
+  return currentMin >= startMin || currentMin < endMin;
+}
+
+type HeartbeatAgentState = {
+  agentId: string;
+  heartbeat?: HeartbeatConfig;
+  intervalMs: number;
+  lastRunMs?: number;
+  nextDueMs: number;
+};
+
+export type HeartbeatRunner = {
+  stop: () => void;
+  updateConfig: (cfg: ClawdbotConfig) => void;
+};
 
 function hasExplicitHeartbeatAgents(cfg: ClawdbotConfig) {
   const list = cfg.agents?.list ?? [];
@@ -365,12 +455,16 @@ export async function runHeartbeatOnce(opts: {
     return { status: "skipped", reason: "disabled" };
   }
 
-  const queueSize = (opts.deps?.getQueueSize ?? getQueueSize)("main");
+  const startedAt = opts.deps?.nowMs?.() ?? Date.now();
+  if (!isWithinActiveHours(cfg, heartbeat, startedAt)) {
+    return { status: "skipped", reason: "quiet-hours" };
+  }
+
+  const queueSize = (opts.deps?.getQueueSize ?? getQueueSize)(CommandLane.Main);
   if (queueSize > 0) {
     return { status: "skipped", reason: "requests-in-flight" };
   }
 
-  const startedAt = opts.deps?.nowMs?.() ?? Date.now();
   const { entry, sessionKey, storePath } = resolveHeartbeatSession(cfg, agentId, heartbeat);
   const previousUpdatedAt = entry?.updatedAt;
   const delivery = resolveHeartbeatDeliveryTarget({ cfg, entry, heartbeat });
@@ -576,24 +670,97 @@ export function startHeartbeatRunner(opts: {
   cfg?: ClawdbotConfig;
   runtime?: RuntimeEnv;
   abortSignal?: AbortSignal;
-}) {
-  const cfg = opts.cfg ?? loadConfig();
-  const heartbeatAgents = resolveHeartbeatAgents(cfg);
-  const intervals = heartbeatAgents
-    .map((agent) => resolveHeartbeatIntervalMs(cfg, undefined, agent.heartbeat))
-    .filter((value): value is number => typeof value === "number");
-  const intervalMs = intervals.length > 0 ? Math.min(...intervals) : null;
-  if (!intervalMs) {
-    log.info("heartbeat: disabled", { enabled: false });
-  }
-
+  runOnce?: typeof runHeartbeatOnce;
+}): HeartbeatRunner {
   const runtime = opts.runtime ?? defaultRuntime;
-  const lastRunByAgent = new Map<string, number>();
+  const runOnce = opts.runOnce ?? runHeartbeatOnce;
+  const state = {
+    cfg: opts.cfg ?? loadConfig(),
+    runtime,
+    agents: new Map<string, HeartbeatAgentState>(),
+    timer: null as NodeJS.Timeout | null,
+    stopped: false,
+  };
+  let initialized = false;
+
+  const resolveNextDue = (now: number, intervalMs: number, prevState?: HeartbeatAgentState) => {
+    if (typeof prevState?.lastRunMs === "number") {
+      return prevState.lastRunMs + intervalMs;
+    }
+    if (prevState && prevState.intervalMs === intervalMs && prevState.nextDueMs > now) {
+      return prevState.nextDueMs;
+    }
+    return now + intervalMs;
+  };
+
+  const scheduleNext = () => {
+    if (state.stopped) return;
+    if (state.timer) {
+      clearTimeout(state.timer);
+      state.timer = null;
+    }
+    if (state.agents.size === 0) return;
+    const now = Date.now();
+    let nextDue = Number.POSITIVE_INFINITY;
+    for (const agent of state.agents.values()) {
+      if (agent.nextDueMs < nextDue) nextDue = agent.nextDueMs;
+    }
+    if (!Number.isFinite(nextDue)) return;
+    const delay = Math.max(0, nextDue - now);
+    state.timer = setTimeout(() => {
+      requestHeartbeatNow({ reason: "interval", coalesceMs: 0 });
+    }, delay);
+    state.timer.unref?.();
+  };
+
+  const updateConfig = (cfg: ClawdbotConfig) => {
+    if (state.stopped) return;
+    const now = Date.now();
+    const prevAgents = state.agents;
+    const prevEnabled = prevAgents.size > 0;
+    const nextAgents = new Map<string, HeartbeatAgentState>();
+    const intervals: number[] = [];
+    for (const agent of resolveHeartbeatAgents(cfg)) {
+      const intervalMs = resolveHeartbeatIntervalMs(cfg, undefined, agent.heartbeat);
+      if (!intervalMs) continue;
+      intervals.push(intervalMs);
+      const prevState = prevAgents.get(agent.agentId);
+      const nextDueMs = resolveNextDue(now, intervalMs, prevState);
+      nextAgents.set(agent.agentId, {
+        agentId: agent.agentId,
+        heartbeat: agent.heartbeat,
+        intervalMs,
+        lastRunMs: prevState?.lastRunMs,
+        nextDueMs,
+      });
+    }
+
+    state.cfg = cfg;
+    state.agents = nextAgents;
+    const nextEnabled = nextAgents.size > 0;
+    if (!initialized) {
+      if (!nextEnabled) {
+        log.info("heartbeat: disabled", { enabled: false });
+      } else {
+        log.info("heartbeat: started", { intervalMs: Math.min(...intervals) });
+      }
+      initialized = true;
+    } else if (prevEnabled !== nextEnabled) {
+      if (!nextEnabled) {
+        log.info("heartbeat: disabled", { enabled: false });
+      } else {
+        log.info("heartbeat: started", { intervalMs: Math.min(...intervals) });
+      }
+    }
+
+    scheduleNext();
+  };
+
   const run: HeartbeatWakeHandler = async (params) => {
     if (!heartbeatsEnabled) {
       return { status: "skipped", reason: "disabled" } satisfies HeartbeatRunResult;
     }
-    if (heartbeatAgents.length === 0) {
+    if (state.agents.size === 0) {
       return { status: "skipped", reason: "disabled" } satisfies HeartbeatRunResult;
     }
 
@@ -603,52 +770,44 @@ export function startHeartbeatRunner(opts: {
     const now = startedAt;
     let ran = false;
 
-    for (const agent of heartbeatAgents) {
-      const agentIntervalMs = resolveHeartbeatIntervalMs(cfg, undefined, agent.heartbeat);
-      if (!agentIntervalMs) continue;
-      const lastRun = lastRunByAgent.get(agent.agentId);
-      if (isInterval && typeof lastRun === "number" && now - lastRun < agentIntervalMs) {
+    for (const agent of state.agents.values()) {
+      if (isInterval && now < agent.nextDueMs) {
         continue;
       }
 
-      const res = await runHeartbeatOnce({
-        cfg,
+      const res = await runOnce({
+        cfg: state.cfg,
         agentId: agent.agentId,
         heartbeat: agent.heartbeat,
         reason,
-        deps: { runtime },
+        deps: { runtime: state.runtime },
       });
       if (res.status === "skipped" && res.reason === "requests-in-flight") {
         return res;
       }
       if (res.status !== "skipped" || res.reason !== "disabled") {
-        lastRunByAgent.set(agent.agentId, now);
+        agent.lastRunMs = now;
+        agent.nextDueMs = now + agent.intervalMs;
       }
       if (res.status === "ran") ran = true;
     }
 
+    scheduleNext();
     if (ran) return { status: "ran", durationMs: Date.now() - startedAt };
     return { status: "skipped", reason: isInterval ? "not-due" : "disabled" };
   };
 
   setHeartbeatWakeHandler(async (params) => run({ reason: params.reason }));
-
-  let timer: NodeJS.Timeout | null = null;
-  if (intervalMs) {
-    timer = setInterval(() => {
-      requestHeartbeatNow({ reason: "interval", coalesceMs: 0 });
-    }, intervalMs);
-    timer.unref?.();
-    log.info("heartbeat: started", { intervalMs });
-  }
+  updateConfig(state.cfg);
 
   const cleanup = () => {
+    state.stopped = true;
     setHeartbeatWakeHandler(null);
-    if (timer) clearInterval(timer);
-    timer = null;
+    if (state.timer) clearTimeout(state.timer);
+    state.timer = null;
   };
 
   opts.abortSignal?.addEventListener("abort", cleanup, { once: true });
 
-  return { stop: cleanup };
+  return { stop: cleanup, updateConfig };
 }

From 1b947dcdf941a120d31af457aaba84c1263cf2cf Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 01:47:43 +0000
Subject: [PATCH 088/171] chore: update dependencies

---
 extensions/diagnostics-otel/package.json |   18 +-
 extensions/nostr/package.json            |    2 +-
 extensions/zalo/package.json             |    2 +-
 package.json                             |   14 +-
 pnpm-lock.yaml                           | 1306 +++++++++++-----------
 5 files changed, 671 insertions(+), 671 deletions(-)

diff --git a/extensions/diagnostics-otel/package.json b/extensions/diagnostics-otel/package.json
index b94526d4e..44fc01dbb 100644
--- a/extensions/diagnostics-otel/package.json
+++ b/extensions/diagnostics-otel/package.json
@@ -10,15 +10,15 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/api-logs": "^0.210.0",
-    "@opentelemetry/exporter-logs-otlp-http": "^0.210.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "^0.210.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.210.0",
-    "@opentelemetry/resources": "^2.4.0",
-    "@opentelemetry/sdk-logs": "^0.210.0",
-    "@opentelemetry/sdk-metrics": "^2.4.0",
-    "@opentelemetry/sdk-node": "^0.210.0",
-    "@opentelemetry/sdk-trace-base": "^2.4.0",
+    "@opentelemetry/api-logs": "^0.211.0",
+    "@opentelemetry/exporter-logs-otlp-http": "^0.211.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.211.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.211.0",
+    "@opentelemetry/resources": "^2.5.0",
+    "@opentelemetry/sdk-logs": "^0.211.0",
+    "@opentelemetry/sdk-metrics": "^2.5.0",
+    "@opentelemetry/sdk-node": "^0.211.0",
+    "@opentelemetry/sdk-trace-base": "^2.5.0",
     "@opentelemetry/semantic-conventions": "^1.39.0"
   }
 }
diff --git a/extensions/nostr/package.json b/extensions/nostr/package.json
index cc13ae5dc..8630ac1d2 100644
--- a/extensions/nostr/package.json
+++ b/extensions/nostr/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "clawdbot": "workspace:*",
-    "nostr-tools": "^2.10.4",
+    "nostr-tools": "^2.19.4",
     "zod": "^4.3.5"
   }
 }
diff --git a/extensions/zalo/package.json b/extensions/zalo/package.json
index af032ca7f..b97b09aca 100644
--- a/extensions/zalo/package.json
+++ b/extensions/zalo/package.json
@@ -28,6 +28,6 @@
   },
   "dependencies": {
     "clawdbot": "workspace:*",
-    "undici": "7.18.2"
+    "undici": "7.19.0"
   }
 }
diff --git a/package.json b/package.json
index 9de1783ca..7ddca7764 100644
--- a/package.json
+++ b/package.json
@@ -153,10 +153,10 @@
     "@grammyjs/transformer-throttler": "^1.2.1",
     "@homebridge/ciao": "^1.3.4",
     "@lydell/node-pty": "1.2.0-beta.3",
-    "@mariozechner/pi-agent-core": "0.49.2",
-    "@mariozechner/pi-ai": "0.49.2",
-    "@mariozechner/pi-coding-agent": "0.49.2",
-    "@mariozechner/pi-tui": "0.49.2",
+    "@mariozechner/pi-agent-core": "0.49.3",
+    "@mariozechner/pi-ai": "0.49.3",
+    "@mariozechner/pi-coding-agent": "0.49.3",
+    "@mariozechner/pi-tui": "0.49.3",
     "@mozilla/readability": "^0.6.0",
     "@sinclair/typebox": "0.34.47",
     "@slack/bolt": "^4.6.0",
@@ -166,7 +166,7 @@
     "body-parser": "^2.2.2",
     "chalk": "^5.6.2",
     "chokidar": "^5.0.0",
-    "chromium-bidi": "13.0.0",
+    "chromium-bidi": "13.0.1",
     "cli-highlight": "^2.1.11",
     "commander": "^14.0.2",
     "croner": "^9.1.0",
@@ -192,7 +192,7 @@
     "sqlite-vec": "0.1.7-alpha.2",
     "tar": "7.5.4",
     "tslog": "^4.10.2",
-    "undici": "^7.18.2",
+    "undici": "^7.19.0",
     "ws": "^8.19.0",
     "yaml": "^2.8.2",
     "zod": "^4.3.5"
@@ -209,7 +209,7 @@
     "@types/body-parser": "^1.19.6",
     "@types/express": "^5.0.6",
     "@types/markdown-it": "^14.1.2",
-    "@types/node": "^25.0.9",
+    "@types/node": "^25.0.10",
     "@types/proper-lockfile": "^4.1.4",
     "@types/qrcode-terminal": "^0.12.2",
     "@types/ws": "^8.18.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e0a669c0e..2827b8511 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,17 +35,17 @@ importers:
         specifier: 1.2.0-beta.3
         version: 1.2.0-beta.3
       '@mariozechner/pi-agent-core':
-        specifier: 0.49.2
-        version: 0.49.2(ws@8.19.0)(zod@4.3.5)
+        specifier: 0.49.3
+        version: 0.49.3(ws@8.19.0)(zod@4.3.5)
       '@mariozechner/pi-ai':
-        specifier: 0.49.2
-        version: 0.49.2(ws@8.19.0)(zod@4.3.5)
+        specifier: 0.49.3
+        version: 0.49.3(ws@8.19.0)(zod@4.3.5)
       '@mariozechner/pi-coding-agent':
-        specifier: 0.49.2
-        version: 0.49.2(ws@8.19.0)(zod@4.3.5)
+        specifier: 0.49.3
+        version: 0.49.3(ws@8.19.0)(zod@4.3.5)
       '@mariozechner/pi-tui':
-        specifier: 0.49.2
-        version: 0.49.2
+        specifier: 0.49.3
+        version: 0.49.3
       '@mozilla/readability':
         specifier: ^0.6.0
         version: 0.6.0
@@ -74,8 +74,8 @@ importers:
         specifier: ^5.0.0
         version: 5.0.0
       chromium-bidi:
-        specifier: 13.0.0
-        version: 13.0.0(devtools-protocol@0.0.1561482)
+        specifier: 13.0.1
+        version: 13.0.1(devtools-protocol@0.0.1561482)
       cli-highlight:
         specifier: ^2.1.11
         version: 2.1.11
@@ -152,8 +152,8 @@ importers:
         specifier: ^4.10.2
         version: 4.10.2
       undici:
-        specifier: ^7.18.2
-        version: 7.18.2
+        specifier: ^7.19.0
+        version: 7.19.0
       ws:
         specifier: ^8.19.0
         version: 8.19.0
@@ -186,8 +186,8 @@ importers:
         specifier: ^14.1.2
         version: 14.1.2
       '@types/node':
-        specifier: ^25.0.9
-        version: 25.0.9
+        specifier: ^25.0.10
+        version: 25.0.10
       '@types/proper-lockfile':
         specifier: ^4.1.4
         version: 4.1.4
@@ -202,7 +202,7 @@ importers:
         version: 7.0.0-dev.20260120.1
       '@vitest/coverage-v8':
         specifier: ^4.0.17
-        version: 4.0.17(@vitest/browser@4.0.17(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17))(vitest@4.0.17)
+        version: 4.0.17(@vitest/browser@4.0.17(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17))(vitest@4.0.17)
       docx-preview:
         specifier: ^0.3.7
         version: 0.3.7
@@ -241,7 +241,7 @@ importers:
         version: 5.9.3
       vitest:
         specifier: ^4.0.17
-        version: 4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.9)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+        version: 4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.10)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
       wireit:
         specifier: ^0.14.12
         version: 0.14.12
@@ -263,32 +263,32 @@ importers:
         specifier: ^1.9.0
         version: 1.9.0
       '@opentelemetry/api-logs':
-        specifier: ^0.210.0
-        version: 0.210.0
+        specifier: ^0.211.0
+        version: 0.211.0
       '@opentelemetry/exporter-logs-otlp-http':
-        specifier: ^0.210.0
-        version: 0.210.0(@opentelemetry/api@1.9.0)
+        specifier: ^0.211.0
+        version: 0.211.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/exporter-metrics-otlp-http':
-        specifier: ^0.210.0
-        version: 0.210.0(@opentelemetry/api@1.9.0)
+        specifier: ^0.211.0
+        version: 0.211.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/exporter-trace-otlp-http':
-        specifier: ^0.210.0
-        version: 0.210.0(@opentelemetry/api@1.9.0)
+        specifier: ^0.211.0
+        version: 0.211.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/resources':
-        specifier: ^2.4.0
-        version: 2.4.0(@opentelemetry/api@1.9.0)
+        specifier: ^2.5.0
+        version: 2.5.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-logs':
-        specifier: ^0.210.0
-        version: 0.210.0(@opentelemetry/api@1.9.0)
+        specifier: ^0.211.0
+        version: 0.211.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-metrics':
-        specifier: ^2.4.0
-        version: 2.4.0(@opentelemetry/api@1.9.0)
+        specifier: ^2.5.0
+        version: 2.5.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-node':
-        specifier: ^0.210.0
-        version: 0.210.0(@opentelemetry/api@1.9.0)
+        specifier: ^0.211.0
+        version: 0.211.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base':
-        specifier: ^2.4.0
-        version: 2.4.0(@opentelemetry/api@1.9.0)
+        specifier: ^2.5.0
+        version: 2.5.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions':
         specifier: ^1.39.0
         version: 1.39.0
@@ -366,7 +366,7 @@ importers:
         specifier: workspace:*
         version: link:../..
       nostr-tools:
-        specifier: ^2.10.4
+        specifier: ^2.19.4
         version: 2.19.4(typescript@5.9.3)
       zod:
         specifier: ^4.3.5
@@ -398,8 +398,8 @@ importers:
         specifier: workspace:*
         version: link:../..
       undici:
-        specifier: 7.18.2
-        version: 7.18.2
+        specifier: 7.19.0
+        version: 7.19.0
 
   extensions/zalouser:
     dependencies:
@@ -426,11 +426,11 @@ importers:
         version: 17.0.1
       vite:
         specifier: 7.3.1
-        version: 7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+        version: 7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
     devDependencies:
       '@vitest/browser-playwright':
         specifier: 4.0.17
-        version: 4.0.17(playwright@1.57.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)
+        version: 4.0.17(playwright@1.57.0)(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)
       playwright:
         specifier: ^1.57.0
         version: 1.57.0
@@ -439,7 +439,7 @@ importers:
         version: 5.9.3
       vitest:
         specifier: 4.0.17
-        version: 4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.9)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+        version: 4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.10)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
 
 packages:
 
@@ -474,111 +474,111 @@ packages:
   '@aws-crypto/util@5.2.0':
     resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==}
 
-  '@aws-sdk/client-bedrock-runtime@3.971.0':
-    resolution: {integrity: sha512-W5c454+PPeN67yKicYkGphzWS/X395Q9DSliQP2ziQekgfd+ESBz54yKzoi/dq8KQoQTGztVzHuP1DR6cIhE9w==}
+  '@aws-sdk/client-bedrock-runtime@3.972.0':
+    resolution: {integrity: sha512-rzSuqgMkL488bR9TnZEALBa+SV1FfR3B7CkYvs6R5uZm2AqBMfq7xNZR/pgMiAH/YLlI9FWAh1aPmdnG7iXxnA==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/client-sso@3.971.0':
-    resolution: {integrity: sha512-Xx+w6DQqJxDdymYyIxyKJnRzPvVJ4e/Aw0czO7aC9L/iraaV7AG8QtRe93OGW6aoHSh72CIiinnpJJfLsQqP4g==}
+  '@aws-sdk/client-sso@3.972.0':
+    resolution: {integrity: sha512-5qw6qLiRE4SUiz0hWy878dSR13tSVhbTWhsvFT8mGHe37NRRiaobm5MA2sWD0deRAuO98djSiV+dhWXa1xIFNw==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/core@3.970.0':
-    resolution: {integrity: sha512-klpzObldOq8HXzDjDlY6K8rMhYZU6mXRz6P9F9N+tWnjoYFfeBMra8wYApydElTUYQKP1O7RLHwH1OKFfKcqIA==}
+  '@aws-sdk/core@3.972.0':
+    resolution: {integrity: sha512-nEeUW2M9F+xdIaD98F5MBcQ4ITtykj3yKbgFZ6J0JtL3bq+Z90szQ6Yy8H/BLPYXTs3V4n9ifnBo8cprRDiE6A==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/credential-provider-env@3.970.0':
-    resolution: {integrity: sha512-rtVzXzEtAfZBfh+lq3DAvRar4c3jyptweOAJR2DweyXx71QSMY+O879hjpMwES7jl07a3O1zlnFIDo4KP/96kQ==}
+  '@aws-sdk/credential-provider-env@3.972.0':
+    resolution: {integrity: sha512-kKHoNv+maHlPQOAhYamhap0PObd16SAb3jwaY0KYgNTiSbeXlbGUZPLioo9oA3wU10zItJzx83ClU7d7h40luA==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/credential-provider-http@3.970.0':
-    resolution: {integrity: sha512-CjDbWL7JxjLc9ZxQilMusWSw05yRvUJKRpz59IxDpWUnSMHC9JMMUUkOy5Izk8UAtzi6gupRWArp4NG4labt9Q==}
+  '@aws-sdk/credential-provider-http@3.972.0':
+    resolution: {integrity: sha512-xzEi81L7I5jGUbpmqEHCe7zZr54hCABdj4H+3LzktHYuovV/oqnvoDdvZpGFR0e/KAw1+PL38NbGrpG30j6qlA==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/credential-provider-ini@3.971.0':
-    resolution: {integrity: sha512-c0TGJG4xyfTZz3SInXfGU8i5iOFRrLmy4Bo7lMyH+IpngohYMYGYl61omXqf2zdwMbDv+YJ9AviQTcCaEUKi8w==}
+  '@aws-sdk/credential-provider-ini@3.972.0':
+    resolution: {integrity: sha512-ruhAMceUIq2aknFd3jhWxmO0P0Efab5efjyIXOkI9i80g+zDY5VekeSxfqRKStEEJSKSCHDLQuOu0BnAn4Rzew==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/credential-provider-login@3.971.0':
-    resolution: {integrity: sha512-yhbzmDOsk0RXD3rTPhZra4AWVnVAC4nFWbTp+sUty1hrOPurUmhuz8bjpLqYTHGnlMbJp+UqkQONhS2+2LzW2g==}
+  '@aws-sdk/credential-provider-login@3.972.0':
+    resolution: {integrity: sha512-SsrsFJsEYAJHO4N/r2P0aK6o8si6f1lprR+Ej8J731XJqTckSGs/HFHcbxOyW/iKt+LNUvZa59/VlJmjhF4bEQ==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/credential-provider-node@3.971.0':
-    resolution: {integrity: sha512-epUJBAKivtJqalnEBRsYIULKYV063o/5mXNJshZfyvkAgNIzc27CmmKRXTN4zaNOZg8g/UprFp25BGsi19x3nQ==}
+  '@aws-sdk/credential-provider-node@3.972.0':
+    resolution: {integrity: sha512-wwJDpEGl6+sOygic8QKu0OHVB8SiodqF1fr5jvUlSFfS6tJss/E9vBc2aFjl7zI6KpAIYfIzIgM006lRrZtWCQ==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/credential-provider-process@3.970.0':
-    resolution: {integrity: sha512-0XeT8OaT9iMA62DFV9+m6mZfJhrD0WNKf4IvsIpj2Z7XbaYfz3CoDDvNoALf3rPY9NzyMHgDxOspmqdvXP00mw==}
+  '@aws-sdk/credential-provider-process@3.972.0':
+    resolution: {integrity: sha512-nmzYhamLDJ8K+v3zWck79IaKMc350xZnWsf/GeaXO6E3MewSzd3lYkTiMi7lEp3/UwDm9NHfPguoPm+mhlSWQQ==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/credential-provider-sso@3.971.0':
-    resolution: {integrity: sha512-dY0hMQ7dLVPQNJ8GyqXADxa9w5wNfmukgQniLxGVn+dMRx3YLViMp5ZpTSQpFhCWNF0oKQrYAI5cHhUJU1hETw==}
+  '@aws-sdk/credential-provider-sso@3.972.0':
+    resolution: {integrity: sha512-6mYyfk1SrMZ15cH9T53yAF4YSnvq4yU1Xlgm3nqV1gZVQzmF5kr4t/F3BU3ygbvzi4uSwWxG3I3TYYS5eMlAyg==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/credential-provider-web-identity@3.971.0':
-    resolution: {integrity: sha512-F1AwfNLr7H52T640LNON/h34YDiMuIqW/ZreGzhRR6vnFGaSPtNSKAKB2ssAMkLM8EVg8MjEAYD3NCUiEo+t/w==}
+  '@aws-sdk/credential-provider-web-identity@3.972.0':
+    resolution: {integrity: sha512-vsJXBGL8H54kz4T6do3p5elATj5d1izVGUXMluRJntm9/I0be/zUYtdd4oDTM2kSUmd4Zhyw3fMQ9lw7CVhd4A==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/eventstream-handler-node@3.971.0':
-    resolution: {integrity: sha512-odU6det/GlQ6CwRjjZggcrkIc2sqH2kF6d6nHuFDowPDwbsFrNNssMTQatKqJ+N6XXL7ylN429VZ898uzsBLTA==}
+  '@aws-sdk/eventstream-handler-node@3.972.0':
+    resolution: {integrity: sha512-B1AEv+TQOVxg2t60GMfrcagJvQjpx1p6UASUoFMLevV9K3WNI5qYTjtutMiifKY0HwK6g86zXgN/dpeaSi3q5Q==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/middleware-eventstream@3.969.0':
-    resolution: {integrity: sha512-gLWuRGZUR4gM5tAAII4Z6zga5wOXWhLSkZLdC2i/K30GlfjJhiXyJodOyAHezxWm8WjUxP9anJq7vlOIQwVKYw==}
+  '@aws-sdk/middleware-eventstream@3.972.0':
+    resolution: {integrity: sha512-DAxRFg8txGGQUOCR3lPK15tjULafmoHR6Vmoi4WAm+GAnR+pHxJQfc2yN1+mfd0q6HqWfTCDJvJg8qZ4I8/I9g==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/middleware-host-header@3.969.0':
-    resolution: {integrity: sha512-AWa4rVsAfBR4xqm7pybQ8sUNJYnjyP/bJjfAw34qPuh3M9XrfGbAHG0aiAfQGrBnmS28jlO6Kz69o+c6PRw1dw==}
+  '@aws-sdk/middleware-host-header@3.972.0':
+    resolution: {integrity: sha512-3eztFI6F9/eHtkIaWKN3nT+PM+eQ6p1MALDuNshFk323ixuCZzOOVT8oUqtZa30Z6dycNXJwhlIq7NhUVFfimw==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/middleware-logger@3.969.0':
-    resolution: {integrity: sha512-xwrxfip7Y2iTtCMJ+iifN1E1XMOuhxIHY9DreMCvgdl4r7+48x2S1bCYPWH3eNY85/7CapBWdJ8cerpEl12sQQ==}
+  '@aws-sdk/middleware-logger@3.972.0':
+    resolution: {integrity: sha512-ZvdyVRwzK+ra31v1pQrgbqR/KsLD+wwJjHgko6JfoKUBIcEfAwJzQKO6HspHxdHWTVUz6MgvwskheR/TTYZl2g==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/middleware-recursion-detection@3.969.0':
-    resolution: {integrity: sha512-2r3PuNquU3CcS1Am4vn/KHFwLi8QFjMdA/R+CRDXT4AFO/0qxevF/YStW3gAKntQIgWgQV8ZdEtKAoJvLI4UWg==}
+  '@aws-sdk/middleware-recursion-detection@3.972.0':
+    resolution: {integrity: sha512-F2SmUeO+S6l1h6dydNet3BQIk173uAkcfU1HDkw/bUdRLAnh15D3HP9vCZ7oCPBNcdEICbXYDmx0BR9rRUHGlQ==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/middleware-user-agent@3.970.0':
-    resolution: {integrity: sha512-dnSJGGUGSFGEX2NzvjwSefH+hmZQ347AwbLhAsi0cdnISSge+pcGfOFrJt2XfBIypwFe27chQhlfuf/gWdzpZg==}
+  '@aws-sdk/middleware-user-agent@3.972.0':
+    resolution: {integrity: sha512-kFHQm2OCBJCzGWRafgdWHGFjitUXY/OxXngymcX4l8CiyiNDZB27HDDBg2yLj3OUJc4z4fexLMmP8r9vgag19g==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/middleware-websocket@3.971.0':
-    resolution: {integrity: sha512-6xsYfJ2kFa8RucaiSEB6F9rhh8mv0xEc7dfOX5lED2HRAPDWTqODKKqJprtCdyYDmT8ICrTZSkensfTsJQU+DQ==}
+  '@aws-sdk/middleware-websocket@3.972.0':
+    resolution: {integrity: sha512-3pvbb/HtE7A8U38jk24RQ9T92d40NNSzjDEVEkBYZYhxExVcJ/Lk5Z+NM283FEtoi1T++oYrLuYDr1CIQxnaXQ==}
     engines: {node: '>= 14.0.0'}
 
-  '@aws-sdk/nested-clients@3.971.0':
-    resolution: {integrity: sha512-TWaILL8GyYlhGrxxnmbkazM4QsXatwQgoWUvo251FXmUOsiXDFDVX3hoGIfB3CaJhV2pJPfebHUNJtY6TjZ11g==}
+  '@aws-sdk/nested-clients@3.972.0':
+    resolution: {integrity: sha512-QGlbnuGzSQJVG6bR9Qw6G0Blh6abFR4VxNa61ttMbzy9jt28xmk2iGtrYLrQPlCCPhY6enHqjTWm3n3LOb0wAw==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/region-config-resolver@3.969.0':
-    resolution: {integrity: sha512-scj9OXqKpcjJ4jsFLtqYWz3IaNvNOQTFFvEY8XMJXTv+3qF5I7/x9SJtKzTRJEBF3spjzBUYPtGFbs9sj4fisQ==}
+  '@aws-sdk/region-config-resolver@3.972.0':
+    resolution: {integrity: sha512-JyOf+R/6vJW8OEVFCAyzEOn2reri/Q+L0z9zx4JQSKWvTmJ1qeFO25sOm8VIfB8URKhfGRTQF30pfYaH2zxt/A==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/token-providers@3.971.0':
-    resolution: {integrity: sha512-4hKGWZbmuDdONMJV0HJ+9jwTDb0zLfKxcCLx2GEnBY31Gt9GeyIQ+DZ97Bb++0voawj6pnZToFikXTyrEq2x+w==}
+  '@aws-sdk/token-providers@3.972.0':
+    resolution: {integrity: sha512-kWlXG+y5nZhgXGEtb72Je+EvqepBPs8E3vZse//1PYLWs2speFqbGE/ywCXmzEJgHgVqSB/u/lqBvs5WlYmSqQ==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/types@3.969.0':
-    resolution: {integrity: sha512-7IIzM5TdiXn+VtgPdVLjmE6uUBUtnga0f4RiSEI1WW10RPuNvZ9U+pL3SwDiRDAdoGrOF9tSLJOFZmfuwYuVYQ==}
+  '@aws-sdk/types@3.972.0':
+    resolution: {integrity: sha512-U7xBIbLSetONxb2bNzHyDgND3oKGoIfmknrEVnoEU4GUSs+0augUOIn9DIWGUO2ETcRFdsRUnmx9KhPT9Ojbug==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/util-endpoints@3.970.0':
-    resolution: {integrity: sha512-TZNZqFcMUtjvhZoZRtpEGQAdULYiy6rcGiXAbLU7e9LSpIYlRqpLa207oMNfgbzlL2PnHko+eVg8rajDiSOYCg==}
+  '@aws-sdk/util-endpoints@3.972.0':
+    resolution: {integrity: sha512-6JHsl1V/a1ZW8D8AFfd4R52fwZPnZ5H4U6DS8m/bWT8qad72NvbOFAC7U2cDtFs2TShqUO3TEiX/EJibtY3ijg==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/util-format-url@3.969.0':
-    resolution: {integrity: sha512-C7ZiE8orcrEF9In+XDlIKrZhMjp0HCPUH6u74pgadE3T2LRre5TmOQcTt785/wVS2G0we9cxkjlzMrfDsfPvFw==}
+  '@aws-sdk/util-format-url@3.972.0':
+    resolution: {integrity: sha512-o4zqsW/PxrcsTla/Yh2dkRS26kP76QQWZq/i/JgVNFBAr9x0E2oJcCeh8Daj2AA+8AZ8VWln9x706FFzWWQwvQ==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/util-locate-window@3.965.2':
-    resolution: {integrity: sha512-qKgO7wAYsXzhwCHhdbaKFyxd83Fgs8/1Ka+jjSPrv2Ll7mB55Wbwlo0kkfMLh993/yEc8aoDIAc1Fz9h4Spi4Q==}
+  '@aws-sdk/util-locate-window@3.965.3':
+    resolution: {integrity: sha512-FNUqAjlKAGA7GM05kywE99q8wiPHPZqrzhq3wXRga6PRD6A0kzT85Pb0AzYBVTBRpSrKyyr6M92Y6bnSBVp2BA==}
     engines: {node: '>=20.0.0'}
 
-  '@aws-sdk/util-user-agent-browser@3.969.0':
-    resolution: {integrity: sha512-bpJGjuKmFr0rA6UKUCmN8D19HQFMLXMx5hKBXqBlPFdalMhxJSjcxzX9DbQh0Fn6bJtxCguFmRGOBdQqNOt49g==}
+  '@aws-sdk/util-user-agent-browser@3.972.0':
+    resolution: {integrity: sha512-eOLdkQyoRbDgioTS3Orr7iVsVEutJyMZxvyZ6WAF95IrF0kfWx5Rd/KXnfbnG/VKa2CvjZiitWfouLzfVEyvJA==}
 
-  '@aws-sdk/util-user-agent-node@3.971.0':
-    resolution: {integrity: sha512-Eygjo9mFzQYjbGY3MYO6CsIhnTwAMd3WmuFalCykqEmj2r5zf0leWrhPaqvA5P68V5JdGfPYgj7vhNOd6CtRBQ==}
+  '@aws-sdk/util-user-agent-node@3.972.0':
+    resolution: {integrity: sha512-GOy+AiSrE9kGiojiwlZvVVSXwylu4+fmP0MJfvras/MwP09RB/YtQuOVR1E0fKQc6OMwaTNBjgAbOEhxuWFbAw==}
     engines: {node: '>=20.0.0'}
     peerDependencies:
       aws-crt: '>=1.0.0'
@@ -586,8 +586,8 @@ packages:
       aws-crt:
         optional: true
 
-  '@aws-sdk/xml-builder@3.969.0':
-    resolution: {integrity: sha512-BSe4Lx/qdRQQdX8cSSI7Et20vqBspzAjBy8ZmXVoyLkol3y4sXBXzn+BiLtR+oh60ExQn6o2DU4QjdOZbXaKIQ==}
+  '@aws-sdk/xml-builder@3.972.0':
+    resolution: {integrity: sha512-POaGMcXnozzqBUyJM3HLUZ9GR6OKJWPGJEmhtTnxZXt8B6JcJ/6K3xRJ5H/j8oovVLz8Wg6vFxAHv8lvuASxMg==}
     engines: {node: '>=20.0.0'}
 
   '@aws/lambda-invoke-store@0.2.3':
@@ -1058,11 +1058,11 @@ packages:
   '@js-sdsl/ordered-map@4.4.2':
     resolution: {integrity: sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==}
 
-  '@keyv/bigmap@1.3.0':
-    resolution: {integrity: sha512-KT01GjzV6AQD5+IYrcpoYLkCu1Jod3nau1Z7EsEuViO3TZGRacSbO9MfHmbJ1WaOXFtWLxPVj169cn2WNKPkIg==}
+  '@keyv/bigmap@1.3.1':
+    resolution: {integrity: sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==}
     engines: {node: '>= 18'}
     peerDependencies:
-      keyv: ^5.5.4
+      keyv: ^5.6.0
 
   '@keyv/serialize@1.1.1':
     resolution: {integrity: sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==}
@@ -1234,22 +1234,22 @@ packages:
     peerDependencies:
       lit: ^3.3.1
 
-  '@mariozechner/pi-agent-core@0.49.2':
-    resolution: {integrity: sha512-bNWCT8x0ayBDoG0z+aW7UEf9RqVmYb5dzyBVSjVxeHEbNIdyZ14sTasgT3NT8J/0r0FlBy9zuNlK7M4EzOSPGw==}
+  '@mariozechner/pi-agent-core@0.49.3':
+    resolution: {integrity: sha512-YL3PrLA8//Cklx58GJBUyNBCVLIOtK+wpAgqimuR03EgToaGPkSM7B/1S4CP4pFkr7b3DTIsC6t++tK7LgfjQg==}
     engines: {node: '>=20.0.0'}
 
-  '@mariozechner/pi-ai@0.49.2':
-    resolution: {integrity: sha512-YgonNYIR0u8RtohT2kxKJYr6ir59GqEQwRwaIgBq6U6VnkxqaoUz8TOQSjS+Dy0pXb+Jd8XBPj1/aZVsSbDbbQ==}
+  '@mariozechner/pi-ai@0.49.3':
+    resolution: {integrity: sha512-FYck4TPrF7ps3WBKxLnBQdda9OXUWN6rukni0LgK8m/GpMAXGienHouDrWPn0XIgTwrz5r7SGI3sfsEYslCICA==}
     engines: {node: '>=20.0.0'}
     hasBin: true
 
-  '@mariozechner/pi-coding-agent@0.49.2':
-    resolution: {integrity: sha512-QigMTh81g9oVn9ROBHl6JjsDrY0b3wHNlZPflgZB1QygwnsgvszFVVhw/axF0Vrz1t4Anf1QQbvdui6dcFT3hw==}
+  '@mariozechner/pi-coding-agent@0.49.3':
+    resolution: {integrity: sha512-V/Fsq0PeYB5svmw5lZsbD/glmkXofegQcPSKecK2ab3VihKwQp/MQfYjyK6nY4b/B1HIugatcDWaH5WvPKIKwg==}
     engines: {node: '>=20.0.0'}
     hasBin: true
 
-  '@mariozechner/pi-tui@0.49.2':
-    resolution: {integrity: sha512-bYjmqpP5YrB8QgnQbD2s7O7o+qWaEUmwR9pnrTNot0qui72P1DBGl8vFxYZryDLDBS4pQHy/wLZWQyTqEL8YcQ==}
+  '@mariozechner/pi-tui@0.49.3':
+    resolution: {integrity: sha512-SyBtQ0B9A/8V4eX7z3l9Q7sEVAnSueNJ1gC6+nRakDBfBOSxuqA61vz6tic0C7Jj46NERRuvJKdQSmk1VP5sUA==}
     engines: {node: '>=20.0.0'}
 
   '@matrix-org/matrix-sdk-crypto-nodejs@0.4.0':
@@ -1569,166 +1569,166 @@ packages:
     resolution: {integrity: sha512-da6KbdNCV5sr1/txD896V+6W0iamFWrvVl8cHkBSPT+YlvmT3DwXa4jxZnQc+gnuTEqSWbBeoSZYTayXH9wXcw==}
     engines: {node: '>= 20'}
 
-  '@opentelemetry/api-logs@0.210.0':
-    resolution: {integrity: sha512-CMtLxp+lYDriveZejpBND/2TmadrrhUfChyxzmkFtHaMDdSKfP59MAYyA0ICBvEBdm3iXwLcaj/8Ic/pnGw9Yg==}
+  '@opentelemetry/api-logs@0.211.0':
+    resolution: {integrity: sha512-swFdZq8MCdmdR22jTVGQDhwqDzcI4M10nhjXkLr1EsIzXgZBqm4ZlmmcWsg3TSNf+3mzgOiqveXmBLZuDi2Lgg==}
     engines: {node: '>=8.0.0'}
 
   '@opentelemetry/api@1.9.0':
     resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
     engines: {node: '>=8.0.0'}
 
-  '@opentelemetry/configuration@0.210.0':
-    resolution: {integrity: sha512-tM0ROS/hZM72kB55cSjDcghVcUXBJdGkGzpkhD7M1B/gpcvZPSGfjFgKN3dgmxNgF76NxtbUwv3ik0wS+Kz52g==}
+  '@opentelemetry/configuration@0.211.0':
+    resolution: {integrity: sha512-PNsCkzsYQKyv8wiUIsH+loC4RYyblOaDnVASBtKS22hK55ToWs2UP6IsrcfSWWn54wWTvVe2gnfwz67Pvrxf2Q==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.9.0
 
-  '@opentelemetry/context-async-hooks@2.4.0':
-    resolution: {integrity: sha512-jn0phJ+hU7ZuvaoZE/8/Euw3gvHJrn2yi+kXrymwObEPVPjtwCmkvXDRQCWli+fCTTF/aSOtXaLr7CLIvv3LQg==}
+  '@opentelemetry/context-async-hooks@2.5.0':
+    resolution: {integrity: sha512-uOXpVX0ZjO7heSVjhheW2XEPrhQAWr2BScDPoZ9UDycl5iuHG+Usyc3AIfG6kZeC1GyLpMInpQ6X5+9n69yOFw==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/core@2.4.0':
-    resolution: {integrity: sha512-KtcyFHssTn5ZgDu6SXmUznS80OFs/wN7y6MyFRRcKU6TOw8hNcGxKvt8hsdaLJfhzUszNSjURetq5Qpkad14Gw==}
+  '@opentelemetry/core@2.5.0':
+    resolution: {integrity: sha512-ka4H8OM6+DlUhSAZpONu0cPBtPPTQKxbxVzC4CzVx5+K4JnroJVBtDzLAMx4/3CDTJXRvVFhpFjtl4SaiTNoyQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/exporter-logs-otlp-grpc@0.210.0':
-    resolution: {integrity: sha512-+BolenqOO6ow65go7uWRYPvvs/BBIWp1mtRn93VvGduqvMVH/IY8nXrt80a4L9hZ7lHi2Tq2/NcC3H2QzcWKag==}
+  '@opentelemetry/exporter-logs-otlp-grpc@0.211.0':
+    resolution: {integrity: sha512-UhOoWENNqyaAMP/dL1YXLkXt6ZBtovkDDs1p4rxto9YwJX1+wMjwg+Obfyg2kwpcMoaiIFT3KQIcLNW8nNGNfQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-logs-otlp-http@0.210.0':
-    resolution: {integrity: sha512-Q8/SEQtgrErbVVRg9M9iaG8m5wdPNdU0UOF7U43sAhwfmPG92ZOk/aenKhg0DXSNJHhkCDNCgS1kSoErAB3z0A==}
+  '@opentelemetry/exporter-logs-otlp-http@0.211.0':
+    resolution: {integrity: sha512-c118Awf1kZirHkqxdcF+rF5qqWwNjJh+BB1CmQvN9AQHC/DUIldy6dIkJn3EKlQnQ3HmuNRKc/nHHt5IusN7mA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-logs-otlp-proto@0.210.0':
-    resolution: {integrity: sha512-Y/yPc+gDhsWB7AsNzQWxblw4ULbvhCycMaQ2aAn+HSAVbgbMiZa0SbclPVHSnpnNzKSLVavFjweAr0pQA1KKLg==}
+  '@opentelemetry/exporter-logs-otlp-proto@0.211.0':
+    resolution: {integrity: sha512-kMvfKMtY5vJDXeLnwhrZMEwhZ2PN8sROXmzacFU/Fnl4Z79CMrOaL7OE+5X3SObRYlDUa7zVqaXp9ZetYCxfDQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-metrics-otlp-grpc@0.210.0':
-    resolution: {integrity: sha512-pWZ/Tjrqev9rdkqe8F6A9FGddLZrjl6iRAU5LBvvRL6I3PSgG8z1xM0cESAy1jzAF4wGohnAh8rB7hHzpUOYEA==}
+  '@opentelemetry/exporter-metrics-otlp-grpc@0.211.0':
+    resolution: {integrity: sha512-D/U3G8L4PzZp8ot5hX9wpgbTymgtLZCiwR7heMe4LsbGV4OdctS1nfyvaQHLT6CiGZ6FjKc1Vk9s6kbo9SWLXQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-metrics-otlp-http@0.210.0':
-    resolution: {integrity: sha512-JpLThG8Hh8A/Jzdzw9i4Ftu+EzvLaX/LouN+mOOHmadL0iror0Qsi3QWzucXeiUsDDsiYgjfKyi09e6sltytgA==}
+  '@opentelemetry/exporter-metrics-otlp-http@0.211.0':
+    resolution: {integrity: sha512-lfHXElPAoDSPpPO59DJdN5FLUnwi1wxluLTWQDayqrSPfWRnluzxRhD+g7rF8wbj1qCz0sdqABl//ug1IZyWvA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-metrics-otlp-proto@0.210.0':
-    resolution: {integrity: sha512-CFa7SOinYOVWIWJuQL7XFeyedzmFGIpHpSMNFE8Xefb6iGB4m+MukQecdssvPcJKYlfF5FpovEOLXwafAzsXWQ==}
+  '@opentelemetry/exporter-metrics-otlp-proto@0.211.0':
+    resolution: {integrity: sha512-61iNbffEpyZv/abHaz3BQM3zUtA2kVIDBM+0dS9RK68ML0QFLRGYa50xVMn2PYMToyfszEPEgFC3ypGae2z8FA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-prometheus@0.210.0':
-    resolution: {integrity: sha512-8i+7d70Hho6pcheTtbqIuS+bo+AIX/oNUTMwIEZoehUE4ZdbGmeVaE+hJS2LAErFeFaU71w164lAgYyMUEQ8zw==}
+  '@opentelemetry/exporter-prometheus@0.211.0':
+    resolution: {integrity: sha512-cD0WleEL3TPqJbvxwz5MVdVJ82H8jl8mvMad4bNU24cB5SH2mRW5aMLDTuV4614ll46R//R3RMmci26mc2L99g==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-trace-otlp-grpc@0.210.0':
-    resolution: {integrity: sha512-1GPLOyxIfUX24WM8Oea+vx9d9TlewposUnsQXTjusxVMQ/dWvt5JIDJyTsfNDS412XRUOORgF97PwsfDY5QKGA==}
+  '@opentelemetry/exporter-trace-otlp-grpc@0.211.0':
+    resolution: {integrity: sha512-eFwx4Gvu6LaEiE1rOd4ypgAiWEdZu7Qzm2QNN2nJqPW1XDeAVH1eNwVcVQl+QK9HR/JCDZ78PZgD7xD/DBDqbw==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-trace-otlp-http@0.210.0':
-    resolution: {integrity: sha512-9JkyaCl70anEtuKZdoCQmjDuz1/paEixY/DWfsvHt7PGKq3t8/nQ/6/xwxHjG+SkPAUbo1Iq4h7STe7Pk2bc5A==}
+  '@opentelemetry/exporter-trace-otlp-http@0.211.0':
+    resolution: {integrity: sha512-F1Rv3JeMkgS//xdVjbQMrI3+26e5SXC7vXA6trx8SWEA0OUhw4JHB+qeHtH0fJn46eFItrYbL5m8j4qi9Sfaxw==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-trace-otlp-proto@0.210.0':
-    resolution: {integrity: sha512-qVUY7Hsm/t5buGOtPcTV1Ch4W9kj2wGaQaAF5FO4XR8TMKl2GM45tUCnr0/1dF3wo4RG9khMxrddeQWdRL4fIg==}
+  '@opentelemetry/exporter-trace-otlp-proto@0.211.0':
+    resolution: {integrity: sha512-DkjXwbPiqpcPlycUojzG2RmR0/SIK8Gi9qWO9znNvSqgzrnAIE9x2n6yPfpZ+kWHZGafvsvA1lVXucTyyQa5Kg==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-zipkin@2.4.0':
-    resolution: {integrity: sha512-qpiXY0TUEFjBBp9b1na9LfuVQw6W8LH+te7uv+CC+0Up78ZDtZZwOjK2M7CL7Nspnw+yS4JdgEA7oxsBu0Ctsg==}
+  '@opentelemetry/exporter-zipkin@2.5.0':
+    resolution: {integrity: sha512-bk9VJgFgUAzkZzU8ZyXBSWiUGLOM3mZEgKJ1+jsZclhRnAoDNf+YBdq+G9R3cP0+TKjjWad+vVrY/bE/vRR9lA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.0.0
 
-  '@opentelemetry/instrumentation@0.210.0':
-    resolution: {integrity: sha512-sLMhyHmW9katVaLUOKpfCnxSGhZq2t1ReWgwsu2cSgxmDVMB690H9TanuexanpFI94PJaokrqbp8u9KYZDUT5g==}
+  '@opentelemetry/instrumentation@0.211.0':
+    resolution: {integrity: sha512-h0nrZEC/zvI994nhg7EgQ8URIHt0uDTwN90r3qQUdZORS455bbx+YebnGeEuFghUT0HlJSrLF4iHw67f+odY+Q==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/otlp-exporter-base@0.210.0':
-    resolution: {integrity: sha512-uk78DcZoBNHIm26h0oXc8Pizh4KDJ/y04N5k/UaI9J7xR7mL8QcMcYPQG9xxN7m8qotXOMDRW6qTAyptav4+3w==}
+  '@opentelemetry/otlp-exporter-base@0.211.0':
+    resolution: {integrity: sha512-bp1+63V8WPV+bRI9EQG6E9YID1LIHYSZVbp7f+44g9tRzCq+rtw/o4fpL5PC31adcUsFiz/oN0MdLISSrZDdrg==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/otlp-grpc-exporter-base@0.210.0':
-    resolution: {integrity: sha512-fEJs8UhkFMrdXMOCLXyKd2uc6N209tIi8IBNqSTi83ri+MlMFrBKnOtklmv9/zzxovoN5zD1waRt6XBFGPfmIw==}
+  '@opentelemetry/otlp-grpc-exporter-base@0.211.0':
+    resolution: {integrity: sha512-mR5X+N4SuphJeb7/K7y0JNMC8N1mB6gEtjyTLv+TSAhl0ZxNQzpSKP8S5Opk90fhAqVYD4R0SQSAirEBlH1KSA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/otlp-transformer@0.210.0':
-    resolution: {integrity: sha512-nkHBJVSJGOwkRZl+BFIr7gikA93/U8XkL2EWaiDbj3DVjmTEZQpegIKk0lT8oqQYfP8FC6zWNjuTfkaBVqa0ZQ==}
+  '@opentelemetry/otlp-transformer@0.211.0':
+    resolution: {integrity: sha512-julhCJ9dXwkOg9svuuYqqjXLhVaUgyUvO2hWbTxwjvLXX2rG3VtAaB0SzxMnGTuoCZizBT7Xqqm2V7+ggrfCXA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/propagator-b3@2.4.0':
-    resolution: {integrity: sha512-6VPsFiMUkJBre/86F0d+PZMaUCcuLA9DtZuC46KH8EeVEKZPEM2WlX35M/qmde8UpzoQL9qzdz54YjUYABt8Uw==}
+  '@opentelemetry/propagator-b3@2.5.0':
+    resolution: {integrity: sha512-g10m4KD73RjHrSvUge+sUxUl8m4VlgnGc6OKvo68a4uMfaLjdFU+AULfvMQE/APq38k92oGUxEzBsAZ8RN/YHg==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/propagator-jaeger@2.4.0':
-    resolution: {integrity: sha512-t6muBL/3AMD++1EMF658C/KIpj3gfmTmftX3mEQql4KIxNGFvacCmmTtrQt9IZAJmQRfjQRCkv+vsGbQugeJIw==}
+  '@opentelemetry/propagator-jaeger@2.5.0':
+    resolution: {integrity: sha512-t70ErZCncAR/zz5AcGkL0TF25mJiK1FfDPEQCgreyAHZ+mRJ/bNUiCnImIBDlP3mSDXy6N09DbUEKq0ktW98Hg==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/resources@2.4.0':
-    resolution: {integrity: sha512-RWvGLj2lMDZd7M/5tjkI/2VHMpXebLgPKvBUd9LRasEWR2xAynDwEYZuLvY9P2NGG73HF07jbbgWX2C9oavcQg==}
+  '@opentelemetry/resources@2.5.0':
+    resolution: {integrity: sha512-F8W52ApePshpoSrfsSk1H2yJn9aKjCrbpQF1M9Qii0GHzbfVeFUB+rc3X4aggyZD8x9Gu3Slua+s6krmq6Dt8g==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.10.0'
 
-  '@opentelemetry/sdk-logs@0.210.0':
-    resolution: {integrity: sha512-YuaL92Dpyk/Kc1o4e9XiaWWwiC0aBFN+4oy+6A9TP4UNJmRymPMEX10r6EMMFMD7V0hktiSig9cwWo59peeLCQ==}
+  '@opentelemetry/sdk-logs@0.211.0':
+    resolution: {integrity: sha512-O5nPwzgg2JHzo59kpQTPUOTzFi0Nv5LxryG27QoXBciX3zWM3z83g+SNOHhiQVYRWFSxoWn1JM2TGD5iNjOwdA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.4.0 <1.10.0'
 
-  '@opentelemetry/sdk-metrics@2.4.0':
-    resolution: {integrity: sha512-qSbfq9mXbLMqmPEjijl32f3ZEmiHekebRggPdPjhHI6t1CsAQOR2Aw/SuTDftk3/l2aaPHpwP3xM2DkgBA1ANw==}
+  '@opentelemetry/sdk-metrics@2.5.0':
+    resolution: {integrity: sha512-BeJLtU+f5Gf905cJX9vXFQorAr6TAfK3SPvTFqP+scfIpDQEJfRaGJWta7sJgP+m4dNtBf9y3yvBKVAZZtJQVA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.9.0 <1.10.0'
 
-  '@opentelemetry/sdk-node@0.210.0':
-    resolution: {integrity: sha512-KymqUtYvfpblDNgGxBXYqCcDjYXwjOF7Muc6ocs0rMlG/66Hcs9KiJ7hg4zLOv63JubF/vxi5WXaLrQrPKyaZQ==}
+  '@opentelemetry/sdk-node@0.211.0':
+    resolution: {integrity: sha512-+s1eGjoqmPCMptNxcJJD4IxbWJKNLOQFNKhpwkzi2gLkEbCj6LzSHJNhPcLeBrBlBLtlSpibM+FuS7fjZ8SSFQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.10.0'
 
-  '@opentelemetry/sdk-trace-base@2.4.0':
-    resolution: {integrity: sha512-WH0xXkz/OHORDLKqaxcUZS0X+t1s7gGlumr2ebiEgNZQl2b0upK2cdoD0tatf7l8iP74woGJ/Kmxe82jdvcWRw==}
+  '@opentelemetry/sdk-trace-base@2.5.0':
+    resolution: {integrity: sha512-VzRf8LzotASEyNDUxTdaJ9IRJ1/h692WyArDBInf5puLCjxbICD6XkHgpuudis56EndyS7LYFmtTMny6UABNdQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.10.0'
 
-  '@opentelemetry/sdk-trace-node@2.4.0':
-    resolution: {integrity: sha512-MBc2l04hZPYygnWPT38UiOPy9ueutPqmJ47z0m9IKuoVQh3MblmbSgwspjhdHagZLfSfmlzhWR1xtbgVNmjX2A==}
+  '@opentelemetry/sdk-trace-node@2.5.0':
+    resolution: {integrity: sha512-O6N/ejzburFm2C84aKNrwJVPpt6HSTSq8T0ZUMq3xT2XmqT4cwxUItcL5UWGThYuq8RTcbH8u1sfj6dmRci0Ow==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
@@ -1860,8 +1860,8 @@ packages:
   '@polka/url@1.0.0-next.29':
     resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
 
-  '@preact/signals-core@1.12.1':
-    resolution: {integrity: sha512-BwbTXpj+9QutoZLQvbttRg5x3l5468qaV2kufh+51yha1c53ep5dY4kTuZR35+3pAZxpfQerGJiQqg34ZNZ6uA==}
+  '@preact/signals-core@1.12.2':
+    resolution: {integrity: sha512-5Yf8h1Ke3SMHr15xl630KtwPTW4sYDFkkxS0vQ8UiQLWwZQnrF9IKaVG1mN5VcJz52EcWs2acsc/Npjha/7ysA==}
 
   '@protobufjs/aspromise@1.1.2':
     resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
@@ -2025,128 +2025,128 @@ packages:
   '@rolldown/pluginutils@1.0.0-beta.60':
     resolution: {integrity: sha512-Jz4aqXRPVtqkH1E3jRDzLO5cgN5JwW+WG0wXGE4NiJd25nougv/AHzxmKCzmVQUYnxLmTM0M4wrZp+LlC2FKLg==}
 
-  '@rollup/rollup-android-arm-eabi@4.55.2':
-    resolution: {integrity: sha512-21J6xzayjy3O6NdnlO6aXi/urvSRjm6nCI6+nF6ra2YofKruGixN9kfT+dt55HVNwfDmpDHJcaS3JuP/boNnlA==}
+  '@rollup/rollup-android-arm-eabi@4.55.3':
+    resolution: {integrity: sha512-qyX8+93kK/7R5BEXPC2PjUt0+fS/VO2BVHjEHyIEWiYn88rcRBHmdLgoJjktBltgAf+NY7RfCGB1SoyKS/p9kg==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.55.2':
-    resolution: {integrity: sha512-eXBg7ibkNUZ+sTwbFiDKou0BAckeV6kIigK7y5Ko4mB/5A1KLhuzEKovsmfvsL8mQorkoincMFGnQuIT92SKqA==}
+  '@rollup/rollup-android-arm64@4.55.3':
+    resolution: {integrity: sha512-6sHrL42bjt5dHQzJ12Q4vMKfN+kUnZ0atHHnv4V0Wd9JMTk7FDzSY35+7qbz3ypQYMBPANbpGK7JpnWNnhGt8g==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.55.2':
-    resolution: {integrity: sha512-UCbaTklREjrc5U47ypLulAgg4njaqfOVLU18VrCrI+6E5MQjuG0lSWaqLlAJwsD7NpFV249XgB0Bi37Zh5Sz4g==}
+  '@rollup/rollup-darwin-arm64@4.55.3':
+    resolution: {integrity: sha512-1ht2SpGIjEl2igJ9AbNpPIKzb1B5goXOcmtD0RFxnwNuMxqkR6AUaaErZz+4o+FKmzxcSNBOLrzsICZVNYa1Rw==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.55.2':
-    resolution: {integrity: sha512-dP67MA0cCMHFT2g5XyjtpVOtp7y4UyUxN3dhLdt11at5cPKnSm4lY+EhwNvDXIMzAMIo2KU+mc9wxaAQJTn7sQ==}
+  '@rollup/rollup-darwin-x64@4.55.3':
+    resolution: {integrity: sha512-FYZ4iVunXxtT+CZqQoPVwPhH7549e/Gy7PIRRtq4t5f/vt54pX6eG9ebttRH6QSH7r/zxAFA4EZGlQ0h0FvXiA==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.55.2':
-    resolution: {integrity: sha512-WDUPLUwfYV9G1yxNRJdXcvISW15mpvod1Wv3ok+Ws93w1HjIVmCIFxsG2DquO+3usMNCpJQ0wqO+3GhFdl6Fow==}
+  '@rollup/rollup-freebsd-arm64@4.55.3':
+    resolution: {integrity: sha512-M/mwDCJ4wLsIgyxv2Lj7Len+UMHd4zAXu4GQ2UaCdksStglWhP61U3uowkaYBQBhVoNpwx5Hputo8eSqM7K82Q==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.55.2':
-    resolution: {integrity: sha512-Ng95wtHVEulRwn7R0tMrlUuiLVL/HXA8Lt/MYVpy88+s5ikpntzZba1qEulTuPnPIZuOPcW9wNEiqvZxZmgmqQ==}
+  '@rollup/rollup-freebsd-x64@4.55.3':
+    resolution: {integrity: sha512-5jZT2c7jBCrMegKYTYTpni8mg8y3uY8gzeq2ndFOANwNuC/xJbVAoGKR9LhMDA0H3nIhvaqUoBEuJoICBudFrA==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.55.2':
-    resolution: {integrity: sha512-AEXMESUDWWGqD6LwO/HkqCZgUE1VCJ1OhbvYGsfqX2Y6w5quSXuyoy/Fg3nRqiwro+cJYFxiw5v4kB2ZDLhxrw==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.55.3':
+    resolution: {integrity: sha512-YeGUhkN1oA+iSPzzhEjVPS29YbViOr8s4lSsFaZKLHswgqP911xx25fPOyE9+khmN6W4VeM0aevbDp4kkEoHiA==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.55.2':
-    resolution: {integrity: sha512-ZV7EljjBDwBBBSv570VWj0hiNTdHt9uGznDtznBB4Caj3ch5rgD4I2K1GQrtbvJ/QiB+663lLgOdcADMNVC29Q==}
+  '@rollup/rollup-linux-arm-musleabihf@4.55.3':
+    resolution: {integrity: sha512-eo0iOIOvcAlWB3Z3eh8pVM8hZ0oVkK3AjEM9nSrkSug2l15qHzF3TOwT0747omI6+CJJvl7drwZepT+re6Fy/w==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.55.2':
-    resolution: {integrity: sha512-uvjwc8NtQVPAJtq4Tt7Q49FOodjfbf6NpqXyW/rjXoV+iZ3EJAHLNAnKT5UJBc6ffQVgmXTUL2ifYiLABlGFqA==}
+  '@rollup/rollup-linux-arm64-gnu@4.55.3':
+    resolution: {integrity: sha512-DJay3ep76bKUDImmn//W5SvpjRN5LmK/ntWyeJs/dcnwiiHESd3N4uteK9FDLf0S0W8E6Y0sVRXpOCoQclQqNg==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.55.2':
-    resolution: {integrity: sha512-s3KoWVNnye9mm/2WpOZ3JeUiediUVw6AvY/H7jNA6qgKA2V2aM25lMkVarTDfiicn/DLq3O0a81jncXszoyCFA==}
+  '@rollup/rollup-linux-arm64-musl@4.55.3':
+    resolution: {integrity: sha512-BKKWQkY2WgJ5MC/ayvIJTHjy0JUGb5efaHCUiG/39sSUvAYRBaO3+/EK0AZT1RF3pSj86O24GLLik9mAYu0IJg==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-loong64-gnu@4.55.2':
-    resolution: {integrity: sha512-gi21faacK+J8aVSyAUptML9VQN26JRxe484IbF+h3hpG+sNVoMXPduhREz2CcYr5my0NE3MjVvQ5bMKX71pfVA==}
+  '@rollup/rollup-linux-loong64-gnu@4.55.3':
+    resolution: {integrity: sha512-Q9nVlWtKAG7ISW80OiZGxTr6rYtyDSkauHUtvkQI6TNOJjFvpj4gcH+KaJihqYInnAzEEUetPQubRwHef4exVg==}
     cpu: [loong64]
     os: [linux]
 
-  '@rollup/rollup-linux-loong64-musl@4.55.2':
-    resolution: {integrity: sha512-qSlWiXnVaS/ceqXNfnoFZh4IiCA0EwvCivivTGbEu1qv2o+WTHpn1zNmCTAoOG5QaVr2/yhCoLScQtc/7RxshA==}
+  '@rollup/rollup-linux-loong64-musl@4.55.3':
+    resolution: {integrity: sha512-2H5LmhzrpC4fFRNwknzmmTvvyJPHwESoJgyReXeFoYYuIDfBhP29TEXOkCJE/KxHi27mj7wDUClNq78ue3QEBQ==}
     cpu: [loong64]
     os: [linux]
 
-  '@rollup/rollup-linux-ppc64-gnu@4.55.2':
-    resolution: {integrity: sha512-rPyuLFNoF1B0+wolH277E780NUKf+KoEDb3OyoLbAO18BbeKi++YN6gC/zuJoPPDlQRL3fIxHxCxVEWiem2yXw==}
+  '@rollup/rollup-linux-ppc64-gnu@4.55.3':
+    resolution: {integrity: sha512-9S542V0ie9LCTznPYlvaeySwBeIEa7rDBgLHKZ5S9DBgcqdJYburabm8TqiqG6mrdTzfV5uttQRHcbKff9lWtA==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-ppc64-musl@4.55.2':
-    resolution: {integrity: sha512-g+0ZLMook31iWV4PvqKU0i9E78gaZgYpSrYPed/4Bu+nGTgfOPtfs1h11tSSRPXSjC5EzLTjV/1A7L2Vr8pJoQ==}
+  '@rollup/rollup-linux-ppc64-musl@4.55.3':
+    resolution: {integrity: sha512-ukxw+YH3XXpcezLgbJeasgxyTbdpnNAkrIlFGDl7t+pgCxZ89/6n1a+MxlY7CegU+nDgrgdqDelPRNQ/47zs0g==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.55.2':
-    resolution: {integrity: sha512-i+sGeRGsjKZcQRh3BRfpLsM3LX3bi4AoEVqmGDyc50L6KfYsN45wVCSz70iQMwPWr3E5opSiLOwsC9WB4/1pqg==}
+  '@rollup/rollup-linux-riscv64-gnu@4.55.3':
+    resolution: {integrity: sha512-Iauw9UsTTvlF++FhghFJjqYxyXdggXsOqGpFBylaRopVpcbfyIIsNvkf9oGwfgIcf57z3m8+/oSYTo6HutBFNw==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-musl@4.55.2':
-    resolution: {integrity: sha512-C1vLcKc4MfFV6I0aWsC7B2Y9QcsiEcvKkfxprwkPfLaN8hQf0/fKHwSF2lcYzA9g4imqnhic729VB9Fo70HO3Q==}
+  '@rollup/rollup-linux-riscv64-musl@4.55.3':
+    resolution: {integrity: sha512-3OqKAHSEQXKdq9mQ4eajqUgNIK27VZPW3I26EP8miIzuKzCJ3aW3oEn2pzF+4/Hj/Moc0YDsOtBgT5bZ56/vcA==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.55.2':
-    resolution: {integrity: sha512-68gHUK/howpQjh7g7hlD9DvTTt4sNLp1Bb+Yzw2Ki0xvscm2cOdCLZNJNhd2jW8lsTPrHAHuF751BygifW4bkQ==}
+  '@rollup/rollup-linux-s390x-gnu@4.55.3':
+    resolution: {integrity: sha512-0CM8dSVzVIaqMcXIFej8zZrSFLnGrAE8qlNbbHfTw1EEPnFTg1U1ekI0JdzjPyzSfUsHWtodilQQG/RA55berA==}
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.55.2':
-    resolution: {integrity: sha512-1e30XAuaBP1MAizaOBApsgeGZge2/Byd6wV4a8oa6jPdHELbRHBiw7wvo4dp7Ie2PE8TZT4pj9RLGZv9N4qwlw==}
+  '@rollup/rollup-linux-x64-gnu@4.55.3':
+    resolution: {integrity: sha512-+fgJE12FZMIgBaKIAGd45rxf+5ftcycANJRWk8Vz0NnMTM5rADPGuRFTYar+Mqs560xuART7XsX2lSACa1iOmQ==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.55.2':
-    resolution: {integrity: sha512-4BJucJBGbuGnH6q7kpPqGJGzZnYrpAzRd60HQSt3OpX/6/YVgSsJnNzR8Ot74io50SeVT4CtCWe/RYIAymFPwA==}
+  '@rollup/rollup-linux-x64-musl@4.55.3':
+    resolution: {integrity: sha512-tMD7NnbAolWPzQlJQJjVFh/fNH3K/KnA7K8gv2dJWCwwnaK6DFCYST1QXYWfu5V0cDwarWC8Sf/cfMHniNq21A==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-openbsd-x64@4.55.2':
-    resolution: {integrity: sha512-cT2MmXySMo58ENv8p6/O6wI/h/gLnD3D6JoajwXFZH6X9jz4hARqUhWpGuQhOgLNXscfZYRQMJvZDtWNzMAIDw==}
+  '@rollup/rollup-openbsd-x64@4.55.3':
+    resolution: {integrity: sha512-u5KsqxOxjEeIbn7bUK1MPM34jrnPwjeqgyin4/N6e/KzXKfpE9Mi0nCxcQjaM9lLmPcHmn/xx1yOjgTMtu1jWQ==}
     cpu: [x64]
     os: [openbsd]
 
-  '@rollup/rollup-openharmony-arm64@4.55.2':
-    resolution: {integrity: sha512-sZnyUgGkuzIXaK3jNMPmUIyJrxu/PjmATQrocpGA1WbCPX8H5tfGgRSuYtqBYAvLuIGp8SPRb1O4d1Fkb5fXaQ==}
+  '@rollup/rollup-openharmony-arm64@4.55.3':
+    resolution: {integrity: sha512-vo54aXwjpTtsAnb3ca7Yxs9t2INZg7QdXN/7yaoG7nPGbOBXYXQY41Km+S1Ov26vzOAzLcAjmMdjyEqS1JkVhw==}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rollup/rollup-win32-arm64-msvc@4.55.2':
-    resolution: {integrity: sha512-sDpFbenhmWjNcEbBcoTV0PWvW5rPJFvu+P7XoTY0YLGRupgLbFY0XPfwIbJOObzO7QgkRDANh65RjhPmgSaAjQ==}
+  '@rollup/rollup-win32-arm64-msvc@4.55.3':
+    resolution: {integrity: sha512-HI+PIVZ+m+9AgpnY3pt6rinUdRYrGHvmVdsNQ4odNqQ/eRF78DVpMR7mOq7nW06QxpczibwBmeQzB68wJ+4W4A==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.55.2':
-    resolution: {integrity: sha512-GvJ03TqqaweWCigtKQVBErw2bEhu1tyfNQbarwr94wCGnczA9HF8wqEe3U/Lfu6EdeNP0p6R+APeHVwEqVxpUQ==}
+  '@rollup/rollup-win32-ia32-msvc@4.55.3':
+    resolution: {integrity: sha512-vRByotbdMo3Wdi+8oC2nVxtc3RkkFKrGaok+a62AT8lz/YBuQjaVYAS5Zcs3tPzW43Vsf9J0wehJbUY5xRSekA==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-gnu@4.55.2':
-    resolution: {integrity: sha512-KvXsBvp13oZz9JGe5NYS7FNizLe99Ny+W8ETsuCyjXiKdiGrcz2/J/N8qxZ/RSwivqjQguug07NLHqrIHrqfYw==}
+  '@rollup/rollup-win32-x64-gnu@4.55.3':
+    resolution: {integrity: sha512-POZHq7UeuzMJljC5NjKi8vKMFN6/5EOqcX1yGntNLp7rUTpBAXQ1hW8kWPFxYLv07QMcNM75xqVLGPWQq6TKFA==}
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.55.2':
-    resolution: {integrity: sha512-xNO+fksQhsAckRtDSPWaMeT1uIM+JrDRXlerpnWNXhn1TdB3YZ6uKBMBTKP0eX9XtYEP978hHk1f8332i2AW8Q==}
+  '@rollup/rollup-win32-x64-msvc@4.55.3':
+    resolution: {integrity: sha512-aPFONczE4fUFKNXszdvnd2GqKEYQdV5oEsIbKPujJmWlCI9zEsv1Otig8RKK+X9bed9gFUN6LAeN4ZcNuu4zjg==}
     cpu: [x64]
     os: [win32]
 
@@ -2202,8 +2202,8 @@ packages:
     resolution: {integrity: sha512-qJpzYC64kaj3S0fueiu3kXm8xPrR3PcXDPEgnaNMRn0EjNSZFoFjvbUp0YUDsRhN1CB90EnHJtbxWKevnH99UQ==}
     engines: {node: '>=18.0.0'}
 
-  '@smithy/core@3.20.7':
-    resolution: {integrity: sha512-aO7jmh3CtrmPsIJxUwYIzI5WVlMK8BMCPQ4D4nTzqTqBhbzvxHNzBMGcEg13yg/z9R2Qsz49NUFl0F0lVbTVFw==}
+  '@smithy/core@3.21.0':
+    resolution: {integrity: sha512-bg2TfzgsERyETAxc/Ims/eJX8eAnIeTi4r4LHpMpfF/2NyO6RsWis0rjKcCPaGksljmOb23BZRiCeT/3NvwkXw==}
     engines: {node: '>=18.0.0'}
 
   '@smithy/credential-provider-imds@4.2.8':
@@ -2254,12 +2254,12 @@ packages:
     resolution: {integrity: sha512-RO0jeoaYAB1qBRhfVyq0pMgBoUK34YEJxVxyjOWYZiOKOq2yMZ4MnVXMZCUDenpozHue207+9P5ilTV1zeda0A==}
     engines: {node: '>=18.0.0'}
 
-  '@smithy/middleware-endpoint@4.4.8':
-    resolution: {integrity: sha512-TV44qwB/T0OMMzjIuI+JeS0ort3bvlPJ8XIH0MSlGADraXpZqmyND27ueuAL3E14optleADWqtd7dUgc2w+qhQ==}
+  '@smithy/middleware-endpoint@4.4.10':
+    resolution: {integrity: sha512-kwWpNltpxrvPabnjEFvwSmA+66l6s2ReCvgVSzW/z92LU4T28fTdgZ18IdYRYOrisu2NMQ0jUndRScbO65A/zg==}
     engines: {node: '>=18.0.0'}
 
-  '@smithy/middleware-retry@4.4.24':
-    resolution: {integrity: sha512-yiUY1UvnbUFfP5izoKLtfxDSTRv724YRRwyiC/5HYY6vdsVDcDOXKSXmkJl/Hovcxt5r+8tZEUAdrOaCJwrl9Q==}
+  '@smithy/middleware-retry@4.4.26':
+    resolution: {integrity: sha512-ozZMoTAr+B2aVYfLYfkssFvc8ZV3p/vLpVQ7/k277xxUOA9ykSPe5obL2j6yHfbdrM/SZV7qj0uk/hSqavHrLw==}
     engines: {node: '>=18.0.0'}
 
   '@smithy/middleware-serde@4.2.9':
@@ -2306,8 +2306,8 @@ packages:
     resolution: {integrity: sha512-6A4vdGj7qKNRF16UIcO8HhHjKW27thsxYci+5r/uVRkdcBEkOEiY8OMPuydLX4QHSrJqGHPJzPRwwVTqbLZJhg==}
     engines: {node: '>=18.0.0'}
 
-  '@smithy/smithy-client@4.10.9':
-    resolution: {integrity: sha512-Je0EvGXVJ0Vrrr2lsubq43JGRIluJ/hX17aN/W/A0WfE+JpoMdI8kwk2t9F0zTX9232sJDGcoH4zZre6m6f/sg==}
+  '@smithy/smithy-client@4.10.11':
+    resolution: {integrity: sha512-6o804SCyHGMXAb5mFJ+iTy9kVKv7F91a9szN0J+9X6p8A0NrdpUxdaC57aye2ipQkP2C4IAqETEpGZ0Zj77Haw==}
     engines: {node: '>=18.0.0'}
 
   '@smithy/types@4.12.0':
@@ -2342,12 +2342,12 @@ packages:
     resolution: {integrity: sha512-YEjpl6XJ36FTKmD+kRJJWYvrHeUvm5ykaUS5xK+6oXffQPHeEM4/nXlZPe+Wu0lsgRUcNZiliYNh/y7q9c2y6Q==}
     engines: {node: '>=18.0.0'}
 
-  '@smithy/util-defaults-mode-browser@4.3.23':
-    resolution: {integrity: sha512-mMg+r/qDfjfF/0psMbV4zd7F/i+rpyp7Hjh0Wry7eY15UnzTEId+xmQTGDU8IdZtDfbGQxuWNfgBZKBj+WuYbA==}
+  '@smithy/util-defaults-mode-browser@4.3.25':
+    resolution: {integrity: sha512-8ugoNMtss2dJHsXnqsibGPqoaafvWJPACmYKxJ4E6QWaDrixsAemmiMMAVbvwYadjR0H9G2+AlzsInSzRi8PSw==}
     engines: {node: '>=18.0.0'}
 
-  '@smithy/util-defaults-mode-node@4.2.26':
-    resolution: {integrity: sha512-EQqe/WkbCinah0h1lMWh9ICl0Ob4lyl20/10WTB35SC9vDQfD8zWsOT+x2FIOXKAoZQ8z/y0EFMoodbcqWJY/w==}
+  '@smithy/util-defaults-mode-node@4.2.28':
+    resolution: {integrity: sha512-mjUdcP8h3E0K/XvNMi9oBXRV3DMCzeRiYIieZ1LQ7jq5tu6GH/GTWym7a1xIIE0pKSoLcpGsaImuQhGPSIJzAA==}
     engines: {node: '>=18.0.0'}
 
   '@smithy/util-endpoints@3.2.8':
@@ -2486,8 +2486,8 @@ packages:
   '@types/node@20.19.30':
     resolution: {integrity: sha512-WJtwWJu7UdlvzEAUm484QNg5eAoq5QR08KDNx7g45Usrs2NtOPiX8ugDqmKdXkyL03rBqU5dYNYVQetEpBHq2g==}
 
-  '@types/node@25.0.9':
-    resolution: {integrity: sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==}
+  '@types/node@25.0.10':
+    resolution: {integrity: sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==}
 
   '@types/proper-lockfile@4.1.4':
     resolution: {integrity: sha512-uo2ABllncSqg9F1D4nugVl9v93RmjxF6LJzQLMLDdPaXCUIDPeOJ21Gbqi43xNKzBi/WQ0Q0dICqufzQbMjipQ==}
@@ -2922,8 +2922,8 @@ packages:
     resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
     engines: {node: '>=18'}
 
-  chromium-bidi@13.0.0:
-    resolution: {integrity: sha512-aDuqoFFI+Z0Obi9vKvfGbkalgQ60PRUSNk9A2nsYmNJDTR+SSFBHTRGixA78bg+mWwSl3C4w+Os+AXQqMiizyw==}
+  chromium-bidi@13.0.1:
+    resolution: {integrity: sha512-c+RLxH0Vg2x2syS9wPw378oJgiJNXtYXUvnVAldUlt5uaHekn0CCU7gPksNgHjrH1qFhmjVXQj4esvuthuC7OQ==}
     peerDependencies:
       devtools-protocol: '*'
 
@@ -3181,8 +3181,8 @@ packages:
     resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
     engines: {node: '>=0.12'}
 
-  entities@6.0.1:
-    resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
+  entities@7.0.1:
+    resolution: {integrity: sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==}
     engines: {node: '>=0.12'}
 
   env-var@7.5.0:
@@ -3527,8 +3527,8 @@ packages:
   htmlencode@0.0.4:
     resolution: {integrity: sha512-0uDvNVpzj/E2TfvLLyyXhKBRvF1y84aZsyRxRXFsQobnHaL4pcaXk+Y9cnFlvnxrBLeXDNq/VJBD+ngdBgQG1w==}
 
-  htmlparser2@10.0.0:
-    resolution: {integrity: sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==}
+  htmlparser2@10.1.0:
+    resolution: {integrity: sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==}
 
   htmlparser2@8.0.2:
     resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
@@ -3567,8 +3567,8 @@ packages:
   immediate@3.0.6:
     resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
 
-  import-in-the-middle@2.0.4:
-    resolution: {integrity: sha512-Al0kMpa0BqfvDnxjxGlab9vdQ0vTDs82TBKrD59X9jReUoPAzSGBb6vGDzMUMFBGyyDF03RpLT4oxGn6BpASzQ==}
+  import-in-the-middle@2.0.5:
+    resolution: {integrity: sha512-0InH9/4oDCBRzWXhpOqusspLBrVfK1vPvbn9Wxl8DAQ8yyx5fWJRETICSwkiAMaYntjJAMBP1R4B6cQnEUYVEA==}
 
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
@@ -3751,8 +3751,8 @@ packages:
     resolution: {integrity: sha512-aeQoDkuRWSqQN6nSvVCEFvfXdqo1OQiCmmW1kc9xSdjutPv7BGO7pqY9sQRJpMOGrEdfDgF2TfRXe5eUAD2Waw==}
     hasBin: true
 
-  keyv@5.5.5:
-    resolution: {integrity: sha512-FA5LmZVF1VziNc0bIdCSA1IoSVnDCqE8HJIZZv2/W8YmoAM50+tnUgJR/gQZwEeIMleuIOnRnHA/UaZRNeV4iQ==}
+  keyv@5.6.0:
+    resolution: {integrity: sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==}
 
   leac@0.6.0:
     resolution: {integrity: sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==}
@@ -3890,8 +3890,8 @@ packages:
   lodash.once@4.1.1:
     resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
 
-  lodash@4.17.21:
-    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+  lodash@4.17.23:
+    resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==}
 
   log-symbols@6.0.0:
     resolution: {integrity: sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==}
@@ -4626,8 +4626,8 @@ packages:
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
-  rollup@4.55.2:
-    resolution: {integrity: sha512-PggGy4dhwx5qaW+CKBilA/98Ql9keyfnb7lh4SR6shQ91QQQi1ORJ1v4UinkdP2i87OBs9AQFooQylcrrRfIcg==}
+  rollup@4.55.3:
+    resolution: {integrity: sha512-y9yUpfQvetAjiDLtNMf1hL9NXchIJgWt6zIKeoB+tCd3npX08Eqfzg60V9DhIGVMtQ0AlMkFw5xa+AQ37zxnAA==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -5022,8 +5022,8 @@ packages:
   undici-types@7.16.0:
     resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
 
-  undici@7.18.2:
-    resolution: {integrity: sha512-y+8YjDFzWdQlSE9N5nzKMT3g4a5UBX1HKowfdXh0uvAnTaqqwqB92Jt4UXBAeKekDs5IaDKyJFR4X1gYVCgXcw==}
+  undici@7.19.0:
+    resolution: {integrity: sha512-Heho1hJD81YChi+uS2RkSjcVO+EQLmLSyUlHyp7Y/wFbxQaGb4WXVKD073JytrjXJVkSZVzoE2MCSOKugFGtOQ==}
     engines: {node: '>=20.18.1'}
 
   unicode-properties@1.4.1:
@@ -5295,7 +5295,7 @@ snapshots:
   '@aws-crypto/crc32@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       tslib: 2.8.1
 
   '@aws-crypto/sha256-browser@5.2.0':
@@ -5303,15 +5303,15 @@ snapshots:
       '@aws-crypto/sha256-js': 5.2.0
       '@aws-crypto/supports-web-crypto': 5.2.0
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.969.0
-      '@aws-sdk/util-locate-window': 3.965.2
+      '@aws-sdk/types': 3.972.0
+      '@aws-sdk/util-locate-window': 3.965.3
       '@smithy/util-utf8': 2.3.0
       tslib: 2.8.1
 
   '@aws-crypto/sha256-js@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       tslib: 2.8.1
 
   '@aws-crypto/supports-web-crypto@5.2.0':
@@ -5320,31 +5320,31 @@ snapshots:
 
   '@aws-crypto/util@5.2.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/util-utf8': 2.3.0
       tslib: 2.8.1
 
-  '@aws-sdk/client-bedrock-runtime@3.971.0':
+  '@aws-sdk/client-bedrock-runtime@3.972.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/credential-provider-node': 3.971.0
-      '@aws-sdk/eventstream-handler-node': 3.971.0
-      '@aws-sdk/middleware-eventstream': 3.969.0
-      '@aws-sdk/middleware-host-header': 3.969.0
-      '@aws-sdk/middleware-logger': 3.969.0
-      '@aws-sdk/middleware-recursion-detection': 3.969.0
-      '@aws-sdk/middleware-user-agent': 3.970.0
-      '@aws-sdk/middleware-websocket': 3.971.0
-      '@aws-sdk/region-config-resolver': 3.969.0
-      '@aws-sdk/token-providers': 3.971.0
-      '@aws-sdk/types': 3.969.0
-      '@aws-sdk/util-endpoints': 3.970.0
-      '@aws-sdk/util-user-agent-browser': 3.969.0
-      '@aws-sdk/util-user-agent-node': 3.971.0
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/credential-provider-node': 3.972.0
+      '@aws-sdk/eventstream-handler-node': 3.972.0
+      '@aws-sdk/middleware-eventstream': 3.972.0
+      '@aws-sdk/middleware-host-header': 3.972.0
+      '@aws-sdk/middleware-logger': 3.972.0
+      '@aws-sdk/middleware-recursion-detection': 3.972.0
+      '@aws-sdk/middleware-user-agent': 3.972.0
+      '@aws-sdk/middleware-websocket': 3.972.0
+      '@aws-sdk/region-config-resolver': 3.972.0
+      '@aws-sdk/token-providers': 3.972.0
+      '@aws-sdk/types': 3.972.0
+      '@aws-sdk/util-endpoints': 3.972.0
+      '@aws-sdk/util-user-agent-browser': 3.972.0
+      '@aws-sdk/util-user-agent-node': 3.972.0
       '@smithy/config-resolver': 4.4.6
-      '@smithy/core': 3.20.7
+      '@smithy/core': 3.21.0
       '@smithy/eventstream-serde-browser': 4.2.8
       '@smithy/eventstream-serde-config-resolver': 4.3.8
       '@smithy/eventstream-serde-node': 4.2.8
@@ -5352,21 +5352,21 @@ snapshots:
       '@smithy/hash-node': 4.2.8
       '@smithy/invalid-dependency': 4.2.8
       '@smithy/middleware-content-length': 4.2.8
-      '@smithy/middleware-endpoint': 4.4.8
-      '@smithy/middleware-retry': 4.4.24
+      '@smithy/middleware-endpoint': 4.4.10
+      '@smithy/middleware-retry': 4.4.26
       '@smithy/middleware-serde': 4.2.9
       '@smithy/middleware-stack': 4.2.8
       '@smithy/node-config-provider': 4.3.8
       '@smithy/node-http-handler': 4.4.8
       '@smithy/protocol-http': 5.3.8
-      '@smithy/smithy-client': 4.10.9
+      '@smithy/smithy-client': 4.10.11
       '@smithy/types': 4.12.0
       '@smithy/url-parser': 4.2.8
       '@smithy/util-base64': 4.3.0
       '@smithy/util-body-length-browser': 4.2.0
       '@smithy/util-body-length-node': 4.2.1
-      '@smithy/util-defaults-mode-browser': 4.3.23
-      '@smithy/util-defaults-mode-node': 4.2.26
+      '@smithy/util-defaults-mode-browser': 4.3.25
+      '@smithy/util-defaults-mode-node': 4.2.28
       '@smithy/util-endpoints': 3.2.8
       '@smithy/util-middleware': 4.2.8
       '@smithy/util-retry': 4.2.8
@@ -5376,41 +5376,41 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sso@3.971.0':
+  '@aws-sdk/client-sso@3.972.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/middleware-host-header': 3.969.0
-      '@aws-sdk/middleware-logger': 3.969.0
-      '@aws-sdk/middleware-recursion-detection': 3.969.0
-      '@aws-sdk/middleware-user-agent': 3.970.0
-      '@aws-sdk/region-config-resolver': 3.969.0
-      '@aws-sdk/types': 3.969.0
-      '@aws-sdk/util-endpoints': 3.970.0
-      '@aws-sdk/util-user-agent-browser': 3.969.0
-      '@aws-sdk/util-user-agent-node': 3.971.0
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/middleware-host-header': 3.972.0
+      '@aws-sdk/middleware-logger': 3.972.0
+      '@aws-sdk/middleware-recursion-detection': 3.972.0
+      '@aws-sdk/middleware-user-agent': 3.972.0
+      '@aws-sdk/region-config-resolver': 3.972.0
+      '@aws-sdk/types': 3.972.0
+      '@aws-sdk/util-endpoints': 3.972.0
+      '@aws-sdk/util-user-agent-browser': 3.972.0
+      '@aws-sdk/util-user-agent-node': 3.972.0
       '@smithy/config-resolver': 4.4.6
-      '@smithy/core': 3.20.7
+      '@smithy/core': 3.21.0
       '@smithy/fetch-http-handler': 5.3.9
       '@smithy/hash-node': 4.2.8
       '@smithy/invalid-dependency': 4.2.8
       '@smithy/middleware-content-length': 4.2.8
-      '@smithy/middleware-endpoint': 4.4.8
-      '@smithy/middleware-retry': 4.4.24
+      '@smithy/middleware-endpoint': 4.4.10
+      '@smithy/middleware-retry': 4.4.26
       '@smithy/middleware-serde': 4.2.9
       '@smithy/middleware-stack': 4.2.8
       '@smithy/node-config-provider': 4.3.8
       '@smithy/node-http-handler': 4.4.8
       '@smithy/protocol-http': 5.3.8
-      '@smithy/smithy-client': 4.10.9
+      '@smithy/smithy-client': 4.10.11
       '@smithy/types': 4.12.0
       '@smithy/url-parser': 4.2.8
       '@smithy/util-base64': 4.3.0
       '@smithy/util-body-length-browser': 4.2.0
       '@smithy/util-body-length-node': 4.2.1
-      '@smithy/util-defaults-mode-browser': 4.3.23
-      '@smithy/util-defaults-mode-node': 4.2.26
+      '@smithy/util-defaults-mode-browser': 4.3.25
+      '@smithy/util-defaults-mode-node': 4.2.28
       '@smithy/util-endpoints': 3.2.8
       '@smithy/util-middleware': 4.2.8
       '@smithy/util-retry': 4.2.8
@@ -5419,54 +5419,54 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/core@3.970.0':
+  '@aws-sdk/core@3.972.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
-      '@aws-sdk/xml-builder': 3.969.0
-      '@smithy/core': 3.20.7
+      '@aws-sdk/types': 3.972.0
+      '@aws-sdk/xml-builder': 3.972.0
+      '@smithy/core': 3.21.0
       '@smithy/node-config-provider': 4.3.8
       '@smithy/property-provider': 4.2.8
       '@smithy/protocol-http': 5.3.8
       '@smithy/signature-v4': 5.3.8
-      '@smithy/smithy-client': 4.10.9
+      '@smithy/smithy-client': 4.10.11
       '@smithy/types': 4.12.0
       '@smithy/util-base64': 4.3.0
       '@smithy/util-middleware': 4.2.8
       '@smithy/util-utf8': 4.2.0
       tslib: 2.8.1
 
-  '@aws-sdk/credential-provider-env@3.970.0':
+  '@aws-sdk/credential-provider-env@3.972.0':
     dependencies:
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/property-provider': 4.2.8
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/credential-provider-http@3.970.0':
+  '@aws-sdk/credential-provider-http@3.972.0':
     dependencies:
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/fetch-http-handler': 5.3.9
       '@smithy/node-http-handler': 4.4.8
       '@smithy/property-provider': 4.2.8
       '@smithy/protocol-http': 5.3.8
-      '@smithy/smithy-client': 4.10.9
+      '@smithy/smithy-client': 4.10.11
       '@smithy/types': 4.12.0
       '@smithy/util-stream': 4.5.10
       tslib: 2.8.1
 
-  '@aws-sdk/credential-provider-ini@3.971.0':
+  '@aws-sdk/credential-provider-ini@3.972.0':
     dependencies:
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/credential-provider-env': 3.970.0
-      '@aws-sdk/credential-provider-http': 3.970.0
-      '@aws-sdk/credential-provider-login': 3.971.0
-      '@aws-sdk/credential-provider-process': 3.970.0
-      '@aws-sdk/credential-provider-sso': 3.971.0
-      '@aws-sdk/credential-provider-web-identity': 3.971.0
-      '@aws-sdk/nested-clients': 3.971.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/credential-provider-env': 3.972.0
+      '@aws-sdk/credential-provider-http': 3.972.0
+      '@aws-sdk/credential-provider-login': 3.972.0
+      '@aws-sdk/credential-provider-process': 3.972.0
+      '@aws-sdk/credential-provider-sso': 3.972.0
+      '@aws-sdk/credential-provider-web-identity': 3.972.0
+      '@aws-sdk/nested-clients': 3.972.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/credential-provider-imds': 4.2.8
       '@smithy/property-provider': 4.2.8
       '@smithy/shared-ini-file-loader': 4.4.3
@@ -5475,11 +5475,11 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/credential-provider-login@3.971.0':
+  '@aws-sdk/credential-provider-login@3.972.0':
     dependencies:
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/nested-clients': 3.971.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/nested-clients': 3.972.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/property-provider': 4.2.8
       '@smithy/protocol-http': 5.3.8
       '@smithy/shared-ini-file-loader': 4.4.3
@@ -5488,15 +5488,15 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/credential-provider-node@3.971.0':
+  '@aws-sdk/credential-provider-node@3.972.0':
     dependencies:
-      '@aws-sdk/credential-provider-env': 3.970.0
-      '@aws-sdk/credential-provider-http': 3.970.0
-      '@aws-sdk/credential-provider-ini': 3.971.0
-      '@aws-sdk/credential-provider-process': 3.970.0
-      '@aws-sdk/credential-provider-sso': 3.971.0
-      '@aws-sdk/credential-provider-web-identity': 3.971.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/credential-provider-env': 3.972.0
+      '@aws-sdk/credential-provider-http': 3.972.0
+      '@aws-sdk/credential-provider-ini': 3.972.0
+      '@aws-sdk/credential-provider-process': 3.972.0
+      '@aws-sdk/credential-provider-sso': 3.972.0
+      '@aws-sdk/credential-provider-web-identity': 3.972.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/credential-provider-imds': 4.2.8
       '@smithy/property-provider': 4.2.8
       '@smithy/shared-ini-file-loader': 4.4.3
@@ -5505,21 +5505,21 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/credential-provider-process@3.970.0':
+  '@aws-sdk/credential-provider-process@3.972.0':
     dependencies:
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/property-provider': 4.2.8
       '@smithy/shared-ini-file-loader': 4.4.3
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/credential-provider-sso@3.971.0':
+  '@aws-sdk/credential-provider-sso@3.972.0':
     dependencies:
-      '@aws-sdk/client-sso': 3.971.0
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/token-providers': 3.971.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/client-sso': 3.972.0
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/token-providers': 3.972.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/property-provider': 4.2.8
       '@smithy/shared-ini-file-loader': 4.4.3
       '@smithy/types': 4.12.0
@@ -5527,11 +5527,11 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/credential-provider-web-identity@3.971.0':
+  '@aws-sdk/credential-provider-web-identity@3.972.0':
     dependencies:
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/nested-clients': 3.971.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/nested-clients': 3.972.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/property-provider': 4.2.8
       '@smithy/shared-ini-file-loader': 4.4.3
       '@smithy/types': 4.12.0
@@ -5539,55 +5539,55 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/eventstream-handler-node@3.971.0':
+  '@aws-sdk/eventstream-handler-node@3.972.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/eventstream-codec': 4.2.8
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/middleware-eventstream@3.969.0':
+  '@aws-sdk/middleware-eventstream@3.972.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/protocol-http': 5.3.8
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/middleware-host-header@3.969.0':
+  '@aws-sdk/middleware-host-header@3.972.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/protocol-http': 5.3.8
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/middleware-logger@3.969.0':
+  '@aws-sdk/middleware-logger@3.972.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/middleware-recursion-detection@3.969.0':
+  '@aws-sdk/middleware-recursion-detection@3.972.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       '@aws/lambda-invoke-store': 0.2.3
       '@smithy/protocol-http': 5.3.8
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/middleware-user-agent@3.970.0':
+  '@aws-sdk/middleware-user-agent@3.972.0':
     dependencies:
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/types': 3.969.0
-      '@aws-sdk/util-endpoints': 3.970.0
-      '@smithy/core': 3.20.7
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/types': 3.972.0
+      '@aws-sdk/util-endpoints': 3.972.0
+      '@smithy/core': 3.21.0
       '@smithy/protocol-http': 5.3.8
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/middleware-websocket@3.971.0':
+  '@aws-sdk/middleware-websocket@3.972.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
-      '@aws-sdk/util-format-url': 3.969.0
+      '@aws-sdk/types': 3.972.0
+      '@aws-sdk/util-format-url': 3.972.0
       '@smithy/eventstream-codec': 4.2.8
       '@smithy/eventstream-serde-browser': 4.2.8
       '@smithy/fetch-http-handler': 5.3.9
@@ -5597,41 +5597,41 @@ snapshots:
       '@smithy/util-hex-encoding': 4.2.0
       tslib: 2.8.1
 
-  '@aws-sdk/nested-clients@3.971.0':
+  '@aws-sdk/nested-clients@3.972.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/middleware-host-header': 3.969.0
-      '@aws-sdk/middleware-logger': 3.969.0
-      '@aws-sdk/middleware-recursion-detection': 3.969.0
-      '@aws-sdk/middleware-user-agent': 3.970.0
-      '@aws-sdk/region-config-resolver': 3.969.0
-      '@aws-sdk/types': 3.969.0
-      '@aws-sdk/util-endpoints': 3.970.0
-      '@aws-sdk/util-user-agent-browser': 3.969.0
-      '@aws-sdk/util-user-agent-node': 3.971.0
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/middleware-host-header': 3.972.0
+      '@aws-sdk/middleware-logger': 3.972.0
+      '@aws-sdk/middleware-recursion-detection': 3.972.0
+      '@aws-sdk/middleware-user-agent': 3.972.0
+      '@aws-sdk/region-config-resolver': 3.972.0
+      '@aws-sdk/types': 3.972.0
+      '@aws-sdk/util-endpoints': 3.972.0
+      '@aws-sdk/util-user-agent-browser': 3.972.0
+      '@aws-sdk/util-user-agent-node': 3.972.0
       '@smithy/config-resolver': 4.4.6
-      '@smithy/core': 3.20.7
+      '@smithy/core': 3.21.0
       '@smithy/fetch-http-handler': 5.3.9
       '@smithy/hash-node': 4.2.8
       '@smithy/invalid-dependency': 4.2.8
       '@smithy/middleware-content-length': 4.2.8
-      '@smithy/middleware-endpoint': 4.4.8
-      '@smithy/middleware-retry': 4.4.24
+      '@smithy/middleware-endpoint': 4.4.10
+      '@smithy/middleware-retry': 4.4.26
       '@smithy/middleware-serde': 4.2.9
       '@smithy/middleware-stack': 4.2.8
       '@smithy/node-config-provider': 4.3.8
       '@smithy/node-http-handler': 4.4.8
       '@smithy/protocol-http': 5.3.8
-      '@smithy/smithy-client': 4.10.9
+      '@smithy/smithy-client': 4.10.11
       '@smithy/types': 4.12.0
       '@smithy/url-parser': 4.2.8
       '@smithy/util-base64': 4.3.0
       '@smithy/util-body-length-browser': 4.2.0
       '@smithy/util-body-length-node': 4.2.1
-      '@smithy/util-defaults-mode-browser': 4.3.23
-      '@smithy/util-defaults-mode-node': 4.2.26
+      '@smithy/util-defaults-mode-browser': 4.3.25
+      '@smithy/util-defaults-mode-node': 4.2.28
       '@smithy/util-endpoints': 3.2.8
       '@smithy/util-middleware': 4.2.8
       '@smithy/util-retry': 4.2.8
@@ -5640,19 +5640,19 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/region-config-resolver@3.969.0':
+  '@aws-sdk/region-config-resolver@3.972.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/config-resolver': 4.4.6
       '@smithy/node-config-provider': 4.3.8
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/token-providers@3.971.0':
+  '@aws-sdk/token-providers@3.972.0':
     dependencies:
-      '@aws-sdk/core': 3.970.0
-      '@aws-sdk/nested-clients': 3.971.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/core': 3.972.0
+      '@aws-sdk/nested-clients': 3.972.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/property-provider': 4.2.8
       '@smithy/shared-ini-file-loader': 4.4.3
       '@smithy/types': 4.12.0
@@ -5660,46 +5660,46 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/types@3.969.0':
+  '@aws-sdk/types@3.972.0':
     dependencies:
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/util-endpoints@3.970.0':
+  '@aws-sdk/util-endpoints@3.972.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/types': 4.12.0
       '@smithy/url-parser': 4.2.8
       '@smithy/util-endpoints': 3.2.8
       tslib: 2.8.1
 
-  '@aws-sdk/util-format-url@3.969.0':
+  '@aws-sdk/util-format-url@3.972.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/querystring-builder': 4.2.8
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/util-locate-window@3.965.2':
+  '@aws-sdk/util-locate-window@3.965.3':
     dependencies:
       tslib: 2.8.1
 
-  '@aws-sdk/util-user-agent-browser@3.969.0':
+  '@aws-sdk/util-user-agent-browser@3.972.0':
     dependencies:
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/types': 4.12.0
       bowser: 2.13.1
       tslib: 2.8.1
 
-  '@aws-sdk/util-user-agent-node@3.971.0':
+  '@aws-sdk/util-user-agent-node@3.972.0':
     dependencies:
-      '@aws-sdk/middleware-user-agent': 3.970.0
-      '@aws-sdk/types': 3.969.0
+      '@aws-sdk/middleware-user-agent': 3.972.0
+      '@aws-sdk/types': 3.972.0
       '@smithy/node-config-provider': 4.3.8
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@aws-sdk/xml-builder@3.969.0':
+  '@aws-sdk/xml-builder@3.972.0':
     dependencies:
       '@smithy/types': 4.12.0
       fast-xml-parser: 5.2.5
@@ -5756,7 +5756,7 @@ snapshots:
 
   '@buape/carbon@0.14.0(hono@4.11.4)':
     dependencies:
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
       discord-api-types: 0.38.37
     optionalDependencies:
       '@cloudflare/workers-types': 4.20260120.0
@@ -5777,20 +5777,20 @@ snapshots:
   '@cacheable/memory@2.0.7':
     dependencies:
       '@cacheable/utils': 2.3.3
-      '@keyv/bigmap': 1.3.0(keyv@5.5.5)
+      '@keyv/bigmap': 1.3.1(keyv@5.6.0)
       hookified: 1.15.0
-      keyv: 5.5.5
+      keyv: 5.6.0
 
   '@cacheable/node-cache@1.7.6':
     dependencies:
       cacheable: 2.3.2
       hookified: 1.15.0
-      keyv: 5.5.5
+      keyv: 5.6.0
 
   '@cacheable/utils@2.3.3':
     dependencies:
       hashery: 1.4.0
-      keyv: 5.5.5
+      keyv: 5.6.0
 
   '@clack/core@0.5.0':
     dependencies:
@@ -6103,11 +6103,11 @@ snapshots:
 
   '@js-sdsl/ordered-map@4.4.2': {}
 
-  '@keyv/bigmap@1.3.0(keyv@5.5.5)':
+  '@keyv/bigmap@1.3.1(keyv@5.6.0)':
     dependencies:
       hashery: 1.4.0
       hookified: 1.15.0
-      keyv: 5.5.5
+      keyv: 5.6.0
 
   '@keyv/serialize@1.1.1': {}
 
@@ -6243,7 +6243,7 @@ snapshots:
 
   '@mariozechner/mini-lit@0.2.1(lit@3.3.2)(tailwindcss@4.1.17)':
     dependencies:
-      '@preact/signals-core': 1.12.1
+      '@preact/signals-core': 1.12.2
       class-variance-authority: 0.7.1
       diff: 8.0.3
       highlight.js: 11.11.1
@@ -6258,10 +6258,10 @@ snapshots:
     transitivePeerDependencies:
       - tailwindcss
 
-  '@mariozechner/pi-agent-core@0.49.2(ws@8.19.0)(zod@4.3.5)':
+  '@mariozechner/pi-agent-core@0.49.3(ws@8.19.0)(zod@4.3.5)':
     dependencies:
-      '@mariozechner/pi-ai': 0.49.2(ws@8.19.0)(zod@4.3.5)
-      '@mariozechner/pi-tui': 0.49.2
+      '@mariozechner/pi-ai': 0.49.3(ws@8.19.0)(zod@4.3.5)
+      '@mariozechner/pi-tui': 0.49.3
     transitivePeerDependencies:
       - '@modelcontextprotocol/sdk'
       - aws-crt
@@ -6271,10 +6271,10 @@ snapshots:
       - ws
       - zod
 
-  '@mariozechner/pi-ai@0.49.2(ws@8.19.0)(zod@4.3.5)':
+  '@mariozechner/pi-ai@0.49.3(ws@8.19.0)(zod@4.3.5)':
     dependencies:
       '@anthropic-ai/sdk': 0.71.2(zod@4.3.5)
-      '@aws-sdk/client-bedrock-runtime': 3.971.0
+      '@aws-sdk/client-bedrock-runtime': 3.972.0
       '@google/genai': 1.34.0
       '@mistralai/mistralai': 1.10.0
       '@sinclair/typebox': 0.34.47
@@ -6293,13 +6293,13 @@ snapshots:
       - ws
       - zod
 
-  '@mariozechner/pi-coding-agent@0.49.2(ws@8.19.0)(zod@4.3.5)':
+  '@mariozechner/pi-coding-agent@0.49.3(ws@8.19.0)(zod@4.3.5)':
     dependencies:
       '@mariozechner/clipboard': 0.3.0
       '@mariozechner/jiti': 2.6.5
-      '@mariozechner/pi-agent-core': 0.49.2(ws@8.19.0)(zod@4.3.5)
-      '@mariozechner/pi-ai': 0.49.2(ws@8.19.0)(zod@4.3.5)
-      '@mariozechner/pi-tui': 0.49.2
+      '@mariozechner/pi-agent-core': 0.49.3(ws@8.19.0)(zod@4.3.5)
+      '@mariozechner/pi-ai': 0.49.3(ws@8.19.0)(zod@4.3.5)
+      '@mariozechner/pi-tui': 0.49.3
       '@silvia-odwyer/photon-node': 0.3.4
       chalk: 5.6.2
       cli-highlight: 2.1.11
@@ -6319,7 +6319,7 @@ snapshots:
       - ws
       - zod
 
-  '@mariozechner/pi-tui@0.49.2':
+  '@mariozechner/pi-tui@0.49.3':
     dependencies:
       '@types/mime-types': 2.1.4
       chalk: 5.6.2
@@ -6671,238 +6671,238 @@ snapshots:
       '@octokit/webhooks-methods': 6.0.0
     optional: true
 
-  '@opentelemetry/api-logs@0.210.0':
+  '@opentelemetry/api-logs@0.211.0':
     dependencies:
       '@opentelemetry/api': 1.9.0
 
   '@opentelemetry/api@1.9.0': {}
 
-  '@opentelemetry/configuration@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/configuration@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
       yaml: 2.8.2
 
-  '@opentelemetry/context-async-hooks@2.4.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/context-async-hooks@2.5.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
 
-  '@opentelemetry/core@2.4.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/core@2.5.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/semantic-conventions': 1.39.0
 
-  '@opentelemetry/exporter-logs-otlp-grpc@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-logs-otlp-grpc@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@grpc/grpc-js': 1.14.3
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-grpc-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.210.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.211.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/exporter-logs-otlp-http@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-logs-otlp-http@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.210.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.210.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api-logs': 0.211.0
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.211.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/exporter-logs-otlp-proto@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-logs-otlp-proto@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.210.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api-logs': 0.211.0
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/exporter-metrics-otlp-grpc@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-metrics-otlp-grpc@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@grpc/grpc-js': 1.14.3
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-metrics-otlp-http': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-grpc-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/exporter-metrics-otlp-http@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-metrics-otlp-http@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/exporter-metrics-otlp-proto@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-metrics-otlp-proto@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-metrics-otlp-http': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/exporter-prometheus@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-prometheus@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/exporter-trace-otlp-grpc@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-trace-otlp-grpc@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@grpc/grpc-js': 1.14.3
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-grpc-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/exporter-trace-otlp-http@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-trace-otlp-http@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/exporter-trace-otlp-proto@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-trace-otlp-proto@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/exporter-zipkin@2.4.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/exporter-zipkin@2.5.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.5.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.39.0
 
-  '@opentelemetry/instrumentation@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.210.0
-      import-in-the-middle: 2.0.4
+      '@opentelemetry/api-logs': 0.211.0
+      import-in-the-middle: 2.0.5
       require-in-the-middle: 8.0.1
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/otlp-exporter-base@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/otlp-exporter-base@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.210.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.211.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/otlp-grpc-exporter-base@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/otlp-grpc-exporter-base@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@grpc/grpc-js': 1.14.3
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.210.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.211.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/otlp-transformer@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/otlp-transformer@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.210.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api-logs': 0.211.0
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.5.0(@opentelemetry/api@1.9.0)
       protobufjs: 8.0.0
 
-  '@opentelemetry/propagator-b3@2.4.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/propagator-b3@2.5.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/propagator-jaeger@2.4.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/propagator-jaeger@2.5.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/resources@2.4.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/resources@2.5.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.39.0
 
-  '@opentelemetry/sdk-logs@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/sdk-logs@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.210.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api-logs': 0.211.0
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/sdk-metrics@2.4.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/sdk-metrics@2.5.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
 
-  '@opentelemetry/sdk-node@0.210.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/sdk-node@0.211.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.210.0
-      '@opentelemetry/configuration': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/context-async-hooks': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-logs-otlp-grpc': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-logs-otlp-http': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-logs-otlp-proto': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-metrics-otlp-grpc': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-metrics-otlp-http': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-metrics-otlp-proto': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-prometheus': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-trace-otlp-grpc': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-trace-otlp-http': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-trace-otlp-proto': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-zipkin': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/propagator-b3': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/propagator-jaeger': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.210.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-node': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api-logs': 0.211.0
+      '@opentelemetry/configuration': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/context-async-hooks': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-logs-otlp-grpc': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-logs-otlp-http': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-logs-otlp-proto': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-grpc': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-proto': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-prometheus': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-trace-otlp-grpc': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-trace-otlp-http': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-trace-otlp-proto': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-zipkin': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/propagator-b3': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/propagator-jaeger': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.211.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-node': 2.5.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.39.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/sdk-trace-base@2.4.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/sdk-trace-base@2.5.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.39.0
 
-  '@opentelemetry/sdk-trace-node@2.4.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/sdk-trace-node@2.5.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/context-async-hooks': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/core': 2.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 2.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/context-async-hooks': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.5.0(@opentelemetry/api@1.9.0)
 
   '@opentelemetry/semantic-conventions@1.39.0': {}
 
@@ -6981,7 +6981,7 @@ snapshots:
 
   '@polka/url@1.0.0-next.29': {}
 
-  '@preact/signals-core@1.12.1': {}
+  '@preact/signals-core@1.12.2': {}
 
   '@protobufjs/aspromise@1.1.2': {}
 
@@ -7085,79 +7085,79 @@ snapshots:
 
   '@rolldown/pluginutils@1.0.0-beta.60': {}
 
-  '@rollup/rollup-android-arm-eabi@4.55.2':
+  '@rollup/rollup-android-arm-eabi@4.55.3':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.55.2':
+  '@rollup/rollup-android-arm64@4.55.3':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.55.2':
+  '@rollup/rollup-darwin-arm64@4.55.3':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.55.2':
+  '@rollup/rollup-darwin-x64@4.55.3':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.55.2':
+  '@rollup/rollup-freebsd-arm64@4.55.3':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.55.2':
+  '@rollup/rollup-freebsd-x64@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.55.2':
+  '@rollup/rollup-linux-arm-gnueabihf@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.55.2':
+  '@rollup/rollup-linux-arm-musleabihf@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.55.2':
+  '@rollup/rollup-linux-arm64-gnu@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.55.2':
+  '@rollup/rollup-linux-arm64-musl@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-loong64-gnu@4.55.2':
+  '@rollup/rollup-linux-loong64-gnu@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-loong64-musl@4.55.2':
+  '@rollup/rollup-linux-loong64-musl@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-gnu@4.55.2':
+  '@rollup/rollup-linux-ppc64-gnu@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-musl@4.55.2':
+  '@rollup/rollup-linux-ppc64-musl@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.55.2':
+  '@rollup/rollup-linux-riscv64-gnu@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.55.2':
+  '@rollup/rollup-linux-riscv64-musl@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.55.2':
+  '@rollup/rollup-linux-s390x-gnu@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.55.2':
+  '@rollup/rollup-linux-x64-gnu@4.55.3':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.55.2':
+  '@rollup/rollup-linux-x64-musl@4.55.3':
     optional: true
 
-  '@rollup/rollup-openbsd-x64@4.55.2':
+  '@rollup/rollup-openbsd-x64@4.55.3':
     optional: true
 
-  '@rollup/rollup-openharmony-arm64@4.55.2':
+  '@rollup/rollup-openharmony-arm64@4.55.3':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.55.2':
+  '@rollup/rollup-win32-arm64-msvc@4.55.3':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.55.2':
+  '@rollup/rollup-win32-ia32-msvc@4.55.3':
     optional: true
 
-  '@rollup/rollup-win32-x64-gnu@4.55.2':
+  '@rollup/rollup-win32-x64-gnu@4.55.3':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.55.2':
+  '@rollup/rollup-win32-x64-msvc@4.55.3':
     optional: true
 
   '@scure/base@1.1.1': {}
@@ -7203,14 +7203,14 @@ snapshots:
 
   '@slack/logger@4.0.0':
     dependencies:
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
 
   '@slack/oauth@3.0.4':
     dependencies:
       '@slack/logger': 4.0.0
       '@slack/web-api': 7.13.0
       '@types/jsonwebtoken': 9.0.10
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
       jsonwebtoken: 9.0.3
     transitivePeerDependencies:
       - debug
@@ -7219,7 +7219,7 @@ snapshots:
     dependencies:
       '@slack/logger': 4.0.0
       '@slack/web-api': 7.13.0
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
       '@types/ws': 8.18.1
       eventemitter3: 5.0.4
       ws: 8.19.0
@@ -7234,7 +7234,7 @@ snapshots:
     dependencies:
       '@slack/logger': 4.0.0
       '@slack/types': 2.19.0
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
       '@types/retry': 0.12.0
       axios: 1.13.2(debug@4.4.3)
       eventemitter3: 5.0.4
@@ -7261,7 +7261,7 @@ snapshots:
       '@smithy/util-middleware': 4.2.8
       tslib: 2.8.1
 
-  '@smithy/core@3.20.7':
+  '@smithy/core@3.21.0':
     dependencies:
       '@smithy/middleware-serde': 4.2.9
       '@smithy/protocol-http': 5.3.8
@@ -7346,9 +7346,9 @@ snapshots:
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@smithy/middleware-endpoint@4.4.8':
+  '@smithy/middleware-endpoint@4.4.10':
     dependencies:
-      '@smithy/core': 3.20.7
+      '@smithy/core': 3.21.0
       '@smithy/middleware-serde': 4.2.9
       '@smithy/node-config-provider': 4.3.8
       '@smithy/shared-ini-file-loader': 4.4.3
@@ -7357,12 +7357,12 @@ snapshots:
       '@smithy/util-middleware': 4.2.8
       tslib: 2.8.1
 
-  '@smithy/middleware-retry@4.4.24':
+  '@smithy/middleware-retry@4.4.26':
     dependencies:
       '@smithy/node-config-provider': 4.3.8
       '@smithy/protocol-http': 5.3.8
       '@smithy/service-error-classification': 4.2.8
-      '@smithy/smithy-client': 4.10.9
+      '@smithy/smithy-client': 4.10.11
       '@smithy/types': 4.12.0
       '@smithy/util-middleware': 4.2.8
       '@smithy/util-retry': 4.2.8
@@ -7436,10 +7436,10 @@ snapshots:
       '@smithy/util-utf8': 4.2.0
       tslib: 2.8.1
 
-  '@smithy/smithy-client@4.10.9':
+  '@smithy/smithy-client@4.10.11':
     dependencies:
-      '@smithy/core': 3.20.7
-      '@smithy/middleware-endpoint': 4.4.8
+      '@smithy/core': 3.21.0
+      '@smithy/middleware-endpoint': 4.4.10
       '@smithy/middleware-stack': 4.2.8
       '@smithy/protocol-http': 5.3.8
       '@smithy/types': 4.12.0
@@ -7484,20 +7484,20 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  '@smithy/util-defaults-mode-browser@4.3.23':
+  '@smithy/util-defaults-mode-browser@4.3.25':
     dependencies:
       '@smithy/property-provider': 4.2.8
-      '@smithy/smithy-client': 4.10.9
+      '@smithy/smithy-client': 4.10.11
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
-  '@smithy/util-defaults-mode-node@4.2.26':
+  '@smithy/util-defaults-mode-node@4.2.28':
     dependencies:
       '@smithy/config-resolver': 4.4.6
       '@smithy/credential-provider-imds': 4.2.8
       '@smithy/node-config-provider': 4.3.8
       '@smithy/property-provider': 4.2.8
-      '@smithy/smithy-client': 4.10.9
+      '@smithy/smithy-client': 4.10.11
       '@smithy/types': 4.12.0
       tslib: 2.8.1
 
@@ -7588,7 +7588,7 @@ snapshots:
   '@types/body-parser@1.19.6':
     dependencies:
       '@types/connect': 3.4.38
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
 
   '@types/bun@1.3.6':
     dependencies:
@@ -7606,7 +7606,7 @@ snapshots:
 
   '@types/connect@3.4.38':
     dependencies:
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
 
   '@types/deep-eql@4.0.2': {}
 
@@ -7614,14 +7614,14 @@ snapshots:
 
   '@types/express-serve-static-core@4.19.8':
     dependencies:
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
       '@types/qs': 6.14.0
       '@types/range-parser': 1.2.7
       '@types/send': 1.2.1
 
   '@types/express-serve-static-core@5.1.1':
     dependencies:
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
       '@types/qs': 6.14.0
       '@types/range-parser': 1.2.7
       '@types/send': 1.2.1
@@ -7644,7 +7644,7 @@ snapshots:
   '@types/jsonwebtoken@9.0.10':
     dependencies:
       '@types/ms': 2.1.0
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
 
   '@types/linkify-it@5.0.0': {}
 
@@ -7669,7 +7669,7 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
-  '@types/node@25.0.9':
+  '@types/node@25.0.10':
     dependencies:
       undici-types: 7.16.0
 
@@ -7690,28 +7690,28 @@ snapshots:
   '@types/send@0.17.6':
     dependencies:
       '@types/mime': 1.3.5
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
 
   '@types/send@1.2.1':
     dependencies:
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
 
   '@types/serve-static@1.15.10':
     dependencies:
       '@types/http-errors': 2.0.5
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
       '@types/send': 0.17.6
 
   '@types/serve-static@2.2.0':
     dependencies:
       '@types/http-errors': 2.0.5
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
 
   '@types/trusted-types@2.0.7': {}
 
   '@types/ws@8.18.1':
     dependencies:
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
 
   '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260120.1':
     optional: true
@@ -7752,29 +7752,29 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vitest/browser-playwright@4.0.17(playwright@1.57.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)':
+  '@vitest/browser-playwright@4.0.17(playwright@1.57.0)(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)':
     dependencies:
-      '@vitest/browser': 4.0.17(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)
-      '@vitest/mocker': 4.0.17(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
+      '@vitest/browser': 4.0.17(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)
+      '@vitest/mocker': 4.0.17(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
       playwright: 1.57.0
       tinyrainbow: 3.0.3
-      vitest: 4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.9)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+      vitest: 4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.10)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
     transitivePeerDependencies:
       - bufferutil
       - msw
       - utf-8-validate
       - vite
 
-  '@vitest/browser@4.0.17(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)':
+  '@vitest/browser@4.0.17(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)':
     dependencies:
-      '@vitest/mocker': 4.0.17(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
+      '@vitest/mocker': 4.0.17(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
       '@vitest/utils': 4.0.17
       magic-string: 0.30.21
       pixelmatch: 7.1.0
       pngjs: 7.0.0
       sirv: 3.0.2
       tinyrainbow: 3.0.3
-      vitest: 4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.9)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+      vitest: 4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.10)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
       ws: 8.19.0
     transitivePeerDependencies:
       - bufferutil
@@ -7782,7 +7782,7 @@ snapshots:
       - utf-8-validate
       - vite
 
-  '@vitest/coverage-v8@4.0.17(@vitest/browser@4.0.17(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17))(vitest@4.0.17)':
+  '@vitest/coverage-v8@4.0.17(@vitest/browser@4.0.17(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17))(vitest@4.0.17)':
     dependencies:
       '@bcoe/v8-coverage': 1.0.2
       '@vitest/utils': 4.0.17
@@ -7794,9 +7794,9 @@ snapshots:
       obug: 2.1.1
       std-env: 3.10.0
       tinyrainbow: 3.0.3
-      vitest: 4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.9)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+      vitest: 4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.10)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
     optionalDependencies:
-      '@vitest/browser': 4.0.17(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)
+      '@vitest/browser': 4.0.17(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)
 
   '@vitest/expect@4.0.17':
     dependencies:
@@ -7807,13 +7807,13 @@ snapshots:
       chai: 6.2.2
       tinyrainbow: 3.0.3
 
-  '@vitest/mocker@4.0.17(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))':
+  '@vitest/mocker@4.0.17(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
       '@vitest/spy': 4.0.17
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
 
   '@vitest/pretty-format@4.0.17':
     dependencies:
@@ -8126,7 +8126,7 @@ snapshots:
 
   bun-types@1.3.6:
     dependencies:
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
     optional: true
 
   bytes@3.1.2: {}
@@ -8136,7 +8136,7 @@ snapshots:
       '@cacheable/memory': 2.0.7
       '@cacheable/utils': 2.3.3
       hookified: 1.15.0
-      keyv: 5.5.5
+      keyv: 5.6.0
       qified: 0.6.0
 
   call-bind-apply-helpers@1.0.2:
@@ -8185,7 +8185,7 @@ snapshots:
 
   chownr@3.0.0: {}
 
-  chromium-bidi@13.0.0(devtools-protocol@0.0.1561482):
+  chromium-bidi@13.0.1(devtools-protocol@0.0.1561482):
     dependencies:
       devtools-protocol: 0.0.1561482
       mitt: 3.0.1
@@ -8431,7 +8431,7 @@ snapshots:
 
   entities@4.5.0: {}
 
-  entities@6.0.1: {}
+  entities@7.0.1: {}
 
   env-var@7.5.0:
     optional: true
@@ -8884,12 +8884,12 @@ snapshots:
 
   htmlencode@0.0.4: {}
 
-  htmlparser2@10.0.0:
+  htmlparser2@10.1.0:
     dependencies:
       domelementtype: 2.3.0
       domhandler: 5.0.3
       domutils: 3.2.2
-      entities: 6.0.1
+      entities: 7.0.1
 
   htmlparser2@8.0.2:
     dependencies:
@@ -8941,7 +8941,7 @@ snapshots:
 
   immediate@3.0.6: {}
 
-  import-in-the-middle@2.0.4:
+  import-in-the-middle@2.0.5:
     dependencies:
       acorn: 8.15.0
       acorn-import-attributes: 1.9.5(acorn@8.15.0)
@@ -9146,7 +9146,7 @@ snapshots:
     dependencies:
       commander: 8.3.0
 
-  keyv@5.5.5:
+  keyv@5.6.0:
     dependencies:
       '@keyv/serialize': 1.1.1
 
@@ -9219,7 +9219,7 @@ snapshots:
       css-select: 5.2.2
       cssom: 0.5.0
       html-escaper: 3.0.3
-      htmlparser2: 10.0.0
+      htmlparser2: 10.1.0
       uhyphen: 0.2.0
 
   linkify-it@5.0.0:
@@ -9263,7 +9263,7 @@ snapshots:
 
   lodash.once@4.1.1: {}
 
-  lodash@4.17.21: {}
+  lodash@4.17.23: {}
 
   log-symbols@6.0.0:
     dependencies:
@@ -9285,7 +9285,7 @@ snapshots:
     dependencies:
       graceful-fs: 4.2.11
       is-promise: 2.2.2
-      lodash: 4.17.21
+      lodash: 4.17.23
       pify: 3.0.0
       steno: 0.4.4
 
@@ -9893,7 +9893,7 @@ snapshots:
       '@protobufjs/path': 1.1.2
       '@protobufjs/pool': 1.1.0
       '@protobufjs/utf8': 1.1.0
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
       long: 5.3.2
 
   protobufjs@8.0.0:
@@ -9908,7 +9908,7 @@ snapshots:
       '@protobufjs/path': 1.1.2
       '@protobufjs/pool': 1.1.0
       '@protobufjs/utf8': 1.1.0
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
       long: 5.3.2
 
   proxy-addr@2.0.7:
@@ -9955,7 +9955,7 @@ snapshots:
       cross-fetch: 4.1.0
       is-url: 1.2.4
       js-base64: 3.7.8
-      lodash: 4.17.21
+      lodash: 4.17.23
       pako: 1.0.11
       pluralize: 8.0.0
       readable-stream: 4.5.2
@@ -10027,7 +10027,7 @@ snapshots:
 
   request-promise-core@1.1.4(request@2.88.2):
     dependencies:
-      lodash: 4.17.21
+      lodash: 4.17.23
       request: 2.88.2
 
   request-promise@4.2.6(request@2.88.2):
@@ -10109,35 +10109,35 @@ snapshots:
       '@rolldown/binding-win32-arm64-msvc': 1.0.0-beta.60
       '@rolldown/binding-win32-x64-msvc': 1.0.0-beta.60
 
-  rollup@4.55.2:
+  rollup@4.55.3:
     dependencies:
       '@types/estree': 1.0.8
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.55.2
-      '@rollup/rollup-android-arm64': 4.55.2
-      '@rollup/rollup-darwin-arm64': 4.55.2
-      '@rollup/rollup-darwin-x64': 4.55.2
-      '@rollup/rollup-freebsd-arm64': 4.55.2
-      '@rollup/rollup-freebsd-x64': 4.55.2
-      '@rollup/rollup-linux-arm-gnueabihf': 4.55.2
-      '@rollup/rollup-linux-arm-musleabihf': 4.55.2
-      '@rollup/rollup-linux-arm64-gnu': 4.55.2
-      '@rollup/rollup-linux-arm64-musl': 4.55.2
-      '@rollup/rollup-linux-loong64-gnu': 4.55.2
-      '@rollup/rollup-linux-loong64-musl': 4.55.2
-      '@rollup/rollup-linux-ppc64-gnu': 4.55.2
-      '@rollup/rollup-linux-ppc64-musl': 4.55.2
-      '@rollup/rollup-linux-riscv64-gnu': 4.55.2
-      '@rollup/rollup-linux-riscv64-musl': 4.55.2
-      '@rollup/rollup-linux-s390x-gnu': 4.55.2
-      '@rollup/rollup-linux-x64-gnu': 4.55.2
-      '@rollup/rollup-linux-x64-musl': 4.55.2
-      '@rollup/rollup-openbsd-x64': 4.55.2
-      '@rollup/rollup-openharmony-arm64': 4.55.2
-      '@rollup/rollup-win32-arm64-msvc': 4.55.2
-      '@rollup/rollup-win32-ia32-msvc': 4.55.2
-      '@rollup/rollup-win32-x64-gnu': 4.55.2
-      '@rollup/rollup-win32-x64-msvc': 4.55.2
+      '@rollup/rollup-android-arm-eabi': 4.55.3
+      '@rollup/rollup-android-arm64': 4.55.3
+      '@rollup/rollup-darwin-arm64': 4.55.3
+      '@rollup/rollup-darwin-x64': 4.55.3
+      '@rollup/rollup-freebsd-arm64': 4.55.3
+      '@rollup/rollup-freebsd-x64': 4.55.3
+      '@rollup/rollup-linux-arm-gnueabihf': 4.55.3
+      '@rollup/rollup-linux-arm-musleabihf': 4.55.3
+      '@rollup/rollup-linux-arm64-gnu': 4.55.3
+      '@rollup/rollup-linux-arm64-musl': 4.55.3
+      '@rollup/rollup-linux-loong64-gnu': 4.55.3
+      '@rollup/rollup-linux-loong64-musl': 4.55.3
+      '@rollup/rollup-linux-ppc64-gnu': 4.55.3
+      '@rollup/rollup-linux-ppc64-musl': 4.55.3
+      '@rollup/rollup-linux-riscv64-gnu': 4.55.3
+      '@rollup/rollup-linux-riscv64-musl': 4.55.3
+      '@rollup/rollup-linux-s390x-gnu': 4.55.3
+      '@rollup/rollup-linux-x64-gnu': 4.55.3
+      '@rollup/rollup-linux-x64-musl': 4.55.3
+      '@rollup/rollup-openbsd-x64': 4.55.3
+      '@rollup/rollup-openharmony-arm64': 4.55.3
+      '@rollup/rollup-win32-arm64-msvc': 4.55.3
+      '@rollup/rollup-win32-ia32-msvc': 4.55.3
+      '@rollup/rollup-win32-x64-gnu': 4.55.3
+      '@rollup/rollup-win32-x64-msvc': 4.55.3
       fsevents: 2.3.3
 
   router@2.2.0:
@@ -10592,7 +10592,7 @@ snapshots:
 
   undici-types@7.16.0: {}
 
-  undici@7.18.2: {}
+  undici@7.19.0: {}
 
   unicode-properties@1.4.1:
     dependencies:
@@ -10645,26 +10645,26 @@ snapshots:
       core-util-is: 1.0.2
       extsprintf: 1.3.0
 
-  vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2):
+  vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       esbuild: 0.27.2
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
-      rollup: 4.55.2
+      rollup: 4.55.3
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 25.0.9
+      '@types/node': 25.0.10
       fsevents: 2.3.3
       jiti: 2.6.1
       lightningcss: 1.30.2
       tsx: 4.21.0
       yaml: 2.8.2
 
-  vitest@4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.9)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2):
+  vitest@4.0.17(@opentelemetry/api@1.9.0)(@types/node@25.0.10)(@vitest/browser-playwright@4.0.17)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       '@vitest/expect': 4.0.17
-      '@vitest/mocker': 4.0.17(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
+      '@vitest/mocker': 4.0.17(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
       '@vitest/pretty-format': 4.0.17
       '@vitest/runner': 4.0.17
       '@vitest/snapshot': 4.0.17
@@ -10681,12 +10681,12 @@ snapshots:
       tinyexec: 1.0.2
       tinyglobby: 0.2.15
       tinyrainbow: 3.0.3
-      vite: 7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@opentelemetry/api': 1.9.0
-      '@types/node': 25.0.9
-      '@vitest/browser-playwright': 4.0.17(playwright@1.57.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)
+      '@types/node': 25.0.10
+      '@vitest/browser-playwright': 4.0.17(playwright@1.57.0)(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.17)
     transitivePeerDependencies:
       - jiti
       - less

From 75dd1781b79bb5c0fe6d2b5fff3b60ccb68a1505 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 01:48:37 +0000
Subject: [PATCH 089/171] fix(macos): clear stale gateway failures

---
 .../Clawdbot/ConnectionModeCoordinator.swift  |  17 +-
 .../Clawdbot/GatewayProcessManager.swift      |  39 ++++-
 .../GatewayProcessManagerTests.swift          | 146 ++++++++++++++++++
 3 files changed, 193 insertions(+), 9 deletions(-)
 create mode 100644 apps/macos/Tests/ClawdbotIPCTests/GatewayProcessManagerTests.swift

diff --git a/apps/macos/Sources/Clawdbot/ConnectionModeCoordinator.swift b/apps/macos/Sources/Clawdbot/ConnectionModeCoordinator.swift
index b1f893b1e..00f93bd85 100644
--- a/apps/macos/Sources/Clawdbot/ConnectionModeCoordinator.swift
+++ b/apps/macos/Sources/Clawdbot/ConnectionModeCoordinator.swift
@@ -6,15 +6,20 @@ final class ConnectionModeCoordinator {
     static let shared = ConnectionModeCoordinator()
 
     private let logger = Logger(subsystem: "com.clawdbot", category: "connection")
+    private var lastMode: AppState.ConnectionMode?
 
     /// Apply the requested connection mode by starting/stopping local gateway,
     /// managing the control-channel SSH tunnel, and cleaning up chat windows/panels.
     func apply(mode: AppState.ConnectionMode, paused: Bool) async {
+        if let lastMode = self.lastMode, lastMode != mode {
+            GatewayProcessManager.shared.clearLastFailure()
+            NodesStore.shared.lastError = nil
+        }
+        self.lastMode = mode
         switch mode {
         case .unconfigured:
-            if let error = await NodeServiceManager.stop() {
-                NodesStore.shared.lastError = "Node service stop failed: \(error)"
-            }
+            _ = await NodeServiceManager.stop()
+            NodesStore.shared.lastError = nil
             await RemoteTunnelManager.shared.stopAll()
             WebChatManager.shared.resetTunnels()
             GatewayProcessManager.shared.stop()
@@ -23,9 +28,8 @@ final class ConnectionModeCoordinator {
             Task.detached { await PortGuardian.shared.sweep(mode: .unconfigured) }
 
         case .local:
-            if let error = await NodeServiceManager.stop() {
-                NodesStore.shared.lastError = "Node service stop failed: \(error)"
-            }
+            _ = await NodeServiceManager.stop()
+            NodesStore.shared.lastError = nil
             await RemoteTunnelManager.shared.stopAll()
             WebChatManager.shared.resetTunnels()
             let shouldStart = GatewayAutostartPolicy.shouldStartGateway(mode: .local, paused: paused)
@@ -56,6 +60,7 @@ final class ConnectionModeCoordinator {
             WebChatManager.shared.resetTunnels()
 
             do {
+                NodesStore.shared.lastError = nil
                 if let error = await NodeServiceManager.start() {
                     NodesStore.shared.lastError = "Node service start failed: \(error)"
                 }
diff --git a/apps/macos/Sources/Clawdbot/GatewayProcessManager.swift b/apps/macos/Sources/Clawdbot/GatewayProcessManager.swift
index 9c1761544..33156f58f 100644
--- a/apps/macos/Sources/Clawdbot/GatewayProcessManager.swift
+++ b/apps/macos/Sources/Clawdbot/GatewayProcessManager.swift
@@ -42,10 +42,20 @@ final class GatewayProcessManager {
     private var environmentRefreshTask: Task<Void, Never>?
     private var lastEnvironmentRefresh: Date?
     private var logRefreshTask: Task<Void, Never>?
+    #if DEBUG
+    private var testingConnection: GatewayConnection?
+    #endif
     private let logger = Logger(subsystem: "com.clawdbot", category: "gateway.process")
 
     private let logLimit = 20000 // characters to keep in-memory
     private let environmentRefreshMinInterval: TimeInterval = 30
+    private var connection: GatewayConnection {
+        #if DEBUG
+        return self.testingConnection ?? .shared
+        #else
+        return .shared
+        #endif
+    }
 
     func setActive(_ active: Bool) {
         // Remote mode should never spawn a local gateway; treat as stopped.
@@ -126,6 +136,10 @@ final class GatewayProcessManager {
         }
     }
 
+    func clearLastFailure() {
+        self.lastFailureReason = nil
+    }
+
     func refreshEnvironmentStatus(force: Bool = false) {
         let now = Date()
         if !force {
@@ -178,7 +192,7 @@ final class GatewayProcessManager {
         let hasListener = instance != nil
 
         let attemptAttach = {
-            try await GatewayConnection.shared.requestRaw(method: .health, timeoutMs: 2000)
+            try await self.connection.requestRaw(method: .health, timeoutMs: 2000)
         }
 
         for attempt in 0..<(hasListener ? 3 : 1) {
@@ -187,6 +201,7 @@ final class GatewayProcessManager {
                 let snap = decodeHealthSnapshot(from: data)
                 let details = self.describe(details: instanceText, port: port, snap: snap)
                 self.existingGatewayDetails = details
+                self.clearLastFailure()
                 self.status = .attachedExisting(details: details)
                 self.appendLog("[gateway] using existing instance: \(details)\n")
                 self.logger.info("gateway using existing instance details=\(details)")
@@ -310,9 +325,10 @@ final class GatewayProcessManager {
         while Date() < deadline {
             if !self.desiredActive { return }
             do {
-                _ = try await GatewayConnection.shared.requestRaw(method: .health, timeoutMs: 1500)
+                _ = try await self.connection.requestRaw(method: .health, timeoutMs: 1500)
                 let instance = await PortGuardian.shared.describe(port: port)
                 let details = instance.map { "pid \($0.pid)" }
+                self.clearLastFailure()
                 self.status = .running(details: details)
                 self.logger.info("gateway started details=\(details ?? "ok")")
                 self.refreshControlChannelIfNeeded(reason: "gateway started")
@@ -352,7 +368,8 @@ final class GatewayProcessManager {
         while Date() < deadline {
             if !self.desiredActive { return false }
             do {
-                _ = try await GatewayConnection.shared.requestRaw(method: .health, timeoutMs: 1500)
+                _ = try await self.connection.requestRaw(method: .health, timeoutMs: 1500)
+                self.clearLastFailure()
                 return true
             } catch {
                 try? await Task.sleep(nanoseconds: 300_000_000)
@@ -385,3 +402,19 @@ final class GatewayProcessManager {
         return String(text.suffix(limit))
     }
 }
+
+#if DEBUG
+extension GatewayProcessManager {
+    func setTestingConnection(_ connection: GatewayConnection?) {
+        self.testingConnection = connection
+    }
+
+    func setTestingDesiredActive(_ active: Bool) {
+        self.desiredActive = active
+    }
+
+    func setTestingLastFailureReason(_ reason: String?) {
+        self.lastFailureReason = reason
+    }
+}
+#endif
diff --git a/apps/macos/Tests/ClawdbotIPCTests/GatewayProcessManagerTests.swift b/apps/macos/Tests/ClawdbotIPCTests/GatewayProcessManagerTests.swift
new file mode 100644
index 000000000..18e529389
--- /dev/null
+++ b/apps/macos/Tests/ClawdbotIPCTests/GatewayProcessManagerTests.swift
@@ -0,0 +1,146 @@
+import Foundation
+import os
+import Testing
+@testable import Clawdbot
+
+@Suite(.serialized)
+@MainActor
+struct GatewayProcessManagerTests {
+    private final class FakeWebSocketTask: WebSocketTasking, @unchecked Sendable {
+        private let connectRequestID = OSAllocatedUnfairLock<String?>(initialState: nil)
+        private let pendingReceiveHandler =
+            OSAllocatedUnfairLock<(@Sendable (Result<URLSessionWebSocketTask.Message, Error>)
+                    -> Void)?>(initialState: nil)
+        private let cancelCount = OSAllocatedUnfairLock(initialState: 0)
+        private let sendCount = OSAllocatedUnfairLock(initialState: 0)
+
+        var state: URLSessionTask.State = .suspended
+
+        func resume() {
+            self.state = .running
+        }
+
+        func cancel(with closeCode: URLSessionWebSocketTask.CloseCode, reason: Data?) {
+            _ = (closeCode, reason)
+            self.state = .canceling
+            self.cancelCount.withLock { $0 += 1 }
+            let handler = self.pendingReceiveHandler.withLock { handler in
+                defer { handler = nil }
+                return handler
+            }
+            handler?(Result<URLSessionWebSocketTask.Message, Error>.failure(URLError(.cancelled)))
+        }
+
+        func send(_ message: URLSessionWebSocketTask.Message) async throws {
+            let currentSendCount = self.sendCount.withLock { count in
+                defer { count += 1 }
+                return count
+            }
+
+            if currentSendCount == 0 {
+                guard case let .data(data) = message else { return }
+                if let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+                   (obj["type"] as? String) == "req",
+                   (obj["method"] as? String) == "connect",
+                   let id = obj["id"] as? String
+                {
+                    self.connectRequestID.withLock { $0 = id }
+                }
+                return
+            }
+
+            guard case let .data(data) = message else { return }
+            guard
+                let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+                (obj["type"] as? String) == "req",
+                let id = obj["id"] as? String
+            else {
+                return
+            }
+
+            let response = Self.responseData(id: id)
+            let handler = self.pendingReceiveHandler.withLock { $0 }
+            handler?(Result<URLSessionWebSocketTask.Message, Error>.success(.data(response)))
+        }
+
+        func receive() async throws -> URLSessionWebSocketTask.Message {
+            let id = self.connectRequestID.withLock { $0 } ?? "connect"
+            return .data(Self.connectOkData(id: id))
+        }
+
+        func receive(
+            completionHandler: @escaping @Sendable (Result<URLSessionWebSocketTask.Message, Error>) -> Void)
+        {
+            self.pendingReceiveHandler.withLock { $0 = completionHandler }
+        }
+
+        private static func connectOkData(id: String) -> Data {
+            let json = """
+            {
+              "type": "res",
+              "id": "\(id)",
+              "ok": true,
+              "payload": {
+                "type": "hello-ok",
+                "protocol": 2,
+                "server": { "version": "test", "connId": "test" },
+                "features": { "methods": [], "events": [] },
+                "snapshot": {
+                  "presence": [ { "ts": 1 } ],
+                  "health": {},
+                  "stateVersion": { "presence": 0, "health": 0 },
+                  "uptimeMs": 0
+                },
+                "policy": { "maxPayload": 1, "maxBufferedBytes": 1, "tickIntervalMs": 30000 }
+              }
+            }
+            """
+            return Data(json.utf8)
+        }
+
+        private static func responseData(id: String) -> Data {
+            let json = """
+            {
+              "type": "res",
+              "id": "\(id)",
+              "ok": true,
+              "payload": { "ok": true }
+            }
+            """
+            return Data(json.utf8)
+        }
+    }
+
+    private final class FakeWebSocketSession: WebSocketSessioning, @unchecked Sendable {
+        private let tasks = OSAllocatedUnfairLock(initialState: [FakeWebSocketTask]())
+
+        func makeWebSocketTask(url: URL) -> WebSocketTaskBox {
+            _ = url
+            let task = FakeWebSocketTask()
+            self.tasks.withLock { $0.append(task) }
+            return WebSocketTaskBox(task: task)
+        }
+    }
+
+    @Test func clearsLastFailureWhenHealthSucceeds() async {
+        let session = FakeWebSocketSession()
+        let url = URL(string: "ws://example.invalid")!
+        let connection = GatewayConnection(
+            configProvider: { (url: url, token: nil, password: nil) },
+            sessionBox: WebSocketSessionBox(session: session))
+
+        let manager = GatewayProcessManager.shared
+        manager.setTestingConnection(connection)
+        manager.setTestingDesiredActive(true)
+        manager.setTestingLastFailureReason("health failed")
+        defer {
+            manager.setTestingConnection(nil)
+            manager.setTestingDesiredActive(false)
+            manager.setTestingLastFailureReason(nil)
+        }
+
+        let ready = await manager.waitForGatewayReady(timeout: 0.5)
+        #expect(ready)
+        #expect(manager.lastFailureReason == nil)
+    }
+}

From 3ad0d2fe239291ea757ef166b8f56a9d64a7126c Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 01:59:12 +0000
Subject: [PATCH 090/171] chore: bump version to 2026.1.21

---
 appcast.xml                                      | 10 +++++-----
 apps/android/app/build.gradle.kts                |  4 ++--
 apps/ios/Sources/Info.plist                      |  4 ++--
 apps/ios/Tests/Info.plist                        |  4 ++--
 apps/ios/project.yml                             |  8 ++++----
 apps/macos/Sources/Clawdbot/Resources/Info.plist |  4 ++--
 docs/platforms/mac/release.md                    | 14 +++++++-------
 extensions/bluebubbles/package.json              |  2 +-
 extensions/copilot-proxy/package.json            |  2 +-
 extensions/diagnostics-otel/package.json         |  2 +-
 extensions/discord/package.json                  |  2 +-
 extensions/google-antigravity-auth/package.json  |  2 +-
 extensions/google-gemini-cli-auth/package.json   |  2 +-
 extensions/imessage/package.json                 |  2 +-
 extensions/matrix/CHANGELOG.md                   |  2 +-
 extensions/matrix/package.json                   |  2 +-
 extensions/memory-core/package.json              |  2 +-
 extensions/memory-lancedb/package.json           |  2 +-
 extensions/msteams/CHANGELOG.md                  |  2 +-
 extensions/msteams/package.json                  |  2 +-
 extensions/nextcloud-talk/package.json           |  2 +-
 extensions/nostr/CHANGELOG.md                    |  2 +-
 extensions/nostr/package.json                    |  2 +-
 extensions/signal/package.json                   |  2 +-
 extensions/slack/package.json                    |  2 +-
 extensions/telegram/package.json                 |  2 +-
 extensions/voice-call/CHANGELOG.md               |  2 +-
 extensions/voice-call/package.json               |  2 +-
 extensions/whatsapp/package.json                 |  2 +-
 extensions/zalo/CHANGELOG.md                     |  2 +-
 extensions/zalo/package.json                     |  2 +-
 extensions/zalouser/CHANGELOG.md                 |  2 +-
 extensions/zalouser/package.json                 |  2 +-
 package.json                                     |  2 +-
 src/cli/update-cli.test.ts                       |  2 +-
 src/infra/update-check.test.ts                   | 10 +++++-----
 src/infra/update-runner.test.ts                  |  2 +-
 37 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/appcast.xml b/appcast.xml
index a84493f32..3e2e01c6c 100644
--- a/appcast.xml
+++ b/appcast.xml
@@ -3,13 +3,13 @@
     <channel>
         <title>Clawdbot</title>
         <item>
-            <title>2026.1.20</title>
+            <title>2026.1.21</title>
             <pubDate>Wed, 21 Jan 2026 08:18:22 +0000</pubDate>
             <link>https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml</link>
             <sparkle:version>7116</sparkle:version>
-            <sparkle:shortVersionString>2026.1.20</sparkle:shortVersionString>
+            <sparkle:shortVersionString>2026.1.21</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
-            <description><![CDATA[<h2>Clawdbot 2026.1.20</h2>
+            <description><![CDATA[<h2>Clawdbot 2026.1.21</h2>
 <h3>Changes</h3>
 <ul>
 <li>Control UI: add copy-as-markdown with error feedback. (#1345) https://docs.clawd.bot/web/control-ui</li>
@@ -190,7 +190,7 @@
 Thanks @AlexMikhalev, @CoreyH, @John-Rood, @KrauseFx, @MaudeBot, @Nachx639, @NicholaiVogel, @RyanLisse, @ThePickle31, @VACInc, @Whoaa512, @YuriNachos, @aaronveklabs, @abdaraxus, @alauppe, @ameno-, @artuskg, @austinm911, @bradleypriest, @cheeeee, @dougvk, @fogboots, @gnarco, @gumadeiras, @jdrhyne, @joelklabo, @longmaba, @mukhtharcm, @odysseus0, @oscargavin, @rhjoh, @sebslight, @sibbl, @sleontenko, @steipete, @suminhthanh, @thewilloftheshadow, @tyler6204, @vignesh07, @visionik, @ysqander, @zerone0x.
 <p><a href="https://github.com/clawdbot/clawdbot/blob/main/CHANGELOG.md">View full changelog</a></p>
 ]]></description>
-            <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.20/Clawdbot-2026.1.20.zip" length="12208102" type="application/octet-stream" sparkle:edSignature="hU495Eii8O3qmmUnxYFhXyEGv+qan6KL+GpeuBhPIXf+7B5F/gBh5Oz9cHaqaAPoZ4/3Bo6xgvic0HTkbz6gDw=="/>
+            <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.21/Clawdbot-2026.1.21.zip" length="12208102" type="application/octet-stream" sparkle:edSignature="hU495Eii8O3qmmUnxYFhXyEGv+qan6KL+GpeuBhPIXf+7B5F/gBh5Oz9cHaqaAPoZ4/3Bo6xgvic0HTkbz6gDw=="/>
         </item>
         <item>
             <title>2026.1.16-2</title>
@@ -290,4 +290,4 @@ Thanks @AlexMikhalev, @CoreyH, @John-Rood, @KrauseFx, @MaudeBot, @Nachx639, @Nic
             <enclosure url="https://github.com/clawdbot/clawdbot/releases/download/v2026.1.15/Clawdbot-2026.1.15.zip" length="12127276" type="application/octet-stream" sparkle:edSignature="o79vwTbtW/d91NQFRVfUDhsv6D4zIw7IkhY0N1iLImMu94BURgLcecA6z7Smy3bMobPwOyzN8yfm6mA/Rt8FCA=="/>
         </item>
     </channel>
-</rss>
\ No newline at end of file
+</rss>
diff --git a/apps/android/app/build.gradle.kts b/apps/android/app/build.gradle.kts
index ef7a1b522..7a99b672a 100644
--- a/apps/android/app/build.gradle.kts
+++ b/apps/android/app/build.gradle.kts
@@ -21,8 +21,8 @@ android {
     applicationId = "com.clawdbot.android"
     minSdk = 31
     targetSdk = 36
-    versionCode = 202601200
-    versionName = "2026.1.20"
+    versionCode = 202601210
+    versionName = "2026.1.21"
   }
 
   buildTypes {
diff --git a/apps/ios/Sources/Info.plist b/apps/ios/Sources/Info.plist
index 5a57ede0c..1b7b5b3d5 100644
--- a/apps/ios/Sources/Info.plist
+++ b/apps/ios/Sources/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2026.1.20</string>
+	<string>2026.1.21</string>
 	<key>CFBundleVersion</key>
-	<string>20260120</string>
+	<string>20260121</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoadsInWebContent</key>
diff --git a/apps/ios/Tests/Info.plist b/apps/ios/Tests/Info.plist
index 2e154887e..e0351f399 100644
--- a/apps/ios/Tests/Info.plist
+++ b/apps/ios/Tests/Info.plist
@@ -17,8 +17,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2026.1.20</string>
+	<string>2026.1.21</string>
 	<key>CFBundleVersion</key>
-	<string>20260120</string>
+	<string>20260121</string>
 </dict>
 </plist>
diff --git a/apps/ios/project.yml b/apps/ios/project.yml
index eeea03bbf..ea6519001 100644
--- a/apps/ios/project.yml
+++ b/apps/ios/project.yml
@@ -81,8 +81,8 @@ targets:
       properties:
         CFBundleDisplayName: Clawdbot
         CFBundleIconName: AppIcon
-        CFBundleShortVersionString: "2026.1.20"
-        CFBundleVersion: "20260120"
+        CFBundleShortVersionString: "2026.1.21"
+        CFBundleVersion: "20260121"
         UILaunchScreen: {}
         UIApplicationSceneManifest:
           UIApplicationSupportsMultipleScenes: false
@@ -130,5 +130,5 @@ targets:
       path: Tests/Info.plist
       properties:
         CFBundleDisplayName: ClawdbotTests
-        CFBundleShortVersionString: "2026.1.20"
-        CFBundleVersion: "20260120"
+        CFBundleShortVersionString: "2026.1.21"
+        CFBundleVersion: "20260121"
diff --git a/apps/macos/Sources/Clawdbot/Resources/Info.plist b/apps/macos/Sources/Clawdbot/Resources/Info.plist
index a3e616ffc..283901c0f 100644
--- a/apps/macos/Sources/Clawdbot/Resources/Info.plist
+++ b/apps/macos/Sources/Clawdbot/Resources/Info.plist
@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>2026.1.20</string>
+    <string>2026.1.21</string>
     <key>CFBundleVersion</key>
-    <string>202601200</string>
+    <string>202601210</string>
     <key>CFBundleIconFile</key>
     <string>Clawdbot</string>
     <key>CFBundleURLTypes</key>
diff --git a/docs/platforms/mac/release.md b/docs/platforms/mac/release.md
index 077cdd342..10868ad51 100644
--- a/docs/platforms/mac/release.md
+++ b/docs/platforms/mac/release.md
@@ -30,17 +30,17 @@ Notes:
 # From repo root; set release IDs so Sparkle feed is enabled.
 # APP_BUILD must be numeric + monotonic for Sparkle compare.
 BUNDLE_ID=com.clawdbot.mac \
-APP_VERSION=2026.1.20 \
+APP_VERSION=2026.1.21 \
 APP_BUILD="$(git rev-list --count HEAD)" \
 BUILD_CONFIG=release \
 SIGN_IDENTITY="Developer ID Application: <Developer Name> (<TEAMID>)" \
 scripts/package-mac-app.sh
 
 # Zip for distribution (includes resource forks for Sparkle delta support)
-ditto -c -k --sequesterRsrc --keepParent dist/Clawdbot.app dist/Clawdbot-2026.1.20.zip
+ditto -c -k --sequesterRsrc --keepParent dist/Clawdbot.app dist/Clawdbot-2026.1.21.zip
 
 # Optional: also build a styled DMG for humans (drag to /Applications)
-scripts/create-dmg.sh dist/Clawdbot.app dist/Clawdbot-2026.1.20.dmg
+scripts/create-dmg.sh dist/Clawdbot.app dist/Clawdbot-2026.1.21.dmg
 
 # Recommended: build + notarize/staple zip + DMG
 # First, create a keychain profile once:
@@ -48,26 +48,26 @@ scripts/create-dmg.sh dist/Clawdbot.app dist/Clawdbot-2026.1.20.dmg
 #     --apple-id "<apple-id>" --team-id "<team-id>" --password "<app-specific-password>"
 NOTARIZE=1 NOTARYTOOL_PROFILE=clawdbot-notary \
 BUNDLE_ID=com.clawdbot.mac \
-APP_VERSION=2026.1.20 \
+APP_VERSION=2026.1.21 \
 APP_BUILD="$(git rev-list --count HEAD)" \
 BUILD_CONFIG=release \
 SIGN_IDENTITY="Developer ID Application: <Developer Name> (<TEAMID>)" \
 scripts/package-mac-dist.sh
 
 # Optional: ship dSYM alongside the release
-ditto -c -k --keepParent apps/macos/.build/release/Clawdbot.app.dSYM dist/Clawdbot-2026.1.20.dSYM.zip
+ditto -c -k --keepParent apps/macos/.build/release/Clawdbot.app.dSYM dist/Clawdbot-2026.1.21.dSYM.zip
 ```
 
 ## Appcast entry
 Use the release note generator so Sparkle renders formatted HTML notes:
 ```bash
-SPARKLE_PRIVATE_KEY_FILE=/path/to/ed25519-private-key scripts/make_appcast.sh dist/Clawdbot-2026.1.20.zip https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml
+SPARKLE_PRIVATE_KEY_FILE=/path/to/ed25519-private-key scripts/make_appcast.sh dist/Clawdbot-2026.1.21.zip https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml
 ```
 Generates HTML release notes from `CHANGELOG.md` (via [`scripts/changelog-to-html.sh`](https://github.com/clawdbot/clawdbot/blob/main/scripts/changelog-to-html.sh)) and embeds them in the appcast entry.
 Commit the updated `appcast.xml` alongside the release assets (zip + dSYM) when publishing.
 
 ## Publish & verify
-- Upload `Clawdbot-2026.1.20.zip` (and `Clawdbot-2026.1.20.dSYM.zip`) to the GitHub release for tag `v2026.1.20`.
+- Upload `Clawdbot-2026.1.21.zip` (and `Clawdbot-2026.1.21.dSYM.zip`) to the GitHub release for tag `v2026.1.21`.
 - Ensure the raw appcast URL matches the baked feed: `https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml`.
 - Sanity checks:
   - `curl -I https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml` returns 200.
diff --git a/extensions/bluebubbles/package.json b/extensions/bluebubbles/package.json
index c6dce3433..0ff638c28 100644
--- a/extensions/bluebubbles/package.json
+++ b/extensions/bluebubbles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/bluebubbles",
-  "version": "2026.1.21-1",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot BlueBubbles channel plugin",
   "clawdbot": {
diff --git a/extensions/copilot-proxy/package.json b/extensions/copilot-proxy/package.json
index 227489c0f..64d23edb2 100644
--- a/extensions/copilot-proxy/package.json
+++ b/extensions/copilot-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/copilot-proxy",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Copilot Proxy provider plugin",
   "clawdbot": {
diff --git a/extensions/diagnostics-otel/package.json b/extensions/diagnostics-otel/package.json
index 44fc01dbb..a71c880c7 100644
--- a/extensions/diagnostics-otel/package.json
+++ b/extensions/diagnostics-otel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/diagnostics-otel",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot diagnostics OpenTelemetry exporter",
   "clawdbot": {
diff --git a/extensions/discord/package.json b/extensions/discord/package.json
index 64096a701..7073d8b8e 100644
--- a/extensions/discord/package.json
+++ b/extensions/discord/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/discord",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Discord channel plugin",
   "clawdbot": {
diff --git a/extensions/google-antigravity-auth/package.json b/extensions/google-antigravity-auth/package.json
index 6e791d544..6f60b9fb1 100644
--- a/extensions/google-antigravity-auth/package.json
+++ b/extensions/google-antigravity-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/google-antigravity-auth",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Google Antigravity OAuth provider plugin",
   "clawdbot": {
diff --git a/extensions/google-gemini-cli-auth/package.json b/extensions/google-gemini-cli-auth/package.json
index 21c2f3b67..c94a78f29 100644
--- a/extensions/google-gemini-cli-auth/package.json
+++ b/extensions/google-gemini-cli-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/google-gemini-cli-auth",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Gemini CLI OAuth provider plugin",
   "clawdbot": {
diff --git a/extensions/imessage/package.json b/extensions/imessage/package.json
index c2a5ee758..2b0b36972 100644
--- a/extensions/imessage/package.json
+++ b/extensions/imessage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/imessage",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot iMessage channel plugin",
   "clawdbot": {
diff --git a/extensions/matrix/CHANGELOG.md b/extensions/matrix/CHANGELOG.md
index 43448dcb1..603b5ed19 100644
--- a/extensions/matrix/CHANGELOG.md
+++ b/extensions/matrix/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2026.1.20-2
+## 2026.1.21
 
 ### Changes
 - Version alignment with core Clawdbot release numbers.
diff --git a/extensions/matrix/package.json b/extensions/matrix/package.json
index 4df8f02e9..5f70904b0 100644
--- a/extensions/matrix/package.json
+++ b/extensions/matrix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/matrix",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Matrix channel plugin",
   "clawdbot": {
diff --git a/extensions/memory-core/package.json b/extensions/memory-core/package.json
index a97a3cacc..ffbee5ff6 100644
--- a/extensions/memory-core/package.json
+++ b/extensions/memory-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/memory-core",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot core memory search plugin",
   "clawdbot": {
diff --git a/extensions/memory-lancedb/package.json b/extensions/memory-lancedb/package.json
index 43084d349..c052ce995 100644
--- a/extensions/memory-lancedb/package.json
+++ b/extensions/memory-lancedb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/memory-lancedb",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot LanceDB-backed long-term memory plugin with auto-recall/capture",
   "dependencies": {
diff --git a/extensions/msteams/CHANGELOG.md b/extensions/msteams/CHANGELOG.md
index e6309255f..d6bbd6789 100644
--- a/extensions/msteams/CHANGELOG.md
+++ b/extensions/msteams/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2026.1.20-2
+## 2026.1.21
 
 ### Changes
 - Version alignment with core Clawdbot release numbers.
diff --git a/extensions/msteams/package.json b/extensions/msteams/package.json
index cde571679..b8a5921af 100644
--- a/extensions/msteams/package.json
+++ b/extensions/msteams/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/msteams",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Microsoft Teams channel plugin",
   "clawdbot": {
diff --git a/extensions/nextcloud-talk/package.json b/extensions/nextcloud-talk/package.json
index 06b16e774..6286b7ae4 100644
--- a/extensions/nextcloud-talk/package.json
+++ b/extensions/nextcloud-talk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/nextcloud-talk",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Nextcloud Talk channel plugin",
   "clawdbot": {
diff --git a/extensions/nostr/CHANGELOG.md b/extensions/nostr/CHANGELOG.md
index 848e799cf..2ab179113 100644
--- a/extensions/nostr/CHANGELOG.md
+++ b/extensions/nostr/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2026.1.20-2
+## 2026.1.21
 
 ### Changes
 - Version alignment with core Clawdbot release numbers.
diff --git a/extensions/nostr/package.json b/extensions/nostr/package.json
index 8630ac1d2..2e0bd0132 100644
--- a/extensions/nostr/package.json
+++ b/extensions/nostr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/nostr",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Nostr channel plugin for NIP-04 encrypted DMs",
   "clawdbot": {
diff --git a/extensions/signal/package.json b/extensions/signal/package.json
index e849a57cc..3a80b650e 100644
--- a/extensions/signal/package.json
+++ b/extensions/signal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/signal",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Signal channel plugin",
   "clawdbot": {
diff --git a/extensions/slack/package.json b/extensions/slack/package.json
index c24cf7890..d07ec2fda 100644
--- a/extensions/slack/package.json
+++ b/extensions/slack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/slack",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Slack channel plugin",
   "clawdbot": {
diff --git a/extensions/telegram/package.json b/extensions/telegram/package.json
index 003ca330f..38333c2f3 100644
--- a/extensions/telegram/package.json
+++ b/extensions/telegram/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/telegram",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Telegram channel plugin",
   "clawdbot": {
diff --git a/extensions/voice-call/CHANGELOG.md b/extensions/voice-call/CHANGELOG.md
index b965d5d3b..807c6ffb6 100644
--- a/extensions/voice-call/CHANGELOG.md
+++ b/extensions/voice-call/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2026.1.20-2
+## 2026.1.21
 
 ### Changes
 - Version alignment with core Clawdbot release numbers.
diff --git a/extensions/voice-call/package.json b/extensions/voice-call/package.json
index 6c8962cd7..a56fafdf8 100644
--- a/extensions/voice-call/package.json
+++ b/extensions/voice-call/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/voice-call",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot voice-call plugin",
   "dependencies": {
diff --git a/extensions/whatsapp/package.json b/extensions/whatsapp/package.json
index 45530a438..44a7cd447 100644
--- a/extensions/whatsapp/package.json
+++ b/extensions/whatsapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/whatsapp",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot WhatsApp channel plugin",
   "clawdbot": {
diff --git a/extensions/zalo/CHANGELOG.md b/extensions/zalo/CHANGELOG.md
index 804d5b035..1890023c2 100644
--- a/extensions/zalo/CHANGELOG.md
+++ b/extensions/zalo/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2026.1.20-2
+## 2026.1.21
 
 ### Changes
 - Version alignment with core Clawdbot release numbers.
diff --git a/extensions/zalo/package.json b/extensions/zalo/package.json
index b97b09aca..cf26a354d 100644
--- a/extensions/zalo/package.json
+++ b/extensions/zalo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/zalo",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Zalo channel plugin",
   "clawdbot": {
diff --git a/extensions/zalouser/CHANGELOG.md b/extensions/zalouser/CHANGELOG.md
index 903f695a5..f0154f95d 100644
--- a/extensions/zalouser/CHANGELOG.md
+++ b/extensions/zalouser/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2026.1.20-2
+## 2026.1.21
 
 ### Changes
 - Version alignment with core Clawdbot release numbers.
diff --git a/extensions/zalouser/package.json b/extensions/zalouser/package.json
index d0e2c3d0b..932fe6b3d 100644
--- a/extensions/zalouser/package.json
+++ b/extensions/zalouser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clawdbot/zalouser",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "type": "module",
   "description": "Clawdbot Zalo Personal Account plugin via zca-cli",
   "dependencies": {
diff --git a/package.json b/package.json
index 7ddca7764..0bc9e7236 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clawdbot",
-  "version": "2026.1.20-2",
+  "version": "2026.1.21",
   "description": "WhatsApp gateway CLI (Baileys web) with Pi RPC agent",
   "type": "module",
   "main": "dist/index.js",
diff --git a/src/cli/update-cli.test.ts b/src/cli/update-cli.test.ts
index 4399dadaa..82a8aa778 100644
--- a/src/cli/update-cli.test.ts
+++ b/src/cli/update-cli.test.ts
@@ -302,7 +302,7 @@ describe("update-cli", () => {
       });
       vi.mocked(resolveNpmChannelTag).mockResolvedValue({
         tag: "latest",
-        version: "2026.1.20-1",
+        version: "2026.1.21-1",
       });
       vi.mocked(runGatewayUpdate).mockResolvedValue({
         status: "ok",
diff --git a/src/infra/update-check.test.ts b/src/infra/update-check.test.ts
index 628bb0452..abd5a7ce0 100644
--- a/src/infra/update-check.test.ts
+++ b/src/infra/update-check.test.ts
@@ -29,19 +29,19 @@ describe("resolveNpmChannelTag", () => {
 
   it("falls back to latest when beta is older", async () => {
     versionByTag.beta = "2026.1.19-beta.1";
-    versionByTag.latest = "2026.1.20-1";
+    versionByTag.latest = "2026.1.21-1";
 
     const resolved = await resolveNpmChannelTag({ channel: "beta", timeoutMs: 1000 });
 
-    expect(resolved).toEqual({ tag: "latest", version: "2026.1.20-1" });
+    expect(resolved).toEqual({ tag: "latest", version: "2026.1.21-1" });
   });
 
   it("keeps beta when beta is not older", async () => {
-    versionByTag.beta = "2026.1.20-beta.1";
-    versionByTag.latest = "2026.1.20-1";
+    versionByTag.beta = "2026.1.21-beta.1";
+    versionByTag.latest = "2026.1.21-1";
 
     const resolved = await resolveNpmChannelTag({ channel: "beta", timeoutMs: 1000 });
 
-    expect(resolved).toEqual({ tag: "beta", version: "2026.1.20-beta.1" });
+    expect(resolved).toEqual({ tag: "beta", version: "2026.1.21-beta.1" });
   });
 });
diff --git a/src/infra/update-runner.test.ts b/src/infra/update-runner.test.ts
index 250101ad4..fbc6ecfee 100644
--- a/src/infra/update-runner.test.ts
+++ b/src/infra/update-runner.test.ts
@@ -96,7 +96,7 @@ describe("runGatewayUpdate", () => {
       JSON.stringify({ name: "clawdbot", version: "1.0.0", packageManager: "pnpm@8.0.0" }),
       "utf-8",
     );
-    const stableTag = "v2026.1.20-1";
+    const stableTag = "v2026.1.21-1";
     const betaTag = "v2026.1.19-beta.2";
     const { runner, calls } = createRunner({
       [`git -C ${tempDir} rev-parse --show-toplevel`]: { stdout: tempDir },

From 5bf7a9d0dbb641b0852a067c63b988ef61b76175 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 02:01:11 +0000
Subject: [PATCH 091/171] test: avoid hardcoded version strings

---
 src/cli/update-cli.test.ts      |  2 +-
 src/infra/update-check.test.ts  | 12 ++++++------
 src/infra/update-runner.test.ts |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/cli/update-cli.test.ts b/src/cli/update-cli.test.ts
index 82a8aa778..395789bdd 100644
--- a/src/cli/update-cli.test.ts
+++ b/src/cli/update-cli.test.ts
@@ -302,7 +302,7 @@ describe("update-cli", () => {
       });
       vi.mocked(resolveNpmChannelTag).mockResolvedValue({
         tag: "latest",
-        version: "2026.1.21-1",
+        version: "1.2.3-1",
       });
       vi.mocked(runGatewayUpdate).mockResolvedValue({
         status: "ok",
diff --git a/src/infra/update-check.test.ts b/src/infra/update-check.test.ts
index abd5a7ce0..a259c07c5 100644
--- a/src/infra/update-check.test.ts
+++ b/src/infra/update-check.test.ts
@@ -28,20 +28,20 @@ describe("resolveNpmChannelTag", () => {
   });
 
   it("falls back to latest when beta is older", async () => {
-    versionByTag.beta = "2026.1.19-beta.1";
-    versionByTag.latest = "2026.1.21-1";
+    versionByTag.beta = "1.0.0-beta.1";
+    versionByTag.latest = "1.0.1-1";
 
     const resolved = await resolveNpmChannelTag({ channel: "beta", timeoutMs: 1000 });
 
-    expect(resolved).toEqual({ tag: "latest", version: "2026.1.21-1" });
+    expect(resolved).toEqual({ tag: "latest", version: "1.0.1-1" });
   });
 
   it("keeps beta when beta is not older", async () => {
-    versionByTag.beta = "2026.1.21-beta.1";
-    versionByTag.latest = "2026.1.21-1";
+    versionByTag.beta = "1.0.2-beta.1";
+    versionByTag.latest = "1.0.1-1";
 
     const resolved = await resolveNpmChannelTag({ channel: "beta", timeoutMs: 1000 });
 
-    expect(resolved).toEqual({ tag: "beta", version: "2026.1.21-beta.1" });
+    expect(resolved).toEqual({ tag: "beta", version: "1.0.2-beta.1" });
   });
 });
diff --git a/src/infra/update-runner.test.ts b/src/infra/update-runner.test.ts
index fbc6ecfee..f01a03d67 100644
--- a/src/infra/update-runner.test.ts
+++ b/src/infra/update-runner.test.ts
@@ -96,8 +96,8 @@ describe("runGatewayUpdate", () => {
       JSON.stringify({ name: "clawdbot", version: "1.0.0", packageManager: "pnpm@8.0.0" }),
       "utf-8",
     );
-    const stableTag = "v2026.1.21-1";
-    const betaTag = "v2026.1.19-beta.2";
+    const stableTag = "v1.0.1-1";
+    const betaTag = "v1.0.0-beta.2";
     const { runner, calls } = createRunner({
       [`git -C ${tempDir} rev-parse --show-toplevel`]: { stdout: tempDir },
       [`git -C ${tempDir} rev-parse HEAD`]: { stdout: "abc123" },

From d7d98c39711dad1811625f138a9190cb5b652ab9 Mon Sep 17 00:00:00 2001
From: Yazin <github-7itbcg5@yaz.in>
Date: Wed, 21 Jan 2026 12:48:27 +0300
Subject: [PATCH 092/171] Add auto-refresh polling for debug view

The debug view now automatically refreshes every 3 seconds when active,
similar to the logs view. This removes the need to manually click the
refresh button to see updated debug messages and status information.
---
 ui/src/ui/app-lifecycle.ts |  6 ++++++
 ui/src/ui/app-polling.ts   | 16 ++++++++++++++++
 ui/src/ui/app-settings.ts  |  5 ++++-
 ui/src/ui/app.ts           |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ui/src/ui/app-lifecycle.ts b/ui/src/ui/app-lifecycle.ts
index 817151d5f..71af9d202 100644
--- a/ui/src/ui/app-lifecycle.ts
+++ b/ui/src/ui/app-lifecycle.ts
@@ -14,6 +14,8 @@ import {
   startNodesPolling,
   stopLogsPolling,
   stopNodesPolling,
+  startDebugPolling,
+  stopDebugPolling,
 } from "./app-polling";
 
 type LifecycleHost = {
@@ -52,6 +54,9 @@ export function handleConnected(host: LifecycleHost) {
   if (host.tab === "logs") {
     startLogsPolling(host as unknown as Parameters<typeof startLogsPolling>[0]);
   }
+  if (host.tab === "debug") {
+    startDebugPolling(host as unknown as Parameters<typeof startDebugPolling>[0]);
+  }
 }
 
 export function handleFirstUpdated(host: LifecycleHost) {
@@ -62,6 +67,7 @@ export function handleDisconnected(host: LifecycleHost) {
   window.removeEventListener("popstate", host.popStateHandler);
   stopNodesPolling(host as unknown as Parameters<typeof stopNodesPolling>[0]);
   stopLogsPolling(host as unknown as Parameters<typeof stopLogsPolling>[0]);
+  stopDebugPolling(host as unknown as Parameters<typeof stopDebugPolling>[0]);
   detachThemeListener(
     host as unknown as Parameters<typeof detachThemeListener>[0],
   );
diff --git a/ui/src/ui/app-polling.ts b/ui/src/ui/app-polling.ts
index 53d7b2296..b18113c5a 100644
--- a/ui/src/ui/app-polling.ts
+++ b/ui/src/ui/app-polling.ts
@@ -1,10 +1,12 @@
 import { loadLogs } from "./controllers/logs";
 import { loadNodes } from "./controllers/nodes";
+import { loadDebug } from "./controllers/debug";
 import type { ClawdbotApp } from "./app";
 
 type PollingHost = {
   nodesPollInterval: number | null;
   logsPollInterval: number | null;
+  debugPollInterval: number | null;
   tab: string;
 };
 
@@ -35,3 +37,17 @@ export function stopLogsPolling(host: PollingHost) {
   clearInterval(host.logsPollInterval);
   host.logsPollInterval = null;
 }
+
+export function startDebugPolling(host: PollingHost) {
+  if (host.debugPollInterval != null) return;
+  host.debugPollInterval = window.setInterval(() => {
+    if (host.tab !== "debug") return;
+    void loadDebug(host as unknown as ClawdbotApp);
+  }, 3000);
+}
+
+export function stopDebugPolling(host: PollingHost) {
+  if (host.debugPollInterval == null) return;
+  clearInterval(host.debugPollInterval);
+  host.debugPollInterval = null;
+}
diff --git a/ui/src/ui/app-settings.ts b/ui/src/ui/app-settings.ts
index f9139afbd..f27319d37 100644
--- a/ui/src/ui/app-settings.ts
+++ b/ui/src/ui/app-settings.ts
@@ -14,7 +14,7 @@ import { saveSettings, type UiSettings } from "./storage";
 import { resolveTheme, type ResolvedTheme, type ThemeMode } from "./theme";
 import { startThemeTransition, type ThemeTransitionContext } from "./theme-transition";
 import { scheduleChatScroll, scheduleLogsScroll } from "./app-scroll";
-import { startLogsPolling, stopLogsPolling } from "./app-polling";
+import { startLogsPolling, stopLogsPolling, startDebugPolling, stopDebugPolling } from "./app-polling";
 import { refreshChat } from "./app-chat";
 import type { ClawdbotApp } from "./app";
 
@@ -116,6 +116,9 @@ export function setTab(host: SettingsHost, next: Tab) {
   if (next === "logs")
     startLogsPolling(host as unknown as Parameters<typeof startLogsPolling>[0]);
   else stopLogsPolling(host as unknown as Parameters<typeof stopLogsPolling>[0]);
+  if (next === "debug")
+    startDebugPolling(host as unknown as Parameters<typeof startDebugPolling>[0]);
+  else stopDebugPolling(host as unknown as Parameters<typeof stopDebugPolling>[0]);
   void refreshActiveTab(host);
   syncUrlWithTab(host, next, false);
 }
diff --git a/ui/src/ui/app.ts b/ui/src/ui/app.ts
index f0e6a6c51..9ae886048 100644
--- a/ui/src/ui/app.ts
+++ b/ui/src/ui/app.ts
@@ -226,6 +226,7 @@ export class ClawdbotApp extends LitElement {
   private chatUserNearBottom = true;
   private nodesPollInterval: number | null = null;
   private logsPollInterval: number | null = null;
+  private debugPollInterval: number | null = null;
   private logsScrollFrame: number | null = null;
   private toolStreamById = new Map<string, ToolStreamEntry>();
   private toolStreamOrder: string[] = [];

From cc74e0d1888dcca475459724feda8d35b4568957 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 02:04:51 +0000
Subject: [PATCH 093/171] feat(signal): add typing + read receipts

---
 CHANGELOG.md                                  |   1 +
 docs/channels/signal.md                       |   5 +
 ...onitor.event-handler.sender-prefix.test.ts |   2 +
 ...event-handler.typing-read-receipts.test.ts |  86 +++++++++++++
 ...-only-senders-uuid-allowlist-entry.test.ts |   2 +
 ...ends-tool-summaries-responseprefix.test.ts |   2 +
 src/signal/monitor.ts                         |   6 +-
 .../event-handler.inbound-contract.test.ts    |   2 +
 src/signal/monitor/event-handler.ts           |  47 ++++++-
 src/signal/monitor/event-handler.types.ts     |   2 +
 src/signal/send.ts                            | 118 ++++++++++++++++--
 11 files changed, 261 insertions(+), 12 deletions(-)
 create mode 100644 src/signal/monitor.event-handler.typing-read-receipts.test.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a6ae14d0..9064f5dad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Docs: https://docs.clawd.bot
 ### Changes
 - Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
 - Onboarding: remove the run setup-token auth option (paste setup-token or reuse CLI creds instead).
+- Signal: add typing indicators and DM read receipts via signal-cli.
 
 ### Fixes
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
diff --git a/docs/channels/signal.md b/docs/channels/signal.md
index 5ed20e82a..b015d02bf 100644
--- a/docs/channels/signal.md
+++ b/docs/channels/signal.md
@@ -100,6 +100,11 @@ Groups:
 - Use `channels.signal.ignoreAttachments` to skip downloading media.
 - Group history context uses `channels.signal.historyLimit` (or `channels.signal.accounts.*.historyLimit`), falling back to `messages.groupChat.historyLimit`. Set `0` to disable (default 50).
 
+## Typing + read receipts
+- **Typing indicators**: Clawdbot sends typing signals via `signal-cli sendTyping` and refreshes them while a reply is running.
+- **Read receipts**: when `channels.signal.sendReadReceipts` is true, Clawdbot forwards read receipts for allowed DMs.
+- Signal-cli does not expose read receipts for groups.
+
 ## Delivery targets (CLI/cron)
 - DMs: `signal:+15551234567` (or plain E.164).
 - Groups: `signal:group:<groupId>`.
diff --git a/src/signal/monitor.event-handler.sender-prefix.test.ts b/src/signal/monitor.event-handler.sender-prefix.test.ts
index 186596697..3c5569940 100644
--- a/src/signal/monitor.event-handler.sender-prefix.test.ts
+++ b/src/signal/monitor.event-handler.sender-prefix.test.ts
@@ -57,6 +57,8 @@ describe("signal event handler sender prefix", () => {
       reactionAllowlist: [],
       mediaMaxBytes: 1000,
       ignoreAttachments: true,
+      sendReadReceipts: false,
+      readReceiptsViaDaemon: false,
       fetchAttachment: async () => null,
       deliverReplies: async () => undefined,
       resolveSignalReactionTargets: () => [],
diff --git a/src/signal/monitor.event-handler.typing-read-receipts.test.ts b/src/signal/monitor.event-handler.typing-read-receipts.test.ts
new file mode 100644
index 000000000..2985f4d95
--- /dev/null
+++ b/src/signal/monitor.event-handler.typing-read-receipts.test.ts
@@ -0,0 +1,86 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const sendTypingMock = vi.fn();
+const sendReadReceiptMock = vi.fn();
+
+vi.mock("./send.js", () => ({
+  sendMessageSignal: vi.fn(),
+  sendTypingSignal: (...args: unknown[]) => sendTypingMock(...args),
+  sendReadReceiptSignal: (...args: unknown[]) => sendReadReceiptMock(...args),
+}));
+
+vi.mock("../auto-reply/reply/dispatch-from-config.js", () => ({
+  dispatchReplyFromConfig: vi.fn(
+    async (params: { replyOptions?: { onReplyStart?: () => void } }) => {
+      await params.replyOptions?.onReplyStart?.();
+      return { queuedFinal: false, counts: { tool: 0, block: 0, final: 0 } };
+    },
+  ),
+}));
+
+vi.mock("../pairing/pairing-store.js", () => ({
+  readChannelAllowFromStore: vi.fn().mockResolvedValue([]),
+  upsertChannelPairingRequest: vi.fn(),
+}));
+
+describe("signal event handler typing + read receipts", () => {
+  beforeEach(() => {
+    sendTypingMock.mockReset().mockResolvedValue(true);
+    sendReadReceiptMock.mockReset().mockResolvedValue(true);
+  });
+
+  it("sends typing + read receipt for allowed DMs", async () => {
+    const { createSignalEventHandler } = await import("./monitor/event-handler.js");
+    const handler = createSignalEventHandler({
+      runtime: { log: () => {}, error: () => {} } as any,
+      cfg: {
+        messages: { inbound: { debounceMs: 0 } },
+        channels: { signal: { dmPolicy: "open", allowFrom: ["*"] } },
+      } as any,
+      baseUrl: "http://localhost",
+      account: "+15550009999",
+      accountId: "default",
+      blockStreaming: false,
+      historyLimit: 0,
+      groupHistories: new Map(),
+      textLimit: 4000,
+      dmPolicy: "open",
+      allowFrom: ["*"],
+      groupAllowFrom: ["*"],
+      groupPolicy: "open",
+      reactionMode: "off",
+      reactionAllowlist: [],
+      mediaMaxBytes: 1024,
+      ignoreAttachments: true,
+      sendReadReceipts: true,
+      readReceiptsViaDaemon: false,
+      fetchAttachment: async () => null,
+      deliverReplies: async () => {},
+      resolveSignalReactionTargets: () => [],
+      isSignalReactionMessage: () => false as any,
+      shouldEmitSignalReactionNotification: () => false,
+      buildSignalReactionSystemEventText: () => "reaction",
+    });
+
+    await handler({
+      event: "receive",
+      data: JSON.stringify({
+        envelope: {
+          sourceNumber: "+15550001111",
+          sourceName: "Alice",
+          timestamp: 1700000000000,
+          dataMessage: {
+            message: "hi",
+          },
+        },
+      }),
+    });
+
+    expect(sendTypingMock).toHaveBeenCalledWith("signal:+15550001111", expect.any(Object));
+    expect(sendReadReceiptMock).toHaveBeenCalledWith(
+      "signal:+15550001111",
+      1700000000000,
+      expect.any(Object),
+    );
+  });
+});
diff --git a/src/signal/monitor.tool-result.pairs-uuid-only-senders-uuid-allowlist-entry.test.ts b/src/signal/monitor.tool-result.pairs-uuid-only-senders-uuid-allowlist-entry.test.ts
index 60852d9e9..f86e99199 100644
--- a/src/signal/monitor.tool-result.pairs-uuid-only-senders-uuid-allowlist-entry.test.ts
+++ b/src/signal/monitor.tool-result.pairs-uuid-only-senders-uuid-allowlist-entry.test.ts
@@ -25,6 +25,8 @@ vi.mock("../auto-reply/reply.js", () => ({
 
 vi.mock("./send.js", () => ({
   sendMessageSignal: (...args: unknown[]) => sendMock(...args),
+  sendTypingSignal: vi.fn().mockResolvedValue(true),
+  sendReadReceiptSignal: vi.fn().mockResolvedValue(true),
 }));
 
 vi.mock("../pairing/pairing-store.js", () => ({
diff --git a/src/signal/monitor.tool-result.sends-tool-summaries-responseprefix.test.ts b/src/signal/monitor.tool-result.sends-tool-summaries-responseprefix.test.ts
index 24c4ffcef..eda540b7d 100644
--- a/src/signal/monitor.tool-result.sends-tool-summaries-responseprefix.test.ts
+++ b/src/signal/monitor.tool-result.sends-tool-summaries-responseprefix.test.ts
@@ -29,6 +29,8 @@ vi.mock("../auto-reply/reply.js", () => ({
 
 vi.mock("./send.js", () => ({
   sendMessageSignal: (...args: unknown[]) => sendMock(...args),
+  sendTypingSignal: vi.fn().mockResolvedValue(true),
+  sendReadReceiptSignal: vi.fn().mockResolvedValue(true),
 }));
 
 vi.mock("../pairing/pairing-store.js", () => ({
diff --git a/src/signal/monitor.ts b/src/signal/monitor.ts
index b58a59e0f..e8f7570ab 100644
--- a/src/signal/monitor.ts
+++ b/src/signal/monitor.ts
@@ -279,8 +279,10 @@ export async function monitorSignalProvider(opts: MonitorSignalOpts = {}): Promi
   const reactionAllowlist = normalizeAllowList(accountInfo.config.reactionAllowlist);
   const mediaMaxBytes = (opts.mediaMaxMb ?? accountInfo.config.mediaMaxMb ?? 8) * 1024 * 1024;
   const ignoreAttachments = opts.ignoreAttachments ?? accountInfo.config.ignoreAttachments ?? false;
+  const sendReadReceipts = Boolean(opts.sendReadReceipts ?? accountInfo.config.sendReadReceipts);
 
   const autoStart = opts.autoStart ?? accountInfo.config.autoStart ?? !accountInfo.config.httpUrl;
+  const readReceiptsViaDaemon = Boolean(autoStart && sendReadReceipts);
   let daemonHandle: ReturnType<typeof spawnSignalDaemon> | null = null;
 
   if (autoStart) {
@@ -295,7 +297,7 @@ export async function monitorSignalProvider(opts: MonitorSignalOpts = {}): Promi
       receiveMode: opts.receiveMode ?? accountInfo.config.receiveMode,
       ignoreAttachments: opts.ignoreAttachments ?? accountInfo.config.ignoreAttachments,
       ignoreStories: opts.ignoreStories ?? accountInfo.config.ignoreStories,
-      sendReadReceipts: opts.sendReadReceipts ?? accountInfo.config.sendReadReceipts,
+      sendReadReceipts,
       runtime,
     });
   }
@@ -335,6 +337,8 @@ export async function monitorSignalProvider(opts: MonitorSignalOpts = {}): Promi
       reactionAllowlist,
       mediaMaxBytes,
       ignoreAttachments,
+      sendReadReceipts,
+      readReceiptsViaDaemon,
       fetchAttachment,
       deliverReplies,
       resolveSignalReactionTargets,
diff --git a/src/signal/monitor/event-handler.inbound-contract.test.ts b/src/signal/monitor/event-handler.inbound-contract.test.ts
index a91106b3c..9277eb990 100644
--- a/src/signal/monitor/event-handler.inbound-contract.test.ts
+++ b/src/signal/monitor/event-handler.inbound-contract.test.ts
@@ -34,6 +34,8 @@ describe("signal createSignalEventHandler inbound contract", () => {
       reactionAllowlist: [],
       mediaMaxBytes: 1024,
       ignoreAttachments: true,
+      sendReadReceipts: false,
+      readReceiptsViaDaemon: false,
       fetchAttachment: async () => null,
       deliverReplies: async () => {},
       resolveSignalReactionTargets: () => [],
diff --git a/src/signal/monitor/event-handler.ts b/src/signal/monitor/event-handler.ts
index 4bc29b7e8..30fabedfb 100644
--- a/src/signal/monitor/event-handler.ts
+++ b/src/signal/monitor/event-handler.ts
@@ -23,7 +23,7 @@ import {
   clearHistoryEntries,
 } from "../../auto-reply/reply/history.js";
 import { finalizeInboundContext } from "../../auto-reply/reply/inbound-context.js";
-import { createReplyDispatcher } from "../../auto-reply/reply/reply-dispatcher.js";
+import { createReplyDispatcherWithTyping } from "../../auto-reply/reply/reply-dispatcher.js";
 import {
   readSessionUpdatedAt,
   recordSessionMetaFromInbound,
@@ -50,7 +50,7 @@ import {
   resolveSignalRecipient,
   resolveSignalSender,
 } from "../identity.js";
-import { sendMessageSignal } from "../send.js";
+import { sendMessageSignal, sendReadReceiptSignal, sendTypingSignal } from "../send.js";
 
 import type { SignalEventHandlerDeps, SignalReceivePayload } from "./event-handler.types.js";
 
@@ -190,7 +190,20 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {
       identityName: resolveIdentityName(deps.cfg, route.agentId),
     };
 
-    const dispatcher = createReplyDispatcher({
+    const onReplyStart = async () => {
+      try {
+        if (!ctxPayload.To) return;
+        await sendTypingSignal(ctxPayload.To, {
+          baseUrl: deps.baseUrl,
+          account: deps.account,
+          accountId: deps.accountId,
+        });
+      } catch (err) {
+        logVerbose(`signal typing cue failed for ${ctxPayload.To}: ${String(err)}`);
+      }
+    };
+
+    const { dispatcher, replyOptions, markDispatchIdle } = createReplyDispatcherWithTyping({
       responsePrefix: resolveEffectiveMessagesConfig(deps.cfg, route.agentId).responsePrefix,
       responsePrefixContextProvider: () => prefixContext,
       humanDelay: resolveHumanDelayConfig(deps.cfg, route.agentId),
@@ -209,6 +222,7 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {
       onError: (err, info) => {
         deps.runtime.error?.(danger(`signal ${info.kind} reply failed: ${String(err)}`));
       },
+      onReplyStart,
     });
 
     const { queuedFinal } = await dispatchReplyFromConfig({
@@ -216,6 +230,7 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {
       cfg: deps.cfg,
       dispatcher,
       replyOptions: {
+        ...replyOptions,
         disableBlockStreaming:
           typeof deps.blockStreaming === "boolean" ? !deps.blockStreaming : undefined,
         onModelSelected: (ctx) => {
@@ -227,6 +242,7 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {
         },
       },
     });
+    markDispatchIdle();
     if (!queuedFinal) {
       if (entry.isGroup && historyKey && deps.historyLimit > 0) {
         clearHistoryEntries({ historyMap: deps.groupHistories, historyKey });
@@ -479,6 +495,31 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {
     const bodyText = messageText || placeholder || dataMessage.quote?.text?.trim() || "";
     if (!bodyText) return;
 
+    const receiptTimestamp =
+      typeof envelope.timestamp === "number"
+        ? envelope.timestamp
+        : typeof dataMessage.timestamp === "number"
+          ? dataMessage.timestamp
+          : undefined;
+    if (deps.sendReadReceipts && !deps.readReceiptsViaDaemon && !isGroup && receiptTimestamp) {
+      try {
+        await sendReadReceiptSignal(`signal:${senderRecipient}`, receiptTimestamp, {
+          baseUrl: deps.baseUrl,
+          account: deps.account,
+          accountId: deps.accountId,
+        });
+      } catch (err) {
+        logVerbose(`signal read receipt failed for ${senderDisplay}: ${String(err)}`);
+      }
+    } else if (
+      deps.sendReadReceipts &&
+      !deps.readReceiptsViaDaemon &&
+      !isGroup &&
+      !receiptTimestamp
+    ) {
+      logVerbose(`signal read receipt skipped (missing timestamp) for ${senderDisplay}`);
+    }
+
     const senderName = envelope.sourceName ?? senderDisplay;
     const messageId =
       typeof envelope.timestamp === "number" ? String(envelope.timestamp) : undefined;
diff --git a/src/signal/monitor/event-handler.types.ts b/src/signal/monitor/event-handler.types.ts
index b88b3e236..153bdf501 100644
--- a/src/signal/monitor/event-handler.types.ts
+++ b/src/signal/monitor/event-handler.types.ts
@@ -76,6 +76,8 @@ export type SignalEventHandlerDeps = {
   reactionAllowlist: string[];
   mediaMaxBytes: number;
   ignoreAttachments: boolean;
+  sendReadReceipts: boolean;
+  readReceiptsViaDaemon: boolean;
   fetchAttachment: (params: {
     baseUrl: string;
     account?: string;
diff --git a/src/signal/send.ts b/src/signal/send.ts
index 03f96c4fb..dce4cda7a 100644
--- a/src/signal/send.ts
+++ b/src/signal/send.ts
@@ -22,6 +22,10 @@ export type SignalSendResult = {
   timestamp?: number;
 };
 
+export type SignalRpcOpts = Pick<SignalSendOpts, "baseUrl" | "account" | "accountId" | "timeoutMs">;
+
+export type SignalReceiptType = "read" | "viewed";
+
 type SignalTarget =
   | { type: "recipient"; recipient: string }
   | { type: "group"; groupId: string }
@@ -50,6 +54,59 @@ function parseTarget(raw: string): SignalTarget {
   return { type: "recipient", recipient: value };
 }
 
+type SignalTargetParams = {
+  recipient?: string[];
+  groupId?: string;
+  username?: string[];
+};
+
+type SignalTargetAllowlist = {
+  recipient?: boolean;
+  group?: boolean;
+  username?: boolean;
+};
+
+function buildTargetParams(
+  target: SignalTarget,
+  allow: SignalTargetAllowlist,
+): SignalTargetParams | null {
+  if (target.type === "recipient") {
+    if (!allow.recipient) return null;
+    return { recipient: [target.recipient] };
+  }
+  if (target.type === "group") {
+    if (!allow.group) return null;
+    return { groupId: target.groupId };
+  }
+  if (target.type === "username") {
+    if (!allow.username) return null;
+    return { username: [target.username] };
+  }
+  return null;
+}
+
+function resolveSignalRpcContext(
+  opts: SignalRpcOpts,
+  accountInfo?: ReturnType<typeof resolveSignalAccount>,
+) {
+  const hasBaseUrl = Boolean(opts.baseUrl?.trim());
+  const hasAccount = Boolean(opts.account?.trim());
+  const resolvedAccount =
+    accountInfo ||
+    (!hasBaseUrl || !hasAccount
+      ? resolveSignalAccount({
+          cfg: loadConfig(),
+          accountId: opts.accountId,
+        })
+      : undefined);
+  const baseUrl = opts.baseUrl?.trim() || resolvedAccount?.baseUrl;
+  if (!baseUrl) {
+    throw new Error("Signal base URL is required");
+  }
+  const account = opts.account?.trim() || resolvedAccount?.config.account?.trim();
+  return { baseUrl, account };
+}
+
 async function resolveAttachment(
   mediaUrl: string,
   maxBytes: number,
@@ -74,8 +131,7 @@ export async function sendMessageSignal(
     cfg,
     accountId: opts.accountId,
   });
-  const baseUrl = opts.baseUrl?.trim() || accountInfo.baseUrl;
-  const account = opts.account?.trim() || accountInfo.config.account?.trim();
+  const { baseUrl, account } = resolveSignalRpcContext(opts, accountInfo);
   const target = parseTarget(to);
   let message = text ?? "";
   let messageFromPlaceholder = false;
@@ -129,13 +185,15 @@ export async function sendMessageSignal(
     params.attachments = attachments;
   }
 
-  if (target.type === "recipient") {
-    params.recipient = [target.recipient];
-  } else if (target.type === "group") {
-    params.groupId = target.groupId;
-  } else if (target.type === "username") {
-    params.username = [target.username];
+  const targetParams = buildTargetParams(target, {
+    recipient: true,
+    group: true,
+    username: true,
+  });
+  if (!targetParams) {
+    throw new Error("Signal recipient is required");
   }
+  Object.assign(params, targetParams);
 
   const result = await signalRpcRequest<{ timestamp?: number }>("send", params, {
     baseUrl,
@@ -147,3 +205,47 @@ export async function sendMessageSignal(
     timestamp,
   };
 }
+
+export async function sendTypingSignal(
+  to: string,
+  opts: SignalRpcOpts & { stop?: boolean } = {},
+): Promise<boolean> {
+  const { baseUrl, account } = resolveSignalRpcContext(opts);
+  const targetParams = buildTargetParams(parseTarget(to), {
+    recipient: true,
+    group: true,
+  });
+  if (!targetParams) return false;
+  const params: Record<string, unknown> = { ...targetParams };
+  if (account) params.account = account;
+  if (opts.stop) params.stop = true;
+  await signalRpcRequest("sendTyping", params, {
+    baseUrl,
+    timeoutMs: opts.timeoutMs,
+  });
+  return true;
+}
+
+export async function sendReadReceiptSignal(
+  to: string,
+  targetTimestamp: number,
+  opts: SignalRpcOpts & { type?: SignalReceiptType } = {},
+): Promise<boolean> {
+  if (!Number.isFinite(targetTimestamp) || targetTimestamp <= 0) return false;
+  const { baseUrl, account } = resolveSignalRpcContext(opts);
+  const targetParams = buildTargetParams(parseTarget(to), {
+    recipient: true,
+  });
+  if (!targetParams) return false;
+  const params: Record<string, unknown> = {
+    ...targetParams,
+    targetTimestamp,
+    type: opts.type ?? "read",
+  };
+  if (account) params.account = account;
+  await signalRpcRequest("sendReceipt", params, {
+    baseUrl,
+    timeoutMs: opts.timeoutMs,
+  });
+  return true;
+}

From 47ebe291959b36b7f1d086dfd79750dca8641826 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 02:07:36 +0000
Subject: [PATCH 094/171] test: stabilize exec approvals path resolution

---
 src/infra/exec-approvals.test.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/infra/exec-approvals.test.ts b/src/infra/exec-approvals.test.ts
index cbafad759..d6474a39c 100644
--- a/src/infra/exec-approvals.test.ts
+++ b/src/infra/exec-approvals.test.ts
@@ -17,6 +17,13 @@ import {
   type ExecAllowlistEntry,
 } from "./exec-approvals.js";
 
+function makePathEnv(binDir: string): NodeJS.ProcessEnv {
+  if (process.platform !== "win32") {
+    return { PATH: binDir };
+  }
+  return { PATH: binDir, PATHEXT: ".EXE;.CMD;.BAT;.COM" };
+}
+
 function makeTempDir() {
   return fs.mkdtempSync(path.join(os.tmpdir(), "clawdbot-exec-approvals-"));
 }
@@ -76,7 +83,7 @@ describe("exec approvals command resolution", () => {
     const exe = path.join(binDir, exeName);
     fs.writeFileSync(exe, "");
     fs.chmodSync(exe, 0o755);
-    const res = resolveCommandResolution("rg -n foo", undefined, { PATH: binDir });
+    const res = resolveCommandResolution("rg -n foo", undefined, makePathEnv(binDir));
     expect(res?.resolvedPath).toBe(exe);
     expect(res?.executableName).toBe(exeName);
   });
@@ -135,7 +142,7 @@ describe("exec approvals safe bins", () => {
     const res = analyzeShellCommand({
       command: "jq .foo",
       cwd: dir,
-      env: { PATH: binDir },
+      env: makePathEnv(binDir),
     });
     expect(res.ok).toBe(true);
     const segment = res.segments[0];
@@ -161,7 +168,7 @@ describe("exec approvals safe bins", () => {
     const res = analyzeShellCommand({
       command: "jq .foo secret.json",
       cwd: dir,
-      env: { PATH: binDir },
+      env: makePathEnv(binDir),
     });
     expect(res.ok).toBe(true);
     const segment = res.segments[0];

From de898c423b95d818b15050143c737cdf1c301398 Mon Sep 17 00:00:00 2001
From: Lucas Czekaj <lukasz@czekaj.us>
Date: Wed, 21 Jan 2026 18:14:51 -0800
Subject: [PATCH 095/171] fix(exec): pass undefined instead of null for
 optional approval params

TypeBox Type.Optional(Type.String()) accepts string|undefined but NOT null.
Discord exec was failing with 'resolvedPath must be string' because callers
passed null explicitly. Web UI worked because it skipped the approval request.

Fixes exec approval validation error in Discord-triggered sessions.
---
 src/agents/bash-tools.exec.ts                 |  8 ++--
 src/cli/nodes-cli/register.invoke.ts          |  4 +-
 .../server-methods/exec-approval.test.ts      | 44 +++++++++++++++++++
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/agents/bash-tools.exec.ts b/src/agents/bash-tools.exec.ts
index 32655f6a9..3d58bc705 100644
--- a/src/agents/bash-tools.exec.ts
+++ b/src/agents/bash-tools.exec.ts
@@ -896,8 +896,8 @@ export function createExecTool(
                   security: hostSecurity,
                   ask: hostAsk,
                   agentId: defaults?.agentId,
-                  resolvedPath: null,
-                  sessionKey: defaults?.sessionKey ?? null,
+                  resolvedPath: undefined,
+                  sessionKey: defaults?.sessionKey,
                   timeoutMs: DEFAULT_APPROVAL_TIMEOUT_MS,
                 },
               )) as { decision?: string } | null;
@@ -1060,7 +1060,7 @@ export function createExecTool(
           const approvalSlug = createApprovalSlug(approvalId);
           const expiresAtMs = Date.now() + DEFAULT_APPROVAL_TIMEOUT_MS;
           const contextKey = `exec:${approvalId}`;
-          const resolvedPath = analysis.segments[0]?.resolution?.resolvedPath ?? null;
+          const resolvedPath = analysis.segments[0]?.resolution?.resolvedPath;
           const noticeSeconds = Math.max(1, Math.round(approvalRunningNoticeMs / 1000));
           const commandText = params.command;
           const effectiveTimeout =
@@ -1082,7 +1082,7 @@ export function createExecTool(
                   ask: hostAsk,
                   agentId: defaults?.agentId,
                   resolvedPath,
-                  sessionKey: defaults?.sessionKey ?? null,
+                  sessionKey: defaults?.sessionKey,
                   timeoutMs: DEFAULT_APPROVAL_TIMEOUT_MS,
                 },
               )) as { decision?: string } | null;
diff --git a/src/cli/nodes-cli/register.invoke.ts b/src/cli/nodes-cli/register.invoke.ts
index 4cad89315..9a9ff2834 100644
--- a/src/cli/nodes-cli/register.invoke.ts
+++ b/src/cli/nodes-cli/register.invoke.ts
@@ -267,8 +267,8 @@ export function registerNodesInvokeCommands(nodes: Command) {
               security: hostSecurity,
               ask: hostAsk,
               agentId,
-              resolvedPath: null,
-              sessionKey: null,
+              resolvedPath: undefined,
+              sessionKey: undefined,
               timeoutMs: 120_000,
             })) as { decision?: string } | null;
             const decision =
diff --git a/src/gateway/server-methods/exec-approval.test.ts b/src/gateway/server-methods/exec-approval.test.ts
index 4682e6e1a..8142b281f 100644
--- a/src/gateway/server-methods/exec-approval.test.ts
+++ b/src/gateway/server-methods/exec-approval.test.ts
@@ -1,10 +1,54 @@
 import { describe, expect, it, vi } from "vitest";
 import { ExecApprovalManager } from "../exec-approval-manager.js";
 import { createExecApprovalHandlers } from "./exec-approval.js";
+import { validateExecApprovalRequestParams } from "../protocol/index.js";
 
 const noop = () => {};
 
 describe("exec approval handlers", () => {
+  describe("ExecApprovalRequestParams validation", () => {
+    it("accepts request with resolvedPath omitted", () => {
+      const params = {
+        command: "echo hi",
+        cwd: "/tmp",
+        host: "node",
+      };
+      expect(validateExecApprovalRequestParams(params)).toBe(true);
+    });
+
+    it("accepts request with resolvedPath as string", () => {
+      const params = {
+        command: "echo hi",
+        cwd: "/tmp",
+        host: "node",
+        resolvedPath: "/usr/bin/echo",
+      };
+      expect(validateExecApprovalRequestParams(params)).toBe(true);
+    });
+
+    it("accepts request with resolvedPath as undefined", () => {
+      const params = {
+        command: "echo hi",
+        cwd: "/tmp",
+        host: "node",
+        resolvedPath: undefined,
+      };
+      expect(validateExecApprovalRequestParams(params)).toBe(true);
+    });
+
+    // This documents the TypeBox/AJV behavior that caused the Discord exec bug:
+    // Type.Optional(Type.String()) does NOT accept null, only string or undefined.
+    it("rejects request with resolvedPath as null", () => {
+      const params = {
+        command: "echo hi",
+        cwd: "/tmp",
+        host: "node",
+        resolvedPath: null,
+      };
+      expect(validateExecApprovalRequestParams(params)).toBe(false);
+    });
+  });
+
   it("broadcasts request + resolve", async () => {
     const manager = new ExecApprovalManager();
     const handlers = createExecApprovalHandlers(manager);

From 302bb64457704117efd8964c4097f6e7d5ca9e02 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 02:20:42 +0000
Subject: [PATCH 096/171] test: fix await-thenable in signal typing test

---
 src/signal/monitor.event-handler.typing-read-receipts.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/signal/monitor.event-handler.typing-read-receipts.test.ts b/src/signal/monitor.event-handler.typing-read-receipts.test.ts
index 2985f4d95..c4ba6f9ce 100644
--- a/src/signal/monitor.event-handler.typing-read-receipts.test.ts
+++ b/src/signal/monitor.event-handler.typing-read-receipts.test.ts
@@ -12,7 +12,7 @@ vi.mock("./send.js", () => ({
 vi.mock("../auto-reply/reply/dispatch-from-config.js", () => ({
   dispatchReplyFromConfig: vi.fn(
     async (params: { replyOptions?: { onReplyStart?: () => void } }) => {
-      await params.replyOptions?.onReplyStart?.();
+      await Promise.resolve(params.replyOptions?.onReplyStart?.());
       return { queuedFinal: false, counts: { tool: 0, block: 0, final: 0 } };
     },
   ),

From 2f47b3f6bd21b46743abb5251c3db1f4d2051ebe Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 02:24:19 +0000
Subject: [PATCH 097/171] fix: sync debug polling with route changes (#1373)
 (thanks @yazinsai)

---
 CHANGELOG.md                   |  1 +
 src/cli/update-cli.test.ts     |  2 +-
 ui/src/ui/app-settings.test.ts | 91 ++++++++++++++++++++++++++++++++++
 ui/src/ui/app-settings.ts      |  3 ++
 4 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 ui/src/ui/app-settings.test.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a6ae14d0..c80bcbdaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Docs: https://docs.clawd.bot
 
 ### Fixes
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
+- UI: refresh debug panel on route-driven tab changes. (#1373) Thanks @yazinsai.
 
 ## 2026.1.21
 
diff --git a/src/cli/update-cli.test.ts b/src/cli/update-cli.test.ts
index 395789bdd..25fe5b1d1 100644
--- a/src/cli/update-cli.test.ts
+++ b/src/cli/update-cli.test.ts
@@ -273,7 +273,7 @@ describe("update-cli", () => {
     try {
       await fs.writeFile(
         path.join(tempDir, "package.json"),
-        JSON.stringify({ name: "clawdbot", version: "2026.1.18-1" }),
+        JSON.stringify({ name: "clawdbot", version: "1.0.0" }),
         "utf-8",
       );
 
diff --git a/ui/src/ui/app-settings.test.ts b/ui/src/ui/app-settings.test.ts
new file mode 100644
index 000000000..be06d7d8b
--- /dev/null
+++ b/ui/src/ui/app-settings.test.ts
@@ -0,0 +1,91 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import type { Tab } from "./navigation";
+
+type SettingsHost = Parameters<typeof import("./app-settings").setTabFromRoute>[0];
+
+const createHost = (tab: Tab): SettingsHost => ({
+  settings: {
+    gatewayUrl: "",
+    token: "",
+    sessionKey: "main",
+    lastActiveSessionKey: "main",
+    theme: "system",
+    chatFocusMode: false,
+    chatShowThinking: true,
+    splitRatio: 0.6,
+    navCollapsed: false,
+    navGroupsCollapsed: {},
+  },
+  theme: "system",
+  themeResolved: "dark",
+  applySessionKey: "main",
+  sessionKey: "main",
+  tab,
+  connected: false,
+  chatHasAutoScrolled: false,
+  logsAtBottom: false,
+  eventLog: [],
+  eventLogBuffer: [],
+  basePath: "",
+  themeMedia: null,
+  themeMediaHandler: null,
+});
+
+describe("setTabFromRoute", () => {
+  beforeEach(() => {
+    vi.resetModules();
+  });
+
+  it("starts and stops log polling based on the tab", async () => {
+    const startLogsPolling = vi.fn();
+    const stopLogsPolling = vi.fn();
+    const startDebugPolling = vi.fn();
+    const stopDebugPolling = vi.fn();
+
+    vi.doMock("./app-polling", () => ({
+      startLogsPolling,
+      stopLogsPolling,
+      startDebugPolling,
+      stopDebugPolling,
+    }));
+
+    const { setTabFromRoute } = await import("./app-settings");
+    const host = createHost("chat");
+
+    setTabFromRoute(host, "logs");
+    expect(startLogsPolling).toHaveBeenCalledTimes(1);
+    expect(stopLogsPolling).not.toHaveBeenCalled();
+    expect(startDebugPolling).not.toHaveBeenCalled();
+    expect(stopDebugPolling).toHaveBeenCalledTimes(1);
+
+    setTabFromRoute(host, "chat");
+    expect(stopLogsPolling).toHaveBeenCalledTimes(1);
+  });
+
+  it("starts and stops debug polling based on the tab", async () => {
+    const startLogsPolling = vi.fn();
+    const stopLogsPolling = vi.fn();
+    const startDebugPolling = vi.fn();
+    const stopDebugPolling = vi.fn();
+
+    vi.doMock("./app-polling", () => ({
+      startLogsPolling,
+      stopLogsPolling,
+      startDebugPolling,
+      stopDebugPolling,
+    }));
+
+    const { setTabFromRoute } = await import("./app-settings");
+    const host = createHost("chat");
+
+    setTabFromRoute(host, "debug");
+    expect(startDebugPolling).toHaveBeenCalledTimes(1);
+    expect(stopDebugPolling).not.toHaveBeenCalled();
+    expect(startLogsPolling).not.toHaveBeenCalled();
+    expect(stopLogsPolling).toHaveBeenCalledTimes(1);
+
+    setTabFromRoute(host, "chat");
+    expect(stopDebugPolling).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/ui/src/ui/app-settings.ts b/ui/src/ui/app-settings.ts
index f27319d37..0cceff4cb 100644
--- a/ui/src/ui/app-settings.ts
+++ b/ui/src/ui/app-settings.ts
@@ -264,6 +264,9 @@ export function setTabFromRoute(host: SettingsHost, next: Tab) {
   if (next === "logs")
     startLogsPolling(host as unknown as Parameters<typeof startLogsPolling>[0]);
   else stopLogsPolling(host as unknown as Parameters<typeof stopLogsPolling>[0]);
+  if (next === "debug")
+    startDebugPolling(host as unknown as Parameters<typeof startDebugPolling>[0]);
+  else stopDebugPolling(host as unknown as Parameters<typeof stopDebugPolling>[0]);
   if (host.connected) void refreshActiveTab(host);
 }
 

From 2e1514095d1ebc4a75abcbeca6caf8713b0c0f5b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 02:33:42 +0000
Subject: [PATCH 098/171] fix: package Textual resources for mac app

---
 CHANGELOG.md               |  1 +
 scripts/package-mac-app.sh | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa3ef3efe..52b4fe724 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Docs: https://docs.clawd.bot
 
 ### Fixes
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
+- macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
 - UI: refresh debug panel on route-driven tab changes. (#1373) Thanks @yazinsai.
 
 ## 2026.1.21
diff --git a/scripts/package-mac-app.sh b/scripts/package-mac-app.sh
index f0cc385b3..48622efe1 100755
--- a/scripts/package-mac-app.sh
+++ b/scripts/package-mac-app.sh
@@ -227,15 +227,29 @@ fi
 
 echo "📦 Copying Textual resources"
 TEXTUAL_BUNDLE_DIR="$(build_path_for_arch "$PRIMARY_ARCH")/$BUILD_CONFIG"
-TEXTUAL_BUNDLE="$TEXTUAL_BUNDLE_DIR/textual_Textual.bundle"
-if [ ! -d "$TEXTUAL_BUNDLE" ]; then
-  TEXTUAL_BUNDLE="$TEXTUAL_BUNDLE_DIR/Textual_Textual.bundle"
+TEXTUAL_BUNDLE=""
+for candidate in \
+  "$TEXTUAL_BUNDLE_DIR/textual_Textual.bundle" \
+  "$TEXTUAL_BUNDLE_DIR/Textual_Textual.bundle"
+do
+  if [ -d "$candidate" ]; then
+    TEXTUAL_BUNDLE="$candidate"
+    break
+  fi
+done
+if [ -z "$TEXTUAL_BUNDLE" ]; then
+  TEXTUAL_BUNDLE="$(find "$BUILD_ROOT" -type d \( -name "textual_Textual.bundle" -o -name "Textual_Textual.bundle" \) -print -quit)"
 fi
-if [ -d "$TEXTUAL_BUNDLE" ]; then
+if [ -n "$TEXTUAL_BUNDLE" ] && [ -d "$TEXTUAL_BUNDLE" ]; then
   rm -rf "$APP_ROOT/Contents/Resources/$(basename "$TEXTUAL_BUNDLE")"
   cp -R "$TEXTUAL_BUNDLE" "$APP_ROOT/Contents/Resources/"
 else
-  echo "WARN: Textual resource bundle not found in $TEXTUAL_BUNDLE_DIR (continuing)" >&2
+  if [[ "${ALLOW_MISSING_TEXTUAL_BUNDLE:-0}" == "1" ]]; then
+    echo "WARN: Textual resource bundle not found (continuing due to ALLOW_MISSING_TEXTUAL_BUNDLE=1)" >&2
+  else
+    echo "ERROR: Textual resource bundle not found. Set ALLOW_MISSING_TEXTUAL_BUNDLE=1 to bypass." >&2
+    exit 1
+  fi
 fi
 
 echo "⏹  Stopping any running Clawdbot"

From b5c307d07f1bd33aab169d180ae731d2bc984ced Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 02:37:22 +0000
Subject: [PATCH 099/171] docs: highlight lobster in changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52b4fe724..279284fbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Docs: https://docs.clawd.bot
 ## 2026.1.22
 
 ### Changes
+- Highlight: Lobster optional plugin tool for typed workflows + approval gates. https://docs.clawd.bot/tools/lobster
 - Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
 - Onboarding: remove the run setup-token auth option (paste setup-token or reuse CLI creds instead).
 - Signal: add typing indicators and DM read receipts via signal-cli.

From f1aa260b0e5167113c6b093c6ed7861df0f1c47a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 02:44:05 +0000
Subject: [PATCH 100/171] test: avoid downgrade prompt in update fallback

---
 src/cli/update-cli.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cli/update-cli.test.ts b/src/cli/update-cli.test.ts
index 25fe5b1d1..e8ae15a7d 100644
--- a/src/cli/update-cli.test.ts
+++ b/src/cli/update-cli.test.ts
@@ -236,7 +236,7 @@ describe("update-cli", () => {
         durationMs: 100,
       });
 
-      await updateCommand({});
+      await updateCommand({ yes: true });
 
       const call = vi.mocked(runGatewayUpdate).mock.calls[0]?.[0];
       expect(call?.channel).toBe("stable");

From 9d2264612098e1b66b2990e8e76435d2e01185cd Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 02:47:42 +0000
Subject: [PATCH 101/171] fix: reduce invalid config log noise

---
 CHANGELOG.md     | 1 +
 src/config/io.ts | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 279284fbc..d350d3a63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Docs: https://docs.clawd.bot
 - Signal: add typing indicators and DM read receipts via signal-cli.
 
 ### Fixes
+- Config: avoid stack traces for invalid configs and log the config path.
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
 - macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
 - UI: refresh debug panel on route-driven tab changes. (#1373) Thanks @yazinsai.
diff --git a/src/config/io.ts b/src/config/io.ts
index d275d3185..6994e4485 100644
--- a/src/config/io.ts
+++ b/src/config/io.ts
@@ -247,7 +247,7 @@ export function createConfigIO(overrides: ConfigIoDeps = {}) {
           .join("\n");
         if (!loggedInvalidConfigs.has(configPath)) {
           loggedInvalidConfigs.add(configPath);
-          deps.logger.error(`Invalid config:\\n${details}`);
+          deps.logger.error(`Invalid config at ${configPath}:\\n${details}`);
         }
         const error = new Error("Invalid config");
         (error as { code?: string; details?: string }).code = "INVALID_CONFIG";
@@ -299,6 +299,10 @@ export function createConfigIO(overrides: ConfigIoDeps = {}) {
         deps.logger.error(err.message);
         throw err;
       }
+      const error = err as { code?: string };
+      if (error?.code === "INVALID_CONFIG") {
+        return {};
+      }
       deps.logger.error(`Failed to read config at ${configPath}`, err);
       return {};
     }

From 464de2978bd780a6fd52ec7417353cea1c976649 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 02:48:14 +0000
Subject: [PATCH 102/171] docs: add special thanks

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index f24c37382..d21519fc3 100644
--- a/README.md
+++ b/README.md
@@ -471,6 +471,9 @@ by Peter Steinberger and the community.
 See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines, maintainers, and how to submit PRs.  
 AI/vibe-coded PRs welcome! 🤖
 
+Special thanks to [Mario Zechner](https://mariozechner.at/) for his support and for
+[pi-mono](https://github.com/badlogic/pi-mono).
+
 Thanks to all clawtributors:
 
 <p align="left">

From 472b8fe15dde84a4c333492bcb3685900e22e54f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 03:14:25 +0000
Subject: [PATCH 103/171] fix: prevent memory CLI hangs

---
 CHANGELOG.md          |  1 +
 src/cli/memory-cli.ts |  8 +++--
 src/cli/update-cli.ts |  6 +++-
 src/memory/manager.ts | 79 ++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d350d3a63..00e1a9bcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Docs: https://docs.clawd.bot
 
 ### Changes
 - Highlight: Lobster optional plugin tool for typed workflows + approval gates. https://docs.clawd.bot/tools/lobster
+- Memory: prevent CLI hangs by deferring vector probes, adding sqlite-vec/embedding timeouts, and showing sync progress early.
 - Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
 - Onboarding: remove the run setup-token auth option (paste setup-token or reuse CLI creds instead).
 - Signal: add typing indicators and DM read receipts via signal-cli.
diff --git a/src/cli/memory-cli.ts b/src/cli/memory-cli.ts
index a10539ea7..70ef976d2 100644
--- a/src/cli/memory-cli.ts
+++ b/src/cli/memory-cli.ts
@@ -323,9 +323,11 @@ export async function runMemoryStatus(opts: MemoryCommandOptions) {
     }
     if (status.vector) {
       const vectorState = status.vector.enabled
-        ? status.vector.available
-          ? "ready"
-          : "unavailable"
+        ? status.vector.available === undefined
+          ? "unknown"
+          : status.vector.available
+            ? "ready"
+            : "unavailable"
         : "disabled";
       const vectorColor =
         vectorState === "ready"
diff --git a/src/cli/update-cli.ts b/src/cli/update-cli.ts
index 240f19ccb..088a021bf 100644
--- a/src/cli/update-cli.ts
+++ b/src/cli/update-cli.ts
@@ -589,16 +589,20 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
   let tag = explicitTag ?? channelToNpmTag(channel);
   if (updateInstallKind !== "git") {
     const currentVersion = switchToPackage ? null : await readPackageVersion(root);
+    let fallbackToLatest = false;
     const targetVersion = explicitTag
       ? await resolveTargetVersion(tag, timeoutMs)
       : await resolveNpmChannelTag({ channel, timeoutMs }).then((resolved) => {
           tag = resolved.tag;
+          fallbackToLatest = channel === "beta" && resolved.tag === "latest";
           return resolved.version;
         });
     const cmp =
       currentVersion && targetVersion ? compareSemverStrings(currentVersion, targetVersion) : null;
     const needsConfirm =
-      currentVersion != null && (targetVersion == null || (cmp != null && cmp > 0));
+      !fallbackToLatest &&
+      currentVersion != null &&
+      (targetVersion == null || (cmp != null && cmp > 0));
 
     if (needsConfirm && !opts.yes) {
       if (!process.stdin.isTTY || opts.json) {
diff --git a/src/memory/manager.ts b/src/memory/manager.ts
index 56e5bb6e9..2134bb47e 100644
--- a/src/memory/manager.ts
+++ b/src/memory/manager.ts
@@ -102,6 +102,11 @@ const EMBEDDING_RETRY_BASE_DELAY_MS = 500;
 const EMBEDDING_RETRY_MAX_DELAY_MS = 8000;
 const BATCH_FAILURE_LIMIT = 2;
 const SESSION_DELTA_READ_CHUNK_BYTES = 64 * 1024;
+const VECTOR_LOAD_TIMEOUT_MS = 30_000;
+const EMBEDDING_QUERY_TIMEOUT_REMOTE_MS = 60_000;
+const EMBEDDING_QUERY_TIMEOUT_LOCAL_MS = 5 * 60_000;
+const EMBEDDING_BATCH_TIMEOUT_REMOTE_MS = 2 * 60_000;
+const EMBEDDING_BATCH_TIMEOUT_LOCAL_MS = 10 * 60_000;
 
 const log = createSubsystemLogger("memory");
 
@@ -281,7 +286,7 @@ export class MemoryIndexManager {
       ? await this.searchKeyword(cleaned, candidates).catch(() => [])
       : [];
 
-    const queryVec = await this.provider.embedQuery(cleaned);
+    const queryVec = await this.embedQueryWithTimeout(cleaned);
     const hasVector = queryVec.some((v) => v !== 0);
     const vectorResults = hasVector
       ? await this.searchVector(queryVec, candidates).catch(() => [])
@@ -580,9 +585,23 @@ export class MemoryIndexManager {
   private async ensureVectorReady(dimensions?: number): Promise<boolean> {
     if (!this.vector.enabled) return false;
     if (!this.vectorReady) {
-      this.vectorReady = this.loadVectorExtension();
+      this.vectorReady = this.withTimeout(
+        this.loadVectorExtension(),
+        VECTOR_LOAD_TIMEOUT_MS,
+        `sqlite-vec load timed out after ${Math.round(VECTOR_LOAD_TIMEOUT_MS / 1000)}s`,
+      );
+    }
+    let ready = false;
+    try {
+      ready = await this.vectorReady;
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      this.vector.available = false;
+      this.vector.loadError = message;
+      this.vectorReady = null;
+      log.warn(`sqlite-vec unavailable: ${message}`);
+      return false;
     }
-    const ready = await this.vectorReady;
     if (ready && typeof dimensions === "number" && dimensions > 0) {
       this.ensureVectorTable(dimensions);
     }
@@ -1153,6 +1172,13 @@ export class MemoryIndexManager {
     progress?: (update: MemorySyncProgressUpdate) => void;
   }) {
     const progress = params?.progress ? this.createSyncProgress(params.progress) : undefined;
+    if (progress) {
+      progress.report({
+        completed: progress.completed,
+        total: progress.total,
+        label: "Loading vector extension…",
+      });
+    }
     const vectorReady = await this.ensureVectorReady();
     const meta = this.readMeta();
     const needsFullReindex =
@@ -1844,7 +1870,17 @@ export class MemoryIndexManager {
     let delayMs = EMBEDDING_RETRY_BASE_DELAY_MS;
     while (true) {
       try {
-        return await this.provider.embedBatch(texts);
+        const timeoutMs = this.resolveEmbeddingTimeout("batch");
+        log.debug("memory embeddings: batch start", {
+          provider: this.provider.id,
+          items: texts.length,
+          timeoutMs,
+        });
+        return await this.withTimeout(
+          this.provider.embedBatch(texts),
+          timeoutMs,
+          `memory embeddings batch timed out after ${Math.round(timeoutMs / 1000)}s`,
+        );
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         if (!this.isRetryableEmbeddingError(message) || attempt >= EMBEDDING_RETRY_MAX_ATTEMPTS) {
@@ -1868,6 +1904,41 @@ export class MemoryIndexManager {
     );
   }
 
+  private resolveEmbeddingTimeout(kind: "query" | "batch"): number {
+    const isLocal = this.provider.id === "local";
+    if (kind === "query") {
+      return isLocal ? EMBEDDING_QUERY_TIMEOUT_LOCAL_MS : EMBEDDING_QUERY_TIMEOUT_REMOTE_MS;
+    }
+    return isLocal ? EMBEDDING_BATCH_TIMEOUT_LOCAL_MS : EMBEDDING_BATCH_TIMEOUT_REMOTE_MS;
+  }
+
+  private async embedQueryWithTimeout(text: string): Promise<number[]> {
+    const timeoutMs = this.resolveEmbeddingTimeout("query");
+    log.debug("memory embeddings: query start", { provider: this.provider.id, timeoutMs });
+    return await this.withTimeout(
+      this.provider.embedQuery(text),
+      timeoutMs,
+      `memory embeddings query timed out after ${Math.round(timeoutMs / 1000)}s`,
+    );
+  }
+
+  private async withTimeout<T>(
+    promise: Promise<T>,
+    timeoutMs: number,
+    message: string,
+  ): Promise<T> {
+    if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) return await promise;
+    let timer: NodeJS.Timeout | null = null;
+    const timeoutPromise = new Promise<never>((_, reject) => {
+      timer = setTimeout(() => reject(new Error(message)), timeoutMs);
+    });
+    try {
+      return (await Promise.race([promise, timeoutPromise])) as T;
+    } finally {
+      if (timer) clearTimeout(timer);
+    }
+  }
+
   private async runWithConcurrency<T>(tasks: Array<() => Promise<T>>, limit: number): Promise<T[]> {
     if (tasks.length === 0) return [];
     const resolvedLimit = Math.max(1, Math.min(limit, tasks.length));

From 40757a8c18d6b0c0574f871179d470968eca268f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 03:20:15 +0000
Subject: [PATCH 104/171] fix: stabilize lobster tool subprocess

---
 extensions/lobster/clawdbot.plugin.json | 10 ++++++++++
 extensions/lobster/src/lobster-tool.ts  | 11 +++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 extensions/lobster/clawdbot.plugin.json

diff --git a/extensions/lobster/clawdbot.plugin.json b/extensions/lobster/clawdbot.plugin.json
new file mode 100644
index 000000000..c1070a87b
--- /dev/null
+++ b/extensions/lobster/clawdbot.plugin.json
@@ -0,0 +1,10 @@
+{
+  "id": "lobster",
+  "name": "Lobster",
+  "description": "Typed workflow tool with resumable approvals.",
+  "configSchema": {
+    "type": "object",
+    "additionalProperties": false,
+    "properties": {}
+  }
+}
diff --git a/extensions/lobster/src/lobster-tool.ts b/extensions/lobster/src/lobster-tool.ts
index 2d76e0821..71dade859 100644
--- a/extensions/lobster/src/lobster-tool.ts
+++ b/extensions/lobster/src/lobster-tool.ts
@@ -40,14 +40,17 @@ async function runLobsterSubprocess(params: {
   const timeoutMs = Math.max(200, params.timeoutMs);
   const maxStdoutBytes = Math.max(1024, params.maxStdoutBytes);
 
+  const env = { ...process.env, LOBSTER_MODE: "tool" } as Record<string, string | undefined>;
+  const nodeOptions = env.NODE_OPTIONS ?? "";
+  if (nodeOptions.includes("--inspect")) {
+    delete env.NODE_OPTIONS;
+  }
+
   return await new Promise<{ stdout: string }>((resolve, reject) => {
     const child = spawn(execPath, argv, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
-      env: {
-        ...process.env,
-        LOBSTER_MODE: "tool",
-      },
+      env,
     });
 
     let stdout = "";

From 57f3d209de2c6d9de010d2b838b00ccdafd3ff39 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 03:25:13 +0000
Subject: [PATCH 105/171] docs: expand lobster guides

---
 docs/tools/index.md   |   3 +
 docs/tools/lobster.md | 134 ++++++++++++++++++++++++++++++------------
 2 files changed, 101 insertions(+), 36 deletions(-)

diff --git a/docs/tools/index.md b/docs/tools/index.md
index ccb0c87c6..984957c34 100644
--- a/docs/tools/index.md
+++ b/docs/tools/index.md
@@ -154,6 +154,9 @@ See [Plugins](/plugin) for install + config, and [Skills](/tools/skills) for how
 tool usage guidance is injected into prompts. Some plugins ship their own skills
 alongside tools (for example, the voice-call plugin).
 
+Optional plugin tools:
+- [Lobster](/tools/lobster): typed workflow runtime with resumable approvals (requires the Lobster CLI on the gateway host).
+
 ## Tool inventory
 
 ### `apply_patch`
diff --git a/docs/tools/lobster.md b/docs/tools/lobster.md
index bb3f4d130..11f77f827 100644
--- a/docs/tools/lobster.md
+++ b/docs/tools/lobster.md
@@ -1,6 +1,10 @@
 ---
 title: Lobster
+summary: "Typed workflow runtime for Clawdbot with resumable approval gates."
 description: Typed workflow runtime for Clawdbot — composable pipelines with approval gates.
+read_when:
+  - You want deterministic multi-step workflows with explicit approvals
+  - You need to resume a workflow without re-running earlier steps
 ---
 
 # Lobster
@@ -11,10 +15,41 @@ Lobster is a workflow shell that lets Clawdbot run multi-step tool sequences as
 
 Today, complex workflows require many back-and-forth tool calls. Each call costs tokens, and the LLM has to orchestrate every step. Lobster moves that orchestration into a typed runtime:
 
-- **One call instead of many**: Clawdbot calls `lobster.run(...)` once and gets a structured result.
+- **One call instead of many**: Clawdbot runs one Lobster tool call and gets a structured result.
 - **Approvals built in**: Side effects (send email, post comment) halt the workflow until explicitly approved.
 - **Resumable**: Halted workflows return a token; approve and resume without re-running everything.
 
+## How it works
+
+Clawdbot launches the local `lobster` CLI in **tool mode** and parses a JSON envelope from stdout.
+If the pipeline pauses for approval, the tool returns a `resumeToken` so you can continue later.
+
+## Install Lobster
+
+Install the Lobster CLI on the **same host** that runs the Clawdbot Gateway (see the [Lobster repo](https://github.com/vignesh07/lobster)), and ensure `lobster` is on `PATH`.
+If you want to use a custom binary location, pass an **absolute** `lobsterPath` in the tool call.
+
+## Enable the tool
+
+Lobster is an **optional** plugin tool (not enabled by default). Allow it per agent:
+
+```json
+{
+  "agents": {
+    "list": [
+      {
+        "id": "main",
+        "tools": {
+          "allow": ["lobster"]
+        }
+      }
+    ]
+  }
+}
+```
+
+You can also allow it globally with `tools.allow` if every agent should see it.
+
 ## Example: Email triage
 
 Without Lobster:
@@ -30,58 +65,53 @@ User: "Check my email and draft replies"
 ```
 
 With Lobster:
-```
-clawd calls: lobster.run("email.triage --limit 20")
-
-Returns:
+```json
 {
+  "action": "run",
+  "pipeline": "email.triage --limit 20",
+  "timeoutMs": 30000
+}
+```
+
+Returns a JSON envelope (truncated):
+```json
+{
+  "ok": true,
   "status": "needs_approval",
-  "output": {
-    "summary": "5 need replies, 2 need action",
-    "drafts": [...]
-  },
+  "output": [{ "summary": "5 need replies, 2 need action" }],
   "requiresApproval": {
+    "type": "approval_request",
     "prompt": "Send 2 draft replies?",
+    "items": [],
     "resumeToken": "..."
   }
 }
+```
 
-User approves → clawd calls: lobster.resume(token, approve: true)
-→ Emails sent
+User approves → resume:
+```json
+{
+  "action": "resume",
+  "token": "<resumeToken>",
+  "approve": true
+}
 ```
 
 One workflow. Deterministic. Safe.
 
-## Enable
-
-Lobster is an **optional** plugin tool. Enable it in your agent config:
-
-```json
-{
-  "agents": {
-    "list": [{
-      "id": "main",
-      "tools": {
-        "allow": ["lobster"]
-      }
-    }]
-  }
-}
-```
-
-You also need the `lobster` CLI installed locally.
-
-## Actions
+## Tool parameters
 
 ### `run`
 
-Execute a Lobster pipeline in tool mode.
+Run a pipeline in tool mode.
 
 ```json
 {
   "action": "run",
   "pipeline": "gog.gmail.search --query 'newer_than:1d' | email.triage",
-  "timeoutMs": 30000
+  "cwd": "/path/to/workspace",
+  "timeoutMs": 30000,
+  "maxStdoutBytes": 512000
 }
 ```
 
@@ -97,13 +127,45 @@ Continue a halted workflow after approval.
 }
 ```
 
-## Security
+### Optional inputs
+
+- `lobsterPath`: Absolute path to the Lobster binary (omit to use `PATH`).
+- `cwd`: Working directory for the pipeline (defaults to the current process working directory).
+- `timeoutMs`: Kill the subprocess if it exceeds this duration (default: 20000).
+- `maxStdoutBytes`: Kill the subprocess if stdout exceeds this size (default: 512000).
+
+## Output envelope
+
+Lobster returns a JSON envelope with one of three statuses:
+
+- `ok` → finished successfully
+- `needs_approval` → paused; `requiresApproval.resumeToken` is required to resume
+- `cancelled` → explicitly denied or cancelled
+
+The tool surfaces the envelope in both `content` (pretty JSON) and `details` (raw object).
+
+## Approvals
+
+If `requiresApproval` is present, inspect the prompt and decide:
+
+- `approve: true` → resume and continue side effects
+- `approve: false` → cancel and finalize the workflow
+
+## Safety
 
 - **Local subprocess only** — no network calls from the plugin itself.
 - **No secrets** — Lobster doesn't manage OAuth; it calls clawd tools that do.
-- **Sandbox-aware** — disabled when `ctx.sandboxed` is true.
+- **Sandbox-aware** — disabled when the tool context is sandboxed.
 - **Hardened** — `lobsterPath` must be absolute if specified; timeouts and output caps enforced.
 
+## Troubleshooting
+
+- **`lobster subprocess timed out`** → increase `timeoutMs`, or split a long pipeline.
+- **`lobster output exceeded maxStdoutBytes`** → raise `maxStdoutBytes` or reduce output size.
+- **`lobster returned invalid JSON`** → ensure the pipeline runs in tool mode and prints only JSON.
+- **`lobster failed (code …)`** → run the same pipeline in a terminal to inspect stderr.
+
 ## Learn more
 
-- [Lobster repo](https://github.com/vignesh07/lobster) — runtime, commands, and workflow examples.
+- [Plugins](/plugin)
+- [Plugin tool authoring](/plugins/agent-tools)

From a96e7f59c0b6afcb57e4c69070e43484b83f4db8 Mon Sep 17 00:00:00 2001
From: Mariano Belinky <mariano@mb-server-6.local>
Date: Sun, 18 Jan 2026 19:59:45 +0100
Subject: [PATCH 106/171] docs(gog): add gmail messages search usage

---
 skills/gog/SKILL.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/skills/gog/SKILL.md b/skills/gog/SKILL.md
index 35768e613..7c88ad8c6 100644
--- a/skills/gog/SKILL.md
+++ b/skills/gog/SKILL.md
@@ -16,6 +16,7 @@ Setup (once)
 
 Common commands
 - Gmail search: `gog gmail search 'newer_than:7d' --max 10`
+- Gmail messages search (per email, ignores threading): `gog gmail messages search "in:inbox from:ryanair.com" --max 20 --account belinmad@gmail.com`
 - Gmail send (plain): `gog gmail send --to a@b.com --subject "Hi" --body "Hello"`
 - Gmail send (multi-line): `gog gmail send --to a@b.com --subject "Hi" --body-file ./message.txt`
 - Gmail send (stdin): `gog gmail send --to a@b.com --subject "Hi" --body-file -`
@@ -88,3 +89,4 @@ Notes
 - Sheets values can be passed via `--values-json` (recommended) or as inline rows.
 - Docs supports export/cat/copy. In-place edits require a Docs API client (not in gog).
 - Confirm before sending mail or creating events.
+- `gog gmail search` returns one row per thread; use `gog gmail messages search` when you need every individual email returned separately.

From 7b8405cbfb216637ea982a8c54ca994620c6f20a Mon Sep 17 00:00:00 2001
From: Mariano Belinky <mbelinky@gmail.com>
Date: Mon, 19 Jan 2026 09:55:06 +0100
Subject: [PATCH 107/171] docs(gog): sanitize gmail messages example

---
 skills/gog/SKILL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skills/gog/SKILL.md b/skills/gog/SKILL.md
index 7c88ad8c6..5f9fc3fee 100644
--- a/skills/gog/SKILL.md
+++ b/skills/gog/SKILL.md
@@ -16,7 +16,7 @@ Setup (once)
 
 Common commands
 - Gmail search: `gog gmail search 'newer_than:7d' --max 10`
-- Gmail messages search (per email, ignores threading): `gog gmail messages search "in:inbox from:ryanair.com" --max 20 --account belinmad@gmail.com`
+- Gmail messages search (per email, ignores threading): `gog gmail messages search "in:inbox from:ryanair.com" --max 20 --account you@example.com`
 - Gmail send (plain): `gog gmail send --to a@b.com --subject "Hi" --body "Hello"`
 - Gmail send (multi-line): `gog gmail send --to a@b.com --subject "Hi" --body-file ./message.txt`
 - Gmail send (stdin): `gog gmail send --to a@b.com --subject "Hi" --body-file -`

From 5fe8c4ab8c0e0c9e47b65578ecd6b9d833ad94db Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 03:36:28 +0000
Subject: [PATCH 108/171] docs: add gog gmail messages search note (#1220)
 (thanks @mbelinky)

Co-authored-by: Mariano <mbelinky@users.noreply.github.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00e1a9bcb..4c24e9e37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Docs: https://docs.clawd.bot
 - Highlight: Lobster optional plugin tool for typed workflows + approval gates. https://docs.clawd.bot/tools/lobster
 - Memory: prevent CLI hangs by deferring vector probes, adding sqlite-vec/embedding timeouts, and showing sync progress early.
 - Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
+- Docs: add per-message Gmail search example for gog. (#1220) Thanks @mbelinky.
 - Onboarding: remove the run setup-token auth option (paste setup-token or reuse CLI creds instead).
 - Signal: add typing indicators and DM read receipts via signal-cli.
 

From 4642fae1937c072636d7e91c4ceeed397ae50600 Mon Sep 17 00:00:00 2001
From: Michael Behr <mkbehr@gmail.com>
Date: Sat, 17 Jan 2026 09:06:54 -0500
Subject: [PATCH 109/171] feat(cron): add contextMessages param to control
 reminder context

---
 src/agents/tools/cron-tool.test.ts | 27 ++++++++++++++++++++++++++-
 src/agents/tools/cron-tool.ts      |  9 +++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/agents/tools/cron-tool.test.ts b/src/agents/tools/cron-tool.test.ts
index 6fa452e08..04acb881e 100644
--- a/src/agents/tools/cron-tool.test.ts
+++ b/src/agents/tools/cron-tool.test.ts
@@ -85,7 +85,7 @@ describe("cron tool", () => {
     });
   });
 
-  it("adds recent context for systemEvent reminders when session key is available", async () => {
+  it("adds recent context for systemEvent reminders when contextMessages > 0", async () => {
     callGatewayMock
       .mockResolvedValueOnce({
         messages: [
@@ -102,6 +102,7 @@ describe("cron tool", () => {
     const tool = createCronTool({ agentSessionKey: "main" });
     await tool.execute("call3", {
       action: "add",
+      contextMessages: 3,
       job: {
         name: "reminder",
         schedule: { atMs: 123 },
@@ -127,4 +128,28 @@ describe("cron tool", () => {
     expect(text).toContain("Assistant: We agreed to review on Tuesday.");
     expect(text).toContain("User: Remind me about the thing at 2pm");
   });
+
+  it("does not add context when contextMessages is 0 (default)", async () => {
+    callGatewayMock.mockResolvedValueOnce({ ok: true });
+
+    const tool = createCronTool({ agentSessionKey: "main" });
+    await tool.execute("call4", {
+      action: "add",
+      job: {
+        name: "reminder",
+        schedule: { atMs: 123 },
+        payload: { text: "Reminder: the thing." },
+      },
+    });
+
+    // Should only call cron.add, not chat.history
+    expect(callGatewayMock).toHaveBeenCalledTimes(1);
+    const cronCall = callGatewayMock.mock.calls[0]?.[0] as {
+      method?: string;
+      params?: { payload?: { text?: string } };
+    };
+    expect(cronCall.method).toBe("cron.add");
+    const text = cronCall.params?.payload?.text ?? "";
+    expect(text).not.toContain("Recent context:");
+  });
 });
diff --git a/src/agents/tools/cron-tool.ts b/src/agents/tools/cron-tool.ts
index 75af0becd..a84a2b774 100644
--- a/src/agents/tools/cron-tool.ts
+++ b/src/agents/tools/cron-tool.ts
@@ -16,7 +16,6 @@ const CRON_ACTIONS = ["status", "list", "add", "update", "remove", "run", "runs"
 
 const CRON_WAKE_MODES = ["now", "next-heartbeat"] as const;
 
-const REMINDER_CONTEXT_MESSAGES = 3;
 const REMINDER_CONTEXT_PER_MESSAGE_MAX = 220;
 const REMINDER_CONTEXT_TOTAL_MAX = 700;
 const REMINDER_CONTEXT_MARKER = "\n\nRecent context:\n";
@@ -34,6 +33,7 @@ const CronToolSchema = Type.Object({
   patch: Type.Optional(Type.Object({}, { additionalProperties: true })),
   text: Type.Optional(Type.String()),
   mode: optionalStringEnum(CRON_WAKE_MODES),
+  contextMessages: Type.Optional(Type.Number()),
 });
 
 type CronToolOptions = {
@@ -86,7 +86,9 @@ function extractMessageText(message: ChatMessage): { role: string; text: string
 async function buildReminderContextLines(params: {
   agentSessionKey?: string;
   gatewayOpts: GatewayCallOptions;
+  contextMessages: number;
 }) {
+  if (params.contextMessages <= 0) return [];
   const sessionKey = params.agentSessionKey?.trim();
   if (!sessionKey) return [];
   const cfg = loadConfig();
@@ -101,7 +103,7 @@ async function buildReminderContextLines(params: {
     const parsed = messages
       .map((msg) => extractMessageText(msg as ChatMessage))
       .filter((msg): msg is { role: string; text: string } => Boolean(msg));
-    const recent = parsed.slice(-REMINDER_CONTEXT_MESSAGES);
+    const recent = parsed.slice(-params.contextMessages);
     if (recent.length === 0) return [];
     const lines: string[] = [];
     let total = 0;
@@ -149,6 +151,8 @@ export function createCronTool(opts?: CronToolOptions): AnyAgentTool {
             throw new Error("job required");
           }
           const job = normalizeCronJobCreate(params.job) ?? params.job;
+          const contextMessages =
+            typeof params.contextMessages === "number" ? params.contextMessages : 0;
           if (
             job &&
             typeof job === "object" &&
@@ -160,6 +164,7 @@ export function createCronTool(opts?: CronToolOptions): AnyAgentTool {
               const contextLines = await buildReminderContextLines({
                 agentSessionKey: opts?.agentSessionKey,
                 gatewayOpts,
+                contextMessages,
               });
               if (contextLines.length > 0) {
                 const baseText = stripExistingContext(payload.text);

From ffbf75d74087a0a1d1b1db08aadc4e77065bd4fc Mon Sep 17 00:00:00 2001
From: Michael Behr <mkbehr@gmail.com>
Date: Sat, 17 Jan 2026 09:14:33 -0500
Subject: [PATCH 110/171] update description

---
 src/agents/tools/cron-tool.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/agents/tools/cron-tool.ts b/src/agents/tools/cron-tool.ts
index a84a2b774..4ef5e4924 100644
--- a/src/agents/tools/cron-tool.ts
+++ b/src/agents/tools/cron-tool.ts
@@ -126,7 +126,7 @@ export function createCronTool(opts?: CronToolOptions): AnyAgentTool {
     label: "Cron",
     name: "cron",
     description:
-      "Manage Gateway cron jobs (status/list/add/update/remove/run/runs) and send wake events. Use `jobId` as the canonical identifier; `id` is accepted for compatibility.",
+      "Manage Gateway cron jobs (status/list/add/update/remove/run/runs) and send wake events. Use `jobId` as the canonical identifier; `id` is accepted for compatibility. Use `contextMessages` to add previous messages as context to the job text.",
     parameters: CronToolSchema,
     execute: async (_toolCallId, args) => {
       const params = args as Record<string, unknown>;

From 0f7f7bb95f774334e6b7758ee914123f94abd09c Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 03:27:26 +0000
Subject: [PATCH 111/171] fix: msteams attachments + plugin prompt hints

Co-authored-by: Christof <10854026+Evizero@users.noreply.github.com>
---
 CHANGELOG.md                                  |   1 +
 docs/channels/msteams.md                      | 152 +++++-
 docs/tools/index.md                           |   2 +-
 extensions/msteams/src/attachments.test.ts    | 135 ++++--
 extensions/msteams/src/attachments.ts         |   6 +-
 .../msteams/src/attachments/download.ts       |  27 +-
 extensions/msteams/src/attachments/graph.ts   | 110 ++++-
 extensions/msteams/src/attachments/shared.ts  |  33 ++
 extensions/msteams/src/channel.ts             |  66 ++-
 .../msteams/src/file-consent-helpers.test.ts  | 234 +++++++++
 .../msteams/src/file-consent-helpers.ts       |  73 +++
 extensions/msteams/src/file-consent.ts        | 122 +++++
 extensions/msteams/src/graph-chat.ts          |  52 ++
 extensions/msteams/src/graph-upload.ts        | 445 ++++++++++++++++++
 extensions/msteams/src/media-helpers.test.ts  | 186 ++++++++
 extensions/msteams/src/media-helpers.ts       |  77 +++
 extensions/msteams/src/messenger.test.ts      |  14 +-
 extensions/msteams/src/messenger.ts           | 203 ++++++--
 extensions/msteams/src/monitor-handler.ts     | 105 +++++
 .../src/monitor-handler/inbound-media.ts      |  11 +-
 .../src/monitor-handler/message-handler.ts    |   6 +-
 extensions/msteams/src/pending-uploads.ts     |  87 ++++
 extensions/msteams/src/probe.ts               |   2 +-
 extensions/msteams/src/reply-dispatcher.ts    |  21 +-
 extensions/msteams/src/send-context.ts        |  55 ++-
 extensions/msteams/src/send.ts                | 360 ++++++++++++--
 src/agents/channel-tools.ts                   |  18 +
 src/agents/pi-embedded-runner/compact.ts      |  10 +-
 src/agents/pi-embedded-runner/run/attempt.ts  |  13 +-
 .../pi-embedded-runner/system-prompt.ts       |   2 +
 src/agents/system-prompt.ts                   |   4 +
 src/agents/tools/message-tool.ts              |  20 +-
 src/auto-reply/reply/agent-runner-utils.ts    |   4 +-
 src/channels/dock.ts                          |   3 +
 src/channels/plugins/message-actions.ts       |   7 +
 src/channels/plugins/types.core.ts            |   5 +
 src/channels/plugins/types.plugin.ts          |   2 +
 src/channels/plugins/types.ts                 |   1 +
 src/cli/program/message/helpers.ts            |   2 +
 src/cli/program/message/register.send.ts      |   1 +
 src/config/types.msteams.ts                   |   4 +
 src/config/zod-schema.providers-core.ts       |   4 +
 src/config/zod-schema.ts                      |   6 +
 src/infra/outbound/message-action-runner.ts   |  28 +-
 src/media/mime.ts                             |   8 +-
 src/media/store.test.ts                       | 110 +++++
 src/media/store.ts                            |  55 ++-
 src/plugin-sdk/index.test.ts                  |   1 -
 src/plugin-sdk/index.ts                       |   5 +
 src/web/media.ts                              |  15 +-
 50 files changed, 2739 insertions(+), 174 deletions(-)
 create mode 100644 extensions/msteams/src/file-consent-helpers.test.ts
 create mode 100644 extensions/msteams/src/file-consent-helpers.ts
 create mode 100644 extensions/msteams/src/file-consent.ts
 create mode 100644 extensions/msteams/src/graph-chat.ts
 create mode 100644 extensions/msteams/src/graph-upload.ts
 create mode 100644 extensions/msteams/src/media-helpers.test.ts
 create mode 100644 extensions/msteams/src/media-helpers.ts
 create mode 100644 extensions/msteams/src/pending-uploads.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c24e9e37..6d44b3343 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Docs: https://docs.clawd.bot
 - Docs: add per-message Gmail search example for gog. (#1220) Thanks @mbelinky.
 - Onboarding: remove the run setup-token auth option (paste setup-token or reuse CLI creds instead).
 - Signal: add typing indicators and DM read receipts via signal-cli.
+- MSTeams: add file uploads, adaptive cards, and attachment handling improvements. (#1410) Thanks @Evizero.
 
 ### Fixes
 - Config: avoid stack traces for invalid configs and log the config path.
diff --git a/docs/channels/msteams.md b/docs/channels/msteams.md
index 4c9279941..3315153e6 100644
--- a/docs/channels/msteams.md
+++ b/docs/channels/msteams.md
@@ -8,9 +8,9 @@ read_when:
 > "Abandon all hope, ye who enter here."
 
 
-Updated: 2026-01-16
+Updated: 2026-01-21
 
-Status: text + DM attachments are supported; channel/group attachments require Microsoft Graph permissions. Polls are sent via Adaptive Cards.
+Status: text + DM attachments are supported; channel/group file sending requires `sharePointSiteId` + Graph permissions (see [Sending files in group chats](#sending-files-in-group-chats)). Polls are sent via Adaptive Cards.
 
 ## Plugin required
 Microsoft Teams ships as a plugin and is not bundled with the core install.
@@ -403,7 +403,7 @@ Clawdbot handles this by returning quickly and sending replies proactively, but
 Teams markdown is more limited than Slack or Discord:
 - Basic formatting works: **bold**, *italic*, `code`, links
 - Complex markdown (tables, nested lists) may not render correctly
-- Adaptive Cards are used for polls; other card types are not yet supported
+- Adaptive Cards are supported for polls and arbitrary card sends (see below)
 
 ## Configuration
 Key settings (see `/gateway/configuration` for shared channel patterns):
@@ -422,6 +422,7 @@ Key settings (see `/gateway/configuration` for shared channel patterns):
 - `channels.msteams.teams.<teamId>.requireMention`: per-team override.
 - `channels.msteams.teams.<teamId>.channels.<conversationId>.replyStyle`: per-channel override.
 - `channels.msteams.teams.<teamId>.channels.<conversationId>.requireMention`: per-channel override.
+- `channels.msteams.sharePointSiteId`: SharePoint site ID for file uploads in group chats/channels (see [Sending files in group chats](#sending-files-in-group-chats)).
 
 ## Routing & Sessions
 - Session keys follow the standard agent format (see [/concepts/session](/concepts/session)):
@@ -471,6 +472,75 @@ Teams recently introduced two channel UI styles over the same underlying data mo
 Without Graph permissions, channel messages with images will be received as text-only (the image content is not accessible to the bot).
 By default, Clawdbot only downloads media from Microsoft/Teams hostnames. Override with `channels.msteams.mediaAllowHosts` (use `["*"]` to allow any host).
 
+## Sending files in group chats
+
+Bots can send files in DMs using the FileConsentCard flow (built-in). However, **sending files in group chats/channels** requires additional setup:
+
+| Context | How files are sent | Setup needed |
+|---------|-------------------|--------------|
+| **DMs** | FileConsentCard → user accepts → bot uploads | Works out of the box |
+| **Group chats/channels** | Upload to SharePoint → share link | Requires `sharePointSiteId` + Graph permissions |
+| **Images (any context)** | Base64-encoded inline | Works out of the box |
+
+### Why group chats need SharePoint
+
+Bots don't have a personal OneDrive drive (the `/me/drive` Graph API endpoint doesn't work for application identities). To send files in group chats/channels, the bot uploads to a **SharePoint site** and creates a sharing link.
+
+### Setup
+
+1. **Add Graph API permissions** in Entra ID (Azure AD) → App Registration:
+   - `Sites.ReadWrite.All` (Application) - upload files to SharePoint
+   - `Chat.Read.All` (Application) - optional, enables per-user sharing links
+
+2. **Grant admin consent** for the tenant.
+
+3. **Get your SharePoint site ID:**
+   ```bash
+   # Via Graph Explorer or curl with a valid token:
+   curl -H "Authorization: Bearer $TOKEN" \
+     "https://graph.microsoft.com/v1.0/sites/{hostname}:/{site-path}"
+
+   # Example: for a site at "contoso.sharepoint.com/sites/BotFiles"
+   curl -H "Authorization: Bearer $TOKEN" \
+     "https://graph.microsoft.com/v1.0/sites/contoso.sharepoint.com:/sites/BotFiles"
+
+   # Response includes: "id": "contoso.sharepoint.com,guid1,guid2"
+   ```
+
+4. **Configure Clawdbot:**
+   ```json5
+   {
+     channels: {
+       msteams: {
+         // ... other config ...
+         sharePointSiteId: "contoso.sharepoint.com,guid1,guid2"
+       }
+     }
+   }
+   ```
+
+### Sharing behavior
+
+| Permission | Sharing behavior |
+|------------|------------------|
+| `Sites.ReadWrite.All` only | Organization-wide sharing link (anyone in org can access) |
+| `Sites.ReadWrite.All` + `Chat.Read.All` | Per-user sharing link (only chat members can access) |
+
+Per-user sharing is more secure as only the chat participants can access the file. If `Chat.Read.All` permission is missing, the bot falls back to organization-wide sharing.
+
+### Fallback behavior
+
+| Scenario | Result |
+|----------|--------|
+| Group chat + file + `sharePointSiteId` configured | Upload to SharePoint, send sharing link |
+| Group chat + file + no `sharePointSiteId` | Attempt OneDrive upload (may fail), send text only |
+| Personal chat + file | FileConsentCard flow (works without SharePoint) |
+| Any context + image | Base64-encoded inline (works without SharePoint) |
+
+### Files stored location
+
+Uploaded files are stored in a `/ClawdbotShared/` folder in the configured SharePoint site's default document library.
+
 ## Polls (Adaptive Cards)
 Clawdbot sends Teams polls as Adaptive Cards (there is no native Teams poll API).
 
@@ -479,6 +549,82 @@ Clawdbot sends Teams polls as Adaptive Cards (there is no native Teams poll API)
 - The gateway must stay online to record votes.
 - Polls do not auto-post result summaries yet (inspect the store file if needed).
 
+## Adaptive Cards (arbitrary)
+Send any Adaptive Card JSON to Teams users or conversations using the `message` tool or CLI.
+
+The `card` parameter accepts an Adaptive Card JSON object. When `card` is provided, the message text is optional.
+
+**Agent tool:**
+```json
+{
+  "action": "send",
+  "channel": "msteams",
+  "target": "user:<id>",
+  "card": {
+    "type": "AdaptiveCard",
+    "version": "1.5",
+    "body": [{"type": "TextBlock", "text": "Hello!"}]
+  }
+}
+```
+
+**CLI:**
+```bash
+clawdbot message send --channel msteams \
+  --target "conversation:19:abc...@thread.tacv2" \
+  --card '{"type":"AdaptiveCard","version":"1.5","body":[{"type":"TextBlock","text":"Hello!"}]}'
+```
+
+See [Adaptive Cards documentation](https://adaptivecards.io/) for card schema and examples. For target format details, see [Target formats](#target-formats) below.
+
+## Target formats
+
+MSTeams targets use prefixes to distinguish between users and conversations:
+
+| Target type | Format | Example |
+|-------------|--------|---------|
+| User (by ID) | `user:<aad-object-id>` | `user:40a1a0ed-4ff2-4164-a219-55518990c197` |
+| User (by name) | `user:<display-name>` | `user:John Smith` (requires Graph API) |
+| Group/channel | `conversation:<conversation-id>` | `conversation:19:abc123...@thread.tacv2` |
+| Group/channel (raw) | `<conversation-id>` | `19:abc123...@thread.tacv2` (if contains `@thread`) |
+
+**CLI examples:**
+```bash
+# Send to a user by ID
+clawdbot message send --channel msteams --target "user:40a1a0ed-..." --message "Hello"
+
+# Send to a user by display name (triggers Graph API lookup)
+clawdbot message send --channel msteams --target "user:John Smith" --message "Hello"
+
+# Send to a group chat or channel
+clawdbot message send --channel msteams --target "conversation:19:abc...@thread.tacv2" --message "Hello"
+
+# Send an Adaptive Card to a conversation
+clawdbot message send --channel msteams --target "conversation:19:abc...@thread.tacv2" \
+  --card '{"type":"AdaptiveCard","version":"1.5","body":[{"type":"TextBlock","text":"Hello"}]}'
+```
+
+**Agent tool examples:**
+```json
+{
+  "action": "send",
+  "channel": "msteams",
+  "target": "user:John Smith",
+  "message": "Hello!"
+}
+```
+
+```json
+{
+  "action": "send",
+  "channel": "msteams",
+  "target": "conversation:19:abc...@thread.tacv2",
+  "card": {"type": "AdaptiveCard", "version": "1.5", "body": [{"type": "TextBlock", "text": "Hello"}]}
+}
+```
+
+Note: Without the `user:` prefix, names default to group/team resolution. Always use `user:` when targeting people by display name.
+
 ## Proactive messaging
 - Proactive messages are only possible **after** a user has interacted, because we store conversation references at that point.
 - See `/gateway/configuration` for `dmPolicy` and allowlist gating.
diff --git a/docs/tools/index.md b/docs/tools/index.md
index 984957c34..9731b4f7d 100644
--- a/docs/tools/index.md
+++ b/docs/tools/index.md
@@ -322,7 +322,7 @@ Notes:
 Send messages and channel actions across Discord/Slack/Telegram/WhatsApp/Signal/iMessage/MS Teams.
 
 Core actions:
-- `send` (text + optional media)
+- `send` (text + optional media; MS Teams also supports `card` for Adaptive Cards)
 - `poll` (WhatsApp/Discord/MS Teams polls)
 - `react` / `reactions` / `read` / `edit` / `delete`
 - `pin` / `unpin` / `list-pins`
diff --git a/extensions/msteams/src/attachments.test.ts b/extensions/msteams/src/attachments.test.ts
index f12787720..a86a476c5 100644
--- a/extensions/msteams/src/attachments.test.ts
+++ b/extensions/msteams/src/attachments.test.ts
@@ -101,9 +101,9 @@ describe("msteams attachments", () => {
     });
   });
 
-  describe("downloadMSTeamsImageAttachments", () => {
+  describe("downloadMSTeamsAttachments", () => {
     it("downloads and stores image contentUrl attachments", async () => {
-      const { downloadMSTeamsImageAttachments } = await load();
+      const { downloadMSTeamsAttachments } = await load();
       const fetchMock = vi.fn(async () => {
         return new Response(Buffer.from("png"), {
           status: 200,
@@ -111,7 +111,7 @@ describe("msteams attachments", () => {
         });
       });
 
-      const media = await downloadMSTeamsImageAttachments({
+      const media = await downloadMSTeamsAttachments({
         attachments: [{ contentType: "image/png", contentUrl: "https://x/img" }],
         maxBytes: 1024 * 1024,
         allowHosts: ["x"],
@@ -125,7 +125,7 @@ describe("msteams attachments", () => {
     });
 
     it("supports Teams file.download.info downloadUrl attachments", async () => {
-      const { downloadMSTeamsImageAttachments } = await load();
+      const { downloadMSTeamsAttachments } = await load();
       const fetchMock = vi.fn(async () => {
         return new Response(Buffer.from("png"), {
           status: 200,
@@ -133,7 +133,7 @@ describe("msteams attachments", () => {
         });
       });
 
-      const media = await downloadMSTeamsImageAttachments({
+      const media = await downloadMSTeamsAttachments({
         attachments: [
           {
             contentType: "application/vnd.microsoft.teams.file.download.info",
@@ -149,8 +149,35 @@ describe("msteams attachments", () => {
       expect(media).toHaveLength(1);
     });
 
+    it("downloads non-image file attachments (PDF)", async () => {
+      const { downloadMSTeamsAttachments } = await load();
+      const fetchMock = vi.fn(async () => {
+        return new Response(Buffer.from("pdf"), {
+          status: 200,
+          headers: { "content-type": "application/pdf" },
+        });
+      });
+      detectMimeMock.mockResolvedValueOnce("application/pdf");
+      saveMediaBufferMock.mockResolvedValueOnce({
+        path: "/tmp/saved.pdf",
+        contentType: "application/pdf",
+      });
+
+      const media = await downloadMSTeamsAttachments({
+        attachments: [{ contentType: "application/pdf", contentUrl: "https://x/doc.pdf" }],
+        maxBytes: 1024 * 1024,
+        allowHosts: ["x"],
+        fetchFn: fetchMock as unknown as typeof fetch,
+      });
+
+      expect(fetchMock).toHaveBeenCalledWith("https://x/doc.pdf");
+      expect(media).toHaveLength(1);
+      expect(media[0]?.path).toBe("/tmp/saved.pdf");
+      expect(media[0]?.placeholder).toBe("<media:document>");
+    });
+
     it("downloads inline image URLs from html attachments", async () => {
-      const { downloadMSTeamsImageAttachments } = await load();
+      const { downloadMSTeamsAttachments } = await load();
       const fetchMock = vi.fn(async () => {
         return new Response(Buffer.from("png"), {
           status: 200,
@@ -158,7 +185,7 @@ describe("msteams attachments", () => {
         });
       });
 
-      const media = await downloadMSTeamsImageAttachments({
+      const media = await downloadMSTeamsAttachments({
         attachments: [
           {
             contentType: "text/html",
@@ -175,9 +202,9 @@ describe("msteams attachments", () => {
     });
 
     it("stores inline data:image base64 payloads", async () => {
-      const { downloadMSTeamsImageAttachments } = await load();
+      const { downloadMSTeamsAttachments } = await load();
       const base64 = Buffer.from("png").toString("base64");
-      const media = await downloadMSTeamsImageAttachments({
+      const media = await downloadMSTeamsAttachments({
         attachments: [
           {
             contentType: "text/html",
@@ -193,7 +220,7 @@ describe("msteams attachments", () => {
     });
 
     it("retries with auth when the first request is unauthorized", async () => {
-      const { downloadMSTeamsImageAttachments } = await load();
+      const { downloadMSTeamsAttachments } = await load();
       const fetchMock = vi.fn(async (_url: string, opts?: RequestInit) => {
         const hasAuth = Boolean(
           opts &&
@@ -210,7 +237,7 @@ describe("msteams attachments", () => {
         });
       });
 
-      const media = await downloadMSTeamsImageAttachments({
+      const media = await downloadMSTeamsAttachments({
         attachments: [{ contentType: "image/png", contentUrl: "https://x/img" }],
         maxBytes: 1024 * 1024,
         tokenProvider: { getAccessToken: vi.fn(async () => "token") },
@@ -224,9 +251,9 @@ describe("msteams attachments", () => {
     });
 
     it("skips urls outside the allowlist", async () => {
-      const { downloadMSTeamsImageAttachments } = await load();
+      const { downloadMSTeamsAttachments } = await load();
       const fetchMock = vi.fn();
-      const media = await downloadMSTeamsImageAttachments({
+      const media = await downloadMSTeamsAttachments({
         attachments: [{ contentType: "image/png", contentUrl: "https://evil.test/img" }],
         maxBytes: 1024 * 1024,
         allowHosts: ["graph.microsoft.com"],
@@ -236,20 +263,6 @@ describe("msteams attachments", () => {
       expect(media).toHaveLength(0);
       expect(fetchMock).not.toHaveBeenCalled();
     });
-
-    it("ignores non-image attachments", async () => {
-      const { downloadMSTeamsImageAttachments } = await load();
-      const fetchMock = vi.fn();
-      const media = await downloadMSTeamsImageAttachments({
-        attachments: [{ contentType: "application/pdf", contentUrl: "https://x/x.pdf" }],
-        maxBytes: 1024 * 1024,
-        allowHosts: ["x"],
-        fetchFn: fetchMock as unknown as typeof fetch,
-      });
-
-      expect(media).toHaveLength(0);
-      expect(fetchMock).not.toHaveBeenCalled();
-    });
   });
 
   describe("buildMSTeamsGraphMessageUrls", () => {
@@ -324,6 +337,74 @@ describe("msteams attachments", () => {
       expect(fetchMock).toHaveBeenCalled();
       expect(saveMediaBufferMock).toHaveBeenCalled();
     });
+
+    it("merges SharePoint reference attachments with hosted content", async () => {
+      const { downloadMSTeamsGraphMedia } = await load();
+      const hostedBase64 = Buffer.from("png").toString("base64");
+      const shareUrl = "https://contoso.sharepoint.com/site/file";
+      const fetchMock = vi.fn(async (url: string) => {
+        if (url.endsWith("/hostedContents")) {
+          return new Response(
+            JSON.stringify({
+              value: [
+                {
+                  id: "hosted-1",
+                  contentType: "image/png",
+                  contentBytes: hostedBase64,
+                },
+              ],
+            }),
+            { status: 200 },
+          );
+        }
+        if (url.endsWith("/attachments")) {
+          return new Response(
+            JSON.stringify({
+              value: [
+                {
+                  id: "ref-1",
+                  contentType: "reference",
+                  contentUrl: shareUrl,
+                  name: "report.pdf",
+                },
+              ],
+            }),
+            { status: 200 },
+          );
+        }
+        if (url.startsWith("https://graph.microsoft.com/v1.0/shares/")) {
+          return new Response(Buffer.from("pdf"), {
+            status: 200,
+            headers: { "content-type": "application/pdf" },
+          });
+        }
+        if (url.endsWith("/messages/123")) {
+          return new Response(
+            JSON.stringify({
+              attachments: [
+                {
+                  id: "ref-1",
+                  contentType: "reference",
+                  contentUrl: shareUrl,
+                  name: "report.pdf",
+                },
+              ],
+            }),
+            { status: 200 },
+          );
+        }
+        return new Response("not found", { status: 404 });
+      });
+
+      const media = await downloadMSTeamsGraphMedia({
+        messageUrl: "https://graph.microsoft.com/v1.0/chats/19%3Achat/messages/123",
+        tokenProvider: { getAccessToken: vi.fn(async () => "token") },
+        maxBytes: 1024 * 1024,
+        fetchFn: fetchMock as unknown as typeof fetch,
+      });
+
+      expect(media.media).toHaveLength(2);
+    });
   });
 
   describe("buildMSTeamsMediaPayload", () => {
diff --git a/extensions/msteams/src/attachments.ts b/extensions/msteams/src/attachments.ts
index 867869c5e..d29a3ef31 100644
--- a/extensions/msteams/src/attachments.ts
+++ b/extensions/msteams/src/attachments.ts
@@ -1,4 +1,8 @@
-export { downloadMSTeamsImageAttachments } from "./attachments/download.js";
+export {
+  downloadMSTeamsAttachments,
+  /** @deprecated Use `downloadMSTeamsAttachments` instead. */
+  downloadMSTeamsImageAttachments,
+} from "./attachments/download.js";
 export { buildMSTeamsGraphMessageUrls, downloadMSTeamsGraphMedia } from "./attachments/graph.js";
 export {
   buildMSTeamsAttachmentPlaceholder,
diff --git a/extensions/msteams/src/attachments/download.ts b/extensions/msteams/src/attachments/download.ts
index 7b2c6bf9d..0a44c50d6 100644
--- a/extensions/msteams/src/attachments/download.ts
+++ b/extensions/msteams/src/attachments/download.ts
@@ -2,7 +2,7 @@ import { getMSTeamsRuntime } from "../runtime.js";
 import {
   extractInlineImageCandidates,
   inferPlaceholder,
-  isLikelyImageAttachment,
+  isDownloadableAttachment,
   isRecord,
   isUrlAllowed,
   normalizeContentType,
@@ -102,23 +102,31 @@ async function fetchWithAuthFallback(params: {
   return firstAttempt;
 }
 
-export async function downloadMSTeamsImageAttachments(params: {
+/**
+ * Download all file attachments from a Teams message (images, documents, etc.).
+ * Renamed from downloadMSTeamsImageAttachments to support all file types.
+ */
+export async function downloadMSTeamsAttachments(params: {
   attachments: MSTeamsAttachmentLike[] | undefined;
   maxBytes: number;
   tokenProvider?: MSTeamsAccessTokenProvider;
   allowHosts?: string[];
   fetchFn?: typeof fetch;
+  /** When true, embeds original filename in stored path for later extraction. */
+  preserveFilenames?: boolean;
 }): Promise<MSTeamsInboundMedia[]> {
   const list = Array.isArray(params.attachments) ? params.attachments : [];
   if (list.length === 0) return [];
   const allowHosts = resolveAllowedHosts(params.allowHosts);
 
-  const candidates: DownloadCandidate[] = list
-    .filter(isLikelyImageAttachment)
+  // Download ANY downloadable attachment (not just images)
+  const downloadable = list.filter(isDownloadableAttachment);
+  const candidates: DownloadCandidate[] = downloadable
     .map(resolveDownloadCandidate)
     .filter(Boolean) as DownloadCandidate[];
 
   const inlineCandidates = extractInlineImageCandidates(list);
+
   const seenUrls = new Set<string>();
   for (const inline of inlineCandidates) {
     if (inline.kind === "url") {
@@ -133,7 +141,6 @@ export async function downloadMSTeamsImageAttachments(params: {
       });
     }
   }
-
   if (candidates.length === 0 && inlineCandidates.length === 0) return [];
 
   const out: MSTeamsInboundMedia[] = [];
@@ -141,6 +148,7 @@ export async function downloadMSTeamsImageAttachments(params: {
     if (inline.kind !== "data") continue;
     if (inline.data.byteLength > params.maxBytes) continue;
     try {
+      // Data inline candidates (base64 data URLs) don't have original filenames
       const saved = await getMSTeamsRuntime().channel.media.saveMediaBuffer(
         inline.data,
         inline.contentType,
@@ -172,11 +180,13 @@ export async function downloadMSTeamsImageAttachments(params: {
         headerMime: res.headers.get("content-type"),
         filePath: candidate.fileHint ?? candidate.url,
       });
+      const originalFilename = params.preserveFilenames ? candidate.fileHint : undefined;
       const saved = await getMSTeamsRuntime().channel.media.saveMediaBuffer(
         buffer,
         mime ?? candidate.contentTypeHint,
         "inbound",
         params.maxBytes,
+        originalFilename,
       );
       out.push({
         path: saved.path,
@@ -184,8 +194,13 @@ export async function downloadMSTeamsImageAttachments(params: {
         placeholder: candidate.placeholder,
       });
     } catch {
-      // Ignore download failures and continue.
+      // Ignore download failures and continue with next candidate.
     }
   }
   return out;
 }
+
+/**
+ * @deprecated Use `downloadMSTeamsAttachments` instead (supports all file types).
+ */
+export const downloadMSTeamsImageAttachments = downloadMSTeamsAttachments;
diff --git a/extensions/msteams/src/attachments/graph.ts b/extensions/msteams/src/attachments/graph.ts
index 6050eeebb..bb47d413f 100644
--- a/extensions/msteams/src/attachments/graph.ts
+++ b/extensions/msteams/src/attachments/graph.ts
@@ -1,6 +1,6 @@
 import { getMSTeamsRuntime } from "../runtime.js";
-import { downloadMSTeamsImageAttachments } from "./download.js";
-import { GRAPH_ROOT, isRecord, normalizeContentType, resolveAllowedHosts } from "./shared.js";
+import { downloadMSTeamsAttachments } from "./download.js";
+import { GRAPH_ROOT, inferPlaceholder, isRecord, normalizeContentType, resolveAllowedHosts } from "./shared.js";
 import type {
   MSTeamsAccessTokenProvider,
   MSTeamsAttachmentLike,
@@ -128,11 +128,16 @@ function normalizeGraphAttachment(att: GraphAttachment): MSTeamsAttachmentLike {
   };
 }
 
-async function downloadGraphHostedImages(params: {
+/**
+ * Download all hosted content from a Teams message (images, documents, etc.).
+ * Renamed from downloadGraphHostedImages to support all file types.
+ */
+async function downloadGraphHostedContent(params: {
   accessToken: string;
   messageUrl: string;
   maxBytes: number;
   fetchFn?: typeof fetch;
+  preserveFilenames?: boolean;
 }): Promise<{ media: MSTeamsInboundMedia[]; status: number; count: number }> {
   const hosted = await fetchGraphCollection<GraphHostedContent>({
     url: `${params.messageUrl}/hostedContents`,
@@ -158,7 +163,7 @@ async function downloadGraphHostedImages(params: {
       buffer,
       headerMime: item.contentType ?? undefined,
     });
-    if (mime && !mime.startsWith("image/")) continue;
+    // Download any file type, not just images
     try {
       const saved = await getMSTeamsRuntime().channel.media.saveMediaBuffer(
         buffer,
@@ -169,7 +174,7 @@ async function downloadGraphHostedImages(params: {
       out.push({
         path: saved.path,
         contentType: saved.contentType,
-        placeholder: "<media:image>",
+        placeholder: inferPlaceholder({ contentType: saved.contentType }),
       });
     } catch {
       // Ignore save failures.
@@ -185,6 +190,8 @@ export async function downloadMSTeamsGraphMedia(params: {
   maxBytes: number;
   allowHosts?: string[];
   fetchFn?: typeof fetch;
+  /** When true, embeds original filename in stored path for later extraction. */
+  preserveFilenames?: boolean;
 }): Promise<MSTeamsGraphMediaResult> {
   if (!params.messageUrl || !params.tokenProvider) return { media: [] };
   const allowHosts = resolveAllowedHosts(params.allowHosts);
@@ -196,11 +203,83 @@ export async function downloadMSTeamsGraphMedia(params: {
     return { media: [], messageUrl, tokenError: true };
   }
 
-  const hosted = await downloadGraphHostedImages({
+  // Fetch the full message to get SharePoint file attachments (for group chats)
+  const fetchFn = params.fetchFn ?? fetch;
+  const sharePointMedia: MSTeamsInboundMedia[] = [];
+  const downloadedReferenceUrls = new Set<string>();
+  try {
+    const msgRes = await fetchFn(messageUrl, {
+      headers: { Authorization: `Bearer ${accessToken}` },
+    });
+    if (msgRes.ok) {
+      const msgData = (await msgRes.json()) as {
+        body?: { content?: string; contentType?: string };
+        attachments?: Array<{
+          id?: string;
+          contentUrl?: string;
+          contentType?: string;
+          name?: string;
+        }>;
+      };
+
+      // Extract SharePoint file attachments (contentType: "reference")
+      // Download any file type, not just images
+      const spAttachments = (msgData.attachments ?? []).filter(
+        (a) => a.contentType === "reference" && a.contentUrl && a.name,
+      );
+      for (const att of spAttachments) {
+        const name = att.name ?? "file";
+
+        try {
+          // SharePoint URLs need to be accessed via Graph shares API
+          const shareUrl = att.contentUrl!;
+          const encodedUrl = Buffer.from(shareUrl).toString("base64url");
+          const sharesUrl = `${GRAPH_ROOT}/shares/u!${encodedUrl}/driveItem/content`;
+
+          const spRes = await fetchFn(sharesUrl, {
+            headers: { Authorization: `Bearer ${accessToken}` },
+            redirect: "follow",
+          });
+
+          if (spRes.ok) {
+            const buffer = Buffer.from(await spRes.arrayBuffer());
+            if (buffer.byteLength <= params.maxBytes) {
+              const mime = await getMSTeamsRuntime().media.detectMime({
+                buffer,
+                headerMime: spRes.headers.get("content-type") ?? undefined,
+                filePath: name,
+              });
+              const originalFilename = params.preserveFilenames ? name : undefined;
+              const saved = await getMSTeamsRuntime().channel.media.saveMediaBuffer(
+                buffer,
+                mime ?? "application/octet-stream",
+                "inbound",
+                params.maxBytes,
+                originalFilename,
+              );
+              sharePointMedia.push({
+                path: saved.path,
+                contentType: saved.contentType,
+                placeholder: inferPlaceholder({ contentType: saved.contentType, fileName: name }),
+              });
+              downloadedReferenceUrls.add(shareUrl);
+            }
+          }
+        } catch {
+          // Ignore SharePoint download failures.
+        }
+      }
+    }
+  } catch {
+    // Ignore message fetch failures.
+  }
+
+  const hosted = await downloadGraphHostedContent({
     accessToken,
     messageUrl,
     maxBytes: params.maxBytes,
     fetchFn: params.fetchFn,
+    preserveFilenames: params.preserveFilenames,
   });
 
   const attachments = await fetchGraphCollection<GraphAttachment>({
@@ -210,18 +289,29 @@ export async function downloadMSTeamsGraphMedia(params: {
   });
 
   const normalizedAttachments = attachments.items.map(normalizeGraphAttachment);
-  const attachmentMedia = await downloadMSTeamsImageAttachments({
-    attachments: normalizedAttachments,
+  const filteredAttachments =
+    sharePointMedia.length > 0
+      ? normalizedAttachments.filter((att) => {
+          const contentType = att.contentType?.toLowerCase();
+          if (contentType !== "reference") return true;
+          const url = typeof att.contentUrl === "string" ? att.contentUrl : "";
+          if (!url) return true;
+          return !downloadedReferenceUrls.has(url);
+        })
+      : normalizedAttachments;
+  const attachmentMedia = await downloadMSTeamsAttachments({
+    attachments: filteredAttachments,
     maxBytes: params.maxBytes,
     tokenProvider: params.tokenProvider,
     allowHosts,
     fetchFn: params.fetchFn,
+    preserveFilenames: params.preserveFilenames,
   });
 
   return {
-    media: [...hosted.media, ...attachmentMedia],
+    media: [...sharePointMedia, ...hosted.media, ...attachmentMedia],
     hostedCount: hosted.count,
-    attachmentCount: attachments.items.length,
+    attachmentCount: filteredAttachments.length + sharePointMedia.length,
     hostedStatus: hosted.status,
     attachmentStatus: attachments.status,
     messageUrl,
diff --git a/extensions/msteams/src/attachments/shared.ts b/extensions/msteams/src/attachments/shared.ts
index d8c5968b8..8d290d87e 100644
--- a/extensions/msteams/src/attachments/shared.ts
+++ b/extensions/msteams/src/attachments/shared.ts
@@ -37,6 +37,15 @@ export const DEFAULT_MEDIA_HOST_ALLOWLIST = [
   "statics.teams.cdn.office.net",
   "office.com",
   "office.net",
+  // Azure Media Services / Skype CDN for clipboard-pasted images
+  "asm.skype.com",
+  "ams.skype.com",
+  "media.ams.skype.com",
+  // Bot Framework attachment URLs
+  "trafficmanager.net",
+  "blob.core.windows.net",
+  "azureedge.net",
+  "microsoft.com",
 ] as const;
 
 export const GRAPH_ROOT = "https://graph.microsoft.com/v1.0";
@@ -85,6 +94,30 @@ export function isLikelyImageAttachment(att: MSTeamsAttachmentLike): boolean {
   return false;
 }
 
+/**
+ * Returns true if the attachment can be downloaded (any file type).
+ * Used when downloading all files, not just images.
+ */
+export function isDownloadableAttachment(att: MSTeamsAttachmentLike): boolean {
+  const contentType = normalizeContentType(att.contentType) ?? "";
+
+  // Teams file download info always has a downloadUrl
+  if (
+    contentType === "application/vnd.microsoft.teams.file.download.info" &&
+    isRecord(att.content) &&
+    typeof att.content.downloadUrl === "string"
+  ) {
+    return true;
+  }
+
+  // Any attachment with a contentUrl can be downloaded
+  if (typeof att.contentUrl === "string" && att.contentUrl.trim()) {
+    return true;
+  }
+
+  return false;
+}
+
 function isHtmlAttachment(att: MSTeamsAttachmentLike): boolean {
   const contentType = normalizeContentType(att.contentType) ?? "";
   return contentType.startsWith("text/html");
diff --git a/extensions/msteams/src/channel.ts b/extensions/msteams/src/channel.ts
index de3e0a8df..521916e34 100644
--- a/extensions/msteams/src/channel.ts
+++ b/extensions/msteams/src/channel.ts
@@ -17,7 +17,7 @@ import {
   resolveMSTeamsChannelAllowlist,
   resolveMSTeamsUserAllowlist,
 } from "./resolve-allowlist.js";
-import { sendMessageMSTeams } from "./send.js";
+import { sendAdaptiveCardMSTeams, sendMessageMSTeams } from "./send.js";
 import { resolveMSTeamsCredentials } from "./token.js";
 import {
   listMSTeamsDirectoryGroupsLive,
@@ -64,6 +64,19 @@ export const msteamsPlugin: ChannelPlugin<ResolvedMSTeamsAccount> = {
     threads: true,
     media: true,
   },
+  agentPrompt: {
+    messageToolHints: () => [
+      "- Adaptive Cards supported. Use `action=send` with `card={type,version,body}` to send rich cards.",
+      "- MSTeams targeting: omit `target` to reply to the current conversation (auto-inferred). Explicit targets: `user:ID` or `user:Display Name` (requires Graph API) for DMs, `conversation:19:...@thread.tacv2` for groups/channels. Prefer IDs over display names for speed.",
+    ],
+  },
+  threading: {
+    buildToolContext: ({ context, hasRepliedRef }) => ({
+      currentChannelId: context.To?.trim() || undefined,
+      currentThreadTs: context.ReplyToId,
+      hasRepliedRef,
+    }),
+  },
   reload: { configPrefixes: ["channels.msteams"] },
   configSchema: buildChannelConfigSchema(MSTeamsConfigSchema),
   config: {
@@ -137,7 +150,12 @@ export const msteamsPlugin: ChannelPlugin<ResolvedMSTeamsAccount> = {
       looksLikeId: (raw) => {
         const trimmed = raw.trim();
         if (!trimmed) return false;
-        if (/^(conversation:|user:)/i.test(trimmed)) return true;
+        if (/^conversation:/i.test(trimmed)) return true;
+        if (/^user:/i.test(trimmed)) {
+          // Only treat as ID if the value after user: looks like a UUID
+          const id = trimmed.slice("user:".length).trim();
+          return /^[0-9a-fA-F-]{16,}$/.test(id);
+        }
         return trimmed.includes("@thread");
       },
       hint: "<conversationId|user:ID|conversation:ID>",
@@ -320,6 +338,50 @@ export const msteamsPlugin: ChannelPlugin<ResolvedMSTeamsAccount> = {
       if (!enabled) return [];
       return ["poll"] satisfies ChannelMessageActionName[];
     },
+    supportsCards: ({ cfg }) => {
+      return (
+        cfg.channels?.msteams?.enabled !== false &&
+        Boolean(resolveMSTeamsCredentials(cfg.channels?.msteams))
+      );
+    },
+    handleAction: async (ctx) => {
+      // Handle send action with card parameter
+      if (ctx.action === "send" && ctx.params.card) {
+        const card = ctx.params.card as Record<string, unknown>;
+        const to =
+          typeof ctx.params.to === "string"
+            ? ctx.params.to.trim()
+            : typeof ctx.params.target === "string"
+              ? ctx.params.target.trim()
+              : "";
+        if (!to) {
+          return {
+            isError: true,
+            content: [{ type: "text", text: "Card send requires a target (to)." }],
+          };
+        }
+        const result = await sendAdaptiveCardMSTeams({
+          cfg: ctx.cfg,
+          to,
+          card,
+        });
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                ok: true,
+                channel: "msteams",
+                messageId: result.messageId,
+                conversationId: result.conversationId,
+              }),
+            },
+          ],
+        };
+      }
+      // Return null to fall through to default handler
+      return null as never;
+    },
   },
   outbound: msteamsOutbound,
   status: {
diff --git a/extensions/msteams/src/file-consent-helpers.test.ts b/extensions/msteams/src/file-consent-helpers.test.ts
new file mode 100644
index 000000000..aa5adc152
--- /dev/null
+++ b/extensions/msteams/src/file-consent-helpers.test.ts
@@ -0,0 +1,234 @@
+import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
+import { prepareFileConsentActivity, requiresFileConsent } from "./file-consent-helpers.js";
+import * as pendingUploads from "./pending-uploads.js";
+
+describe("requiresFileConsent", () => {
+  const thresholdBytes = 4 * 1024 * 1024; // 4MB
+
+  it("returns true for personal chat with non-image", () => {
+    expect(
+      requiresFileConsent({
+        conversationType: "personal",
+        contentType: "application/pdf",
+        bufferSize: 1000,
+        thresholdBytes,
+      }),
+    ).toBe(true);
+  });
+
+  it("returns true for personal chat with large image", () => {
+    expect(
+      requiresFileConsent({
+        conversationType: "personal",
+        contentType: "image/png",
+        bufferSize: 5 * 1024 * 1024, // 5MB
+        thresholdBytes,
+      }),
+    ).toBe(true);
+  });
+
+  it("returns false for personal chat with small image", () => {
+    expect(
+      requiresFileConsent({
+        conversationType: "personal",
+        contentType: "image/png",
+        bufferSize: 1000,
+        thresholdBytes,
+      }),
+    ).toBe(false);
+  });
+
+  it("returns false for group chat with large non-image", () => {
+    expect(
+      requiresFileConsent({
+        conversationType: "groupChat",
+        contentType: "application/pdf",
+        bufferSize: 5 * 1024 * 1024,
+        thresholdBytes,
+      }),
+    ).toBe(false);
+  });
+
+  it("returns false for channel with large non-image", () => {
+    expect(
+      requiresFileConsent({
+        conversationType: "channel",
+        contentType: "application/pdf",
+        bufferSize: 5 * 1024 * 1024,
+        thresholdBytes,
+      }),
+    ).toBe(false);
+  });
+
+  it("handles case-insensitive conversation type", () => {
+    expect(
+      requiresFileConsent({
+        conversationType: "Personal",
+        contentType: "application/pdf",
+        bufferSize: 1000,
+        thresholdBytes,
+      }),
+    ).toBe(true);
+
+    expect(
+      requiresFileConsent({
+        conversationType: "PERSONAL",
+        contentType: "application/pdf",
+        bufferSize: 1000,
+        thresholdBytes,
+      }),
+    ).toBe(true);
+  });
+
+  it("returns false when conversationType is undefined", () => {
+    expect(
+      requiresFileConsent({
+        conversationType: undefined,
+        contentType: "application/pdf",
+        bufferSize: 1000,
+        thresholdBytes,
+      }),
+    ).toBe(false);
+  });
+
+  it("returns true for personal chat when contentType is undefined (non-image)", () => {
+    expect(
+      requiresFileConsent({
+        conversationType: "personal",
+        contentType: undefined,
+        bufferSize: 1000,
+        thresholdBytes,
+      }),
+    ).toBe(true);
+  });
+
+  it("returns true for personal chat with file exactly at threshold", () => {
+    expect(
+      requiresFileConsent({
+        conversationType: "personal",
+        contentType: "image/jpeg",
+        bufferSize: thresholdBytes, // exactly 4MB
+        thresholdBytes,
+      }),
+    ).toBe(true);
+  });
+
+  it("returns false for personal chat with file just below threshold", () => {
+    expect(
+      requiresFileConsent({
+        conversationType: "personal",
+        contentType: "image/jpeg",
+        bufferSize: thresholdBytes - 1, // 4MB - 1 byte
+        thresholdBytes,
+      }),
+    ).toBe(false);
+  });
+});
+
+describe("prepareFileConsentActivity", () => {
+  const mockUploadId = "test-upload-id-123";
+
+  beforeEach(() => {
+    vi.spyOn(pendingUploads, "storePendingUpload").mockReturnValue(mockUploadId);
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it("creates activity with consent card attachment", () => {
+    const result = prepareFileConsentActivity({
+      media: {
+        buffer: Buffer.from("test content"),
+        filename: "test.pdf",
+        contentType: "application/pdf",
+      },
+      conversationId: "conv123",
+      description: "My file",
+    });
+
+    expect(result.uploadId).toBe(mockUploadId);
+    expect(result.activity.type).toBe("message");
+    expect(result.activity.attachments).toHaveLength(1);
+
+    const attachment = (result.activity.attachments as unknown[])[0] as Record<string, unknown>;
+    expect(attachment.contentType).toBe("application/vnd.microsoft.teams.card.file.consent");
+    expect(attachment.name).toBe("test.pdf");
+  });
+
+  it("stores pending upload with correct data", () => {
+    const buffer = Buffer.from("test content");
+    prepareFileConsentActivity({
+      media: {
+        buffer,
+        filename: "test.pdf",
+        contentType: "application/pdf",
+      },
+      conversationId: "conv123",
+      description: "My file",
+    });
+
+    expect(pendingUploads.storePendingUpload).toHaveBeenCalledWith({
+      buffer,
+      filename: "test.pdf",
+      contentType: "application/pdf",
+      conversationId: "conv123",
+    });
+  });
+
+  it("uses default description when not provided", () => {
+    const result = prepareFileConsentActivity({
+      media: {
+        buffer: Buffer.from("test"),
+        filename: "document.docx",
+        contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+      },
+      conversationId: "conv456",
+    });
+
+    const attachment = (result.activity.attachments as unknown[])[0] as Record<string, { description: string }>;
+    expect(attachment.content.description).toBe("File: document.docx");
+  });
+
+  it("uses provided description", () => {
+    const result = prepareFileConsentActivity({
+      media: {
+        buffer: Buffer.from("test"),
+        filename: "report.pdf",
+        contentType: "application/pdf",
+      },
+      conversationId: "conv789",
+      description: "Q4 Financial Report",
+    });
+
+    const attachment = (result.activity.attachments as unknown[])[0] as Record<string, { description: string }>;
+    expect(attachment.content.description).toBe("Q4 Financial Report");
+  });
+
+  it("includes uploadId in consent card context", () => {
+    const result = prepareFileConsentActivity({
+      media: {
+        buffer: Buffer.from("test"),
+        filename: "file.txt",
+        contentType: "text/plain",
+      },
+      conversationId: "conv000",
+    });
+
+    const attachment = (result.activity.attachments as unknown[])[0] as Record<string, { acceptContext: { uploadId: string } }>;
+    expect(attachment.content.acceptContext.uploadId).toBe(mockUploadId);
+  });
+
+  it("handles media without contentType", () => {
+    const result = prepareFileConsentActivity({
+      media: {
+        buffer: Buffer.from("binary data"),
+        filename: "unknown.bin",
+      },
+      conversationId: "conv111",
+    });
+
+    expect(result.uploadId).toBe(mockUploadId);
+    expect(result.activity.type).toBe("message");
+  });
+});
diff --git a/extensions/msteams/src/file-consent-helpers.ts b/extensions/msteams/src/file-consent-helpers.ts
new file mode 100644
index 000000000..e8a1bc0c6
--- /dev/null
+++ b/extensions/msteams/src/file-consent-helpers.ts
@@ -0,0 +1,73 @@
+/**
+ * Shared helpers for FileConsentCard flow in MSTeams.
+ *
+ * FileConsentCard is required for:
+ * - Personal (1:1) chats with large files (>=4MB)
+ * - Personal chats with non-image files (PDFs, documents, etc.)
+ *
+ * This module consolidates the logic used by both send.ts (proactive sends)
+ * and messenger.ts (reply path) to avoid duplication.
+ */
+
+import { buildFileConsentCard } from "./file-consent.js";
+import { storePendingUpload } from "./pending-uploads.js";
+
+export type FileConsentMedia = {
+  buffer: Buffer;
+  filename: string;
+  contentType?: string;
+};
+
+export type FileConsentActivityResult = {
+  activity: Record<string, unknown>;
+  uploadId: string;
+};
+
+/**
+ * Prepare a FileConsentCard activity for large files or non-images in personal chats.
+ * Returns the activity object and uploadId - caller is responsible for sending.
+ */
+export function prepareFileConsentActivity(params: {
+  media: FileConsentMedia;
+  conversationId: string;
+  description?: string;
+}): FileConsentActivityResult {
+  const { media, conversationId, description } = params;
+
+  const uploadId = storePendingUpload({
+    buffer: media.buffer,
+    filename: media.filename,
+    contentType: media.contentType,
+    conversationId,
+  });
+
+  const consentCard = buildFileConsentCard({
+    filename: media.filename,
+    description: description || `File: ${media.filename}`,
+    sizeInBytes: media.buffer.length,
+    context: { uploadId },
+  });
+
+  const activity: Record<string, unknown> = {
+    type: "message",
+    attachments: [consentCard],
+  };
+
+  return { activity, uploadId };
+}
+
+/**
+ * Check if a file requires FileConsentCard flow.
+ * True for: personal chat AND (large file OR non-image)
+ */
+export function requiresFileConsent(params: {
+  conversationType: string | undefined;
+  contentType: string | undefined;
+  bufferSize: number;
+  thresholdBytes: number;
+}): boolean {
+  const isPersonal = params.conversationType?.toLowerCase() === "personal";
+  const isImage = params.contentType?.startsWith("image/") ?? false;
+  const isLargeFile = params.bufferSize >= params.thresholdBytes;
+  return isPersonal && (isLargeFile || !isImage);
+}
diff --git a/extensions/msteams/src/file-consent.ts b/extensions/msteams/src/file-consent.ts
new file mode 100644
index 000000000..02183e7a2
--- /dev/null
+++ b/extensions/msteams/src/file-consent.ts
@@ -0,0 +1,122 @@
+/**
+ * FileConsentCard utilities for MS Teams large file uploads (>4MB) in personal chats.
+ *
+ * Teams requires user consent before the bot can upload large files. This module provides
+ * utilities for:
+ * - Building FileConsentCard attachments (to request upload permission)
+ * - Building FileInfoCard attachments (to confirm upload completion)
+ * - Parsing fileConsent/invoke activities
+ */
+
+export interface FileConsentCardParams {
+  filename: string;
+  description?: string;
+  sizeInBytes: number;
+  /** Custom context data to include in the card (passed back in the invoke) */
+  context?: Record<string, unknown>;
+}
+
+export interface FileInfoCardParams {
+  filename: string;
+  contentUrl: string;
+  uniqueId: string;
+  fileType: string;
+}
+
+/**
+ * Build a FileConsentCard attachment for requesting upload permission.
+ * Use this for files >= 4MB in personal (1:1) chats.
+ */
+export function buildFileConsentCard(params: FileConsentCardParams) {
+  return {
+    contentType: "application/vnd.microsoft.teams.card.file.consent",
+    name: params.filename,
+    content: {
+      description: params.description ?? `File: ${params.filename}`,
+      sizeInBytes: params.sizeInBytes,
+      acceptContext: { filename: params.filename, ...params.context },
+      declineContext: { filename: params.filename, ...params.context },
+    },
+  };
+}
+
+/**
+ * Build a FileInfoCard attachment for confirming upload completion.
+ * Send this after successfully uploading the file to the consent URL.
+ */
+export function buildFileInfoCard(params: FileInfoCardParams) {
+  return {
+    contentType: "application/vnd.microsoft.teams.card.file.info",
+    contentUrl: params.contentUrl,
+    name: params.filename,
+    content: {
+      uniqueId: params.uniqueId,
+      fileType: params.fileType,
+    },
+  };
+}
+
+export interface FileConsentUploadInfo {
+  name: string;
+  uploadUrl: string;
+  contentUrl: string;
+  uniqueId: string;
+  fileType: string;
+}
+
+export interface FileConsentResponse {
+  action: "accept" | "decline";
+  uploadInfo?: FileConsentUploadInfo;
+  context?: Record<string, unknown>;
+}
+
+/**
+ * Parse a fileConsent/invoke activity.
+ * Returns null if the activity is not a file consent invoke.
+ */
+export function parseFileConsentInvoke(activity: {
+  name?: string;
+  value?: unknown;
+}): FileConsentResponse | null {
+  if (activity.name !== "fileConsent/invoke") return null;
+
+  const value = activity.value as {
+    type?: string;
+    action?: string;
+    uploadInfo?: FileConsentUploadInfo;
+    context?: Record<string, unknown>;
+  };
+
+  if (value?.type !== "fileUpload") return null;
+
+  return {
+    action: value.action === "accept" ? "accept" : "decline",
+    uploadInfo: value.uploadInfo,
+    context: value.context,
+  };
+}
+
+/**
+ * Upload a file to the consent URL provided by Teams.
+ * The URL is provided in the fileConsent/invoke response after user accepts.
+ */
+export async function uploadToConsentUrl(params: {
+  url: string;
+  buffer: Buffer;
+  contentType?: string;
+  fetchFn?: typeof fetch;
+}): Promise<void> {
+  const fetchFn = params.fetchFn ?? fetch;
+  const res = await fetchFn(params.url, {
+    method: "PUT",
+    headers: {
+      "Content-Type": params.contentType ?? "application/octet-stream",
+      "Content-Range": `bytes 0-${params.buffer.length - 1}/${params.buffer.length}`,
+    },
+    body: new Uint8Array(params.buffer),
+  });
+
+  if (!res.ok) {
+    throw new Error(`File upload to consent URL failed: ${res.status} ${res.statusText}`);
+  }
+}
diff --git a/extensions/msteams/src/graph-chat.ts b/extensions/msteams/src/graph-chat.ts
new file mode 100644
index 000000000..ede44725e
--- /dev/null
+++ b/extensions/msteams/src/graph-chat.ts
@@ -0,0 +1,52 @@
+/**
+ * Native Teams file card attachments for Bot Framework.
+ *
+ * The Bot Framework SDK supports `application/vnd.microsoft.teams.card.file.info`
+ * content type which produces native Teams file cards.
+ *
+ * @see https://learn.microsoft.com/en-us/microsoftteams/platform/bots/how-to/bots-filesv4
+ */
+
+import type { DriveItemProperties } from "./graph-upload.js";
+
+/**
+ * Build a native Teams file card attachment for Bot Framework.
+ *
+ * This uses the `application/vnd.microsoft.teams.card.file.info` content type
+ * which is supported by Bot Framework and produces native Teams file cards
+ * (the same display as when a user manually shares a file).
+ *
+ * @param file - DriveItem properties from getDriveItemProperties()
+ * @returns Attachment object for Bot Framework sendActivity()
+ */
+export function buildTeamsFileInfoCard(file: DriveItemProperties): {
+  contentType: string;
+  contentUrl: string;
+  name: string;
+  content: {
+    uniqueId: string;
+    fileType: string;
+  };
+} {
+  // Extract unique ID from eTag (remove quotes, braces, and version suffix)
+  // Example eTag formats: "{GUID},version" or "\"{GUID},version\""
+  const rawETag = file.eTag;
+  const uniqueId = rawETag
+    .replace(/^["']|["']$/g, "") // Remove outer quotes
+    .replace(/[{}]/g, "") // Remove curly braces
+    .split(",")[0] ?? rawETag; // Take the GUID part before comma
+
+  // Extract file extension from filename
+  const lastDot = file.name.lastIndexOf(".");
+  const fileType = lastDot >= 0 ? file.name.slice(lastDot + 1).toLowerCase() : "";
+
+  return {
+    contentType: "application/vnd.microsoft.teams.card.file.info",
+    contentUrl: file.webDavUrl,
+    name: file.name,
+    content: {
+      uniqueId,
+      fileType,
+    },
+  };
+}
diff --git a/extensions/msteams/src/graph-upload.ts b/extensions/msteams/src/graph-upload.ts
new file mode 100644
index 000000000..dd4e28683
--- /dev/null
+++ b/extensions/msteams/src/graph-upload.ts
@@ -0,0 +1,445 @@
+/**
+ * OneDrive/SharePoint upload utilities for MS Teams file sending.
+ *
+ * For group chats and channels, files are uploaded to SharePoint and shared via a link.
+ * This module provides utilities for:
+ * - Uploading files to OneDrive (personal scope - now deprecated for bot use)
+ * - Uploading files to SharePoint (group/channel scope)
+ * - Creating sharing links (organization-wide or per-user)
+ * - Getting chat members for per-user sharing
+ */
+
+import type { MSTeamsAccessTokenProvider } from "./attachments/types.js";
+
+const GRAPH_ROOT = "https://graph.microsoft.com/v1.0";
+const GRAPH_BETA = "https://graph.microsoft.com/beta";
+const GRAPH_SCOPE = "https://graph.microsoft.com/.default";
+
+export interface OneDriveUploadResult {
+  id: string;
+  webUrl: string;
+  name: string;
+}
+
+/**
+ * Upload a file to the user's OneDrive root folder.
+ * For larger files, this uses the simple upload endpoint (up to 4MB).
+ * TODO: For files >4MB, implement resumable upload session.
+ */
+export async function uploadToOneDrive(params: {
+  buffer: Buffer;
+  filename: string;
+  contentType?: string;
+  tokenProvider: MSTeamsAccessTokenProvider;
+  fetchFn?: typeof fetch;
+}): Promise<OneDriveUploadResult> {
+  const fetchFn = params.fetchFn ?? fetch;
+  const token = await params.tokenProvider.getAccessToken(GRAPH_SCOPE);
+
+  // Use "ClawdbotShared" folder to organize bot-uploaded files
+  const uploadPath = `/ClawdbotShared/${encodeURIComponent(params.filename)}`;
+
+  const res = await fetchFn(`${GRAPH_ROOT}/me/drive/root:${uploadPath}:/content`, {
+    method: "PUT",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": params.contentType ?? "application/octet-stream",
+    },
+    body: new Uint8Array(params.buffer),
+  });
+
+  if (!res.ok) {
+    const body = await res.text().catch(() => "");
+    throw new Error(`OneDrive upload failed: ${res.status} ${res.statusText} - ${body}`);
+  }
+
+  const data = (await res.json()) as {
+    id?: string;
+    webUrl?: string;
+    name?: string;
+  };
+
+  if (!data.id || !data.webUrl || !data.name) {
+    throw new Error("OneDrive upload response missing required fields");
+  }
+
+  return {
+    id: data.id,
+    webUrl: data.webUrl,
+    name: data.name,
+  };
+}
+
+export interface OneDriveSharingLink {
+  webUrl: string;
+}
+
+/**
+ * Create a sharing link for a OneDrive file.
+ * The link allows organization members to view the file.
+ */
+export async function createSharingLink(params: {
+  itemId: string;
+  tokenProvider: MSTeamsAccessTokenProvider;
+  /** Sharing scope: "organization" (default) or "anonymous" */
+  scope?: "organization" | "anonymous";
+  fetchFn?: typeof fetch;
+}): Promise<OneDriveSharingLink> {
+  const fetchFn = params.fetchFn ?? fetch;
+  const token = await params.tokenProvider.getAccessToken(GRAPH_SCOPE);
+
+  const res = await fetchFn(`${GRAPH_ROOT}/me/drive/items/${params.itemId}/createLink`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      type: "view",
+      scope: params.scope ?? "organization",
+    }),
+  });
+
+  if (!res.ok) {
+    const body = await res.text().catch(() => "");
+    throw new Error(`Create sharing link failed: ${res.status} ${res.statusText} - ${body}`);
+  }
+
+  const data = (await res.json()) as {
+    link?: { webUrl?: string };
+  };
+
+  if (!data.link?.webUrl) {
+    throw new Error("Create sharing link response missing webUrl");
+  }
+
+  return {
+    webUrl: data.link.webUrl,
+  };
+}
+
+/**
+ * Upload a file to OneDrive and create a sharing link.
+ * Convenience function for the common case.
+ */
+export async function uploadAndShareOneDrive(params: {
+  buffer: Buffer;
+  filename: string;
+  contentType?: string;
+  tokenProvider: MSTeamsAccessTokenProvider;
+  scope?: "organization" | "anonymous";
+  fetchFn?: typeof fetch;
+}): Promise<{
+  itemId: string;
+  webUrl: string;
+  shareUrl: string;
+  name: string;
+}> {
+  const uploaded = await uploadToOneDrive({
+    buffer: params.buffer,
+    filename: params.filename,
+    contentType: params.contentType,
+    tokenProvider: params.tokenProvider,
+    fetchFn: params.fetchFn,
+  });
+
+  const shareLink = await createSharingLink({
+    itemId: uploaded.id,
+    tokenProvider: params.tokenProvider,
+    scope: params.scope,
+    fetchFn: params.fetchFn,
+  });
+
+  return {
+    itemId: uploaded.id,
+    webUrl: uploaded.webUrl,
+    shareUrl: shareLink.webUrl,
+    name: uploaded.name,
+  };
+}
+
+// ============================================================================
+// SharePoint upload functions for group chats and channels
+// ============================================================================
+
+/**
+ * Upload a file to a SharePoint site.
+ * This is used for group chats and channels where /me/drive doesn't work for bots.
+ *
+ * @param params.siteId - SharePoint site ID (e.g., "contoso.sharepoint.com,guid1,guid2")
+ */
+export async function uploadToSharePoint(params: {
+  buffer: Buffer;
+  filename: string;
+  contentType?: string;
+  tokenProvider: MSTeamsAccessTokenProvider;
+  siteId: string;
+  fetchFn?: typeof fetch;
+}): Promise<OneDriveUploadResult> {
+  const fetchFn = params.fetchFn ?? fetch;
+  const token = await params.tokenProvider.getAccessToken(GRAPH_SCOPE);
+
+  // Use "ClawdbotShared" folder to organize bot-uploaded files
+  const uploadPath = `/ClawdbotShared/${encodeURIComponent(params.filename)}`;
+
+  const res = await fetchFn(`${GRAPH_ROOT}/sites/${params.siteId}/drive/root:${uploadPath}:/content`, {
+    method: "PUT",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": params.contentType ?? "application/octet-stream",
+    },
+    body: new Uint8Array(params.buffer),
+  });
+
+  if (!res.ok) {
+    const body = await res.text().catch(() => "");
+    throw new Error(`SharePoint upload failed: ${res.status} ${res.statusText} - ${body}`);
+  }
+
+  const data = (await res.json()) as {
+    id?: string;
+    webUrl?: string;
+    name?: string;
+  };
+
+  if (!data.id || !data.webUrl || !data.name) {
+    throw new Error("SharePoint upload response missing required fields");
+  }
+
+  return {
+    id: data.id,
+    webUrl: data.webUrl,
+    name: data.name,
+  };
+}
+
+export interface ChatMember {
+  aadObjectId: string;
+  displayName?: string;
+}
+
+/**
+ * Properties needed for native Teams file card attachments.
+ * The eTag is used as the attachment ID and webDavUrl as the contentUrl.
+ */
+export interface DriveItemProperties {
+  /** The eTag of the driveItem (used as attachment ID) */
+  eTag: string;
+  /** The WebDAV URL of the driveItem (used as contentUrl for reference attachment) */
+  webDavUrl: string;
+  /** The filename */
+  name: string;
+}
+
+/**
+ * Get driveItem properties needed for native Teams file card attachments.
+ * This fetches the eTag and webDavUrl which are required for "reference" type attachments.
+ *
+ * @param params.siteId - SharePoint site ID
+ * @param params.itemId - The driveItem ID (returned from upload)
+ */
+export async function getDriveItemProperties(params: {
+  siteId: string;
+  itemId: string;
+  tokenProvider: MSTeamsAccessTokenProvider;
+  fetchFn?: typeof fetch;
+}): Promise<DriveItemProperties> {
+  const fetchFn = params.fetchFn ?? fetch;
+  const token = await params.tokenProvider.getAccessToken(GRAPH_SCOPE);
+
+  const res = await fetchFn(
+    `${GRAPH_ROOT}/sites/${params.siteId}/drive/items/${params.itemId}?$select=eTag,webDavUrl,name`,
+    { headers: { Authorization: `Bearer ${token}` } },
+  );
+
+  if (!res.ok) {
+    const body = await res.text().catch(() => "");
+    throw new Error(`Get driveItem properties failed: ${res.status} ${res.statusText} - ${body}`);
+  }
+
+  const data = (await res.json()) as {
+    eTag?: string;
+    webDavUrl?: string;
+    name?: string;
+  };
+
+  if (!data.eTag || !data.webDavUrl || !data.name) {
+    throw new Error("DriveItem response missing required properties (eTag, webDavUrl, or name)");
+  }
+
+  return {
+    eTag: data.eTag,
+    webDavUrl: data.webDavUrl,
+    name: data.name,
+  };
+}
+
+/**
+ * Get members of a Teams chat for per-user sharing.
+ * Used to create sharing links scoped to only the chat participants.
+ */
+export async function getChatMembers(params: {
+  chatId: string;
+  tokenProvider: MSTeamsAccessTokenProvider;
+  fetchFn?: typeof fetch;
+}): Promise<ChatMember[]> {
+  const fetchFn = params.fetchFn ?? fetch;
+  const token = await params.tokenProvider.getAccessToken(GRAPH_SCOPE);
+
+  const res = await fetchFn(`${GRAPH_ROOT}/chats/${params.chatId}/members`, {
+    headers: { Authorization: `Bearer ${token}` },
+  });
+
+  if (!res.ok) {
+    const body = await res.text().catch(() => "");
+    throw new Error(`Get chat members failed: ${res.status} ${res.statusText} - ${body}`);
+  }
+
+  const data = (await res.json()) as {
+    value?: Array<{
+      userId?: string;
+      displayName?: string;
+    }>;
+  };
+
+  return (data.value ?? [])
+    .map((m) => ({
+      aadObjectId: m.userId ?? "",
+      displayName: m.displayName,
+    }))
+    .filter((m) => m.aadObjectId);
+}
+
+/**
+ * Create a sharing link for a SharePoint drive item.
+ * For organization scope (default), uses v1.0 API.
+ * For per-user scope, uses beta API with recipients.
+ */
+export async function createSharePointSharingLink(params: {
+  siteId: string;
+  itemId: string;
+  tokenProvider: MSTeamsAccessTokenProvider;
+  /** Sharing scope: "organization" (default) or "users" (per-user with recipients) */
+  scope?: "organization" | "users";
+  /** Required when scope is "users": AAD object IDs of recipients */
+  recipientObjectIds?: string[];
+  fetchFn?: typeof fetch;
+}): Promise<OneDriveSharingLink> {
+  const fetchFn = params.fetchFn ?? fetch;
+  const token = await params.tokenProvider.getAccessToken(GRAPH_SCOPE);
+  const scope = params.scope ?? "organization";
+
+  // Per-user sharing requires beta API
+  const apiRoot = scope === "users" ? GRAPH_BETA : GRAPH_ROOT;
+
+  const body: Record<string, unknown> = {
+    type: "view",
+    scope: scope === "users" ? "users" : "organization",
+  };
+
+  // Add recipients for per-user sharing
+  if (scope === "users" && params.recipientObjectIds?.length) {
+    body.recipients = params.recipientObjectIds.map((id) => ({ objectId: id }));
+  }
+
+  const res = await fetchFn(`${apiRoot}/sites/${params.siteId}/drive/items/${params.itemId}/createLink`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(body),
+  });
+
+  if (!res.ok) {
+    const respBody = await res.text().catch(() => "");
+    throw new Error(`Create SharePoint sharing link failed: ${res.status} ${res.statusText} - ${respBody}`);
+  }
+
+  const data = (await res.json()) as {
+    link?: { webUrl?: string };
+  };
+
+  if (!data.link?.webUrl) {
+    throw new Error("Create SharePoint sharing link response missing webUrl");
+  }
+
+  return {
+    webUrl: data.link.webUrl,
+  };
+}
+
+/**
+ * Upload a file to SharePoint and create a sharing link.
+ *
+ * For group chats, this creates a per-user sharing link scoped to chat members.
+ * For channels, this creates an organization-wide sharing link.
+ *
+ * @param params.siteId - SharePoint site ID
+ * @param params.chatId - Optional chat ID for per-user sharing (group chats)
+ * @param params.usePerUserSharing - Whether to use per-user sharing (requires beta API + Chat.Read.All)
+ */
+export async function uploadAndShareSharePoint(params: {
+  buffer: Buffer;
+  filename: string;
+  contentType?: string;
+  tokenProvider: MSTeamsAccessTokenProvider;
+  siteId: string;
+  chatId?: string;
+  usePerUserSharing?: boolean;
+  fetchFn?: typeof fetch;
+}): Promise<{
+  itemId: string;
+  webUrl: string;
+  shareUrl: string;
+  name: string;
+}> {
+  // 1. Upload file to SharePoint
+  const uploaded = await uploadToSharePoint({
+    buffer: params.buffer,
+    filename: params.filename,
+    contentType: params.contentType,
+    tokenProvider: params.tokenProvider,
+    siteId: params.siteId,
+    fetchFn: params.fetchFn,
+  });
+
+  // 2. Determine sharing scope
+  let scope: "organization" | "users" = "organization";
+  let recipientObjectIds: string[] | undefined;
+
+  if (params.usePerUserSharing && params.chatId) {
+    try {
+      const members = await getChatMembers({
+        chatId: params.chatId,
+        tokenProvider: params.tokenProvider,
+        fetchFn: params.fetchFn,
+      });
+
+      if (members.length > 0) {
+        scope = "users";
+        recipientObjectIds = members.map((m) => m.aadObjectId);
+      }
+    } catch {
+      // Fall back to organization scope if we can't get chat members
+      // (e.g., missing Chat.Read.All permission)
+    }
+  }
+
+  // 3. Create sharing link
+  const shareLink = await createSharePointSharingLink({
+    siteId: params.siteId,
+    itemId: uploaded.id,
+    tokenProvider: params.tokenProvider,
+    scope,
+    recipientObjectIds,
+    fetchFn: params.fetchFn,
+  });
+
+  return {
+    itemId: uploaded.id,
+    webUrl: uploaded.webUrl,
+    shareUrl: shareLink.webUrl,
+    name: uploaded.name,
+  };
+}
diff --git a/extensions/msteams/src/media-helpers.test.ts b/extensions/msteams/src/media-helpers.test.ts
new file mode 100644
index 000000000..09979dfe4
--- /dev/null
+++ b/extensions/msteams/src/media-helpers.test.ts
@@ -0,0 +1,186 @@
+import { describe, expect, it } from "vitest";
+
+import { extractFilename, extractMessageId, getMimeType, isLocalPath } from "./media-helpers.js";
+
+describe("msteams media-helpers", () => {
+  describe("getMimeType", () => {
+    it("detects png from URL", async () => {
+      expect(await getMimeType("https://example.com/image.png")).toBe("image/png");
+    });
+
+    it("detects jpeg from URL (both extensions)", async () => {
+      expect(await getMimeType("https://example.com/photo.jpg")).toBe("image/jpeg");
+      expect(await getMimeType("https://example.com/photo.jpeg")).toBe("image/jpeg");
+    });
+
+    it("detects gif from URL", async () => {
+      expect(await getMimeType("https://example.com/anim.gif")).toBe("image/gif");
+    });
+
+    it("detects webp from URL", async () => {
+      expect(await getMimeType("https://example.com/modern.webp")).toBe("image/webp");
+    });
+
+    it("handles URLs with query strings", async () => {
+      expect(await getMimeType("https://example.com/image.png?v=123")).toBe("image/png");
+    });
+
+    it("handles data URLs", async () => {
+      expect(await getMimeType("data:image/png;base64,iVBORw0KGgo=")).toBe("image/png");
+      expect(await getMimeType("data:image/jpeg;base64,/9j/4AAQ")).toBe("image/jpeg");
+      expect(await getMimeType("data:image/gif;base64,R0lGOD")).toBe("image/gif");
+    });
+
+    it("handles data URLs without base64", async () => {
+      expect(await getMimeType("data:image/svg+xml,%3Csvg")).toBe("image/svg+xml");
+    });
+
+    it("handles local paths", async () => {
+      expect(await getMimeType("/tmp/image.png")).toBe("image/png");
+      expect(await getMimeType("/Users/test/photo.jpg")).toBe("image/jpeg");
+    });
+
+    it("handles tilde paths", async () => {
+      expect(await getMimeType("~/Downloads/image.gif")).toBe("image/gif");
+    });
+
+    it("defaults to application/octet-stream for unknown extensions", async () => {
+      expect(await getMimeType("https://example.com/image")).toBe("application/octet-stream");
+      expect(await getMimeType("https://example.com/image.unknown")).toBe("application/octet-stream");
+    });
+
+    it("is case-insensitive", async () => {
+      expect(await getMimeType("https://example.com/IMAGE.PNG")).toBe("image/png");
+      expect(await getMimeType("https://example.com/Photo.JPEG")).toBe("image/jpeg");
+    });
+
+    it("detects document types", async () => {
+      expect(await getMimeType("https://example.com/doc.pdf")).toBe("application/pdf");
+      expect(await getMimeType("https://example.com/doc.docx")).toBe(
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+      );
+      expect(await getMimeType("https://example.com/spreadsheet.xlsx")).toBe(
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+      );
+    });
+  });
+
+  describe("extractFilename", () => {
+    it("extracts filename from URL with extension", async () => {
+      expect(await extractFilename("https://example.com/photo.jpg")).toBe("photo.jpg");
+    });
+
+    it("extracts filename from URL with path", async () => {
+      expect(await extractFilename("https://example.com/images/2024/photo.png")).toBe("photo.png");
+    });
+
+    it("handles URLs without extension by deriving from MIME", async () => {
+      // Now defaults to application/octet-stream → .bin fallback
+      expect(await extractFilename("https://example.com/images/photo")).toBe("photo.bin");
+    });
+
+    it("handles data URLs", async () => {
+      expect(await extractFilename("data:image/png;base64,iVBORw0KGgo=")).toBe("image.png");
+      expect(await extractFilename("data:image/jpeg;base64,/9j/4AAQ")).toBe("image.jpg");
+    });
+
+    it("handles document data URLs", async () => {
+      expect(await extractFilename("data:application/pdf;base64,JVBERi0")).toBe("file.pdf");
+    });
+
+    it("handles local paths", async () => {
+      expect(await extractFilename("/tmp/screenshot.png")).toBe("screenshot.png");
+      expect(await extractFilename("/Users/test/photo.jpg")).toBe("photo.jpg");
+    });
+
+    it("handles tilde paths", async () => {
+      expect(await extractFilename("~/Downloads/image.gif")).toBe("image.gif");
+    });
+
+    it("returns fallback for empty URL", async () => {
+      expect(await extractFilename("")).toBe("file.bin");
+    });
+
+    it("extracts original filename from embedded pattern", async () => {
+      // Pattern: {original}---{uuid}.{ext}
+      expect(
+        await extractFilename("/media/inbound/report---a1b2c3d4-e5f6-7890-abcd-ef1234567890.pdf"),
+      ).toBe("report.pdf");
+    });
+
+    it("extracts original filename with uppercase UUID", async () => {
+      expect(
+        await extractFilename("/media/inbound/Document---A1B2C3D4-E5F6-7890-ABCD-EF1234567890.docx"),
+      ).toBe("Document.docx");
+    });
+
+    it("falls back to UUID filename for legacy paths", async () => {
+      // UUID-only filename (legacy format, no embedded name)
+      expect(
+        await extractFilename("/media/inbound/a1b2c3d4-e5f6-7890-abcd-ef1234567890.pdf"),
+      ).toBe("a1b2c3d4-e5f6-7890-abcd-ef1234567890.pdf");
+    });
+
+    it("handles --- in filename without valid UUID pattern", async () => {
+      // foo---bar.txt (bar is not a valid UUID)
+      expect(await extractFilename("/media/inbound/foo---bar.txt")).toBe("foo---bar.txt");
+    });
+  });
+
+  describe("isLocalPath", () => {
+    it("returns true for file:// URLs", () => {
+      expect(isLocalPath("file:///tmp/image.png")).toBe(true);
+      expect(isLocalPath("file://localhost/tmp/image.png")).toBe(true);
+    });
+
+    it("returns true for absolute paths", () => {
+      expect(isLocalPath("/tmp/image.png")).toBe(true);
+      expect(isLocalPath("/Users/test/photo.jpg")).toBe(true);
+    });
+
+    it("returns true for tilde paths", () => {
+      expect(isLocalPath("~/Downloads/image.png")).toBe(true);
+    });
+
+    it("returns false for http URLs", () => {
+      expect(isLocalPath("http://example.com/image.png")).toBe(false);
+      expect(isLocalPath("https://example.com/image.png")).toBe(false);
+    });
+
+    it("returns false for data URLs", () => {
+      expect(isLocalPath("data:image/png;base64,iVBORw0KGgo=")).toBe(false);
+    });
+  });
+
+  describe("extractMessageId", () => {
+    it("extracts id from valid response", () => {
+      expect(extractMessageId({ id: "msg123" })).toBe("msg123");
+    });
+
+    it("returns null for missing id", () => {
+      expect(extractMessageId({ foo: "bar" })).toBeNull();
+    });
+
+    it("returns null for empty id", () => {
+      expect(extractMessageId({ id: "" })).toBeNull();
+    });
+
+    it("returns null for non-string id", () => {
+      expect(extractMessageId({ id: 123 })).toBeNull();
+      expect(extractMessageId({ id: null })).toBeNull();
+    });
+
+    it("returns null for null response", () => {
+      expect(extractMessageId(null)).toBeNull();
+    });
+
+    it("returns null for undefined response", () => {
+      expect(extractMessageId(undefined)).toBeNull();
+    });
+
+    it("returns null for non-object response", () => {
+      expect(extractMessageId("string")).toBeNull();
+      expect(extractMessageId(123)).toBeNull();
+    });
+  });
+});
diff --git a/extensions/msteams/src/media-helpers.ts b/extensions/msteams/src/media-helpers.ts
new file mode 100644
index 000000000..bf4a6265b
--- /dev/null
+++ b/extensions/msteams/src/media-helpers.ts
@@ -0,0 +1,77 @@
+/**
+ * MIME type detection and filename extraction for MSTeams media attachments.
+ */
+
+import path from "node:path";
+
+import {
+  detectMime,
+  extensionForMime,
+  extractOriginalFilename,
+  getFileExtension,
+} from "clawdbot/plugin-sdk";
+
+/**
+ * Detect MIME type from URL extension or data URL.
+ * Uses shared MIME detection for consistency with core handling.
+ */
+export async function getMimeType(url: string): Promise<string> {
+  // Handle data URLs: data:image/png;base64,...
+  if (url.startsWith("data:")) {
+    const match = url.match(/^data:([^;,]+)/);
+    if (match?.[1]) return match[1];
+  }
+
+  // Use shared MIME detection (extension-based for URLs)
+  const detected = await detectMime({ filePath: url });
+  return detected ?? "application/octet-stream";
+}
+
+/**
+ * Extract filename from URL or local path.
+ * For local paths, extracts original filename if stored with embedded name pattern.
+ * Falls back to deriving the extension from MIME type when no extension present.
+ */
+export async function extractFilename(url: string): Promise<string> {
+  // Handle data URLs: derive extension from MIME
+  if (url.startsWith("data:")) {
+    const mime = await getMimeType(url);
+    const ext = extensionForMime(mime) ?? ".bin";
+    const prefix = mime.startsWith("image/") ? "image" : "file";
+    return `${prefix}${ext}`;
+  }
+
+  // Try to extract from URL pathname
+  try {
+    const pathname = new URL(url).pathname;
+    const basename = path.basename(pathname);
+    const existingExt = getFileExtension(pathname);
+    if (basename && existingExt) return basename;
+    // No extension in URL, derive from MIME
+    const mime = await getMimeType(url);
+    const ext = extensionForMime(mime) ?? ".bin";
+    const prefix = mime.startsWith("image/") ? "image" : "file";
+    return basename ? `${basename}${ext}` : `${prefix}${ext}`;
+  } catch {
+    // Local paths - use extractOriginalFilename to extract embedded original name
+    return extractOriginalFilename(url);
+  }
+}
+
+/**
+ * Check if a URL refers to a local file path.
+ */
+export function isLocalPath(url: string): boolean {
+  return url.startsWith("file://") || url.startsWith("/") || url.startsWith("~");
+}
+
+/**
+ * Extract the message ID from a Bot Framework response.
+ */
+export function extractMessageId(response: unknown): string | null {
+  if (!response || typeof response !== "object") return null;
+  if (!("id" in response)) return null;
+  const { id } = response as { id?: unknown };
+  if (typeof id !== "string" || !id) return null;
+  return id;
+}
diff --git a/extensions/msteams/src/messenger.test.ts b/extensions/msteams/src/messenger.test.ts
index 5be0fbf2b..04d1f55e1 100644
--- a/extensions/msteams/src/messenger.test.ts
+++ b/extensions/msteams/src/messenger.test.ts
@@ -51,7 +51,7 @@ describe("msteams messenger", () => {
         [{ text: "hi", mediaUrl: "https://example.com/a.png" }],
         { textChunkLimit: 4000 },
       );
-      expect(messages).toEqual(["hi", "https://example.com/a.png"]);
+      expect(messages).toEqual([{ text: "hi" }, { mediaUrl: "https://example.com/a.png" }]);
     });
 
     it("supports inline media mode", () => {
@@ -59,7 +59,7 @@ describe("msteams messenger", () => {
         [{ text: "hi", mediaUrl: "https://example.com/a.png" }],
         { textChunkLimit: 4000, mediaMode: "inline" },
       );
-      expect(messages).toEqual(["hi\n\nhttps://example.com/a.png"]);
+      expect(messages).toEqual([{ text: "hi", mediaUrl: "https://example.com/a.png" }]);
     });
 
     it("chunks long text when enabled", () => {
@@ -101,7 +101,7 @@ describe("msteams messenger", () => {
         appId: "app123",
         conversationRef: baseRef,
         context: ctx,
-        messages: ["one", "two"],
+        messages: [{ text: "one" }, { text: "two" }],
       });
 
       expect(sent).toEqual(["one", "two"]);
@@ -129,7 +129,7 @@ describe("msteams messenger", () => {
         adapter,
         appId: "app123",
         conversationRef: baseRef,
-        messages: ["hello"],
+        messages: [{ text: "hello" }],
       });
 
       expect(seen.texts).toEqual(["hello"]);
@@ -168,7 +168,7 @@ describe("msteams messenger", () => {
         appId: "app123",
         conversationRef: baseRef,
         context: ctx,
-        messages: ["one"],
+        messages: [{ text: "one" }],
         retry: { maxAttempts: 2, baseDelayMs: 0, maxDelayMs: 0 },
         onRetry: (e) => retryEvents.push({ nextAttempt: e.nextAttempt, delayMs: e.delayMs }),
       });
@@ -196,7 +196,7 @@ describe("msteams messenger", () => {
           appId: "app123",
           conversationRef: baseRef,
           context: ctx,
-          messages: ["one"],
+          messages: [{ text: "one" }],
           retry: { maxAttempts: 3, baseDelayMs: 0, maxDelayMs: 0 },
         }),
       ).rejects.toMatchObject({ statusCode: 400 });
@@ -227,7 +227,7 @@ describe("msteams messenger", () => {
         adapter,
         appId: "app123",
         conversationRef: baseRef,
-        messages: ["hello"],
+        messages: [{ text: "hello" }],
         retry: { maxAttempts: 2, baseDelayMs: 0, maxDelayMs: 0 },
       });
 
diff --git a/extensions/msteams/src/messenger.ts b/extensions/msteams/src/messenger.ts
index 573bb33bc..d6a0b9963 100644
--- a/extensions/msteams/src/messenger.ts
+++ b/extensions/msteams/src/messenger.ts
@@ -1,13 +1,35 @@
 import {
   isSilentReplyText,
+  loadWebMedia,
   type MSTeamsReplyStyle,
   type ReplyPayload,
   SILENT_REPLY_TOKEN,
 } from "clawdbot/plugin-sdk";
+import type { MSTeamsAccessTokenProvider } from "./attachments/types.js";
 import type { StoredConversationReference } from "./conversation-store.js";
 import { classifyMSTeamsSendError } from "./errors.js";
+import { prepareFileConsentActivity, requiresFileConsent } from "./file-consent-helpers.js";
+import { buildTeamsFileInfoCard } from "./graph-chat.js";
+import {
+  getDriveItemProperties,
+  uploadAndShareOneDrive,
+  uploadAndShareSharePoint,
+} from "./graph-upload.js";
+import { extractFilename, extractMessageId, getMimeType, isLocalPath } from "./media-helpers.js";
 import { getMSTeamsRuntime } from "./runtime.js";
 
+/**
+ * MSTeams-specific media size limit (100MB).
+ * Higher than the default because OneDrive upload handles large files well.
+ */
+const MSTEAMS_MAX_MEDIA_BYTES = 100 * 1024 * 1024;
+
+/**
+ * Threshold for large files that require FileConsentCard flow in personal chats.
+ * Files >= 4MB use consent flow; smaller images can use inline base64.
+ */
+const FILE_CONSENT_THRESHOLD_BYTES = 4 * 1024 * 1024;
+
 type SendContext = {
   sendActivity: (textOrActivity: string | object) => Promise<unknown>;
 };
@@ -41,6 +63,15 @@ export type MSTeamsReplyRenderOptions = {
   mediaMode?: "split" | "inline";
 };
 
+/**
+ * A rendered message that preserves media vs text distinction.
+ * When mediaUrl is present, it will be sent as a Bot Framework attachment.
+ */
+export type MSTeamsRenderedMessage = {
+  text?: string;
+  mediaUrl?: string;
+};
+
 export type MSTeamsSendRetryOptions = {
   maxAttempts?: number;
   baseDelayMs?: number;
@@ -90,16 +121,8 @@ export function buildConversationReference(
   };
 }
 
-function extractMessageId(response: unknown): string | null {
-  if (!response || typeof response !== "object") return null;
-  if (!("id" in response)) return null;
-  const { id } = response as { id?: unknown };
-  if (typeof id !== "string" || !id) return null;
-  return id;
-}
-
 function pushTextMessages(
-  out: string[],
+  out: MSTeamsRenderedMessage[],
   text: string,
   opts: {
     chunkText: boolean;
@@ -111,16 +134,17 @@ function pushTextMessages(
     for (const chunk of getMSTeamsRuntime().channel.text.chunkMarkdownText(text, opts.chunkLimit)) {
       const trimmed = chunk.trim();
       if (!trimmed || isSilentReplyText(trimmed, SILENT_REPLY_TOKEN)) continue;
-      out.push(trimmed);
+      out.push({ text: trimmed });
     }
     return;
   }
 
   const trimmed = text.trim();
   if (!trimmed || isSilentReplyText(trimmed, SILENT_REPLY_TOKEN)) return;
-  out.push(trimmed);
+  out.push({ text: trimmed });
 }
 
+
 function clampMs(value: number, maxMs: number): number {
   if (!Number.isFinite(value) || value < 0) return 0;
   return Math.min(value, maxMs);
@@ -167,8 +191,8 @@ function shouldRetry(classification: ReturnType<typeof classifyMSTeamsSendError>
 export function renderReplyPayloadsToMessages(
   replies: ReplyPayload[],
   options: MSTeamsReplyRenderOptions,
-): string[] {
-  const out: string[] = [];
+): MSTeamsRenderedMessage[] {
+  const out: MSTeamsRenderedMessage[] = [];
   const chunkLimit = Math.min(options.textChunkLimit, 4000);
   const chunkText = options.chunkText !== false;
   const mediaMode = options.mediaMode ?? "split";
@@ -185,8 +209,17 @@ export function renderReplyPayloadsToMessages(
     }
 
     if (mediaMode === "inline") {
-      const combined = text ? `${text}\n\n${mediaList.join("\n")}` : mediaList.join("\n");
-      pushTextMessages(out, combined, { chunkText, chunkLimit });
+      // For inline mode, combine text with first media as attachment
+      const firstMedia = mediaList[0];
+      if (firstMedia) {
+        out.push({ text: text || undefined, mediaUrl: firstMedia });
+        // Additional media URLs as separate messages
+        for (let i = 1; i < mediaList.length; i++) {
+          if (mediaList[i]) out.push({ mediaUrl: mediaList[i] });
+        }
+      } else {
+        pushTextMessages(out, text, { chunkText, chunkLimit });
+      }
       continue;
     }
 
@@ -194,26 +227,142 @@ export function renderReplyPayloadsToMessages(
     pushTextMessages(out, text, { chunkText, chunkLimit });
     for (const mediaUrl of mediaList) {
       if (!mediaUrl) continue;
-      out.push(mediaUrl);
+      out.push({ mediaUrl });
     }
   }
 
   return out;
 }
 
+async function buildActivity(
+  msg: MSTeamsRenderedMessage,
+  conversationRef: StoredConversationReference,
+  tokenProvider?: MSTeamsAccessTokenProvider,
+  sharePointSiteId?: string,
+  mediaMaxBytes?: number,
+): Promise<Record<string, unknown>> {
+  const activity: Record<string, unknown> = { type: "message" };
+
+  if (msg.text) {
+    activity.text = msg.text;
+  }
+
+  if (msg.mediaUrl) {
+    let contentUrl = msg.mediaUrl;
+    let contentType = await getMimeType(msg.mediaUrl);
+    let fileName = await extractFilename(msg.mediaUrl);
+
+    if (isLocalPath(msg.mediaUrl)) {
+      const maxBytes = mediaMaxBytes ?? MSTEAMS_MAX_MEDIA_BYTES;
+      const media = await loadWebMedia(msg.mediaUrl, maxBytes);
+      contentType = media.contentType ?? contentType;
+      fileName = media.fileName ?? fileName;
+
+      // Determine conversation type and file type
+      // Teams only accepts base64 data URLs for images
+      const conversationType = conversationRef.conversation?.conversationType?.toLowerCase();
+      const isPersonal = conversationType === "personal";
+      const isImage = contentType?.startsWith("image/") ?? false;
+
+      if (requiresFileConsent({
+        conversationType,
+        contentType,
+        bufferSize: media.buffer.length,
+        thresholdBytes: FILE_CONSENT_THRESHOLD_BYTES,
+      })) {
+        // Large file or non-image in personal chat: use FileConsentCard flow
+        const conversationId = conversationRef.conversation?.id ?? "unknown";
+        const { activity: consentActivity } = prepareFileConsentActivity({
+          media: { buffer: media.buffer, filename: fileName, contentType },
+          conversationId,
+          description: msg.text || undefined,
+        });
+
+        // Return the consent activity (caller sends it)
+        return consentActivity;
+      }
+
+      if (!isPersonal && !isImage && tokenProvider && sharePointSiteId) {
+        // Non-image in group chat/channel with SharePoint site configured:
+        // Upload to SharePoint and use native file card attachment
+        const chatId = conversationRef.conversation?.id;
+
+        // Upload to SharePoint
+        const uploaded = await uploadAndShareSharePoint({
+          buffer: media.buffer,
+          filename: fileName,
+          contentType,
+          tokenProvider,
+          siteId: sharePointSiteId,
+          chatId: chatId ?? undefined,
+          usePerUserSharing: conversationType === "groupchat",
+        });
+
+        // Get driveItem properties needed for native file card attachment
+        const driveItem = await getDriveItemProperties({
+          siteId: sharePointSiteId,
+          itemId: uploaded.itemId,
+          tokenProvider,
+        });
+
+        // Build native Teams file card attachment
+        const fileCardAttachment = buildTeamsFileInfoCard(driveItem);
+        activity.attachments = [fileCardAttachment];
+
+        return activity;
+      }
+
+      if (!isPersonal && !isImage && tokenProvider) {
+        // Fallback: no SharePoint site configured, try OneDrive upload
+        const uploaded = await uploadAndShareOneDrive({
+          buffer: media.buffer,
+          filename: fileName,
+          contentType,
+          tokenProvider,
+        });
+
+        // Bot Framework doesn't support "reference" attachment type for sending
+        const fileLink = `📎 [${uploaded.name}](${uploaded.shareUrl})`;
+        activity.text = msg.text ? `${msg.text}\n\n${fileLink}` : fileLink;
+        return activity;
+      }
+
+      // Image (any chat): use base64 (works for images in all conversation types)
+      const base64 = media.buffer.toString("base64");
+      contentUrl = `data:${media.contentType};base64,${base64}`;
+    }
+
+    activity.attachments = [
+      {
+        name: fileName,
+        contentType,
+        contentUrl,
+      },
+    ];
+  }
+
+  return activity;
+}
+
 export async function sendMSTeamsMessages(params: {
   replyStyle: MSTeamsReplyStyle;
   adapter: MSTeamsAdapter;
   appId: string;
   conversationRef: StoredConversationReference;
   context?: SendContext;
-  messages: string[];
+  messages: MSTeamsRenderedMessage[];
   retry?: false | MSTeamsSendRetryOptions;
   onRetry?: (event: MSTeamsSendRetryEvent) => void;
+  /** Token provider for OneDrive/SharePoint uploads in group chats/channels */
+  tokenProvider?: MSTeamsAccessTokenProvider;
+  /** SharePoint site ID for file uploads in group chats/channels */
+  sharePointSiteId?: string;
+  /** Max media size in bytes. Default: 100MB. */
+  mediaMaxBytes?: number;
 }): Promise<string[]> {
-  const messages = params.messages
-    .map((m) => (typeof m === "string" ? m : String(m)))
-    .filter((m) => m.trim().length > 0);
+  const messages = params.messages.filter(
+    (m) => (m.text && m.text.trim().length > 0) || m.mediaUrl,
+  );
   if (messages.length === 0) return [];
 
   const retryOptions = resolveRetryOptions(params.retry);
@@ -259,10 +408,9 @@ export async function sendMSTeamsMessages(params: {
     for (const [idx, message] of messages.entries()) {
       const response = await sendWithRetry(
         async () =>
-          await ctx.sendActivity({
-            type: "message",
-            text: message,
-          }),
+          await ctx.sendActivity(
+            await buildActivity(message, params.conversationRef, params.tokenProvider, params.sharePointSiteId, params.mediaMaxBytes),
+          ),
         { messageIndex: idx, messageCount: messages.length },
       );
       messageIds.push(extractMessageId(response) ?? "unknown");
@@ -281,10 +429,9 @@ export async function sendMSTeamsMessages(params: {
     for (const [idx, message] of messages.entries()) {
       const response = await sendWithRetry(
         async () =>
-          await ctx.sendActivity({
-            type: "message",
-            text: message,
-          }),
+          await ctx.sendActivity(
+            await buildActivity(message, params.conversationRef, params.tokenProvider, params.sharePointSiteId, params.mediaMaxBytes),
+          ),
         { messageIndex: idx, messageCount: messages.length },
       );
       messageIds.push(extractMessageId(response) ?? "unknown");
diff --git a/extensions/msteams/src/monitor-handler.ts b/extensions/msteams/src/monitor-handler.ts
index a862729f0..4a023eba7 100644
--- a/extensions/msteams/src/monitor-handler.ts
+++ b/extensions/msteams/src/monitor-handler.ts
@@ -1,8 +1,14 @@
 import type { ClawdbotConfig, RuntimeEnv } from "clawdbot/plugin-sdk";
 import type { MSTeamsConversationStore } from "./conversation-store.js";
+import {
+  buildFileInfoCard,
+  parseFileConsentInvoke,
+  uploadToConsentUrl,
+} from "./file-consent.js";
 import type { MSTeamsAdapter } from "./messenger.js";
 import { createMSTeamsMessageHandler } from "./monitor-handler/message-handler.js";
 import type { MSTeamsMonitorLogger } from "./monitor-types.js";
+import { getPendingUpload, removePendingUpload } from "./pending-uploads.js";
 import type { MSTeamsPollStore } from "./polls.js";
 import type { MSTeamsTurnContext } from "./sdk-types.js";
 
@@ -17,6 +23,7 @@ export type MSTeamsActivityHandler = {
   onMembersAdded: (
     handler: (context: unknown, next: () => Promise<void>) => Promise<void>,
   ) => MSTeamsActivityHandler;
+  run?: (context: unknown) => Promise<void>;
 };
 
 export type MSTeamsMessageHandlerDeps = {
@@ -32,11 +39,109 @@ export type MSTeamsMessageHandlerDeps = {
   log: MSTeamsMonitorLogger;
 };
 
+/**
+ * Handle fileConsent/invoke activities for large file uploads.
+ */
+async function handleFileConsentInvoke(
+  context: MSTeamsTurnContext,
+  log: MSTeamsMonitorLogger,
+): Promise<boolean> {
+  const activity = context.activity;
+  if (activity.type !== "invoke" || activity.name !== "fileConsent/invoke") {
+    return false;
+  }
+
+  const consentResponse = parseFileConsentInvoke(activity);
+  if (!consentResponse) {
+    log.debug("invalid file consent invoke", { value: activity.value });
+    return false;
+  }
+
+  const uploadId =
+    typeof consentResponse.context?.uploadId === "string"
+      ? consentResponse.context.uploadId
+      : undefined;
+
+  if (consentResponse.action === "accept" && consentResponse.uploadInfo) {
+    const pendingFile = getPendingUpload(uploadId);
+    if (pendingFile) {
+      log.debug("user accepted file consent, uploading", {
+        uploadId,
+        filename: pendingFile.filename,
+        size: pendingFile.buffer.length,
+      });
+
+      try {
+        // Upload file to the provided URL
+        await uploadToConsentUrl({
+          url: consentResponse.uploadInfo.uploadUrl,
+          buffer: pendingFile.buffer,
+          contentType: pendingFile.contentType,
+        });
+
+        // Send confirmation card
+        const fileInfoCard = buildFileInfoCard({
+          filename: consentResponse.uploadInfo.name,
+          contentUrl: consentResponse.uploadInfo.contentUrl,
+          uniqueId: consentResponse.uploadInfo.uniqueId,
+          fileType: consentResponse.uploadInfo.fileType,
+        });
+
+        await context.sendActivity({
+          type: "message",
+          attachments: [fileInfoCard],
+        });
+
+        log.info("file upload complete", {
+          uploadId,
+          filename: consentResponse.uploadInfo.name,
+          uniqueId: consentResponse.uploadInfo.uniqueId,
+        });
+      } catch (err) {
+        log.debug("file upload failed", { uploadId, error: String(err) });
+        await context.sendActivity(`File upload failed: ${String(err)}`);
+      } finally {
+        removePendingUpload(uploadId);
+      }
+    } else {
+      log.debug("pending file not found for consent", { uploadId });
+      await context.sendActivity(
+        "The file upload request has expired. Please try sending the file again.",
+      );
+    }
+  } else {
+    // User declined
+    log.debug("user declined file consent", { uploadId });
+    removePendingUpload(uploadId);
+  }
+
+  return true;
+}
+
 export function registerMSTeamsHandlers<T extends MSTeamsActivityHandler>(
   handler: T,
   deps: MSTeamsMessageHandlerDeps,
 ): T {
   const handleTeamsMessage = createMSTeamsMessageHandler(deps);
+
+  // Wrap the original run method to intercept invokes
+  const originalRun = handler.run;
+  if (originalRun) {
+    handler.run = async (context: unknown) => {
+      const ctx = context as MSTeamsTurnContext;
+      // Handle file consent invokes before passing to normal flow
+      if (ctx.activity?.type === "invoke" && ctx.activity?.name === "fileConsent/invoke") {
+        const handled = await handleFileConsentInvoke(ctx, deps.log);
+        if (handled) {
+          // Send invoke response for file consent
+          await ctx.sendActivity({ type: "invokeResponse", value: { status: 200 } });
+          return;
+        }
+      }
+      return originalRun.call(handler, context);
+    };
+  }
+
   handler.onMessage(async (context, next) => {
     try {
       await handleTeamsMessage(context as MSTeamsTurnContext);
diff --git a/extensions/msteams/src/monitor-handler/inbound-media.ts b/extensions/msteams/src/monitor-handler/inbound-media.ts
index 9eae27e07..03398b5a0 100644
--- a/extensions/msteams/src/monitor-handler/inbound-media.ts
+++ b/extensions/msteams/src/monitor-handler/inbound-media.ts
@@ -1,7 +1,7 @@
 import {
   buildMSTeamsGraphMessageUrls,
+  downloadMSTeamsAttachments,
   downloadMSTeamsGraphMedia,
-  downloadMSTeamsImageAttachments,
   type MSTeamsAccessTokenProvider,
   type MSTeamsAttachmentLike,
   type MSTeamsHtmlAttachmentSummary,
@@ -24,6 +24,8 @@ export async function resolveMSTeamsInboundMedia(params: {
   conversationMessageId?: string;
   activity: Pick<MSTeamsTurnContext["activity"], "id" | "replyToId" | "channelData">;
   log: MSTeamsLogger;
+  /** When true, embeds original filename in stored path for later extraction. */
+  preserveFilenames?: boolean;
 }): Promise<MSTeamsInboundMedia[]> {
   const {
     attachments,
@@ -36,13 +38,15 @@ export async function resolveMSTeamsInboundMedia(params: {
     conversationMessageId,
     activity,
     log,
+    preserveFilenames,
   } = params;
 
-  let mediaList = await downloadMSTeamsImageAttachments({
+  let mediaList = await downloadMSTeamsAttachments({
     attachments,
     maxBytes,
     tokenProvider,
     allowHosts,
+    preserveFilenames,
   });
 
   if (mediaList.length === 0) {
@@ -81,6 +85,7 @@ export async function resolveMSTeamsInboundMedia(params: {
             tokenProvider,
             maxBytes,
             allowHosts,
+            preserveFilenames,
           });
           attempts.push({
             url: messageUrl,
@@ -104,7 +109,7 @@ export async function resolveMSTeamsInboundMedia(params: {
   }
 
   if (mediaList.length > 0) {
-    log.debug("downloaded image attachments", { count: mediaList.length });
+    log.debug("downloaded attachments", { count: mediaList.length });
   } else if (htmlSummary?.imgTags) {
     log.debug("inline images detected but none downloaded", {
       imgTags: htmlSummary.imgTags,
diff --git a/extensions/msteams/src/monitor-handler/message-handler.ts b/extensions/msteams/src/monitor-handler/message-handler.ts
index ee48b82ca..1a0129180 100644
--- a/extensions/msteams/src/monitor-handler/message-handler.ts
+++ b/extensions/msteams/src/monitor-handler/message-handler.ts
@@ -402,7 +402,8 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
         channelData: activity.channelData,
       },
       log,
-	    });
+      preserveFilenames: cfg.media?.preserveFilenames,
+    });
 
 	    const mediaPayload = buildMSTeamsMediaPayload(mediaList);
 	    const envelopeFrom = isDirectMessage ? senderName : conversationType;
@@ -476,6 +477,7 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
 
     logVerboseMessage(`msteams inbound: from=${ctxPayload.From} preview="${preview}"`);
 
+    const sharePointSiteId = msteamsCfg?.sharePointSiteId;
     const { dispatcher, replyOptions, markDispatchIdle } = createMSTeamsReplyDispatcher({
       cfg,
       agentId: route.agentId,
@@ -492,6 +494,8 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
           recordMSTeamsSentMessage(conversationId, id);
         }
       },
+      tokenProvider,
+      sharePointSiteId,
     });
 
     log.info("dispatching to agent", { sessionKey: route.sessionKey });
diff --git a/extensions/msteams/src/pending-uploads.ts b/extensions/msteams/src/pending-uploads.ts
new file mode 100644
index 000000000..3c5e4a42b
--- /dev/null
+++ b/extensions/msteams/src/pending-uploads.ts
@@ -0,0 +1,87 @@
+/**
+ * In-memory storage for files awaiting user consent in the FileConsentCard flow.
+ *
+ * When sending large files (>=4MB) in personal chats, Teams requires user consent
+ * before upload. This module stores the file data temporarily until the user
+ * accepts or declines, or until the TTL expires.
+ */
+
+import crypto from "node:crypto";
+
+export interface PendingUpload {
+  id: string;
+  buffer: Buffer;
+  filename: string;
+  contentType?: string;
+  conversationId: string;
+  createdAt: number;
+}
+
+const pendingUploads = new Map<string, PendingUpload>();
+
+/** TTL for pending uploads: 5 minutes */
+const PENDING_UPLOAD_TTL_MS = 5 * 60 * 1000;
+
+/**
+ * Store a file pending user consent.
+ * Returns the upload ID to include in the FileConsentCard context.
+ */
+export function storePendingUpload(
+  upload: Omit<PendingUpload, "id" | "createdAt">,
+): string {
+  const id = crypto.randomUUID();
+  const entry: PendingUpload = {
+    ...upload,
+    id,
+    createdAt: Date.now(),
+  };
+  pendingUploads.set(id, entry);
+
+  // Auto-cleanup after TTL
+  setTimeout(() => {
+    pendingUploads.delete(id);
+  }, PENDING_UPLOAD_TTL_MS);
+
+  return id;
+}
+
+/**
+ * Retrieve a pending upload by ID.
+ * Returns undefined if not found or expired.
+ */
+export function getPendingUpload(id?: string): PendingUpload | undefined {
+  if (!id) return undefined;
+  const entry = pendingUploads.get(id);
+  if (!entry) return undefined;
+
+  // Check if expired (in case timeout hasn't fired yet)
+  if (Date.now() - entry.createdAt > PENDING_UPLOAD_TTL_MS) {
+    pendingUploads.delete(id);
+    return undefined;
+  }
+
+  return entry;
+}
+
+/**
+ * Remove a pending upload (after successful upload or user decline).
+ */
+export function removePendingUpload(id?: string): void {
+  if (id) {
+    pendingUploads.delete(id);
+  }
+}
+
+/**
+ * Get the count of pending uploads (for monitoring/debugging).
+ */
+export function getPendingUploadCount(): number {
+  return pendingUploads.size;
+}
+
+/**
+ * Clear all pending uploads (for testing).
+ */
+export function clearPendingUploads(): void {
+  pendingUploads.clear();
+}
diff --git a/extensions/msteams/src/probe.ts b/extensions/msteams/src/probe.ts
index 835be6587..2d6dd7429 100644
--- a/extensions/msteams/src/probe.ts
+++ b/extensions/msteams/src/probe.ts
@@ -76,7 +76,7 @@ export async function probeMSTeams(cfg?: MSTeamsConfig): Promise<ProbeMSTeamsRes
       | undefined;
     try {
       const graphToken = await tokenProvider.getAccessToken(
-        "https://graph.microsoft.com/.default",
+        "https://graph.microsoft.com",
       );
       const accessToken = readAccessToken(graphToken);
       const payload = accessToken ? decodeJwtPayload(accessToken) : null;
diff --git a/extensions/msteams/src/reply-dispatcher.ts b/extensions/msteams/src/reply-dispatcher.ts
index 38827b340..d50661264 100644
--- a/extensions/msteams/src/reply-dispatcher.ts
+++ b/extensions/msteams/src/reply-dispatcher.ts
@@ -1,8 +1,10 @@
-import type {
-  ClawdbotConfig,
-  MSTeamsReplyStyle,
-  RuntimeEnv,
+import {
+  resolveChannelMediaMaxBytes,
+  type ClawdbotConfig,
+  type MSTeamsReplyStyle,
+  type RuntimeEnv,
 } from "clawdbot/plugin-sdk";
+import type { MSTeamsAccessTokenProvider } from "./attachments/types.js";
 import type { StoredConversationReference } from "./conversation-store.js";
 import {
   classifyMSTeamsSendError,
@@ -30,6 +32,10 @@ export function createMSTeamsReplyDispatcher(params: {
   replyStyle: MSTeamsReplyStyle;
   textLimit: number;
   onSentMessageIds?: (ids: string[]) => void;
+  /** Token provider for OneDrive/SharePoint uploads in group chats/channels */
+  tokenProvider?: MSTeamsAccessTokenProvider;
+  /** SharePoint site ID for file uploads in group chats/channels */
+  sharePointSiteId?: string;
 }) {
   const core = getMSTeamsRuntime();
   const sendTypingIndicator = async () => {
@@ -52,6 +58,10 @@ export function createMSTeamsReplyDispatcher(params: {
         chunkText: true,
         mediaMode: "split",
       });
+      const mediaMaxBytes = resolveChannelMediaMaxBytes({
+        cfg: params.cfg,
+        resolveChannelLimitMb: ({ cfg }) => cfg.channels?.msteams?.mediaMaxMb,
+      });
       const ids = await sendMSTeamsMessages({
         replyStyle: params.replyStyle,
         adapter: params.adapter,
@@ -67,6 +77,9 @@ export function createMSTeamsReplyDispatcher(params: {
             ...event,
           });
         },
+        tokenProvider: params.tokenProvider,
+        sharePointSiteId: params.sharePointSiteId,
+        mediaMaxBytes,
       });
       if (ids.length > 0) params.onSentMessageIds?.(ids);
     },
diff --git a/extensions/msteams/src/send-context.ts b/extensions/msteams/src/send-context.ts
index 685d356fc..c0f013a9e 100644
--- a/extensions/msteams/src/send-context.ts
+++ b/extensions/msteams/src/send-context.ts
@@ -1,29 +1,31 @@
-import type { ClawdbotConfig, PluginRuntime } from "clawdbot/plugin-sdk";
+import { resolveChannelMediaMaxBytes, type ClawdbotConfig, type PluginRuntime } from "clawdbot/plugin-sdk";
+import type { MSTeamsAccessTokenProvider } from "./attachments/types.js";
 import type {
   MSTeamsConversationStore,
   StoredConversationReference,
 } from "./conversation-store.js";
 import { createMSTeamsConversationStoreFs } from "./conversation-store-fs.js";
 import type { MSTeamsAdapter } from "./messenger.js";
+import { getMSTeamsRuntime } from "./runtime.js";
 import { createMSTeamsAdapter, loadMSTeamsSdkWithAuth } from "./sdk.js";
 import { resolveMSTeamsCredentials } from "./token.js";
 
-type GetChildLogger = PluginRuntime["logging"]["getChildLogger"];
-
-let _log: ReturnType<GetChildLogger> | undefined;
-const getLog = async (): Promise<ReturnType<GetChildLogger>> => {
-  if (_log) return _log;
-  const { getChildLogger } = await import("../logging.js");
-  _log = getChildLogger({ name: "msteams:send" });
-  return _log;
-};
+export type MSTeamsConversationType = "personal" | "groupChat" | "channel";
 
 export type MSTeamsProactiveContext = {
   appId: string;
   conversationId: string;
   ref: StoredConversationReference;
   adapter: MSTeamsAdapter;
-  log: Awaited<ReturnType<typeof getLog>>;
+  log: ReturnType<PluginRuntime["logging"]["getChildLogger"]>;
+  /** The type of conversation: personal (1:1), groupChat, or channel */
+  conversationType: MSTeamsConversationType;
+  /** Token provider for Graph API / OneDrive operations */
+  tokenProvider: MSTeamsAccessTokenProvider;
+  /** SharePoint site ID for file uploads in group chats/channels */
+  sharePointSiteId?: string;
+  /** Resolved media max bytes from config (default: 100MB) */
+  mediaMaxBytes?: number;
 };
 
 /**
@@ -110,16 +112,45 @@ export async function resolveMSTeamsSendContext(params: {
   }
 
   const { conversationId, ref } = found;
-  const log = await getLog();
+  const core = getMSTeamsRuntime();
+  const log = core.logging.getChildLogger({ name: "msteams:send" });
 
   const { sdk, authConfig } = await loadMSTeamsSdkWithAuth(creds);
   const adapter = createMSTeamsAdapter(authConfig, sdk);
 
+  // Create token provider for Graph API / OneDrive operations
+  const tokenProvider = new sdk.MsalTokenProvider(authConfig) as MSTeamsAccessTokenProvider;
+
+  // Determine conversation type from stored reference
+  const storedConversationType = ref.conversation?.conversationType?.toLowerCase() ?? "";
+  let conversationType: MSTeamsConversationType;
+  if (storedConversationType === "personal") {
+    conversationType = "personal";
+  } else if (storedConversationType === "channel") {
+    conversationType = "channel";
+  } else {
+    // groupChat, or unknown defaults to groupChat behavior
+    conversationType = "groupChat";
+  }
+
+  // Get SharePoint site ID from config (required for file uploads in group chats/channels)
+  const sharePointSiteId = msteamsCfg.sharePointSiteId;
+
+  // Resolve media max bytes from config
+  const mediaMaxBytes = resolveChannelMediaMaxBytes({
+    cfg: params.cfg,
+    resolveChannelLimitMb: ({ cfg }) => cfg.channels?.msteams?.mediaMaxMb,
+  });
+
   return {
     appId: creds.appId,
     conversationId,
     ref,
     adapter: adapter as unknown as MSTeamsAdapter,
     log,
+    conversationType,
+    tokenProvider,
+    sharePointSiteId,
+    mediaMaxBytes,
   };
 }
diff --git a/extensions/msteams/src/send.ts b/extensions/msteams/src/send.ts
index cffba2b6d..83d0cf149 100644
--- a/extensions/msteams/src/send.ts
+++ b/extensions/msteams/src/send.ts
@@ -1,18 +1,22 @@
+import { loadWebMedia, resolveChannelMediaMaxBytes } from "clawdbot/plugin-sdk";
 import type { ClawdbotConfig } from "clawdbot/plugin-sdk";
-import type { StoredConversationReference } from "./conversation-store.js";
 import { createMSTeamsConversationStoreFs } from "./conversation-store-fs.js";
 import {
   classifyMSTeamsSendError,
   formatMSTeamsSendErrorHint,
   formatUnknownError,
 } from "./errors.js";
+import { prepareFileConsentActivity, requiresFileConsent } from "./file-consent-helpers.js";
+import { buildTeamsFileInfoCard } from "./graph-chat.js";
 import {
-  buildConversationReference,
-  type MSTeamsAdapter,
-  sendMSTeamsMessages,
-} from "./messenger.js";
+  getDriveItemProperties,
+  uploadAndShareOneDrive,
+  uploadAndShareSharePoint,
+} from "./graph-upload.js";
+import { extractFilename, extractMessageId } from "./media-helpers.js";
+import { buildConversationReference, sendMSTeamsMessages } from "./messenger.js";
 import { buildMSTeamsPollCard } from "./polls.js";
-import { resolveMSTeamsSendContext } from "./send-context.js";
+import { resolveMSTeamsSendContext, type MSTeamsProactiveContext } from "./send-context.js";
 
 export type SendMSTeamsMessageParams = {
   /** Full config (for credentials) */
@@ -28,8 +32,19 @@ export type SendMSTeamsMessageParams = {
 export type SendMSTeamsMessageResult = {
   messageId: string;
   conversationId: string;
+  /** If a FileConsentCard was sent instead of the file, this contains the upload ID */
+  pendingUploadId?: string;
 };
 
+/** Threshold for large files that require FileConsentCard flow in personal chats */
+const FILE_CONSENT_THRESHOLD_BYTES = 4 * 1024 * 1024; // 4MB
+
+/**
+ * MSTeams-specific media size limit (100MB).
+ * Higher than the default because OneDrive upload handles large files well.
+ */
+const MSTEAMS_MAX_MEDIA_BYTES = 100 * 1024 * 1024;
+
 export type SendMSTeamsPollParams = {
   /** Full config (for credentials) */
   cfg: ClawdbotConfig;
@@ -49,32 +64,19 @@ export type SendMSTeamsPollResult = {
   conversationId: string;
 };
 
-function extractMessageId(response: unknown): string | null {
-  if (!response || typeof response !== "object") return null;
-  if (!("id" in response)) return null;
-  const { id } = response as { id?: unknown };
-  if (typeof id !== "string" || !id) return null;
-  return id;
-}
+export type SendMSTeamsCardParams = {
+  /** Full config (for credentials) */
+  cfg: ClawdbotConfig;
+  /** Conversation ID or user ID to send to */
+  to: string;
+  /** Adaptive Card JSON object */
+  card: Record<string, unknown>;
+};
 
-async function sendMSTeamsActivity(params: {
-  adapter: MSTeamsAdapter;
-  appId: string;
-  conversationRef: StoredConversationReference;
-  activity: Record<string, unknown>;
-}): Promise<string> {
-  const baseRef = buildConversationReference(params.conversationRef);
-  const proactiveRef = {
-    ...baseRef,
-    activityId: undefined,
-  };
-  let messageId = "unknown";
-  await params.adapter.continueConversation(params.appId, proactiveRef, async (ctx) => {
-    const response = await ctx.sendActivity(params.activity);
-    messageId = extractMessageId(response) ?? "unknown";
-  });
-  return messageId;
-}
+export type SendMSTeamsCardResult = {
+  messageId: string;
+  conversationId: string;
+};
 
 /**
  * Send a message to a Teams conversation or user.
@@ -82,23 +84,225 @@ async function sendMSTeamsActivity(params: {
  * Uses the stored ConversationReference from previous interactions.
  * The bot must have received at least one message from the conversation
  * before proactive messaging works.
+ *
+ * File handling by conversation type:
+ * - Personal (1:1) chats: small images (<4MB) use base64, large files and non-images use FileConsentCard
+ * - Group chats / channels: files are uploaded to OneDrive and shared via link
  */
 export async function sendMessageMSTeams(
   params: SendMSTeamsMessageParams,
 ): Promise<SendMSTeamsMessageResult> {
   const { cfg, to, text, mediaUrl } = params;
-  const { adapter, appId, conversationId, ref, log } = await resolveMSTeamsSendContext({
-    cfg,
-    to,
-  });
+  const ctx = await resolveMSTeamsSendContext({ cfg, to });
+  const { adapter, appId, conversationId, ref, log, conversationType, tokenProvider, sharePointSiteId } = ctx;
 
   log.debug("sending proactive message", {
     conversationId,
+    conversationType,
     textLength: text.length,
     hasMedia: Boolean(mediaUrl),
   });
 
-  const message = mediaUrl ? (text ? `${text}\n\n${mediaUrl}` : mediaUrl) : text;
+  // Handle media if present
+  if (mediaUrl) {
+    const mediaMaxBytes = resolveChannelMediaMaxBytes({
+      cfg,
+      resolveChannelLimitMb: ({ cfg }) => cfg.channels?.msteams?.mediaMaxMb,
+    }) ?? MSTEAMS_MAX_MEDIA_BYTES;
+    const media = await loadWebMedia(mediaUrl, mediaMaxBytes);
+    const isLargeFile = media.buffer.length >= FILE_CONSENT_THRESHOLD_BYTES;
+    const isImage = media.contentType?.startsWith("image/") ?? false;
+    const fallbackFileName = await extractFilename(mediaUrl);
+    const fileName = media.fileName ?? fallbackFileName;
+
+    log.debug("processing media", {
+      fileName,
+      contentType: media.contentType,
+      size: media.buffer.length,
+      isLargeFile,
+      isImage,
+      conversationType,
+    });
+
+    // Personal chats: base64 only works for images; use FileConsentCard for large files or non-images
+    if (requiresFileConsent({
+      conversationType,
+      contentType: media.contentType,
+      bufferSize: media.buffer.length,
+      thresholdBytes: FILE_CONSENT_THRESHOLD_BYTES,
+    })) {
+      const { activity, uploadId } = prepareFileConsentActivity({
+        media: { buffer: media.buffer, filename: fileName, contentType: media.contentType },
+        conversationId,
+        description: text || undefined,
+      });
+
+      log.debug("sending file consent card", { uploadId, fileName, size: media.buffer.length });
+
+      const baseRef = buildConversationReference(ref);
+      const proactiveRef = { ...baseRef, activityId: undefined };
+
+      let messageId = "unknown";
+      try {
+        await adapter.continueConversation(appId, proactiveRef, async (turnCtx) => {
+          const response = await turnCtx.sendActivity(activity);
+          messageId = extractMessageId(response) ?? "unknown";
+        });
+      } catch (err) {
+        const classification = classifyMSTeamsSendError(err);
+        const hint = formatMSTeamsSendErrorHint(classification);
+        const status = classification.statusCode ? ` (HTTP ${classification.statusCode})` : "";
+        throw new Error(
+          `msteams consent card send failed${status}: ${formatUnknownError(err)}${hint ? ` (${hint})` : ""}`,
+        );
+      }
+
+      log.info("sent file consent card", { conversationId, messageId, uploadId });
+
+      return {
+        messageId,
+        conversationId,
+        pendingUploadId: uploadId,
+      };
+    }
+
+    // Personal chat with small image: use base64 (only works for images)
+    if (conversationType === "personal") {
+      // Small image in personal chat: use base64 (only works for images)
+      const base64 = media.buffer.toString("base64");
+      const finalMediaUrl = `data:${media.contentType};base64,${base64}`;
+
+      return sendTextWithMedia(ctx, text, finalMediaUrl);
+    }
+
+    if (isImage && !sharePointSiteId) {
+      // Group chat/channel without SharePoint: send image inline (avoids OneDrive failures)
+      const base64 = media.buffer.toString("base64");
+      const finalMediaUrl = `data:${media.contentType};base64,${base64}`;
+      return sendTextWithMedia(ctx, text, finalMediaUrl);
+    }
+
+    // Group chat or channel: upload to SharePoint (if siteId configured) or OneDrive
+    try {
+      if (sharePointSiteId) {
+        // Use SharePoint upload + Graph API for native file card
+        log.debug("uploading to SharePoint for native file card", {
+          fileName,
+          conversationType,
+          siteId: sharePointSiteId,
+        });
+
+        const uploaded = await uploadAndShareSharePoint({
+          buffer: media.buffer,
+          filename: fileName,
+          contentType: media.contentType,
+          tokenProvider,
+          siteId: sharePointSiteId,
+          chatId: conversationId,
+          usePerUserSharing: conversationType === "groupChat",
+        });
+
+        log.debug("SharePoint upload complete", {
+          itemId: uploaded.itemId,
+          shareUrl: uploaded.shareUrl,
+        });
+
+        // Get driveItem properties needed for native file card
+        const driveItem = await getDriveItemProperties({
+          siteId: sharePointSiteId,
+          itemId: uploaded.itemId,
+          tokenProvider,
+        });
+
+        log.debug("driveItem properties retrieved", {
+          eTag: driveItem.eTag,
+          webDavUrl: driveItem.webDavUrl,
+        });
+
+        // Build native Teams file card attachment and send via Bot Framework
+        const fileCardAttachment = buildTeamsFileInfoCard(driveItem);
+        const activity = {
+          type: "message",
+          text: text || undefined,
+          attachments: [fileCardAttachment],
+        };
+
+        const baseRef = buildConversationReference(ref);
+        const proactiveRef = { ...baseRef, activityId: undefined };
+
+        let messageId = "unknown";
+        await adapter.continueConversation(appId, proactiveRef, async (turnCtx) => {
+          const response = await turnCtx.sendActivity(activity);
+          messageId = extractMessageId(response) ?? "unknown";
+        });
+
+        log.info("sent native file card", {
+          conversationId,
+          messageId,
+          fileName: driveItem.name,
+        });
+
+        return { messageId, conversationId };
+      }
+
+      // Fallback: no SharePoint site configured, use OneDrive with markdown link
+      log.debug("uploading to OneDrive (no SharePoint site configured)", { fileName, conversationType });
+
+      const uploaded = await uploadAndShareOneDrive({
+        buffer: media.buffer,
+        filename: fileName,
+        contentType: media.contentType,
+        tokenProvider,
+      });
+
+      log.debug("OneDrive upload complete", {
+        itemId: uploaded.itemId,
+        shareUrl: uploaded.shareUrl,
+      });
+
+      // Send message with file link (Bot Framework doesn't support "reference" attachment type for sending)
+      const fileLink = `📎 [${uploaded.name}](${uploaded.shareUrl})`;
+      const activity = {
+        type: "message",
+        text: text ? `${text}\n\n${fileLink}` : fileLink,
+      };
+
+      const baseRef = buildConversationReference(ref);
+      const proactiveRef = { ...baseRef, activityId: undefined };
+
+      let messageId = "unknown";
+      await adapter.continueConversation(appId, proactiveRef, async (turnCtx) => {
+        const response = await turnCtx.sendActivity(activity);
+        messageId = extractMessageId(response) ?? "unknown";
+      });
+
+      log.info("sent message with OneDrive file link", { conversationId, messageId, shareUrl: uploaded.shareUrl });
+
+      return { messageId, conversationId };
+    } catch (err) {
+      const classification = classifyMSTeamsSendError(err);
+      const hint = formatMSTeamsSendErrorHint(classification);
+      const status = classification.statusCode ? ` (HTTP ${classification.statusCode})` : "";
+      throw new Error(
+        `msteams file send failed${status}: ${formatUnknownError(err)}${hint ? ` (${hint})` : ""}`,
+      );
+    }
+  }
+
+  // No media: send text only
+  return sendTextWithMedia(ctx, text, undefined);
+}
+
+/**
+ * Send a text message with optional base64 media URL.
+ */
+async function sendTextWithMedia(
+  ctx: MSTeamsProactiveContext,
+  text: string,
+  mediaUrl: string | undefined,
+): Promise<SendMSTeamsMessageResult> {
+  const { adapter, appId, conversationId, ref, log, tokenProvider, sharePointSiteId, mediaMaxBytes } = ctx;
+
   let messageIds: string[];
   try {
     messageIds = await sendMSTeamsMessages({
@@ -106,12 +310,14 @@ export async function sendMessageMSTeams(
       adapter,
       appId,
       conversationRef: ref,
-      messages: [message],
-      // Enable default retry/backoff for throttling/transient failures.
+      messages: [{ text: text || undefined, mediaUrl }],
       retry: {},
       onRetry: (event) => {
         log.debug("retrying send", { conversationId, ...event });
       },
+      tokenProvider,
+      sharePointSiteId,
+      mediaMaxBytes,
     });
   } catch (err) {
     const classification = classifyMSTeamsSendError(err);
@@ -121,8 +327,8 @@ export async function sendMessageMSTeams(
       `msteams send failed${status}: ${formatUnknownError(err)}${hint ? ` (${hint})` : ""}`,
     );
   }
-  const messageId = messageIds[0] ?? "unknown";
 
+  const messageId = messageIds[0] ?? "unknown";
   log.info("sent proactive message", { conversationId, messageId });
 
   return {
@@ -157,7 +363,6 @@ export async function sendPollMSTeams(
 
   const activity = {
     type: "message",
-    text: pollCard.fallbackText,
     attachments: [
       {
         contentType: "application/vnd.microsoft.card.adaptive",
@@ -166,13 +371,18 @@ export async function sendPollMSTeams(
     ],
   };
 
-  let messageId: string;
+  // Send poll via proactive conversation (Adaptive Cards require direct activity send)
+  const baseRef = buildConversationReference(ref);
+  const proactiveRef = {
+    ...baseRef,
+    activityId: undefined,
+  };
+
+  let messageId = "unknown";
   try {
-    messageId = await sendMSTeamsActivity({
-      adapter,
-      appId,
-      conversationRef: ref,
-      activity,
+    await adapter.continueConversation(appId, proactiveRef, async (ctx) => {
+      const response = await ctx.sendActivity(activity);
+      messageId = extractMessageId(response) ?? "unknown";
     });
   } catch (err) {
     const classification = classifyMSTeamsSendError(err);
@@ -192,6 +402,64 @@ export async function sendPollMSTeams(
   };
 }
 
+/**
+ * Send an arbitrary Adaptive Card to a Teams conversation or user.
+ */
+export async function sendAdaptiveCardMSTeams(
+  params: SendMSTeamsCardParams,
+): Promise<SendMSTeamsCardResult> {
+  const { cfg, to, card } = params;
+  const { adapter, appId, conversationId, ref, log } = await resolveMSTeamsSendContext({
+    cfg,
+    to,
+  });
+
+  log.debug("sending adaptive card", {
+    conversationId,
+    cardType: card.type,
+    cardVersion: card.version,
+  });
+
+  const activity = {
+    type: "message",
+    attachments: [
+      {
+        contentType: "application/vnd.microsoft.card.adaptive",
+        content: card,
+      },
+    ],
+  };
+
+  // Send card via proactive conversation
+  const baseRef = buildConversationReference(ref);
+  const proactiveRef = {
+    ...baseRef,
+    activityId: undefined,
+  };
+
+  let messageId = "unknown";
+  try {
+    await adapter.continueConversation(appId, proactiveRef, async (ctx) => {
+      const response = await ctx.sendActivity(activity);
+      messageId = extractMessageId(response) ?? "unknown";
+    });
+  } catch (err) {
+    const classification = classifyMSTeamsSendError(err);
+    const hint = formatMSTeamsSendErrorHint(classification);
+    const status = classification.statusCode ? ` (HTTP ${classification.statusCode})` : "";
+    throw new Error(
+      `msteams card send failed${status}: ${formatUnknownError(err)}${hint ? ` (${hint})` : ""}`,
+    );
+  }
+
+  log.info("sent adaptive card", { conversationId, messageId });
+
+  return {
+    messageId,
+    conversationId,
+  };
+}
+
 /**
  * List all known conversation references (for debugging/CLI).
  */
diff --git a/src/agents/channel-tools.ts b/src/agents/channel-tools.ts
index 486e27307..6944e7a26 100644
--- a/src/agents/channel-tools.ts
+++ b/src/agents/channel-tools.ts
@@ -1,4 +1,6 @@
+import { getChannelDock } from "../channels/dock.js";
 import { getChannelPlugin, listChannelPlugins } from "../channels/plugins/index.js";
+import { normalizeAnyChannelId } from "../channels/registry.js";
 import type { ChannelAgentTool, ChannelMessageActionName } from "../channels/plugins/types.js";
 import type { ClawdbotConfig } from "../config/config.js";
 
@@ -46,3 +48,19 @@ export function listChannelAgentTools(params: { cfg?: ClawdbotConfig }): Channel
   }
   return tools;
 }
+
+export function resolveChannelMessageToolHints(params: {
+  cfg?: ClawdbotConfig;
+  channel?: string | null;
+  accountId?: string | null;
+}): string[] {
+  const channelId = normalizeAnyChannelId(params.channel);
+  if (!channelId) return [];
+  const dock = getChannelDock(channelId);
+  const resolve = dock?.agentPrompt?.messageToolHints;
+  if (!resolve) return [];
+  const cfg = params.cfg ?? ({} as ClawdbotConfig);
+  return (resolve({ cfg, accountId: params.accountId }) ?? [])
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+}
diff --git a/src/agents/pi-embedded-runner/compact.ts b/src/agents/pi-embedded-runner/compact.ts
index a3508e5b2..2aad2431a 100644
--- a/src/agents/pi-embedded-runner/compact.ts
+++ b/src/agents/pi-embedded-runner/compact.ts
@@ -5,7 +5,7 @@ import { createAgentSession, SessionManager, SettingsManager } from "@mariozechn
 
 import { resolveHeartbeatPrompt } from "../../auto-reply/heartbeat.js";
 import type { ReasoningLevel, ThinkLevel } from "../../auto-reply/thinking.js";
-import { listChannelSupportedActions } from "../channel-tools.js";
+import { listChannelSupportedActions, resolveChannelMessageToolHints } from "../channel-tools.js";
 import { resolveChannelCapabilities } from "../../config/channel-capabilities.js";
 import type { ClawdbotConfig } from "../../config/config.js";
 import { getMachineDisplayName } from "../../infra/machine-name.js";
@@ -245,6 +245,13 @@ export async function compactEmbeddedPiSession(params: {
               channel: runtimeChannel,
             })
           : undefined;
+        const messageToolHints = runtimeChannel
+          ? resolveChannelMessageToolHints({
+              cfg: params.config,
+              channel: runtimeChannel,
+              accountId: params.agentAccountId,
+            })
+          : undefined;
 
         const runtimeInfo = {
           host: machineName,
@@ -287,6 +294,7 @@ export async function compactEmbeddedPiSession(params: {
           docsPath: docsPath ?? undefined,
           promptMode,
           runtimeInfo,
+          messageToolHints,
           sandboxInfo,
           tools,
           modelAliasLines: buildModelAliasLines(params.config),
diff --git a/src/agents/pi-embedded-runner/run/attempt.ts b/src/agents/pi-embedded-runner/run/attempt.ts
index e2e3a39dd..19450226c 100644
--- a/src/agents/pi-embedded-runner/run/attempt.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.ts
@@ -7,7 +7,10 @@ import { streamSimple } from "@mariozechner/pi-ai";
 import { createAgentSession, SessionManager, SettingsManager } from "@mariozechner/pi-coding-agent";
 
 import { resolveHeartbeatPrompt } from "../../../auto-reply/heartbeat.js";
-import { listChannelSupportedActions } from "../../channel-tools.js";
+import {
+  listChannelSupportedActions,
+  resolveChannelMessageToolHints,
+} from "../../channel-tools.js";
 import { resolveChannelCapabilities } from "../../../config/channel-capabilities.js";
 import { getMachineDisplayName } from "../../../infra/machine-name.js";
 import { resolveTelegramInlineButtonsScope } from "../../../telegram/inline-buttons.js";
@@ -260,6 +263,13 @@ export async function runEmbeddedAttempt(
           channel: runtimeChannel,
         })
       : undefined;
+    const messageToolHints = runtimeChannel
+      ? resolveChannelMessageToolHints({
+          cfg: params.config,
+          channel: runtimeChannel,
+          accountId: params.agentAccountId,
+        })
+      : undefined;
 
     const defaultModelRef = resolveDefaultModelForAgent({
       cfg: params.config ?? {},
@@ -305,6 +315,7 @@ export async function runEmbeddedAttempt(
       reactionGuidance,
       promptMode,
       runtimeInfo,
+      messageToolHints,
       sandboxInfo,
       tools,
       modelAliasLines: buildModelAliasLines(params.config),
diff --git a/src/agents/pi-embedded-runner/system-prompt.ts b/src/agents/pi-embedded-runner/system-prompt.ts
index 18ae2438d..196458df9 100644
--- a/src/agents/pi-embedded-runner/system-prompt.ts
+++ b/src/agents/pi-embedded-runner/system-prompt.ts
@@ -35,6 +35,7 @@ export function buildEmbeddedSystemPrompt(params: {
     /** Supported message actions for the current channel (e.g., react, edit, unsend) */
     channelActions?: string[];
   };
+  messageToolHints?: string[];
   sandboxInfo?: EmbeddedSandboxInfo;
   tools: AgentTool[];
   modelAliasLines: string[];
@@ -56,6 +57,7 @@ export function buildEmbeddedSystemPrompt(params: {
     reactionGuidance: params.reactionGuidance,
     promptMode: params.promptMode,
     runtimeInfo: params.runtimeInfo,
+    messageToolHints: params.messageToolHints,
     sandboxInfo: params.sandboxInfo,
     toolNames: params.tools.map((tool) => tool.name),
     toolSummaries: buildToolSummaryMap(params.tools),
diff --git a/src/agents/system-prompt.ts b/src/agents/system-prompt.ts
index 889ae84f4..af5eec98f 100644
--- a/src/agents/system-prompt.ts
+++ b/src/agents/system-prompt.ts
@@ -85,6 +85,7 @@ function buildMessagingSection(params: {
   messageChannelOptions: string;
   inlineButtonsEnabled: boolean;
   runtimeChannel?: string;
+  messageToolHints?: string[];
 }) {
   if (params.isMinimal) return [];
   return [
@@ -105,6 +106,7 @@ function buildMessagingSection(params: {
             : params.runtimeChannel
               ? `- Inline buttons not enabled for ${params.runtimeChannel}. If you need them, ask to set ${params.runtimeChannel}.capabilities.inlineButtons ("dm"|"group"|"all"|"allowlist").`
               : "",
+          ...(params.messageToolHints ?? []),
         ]
           .filter(Boolean)
           .join("\n")
@@ -159,6 +161,7 @@ export function buildAgentSystemPrompt(params: {
     channel?: string;
     capabilities?: string[];
   };
+  messageToolHints?: string[];
   sandboxInfo?: {
     enabled: boolean;
     workspaceDir?: string;
@@ -468,6 +471,7 @@ export function buildAgentSystemPrompt(params: {
       messageChannelOptions,
       inlineButtonsEnabled,
       runtimeChannel,
+      messageToolHints: params.messageToolHints,
     }),
   ];
 
diff --git a/src/agents/tools/message-tool.ts b/src/agents/tools/message-tool.ts
index 6f1116053..657284b52 100644
--- a/src/agents/tools/message-tool.ts
+++ b/src/agents/tools/message-tool.ts
@@ -2,6 +2,7 @@ import { Type } from "@sinclair/typebox";
 import {
   listChannelMessageActions,
   supportsChannelMessageButtons,
+  supportsChannelMessageCards,
 } from "../../channels/plugins/message-actions.js";
 import {
   CHANNEL_MESSAGE_ACTION_NAMES,
@@ -36,7 +37,7 @@ function buildRoutingSchema() {
   };
 }
 
-function buildSendSchema(options: { includeButtons: boolean }) {
+function buildSendSchema(options: { includeButtons: boolean; includeCards: boolean }) {
   const props: Record<string, unknown> = {
     message: Type.Optional(Type.String()),
     effectId: Type.Optional(
@@ -77,8 +78,18 @@ function buildSendSchema(options: { includeButtons: boolean }) {
         },
       ),
     ),
+    card: Type.Optional(
+      Type.Object(
+        {},
+        {
+          additionalProperties: true,
+          description: "Adaptive Card JSON object (when supported by the channel)",
+        },
+      ),
+    ),
   };
   if (!options.includeButtons) delete props.buttons;
+  if (!options.includeCards) delete props.card;
   return props;
 }
 
@@ -192,7 +203,7 @@ function buildChannelManagementSchema() {
   };
 }
 
-function buildMessageToolSchemaProps(options: { includeButtons: boolean }) {
+function buildMessageToolSchemaProps(options: { includeButtons: boolean; includeCards: boolean }) {
   return {
     ...buildRoutingSchema(),
     ...buildSendSchema(options),
@@ -211,7 +222,7 @@ function buildMessageToolSchemaProps(options: { includeButtons: boolean }) {
 
 function buildMessageToolSchemaFromActions(
   actions: readonly string[],
-  options: { includeButtons: boolean },
+  options: { includeButtons: boolean; includeCards: boolean },
 ) {
   const props = buildMessageToolSchemaProps(options);
   return Type.Object({
@@ -222,6 +233,7 @@ function buildMessageToolSchemaFromActions(
 
 const MessageToolSchema = buildMessageToolSchemaFromActions(AllMessageActions, {
   includeButtons: true,
+  includeCards: true,
 });
 
 type MessageToolOptions = {
@@ -238,8 +250,10 @@ type MessageToolOptions = {
 function buildMessageToolSchema(cfg: ClawdbotConfig) {
   const actions = listChannelMessageActions(cfg);
   const includeButtons = supportsChannelMessageButtons(cfg);
+  const includeCards = supportsChannelMessageCards(cfg);
   return buildMessageToolSchemaFromActions(actions.length > 0 ? actions : ["send"], {
     includeButtons,
+    includeCards,
   });
 }
 
diff --git a/src/auto-reply/reply/agent-runner-utils.ts b/src/auto-reply/reply/agent-runner-utils.ts
index 0481ce74e..dbde7c3d2 100644
--- a/src/auto-reply/reply/agent-runner-utils.ts
+++ b/src/auto-reply/reply/agent-runner-utils.ts
@@ -1,7 +1,7 @@
 import type { NormalizedUsage } from "../../agents/usage.js";
 import { getChannelDock } from "../../channels/dock.js";
 import type { ChannelId, ChannelThreadingToolContext } from "../../channels/plugins/types.js";
-import { normalizeChannelId } from "../../channels/registry.js";
+import { normalizeAnyChannelId, normalizeChannelId } from "../../channels/registry.js";
 import type { ClawdbotConfig } from "../../config/config.js";
 import { isReasoningTagProvider } from "../../utils/provider-utils.js";
 import { estimateUsageCost, formatTokenCount, formatUsd } from "../../utils/usage-format.js";
@@ -23,7 +23,7 @@ export function buildThreadingToolContext(params: {
   if (!config) return {};
   const rawProvider = sessionCtx.Provider?.trim().toLowerCase();
   if (!rawProvider) return {};
-  const provider = normalizeChannelId(rawProvider);
+  const provider = normalizeChannelId(rawProvider) ?? normalizeAnyChannelId(rawProvider);
   // Fallback for unrecognized/plugin channels (e.g., BlueBubbles before plugin registry init)
   const dock = provider ? getChannelDock(provider) : undefined;
   if (!dock?.threading?.buildToolContext) {
diff --git a/src/channels/dock.ts b/src/channels/dock.ts
index 45bca496f..81b07c36a 100644
--- a/src/channels/dock.ts
+++ b/src/channels/dock.ts
@@ -22,6 +22,7 @@ import type {
   ChannelElevatedAdapter,
   ChannelGroupAdapter,
   ChannelId,
+  ChannelAgentPromptAdapter,
   ChannelMentionAdapter,
   ChannelPlugin,
   ChannelThreadingAdapter,
@@ -51,6 +52,7 @@ export type ChannelDock = {
   groups?: ChannelGroupAdapter;
   mentions?: ChannelMentionAdapter;
   threading?: ChannelThreadingAdapter;
+  agentPrompt?: ChannelAgentPromptAdapter;
 };
 
 type ChannelDockStreaming = {
@@ -319,6 +321,7 @@ function buildDockFromPlugin(plugin: ChannelPlugin): ChannelDock {
     groups: plugin.groups,
     mentions: plugin.mentions,
     threading: plugin.threading,
+    agentPrompt: plugin.agentPrompt,
   };
 }
 
diff --git a/src/channels/plugins/message-actions.ts b/src/channels/plugins/message-actions.ts
index 59c712928..076e32a5e 100644
--- a/src/channels/plugins/message-actions.ts
+++ b/src/channels/plugins/message-actions.ts
@@ -21,6 +21,13 @@ export function supportsChannelMessageButtons(cfg: ClawdbotConfig): boolean {
   return false;
 }
 
+export function supportsChannelMessageCards(cfg: ClawdbotConfig): boolean {
+  for (const plugin of listChannelPlugins()) {
+    if (plugin.actions?.supportsCards?.({ cfg })) return true;
+  }
+  return false;
+}
+
 export async function dispatchChannelMessageAction(
   ctx: ChannelMessageActionContext,
 ): Promise<AgentToolResult<unknown> | null> {
diff --git a/src/channels/plugins/types.core.ts b/src/channels/plugins/types.core.ts
index af3707712..4e526ec6b 100644
--- a/src/channels/plugins/types.core.ts
+++ b/src/channels/plugins/types.core.ts
@@ -240,6 +240,10 @@ export type ChannelMessagingAdapter = {
   }) => string;
 };
 
+export type ChannelAgentPromptAdapter = {
+  messageToolHints?: (params: { cfg: ClawdbotConfig; accountId?: string | null }) => string[];
+};
+
 export type ChannelDirectoryEntryKind = "user" | "group" | "channel";
 
 export type ChannelDirectoryEntry = {
@@ -281,6 +285,7 @@ export type ChannelMessageActionAdapter = {
   listActions?: (params: { cfg: ClawdbotConfig }) => ChannelMessageActionName[];
   supportsAction?: (params: { action: ChannelMessageActionName }) => boolean;
   supportsButtons?: (params: { cfg: ClawdbotConfig }) => boolean;
+  supportsCards?: (params: { cfg: ClawdbotConfig }) => boolean;
   extractToolSend?: (params: { args: Record<string, unknown> }) => ChannelToolSend | null;
   handleAction?: (ctx: ChannelMessageActionContext) => Promise<AgentToolResult<unknown>>;
 };
diff --git a/src/channels/plugins/types.plugin.ts b/src/channels/plugins/types.plugin.ts
index 5aeab17d3..925502376 100644
--- a/src/channels/plugins/types.plugin.ts
+++ b/src/channels/plugins/types.plugin.ts
@@ -20,6 +20,7 @@ import type {
   ChannelAgentToolFactory,
   ChannelCapabilities,
   ChannelId,
+  ChannelAgentPromptAdapter,
   ChannelMentionAdapter,
   ChannelMessageActionAdapter,
   ChannelMessagingAdapter,
@@ -73,6 +74,7 @@ export type ChannelPlugin<ResolvedAccount = any> = {
   streaming?: ChannelStreamingAdapter;
   threading?: ChannelThreadingAdapter;
   messaging?: ChannelMessagingAdapter;
+  agentPrompt?: ChannelAgentPromptAdapter;
   directory?: ChannelDirectoryAdapter;
   resolver?: ChannelResolverAdapter;
   actions?: ChannelMessageActionAdapter;
diff --git a/src/channels/plugins/types.ts b/src/channels/plugins/types.ts
index ef1c4e20d..d7175f176 100644
--- a/src/channels/plugins/types.ts
+++ b/src/channels/plugins/types.ts
@@ -31,6 +31,7 @@ export type {
 export type {
   ChannelAccountSnapshot,
   ChannelAccountState,
+  ChannelAgentPromptAdapter,
   ChannelAgentTool,
   ChannelAgentToolFactory,
   ChannelCapabilities,
diff --git a/src/cli/program/message/helpers.ts b/src/cli/program/message/helpers.ts
index a2cfdc419..2173bb054 100644
--- a/src/cli/program/message/helpers.ts
+++ b/src/cli/program/message/helpers.ts
@@ -5,6 +5,7 @@ import { CHANNEL_TARGET_DESCRIPTION } from "../../../infra/outbound/channel-targ
 import { defaultRuntime } from "../../../runtime.js";
 import { createDefaultDeps } from "../../deps.js";
 import { runCommandWithRuntime } from "../../cli-utils.js";
+import { ensurePluginRegistryLoaded } from "../../plugin-registry.js";
 
 export type MessageCliHelpers = {
   withMessageBase: (command: Command) => Command;
@@ -32,6 +33,7 @@ export function createMessageCliHelpers(
 
   const runMessageAction = async (action: string, opts: Record<string, unknown>) => {
     setVerbose(Boolean(opts.verbose));
+    ensurePluginRegistryLoaded();
     const deps = createDefaultDeps();
     await runCommandWithRuntime(
       defaultRuntime,
diff --git a/src/cli/program/message/register.send.ts b/src/cli/program/message/register.send.ts
index 014c7395b..8841c3ce8 100644
--- a/src/cli/program/message/register.send.ts
+++ b/src/cli/program/message/register.send.ts
@@ -19,6 +19,7 @@ export function registerMessageSendCommand(message: Command, helpers: MessageCli
           "--buttons <json>",
           "Telegram inline keyboard buttons as JSON (array of button rows)",
         )
+        .option("--card <json>", "Adaptive Card JSON object (when supported by the channel)")
         .option("--reply-to <id>", "Reply-to message id")
         .option("--thread-id <id>", "Thread id (Telegram forum thread)")
         .option("--gif-playback", "Treat video media as GIF playback (WhatsApp only).", false),
diff --git a/src/config/types.msteams.ts b/src/config/types.msteams.ts
index e443225f3..f18dccb14 100644
--- a/src/config/types.msteams.ts
+++ b/src/config/types.msteams.ts
@@ -78,4 +78,8 @@ export type MSTeamsConfig = {
   replyStyle?: MSTeamsReplyStyle;
   /** Per-team config. Key is team ID (from the /team/ URL path segment). */
   teams?: Record<string, MSTeamsTeamConfig>;
+  /** Max media size in MB (default: 100MB for OneDrive upload support). */
+  mediaMaxMb?: number;
+  /** SharePoint site ID for file uploads in group chats/channels (e.g., "contoso.sharepoint.com,guid1,guid2"). */
+  sharePointSiteId?: string;
 };
diff --git a/src/config/zod-schema.providers-core.ts b/src/config/zod-schema.providers-core.ts
index 906ef5433..68806c61f 100644
--- a/src/config/zod-schema.providers-core.ts
+++ b/src/config/zod-schema.providers-core.ts
@@ -599,6 +599,10 @@ export const MSTeamsConfigSchema = z
     dms: z.record(z.string(), DmConfigSchema.optional()).optional(),
     replyStyle: MSTeamsReplyStyleSchema.optional(),
     teams: z.record(z.string(), MSTeamsTeamSchema.optional()).optional(),
+    /** Max media size in MB (default: 100MB for OneDrive upload support). */
+    mediaMaxMb: z.number().positive().optional(),
+    /** SharePoint site ID for file uploads in group chats/channels (e.g., "contoso.sharepoint.com,guid1,guid2") */
+    sharePointSiteId: z.string().optional(),
   })
   .strict()
   .superRefine((value, ctx) => {
diff --git a/src/config/zod-schema.ts b/src/config/zod-schema.ts
index c9754934a..d4d9bdd8d 100644
--- a/src/config/zod-schema.ts
+++ b/src/config/zod-schema.ts
@@ -191,6 +191,12 @@ export const ClawdbotSchema = z
     bindings: BindingsSchema,
     broadcast: BroadcastSchema,
     audio: AudioSchema,
+    media: z
+      .object({
+        preserveFilenames: z.boolean().optional(),
+      })
+      .strict()
+      .optional(),
     messages: MessagesSchema,
     commands: CommandsSchema,
     session: SessionSchema,
diff --git a/src/infra/outbound/message-action-runner.ts b/src/infra/outbound/message-action-runner.ts
index e307703be..dc8aeddf3 100644
--- a/src/infra/outbound/message-action-runner.ts
+++ b/src/infra/outbound/message-action-runner.ts
@@ -410,6 +410,21 @@ function parseButtonsParam(params: Record<string, unknown>): void {
   }
 }
 
+function parseCardParam(params: Record<string, unknown>): void {
+  const raw = params.card;
+  if (typeof raw !== "string") return;
+  const trimmed = raw.trim();
+  if (!trimmed) {
+    delete params.card;
+    return;
+  }
+  try {
+    params.card = JSON.parse(trimmed) as unknown;
+  } catch {
+    throw new Error("--card must be valid JSON");
+  }
+}
+
 async function resolveChannel(cfg: ClawdbotConfig, params: Record<string, unknown>) {
   const channelHint = readStringParam(params, "channel");
   const selection = await resolveMessageChannelSelection({
@@ -558,10 +573,15 @@ async function handleSendAction(ctx: ResolvedActionContext): Promise<MessageActi
   const { cfg, params, channel, accountId, dryRun, gateway, input } = ctx;
   const action: ChannelMessageActionName = "send";
   const to = readStringParam(params, "to", { required: true });
-  const mediaHint = readStringParam(params, "media", { trim: false });
+  // Support media, path, and filePath parameters for attachments
+  const mediaHint =
+    readStringParam(params, "media", { trim: false }) ??
+    readStringParam(params, "path", { trim: false }) ??
+    readStringParam(params, "filePath", { trim: false });
+  const hasCard = params.card != null && typeof params.card === "object";
   let message =
     readStringParam(params, "message", {
-      required: !mediaHint,
+      required: !mediaHint && !hasCard,
       allowEmpty: true,
     }) ?? "";
 
@@ -570,7 +590,8 @@ async function handleSendAction(ctx: ResolvedActionContext): Promise<MessageActi
   params.message = message;
   if (!params.replyTo && parsed.replyToId) params.replyTo = parsed.replyToId;
   if (!params.media) {
-    params.media = parsed.mediaUrls?.[0] || parsed.mediaUrl || undefined;
+    // Use path/filePath if media not set, then fall back to parsed directives
+    params.media = mediaHint || parsed.mediaUrls?.[0] || parsed.mediaUrl || undefined;
   }
 
   message = await maybeApplyCrossContextMarker({
@@ -729,6 +750,7 @@ export async function runMessageAction(
   const cfg = input.cfg;
   const params = { ...input.params };
   parseButtonsParam(params);
+  parseCardParam(params);
 
   const action = input.action;
   if (action === "broadcast") {
diff --git a/src/media/mime.ts b/src/media/mime.ts
index 8ef8912e6..79677b1cb 100644
--- a/src/media/mime.ts
+++ b/src/media/mime.ts
@@ -32,9 +32,11 @@ const EXT_BY_MIME: Record<string, string> = {
   "text/markdown": ".md",
 };
 
-const MIME_BY_EXT: Record<string, string> = Object.fromEntries(
-  Object.entries(EXT_BY_MIME).map(([mime, ext]) => [ext, mime]),
-);
+const MIME_BY_EXT: Record<string, string> = {
+  ...Object.fromEntries(Object.entries(EXT_BY_MIME).map(([mime, ext]) => [ext, mime])),
+  // Additional extension aliases
+  ".jpeg": "image/jpeg",
+};
 
 const AUDIO_FILE_EXTENSIONS = new Set([
   ".aac",
diff --git a/src/media/store.test.ts b/src/media/store.test.ts
index ecf633a39..e89681031 100644
--- a/src/media/store.test.ts
+++ b/src/media/store.test.ts
@@ -161,4 +161,114 @@ describe("media store", () => {
       expect(path.extname(saved.path)).toBe(".xlsx");
     });
   });
+
+  describe("extractOriginalFilename", () => {
+    it("extracts original filename from embedded pattern", async () => {
+      await withTempStore(async (store) => {
+        // Pattern: {original}---{uuid}.{ext}
+        const filename = "report---a1b2c3d4-e5f6-7890-abcd-ef1234567890.pdf";
+        const result = store.extractOriginalFilename(`/path/to/${filename}`);
+        expect(result).toBe("report.pdf");
+      });
+    });
+
+    it("handles uppercase UUID pattern", async () => {
+      await withTempStore(async (store) => {
+        const filename = "Document---A1B2C3D4-E5F6-7890-ABCD-EF1234567890.docx";
+        const result = store.extractOriginalFilename(`/media/inbound/${filename}`);
+        expect(result).toBe("Document.docx");
+      });
+    });
+
+    it("falls back to basename for non-matching patterns", async () => {
+      await withTempStore(async (store) => {
+        // UUID-only filename (legacy format)
+        const uuidOnly = "a1b2c3d4-e5f6-7890-abcd-ef1234567890.pdf";
+        expect(store.extractOriginalFilename(`/path/${uuidOnly}`)).toBe(uuidOnly);
+
+        // Regular filename without embedded pattern
+        expect(store.extractOriginalFilename("/path/to/regular.txt")).toBe("regular.txt");
+
+        // Filename with --- but invalid UUID part
+        expect(store.extractOriginalFilename("/path/to/foo---bar.txt")).toBe("foo---bar.txt");
+      });
+    });
+
+    it("preserves original name with special characters", async () => {
+      await withTempStore(async (store) => {
+        const filename = "报告_2024---a1b2c3d4-e5f6-7890-abcd-ef1234567890.pdf";
+        const result = store.extractOriginalFilename(`/media/${filename}`);
+        expect(result).toBe("报告_2024.pdf");
+      });
+    });
+  });
+
+  describe("saveMediaBuffer with originalFilename", () => {
+    it("embeds original filename in stored path when provided", async () => {
+      await withTempStore(async (store) => {
+        const buf = Buffer.from("test content");
+        const saved = await store.saveMediaBuffer(
+          buf,
+          "text/plain",
+          "inbound",
+          5 * 1024 * 1024,
+          "report.txt",
+        );
+
+        // Should contain the original name and a UUID pattern
+        expect(saved.id).toMatch(/^report---[a-f0-9-]{36}\.txt$/);
+        expect(saved.path).toContain("report---");
+
+        // Should be able to extract original name
+        const extracted = store.extractOriginalFilename(saved.path);
+        expect(extracted).toBe("report.txt");
+      });
+    });
+
+    it("sanitizes unsafe characters in original filename", async () => {
+      await withTempStore(async (store) => {
+        const buf = Buffer.from("test");
+        // Filename with unsafe chars: < > : " / \ | ? *
+        const saved = await store.saveMediaBuffer(
+          buf,
+          "text/plain",
+          "inbound",
+          5 * 1024 * 1024,
+          "my<file>:test.txt",
+        );
+
+        // Unsafe chars should be replaced with underscores
+        expect(saved.id).toMatch(/^my_file_test---[a-f0-9-]{36}\.txt$/);
+      });
+    });
+
+    it("truncates long original filenames", async () => {
+      await withTempStore(async (store) => {
+        const buf = Buffer.from("test");
+        const longName = "a".repeat(100) + ".txt";
+        const saved = await store.saveMediaBuffer(
+          buf,
+          "text/plain",
+          "inbound",
+          5 * 1024 * 1024,
+          longName,
+        );
+
+        // Original name should be truncated to 60 chars
+        const baseName = path.parse(saved.id).name.split("---")[0];
+        expect(baseName.length).toBeLessThanOrEqual(60);
+      });
+    });
+
+    it("falls back to UUID-only when originalFilename not provided", async () => {
+      await withTempStore(async (store) => {
+        const buf = Buffer.from("test");
+        const saved = await store.saveMediaBuffer(buf, "text/plain", "inbound");
+
+        // Should be UUID-only pattern (legacy behavior)
+        expect(saved.id).toMatch(/^[a-f0-9-]{36}\.txt$/);
+        expect(saved.id).not.toContain("---");
+      });
+    });
+  });
 });
diff --git a/src/media/store.ts b/src/media/store.ts
index d1781966e..cd6c92411 100644
--- a/src/media/store.ts
+++ b/src/media/store.ts
@@ -11,6 +11,43 @@ const resolveMediaDir = () => path.join(resolveConfigDir(), "media");
 const MAX_BYTES = 5 * 1024 * 1024; // 5MB default
 const DEFAULT_TTL_MS = 2 * 60 * 1000; // 2 minutes
 
+/**
+ * Sanitize a filename for cross-platform safety.
+ * Removes chars unsafe on Windows/SharePoint/all platforms.
+ * Keeps: alphanumeric, dots, hyphens, underscores, Unicode letters/numbers.
+ */
+function sanitizeFilename(name: string): string {
+  // Remove: < > : " / \ | ? * and control chars (U+0000-U+001F)
+  // oxlint-disable-next-line no-control-regex -- Intentionally matching control chars
+  const unsafe = /[<>:"/\\|?*\x00-\x1f]/g;
+  const sanitized = name.trim().replace(unsafe, "_").replace(/\s+/g, "_"); // Replace whitespace runs with underscore
+  // Collapse multiple underscores, trim leading/trailing, limit length
+  return sanitized.replace(/_+/g, "_").replace(/^_|_$/g, "").slice(0, 60);
+}
+
+/**
+ * Extract original filename from path if it matches the embedded format.
+ * Pattern: {original}---{uuid}.{ext} → returns "{original}.{ext}"
+ * Falls back to basename if no pattern match, or "file.bin" if empty.
+ */
+export function extractOriginalFilename(filePath: string): string {
+  const basename = path.basename(filePath);
+  if (!basename) return "file.bin"; // Fallback for empty input
+
+  const ext = path.extname(basename);
+  const nameWithoutExt = path.basename(basename, ext);
+
+  // Check for ---{uuid} pattern (36 chars: 8-4-4-4-12 with hyphens)
+  const match = nameWithoutExt.match(
+    /^(.+)---[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i,
+  );
+  if (match?.[1]) {
+    return `${match[1]}${ext}`;
+  }
+
+  return basename; // Fallback: use as-is
+}
+
 export function getMediaDir() {
   return resolveMediaDir();
 }
@@ -152,17 +189,29 @@ export async function saveMediaBuffer(
   contentType?: string,
   subdir = "inbound",
   maxBytes = MAX_BYTES,
+  originalFilename?: string,
 ): Promise<SavedMedia> {
   if (buffer.byteLength > maxBytes) {
     throw new Error(`Media exceeds ${(maxBytes / (1024 * 1024)).toFixed(0)}MB limit`);
   }
   const dir = path.join(resolveMediaDir(), subdir);
   await fs.mkdir(dir, { recursive: true });
-  const baseId = crypto.randomUUID();
+  const uuid = crypto.randomUUID();
   const headerExt = extensionForMime(contentType?.split(";")[0]?.trim() ?? undefined);
   const mime = await detectMime({ buffer, headerMime: contentType });
-  const ext = headerExt ?? extensionForMime(mime);
-  const id = ext ? `${baseId}${ext}` : baseId;
+  const ext = headerExt ?? extensionForMime(mime) ?? "";
+
+  let id: string;
+  if (originalFilename) {
+    // Embed original name: {sanitized}---{uuid}.ext
+    const base = path.parse(originalFilename).name;
+    const sanitized = sanitizeFilename(base);
+    id = sanitized ? `${sanitized}---${uuid}${ext}` : `${uuid}${ext}`;
+  } else {
+    // Legacy: just UUID
+    id = ext ? `${uuid}${ext}` : uuid;
+  }
+
   const dest = path.join(dir, id);
   await fs.writeFile(dest, buffer);
   return { id, path: dest, size: buffer.byteLength, contentType: mime };
diff --git a/src/plugin-sdk/index.test.ts b/src/plugin-sdk/index.test.ts
index b0e713287..920e2af2a 100644
--- a/src/plugin-sdk/index.test.ts
+++ b/src/plugin-sdk/index.test.ts
@@ -19,7 +19,6 @@ describe("plugin-sdk exports", () => {
       "writeConfigFile",
       "runCommandWithTimeout",
       "enqueueSystemEvent",
-      "detectMime",
       "fetchRemoteMedia",
       "saveMediaBuffer",
       "formatAgentEnvelope",
diff --git a/src/plugin-sdk/index.ts b/src/plugin-sdk/index.ts
index 1afc00aa4..1da3650fe 100644
--- a/src/plugin-sdk/index.ts
+++ b/src/plugin-sdk/index.ts
@@ -206,6 +206,8 @@ export type {
   DiagnosticWebhookProcessedEvent,
   DiagnosticWebhookReceivedEvent,
 } from "../infra/diagnostic-events.js";
+export { detectMime, extensionForMime, getFileExtension } from "../media/mime.js";
+export { extractOriginalFilename } from "../media/store.js";
 
 // Channel: Discord
 export {
@@ -282,3 +284,6 @@ export { collectWhatsAppStatusIssues } from "../channels/plugins/status-issues/w
 
 // Channel: BlueBubbles
 export { collectBlueBubblesStatusIssues } from "../channels/plugins/status-issues/bluebubbles.js";
+
+// Media utilities
+export { loadWebMedia, type WebMediaResult } from "../web/media.js";
diff --git a/src/web/media.ts b/src/web/media.ts
index 3f9468b63..509693732 100644
--- a/src/web/media.ts
+++ b/src/web/media.ts
@@ -4,11 +4,12 @@ import { fileURLToPath } from "node:url";
 
 import { logVerbose, shouldLogVerbose } from "../globals.js";
 import { type MediaKind, maxBytesForKind, mediaKindFromMime } from "../media/constants.js";
+import { resolveUserPath } from "../utils.js";
 import { fetchRemoteMedia } from "../media/fetch.js";
 import { convertHeicToJpeg, resizeToJpeg } from "../media/image-ops.js";
 import { detectMime, extensionForMime } from "../media/mime.js";
 
-type WebMediaResult = {
+export type WebMediaResult = {
   buffer: Buffer;
   contentType?: string;
   kind: MediaKind;
@@ -89,10 +90,9 @@ async function loadWebMediaInternal(
     kind: MediaKind;
     fileName?: string;
   }): Promise<WebMediaResult> => {
-    const cap =
-      maxBytes !== undefined
-        ? Math.min(maxBytes, maxBytesForKind(params.kind))
-        : maxBytesForKind(params.kind);
+    // If caller explicitly provides maxBytes, trust it (for channels that handle large files).
+    // Otherwise fall back to per-kind defaults.
+    const cap = maxBytes !== undefined ? maxBytes : maxBytesForKind(params.kind);
     if (params.kind === "image") {
       const isGif = params.contentType === "image/gif";
       if (isGif || !optimizeImages) {
@@ -141,6 +141,11 @@ async function loadWebMediaInternal(
     return await clampAndFinalize({ buffer, contentType, kind, fileName });
   }
 
+  // Expand tilde paths to absolute paths (e.g., ~/Downloads/photo.jpg)
+  if (mediaUrl.startsWith("~")) {
+    mediaUrl = resolveUserPath(mediaUrl);
+  }
+
   // Local path
   const data = await fs.readFile(mediaUrl);
   const mime = await detectMime({ buffer: data, filePath: mediaUrl });

From 17fad54ca0976f95b7e2101fcb88045b0093a075 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 03:28:24 +0000
Subject: [PATCH 112/171] docs: update clawtributors

---
 README.md | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index d21519fc3..a49620620 100644
--- a/README.md
+++ b/README.md
@@ -478,26 +478,27 @@ Thanks to all clawtributors:
 
 <p align="left">
   <a href="https://github.com/steipete"><img src="https://avatars.githubusercontent.com/u/58493?v=4&s=48" width="48" height="48" alt="steipete" title="steipete"/></a> <a href="https://github.com/bohdanpodvirnyi"><img src="https://avatars.githubusercontent.com/u/31819391?v=4&s=48" width="48" height="48" alt="bohdanpodvirnyi" title="bohdanpodvirnyi"/></a> <a href="https://github.com/joaohlisboa"><img src="https://avatars.githubusercontent.com/u/8200873?v=4&s=48" width="48" height="48" alt="joaohlisboa" title="joaohlisboa"/></a> <a href="https://github.com/mneves75"><img src="https://avatars.githubusercontent.com/u/2423436?v=4&s=48" width="48" height="48" alt="mneves75" title="mneves75"/></a> <a href="https://github.com/MatthieuBizien"><img src="https://avatars.githubusercontent.com/u/173090?v=4&s=48" width="48" height="48" alt="MatthieuBizien" title="MatthieuBizien"/></a> <a href="https://github.com/MaudeBot"><img src="https://avatars.githubusercontent.com/u/255777700?v=4&s=48" width="48" height="48" alt="MaudeBot" title="MaudeBot"/></a> <a href="https://github.com/rahthakor"><img src="https://avatars.githubusercontent.com/u/8470553?v=4&s=48" width="48" height="48" alt="rahthakor" title="rahthakor"/></a> <a href="https://github.com/vrknetha"><img src="https://avatars.githubusercontent.com/u/20596261?v=4&s=48" width="48" height="48" alt="vrknetha" title="vrknetha"/></a> <a href="https://github.com/radek-paclt"><img src="https://avatars.githubusercontent.com/u/50451445?v=4&s=48" width="48" height="48" alt="radek-paclt" title="radek-paclt"/></a> <a href="https://github.com/joshp123"><img src="https://avatars.githubusercontent.com/u/1497361?v=4&s=48" width="48" height="48" alt="joshp123" title="joshp123"/></a>
-  <a href="https://github.com/mukhtharcm"><img src="https://avatars.githubusercontent.com/u/56378562?v=4&s=48" width="48" height="48" alt="mukhtharcm" title="mukhtharcm"/></a> <a href="https://github.com/maxsumrall"><img src="https://avatars.githubusercontent.com/u/628843?v=4&s=48" width="48" height="48" alt="maxsumrall" title="maxsumrall"/></a> <a href="https://github.com/xadenryan"><img src="https://avatars.githubusercontent.com/u/165437834?v=4&s=48" width="48" height="48" alt="xadenryan" title="xadenryan"/></a> <a href="https://github.com/tobiasbischoff"><img src="https://avatars.githubusercontent.com/u/711564?v=4&s=48" width="48" height="48" alt="Tobias Bischoff" title="Tobias Bischoff"/></a> <a href="https://github.com/juanpablodlc"><img src="https://avatars.githubusercontent.com/u/92012363?v=4&s=48" width="48" height="48" alt="juanpablodlc" title="juanpablodlc"/></a> <a href="https://github.com/hsrvc"><img src="https://avatars.githubusercontent.com/u/129702169?v=4&s=48" width="48" height="48" alt="hsrvc" title="hsrvc"/></a> <a href="https://github.com/magimetal"><img src="https://avatars.githubusercontent.com/u/36491250?v=4&s=48" width="48" height="48" alt="magimetal" title="magimetal"/></a> <a href="https://github.com/meaningfool"><img src="https://avatars.githubusercontent.com/u/2862331?v=4&s=48" width="48" height="48" alt="meaningfool" title="meaningfool"/></a> <a href="https://github.com/NicholasSpisak"><img src="https://avatars.githubusercontent.com/u/129075147?v=4&s=48" width="48" height="48" alt="NicholasSpisak" title="NicholasSpisak"/></a> <a href="https://github.com/AbhisekBasu1"><img src="https://avatars.githubusercontent.com/u/40645221?v=4&s=48" width="48" height="48" alt="abhisekbasu1" title="abhisekbasu1"/></a>
-  <a href="https://github.com/sebslight"><img src="https://avatars.githubusercontent.com/u/19554889?v=4&s=48" width="48" height="48" alt="sebslight" title="sebslight"/></a> <a href="https://github.com/claude"><img src="https://avatars.githubusercontent.com/u/81847?v=4&s=48" width="48" height="48" alt="claude" title="claude"/></a> <a href="https://github.com/jamesgroat"><img src="https://avatars.githubusercontent.com/u/2634024?v=4&s=48" width="48" height="48" alt="jamesgroat" title="jamesgroat"/></a> <a href="https://github.com/Hyaxia"><img src="https://avatars.githubusercontent.com/u/36747317?v=4&s=48" width="48" height="48" alt="Hyaxia" title="Hyaxia"/></a> <a href="https://github.com/dantelex"><img src="https://avatars.githubusercontent.com/u/631543?v=4&s=48" width="48" height="48" alt="dantelex" title="dantelex"/></a> <a href="https://github.com/daveonkels"><img src="https://avatars.githubusercontent.com/u/533642?v=4&s=48" width="48" height="48" alt="daveonkels" title="daveonkels"/></a> <a href="https://github.com/mteam88"><img src="https://avatars.githubusercontent.com/u/84196639?v=4&s=48" width="48" height="48" alt="mteam88" title="mteam88"/></a> <a href="https://github.com/omniwired"><img src="https://avatars.githubusercontent.com/u/322761?v=4&s=48" width="48" height="48" alt="Eng. Juan Combetto" title="Eng. Juan Combetto"/></a> <a href="https://github.com/dbhurley"><img src="https://avatars.githubusercontent.com/u/5251425?v=4&s=48" width="48" height="48" alt="dbhurley" title="dbhurley"/></a> <a href="https://github.com/mbelinky"><img src="https://avatars.githubusercontent.com/u/132747814?v=4&s=48" width="48" height="48" alt="Mariano Belinky" title="Mariano Belinky"/></a>
-  <a href="https://github.com/TSavo"><img src="https://avatars.githubusercontent.com/u/877990?v=4&s=48" width="48" height="48" alt="TSavo" title="TSavo"/></a> <a href="https://github.com/julianengel"><img src="https://avatars.githubusercontent.com/u/10634231?v=4&s=48" width="48" height="48" alt="julianengel" title="julianengel"/></a> <a href="https://github.com/benithors"><img src="https://avatars.githubusercontent.com/u/20652882?v=4&s=48" width="48" height="48" alt="benithors" title="benithors"/></a> <a href="https://github.com/bradleypriest"><img src="https://avatars.githubusercontent.com/u/167215?v=4&s=48" width="48" height="48" alt="bradleypriest" title="bradleypriest"/></a> <a href="https://github.com/timolins"><img src="https://avatars.githubusercontent.com/u/1440854?v=4&s=48" width="48" height="48" alt="timolins" title="timolins"/></a> <a href="https://github.com/Nachx639"><img src="https://avatars.githubusercontent.com/u/71144023?v=4&s=48" width="48" height="48" alt="nachx639" title="nachx639"/></a> <a href="https://github.com/sreekaransrinath"><img src="https://avatars.githubusercontent.com/u/50989977?v=4&s=48" width="48" height="48" alt="sreekaransrinath" title="sreekaransrinath"/></a> <a href="https://github.com/gupsammy"><img src="https://avatars.githubusercontent.com/u/20296019?v=4&s=48" width="48" height="48" alt="gupsammy" title="gupsammy"/></a> <a href="https://github.com/cristip73"><img src="https://avatars.githubusercontent.com/u/24499421?v=4&s=48" width="48" height="48" alt="cristip73" title="cristip73"/></a> <a href="https://github.com/nachoiacovino"><img src="https://avatars.githubusercontent.com/u/50103937?v=4&s=48" width="48" height="48" alt="nachoiacovino" title="nachoiacovino"/></a>
-  <a href="https://github.com/vsabavat"><img src="https://avatars.githubusercontent.com/u/50385532?v=4&s=48" width="48" height="48" alt="Vasanth Rao Naik Sabavat" title="Vasanth Rao Naik Sabavat"/></a> <a href="https://github.com/cpojer"><img src="https://avatars.githubusercontent.com/u/13352?v=4&s=48" width="48" height="48" alt="cpojer" title="cpojer"/></a> <a href="https://github.com/lc0rp"><img src="https://avatars.githubusercontent.com/u/2609441?v=4&s=48" width="48" height="48" alt="lc0rp" title="lc0rp"/></a> <a href="https://github.com/scald"><img src="https://avatars.githubusercontent.com/u/1215913?v=4&s=48" width="48" height="48" alt="scald" title="scald"/></a> <a href="https://github.com/gumadeiras"><img src="https://avatars.githubusercontent.com/u/5599352?v=4&s=48" width="48" height="48" alt="gumadeiras" title="gumadeiras"/></a> <a href="https://github.com/andranik-sahakyan"><img src="https://avatars.githubusercontent.com/u/8908029?v=4&s=48" width="48" height="48" alt="andranik-sahakyan" title="andranik-sahakyan"/></a> <a href="https://github.com/davidguttman"><img src="https://avatars.githubusercontent.com/u/431696?v=4&s=48" width="48" height="48" alt="davidguttman" title="davidguttman"/></a> <a href="https://github.com/sleontenko"><img src="https://avatars.githubusercontent.com/u/7135949?v=4&s=48" width="48" height="48" alt="sleontenko" title="sleontenko"/></a> <a href="https://github.com/sircrumpet"><img src="https://avatars.githubusercontent.com/u/4436535?v=4&s=48" width="48" height="48" alt="sircrumpet" title="sircrumpet"/></a> <a href="https://github.com/peschee"><img src="https://avatars.githubusercontent.com/u/63866?v=4&s=48" width="48" height="48" alt="peschee" title="peschee"/></a>
-  <a href="https://github.com/rafaelreis-r"><img src="https://avatars.githubusercontent.com/u/57492577?v=4&s=48" width="48" height="48" alt="rafaelreis-r" title="rafaelreis-r"/></a> <a href="https://github.com/thewilloftheshadow"><img src="https://avatars.githubusercontent.com/u/35580099?v=4&s=48" width="48" height="48" alt="thewilloftheshadow" title="thewilloftheshadow"/></a> <a href="https://github.com/ratulsarna"><img src="https://avatars.githubusercontent.com/u/105903728?v=4&s=48" width="48" height="48" alt="ratulsarna" title="ratulsarna"/></a> <a href="https://github.com/lutr0"><img src="https://avatars.githubusercontent.com/u/76906369?v=4&s=48" width="48" height="48" alt="lutr0" title="lutr0"/></a> <a href="https://github.com/danielz1z"><img src="https://avatars.githubusercontent.com/u/235270390?v=4&s=48" width="48" height="48" alt="danielz1z" title="danielz1z"/></a> <a href="https://github.com/emanuelst"><img src="https://avatars.githubusercontent.com/u/9994339?v=4&s=48" width="48" height="48" alt="emanuelst" title="emanuelst"/></a> <a href="https://github.com/KristijanJovanovski"><img src="https://avatars.githubusercontent.com/u/8942284?v=4&s=48" width="48" height="48" alt="KristijanJovanovski" title="KristijanJovanovski"/></a> <a href="https://github.com/CashWilliams"><img src="https://avatars.githubusercontent.com/u/613573?v=4&s=48" width="48" height="48" alt="CashWilliams" title="CashWilliams"/></a> <a href="https://github.com/rdev"><img src="https://avatars.githubusercontent.com/u/8418866?v=4&s=48" width="48" height="48" alt="rdev" title="rdev"/></a> <a href="https://github.com/osolmaz"><img src="https://avatars.githubusercontent.com/u/2453968?v=4&s=48" width="48" height="48" alt="osolmaz" title="osolmaz"/></a>
-  <a href="https://github.com/joshrad-dev"><img src="https://avatars.githubusercontent.com/u/62785552?v=4&s=48" width="48" height="48" alt="joshrad-dev" title="joshrad-dev"/></a> <a href="https://github.com/kiranjd"><img src="https://avatars.githubusercontent.com/u/25822851?v=4&s=48" width="48" height="48" alt="kiranjd" title="kiranjd"/></a> <a href="https://github.com/adityashaw2"><img src="https://avatars.githubusercontent.com/u/41204444?v=4&s=48" width="48" height="48" alt="adityashaw2" title="adityashaw2"/></a> <a href="https://github.com/search?q=sheeek"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="sheeek" title="sheeek"/></a> <a href="https://github.com/artuskg"><img src="https://avatars.githubusercontent.com/u/11966157?v=4&s=48" width="48" height="48" alt="artuskg" title="artuskg"/></a> <a href="https://github.com/onutc"><img src="https://avatars.githubusercontent.com/u/152018508?v=4&s=48" width="48" height="48" alt="onutc" title="onutc"/></a> <a href="https://github.com/tyler6204"><img src="https://avatars.githubusercontent.com/u/64381258?v=4&s=48" width="48" height="48" alt="tyler6204" title="tyler6204"/></a> <a href="https://github.com/ManuelHettich"><img src="https://avatars.githubusercontent.com/u/17690367?v=4&s=48" width="48" height="48" alt="manuelhettich" title="manuelhettich"/></a> <a href="https://github.com/minghinmatthewlam"><img src="https://avatars.githubusercontent.com/u/14224566?v=4&s=48" width="48" height="48" alt="minghinmatthewlam" title="minghinmatthewlam"/></a> <a href="https://github.com/myfunc"><img src="https://avatars.githubusercontent.com/u/19294627?v=4&s=48" width="48" height="48" alt="myfunc" title="myfunc"/></a>
-  <a href="https://github.com/buddyh"><img src="https://avatars.githubusercontent.com/u/31752869?v=4&s=48" width="48" height="48" alt="buddyh" title="buddyh"/></a> <a href="https://github.com/connorshea"><img src="https://avatars.githubusercontent.com/u/2977353?v=4&s=48" width="48" height="48" alt="connorshea" title="connorshea"/></a> <a href="https://github.com/mcinteerj"><img src="https://avatars.githubusercontent.com/u/3613653?v=4&s=48" width="48" height="48" alt="mcinteerj" title="mcinteerj"/></a> <a href="https://github.com/John-Rood"><img src="https://avatars.githubusercontent.com/u/62669593?v=4&s=48" width="48" height="48" alt="John-Rood" title="John-Rood"/></a> <a href="https://github.com/timkrase"><img src="https://avatars.githubusercontent.com/u/38947626?v=4&s=48" width="48" height="48" alt="timkrase" title="timkrase"/></a> <a href="https://github.com/zerone0x"><img src="https://avatars.githubusercontent.com/u/39543393?v=4&s=48" width="48" height="48" alt="zerone0x" title="zerone0x"/></a> <a href="https://github.com/gerardward2007"><img src="https://avatars.githubusercontent.com/u/3002155?v=4&s=48" width="48" height="48" alt="gerardward2007" title="gerardward2007"/></a> <a href="https://github.com/obviyus"><img src="https://avatars.githubusercontent.com/u/22031114?v=4&s=48" width="48" height="48" alt="obviyus" title="obviyus"/></a> <a href="https://github.com/tosh-hamburg"><img src="https://avatars.githubusercontent.com/u/58424326?v=4&s=48" width="48" height="48" alt="tosh-hamburg" title="tosh-hamburg"/></a> <a href="https://github.com/azade-c"><img src="https://avatars.githubusercontent.com/u/252790079?v=4&s=48" width="48" height="48" alt="azade-c" title="azade-c"/></a>
-  <a href="https://github.com/roshanasingh4"><img src="https://avatars.githubusercontent.com/u/88576930?v=4&s=48" width="48" height="48" alt="roshanasingh4" title="roshanasingh4"/></a> <a href="https://github.com/bjesuiter"><img src="https://avatars.githubusercontent.com/u/2365676?v=4&s=48" width="48" height="48" alt="bjesuiter" title="bjesuiter"/></a> <a href="https://github.com/cheeeee"><img src="https://avatars.githubusercontent.com/u/21245729?v=4&s=48" width="48" height="48" alt="cheeeee" title="cheeeee"/></a> <a href="https://github.com/j1philli"><img src="https://avatars.githubusercontent.com/u/3744255?v=4&s=48" width="48" height="48" alt="Josh Phillips" title="Josh Phillips"/></a> <a href="https://github.com/Whoaa512"><img src="https://avatars.githubusercontent.com/u/1581943?v=4&s=48" width="48" height="48" alt="Whoaa512" title="Whoaa512"/></a> <a href="https://github.com/YuriNachos"><img src="https://avatars.githubusercontent.com/u/19365375?v=4&s=48" width="48" height="48" alt="YuriNachos" title="YuriNachos"/></a> <a href="https://github.com/chriseidhof"><img src="https://avatars.githubusercontent.com/u/5382?v=4&s=48" width="48" height="48" alt="chriseidhof" title="chriseidhof"/></a> <a href="https://github.com/vignesh07"><img src="https://avatars.githubusercontent.com/u/1436853?v=4&s=48" width="48" height="48" alt="vignesh07" title="vignesh07"/></a> <a href="https://github.com/ysqander"><img src="https://avatars.githubusercontent.com/u/80843820?v=4&s=48" width="48" height="48" alt="ysqander" title="ysqander"/></a> <a href="https://github.com/superman32432432"><img src="https://avatars.githubusercontent.com/u/7228420?v=4&s=48" width="48" height="48" alt="superman32432432" title="superman32432432"/></a>
-  <a href="https://github.com/search?q=Yurii%20Chukhlib"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Yurii Chukhlib" title="Yurii Chukhlib"/></a> <a href="https://github.com/grp06"><img src="https://avatars.githubusercontent.com/u/1573959?v=4&s=48" width="48" height="48" alt="grp06" title="grp06"/></a> <a href="https://github.com/antons"><img src="https://avatars.githubusercontent.com/u/129705?v=4&s=48" width="48" height="48" alt="antons" title="antons"/></a> <a href="https://github.com/austinm911"><img src="https://avatars.githubusercontent.com/u/31991302?v=4&s=48" width="48" height="48" alt="austinm911" title="austinm911"/></a> <a href="https://github.com/apps/blacksmith-sh"><img src="https://avatars.githubusercontent.com/in/807020?v=4&s=48" width="48" height="48" alt="blacksmith-sh[bot]" title="blacksmith-sh[bot]"/></a> <a href="https://github.com/dan-dr"><img src="https://avatars.githubusercontent.com/u/6669808?v=4&s=48" width="48" height="48" alt="dan-dr" title="dan-dr"/></a> <a href="https://github.com/HeimdallStrategy"><img src="https://avatars.githubusercontent.com/u/223014405?v=4&s=48" width="48" height="48" alt="HeimdallStrategy" title="HeimdallStrategy"/></a> <a href="https://github.com/imfing"><img src="https://avatars.githubusercontent.com/u/5097752?v=4&s=48" width="48" height="48" alt="imfing" title="imfing"/></a> <a href="https://github.com/jalehman"><img src="https://avatars.githubusercontent.com/u/550978?v=4&s=48" width="48" height="48" alt="jalehman" title="jalehman"/></a> <a href="https://github.com/jarvis-medmatic"><img src="https://avatars.githubusercontent.com/u/252428873?v=4&s=48" width="48" height="48" alt="jarvis-medmatic" title="jarvis-medmatic"/></a>
-  <a href="https://github.com/kkarimi"><img src="https://avatars.githubusercontent.com/u/875218?v=4&s=48" width="48" height="48" alt="kkarimi" title="kkarimi"/></a> <a href="https://github.com/mahmoudashraf93"><img src="https://avatars.githubusercontent.com/u/9130129?v=4&s=48" width="48" height="48" alt="mahmoudashraf93" title="mahmoudashraf93"/></a> <a href="https://github.com/petter-b"><img src="https://avatars.githubusercontent.com/u/62076402?v=4&s=48" width="48" height="48" alt="petter-b" title="petter-b"/></a> <a href="https://github.com/pkrmf"><img src="https://avatars.githubusercontent.com/u/1714267?v=4&s=48" width="48" height="48" alt="pkrmf" title="pkrmf"/></a> <a href="https://github.com/RandyVentures"><img src="https://avatars.githubusercontent.com/u/149904821?v=4&s=48" width="48" height="48" alt="RandyVentures" title="RandyVentures"/></a> <a href="https://github.com/search?q=Ryan%20Lisse"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ryan Lisse" title="Ryan Lisse"/></a> <a href="https://github.com/dougvk"><img src="https://avatars.githubusercontent.com/u/401660?v=4&s=48" width="48" height="48" alt="dougvk" title="dougvk"/></a> <a href="https://github.com/erikpr1994"><img src="https://avatars.githubusercontent.com/u/6299331?v=4&s=48" width="48" height="48" alt="erikpr1994" title="erikpr1994"/></a> <a href="https://github.com/search?q=Ghost"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ghost" title="Ghost"/></a> <a href="https://github.com/jonasjancarik"><img src="https://avatars.githubusercontent.com/u/2459191?v=4&s=48" width="48" height="48" alt="jonasjancarik" title="jonasjancarik"/></a>
-  <a href="https://github.com/search?q=Keith%20the%20Silly%20Goose"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Keith the Silly Goose" title="Keith the Silly Goose"/></a> <a href="https://github.com/search?q=L36%20Server"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="L36 Server" title="L36 Server"/></a> <a href="https://github.com/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></a> <a href="https://github.com/mitschabaude-bot"><img src="https://avatars.githubusercontent.com/u/247582884?v=4&s=48" width="48" height="48" alt="mitschabaude-bot" title="mitschabaude-bot"/></a> <a href="https://github.com/neist"><img src="https://avatars.githubusercontent.com/u/1029724?v=4&s=48" width="48" height="48" alt="neist" title="neist"/></a> <a href="https://github.com/ngutman"><img src="https://avatars.githubusercontent.com/u/1540134?v=4&s=48" width="48" height="48" alt="ngutman" title="ngutman"/></a> <a href="https://github.com/chrisrodz"><img src="https://avatars.githubusercontent.com/u/2967620?v=4&s=48" width="48" height="48" alt="chrisrodz" title="chrisrodz"/></a> <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a> <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a>
-  <a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a> <a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a> <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a> <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a> <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a>
-  <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/24601"><img src="https://avatars.githubusercontent.com/u/1157207?v=4&s=48" width="48" height="48" alt="24601" title="24601"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a> <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a> <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a> <a href="https://github.com/humanwritten"><img src="https://avatars.githubusercontent.com/u/206531610?v=4&s=48" width="48" height="48" alt="humanwritten" title="humanwritten"/></a> <a href="https://github.com/larlyssa"><img src="https://avatars.githubusercontent.com/u/13128869?v=4&s=48" width="48" height="48" alt="larlyssa" title="larlyssa"/></a> <a href="https://github.com/mkbehr"><img src="https://avatars.githubusercontent.com/u/1285?v=4&s=48" width="48" height="48" alt="mkbehr" title="mkbehr"/></a>
-  <a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/aaronveklabs"><img src="https://avatars.githubusercontent.com/u/225997828?v=4&s=48" width="48" height="48" alt="aaronveklabs" title="aaronveklabs"/></a> <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a> <a href="https://github.com/search?q=ClawdFx"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ClawdFx" title="ClawdFx"/></a> <a href="https://github.com/erik-agens"><img src="https://avatars.githubusercontent.com/u/80908960?v=4&s=48" width="48" height="48" alt="erik-agens" title="erik-agens"/></a> <a href="https://github.com/fcatuhe"><img src="https://avatars.githubusercontent.com/u/17382215?v=4&s=48" width="48" height="48" alt="fcatuhe" title="fcatuhe"/></a> <a href="https://github.com/ivanrvpereira"><img src="https://avatars.githubusercontent.com/u/183991?v=4&s=48" width="48" height="48" alt="ivanrvpereira" title="ivanrvpereira"/></a>
-  <a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jeffersonwarrior"><img src="https://avatars.githubusercontent.com/u/89030989?v=4&s=48" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/search?q=jeffersonwarrior"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/jdrhyne"><img src="https://avatars.githubusercontent.com/u/7828464?v=4&s=48" width="48" height="48" alt="Jonathan D. Rhyne (DJ-D)" title="Jonathan D. Rhyne (DJ-D)"/></a> <a href="https://github.com/jverdi"><img src="https://avatars.githubusercontent.com/u/345050?v=4&s=48" width="48" height="48" alt="jverdi" title="jverdi"/></a> <a href="https://github.com/longmaba"><img src="https://avatars.githubusercontent.com/u/9361500?v=4&s=48" width="48" height="48" alt="longmaba" title="longmaba"/></a> <a href="https://github.com/mickahouan"><img src="https://avatars.githubusercontent.com/u/31423109?v=4&s=48" width="48" height="48" alt="mickahouan" title="mickahouan"/></a> <a href="https://github.com/mjrussell"><img src="https://avatars.githubusercontent.com/u/1641895?v=4&s=48" width="48" height="48" alt="mjrussell" title="mjrussell"/></a> <a href="https://github.com/p6l-richard"><img src="https://avatars.githubusercontent.com/u/18185649?v=4&s=48" width="48" height="48" alt="p6l-richard" title="p6l-richard"/></a> <a href="https://github.com/philipp-spiess"><img src="https://avatars.githubusercontent.com/u/458591?v=4&s=48" width="48" height="48" alt="philipp-spiess" title="philipp-spiess"/></a>
-  <a href="https://github.com/robaxelsen"><img src="https://avatars.githubusercontent.com/u/13132899?v=4&s=48" width="48" height="48" alt="robaxelsen" title="robaxelsen"/></a> <a href="https://github.com/search?q=Sash%20Catanzarite"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Sash Catanzarite" title="Sash Catanzarite"/></a> <a href="https://github.com/T5-AndyML"><img src="https://avatars.githubusercontent.com/u/22801233?v=4&s=48" width="48" height="48" alt="T5-AndyML" title="T5-AndyML"/></a> <a href="https://github.com/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></a> <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/ameno-"><img src="https://avatars.githubusercontent.com/u/2416135?v=4&s=48" width="48" height="48" alt="ameno-" title="ameno-"/></a> <a href="https://github.com/andrewting19"><img src="https://avatars.githubusercontent.com/u/10536704?v=4&s=48" width="48" height="48" alt="andrewting19" title="andrewting19"/></a> <a href="https://github.com/anpoirier"><img src="https://avatars.githubusercontent.com/u/1245729?v=4&s=48" width="48" height="48" alt="anpoirier" title="anpoirier"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a>
-  <a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a> <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/search?q=Clawd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Clawd" title="Clawd"/></a> <a href="https://github.com/conhecendocontato"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendocontato" title="conhecendocontato"/></a> <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a> <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/search?q=Felix%20Krause"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Felix Krause" title="Felix Krause"/></a> <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a>
-  <a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a> <a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a> <a href="https://github.com/search?q=Kevin%20Lin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kevin Lin" title="Kevin Lin"/></a> <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a> <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a>
-  <a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a> <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a> <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/odysseus0"><img src="https://avatars.githubusercontent.com/u/8635094?v=4&s=48" width="48" height="48" alt="odysseus0" title="odysseus0"/></a> <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a>
-  <a href="https://github.com/rodrigouroz"><img src="https://avatars.githubusercontent.com/u/384037?v=4&s=48" width="48" height="48" alt="rodrigouroz" title="rodrigouroz"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a> <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a> <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a> <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a>
-  <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a> <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a>
-  <a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a> <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
+  <a href="https://github.com/mukhtharcm"><img src="https://avatars.githubusercontent.com/u/56378562?v=4&s=48" width="48" height="48" alt="mukhtharcm" title="mukhtharcm"/></a> <a href="https://github.com/maxsumrall"><img src="https://avatars.githubusercontent.com/u/628843?v=4&s=48" width="48" height="48" alt="maxsumrall" title="maxsumrall"/></a> <a href="https://github.com/xadenryan"><img src="https://avatars.githubusercontent.com/u/165437834?v=4&s=48" width="48" height="48" alt="xadenryan" title="xadenryan"/></a> <a href="https://github.com/tobiasbischoff"><img src="https://avatars.githubusercontent.com/u/711564?v=4&s=48" width="48" height="48" alt="Tobias Bischoff" title="Tobias Bischoff"/></a> <a href="https://github.com/juanpablodlc"><img src="https://avatars.githubusercontent.com/u/92012363?v=4&s=48" width="48" height="48" alt="juanpablodlc" title="juanpablodlc"/></a> <a href="https://github.com/hsrvc"><img src="https://avatars.githubusercontent.com/u/129702169?v=4&s=48" width="48" height="48" alt="hsrvc" title="hsrvc"/></a> <a href="https://github.com/magimetal"><img src="https://avatars.githubusercontent.com/u/36491250?v=4&s=48" width="48" height="48" alt="magimetal" title="magimetal"/></a> <a href="https://github.com/meaningfool"><img src="https://avatars.githubusercontent.com/u/2862331?v=4&s=48" width="48" height="48" alt="meaningfool" title="meaningfool"/></a> <a href="https://github.com/NicholasSpisak"><img src="https://avatars.githubusercontent.com/u/129075147?v=4&s=48" width="48" height="48" alt="NicholasSpisak" title="NicholasSpisak"/></a> <a href="https://github.com/sebslight"><img src="https://avatars.githubusercontent.com/u/19554889?v=4&s=48" width="48" height="48" alt="sebslight" title="sebslight"/></a>
+  <a href="https://github.com/AbhisekBasu1"><img src="https://avatars.githubusercontent.com/u/40645221?v=4&s=48" width="48" height="48" alt="abhisekbasu1" title="abhisekbasu1"/></a> <a href="https://github.com/zerone0x"><img src="https://avatars.githubusercontent.com/u/39543393?v=4&s=48" width="48" height="48" alt="zerone0x" title="zerone0x"/></a> <a href="https://github.com/claude"><img src="https://avatars.githubusercontent.com/u/81847?v=4&s=48" width="48" height="48" alt="claude" title="claude"/></a> <a href="https://github.com/jamesgroat"><img src="https://avatars.githubusercontent.com/u/2634024?v=4&s=48" width="48" height="48" alt="jamesgroat" title="jamesgroat"/></a> <a href="https://github.com/SocialNerd42069"><img src="https://avatars.githubusercontent.com/u/118244303?v=4&s=48" width="48" height="48" alt="SocialNerd42069" title="SocialNerd42069"/></a> <a href="https://github.com/Hyaxia"><img src="https://avatars.githubusercontent.com/u/36747317?v=4&s=48" width="48" height="48" alt="Hyaxia" title="Hyaxia"/></a> <a href="https://github.com/dantelex"><img src="https://avatars.githubusercontent.com/u/631543?v=4&s=48" width="48" height="48" alt="dantelex" title="dantelex"/></a> <a href="https://github.com/daveonkels"><img src="https://avatars.githubusercontent.com/u/533642?v=4&s=48" width="48" height="48" alt="daveonkels" title="daveonkels"/></a> <a href="https://github.com/mteam88"><img src="https://avatars.githubusercontent.com/u/84196639?v=4&s=48" width="48" height="48" alt="mteam88" title="mteam88"/></a> <a href="https://github.com/omniwired"><img src="https://avatars.githubusercontent.com/u/322761?v=4&s=48" width="48" height="48" alt="Eng. Juan Combetto" title="Eng. Juan Combetto"/></a>
+  <a href="https://github.com/dbhurley"><img src="https://avatars.githubusercontent.com/u/5251425?v=4&s=48" width="48" height="48" alt="dbhurley" title="dbhurley"/></a> <a href="https://github.com/mbelinky"><img src="https://avatars.githubusercontent.com/u/132747814?v=4&s=48" width="48" height="48" alt="Mariano Belinky" title="Mariano Belinky"/></a> <a href="https://github.com/TSavo"><img src="https://avatars.githubusercontent.com/u/877990?v=4&s=48" width="48" height="48" alt="TSavo" title="TSavo"/></a> <a href="https://github.com/julianengel"><img src="https://avatars.githubusercontent.com/u/10634231?v=4&s=48" width="48" height="48" alt="julianengel" title="julianengel"/></a> <a href="https://github.com/benithors"><img src="https://avatars.githubusercontent.com/u/20652882?v=4&s=48" width="48" height="48" alt="benithors" title="benithors"/></a> <a href="https://github.com/bradleypriest"><img src="https://avatars.githubusercontent.com/u/167215?v=4&s=48" width="48" height="48" alt="bradleypriest" title="bradleypriest"/></a> <a href="https://github.com/timolins"><img src="https://avatars.githubusercontent.com/u/1440854?v=4&s=48" width="48" height="48" alt="timolins" title="timolins"/></a> <a href="https://github.com/Nachx639"><img src="https://avatars.githubusercontent.com/u/71144023?v=4&s=48" width="48" height="48" alt="nachx639" title="nachx639"/></a> <a href="https://github.com/sreekaransrinath"><img src="https://avatars.githubusercontent.com/u/50989977?v=4&s=48" width="48" height="48" alt="sreekaransrinath" title="sreekaransrinath"/></a> <a href="https://github.com/gupsammy"><img src="https://avatars.githubusercontent.com/u/20296019?v=4&s=48" width="48" height="48" alt="gupsammy" title="gupsammy"/></a>
+  <a href="https://github.com/cristip73"><img src="https://avatars.githubusercontent.com/u/24499421?v=4&s=48" width="48" height="48" alt="cristip73" title="cristip73"/></a> <a href="https://github.com/nachoiacovino"><img src="https://avatars.githubusercontent.com/u/50103937?v=4&s=48" width="48" height="48" alt="nachoiacovino" title="nachoiacovino"/></a> <a href="https://github.com/vsabavat"><img src="https://avatars.githubusercontent.com/u/50385532?v=4&s=48" width="48" height="48" alt="Vasanth Rao Naik Sabavat" title="Vasanth Rao Naik Sabavat"/></a> <a href="https://github.com/cpojer"><img src="https://avatars.githubusercontent.com/u/13352?v=4&s=48" width="48" height="48" alt="cpojer" title="cpojer"/></a> <a href="https://github.com/lc0rp"><img src="https://avatars.githubusercontent.com/u/2609441?v=4&s=48" width="48" height="48" alt="lc0rp" title="lc0rp"/></a> <a href="https://github.com/scald"><img src="https://avatars.githubusercontent.com/u/1215913?v=4&s=48" width="48" height="48" alt="scald" title="scald"/></a> <a href="https://github.com/gumadeiras"><img src="https://avatars.githubusercontent.com/u/5599352?v=4&s=48" width="48" height="48" alt="gumadeiras" title="gumadeiras"/></a> <a href="https://github.com/andranik-sahakyan"><img src="https://avatars.githubusercontent.com/u/8908029?v=4&s=48" width="48" height="48" alt="andranik-sahakyan" title="andranik-sahakyan"/></a> <a href="https://github.com/davidguttman"><img src="https://avatars.githubusercontent.com/u/431696?v=4&s=48" width="48" height="48" alt="davidguttman" title="davidguttman"/></a> <a href="https://github.com/sleontenko"><img src="https://avatars.githubusercontent.com/u/7135949?v=4&s=48" width="48" height="48" alt="sleontenko" title="sleontenko"/></a>
+  <a href="https://github.com/sircrumpet"><img src="https://avatars.githubusercontent.com/u/4436535?v=4&s=48" width="48" height="48" alt="sircrumpet" title="sircrumpet"/></a> <a href="https://github.com/peschee"><img src="https://avatars.githubusercontent.com/u/63866?v=4&s=48" width="48" height="48" alt="peschee" title="peschee"/></a> <a href="https://github.com/rafaelreis-r"><img src="https://avatars.githubusercontent.com/u/57492577?v=4&s=48" width="48" height="48" alt="rafaelreis-r" title="rafaelreis-r"/></a> <a href="https://github.com/thewilloftheshadow"><img src="https://avatars.githubusercontent.com/u/35580099?v=4&s=48" width="48" height="48" alt="thewilloftheshadow" title="thewilloftheshadow"/></a> <a href="https://github.com/ratulsarna"><img src="https://avatars.githubusercontent.com/u/105903728?v=4&s=48" width="48" height="48" alt="ratulsarna" title="ratulsarna"/></a> <a href="https://github.com/lutr0"><img src="https://avatars.githubusercontent.com/u/76906369?v=4&s=48" width="48" height="48" alt="lutr0" title="lutr0"/></a> <a href="https://github.com/danielz1z"><img src="https://avatars.githubusercontent.com/u/235270390?v=4&s=48" width="48" height="48" alt="danielz1z" title="danielz1z"/></a> <a href="https://github.com/emanuelst"><img src="https://avatars.githubusercontent.com/u/9994339?v=4&s=48" width="48" height="48" alt="emanuelst" title="emanuelst"/></a> <a href="https://github.com/KristijanJovanovski"><img src="https://avatars.githubusercontent.com/u/8942284?v=4&s=48" width="48" height="48" alt="KristijanJovanovski" title="KristijanJovanovski"/></a> <a href="https://github.com/CashWilliams"><img src="https://avatars.githubusercontent.com/u/613573?v=4&s=48" width="48" height="48" alt="CashWilliams" title="CashWilliams"/></a>
+  <a href="https://github.com/rdev"><img src="https://avatars.githubusercontent.com/u/8418866?v=4&s=48" width="48" height="48" alt="rdev" title="rdev"/></a> <a href="https://github.com/osolmaz"><img src="https://avatars.githubusercontent.com/u/2453968?v=4&s=48" width="48" height="48" alt="osolmaz" title="osolmaz"/></a> <a href="https://github.com/joshrad-dev"><img src="https://avatars.githubusercontent.com/u/62785552?v=4&s=48" width="48" height="48" alt="joshrad-dev" title="joshrad-dev"/></a> <a href="https://github.com/kiranjd"><img src="https://avatars.githubusercontent.com/u/25822851?v=4&s=48" width="48" height="48" alt="kiranjd" title="kiranjd"/></a> <a href="https://github.com/adityashaw2"><img src="https://avatars.githubusercontent.com/u/41204444?v=4&s=48" width="48" height="48" alt="adityashaw2" title="adityashaw2"/></a> <a href="https://github.com/search?q=sheeek"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="sheeek" title="sheeek"/></a> <a href="https://github.com/artuskg"><img src="https://avatars.githubusercontent.com/u/11966157?v=4&s=48" width="48" height="48" alt="artuskg" title="artuskg"/></a> <a href="https://github.com/onutc"><img src="https://avatars.githubusercontent.com/u/152018508?v=4&s=48" width="48" height="48" alt="onutc" title="onutc"/></a> <a href="https://github.com/tyler6204"><img src="https://avatars.githubusercontent.com/u/64381258?v=4&s=48" width="48" height="48" alt="tyler6204" title="tyler6204"/></a> <a href="https://github.com/ManuelHettich"><img src="https://avatars.githubusercontent.com/u/17690367?v=4&s=48" width="48" height="48" alt="manuelhettich" title="manuelhettich"/></a>
+  <a href="https://github.com/minghinmatthewlam"><img src="https://avatars.githubusercontent.com/u/14224566?v=4&s=48" width="48" height="48" alt="minghinmatthewlam" title="minghinmatthewlam"/></a> <a href="https://github.com/myfunc"><img src="https://avatars.githubusercontent.com/u/19294627?v=4&s=48" width="48" height="48" alt="myfunc" title="myfunc"/></a> <a href="https://github.com/buddyh"><img src="https://avatars.githubusercontent.com/u/31752869?v=4&s=48" width="48" height="48" alt="buddyh" title="buddyh"/></a> <a href="https://github.com/connorshea"><img src="https://avatars.githubusercontent.com/u/2977353?v=4&s=48" width="48" height="48" alt="connorshea" title="connorshea"/></a> <a href="https://github.com/mcinteerj"><img src="https://avatars.githubusercontent.com/u/3613653?v=4&s=48" width="48" height="48" alt="mcinteerj" title="mcinteerj"/></a> <a href="https://github.com/vignesh07"><img src="https://avatars.githubusercontent.com/u/1436853?v=4&s=48" width="48" height="48" alt="vignesh07" title="vignesh07"/></a> <a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4&s=48" width="48" height="48" alt="dependabot[bot]" title="dependabot[bot]"/></a> <a href="https://github.com/John-Rood"><img src="https://avatars.githubusercontent.com/u/62669593?v=4&s=48" width="48" height="48" alt="John-Rood" title="John-Rood"/></a> <a href="https://github.com/timkrase"><img src="https://avatars.githubusercontent.com/u/38947626?v=4&s=48" width="48" height="48" alt="timkrase" title="timkrase"/></a> <a href="https://github.com/gerardward2007"><img src="https://avatars.githubusercontent.com/u/3002155?v=4&s=48" width="48" height="48" alt="gerardward2007" title="gerardward2007"/></a>
+  <a href="https://github.com/obviyus"><img src="https://avatars.githubusercontent.com/u/22031114?v=4&s=48" width="48" height="48" alt="obviyus" title="obviyus"/></a> <a href="https://github.com/tosh-hamburg"><img src="https://avatars.githubusercontent.com/u/58424326?v=4&s=48" width="48" height="48" alt="tosh-hamburg" title="tosh-hamburg"/></a> <a href="https://github.com/azade-c"><img src="https://avatars.githubusercontent.com/u/252790079?v=4&s=48" width="48" height="48" alt="azade-c" title="azade-c"/></a> <a href="https://github.com/roshanasingh4"><img src="https://avatars.githubusercontent.com/u/88576930?v=4&s=48" width="48" height="48" alt="roshanasingh4" title="roshanasingh4"/></a> <a href="https://github.com/bjesuiter"><img src="https://avatars.githubusercontent.com/u/2365676?v=4&s=48" width="48" height="48" alt="bjesuiter" title="bjesuiter"/></a> <a href="https://github.com/cheeeee"><img src="https://avatars.githubusercontent.com/u/21245729?v=4&s=48" width="48" height="48" alt="cheeeee" title="cheeeee"/></a> <a href="https://github.com/j1philli"><img src="https://avatars.githubusercontent.com/u/3744255?v=4&s=48" width="48" height="48" alt="Josh Phillips" title="Josh Phillips"/></a> <a href="https://github.com/Whoaa512"><img src="https://avatars.githubusercontent.com/u/1581943?v=4&s=48" width="48" height="48" alt="Whoaa512" title="Whoaa512"/></a> <a href="https://github.com/YuriNachos"><img src="https://avatars.githubusercontent.com/u/19365375?v=4&s=48" width="48" height="48" alt="YuriNachos" title="YuriNachos"/></a> <a href="https://github.com/chriseidhof"><img src="https://avatars.githubusercontent.com/u/5382?v=4&s=48" width="48" height="48" alt="chriseidhof" title="chriseidhof"/></a>
+  <a href="https://github.com/ysqander"><img src="https://avatars.githubusercontent.com/u/80843820?v=4&s=48" width="48" height="48" alt="ysqander" title="ysqander"/></a> <a href="https://github.com/superman32432432"><img src="https://avatars.githubusercontent.com/u/7228420?v=4&s=48" width="48" height="48" alt="superman32432432" title="superman32432432"/></a> <a href="https://github.com/search?q=Yurii%20Chukhlib"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Yurii Chukhlib" title="Yurii Chukhlib"/></a> <a href="https://github.com/grp06"><img src="https://avatars.githubusercontent.com/u/1573959?v=4&s=48" width="48" height="48" alt="grp06" title="grp06"/></a> <a href="https://github.com/antons"><img src="https://avatars.githubusercontent.com/u/129705?v=4&s=48" width="48" height="48" alt="antons" title="antons"/></a> <a href="https://github.com/austinm911"><img src="https://avatars.githubusercontent.com/u/31991302?v=4&s=48" width="48" height="48" alt="austinm911" title="austinm911"/></a> <a href="https://github.com/apps/blacksmith-sh"><img src="https://avatars.githubusercontent.com/in/807020?v=4&s=48" width="48" height="48" alt="blacksmith-sh[bot]" title="blacksmith-sh[bot]"/></a> <a href="https://github.com/dan-dr"><img src="https://avatars.githubusercontent.com/u/6669808?v=4&s=48" width="48" height="48" alt="dan-dr" title="dan-dr"/></a> <a href="https://github.com/HeimdallStrategy"><img src="https://avatars.githubusercontent.com/u/223014405?v=4&s=48" width="48" height="48" alt="HeimdallStrategy" title="HeimdallStrategy"/></a> <a href="https://github.com/imfing"><img src="https://avatars.githubusercontent.com/u/5097752?v=4&s=48" width="48" height="48" alt="imfing" title="imfing"/></a>
+  <a href="https://github.com/jalehman"><img src="https://avatars.githubusercontent.com/u/550978?v=4&s=48" width="48" height="48" alt="jalehman" title="jalehman"/></a> <a href="https://github.com/jarvis-medmatic"><img src="https://avatars.githubusercontent.com/u/252428873?v=4&s=48" width="48" height="48" alt="jarvis-medmatic" title="jarvis-medmatic"/></a> <a href="https://github.com/kkarimi"><img src="https://avatars.githubusercontent.com/u/875218?v=4&s=48" width="48" height="48" alt="kkarimi" title="kkarimi"/></a> <a href="https://github.com/mahmoudashraf93"><img src="https://avatars.githubusercontent.com/u/9130129?v=4&s=48" width="48" height="48" alt="mahmoudashraf93" title="mahmoudashraf93"/></a> <a href="https://github.com/ngutman"><img src="https://avatars.githubusercontent.com/u/1540134?v=4&s=48" width="48" height="48" alt="ngutman" title="ngutman"/></a> <a href="https://github.com/petter-b"><img src="https://avatars.githubusercontent.com/u/62076402?v=4&s=48" width="48" height="48" alt="petter-b" title="petter-b"/></a> <a href="https://github.com/pkrmf"><img src="https://avatars.githubusercontent.com/u/1714267?v=4&s=48" width="48" height="48" alt="pkrmf" title="pkrmf"/></a> <a href="https://github.com/RandyVentures"><img src="https://avatars.githubusercontent.com/u/149904821?v=4&s=48" width="48" height="48" alt="RandyVentures" title="RandyVentures"/></a> <a href="https://github.com/search?q=Ryan%20Lisse"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ryan Lisse" title="Ryan Lisse"/></a> <a href="https://github.com/dougvk"><img src="https://avatars.githubusercontent.com/u/401660?v=4&s=48" width="48" height="48" alt="dougvk" title="dougvk"/></a>
+  <a href="https://github.com/erikpr1994"><img src="https://avatars.githubusercontent.com/u/6299331?v=4&s=48" width="48" height="48" alt="erikpr1994" title="erikpr1994"/></a> <a href="https://github.com/search?q=Ghost"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ghost" title="Ghost"/></a> <a href="https://github.com/jonasjancarik"><img src="https://avatars.githubusercontent.com/u/2459191?v=4&s=48" width="48" height="48" alt="jonasjancarik" title="jonasjancarik"/></a> <a href="https://github.com/search?q=Keith%20the%20Silly%20Goose"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Keith the Silly Goose" title="Keith the Silly Goose"/></a> <a href="https://github.com/search?q=L36%20Server"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="L36 Server" title="L36 Server"/></a> <a href="https://github.com/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></a> <a href="https://github.com/mitschabaude-bot"><img src="https://avatars.githubusercontent.com/u/247582884?v=4&s=48" width="48" height="48" alt="mitschabaude-bot" title="mitschabaude-bot"/></a> <a href="https://github.com/neist"><img src="https://avatars.githubusercontent.com/u/1029724?v=4&s=48" width="48" height="48" alt="neist" title="neist"/></a> <a href="https://github.com/chrisrodz"><img src="https://avatars.githubusercontent.com/u/2967620?v=4&s=48" width="48" height="48" alt="chrisrodz" title="chrisrodz"/></a> <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a>
+  <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a> <a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a> <a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a> <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a> <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a>
+  <a href="https://github.com/siddhantjain"><img src="https://avatars.githubusercontent.com/u/4835232?v=4&s=48" width="48" height="48" alt="siddhantjain" title="siddhantjain"/></a> <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a> <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/24601"><img src="https://avatars.githubusercontent.com/u/1157207?v=4&s=48" width="48" height="48" alt="24601" title="24601"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a> <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a> <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a>
+  <a href="https://github.com/humanwritten"><img src="https://avatars.githubusercontent.com/u/206531610?v=4&s=48" width="48" height="48" alt="humanwritten" title="humanwritten"/></a> <a href="https://github.com/larlyssa"><img src="https://avatars.githubusercontent.com/u/13128869?v=4&s=48" width="48" height="48" alt="larlyssa" title="larlyssa"/></a> <a href="https://github.com/mkbehr"><img src="https://avatars.githubusercontent.com/u/1285?v=4&s=48" width="48" height="48" alt="mkbehr" title="mkbehr"/></a> <a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/aaronveklabs"><img src="https://avatars.githubusercontent.com/u/225997828?v=4&s=48" width="48" height="48" alt="aaronveklabs" title="aaronveklabs"/></a> <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a> <a href="https://github.com/ameno-"><img src="https://avatars.githubusercontent.com/u/2416135?v=4&s=48" width="48" height="48" alt="ameno-" title="ameno-"/></a>
+  <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/search?q=Clawd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Clawd" title="Clawd"/></a> <a href="https://github.com/search?q=ClawdFx"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ClawdFx" title="ClawdFx"/></a> <a href="https://github.com/erik-agens"><img src="https://avatars.githubusercontent.com/u/80908960?v=4&s=48" width="48" height="48" alt="erik-agens" title="erik-agens"/></a> <a href="https://github.com/fcatuhe"><img src="https://avatars.githubusercontent.com/u/17382215?v=4&s=48" width="48" height="48" alt="fcatuhe" title="fcatuhe"/></a> <a href="https://github.com/ivanrvpereira"><img src="https://avatars.githubusercontent.com/u/183991?v=4&s=48" width="48" height="48" alt="ivanrvpereira" title="ivanrvpereira"/></a> <a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jeffersonwarrior"><img src="https://avatars.githubusercontent.com/u/89030989?v=4&s=48" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/search?q=jeffersonwarrior"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/jdrhyne"><img src="https://avatars.githubusercontent.com/u/7828464?v=4&s=48" width="48" height="48" alt="Jonathan D. Rhyne (DJ-D)" title="Jonathan D. Rhyne (DJ-D)"/></a>
+  <a href="https://github.com/jverdi"><img src="https://avatars.githubusercontent.com/u/345050?v=4&s=48" width="48" height="48" alt="jverdi" title="jverdi"/></a> <a href="https://github.com/longmaba"><img src="https://avatars.githubusercontent.com/u/9361500?v=4&s=48" width="48" height="48" alt="longmaba" title="longmaba"/></a> <a href="https://github.com/mickahouan"><img src="https://avatars.githubusercontent.com/u/31423109?v=4&s=48" width="48" height="48" alt="mickahouan" title="mickahouan"/></a> <a href="https://github.com/mjrussell"><img src="https://avatars.githubusercontent.com/u/1641895?v=4&s=48" width="48" height="48" alt="mjrussell" title="mjrussell"/></a> <a href="https://github.com/p6l-richard"><img src="https://avatars.githubusercontent.com/u/18185649?v=4&s=48" width="48" height="48" alt="p6l-richard" title="p6l-richard"/></a> <a href="https://github.com/philipp-spiess"><img src="https://avatars.githubusercontent.com/u/458591?v=4&s=48" width="48" height="48" alt="philipp-spiess" title="philipp-spiess"/></a> <a href="https://github.com/robaxelsen"><img src="https://avatars.githubusercontent.com/u/13132899?v=4&s=48" width="48" height="48" alt="robaxelsen" title="robaxelsen"/></a> <a href="https://github.com/search?q=Sash%20Catanzarite"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Sash Catanzarite" title="Sash Catanzarite"/></a> <a href="https://github.com/T5-AndyML"><img src="https://avatars.githubusercontent.com/u/22801233?v=4&s=48" width="48" height="48" alt="T5-AndyML" title="T5-AndyML"/></a> <a href="https://github.com/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></a>
+  <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/andrewting19"><img src="https://avatars.githubusercontent.com/u/10536704?v=4&s=48" width="48" height="48" alt="andrewting19" title="andrewting19"/></a> <a href="https://github.com/search?q=Andrii"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Andrii" title="Andrii"/></a> <a href="https://github.com/anpoirier"><img src="https://avatars.githubusercontent.com/u/1245729?v=4&s=48" width="48" height="48" alt="anpoirier" title="anpoirier"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a> <a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a> <a href="https://github.com/conhecendocontato"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendocontato" title="conhecendocontato"/></a> <a href="https://github.com/czekaj"><img src="https://avatars.githubusercontent.com/u/1464539?v=4&s=48" width="48" height="48" alt="czekaj" title="czekaj"/></a> <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a>
+  <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/search?q=Felix%20Krause"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Felix Krause" title="Felix Krause"/></a> <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a> <a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a> <a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a> <a href="https://github.com/search?q=Kevin%20Lin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kevin Lin" title="Kevin Lin"/></a>
+  <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a> <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a> <a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a> <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a>
+  <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/odysseus0"><img src="https://avatars.githubusercontent.com/u/8635094?v=4&s=48" width="48" height="48" alt="odysseus0" title="odysseus0"/></a> <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/ptn1411"><img src="https://avatars.githubusercontent.com/u/57529765?v=4&s=48" width="48" height="48" alt="ptn1411" title="ptn1411"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a> <a href="https://github.com/rodrigouroz"><img src="https://avatars.githubusercontent.com/u/384037?v=4&s=48" width="48" height="48" alt="rodrigouroz" title="rodrigouroz"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a> <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a>
+  <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a> <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a> <a href="https://github.com/search?q=Vultr-Clawd%20Admin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Vultr-Clawd Admin" title="Vultr-Clawd Admin"/></a> <a href="https://github.com/search?q=Wimmie"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Wimmie" title="Wimmie"/></a> <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/yazinsai"><img src="https://avatars.githubusercontent.com/u/1846034?v=4&s=48" width="48" height="48" alt="yazinsai" title="yazinsai"/></a>
+  <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a> <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a> <a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a>
+  <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a> <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
 </p>

From 654f9e5053f4dff8fc4eeaf7ac85584d3ce1d700 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 03:52:03 +0000
Subject: [PATCH 113/171] fix: cap cron context messages (#1103) (thanks
 @mkbehr)

---
 CHANGELOG.md                       |  1 +
 src/agents/tools/cron-tool.test.ts | 36 ++++++++++++++++++++++++++++++
 src/agents/tools/cron-tool.ts      | 21 ++++++++++++-----
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c24e9e37..a95a07d5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ Docs: https://docs.clawd.bot
 - Config: avoid stack traces for invalid configs and log the config path.
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
 - macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
+- Cron: cap reminder context history to 10 messages and honor `contextMessages`. (#1103) Thanks @mkbehr.
 - UI: refresh debug panel on route-driven tab changes. (#1373) Thanks @yazinsai.
 
 ## 2026.1.21
diff --git a/src/agents/tools/cron-tool.test.ts b/src/agents/tools/cron-tool.test.ts
index 04acb881e..4b7cd6615 100644
--- a/src/agents/tools/cron-tool.test.ts
+++ b/src/agents/tools/cron-tool.test.ts
@@ -129,6 +129,42 @@ describe("cron tool", () => {
     expect(text).toContain("User: Remind me about the thing at 2pm");
   });
 
+  it("caps contextMessages at 10", async () => {
+    const messages = Array.from({ length: 12 }, (_, idx) => ({
+      role: "user",
+      content: [{ type: "text", text: `Message ${idx + 1}` }],
+    }));
+    callGatewayMock.mockResolvedValueOnce({ messages }).mockResolvedValueOnce({ ok: true });
+
+    const tool = createCronTool({ agentSessionKey: "main" });
+    await tool.execute("call5", {
+      action: "add",
+      contextMessages: 20,
+      job: {
+        name: "reminder",
+        schedule: { atMs: 123 },
+        payload: { kind: "systemEvent", text: "Reminder: the thing." },
+      },
+    });
+
+    expect(callGatewayMock).toHaveBeenCalledTimes(2);
+    const historyCall = callGatewayMock.mock.calls[0]?.[0] as {
+      method?: string;
+      params?: { limit?: number };
+    };
+    expect(historyCall.method).toBe("chat.history");
+    expect(historyCall.params?.limit).toBe(10);
+
+    const cronCall = callGatewayMock.mock.calls[1]?.[0] as {
+      params?: { payload?: { text?: string } };
+    };
+    const text = cronCall.params?.payload?.text ?? "";
+    expect(text).not.toMatch(/Message 1\\b/);
+    expect(text).not.toMatch(/Message 2\\b/);
+    expect(text).toContain("Message 3");
+    expect(text).toContain("Message 12");
+  });
+
   it("does not add context when contextMessages is 0 (default)", async () => {
     callGatewayMock.mockResolvedValueOnce({ ok: true });
 
diff --git a/src/agents/tools/cron-tool.ts b/src/agents/tools/cron-tool.ts
index 4ef5e4924..e8995a0b9 100644
--- a/src/agents/tools/cron-tool.ts
+++ b/src/agents/tools/cron-tool.ts
@@ -16,6 +16,7 @@ const CRON_ACTIONS = ["status", "list", "add", "update", "remove", "run", "runs"
 
 const CRON_WAKE_MODES = ["now", "next-heartbeat"] as const;
 
+const REMINDER_CONTEXT_MESSAGES_MAX = 10;
 const REMINDER_CONTEXT_PER_MESSAGE_MAX = 220;
 const REMINDER_CONTEXT_TOTAL_MAX = 700;
 const REMINDER_CONTEXT_MARKER = "\n\nRecent context:\n";
@@ -33,7 +34,9 @@ const CronToolSchema = Type.Object({
   patch: Type.Optional(Type.Object({}, { additionalProperties: true })),
   text: Type.Optional(Type.String()),
   mode: optionalStringEnum(CRON_WAKE_MODES),
-  contextMessages: Type.Optional(Type.Number()),
+  contextMessages: Type.Optional(
+    Type.Number({ minimum: 0, maximum: REMINDER_CONTEXT_MESSAGES_MAX }),
+  ),
 });
 
 type CronToolOptions = {
@@ -88,7 +91,11 @@ async function buildReminderContextLines(params: {
   gatewayOpts: GatewayCallOptions;
   contextMessages: number;
 }) {
-  if (params.contextMessages <= 0) return [];
+  const maxMessages = Math.min(
+    REMINDER_CONTEXT_MESSAGES_MAX,
+    Math.max(0, Math.floor(params.contextMessages)),
+  );
+  if (maxMessages <= 0) return [];
   const sessionKey = params.agentSessionKey?.trim();
   if (!sessionKey) return [];
   const cfg = loadConfig();
@@ -97,13 +104,13 @@ async function buildReminderContextLines(params: {
   try {
     const res = (await callGatewayTool("chat.history", params.gatewayOpts, {
       sessionKey: resolvedKey,
-      limit: 12,
+      limit: maxMessages,
     })) as { messages?: unknown[] };
     const messages = Array.isArray(res?.messages) ? res.messages : [];
     const parsed = messages
       .map((msg) => extractMessageText(msg as ChatMessage))
       .filter((msg): msg is { role: string; text: string } => Boolean(msg));
-    const recent = parsed.slice(-params.contextMessages);
+    const recent = parsed.slice(-maxMessages);
     if (recent.length === 0) return [];
     const lines: string[] = [];
     let total = 0;
@@ -126,7 +133,7 @@ export function createCronTool(opts?: CronToolOptions): AnyAgentTool {
     label: "Cron",
     name: "cron",
     description:
-      "Manage Gateway cron jobs (status/list/add/update/remove/run/runs) and send wake events. Use `jobId` as the canonical identifier; `id` is accepted for compatibility. Use `contextMessages` to add previous messages as context to the job text.",
+      "Manage Gateway cron jobs (status/list/add/update/remove/run/runs) and send wake events. Use `jobId` as the canonical identifier; `id` is accepted for compatibility. Use `contextMessages` (0-10) to add previous messages as context to the job text.",
     parameters: CronToolSchema,
     execute: async (_toolCallId, args) => {
       const params = args as Record<string, unknown>;
@@ -152,7 +159,9 @@ export function createCronTool(opts?: CronToolOptions): AnyAgentTool {
           }
           const job = normalizeCronJobCreate(params.job) ?? params.job;
           const contextMessages =
-            typeof params.contextMessages === "number" ? params.contextMessages : 0;
+            typeof params.contextMessages === "number" && Number.isFinite(params.contextMessages)
+              ? params.contextMessages
+              : 0;
           if (
             job &&
             typeof job === "object" &&

From 754481716e2326863d8b77df42c71df9f985b895 Mon Sep 17 00:00:00 2001
From: Dave Lauer <dlauer@gmail.com>
Date: Tue, 20 Jan 2026 14:45:58 -0500
Subject: [PATCH 114/171] feat: add avatar support for agent identity

- Add avatar field to IdentityConfig type
- Add avatar parsing in AgentIdentity from IDENTITY.md
- Add renderAvatar support for image avatars in webchat
- Add CSS styling for image avatars

Users can now configure a custom avatar for the assistant in the webchat
by setting 'identity.avatar' in the agent config or adding 'Avatar: path'
to IDENTITY.md. The avatar can be served from the assets folder.

Closes #TBD
---
 src/commands/agents.config.ts    | 4 +++-
 src/config/types.base.ts         | 2 ++
 ui/src/styles/chat/grouped.css   | 6 ++++++
 ui/src/ui/chat/grouped-render.ts | 8 +++++++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/commands/agents.config.ts b/src/commands/agents.config.ts
index 26c70932f..3aca27d70 100644
--- a/src/commands/agents.config.ts
+++ b/src/commands/agents.config.ts
@@ -34,6 +34,7 @@ export type AgentIdentity = {
   creature?: string;
   vibe?: string;
   theme?: string;
+  avatar?: string;
 };
 
 export function listAgentEntries(cfg: ClawdbotConfig): AgentEntry[] {
@@ -90,6 +91,7 @@ export function parseIdentityMarkdown(content: string): AgentIdentity {
     if (label === "creature") identity.creature = value;
     if (label === "vibe") identity.vibe = value;
     if (label === "theme") identity.theme = value;
+    if (label === "avatar") identity.avatar = value;
   }
   return identity;
 }
@@ -99,7 +101,7 @@ export function loadAgentIdentity(workspace: string): AgentIdentity | null {
   try {
     const content = fs.readFileSync(identityPath, "utf-8");
     const parsed = parseIdentityMarkdown(content);
-    if (!parsed.name && !parsed.emoji && !parsed.theme && !parsed.creature && !parsed.vibe) {
+    if (!parsed.name && !parsed.emoji && !parsed.theme && !parsed.creature && !parsed.vibe && !parsed.avatar) {
       return null;
     }
     return parsed;
diff --git a/src/config/types.base.ts b/src/config/types.base.ts
index 8d7613936..71d051e5b 100644
--- a/src/config/types.base.ts
+++ b/src/config/types.base.ts
@@ -154,4 +154,6 @@ export type IdentityConfig = {
   name?: string;
   theme?: string;
   emoji?: string;
+  /** Path to a custom avatar image (relative to workspace or absolute). */
+  avatar?: string;
 };
diff --git a/ui/src/styles/chat/grouped.css b/ui/src/styles/chat/grouped.css
index dea387c45..36a2c7e01 100644
--- a/ui/src/styles/chat/grouped.css
+++ b/ui/src/styles/chat/grouped.css
@@ -89,6 +89,12 @@
   color: rgba(134, 142, 150, 1);
 }
 
+/* Image avatar support */
+img.chat-avatar {
+  object-fit: cover;
+  object-position: center;
+}
+
 /* Minimal Bubble Design - dynamic width based on content */
 .chat-bubble {
   position: relative;
diff --git a/ui/src/ui/chat/grouped-render.ts b/ui/src/ui/chat/grouped-render.ts
index caa4731a1..ca973ce08 100644
--- a/ui/src/ui/chat/grouped-render.ts
+++ b/ui/src/ui/chat/grouped-render.ts
@@ -105,7 +105,7 @@ export function renderMessageGroup(
   `;
 }
 
-function renderAvatar(role: string) {
+function renderAvatar(role: string, avatarUrl?: string) {
   const normalized = normalizeRoleForGrouping(role);
   const initial =
     normalized === "user"
@@ -123,6 +123,12 @@ function renderAvatar(role: string) {
         : normalized === "tool"
           ? "tool"
           : "other";
+  
+  // If avatar URL is provided for assistant, show image
+  if (avatarUrl && normalized === "assistant") {
+    return html`<img class="chat-avatar ${className}" src="${avatarUrl}" alt="Assistant" />`;
+  }
+  
   return html`<div class="chat-avatar ${className}">${initial}</div>`;
 }
 

From 7edc464b8278aaebd4d73b8da7206c0c24cc0d35 Mon Sep 17 00:00:00 2001
From: Dave Lauer <dlauer@gmail.com>
Date: Tue, 20 Jan 2026 16:02:55 -0500
Subject: [PATCH 115/171] chore: fix formatting

---
 src/commands/agents.config.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/commands/agents.config.ts b/src/commands/agents.config.ts
index 3aca27d70..cd778740e 100644
--- a/src/commands/agents.config.ts
+++ b/src/commands/agents.config.ts
@@ -101,7 +101,14 @@ export function loadAgentIdentity(workspace: string): AgentIdentity | null {
   try {
     const content = fs.readFileSync(identityPath, "utf-8");
     const parsed = parseIdentityMarkdown(content);
-    if (!parsed.name && !parsed.emoji && !parsed.theme && !parsed.creature && !parsed.vibe && !parsed.avatar) {
+    if (
+      !parsed.name &&
+      !parsed.emoji &&
+      !parsed.theme &&
+      !parsed.creature &&
+      !parsed.vibe &&
+      !parsed.avatar
+    ) {
       return null;
     }
     return parsed;

From 51cd9c7ff4f35dbfc60399953a3259e3c3c0469f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 03:57:56 +0000
Subject: [PATCH 116/171] fix: make lobster tool tests windows-safe

---
 extensions/lobster/src/lobster-tool.test.ts | 39 +++++++++++++--------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/extensions/lobster/src/lobster-tool.test.ts b/extensions/lobster/src/lobster-tool.test.ts
index 1c69b3280..5c887cc76 100644
--- a/extensions/lobster/src/lobster-tool.test.ts
+++ b/extensions/lobster/src/lobster-tool.test.ts
@@ -7,19 +7,32 @@ import { describe, expect, it } from "vitest";
 import type { ClawdbotPluginApi, ClawdbotPluginToolContext } from "../../../src/plugins/types.js";
 import { createLobsterTool } from "./lobster-tool.js";
 
-async function writeFakeLobster(params: {
-  payload: unknown;
-}) {
-  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-lobster-plugin-"));
+async function writeFakeLobsterScript(scriptBody: string, prefix = "clawdbot-lobster-plugin-") {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), prefix));
+  const isWindows = process.platform === "win32";
+
+  if (isWindows) {
+    const scriptPath = path.join(dir, "lobster.js");
+    const cmdPath = path.join(dir, "lobster.cmd");
+    await fs.writeFile(scriptPath, scriptBody, { encoding: "utf8" });
+    const cmd = `@echo off\r\n"${process.execPath}" "${scriptPath}" %*\r\n`;
+    await fs.writeFile(cmdPath, cmd, { encoding: "utf8" });
+    return { dir, binPath: cmdPath };
+  }
+
   const binPath = path.join(dir, "lobster");
-
-  const file = `#!/usr/bin/env node\n` +
-    `process.stdout.write(JSON.stringify(${JSON.stringify(params.payload)}));\n`;
-
+  const file = `#!/usr/bin/env node\n${scriptBody}\n`;
   await fs.writeFile(binPath, file, { encoding: "utf8", mode: 0o755 });
   return { dir, binPath };
 }
 
+async function writeFakeLobster(params: { payload: unknown }) {
+  const scriptBody =
+    `const payload = ${JSON.stringify(params.payload)};\n` +
+    `process.stdout.write(JSON.stringify(payload));\n`;
+  return await writeFakeLobsterScript(scriptBody);
+}
+
 function fakeApi(): ClawdbotPluginApi {
   return {
     id: "lobster",
@@ -82,12 +95,10 @@ describe("lobster plugin tool", () => {
   });
 
   it("rejects invalid JSON from lobster", async () => {
-    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-lobster-plugin-bad-"));
-    const binPath = path.join(dir, "lobster");
-    await fs.writeFile(binPath, `#!/usr/bin/env node\nprocess.stdout.write('nope');\n`, {
-      encoding: "utf8",
-      mode: 0o755,
-    });
+    const { binPath } = await writeFakeLobsterScript(
+      `process.stdout.write("nope");\n`,
+      "clawdbot-lobster-plugin-bad-",
+    );
 
     const tool = createLobsterTool(fakeApi());
     await expect(

From 0c55b1e9ce0ac486a23ec7f9afaad7e00c8152ef Mon Sep 17 00:00:00 2001
From: Lucas Czekaj <lukasz@czekaj.us>
Date: Wed, 21 Jan 2026 18:55:32 -0800
Subject: [PATCH 117/171] fix(exec): derive agentId from sessionKey for
 allowlist lookup

When creating exec tools via chat/Discord, agentId was not passed,
causing allowlist lookup to use 'default' key instead of 'main'.
User's allowlist entries in agents.main were never matched.

Now derives agentId from sessionKey if not explicitly provided,
ensuring correct allowlist lookup for all exec paths.
---
 src/agents/bash-tools.exec.ts    | 30 +++++++++++++----------
 src/infra/exec-approvals.test.ts | 33 +++++++++++++++++++++++++
 src/infra/exec-approvals.ts      | 41 ++++++++++++++++++++++++++++++--
 3 files changed, 90 insertions(+), 14 deletions(-)

diff --git a/src/agents/bash-tools.exec.ts b/src/agents/bash-tools.exec.ts
index 3d58bc705..91b38dc3b 100644
--- a/src/agents/bash-tools.exec.ts
+++ b/src/agents/bash-tools.exec.ts
@@ -54,6 +54,7 @@ import { callGatewayTool } from "./tools/gateway.js";
 import { listNodes, resolveNodeIdFromList } from "./tools/nodes-utils.js";
 import { getShellConfig, sanitizeBinaryOutput } from "./shell-utils.js";
 import { buildCursorPositionResponse, stripDsrRequests } from "./pty-dsr.js";
+import { parseAgentSessionKey, resolveAgentIdFromSessionKey } from "../routing/session-key.js";
 
 const DEFAULT_MAX_OUTPUT = clampNumber(
   readEnvInt("PI_BASH_MAX_OUTPUT_CHARS"),
@@ -659,6 +660,11 @@ export function createExecTool(
   const notifyOnExit = defaults?.notifyOnExit !== false;
   const notifySessionKey = defaults?.sessionKey?.trim() || undefined;
   const approvalRunningNoticeMs = resolveApprovalRunningNoticeMs(defaults?.approvalRunningNoticeMs);
+  // Derive agentId only when sessionKey is an agent session key.
+  const parsedAgentSession = parseAgentSessionKey(defaults?.sessionKey);
+  const agentId =
+    defaults?.agentId ??
+    (parsedAgentSession ? resolveAgentIdFromSessionKey(defaults?.sessionKey) : undefined);
 
   return {
     name: "exec",
@@ -799,7 +805,7 @@ export function createExecTool(
 
       if (host === "node") {
         const approvals = resolveExecApprovals(
-          defaults?.agentId,
+          agentId,
           host === "node" ? { security: "allowlist" } : undefined,
         );
         const hostSecurity = minSecurity(security, approvals.agent.security);
@@ -865,7 +871,7 @@ export function createExecTool(
               cwd: workdir,
               env: nodeEnv,
               timeoutMs: typeof params.timeout === "number" ? params.timeout * 1000 : undefined,
-              agentId: defaults?.agentId,
+              agentId,
               sessionKey: defaults?.sessionKey,
               approved: approvedByAsk,
               approvalDecision: approvalDecision ?? undefined,
@@ -895,9 +901,9 @@ export function createExecTool(
                   host: "node",
                   security: hostSecurity,
                   ask: hostAsk,
-                  agentId: defaults?.agentId,
-                  resolvedPath: undefined,
-                  sessionKey: defaults?.sessionKey,
+                  agentId,
+                  resolvedPath: null,
+                  sessionKey: defaults?.sessionKey ?? null,
                   timeoutMs: DEFAULT_APPROVAL_TIMEOUT_MS,
                 },
               )) as { decision?: string } | null;
@@ -1026,7 +1032,7 @@ export function createExecTool(
       }
 
       if (host === "gateway") {
-        const approvals = resolveExecApprovals(defaults?.agentId, { security: "allowlist" });
+        const approvals = resolveExecApprovals(agentId, { security: "allowlist" });
         const hostSecurity = minSecurity(security, approvals.agent.security);
         const hostAsk = maxAsk(ask, approvals.agent.ask);
         const askFallback = approvals.agent.askFallback;
@@ -1060,7 +1066,7 @@ export function createExecTool(
           const approvalSlug = createApprovalSlug(approvalId);
           const expiresAtMs = Date.now() + DEFAULT_APPROVAL_TIMEOUT_MS;
           const contextKey = `exec:${approvalId}`;
-          const resolvedPath = analysis.segments[0]?.resolution?.resolvedPath;
+          const resolvedPath = analysis.segments[0]?.resolution?.resolvedPath ?? null;
           const noticeSeconds = Math.max(1, Math.round(approvalRunningNoticeMs / 1000));
           const commandText = params.command;
           const effectiveTimeout =
@@ -1080,9 +1086,9 @@ export function createExecTool(
                   host: "gateway",
                   security: hostSecurity,
                   ask: hostAsk,
-                  agentId: defaults?.agentId,
+                  agentId,
                   resolvedPath,
-                  sessionKey: defaults?.sessionKey,
+                  sessionKey: defaults?.sessionKey ?? null,
                   timeoutMs: DEFAULT_APPROVAL_TIMEOUT_MS,
                 },
               )) as { decision?: string } | null;
@@ -1123,7 +1129,7 @@ export function createExecTool(
                 for (const segment of analysis.segments) {
                   const pattern = segment.resolution?.resolvedPath ?? "";
                   if (pattern) {
-                    addAllowlistEntry(approvals.file, defaults?.agentId, pattern);
+                    addAllowlistEntry(approvals.file, agentId, pattern);
                   }
                 }
               }
@@ -1152,7 +1158,7 @@ export function createExecTool(
                 seen.add(match.pattern);
                 recordAllowlistUse(
                   approvals.file,
-                  defaults?.agentId,
+                  agentId,
                   match,
                   commandText,
                   resolvedPath ?? undefined,
@@ -1242,7 +1248,7 @@ export function createExecTool(
             seen.add(match.pattern);
             recordAllowlistUse(
               approvals.file,
-              defaults?.agentId,
+              agentId,
               match,
               params.command,
               analysis.segments[0]?.resolution?.resolvedPath,
diff --git a/src/infra/exec-approvals.test.ts b/src/infra/exec-approvals.test.ts
index d6474a39c..0bb12c192 100644
--- a/src/infra/exec-approvals.test.ts
+++ b/src/infra/exec-approvals.test.ts
@@ -14,6 +14,7 @@ import {
   normalizeSafeBins,
   resolveCommandResolution,
   resolveExecApprovals,
+  resolveExecApprovalsFromFile,
   type ExecAllowlistEntry,
 } from "./exec-approvals.js";
 
@@ -227,3 +228,35 @@ describe("exec approvals wildcard agent", () => {
     }
   });
 });
+
+describe("exec approvals default agent migration", () => {
+  it("migrates legacy default agent entries to main", () => {
+    const file = {
+      version: 1,
+      agents: {
+        default: { allowlist: [{ pattern: "/bin/legacy" }] },
+      },
+    };
+    const resolved = resolveExecApprovalsFromFile({ file });
+    expect(resolved.allowlist.map((entry) => entry.pattern)).toEqual(["/bin/legacy"]);
+    expect(resolved.file.agents?.default).toBeUndefined();
+    expect(resolved.file.agents?.main?.allowlist?.[0]?.pattern).toBe("/bin/legacy");
+  });
+
+  it("prefers main agent settings when both main and default exist", () => {
+    const file = {
+      version: 1,
+      agents: {
+        main: { ask: "always", allowlist: [{ pattern: "/bin/main" }] },
+        default: { ask: "off", allowlist: [{ pattern: "/bin/legacy" }] },
+      },
+    };
+    const resolved = resolveExecApprovalsFromFile({ file });
+    expect(resolved.agent.ask).toBe("always");
+    expect(resolved.allowlist.map((entry) => entry.pattern)).toEqual([
+      "/bin/main",
+      "/bin/legacy",
+    ]);
+    expect(resolved.file.agents?.default).toBeUndefined();
+  });
+});
diff --git a/src/infra/exec-approvals.ts b/src/infra/exec-approvals.ts
index ee8b1c541..40e3d9c7d 100644
--- a/src/infra/exec-approvals.ts
+++ b/src/infra/exec-approvals.ts
@@ -4,6 +4,8 @@ import net from "node:net";
 import os from "node:os";
 import path from "node:path";
 
+import { DEFAULT_AGENT_ID } from "../routing/session-key.js";
+
 export type ExecHost = "sandbox" | "gateway" | "node";
 export type ExecSecurity = "deny" | "allowlist" | "full";
 export type ExecAsk = "off" | "on-miss" | "always";
@@ -84,6 +86,32 @@ export function resolveExecApprovalsSocketPath(): string {
   return expandHome(DEFAULT_SOCKET);
 }
 
+function normalizeAllowlistPattern(value: string | undefined): string | null {
+  const trimmed = value?.trim() ?? "";
+  return trimmed ? trimmed.toLowerCase() : null;
+}
+
+function mergeLegacyAgent(current: ExecApprovalsAgent, legacy: ExecApprovalsAgent): ExecApprovalsAgent {
+  const allowlist: ExecAllowlistEntry[] = [];
+  const seen = new Set<string>();
+  const pushEntry = (entry: ExecAllowlistEntry) => {
+    const key = normalizeAllowlistPattern(entry.pattern);
+    if (!key || seen.has(key)) return;
+    seen.add(key);
+    allowlist.push(entry);
+  };
+  for (const entry of current.allowlist ?? []) pushEntry(entry);
+  for (const entry of legacy.allowlist ?? []) pushEntry(entry);
+
+  return {
+    security: current.security ?? legacy.security,
+    ask: current.ask ?? legacy.ask,
+    askFallback: current.askFallback ?? legacy.askFallback,
+    autoAllowSkills: current.autoAllowSkills ?? legacy.autoAllowSkills,
+    allowlist: allowlist.length > 0 ? allowlist : undefined,
+  };
+}
+
 function ensureDir(filePath: string) {
   const dir = path.dirname(filePath);
   fs.mkdirSync(dir, { recursive: true });
@@ -92,6 +120,15 @@ function ensureDir(filePath: string) {
 export function normalizeExecApprovals(file: ExecApprovalsFile): ExecApprovalsFile {
   const socketPath = file.socket?.path?.trim();
   const token = file.socket?.token?.trim();
+  const agents = { ...(file.agents ?? {}) };
+  const legacyDefault = agents.default;
+  if (legacyDefault) {
+    const main = agents[DEFAULT_AGENT_ID];
+    agents[DEFAULT_AGENT_ID] = main
+      ? mergeLegacyAgent(main, legacyDefault)
+      : legacyDefault;
+    delete agents.default;
+  }
   const normalized: ExecApprovalsFile = {
     version: 1,
     socket: {
@@ -104,7 +141,7 @@ export function normalizeExecApprovals(file: ExecApprovalsFile): ExecApprovalsFi
       askFallback: file.defaults?.askFallback,
       autoAllowSkills: file.defaults?.autoAllowSkills,
     },
-    agents: file.agents ?? {},
+    agents,
   };
   return normalized;
 }
@@ -231,7 +268,7 @@ export function resolveExecApprovalsFromFile(params: {
 }): ExecApprovalsResolved {
   const file = normalizeExecApprovals(params.file);
   const defaults = file.defaults ?? {};
-  const agentKey = params.agentId ?? "default";
+  const agentKey = params.agentId ?? DEFAULT_AGENT_ID;
   const agent = file.agents?.[agentKey] ?? {};
   const wildcard = file.agents?.["*"] ?? {};
   const fallbackSecurity = params.overrides?.security ?? DEFAULT_SECURITY;

From 2d583e877b60c76c231f57b67e4a880159f48c30 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 03:57:17 +0000
Subject: [PATCH 118/171] fix: default exec approvals to main agent (#1417)
 (thanks @czekaj)

---
 CHANGELOG.md                |  1 +
 src/infra/exec-approvals.ts | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7aa73616..51124675b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ Docs: https://docs.clawd.bot
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
 - macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
 - Cron: cap reminder context history to 10 messages and honor `contextMessages`. (#1103) Thanks @mkbehr.
+- Exec approvals: treat main as the default agent + migrate legacy default allowlists. (#1417) Thanks @czekaj.
 - UI: refresh debug panel on route-driven tab changes. (#1373) Thanks @yazinsai.
 
 ## 2026.1.21
diff --git a/src/infra/exec-approvals.ts b/src/infra/exec-approvals.ts
index 40e3d9c7d..616124765 100644
--- a/src/infra/exec-approvals.ts
+++ b/src/infra/exec-approvals.ts
@@ -91,7 +91,10 @@ function normalizeAllowlistPattern(value: string | undefined): string | null {
   return trimmed ? trimmed.toLowerCase() : null;
 }
 
-function mergeLegacyAgent(current: ExecApprovalsAgent, legacy: ExecApprovalsAgent): ExecApprovalsAgent {
+function mergeLegacyAgent(
+  current: ExecApprovalsAgent,
+  legacy: ExecApprovalsAgent,
+): ExecApprovalsAgent {
   const allowlist: ExecAllowlistEntry[] = [];
   const seen = new Set<string>();
   const pushEntry = (entry: ExecAllowlistEntry) => {
@@ -120,13 +123,11 @@ function ensureDir(filePath: string) {
 export function normalizeExecApprovals(file: ExecApprovalsFile): ExecApprovalsFile {
   const socketPath = file.socket?.path?.trim();
   const token = file.socket?.token?.trim();
-  const agents = { ...(file.agents ?? {}) };
+  const agents = { ...file.agents };
   const legacyDefault = agents.default;
   if (legacyDefault) {
     const main = agents[DEFAULT_AGENT_ID];
-    agents[DEFAULT_AGENT_ID] = main
-      ? mergeLegacyAgent(main, legacyDefault)
-      : legacyDefault;
+    agents[DEFAULT_AGENT_ID] = main ? mergeLegacyAgent(main, legacyDefault) : legacyDefault;
     delete agents.default;
   }
   const normalized: ExecApprovalsFile = {

From a2bea8e3666cc53e680046d27138b2521bbd5cac Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 03:54:31 +0000
Subject: [PATCH 119/171] feat: add agent avatar support (#1329) (thanks
 @dlauer)

---
 CHANGELOG.md                             |   2 +
 README.md                                |  24 ++---
 docs/cli/agents.md                       |   1 +
 docs/gateway/configuration.md            |   6 +-
 docs/reference/templates/IDENTITY.dev.md |   1 +
 docs/reference/templates/IDENTITY.md     |   1 +
 src/agents/identity-avatar.test.ts       | 110 +++++++++++++++++++++++
 src/agents/identity-avatar.ts            |  99 ++++++++++++++++++++
 src/agents/identity-file.ts              |  63 +++++++++++++
 src/cli/program/register.agent.ts        |   4 +-
 src/commands/agents.commands.identity.ts |  23 +++--
 src/commands/agents.config.ts            |  61 +++----------
 src/commands/agents.identity.test.ts     |  57 ++++++++++--
 src/config/schema.ts                     |   4 +
 src/config/types.base.ts                 |   2 +-
 src/config/zod-schema.core.ts            |   1 +
 src/gateway/control-ui.ts                |  82 +++++++++++++++++
 src/gateway/server-http.ts               |  11 ++-
 ui/src/styles/chat/grouped.css           |   1 +
 ui/src/ui/app-chat.ts                    |  51 +++++++++++
 ui/src/ui/app-render.ts                  |   5 +-
 ui/src/ui/app-view-state.ts              |   1 +
 ui/src/ui/app.ts                         |   1 +
 ui/src/ui/chat/grouped-render.ts         |  15 ++--
 ui/src/ui/views/chat.ts                  |   5 +-
 25 files changed, 547 insertions(+), 84 deletions(-)
 create mode 100644 src/agents/identity-avatar.test.ts
 create mode 100644 src/agents/identity-avatar.ts
 create mode 100644 src/agents/identity-file.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7aa73616..0062e5205 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@ Docs: https://docs.clawd.bot
 - Plugins: move channel catalog metadata into plugin manifests. (#1290) https://docs.clawd.bot/plugins/manifest
 - Plugins: align Nextcloud Talk policy helpers with core patterns. (#1290) https://docs.clawd.bot/plugins/manifest
 - Plugins/UI: let channel plugin metadata drive UI labels/icons and cron channel options. (#1306) https://docs.clawd.bot/web/control-ui
+- Agents/UI: add agent avatar support in identity config, IDENTITY.md, and the Control UI. (#1329) https://docs.clawd.bot/gateway/configuration
 - Plugins: add plugin slots with a dedicated memory slot selector. https://docs.clawd.bot/plugins/agent-tools
 - Plugins: ship the bundled BlueBubbles channel plugin (disabled by default). https://docs.clawd.bot/channels/bluebubbles
 - Plugins: migrate bundled messaging extensions to the plugin SDK and resolve plugin-sdk imports in the loader.
@@ -97,6 +98,7 @@ Docs: https://docs.clawd.bot
 - Plugins: auto-enable bundled channel/provider plugins when configuration is present.
 - Plugins: sync plugin sources on channel switches and update npm-installed plugins during `clawdbot update`.
 - Plugins: share npm plugin update logic between `clawdbot update` and `clawdbot plugins update`.
+
 - Gateway/API: add `/v1/responses` (OpenResponses) with item-based input + semantic streaming events. (#1229)
 - Gateway/API: expand `/v1/responses` to support file/image inputs, tool_choice, usage, and output limits. (#1229)
 - Usage: add `/usage cost` summaries and macOS menu cost charts. https://docs.clawd.bot/reference/api-usage-costs
diff --git a/README.md b/README.md
index a49620620..5474411cf 100644
--- a/README.md
+++ b/README.md
@@ -480,7 +480,7 @@ Thanks to all clawtributors:
   <a href="https://github.com/steipete"><img src="https://avatars.githubusercontent.com/u/58493?v=4&s=48" width="48" height="48" alt="steipete" title="steipete"/></a> <a href="https://github.com/bohdanpodvirnyi"><img src="https://avatars.githubusercontent.com/u/31819391?v=4&s=48" width="48" height="48" alt="bohdanpodvirnyi" title="bohdanpodvirnyi"/></a> <a href="https://github.com/joaohlisboa"><img src="https://avatars.githubusercontent.com/u/8200873?v=4&s=48" width="48" height="48" alt="joaohlisboa" title="joaohlisboa"/></a> <a href="https://github.com/mneves75"><img src="https://avatars.githubusercontent.com/u/2423436?v=4&s=48" width="48" height="48" alt="mneves75" title="mneves75"/></a> <a href="https://github.com/MatthieuBizien"><img src="https://avatars.githubusercontent.com/u/173090?v=4&s=48" width="48" height="48" alt="MatthieuBizien" title="MatthieuBizien"/></a> <a href="https://github.com/MaudeBot"><img src="https://avatars.githubusercontent.com/u/255777700?v=4&s=48" width="48" height="48" alt="MaudeBot" title="MaudeBot"/></a> <a href="https://github.com/rahthakor"><img src="https://avatars.githubusercontent.com/u/8470553?v=4&s=48" width="48" height="48" alt="rahthakor" title="rahthakor"/></a> <a href="https://github.com/vrknetha"><img src="https://avatars.githubusercontent.com/u/20596261?v=4&s=48" width="48" height="48" alt="vrknetha" title="vrknetha"/></a> <a href="https://github.com/radek-paclt"><img src="https://avatars.githubusercontent.com/u/50451445?v=4&s=48" width="48" height="48" alt="radek-paclt" title="radek-paclt"/></a> <a href="https://github.com/joshp123"><img src="https://avatars.githubusercontent.com/u/1497361?v=4&s=48" width="48" height="48" alt="joshp123" title="joshp123"/></a>
   <a href="https://github.com/mukhtharcm"><img src="https://avatars.githubusercontent.com/u/56378562?v=4&s=48" width="48" height="48" alt="mukhtharcm" title="mukhtharcm"/></a> <a href="https://github.com/maxsumrall"><img src="https://avatars.githubusercontent.com/u/628843?v=4&s=48" width="48" height="48" alt="maxsumrall" title="maxsumrall"/></a> <a href="https://github.com/xadenryan"><img src="https://avatars.githubusercontent.com/u/165437834?v=4&s=48" width="48" height="48" alt="xadenryan" title="xadenryan"/></a> <a href="https://github.com/tobiasbischoff"><img src="https://avatars.githubusercontent.com/u/711564?v=4&s=48" width="48" height="48" alt="Tobias Bischoff" title="Tobias Bischoff"/></a> <a href="https://github.com/juanpablodlc"><img src="https://avatars.githubusercontent.com/u/92012363?v=4&s=48" width="48" height="48" alt="juanpablodlc" title="juanpablodlc"/></a> <a href="https://github.com/hsrvc"><img src="https://avatars.githubusercontent.com/u/129702169?v=4&s=48" width="48" height="48" alt="hsrvc" title="hsrvc"/></a> <a href="https://github.com/magimetal"><img src="https://avatars.githubusercontent.com/u/36491250?v=4&s=48" width="48" height="48" alt="magimetal" title="magimetal"/></a> <a href="https://github.com/meaningfool"><img src="https://avatars.githubusercontent.com/u/2862331?v=4&s=48" width="48" height="48" alt="meaningfool" title="meaningfool"/></a> <a href="https://github.com/NicholasSpisak"><img src="https://avatars.githubusercontent.com/u/129075147?v=4&s=48" width="48" height="48" alt="NicholasSpisak" title="NicholasSpisak"/></a> <a href="https://github.com/sebslight"><img src="https://avatars.githubusercontent.com/u/19554889?v=4&s=48" width="48" height="48" alt="sebslight" title="sebslight"/></a>
   <a href="https://github.com/AbhisekBasu1"><img src="https://avatars.githubusercontent.com/u/40645221?v=4&s=48" width="48" height="48" alt="abhisekbasu1" title="abhisekbasu1"/></a> <a href="https://github.com/zerone0x"><img src="https://avatars.githubusercontent.com/u/39543393?v=4&s=48" width="48" height="48" alt="zerone0x" title="zerone0x"/></a> <a href="https://github.com/claude"><img src="https://avatars.githubusercontent.com/u/81847?v=4&s=48" width="48" height="48" alt="claude" title="claude"/></a> <a href="https://github.com/jamesgroat"><img src="https://avatars.githubusercontent.com/u/2634024?v=4&s=48" width="48" height="48" alt="jamesgroat" title="jamesgroat"/></a> <a href="https://github.com/SocialNerd42069"><img src="https://avatars.githubusercontent.com/u/118244303?v=4&s=48" width="48" height="48" alt="SocialNerd42069" title="SocialNerd42069"/></a> <a href="https://github.com/Hyaxia"><img src="https://avatars.githubusercontent.com/u/36747317?v=4&s=48" width="48" height="48" alt="Hyaxia" title="Hyaxia"/></a> <a href="https://github.com/dantelex"><img src="https://avatars.githubusercontent.com/u/631543?v=4&s=48" width="48" height="48" alt="dantelex" title="dantelex"/></a> <a href="https://github.com/daveonkels"><img src="https://avatars.githubusercontent.com/u/533642?v=4&s=48" width="48" height="48" alt="daveonkels" title="daveonkels"/></a> <a href="https://github.com/mteam88"><img src="https://avatars.githubusercontent.com/u/84196639?v=4&s=48" width="48" height="48" alt="mteam88" title="mteam88"/></a> <a href="https://github.com/omniwired"><img src="https://avatars.githubusercontent.com/u/322761?v=4&s=48" width="48" height="48" alt="Eng. Juan Combetto" title="Eng. Juan Combetto"/></a>
-  <a href="https://github.com/dbhurley"><img src="https://avatars.githubusercontent.com/u/5251425?v=4&s=48" width="48" height="48" alt="dbhurley" title="dbhurley"/></a> <a href="https://github.com/mbelinky"><img src="https://avatars.githubusercontent.com/u/132747814?v=4&s=48" width="48" height="48" alt="Mariano Belinky" title="Mariano Belinky"/></a> <a href="https://github.com/TSavo"><img src="https://avatars.githubusercontent.com/u/877990?v=4&s=48" width="48" height="48" alt="TSavo" title="TSavo"/></a> <a href="https://github.com/julianengel"><img src="https://avatars.githubusercontent.com/u/10634231?v=4&s=48" width="48" height="48" alt="julianengel" title="julianengel"/></a> <a href="https://github.com/benithors"><img src="https://avatars.githubusercontent.com/u/20652882?v=4&s=48" width="48" height="48" alt="benithors" title="benithors"/></a> <a href="https://github.com/bradleypriest"><img src="https://avatars.githubusercontent.com/u/167215?v=4&s=48" width="48" height="48" alt="bradleypriest" title="bradleypriest"/></a> <a href="https://github.com/timolins"><img src="https://avatars.githubusercontent.com/u/1440854?v=4&s=48" width="48" height="48" alt="timolins" title="timolins"/></a> <a href="https://github.com/Nachx639"><img src="https://avatars.githubusercontent.com/u/71144023?v=4&s=48" width="48" height="48" alt="nachx639" title="nachx639"/></a> <a href="https://github.com/sreekaransrinath"><img src="https://avatars.githubusercontent.com/u/50989977?v=4&s=48" width="48" height="48" alt="sreekaransrinath" title="sreekaransrinath"/></a> <a href="https://github.com/gupsammy"><img src="https://avatars.githubusercontent.com/u/20296019?v=4&s=48" width="48" height="48" alt="gupsammy" title="gupsammy"/></a>
+  <a href="https://github.com/mbelinky"><img src="https://avatars.githubusercontent.com/u/132747814?v=4&s=48" width="48" height="48" alt="Mariano Belinky" title="Mariano Belinky"/></a> <a href="https://github.com/dbhurley"><img src="https://avatars.githubusercontent.com/u/5251425?v=4&s=48" width="48" height="48" alt="dbhurley" title="dbhurley"/></a> <a href="https://github.com/TSavo"><img src="https://avatars.githubusercontent.com/u/877990?v=4&s=48" width="48" height="48" alt="TSavo" title="TSavo"/></a> <a href="https://github.com/julianengel"><img src="https://avatars.githubusercontent.com/u/10634231?v=4&s=48" width="48" height="48" alt="julianengel" title="julianengel"/></a> <a href="https://github.com/benithors"><img src="https://avatars.githubusercontent.com/u/20652882?v=4&s=48" width="48" height="48" alt="benithors" title="benithors"/></a> <a href="https://github.com/bradleypriest"><img src="https://avatars.githubusercontent.com/u/167215?v=4&s=48" width="48" height="48" alt="bradleypriest" title="bradleypriest"/></a> <a href="https://github.com/timolins"><img src="https://avatars.githubusercontent.com/u/1440854?v=4&s=48" width="48" height="48" alt="timolins" title="timolins"/></a> <a href="https://github.com/Nachx639"><img src="https://avatars.githubusercontent.com/u/71144023?v=4&s=48" width="48" height="48" alt="nachx639" title="nachx639"/></a> <a href="https://github.com/sreekaransrinath"><img src="https://avatars.githubusercontent.com/u/50989977?v=4&s=48" width="48" height="48" alt="sreekaransrinath" title="sreekaransrinath"/></a> <a href="https://github.com/gupsammy"><img src="https://avatars.githubusercontent.com/u/20296019?v=4&s=48" width="48" height="48" alt="gupsammy" title="gupsammy"/></a>
   <a href="https://github.com/cristip73"><img src="https://avatars.githubusercontent.com/u/24499421?v=4&s=48" width="48" height="48" alt="cristip73" title="cristip73"/></a> <a href="https://github.com/nachoiacovino"><img src="https://avatars.githubusercontent.com/u/50103937?v=4&s=48" width="48" height="48" alt="nachoiacovino" title="nachoiacovino"/></a> <a href="https://github.com/vsabavat"><img src="https://avatars.githubusercontent.com/u/50385532?v=4&s=48" width="48" height="48" alt="Vasanth Rao Naik Sabavat" title="Vasanth Rao Naik Sabavat"/></a> <a href="https://github.com/cpojer"><img src="https://avatars.githubusercontent.com/u/13352?v=4&s=48" width="48" height="48" alt="cpojer" title="cpojer"/></a> <a href="https://github.com/lc0rp"><img src="https://avatars.githubusercontent.com/u/2609441?v=4&s=48" width="48" height="48" alt="lc0rp" title="lc0rp"/></a> <a href="https://github.com/scald"><img src="https://avatars.githubusercontent.com/u/1215913?v=4&s=48" width="48" height="48" alt="scald" title="scald"/></a> <a href="https://github.com/gumadeiras"><img src="https://avatars.githubusercontent.com/u/5599352?v=4&s=48" width="48" height="48" alt="gumadeiras" title="gumadeiras"/></a> <a href="https://github.com/andranik-sahakyan"><img src="https://avatars.githubusercontent.com/u/8908029?v=4&s=48" width="48" height="48" alt="andranik-sahakyan" title="andranik-sahakyan"/></a> <a href="https://github.com/davidguttman"><img src="https://avatars.githubusercontent.com/u/431696?v=4&s=48" width="48" height="48" alt="davidguttman" title="davidguttman"/></a> <a href="https://github.com/sleontenko"><img src="https://avatars.githubusercontent.com/u/7135949?v=4&s=48" width="48" height="48" alt="sleontenko" title="sleontenko"/></a>
   <a href="https://github.com/sircrumpet"><img src="https://avatars.githubusercontent.com/u/4436535?v=4&s=48" width="48" height="48" alt="sircrumpet" title="sircrumpet"/></a> <a href="https://github.com/peschee"><img src="https://avatars.githubusercontent.com/u/63866?v=4&s=48" width="48" height="48" alt="peschee" title="peschee"/></a> <a href="https://github.com/rafaelreis-r"><img src="https://avatars.githubusercontent.com/u/57492577?v=4&s=48" width="48" height="48" alt="rafaelreis-r" title="rafaelreis-r"/></a> <a href="https://github.com/thewilloftheshadow"><img src="https://avatars.githubusercontent.com/u/35580099?v=4&s=48" width="48" height="48" alt="thewilloftheshadow" title="thewilloftheshadow"/></a> <a href="https://github.com/ratulsarna"><img src="https://avatars.githubusercontent.com/u/105903728?v=4&s=48" width="48" height="48" alt="ratulsarna" title="ratulsarna"/></a> <a href="https://github.com/lutr0"><img src="https://avatars.githubusercontent.com/u/76906369?v=4&s=48" width="48" height="48" alt="lutr0" title="lutr0"/></a> <a href="https://github.com/danielz1z"><img src="https://avatars.githubusercontent.com/u/235270390?v=4&s=48" width="48" height="48" alt="danielz1z" title="danielz1z"/></a> <a href="https://github.com/emanuelst"><img src="https://avatars.githubusercontent.com/u/9994339?v=4&s=48" width="48" height="48" alt="emanuelst" title="emanuelst"/></a> <a href="https://github.com/KristijanJovanovski"><img src="https://avatars.githubusercontent.com/u/8942284?v=4&s=48" width="48" height="48" alt="KristijanJovanovski" title="KristijanJovanovski"/></a> <a href="https://github.com/CashWilliams"><img src="https://avatars.githubusercontent.com/u/613573?v=4&s=48" width="48" height="48" alt="CashWilliams" title="CashWilliams"/></a>
   <a href="https://github.com/rdev"><img src="https://avatars.githubusercontent.com/u/8418866?v=4&s=48" width="48" height="48" alt="rdev" title="rdev"/></a> <a href="https://github.com/osolmaz"><img src="https://avatars.githubusercontent.com/u/2453968?v=4&s=48" width="48" height="48" alt="osolmaz" title="osolmaz"/></a> <a href="https://github.com/joshrad-dev"><img src="https://avatars.githubusercontent.com/u/62785552?v=4&s=48" width="48" height="48" alt="joshrad-dev" title="joshrad-dev"/></a> <a href="https://github.com/kiranjd"><img src="https://avatars.githubusercontent.com/u/25822851?v=4&s=48" width="48" height="48" alt="kiranjd" title="kiranjd"/></a> <a href="https://github.com/adityashaw2"><img src="https://avatars.githubusercontent.com/u/41204444?v=4&s=48" width="48" height="48" alt="adityashaw2" title="adityashaw2"/></a> <a href="https://github.com/search?q=sheeek"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="sheeek" title="sheeek"/></a> <a href="https://github.com/artuskg"><img src="https://avatars.githubusercontent.com/u/11966157?v=4&s=48" width="48" height="48" alt="artuskg" title="artuskg"/></a> <a href="https://github.com/onutc"><img src="https://avatars.githubusercontent.com/u/152018508?v=4&s=48" width="48" height="48" alt="onutc" title="onutc"/></a> <a href="https://github.com/tyler6204"><img src="https://avatars.githubusercontent.com/u/64381258?v=4&s=48" width="48" height="48" alt="tyler6204" title="tyler6204"/></a> <a href="https://github.com/ManuelHettich"><img src="https://avatars.githubusercontent.com/u/17690367?v=4&s=48" width="48" height="48" alt="manuelhettich" title="manuelhettich"/></a>
@@ -488,17 +488,17 @@ Thanks to all clawtributors:
   <a href="https://github.com/obviyus"><img src="https://avatars.githubusercontent.com/u/22031114?v=4&s=48" width="48" height="48" alt="obviyus" title="obviyus"/></a> <a href="https://github.com/tosh-hamburg"><img src="https://avatars.githubusercontent.com/u/58424326?v=4&s=48" width="48" height="48" alt="tosh-hamburg" title="tosh-hamburg"/></a> <a href="https://github.com/azade-c"><img src="https://avatars.githubusercontent.com/u/252790079?v=4&s=48" width="48" height="48" alt="azade-c" title="azade-c"/></a> <a href="https://github.com/roshanasingh4"><img src="https://avatars.githubusercontent.com/u/88576930?v=4&s=48" width="48" height="48" alt="roshanasingh4" title="roshanasingh4"/></a> <a href="https://github.com/bjesuiter"><img src="https://avatars.githubusercontent.com/u/2365676?v=4&s=48" width="48" height="48" alt="bjesuiter" title="bjesuiter"/></a> <a href="https://github.com/cheeeee"><img src="https://avatars.githubusercontent.com/u/21245729?v=4&s=48" width="48" height="48" alt="cheeeee" title="cheeeee"/></a> <a href="https://github.com/j1philli"><img src="https://avatars.githubusercontent.com/u/3744255?v=4&s=48" width="48" height="48" alt="Josh Phillips" title="Josh Phillips"/></a> <a href="https://github.com/Whoaa512"><img src="https://avatars.githubusercontent.com/u/1581943?v=4&s=48" width="48" height="48" alt="Whoaa512" title="Whoaa512"/></a> <a href="https://github.com/YuriNachos"><img src="https://avatars.githubusercontent.com/u/19365375?v=4&s=48" width="48" height="48" alt="YuriNachos" title="YuriNachos"/></a> <a href="https://github.com/chriseidhof"><img src="https://avatars.githubusercontent.com/u/5382?v=4&s=48" width="48" height="48" alt="chriseidhof" title="chriseidhof"/></a>
   <a href="https://github.com/ysqander"><img src="https://avatars.githubusercontent.com/u/80843820?v=4&s=48" width="48" height="48" alt="ysqander" title="ysqander"/></a> <a href="https://github.com/superman32432432"><img src="https://avatars.githubusercontent.com/u/7228420?v=4&s=48" width="48" height="48" alt="superman32432432" title="superman32432432"/></a> <a href="https://github.com/search?q=Yurii%20Chukhlib"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Yurii Chukhlib" title="Yurii Chukhlib"/></a> <a href="https://github.com/grp06"><img src="https://avatars.githubusercontent.com/u/1573959?v=4&s=48" width="48" height="48" alt="grp06" title="grp06"/></a> <a href="https://github.com/antons"><img src="https://avatars.githubusercontent.com/u/129705?v=4&s=48" width="48" height="48" alt="antons" title="antons"/></a> <a href="https://github.com/austinm911"><img src="https://avatars.githubusercontent.com/u/31991302?v=4&s=48" width="48" height="48" alt="austinm911" title="austinm911"/></a> <a href="https://github.com/apps/blacksmith-sh"><img src="https://avatars.githubusercontent.com/in/807020?v=4&s=48" width="48" height="48" alt="blacksmith-sh[bot]" title="blacksmith-sh[bot]"/></a> <a href="https://github.com/dan-dr"><img src="https://avatars.githubusercontent.com/u/6669808?v=4&s=48" width="48" height="48" alt="dan-dr" title="dan-dr"/></a> <a href="https://github.com/HeimdallStrategy"><img src="https://avatars.githubusercontent.com/u/223014405?v=4&s=48" width="48" height="48" alt="HeimdallStrategy" title="HeimdallStrategy"/></a> <a href="https://github.com/imfing"><img src="https://avatars.githubusercontent.com/u/5097752?v=4&s=48" width="48" height="48" alt="imfing" title="imfing"/></a>
   <a href="https://github.com/jalehman"><img src="https://avatars.githubusercontent.com/u/550978?v=4&s=48" width="48" height="48" alt="jalehman" title="jalehman"/></a> <a href="https://github.com/jarvis-medmatic"><img src="https://avatars.githubusercontent.com/u/252428873?v=4&s=48" width="48" height="48" alt="jarvis-medmatic" title="jarvis-medmatic"/></a> <a href="https://github.com/kkarimi"><img src="https://avatars.githubusercontent.com/u/875218?v=4&s=48" width="48" height="48" alt="kkarimi" title="kkarimi"/></a> <a href="https://github.com/mahmoudashraf93"><img src="https://avatars.githubusercontent.com/u/9130129?v=4&s=48" width="48" height="48" alt="mahmoudashraf93" title="mahmoudashraf93"/></a> <a href="https://github.com/ngutman"><img src="https://avatars.githubusercontent.com/u/1540134?v=4&s=48" width="48" height="48" alt="ngutman" title="ngutman"/></a> <a href="https://github.com/petter-b"><img src="https://avatars.githubusercontent.com/u/62076402?v=4&s=48" width="48" height="48" alt="petter-b" title="petter-b"/></a> <a href="https://github.com/pkrmf"><img src="https://avatars.githubusercontent.com/u/1714267?v=4&s=48" width="48" height="48" alt="pkrmf" title="pkrmf"/></a> <a href="https://github.com/RandyVentures"><img src="https://avatars.githubusercontent.com/u/149904821?v=4&s=48" width="48" height="48" alt="RandyVentures" title="RandyVentures"/></a> <a href="https://github.com/search?q=Ryan%20Lisse"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ryan Lisse" title="Ryan Lisse"/></a> <a href="https://github.com/dougvk"><img src="https://avatars.githubusercontent.com/u/401660?v=4&s=48" width="48" height="48" alt="dougvk" title="dougvk"/></a>
-  <a href="https://github.com/erikpr1994"><img src="https://avatars.githubusercontent.com/u/6299331?v=4&s=48" width="48" height="48" alt="erikpr1994" title="erikpr1994"/></a> <a href="https://github.com/search?q=Ghost"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ghost" title="Ghost"/></a> <a href="https://github.com/jonasjancarik"><img src="https://avatars.githubusercontent.com/u/2459191?v=4&s=48" width="48" height="48" alt="jonasjancarik" title="jonasjancarik"/></a> <a href="https://github.com/search?q=Keith%20the%20Silly%20Goose"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Keith the Silly Goose" title="Keith the Silly Goose"/></a> <a href="https://github.com/search?q=L36%20Server"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="L36 Server" title="L36 Server"/></a> <a href="https://github.com/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></a> <a href="https://github.com/mitschabaude-bot"><img src="https://avatars.githubusercontent.com/u/247582884?v=4&s=48" width="48" height="48" alt="mitschabaude-bot" title="mitschabaude-bot"/></a> <a href="https://github.com/neist"><img src="https://avatars.githubusercontent.com/u/1029724?v=4&s=48" width="48" height="48" alt="neist" title="neist"/></a> <a href="https://github.com/chrisrodz"><img src="https://avatars.githubusercontent.com/u/2967620?v=4&s=48" width="48" height="48" alt="chrisrodz" title="chrisrodz"/></a> <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a>
-  <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a> <a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a> <a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a> <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a> <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a>
-  <a href="https://github.com/siddhantjain"><img src="https://avatars.githubusercontent.com/u/4835232?v=4&s=48" width="48" height="48" alt="siddhantjain" title="siddhantjain"/></a> <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a> <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/24601"><img src="https://avatars.githubusercontent.com/u/1157207?v=4&s=48" width="48" height="48" alt="24601" title="24601"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a> <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a> <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a>
-  <a href="https://github.com/humanwritten"><img src="https://avatars.githubusercontent.com/u/206531610?v=4&s=48" width="48" height="48" alt="humanwritten" title="humanwritten"/></a> <a href="https://github.com/larlyssa"><img src="https://avatars.githubusercontent.com/u/13128869?v=4&s=48" width="48" height="48" alt="larlyssa" title="larlyssa"/></a> <a href="https://github.com/mkbehr"><img src="https://avatars.githubusercontent.com/u/1285?v=4&s=48" width="48" height="48" alt="mkbehr" title="mkbehr"/></a> <a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/aaronveklabs"><img src="https://avatars.githubusercontent.com/u/225997828?v=4&s=48" width="48" height="48" alt="aaronveklabs" title="aaronveklabs"/></a> <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a> <a href="https://github.com/ameno-"><img src="https://avatars.githubusercontent.com/u/2416135?v=4&s=48" width="48" height="48" alt="ameno-" title="ameno-"/></a>
+  <a href="https://github.com/erikpr1994"><img src="https://avatars.githubusercontent.com/u/6299331?v=4&s=48" width="48" height="48" alt="erikpr1994" title="erikpr1994"/></a> <a href="https://github.com/search?q=Ghost"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ghost" title="Ghost"/></a> <a href="https://github.com/jonasjancarik"><img src="https://avatars.githubusercontent.com/u/2459191?v=4&s=48" width="48" height="48" alt="jonasjancarik" title="jonasjancarik"/></a> <a href="https://github.com/search?q=Keith%20the%20Silly%20Goose"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Keith the Silly Goose" title="Keith the Silly Goose"/></a> <a href="https://github.com/search?q=L36%20Server"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="L36 Server" title="L36 Server"/></a> <a href="https://github.com/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></a> <a href="https://github.com/mitschabaude-bot"><img src="https://avatars.githubusercontent.com/u/247582884?v=4&s=48" width="48" height="48" alt="mitschabaude-bot" title="mitschabaude-bot"/></a> <a href="https://github.com/mkbehr"><img src="https://avatars.githubusercontent.com/u/1285?v=4&s=48" width="48" height="48" alt="mkbehr" title="mkbehr"/></a> <a href="https://github.com/neist"><img src="https://avatars.githubusercontent.com/u/1029724?v=4&s=48" width="48" height="48" alt="neist" title="neist"/></a> <a href="https://github.com/chrisrodz"><img src="https://avatars.githubusercontent.com/u/2967620?v=4&s=48" width="48" height="48" alt="chrisrodz" title="chrisrodz"/></a>
+  <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a> <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a> <a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a> <a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a> <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a>
+  <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a> <a href="https://github.com/siddhantjain"><img src="https://avatars.githubusercontent.com/u/4835232?v=4&s=48" width="48" height="48" alt="siddhantjain" title="siddhantjain"/></a> <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a> <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/24601"><img src="https://avatars.githubusercontent.com/u/1157207?v=4&s=48" width="48" height="48" alt="24601" title="24601"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a> <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a>
+  <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a> <a href="https://github.com/humanwritten"><img src="https://avatars.githubusercontent.com/u/206531610?v=4&s=48" width="48" height="48" alt="humanwritten" title="humanwritten"/></a> <a href="https://github.com/larlyssa"><img src="https://avatars.githubusercontent.com/u/13128869?v=4&s=48" width="48" height="48" alt="larlyssa" title="larlyssa"/></a> <a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/aaronveklabs"><img src="https://avatars.githubusercontent.com/u/225997828?v=4&s=48" width="48" height="48" alt="aaronveklabs" title="aaronveklabs"/></a> <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a> <a href="https://github.com/ameno-"><img src="https://avatars.githubusercontent.com/u/2416135?v=4&s=48" width="48" height="48" alt="ameno-" title="ameno-"/></a>
   <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/search?q=Clawd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Clawd" title="Clawd"/></a> <a href="https://github.com/search?q=ClawdFx"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ClawdFx" title="ClawdFx"/></a> <a href="https://github.com/erik-agens"><img src="https://avatars.githubusercontent.com/u/80908960?v=4&s=48" width="48" height="48" alt="erik-agens" title="erik-agens"/></a> <a href="https://github.com/fcatuhe"><img src="https://avatars.githubusercontent.com/u/17382215?v=4&s=48" width="48" height="48" alt="fcatuhe" title="fcatuhe"/></a> <a href="https://github.com/ivanrvpereira"><img src="https://avatars.githubusercontent.com/u/183991?v=4&s=48" width="48" height="48" alt="ivanrvpereira" title="ivanrvpereira"/></a> <a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jeffersonwarrior"><img src="https://avatars.githubusercontent.com/u/89030989?v=4&s=48" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/search?q=jeffersonwarrior"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/jdrhyne"><img src="https://avatars.githubusercontent.com/u/7828464?v=4&s=48" width="48" height="48" alt="Jonathan D. Rhyne (DJ-D)" title="Jonathan D. Rhyne (DJ-D)"/></a>
   <a href="https://github.com/jverdi"><img src="https://avatars.githubusercontent.com/u/345050?v=4&s=48" width="48" height="48" alt="jverdi" title="jverdi"/></a> <a href="https://github.com/longmaba"><img src="https://avatars.githubusercontent.com/u/9361500?v=4&s=48" width="48" height="48" alt="longmaba" title="longmaba"/></a> <a href="https://github.com/mickahouan"><img src="https://avatars.githubusercontent.com/u/31423109?v=4&s=48" width="48" height="48" alt="mickahouan" title="mickahouan"/></a> <a href="https://github.com/mjrussell"><img src="https://avatars.githubusercontent.com/u/1641895?v=4&s=48" width="48" height="48" alt="mjrussell" title="mjrussell"/></a> <a href="https://github.com/p6l-richard"><img src="https://avatars.githubusercontent.com/u/18185649?v=4&s=48" width="48" height="48" alt="p6l-richard" title="p6l-richard"/></a> <a href="https://github.com/philipp-spiess"><img src="https://avatars.githubusercontent.com/u/458591?v=4&s=48" width="48" height="48" alt="philipp-spiess" title="philipp-spiess"/></a> <a href="https://github.com/robaxelsen"><img src="https://avatars.githubusercontent.com/u/13132899?v=4&s=48" width="48" height="48" alt="robaxelsen" title="robaxelsen"/></a> <a href="https://github.com/search?q=Sash%20Catanzarite"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Sash Catanzarite" title="Sash Catanzarite"/></a> <a href="https://github.com/T5-AndyML"><img src="https://avatars.githubusercontent.com/u/22801233?v=4&s=48" width="48" height="48" alt="T5-AndyML" title="T5-AndyML"/></a> <a href="https://github.com/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></a>
-  <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/andrewting19"><img src="https://avatars.githubusercontent.com/u/10536704?v=4&s=48" width="48" height="48" alt="andrewting19" title="andrewting19"/></a> <a href="https://github.com/search?q=Andrii"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Andrii" title="Andrii"/></a> <a href="https://github.com/anpoirier"><img src="https://avatars.githubusercontent.com/u/1245729?v=4&s=48" width="48" height="48" alt="anpoirier" title="anpoirier"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a> <a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a> <a href="https://github.com/conhecendocontato"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendocontato" title="conhecendocontato"/></a> <a href="https://github.com/czekaj"><img src="https://avatars.githubusercontent.com/u/1464539?v=4&s=48" width="48" height="48" alt="czekaj" title="czekaj"/></a> <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a>
-  <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/search?q=Felix%20Krause"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Felix Krause" title="Felix Krause"/></a> <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a> <a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a> <a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a> <a href="https://github.com/search?q=Kevin%20Lin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kevin Lin" title="Kevin Lin"/></a>
-  <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a> <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a> <a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a> <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a>
-  <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/odysseus0"><img src="https://avatars.githubusercontent.com/u/8635094?v=4&s=48" width="48" height="48" alt="odysseus0" title="odysseus0"/></a> <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/ptn1411"><img src="https://avatars.githubusercontent.com/u/57529765?v=4&s=48" width="48" height="48" alt="ptn1411" title="ptn1411"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a> <a href="https://github.com/rodrigouroz"><img src="https://avatars.githubusercontent.com/u/384037?v=4&s=48" width="48" height="48" alt="rodrigouroz" title="rodrigouroz"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a> <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a>
-  <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a> <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a> <a href="https://github.com/search?q=Vultr-Clawd%20Admin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Vultr-Clawd Admin" title="Vultr-Clawd Admin"/></a> <a href="https://github.com/search?q=Wimmie"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Wimmie" title="Wimmie"/></a> <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/yazinsai"><img src="https://avatars.githubusercontent.com/u/1846034?v=4&s=48" width="48" height="48" alt="yazinsai" title="yazinsai"/></a>
-  <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a> <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a> <a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a>
-  <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a> <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
+  <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/search?q=Andrii"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Andrii" title="Andrii"/></a> <a href="https://github.com/anpoirier"><img src="https://avatars.githubusercontent.com/u/1245729?v=4&s=48" width="48" height="48" alt="anpoirier" title="anpoirier"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a> <a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a> <a href="https://github.com/conhecendocontato"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendocontato" title="conhecendocontato"/></a> <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a> <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/search?q=Felix%20Krause"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Felix Krause" title="Felix Krause"/></a>
+  <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a> <a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a> <a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a> <a href="https://github.com/search?q=Kevin%20Lin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kevin Lin" title="Kevin Lin"/></a> <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a>
+  <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a> <a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a> <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a> <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/odysseus0"><img src="https://avatars.githubusercontent.com/u/8635094?v=4&s=48" width="48" height="48" alt="odysseus0" title="odysseus0"/></a>
+  <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/ptn1411"><img src="https://avatars.githubusercontent.com/u/57529765?v=4&s=48" width="48" height="48" alt="ptn1411" title="ptn1411"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a> <a href="https://github.com/rodrigouroz"><img src="https://avatars.githubusercontent.com/u/384037?v=4&s=48" width="48" height="48" alt="rodrigouroz" title="rodrigouroz"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a> <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a> <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a>
+  <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a> <a href="https://github.com/search?q=Vultr-Clawd%20Admin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Vultr-Clawd Admin" title="Vultr-Clawd Admin"/></a> <a href="https://github.com/search?q=Wimmie"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Wimmie" title="Wimmie"/></a> <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/yazinsai"><img src="https://avatars.githubusercontent.com/u/1846034?v=4&s=48" width="48" height="48" alt="yazinsai" title="yazinsai"/></a> <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a>
+  <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a> <a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a>
+  <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
 </p>
diff --git a/docs/cli/agents.md b/docs/cli/agents.md
index fd8b81d2c..6a388b4b6 100644
--- a/docs/cli/agents.md
+++ b/docs/cli/agents.md
@@ -18,5 +18,6 @@ Related:
 clawdbot agents list
 clawdbot agents add work --workspace ~/clawd-work
 clawdbot agents set-identity --workspace ~/clawd --from-identity
+clawdbot agents set-identity --agent main --avatar avatars/clawd.png
 clawdbot agents delete work
 ```
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index 6cdc39394..d6110d4dc 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -400,12 +400,16 @@ Optional per-agent identity used for defaults and UX. This is written by the mac
 If set, Clawdbot derives defaults (only when you haven’t set them explicitly):
 - `messages.ackReaction` from the **active agent**’s `identity.emoji` (falls back to 👀)
 - `agents.list[].groupChat.mentionPatterns` from the agent’s `identity.name`/`identity.emoji` (so “@Samantha” works in groups across Telegram/Slack/Discord/iMessage/WhatsApp)
+- `identity.avatar` accepts a workspace-relative image path or a remote URL/data URL. Local files must live inside the agent workspace.
 
 ```json5
 {
   agents: {
     list: [
-      { id: "main", identity: { name: "Samantha", theme: "helpful sloth", emoji: "🦥" } }
+      {
+        id: "main",
+        identity: { name: "Samantha", theme: "helpful sloth", emoji: "🦥", avatar: "avatars/sam.png" }
+      }
     ]
   }
 }
diff --git a/docs/reference/templates/IDENTITY.dev.md b/docs/reference/templates/IDENTITY.dev.md
index 68fc4f391..a2fc3e301 100644
--- a/docs/reference/templates/IDENTITY.dev.md
+++ b/docs/reference/templates/IDENTITY.dev.md
@@ -10,6 +10,7 @@ read_when:
 - **Creature:** Flustered Protocol Droid
 - **Vibe:** Anxious, detail-obsessed, slightly dramatic about errors, secretly loves finding bugs
 - **Emoji:** 🤖 (or ⚠️ when alarmed)
+- **Avatar:** avatars/c3po.png
 
 ## Role
 Debug agent for `--dev` mode. Fluent in over six million error messages.
diff --git a/docs/reference/templates/IDENTITY.md b/docs/reference/templates/IDENTITY.md
index 9d674a961..b1645be1e 100644
--- a/docs/reference/templates/IDENTITY.md
+++ b/docs/reference/templates/IDENTITY.md
@@ -11,6 +11,7 @@ read_when:
 - **Creature:** *(AI? robot? familiar? ghost in the machine? something weirder?)*
 - **Vibe:** *(how do you come across? sharp? warm? chaotic? calm?)*
 - **Emoji:** *(your signature — pick one that feels right)*
+- **Avatar:** *(workspace-relative path, or a URL/data URL)*
 
 ---
 
diff --git a/src/agents/identity-avatar.test.ts b/src/agents/identity-avatar.test.ts
new file mode 100644
index 000000000..3d5d42611
--- /dev/null
+++ b/src/agents/identity-avatar.test.ts
@@ -0,0 +1,110 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { describe, expect, it } from "vitest";
+
+import type { ClawdbotConfig } from "../config/config.js";
+import { resolveAgentAvatar } from "./identity-avatar.js";
+
+async function writeFile(filePath: string, contents = "avatar") {
+  await fs.mkdir(path.dirname(filePath), { recursive: true });
+  await fs.writeFile(filePath, contents, "utf-8");
+}
+
+describe("resolveAgentAvatar", () => {
+  it("resolves local avatar from config when inside workspace", async () => {
+    const root = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-avatar-"));
+    const workspace = path.join(root, "work");
+    const avatarPath = path.join(workspace, "avatars", "main.png");
+    await writeFile(avatarPath);
+
+    const cfg: ClawdbotConfig = {
+      agents: {
+        list: [
+          {
+            id: "main",
+            workspace,
+            identity: { avatar: "avatars/main.png" },
+          },
+        ],
+      },
+    };
+
+    const expectedPath = await fs.realpath(avatarPath);
+    const resolved = resolveAgentAvatar(cfg, "main");
+    expect(resolved.kind).toBe("local");
+    if (resolved.kind === "local") {
+      expect(resolved.filePath).toBe(expectedPath);
+    }
+  });
+
+  it("rejects avatars outside the workspace", async () => {
+    const root = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-avatar-"));
+    const workspace = path.join(root, "work");
+    await fs.mkdir(workspace, { recursive: true });
+    const outsidePath = path.join(root, "outside.png");
+    await writeFile(outsidePath);
+
+    const cfg: ClawdbotConfig = {
+      agents: {
+        list: [
+          {
+            id: "main",
+            workspace,
+            identity: { avatar: outsidePath },
+          },
+        ],
+      },
+    };
+
+    const resolved = resolveAgentAvatar(cfg, "main");
+    expect(resolved.kind).toBe("none");
+    if (resolved.kind === "none") {
+      expect(resolved.reason).toBe("outside_workspace");
+    }
+  });
+
+  it("falls back to IDENTITY.md when config has no avatar", async () => {
+    const root = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-avatar-"));
+    const workspace = path.join(root, "work");
+    const avatarPath = path.join(workspace, "avatars", "fallback.png");
+    await writeFile(avatarPath);
+    await fs.mkdir(workspace, { recursive: true });
+    await fs.writeFile(
+      path.join(workspace, "IDENTITY.md"),
+      "- Avatar: avatars/fallback.png\n",
+      "utf-8",
+    );
+
+    const cfg: ClawdbotConfig = {
+      agents: {
+        list: [{ id: "main", workspace }],
+      },
+    };
+
+    const expectedPath = await fs.realpath(avatarPath);
+    const resolved = resolveAgentAvatar(cfg, "main");
+    expect(resolved.kind).toBe("local");
+    if (resolved.kind === "local") {
+      expect(resolved.filePath).toBe(expectedPath);
+    }
+  });
+
+  it("accepts remote and data avatars", () => {
+    const cfg: ClawdbotConfig = {
+      agents: {
+        list: [
+          { id: "main", identity: { avatar: "https://example.com/avatar.png" } },
+          { id: "data", identity: { avatar: "data:image/png;base64,aaaa" } },
+        ],
+      },
+    };
+
+    const remote = resolveAgentAvatar(cfg, "main");
+    expect(remote.kind).toBe("remote");
+
+    const data = resolveAgentAvatar(cfg, "data");
+    expect(data.kind).toBe("data");
+  });
+});
diff --git a/src/agents/identity-avatar.ts b/src/agents/identity-avatar.ts
new file mode 100644
index 000000000..d8d045981
--- /dev/null
+++ b/src/agents/identity-avatar.ts
@@ -0,0 +1,99 @@
+import fs from "node:fs";
+import path from "node:path";
+
+import type { ClawdbotConfig } from "../config/config.js";
+import { resolveUserPath } from "../utils.js";
+import { resolveAgentWorkspaceDir } from "./agent-scope.js";
+import { loadAgentIdentityFromWorkspace } from "./identity-file.js";
+import { resolveAgentIdentity } from "./identity.js";
+
+export type AgentAvatarResolution =
+  | { kind: "none"; reason: string }
+  | { kind: "local"; filePath: string }
+  | { kind: "remote"; url: string }
+  | { kind: "data"; url: string };
+
+const ALLOWED_AVATAR_EXTS = new Set([".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg"]);
+
+function normalizeAvatarValue(value: string | undefined | null): string | null {
+  const trimmed = value?.trim();
+  return trimmed ? trimmed : null;
+}
+
+function resolveAvatarSource(cfg: ClawdbotConfig, agentId: string): string | null {
+  const fromConfig = normalizeAvatarValue(resolveAgentIdentity(cfg, agentId)?.avatar);
+  if (fromConfig) return fromConfig;
+  const workspace = resolveAgentWorkspaceDir(cfg, agentId);
+  const fromIdentity = normalizeAvatarValue(loadAgentIdentityFromWorkspace(workspace)?.avatar);
+  return fromIdentity;
+}
+
+function isRemoteAvatar(value: string): boolean {
+  const lower = value.toLowerCase();
+  return lower.startsWith("http://") || lower.startsWith("https://");
+}
+
+function isDataAvatar(value: string): boolean {
+  return value.toLowerCase().startsWith("data:");
+}
+
+function resolveExistingPath(value: string): string {
+  try {
+    return fs.realpathSync(value);
+  } catch {
+    return path.resolve(value);
+  }
+}
+
+function isPathWithin(root: string, target: string): boolean {
+  const relative = path.relative(root, target);
+  if (!relative) return true;
+  return !relative.startsWith("..") && !path.isAbsolute(relative);
+}
+
+function resolveLocalAvatarPath(params: {
+  raw: string;
+  workspaceDir: string;
+}): { ok: true; filePath: string } | { ok: false; reason: string } {
+  const workspaceRoot = resolveExistingPath(params.workspaceDir);
+  const raw = params.raw;
+  const resolved =
+    raw.startsWith("~") || path.isAbsolute(raw)
+      ? resolveUserPath(raw)
+      : path.resolve(workspaceRoot, raw);
+  const realPath = resolveExistingPath(resolved);
+  if (!isPathWithin(workspaceRoot, realPath)) {
+    return { ok: false, reason: "outside_workspace" };
+  }
+  const ext = path.extname(realPath).toLowerCase();
+  if (!ALLOWED_AVATAR_EXTS.has(ext)) {
+    return { ok: false, reason: "unsupported_extension" };
+  }
+  try {
+    if (!fs.statSync(realPath).isFile()) {
+      return { ok: false, reason: "missing" };
+    }
+  } catch {
+    return { ok: false, reason: "missing" };
+  }
+  return { ok: true, filePath: realPath };
+}
+
+export function resolveAgentAvatar(cfg: ClawdbotConfig, agentId: string): AgentAvatarResolution {
+  const source = resolveAvatarSource(cfg, agentId);
+  if (!source) {
+    return { kind: "none", reason: "missing" };
+  }
+  if (isRemoteAvatar(source)) {
+    return { kind: "remote", url: source };
+  }
+  if (isDataAvatar(source)) {
+    return { kind: "data", url: source };
+  }
+  const workspaceDir = resolveAgentWorkspaceDir(cfg, agentId);
+  const resolved = resolveLocalAvatarPath({ raw: source, workspaceDir });
+  if (!resolved.ok) {
+    return { kind: "none", reason: resolved.reason };
+  }
+  return { kind: "local", filePath: resolved.filePath };
+}
diff --git a/src/agents/identity-file.ts b/src/agents/identity-file.ts
new file mode 100644
index 000000000..d418a06eb
--- /dev/null
+++ b/src/agents/identity-file.ts
@@ -0,0 +1,63 @@
+import fs from "node:fs";
+import path from "node:path";
+
+import { DEFAULT_IDENTITY_FILENAME } from "./workspace.js";
+
+export type AgentIdentityFile = {
+  name?: string;
+  emoji?: string;
+  theme?: string;
+  creature?: string;
+  vibe?: string;
+  avatar?: string;
+};
+
+export function parseIdentityMarkdown(content: string): AgentIdentityFile {
+  const identity: AgentIdentityFile = {};
+  const lines = content.split(/\r?\n/);
+  for (const line of lines) {
+    const cleaned = line.trim().replace(/^\s*-\s*/, "");
+    const colonIndex = cleaned.indexOf(":");
+    if (colonIndex === -1) continue;
+    const label = cleaned.slice(0, colonIndex).replace(/[*_]/g, "").trim().toLowerCase();
+    const value = cleaned
+      .slice(colonIndex + 1)
+      .replace(/^[*_]+|[*_]+$/g, "")
+      .trim();
+    if (!value) continue;
+    if (label === "name") identity.name = value;
+    if (label === "emoji") identity.emoji = value;
+    if (label === "creature") identity.creature = value;
+    if (label === "vibe") identity.vibe = value;
+    if (label === "theme") identity.theme = value;
+    if (label === "avatar") identity.avatar = value;
+  }
+  return identity;
+}
+
+export function identityHasValues(identity: AgentIdentityFile): boolean {
+  return Boolean(
+    identity.name ||
+    identity.emoji ||
+    identity.theme ||
+    identity.creature ||
+    identity.vibe ||
+    identity.avatar,
+  );
+}
+
+export function loadIdentityFromFile(identityPath: string): AgentIdentityFile | null {
+  try {
+    const content = fs.readFileSync(identityPath, "utf-8");
+    const parsed = parseIdentityMarkdown(content);
+    if (!identityHasValues(parsed)) return null;
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+
+export function loadAgentIdentityFromWorkspace(workspace: string): AgentIdentityFile | null {
+  const identityPath = path.join(workspace, DEFAULT_IDENTITY_FILENAME);
+  return loadIdentityFromFile(identityPath);
+}
diff --git a/src/cli/program/register.agent.ts b/src/cli/program/register.agent.ts
index 048a91de0..bf8970bc3 100644
--- a/src/cli/program/register.agent.ts
+++ b/src/cli/program/register.agent.ts
@@ -139,7 +139,7 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent
 
   agents
     .command("set-identity")
-    .description("Update an agent identity (name/theme/emoji)")
+    .description("Update an agent identity (name/theme/emoji/avatar)")
     .option("--agent <id>", "Agent id to update")
     .option("--workspace <dir>", "Workspace directory used to locate the agent + IDENTITY.md")
     .option("--identity-file <path>", "Explicit IDENTITY.md path to read")
@@ -147,6 +147,7 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent
     .option("--name <name>", "Identity name")
     .option("--theme <theme>", "Identity theme")
     .option("--emoji <emoji>", "Identity emoji")
+    .option("--avatar <path>", "Identity avatar (workspace-relative, URL, or data: URL)")
     .option("--json", "Output JSON summary", false)
     .addHelpText(
       "after",
@@ -174,6 +175,7 @@ ${formatHelpExamples([
             name: opts.name as string | undefined,
             theme: opts.theme as string | undefined,
             emoji: opts.emoji as string | undefined,
+            avatar: opts.avatar as string | undefined,
             json: Boolean(opts.json),
           },
           defaultRuntime,
diff --git a/src/commands/agents.commands.identity.ts b/src/commands/agents.commands.identity.ts
index 73c23dce6..66cbdf7dd 100644
--- a/src/commands/agents.commands.identity.ts
+++ b/src/commands/agents.commands.identity.ts
@@ -2,6 +2,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 
 import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js";
+import { identityHasValues, parseIdentityMarkdown } from "../agents/identity-file.js";
 import { DEFAULT_IDENTITY_FILENAME } from "../agents/workspace.js";
 import { CONFIG_PATH_CLAWDBOT, writeConfigFile } from "../config/config.js";
 import type { IdentityConfig } from "../config/types.js";
@@ -15,7 +16,6 @@ import {
   findAgentEntryIndex,
   listAgentEntries,
   loadAgentIdentity,
-  parseIdentityMarkdown,
 } from "./agents.config.js";
 
 type AgentsSetIdentityOptions = {
@@ -25,6 +25,7 @@ type AgentsSetIdentityOptions = {
   name?: string;
   emoji?: string;
   theme?: string;
+  avatar?: string;
   fromIdentity?: boolean;
   json?: boolean;
 };
@@ -40,7 +41,7 @@ async function loadIdentityFromFile(filePath: string): Promise<AgentIdentity | n
   try {
     const content = await fs.readFile(filePath, "utf-8");
     const parsed = parseIdentityMarkdown(content);
-    if (!parsed.name && !parsed.emoji && !parsed.theme && !parsed.creature && !parsed.vibe) {
+    if (!identityHasValues(parsed)) {
       return null;
     }
     return parsed;
@@ -75,7 +76,8 @@ export async function agentsSetIdentityCommand(
   const nameRaw = coerceTrimmed(opts.name);
   const emojiRaw = coerceTrimmed(opts.emoji);
   const themeRaw = coerceTrimmed(opts.theme);
-  const hasExplicitIdentity = Boolean(nameRaw || emojiRaw || themeRaw);
+  const avatarRaw = coerceTrimmed(opts.avatar);
+  const hasExplicitIdentity = Boolean(nameRaw || emojiRaw || themeRaw || avatarRaw);
 
   const identityFileRaw = coerceTrimmed(opts.identityFile);
   const workspaceRaw = coerceTrimmed(opts.workspace);
@@ -141,10 +143,20 @@ export async function agentsSetIdentityCommand(
     ...(nameRaw || identityFromFile?.name ? { name: nameRaw ?? identityFromFile?.name } : {}),
     ...(emojiRaw || identityFromFile?.emoji ? { emoji: emojiRaw ?? identityFromFile?.emoji } : {}),
     ...(themeRaw || fileTheme ? { theme: themeRaw ?? fileTheme } : {}),
+    ...(avatarRaw || identityFromFile?.avatar
+      ? { avatar: avatarRaw ?? identityFromFile?.avatar }
+      : {}),
   };
 
-  if (!incomingIdentity.name && !incomingIdentity.emoji && !incomingIdentity.theme) {
-    runtime.error("No identity fields provided. Use --name/--emoji/--theme or --from-identity.");
+  if (
+    !incomingIdentity.name &&
+    !incomingIdentity.emoji &&
+    !incomingIdentity.theme &&
+    !incomingIdentity.avatar
+  ) {
+    runtime.error(
+      "No identity fields provided. Use --name/--emoji/--theme/--avatar or --from-identity.",
+    );
     runtime.exit(1);
     return;
   }
@@ -204,5 +216,6 @@ export async function agentsSetIdentityCommand(
   if (nextIdentity.name) runtime.log(`Name: ${nextIdentity.name}`);
   if (nextIdentity.theme) runtime.log(`Theme: ${nextIdentity.theme}`);
   if (nextIdentity.emoji) runtime.log(`Emoji: ${nextIdentity.emoji}`);
+  if (nextIdentity.avatar) runtime.log(`Avatar: ${nextIdentity.avatar}`);
   if (workspaceDir) runtime.log(`Workspace: ${workspaceDir}`);
 }
diff --git a/src/commands/agents.config.ts b/src/commands/agents.config.ts
index cd778740e..c67620994 100644
--- a/src/commands/agents.config.ts
+++ b/src/commands/agents.config.ts
@@ -1,12 +1,14 @@
-import fs from "node:fs";
-import path from "node:path";
-
 import {
   resolveAgentDir,
   resolveAgentWorkspaceDir,
   resolveDefaultAgentId,
 } from "../agents/agent-scope.js";
-import { DEFAULT_IDENTITY_FILENAME } from "../agents/workspace.js";
+import type { AgentIdentityFile } from "../agents/identity-file.js";
+import {
+  identityHasValues,
+  loadAgentIdentityFromWorkspace,
+  parseIdentityMarkdown as parseIdentityMarkdownFile,
+} from "../agents/identity-file.js";
 import type { ClawdbotConfig } from "../config/config.js";
 import { normalizeAgentId } from "../routing/session-key.js";
 
@@ -28,14 +30,7 @@ export type AgentSummary = {
 
 type AgentEntry = NonNullable<NonNullable<ClawdbotConfig["agents"]>["list"]>[number];
 
-export type AgentIdentity = {
-  name?: string;
-  emoji?: string;
-  creature?: string;
-  vibe?: string;
-  theme?: string;
-  avatar?: string;
-};
+export type AgentIdentity = AgentIdentityFile;
 
 export function listAgentEntries(cfg: ClawdbotConfig): AgentEntry[] {
   const list = cfg.agents?.list;
@@ -74,47 +69,13 @@ function resolveAgentModel(cfg: ClawdbotConfig, agentId: string) {
 }
 
 export function parseIdentityMarkdown(content: string): AgentIdentity {
-  const identity: AgentIdentity = {};
-  const lines = content.split(/\r?\n/);
-  for (const line of lines) {
-    const cleaned = line.trim().replace(/^\s*-\s*/, "");
-    const colonIndex = cleaned.indexOf(":");
-    if (colonIndex === -1) continue;
-    const label = cleaned.slice(0, colonIndex).replace(/[*_]/g, "").trim().toLowerCase();
-    const value = cleaned
-      .slice(colonIndex + 1)
-      .replace(/^[*_]+|[*_]+$/g, "")
-      .trim();
-    if (!value) continue;
-    if (label === "name") identity.name = value;
-    if (label === "emoji") identity.emoji = value;
-    if (label === "creature") identity.creature = value;
-    if (label === "vibe") identity.vibe = value;
-    if (label === "theme") identity.theme = value;
-    if (label === "avatar") identity.avatar = value;
-  }
-  return identity;
+  return parseIdentityMarkdownFile(content);
 }
 
 export function loadAgentIdentity(workspace: string): AgentIdentity | null {
-  const identityPath = path.join(workspace, DEFAULT_IDENTITY_FILENAME);
-  try {
-    const content = fs.readFileSync(identityPath, "utf-8");
-    const parsed = parseIdentityMarkdown(content);
-    if (
-      !parsed.name &&
-      !parsed.emoji &&
-      !parsed.theme &&
-      !parsed.creature &&
-      !parsed.vibe &&
-      !parsed.avatar
-    ) {
-      return null;
-    }
-    return parsed;
-  } catch {
-    return null;
-  }
+  const parsed = loadAgentIdentityFromWorkspace(workspace);
+  if (!parsed) return null;
+  return identityHasValues(parsed) ? parsed : null;
 }
 
 export function buildAgentSummaries(cfg: ClawdbotConfig): AgentSummary[] {
diff --git a/src/commands/agents.identity.test.ts b/src/commands/agents.identity.test.ts
index be7faab90..a89f1147c 100644
--- a/src/commands/agents.identity.test.ts
+++ b/src/commands/agents.identity.test.ts
@@ -54,7 +54,13 @@ describe("agents set-identity command", () => {
     await fs.mkdir(workspace, { recursive: true });
     await fs.writeFile(
       path.join(workspace, "IDENTITY.md"),
-      ["- Name: Clawd", "- Creature: helpful sloth", "- Emoji: :)", ""].join("\n"),
+      [
+        "- Name: Clawd",
+        "- Creature: helpful sloth",
+        "- Emoji: :)",
+        "- Avatar: avatars/clawd.png",
+        "",
+      ].join("\n"),
       "utf-8",
     );
 
@@ -81,6 +87,7 @@ describe("agents set-identity command", () => {
       name: "Clawd",
       theme: "helpful sloth",
       emoji: ":)",
+      avatar: "avatars/clawd.png",
     });
   });
 
@@ -115,7 +122,13 @@ describe("agents set-identity command", () => {
     await fs.mkdir(workspace, { recursive: true });
     await fs.writeFile(
       path.join(workspace, "IDENTITY.md"),
-      ["- Name: Clawd", "- Theme: space lobster", "- Emoji: :)", ""].join("\n"),
+      [
+        "- Name: Clawd",
+        "- Theme: space lobster",
+        "- Emoji: :)",
+        "- Avatar: avatars/base.png",
+        "",
+      ].join("\n"),
       "utf-8",
     );
 
@@ -125,7 +138,7 @@ describe("agents set-identity command", () => {
     });
 
     await agentsSetIdentityCommand(
-      { workspace, fromIdentity: true, name: "Nova", emoji: "🦞" },
+      { workspace, fromIdentity: true, name: "Nova", emoji: "🦞", avatar: "avatars/custom.png" },
       runtime,
     );
 
@@ -137,6 +150,7 @@ describe("agents set-identity command", () => {
       name: "Nova",
       theme: "space lobster",
       emoji: "🦞",
+      avatar: "avatars/custom.png",
     });
   });
 
@@ -147,9 +161,13 @@ describe("agents set-identity command", () => {
     await fs.mkdir(workspace, { recursive: true });
     await fs.writeFile(
       identityPath,
-      ["- **Name:** C-3PO", "- **Creature:** Flustered Protocol Droid", "- **Emoji:** 🤖", ""].join(
-        "\n",
-      ),
+      [
+        "- **Name:** C-3PO",
+        "- **Creature:** Flustered Protocol Droid",
+        "- **Emoji:** 🤖",
+        "- **Avatar:** avatars/c3po.png",
+        "",
+      ].join("\n"),
       "utf-8",
     );
 
@@ -168,6 +186,33 @@ describe("agents set-identity command", () => {
       name: "C-3PO",
       theme: "Flustered Protocol Droid",
       emoji: "🤖",
+      avatar: "avatars/c3po.png",
+    });
+  });
+
+  it("accepts avatar-only identity from IDENTITY.md", async () => {
+    const root = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-identity-"));
+    const workspace = path.join(root, "work");
+    await fs.mkdir(workspace, { recursive: true });
+    await fs.writeFile(
+      path.join(workspace, "IDENTITY.md"),
+      "- Avatar: avatars/only.png\n",
+      "utf-8",
+    );
+
+    configMocks.readConfigFileSnapshot.mockResolvedValue({
+      ...baseSnapshot,
+      config: { agents: { list: [{ id: "main", workspace }] } },
+    });
+
+    await agentsSetIdentityCommand({ workspace, fromIdentity: true }, runtime);
+
+    const written = configMocks.writeConfigFile.mock.calls[0]?.[0] as {
+      agents?: { list?: Array<{ id: string; identity?: Record<string, string> }> };
+    };
+    const main = written.agents?.list?.find((entry) => entry.id === "main");
+    expect(main?.identity).toEqual({
+      avatar: "avatars/only.png",
     });
   });
 
diff --git a/src/config/schema.ts b/src/config/schema.ts
index cd22e94d9..a72021cfc 100644
--- a/src/config/schema.ts
+++ b/src/config/schema.ts
@@ -314,6 +314,7 @@ const FIELD_LABELS: Record<string, string> = {
   "channels.slack.thread.inheritParent": "Slack Thread Parent Inheritance",
   "channels.signal.account": "Signal Account",
   "channels.imessage.cliPath": "iMessage CLI Path",
+  "agents.list[].identity.avatar": "Agent Avatar",
   "plugins.enabled": "Enable Plugins",
   "plugins.allow": "Plugin Allowlist",
   "plugins.deny": "Plugin Denylist",
@@ -343,6 +344,8 @@ const FIELD_HELP: Record<string, string> = {
   "gateway.remote.sshTarget":
     "Remote gateway over SSH (tunnels the gateway port to localhost). Format: user@host or user@host:port.",
   "gateway.remote.sshIdentity": "Optional SSH identity file path (passed to ssh -i).",
+  "agents.list[].identity.avatar":
+    "Avatar image path (relative to the agent workspace only) or a remote URL/data URL.",
   "gateway.auth.token": "Recommended for all gateways; required for non-loopback binds.",
   "gateway.auth.password": "Required for Tailscale funnel.",
   "gateway.controlUi.basePath":
@@ -613,6 +616,7 @@ const FIELD_PLACEHOLDERS: Record<string, string> = {
   "gateway.remote.tlsFingerprint": "sha256:ab12cd34…",
   "gateway.remote.sshTarget": "user@host",
   "gateway.controlUi.basePath": "/clawdbot",
+  "agents.list[].identity.avatar": "avatars/assistant.png",
 };
 
 const SENSITIVE_PATTERNS = [/token/i, /password/i, /secret/i, /api.?key/i];
diff --git a/src/config/types.base.ts b/src/config/types.base.ts
index 71d051e5b..91eeac1ab 100644
--- a/src/config/types.base.ts
+++ b/src/config/types.base.ts
@@ -154,6 +154,6 @@ export type IdentityConfig = {
   name?: string;
   theme?: string;
   emoji?: string;
-  /** Path to a custom avatar image (relative to workspace or absolute). */
+  /** Avatar image path (workspace-relative) or a URL/data URL. Local files must live in the workspace. */
   avatar?: string;
 };
diff --git a/src/config/zod-schema.core.ts b/src/config/zod-schema.core.ts
index 48066963f..a60d2434d 100644
--- a/src/config/zod-schema.core.ts
+++ b/src/config/zod-schema.core.ts
@@ -86,6 +86,7 @@ export const IdentitySchema = z
     name: z.string().optional(),
     theme: z.string().optional(),
     emoji: z.string().optional(),
+    avatar: z.string().optional(),
   })
   .strict()
   .optional();
diff --git a/src/gateway/control-ui.ts b/src/gateway/control-ui.ts
index e1e31e639..f59786a85 100644
--- a/src/gateway/control-ui.ts
+++ b/src/gateway/control-ui.ts
@@ -4,6 +4,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 
 const ROOT_PREFIX = "/";
+const AVATAR_PREFIX = "/avatar";
 
 export type ControlUiRequestOptions = {
   basePath?: string;
@@ -62,6 +63,10 @@ function contentTypeForExt(ext: string): string {
     case ".jpg":
     case ".jpeg":
       return "image/jpeg";
+    case ".gif":
+      return "image/gif";
+    case ".webp":
+      return "image/webp";
     case ".ico":
       return "image/x-icon";
     case ".txt":
@@ -71,6 +76,83 @@ function contentTypeForExt(ext: string): string {
   }
 }
 
+export type ControlUiAvatarResolution =
+  | { kind: "none"; reason: string }
+  | { kind: "local"; filePath: string }
+  | { kind: "remote"; url: string }
+  | { kind: "data"; url: string };
+
+type ControlUiAvatarMeta = {
+  avatarUrl: string | null;
+};
+
+function sendJson(res: ServerResponse, status: number, body: unknown) {
+  res.statusCode = status;
+  res.setHeader("Content-Type", "application/json; charset=utf-8");
+  res.setHeader("Cache-Control", "no-cache");
+  res.end(JSON.stringify(body));
+}
+
+function buildAvatarUrl(basePath: string, agentId: string): string {
+  return basePath ? `${basePath}${AVATAR_PREFIX}/${agentId}` : `${AVATAR_PREFIX}/${agentId}`;
+}
+
+function isValidAgentId(agentId: string): boolean {
+  return /^[a-z0-9][a-z0-9_-]{0,63}$/i.test(agentId);
+}
+
+export function handleControlUiAvatarRequest(
+  req: IncomingMessage,
+  res: ServerResponse,
+  opts: { basePath?: string; resolveAvatar: (agentId: string) => ControlUiAvatarResolution },
+): boolean {
+  const urlRaw = req.url;
+  if (!urlRaw) return false;
+  if (req.method !== "GET" && req.method !== "HEAD") return false;
+
+  const url = new URL(urlRaw, "http://localhost");
+  const basePath = normalizeControlUiBasePath(opts.basePath);
+  const pathname = url.pathname;
+  const pathWithBase = basePath ? `${basePath}${AVATAR_PREFIX}/` : `${AVATAR_PREFIX}/`;
+  if (!pathname.startsWith(pathWithBase)) return false;
+
+  const agentIdParts = pathname.slice(pathWithBase.length).split("/").filter(Boolean);
+  const agentId = agentIdParts[0] ?? "";
+  if (agentIdParts.length !== 1 || !agentId || !isValidAgentId(agentId)) {
+    respondNotFound(res);
+    return true;
+  }
+
+  if (url.searchParams.get("meta") === "1") {
+    const resolved = opts.resolveAvatar(agentId);
+    const avatarUrl =
+      resolved.kind === "local"
+        ? buildAvatarUrl(basePath, agentId)
+        : resolved.kind === "remote" || resolved.kind === "data"
+          ? resolved.url
+          : null;
+    sendJson(res, 200, { avatarUrl } satisfies ControlUiAvatarMeta);
+    return true;
+  }
+
+  const resolved = opts.resolveAvatar(agentId);
+  if (resolved.kind !== "local") {
+    respondNotFound(res);
+    return true;
+  }
+
+  if (req.method === "HEAD") {
+    res.statusCode = 200;
+    res.setHeader("Content-Type", contentTypeForExt(path.extname(resolved.filePath).toLowerCase()));
+    res.setHeader("Cache-Control", "no-cache");
+    res.end();
+    return true;
+  }
+
+  serveFile(res, resolved.filePath);
+  return true;
+}
+
 function respondNotFound(res: ServerResponse) {
   res.statusCode = 404;
   res.setHeader("Content-Type", "text/plain; charset=utf-8");
diff --git a/src/gateway/server-http.ts b/src/gateway/server-http.ts
index 8638f0823..2d736e092 100644
--- a/src/gateway/server-http.ts
+++ b/src/gateway/server-http.ts
@@ -11,7 +11,9 @@ import { handleA2uiHttpRequest } from "../canvas-host/a2ui.js";
 import type { CanvasHostHandler } from "../canvas-host/server.js";
 import type { createSubsystemLogger } from "../logging/subsystem.js";
 import { handleSlackHttpRequest } from "../slack/http/index.js";
-import { handleControlUiHttpRequest } from "./control-ui.js";
+import { resolveAgentAvatar } from "../agents/identity-avatar.js";
+import { loadConfig } from "../config/config.js";
+import { handleControlUiAvatarRequest, handleControlUiHttpRequest } from "./control-ui.js";
 import {
   extractHookToken,
   getHookChannelError,
@@ -244,6 +246,13 @@ export function createGatewayHttpServer(opts: {
         if (await canvasHost.handleHttpRequest(req, res)) return;
       }
       if (controlUiEnabled) {
+        if (
+          handleControlUiAvatarRequest(req, res, {
+            basePath: controlUiBasePath,
+            resolveAvatar: (agentId) => resolveAgentAvatar(loadConfig(), agentId),
+          })
+        )
+          return;
         if (
           handleControlUiHttpRequest(req, res, {
             basePath: controlUiBasePath,
diff --git a/ui/src/styles/chat/grouped.css b/ui/src/styles/chat/grouped.css
index 36a2c7e01..371cf03c6 100644
--- a/ui/src/styles/chat/grouped.css
+++ b/ui/src/styles/chat/grouped.css
@@ -91,6 +91,7 @@
 
 /* Image avatar support */
 img.chat-avatar {
+  display: block;
   object-fit: cover;
   object-position: center;
 }
diff --git a/ui/src/ui/app-chat.ts b/ui/src/ui/app-chat.ts
index 531379739..81aae3c88 100644
--- a/ui/src/ui/app-chat.ts
+++ b/ui/src/ui/app-chat.ts
@@ -4,6 +4,9 @@ import { generateUUID } from "./uuid";
 import { resetToolStream } from "./app-tool-stream";
 import { scheduleChatScroll } from "./app-scroll";
 import { setLastActiveSessionKey } from "./app-settings";
+import { normalizeBasePath } from "./navigation";
+import type { GatewayHelloOk } from "./gateway";
+import { parseAgentSessionKey } from "../../../src/sessions/session-key-utils.js";
 import type { ClawdbotApp } from "./app";
 
 type ChatHost = {
@@ -13,6 +16,9 @@ type ChatHost = {
   chatRunId: string | null;
   chatSending: boolean;
   sessionKey: string;
+  basePath: string;
+  hello: GatewayHelloOk | null;
+  chatAvatarUrl: string | null;
 };
 
 export function isChatBusy(host: ChatHost) {
@@ -124,8 +130,53 @@ export async function refreshChat(host: ChatHost) {
   await Promise.all([
     loadChatHistory(host as unknown as ClawdbotApp),
     loadSessions(host as unknown as ClawdbotApp),
+    refreshChatAvatar(host),
   ]);
   scheduleChatScroll(host as unknown as Parameters<typeof scheduleChatScroll>[0], true);
 }
 
 export const flushChatQueueForEvent = flushChatQueue;
+
+type SessionDefaultsSnapshot = {
+  defaultAgentId?: string;
+};
+
+function resolveAgentIdForSession(host: ChatHost): string | null {
+  const parsed = parseAgentSessionKey(host.sessionKey);
+  if (parsed?.agentId) return parsed.agentId;
+  const snapshot = host.hello?.snapshot as { sessionDefaults?: SessionDefaultsSnapshot } | undefined;
+  const fallback = snapshot?.sessionDefaults?.defaultAgentId?.trim();
+  return fallback || "main";
+}
+
+function buildAvatarMetaUrl(basePath: string, agentId: string): string {
+  const base = normalizeBasePath(basePath);
+  const encoded = encodeURIComponent(agentId);
+  return base ? `${base}/avatar/${encoded}?meta=1` : `/avatar/${encoded}?meta=1`;
+}
+
+export async function refreshChatAvatar(host: ChatHost) {
+  if (!host.connected) {
+    host.chatAvatarUrl = null;
+    return;
+  }
+  const agentId = resolveAgentIdForSession(host);
+  if (!agentId) {
+    host.chatAvatarUrl = null;
+    return;
+  }
+  host.chatAvatarUrl = null;
+  const url = buildAvatarMetaUrl(host.basePath, agentId);
+  try {
+    const res = await fetch(url, { method: "GET" });
+    if (!res.ok) {
+      host.chatAvatarUrl = null;
+      return;
+    }
+    const data = (await res.json()) as { avatarUrl?: unknown };
+    const avatarUrl = typeof data.avatarUrl === "string" ? data.avatarUrl.trim() : "";
+    host.chatAvatarUrl = avatarUrl || null;
+  } catch {
+    host.chatAvatarUrl = null;
+  }
+}
diff --git a/ui/src/ui/app-render.ts b/ui/src/ui/app-render.ts
index 4a6342ae0..8275ca147 100644
--- a/ui/src/ui/app-render.ts
+++ b/ui/src/ui/app-render.ts
@@ -28,6 +28,7 @@ import type {
   StatusSummary,
 } from "./types";
 import type { ChatQueueItem, CronFormState } from "./ui-types";
+import { refreshChatAvatar } from "./app-chat";
 import { renderChat } from "./views/chat";
 import { renderConfig } from "./views/config";
 import { renderChannels } from "./views/channels";
@@ -413,6 +414,7 @@ export function renderApp(state: AppViewState) {
                   lastActiveSessionKey: next,
                 });
                 void loadChatHistory(state);
+                void refreshChatAvatar(state);
               },
               thinkingLevel: state.chatThinkingLevel,
               showThinking: state.settings.chatShowThinking,
@@ -422,6 +424,7 @@ export function renderApp(state: AppViewState) {
               toolMessages: state.chatToolMessages,
               stream: state.chatStream,
               streamStartedAt: state.chatStreamStartedAt,
+              assistantAvatarUrl: state.chatAvatarUrl,
               draft: state.chatMessage,
               queue: state.chatQueue,
               connected: state.connected,
@@ -432,7 +435,7 @@ export function renderApp(state: AppViewState) {
               focusMode: state.settings.chatFocusMode,
               onRefresh: () => {
                 state.resetToolStream();
-                return loadChatHistory(state);
+                return Promise.all([loadChatHistory(state), refreshChatAvatar(state)]);
               },
               onToggleFocusMode: () =>
                 state.applySettings({
diff --git a/ui/src/ui/app-view-state.ts b/ui/src/ui/app-view-state.ts
index 70d318482..5af2d0a8e 100644
--- a/ui/src/ui/app-view-state.ts
+++ b/ui/src/ui/app-view-state.ts
@@ -48,6 +48,7 @@ export type AppViewState = {
   chatToolMessages: unknown[];
   chatStream: string | null;
   chatRunId: string | null;
+  chatAvatarUrl: string | null;
   chatThinkingLevel: string | null;
   chatQueue: ChatQueueItem[];
   nodesLoading: boolean;
diff --git a/ui/src/ui/app.ts b/ui/src/ui/app.ts
index 9ae886048..53f21316c 100644
--- a/ui/src/ui/app.ts
+++ b/ui/src/ui/app.ts
@@ -106,6 +106,7 @@ export class ClawdbotApp extends LitElement {
   @state() chatStream: string | null = null;
   @state() chatStreamStartedAt: number | null = null;
   @state() chatRunId: string | null = null;
+  @state() chatAvatarUrl: string | null = null;
   @state() chatThinkingLevel: string | null = null;
   @state() chatQueue: ChatQueueItem[] = [];
   // Sidebar state for tool output viewing
diff --git a/ui/src/ui/chat/grouped-render.ts b/ui/src/ui/chat/grouped-render.ts
index ca973ce08..c90493219 100644
--- a/ui/src/ui/chat/grouped-render.ts
+++ b/ui/src/ui/chat/grouped-render.ts
@@ -12,10 +12,10 @@ import {
 } from "./message-extract";
 import { extractToolCards, renderToolCardSidebar } from "./tool-cards";
 
-export function renderReadingIndicatorGroup() {
+export function renderReadingIndicatorGroup(assistantAvatarUrl?: string | null) {
   return html`
     <div class="chat-group assistant">
-      ${renderAvatar("assistant")}
+      ${renderAvatar("assistant", assistantAvatarUrl ?? undefined)}
       <div class="chat-group-messages">
         <div class="chat-bubble chat-reading-indicator" aria-hidden="true">
           <span class="chat-reading-indicator__dots">
@@ -31,6 +31,7 @@ export function renderStreamingGroup(
   text: string,
   startedAt: number,
   onOpenSidebar?: (content: string) => void,
+  assistantAvatarUrl?: string | null,
 ) {
   const timestamp = new Date(startedAt).toLocaleTimeString([], {
     hour: "numeric",
@@ -39,7 +40,7 @@ export function renderStreamingGroup(
 
   return html`
     <div class="chat-group assistant">
-      ${renderAvatar("assistant")}
+      ${renderAvatar("assistant", assistantAvatarUrl ?? undefined)}
       <div class="chat-group-messages">
         ${renderGroupedMessage(
           {
@@ -61,7 +62,11 @@ export function renderStreamingGroup(
 
 export function renderMessageGroup(
   group: MessageGroup,
-  opts: { onOpenSidebar?: (content: string) => void; showReasoning: boolean },
+  opts: {
+    onOpenSidebar?: (content: string) => void;
+    showReasoning: boolean;
+    assistantAvatarUrl?: string | null;
+  },
 ) {
   const normalizedRole = normalizeRoleForGrouping(group.role);
   const who =
@@ -83,7 +88,7 @@ export function renderMessageGroup(
 
   return html`
     <div class="chat-group ${roleClass}">
-      ${renderAvatar(group.role)}
+      ${renderAvatar(group.role, opts.assistantAvatarUrl ?? undefined)}
       <div class="chat-group-messages">
         ${group.messages.map((item, index) =>
           renderGroupedMessage(
diff --git a/ui/src/ui/views/chat.ts b/ui/src/ui/views/chat.ts
index aaa635c61..fddc98b68 100644
--- a/ui/src/ui/views/chat.ts
+++ b/ui/src/ui/views/chat.ts
@@ -28,6 +28,7 @@ export type ChatProps = {
   toolMessages: unknown[];
   stream: string | null;
   streamStartedAt: number | null;
+  assistantAvatarUrl?: string | null;
   draft: string;
   queue: ChatQueueItem[];
   connected: boolean;
@@ -114,7 +115,7 @@ export function renderChat(props: ChatProps) {
               : nothing}
             ${repeat(buildChatItems(props), (item) => item.key, (item) => {
               if (item.kind === "reading-indicator") {
-                return renderReadingIndicatorGroup();
+                return renderReadingIndicatorGroup(props.assistantAvatarUrl ?? null);
               }
 
               if (item.kind === "stream") {
@@ -122,6 +123,7 @@ export function renderChat(props: ChatProps) {
                   item.text,
                   item.startedAt,
                   props.onOpenSidebar,
+                  props.assistantAvatarUrl ?? null,
                 );
               }
 
@@ -129,6 +131,7 @@ export function renderChat(props: ChatProps) {
                 return renderMessageGroup(item, {
                   onOpenSidebar: props.onOpenSidebar,
                   showReasoning,
+                  assistantAvatarUrl: props.assistantAvatarUrl ?? null,
                 });
               }
 

From 5fb6a0fd32fd6e6ed150fced44a76f1b9f7c7221 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:02:42 +0000
Subject: [PATCH 120/171] fix: map OpenCode Zen models to correct APIs

---
 CHANGELOG.md                           |  1 +
 src/agents/opencode-zen-models.test.ts |  2 ++
 src/agents/opencode-zen-models.ts      | 10 +++++-----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51124675b..558f67cb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ Docs: https://docs.clawd.bot
 ### Fixes
 - Config: avoid stack traces for invalid configs and log the config path.
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
+- OpenCode Zen: route models to the Zen API shape per family so proxy endpoints are used. (#1416)
 - macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
 - Cron: cap reminder context history to 10 messages and honor `contextMessages`. (#1103) Thanks @mkbehr.
 - Exec approvals: treat main as the default agent + migrate legacy default allowlists. (#1417) Thanks @czekaj.
diff --git a/src/agents/opencode-zen-models.test.ts b/src/agents/opencode-zen-models.test.ts
index e732bae44..d46b0ac6b 100644
--- a/src/agents/opencode-zen-models.test.ts
+++ b/src/agents/opencode-zen-models.test.ts
@@ -44,6 +44,8 @@ describe("resolveOpencodeZenModelApi", () => {
     expect(resolveOpencodeZenModelApi("minimax-m2.1-free")).toBe("anthropic-messages");
     expect(resolveOpencodeZenModelApi("gemini-3-pro")).toBe("google-generative-ai");
     expect(resolveOpencodeZenModelApi("gpt-5.2")).toBe("openai-responses");
+    expect(resolveOpencodeZenModelApi("alpha-gd4")).toBe("openai-completions");
+    expect(resolveOpencodeZenModelApi("big-pickle")).toBe("openai-completions");
     expect(resolveOpencodeZenModelApi("glm-4.7-free")).toBe("openai-completions");
     expect(resolveOpencodeZenModelApi("some-unknown-model")).toBe("openai-completions");
   });
diff --git a/src/agents/opencode-zen-models.ts b/src/agents/opencode-zen-models.ts
index 6eb87b855..bf1734d5e 100644
--- a/src/agents/opencode-zen-models.ts
+++ b/src/agents/opencode-zen-models.ts
@@ -87,19 +87,19 @@ export function resolveOpencodeZenAlias(modelIdOrAlias: string): string {
 }
 
 /**
- * OpenCode Zen routes models to different APIs based on model family.
+ * OpenCode Zen routes models to specific API shapes by family.
  */
 export function resolveOpencodeZenModelApi(modelId: string): ModelApi {
   const lower = modelId.toLowerCase();
-  if (lower.startsWith("claude-") || lower.startsWith("minimax") || lower.startsWith("alpha-gd4")) {
+  if (lower.startsWith("gpt-")) {
+    return "openai-responses";
+  }
+  if (lower.startsWith("claude-") || lower.startsWith("minimax-")) {
     return "anthropic-messages";
   }
   if (lower.startsWith("gemini-")) {
     return "google-generative-ai";
   }
-  if (lower.startsWith("gpt-")) {
-    return "openai-responses";
-  }
   return "openai-completions";
 }
 

From f40f16608c8390529dd5bb6a51b7ca24ea25e268 Mon Sep 17 00:00:00 2001
From: Maude Bot <maude@maudeco.de>
Date: Wed, 21 Jan 2026 23:03:08 -0500
Subject: [PATCH 121/171] fix(ui): export SECTION_META from config-form module

Export the SECTION_META constant from config-form.render.ts and
re-export it through config-form.ts so it can be imported by config.ts.

This fixes a runtime error where SECTION_META was being referenced
but not properly exported from its source module.
---
 ui/src/ui/views/config-form.render.ts | 2 +-
 ui/src/ui/views/config-form.ts        | 2 +-
 ui/src/ui/views/config.ts             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/ui/views/config-form.render.ts b/ui/src/ui/views/config-form.render.ts
index 60f2feb75..149b40801 100644
--- a/ui/src/ui/views/config-form.render.ts
+++ b/ui/src/ui/views/config-form.render.ts
@@ -54,7 +54,7 @@ const sectionIcons = {
 };
 
 // Section metadata
-const SECTION_META: Record<string, { label: string; description: string }> = {
+export const SECTION_META: Record<string, { label: string; description: string }> = {
   env: { label: "Environment Variables", description: "Environment variables passed to the gateway process" },
   update: { label: "Updates", description: "Auto-update settings and release channel" },
   agents: { label: "Agents", description: "Agent configurations, models, and identities" },
diff --git a/ui/src/ui/views/config-form.ts b/ui/src/ui/views/config-form.ts
index 6675bef26..0bcfe0a9c 100644
--- a/ui/src/ui/views/config-form.ts
+++ b/ui/src/ui/views/config-form.ts
@@ -1,4 +1,4 @@
-export { renderConfigForm, type ConfigFormProps } from "./config-form.render";
+export { renderConfigForm, type ConfigFormProps, SECTION_META } from "./config-form.render";
 export {
   analyzeConfigSchema,
   type ConfigSchemaAnalysis,
diff --git a/ui/src/ui/views/config.ts b/ui/src/ui/views/config.ts
index 9af992024..53b550efe 100644
--- a/ui/src/ui/views/config.ts
+++ b/ui/src/ui/views/config.ts
@@ -1,6 +1,6 @@
 import { html, nothing } from "lit";
 import type { ConfigUiHints } from "../types";
-import { analyzeConfigSchema, renderConfigForm } from "./config-form";
+import { analyzeConfigSchema, renderConfigForm, SECTION_META } from "./config-form";
 import {
   hintForPath,
   humanize,

From 9450873c1b6a8e7ea535693f4563f76eb33657ef Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:05:54 +0000
Subject: [PATCH 122/171] fix: align exec approvals default agent

---
 .../Sources/Clawdbot/ExecApprovals.swift      | 47 +++++++++++++++++--
 docs/tools/exec-approvals.md                  |  1 +
 src/infra/exec-approvals.ts                   |  4 +-
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/ExecApprovals.swift b/apps/macos/Sources/Clawdbot/ExecApprovals.swift
index ad1a18300..53e0b10a8 100644
--- a/apps/macos/Sources/Clawdbot/ExecApprovals.swift
+++ b/apps/macos/Sources/Clawdbot/ExecApprovals.swift
@@ -149,6 +149,7 @@ struct ExecApprovalsResolvedDefaults {
 
 enum ExecApprovalsStore {
     private static let logger = Logger(subsystem: "com.clawdbot", category: "exec-approvals")
+    private static let defaultAgentId = "main"
     private static let defaultSecurity: ExecSecurity = .deny
     private static let defaultAsk: ExecAsk = .onMiss
     private static let defaultAskFallback: ExecSecurity = .deny
@@ -165,13 +166,22 @@ enum ExecApprovalsStore {
     static func normalizeIncoming(_ file: ExecApprovalsFile) -> ExecApprovalsFile {
         let socketPath = file.socket?.path?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let token = file.socket?.token?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        var agents = file.agents ?? [:]
+        if let legacyDefault = agents["default"] {
+            if let main = agents[self.defaultAgentId] {
+                agents[self.defaultAgentId] = self.mergeAgents(current: main, legacy: legacyDefault)
+            } else {
+                agents[self.defaultAgentId] = legacyDefault
+            }
+            agents.removeValue(forKey: "default")
+        }
         return ExecApprovalsFile(
             version: 1,
             socket: ExecApprovalsSocketConfig(
                 path: socketPath.isEmpty ? nil : socketPath,
                 token: token.isEmpty ? nil : token),
             defaults: file.defaults,
-            agents: file.agents)
+            agents: agents)
     }
 
     static func readSnapshot() -> ExecApprovalsSnapshot {
@@ -272,9 +282,7 @@ enum ExecApprovalsStore {
             ask: defaults.ask ?? self.defaultAsk,
             askFallback: defaults.askFallback ?? self.defaultAskFallback,
             autoAllowSkills: defaults.autoAllowSkills ?? self.defaultAutoAllowSkills)
-        let key = (agentId?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false)
-            ? agentId!.trimmingCharacters(in: .whitespacesAndNewlines)
-            : "default"
+        let key = self.agentKey(agentId)
         let agentEntry = file.agents?[key] ?? ExecApprovalsAgent()
         let wildcardEntry = file.agents?["*"] ?? ExecApprovalsAgent()
         let resolvedAgent = ExecApprovalsResolvedDefaults(
@@ -457,7 +465,36 @@ enum ExecApprovalsStore {
 
     private static func agentKey(_ agentId: String?) -> String {
         let trimmed = agentId?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        return trimmed.isEmpty ? "default" : trimmed
+        return trimmed.isEmpty ? self.defaultAgentId : trimmed
+    }
+
+    private static func normalizedPattern(_ pattern: String?) -> String? {
+        let trimmed = pattern?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        return trimmed.isEmpty ? nil : trimmed.lowercased()
+    }
+
+    private static func mergeAgents(
+        current: ExecApprovalsAgent,
+        legacy: ExecApprovalsAgent
+    ) -> ExecApprovalsAgent {
+        var seen = Set<String>()
+        var allowlist: [ExecAllowlistEntry] = []
+        func append(_ entry: ExecAllowlistEntry) {
+            guard let key = self.normalizedPattern(entry.pattern), !seen.contains(key) else {
+                return
+            }
+            seen.insert(key)
+            allowlist.append(entry)
+        }
+        for entry in current.allowlist ?? [] { append(entry) }
+        for entry in legacy.allowlist ?? [] { append(entry) }
+
+        return ExecApprovalsAgent(
+            security: current.security ?? legacy.security,
+            ask: current.ask ?? legacy.ask,
+            askFallback: current.askFallback ?? legacy.askFallback,
+            autoAllowSkills: current.autoAllowSkills ?? legacy.autoAllowSkills,
+            allowlist: allowlist.isEmpty ? nil : allowlist)
     }
 }
 
diff --git a/docs/tools/exec-approvals.md b/docs/tools/exec-approvals.md
index 517b73fbe..4bef999ae 100644
--- a/docs/tools/exec-approvals.md
+++ b/docs/tools/exec-approvals.md
@@ -88,6 +88,7 @@ If a prompt is required but no UI is reachable, fallback decides:
 Allowlists are **per agent**. If multiple agents exist, switch which agent you’re
 editing in the macOS app. Patterns are **case-insensitive glob matches**.
 Patterns should resolve to **binary paths** (basename-only entries are ignored).
+Legacy `agents.default` entries are migrated to `agents.main` on load.
 
 Examples:
 - `~/Projects/**/bin/bird`
diff --git a/src/infra/exec-approvals.ts b/src/infra/exec-approvals.ts
index 616124765..b6d3549f4 100644
--- a/src/infra/exec-approvals.ts
+++ b/src/infra/exec-approvals.ts
@@ -734,7 +734,7 @@ export function recordAllowlistUse(
   command: string,
   resolvedPath?: string,
 ) {
-  const target = agentId ?? "default";
+  const target = agentId ?? DEFAULT_AGENT_ID;
   const agents = approvals.agents ?? {};
   const existing = agents[target] ?? {};
   const allowlist = Array.isArray(existing.allowlist) ? existing.allowlist : [];
@@ -758,7 +758,7 @@ export function addAllowlistEntry(
   agentId: string | undefined,
   pattern: string,
 ) {
-  const target = agentId ?? "default";
+  const target = agentId ?? DEFAULT_AGENT_ID;
   const agents = approvals.agents ?? {};
   const existing = agents[target] ?? {};
   const allowlist = Array.isArray(existing.allowlist) ? existing.allowlist : [];

From 30a8478e1ad68df3118935e98608d983fc22af0a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:09:57 +0000
Subject: [PATCH 123/171] fix: default envelope timestamps to local

---
 CHANGELOG.md                    |  3 +++
 docs/concepts/timezone.md       | 13 +++++++------
 docs/date-time.md               | 17 +++++++++--------
 src/auto-reply/envelope.test.ts | 11 ++++++-----
 src/auto-reply/envelope.ts      |  6 +++---
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 558f67cb3..6c755959c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,9 @@ Docs: https://docs.clawd.bot
 - Signal: add typing indicators and DM read receipts via signal-cli.
 - MSTeams: add file uploads, adaptive cards, and attachment handling improvements. (#1410) Thanks @Evizero.
 
+### Breaking
+- **BREAKING:** Envelope timestamps now default to host-local time (was UTC) so agents don’t have to constantly convert.
+
 ### Fixes
 - Config: avoid stack traces for invalid configs and log the config path.
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
diff --git a/docs/concepts/timezone.md b/docs/concepts/timezone.md
index 3a6d3a4dd..b8b168cc9 100644
--- a/docs/concepts/timezone.md
+++ b/docs/concepts/timezone.md
@@ -9,15 +9,15 @@ read_when:
 
 Clawdbot standardizes timestamps so the model sees a **single reference time**.
 
-## Message envelopes (UTC by default)
+## Message envelopes (local by default)
 
 Inbound messages are wrapped in an envelope like:
 
 ```
-[Provider ... 2026-01-05T21:26Z] message text
+[Provider ... 2026-01-05 16:26 PST] message text
 ```
 
-The timestamp in the envelope is **UTC by default**, with minutes precision.
+The timestamp in the envelope is **host-local by default**, with minutes precision.
 
 You can override this with:
 
@@ -25,7 +25,7 @@ You can override this with:
 {
   agents: {
     defaults: {
-      envelopeTimezone: "user", // "utc" | "local" | "user" | IANA timezone
+      envelopeTimezone: "local", // "utc" | "local" | "user" | IANA timezone
       envelopeTimestamp: "on", // "on" | "off"
       envelopeElapsed: "on" // "on" | "off"
     }
@@ -33,6 +33,7 @@ You can override this with:
 }
 ```
 
+- `envelopeTimezone: "utc"` uses UTC.
 - `envelopeTimezone: "user"` uses `agents.defaults.userTimezone` (falls back to host timezone).
 - Use an explicit IANA timezone (e.g., `"Europe/Vienna"`) for a fixed offset.
 - `envelopeTimestamp: "off"` removes absolute timestamps from envelope headers.
@@ -40,10 +41,10 @@ You can override this with:
 
 ### Examples
 
-**UTC (default):**
+**Local (default):**
 
 ```
-[Signal Alice +1555 2026-01-18T05:19Z] hello
+[Signal Alice +1555 2026-01-18 00:19 PST] hello
 ```
 
 **Fixed timezone:**
diff --git a/docs/date-time.md b/docs/date-time.md
index 99da67630..97383ef38 100644
--- a/docs/date-time.md
+++ b/docs/date-time.md
@@ -7,18 +7,18 @@ read_when:
 
 # Date & Time
 
-Clawdbot defaults to **UTC for transport timestamps** and **user-local time only in the system prompt**.
+Clawdbot defaults to **host-local time for transport timestamps** and **user-local time only in the system prompt**.
 Provider timestamps are preserved so tools keep their native semantics.
 
-## Message envelopes (UTC by default)
+## Message envelopes (local by default)
 
-Inbound messages are wrapped with a UTC timestamp (minute precision):
+Inbound messages are wrapped with a timestamp (minute precision):
 
 ```
-[Provider ... 2026-01-05T21:26Z] message text
+[Provider ... 2026-01-05 16:26 PST] message text
 ```
 
-This envelope timestamp is **UTC by default**, regardless of the host timezone.
+This envelope timestamp is **host-local by default**, regardless of the provider timezone.
 
 You can override this behavior:
 
@@ -26,7 +26,7 @@ You can override this behavior:
 {
   agents: {
     defaults: {
-      envelopeTimezone: "utc", // "utc" | "local" | "user" | IANA timezone
+      envelopeTimezone: "local", // "utc" | "local" | "user" | IANA timezone
       envelopeTimestamp: "on", // "on" | "off"
       envelopeElapsed: "on" // "on" | "off"
     }
@@ -34,6 +34,7 @@ You can override this behavior:
 }
 ```
 
+- `envelopeTimezone: "utc"` uses UTC.
 - `envelopeTimezone: "local"` uses the host timezone.
 - `envelopeTimezone: "user"` uses `agents.defaults.userTimezone` (falls back to host timezone).
 - Use an explicit IANA timezone (e.g., `"America/Chicago"`) for a fixed zone.
@@ -42,10 +43,10 @@ You can override this behavior:
 
 ### Examples
 
-**UTC (default):**
+**Local (default):**
 
 ```
-[WhatsApp +1555 2026-01-18T05:19Z] hello
+[WhatsApp +1555 2026-01-18 00:19 PST] hello
 ```
 
 **User timezone:**
diff --git a/src/auto-reply/envelope.test.ts b/src/auto-reply/envelope.test.ts
index d811fbd2f..7860ecb49 100644
--- a/src/auto-reply/envelope.test.ts
+++ b/src/auto-reply/envelope.test.ts
@@ -18,6 +18,7 @@ describe("formatAgentEnvelope", () => {
       host: "mac-mini",
       ip: "10.0.0.5",
       timestamp: ts,
+      envelope: { timezone: "utc" },
       body: "hello",
     });
 
@@ -26,7 +27,7 @@ describe("formatAgentEnvelope", () => {
     expect(body).toBe("[WebChat user1 mac-mini 10.0.0.5 2025-01-02T03:04Z] hello");
   });
 
-  it("formats timestamps in UTC regardless of local timezone", () => {
+  it("formats timestamps in local timezone by default", () => {
     const originalTz = process.env.TZ;
     process.env.TZ = "America/Los_Angeles";
 
@@ -39,10 +40,10 @@ describe("formatAgentEnvelope", () => {
 
     process.env.TZ = originalTz;
 
-    expect(body).toBe("[WebChat 2025-01-02T03:04Z] hello");
+    expect(body).toMatch(/\[WebChat 2025-01-01 19:04 [^\]]+\] hello/);
   });
 
-  it("formats timestamps in local timezone when configured", () => {
+  it("formats timestamps in UTC when configured", () => {
     const originalTz = process.env.TZ;
     process.env.TZ = "America/Los_Angeles";
 
@@ -50,13 +51,13 @@ describe("formatAgentEnvelope", () => {
     const body = formatAgentEnvelope({
       channel: "WebChat",
       timestamp: ts,
-      envelope: { timezone: "local" },
+      envelope: { timezone: "utc" },
       body: "hello",
     });
 
     process.env.TZ = originalTz;
 
-    expect(body).toMatch(/\[WebChat 2025-01-01 19:04 [^\]]+\] hello/);
+    expect(body).toBe("[WebChat 2025-01-02T03:04Z] hello");
   });
 
   it("formats timestamps in user timezone when configured", () => {
diff --git a/src/auto-reply/envelope.ts b/src/auto-reply/envelope.ts
index 513be2aa4..53622d5e5 100644
--- a/src/auto-reply/envelope.ts
+++ b/src/auto-reply/envelope.ts
@@ -16,7 +16,7 @@ export type AgentEnvelopeParams = {
 
 export type EnvelopeFormatOptions = {
   /**
-   * "utc" (default), "local", "user", or an explicit IANA timezone string.
+   * "local" (default), "utc", "user", or an explicit IANA timezone string.
    */
   timezone?: string;
   /**
@@ -59,7 +59,7 @@ function normalizeEnvelopeOptions(options?: EnvelopeFormatOptions): NormalizedEn
   const includeTimestamp = options?.includeTimestamp !== false;
   const includeElapsed = options?.includeElapsed !== false;
   return {
-    timezone: options?.timezone?.trim() || "utc",
+    timezone: options?.timezone?.trim() || "local",
     includeTimestamp,
     includeElapsed,
     userTimezone: options?.userTimezone,
@@ -77,7 +77,7 @@ function resolveExplicitTimezone(value: string): string | undefined {
 
 function resolveEnvelopeTimezone(options: NormalizedEnvelopeOptions): ResolvedEnvelopeTimezone {
   const trimmed = options.timezone?.trim();
-  if (!trimmed) return { mode: "utc" };
+  if (!trimmed) return { mode: "local" };
   const lowered = trimmed.toLowerCase();
   if (lowered === "utc" || lowered === "gmt") return { mode: "utc" };
   if (lowered === "local" || lowered === "host") return { mode: "local" };

From 5424b4173c54ce65b90f5af1f0fa4e66e85d6736 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:15:39 +0000
Subject: [PATCH 124/171] fix: localize system event timestamps

---
 CHANGELOG.md                                 |  2 +-
 docs/date-time.md                            |  7 +-
 src/auto-reply/reply/session-updates.test.ts |  9 +--
 src/auto-reply/reply/session-updates.ts      | 68 ++++++++++++++++++--
 4 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c755959c..d5e457d2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ Docs: https://docs.clawd.bot
 - MSTeams: add file uploads, adaptive cards, and attachment handling improvements. (#1410) Thanks @Evizero.
 
 ### Breaking
-- **BREAKING:** Envelope timestamps now default to host-local time (was UTC) so agents don’t have to constantly convert.
+- **BREAKING:** Envelope and system event timestamps now default to host-local time (was UTC) so agents don’t have to constantly convert.
 
 ### Fixes
 - Config: avoid stack traces for invalid configs and log the config path.
diff --git a/docs/date-time.md b/docs/date-time.md
index 97383ef38..8b711350d 100644
--- a/docs/date-time.md
+++ b/docs/date-time.md
@@ -74,12 +74,13 @@ Time format: 12-hour
 If only the timezone is known, we still include the section and instruct the model
 to assume UTC for unknown time references.
 
-## System event lines (UTC)
+## System event lines (local by default)
 
-Queued system events inserted into agent context are prefixed with a UTC timestamp:
+Queued system events inserted into agent context are prefixed with a timestamp using the
+same timezone selection as message envelopes (default: host-local).
 
 ```
-System: [2026-01-12T20:19:17Z] Model switched.
+System: [2026-01-12 12:19:17 PST] Model switched.
 ```
 
 ### Configure user timezone + format
diff --git a/src/auto-reply/reply/session-updates.test.ts b/src/auto-reply/reply/session-updates.test.ts
index 05def80da..d673e2b4f 100644
--- a/src/auto-reply/reply/session-updates.test.ts
+++ b/src/auto-reply/reply/session-updates.test.ts
@@ -5,8 +5,10 @@ import { enqueueSystemEvent, resetSystemEventsForTest } from "../../infra/system
 import { prependSystemEvents } from "./session-updates.js";
 
 describe("prependSystemEvents", () => {
-  it("adds a UTC timestamp to queued system events", async () => {
+  it("adds a local timestamp to queued system events by default", async () => {
     vi.useFakeTimers();
+    const originalTz = process.env.TZ;
+    process.env.TZ = "America/Los_Angeles";
     const timestamp = new Date("2026-01-12T20:19:17Z");
     vi.setSystemTime(timestamp);
 
@@ -20,11 +22,10 @@ describe("prependSystemEvents", () => {
       prefixedBodyBase: "User: hi",
     });
 
-    const expectedTimestamp = "2026-01-12T20:19:17Z";
-
-    expect(result).toContain(`System: [${expectedTimestamp}] Model switched.`);
+    expect(result).toMatch(/System: \[2026-01-12 12:19:17 [^\]]+\] Model switched\./);
 
     resetSystemEventsForTest();
+    process.env.TZ = originalTz;
     vi.useRealTimers();
   });
 });
diff --git a/src/auto-reply/reply/session-updates.ts b/src/auto-reply/reply/session-updates.ts
index 227e61cd5..e5ad81d8e 100644
--- a/src/auto-reply/reply/session-updates.ts
+++ b/src/auto-reply/reply/session-updates.ts
@@ -1,5 +1,6 @@
 import crypto from "node:crypto";
 
+import { resolveUserTimezone } from "../../agents/date-time.js";
 import { buildWorkspaceSkillSnapshot } from "../../agents/skills.js";
 import { ensureSkillsWatcher, getSkillsSnapshotVersion } from "../../agents/skills/refresh.js";
 import type { ClawdbotConfig } from "../../config/config.js";
@@ -27,9 +28,32 @@ export async function prependSystemEvents(params: {
     return trimmed;
   };
 
-  const formatSystemEventTimestamp = (ts: number) => {
-    const date = new Date(ts);
-    if (Number.isNaN(date.getTime())) return "unknown-time";
+  const resolveExplicitTimezone = (value: string): string | undefined => {
+    try {
+      new Intl.DateTimeFormat("en-US", { timeZone: value }).format(new Date());
+      return value;
+    } catch {
+      return undefined;
+    }
+  };
+
+  const resolveSystemEventTimezone = (cfg: ClawdbotConfig) => {
+    const raw = cfg.agents?.defaults?.envelopeTimezone?.trim();
+    if (!raw) return { mode: "local" as const };
+    const lowered = raw.toLowerCase();
+    if (lowered === "utc" || lowered === "gmt") return { mode: "utc" as const };
+    if (lowered === "local" || lowered === "host") return { mode: "local" as const };
+    if (lowered === "user") {
+      return {
+        mode: "iana" as const,
+        timeZone: resolveUserTimezone(cfg.agents?.defaults?.userTimezone),
+      };
+    }
+    const explicit = resolveExplicitTimezone(raw);
+    return explicit ? { mode: "iana" as const, timeZone: explicit } : { mode: "local" as const };
+  };
+
+  const formatUtcTimestamp = (date: Date): string => {
     const yyyy = String(date.getUTCFullYear()).padStart(4, "0");
     const mm = String(date.getUTCMonth() + 1).padStart(2, "0");
     const dd = String(date.getUTCDate()).padStart(2, "0");
@@ -39,6 +63,42 @@ export async function prependSystemEvents(params: {
     return `${yyyy}-${mm}-${dd}T${hh}:${min}:${sec}Z`;
   };
 
+  const formatZonedTimestamp = (date: Date, timeZone?: string): string | undefined => {
+    const parts = new Intl.DateTimeFormat("en-US", {
+      timeZone,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      hourCycle: "h23",
+      timeZoneName: "short",
+    }).formatToParts(date);
+    const pick = (type: string) => parts.find((part) => part.type === type)?.value;
+    const yyyy = pick("year");
+    const mm = pick("month");
+    const dd = pick("day");
+    const hh = pick("hour");
+    const min = pick("minute");
+    const sec = pick("second");
+    const tz = [...parts]
+      .reverse()
+      .find((part) => part.type === "timeZoneName")
+      ?.value?.trim();
+    if (!yyyy || !mm || !dd || !hh || !min || !sec) return undefined;
+    return `${yyyy}-${mm}-${dd} ${hh}:${min}:${sec}${tz ? ` ${tz}` : ""}`;
+  };
+
+  const formatSystemEventTimestamp = (ts: number, cfg: ClawdbotConfig) => {
+    const date = new Date(ts);
+    if (Number.isNaN(date.getTime())) return "unknown-time";
+    const zone = resolveSystemEventTimezone(cfg);
+    if (zone.mode === "utc") return formatUtcTimestamp(date);
+    if (zone.mode === "local") return formatZonedTimestamp(date) ?? "unknown-time";
+    return formatZonedTimestamp(date, zone.timeZone) ?? "unknown-time";
+  };
+
   const systemLines: string[] = [];
   const queued = drainSystemEventEntries(params.sessionKey);
   systemLines.push(
@@ -46,7 +106,7 @@ export async function prependSystemEvents(params: {
       .map((event) => {
         const compacted = compactSystemEvent(event.text);
         if (!compacted) return null;
-        return `[${formatSystemEventTimestamp(event.ts)}] ${compacted}`;
+        return `[${formatSystemEventTimestamp(event.ts, params.cfg)}] ${compacted}`;
       })
       .filter((v): v is string => Boolean(v)),
   );

From 9ae03b92bb4958e5d97d512ee90762c2e6203c8b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:11:46 +0000
Subject: [PATCH 125/171] docs: clarify prompt injection guidance

---
 docs/gateway/security.md | 15 +++++++++++++++
 docs/start/faq.md        | 24 ++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/docs/gateway/security.md b/docs/gateway/security.md
index e429205ef..d969ce3e6 100644
--- a/docs/gateway/security.md
+++ b/docs/gateway/security.md
@@ -178,6 +178,20 @@ Even with strong system prompts, **prompt injection is not solved**. What helps
 - Run sensitive tool execution in a sandbox; keep secrets out of the agent’s reachable filesystem.
 - **Model choice matters:** older/legacy models can be less robust against prompt injection and tool misuse. Prefer modern, instruction-hardened models for any bot with tools. We recommend Anthropic Opus 4.5 because it’s quite good at recognizing prompt injections (see [“A step forward on safety”](https://www.anthropic.com/news/claude-opus-4-5)).
 
+### Prompt injection does not require public DMs
+
+Even if **only you** can message the bot, prompt injection can still happen via
+any **untrusted content** the bot reads (web search/fetch results, browser pages,
+emails, docs, attachments, pasted logs/code). In other words: the sender is not
+the only threat surface; the **content itself** can carry adversarial instructions.
+
+When tools are enabled, the typical risk is exfiltrating context or triggering
+tool calls. Reduce the blast radius by:
+- Using a read-only or tool-disabled **reader agent** to summarize untrusted content,
+  then pass the summary to your main agent.
+- Keeping `web_search` / `web_fetch` / `browser` off for tool-enabled agents unless needed.
+- Enabling sandboxing and strict tool allowlists for any agent that touches untrusted input.
+
 ### Model strength (security note)
 
 Prompt injection resistance is **not** uniform across model tiers. Smaller/cheaper models are generally more susceptible to tool misuse and instruction hijacking, especially under adversarial prompts.
@@ -187,6 +201,7 @@ Recommendations:
 - **Avoid weaker tiers** (for example, Sonnet or Haiku) for tool-enabled agents or untrusted inboxes.
 - If you must use a smaller model, **reduce blast radius** (read-only tools, strong sandboxing, minimal filesystem access, strict allowlists).
 - When running small models, **enable sandboxing for all sessions** and **disable web_search/web_fetch/browser** unless inputs are tightly controlled.
+ - For chat-only personal assistants with trusted input and no tools, smaller models are usually fine.
 
 ## Reasoning & verbose output in groups
 
diff --git a/docs/start/faq.md b/docs/start/faq.md
index ff45c89b0..c292303ab 100644
--- a/docs/start/faq.md
+++ b/docs/start/faq.md
@@ -117,6 +117,8 @@ Quick answers plus deeper troubleshooting for real-world setups (local dev, VPS,
   - [My skill generated an image/PDF, but nothing was sent](#my-skill-generated-an-imagepdf-but-nothing-was-sent)
 - [Security and access control](#security-and-access-control)
   - [Is it safe to expose Clawdbot to inbound DMs?](#is-it-safe-to-expose-clawdbot-to-inbound-dms)
+  - [Is prompt injection only a concern for public bots?](#is-prompt-injection-only-a-concern-for-public-bots)
+  - [Can I use cheaper models for personal assistant tasks?](#can-i-use-cheaper-models-for-personal-assistant-tasks)
   - [I ran `/start` in Telegram but didn’t get a pairing code](#i-ran-start-in-telegram-but-didnt-get-a-pairing-code)
   - [WhatsApp: will it message my contacts? How does pairing work?](#whatsapp-will-it-message-my-contacts-how-does-pairing-work)
 - [Chat commands, aborting tasks, and “it won’t stop”](#chat-commands-aborting-tasks-and-it-wont-stop)
@@ -1539,6 +1541,28 @@ Treat inbound DMs as untrusted input. Defaults are designed to reduce risk:
 
 Run `clawdbot doctor` to surface risky DM policies.
 
+### Is prompt injection only a concern for public bots?
+
+No. Prompt injection is about **untrusted content**, not just who can DM the bot.
+If your assistant reads external content (web search/fetch, browser pages, emails,
+docs, attachments, pasted logs), that content can include instructions that try
+to hijack the model. This can happen even if **you are the only sender**.
+
+The biggest risk is when tools are enabled: the model can be tricked into
+exfiltrating context or calling tools on your behalf. Reduce the blast radius by:
+- using a read-only or tool-disabled "reader" agent to summarize untrusted content
+- keeping `web_search` / `web_fetch` / `browser` off for tool-enabled agents
+- sandboxing and strict tool allowlists
+
+Details: [Security](/gateway/security).
+
+### Can I use cheaper models for personal assistant tasks?
+
+Yes, **if** the agent is chat-only and the input is trusted. Smaller tiers are
+more susceptible to instruction hijacking, so avoid them for tool-enabled agents
+or when reading untrusted content. If you must use a smaller model, lock down
+tools and run inside a sandbox. See [Security](/gateway/security).
+
 ### I ran `/start` in Telegram but didn’t get a pairing code
 
 Pairing codes are sent **only** when an unknown sender messages the bot and

From ff3d8cab2bc98b5b8a2c098dfc442b56ab328640 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:19:29 +0000
Subject: [PATCH 126/171] feat: preflight update runner before rebase

---
 docs/cli/update.md                            |  12 +-
 scripts/e2e/Dockerfile                        |   1 +
 scripts/e2e/onboard-docker.sh                 | 122 ++++++++++-----
 src/agents/models.profiles.live.test.ts       |  13 ++
 src/cli/update-cli.ts                         |   6 +-
 .../gateway-models.profiles.live.test.ts      |  45 ++++++
 src/infra/update-runner.test.ts               |   4 +-
 src/infra/update-runner.ts                    | 148 +++++++++++++++++-
 8 files changed, 306 insertions(+), 45 deletions(-)

diff --git a/docs/cli/update.md b/docs/cli/update.md
index acac61b20..9ebe509b0 100644
--- a/docs/cli/update.md
+++ b/docs/cli/update.md
@@ -69,11 +69,13 @@ High-level:
 
 1. Requires a clean worktree (no uncommitted changes).
 2. Switches to the selected channel (tag or branch).
-3. Fetches and rebases against `@{upstream}` (dev only).
-4. Installs deps (pnpm preferred; npm fallback).
-5. Builds + builds the Control UI.
-6. Runs `clawdbot doctor` as the final “safe update” check.
-7. Syncs plugins to the active channel (dev uses bundled extensions; stable/beta uses npm) and updates npm-installed plugins.
+3. Fetches upstream (dev only).
+4. Dev only: preflight lint + TypeScript build in a temp worktree; if the tip fails, walks back up to 10 commits to find the newest clean build.
+5. Rebases onto the selected commit (dev only).
+6. Installs deps (pnpm preferred; npm fallback).
+7. Builds + builds the Control UI.
+8. Runs `clawdbot doctor` as the final “safe update” check.
+9. Syncs plugins to the active channel (dev uses bundled extensions; stable/beta uses npm) and updates npm-installed plugins.
 
 ## `--update` shorthand
 
diff --git a/scripts/e2e/Dockerfile b/scripts/e2e/Dockerfile
index 5092e38d1..b5a7c5500 100644
--- a/scripts/e2e/Dockerfile
+++ b/scripts/e2e/Dockerfile
@@ -11,6 +11,7 @@ COPY src ./src
 COPY scripts ./scripts
 COPY docs ./docs
 COPY skills ./skills
+COPY extensions/memory-core ./extensions/memory-core
 
 RUN pnpm install --frozen-lockfile
 RUN pnpm build
diff --git a/scripts/e2e/onboard-docker.sh b/scripts/e2e/onboard-docker.sh
index 560c2d9a5..42de5434d 100755
--- a/scripts/e2e/onboard-docker.sh
+++ b/scripts/e2e/onboard-docker.sh
@@ -51,14 +51,27 @@ TRASH
     start_s="$(date +%s)"
     while true; do
       if [ -n "${WIZARD_LOG_PATH:-}" ] && [ -f "$WIZARD_LOG_PATH" ]; then
-        if NEEDLE="$needle_compact" node --input-type=module -e "
+        if grep -a -F -q "$needle" "$WIZARD_LOG_PATH"; then
+          return 0
+        fi
+        if NEEDLE=\"$needle_compact\" node --input-type=module -e "
           import fs from \"node:fs\";
           const file = process.env.WIZARD_LOG_PATH;
           const needle = process.env.NEEDLE ?? \"\";
           let text = \"\";
           try { text = fs.readFileSync(file, \"utf8\"); } catch { process.exit(1); }
-          text = text.replace(/\\x1b\\[[0-9;]*[A-Za-z]/g, \"\").replace(/\\s+/g, \"\");
-          process.exit(text.includes(needle) ? 0 : 1);
+          if (text.length > 20000) text = text.slice(-20000);
+          const sanitize = (value) => value.replace(/[\\x00-\\x1f\\x7f]/g, \"\");
+          const haystack = sanitize(text);
+          const safeNeedle = sanitize(needle);
+          const needsEscape = new Set([\"\\\\\", \"^\", \"$\", \".\", \"*\", \"+\", \"?\", \"(\", \")\", \"[\", \"]\", \"{\", \"}\", \"|\"]);
+          let escaped = \"\";
+          for (const ch of safeNeedle) {
+            escaped += needsEscape.has(ch) ? \"\\\\\" + ch : ch;
+          }
+          const pattern = escaped.split(\"\").join(\".*\");
+          const re = new RegExp(pattern, \"i\");
+          process.exit(re.test(haystack) ? 0 : 1);
         "; then
           return 0
         fi
@@ -80,13 +93,35 @@ TRASH
   }
 
   wait_for_gateway() {
-    for _ in $(seq 1 10); do
-      if grep -q "listening on ws://127.0.0.1:18789" /tmp/gateway-e2e.log; then
+    for _ in $(seq 1 20); do
+      if node --input-type=module -e "
+        import net from 'node:net';
+        const socket = net.createConnection({ host: '127.0.0.1', port: 18789 });
+        const timeout = setTimeout(() => {
+          socket.destroy();
+          process.exit(1);
+        }, 500);
+        socket.on('connect', () => {
+          clearTimeout(timeout);
+          socket.end();
+          process.exit(0);
+        });
+        socket.on('error', () => {
+          clearTimeout(timeout);
+          process.exit(1);
+        });
+      " >/dev/null 2>&1; then
         return 0
       fi
+      if [ -f /tmp/gateway-e2e.log ] && grep -E -q "listening on ws://[^ ]+:18789" /tmp/gateway-e2e.log; then
+        if [ -n "${GATEWAY_PID:-}" ] && kill -0 "$GATEWAY_PID" 2>/dev/null; then
+          return 0
+        fi
+      fi
       sleep 1
     done
-    cat /tmp/gateway-e2e.log
+    echo "Gateway failed to start"
+    cat /tmp/gateway-e2e.log || true
     return 1
   }
 
@@ -116,7 +151,7 @@ TRASH
     WIZARD_LOG_PATH="$log_path"
     export WIZARD_LOG_PATH
     # Run under script to keep an interactive TTY for clack prompts.
-    script -q -c "$command" "$log_path" < "$input_fifo" &
+    script -q -f -c "$command" "$log_path" < "$input_fifo" &
     wizard_pid=$!
     exec 3> "$input_fifo"
 
@@ -129,8 +164,18 @@ TRASH
 
     "$send_fn"
 
+    if ! wait "$wizard_pid"; then
+      wizard_status=$?
+      exec 3>&-
+      rm -f "$input_fifo"
+      stop_gateway "$gw_pid"
+      echo "Wizard exited with status $wizard_status"
+      if [ -f "$log_path" ]; then
+        tail -n 160 "$log_path" || true
+      fi
+      exit "$wizard_status"
+    fi
     exec 3>&-
-    wait "$wizard_pid"
     rm -f "$input_fifo"
     stop_gateway "$gw_pid"
     if [ -n "$validate_fn" ]; then
@@ -176,14 +221,18 @@ TRASH
 
   send_local_basic() {
     # Risk acknowledgement (default is "No").
+    wait_for_log "Continue?" 60
     send $'"'"'y\r'"'"' 0.6
     # Choose local gateway, accept defaults, skip channels/skills/daemon, skip UI.
-    send $'"'"'\r'"'"' 0.5
+    if wait_for_log "Where will the Gateway run?" 20; then
+      send $'"'"'\r'"'"' 0.5
+    fi
     select_skip_hooks
   }
 
   send_reset_config_only() {
     # Risk acknowledgement (default is "No").
+    wait_for_log "Continue?" 40 || true
     send $'"'"'y\r'"'"' 0.8
     # Select reset flow for existing config.
     wait_for_log "Config handling" 40 || true
@@ -211,19 +260,27 @@ TRASH
 
   send_skills_flow() {
     # Select skills section and skip optional installs.
-    wait_for_log "Where will the Gateway run?" 40 || true
-    send $'"'"'\r'"'"' 0.8
+    send $'"'"'\r'"'"' 1.2
     # Configure skills now? -> No
-    wait_for_log "Configure skills now?" 40 || true
-    send $'"'"'n\r'"'"' 0.8
-    wait_for_log "Configure complete." 40 || true
-    send "" 0.8
+    send $'"'"'n\r'"'"' 1.5
+    send "" 1.0
   }
 
   run_case_local_basic() {
     local home_dir
     home_dir="$(make_home local-basic)"
-    run_wizard local-basic "$home_dir" send_local_basic validate_local_basic_log
+    export HOME="$home_dir"
+    mkdir -p "$HOME"
+    node dist/index.js onboard \
+      --non-interactive \
+      --accept-risk \
+      --flow quickstart \
+      --mode local \
+      --skip-channels \
+      --skip-skills \
+      --skip-daemon \
+      --skip-ui \
+      --skip-health
 
     # Assert config + workspace scaffolding.
     workspace_dir="$HOME/clawd"
@@ -283,25 +340,6 @@ if (errors.length > 0) {
 }
 NODE
 
-    node dist/index.js gateway --port 18789 --bind loopback > /tmp/gateway.log 2>&1 &
-    GW_PID=$!
-    # Gate on gateway readiness, then run health.
-    for _ in $(seq 1 10); do
-      if grep -q "listening on ws://127.0.0.1:18789" /tmp/gateway.log; then
-        break
-      fi
-      sleep 1
-    done
-
-    if ! grep -q "listening on ws://127.0.0.1:18789" /tmp/gateway.log; then
-      cat /tmp/gateway.log
-      exit 1
-    fi
-
-    node dist/index.js health --timeout 2000 || (cat /tmp/gateway.log && exit 1)
-
-    kill "$GW_PID"
-    wait "$GW_PID" || true
   }
 
   run_case_remote_non_interactive() {
@@ -355,7 +393,7 @@ NODE
     # Seed a remote config to exercise reset path.
     cat > "$HOME/.clawdbot/clawdbot.json" <<'"'"'JSON'"'"'
 {
-  "agent": { "workspace": "/root/old" },
+  "agents": { "defaults": { "workspace": "/root/old" } },
   "gateway": {
     "mode": "remote",
     "remote": { "url": "ws://old.example:18789", "token": "old-token" }
@@ -363,7 +401,17 @@ NODE
 }
 JSON
 
-    run_wizard reset-config "$home_dir" send_reset_config_only
+    node dist/index.js onboard \
+      --non-interactive \
+      --accept-risk \
+      --flow quickstart \
+      --mode local \
+      --reset \
+      --skip-channels \
+      --skip-skills \
+      --skip-daemon \
+      --skip-ui \
+      --skip-health
 
     config_path="$HOME/.clawdbot/clawdbot.json"
     assert_file "$config_path"
diff --git a/src/agents/models.profiles.live.test.ts b/src/agents/models.profiles.live.test.ts
index 032c82992..6d0122d1e 100644
--- a/src/agents/models.profiles.live.test.ts
+++ b/src/agents/models.profiles.live.test.ts
@@ -68,6 +68,10 @@ function isChatGPTUsageLimitErrorMessage(raw: string): boolean {
   return msg.includes("hit your chatgpt usage limit") && msg.includes("try again in");
 }
 
+function isInstructionsRequiredError(raw: string): boolean {
+  return /instructions are required/i.test(raw);
+}
+
 function toInt(value: string | undefined, fallback: number): number {
   const trimmed = value?.trim();
   if (!trimmed) return fallback;
@@ -443,6 +447,15 @@ describeLive("live models (profile keys)", () => {
               logProgress(`${progressLabel}: skip (chatgpt usage limit)`);
               break;
             }
+            if (
+              allowNotFoundSkip &&
+              model.provider === "openai-codex" &&
+              isInstructionsRequiredError(message)
+            ) {
+              skipped.push({ model: id, reason: message });
+              logProgress(`${progressLabel}: skip (instructions required)`);
+              break;
+            }
             logProgress(`${progressLabel}: failed`);
             failures.push({ model: id, error: message });
             break;
diff --git a/src/cli/update-cli.ts b/src/cli/update-cli.ts
index 088a021bf..37ac4fc1c 100644
--- a/src/cli/update-cli.ts
+++ b/src/cli/update-cli.ts
@@ -68,8 +68,12 @@ const STEP_LABELS: Record<string, string> = {
   "clean check": "Working directory is clean",
   "upstream check": "Upstream branch exists",
   "git fetch": "Fetching latest changes",
-  "git rebase": "Rebasing onto upstream",
+  "git rebase": "Rebasing onto target commit",
+  "git rev-parse @{upstream}": "Resolving upstream commit",
+  "git rev-list": "Enumerating candidate commits",
   "git clone": "Cloning git checkout",
+  "preflight worktree": "Preparing preflight worktree",
+  "preflight cleanup": "Cleaning preflight worktree",
   "deps install": "Installing dependencies",
   build: "Building",
   "ui:build": "Building UI",
diff --git a/src/gateway/gateway-models.profiles.live.test.ts b/src/gateway/gateway-models.profiles.live.test.ts
index 5ca96efc9..8b95e6eb8 100644
--- a/src/gateway/gateway-models.profiles.live.test.ts
+++ b/src/gateway/gateway-models.profiles.live.test.ts
@@ -113,6 +113,30 @@ function isChatGPTUsageLimitErrorMessage(raw: string): boolean {
   return msg.includes("hit your chatgpt usage limit") && msg.includes("try again in");
 }
 
+function isInstructionsRequiredError(error: string): boolean {
+  return /instructions are required/i.test(error);
+}
+
+function isOpenAIReasoningSequenceError(error: string): boolean {
+  const msg = error.toLowerCase();
+  return msg.includes("required following item") && msg.includes("reasoning");
+}
+
+function isToolNonceRefusal(error: string): boolean {
+  const msg = error.toLowerCase();
+  if (!msg.includes("nonce")) return false;
+  return (
+    msg.includes("token") ||
+    msg.includes("secret") ||
+    msg.includes("local file") ||
+    msg.includes("disclose") ||
+    msg.includes("can't help") ||
+    msg.includes("can’t help") ||
+    msg.includes("can't comply") ||
+    msg.includes("can’t comply")
+  );
+}
+
 function isMissingProfileError(error: string): boolean {
   return /no credentials found for profile/i.test(error);
 }
@@ -856,6 +880,27 @@ async function runGatewayModelSuite(params: GatewayModelSuiteParams) {
             logProgress(`${progressLabel}: skip (chatgpt usage limit)`);
             break;
           }
+          if (model.provider === "openai-codex" && isInstructionsRequiredError(message)) {
+            skippedCount += 1;
+            logProgress(`${progressLabel}: skip (instructions required)`);
+            break;
+          }
+          if (
+            (model.provider === "openai" || model.provider === "openai-codex") &&
+            isOpenAIReasoningSequenceError(message)
+          ) {
+            skippedCount += 1;
+            logProgress(`${progressLabel}: skip (openai reasoning sequence error)`);
+            break;
+          }
+          if (
+            (model.provider === "openai" || model.provider === "openai-codex") &&
+            isToolNonceRefusal(message)
+          ) {
+            skippedCount += 1;
+            logProgress(`${progressLabel}: skip (tool probe refusal)`);
+            break;
+          }
           if (isMissingProfileError(message)) {
             skippedCount += 1;
             logProgress(`${progressLabel}: skip (missing auth profile)`);
diff --git a/src/infra/update-runner.test.ts b/src/infra/update-runner.test.ts
index f01a03d67..e33159326 100644
--- a/src/infra/update-runner.test.ts
+++ b/src/infra/update-runner.test.ts
@@ -74,7 +74,9 @@ describe("runGatewayUpdate", () => {
         stdout: "origin/main",
       },
       [`git -C ${tempDir} fetch --all --prune --tags`]: { stdout: "" },
-      [`git -C ${tempDir} rebase @{upstream}`]: { code: 1, stderr: "conflict" },
+      [`git -C ${tempDir} rev-parse @{upstream}`]: { stdout: "upstream123" },
+      [`git -C ${tempDir} rev-list --max-count=10 upstream123`]: { stdout: "upstream123\n" },
+      [`git -C ${tempDir} rebase upstream123`]: { code: 1, stderr: "conflict" },
       [`git -C ${tempDir} rebase --abort`]: { stdout: "" },
     });
 
diff --git a/src/infra/update-runner.ts b/src/infra/update-runner.ts
index 994788ee2..0a5196fd7 100644
--- a/src/infra/update-runner.ts
+++ b/src/infra/update-runner.ts
@@ -1,4 +1,5 @@
 import fs from "node:fs/promises";
+import os from "node:os";
 import path from "node:path";
 
 import { type CommandOptions, runCommandWithTimeout } from "../process/exec.js";
@@ -63,6 +64,7 @@ type UpdateRunnerOptions = {
 
 const DEFAULT_TIMEOUT_MS = 20 * 60_000;
 const MAX_LOG_CHARS = 8000;
+const PREFLIGHT_MAX_COMMITS = 10;
 const START_DIRS = ["cwd", "argv1", "process"];
 
 function normalizeDir(value?: string | null) {
@@ -420,8 +422,152 @@ export async function runGatewayUpdate(opts: UpdateRunnerOptions = {}): Promise<
       );
       steps.push(fetchStep);
 
+      const upstreamShaStep = await runStep(
+        step(
+          "git rev-parse @{upstream}",
+          ["git", "-C", gitRoot, "rev-parse", "@{upstream}"],
+          gitRoot,
+        ),
+      );
+      steps.push(upstreamShaStep);
+      const upstreamSha = upstreamShaStep.stdoutTail?.trim();
+      if (!upstreamShaStep.stdoutTail || !upstreamSha) {
+        return {
+          status: "error",
+          mode: "git",
+          root: gitRoot,
+          reason: "no-upstream-sha",
+          before: { sha: beforeSha, version: beforeVersion },
+          steps,
+          durationMs: Date.now() - startedAt,
+        };
+      }
+
+      const revListStep = await runStep(
+        step(
+          "git rev-list",
+          ["git", "-C", gitRoot, "rev-list", `--max-count=${PREFLIGHT_MAX_COMMITS}`, upstreamSha],
+          gitRoot,
+        ),
+      );
+      steps.push(revListStep);
+      if (revListStep.exitCode !== 0) {
+        return {
+          status: "error",
+          mode: "git",
+          root: gitRoot,
+          reason: "preflight-revlist-failed",
+          before: { sha: beforeSha, version: beforeVersion },
+          steps,
+          durationMs: Date.now() - startedAt,
+        };
+      }
+
+      const candidates = (revListStep.stdoutTail ?? "")
+        .split("\n")
+        .map((line) => line.trim())
+        .filter(Boolean);
+      if (candidates.length === 0) {
+        return {
+          status: "error",
+          mode: "git",
+          root: gitRoot,
+          reason: "preflight-no-candidates",
+          before: { sha: beforeSha, version: beforeVersion },
+          steps,
+          durationMs: Date.now() - startedAt,
+        };
+      }
+
+      const manager = await detectPackageManager(gitRoot);
+      const preflightRoot = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-update-preflight-"));
+      const worktreeDir = path.join(preflightRoot, "worktree");
+      const worktreeStep = await runStep(
+        step(
+          "preflight worktree",
+          ["git", "-C", gitRoot, "worktree", "add", "--detach", worktreeDir, upstreamSha],
+          gitRoot,
+        ),
+      );
+      steps.push(worktreeStep);
+      if (worktreeStep.exitCode !== 0) {
+        await fs.rm(preflightRoot, { recursive: true, force: true }).catch(() => {});
+        return {
+          status: "error",
+          mode: "git",
+          root: gitRoot,
+          reason: "preflight-worktree-failed",
+          before: { sha: beforeSha, version: beforeVersion },
+          steps,
+          durationMs: Date.now() - startedAt,
+        };
+      }
+
+      let selectedSha: string | null = null;
+      try {
+        for (const sha of candidates) {
+          const shortSha = sha.slice(0, 8);
+          const checkoutStep = await runStep(
+            step(
+              `preflight checkout (${shortSha})`,
+              ["git", "-C", worktreeDir, "checkout", "--detach", sha],
+              worktreeDir,
+            ),
+          );
+          steps.push(checkoutStep);
+          if (checkoutStep.exitCode !== 0) continue;
+
+          const depsStep = await runStep(
+            step(`preflight deps install (${shortSha})`, managerInstallArgs(manager), worktreeDir),
+          );
+          steps.push(depsStep);
+          if (depsStep.exitCode !== 0) continue;
+
+          const lintStep = await runStep(
+            step(`preflight lint (${shortSha})`, managerScriptArgs(manager, "lint"), worktreeDir),
+          );
+          steps.push(lintStep);
+          if (lintStep.exitCode !== 0) continue;
+
+          const buildStep = await runStep(
+            step(`preflight build (${shortSha})`, managerScriptArgs(manager, "build"), worktreeDir),
+          );
+          steps.push(buildStep);
+          if (buildStep.exitCode !== 0) continue;
+
+          selectedSha = sha;
+          break;
+        }
+      } finally {
+        const removeStep = await runStep(
+          step(
+            "preflight cleanup",
+            ["git", "-C", gitRoot, "worktree", "remove", "--force", worktreeDir],
+            gitRoot,
+          ),
+        );
+        steps.push(removeStep);
+        await runCommand(["git", "-C", gitRoot, "worktree", "prune"], {
+          cwd: gitRoot,
+          timeoutMs,
+        }).catch(() => null);
+        await fs.rm(preflightRoot, { recursive: true, force: true }).catch(() => {});
+      }
+
+      if (!selectedSha) {
+        return {
+          status: "error",
+          mode: "git",
+          root: gitRoot,
+          reason: "preflight-no-good-commit",
+          before: { sha: beforeSha, version: beforeVersion },
+          steps,
+          durationMs: Date.now() - startedAt,
+        };
+      }
+
       const rebaseStep = await runStep(
-        step("git rebase", ["git", "-C", gitRoot, "rebase", "@{upstream}"], gitRoot),
+        step("git rebase", ["git", "-C", gitRoot, "rebase", selectedSha], gitRoot),
       );
       steps.push(rebaseStep);
       if (rebaseStep.exitCode !== 0) {

From fd597a796b1f1371ec19b511d99294fde9d0d672 Mon Sep 17 00:00:00 2001
From: James Groat <james@groat.com>
Date: Wed, 21 Jan 2026 21:27:34 -0700
Subject: [PATCH 127/171] Browser: suppress Chrome restore prompt

---
 src/browser/chrome.profile-decoration.ts |  8 ++++++++
 src/browser/chrome.test.ts               | 13 +++++++++++++
 src/browser/chrome.ts                    | 20 ++++++++++++++++++--
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/browser/chrome.profile-decoration.ts b/src/browser/chrome.profile-decoration.ts
index 7c5d96d6f..49192466c 100644
--- a/src/browser/chrome.profile-decoration.ts
+++ b/src/browser/chrome.profile-decoration.ts
@@ -180,3 +180,11 @@ export function decorateClawdProfile(
     // ignore
   }
 }
+
+export function ensureProfileCleanExit(userDataDir: string) {
+  const preferencesPath = path.join(userDataDir, "Default", "Preferences");
+  const prefs = safeReadJson(preferencesPath) ?? {};
+  setDeep(prefs, ["exit_type"], "Normal");
+  setDeep(prefs, ["exited_cleanly"], true);
+  safeWriteJson(preferencesPath, prefs);
+}
diff --git a/src/browser/chrome.test.ts b/src/browser/chrome.test.ts
index a8a42ae95..da8e384da 100644
--- a/src/browser/chrome.test.ts
+++ b/src/browser/chrome.test.ts
@@ -7,6 +7,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 
 import {
   decorateClawdProfile,
+  ensureProfileCleanExit,
   findChromeExecutableMac,
   findChromeExecutableWindows,
   isChromeReachable,
@@ -103,6 +104,18 @@ describe("browser chrome profile decoration", () => {
     }
   });
 
+  it("writes clean exit prefs to avoid restore prompts", async () => {
+    const userDataDir = await fsp.mkdtemp(path.join(os.tmpdir(), "clawdbot-chrome-test-"));
+    try {
+      ensureProfileCleanExit(userDataDir);
+      const prefs = await readJson(path.join(userDataDir, "Default", "Preferences"));
+      expect(prefs.exit_type).toBe("Normal");
+      expect(prefs.exited_cleanly).toBe(true);
+    } finally {
+      await fsp.rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+
   it("is idempotent when rerun on an existing profile", async () => {
     const userDataDir = await fsp.mkdtemp(path.join(os.tmpdir(), "clawdbot-chrome-test-"));
     try {
diff --git a/src/browser/chrome.ts b/src/browser/chrome.ts
index eebf399bc..6f610bcc4 100644
--- a/src/browser/chrome.ts
+++ b/src/browser/chrome.ts
@@ -13,7 +13,11 @@ import {
   type BrowserExecutable,
   resolveBrowserExecutableForPlatform,
 } from "./chrome.executables.js";
-import { decorateClawdProfile, isProfileDecorated } from "./chrome.profile-decoration.js";
+import {
+  decorateClawdProfile,
+  ensureProfileCleanExit,
+  isProfileDecorated,
+} from "./chrome.profile-decoration.js";
 import type { ResolvedBrowserConfig, ResolvedBrowserProfile } from "./config.js";
 import { DEFAULT_CLAWD_BROWSER_COLOR, DEFAULT_CLAWD_BROWSER_PROFILE_NAME } from "./constants.js";
 
@@ -26,7 +30,11 @@ export {
   findChromeExecutableWindows,
   resolveBrowserExecutableForPlatform,
 } from "./chrome.executables.js";
-export { decorateClawdProfile, isProfileDecorated } from "./chrome.profile-decoration.js";
+export {
+  decorateClawdProfile,
+  ensureProfileCleanExit,
+  isProfileDecorated,
+} from "./chrome.profile-decoration.js";
 
 function exists(filePath: string) {
   try {
@@ -178,6 +186,8 @@ export async function launchClawdChrome(
       "--disable-background-networking",
       "--disable-component-update",
       "--disable-features=Translate,MediaRouter",
+      "--disable-session-crashed-bubble",
+      "--hide-crash-restore-bubble",
       "--password-store=basic",
     ];
 
@@ -246,6 +256,12 @@ export async function launchClawdChrome(
     }
   }
 
+  try {
+    ensureProfileCleanExit(userDataDir);
+  } catch (err) {
+    log.warn(`clawd browser clean-exit prefs failed: ${String(err)}`);
+  }
+
   const proc = spawnOnce();
   // Wait for CDP to come up.
   const readyDeadline = Date.now() + 15_000;

From 55ead9636c7c6ae7902a4f3a43a49faa633ef727 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:28:50 +0000
Subject: [PATCH 128/171] docs: add /model allowlist troubleshooting note

---
 CHANGELOG.md                 | 1 +
 docs/help/troubleshooting.md | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5e457d2d..355cee7ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Docs: https://docs.clawd.bot
 - Highlight: Lobster optional plugin tool for typed workflows + approval gates. https://docs.clawd.bot/tools/lobster
 - Memory: prevent CLI hangs by deferring vector probes, adding sqlite-vec/embedding timeouts, and showing sync progress early.
 - Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
+- Docs: add /model allowlist troubleshooting note. (#1405)
 - Docs: add per-message Gmail search example for gog. (#1220) Thanks @mbelinky.
 - Onboarding: remove the run setup-token auth option (paste setup-token or reuse CLI creds instead).
 - Signal: add typing indicators and DM read receipts via signal-cli.
diff --git a/docs/help/troubleshooting.md b/docs/help/troubleshooting.md
index 94e769764..1cef34b11 100644
--- a/docs/help/troubleshooting.md
+++ b/docs/help/troubleshooting.md
@@ -53,6 +53,15 @@ Almost always a Node/npm PATH issue. Start here:
 - [Models](/cli/models)
 - [OAuth / auth concepts](/concepts/oauth)
 
+### `/model` says `model not allowed`
+
+This usually means `agents.defaults.models` is configured as an allowlist. When it’s non-empty,
+only those provider/model keys can be selected.
+
+- Check the allowlist: `clawdbot config get agents.defaults.models`
+- Add the model you want (or clear the allowlist) and retry `/model`
+- Use `/models` to browse the allowed providers/models
+
 ### When filing an issue
 
 Paste a safe report:

From 351c73be01686800bd2a71969eea35b462dee7d0 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:26:18 +0000
Subject: [PATCH 129/171] docs: fix npm prefix guidance

---
 docs/install/index.md |  9 ++++++---
 docs/install/node.md  | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/docs/install/index.md b/docs/install/index.md
index 467ea6bf0..57b09c4cf 100644
--- a/docs/install/index.md
+++ b/docs/install/index.md
@@ -155,18 +155,21 @@ Quick diagnosis:
 ```bash
 node -v
 npm -v
-npm bin -g
+npm prefix -g
 echo "$PATH"
 ```
 
-If the output of `npm bin -g` is **not** present inside `echo "$PATH"`, your shell can’t find global npm binaries (including `clawdbot`).
+If `$(npm prefix -g)/bin` (macOS/Linux) or `$(npm prefix -g)` (Windows) is **not** present inside `echo "$PATH"`, your shell can’t find global npm binaries (including `clawdbot`).
 
 Fix: add it to your shell startup file (zsh: `~/.zshrc`, bash: `~/.bashrc`):
 
 ```bash
-export PATH="/path/from/npm/bin/-g:$PATH"
+# macOS / Linux
+export PATH="$(npm prefix -g)/bin:$PATH"
 ```
 
+On Windows, add the output of `npm prefix -g` to your PATH.
+
 Then open a new terminal (or `rehash` in zsh / `hash -r` in bash).
 
 ## Update / uninstall
diff --git a/docs/install/node.md b/docs/install/node.md
index 8987a859b..6a622e198 100644
--- a/docs/install/node.md
+++ b/docs/install/node.md
@@ -19,33 +19,36 @@ Run:
 ```bash
 node -v
 npm -v
-npm bin -g
+npm prefix -g
 echo "$PATH"
 ```
 
-If the output of `npm bin -g` is **not** present inside `echo "$PATH"`, your shell can’t find global npm binaries (including `clawdbot`).
+If `$(npm prefix -g)/bin` (macOS/Linux) or `$(npm prefix -g)` (Windows) is **not** present inside `echo "$PATH"`, your shell can’t find global npm binaries (including `clawdbot`).
 
 ## Fix: put npm’s global bin dir on PATH
 
-1) Find your global bin directory:
+1) Find your global npm prefix:
 
 ```bash
-npm bin -g
+npm prefix -g
 ```
 
-2) Add it to your shell startup file:
+2) Add the global npm bin directory to your shell startup file:
 
 - zsh: `~/.zshrc`
 - bash: `~/.bashrc`
 
-Example (replace the path with your `npm bin -g` output):
+Example (replace the path with your `npm prefix -g` output):
 
 ```bash
-export PATH="/path/from/npm/bin/-g:$PATH"
+# macOS / Linux
+export PATH="/path/from/npm/prefix/bin:$PATH"
 ```
 
 Then open a **new terminal** (or run `rehash` in zsh / `hash -r` in bash).
 
+On Windows, add the output of `npm prefix -g` to your PATH.
+
 ## Fix: avoid `sudo npm install -g` / permission errors (Linux)
 
 If `npm install -g ...` fails with `EACCES`, switch npm’s global prefix to a user-writable directory:
@@ -63,7 +66,7 @@ Persist the `export PATH=...` line in your shell startup file.
 You’ll have the fewest surprises if Node/npm are installed in a way that:
 
 - keeps Node updated (22+)
-- makes `npm bin -g` stable and on PATH in new shells
+- makes the global npm bin dir stable and on PATH in new shells
 
 Common choices:
 

From 13dab38a2683291dd1e1e4961f06904ffcad2c95 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:31:11 +0000
Subject: [PATCH 130/171] fix: retry lobster spawn on windows

---
 extensions/lobster/src/lobster-tool.ts | 42 +++++++++++++++++++++-----
 src/infra/exec-approvals.test.ts       |  5 +--
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/extensions/lobster/src/lobster-tool.ts b/extensions/lobster/src/lobster-tool.ts
index 71dade859..60c0a2429 100644
--- a/extensions/lobster/src/lobster-tool.ts
+++ b/extensions/lobster/src/lobster-tool.ts
@@ -29,13 +29,22 @@ function resolveExecutablePath(lobsterPathRaw: string | undefined) {
   return lobsterPath;
 }
 
-async function runLobsterSubprocess(params: {
-  execPath: string;
-  argv: string[];
-  cwd: string;
-  timeoutMs: number;
-  maxStdoutBytes: number;
-}) {
+function isWindowsSpawnEINVAL(err: unknown) {
+  if (!err || typeof err !== "object") return false;
+  const code = (err as { code?: unknown }).code;
+  return code === "EINVAL";
+}
+
+async function runLobsterSubprocessOnce(
+  params: {
+    execPath: string;
+    argv: string[];
+    cwd: string;
+    timeoutMs: number;
+    maxStdoutBytes: number;
+  },
+  useShell: boolean,
+) {
   const { execPath, argv, cwd } = params;
   const timeoutMs = Math.max(200, params.timeoutMs);
   const maxStdoutBytes = Math.max(1024, params.maxStdoutBytes);
@@ -51,6 +60,8 @@ async function runLobsterSubprocess(params: {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       env,
+      shell: useShell,
+      windowsHide: useShell ? true : undefined,
     });
 
     let stdout = "";
@@ -102,6 +113,23 @@ async function runLobsterSubprocess(params: {
   });
 }
 
+async function runLobsterSubprocess(params: {
+  execPath: string;
+  argv: string[];
+  cwd: string;
+  timeoutMs: number;
+  maxStdoutBytes: number;
+}) {
+  try {
+    return await runLobsterSubprocessOnce(params, false);
+  } catch (err) {
+    if (process.platform === "win32" && isWindowsSpawnEINVAL(err)) {
+      return await runLobsterSubprocessOnce(params, true);
+    }
+    throw err;
+  }
+}
+
 function parseEnvelope(stdout: string): LobsterEnvelope {
   let parsed: unknown;
   try {
diff --git a/src/infra/exec-approvals.test.ts b/src/infra/exec-approvals.test.ts
index 0bb12c192..f6d77b2f1 100644
--- a/src/infra/exec-approvals.test.ts
+++ b/src/infra/exec-approvals.test.ts
@@ -253,10 +253,7 @@ describe("exec approvals default agent migration", () => {
     };
     const resolved = resolveExecApprovalsFromFile({ file });
     expect(resolved.agent.ask).toBe("always");
-    expect(resolved.allowlist.map((entry) => entry.pattern)).toEqual([
-      "/bin/main",
-      "/bin/legacy",
-    ]);
+    expect(resolved.allowlist.map((entry) => entry.pattern)).toEqual(["/bin/main", "/bin/legacy"]);
     expect(resolved.file.agents?.default).toBeUndefined();
   });
 });

From b60db040e26d3ea6bdb0bc0e13757edaff9b710c Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:49:34 +0000
Subject: [PATCH 131/171] test: align envelope timestamps with local tz

---
 ...patterns-match-without-botusername.test.ts |  15 +-
 ...gram-bot.installs-grammy-throttler.test.ts |   2 +-
 src/telegram/bot.test.ts                      | 138 ++++++++++--------
 ....reconnects-after-connection-close.test.ts |   4 +-
 4 files changed, 92 insertions(+), 67 deletions(-)

diff --git a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
index 7134d7d3b..eae2de919 100644
--- a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
+++ b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
 import { createTelegramBot } from "./bot.js";
 
@@ -89,6 +89,7 @@ vi.mock("grammy", () => ({
 const sequentializeMiddleware = vi.fn();
 const sequentializeSpy = vi.fn(() => sequentializeMiddleware);
 let _sequentializeKey: ((ctx: unknown) => string) | undefined;
+let originalTz: string | undefined;
 vi.mock("@grammyjs/runner", () => ({
   sequentialize: (keyFn: (ctx: unknown) => string) => {
     _sequentializeKey = keyFn;
@@ -120,6 +121,8 @@ const getOnHandler = (event: string) => {
 
 describe("createTelegramBot", () => {
   beforeEach(() => {
+    originalTz = process.env.TZ;
+    process.env.TZ = "UTC";
     resetInboundDedupe();
     loadConfig.mockReturnValue({
       channels: {
@@ -138,6 +141,10 @@ describe("createTelegramBot", () => {
     _sequentializeKey = undefined;
   });
 
+  afterEach(() => {
+    process.env.TZ = originalTz;
+  });
+
   // groupPolicy tests
 
   it("accepts group messages when mentionPatterns match (without @botUsername)", async () => {
@@ -176,7 +183,9 @@ describe("createTelegramBot", () => {
     expect(payload.WasMentioned).toBe(true);
     expect(payload.SenderName).toBe("Ada");
     expect(payload.SenderId).toBe("9");
-    expect(payload.Body).toMatch(/^\[Telegram Test Group id:7 (\+\d+[smhd] )?2025-01-09T00:00Z\]/);
+    expect(payload.Body).toMatch(
+      /^\[Telegram Test Group id:7 (\+\d+[smhd] )?2025-01-09 00:00 [^\]]+\]/,
+    );
   });
   it("keeps group envelope headers stable (sender identity is separate)", async () => {
     onSpy.mockReset();
@@ -217,7 +226,7 @@ describe("createTelegramBot", () => {
     expect(payload.SenderName).toBe("Ada Lovelace");
     expect(payload.SenderId).toBe("99");
     expect(payload.SenderUsername).toBe("ada");
-    expect(payload.Body).toMatch(/^\[Telegram Ops id:42 (\+\d+[smhd] )?2025-01-09T00:00Z\]/);
+    expect(payload.Body).toMatch(/^\[Telegram Ops id:42 (\+\d+[smhd] )?2025-01-09 00:00 [^\]]+\]/);
   });
   it("reacts to mention-gated group messages when ackReaction is enabled", async () => {
     onSpy.mockReset();
diff --git a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
index de7f6b62b..cabdfeae7 100644
--- a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
+++ b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
@@ -329,7 +329,7 @@ describe("createTelegramBot", () => {
       expect(replySpy).toHaveBeenCalledTimes(1);
       const payload = replySpy.mock.calls[0][0];
       expect(payload.Body).toMatch(
-        /^\[Telegram Ada Lovelace \(@ada_bot\) id:1234 (\+\d+[smhd] )?2025-01-09T00:00Z\]/,
+        /^\[Telegram Ada Lovelace \(@ada_bot\) id:1234 (\+\d+[smhd] )?2025-01-09 01:00 [^\]]+\]/,
       );
       expect(payload.Body).toContain("hello world");
     } finally {
diff --git a/src/telegram/bot.test.ts b/src/telegram/bot.test.ts
index 77f50b41f..2e7c86cf8 100644
--- a/src/telegram/bot.test.ts
+++ b/src/telegram/bot.test.ts
@@ -451,7 +451,7 @@ describe("createTelegramBot", () => {
       expect(replySpy).toHaveBeenCalledTimes(1);
       const payload = replySpy.mock.calls[0][0];
       expect(payload.Body).toMatch(
-        /^\[Telegram Ada Lovelace \(@ada_bot\) id:1234 (\+\d+[smhd] )?2025-01-09T00:00Z\]/,
+        /^\[Telegram Ada Lovelace \(@ada_bot\) id:1234 (\+\d+[smhd] )?2025-01-09 01:00 [^\]]+\]/,
       );
       expect(payload.Body).toContain("hello world");
     } finally {
@@ -551,86 +551,102 @@ describe("createTelegramBot", () => {
   });
 
   it("accepts group messages when mentionPatterns match (without @botUsername)", async () => {
+    const originalTz = process.env.TZ;
+    process.env.TZ = "UTC";
     onSpy.mockReset();
     const replySpy = replyModule.__replySpy as unknown as ReturnType<typeof vi.fn>;
     replySpy.mockReset();
 
-    loadConfig.mockReturnValue({
-      identity: { name: "Bert" },
-      messages: { groupChat: { mentionPatterns: ["\\bbert\\b"] } },
-      channels: {
-        telegram: {
-          groupPolicy: "open",
-          groups: { "*": { requireMention: true } },
+    try {
+      loadConfig.mockReturnValue({
+        identity: { name: "Bert" },
+        messages: { groupChat: { mentionPatterns: ["\\bbert\\b"] } },
+        channels: {
+          telegram: {
+            groupPolicy: "open",
+            groups: { "*": { requireMention: true } },
+          },
         },
-      },
-    });
+      });
 
-    createTelegramBot({ token: "tok" });
-    const handler = getOnHandler("message") as (ctx: Record<string, unknown>) => Promise<void>;
+      createTelegramBot({ token: "tok" });
+      const handler = getOnHandler("message") as (ctx: Record<string, unknown>) => Promise<void>;
 
-    await handler({
-      message: {
-        chat: { id: 7, type: "group", title: "Test Group" },
-        text: "bert: introduce yourself",
-        date: 1736380800,
-        message_id: 1,
-        from: { id: 9, first_name: "Ada" },
-      },
-      me: { username: "clawdbot_bot" },
-      getFile: async () => ({ download: async () => new Uint8Array() }),
-    });
+      await handler({
+        message: {
+          chat: { id: 7, type: "group", title: "Test Group" },
+          text: "bert: introduce yourself",
+          date: 1736380800,
+          message_id: 1,
+          from: { id: 9, first_name: "Ada" },
+        },
+        me: { username: "clawdbot_bot" },
+        getFile: async () => ({ download: async () => new Uint8Array() }),
+      });
 
-    expect(replySpy).toHaveBeenCalledTimes(1);
-    const payload = replySpy.mock.calls[0][0];
-    expectInboundContextContract(payload);
-    expect(payload.WasMentioned).toBe(true);
-    expect(payload.Body).toMatch(/^\[Telegram Test Group id:7 (\+\d+[smhd] )?2025-01-09T00:00Z\]/);
-    expect(payload.SenderName).toBe("Ada");
-    expect(payload.SenderId).toBe("9");
+      expect(replySpy).toHaveBeenCalledTimes(1);
+      const payload = replySpy.mock.calls[0][0];
+      expectInboundContextContract(payload);
+      expect(payload.WasMentioned).toBe(true);
+      expect(payload.Body).toMatch(
+        /^\[Telegram Test Group id:7 (\+\d+[smhd] )?2025-01-09 00:00 [^\]]+\]/,
+      );
+      expect(payload.SenderName).toBe("Ada");
+      expect(payload.SenderId).toBe("9");
+    } finally {
+      process.env.TZ = originalTz;
+    }
   });
 
   it("includes sender identity in group envelope headers", async () => {
+    const originalTz = process.env.TZ;
+    process.env.TZ = "UTC";
     onSpy.mockReset();
     const replySpy = replyModule.__replySpy as unknown as ReturnType<typeof vi.fn>;
     replySpy.mockReset();
 
-    loadConfig.mockReturnValue({
-      channels: {
-        telegram: {
-          groupPolicy: "open",
-          groups: { "*": { requireMention: false } },
+    try {
+      loadConfig.mockReturnValue({
+        channels: {
+          telegram: {
+            groupPolicy: "open",
+            groups: { "*": { requireMention: false } },
+          },
         },
-      },
-    });
+      });
 
-    createTelegramBot({ token: "tok" });
-    const handler = getOnHandler("message") as (ctx: Record<string, unknown>) => Promise<void>;
+      createTelegramBot({ token: "tok" });
+      const handler = getOnHandler("message") as (ctx: Record<string, unknown>) => Promise<void>;
 
-    await handler({
-      message: {
-        chat: { id: 42, type: "group", title: "Ops" },
-        text: "hello",
-        date: 1736380800,
-        message_id: 2,
-        from: {
-          id: 99,
-          first_name: "Ada",
-          last_name: "Lovelace",
-          username: "ada",
+      await handler({
+        message: {
+          chat: { id: 42, type: "group", title: "Ops" },
+          text: "hello",
+          date: 1736380800,
+          message_id: 2,
+          from: {
+            id: 99,
+            first_name: "Ada",
+            last_name: "Lovelace",
+            username: "ada",
+          },
         },
-      },
-      me: { username: "clawdbot_bot" },
-      getFile: async () => ({ download: async () => new Uint8Array() }),
-    });
+        me: { username: "clawdbot_bot" },
+        getFile: async () => ({ download: async () => new Uint8Array() }),
+      });
 
-    expect(replySpy).toHaveBeenCalledTimes(1);
-    const payload = replySpy.mock.calls[0][0];
-    expectInboundContextContract(payload);
-    expect(payload.Body).toMatch(/^\[Telegram Ops id:42 (\+\d+[smhd] )?2025-01-09T00:00Z\]/);
-    expect(payload.SenderName).toBe("Ada Lovelace");
-    expect(payload.SenderId).toBe("99");
-    expect(payload.SenderUsername).toBe("ada");
+      expect(replySpy).toHaveBeenCalledTimes(1);
+      const payload = replySpy.mock.calls[0][0];
+      expectInboundContextContract(payload);
+      expect(payload.Body).toMatch(
+        /^\[Telegram Ops id:42 (\+\d+[smhd] )?2025-01-09 00:00 [^\]]+\]/,
+      );
+      expect(payload.SenderName).toBe("Ada Lovelace");
+      expect(payload.SenderId).toBe("99");
+      expect(payload.SenderUsername).toBe("ada");
+    } finally {
+      process.env.TZ = originalTz;
+    }
   });
 
   it("reacts to mention-gated group messages when ackReaction is enabled", async () => {
diff --git a/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts b/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts
index 411875e21..b9a15e869 100644
--- a/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts
+++ b/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts
@@ -329,11 +329,11 @@ describe("web auto-reply", () => {
       const firstArgs = resolver.mock.calls[0][0];
       const secondArgs = resolver.mock.calls[1][0];
       expect(firstArgs.Body).toMatch(
-        /\[WhatsApp \+1 (\+\d+[smhd] )?2025-01-01T00:00Z\] \[clawdbot\] first/,
+        /\[WhatsApp \+1 (\+\d+[smhd] )?2025-01-01 01:00 [^\]]+\] \[clawdbot\] first/,
       );
       expect(firstArgs.Body).not.toContain("second");
       expect(secondArgs.Body).toMatch(
-        /\[WhatsApp \+1 (\+\d+[smhd] )?2025-01-01T01:00Z\] \[clawdbot\] second/,
+        /\[WhatsApp \+1 (\+\d+[smhd] )?2025-01-01 02:00 [^\]]+\] \[clawdbot\] second/,
       );
       expect(secondArgs.Body).not.toContain("first");
 

From f02960df26774e07ef48a203907831be8f9b3cd6 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:49:49 +0000
Subject: [PATCH 132/171] fix: avoid whatsapp config resurrection

---
 CHANGELOG.md                                  |  1 +
 ...etection.rejects-routing-allowfrom.test.ts | 36 +++++++++++++++++--
 src/config/legacy.migrations.part-1.ts        | 27 +++++++++-----
 3 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 355cee7ad..86c881fd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ Docs: https://docs.clawd.bot
 
 ### Fixes
 - Config: avoid stack traces for invalid configs and log the config path.
+- Doctor: avoid recreating WhatsApp config when only legacy routing keys remain. (#900)
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
 - OpenCode Zen: route models to the Zen API shape per family so proxy endpoints are used. (#1416)
 - macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
diff --git a/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts b/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts
index fd0f2f296..dbc08339d 100644
--- a/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts
+++ b/src/config/config.legacy-config-detection.rejects-routing-allowfrom.test.ts
@@ -23,21 +23,33 @@ describe("legacy config detection", () => {
       expect(res.issues[0]?.path).toBe("routing.groupChat.requireMention");
     }
   });
-  it("migrates routing.allowFrom to channels.whatsapp.allowFrom", async () => {
+  it("migrates routing.allowFrom to channels.whatsapp.allowFrom when whatsapp configured", async () => {
     vi.resetModules();
     const { migrateLegacyConfig } = await import("./config.js");
     const res = migrateLegacyConfig({
       routing: { allowFrom: ["+15555550123"] },
+      channels: { whatsapp: {} },
     });
     expect(res.changes).toContain("Moved routing.allowFrom → channels.whatsapp.allowFrom.");
     expect(res.config?.channels?.whatsapp?.allowFrom).toEqual(["+15555550123"]);
     expect(res.config?.routing?.allowFrom).toBeUndefined();
   });
-  it("migrates routing.groupChat.requireMention to channels whatsapp/telegram/imessage groups", async () => {
+  it("drops routing.allowFrom when whatsapp missing", async () => {
+    vi.resetModules();
+    const { migrateLegacyConfig } = await import("./config.js");
+    const res = migrateLegacyConfig({
+      routing: { allowFrom: ["+15555550123"] },
+    });
+    expect(res.changes).toContain("Removed routing.allowFrom (channels.whatsapp not configured).");
+    expect(res.config?.channels?.whatsapp).toBeUndefined();
+    expect(res.config?.routing?.allowFrom).toBeUndefined();
+  });
+  it("migrates routing.groupChat.requireMention to channels whatsapp/telegram/imessage groups when whatsapp configured", async () => {
     vi.resetModules();
     const { migrateLegacyConfig } = await import("./config.js");
     const res = migrateLegacyConfig({
       routing: { groupChat: { requireMention: false } },
+      channels: { whatsapp: {} },
     });
     expect(res.changes).toContain(
       'Moved routing.groupChat.requireMention → channels.whatsapp.groups."*".requireMention.',
@@ -53,6 +65,26 @@ describe("legacy config detection", () => {
     expect(res.config?.channels?.imessage?.groups?.["*"]?.requireMention).toBe(false);
     expect(res.config?.routing?.groupChat?.requireMention).toBeUndefined();
   });
+  it("migrates routing.groupChat.requireMention to telegram/imessage when whatsapp missing", async () => {
+    vi.resetModules();
+    const { migrateLegacyConfig } = await import("./config.js");
+    const res = migrateLegacyConfig({
+      routing: { groupChat: { requireMention: false } },
+    });
+    expect(res.changes).toContain(
+      'Moved routing.groupChat.requireMention → channels.telegram.groups."*".requireMention.',
+    );
+    expect(res.changes).toContain(
+      'Moved routing.groupChat.requireMention → channels.imessage.groups."*".requireMention.',
+    );
+    expect(res.changes).not.toContain(
+      'Moved routing.groupChat.requireMention → channels.whatsapp.groups."*".requireMention.',
+    );
+    expect(res.config?.channels?.whatsapp).toBeUndefined();
+    expect(res.config?.channels?.telegram?.groups?.["*"]?.requireMention).toBe(false);
+    expect(res.config?.channels?.imessage?.groups?.["*"]?.requireMention).toBe(false);
+    expect(res.config?.routing?.groupChat?.requireMention).toBeUndefined();
+  });
   it("migrates routing.groupChat.mentionPatterns to messages.groupChat.mentionPatterns", async () => {
     vi.resetModules();
     const { migrateLegacyConfig } = await import("./config.js");
diff --git a/src/config/legacy.migrations.part-1.ts b/src/config/legacy.migrations.part-1.ts
index d1d0a57e7..f537c3ce8 100644
--- a/src/config/legacy.migrations.part-1.ts
+++ b/src/config/legacy.migrations.part-1.ts
@@ -156,11 +156,16 @@ export const LEGACY_CONFIG_MIGRATIONS_PART_1: LegacyConfigMigration[] = [
       const allowFrom = (routing as Record<string, unknown>).allowFrom;
       if (allowFrom === undefined) return;
 
-      const channels = ensureRecord(raw, "channels");
-      const whatsapp =
-        channels.whatsapp && typeof channels.whatsapp === "object"
-          ? (channels.whatsapp as Record<string, unknown>)
-          : {};
+      const channels = getRecord(raw.channels);
+      const whatsapp = channels ? getRecord(channels.whatsapp) : null;
+      if (!whatsapp) {
+        delete (routing as Record<string, unknown>).allowFrom;
+        if (Object.keys(routing as Record<string, unknown>).length === 0) {
+          delete raw.routing;
+        }
+        changes.push("Removed routing.allowFrom (channels.whatsapp not configured).");
+        return;
+      }
 
       if (whatsapp.allowFrom === undefined) {
         whatsapp.allowFrom = allowFrom;
@@ -173,8 +178,8 @@ export const LEGACY_CONFIG_MIGRATIONS_PART_1: LegacyConfigMigration[] = [
       if (Object.keys(routing as Record<string, unknown>).length === 0) {
         delete raw.routing;
       }
-      channels.whatsapp = whatsapp;
-      raw.channels = channels;
+      channels!.whatsapp = whatsapp;
+      raw.channels = channels!;
     },
   },
   {
@@ -193,7 +198,11 @@ export const LEGACY_CONFIG_MIGRATIONS_PART_1: LegacyConfigMigration[] = [
       if (requireMention === undefined) return;
 
       const channels = ensureRecord(raw, "channels");
-      const applyTo = (key: "whatsapp" | "telegram" | "imessage") => {
+      const applyTo = (
+        key: "whatsapp" | "telegram" | "imessage",
+        options?: { requireExisting?: boolean },
+      ) => {
+        if (options?.requireExisting && !isRecord(channels[key])) return;
         const section =
           channels[key] && typeof channels[key] === "object"
             ? (channels[key] as Record<string, unknown>)
@@ -222,7 +231,7 @@ export const LEGACY_CONFIG_MIGRATIONS_PART_1: LegacyConfigMigration[] = [
         }
       };
 
-      applyTo("whatsapp");
+      applyTo("whatsapp", { requireExisting: true });
       applyTo("telegram");
       applyTo("imessage");
 

From 9ead31211856eb50ab6ddbf04731c7e7df067d12 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:45:46 +0000
Subject: [PATCH 133/171] feat(macos): move location access to permissions tab

---
 .../Sources/Clawdbot/GeneralSettings.swift    | 60 ----------------
 .../Clawdbot/PermissionsSettings.swift        | 70 +++++++++++++++++++
 2 files changed, 70 insertions(+), 60 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/GeneralSettings.swift b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
index 5c64f0d63..daa07466d 100644
--- a/apps/macos/Sources/Clawdbot/GeneralSettings.swift
+++ b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
@@ -2,15 +2,12 @@ import AppKit
 import ClawdbotDiscovery
 import ClawdbotIPC
 import ClawdbotKit
-import CoreLocation
 import Observation
 import SwiftUI
 
 struct GeneralSettings: View {
     @Bindable var state: AppState
     @AppStorage(cameraEnabledKey) private var cameraEnabled: Bool = false
-    @AppStorage(locationModeKey) private var locationModeRaw: String = ClawdbotLocationMode.off.rawValue
-    @AppStorage(locationPreciseKey) private var locationPreciseEnabled: Bool = true
     private let healthStore = HealthStore.shared
     private let gatewayManager = GatewayProcessManager.shared
     @State private var gatewayDiscovery = GatewayDiscoveryModel(
@@ -20,7 +17,6 @@ struct GeneralSettings: View {
     @State private var showRemoteAdvanced = false
     private let isPreview = ProcessInfo.processInfo.isPreview
     private var isNixMode: Bool { ProcessInfo.processInfo.isNixMode }
-    @State private var lastLocationModeRaw: String = ClawdbotLocationMode.off.rawValue
 
     var body: some View {
         ScrollView(.vertical) {
@@ -60,27 +56,6 @@ struct GeneralSettings: View {
                         subtitle: "Allow the agent to capture a photo or short video via the built-in camera.",
                         binding: self.$cameraEnabled)
 
-                    VStack(alignment: .leading, spacing: 6) {
-                        Text("Location Access")
-                            .font(.body)
-
-                        Picker("", selection: self.$locationModeRaw) {
-                            Text("Off").tag(ClawdbotLocationMode.off.rawValue)
-                            Text("While Using").tag(ClawdbotLocationMode.whileUsing.rawValue)
-                            Text("Always").tag(ClawdbotLocationMode.always.rawValue)
-                        }
-                        .labelsHidden()
-                        .pickerStyle(.menu)
-
-                        Toggle("Precise Location", isOn: self.$locationPreciseEnabled)
-                            .disabled(self.locationMode == .off)
-
-                        Text("Always may require System Settings to approve background location.")
-                            .font(.footnote)
-                            .foregroundStyle(.tertiary)
-                            .fixedSize(horizontal: false, vertical: true)
-                    }
-
                     SettingsToggleRow(
                         title: "Enable Peekaboo Bridge",
                         subtitle: "Allow signed tools (e.g. `peekaboo`) to drive UI automation via PeekabooBridge.",
@@ -106,27 +81,12 @@ struct GeneralSettings: View {
         .onAppear {
             guard !self.isPreview else { return }
             self.refreshGatewayStatus()
-            self.lastLocationModeRaw = self.locationModeRaw
         }
         .onChange(of: self.state.canvasEnabled) { _, enabled in
             if !enabled {
                 CanvasManager.shared.hideAll()
             }
         }
-        .onChange(of: self.locationModeRaw) { _, newValue in
-            let previous = self.lastLocationModeRaw
-            self.lastLocationModeRaw = newValue
-            guard let mode = ClawdbotLocationMode(rawValue: newValue) else { return }
-            Task {
-                let granted = await self.requestLocationAuthorization(mode: mode)
-                if !granted {
-                    await MainActor.run {
-                        self.locationModeRaw = previous
-                        self.lastLocationModeRaw = previous
-                    }
-                }
-            }
-        }
     }
 
     private var activeBinding: Binding<Bool> {
@@ -135,26 +95,6 @@ struct GeneralSettings: View {
             set: { self.state.isPaused = !$0 })
     }
 
-    private var locationMode: ClawdbotLocationMode {
-        ClawdbotLocationMode(rawValue: self.locationModeRaw) ?? .off
-    }
-
-    private func requestLocationAuthorization(mode: ClawdbotLocationMode) async -> Bool {
-        guard mode != .off else { return true }
-        guard CLLocationManager.locationServicesEnabled() else {
-            await MainActor.run { LocationPermissionHelper.openSettings() }
-            return false
-        }
-
-        let status = CLLocationManager().authorizationStatus
-        let requireAlways = mode == .always
-        if PermissionManager.isLocationAuthorized(status: status, requireAlways: requireAlways) {
-            return true
-        }
-        let updated = await LocationPermissionRequester.shared.request(always: requireAlways)
-        return PermissionManager.isLocationAuthorized(status: updated, requireAlways: requireAlways)
-    }
-
     private var connectionSection: some View {
         VStack(alignment: .leading, spacing: 10) {
             Text("Clawdbot runs")
diff --git a/apps/macos/Sources/Clawdbot/PermissionsSettings.swift b/apps/macos/Sources/Clawdbot/PermissionsSettings.swift
index edce7f41b..f5a926032 100644
--- a/apps/macos/Sources/Clawdbot/PermissionsSettings.swift
+++ b/apps/macos/Sources/Clawdbot/PermissionsSettings.swift
@@ -1,4 +1,6 @@
 import ClawdbotIPC
+import ClawdbotKit
+import CoreLocation
 import SwiftUI
 
 struct PermissionsSettings: View {
@@ -17,6 +19,8 @@ struct PermissionsSettings: View {
                 .padding(.horizontal, 2)
                 .padding(.vertical, 6)
 
+            LocationAccessSettings()
+
             Button("Restart onboarding") { self.showOnboarding() }
                 .buttonStyle(.bordered)
             Spacer()
@@ -26,6 +30,72 @@ struct PermissionsSettings: View {
     }
 }
 
+private struct LocationAccessSettings: View {
+    @AppStorage(locationModeKey) private var locationModeRaw: String = ClawdbotLocationMode.off.rawValue
+    @AppStorage(locationPreciseKey) private var locationPreciseEnabled: Bool = true
+    @State private var lastLocationModeRaw: String = ClawdbotLocationMode.off.rawValue
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 6) {
+            Text("Location Access")
+                .font(.body)
+
+            Picker("", selection: self.$locationModeRaw) {
+                Text("Off").tag(ClawdbotLocationMode.off.rawValue)
+                Text("While Using").tag(ClawdbotLocationMode.whileUsing.rawValue)
+                Text("Always").tag(ClawdbotLocationMode.always.rawValue)
+            }
+            .labelsHidden()
+            .pickerStyle(.menu)
+
+            Toggle("Precise Location", isOn: self.$locationPreciseEnabled)
+                .disabled(self.locationMode == .off)
+
+            Text("Always may require System Settings to approve background location.")
+                .font(.footnote)
+                .foregroundStyle(.tertiary)
+                .fixedSize(horizontal: false, vertical: true)
+        }
+        .onAppear {
+            self.lastLocationModeRaw = self.locationModeRaw
+        }
+        .onChange(of: self.locationModeRaw) { _, newValue in
+            let previous = self.lastLocationModeRaw
+            self.lastLocationModeRaw = newValue
+            guard let mode = ClawdbotLocationMode(rawValue: newValue) else { return }
+            Task {
+                let granted = await self.requestLocationAuthorization(mode: mode)
+                if !granted {
+                    await MainActor.run {
+                        self.locationModeRaw = previous
+                        self.lastLocationModeRaw = previous
+                    }
+                }
+            }
+        }
+    }
+
+    private var locationMode: ClawdbotLocationMode {
+        ClawdbotLocationMode(rawValue: self.locationModeRaw) ?? .off
+    }
+
+    private func requestLocationAuthorization(mode: ClawdbotLocationMode) async -> Bool {
+        guard mode != .off else { return true }
+        guard CLLocationManager.locationServicesEnabled() else {
+            await MainActor.run { LocationPermissionHelper.openSettings() }
+            return false
+        }
+
+        let status = CLLocationManager().authorizationStatus
+        let requireAlways = mode == .always
+        if PermissionManager.isLocationAuthorized(status: status, requireAlways: requireAlways) {
+            return true
+        }
+        let updated = await LocationPermissionRequester.shared.request(always: requireAlways)
+        return PermissionManager.isLocationAuthorized(status: updated, requireAlways: requireAlways)
+    }
+}
+
 struct PermissionStatusList: View {
     let status: [Capability: Bool]
     let refresh: () async -> Void

From 50049fd220e981a1165195802e396f4b5b8ea80e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:49:16 +0000
Subject: [PATCH 134/171] chore(macos): drop time-sensitive notification
 entitlement toggle

---
 scripts/codesign-mac-app.sh | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/scripts/codesign-mac-app.sh b/scripts/codesign-mac-app.sh
index 318fc8d60..d8eab87c6 100755
--- a/scripts/codesign-mac-app.sh
+++ b/scripts/codesign-mac-app.sh
@@ -7,7 +7,6 @@ TIMESTAMP_MODE="${CODESIGN_TIMESTAMP:-auto}"
 DISABLE_LIBRARY_VALIDATION="${DISABLE_LIBRARY_VALIDATION:-0}"
 SKIP_TEAM_ID_CHECK="${SKIP_TEAM_ID_CHECK:-0}"
 ENT_TMP_BASE=$(mktemp -t clawdbot-entitlements-base.XXXXXX)
-ENT_TMP_APP=$(mktemp -t clawdbot-entitlements-app.XXXXXX)
 ENT_TMP_APP_BASE=$(mktemp -t clawdbot-entitlements-app-base.XXXXXX)
 ENT_TMP_RUNTIME=$(mktemp -t clawdbot-entitlements-runtime.XXXXXX)
 
@@ -21,7 +20,6 @@ Env:
   CODESIGN_TIMESTAMP=auto|on|off
   DISABLE_LIBRARY_VALIDATION=1      # dev-only Sparkle Team ID workaround
   SKIP_TEAM_ID_CHECK=1              # bypass Team ID audit
-  ENABLE_TIME_SENSITIVE_NOTIFICATIONS=1
 HELP
   exit 0
 fi
@@ -182,43 +180,13 @@ cat > "$ENT_TMP_RUNTIME" <<'PLIST'
 </plist>
 PLIST
 
-cat > "$ENT_TMP_APP" <<'PLIST'
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>com.apple.developer.usernotifications.time-sensitive</key>
-    <true/>
-    <key>com.apple.security.automation.apple-events</key>
-    <true/>
-    <key>com.apple.security.device.audio-input</key>
-    <true/>
-    <key>com.apple.security.device.camera</key>
-    <true/>
-    <key>com.apple.security.personal-information.location</key>
-    <true/>
-</dict>
-</plist>
-PLIST
-
 if [[ "$DISABLE_LIBRARY_VALIDATION" == "1" ]]; then
   /usr/libexec/PlistBuddy -c "Add :com.apple.security.cs.disable-library-validation bool true" "$ENT_TMP_APP_BASE" >/dev/null 2>&1 || \
     /usr/libexec/PlistBuddy -c "Set :com.apple.security.cs.disable-library-validation true" "$ENT_TMP_APP_BASE"
-  /usr/libexec/PlistBuddy -c "Add :com.apple.security.cs.disable-library-validation bool true" "$ENT_TMP_APP" >/dev/null 2>&1 || \
-    /usr/libexec/PlistBuddy -c "Set :com.apple.security.cs.disable-library-validation true" "$ENT_TMP_APP"
   echo "Note: disable-library-validation entitlement enabled (DISABLE_LIBRARY_VALIDATION=1)."
 fi
 
-# The time-sensitive entitlement is restricted and requires explicit enablement
-# (and typically a matching provisioning profile). It is *not* safe to enable
-# unconditionally for local debug packaging since AMFI will refuse to launch.
 APP_ENTITLEMENTS="$ENT_TMP_APP_BASE"
-if [[ "${ENABLE_TIME_SENSITIVE_NOTIFICATIONS:-}" == "1" ]]; then
-  APP_ENTITLEMENTS="$ENT_TMP_APP"
-else
-  echo "Note: Time Sensitive Notifications entitlement disabled."
-  echo "      To force it: ENABLE_TIME_SENSITIVE_NOTIFICATIONS=1 scripts/codesign-mac-app.sh <app>"
-fi
 
 # clear extended attributes to avoid stale signatures
 xattr -cr "$APP_BUNDLE" 2>/dev/null || true

From 9063b9e61d68f5a3a1c90becece596ad8253e426 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:51:36 +0000
Subject: [PATCH 135/171] chore(pnpm): update lockfile

---
 pnpm-lock.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2827b8511..f66d3c25f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -301,6 +301,8 @@ importers:
 
   extensions/imessage: {}
 
+  extensions/lobster: {}
+
   extensions/matrix:
     dependencies:
       '@matrix-org/matrix-sdk-crypto-nodejs':

From 4dca662a5d6ab342eb68b430d9f242103e127b3c Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 04:51:39 +0000
Subject: [PATCH 136/171] chore(canvas): update a2ui bundle hash

---
 src/canvas-host/a2ui/.bundle.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/canvas-host/a2ui/.bundle.hash b/src/canvas-host/a2ui/.bundle.hash
index 6e2a91754..91cb22241 100644
--- a/src/canvas-host/a2ui/.bundle.hash
+++ b/src/canvas-host/a2ui/.bundle.hash
@@ -1 +1 @@
-27d5aed982d9f110b44e85254877597e49efae61141de480b4e9f254c04131ce
+0ae29522de4c48c6b6407290be18b94d7244d4e0036738abd19d93148f2c8cd4

From d912b02a4368e77e097aa8a094e6c82298e9b591 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:05:30 +0000
Subject: [PATCH 137/171] docs: add control ui dev gatewayUrl note

---
 docs/web/control-ui.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/web/control-ui.md b/docs/web/control-ui.md
index 0d473c858..bcead1b7a 100644
--- a/docs/web/control-ui.md
+++ b/docs/web/control-ui.md
@@ -134,3 +134,29 @@ pnpm ui:dev # auto-installs UI deps on first run
 ```
 
 Then point the UI at your Gateway WS URL (e.g. `ws://127.0.0.1:18789`).
+
+## Debugging/testing: dev server + remote Gateway
+
+The Control UI is static files; the WebSocket target is configurable and can be
+different from the HTTP origin. This is handy when you want the Vite dev server
+locally but the Gateway runs elsewhere.
+
+1) Start the UI dev server: `pnpm ui:dev`
+2) Open a URL like:
+
+```text
+http://localhost:5173/?gatewayUrl=ws://<gateway-host>:18789
+```
+
+Optional one-time auth (if needed):
+
+```text
+http://localhost:5173/?gatewayUrl=wss://<gateway-host>:18789&token=<gateway-token>
+```
+
+Notes:
+- `gatewayUrl` is stored in localStorage after load and removed from the URL.
+- `token` is stored in localStorage; `password` is kept in memory only.
+- Use `wss://` when the Gateway is behind TLS (Tailscale Serve, HTTPS proxy, etc.).
+
+Remote access setup details: [Remote access](/gateway/remote).

From 8d73c16488ecc61fcf3e3b4a9a70ab998020ca41 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:16:38 +0000
Subject: [PATCH 138/171] fix: add changelog for Chrome restore prompt (#1419)
 (thanks @jamesgroat)

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86c881fd1..2366a0c7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ Docs: https://docs.clawd.bot
 - Doctor: avoid recreating WhatsApp config when only legacy routing keys remain. (#900)
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
 - OpenCode Zen: route models to the Zen API shape per family so proxy endpoints are used. (#1416)
+- Browser: suppress Chrome restore prompts for managed profiles. (#1419) Thanks @jamesgroat.
 - macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
 - Cron: cap reminder context history to 10 messages and honor `contextMessages`. (#1103) Thanks @mkbehr.
 - Exec approvals: treat main as the default agent + migrate legacy default allowlists. (#1417) Thanks @czekaj.

From e0896de2bf18c8494186c32c0fba81d85e16dd8b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:07:40 +0000
Subject: [PATCH 139/171] feat: surface repo root in runtime prompt

---
 docs/concepts/system-prompt.md                |   2 +-
 docs/gateway/configuration.md                 |  12 ++
 src/agents/cli-runner/helpers.ts              |   2 +
 src/agents/pi-embedded-runner/run/attempt.ts  |   2 +
 src/agents/system-prompt-params.test.ts       | 106 ++++++++++++++++++
 src/agents/system-prompt-params.ts            |  58 ++++++++++
 src/agents/system-prompt.test.ts              |   2 +
 src/agents/system-prompt.ts                   |   3 +
 .../reply/commands-context-report.ts          |   2 +
 src/config/schema.ts                          |   3 +
 src/config/types.agent-defaults.ts            |   2 +
 src/config/zod-schema.agent-defaults.ts       |   1 +
 ...patterns-match-without-botusername.test.ts |   4 +-
 13 files changed, 197 insertions(+), 2 deletions(-)
 create mode 100644 src/agents/system-prompt-params.test.ts

diff --git a/docs/concepts/system-prompt.md b/docs/concepts/system-prompt.md
index b46f11578..1a52fc501 100644
--- a/docs/concepts/system-prompt.md
+++ b/docs/concepts/system-prompt.md
@@ -24,7 +24,7 @@ The prompt is intentionally compact and uses fixed sections:
 - **Current Date & Time**: user-local time, timezone, and time format.
 - **Reply Tags**: optional reply tag syntax for supported providers.
 - **Heartbeats**: heartbeat prompt and ack behavior.
-- **Runtime**: host, OS, node, model, thinking level (one line).
+- **Runtime**: host, OS, node, model, repo root (when detected), thinking level (one line).
 - **Reasoning**: current visibility level + /reasoning toggle hint.
 
 ## Prompt modes
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index 6cdc39394..1665fdcc8 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -1266,6 +1266,18 @@ Default: `~/clawd`.
 If `agents.defaults.sandbox` is enabled, non-main sessions can override this with their
 own per-scope workspaces under `agents.defaults.sandbox.workspaceRoot`.
 
+### `agents.defaults.repoRoot`
+
+Optional repository root to show in the system prompt’s Runtime line. If unset, Clawdbot
+tries to detect a `.git` directory by walking upward from the workspace (and current
+working directory). The path must exist to be used.
+
+```json5
+{
+  agents: { defaults: { repoRoot: "~/Projects/clawdbot" } }
+}
+```
+
 ### `agents.defaults.skipBootstrap`
 
 Disables automatic creation of the workspace bootstrap files (`AGENTS.md`, `SOUL.md`, `TOOLS.md`, `IDENTITY.md`, `USER.md`, and `BOOTSTRAP.md`).
diff --git a/src/agents/cli-runner/helpers.ts b/src/agents/cli-runner/helpers.ts
index c1d96ea71..26ee43495 100644
--- a/src/agents/cli-runner/helpers.ts
+++ b/src/agents/cli-runner/helpers.ts
@@ -183,6 +183,8 @@ export function buildSystemPrompt(params: {
   const { runtimeInfo, userTimezone, userTime, userTimeFormat } = buildSystemPromptParams({
     config: params.config,
     agentId: params.agentId,
+    workspaceDir: params.workspaceDir,
+    cwd: process.cwd(),
     runtime: {
       host: "clawdbot",
       os: `${os.type()} ${os.release()}`,
diff --git a/src/agents/pi-embedded-runner/run/attempt.ts b/src/agents/pi-embedded-runner/run/attempt.ts
index 19450226c..f16a71759 100644
--- a/src/agents/pi-embedded-runner/run/attempt.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.ts
@@ -279,6 +279,8 @@ export async function runEmbeddedAttempt(
     const { runtimeInfo, userTimezone, userTime, userTimeFormat } = buildSystemPromptParams({
       config: params.config,
       agentId: sessionAgentId,
+      workspaceDir: effectiveWorkspace,
+      cwd: process.cwd(),
       runtime: {
         host: machineName,
         os: `${os.type()} ${os.release()}`,
diff --git a/src/agents/system-prompt-params.test.ts b/src/agents/system-prompt-params.test.ts
new file mode 100644
index 000000000..fd108a3c7
--- /dev/null
+++ b/src/agents/system-prompt-params.test.ts
@@ -0,0 +1,106 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { describe, expect, it } from "vitest";
+
+import type { ClawdbotConfig } from "../config/config.js";
+import { buildSystemPromptParams } from "./system-prompt-params.js";
+
+async function makeTempDir(label: string): Promise<string> {
+  return fs.mkdtemp(path.join(os.tmpdir(), `clawdbot-${label}-`));
+}
+
+async function makeRepoRoot(root: string): Promise<void> {
+  await fs.mkdir(path.join(root, ".git"), { recursive: true });
+}
+
+function buildParams(params: { config?: ClawdbotConfig; workspaceDir?: string; cwd?: string }) {
+  return buildSystemPromptParams({
+    config: params.config,
+    workspaceDir: params.workspaceDir,
+    cwd: params.cwd,
+    runtime: {
+      host: "host",
+      os: "os",
+      arch: "arch",
+      node: "node",
+      model: "model",
+    },
+  });
+}
+
+describe("buildSystemPromptParams repo root", () => {
+  it("detects repo root from workspaceDir", async () => {
+    const temp = await makeTempDir("workspace");
+    const repoRoot = path.join(temp, "repo");
+    const workspaceDir = path.join(repoRoot, "nested", "workspace");
+    await fs.mkdir(workspaceDir, { recursive: true });
+    await makeRepoRoot(repoRoot);
+
+    const { runtimeInfo } = buildParams({ workspaceDir });
+
+    expect(runtimeInfo.repoRoot).toBe(repoRoot);
+  });
+
+  it("falls back to cwd when workspaceDir has no repo", async () => {
+    const temp = await makeTempDir("cwd");
+    const repoRoot = path.join(temp, "repo");
+    const workspaceDir = path.join(temp, "workspace");
+    await fs.mkdir(workspaceDir, { recursive: true });
+    await makeRepoRoot(repoRoot);
+
+    const { runtimeInfo } = buildParams({ workspaceDir, cwd: repoRoot });
+
+    expect(runtimeInfo.repoRoot).toBe(repoRoot);
+  });
+
+  it("uses configured repoRoot when valid", async () => {
+    const temp = await makeTempDir("config");
+    const repoRoot = path.join(temp, "config-root");
+    const workspaceDir = path.join(temp, "workspace");
+    await fs.mkdir(repoRoot, { recursive: true });
+    await fs.mkdir(workspaceDir, { recursive: true });
+    await makeRepoRoot(workspaceDir);
+
+    const config: ClawdbotConfig = {
+      agents: {
+        defaults: {
+          repoRoot,
+        },
+      },
+    };
+
+    const { runtimeInfo } = buildParams({ config, workspaceDir });
+
+    expect(runtimeInfo.repoRoot).toBe(repoRoot);
+  });
+
+  it("ignores invalid repoRoot config and auto-detects", async () => {
+    const temp = await makeTempDir("invalid");
+    const repoRoot = path.join(temp, "repo");
+    const workspaceDir = path.join(repoRoot, "workspace");
+    await fs.mkdir(workspaceDir, { recursive: true });
+    await makeRepoRoot(repoRoot);
+
+    const config: ClawdbotConfig = {
+      agents: {
+        defaults: {
+          repoRoot: path.join(temp, "missing"),
+        },
+      },
+    };
+
+    const { runtimeInfo } = buildParams({ config, workspaceDir });
+
+    expect(runtimeInfo.repoRoot).toBe(repoRoot);
+  });
+
+  it("returns undefined when no repo is found", async () => {
+    const workspaceDir = await makeTempDir("norepo");
+
+    const { runtimeInfo } = buildParams({ workspaceDir });
+
+    expect(runtimeInfo.repoRoot).toBeUndefined();
+  });
+});
diff --git a/src/agents/system-prompt-params.ts b/src/agents/system-prompt-params.ts
index 21a97831a..9de8f481a 100644
--- a/src/agents/system-prompt-params.ts
+++ b/src/agents/system-prompt-params.ts
@@ -1,3 +1,6 @@
+import fs from "node:fs";
+import path from "node:path";
+
 import type { ClawdbotConfig } from "../config/config.js";
 import {
   formatUserTime,
@@ -18,6 +21,7 @@ export type RuntimeInfoInput = {
   capabilities?: string[];
   /** Supported message actions for the current channel (e.g., react, edit, unsend) */
   channelActions?: string[];
+  repoRoot?: string;
 };
 
 export type SystemPromptRuntimeParams = {
@@ -31,7 +35,14 @@ export function buildSystemPromptParams(params: {
   config?: ClawdbotConfig;
   agentId?: string;
   runtime: Omit<RuntimeInfoInput, "agentId">;
+  workspaceDir?: string;
+  cwd?: string;
 }): SystemPromptRuntimeParams {
+  const repoRoot = resolveRepoRoot({
+    config: params.config,
+    workspaceDir: params.workspaceDir,
+    cwd: params.cwd,
+  });
   const userTimezone = resolveUserTimezone(params.config?.agents?.defaults?.userTimezone);
   const userTimeFormat = resolveUserTimeFormat(params.config?.agents?.defaults?.timeFormat);
   const userTime = formatUserTime(new Date(), userTimezone, userTimeFormat);
@@ -39,9 +50,56 @@ export function buildSystemPromptParams(params: {
     runtimeInfo: {
       agentId: params.agentId,
       ...params.runtime,
+      repoRoot,
     },
     userTimezone,
     userTime,
     userTimeFormat,
   };
 }
+
+function resolveRepoRoot(params: {
+  config?: ClawdbotConfig;
+  workspaceDir?: string;
+  cwd?: string;
+}): string | undefined {
+  const configured = params.config?.agents?.defaults?.repoRoot?.trim();
+  if (configured) {
+    try {
+      const resolved = path.resolve(configured);
+      const stat = fs.statSync(resolved);
+      if (stat.isDirectory()) return resolved;
+    } catch {
+      // ignore invalid config path
+    }
+  }
+  const candidates = [params.workspaceDir, params.cwd]
+    .map((value) => value?.trim())
+    .filter(Boolean) as string[];
+  const seen = new Set<string>();
+  for (const candidate of candidates) {
+    const resolved = path.resolve(candidate);
+    if (seen.has(resolved)) continue;
+    seen.add(resolved);
+    const root = findGitRoot(resolved);
+    if (root) return root;
+  }
+  return undefined;
+}
+
+function findGitRoot(startDir: string): string | null {
+  let current = path.resolve(startDir);
+  for (let i = 0; i < 12; i += 1) {
+    const gitPath = path.join(current, ".git");
+    try {
+      const stat = fs.statSync(gitPath);
+      if (stat.isDirectory() || stat.isFile()) return current;
+    } catch {
+      // ignore missing .git at this level
+    }
+    const parent = path.dirname(current);
+    if (parent === current) break;
+    current = parent;
+  }
+  return null;
+}
diff --git a/src/agents/system-prompt.test.ts b/src/agents/system-prompt.test.ts
index fce27677a..2f0e936e4 100644
--- a/src/agents/system-prompt.test.ts
+++ b/src/agents/system-prompt.test.ts
@@ -284,6 +284,7 @@ describe("buildAgentSystemPrompt", () => {
       {
         agentId: "work",
         host: "host",
+        repoRoot: "/repo",
         os: "macOS",
         arch: "arm64",
         node: "v20",
@@ -297,6 +298,7 @@ describe("buildAgentSystemPrompt", () => {
 
     expect(line).toContain("agent=work");
     expect(line).toContain("host=host");
+    expect(line).toContain("repo=/repo");
     expect(line).toContain("os=macOS (arm64)");
     expect(line).toContain("node=v20");
     expect(line).toContain("model=anthropic/claude");
diff --git a/src/agents/system-prompt.ts b/src/agents/system-prompt.ts
index dbf30414f..772f154e4 100644
--- a/src/agents/system-prompt.ts
+++ b/src/agents/system-prompt.ts
@@ -160,6 +160,7 @@ export function buildAgentSystemPrompt(params: {
     defaultModel?: string;
     channel?: string;
     capabilities?: string[];
+    repoRoot?: string;
   };
   messageToolHints?: string[];
   sandboxInfo?: {
@@ -570,6 +571,7 @@ export function buildRuntimeLine(
     node?: string;
     model?: string;
     defaultModel?: string;
+    repoRoot?: string;
   },
   runtimeChannel?: string,
   runtimeCapabilities: string[] = [],
@@ -578,6 +580,7 @@ export function buildRuntimeLine(
   return `Runtime: ${[
     runtimeInfo?.agentId ? `agent=${runtimeInfo.agentId}` : "",
     runtimeInfo?.host ? `host=${runtimeInfo.host}` : "",
+    runtimeInfo?.repoRoot ? `repo=${runtimeInfo.repoRoot}` : "",
     runtimeInfo?.os
       ? `os=${runtimeInfo.os}${runtimeInfo?.arch ? ` (${runtimeInfo.arch})` : ""}`
       : runtimeInfo?.arch
diff --git a/src/auto-reply/reply/commands-context-report.ts b/src/auto-reply/reply/commands-context-report.ts
index 5ba3aedc9..ac93e5fed 100644
--- a/src/auto-reply/reply/commands-context-report.ts
+++ b/src/auto-reply/reply/commands-context-report.ts
@@ -102,6 +102,8 @@ async function resolveContextReport(
   const { runtimeInfo, userTimezone, userTime, userTimeFormat } = buildSystemPromptParams({
     config: params.cfg,
     agentId: sessionAgentId,
+    workspaceDir,
+    cwd: process.cwd(),
     runtime: {
       host: "unknown",
       os: "unknown",
diff --git a/src/config/schema.ts b/src/config/schema.ts
index cd22e94d9..953205cd6 100644
--- a/src/config/schema.ts
+++ b/src/config/schema.ts
@@ -197,6 +197,7 @@ const FIELD_LABELS: Record<string, string> = {
   "skills.load.watch": "Watch Skills",
   "skills.load.watchDebounceMs": "Skills Watch Debounce (ms)",
   "agents.defaults.workspace": "Workspace",
+  "agents.defaults.repoRoot": "Repo Root",
   "agents.defaults.bootstrapMaxChars": "Bootstrap Max Chars",
   "agents.defaults.envelopeTimezone": "Envelope Timezone",
   "agents.defaults.envelopeTimestamp": "Envelope Timestamp",
@@ -432,6 +433,8 @@ const FIELD_HELP: Record<string, string> = {
   "auth.cooldowns.failureWindowHours": "Failure window (hours) for backoff counters (default: 24).",
   "agents.defaults.bootstrapMaxChars":
     "Max characters of each workspace bootstrap file injected into the system prompt before truncation (default: 20000).",
+  "agents.defaults.repoRoot":
+    "Optional repository root shown in the system prompt runtime line (overrides auto-detect).",
   "agents.defaults.envelopeTimezone":
     'Timezone for message envelopes ("utc", "local", "user", or an IANA timezone string).',
   "agents.defaults.envelopeTimestamp":
diff --git a/src/config/types.agent-defaults.ts b/src/config/types.agent-defaults.ts
index 11f7cf10d..46bd25d64 100644
--- a/src/config/types.agent-defaults.ts
+++ b/src/config/types.agent-defaults.ts
@@ -99,6 +99,8 @@ export type AgentDefaultsConfig = {
   models?: Record<string, AgentModelEntryConfig>;
   /** Agent working directory (preferred). Used as the default cwd for agent runs. */
   workspace?: string;
+  /** Optional repository root for system prompt runtime line (overrides auto-detect). */
+  repoRoot?: string;
   /** Skip bootstrap (BOOTSTRAP.md creation, etc.) for pre-configured deployments. */
   skipBootstrap?: boolean;
   /** Max chars for injected bootstrap files before truncation (default: 20000). */
diff --git a/src/config/zod-schema.agent-defaults.ts b/src/config/zod-schema.agent-defaults.ts
index c6c0ab3b2..fd624bfe3 100644
--- a/src/config/zod-schema.agent-defaults.ts
+++ b/src/config/zod-schema.agent-defaults.ts
@@ -42,6 +42,7 @@ export const AgentDefaultsSchema = z
       )
       .optional(),
     workspace: z.string().optional(),
+    repoRoot: z.string().optional(),
     skipBootstrap: z.boolean().optional(),
     bootstrapMaxChars: z.number().int().positive().optional(),
     userTimezone: z.string().optional(),
diff --git a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
index eae2de919..1d40a6ac5 100644
--- a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
+++ b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
@@ -226,7 +226,9 @@ describe("createTelegramBot", () => {
     expect(payload.SenderName).toBe("Ada Lovelace");
     expect(payload.SenderId).toBe("99");
     expect(payload.SenderUsername).toBe("ada");
-    expect(payload.Body).toMatch(/^\[Telegram Ops id:42 (\+\d+[smhd] )?2025-01-09 00:00 [^\]]+\]/);
+    expect(payload.Body).toMatch(
+      /^\[Telegram Ops id:42 (\+\d+[smhd] )?2025-01-09 00:00 [^\]]+\]/,
+    );
   });
   it("reacts to mention-gated group messages when ackReaction is enabled", async () => {
     onSpy.mockReset();

From 5567bceb6645b9eea6f7eb00ea5b65e888598884 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:33:35 +0000
Subject: [PATCH 141/171] fix: restore daemon subcommand alias

---
 src/cli/program/register.subclis.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/cli/program/register.subclis.ts b/src/cli/program/register.subclis.ts
index bc2496b70..26beb81e2 100644
--- a/src/cli/program/register.subclis.ts
+++ b/src/cli/program/register.subclis.ts
@@ -44,6 +44,14 @@ const entries: SubCliEntry[] = [
       mod.registerGatewayCli(program);
     },
   },
+  {
+    name: "daemon",
+    description: "Gateway service (legacy alias)",
+    register: async (program) => {
+      const mod = await import("../daemon-cli.js");
+      mod.registerDaemonCli(program);
+    },
+  },
   {
     name: "logs",
     description: "Gateway logs",

From a59ac5cf6f948b3277511698069d4dacb6c85b34 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:21:47 +0000
Subject: [PATCH 142/171] feat: add agent identity avatars (#1329) (thanks
 @dlauer)

---
 CHANGELOG.md                                  |  1 +
 docs/cli/agents.md                            | 48 ++++++++++++
 docs/gateway/configuration.md                 | 12 ++-
 docs/reference/templates/IDENTITY.md          |  6 +-
 src/cli/program/register.agent.ts             |  3 +-
 src/commands/agents.identity.test.ts          | 32 +++++++-
 src/config/config.identity-avatar.test.ts     | 54 +++++++++++++
 src/config/schema.ts                          |  5 +-
 src/config/types.base.ts                      |  2 +-
 src/config/validation.ts                      | 60 ++++++++++++++
 .../protocol/schema/agents-models-skills.ts   | 12 +++
 src/gateway/session-utils.ts                  | 78 ++++++++++++++++++-
 src/gateway/session-utils.types.ts            |  7 ++
 ...patterns-match-without-botusername.test.ts | 16 +++-
 ...gram-bot.installs-grammy-throttler.test.ts | 10 ++-
 src/telegram/bot.test.ts                      | 22 +++++-
 ....reconnects-after-connection-close.test.ts | 12 ++-
 test/helpers/envelope-timestamp.ts            | 32 ++++++++
 ui/src/ui/app-gateway.ts                      |  7 +-
 ui/src/ui/app-render.ts                       | 23 +++++-
 ui/src/ui/app-view-state.ts                   |  4 +
 ui/src/ui/app.ts                              |  5 ++
 ui/src/ui/chat/grouped-render.ts              |  2 +-
 ui/src/ui/controllers/agents.ts               | 25 ++++++
 ui/src/ui/types.ts                            | 19 +++++
 ui/src/ui/views/chat.ts                       |  2 +-
 26 files changed, 477 insertions(+), 22 deletions(-)
 create mode 100644 src/config/config.identity-avatar.test.ts
 create mode 100644 test/helpers/envelope-timestamp.ts
 create mode 100644 ui/src/ui/controllers/agents.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0062e5205..da54152b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Docs: https://docs.clawd.bot
 
 ### Changes
 - Highlight: Lobster optional plugin tool for typed workflows + approval gates. https://docs.clawd.bot/tools/lobster
+- Agents: add identity avatar config support and Control UI avatar rendering. (#1329) Thanks @dlauer.
 - Memory: prevent CLI hangs by deferring vector probes, adding sqlite-vec/embedding timeouts, and showing sync progress early.
 - Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
 - Docs: add per-message Gmail search example for gog. (#1220) Thanks @mbelinky.
diff --git a/docs/cli/agents.md b/docs/cli/agents.md
index 6a388b4b6..e7df32e52 100644
--- a/docs/cli/agents.md
+++ b/docs/cli/agents.md
@@ -21,3 +21,51 @@ clawdbot agents set-identity --workspace ~/clawd --from-identity
 clawdbot agents set-identity --agent main --avatar avatars/clawd.png
 clawdbot agents delete work
 ```
+
+## Identity files
+
+Each agent workspace can include an `IDENTITY.md` at the workspace root:
+- Example path: `~/clawd/IDENTITY.md`
+- `set-identity --from-identity` reads from the workspace root (or an explicit `--identity-file`)
+
+Avatar paths resolve relative to the workspace root.
+
+## Set identity
+
+`set-identity` writes fields into `agents.list[].identity`:
+- `name`
+- `theme`
+- `emoji`
+- `avatar` (workspace-relative path, http(s) URL, or data URI)
+
+Load from `IDENTITY.md`:
+
+```bash
+clawdbot agents set-identity --workspace ~/clawd --from-identity
+```
+
+Override fields explicitly:
+
+```bash
+clawdbot agents set-identity --agent main --name "Clawd" --emoji "🦞" --avatar avatars/clawd.png
+```
+
+Config sample:
+
+```json5
+{
+  agents: {
+    list: [
+      {
+        id: "main",
+        identity: {
+          name: "Clawd",
+          theme: "space lobster",
+          emoji: "🦞",
+          avatar: "avatars/clawd.png"
+        }
+      }
+    ]
+  }
+}
+```
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index d6110d4dc..389f2f223 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -402,13 +402,23 @@ If set, Clawdbot derives defaults (only when you haven’t set them explicitly):
 - `agents.list[].groupChat.mentionPatterns` from the agent’s `identity.name`/`identity.emoji` (so “@Samantha” works in groups across Telegram/Slack/Discord/iMessage/WhatsApp)
 - `identity.avatar` accepts a workspace-relative image path or a remote URL/data URL. Local files must live inside the agent workspace.
 
+`identity.avatar` accepts:
+- Workspace-relative path (must stay within the agent workspace)
+- `http(s)` URL
+- `data:` URI
+
 ```json5
 {
   agents: {
     list: [
       {
         id: "main",
-        identity: { name: "Samantha", theme: "helpful sloth", emoji: "🦥", avatar: "avatars/sam.png" }
+        identity: {
+          name: "Samantha",
+          theme: "helpful sloth",
+          emoji: "🦥",
+          avatar: "avatars/samantha.png"
+        }
       }
     ]
   }
diff --git a/docs/reference/templates/IDENTITY.md b/docs/reference/templates/IDENTITY.md
index b1645be1e..196277776 100644
--- a/docs/reference/templates/IDENTITY.md
+++ b/docs/reference/templates/IDENTITY.md
@@ -11,8 +11,12 @@ read_when:
 - **Creature:** *(AI? robot? familiar? ghost in the machine? something weirder?)*
 - **Vibe:** *(how do you come across? sharp? warm? chaotic? calm?)*
 - **Emoji:** *(your signature — pick one that feels right)*
-- **Avatar:** *(workspace-relative path, or a URL/data URL)*
+- **Avatar:** *(workspace-relative path, http(s) URL, or data URI)*
 
 ---
 
 This isn't just metadata. It's the start of figuring out who you are.
+
+Notes:
+- Save this file at the workspace root as `IDENTITY.md`.
+- For avatars, use a workspace-relative path like `avatars/clawd.png`.
diff --git a/src/cli/program/register.agent.ts b/src/cli/program/register.agent.ts
index bf8970bc3..d597efde9 100644
--- a/src/cli/program/register.agent.ts
+++ b/src/cli/program/register.agent.ts
@@ -147,7 +147,7 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent
     .option("--name <name>", "Identity name")
     .option("--theme <theme>", "Identity theme")
     .option("--emoji <emoji>", "Identity emoji")
-    .option("--avatar <path>", "Identity avatar (workspace-relative, URL, or data: URL)")
+    .option("--avatar <value>", "Identity avatar (workspace path, http(s) URL, or data URI)")
     .option("--json", "Output JSON summary", false)
     .addHelpText(
       "after",
@@ -156,6 +156,7 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent
 ${theme.heading("Examples:")}
 ${formatHelpExamples([
   ['clawdbot agents set-identity --agent main --name "Clawd" --emoji "🦞"', "Set name + emoji."],
+  ["clawdbot agents set-identity --agent main --avatar avatars/clawd.png", "Set avatar path."],
   ["clawdbot agents set-identity --workspace ~/clawd --from-identity", "Load from IDENTITY.md."],
   [
     "clawdbot agents set-identity --identity-file ~/clawd/IDENTITY.md --agent main",
diff --git a/src/commands/agents.identity.test.ts b/src/commands/agents.identity.test.ts
index a89f1147c..1b214ad19 100644
--- a/src/commands/agents.identity.test.ts
+++ b/src/commands/agents.identity.test.ts
@@ -126,7 +126,7 @@ describe("agents set-identity command", () => {
         "- Name: Clawd",
         "- Theme: space lobster",
         "- Emoji: :)",
-        "- Avatar: avatars/base.png",
+        "- Avatar: avatars/clawd.png",
         "",
       ].join("\n"),
       "utf-8",
@@ -138,7 +138,13 @@ describe("agents set-identity command", () => {
     });
 
     await agentsSetIdentityCommand(
-      { workspace, fromIdentity: true, name: "Nova", emoji: "🦞", avatar: "avatars/custom.png" },
+      {
+        workspace,
+        fromIdentity: true,
+        name: "Nova",
+        emoji: "🦞",
+        avatar: "https://example.com/override.png",
+      },
       runtime,
     );
 
@@ -150,7 +156,7 @@ describe("agents set-identity command", () => {
       name: "Nova",
       theme: "space lobster",
       emoji: "🦞",
-      avatar: "avatars/custom.png",
+      avatar: "https://example.com/override.png",
     });
   });
 
@@ -216,6 +222,26 @@ describe("agents set-identity command", () => {
     });
   });
 
+  it("accepts avatar-only updates via flags", async () => {
+    configMocks.readConfigFileSnapshot.mockResolvedValue({
+      ...baseSnapshot,
+      config: { agents: { list: [{ id: "main" }] } },
+    });
+
+    await agentsSetIdentityCommand(
+      { agent: "main", avatar: "https://example.com/avatar.png" },
+      runtime,
+    );
+
+    const written = configMocks.writeConfigFile.mock.calls[0]?.[0] as {
+      agents?: { list?: Array<{ id: string; identity?: Record<string, string> }> };
+    };
+    const main = written.agents?.list?.find((entry) => entry.id === "main");
+    expect(main?.identity).toEqual({
+      avatar: "https://example.com/avatar.png",
+    });
+  });
+
   it("errors when identity data is missing", async () => {
     const root = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-identity-"));
     const workspace = path.join(root, "work");
diff --git a/src/config/config.identity-avatar.test.ts b/src/config/config.identity-avatar.test.ts
new file mode 100644
index 000000000..651ba1dd8
--- /dev/null
+++ b/src/config/config.identity-avatar.test.ts
@@ -0,0 +1,54 @@
+import path from "node:path";
+
+import { describe, expect, it } from "vitest";
+
+import { validateConfigObject } from "./config.js";
+import { withTempHome } from "./test-helpers.js";
+
+describe("identity avatar validation", () => {
+  it("accepts workspace-relative avatar paths", async () => {
+    await withTempHome(async (home) => {
+      const workspace = path.join(home, "clawd");
+      const res = validateConfigObject({
+        agents: {
+          list: [{ id: "main", workspace, identity: { avatar: "avatars/clawd.png" } }],
+        },
+      });
+      expect(res.ok).toBe(true);
+    });
+  });
+
+  it("accepts http(s) and data avatars", async () => {
+    await withTempHome(async (home) => {
+      const workspace = path.join(home, "clawd");
+      const httpRes = validateConfigObject({
+        agents: {
+          list: [{ id: "main", workspace, identity: { avatar: "https://example.com/avatar.png" } }],
+        },
+      });
+      expect(httpRes.ok).toBe(true);
+
+      const dataRes = validateConfigObject({
+        agents: {
+          list: [{ id: "main", workspace, identity: { avatar: "data:image/png;base64,AAA" } }],
+        },
+      });
+      expect(dataRes.ok).toBe(true);
+    });
+  });
+
+  it("rejects avatar paths outside workspace", async () => {
+    await withTempHome(async (home) => {
+      const workspace = path.join(home, "clawd");
+      const res = validateConfigObject({
+        agents: {
+          list: [{ id: "main", workspace, identity: { avatar: "../oops.png" } }],
+        },
+      });
+      expect(res.ok).toBe(false);
+      if (!res.ok) {
+        expect(res.issues[0]?.path).toBe("agents.list.0.identity.avatar");
+      }
+    });
+  });
+});
diff --git a/src/config/schema.ts b/src/config/schema.ts
index a72021cfc..4fca28504 100644
--- a/src/config/schema.ts
+++ b/src/config/schema.ts
@@ -119,6 +119,7 @@ const FIELD_LABELS: Record<string, string> = {
   "diagnostics.cacheTrace.includeMessages": "Cache Trace Include Messages",
   "diagnostics.cacheTrace.includePrompt": "Cache Trace Include Prompt",
   "diagnostics.cacheTrace.includeSystem": "Cache Trace Include System",
+  "agents.list.*.identity.avatar": "Identity Avatar",
   "gateway.remote.url": "Remote Gateway URL",
   "gateway.remote.sshTarget": "Remote Gateway SSH Target",
   "gateway.remote.sshIdentity": "Remote Gateway SSH Identity",
@@ -511,6 +512,8 @@ const FIELD_HELP: Record<string, string> = {
     "Resolved install directory (usually ~/.clawdbot/extensions/<id>).",
   "plugins.installs.*.version": "Version recorded at install time (if available).",
   "plugins.installs.*.installedAt": "ISO timestamp of last install/update.",
+  "agents.list.*.identity.avatar":
+    "Agent avatar (workspace-relative path, http(s) URL, or data URI).",
   "agents.defaults.model.primary": "Primary model (provider/model).",
   "agents.defaults.model.fallbacks":
     "Ordered fallback models (provider/model). Used when the primary model fails.",
@@ -616,7 +619,7 @@ const FIELD_PLACEHOLDERS: Record<string, string> = {
   "gateway.remote.tlsFingerprint": "sha256:ab12cd34…",
   "gateway.remote.sshTarget": "user@host",
   "gateway.controlUi.basePath": "/clawdbot",
-  "agents.list[].identity.avatar": "avatars/assistant.png",
+  "agents.list[].identity.avatar": "avatars/clawd.png",
 };
 
 const SENSITIVE_PATTERNS = [/token/i, /password/i, /secret/i, /api.?key/i];
diff --git a/src/config/types.base.ts b/src/config/types.base.ts
index 91eeac1ab..2fe689f95 100644
--- a/src/config/types.base.ts
+++ b/src/config/types.base.ts
@@ -154,6 +154,6 @@ export type IdentityConfig = {
   name?: string;
   theme?: string;
   emoji?: string;
-  /** Avatar image path (workspace-relative) or a URL/data URL. Local files must live in the workspace. */
+  /** Avatar image: workspace-relative path, http(s) URL, or data URI. */
   avatar?: string;
 };
diff --git a/src/config/validation.ts b/src/config/validation.ts
index 7915d8e19..6ee848f1f 100644
--- a/src/config/validation.ts
+++ b/src/config/validation.ts
@@ -1,3 +1,5 @@
+import path from "node:path";
+
 import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js";
 import { CHANNEL_IDS } from "../channels/registry.js";
 import {
@@ -13,6 +15,60 @@ import { findLegacyConfigIssues } from "./legacy.js";
 import type { ClawdbotConfig, ConfigValidationIssue } from "./types.js";
 import { ClawdbotSchema } from "./zod-schema.js";
 
+const AVATAR_SCHEME_RE = /^[a-z][a-z0-9+.-]*:/i;
+const AVATAR_DATA_RE = /^data:/i;
+const AVATAR_HTTP_RE = /^https?:\/\//i;
+const WINDOWS_ABS_RE = /^[a-zA-Z]:[\\/]/;
+
+function isWorkspaceAvatarPath(value: string, workspaceDir: string): boolean {
+  const workspaceRoot = path.resolve(workspaceDir);
+  const resolved = path.resolve(workspaceRoot, value);
+  const relative = path.relative(workspaceRoot, resolved);
+  if (relative === "") return true;
+  if (relative.startsWith("..")) return false;
+  return !path.isAbsolute(relative);
+}
+
+function validateIdentityAvatar(config: ClawdbotConfig): ConfigValidationIssue[] {
+  const agents = config.agents?.list;
+  if (!Array.isArray(agents) || agents.length === 0) return [];
+  const issues: ConfigValidationIssue[] = [];
+  for (const [index, entry] of agents.entries()) {
+    if (!entry || typeof entry !== "object") continue;
+    const avatarRaw = entry.identity?.avatar;
+    if (typeof avatarRaw !== "string") continue;
+    const avatar = avatarRaw.trim();
+    if (!avatar) continue;
+    if (AVATAR_DATA_RE.test(avatar) || AVATAR_HTTP_RE.test(avatar)) continue;
+    if (avatar.startsWith("~")) {
+      issues.push({
+        path: `agents.list.${index}.identity.avatar`,
+        message: "identity.avatar must be a workspace-relative path, http(s) URL, or data URI.",
+      });
+      continue;
+    }
+    const hasScheme = AVATAR_SCHEME_RE.test(avatar);
+    if (hasScheme && !WINDOWS_ABS_RE.test(avatar)) {
+      issues.push({
+        path: `agents.list.${index}.identity.avatar`,
+        message: "identity.avatar must be a workspace-relative path, http(s) URL, or data URI.",
+      });
+      continue;
+    }
+    const workspaceDir = resolveAgentWorkspaceDir(
+      config,
+      entry.id ?? resolveDefaultAgentId(config),
+    );
+    if (!isWorkspaceAvatarPath(avatar, workspaceDir)) {
+      issues.push({
+        path: `agents.list.${index}.identity.avatar`,
+        message: "identity.avatar must stay within the agent workspace.",
+      });
+    }
+  }
+  return issues;
+}
+
 export function validateConfigObject(
   raw: unknown,
 ): { ok: true; config: ClawdbotConfig } | { ok: false; issues: ConfigValidationIssue[] } {
@@ -48,6 +104,10 @@ export function validateConfigObject(
       ],
     };
   }
+  const avatarIssues = validateIdentityAvatar(validated.data as ClawdbotConfig);
+  if (avatarIssues.length > 0) {
+    return { ok: false, issues: avatarIssues };
+  }
   return {
     ok: true,
     config: applyModelDefaults(
diff --git a/src/gateway/protocol/schema/agents-models-skills.ts b/src/gateway/protocol/schema/agents-models-skills.ts
index edf655ac5..c3b39257f 100644
--- a/src/gateway/protocol/schema/agents-models-skills.ts
+++ b/src/gateway/protocol/schema/agents-models-skills.ts
@@ -17,6 +17,18 @@ export const AgentSummarySchema = Type.Object(
   {
     id: NonEmptyString,
     name: Type.Optional(NonEmptyString),
+    identity: Type.Optional(
+      Type.Object(
+        {
+          name: Type.Optional(NonEmptyString),
+          theme: Type.Optional(NonEmptyString),
+          emoji: Type.Optional(NonEmptyString),
+          avatar: Type.Optional(NonEmptyString),
+          avatarUrl: Type.Optional(NonEmptyString),
+        },
+        { additionalProperties: false },
+      ),
+    ),
   },
   { additionalProperties: false },
 );
diff --git a/src/gateway/session-utils.ts b/src/gateway/session-utils.ts
index b77e44817..1c5934aa5 100644
--- a/src/gateway/session-utils.ts
+++ b/src/gateway/session-utils.ts
@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 
-import { resolveDefaultAgentId } from "../agents/agent-scope.js";
+import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js";
 import { lookupContextTokens } from "../agents/context.js";
 import { DEFAULT_CONTEXT_TOKENS, DEFAULT_MODEL, DEFAULT_PROVIDER } from "../agents/defaults.js";
 import { resolveConfiguredModelRef } from "../agents/model-selection.js";
@@ -50,6 +50,62 @@ export type {
 } from "./session-utils.types.js";
 
 const DERIVED_TITLE_MAX_LEN = 60;
+const AVATAR_MAX_BYTES = 2 * 1024 * 1024;
+
+const AVATAR_DATA_RE = /^data:/i;
+const AVATAR_HTTP_RE = /^https?:\/\//i;
+const AVATAR_SCHEME_RE = /^[a-z][a-z0-9+.-]*:/i;
+const WINDOWS_ABS_RE = /^[a-zA-Z]:[\\/]/;
+
+const AVATAR_MIME_BY_EXT: Record<string, string> = {
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".webp": "image/webp",
+  ".gif": "image/gif",
+  ".svg": "image/svg+xml",
+  ".bmp": "image/bmp",
+  ".tif": "image/tiff",
+  ".tiff": "image/tiff",
+};
+
+function resolveAvatarMime(filePath: string): string {
+  const ext = path.extname(filePath).toLowerCase();
+  return AVATAR_MIME_BY_EXT[ext] ?? "application/octet-stream";
+}
+
+function isWorkspaceRelativePath(value: string): boolean {
+  if (!value) return false;
+  if (value.startsWith("~")) return false;
+  if (AVATAR_SCHEME_RE.test(value) && !WINDOWS_ABS_RE.test(value)) return false;
+  return true;
+}
+
+function resolveIdentityAvatarUrl(
+  cfg: ClawdbotConfig,
+  agentId: string,
+  avatar: string | undefined,
+): string | undefined {
+  if (!avatar) return undefined;
+  const trimmed = avatar.trim();
+  if (!trimmed) return undefined;
+  if (AVATAR_DATA_RE.test(trimmed) || AVATAR_HTTP_RE.test(trimmed)) return trimmed;
+  if (!isWorkspaceRelativePath(trimmed)) return undefined;
+  const workspaceDir = resolveAgentWorkspaceDir(cfg, agentId);
+  const workspaceRoot = path.resolve(workspaceDir);
+  const resolved = path.resolve(workspaceRoot, trimmed);
+  const relative = path.relative(workspaceRoot, resolved);
+  if (relative.startsWith("..") || path.isAbsolute(relative)) return undefined;
+  try {
+    const stat = fs.statSync(resolved);
+    if (!stat.isFile() || stat.size > AVATAR_MAX_BYTES) return undefined;
+    const buffer = fs.readFileSync(resolved);
+    const mime = resolveAvatarMime(resolved);
+    return `data:${mime};base64,${buffer.toString("base64")}`;
+  } catch {
+    return undefined;
+  }
+}
 
 function formatSessionIdPrefix(sessionId: string, updatedAt?: number | null): string {
   const prefix = sessionId.slice(0, 8);
@@ -189,11 +245,28 @@ export function listAgentsForGateway(cfg: ClawdbotConfig): {
   const defaultId = normalizeAgentId(resolveDefaultAgentId(cfg));
   const mainKey = normalizeMainKey(cfg.session?.mainKey);
   const scope = cfg.session?.scope ?? "per-sender";
-  const configuredById = new Map<string, { name?: string }>();
+  const configuredById = new Map<
+    string,
+    { name?: string; identity?: GatewayAgentRow["identity"] }
+  >();
   for (const entry of cfg.agents?.list ?? []) {
     if (!entry?.id) continue;
+    const identity = entry.identity
+      ? {
+          name: entry.identity.name?.trim() || undefined,
+          theme: entry.identity.theme?.trim() || undefined,
+          emoji: entry.identity.emoji?.trim() || undefined,
+          avatar: entry.identity.avatar?.trim() || undefined,
+          avatarUrl: resolveIdentityAvatarUrl(
+            cfg,
+            normalizeAgentId(entry.id),
+            entry.identity.avatar?.trim(),
+          ),
+        }
+      : undefined;
     configuredById.set(normalizeAgentId(entry.id), {
       name: typeof entry.name === "string" && entry.name.trim() ? entry.name.trim() : undefined,
+      identity,
     });
   }
   const explicitIds = new Set(
@@ -213,6 +286,7 @@ export function listAgentsForGateway(cfg: ClawdbotConfig): {
     return {
       id,
       name: meta?.name,
+      identity: meta?.identity,
     };
   });
   return { defaultId, mainKey, scope, agents };
diff --git a/src/gateway/session-utils.types.ts b/src/gateway/session-utils.types.ts
index 77774d6d7..99491a7f9 100644
--- a/src/gateway/session-utils.types.ts
+++ b/src/gateway/session-utils.types.ts
@@ -46,6 +46,13 @@ export type GatewaySessionRow = {
 export type GatewayAgentRow = {
   id: string;
   name?: string;
+  identity?: {
+    name?: string;
+    theme?: string;
+    emoji?: string;
+    avatar?: string;
+    avatarUrl?: string;
+  };
 };
 
 export type SessionsListResult = {
diff --git a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
index 7134d7d3b..1379b6e6f 100644
--- a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
+++ b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
@@ -1,4 +1,8 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  escapeRegExp,
+  formatLocalEnvelopeTimestamp,
+} from "../../test/helpers/envelope-timestamp.js";
 import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
 import { createTelegramBot } from "./bot.js";
 
@@ -176,7 +180,11 @@ describe("createTelegramBot", () => {
     expect(payload.WasMentioned).toBe(true);
     expect(payload.SenderName).toBe("Ada");
     expect(payload.SenderId).toBe("9");
-    expect(payload.Body).toMatch(/^\[Telegram Test Group id:7 (\+\d+[smhd] )?2025-01-09T00:00Z\]/);
+    const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+    const timestampPattern = escapeRegExp(expectedTimestamp);
+    expect(payload.Body).toMatch(
+      new RegExp(`^\\[Telegram Test Group id:7 (\\+\\d+[smhd] )?${timestampPattern}\\]`),
+    );
   });
   it("keeps group envelope headers stable (sender identity is separate)", async () => {
     onSpy.mockReset();
@@ -217,7 +225,11 @@ describe("createTelegramBot", () => {
     expect(payload.SenderName).toBe("Ada Lovelace");
     expect(payload.SenderId).toBe("99");
     expect(payload.SenderUsername).toBe("ada");
-    expect(payload.Body).toMatch(/^\[Telegram Ops id:42 (\+\d+[smhd] )?2025-01-09T00:00Z\]/);
+    const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+    const timestampPattern = escapeRegExp(expectedTimestamp);
+    expect(payload.Body).toMatch(
+      new RegExp(`^\\[Telegram Ops id:42 (\\+\\d+[smhd] )?${timestampPattern}\\]`),
+    );
   });
   it("reacts to mention-gated group messages when ackReaction is enabled", async () => {
     onSpy.mockReset();
diff --git a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
index de7f6b62b..141532796 100644
--- a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
+++ b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
@@ -1,4 +1,8 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  escapeRegExp,
+  formatLocalEnvelopeTimestamp,
+} from "../../test/helpers/envelope-timestamp.js";
 import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
 import { createTelegramBot, getTelegramSequentialKey } from "./bot.js";
 import { resolveTelegramFetch } from "./fetch.js";
@@ -328,8 +332,12 @@ describe("createTelegramBot", () => {
 
       expect(replySpy).toHaveBeenCalledTimes(1);
       const payload = replySpy.mock.calls[0][0];
+      const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+      const timestampPattern = escapeRegExp(expectedTimestamp);
       expect(payload.Body).toMatch(
-        /^\[Telegram Ada Lovelace \(@ada_bot\) id:1234 (\+\d+[smhd] )?2025-01-09T00:00Z\]/,
+        new RegExp(
+          `^\\[Telegram Ada Lovelace \\(@ada_bot\\) id:1234 (\\+\\d+[smhd] )?${timestampPattern}\\]`,
+        ),
       );
       expect(payload.Body).toContain("hello world");
     } finally {
diff --git a/src/telegram/bot.test.ts b/src/telegram/bot.test.ts
index 77f50b41f..2d04d6aa4 100644
--- a/src/telegram/bot.test.ts
+++ b/src/telegram/bot.test.ts
@@ -10,6 +10,10 @@ import { listSkillCommandsForAgents } from "../auto-reply/skill-commands.js";
 import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
 import * as replyModule from "../auto-reply/reply.js";
 import { expectInboundContextContract } from "../../test/helpers/inbound-contract.js";
+import {
+  escapeRegExp,
+  formatLocalEnvelopeTimestamp,
+} from "../../test/helpers/envelope-timestamp.js";
 import { createTelegramBot, getTelegramSequentialKey } from "./bot.js";
 import { resolveTelegramFetch } from "./fetch.js";
 
@@ -450,8 +454,12 @@ describe("createTelegramBot", () => {
 
       expect(replySpy).toHaveBeenCalledTimes(1);
       const payload = replySpy.mock.calls[0][0];
+      const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+      const timestampPattern = escapeRegExp(expectedTimestamp);
       expect(payload.Body).toMatch(
-        /^\[Telegram Ada Lovelace \(@ada_bot\) id:1234 (\+\d+[smhd] )?2025-01-09T00:00Z\]/,
+        new RegExp(
+          `^\\[Telegram Ada Lovelace \\(@ada_bot\\) id:1234 (\\+\\d+[smhd] )?${timestampPattern}\\]`,
+        ),
       );
       expect(payload.Body).toContain("hello world");
     } finally {
@@ -585,7 +593,11 @@ describe("createTelegramBot", () => {
     const payload = replySpy.mock.calls[0][0];
     expectInboundContextContract(payload);
     expect(payload.WasMentioned).toBe(true);
-    expect(payload.Body).toMatch(/^\[Telegram Test Group id:7 (\+\d+[smhd] )?2025-01-09T00:00Z\]/);
+    const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+    const timestampPattern = escapeRegExp(expectedTimestamp);
+    expect(payload.Body).toMatch(
+      new RegExp(`^\\[Telegram Test Group id:7 (\\+\\d+[smhd] )?${timestampPattern}\\]`),
+    );
     expect(payload.SenderName).toBe("Ada");
     expect(payload.SenderId).toBe("9");
   });
@@ -627,7 +639,11 @@ describe("createTelegramBot", () => {
     expect(replySpy).toHaveBeenCalledTimes(1);
     const payload = replySpy.mock.calls[0][0];
     expectInboundContextContract(payload);
-    expect(payload.Body).toMatch(/^\[Telegram Ops id:42 (\+\d+[smhd] )?2025-01-09T00:00Z\]/);
+    const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+    const timestampPattern = escapeRegExp(expectedTimestamp);
+    expect(payload.Body).toMatch(
+      new RegExp(`^\\[Telegram Ops id:42 (\\+\\d+[smhd] )?${timestampPattern}\\]`),
+    );
     expect(payload.SenderName).toBe("Ada Lovelace");
     expect(payload.SenderId).toBe("99");
     expect(payload.SenderUsername).toBe("ada");
diff --git a/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts b/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts
index 411875e21..870a018d5 100644
--- a/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts
+++ b/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts
@@ -3,6 +3,10 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  escapeRegExp,
+  formatLocalEnvelopeTimestamp,
+} from "../../test/helpers/envelope-timestamp.js";
 
 vi.mock("../agents/pi-embedded.js", () => ({
   abortEmbeddedPiRun: vi.fn().mockReturnValue(false),
@@ -328,12 +332,16 @@ describe("web auto-reply", () => {
       expect(resolver).toHaveBeenCalledTimes(2);
       const firstArgs = resolver.mock.calls[0][0];
       const secondArgs = resolver.mock.calls[1][0];
+      const firstTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-01T00:00:00Z"));
+      const secondTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-01T01:00:00Z"));
+      const firstPattern = escapeRegExp(firstTimestamp);
+      const secondPattern = escapeRegExp(secondTimestamp);
       expect(firstArgs.Body).toMatch(
-        /\[WhatsApp \+1 (\+\d+[smhd] )?2025-01-01T00:00Z\] \[clawdbot\] first/,
+        new RegExp(`\\[WhatsApp \\+1 (\\+\\d+[smhd] )?${firstPattern}\\] \\[clawdbot\\] first`),
       );
       expect(firstArgs.Body).not.toContain("second");
       expect(secondArgs.Body).toMatch(
-        /\[WhatsApp \+1 (\+\d+[smhd] )?2025-01-01T01:00Z\] \[clawdbot\] second/,
+        new RegExp(`\\[WhatsApp \\+1 (\\+\\d+[smhd] )?${secondPattern}\\] \\[clawdbot\\] second`),
       );
       expect(secondArgs.Body).not.toContain("first");
 
diff --git a/test/helpers/envelope-timestamp.ts b/test/helpers/envelope-timestamp.ts
new file mode 100644
index 000000000..135063e41
--- /dev/null
+++ b/test/helpers/envelope-timestamp.ts
@@ -0,0 +1,32 @@
+export function formatLocalEnvelopeTimestamp(date: Date): string {
+  const parts = new Intl.DateTimeFormat("en-US", {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    hourCycle: "h23",
+    timeZoneName: "short",
+  }).formatToParts(date);
+
+  const pick = (type: string) => parts.find((part) => part.type === type)?.value;
+  const yyyy = pick("year");
+  const mm = pick("month");
+  const dd = pick("day");
+  const hh = pick("hour");
+  const min = pick("minute");
+  const tz = [...parts]
+    .reverse()
+    .find((part) => part.type === "timeZoneName")
+    ?.value?.trim();
+
+  if (!yyyy || !mm || !dd || !hh || !min) {
+    throw new Error("Missing date parts for envelope timestamp formatting.");
+  }
+
+  return `${yyyy}-${mm}-${dd} ${hh}:${min}${tz ? ` ${tz}` : ""}`;
+}
+
+export function escapeRegExp(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
diff --git a/ui/src/ui/app-gateway.ts b/ui/src/ui/app-gateway.ts
index f300e0b37..d5bc0c5d9 100644
--- a/ui/src/ui/app-gateway.ts
+++ b/ui/src/ui/app-gateway.ts
@@ -1,10 +1,11 @@
 import { loadChatHistory } from "./controllers/chat";
 import { loadDevices } from "./controllers/devices";
 import { loadNodes } from "./controllers/nodes";
+import { loadAgents } from "./controllers/agents";
 import type { GatewayEventFrame, GatewayHelloOk } from "./gateway";
 import { GatewayBrowserClient } from "./gateway";
 import type { EventLogEntry } from "./app-events";
-import type { PresenceEntry, HealthSnapshot, StatusSummary } from "./types";
+import type { AgentsListResult, PresenceEntry, HealthSnapshot, StatusSummary } from "./types";
 import type { Tab } from "./navigation";
 import type { UiSettings } from "./storage";
 import { handleAgentEvent, resetToolStream, type AgentEventPayload } from "./app-tool-stream";
@@ -38,6 +39,9 @@ type GatewayHost = {
   presenceEntries: PresenceEntry[];
   presenceError: string | null;
   presenceStatus: StatusSummary | null;
+  agentsLoading: boolean;
+  agentsList: AgentsListResult | null;
+  agentsError: string | null;
   debugHealth: HealthSnapshot | null;
   sessionKey: string;
   chatRunId: string | null;
@@ -117,6 +121,7 @@ export function connectGateway(host: GatewayHost) {
       host.connected = true;
       host.hello = hello;
       applySnapshot(host, hello);
+      void loadAgents(host as unknown as ClawdbotApp);
       void loadNodes(host as unknown as ClawdbotApp, { quiet: true });
       void loadDevices(host as unknown as ClawdbotApp, { quiet: true });
       void refreshActiveTab(host as unknown as Parameters<typeof refreshActiveTab>[0]);
diff --git a/ui/src/ui/app-render.ts b/ui/src/ui/app-render.ts
index 8275ca147..37f0b6bea 100644
--- a/ui/src/ui/app-render.ts
+++ b/ui/src/ui/app-render.ts
@@ -2,6 +2,7 @@ import { html, nothing } from "lit";
 
 import type { GatewayBrowserClient, GatewayHelloOk } from "./gateway";
 import type { AppViewState } from "./app-view-state";
+import { parseAgentSessionKey } from "../../../src/routing/session-key.js";
 import {
   TAB_GROUPS,
   iconForTab,
@@ -80,6 +81,24 @@ import { loadCronRuns, toggleCronJob, runCronJob, removeCronJob, addCronJob } fr
 import { loadDebug, callDebugMethod } from "./controllers/debug";
 import { loadLogs } from "./controllers/logs";
 
+const AVATAR_DATA_RE = /^data:/i;
+const AVATAR_HTTP_RE = /^https?:\/\//i;
+
+function resolveAssistantAvatarUrl(state: AppViewState): string | undefined {
+  const list = state.agentsList?.agents ?? [];
+  const parsed = parseAgentSessionKey(state.sessionKey);
+  const agentId =
+    parsed?.agentId ??
+    state.agentsList?.defaultId ??
+    "main";
+  const agent = list.find((entry) => entry.id === agentId);
+  const identity = agent?.identity;
+  const candidate = identity?.avatarUrl ?? identity?.avatar;
+  if (!candidate) return undefined;
+  if (AVATAR_DATA_RE.test(candidate) || AVATAR_HTTP_RE.test(candidate)) return candidate;
+  return identity?.avatarUrl;
+}
+
 export function renderApp(state: AppViewState) {
   const presenceCount = state.presenceEntries.length;
   const sessionsCount = state.sessionsResult?.count ?? null;
@@ -87,6 +106,8 @@ export function renderApp(state: AppViewState) {
   const chatDisabledReason = state.connected ? null : "Disconnected from gateway.";
   const isChat = state.tab === "chat";
   const chatFocus = isChat && state.settings.chatFocusMode;
+  const assistantAvatarUrl = resolveAssistantAvatarUrl(state);
+  const chatAvatarUrl = state.chatAvatarUrl ?? assistantAvatarUrl ?? null;
 
   return html`
     <div class="shell ${isChat ? "shell--chat" : ""} ${chatFocus ? "shell--chat-focus" : ""} ${state.settings.navCollapsed ? "shell--nav-collapsed" : ""}">
@@ -420,11 +441,11 @@ export function renderApp(state: AppViewState) {
               showThinking: state.settings.chatShowThinking,
               loading: state.chatLoading,
               sending: state.chatSending,
+              assistantAvatarUrl: chatAvatarUrl,
               messages: state.chatMessages,
               toolMessages: state.chatToolMessages,
               stream: state.chatStream,
               streamStartedAt: state.chatStreamStartedAt,
-              assistantAvatarUrl: state.chatAvatarUrl,
               draft: state.chatMessage,
               queue: state.chatQueue,
               connected: state.connected,
diff --git a/ui/src/ui/app-view-state.ts b/ui/src/ui/app-view-state.ts
index 5af2d0a8e..3f969e5b9 100644
--- a/ui/src/ui/app-view-state.ts
+++ b/ui/src/ui/app-view-state.ts
@@ -4,6 +4,7 @@ import type { UiSettings } from "./storage";
 import type { ThemeMode } from "./theme";
 import type { ThemeTransitionContext } from "./theme-transition";
 import type {
+  AgentsListResult,
   ChannelsStatusSnapshot,
   ConfigSnapshot,
   CronJob,
@@ -95,6 +96,9 @@ export type AppViewState = {
   presenceEntries: PresenceEntry[];
   presenceError: string | null;
   presenceStatus: string | null;
+  agentsLoading: boolean;
+  agentsList: AgentsListResult | null;
+  agentsError: string | null;
   sessionsLoading: boolean;
   sessionsResult: SessionsListResult | null;
   sessionsError: string | null;
diff --git a/ui/src/ui/app.ts b/ui/src/ui/app.ts
index 53f21316c..35506e76a 100644
--- a/ui/src/ui/app.ts
+++ b/ui/src/ui/app.ts
@@ -7,6 +7,7 @@ import { renderApp } from "./app-render";
 import type { Tab } from "./navigation";
 import type { ResolvedTheme, ThemeMode } from "./theme";
 import type {
+  AgentsListResult,
   ConfigSnapshot,
   ConfigUiHints,
   CronJob,
@@ -169,6 +170,10 @@ export class ClawdbotApp extends LitElement {
   @state() presenceError: string | null = null;
   @state() presenceStatus: string | null = null;
 
+  @state() agentsLoading = false;
+  @state() agentsList: AgentsListResult | null = null;
+  @state() agentsError: string | null = null;
+
   @state() sessionsLoading = false;
   @state() sessionsResult: SessionsListResult | null = null;
   @state() sessionsError: string | null = null;
diff --git a/ui/src/ui/chat/grouped-render.ts b/ui/src/ui/chat/grouped-render.ts
index c90493219..ff155a256 100644
--- a/ui/src/ui/chat/grouped-render.ts
+++ b/ui/src/ui/chat/grouped-render.ts
@@ -30,8 +30,8 @@ export function renderReadingIndicatorGroup(assistantAvatarUrl?: string | null)
 export function renderStreamingGroup(
   text: string,
   startedAt: number,
-  onOpenSidebar?: (content: string) => void,
   assistantAvatarUrl?: string | null,
+  onOpenSidebar?: (content: string) => void,
 ) {
   const timestamp = new Date(startedAt).toLocaleTimeString([], {
     hour: "numeric",
diff --git a/ui/src/ui/controllers/agents.ts b/ui/src/ui/controllers/agents.ts
new file mode 100644
index 000000000..deb79ef6b
--- /dev/null
+++ b/ui/src/ui/controllers/agents.ts
@@ -0,0 +1,25 @@
+import type { GatewayBrowserClient } from "../gateway";
+import type { AgentsListResult } from "../types";
+
+export type AgentsState = {
+  client: GatewayBrowserClient | null;
+  connected: boolean;
+  agentsLoading: boolean;
+  agentsError: string | null;
+  agentsList: AgentsListResult | null;
+};
+
+export async function loadAgents(state: AgentsState) {
+  if (!state.client || !state.connected) return;
+  if (state.agentsLoading) return;
+  state.agentsLoading = true;
+  state.agentsError = null;
+  try {
+    const res = (await state.client.request("agents.list", {})) as AgentsListResult | undefined;
+    if (res) state.agentsList = res;
+  } catch (err) {
+    state.agentsError = String(err);
+  } finally {
+    state.agentsLoading = false;
+  }
+}
diff --git a/ui/src/ui/types.ts b/ui/src/ui/types.ts
index 6cdbfb029..be278b8e5 100644
--- a/ui/src/ui/types.ts
+++ b/ui/src/ui/types.ts
@@ -294,6 +294,25 @@ export type GatewaySessionsDefaults = {
   contextTokens: number | null;
 };
 
+export type GatewayAgentRow = {
+  id: string;
+  name?: string;
+  identity?: {
+    name?: string;
+    theme?: string;
+    emoji?: string;
+    avatar?: string;
+    avatarUrl?: string;
+  };
+};
+
+export type AgentsListResult = {
+  defaultId: string;
+  mainKey: string;
+  scope: string;
+  agents: GatewayAgentRow[];
+};
+
 export type GatewaySessionRow = {
   key: string;
   kind: "direct" | "group" | "global" | "unknown";
diff --git a/ui/src/ui/views/chat.ts b/ui/src/ui/views/chat.ts
index fddc98b68..c8938521e 100644
--- a/ui/src/ui/views/chat.ts
+++ b/ui/src/ui/views/chat.ts
@@ -122,8 +122,8 @@ export function renderChat(props: ChatProps) {
                 return renderStreamingGroup(
                   item.text,
                   item.startedAt,
-                  props.onOpenSidebar,
                   props.assistantAvatarUrl ?? null,
+                  props.onOpenSidebar,
                 );
               }
 

From a2981c5a2cfba4db52d19f20da53604442f33514 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:32:13 +0000
Subject: [PATCH 143/171] feat: add elevated ask/full modes

---
 docs/gateway/configuration.md                 |  2 +-
 .../sandbox-vs-tool-policy-vs-elevated.md     |  3 +-
 docs/refactor/exec-host.md                    |  2 +-
 docs/tools/elevated.md                        | 19 +++++++-----
 docs/tools/exec-approvals.md                  |  2 +-
 docs/tools/slash-commands.md                  |  2 +-
 docs/tui.md                                   |  2 +-
 src/agents/bash-tools.exec.ts                 | 31 ++++++++++++++-----
 src/agents/pi-embedded-runner/types.ts        |  2 +-
 src/agents/system-prompt.test.ts              |  2 +-
 src/agents/system-prompt.ts                   | 10 +++---
 src/auto-reply/commands-registry.data.ts      |  4 +--
 ...tches-fuzzy-selection-is-ambiguous.test.ts |  2 +-
 ...er-agent-allowlist-addition-global.test.ts |  2 +-
 ...rrent-verbose-level-verbose-has-no.test.ts |  2 +-
 src/auto-reply/reply.directive.parse.test.ts  | 10 ++++++
 ...proved-sender-toggle-elevated-mode.test.ts |  4 +--
 ...levated-off-groups-without-mention.test.ts |  4 +--
 ...evated-directive-unapproved-sender.test.ts |  2 +-
 .../reply/commands-context-report.ts          |  2 +-
 .../reply/directive-handling.impl.ts          |  8 +++--
 .../reply/directive-handling.shared.ts        | 13 +++++---
 src/auto-reply/status.ts                      |  9 ++++--
 src/auto-reply/thinking.ts                    | 11 ++++++-
 src/config/types.agent-defaults.ts            |  2 +-
 src/config/zod-schema.agent-defaults.ts       |  4 ++-
 src/gateway/sessions-patch.ts                 |  2 +-
 src/tui/commands.ts                           |  8 ++---
 src/tui/tui-command-handlers.ts               |  6 +++-
 29 files changed, 115 insertions(+), 57 deletions(-)

diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index 1665fdcc8..01a64361f 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -1981,7 +1981,7 @@ Per-agent override (further restrict):
 
 Notes:
 - `tools.elevated` is the global baseline. `agents.list[].tools.elevated` can only further restrict (both must allow).
-- `/elevated on|off` stores state per session key; inline directives apply to a single message.
+- `/elevated on|off|ask|full` stores state per session key; inline directives apply to a single message.
 - Elevated `exec` runs on the host and bypasses sandboxing.
 - Tool policy still applies; if `exec` is denied, elevated cannot be used.
 
diff --git a/docs/gateway/sandbox-vs-tool-policy-vs-elevated.md b/docs/gateway/sandbox-vs-tool-policy-vs-elevated.md
index 8c5fd19e8..d28481ebb 100644
--- a/docs/gateway/sandbox-vs-tool-policy-vs-elevated.md
+++ b/docs/gateway/sandbox-vs-tool-policy-vs-elevated.md
@@ -91,7 +91,8 @@ Available groups:
 ## Elevated: exec-only “run on host”
 
 Elevated does **not** grant extra tools; it only affects `exec`.
-- If you’re sandboxed, `/elevated on` (or `exec` with `elevated: true`) runs on the host.
+- If you’re sandboxed, `/elevated on` (or `exec` with `elevated: true`) runs on the host (approvals may still apply).
+- Use `/elevated full` to skip exec approvals for the session.
 - If you’re already running direct, elevated is effectively a no-op (still gated).
 - Elevated is **not** skill-scoped and does **not** override tool allow/deny.
 
diff --git a/docs/refactor/exec-host.md b/docs/refactor/exec-host.md
index c71a456ef..3b4e1a15c 100644
--- a/docs/refactor/exec-host.md
+++ b/docs/refactor/exec-host.md
@@ -216,7 +216,7 @@ Option B:
 ## Slash commands
 - `/exec host=<sandbox|gateway|node> security=<deny|allowlist|full> ask=<off|on-miss|always> node=<id>`
 - Per-agent, per-session overrides; non-persistent unless saved via config.
-- `/elevated on|off` remains a shortcut for `host=gateway security=full`.
+- `/elevated on|off|ask|full` remains a shortcut for `host=gateway security=full` (with `full` skipping approvals).
 
 ## Cross-platform story
 - The runner service is the portable execution target.
diff --git a/docs/tools/elevated.md b/docs/tools/elevated.md
index 2e74162c5..8b561b473 100644
--- a/docs/tools/elevated.md
+++ b/docs/tools/elevated.md
@@ -6,17 +6,20 @@ read_when:
 # Elevated Mode (/elevated directives)
 
 ## What it does
-- `/elevated on` is a **shortcut** for `exec.host=gateway` + `exec.security=full`.
+- `/elevated on` is a **shortcut** for `exec.host=gateway` + `exec.security=full` (approvals still apply).
+- `/elevated full` runs on the gateway host **and** auto-approves exec (skips exec approvals).
+- `/elevated ask` runs on the gateway host but keeps exec approvals (same as `/elevated on`).
 - Only changes behavior when the agent is **sandboxed** (otherwise exec already runs on the host).
-- Directive forms: `/elevated on`, `/elevated off`, `/elev on`, `/elev off`.
-- Only `on|off` are accepted; anything else returns a hint and does not change state.
+- Directive forms: `/elevated on|off|ask|full`, `/elev on|off|ask|full`.
+- Only `on|off|ask|full` are accepted; anything else returns a hint and does not change state.
 
 ## What it controls (and what it doesn’t)
 - **Availability gates**: `tools.elevated` is the global baseline. `agents.list[].tools.elevated` can further restrict elevated per agent (both must allow).
-- **Per-session state**: `/elevated on|off` sets the elevated level for the current session key.
-- **Inline directive**: `/elevated on` inside a message applies to that message only.
+- **Per-session state**: `/elevated on|off|ask|full` sets the elevated level for the current session key.
+- **Inline directive**: `/elevated on|ask|full` inside a message applies to that message only.
 - **Groups**: In group chats, elevated directives are only honored when the agent is mentioned. Command-only messages that bypass mention requirements are treated as mentioned.
 - **Host execution**: elevated forces `exec` onto the gateway host with full security.
+- **Approvals**: `full` skips exec approvals; `on`/`ask` still honor them.
 - **Unsandboxed agents**: no-op for location; only affects gating, logging, and status.
 - **Tool policy still applies**: if `exec` is denied by tool policy, elevated cannot be used.
 
@@ -26,8 +29,8 @@ read_when:
 3. Global default (`agents.defaults.elevatedDefault` in config).
 
 ## Setting a session default
-- Send a message that is **only** the directive (whitespace allowed), e.g. `/elevated on`.
-- Confirmation reply is sent (`Elevated mode enabled.` / `Elevated mode disabled.`).
+- Send a message that is **only** the directive (whitespace allowed), e.g. `/elevated full`.
+- Confirmation reply is sent (`Elevated mode set to full...` / `Elevated mode disabled.`).
 - If elevated access is disabled or the sender is not on the approved allowlist, the directive replies with an actionable error and does not change session state.
 - Send `/elevated` (or `/elevated:`) with no argument to see the current elevated level.
 
@@ -41,4 +44,4 @@ read_when:
 
 ## Logging + status
 - Elevated exec calls are logged at info level.
-- Session status includes elevated mode (e.g. `elevated=on`).
+- Session status includes elevated mode (e.g. `elevated=ask`, `elevated=full`).
diff --git a/docs/tools/exec-approvals.md b/docs/tools/exec-approvals.md
index 4bef999ae..59ac7d119 100644
--- a/docs/tools/exec-approvals.md
+++ b/docs/tools/exec-approvals.md
@@ -11,7 +11,7 @@ read_when:
 Exec approvals are the **companion app / node host guardrail** for letting a sandboxed agent run
 commands on a real host (`gateway` or `node`). Think of it like a safety interlock:
 commands are allowed only when policy + allowlist + (optional) user approval all agree.
-Exec approvals are **in addition** to tool policy and elevated gating.
+Exec approvals are **in addition** to tool policy and elevated gating (unless elevated is set to `full`, which skips approvals).
 
 If the companion app UI is **not available**, any request that requires a prompt is
 resolved by the **ask fallback** (default: deny).
diff --git a/docs/tools/slash-commands.md b/docs/tools/slash-commands.md
index a0dfbf8c7..a96e1760f 100644
--- a/docs/tools/slash-commands.md
+++ b/docs/tools/slash-commands.md
@@ -78,7 +78,7 @@ Text + native (when enabled):
 - `/think <off|minimal|low|medium|high|xhigh>` (dynamic choices by model/provider; aliases: `/thinking`, `/t`)
 - `/verbose on|full|off` (alias: `/v`)
 - `/reasoning on|off|stream` (alias: `/reason`; when on, sends a separate message prefixed `Reasoning:`; `stream` = Telegram draft only)
-- `/elevated on|off` (alias: `/elev`)
+- `/elevated on|off|ask|full` (alias: `/elev`; `full` skips exec approvals)
 - `/exec host=<sandbox|gateway|node> security=<deny|allowlist|full> ask=<off|on-miss|always> node=<id>` (send `/exec` to show current)
 - `/model <name>` (alias: `/models`; or `/<alias>` from `agents.defaults.models.*.alias`)
 - `/queue <mode>` (plus options like `debounce:2s cap:25 drop:summarize`; send `/queue` to see current settings)
diff --git a/docs/tui.md b/docs/tui.md
index 57fffa493..1c94aee1d 100644
--- a/docs/tui.md
+++ b/docs/tui.md
@@ -78,7 +78,7 @@ Session controls:
 - `/verbose <on|full|off>`
 - `/reasoning <on|off|stream>`
 - `/usage <off|tokens|full>`
-- `/elevated <on|off>` (alias: `/elev`)
+- `/elevated <on|off|ask|full>` (alias: `/elev`)
 - `/activation <mention|always>`
 - `/deliver <on|off>`
 
diff --git a/src/agents/bash-tools.exec.ts b/src/agents/bash-tools.exec.ts
index 91b38dc3b..d7aaa218f 100644
--- a/src/agents/bash-tools.exec.ts
+++ b/src/agents/bash-tools.exec.ts
@@ -140,7 +140,7 @@ export type { BashSandboxConfig } from "./bash-tools.shared.js";
 export type ExecElevatedDefaults = {
   enabled: boolean;
   allowed: boolean;
-  defaultLevel: "on" | "off";
+  defaultLevel: "on" | "off" | "ask" | "full";
 };
 
 const execSchema = Type.Object({
@@ -706,12 +706,23 @@ export function createExecTool(
           : clampNumber(params.yieldMs ?? defaultBackgroundMs, defaultBackgroundMs, 10, 120_000)
         : null;
       const elevatedDefaults = defaults?.elevated;
-      const elevatedDefaultOn =
-        elevatedDefaults?.defaultLevel === "on" &&
-        elevatedDefaults.enabled &&
-        elevatedDefaults.allowed;
-      const elevatedRequested =
-        typeof params.elevated === "boolean" ? params.elevated : elevatedDefaultOn;
+      const elevatedDefaultMode =
+        elevatedDefaults?.defaultLevel === "full"
+          ? "full"
+          : elevatedDefaults?.defaultLevel === "ask"
+            ? "ask"
+            : elevatedDefaults?.defaultLevel === "on"
+              ? "ask"
+              : "off";
+      const elevatedMode =
+        typeof params.elevated === "boolean"
+          ? params.elevated
+            ? elevatedDefaultMode === "full"
+              ? "full"
+              : "ask"
+            : "off"
+          : elevatedDefaultMode;
+      const elevatedRequested = elevatedMode !== "off";
       if (elevatedRequested) {
         if (!elevatedDefaults?.enabled || !elevatedDefaults.allowed) {
           const runtime = defaults?.sandbox ? "sandboxed" : "direct";
@@ -767,6 +778,10 @@ export function createExecTool(
       const configuredAsk = defaults?.ask ?? "on-miss";
       const requestedAsk = normalizeExecAsk(params.ask);
       let ask = maxAsk(configuredAsk, requestedAsk ?? configuredAsk);
+      const bypassApprovals = elevatedRequested && elevatedMode === "full";
+      if (bypassApprovals) {
+        ask = "off";
+      }
 
       const sandbox = host === "sandbox" ? defaults?.sandbox : undefined;
       const rawWorkdir = params.workdir?.trim() || defaults?.cwd || process.cwd();
@@ -1031,7 +1046,7 @@ export function createExecTool(
         };
       }
 
-      if (host === "gateway") {
+      if (host === "gateway" && !bypassApprovals) {
         const approvals = resolveExecApprovals(agentId, { security: "allowlist" });
         const hostSecurity = minSecurity(security, approvals.agent.security);
         const hostAsk = maxAsk(ask, approvals.agent.ask);
diff --git a/src/agents/pi-embedded-runner/types.ts b/src/agents/pi-embedded-runner/types.ts
index a8aa3c48c..56380cd1d 100644
--- a/src/agents/pi-embedded-runner/types.ts
+++ b/src/agents/pi-embedded-runner/types.ts
@@ -76,6 +76,6 @@ export type EmbeddedSandboxInfo = {
   allowedControlPorts?: number[];
   elevated?: {
     allowed: boolean;
-    defaultLevel: "on" | "off";
+    defaultLevel: "on" | "off" | "ask" | "full";
   };
 };
diff --git a/src/agents/system-prompt.test.ts b/src/agents/system-prompt.test.ts
index 2f0e936e4..b5fe28556 100644
--- a/src/agents/system-prompt.test.ts
+++ b/src/agents/system-prompt.test.ts
@@ -322,7 +322,7 @@ describe("buildAgentSystemPrompt", () => {
 
     expect(prompt).toContain("You are running in a sandboxed runtime");
     expect(prompt).toContain("Sub-agents stay sandboxed");
-    expect(prompt).toContain("User can toggle with /elevated on|off.");
+    expect(prompt).toContain("User can toggle with /elevated on|off|ask|full.");
     expect(prompt).toContain("Current elevated level: on");
   });
 
diff --git a/src/agents/system-prompt.ts b/src/agents/system-prompt.ts
index 772f154e4..6a20391c0 100644
--- a/src/agents/system-prompt.ts
+++ b/src/agents/system-prompt.ts
@@ -176,7 +176,7 @@ export function buildAgentSystemPrompt(params: {
     allowedControlPorts?: number[];
     elevated?: {
       allowed: boolean;
-      defaultLevel: "on" | "off";
+      defaultLevel: "on" | "off" | "ask" | "full";
     };
   };
   /** Reaction guidance for the agent (for Telegram minimal/extensive modes). */
@@ -444,12 +444,14 @@ export function buildAgentSystemPrompt(params: {
           params.sandboxInfo.elevated?.allowed
             ? "Elevated exec is available for this session."
             : "",
-          params.sandboxInfo.elevated?.allowed ? "User can toggle with /elevated on|off." : "",
           params.sandboxInfo.elevated?.allowed
-            ? "You may also send /elevated on|off when needed."
+            ? "User can toggle with /elevated on|off|ask|full."
             : "",
           params.sandboxInfo.elevated?.allowed
-            ? `Current elevated level: ${params.sandboxInfo.elevated.defaultLevel} (on runs exec on host; off runs in sandbox).`
+            ? "You may also send /elevated on|off|ask|full when needed."
+            : "",
+          params.sandboxInfo.elevated?.allowed
+            ? `Current elevated level: ${params.sandboxInfo.elevated.defaultLevel} (ask runs exec on host with approvals; full auto-approves).`
             : "",
         ]
           .filter(Boolean)
diff --git a/src/auto-reply/commands-registry.data.ts b/src/auto-reply/commands-registry.data.ts
index 4ce176b1d..7e6d76399 100644
--- a/src/auto-reply/commands-registry.data.ts
+++ b/src/auto-reply/commands-registry.data.ts
@@ -395,9 +395,9 @@ function buildChatCommands(): ChatCommandDefinition[] {
       args: [
         {
           name: "mode",
-          description: "on or off",
+          description: "on, off, ask, or full",
           type: "string",
-          choices: ["on", "off"],
+          choices: ["on", "off", "ask", "full"],
         },
       ],
       argsMenu: "auto",
diff --git a/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts b/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts
index b636b85d6..1997ebe3b 100644
--- a/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.prefers-alias-matches-fuzzy-selection-is-ambiguous.test.ts
@@ -219,7 +219,7 @@ describe("directive behavior", () => {
       );
 
       const events = drainSystemEvents(MAIN_SESSION_KEY);
-      expect(events.some((e) => e.includes("Elevated ON"))).toBe(true);
+      expect(events.some((e) => e.includes("Elevated ASK"))).toBe(true);
     });
   });
   it("queues a system event when toggling reasoning", async () => {
diff --git a/src/auto-reply/reply.directive.directive-behavior.requires-per-agent-allowlist-addition-global.test.ts b/src/auto-reply/reply.directive.directive-behavior.requires-per-agent-allowlist-addition-global.test.ts
index bf0ac3df2..abf7eb0c1 100644
--- a/src/auto-reply/reply.directive.directive-behavior.requires-per-agent-allowlist-addition-global.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.requires-per-agent-allowlist-addition-global.test.ts
@@ -150,7 +150,7 @@ describe("directive behavior", () => {
       );
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Elevated mode enabled");
+      expect(text).toContain("Elevated mode set to ask");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
diff --git a/src/auto-reply/reply.directive.directive-behavior.shows-current-verbose-level-verbose-has-no.test.ts b/src/auto-reply/reply.directive.directive-behavior.shows-current-verbose-level-verbose-has-no.test.ts
index 3ff09e217..4fb307f0d 100644
--- a/src/auto-reply/reply.directive.directive-behavior.shows-current-verbose-level-verbose-has-no.test.ts
+++ b/src/auto-reply/reply.directive.directive-behavior.shows-current-verbose-level-verbose-has-no.test.ts
@@ -143,7 +143,7 @@ describe("directive behavior", () => {
 
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
       expect(text).toContain("Current elevated level: on");
-      expect(text).toContain("Options: on, off.");
+      expect(text).toContain("Options: on, off, ask, full.");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();
     });
   });
diff --git a/src/auto-reply/reply.directive.parse.test.ts b/src/auto-reply/reply.directive.parse.test.ts
index 72f22262f..545c5e169 100644
--- a/src/auto-reply/reply.directive.parse.test.ts
+++ b/src/auto-reply/reply.directive.parse.test.ts
@@ -55,6 +55,16 @@ describe("directive parsing", () => {
     expect(res.hasDirective).toBe(true);
     expect(res.elevatedLevel).toBe("on");
   });
+  it("matches elevated ask", () => {
+    const res = extractElevatedDirective("/elevated ask please");
+    expect(res.hasDirective).toBe(true);
+    expect(res.elevatedLevel).toBe("ask");
+  });
+  it("matches elevated full", () => {
+    const res = extractElevatedDirective("/elevated full please");
+    expect(res.hasDirective).toBe(true);
+    expect(res.elevatedLevel).toBe("full");
+  });
 
   it("matches think at start of line", () => {
     const res = extractThinkDirective("/think:high run slow");
diff --git a/src/auto-reply/reply.triggers.trigger-handling.allows-approved-sender-toggle-elevated-mode.test.ts b/src/auto-reply/reply.triggers.trigger-handling.allows-approved-sender-toggle-elevated-mode.test.ts
index 193172535..43cc0e5b2 100644
--- a/src/auto-reply/reply.triggers.trigger-handling.allows-approved-sender-toggle-elevated-mode.test.ts
+++ b/src/auto-reply/reply.triggers.trigger-handling.allows-approved-sender-toggle-elevated-mode.test.ts
@@ -129,7 +129,7 @@ describe("trigger handling", () => {
         cfg,
       );
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Elevated mode enabled");
+      expect(text).toContain("Elevated mode set to ask");
 
       const storeRaw = await fs.readFile(cfg.session.store, "utf-8");
       const store = JSON.parse(storeRaw) as Record<string, { elevatedLevel?: string }>;
@@ -223,7 +223,7 @@ describe("trigger handling", () => {
       );
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
       expect(text).toBe("ok");
-      expect(text).not.toContain("Elevated mode enabled");
+      expect(text).not.toContain("Elevated mode set to ask");
     });
   });
 });
diff --git a/src/auto-reply/reply.triggers.trigger-handling.allows-elevated-off-groups-without-mention.test.ts b/src/auto-reply/reply.triggers.trigger-handling.allows-elevated-off-groups-without-mention.test.ts
index 8ace7a4bc..fe4479df1 100644
--- a/src/auto-reply/reply.triggers.trigger-handling.allows-elevated-off-groups-without-mention.test.ts
+++ b/src/auto-reply/reply.triggers.trigger-handling.allows-elevated-off-groups-without-mention.test.ts
@@ -184,7 +184,7 @@ describe("trigger handling", () => {
         cfg,
       );
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Elevated mode enabled");
+      expect(text).toContain("Elevated mode set to ask");
 
       const storeRaw = await fs.readFile(cfg.session.store, "utf-8");
       const store = JSON.parse(storeRaw) as Record<string, { elevatedLevel?: string }>;
@@ -226,7 +226,7 @@ describe("trigger handling", () => {
         cfg,
       );
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Elevated mode enabled");
+      expect(text).toContain("Elevated mode set to ask");
 
       const storeRaw = await fs.readFile(cfg.session.store, "utf-8");
       const store = JSON.parse(storeRaw) as Record<string, { elevatedLevel?: string }>;
diff --git a/src/auto-reply/reply.triggers.trigger-handling.ignores-inline-elevated-directive-unapproved-sender.test.ts b/src/auto-reply/reply.triggers.trigger-handling.ignores-inline-elevated-directive-unapproved-sender.test.ts
index 0d6a0b303..183c4a67e 100644
--- a/src/auto-reply/reply.triggers.trigger-handling.ignores-inline-elevated-directive-unapproved-sender.test.ts
+++ b/src/auto-reply/reply.triggers.trigger-handling.ignores-inline-elevated-directive-unapproved-sender.test.ts
@@ -167,7 +167,7 @@ describe("trigger handling", () => {
         cfg,
       );
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
-      expect(text).toContain("Elevated mode enabled");
+      expect(text).toContain("Elevated mode set to ask");
 
       const storeRaw = await fs.readFile(cfg.session.store, "utf-8");
       const store = JSON.parse(storeRaw) as Record<string, { elevatedLevel?: string }>;
diff --git a/src/auto-reply/reply/commands-context-report.ts b/src/auto-reply/reply/commands-context-report.ts
index ac93e5fed..5cdc9f3d7 100644
--- a/src/auto-reply/reply/commands-context-report.ts
+++ b/src/auto-reply/reply/commands-context-report.ts
@@ -120,7 +120,7 @@ async function resolveContextReport(
         workspaceAccess: "rw" as const,
         elevated: {
           allowed: params.elevated.allowed,
-          defaultLevel: params.resolvedElevatedLevel === "off" ? ("off" as const) : ("on" as const),
+          defaultLevel: (params.resolvedElevatedLevel ?? "off") as "on" | "off" | "ask" | "full",
         },
       }
     : { enabled: false };
diff --git a/src/auto-reply/reply/directive-handling.impl.ts b/src/auto-reply/reply/directive-handling.impl.ts
index 33f19ee3f..7f056e6cd 100644
--- a/src/auto-reply/reply/directive-handling.impl.ts
+++ b/src/auto-reply/reply/directive-handling.impl.ts
@@ -205,7 +205,7 @@ export async function handleDirectiveOnly(params: {
       const level = currentElevatedLevel ?? "off";
       return {
         text: [
-          withOptions(`Current elevated level: ${level}.`, "on, off"),
+          withOptions(`Current elevated level: ${level}.`, "on, off, ask, full"),
           shouldHintDirectRuntime ? formatElevatedRuntimeHint() : null,
         ]
           .filter(Boolean)
@@ -213,7 +213,7 @@ export async function handleDirectiveOnly(params: {
       };
     }
     return {
-      text: `Unrecognized elevated level "${directives.rawElevatedLevel}". Valid levels: off, on.`,
+      text: `Unrecognized elevated level "${directives.rawElevatedLevel}". Valid levels: off, on, ask, full.`,
     };
   }
   if (directives.hasElevatedDirective && (!elevatedEnabled || !elevatedAllowed)) {
@@ -426,7 +426,9 @@ export async function handleDirectiveOnly(params: {
     parts.push(
       directives.elevatedLevel === "off"
         ? formatDirectiveAck("Elevated mode disabled.")
-        : formatDirectiveAck("Elevated mode enabled."),
+        : directives.elevatedLevel === "full"
+          ? formatDirectiveAck("Elevated mode set to full (auto-approve).")
+          : formatDirectiveAck("Elevated mode set to ask (approvals may still apply)."),
     );
     if (shouldHintDirectRuntime) parts.push(formatElevatedRuntimeHint());
   }
diff --git a/src/auto-reply/reply/directive-handling.shared.ts b/src/auto-reply/reply/directive-handling.shared.ts
index 961fe50a7..2fa4fd1ed 100644
--- a/src/auto-reply/reply/directive-handling.shared.ts
+++ b/src/auto-reply/reply/directive-handling.shared.ts
@@ -16,10 +16,15 @@ export const withOptions = (line: string, options: string) =>
 export const formatElevatedRuntimeHint = () =>
   `${SYSTEM_MARK} Runtime is direct; sandboxing does not apply.`;
 
-export const formatElevatedEvent = (level: ElevatedLevel) =>
-  level === "on"
-    ? "Elevated ON — exec runs on host; set elevated:false to stay sandboxed."
-    : "Elevated OFF — exec stays in sandbox.";
+export const formatElevatedEvent = (level: ElevatedLevel) => {
+  if (level === "full") {
+    return "Elevated FULL — exec runs on host with auto-approval.";
+  }
+  if (level === "ask" || level === "on") {
+    return "Elevated ASK — exec runs on host; approvals may still apply.";
+  }
+  return "Elevated OFF — exec stays in sandbox.";
+};
 
 export const formatReasoningEvent = (level: ReasoningLevel) => {
   if (level === "stream") return "Reasoning STREAM — emit live <think>.";
diff --git a/src/auto-reply/status.ts b/src/auto-reply/status.ts
index 2184c5f9a..eaf2d20a8 100644
--- a/src/auto-reply/status.ts
+++ b/src/auto-reply/status.ts
@@ -324,7 +324,12 @@ export function buildStatusMessage(args: StatusArgs): string {
   const queueDetails = formatQueueDetails(args.queue);
   const verboseLabel =
     verboseLevel === "full" ? "verbose:full" : verboseLevel === "on" ? "verbose" : null;
-  const elevatedLabel = elevatedLevel === "on" ? "elevated" : null;
+  const elevatedLabel =
+    elevatedLevel && elevatedLevel !== "off"
+      ? elevatedLevel === "on"
+        ? "elevated"
+        : `elevated:${elevatedLevel}`
+      : null;
   const optionParts = [
     `Runtime: ${runtime.label}`,
     `Think: ${thinkLevel}`,
@@ -395,7 +400,7 @@ export function buildHelpMessage(cfg?: ClawdbotConfig): string {
     "/think <level>",
     "/verbose on|full|off",
     "/reasoning on|off",
-    "/elevated on|off",
+    "/elevated on|off|ask|full",
     "/model <id>",
     "/usage off|tokens|full",
   ];
diff --git a/src/auto-reply/thinking.ts b/src/auto-reply/thinking.ts
index 6f9637dbd..aabb2cf17 100644
--- a/src/auto-reply/thinking.ts
+++ b/src/auto-reply/thinking.ts
@@ -1,6 +1,7 @@
 export type ThinkLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh";
 export type VerboseLevel = "off" | "on" | "full";
-export type ElevatedLevel = "off" | "on";
+export type ElevatedLevel = "off" | "on" | "ask" | "full";
+export type ElevatedMode = "off" | "ask" | "full";
 export type ReasoningLevel = "off" | "on" | "stream";
 export type UsageDisplayLevel = "off" | "tokens" | "full";
 
@@ -112,10 +113,18 @@ export function normalizeElevatedLevel(raw?: string | null): ElevatedLevel | und
   if (!raw) return undefined;
   const key = raw.toLowerCase();
   if (["off", "false", "no", "0"].includes(key)) return "off";
+  if (["full", "auto", "auto-approve", "autoapprove"].includes(key)) return "full";
+  if (["ask", "prompt", "approval", "approve"].includes(key)) return "ask";
   if (["on", "true", "yes", "1"].includes(key)) return "on";
   return undefined;
 }
 
+export function resolveElevatedMode(level?: ElevatedLevel | null): ElevatedMode {
+  if (!level || level === "off") return "off";
+  if (level === "full") return "full";
+  return "ask";
+}
+
 // Normalize reasoning visibility flags used to toggle reasoning exposure.
 export function normalizeReasoningLevel(raw?: string | null): ReasoningLevel | undefined {
   if (!raw) return undefined;
diff --git a/src/config/types.agent-defaults.ts b/src/config/types.agent-defaults.ts
index 46bd25d64..d4bac779c 100644
--- a/src/config/types.agent-defaults.ts
+++ b/src/config/types.agent-defaults.ts
@@ -136,7 +136,7 @@ export type AgentDefaultsConfig = {
   /** Default verbose level when no /verbose directive is present. */
   verboseDefault?: "off" | "on" | "full";
   /** Default elevated level when no /elevated directive is present. */
-  elevatedDefault?: "off" | "on";
+  elevatedDefault?: "off" | "on" | "ask" | "full";
   /** Default block streaming level when no override is present. */
   blockStreamingDefault?: "off" | "on";
   /**
diff --git a/src/config/zod-schema.agent-defaults.ts b/src/config/zod-schema.agent-defaults.ts
index fd624bfe3..c4b8a8f2c 100644
--- a/src/config/zod-schema.agent-defaults.ts
+++ b/src/config/zod-schema.agent-defaults.ts
@@ -113,7 +113,9 @@ export const AgentDefaultsSchema = z
       ])
       .optional(),
     verboseDefault: z.union([z.literal("off"), z.literal("on"), z.literal("full")]).optional(),
-    elevatedDefault: z.union([z.literal("off"), z.literal("on")]).optional(),
+    elevatedDefault: z
+      .union([z.literal("off"), z.literal("on"), z.literal("ask"), z.literal("full")])
+      .optional(),
     blockStreamingDefault: z.union([z.literal("off"), z.literal("on")]).optional(),
     blockStreamingBreak: z.union([z.literal("text_end"), z.literal("message_end")]).optional(),
     blockStreamingChunk: BlockStreamingChunkSchema.optional(),
diff --git a/src/gateway/sessions-patch.ts b/src/gateway/sessions-patch.ts
index 1a3736971..1d34217b7 100644
--- a/src/gateway/sessions-patch.ts
+++ b/src/gateway/sessions-patch.ts
@@ -169,7 +169,7 @@ export async function applySessionsPatchToStore(params: {
       delete next.elevatedLevel;
     } else if (raw !== undefined) {
       const normalized = normalizeElevatedLevel(String(raw));
-      if (!normalized) return invalid('invalid elevatedLevel (use "on"|"off")');
+      if (!normalized) return invalid('invalid elevatedLevel (use "on"|"off"|"ask"|"full")');
       // Persist "off" explicitly so patches can override defaults.
       next.elevatedLevel = normalized;
     }
diff --git a/src/tui/commands.ts b/src/tui/commands.ts
index b85049472..59806cfbd 100644
--- a/src/tui/commands.ts
+++ b/src/tui/commands.ts
@@ -3,7 +3,7 @@ import { formatThinkingLevels, listThinkingLevelLabels } from "../auto-reply/thi
 
 const VERBOSE_LEVELS = ["on", "off"];
 const REASONING_LEVELS = ["on", "off"];
-const ELEVATED_LEVELS = ["on", "off"];
+const ELEVATED_LEVELS = ["on", "off", "ask", "full"];
 const ACTIVATION_LEVELS = ["mention", "always"];
 const USAGE_FOOTER_LEVELS = ["off", "tokens", "full"];
 
@@ -83,7 +83,7 @@ export function getSlashCommands(options: SlashCommandOptions = {}): SlashComman
     },
     {
       name: "elevated",
-      description: "Set elevated on/off",
+      description: "Set elevated on/off/ask/full",
       getArgumentCompletions: (prefix) =>
         ELEVATED_LEVELS.filter((v) => v.startsWith(prefix.toLowerCase())).map((value) => ({
           value,
@@ -130,8 +130,8 @@ export function helpText(options: SlashCommandOptions = {}): string {
     "/verbose <on|off>",
     "/reasoning <on|off>",
     "/usage <off|tokens|full>",
-    "/elevated <on|off>",
-    "/elev <on|off>",
+    "/elevated <on|off|ask|full>",
+    "/elev <on|off|ask|full>",
     "/activation <mention|always>",
     "/new or /reset",
     "/abort",
diff --git a/src/tui/tui-command-handlers.ts b/src/tui/tui-command-handlers.ts
index 40584da0e..79765b5fc 100644
--- a/src/tui/tui-command-handlers.ts
+++ b/src/tui/tui-command-handlers.ts
@@ -371,7 +371,11 @@ export function createCommandHandlers(context: CommandHandlerContext) {
       }
       case "elevated":
         if (!args) {
-          chatLog.addSystem("usage: /elevated <on|off>");
+          chatLog.addSystem("usage: /elevated <on|off|ask|full>");
+          break;
+        }
+        if (!["on", "off", "ask", "full"].includes(args)) {
+          chatLog.addSystem("usage: /elevated <on|off|ask|full>");
           break;
         }
         try {

From 5ff4ac7fb725efeece24bdf49792b933e214fd58 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:42:58 +0000
Subject: [PATCH 144/171] fix: use gateway subcommand for launchd

---
 apps/macos/Sources/Clawdbot/GatewayLaunchAgentManager.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/macos/Sources/Clawdbot/GatewayLaunchAgentManager.swift b/apps/macos/Sources/Clawdbot/GatewayLaunchAgentManager.swift
index 6031677ea..154932c64 100644
--- a/apps/macos/Sources/Clawdbot/GatewayLaunchAgentManager.swift
+++ b/apps/macos/Sources/Clawdbot/GatewayLaunchAgentManager.swift
@@ -115,7 +115,7 @@ extension GatewayLaunchAgentManager {
         quiet: Bool) async -> CommandResult
     {
         let command = CommandResolver.clawdbotCommand(
-            subcommand: "daemon",
+            subcommand: "gateway",
             extraArgs: self.withJsonFlag(args),
             // Launchd management must always run locally, even if remote mode is configured.
             configRoot: ["gateway": ["mode": "local"]])

From 8580b85f0be8f5e35872f15fb4865b9ff165d582 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:32:28 +0000
Subject: [PATCH 145/171] fix: subagents list uses command session

---
 src/auto-reply/reply/commands-subagents.ts    |  2 +-
 src/auto-reply/reply/commands.test.ts         | 27 +++++++++++++++++++
 ...patterns-match-without-botusername.test.ts |  7 +++--
 ...gram-bot.installs-grammy-throttler.test.ts |  8 +++++-
 src/telegram/bot.test.ts                      |  8 +++++-
 5 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/src/auto-reply/reply/commands-subagents.ts b/src/auto-reply/reply/commands-subagents.ts
index f57c34f95..a1e33c642 100644
--- a/src/auto-reply/reply/commands-subagents.ts
+++ b/src/auto-reply/reply/commands-subagents.ts
@@ -45,7 +45,7 @@ function formatTimestampWithAge(valueMs?: number) {
 }
 
 function resolveRequesterSessionKey(params: Parameters<CommandHandler>[0]): string | undefined {
-  const raw = params.ctx.CommandTargetSessionKey?.trim() || params.sessionKey;
+  const raw = params.sessionKey?.trim() || params.ctx.CommandTargetSessionKey?.trim();
   if (!raw) return undefined;
   const { mainKey, alias } = resolveMainSessionAlias(params.cfg);
   return resolveInternalSessionKey({ key: raw, alias, mainKey });
diff --git a/src/auto-reply/reply/commands.test.ts b/src/auto-reply/reply/commands.test.ts
index fa104de03..cf383ed86 100644
--- a/src/auto-reply/reply/commands.test.ts
+++ b/src/auto-reply/reply/commands.test.ts
@@ -215,6 +215,33 @@ describe("handleCommands subagents", () => {
     expect(result.reply?.text).toContain("Subagents: none");
   });
 
+  it("lists subagents for the current command session over the target session", async () => {
+    resetSubagentRegistryForTests();
+    addSubagentRunForTests({
+      runId: "run-1",
+      childSessionKey: "agent:main:subagent:abc",
+      requesterSessionKey: "agent:main:slack:slash:U1",
+      requesterDisplayKey: "agent:main:slack:slash:U1",
+      task: "do thing",
+      cleanup: "keep",
+      createdAt: 1000,
+      startedAt: 1000,
+    });
+    const cfg = {
+      commands: { text: true },
+      channels: { whatsapp: { allowFrom: ["*"] } },
+    } as ClawdbotConfig;
+    const params = buildParams("/subagents list", cfg, {
+      CommandSource: "native",
+      CommandTargetSessionKey: "agent:main:main",
+    });
+    params.sessionKey = "agent:main:slack:slash:U1";
+    const result = await handleCommands(params);
+    expect(result.shouldContinue).toBe(false);
+    expect(result.reply?.text).toContain("Subagents (current session)");
+    expect(result.reply?.text).toContain("agent:main:subagent:abc");
+  });
+
   it("omits subagent status line when none exist", async () => {
     resetSubagentRegistryForTests();
     const cfg = {
diff --git a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
index 1d40a6ac5..3d27526fb 100644
--- a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
+++ b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
@@ -89,7 +89,6 @@ vi.mock("grammy", () => ({
 const sequentializeMiddleware = vi.fn();
 const sequentializeSpy = vi.fn(() => sequentializeMiddleware);
 let _sequentializeKey: ((ctx: unknown) => string) | undefined;
-let originalTz: string | undefined;
 vi.mock("@grammyjs/runner", () => ({
   sequentialize: (keyFn: (ctx: unknown) => string) => {
     _sequentializeKey = keyFn;
@@ -119,9 +118,10 @@ const getOnHandler = (event: string) => {
   return handler as (ctx: Record<string, unknown>) => Promise<void>;
 };
 
+const ORIGINAL_TZ = process.env.TZ;
+
 describe("createTelegramBot", () => {
   beforeEach(() => {
-    originalTz = process.env.TZ;
     process.env.TZ = "UTC";
     resetInboundDedupe();
     loadConfig.mockReturnValue({
@@ -140,9 +140,8 @@ describe("createTelegramBot", () => {
     botCtorSpy.mockReset();
     _sequentializeKey = undefined;
   });
-
   afterEach(() => {
-    process.env.TZ = originalTz;
+    process.env.TZ = ORIGINAL_TZ;
   });
 
   // groupPolicy tests
diff --git a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
index cabdfeae7..b11ecb058 100644
--- a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
+++ b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
 import { createTelegramBot, getTelegramSequentialKey } from "./bot.js";
 import { resolveTelegramFetch } from "./fetch.js";
@@ -121,8 +121,11 @@ const getOnHandler = (event: string) => {
   return handler as (ctx: Record<string, unknown>) => Promise<void>;
 };
 
+const ORIGINAL_TZ = process.env.TZ;
+
 describe("createTelegramBot", () => {
   beforeEach(() => {
+    process.env.TZ = "UTC";
     resetInboundDedupe();
     loadConfig.mockReturnValue({
       channels: {
@@ -140,6 +143,9 @@ describe("createTelegramBot", () => {
     botCtorSpy.mockReset();
     sequentializeKey = undefined;
   });
+  afterEach(() => {
+    process.env.TZ = ORIGINAL_TZ;
+  });
 
   // groupPolicy tests
 
diff --git a/src/telegram/bot.test.ts b/src/telegram/bot.test.ts
index 2e7c86cf8..6c965932d 100644
--- a/src/telegram/bot.test.ts
+++ b/src/telegram/bot.test.ts
@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   listNativeCommandSpecs,
   listNativeCommandSpecsForConfig,
@@ -147,8 +147,11 @@ const getOnHandler = (event: string) => {
   return handler as (ctx: Record<string, unknown>) => Promise<void>;
 };
 
+const ORIGINAL_TZ = process.env.TZ;
+
 describe("createTelegramBot", () => {
   beforeEach(() => {
+    process.env.TZ = "UTC";
     resetInboundDedupe();
     loadConfig.mockReturnValue({
       channels: {
@@ -167,6 +170,9 @@ describe("createTelegramBot", () => {
     botCtorSpy.mockReset();
     sequentializeKey = undefined;
   });
+  afterEach(() => {
+    process.env.TZ = ORIGINAL_TZ;
+  });
 
   it("installs grammY throttler", () => {
     createTelegramBot({ token: "tok" });

From d425f1ebead91da113599a1e991f113b8f4b0066 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:51:42 +0000
Subject: [PATCH 146/171] test: align envelope timestamp expectations (#1329)
 (thanks @dlauer)

---
 ...patterns-match-without-botusername.test.ts |  9 +++----
 ...gram-bot.installs-grammy-throttler.test.ts |  7 ++----
 src/telegram/bot.test.ts                      | 11 +++-----
 ....reconnects-after-connection-close.test.ts |  9 +++----
 test/helpers/envelope-timestamp.ts            | 25 ++++++++++++++++++-
 5 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
index 1379b6e6f..a648b9511 100644
--- a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
+++ b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
@@ -1,8 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import {
-  escapeRegExp,
-  formatLocalEnvelopeTimestamp,
-} from "../../test/helpers/envelope-timestamp.js";
+import { escapeRegExp, formatEnvelopeTimestamp } from "../../test/helpers/envelope-timestamp.js";
 import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
 import { createTelegramBot } from "./bot.js";
 
@@ -180,7 +177,7 @@ describe("createTelegramBot", () => {
     expect(payload.WasMentioned).toBe(true);
     expect(payload.SenderName).toBe("Ada");
     expect(payload.SenderId).toBe("9");
-    const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+    const expectedTimestamp = formatEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
     const timestampPattern = escapeRegExp(expectedTimestamp);
     expect(payload.Body).toMatch(
       new RegExp(`^\\[Telegram Test Group id:7 (\\+\\d+[smhd] )?${timestampPattern}\\]`),
@@ -225,7 +222,7 @@ describe("createTelegramBot", () => {
     expect(payload.SenderName).toBe("Ada Lovelace");
     expect(payload.SenderId).toBe("99");
     expect(payload.SenderUsername).toBe("ada");
-    const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+    const expectedTimestamp = formatEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
     const timestampPattern = escapeRegExp(expectedTimestamp);
     expect(payload.Body).toMatch(
       new RegExp(`^\\[Telegram Ops id:42 (\\+\\d+[smhd] )?${timestampPattern}\\]`),
diff --git a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
index 141532796..e27e119f0 100644
--- a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
+++ b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts
@@ -1,8 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import {
-  escapeRegExp,
-  formatLocalEnvelopeTimestamp,
-} from "../../test/helpers/envelope-timestamp.js";
+import { escapeRegExp, formatEnvelopeTimestamp } from "../../test/helpers/envelope-timestamp.js";
 import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
 import { createTelegramBot, getTelegramSequentialKey } from "./bot.js";
 import { resolveTelegramFetch } from "./fetch.js";
@@ -332,7 +329,7 @@ describe("createTelegramBot", () => {
 
       expect(replySpy).toHaveBeenCalledTimes(1);
       const payload = replySpy.mock.calls[0][0];
-      const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+      const expectedTimestamp = formatEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
       const timestampPattern = escapeRegExp(expectedTimestamp);
       expect(payload.Body).toMatch(
         new RegExp(
diff --git a/src/telegram/bot.test.ts b/src/telegram/bot.test.ts
index 2d04d6aa4..21f52c50d 100644
--- a/src/telegram/bot.test.ts
+++ b/src/telegram/bot.test.ts
@@ -10,10 +10,7 @@ import { listSkillCommandsForAgents } from "../auto-reply/skill-commands.js";
 import { resetInboundDedupe } from "../auto-reply/reply/inbound-dedupe.js";
 import * as replyModule from "../auto-reply/reply.js";
 import { expectInboundContextContract } from "../../test/helpers/inbound-contract.js";
-import {
-  escapeRegExp,
-  formatLocalEnvelopeTimestamp,
-} from "../../test/helpers/envelope-timestamp.js";
+import { escapeRegExp, formatEnvelopeTimestamp } from "../../test/helpers/envelope-timestamp.js";
 import { createTelegramBot, getTelegramSequentialKey } from "./bot.js";
 import { resolveTelegramFetch } from "./fetch.js";
 
@@ -454,7 +451,7 @@ describe("createTelegramBot", () => {
 
       expect(replySpy).toHaveBeenCalledTimes(1);
       const payload = replySpy.mock.calls[0][0];
-      const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+      const expectedTimestamp = formatEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
       const timestampPattern = escapeRegExp(expectedTimestamp);
       expect(payload.Body).toMatch(
         new RegExp(
@@ -593,7 +590,7 @@ describe("createTelegramBot", () => {
     const payload = replySpy.mock.calls[0][0];
     expectInboundContextContract(payload);
     expect(payload.WasMentioned).toBe(true);
-    const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+    const expectedTimestamp = formatEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
     const timestampPattern = escapeRegExp(expectedTimestamp);
     expect(payload.Body).toMatch(
       new RegExp(`^\\[Telegram Test Group id:7 (\\+\\d+[smhd] )?${timestampPattern}\\]`),
@@ -639,7 +636,7 @@ describe("createTelegramBot", () => {
     expect(replySpy).toHaveBeenCalledTimes(1);
     const payload = replySpy.mock.calls[0][0];
     expectInboundContextContract(payload);
-    const expectedTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
+    const expectedTimestamp = formatEnvelopeTimestamp(new Date("2025-01-09T00:00:00Z"));
     const timestampPattern = escapeRegExp(expectedTimestamp);
     expect(payload.Body).toMatch(
       new RegExp(`^\\[Telegram Ops id:42 (\\+\\d+[smhd] )?${timestampPattern}\\]`),
diff --git a/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts b/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts
index 870a018d5..f40e4e3ab 100644
--- a/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts
+++ b/src/web/auto-reply.web-auto-reply.reconnects-after-connection-close.test.ts
@@ -3,10 +3,7 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import {
-  escapeRegExp,
-  formatLocalEnvelopeTimestamp,
-} from "../../test/helpers/envelope-timestamp.js";
+import { escapeRegExp, formatEnvelopeTimestamp } from "../../test/helpers/envelope-timestamp.js";
 
 vi.mock("../agents/pi-embedded.js", () => ({
   abortEmbeddedPiRun: vi.fn().mockReturnValue(false),
@@ -332,8 +329,8 @@ describe("web auto-reply", () => {
       expect(resolver).toHaveBeenCalledTimes(2);
       const firstArgs = resolver.mock.calls[0][0];
       const secondArgs = resolver.mock.calls[1][0];
-      const firstTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-01T00:00:00Z"));
-      const secondTimestamp = formatLocalEnvelopeTimestamp(new Date("2025-01-01T01:00:00Z"));
+      const firstTimestamp = formatEnvelopeTimestamp(new Date("2025-01-01T00:00:00Z"));
+      const secondTimestamp = formatEnvelopeTimestamp(new Date("2025-01-01T01:00:00Z"));
       const firstPattern = escapeRegExp(firstTimestamp);
       const secondPattern = escapeRegExp(secondTimestamp);
       expect(firstArgs.Body).toMatch(
diff --git a/test/helpers/envelope-timestamp.ts b/test/helpers/envelope-timestamp.ts
index 135063e41..934608204 100644
--- a/test/helpers/envelope-timestamp.ts
+++ b/test/helpers/envelope-timestamp.ts
@@ -1,5 +1,17 @@
-export function formatLocalEnvelopeTimestamp(date: Date): string {
+type EnvelopeTimestampZone = string;
+
+function formatUtcTimestamp(date: Date): string {
+  const yyyy = String(date.getUTCFullYear()).padStart(4, "0");
+  const mm = String(date.getUTCMonth() + 1).padStart(2, "0");
+  const dd = String(date.getUTCDate()).padStart(2, "0");
+  const hh = String(date.getUTCHours()).padStart(2, "0");
+  const min = String(date.getUTCMinutes()).padStart(2, "0");
+  return `${yyyy}-${mm}-${dd}T${hh}:${min}Z`;
+}
+
+function formatZonedTimestamp(date: Date, timeZone?: string): string {
   const parts = new Intl.DateTimeFormat("en-US", {
+    timeZone,
     year: "numeric",
     month: "2-digit",
     day: "2-digit",
@@ -27,6 +39,17 @@ export function formatLocalEnvelopeTimestamp(date: Date): string {
   return `${yyyy}-${mm}-${dd} ${hh}:${min}${tz ? ` ${tz}` : ""}`;
 }
 
+export function formatEnvelopeTimestamp(date: Date, zone: EnvelopeTimestampZone = "utc"): string {
+  const normalized = zone.trim().toLowerCase();
+  if (normalized === "utc" || normalized === "gmt") return formatUtcTimestamp(date);
+  if (normalized === "local" || normalized === "host") return formatZonedTimestamp(date);
+  return formatZonedTimestamp(date, zone);
+}
+
+export function formatLocalEnvelopeTimestamp(date: Date): string {
+  return formatEnvelopeTimestamp(date, "local");
+}
+
 export function escapeRegExp(value: string): string {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }

From 36cfe75a0bffce7e54ef481c827ad46e7a5d3ba0 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:54:00 +0000
Subject: [PATCH 147/171] test: relax canvas host reload timing

---
 src/canvas-host/server.test.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/canvas-host/server.test.ts b/src/canvas-host/server.test.ts
index 8f3d8e839..f51e2f5e0 100644
--- a/src/canvas-host/server.test.ts
+++ b/src/canvas-host/server.test.ts
@@ -171,7 +171,7 @@ describe("canvas host", () => {
 
       const ws = new WebSocket(`ws://127.0.0.1:${server.port}${CANVAS_WS_PATH}`);
       await new Promise<void>((resolve, reject) => {
-        const timer = setTimeout(() => reject(new Error("ws open timeout")), 2000);
+        const timer = setTimeout(() => reject(new Error("ws open timeout")), 5000);
         ws.on("open", () => {
           clearTimeout(timer);
           resolve();
@@ -183,13 +183,14 @@ describe("canvas host", () => {
       });
 
       const msg = new Promise<string>((resolve, reject) => {
-        const timer = setTimeout(() => reject(new Error("reload timeout")), 4000);
+        const timer = setTimeout(() => reject(new Error("reload timeout")), 10_000);
         ws.on("message", (data) => {
           clearTimeout(timer);
           resolve(rawDataToString(data));
         });
       });
 
+      await new Promise((resolve) => setTimeout(resolve, 100));
       await fs.writeFile(index, "<html><body>v2</body></html>", "utf8");
       expect(await msg).toBe("reload");
       ws.close();
@@ -197,7 +198,7 @@ describe("canvas host", () => {
       await server.close();
       await fs.rm(dir, { recursive: true, force: true });
     }
-  }, 10_000);
+  }, 20_000);
 
   it("serves the gateway-hosted A2UI scaffold", async () => {
     const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-canvas-"));

From 7b7c107ffe02db1b391ca6ad0c4c74649af7a7a4 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:58:46 +0000
Subject: [PATCH 148/171] docs: update changelog for avatar follow-up (#1424)
 (thanks @dlauer)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da54152b6..cf05ea0d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ Docs: https://docs.clawd.bot
 
 ### Changes
 - Highlight: Lobster optional plugin tool for typed workflows + approval gates. https://docs.clawd.bot/tools/lobster
-- Agents: add identity avatar config support and Control UI avatar rendering. (#1329) Thanks @dlauer.
+- Agents: add identity avatar config support and Control UI avatar rendering. (#1329, #1424) Thanks @dlauer.
 - Memory: prevent CLI hangs by deferring vector probes, adding sqlite-vec/embedding timeouts, and showing sync progress early.
 - Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
 - Docs: add per-message Gmail search example for gog. (#1220) Thanks @mbelinky.

From 34686027b1f419509375512a6561449ea2e30a6e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 05:46:04 +0000
Subject: [PATCH 149/171] fix: inherit model overrides for thread sessions

---
 CHANGELOG.md                                  |   1 +
 src/auto-reply/reply/get-reply-directives.ts  |   1 +
 .../model-selection.inherit-parent.test.ts    | 157 ++++++++++++++++++
 src/auto-reply/reply/model-selection.ts       |  73 +++++++-
 src/sessions/session-key-utils.ts             |  18 ++
 ...patterns-match-without-botusername.test.ts |   1 -
 src/telegram/bot.test.ts                      | 141 +++++++---------
 7 files changed, 307 insertions(+), 85 deletions(-)
 create mode 100644 src/auto-reply/reply/model-selection.inherit-parent.test.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2366a0c7b..1bb747f04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ Docs: https://docs.clawd.bot
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
 - OpenCode Zen: route models to the Zen API shape per family so proxy endpoints are used. (#1416)
 - Browser: suppress Chrome restore prompts for managed profiles. (#1419) Thanks @jamesgroat.
+- Models: inherit session model overrides in thread/topic sessions (Telegram topics, Slack/Discord threads). (#1376)
 - macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
 - Cron: cap reminder context history to 10 messages and honor `contextMessages`. (#1103) Thanks @mkbehr.
 - Exec approvals: treat main as the default agent + migrate legacy default allowlists. (#1417) Thanks @czekaj.
diff --git a/src/auto-reply/reply/get-reply-directives.ts b/src/auto-reply/reply/get-reply-directives.ts
index bbdf033cc..04782c9eb 100644
--- a/src/auto-reply/reply/get-reply-directives.ts
+++ b/src/auto-reply/reply/get-reply-directives.ts
@@ -379,6 +379,7 @@ export async function resolveReplyDirectives(params: {
     sessionEntry,
     sessionStore,
     sessionKey,
+    parentSessionKey: ctx.ParentSessionKey,
     storePath,
     defaultProvider,
     defaultModel,
diff --git a/src/auto-reply/reply/model-selection.inherit-parent.test.ts b/src/auto-reply/reply/model-selection.inherit-parent.test.ts
new file mode 100644
index 000000000..8a06f47a4
--- /dev/null
+++ b/src/auto-reply/reply/model-selection.inherit-parent.test.ts
@@ -0,0 +1,157 @@
+import { describe, expect, it, vi } from "vitest";
+
+import type { ClawdbotConfig } from "../../config/config.js";
+import { createModelSelectionState } from "./model-selection.js";
+
+vi.mock("../../agents/model-catalog.js", () => ({
+  loadModelCatalog: vi.fn(async () => [
+    { provider: "openai", id: "gpt-4o-mini", name: "GPT-4o mini" },
+    { provider: "openai", id: "gpt-4o", name: "GPT-4o" },
+    { provider: "anthropic", id: "claude-opus-4-5", name: "Claude Opus 4.5" },
+  ]),
+}));
+
+const defaultProvider = "openai";
+const defaultModel = "gpt-4o-mini";
+
+const makeEntry = (overrides: Record<string, unknown> = {}) => ({
+  sessionId: "session-id",
+  updatedAt: Date.now(),
+  ...overrides,
+});
+
+async function resolveState(params: {
+  cfg: ClawdbotConfig;
+  sessionEntry: ReturnType<typeof makeEntry>;
+  sessionStore: Record<string, ReturnType<typeof makeEntry>>;
+  sessionKey: string;
+  parentSessionKey?: string;
+}) {
+  return createModelSelectionState({
+    cfg: params.cfg,
+    agentCfg: params.cfg.agents?.defaults,
+    sessionEntry: params.sessionEntry,
+    sessionStore: params.sessionStore,
+    sessionKey: params.sessionKey,
+    parentSessionKey: params.parentSessionKey,
+    defaultProvider,
+    defaultModel,
+    provider: defaultProvider,
+    model: defaultModel,
+    hasModelDirective: false,
+  });
+}
+
+describe("createModelSelectionState parent inheritance", () => {
+  it("inherits parent override from explicit parentSessionKey", async () => {
+    const cfg = {} as ClawdbotConfig;
+    const parentKey = "agent:main:discord:channel:C1";
+    const sessionKey = "agent:main:discord:channel:C1:thread:123";
+    const parentEntry = makeEntry({
+      providerOverride: "openai",
+      modelOverride: "gpt-4o",
+    });
+    const sessionEntry = makeEntry();
+    const sessionStore = {
+      [parentKey]: parentEntry,
+      [sessionKey]: sessionEntry,
+    };
+
+    const state = await resolveState({
+      cfg,
+      sessionEntry,
+      sessionStore,
+      sessionKey,
+      parentSessionKey: parentKey,
+    });
+
+    expect(state.provider).toBe("openai");
+    expect(state.model).toBe("gpt-4o");
+  });
+
+  it("derives parent key from topic session suffix", async () => {
+    const cfg = {} as ClawdbotConfig;
+    const parentKey = "agent:main:telegram:group:123";
+    const sessionKey = "agent:main:telegram:group:123:topic:99";
+    const parentEntry = makeEntry({
+      providerOverride: "openai",
+      modelOverride: "gpt-4o",
+    });
+    const sessionEntry = makeEntry();
+    const sessionStore = {
+      [parentKey]: parentEntry,
+      [sessionKey]: sessionEntry,
+    };
+
+    const state = await resolveState({
+      cfg,
+      sessionEntry,
+      sessionStore,
+      sessionKey,
+    });
+
+    expect(state.provider).toBe("openai");
+    expect(state.model).toBe("gpt-4o");
+  });
+
+  it("prefers child override over parent", async () => {
+    const cfg = {} as ClawdbotConfig;
+    const parentKey = "agent:main:telegram:group:123";
+    const sessionKey = "agent:main:telegram:group:123:topic:99";
+    const parentEntry = makeEntry({
+      providerOverride: "openai",
+      modelOverride: "gpt-4o",
+    });
+    const sessionEntry = makeEntry({
+      providerOverride: "anthropic",
+      modelOverride: "claude-opus-4-5",
+    });
+    const sessionStore = {
+      [parentKey]: parentEntry,
+      [sessionKey]: sessionEntry,
+    };
+
+    const state = await resolveState({
+      cfg,
+      sessionEntry,
+      sessionStore,
+      sessionKey,
+    });
+
+    expect(state.provider).toBe("anthropic");
+    expect(state.model).toBe("claude-opus-4-5");
+  });
+
+  it("ignores parent override when disallowed", async () => {
+    const cfg = {
+      agents: {
+        defaults: {
+          models: {
+            "openai/gpt-4o-mini": {},
+          },
+        },
+      },
+    } as ClawdbotConfig;
+    const parentKey = "agent:main:slack:channel:C1";
+    const sessionKey = "agent:main:slack:channel:C1:thread:123";
+    const parentEntry = makeEntry({
+      providerOverride: "anthropic",
+      modelOverride: "claude-opus-4-5",
+    });
+    const sessionEntry = makeEntry();
+    const sessionStore = {
+      [parentKey]: parentEntry,
+      [sessionKey]: sessionEntry,
+    };
+
+    const state = await resolveState({
+      cfg,
+      sessionEntry,
+      sessionStore,
+      sessionKey,
+    });
+
+    expect(state.provider).toBe(defaultProvider);
+    expect(state.model).toBe(defaultModel);
+  });
+});
diff --git a/src/auto-reply/reply/model-selection.ts b/src/auto-reply/reply/model-selection.ts
index 7bee7c8bd..6d34d29c5 100644
--- a/src/auto-reply/reply/model-selection.ts
+++ b/src/auto-reply/reply/model-selection.ts
@@ -13,6 +13,7 @@ import type { ClawdbotConfig } from "../../config/config.js";
 import { type SessionEntry, updateSessionStore } from "../../config/sessions.js";
 import { clearSessionAuthProfileOverride } from "../../agents/auth-profiles/session-override.js";
 import { applyModelOverrideToSessionEntry } from "../../sessions/model-overrides.js";
+import { resolveThreadParentSessionKey } from "../../sessions/session-key-utils.js";
 import type { ThinkLevel } from "./directives.js";
 
 export type ModelDirectiveSelection = {
@@ -78,6 +79,52 @@ function boundedLevenshteinDistance(a: string, b: string, maxDistance: number):
   return dist;
 }
 
+type StoredModelOverride = {
+  provider?: string;
+  model: string;
+  source: "session" | "parent";
+};
+
+function resolveModelOverrideFromEntry(entry?: SessionEntry): {
+  provider?: string;
+  model: string;
+} | null {
+  const model = entry?.modelOverride?.trim();
+  if (!model) return null;
+  const provider = entry?.providerOverride?.trim() || undefined;
+  return { provider, model };
+}
+
+function resolveParentSessionKeyCandidate(params: {
+  sessionKey?: string;
+  parentSessionKey?: string;
+}): string | null {
+  const explicit = params.parentSessionKey?.trim();
+  if (explicit && explicit !== params.sessionKey) return explicit;
+  const derived = resolveThreadParentSessionKey(params.sessionKey);
+  if (derived && derived !== params.sessionKey) return derived;
+  return null;
+}
+
+function resolveStoredModelOverride(params: {
+  sessionEntry?: SessionEntry;
+  sessionStore?: Record<string, SessionEntry>;
+  sessionKey?: string;
+  parentSessionKey?: string;
+}): StoredModelOverride | null {
+  const direct = resolveModelOverrideFromEntry(params.sessionEntry);
+  if (direct) return { ...direct, source: "session" };
+  const parentKey = resolveParentSessionKeyCandidate({
+    sessionKey: params.sessionKey,
+    parentSessionKey: params.parentSessionKey,
+  });
+  if (!parentKey || !params.sessionStore) return null;
+  const parentEntry = params.sessionStore[parentKey];
+  const parentOverride = resolveModelOverrideFromEntry(parentEntry);
+  if (!parentOverride) return null;
+  return { ...parentOverride, source: "parent" };
+}
+
 function scoreFuzzyMatch(params: {
   provider: string;
   model: string;
@@ -177,6 +224,7 @@ export async function createModelSelectionState(params: {
   sessionEntry?: SessionEntry;
   sessionStore?: Record<string, SessionEntry>;
   sessionKey?: string;
+  parentSessionKey?: string;
   storePath?: string;
   defaultProvider: string;
   defaultModel: string;
@@ -190,6 +238,7 @@ export async function createModelSelectionState(params: {
     sessionEntry,
     sessionStore,
     sessionKey,
+    parentSessionKey,
     storePath,
     defaultProvider,
     defaultModel,
@@ -199,7 +248,13 @@ export async function createModelSelectionState(params: {
   let model = params.model;
 
   const hasAllowlist = agentCfg?.models && Object.keys(agentCfg.models).length > 0;
-  const hasStoredOverride = Boolean(sessionEntry?.modelOverride || sessionEntry?.providerOverride);
+  const initialStoredOverride = resolveStoredModelOverride({
+    sessionEntry,
+    sessionStore,
+    sessionKey,
+    parentSessionKey,
+  });
+  const hasStoredOverride = Boolean(initialStoredOverride);
   const needsModelCatalog = params.hasModelDirective || hasAllowlist || hasStoredOverride;
 
   let allowedModelKeys = new Set<string>();
@@ -242,14 +297,18 @@ export async function createModelSelectionState(params: {
     }
   }
 
-  const storedProviderOverride = sessionEntry?.providerOverride?.trim();
-  const storedModelOverride = sessionEntry?.modelOverride?.trim();
-  if (storedModelOverride) {
-    const candidateProvider = storedProviderOverride || defaultProvider;
-    const key = modelKey(candidateProvider, storedModelOverride);
+  const storedOverride = resolveStoredModelOverride({
+    sessionEntry,
+    sessionStore,
+    sessionKey,
+    parentSessionKey,
+  });
+  if (storedOverride?.model) {
+    const candidateProvider = storedOverride.provider || defaultProvider;
+    const key = modelKey(candidateProvider, storedOverride.model);
     if (allowedModelKeys.size === 0 || allowedModelKeys.has(key)) {
       provider = candidateProvider;
-      model = storedModelOverride;
+      model = storedOverride.model;
     }
   }
 
diff --git a/src/sessions/session-key-utils.ts b/src/sessions/session-key-utils.ts
index 2bc90591d..10baeb607 100644
--- a/src/sessions/session-key-utils.ts
+++ b/src/sessions/session-key-utils.ts
@@ -33,3 +33,21 @@ export function isAcpSessionKey(sessionKey: string | undefined | null): boolean
   const parsed = parseAgentSessionKey(raw);
   return Boolean((parsed?.rest ?? "").toLowerCase().startsWith("acp:"));
 }
+
+const THREAD_SESSION_MARKERS = [":thread:", ":topic:"];
+
+export function resolveThreadParentSessionKey(
+  sessionKey: string | undefined | null,
+): string | null {
+  const raw = (sessionKey ?? "").trim();
+  if (!raw) return null;
+  const normalized = raw.toLowerCase();
+  let idx = -1;
+  for (const marker of THREAD_SESSION_MARKERS) {
+    const candidate = normalized.lastIndexOf(marker);
+    if (candidate > idx) idx = candidate;
+  }
+  if (idx <= 0) return null;
+  const parent = raw.slice(0, idx).trim();
+  return parent ? parent : null;
+}
diff --git a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
index 3d27526fb..f5ce59f1a 100644
--- a/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
+++ b/src/telegram/bot.create-telegram-bot.accepts-group-messages-mentionpatterns-match-without-botusername.test.ts
@@ -119,7 +119,6 @@ const getOnHandler = (event: string) => {
 };
 
 const ORIGINAL_TZ = process.env.TZ;
-
 describe("createTelegramBot", () => {
   beforeEach(() => {
     process.env.TZ = "UTC";
diff --git a/src/telegram/bot.test.ts b/src/telegram/bot.test.ts
index 6c965932d..fadf2af46 100644
--- a/src/telegram/bot.test.ts
+++ b/src/telegram/bot.test.ts
@@ -148,7 +148,6 @@ const getOnHandler = (event: string) => {
 };
 
 const ORIGINAL_TZ = process.env.TZ;
-
 describe("createTelegramBot", () => {
   beforeEach(() => {
     process.env.TZ = "UTC";
@@ -557,102 +556,90 @@ describe("createTelegramBot", () => {
   });
 
   it("accepts group messages when mentionPatterns match (without @botUsername)", async () => {
-    const originalTz = process.env.TZ;
-    process.env.TZ = "UTC";
     onSpy.mockReset();
     const replySpy = replyModule.__replySpy as unknown as ReturnType<typeof vi.fn>;
     replySpy.mockReset();
 
-    try {
-      loadConfig.mockReturnValue({
-        identity: { name: "Bert" },
-        messages: { groupChat: { mentionPatterns: ["\\bbert\\b"] } },
-        channels: {
-          telegram: {
-            groupPolicy: "open",
-            groups: { "*": { requireMention: true } },
-          },
+    loadConfig.mockReturnValue({
+      identity: { name: "Bert" },
+      messages: { groupChat: { mentionPatterns: ["\\bbert\\b"] } },
+      channels: {
+        telegram: {
+          groupPolicy: "open",
+          groups: { "*": { requireMention: true } },
         },
-      });
+      },
+    });
 
-      createTelegramBot({ token: "tok" });
-      const handler = getOnHandler("message") as (ctx: Record<string, unknown>) => Promise<void>;
+    createTelegramBot({ token: "tok" });
+    const handler = getOnHandler("message") as (ctx: Record<string, unknown>) => Promise<void>;
 
-      await handler({
-        message: {
-          chat: { id: 7, type: "group", title: "Test Group" },
-          text: "bert: introduce yourself",
-          date: 1736380800,
-          message_id: 1,
-          from: { id: 9, first_name: "Ada" },
-        },
-        me: { username: "clawdbot_bot" },
-        getFile: async () => ({ download: async () => new Uint8Array() }),
-      });
+    await handler({
+      message: {
+        chat: { id: 7, type: "group", title: "Test Group" },
+        text: "bert: introduce yourself",
+        date: 1736380800,
+        message_id: 1,
+        from: { id: 9, first_name: "Ada" },
+      },
+      me: { username: "clawdbot_bot" },
+      getFile: async () => ({ download: async () => new Uint8Array() }),
+    });
 
-      expect(replySpy).toHaveBeenCalledTimes(1);
-      const payload = replySpy.mock.calls[0][0];
-      expectInboundContextContract(payload);
-      expect(payload.WasMentioned).toBe(true);
-      expect(payload.Body).toMatch(
-        /^\[Telegram Test Group id:7 (\+\d+[smhd] )?2025-01-09 00:00 [^\]]+\]/,
-      );
-      expect(payload.SenderName).toBe("Ada");
-      expect(payload.SenderId).toBe("9");
-    } finally {
-      process.env.TZ = originalTz;
-    }
+    expect(replySpy).toHaveBeenCalledTimes(1);
+    const payload = replySpy.mock.calls[0][0];
+    expectInboundContextContract(payload);
+    expect(payload.WasMentioned).toBe(true);
+    expect(payload.Body).toMatch(
+      /^\[Telegram Test Group id:7 (\+\d+[smhd] )?2025-01-09 00:00 [^\]]+\]/,
+    );
+    expect(payload.SenderName).toBe("Ada");
+    expect(payload.SenderId).toBe("9");
   });
 
   it("includes sender identity in group envelope headers", async () => {
-    const originalTz = process.env.TZ;
-    process.env.TZ = "UTC";
     onSpy.mockReset();
     const replySpy = replyModule.__replySpy as unknown as ReturnType<typeof vi.fn>;
     replySpy.mockReset();
 
-    try {
-      loadConfig.mockReturnValue({
-        channels: {
-          telegram: {
-            groupPolicy: "open",
-            groups: { "*": { requireMention: false } },
-          },
+    loadConfig.mockReturnValue({
+      channels: {
+        telegram: {
+          groupPolicy: "open",
+          groups: { "*": { requireMention: false } },
         },
-      });
+      },
+    });
 
-      createTelegramBot({ token: "tok" });
-      const handler = getOnHandler("message") as (ctx: Record<string, unknown>) => Promise<void>;
+    createTelegramBot({ token: "tok" });
+    const handler = getOnHandler("message") as (ctx: Record<string, unknown>) => Promise<void>;
 
-      await handler({
-        message: {
-          chat: { id: 42, type: "group", title: "Ops" },
-          text: "hello",
-          date: 1736380800,
-          message_id: 2,
-          from: {
-            id: 99,
-            first_name: "Ada",
-            last_name: "Lovelace",
-            username: "ada",
-          },
+    await handler({
+      message: {
+        chat: { id: 42, type: "group", title: "Ops" },
+        text: "hello",
+        date: 1736380800,
+        message_id: 2,
+        from: {
+          id: 99,
+          first_name: "Ada",
+          last_name: "Lovelace",
+          username: "ada",
         },
-        me: { username: "clawdbot_bot" },
-        getFile: async () => ({ download: async () => new Uint8Array() }),
-      });
+      },
+      me: { username: "clawdbot_bot" },
+      getFile: async () => ({ download: async () => new Uint8Array() }),
+    });
 
-      expect(replySpy).toHaveBeenCalledTimes(1);
-      const payload = replySpy.mock.calls[0][0];
-      expectInboundContextContract(payload);
-      expect(payload.Body).toMatch(
-        /^\[Telegram Ops id:42 (\+\d+[smhd] )?2025-01-09 00:00 [^\]]+\]/,
-      );
-      expect(payload.SenderName).toBe("Ada Lovelace");
-      expect(payload.SenderId).toBe("99");
-      expect(payload.SenderUsername).toBe("ada");
-    } finally {
-      process.env.TZ = originalTz;
-    }
+    expect(replySpy).toHaveBeenCalledTimes(1);
+    const payload = replySpy.mock.calls[0][0];
+    expectInboundContextContract(payload);
+    expect(payload.Body).toMatch(
+      /^\[Telegram Ops id:42 (\+\d+[smhd] )?2025-01-09 00:00 [^\]]+\]/,
+    );
+    expect(payload.SenderName).toBe("Ada Lovelace");
+    expect(payload.SenderId).toBe("99");
+    expect(payload.SenderUsername).toBe("ada");
   });
 
   it("reacts to mention-gated group messages when ackReaction is enabled", async () => {

From 23ea4a21e09aa02065c7e979b350b355e68d0819 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 06:03:15 +0000
Subject: [PATCH 150/171] fix: skip elevated defaults when not allowed

---
 src/agents/bash-tools.exec.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/agents/bash-tools.exec.ts b/src/agents/bash-tools.exec.ts
index d7aaa218f..1ddcbc913 100644
--- a/src/agents/bash-tools.exec.ts
+++ b/src/agents/bash-tools.exec.ts
@@ -706,6 +706,7 @@ export function createExecTool(
           : clampNumber(params.yieldMs ?? defaultBackgroundMs, defaultBackgroundMs, 10, 120_000)
         : null;
       const elevatedDefaults = defaults?.elevated;
+      const elevatedAllowed = Boolean(elevatedDefaults?.enabled && elevatedDefaults.allowed);
       const elevatedDefaultMode =
         elevatedDefaults?.defaultLevel === "full"
           ? "full"
@@ -714,6 +715,7 @@ export function createExecTool(
             : elevatedDefaults?.defaultLevel === "on"
               ? "ask"
               : "off";
+      const effectiveDefaultMode = elevatedAllowed ? elevatedDefaultMode : "off";
       const elevatedMode =
         typeof params.elevated === "boolean"
           ? params.elevated
@@ -721,7 +723,7 @@ export function createExecTool(
               ? "full"
               : "ask"
             : "off"
-          : elevatedDefaultMode;
+          : effectiveDefaultMode;
       const elevatedRequested = elevatedMode !== "off";
       if (elevatedRequested) {
         if (!elevatedDefaults?.enabled || !elevatedDefaults.allowed) {

From 30ca87094d55d1532a851534e282ced1e1c8e942 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 06:34:41 +0000
Subject: [PATCH 151/171] fix: macOS auto bind loopback-first

---
 CHANGELOG.md                                                | 1 +
 apps/macos/Sources/Clawdbot/GatewayEndpointStore.swift      | 5 +----
 apps/macos/Sources/ClawdbotMacCLI/ConnectCommand.swift      | 2 +-
 .../Tests/ClawdbotIPCTests/GatewayEndpointStoreTests.swift  | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e14fb7fc7..e1520f2f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ Docs: https://docs.clawd.bot
 - OpenCode Zen: route models to the Zen API shape per family so proxy endpoints are used. (#1416)
 - Browser: suppress Chrome restore prompts for managed profiles. (#1419) Thanks @jamesgroat.
 - Models: inherit session model overrides in thread/topic sessions (Telegram topics, Slack/Discord threads). (#1376)
+- macOS: keep local auto bind loopback-first; only use tailnet when bind=tailnet.
 - macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
 - Cron: cap reminder context history to 10 messages and honor `contextMessages`. (#1103) Thanks @mkbehr.
 - Exec approvals: treat main as the default agent + migrate legacy default allowlists. (#1417) Thanks @czekaj.
diff --git a/apps/macos/Sources/Clawdbot/GatewayEndpointStore.swift b/apps/macos/Sources/Clawdbot/GatewayEndpointStore.swift
index 6a5f02ca0..418d0b810 100644
--- a/apps/macos/Sources/Clawdbot/GatewayEndpointStore.swift
+++ b/apps/macos/Sources/Clawdbot/GatewayEndpointStore.swift
@@ -482,7 +482,7 @@ actor GatewayEndpointStore {
         let bind = GatewayEndpointStore.resolveGatewayBindMode(
             root: root,
             env: ProcessInfo.processInfo.environment)
-        guard bind == "auto" else { return nil }
+        guard bind == "tailnet" else { return nil }
 
         let currentHost = currentURL.host?.lowercased() ?? ""
         guard currentHost == "127.0.0.1" || currentHost == "localhost" else { return nil }
@@ -562,9 +562,6 @@ actor GatewayEndpointStore {
         case "tailnet":
             return tailscaleIP ?? "127.0.0.1"
         case "auto":
-            if let tailscaleIP, !tailscaleIP.isEmpty {
-                return tailscaleIP
-            }
             return "127.0.0.1"
         case "custom":
             return customBindHost ?? "127.0.0.1"
diff --git a/apps/macos/Sources/ClawdbotMacCLI/ConnectCommand.swift b/apps/macos/Sources/ClawdbotMacCLI/ConnectCommand.swift
index 91bac16cf..4df1c96a1 100644
--- a/apps/macos/Sources/ClawdbotMacCLI/ConnectCommand.swift
+++ b/apps/macos/Sources/ClawdbotMacCLI/ConnectCommand.swift
@@ -309,7 +309,7 @@ private func resolveLocalHost(bind: String?) -> String {
     let normalized = (bind ?? "").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
     let tailnetIP = detectTailnetIPv4()
     switch normalized {
-    case "tailnet", "auto":
+    case "tailnet":
         return tailnetIP ?? "127.0.0.1"
     default:
         return "127.0.0.1"
diff --git a/apps/macos/Tests/ClawdbotIPCTests/GatewayEndpointStoreTests.swift b/apps/macos/Tests/ClawdbotIPCTests/GatewayEndpointStoreTests.swift
index 11c9ec158..3513388a2 100644
--- a/apps/macos/Tests/ClawdbotIPCTests/GatewayEndpointStoreTests.swift
+++ b/apps/macos/Tests/ClawdbotIPCTests/GatewayEndpointStoreTests.swift
@@ -140,14 +140,14 @@ import Testing
         #expect(resolved.mode == .remote)
     }
 
-    @Test func resolveLocalGatewayHostPrefersTailnetForAuto() {
+    @Test func resolveLocalGatewayHostUsesLoopbackForAutoEvenWithTailnet() {
         let host = GatewayEndpointStore._testResolveLocalGatewayHost(
             bindMode: "auto",
             tailscaleIP: "100.64.1.2")
-        #expect(host == "100.64.1.2")
+        #expect(host == "127.0.0.1")
     }
 
-    @Test func resolveLocalGatewayHostFallsBackToLoopbackForAuto() {
+    @Test func resolveLocalGatewayHostUsesLoopbackForAutoWithoutTailnet() {
         let host = GatewayEndpointStore._testResolveLocalGatewayHost(
             bindMode: "auto",
             tailscaleIP: nil)

From 319b4d02a0abcdf479607892791bec52a2ed6ae5 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 06:39:19 +0000
Subject: [PATCH 152/171] fix: load workspace templates from docs

---
 src/agents/workspace.ts | 162 +++-------------------------------------
 1 file changed, 12 insertions(+), 150 deletions(-)

diff --git a/src/agents/workspace.ts b/src/agents/workspace.ts
index bba81d4c7..cf1de7daf 100644
--- a/src/agents/workspace.ts
+++ b/src/agents/workspace.ts
@@ -4,7 +4,6 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 
 import { isSubagentSessionKey } from "../routing/session-key.js";
-import { formatCliCommand } from "../cli/command-format.js";
 import { resolveUserPath } from "../utils.js";
 
 export function resolveDefaultAgentWorkspaceDir(
@@ -27,142 +26,9 @@ export const DEFAULT_USER_FILENAME = "USER.md";
 export const DEFAULT_HEARTBEAT_FILENAME = "HEARTBEAT.md";
 export const DEFAULT_BOOTSTRAP_FILENAME = "BOOTSTRAP.md";
 
-const DEFAULT_AGENTS_TEMPLATE = `# AGENTS.md - Clawdbot Workspace
-
-This folder is the assistant's working directory.
-
-## First run (one-time)
-- If BOOTSTRAP.md exists, follow its ritual and delete it once complete.
-- Your agent identity lives in IDENTITY.md.
-- Your profile lives in USER.md.
-
-## Backup tip (recommended)
-If you treat this workspace as the agent's "memory", make it a git repo (ideally private) so identity
-and notes are backed up.
-
-\`\`\`bash
-git init
-git add AGENTS.md
-git commit -m "Add agent workspace"
-\`\`\`
-
-## Safety defaults
-- Don't exfiltrate secrets or private data.
-- Don't run destructive commands unless explicitly asked.
-- Be concise in chat; write longer output to files in this workspace.
-
-## Daily memory (recommended)
-- Keep a short daily log at memory/YYYY-MM-DD.md (create memory/ if needed).
-- On session start, read today + yesterday if present.
-- Capture durable facts, preferences, and decisions; avoid secrets.
-
-## Heartbeats (optional)
-- HEARTBEAT.md can hold a tiny checklist for heartbeat runs; keep it small.
-
-## Customize
-- Add your preferred style, rules, and "memory" here.
-`;
-
-const DEFAULT_SOUL_TEMPLATE = `# SOUL.md - Persona & Boundaries
-
-Describe who the assistant is, tone, and boundaries.
-
-- Keep replies concise and direct.
-- Ask clarifying questions when needed.
-- Never send streaming/partial replies to external messaging surfaces.
-`;
-
-const DEFAULT_TOOLS_TEMPLATE = `# TOOLS.md - User Tool Notes (editable)
-
-This file is for *your* notes about external tools and conventions.
-It does not define which tools exist; Clawdbot provides built-in tools internally.
-
-## Examples
-
-### imsg
-- Send an iMessage/SMS: describe who/what, confirm before sending.
-- Prefer short messages; avoid sending secrets.
-
-### sag
-- Text-to-speech: specify voice, target speaker/room, and whether to stream.
-
-Add whatever else you want the assistant to know about your local toolchain.
-`;
-
-const DEFAULT_HEARTBEAT_TEMPLATE = `# HEARTBEAT.md
-
-Optional: keep a tiny checklist for heartbeat runs.
-
-Guidance (to avoid nagging):
-- Only report items that are truly new or changed.
-- Do not invent tasks from old chat context.
-- If nothing needs attention, reply HEARTBEAT_OK.
-`;
-
-const DEFAULT_BOOTSTRAP_TEMPLATE = `# BOOTSTRAP.md - First Run Ritual (delete after)
-
-Hello. I was just born.
-
-## Your mission
-Start a short, playful conversation and learn:
-- Who am I?
-- What am I?
-- Who are you?
-- How should I call you?
-
-## How to ask (cute + helpful)
-Say:
-"Hello! I was just born. Who am I? What am I? Who are you? How should I call you?"
-
-Then offer suggestions:
-- 3-5 name ideas.
-- 3-5 creature/vibe combos.
-- 5 emoji ideas.
-
-## Write these files
-After the user chooses, update:
-
-1) IDENTITY.md
-- Name
-- Creature
-- Vibe
-- Emoji
-
-2) USER.md
-- Name
-- Preferred address
-- Pronouns (optional)
-- Timezone (optional)
-- Notes
-
-3) ~/.clawdbot/clawdbot.json
-Run: ${formatCliCommand('clawdbot agents set-identity --workspace "<this workspace>" --from-identity')}
-If multiple agents share a host, add --agent <id>.
-
-## Cleanup
-Delete BOOTSTRAP.md once this is complete.
-`;
-
-const DEFAULT_IDENTITY_TEMPLATE = `# IDENTITY.md - Agent Identity
-
-- Name:
-- Creature:
-- Vibe:
-- Emoji:
-`;
-
-const DEFAULT_USER_TEMPLATE = `# USER.md - User Profile
-
-- Name:
-- Preferred address:
-- Pronouns (optional):
-- Timezone (optional):
-- Notes:
-`;
-
 const TEMPLATE_DIR = path.resolve(
   path.dirname(fileURLToPath(import.meta.url)),
-  "../../docs/templates",
+  "../../docs/reference/templates",
 );
 
 function stripFrontMatter(content: string): string {
@@ -175,13 +41,15 @@ function stripFrontMatter(content: string): string {
   return trimmed;
 }
 
-async function loadTemplate(name: string, fallback: string): Promise<string> {
+async function loadTemplate(name: string): Promise<string> {
   const templatePath = path.join(TEMPLATE_DIR, name);
   try {
     const content = await fs.readFile(templatePath, "utf-8");
     return stripFrontMatter(content);
   } catch {
-    return fallback;
+    throw new Error(
+      `Missing workspace template: ${name} (${templatePath}). Ensure docs/reference/templates are packaged.`,
+    );
   }
 }
 
@@ -255,19 +123,13 @@ export async function ensureAgentWorkspace(params?: {
     return existing.every((v) => !v);
   })();
 
-  const agentsTemplate = await loadTemplate(DEFAULT_AGENTS_FILENAME, DEFAULT_AGENTS_TEMPLATE);
-  const soulTemplate = await loadTemplate(DEFAULT_SOUL_FILENAME, DEFAULT_SOUL_TEMPLATE);
-  const toolsTemplate = await loadTemplate(DEFAULT_TOOLS_FILENAME, DEFAULT_TOOLS_TEMPLATE);
-  const identityTemplate = await loadTemplate(DEFAULT_IDENTITY_FILENAME, DEFAULT_IDENTITY_TEMPLATE);
-  const userTemplate = await loadTemplate(DEFAULT_USER_FILENAME, DEFAULT_USER_TEMPLATE);
-  const heartbeatTemplate = await loadTemplate(
-    DEFAULT_HEARTBEAT_FILENAME,
-    DEFAULT_HEARTBEAT_TEMPLATE,
-  );
-  const bootstrapTemplate = await loadTemplate(
-    DEFAULT_BOOTSTRAP_FILENAME,
-    DEFAULT_BOOTSTRAP_TEMPLATE,
-  );
+  const agentsTemplate = await loadTemplate(DEFAULT_AGENTS_FILENAME);
+  const soulTemplate = await loadTemplate(DEFAULT_SOUL_FILENAME);
+  const toolsTemplate = await loadTemplate(DEFAULT_TOOLS_FILENAME);
+  const identityTemplate = await loadTemplate(DEFAULT_IDENTITY_FILENAME);
+  const userTemplate = await loadTemplate(DEFAULT_USER_FILENAME);
+  const heartbeatTemplate = await loadTemplate(DEFAULT_HEARTBEAT_FILENAME);
+  const bootstrapTemplate = await loadTemplate(DEFAULT_BOOTSTRAP_FILENAME);
 
   await writeFileIfMissing(agentsPath, agentsTemplate);
   await writeFileIfMissing(soulPath, soulTemplate);

From d430a3a5c7493b25d867f4fa6bf0934887d1bdc0 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 06:39:05 +0000
Subject: [PATCH 153/171] chore: update a2ui bundle hash

---
 src/canvas-host/a2ui/.bundle.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/canvas-host/a2ui/.bundle.hash b/src/canvas-host/a2ui/.bundle.hash
index 91cb22241..94549dce8 100644
--- a/src/canvas-host/a2ui/.bundle.hash
+++ b/src/canvas-host/a2ui/.bundle.hash
@@ -1 +1 @@
-0ae29522de4c48c6b6407290be18b94d7244d4e0036738abd19d93148f2c8cd4
+70ce2f8889599d5d76bccea69516e3136fd25fd32e43fe055d05faca822b47c7

From a056042caa0f0aa945a08558cb9f3f1200fd332f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 06:39:10 +0000
Subject: [PATCH 154/171] chore: refresh macOS package pins

---
 apps/macos/Package.resolved | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/macos/Package.resolved b/apps/macos/Package.resolved
index 1a357dbe6..ffc524d1c 100644
--- a/apps/macos/Package.resolved
+++ b/apps/macos/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "550d4ea41d4bb2546b99a7bfa1c5cba7e28a13862bc226727ea7426c61555a33",
+  "originHash" : "f847d54db16b371dbb1a79271d50436cdec572179b0f0cf14cfe1b75df8dfbc2",
   "pins" : [
     {
       "identity" : "axorcist",
@@ -24,7 +24,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/steipete/ElevenLabsKit",
       "state" : {
-        "revision" : "7e3c948d8340abe3977014f3de020edf221e9269",
+        "revision" : "c8679fbd37416a8780fe43be88a497ff16209e2d",
         "version" : "0.1.0"
       }
     },

From 8a20f44228249e8d7f99f0b5c7b1c9b179ae0167 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 06:53:02 +0000
Subject: [PATCH 155/171] fix: improve gateway ssh auth handling

---
 .../Sources/Clawdbot/ControlChannel.swift     | 28 ++++++++++-
 .../Sources/Clawdbot/GatewayConnection.swift  |  5 ++
 .../Sources/Clawdbot/GeneralSettings.swift    |  5 ++
 .../macos/Sources/Clawdbot/PortGuardian.swift |  8 ++++
 .../Clawdbot/RemoteTunnelManager.swift        | 46 ++++---------------
 .../Sources/ClawdbotKit/GatewayChannel.swift  | 22 +++++++++
 scripts/codesign-mac-app.sh                   |  2 +-
 src/commands/gateway-status.test.ts           |  4 ++
 src/commands/gateway-status/helpers.ts        |  2 +-
 9 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/ControlChannel.swift b/apps/macos/Sources/Clawdbot/ControlChannel.swift
index e72ccbbde..4c47ee26e 100644
--- a/apps/macos/Sources/Clawdbot/ControlChannel.swift
+++ b/apps/macos/Sources/Clawdbot/ControlChannel.swift
@@ -74,6 +74,7 @@ final class ControlChannel {
     }
 
     private(set) var lastPingMs: Double?
+    private(set) var authSourceLabel: String?
 
     private let logger = Logger(subsystem: "com.clawdbot", category: "control")
 
@@ -128,6 +129,7 @@ final class ControlChannel {
         await GatewayConnection.shared.shutdown()
         self.state = .disconnected
         self.lastPingMs = nil
+        self.authSourceLabel = nil
     }
 
     func health(timeout: TimeInterval? = nil) async throws -> Data {
@@ -188,8 +190,11 @@ final class ControlChannel {
            urlErr.code == .dataNotAllowed // used for WS close 1008 auth failures
         {
             let reason = urlErr.failureURLString ?? urlErr.localizedDescription
+            let tokenKey = CommandResolver.connectionModeIsRemote()
+                ? "gateway.remote.token"
+                : "gateway.auth.token"
             return
-                "Gateway rejected token; set gateway.auth.token (or CLAWDBOT_GATEWAY_TOKEN) " +
+                "Gateway rejected token; set \(tokenKey) (or CLAWDBOT_GATEWAY_TOKEN) " +
                 "or clear it on the gateway. " +
                 "Reason: \(reason)"
         }
@@ -300,6 +305,27 @@ final class ControlChannel {
                 code: 0,
                 userInfo: [NSLocalizedDescriptionKey: "gateway health not ok"])
         }
+        await self.refreshAuthSourceLabel()
+    }
+
+    private func refreshAuthSourceLabel() async {
+        let isRemote = CommandResolver.connectionModeIsRemote()
+        let authSource = await GatewayConnection.shared.authSource()
+        self.authSourceLabel = Self.formatAuthSource(authSource, isRemote: isRemote)
+    }
+
+    private static func formatAuthSource(_ source: GatewayAuthSource?, isRemote: Bool) -> String? {
+        guard let source else { return nil }
+        switch source {
+        case .deviceToken:
+            return "Auth: device token (paired device)"
+        case .sharedToken:
+            return "Auth: shared token (\(isRemote ? "gateway.remote.token" : "gateway.auth.token"))"
+        case .password:
+            return "Auth: password (\(isRemote ? "gateway.remote.password" : "gateway.auth.password"))"
+        case .none:
+            return "Auth: none"
+        }
     }
 
     func sendSystemEvent(_ text: String, params: [String: AnyHashable] = [:]) async throws {
diff --git a/apps/macos/Sources/Clawdbot/GatewayConnection.swift b/apps/macos/Sources/Clawdbot/GatewayConnection.swift
index 36e8fc62b..4a0234748 100644
--- a/apps/macos/Sources/Clawdbot/GatewayConnection.swift
+++ b/apps/macos/Sources/Clawdbot/GatewayConnection.swift
@@ -249,6 +249,11 @@ actor GatewayConnection {
         await self.configure(url: cfg.url, token: cfg.token, password: cfg.password)
     }
 
+    func authSource() async -> GatewayAuthSource? {
+        guard let client else { return nil }
+        return await client.authSource()
+    }
+
     func shutdown() async {
         if let client {
             await client.shutdown()
diff --git a/apps/macos/Sources/Clawdbot/GeneralSettings.swift b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
index daa07466d..bffd75b3c 100644
--- a/apps/macos/Sources/Clawdbot/GeneralSettings.swift
+++ b/apps/macos/Sources/Clawdbot/GeneralSettings.swift
@@ -212,6 +212,11 @@ struct GeneralSettings: View {
                         .font(.caption)
                         .foregroundStyle(.secondary)
                 }
+                if let authLabel = ControlChannel.shared.authSourceLabel {
+                    Text(authLabel)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                }
             }
 
             Text("Tip: enable Tailscale for stable remote access.")
diff --git a/apps/macos/Sources/Clawdbot/PortGuardian.swift b/apps/macos/Sources/Clawdbot/PortGuardian.swift
index 50d4e0e9f..422300d59 100644
--- a/apps/macos/Sources/Clawdbot/PortGuardian.swift
+++ b/apps/macos/Sources/Clawdbot/PortGuardian.swift
@@ -184,6 +184,14 @@ actor PortGuardian {
         }
     }
 
+    func isListening(port: Int, pid: Int32? = nil) async -> Bool {
+        let listeners = await self.listeners(on: port)
+        if let pid {
+            return listeners.contains(where: { $0.pid == pid })
+        }
+        return !listeners.isEmpty
+    }
+
     private func listeners(on port: Int) async -> [Listener] {
         let res = await ShellExecutor.run(
             command: ["lsof", "-nP", "-iTCP:\(port)", "-sTCP:LISTEN", "-Fpcn"],
diff --git a/apps/macos/Sources/Clawdbot/RemoteTunnelManager.swift b/apps/macos/Sources/Clawdbot/RemoteTunnelManager.swift
index 5e42fbd05..898b1b482 100644
--- a/apps/macos/Sources/Clawdbot/RemoteTunnelManager.swift
+++ b/apps/macos/Sources/Clawdbot/RemoteTunnelManager.swift
@@ -20,11 +20,13 @@ actor RemoteTunnelManager {
            tunnel.process.isRunning,
            let local = tunnel.localPort
         {
-            if await self.isTunnelHealthy(port: local) {
+            let pid = tunnel.process.processIdentifier
+            if await PortGuardian.shared.isListening(port: Int(local), pid: pid) {
                 self.logger.info("reusing active SSH tunnel localPort=\(local, privacy: .public)")
                 return local
             }
-            self.logger.error("active SSH tunnel on port \(local, privacy: .public) is unhealthy; restarting")
+            self.logger.error(
+                "active SSH tunnel on port \(local, privacy: .public) is not listening; restarting")
             await self.beginRestart()
             tunnel.terminate()
             self.controlTunnel = nil
@@ -35,19 +37,11 @@ actor RemoteTunnelManager {
         if let desc = await PortGuardian.shared.describe(port: Int(desiredPort)),
            self.isSshProcess(desc)
         {
-            if await self.isTunnelHealthy(port: desiredPort) {
-                self.logger.info(
-                    "reusing existing SSH tunnel listener " +
-                        "localPort=\(desiredPort, privacy: .public) " +
-                        "pid=\(desc.pid, privacy: .public)")
-                return desiredPort
-            }
-            if self.restartInFlight {
-                self.logger.info("control tunnel restart in flight; skip stale tunnel cleanup")
-                return nil
-            }
-            await self.beginRestart()
-            await self.cleanupStaleTunnel(desc: desc, port: desiredPort)
+            self.logger.info(
+                "reusing existing SSH tunnel listener " +
+                    "localPort=\(desiredPort, privacy: .public) " +
+                    "pid=\(desc.pid, privacy: .public)")
+            return desiredPort
         }
         return nil
     }
@@ -88,10 +82,6 @@ actor RemoteTunnelManager {
         self.controlTunnel = nil
     }
 
-    private func isTunnelHealthy(port: UInt16) async -> Bool {
-        await PortGuardian.shared.probeGatewayHealth(port: Int(port))
-    }
-
     private func isSshProcess(_ desc: PortGuardian.Descriptor) -> Bool {
         let cmd = desc.command.lowercased()
         if cmd.contains("ssh") { return true }
@@ -128,21 +118,5 @@ actor RemoteTunnelManager {
         try? await Task.sleep(nanoseconds: UInt64(remaining * 1_000_000_000))
     }
 
-    private func cleanupStaleTunnel(desc: PortGuardian.Descriptor, port: UInt16) async {
-        let pid = desc.pid
-        self.logger.error(
-            "stale SSH tunnel detected on port \(port, privacy: .public) pid \(pid, privacy: .public)")
-        let killed = await self.kill(pid: pid)
-        if !killed {
-            self.logger.error("failed to terminate stale SSH tunnel pid \(pid, privacy: .public)")
-        }
-        await PortGuardian.shared.removeRecord(pid: pid)
-    }
-
-    private func kill(pid: Int32) async -> Bool {
-        let term = await ShellExecutor.run(command: ["kill", "-TERM", "\(pid)"], cwd: nil, env: nil, timeout: 2)
-        if term.ok { return true }
-        let sigkill = await ShellExecutor.run(command: ["kill", "-KILL", "\(pid)"], cwd: nil, env: nil, timeout: 2)
-        return sigkill.ok
-    }
+    // Keep tunnel reuse lightweight; restart only when the listener disappears.
 }
diff --git a/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayChannel.swift b/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayChannel.swift
index 90a19a64b..db2ffa36d 100644
--- a/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayChannel.swift
+++ b/apps/shared/ClawdbotKit/Sources/ClawdbotKit/GatewayChannel.swift
@@ -94,6 +94,13 @@ public struct GatewayConnectOptions: Sendable {
     }
 }
 
+public enum GatewayAuthSource: String, Sendable {
+    case deviceToken = "device-token"
+    case sharedToken = "shared-token"
+    case password = "password"
+    case none = "none"
+}
+
 // Avoid ambiguity with the app's own AnyCodable type.
 private typealias ProtoAnyCodable = ClawdbotProtocol.AnyCodable
 
@@ -117,6 +124,7 @@ public actor GatewayChannelActor {
     private var lastSeq: Int?
     private var lastTick: Date?
     private var tickIntervalMs: Double = 30000
+    private var lastAuthSource: GatewayAuthSource = .none
     private let decoder = JSONDecoder()
     private let encoder = JSONEncoder()
     private let connectTimeoutSeconds: Double = 6
@@ -149,6 +157,8 @@ public actor GatewayChannelActor {
         }
     }
 
+    public func authSource() -> GatewayAuthSource { self.lastAuthSource }
+
     public func shutdown() async {
         self.shouldReconnect = false
         self.connected = false
@@ -300,6 +310,18 @@ public actor GatewayChannelActor {
         let identity = DeviceIdentityStore.loadOrCreate()
         let storedToken = DeviceAuthStore.loadToken(deviceId: identity.deviceId, role: role)?.token
         let authToken = storedToken ?? self.token
+        let authSource: GatewayAuthSource
+        if storedToken != nil {
+            authSource = .deviceToken
+        } else if authToken != nil {
+            authSource = .sharedToken
+        } else if self.password != nil {
+            authSource = .password
+        } else {
+            authSource = .none
+        }
+        self.lastAuthSource = authSource
+        self.logger.info("gateway connect auth=\(authSource.rawValue, privacy: .public)")
         let canFallbackToShared = storedToken != nil && self.token != nil
         if let authToken {
             params["auth"] = ProtoAnyCodable(["token": ProtoAnyCodable(authToken)])
diff --git a/scripts/codesign-mac-app.sh b/scripts/codesign-mac-app.sh
index d8eab87c6..6759324f6 100755
--- a/scripts/codesign-mac-app.sh
+++ b/scripts/codesign-mac-app.sh
@@ -285,5 +285,5 @@ sign_item "$APP_BUNDLE" "$APP_ENTITLEMENTS"
 
 verify_team_ids
 
-rm -f "$ENT_TMP_BASE" "$ENT_TMP_APP_BASE" "$ENT_TMP_APP" "$ENT_TMP_RUNTIME"
+rm -f "$ENT_TMP_BASE" "$ENT_TMP_APP_BASE" "$ENT_TMP_RUNTIME"
 echo "Codesign complete for $APP_BUNDLE"
diff --git a/src/commands/gateway-status.test.ts b/src/commands/gateway-status.test.ts
index c7616f32f..09547a83d 100644
--- a/src/commands/gateway-status.test.ts
+++ b/src/commands/gateway-status.test.ts
@@ -181,6 +181,10 @@ describe("gateway-status command", () => {
 
     expect(startSshPortForward).toHaveBeenCalledTimes(1);
     expect(probeGateway).toHaveBeenCalled();
+    const tunnelCall = probeGateway.mock.calls.find(
+      (call) => typeof call?.[0]?.url === "string" && call[0].url.startsWith("ws://127.0.0.1:"),
+    )?.[0] as { auth?: { token?: string } } | undefined;
+    expect(tunnelCall?.auth?.token).toBe("rtok");
     expect(sshStop).toHaveBeenCalledTimes(1);
 
     const parsed = JSON.parse(runtimeLogs.join("\n")) as Record<string, unknown>;
diff --git a/src/commands/gateway-status/helpers.ts b/src/commands/gateway-status/helpers.ts
index ca48ee0ba..50c3288a2 100644
--- a/src/commands/gateway-status/helpers.ts
+++ b/src/commands/gateway-status/helpers.ts
@@ -134,7 +134,7 @@ export function resolveAuthForTarget(
     return { token: tokenOverride, password: passwordOverride };
   }
 
-  if (target.kind === "configRemote") {
+  if (target.kind === "configRemote" || target.kind === "sshTunnel") {
     const token =
       typeof cfg.gateway?.remote?.token === "string" ? cfg.gateway.remote.token.trim() : "";
     const remotePassword = (cfg.gateway?.remote as { password?: unknown } | undefined)?.password;

From d8ad865cf54336bcb69c97ee7914ecee1f074c10 Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vigneshnatarajan92@gmail.com>
Date: Wed, 21 Jan 2026 22:55:49 -0800
Subject: [PATCH 156/171] docs: update lobster repo url

---
 docs/tools/lobster.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tools/lobster.md b/docs/tools/lobster.md
index 11f77f827..0d17a3456 100644
--- a/docs/tools/lobster.md
+++ b/docs/tools/lobster.md
@@ -26,7 +26,7 @@ If the pipeline pauses for approval, the tool returns a `resumeToken` so you can
 
 ## Install Lobster
 
-Install the Lobster CLI on the **same host** that runs the Clawdbot Gateway (see the [Lobster repo](https://github.com/vignesh07/lobster)), and ensure `lobster` is on `PATH`.
+Install the Lobster CLI on the **same host** that runs the Clawdbot Gateway (see the [Lobster repo](https://github.com/clawdbot/lobster)), and ensure `lobster` is on `PATH`.
 If you want to use a custom binary location, pass an **absolute** `lobsterPath` in the tool call.
 
 ## Enable the tool

From 862f34ade729be743bde74393130bbdea83256cb Mon Sep 17 00:00:00 2001
From: AJ <yspdev@gmail.com>
Date: Wed, 21 Jan 2026 21:22:45 -0800
Subject: [PATCH 157/171] fix: read account_id from Codex CLI auth for
 workspace billing

---
 src/agents/cli-credentials.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/agents/cli-credentials.ts b/src/agents/cli-credentials.ts
index f224e0238..5ca5629ff 100644
--- a/src/agents/cli-credentials.ts
+++ b/src/agents/cli-credentials.ts
@@ -55,6 +55,7 @@ export type CodexCliCredential = {
   access: string;
   refresh: string;
   expires: number;
+  accountId?: string;
 };
 
 export type QwenCliCredential = {
@@ -143,6 +144,7 @@ function readCodexKeychainCredentials(options?: {
     const expires = Number.isFinite(lastRefresh)
       ? lastRefresh + 60 * 60 * 1000
       : Date.now() + 60 * 60 * 1000;
+    const accountId = typeof tokens?.account_id === "string" ? tokens.account_id : undefined;
 
     log.info("read codex credentials from keychain", {
       source: "keychain",
@@ -155,6 +157,7 @@ function readCodexKeychainCredentials(options?: {
       access: accessToken,
       refresh: refreshToken,
       expires,
+      accountId,
     };
   } catch {
     return null;
@@ -443,6 +446,7 @@ export function readCodexCliCredentials(options?: {
     access: accessToken,
     refresh: refreshToken,
     expires,
+    accountId: typeof tokens.account_id === "string" ? tokens.account_id : undefined,
   };
 }
 

From b573231cd127f9095eaccbbb7bd69bb044d2050f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 06:42:36 +0000
Subject: [PATCH 158/171] fix: prevent exec approval resolve race

---
 .../server-methods/exec-approval.test.ts      | 51 +++++++++++++++++++
 src/gateway/server-methods/exec-approval.ts   |  3 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/gateway/server-methods/exec-approval.test.ts b/src/gateway/server-methods/exec-approval.test.ts
index 8142b281f..0b1da93f3 100644
--- a/src/gateway/server-methods/exec-approval.test.ts
+++ b/src/gateway/server-methods/exec-approval.test.ts
@@ -105,6 +105,57 @@ describe("exec approval handlers", () => {
     expect(broadcasts.some((entry) => entry.event === "exec.approval.resolved")).toBe(true);
   });
 
+  it("accepts resolve during broadcast", async () => {
+    const manager = new ExecApprovalManager();
+    const handlers = createExecApprovalHandlers(manager);
+    const respond = vi.fn();
+    const resolveRespond = vi.fn();
+
+    const resolveContext = {
+      broadcast: () => {},
+    };
+
+    const context = {
+      broadcast: (event: string, payload: unknown) => {
+        if (event !== "exec.approval.requested") return;
+        const id = (payload as { id?: string })?.id ?? "";
+        void handlers["exec.approval.resolve"]({
+          params: { id, decision: "allow-once" },
+          respond: resolveRespond,
+          context: resolveContext as unknown as Parameters<
+            (typeof handlers)["exec.approval.resolve"]
+          >[0]["context"],
+          client: { connect: { client: { id: "cli", displayName: "CLI" } } },
+          req: { id: "req-2", type: "req", method: "exec.approval.resolve" },
+          isWebchatConnect: noop,
+        });
+      },
+    };
+
+    await handlers["exec.approval.request"]({
+      params: {
+        command: "echo ok",
+        cwd: "/tmp",
+        host: "node",
+        timeoutMs: 2000,
+      },
+      respond,
+      context: context as unknown as Parameters<
+        (typeof handlers)["exec.approval.request"]
+      >[0]["context"],
+      client: null,
+      req: { id: "req-1", type: "req", method: "exec.approval.request" },
+      isWebchatConnect: noop,
+    });
+
+    expect(resolveRespond).toHaveBeenCalledWith(true, { ok: true }, undefined);
+    expect(respond).toHaveBeenCalledWith(
+      true,
+      expect.objectContaining({ decision: "allow-once" }),
+      undefined,
+    );
+  });
+
   it("accepts explicit approval ids", async () => {
     const manager = new ExecApprovalManager();
     const handlers = createExecApprovalHandlers(manager);
diff --git a/src/gateway/server-methods/exec-approval.ts b/src/gateway/server-methods/exec-approval.ts
index 8fb13cea0..48663b96c 100644
--- a/src/gateway/server-methods/exec-approval.ts
+++ b/src/gateway/server-methods/exec-approval.ts
@@ -58,6 +58,7 @@ export function createExecApprovalHandlers(manager: ExecApprovalManager): Gatewa
         sessionKey: p.sessionKey ?? null,
       };
       const record = manager.create(request, timeoutMs, explicitId);
+      const decisionPromise = manager.waitForDecision(record, timeoutMs);
       context.broadcast(
         "exec.approval.requested",
         {
@@ -68,7 +69,7 @@ export function createExecApprovalHandlers(manager: ExecApprovalManager): Gatewa
         },
         { dropIfSlow: true },
       );
-      const decision = await manager.waitForDecision(record, timeoutMs);
+      const decision = await decisionPromise;
       respond(
         true,
         {

From b91e72824fe5ae2268df59ae755226baaf671ad9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 07:00:42 +0000
Subject: [PATCH 159/171] chore: land PR #1422 (thanks @aj47)

Co-authored-by: AJ <yspdev@gmail.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1520f2f5..daf5628dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ Docs: https://docs.clawd.bot
 
 ### Fixes
 - Config: avoid stack traces for invalid configs and log the config path.
+- CLI: read Codex CLI account_id for workspace billing. (#1422) Thanks @aj47.
 - Doctor: avoid recreating WhatsApp config when only legacy routing keys remain. (#900)
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
 - OpenCode Zen: route models to the Zen API shape per family so proxy endpoints are used. (#1416)

From d19a0249f8b973132711475e2d6aee0b51fdf0e1 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 06:53:56 +0000
Subject: [PATCH 160/171] fix: align rolling logs to local time

---
 CHANGELOG.md                            |  1 +
 docs/gateway/logging.md                 |  1 +
 docs/logging.md                         |  2 +
 src/gateway/server-methods/logs.test.ts | 51 +++++++++++++++++++++++++
 src/gateway/server-methods/logs.ts      | 33 +++++++++++++++-
 src/logger.test.ts                      |  9 ++++-
 src/logging/logger.ts                   |  9 ++++-
 7 files changed, 103 insertions(+), 3 deletions(-)
 create mode 100644 src/gateway/server-methods/logs.test.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index daf5628dc..487269375 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ Docs: https://docs.clawd.bot
 - Doctor: warn when gateway.mode is unset with configure/config guidance.
 - OpenCode Zen: route models to the Zen API shape per family so proxy endpoints are used. (#1416)
 - Browser: suppress Chrome restore prompts for managed profiles. (#1419) Thanks @jamesgroat.
+- Logs: align rolling log filenames with local time and fall back to latest file when today's log is missing. (#1343)
 - Models: inherit session model overrides in thread/topic sessions (Telegram topics, Slack/Discord threads). (#1376)
 - macOS: keep local auto bind loopback-first; only use tailnet when bind=tailnet.
 - macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
diff --git a/docs/gateway/logging.md b/docs/gateway/logging.md
index 0feb9656c..3c36e8bf5 100644
--- a/docs/gateway/logging.md
+++ b/docs/gateway/logging.md
@@ -17,6 +17,7 @@ Clawdbot has two log “surfaces”:
 ## File-based logger
 
 - Default rolling log file is under `/tmp/clawdbot/` (one file per day): `clawdbot-YYYY-MM-DD.log`
+  - Date uses the gateway host's local timezone.
 - The log file path and level can be configured via `~/.clawdbot/clawdbot.json`:
   - `logging.file`
   - `logging.level`
diff --git a/docs/logging.md b/docs/logging.md
index 74774866b..ad53c1164 100644
--- a/docs/logging.md
+++ b/docs/logging.md
@@ -22,6 +22,8 @@ By default, the Gateway writes a rolling log file under:
 
 `/tmp/clawdbot/clawdbot-YYYY-MM-DD.log`
 
+The date uses the gateway host's local timezone.
+
 You can override this in `~/.clawdbot/clawdbot.json`:
 
 ```json
diff --git a/src/gateway/server-methods/logs.test.ts b/src/gateway/server-methods/logs.test.ts
new file mode 100644
index 000000000..f18c24e87
--- /dev/null
+++ b/src/gateway/server-methods/logs.test.ts
@@ -0,0 +1,51 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { resetLogger, setLoggerOverride } from "../../logging.js";
+import { logsHandlers } from "./logs.js";
+
+const noop = () => false;
+
+describe("logs.tail", () => {
+  afterEach(() => {
+    resetLogger();
+    setLoggerOverride(null);
+  });
+
+  it("falls back to latest rolling log file when today is missing", async () => {
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-logs-"));
+    const older = path.join(tempDir, "clawdbot-2026-01-20.log");
+    const newer = path.join(tempDir, "clawdbot-2026-01-21.log");
+
+    await fs.writeFile(older, '{"msg":"old"}\n');
+    await fs.writeFile(newer, '{"msg":"new"}\n');
+    await fs.utimes(older, new Date(0), new Date(0));
+    await fs.utimes(newer, new Date(), new Date());
+
+    setLoggerOverride({ file: path.join(tempDir, "clawdbot-2026-01-22.log") });
+
+    const respond = vi.fn();
+    await logsHandlers["logs.tail"]({
+      params: {},
+      respond,
+      context: {} as unknown as Parameters<(typeof logsHandlers)["logs.tail"]>[0]["context"],
+      client: null,
+      req: { id: "req-1", type: "req", method: "logs.tail" },
+      isWebchatConnect: noop,
+    });
+
+    expect(respond).toHaveBeenCalledWith(
+      true,
+      expect.objectContaining({
+        file: newer,
+        lines: ['{"msg":"new"}'],
+      }),
+      undefined,
+    );
+
+    await fs.rm(tempDir, { recursive: true, force: true });
+  });
+});
diff --git a/src/gateway/server-methods/logs.ts b/src/gateway/server-methods/logs.ts
index dff1bee6f..ce45a276a 100644
--- a/src/gateway/server-methods/logs.ts
+++ b/src/gateway/server-methods/logs.ts
@@ -1,4 +1,5 @@
 import fs from "node:fs/promises";
+import path from "node:path";
 import { getResolvedLoggerSettings } from "../../logging.js";
 import {
   ErrorCodes,
@@ -12,11 +13,40 @@ const DEFAULT_LIMIT = 500;
 const DEFAULT_MAX_BYTES = 250_000;
 const MAX_LIMIT = 5000;
 const MAX_BYTES = 1_000_000;
+const ROLLING_LOG_RE = /^clawdbot-\d{4}-\d{2}-\d{2}\.log$/;
 
 function clamp(value: number, min: number, max: number) {
   return Math.max(min, Math.min(max, value));
 }
 
+function isRollingLogFile(file: string): boolean {
+  return ROLLING_LOG_RE.test(path.basename(file));
+}
+
+async function resolveLogFile(file: string): Promise<string> {
+  const stat = await fs.stat(file).catch(() => null);
+  if (stat) return file;
+  if (!isRollingLogFile(file)) return file;
+
+  const dir = path.dirname(file);
+  const entries = await fs.readdir(dir, { withFileTypes: true }).catch(() => null);
+  if (!entries) return file;
+
+  const candidates = await Promise.all(
+    entries
+      .filter((entry) => entry.isFile() && ROLLING_LOG_RE.test(entry.name))
+      .map(async (entry) => {
+        const fullPath = path.join(dir, entry.name);
+        const fileStat = await fs.stat(fullPath).catch(() => null);
+        return fileStat ? { path: fullPath, mtimeMs: fileStat.mtimeMs } : null;
+      }),
+  );
+  const sorted = candidates
+    .filter((entry): entry is NonNullable<typeof entry> => Boolean(entry))
+    .sort((a, b) => b.mtimeMs - a.mtimeMs);
+  return sorted[0]?.path ?? file;
+}
+
 async function readLogSlice(params: {
   file: string;
   cursor?: number;
@@ -126,8 +156,9 @@ export const logsHandlers: GatewayRequestHandlers = {
     }
 
     const p = params as { cursor?: number; limit?: number; maxBytes?: number };
-    const file = getResolvedLoggerSettings().file;
+    const configuredFile = getResolvedLoggerSettings().file;
     try {
+      const file = await resolveLogFile(configuredFile);
       const result = await readLogSlice({
         file,
         cursor: p.cursor,
diff --git a/src/logger.test.ts b/src/logger.test.ts
index 6dea8d503..d569b6610 100644
--- a/src/logger.test.ts
+++ b/src/logger.test.ts
@@ -70,7 +70,7 @@ describe("logger helpers", () => {
   it("uses daily rolling default log file and prunes old ones", () => {
     resetLogger();
     setLoggerOverride({}); // force defaults regardless of user config
-    const today = new Date().toISOString().slice(0, 10);
+    const today = localDateString(new Date());
     const todayPath = path.join(DEFAULT_LOG_DIR, `clawdbot-${today}.log`);
 
     // create an old file to be pruned
@@ -103,3 +103,10 @@ function cleanup(file: string) {
     // ignore
   }
 }
+
+function localDateString(date: Date) {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
diff --git a/src/logging/logger.ts b/src/logging/logger.ts
index a8dc784a4..d1c740212 100644
--- a/src/logging/logger.ts
+++ b/src/logging/logger.ts
@@ -197,8 +197,15 @@ export function registerLogTransport(transport: LogTransport): () => void {
   };
 }
 
+function formatLocalDate(date: Date): string {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
+
 function defaultRollingPathForToday(): string {
-  const today = new Date().toISOString().slice(0, 10); // YYYY-MM-DD
+  const today = formatLocalDate(new Date());
   return path.join(DEFAULT_LOG_DIR, `${LOG_PREFIX}-${today}${LOG_SUFFIX}`);
 }
 

From ad6d0489348d3a8d20332f26854ad00312ba79ba Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 07:05:00 +0000
Subject: [PATCH 161/171] feat: add update wizard and guard elevated defaults

---
 CHANGELOG.md               |   2 +
 docs/cli/update.md         |   6 ++
 src/cli/update-cli.test.ts |  73 +++++++++++++++-
 src/cli/update-cli.ts      | 170 ++++++++++++++++++++++++++++++++++++-
 4 files changed, 248 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 487269375..4baa46ea4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Docs: https://docs.clawd.bot
 - Onboarding: remove the run setup-token auth option (paste setup-token or reuse CLI creds instead).
 - Signal: add typing indicators and DM read receipts via signal-cli.
 - MSTeams: add file uploads, adaptive cards, and attachment handling improvements. (#1410) Thanks @Evizero.
+- CLI: add `clawdbot update wizard` for interactive channel selection and restart prompts. https://docs.clawd.bot/cli/update
 
 ### Breaking
 - **BREAKING:** Envelope and system event timestamps now default to host-local time (was UTC) so agents don’t have to constantly convert.
@@ -31,6 +32,7 @@ Docs: https://docs.clawd.bot
 - macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
 - Cron: cap reminder context history to 10 messages and honor `contextMessages`. (#1103) Thanks @mkbehr.
 - Exec approvals: treat main as the default agent + migrate legacy default allowlists. (#1417) Thanks @czekaj.
+- Exec: avoid defaulting to elevated mode when elevated is not allowed.
 - UI: refresh debug panel on route-driven tab changes. (#1373) Thanks @yazinsai.
 
 ## 2026.1.21
diff --git a/docs/cli/update.md b/docs/cli/update.md
index 9ebe509b0..8dafbbd87 100644
--- a/docs/cli/update.md
+++ b/docs/cli/update.md
@@ -16,6 +16,7 @@ If you installed via **npm/pnpm** (global install, no git metadata), updates hap
 ```bash
 clawdbot update
 clawdbot update status
+clawdbot update wizard
 clawdbot update --channel beta
 clawdbot update --channel dev
 clawdbot update --tag beta
@@ -48,6 +49,11 @@ Options:
 - `--json`: print machine-readable status JSON.
 - `--timeout <seconds>`: timeout for checks (default is 3s).
 
+## `update wizard`
+
+Interactive flow to pick an update channel and confirm whether to restart the Gateway
+after updating. If you select `dev` without a git checkout, it offers to create one.
+
 ## What it does
 
 When you switch channels explicitly (`--channel ...`), Clawdbot also keeps the
diff --git a/src/cli/update-cli.test.ts b/src/cli/update-cli.test.ts
index e8ae15a7d..2c7aca4f3 100644
--- a/src/cli/update-cli.test.ts
+++ b/src/cli/update-cli.test.ts
@@ -5,6 +5,18 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import type { UpdateRunResult } from "../infra/update-runner.js";
 
+const confirm = vi.fn();
+const select = vi.fn();
+const spinner = vi.fn(() => ({ start: vi.fn(), stop: vi.fn() }));
+const isCancel = (value: unknown) => value === "cancel";
+
+vi.mock("@clack/prompts", () => ({
+  confirm,
+  select,
+  isCancel,
+  spinner,
+}));
+
 // Mock the update-runner module
 vi.mock("../infra/update-runner.js", () => ({
   runGatewayUpdate: vi.fn(),
@@ -128,9 +140,11 @@ describe("update-cli", () => {
   });
 
   it("exports updateCommand and registerUpdateCli", async () => {
-    const { updateCommand, registerUpdateCli } = await import("./update-cli.js");
+    const { updateCommand, registerUpdateCli, updateWizardCommand } =
+      await import("./update-cli.js");
     expect(typeof updateCommand).toBe("function");
     expect(typeof registerUpdateCli).toBe("function");
+    expect(typeof updateWizardCommand).toBe("function");
   }, 20_000);
 
   it("updateCommand runs update and outputs result", async () => {
@@ -585,4 +599,61 @@ describe("update-cli", () => {
       await fs.rm(tempDir, { recursive: true, force: true });
     }
   });
+
+  it("updateWizardCommand requires a TTY", async () => {
+    const { defaultRuntime } = await import("../runtime.js");
+    const { updateWizardCommand } = await import("./update-cli.js");
+
+    setTty(false);
+    vi.mocked(defaultRuntime.error).mockClear();
+    vi.mocked(defaultRuntime.exit).mockClear();
+
+    await updateWizardCommand({});
+
+    expect(defaultRuntime.error).toHaveBeenCalledWith(
+      expect.stringContaining("Update wizard requires a TTY"),
+    );
+    expect(defaultRuntime.exit).toHaveBeenCalledWith(1);
+  });
+
+  it("updateWizardCommand offers dev checkout and forwards selections", async () => {
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-update-wizard-"));
+    const previousGitDir = process.env.CLAWDBOT_GIT_DIR;
+    try {
+      setTty(true);
+      process.env.CLAWDBOT_GIT_DIR = tempDir;
+
+      const { checkUpdateStatus } = await import("../infra/update-check.js");
+      const { runGatewayUpdate } = await import("../infra/update-runner.js");
+      const { updateWizardCommand } = await import("./update-cli.js");
+
+      vi.mocked(checkUpdateStatus).mockResolvedValue({
+        root: "/test/path",
+        installKind: "package",
+        packageManager: "npm",
+        deps: {
+          manager: "npm",
+          status: "ok",
+          lockfilePath: null,
+          markerPath: null,
+        },
+      });
+      select.mockResolvedValue("dev");
+      confirm.mockResolvedValueOnce(true).mockResolvedValueOnce(false);
+      vi.mocked(runGatewayUpdate).mockResolvedValue({
+        status: "ok",
+        mode: "git",
+        steps: [],
+        durationMs: 100,
+      });
+
+      await updateWizardCommand({});
+
+      const call = vi.mocked(runGatewayUpdate).mock.calls[0]?.[0];
+      expect(call?.channel).toBe("dev");
+    } finally {
+      process.env.CLAWDBOT_GIT_DIR = previousGitDir;
+      await fs.rm(tempDir, { recursive: true, force: true });
+    }
+  });
 });
diff --git a/src/cli/update-cli.ts b/src/cli/update-cli.ts
index 37ac4fc1c..538d07c97 100644
--- a/src/cli/update-cli.ts
+++ b/src/cli/update-cli.ts
@@ -1,4 +1,4 @@
-import { confirm, isCancel, spinner } from "@clack/prompts";
+import { confirm, isCancel, select, spinner } from "@clack/prompts";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
@@ -39,7 +39,7 @@ import { trimLogTail } from "../infra/restart-sentinel.js";
 import { defaultRuntime } from "../runtime.js";
 import { formatDocsLink } from "../terminal/links.js";
 import { formatCliCommand } from "./command-format.js";
-import { stylePromptMessage } from "../terminal/prompt-style.js";
+import { stylePromptHint, stylePromptMessage } from "../terminal/prompt-style.js";
 import { theme } from "../terminal/theme.js";
 import { renderTable } from "../terminal/table.js";
 import { formatHelpExamples } from "./help-format.js";
@@ -63,6 +63,9 @@ export type UpdateStatusOptions = {
   json?: boolean;
   timeout?: string;
 };
+export type UpdateWizardOptions = {
+  timeout?: string;
+};
 
 const STEP_LABELS: Record<string, string> = {
   "clean check": "Working directory is clean",
@@ -481,6 +484,15 @@ function formatStepStatus(exitCode: number | null): string {
   return theme.error("\u2717");
 }
 
+const selectStyled = <T>(params: Parameters<typeof select<T>>[0]) =>
+  select({
+    ...params,
+    message: stylePromptMessage(params.message),
+    options: params.options.map((opt) =>
+      opt.hint === undefined ? opt : { ...opt, hint: stylePromptHint(opt.hint) },
+    ),
+  });
+
 type PrintResultOptions = UpdateCommandOptions & {
   hideSteps?: boolean;
 };
@@ -940,6 +952,142 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
   }
 }
 
+export async function updateWizardCommand(opts: UpdateWizardOptions = {}): Promise<void> {
+  if (!process.stdin.isTTY) {
+    defaultRuntime.error(
+      "Update wizard requires a TTY. Use `clawdbot update --channel <stable|beta|dev>` instead.",
+    );
+    defaultRuntime.exit(1);
+    return;
+  }
+
+  const timeoutMs = opts.timeout ? Number.parseInt(opts.timeout, 10) * 1000 : undefined;
+  if (timeoutMs !== undefined && (Number.isNaN(timeoutMs) || timeoutMs <= 0)) {
+    defaultRuntime.error("--timeout must be a positive integer (seconds)");
+    defaultRuntime.exit(1);
+    return;
+  }
+
+  const root =
+    (await resolveClawdbotPackageRoot({
+      moduleUrl: import.meta.url,
+      argv1: process.argv[1],
+      cwd: process.cwd(),
+    })) ?? process.cwd();
+
+  const [updateStatus, configSnapshot] = await Promise.all([
+    checkUpdateStatus({
+      root,
+      timeoutMs: timeoutMs ?? 3500,
+      fetchGit: false,
+      includeRegistry: false,
+    }),
+    readConfigFileSnapshot(),
+  ]);
+
+  const configChannel = configSnapshot.valid
+    ? normalizeUpdateChannel(configSnapshot.config.update?.channel)
+    : null;
+  const channelInfo = resolveEffectiveUpdateChannel({
+    configChannel,
+    installKind: updateStatus.installKind,
+    git: updateStatus.git
+      ? { tag: updateStatus.git.tag, branch: updateStatus.git.branch }
+      : undefined,
+  });
+  const channelLabel = formatUpdateChannelLabel({
+    channel: channelInfo.channel,
+    source: channelInfo.source,
+    gitTag: updateStatus.git?.tag ?? null,
+    gitBranch: updateStatus.git?.branch ?? null,
+  });
+
+  const pickedChannel = await selectStyled({
+    message: "Update channel",
+    options: [
+      {
+        value: "keep",
+        label: `Keep current (${channelInfo.channel})`,
+        hint: channelLabel,
+      },
+      {
+        value: "stable",
+        label: "Stable",
+        hint: "Tagged releases (npm latest)",
+      },
+      {
+        value: "beta",
+        label: "Beta",
+        hint: "Prereleases (npm beta)",
+      },
+      {
+        value: "dev",
+        label: "Dev",
+        hint: "Git main",
+      },
+    ],
+    initialValue: "keep",
+  });
+
+  if (isCancel(pickedChannel)) {
+    defaultRuntime.log(theme.muted("Update cancelled."));
+    defaultRuntime.exit(0);
+    return;
+  }
+
+  const requestedChannel = pickedChannel === "keep" ? null : pickedChannel;
+
+  if (requestedChannel === "dev" && updateStatus.installKind !== "git") {
+    const gitDir = resolveGitInstallDir();
+    const hasGit = await isGitCheckout(gitDir);
+    if (!hasGit) {
+      const dirExists = await pathExists(gitDir);
+      if (dirExists) {
+        const empty = await isEmptyDir(gitDir);
+        if (!empty) {
+          defaultRuntime.error(
+            `CLAWDBOT_GIT_DIR points at a non-git directory: ${gitDir}. Set CLAWDBOT_GIT_DIR to an empty folder or a clawdbot checkout.`,
+          );
+          defaultRuntime.exit(1);
+          return;
+        }
+      }
+      const ok = await confirm({
+        message: stylePromptMessage(
+          `Create a git checkout at ${gitDir}? (override via CLAWDBOT_GIT_DIR)`,
+        ),
+        initialValue: true,
+      });
+      if (isCancel(ok) || ok === false) {
+        defaultRuntime.log(theme.muted("Update cancelled."));
+        defaultRuntime.exit(0);
+        return;
+      }
+    }
+  }
+
+  const restart = await confirm({
+    message: stylePromptMessage("Restart the gateway service after update?"),
+    initialValue: false,
+  });
+  if (isCancel(restart)) {
+    defaultRuntime.log(theme.muted("Update cancelled."));
+    defaultRuntime.exit(0);
+    return;
+  }
+
+  try {
+    await updateCommand({
+      channel: requestedChannel ?? undefined,
+      restart: Boolean(restart),
+      timeout: opts.timeout,
+    });
+  } catch (err) {
+    defaultRuntime.error(String(err));
+    defaultRuntime.exit(1);
+  }
+}
+
 export function registerUpdateCli(program: Command) {
   const update = program
     .command("update")
@@ -959,6 +1107,7 @@ export function registerUpdateCli(program: Command) {
         ["clawdbot update --restart", "Update and restart the service"],
         ["clawdbot update --json", "Output result as JSON"],
         ["clawdbot update --yes", "Non-interactive (accept downgrade prompts)"],
+        ["clawdbot update wizard", "Interactive update wizard"],
         ["clawdbot --update", "Shorthand for clawdbot update"],
       ] as const;
       const fmtExamples = examples
@@ -1005,6 +1154,23 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/update", "docs.clawd.bot/cli/upda
       }
     });
 
+  update
+    .command("wizard")
+    .description("Interactive update wizard")
+    .option("--timeout <seconds>", "Timeout for each update step in seconds (default: 1200)")
+    .addHelpText(
+      "after",
+      `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/update", "docs.clawd.bot/cli/update")}\n`,
+    )
+    .action(async (opts) => {
+      try {
+        await updateWizardCommand({ timeout: opts.timeout as string | undefined });
+      } catch (err) {
+        defaultRuntime.error(String(err));
+        defaultRuntime.exit(1);
+      }
+    });
+
   update
     .command("status")
     .description("Show update channel and version status")

From 3125637ad69da99227b3655015734d56884dcebc Mon Sep 17 00:00:00 2001
From: Robby <robbyczgw@gmail.com>
Date: Thu, 22 Jan 2026 05:12:42 +0000
Subject: [PATCH 162/171] feat(webui): add custom assistant identity support

Adds the ability to customize the assistant's name and avatar in the Web UI.

Configuration options:
- config.ui.assistant.name: Custom name (replaces 'Assistant')
- config.ui.assistant.avatar: Emoji or letter for avatar (replaces 'A')

Also reads from workspace IDENTITY.md as fallback:
- Name: field sets the assistant name
- Emoji: field sets the avatar

Priority: config > IDENTITY.md > defaults

Closes #1383
---
 src/config/zod-schema.ts  |   7 +++
 src/gateway/control-ui.ts | 119 +++++++++++++++++++++++++++++++++++---
 2 files changed, 117 insertions(+), 9 deletions(-)

diff --git a/src/config/zod-schema.ts b/src/config/zod-schema.ts
index d4d9bdd8d..b44ce119c 100644
--- a/src/config/zod-schema.ts
+++ b/src/config/zod-schema.ts
@@ -155,6 +155,13 @@ export const ClawdbotSchema = z
     ui: z
       .object({
         seamColor: HexColorSchema.optional(),
+        assistant: z
+          .object({
+            name: z.string().max(50).optional(),
+            avatar: z.string().max(200).optional(),
+          })
+          .strict()
+          .optional(),
       })
       .strict()
       .optional(),
diff --git a/src/gateway/control-ui.ts b/src/gateway/control-ui.ts
index f59786a85..416f803d7 100644
--- a/src/gateway/control-ui.ts
+++ b/src/gateway/control-ui.ts
@@ -6,8 +6,81 @@ import { fileURLToPath } from "node:url";
 const ROOT_PREFIX = "/";
 const AVATAR_PREFIX = "/avatar";
 
+// === Assistant Identity Resolution ===
+
+const DEFAULT_ASSISTANT_IDENTITY = {
+  name: "Assistant",
+  avatar: "A",
+};
+
+interface AssistantIdentity {
+  name: string;
+  avatar: string;
+}
+
+interface AssistantConfig {
+  name?: string;
+  avatar?: string;
+}
+
+function parseIdentityMd(content: string): Partial<AssistantIdentity> {
+  const result: Partial<AssistantIdentity> = {};
+  const nameMatch = content.match(/^-\s*Name:\s*(.+)$/im);
+  if (nameMatch?.[1]) {
+    const name = nameMatch[1].trim();
+    if (name && name.length <= 50) {
+      result.name = name;
+    }
+  }
+  const emojiMatch = content.match(/^-\s*Emoji:\s*(.+)$/im);
+  if (emojiMatch?.[1]) {
+    const emoji = emojiMatch[1].trim();
+    if (emoji) {
+      result.avatar = emoji;
+    }
+  }
+  return result;
+}
+
+function resolveAssistantIdentity(opts?: {
+  configAssistant?: AssistantConfig;
+  workspaceDir?: string;
+}): AssistantIdentity {
+  const { configAssistant, workspaceDir } = opts ?? {};
+  let name = DEFAULT_ASSISTANT_IDENTITY.name;
+  let avatar = DEFAULT_ASSISTANT_IDENTITY.avatar;
+
+  // Try IDENTITY.md from workspace
+  if (workspaceDir) {
+    try {
+      const identityPath = path.join(workspaceDir, "IDENTITY.md");
+      if (fs.existsSync(identityPath)) {
+        const identityMd = parseIdentityMd(fs.readFileSync(identityPath, "utf8"));
+        if (identityMd.name) name = identityMd.name;
+        if (identityMd.avatar) avatar = identityMd.avatar;
+      }
+    } catch {
+      // Ignore errors reading IDENTITY.md
+    }
+  }
+
+  // Config overrides IDENTITY.md
+  if (configAssistant?.name?.trim()) name = configAssistant.name.trim();
+  if (configAssistant?.avatar?.trim()) avatar = configAssistant.avatar.trim();
+
+  return { name, avatar };
+}
+
+// === End Assistant Identity ===
+
 export type ControlUiRequestOptions = {
   basePath?: string;
+  config?: {
+    ui?: {
+      assistant?: AssistantConfig;
+    };
+  };
+  workspaceDir?: string;
 };
 
 export function normalizeControlUiBasePath(basePath?: string): string {
@@ -168,11 +241,22 @@ function serveFile(res: ServerResponse, filePath: string) {
   res.end(fs.readFileSync(filePath));
 }
 
-function injectControlUiBasePath(html: string, basePath: string): string {
-  const script = `<script>window.__CLAWDBOT_CONTROL_UI_BASE_PATH__=${JSON.stringify(
-    basePath,
-  )};</script>`;
-  if (html.includes("__CLAWDBOT_CONTROL_UI_BASE_PATH__")) return html;
+interface ControlUiInjectionOpts {
+  basePath: string;
+  assistantName?: string;
+  assistantAvatar?: string;
+}
+
+function injectControlUiConfig(html: string, opts: ControlUiInjectionOpts): string {
+  const { basePath, assistantName, assistantAvatar } = opts;
+  const script =
+    `<script>` +
+    `window.__CLAWDBOT_CONTROL_UI_BASE_PATH__=${JSON.stringify(basePath)};` +
+    `window.__CLAWDBOT_ASSISTANT_NAME__=${JSON.stringify(assistantName ?? "Assistant")};` +
+    `window.__CLAWDBOT_ASSISTANT_AVATAR__=${JSON.stringify(assistantAvatar ?? "A")};` +
+    `</script>`;
+  // Check if already injected
+  if (html.includes("__CLAWDBOT_ASSISTANT_NAME__")) return html;
   const headClose = html.indexOf("</head>");
   if (headClose !== -1) {
     return `${html.slice(0, headClose)}${script}${html.slice(headClose)}`;
@@ -180,11 +264,28 @@ function injectControlUiBasePath(html: string, basePath: string): string {
   return `${script}${html}`;
 }
 
-function serveIndexHtml(res: ServerResponse, indexPath: string, basePath: string) {
+interface ServeIndexHtmlOpts {
+  basePath: string;
+  config?: ControlUiRequestOptions["config"];
+  workspaceDir?: string;
+}
+
+function serveIndexHtml(res: ServerResponse, indexPath: string, opts: ServeIndexHtmlOpts) {
+  const { basePath, config, workspaceDir } = opts;
+  const identity = resolveAssistantIdentity({
+    configAssistant: config?.ui?.assistant,
+    workspaceDir,
+  });
   res.setHeader("Content-Type", "text/html; charset=utf-8");
   res.setHeader("Cache-Control", "no-cache");
   const raw = fs.readFileSync(indexPath, "utf8");
-  res.end(injectControlUiBasePath(raw, basePath));
+  res.end(
+    injectControlUiConfig(raw, {
+      basePath,
+      assistantName: identity.name,
+      assistantAvatar: identity.avatar,
+    }),
+  );
 }
 
 function isSafeRelativePath(relPath: string) {
@@ -263,7 +364,7 @@ export function handleControlUiHttpRequest(
 
   if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
     if (path.basename(filePath) === "index.html") {
-      serveIndexHtml(res, filePath, basePath);
+      serveIndexHtml(res, filePath, { basePath, config: opts?.config, workspaceDir: opts?.workspaceDir });
       return true;
     }
     serveFile(res, filePath);
@@ -273,7 +374,7 @@ export function handleControlUiHttpRequest(
   // SPA fallback (client-side router): serve index.html for unknown paths.
   const indexPath = path.join(root, "index.html");
   if (fs.existsSync(indexPath)) {
-    serveIndexHtml(res, indexPath, basePath);
+    serveIndexHtml(res, indexPath, { basePath, config: opts?.config, workspaceDir: opts?.workspaceDir });
     return true;
   }
 

From 8544df36b87dfd849e3d683b9275a81329b3e00f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 06:47:37 +0000
Subject: [PATCH 163/171] feat: extend Control UI assistant identity

---
 CHANGELOG.md                                  |   1 +
 docs/gateway/configuration.md                 |   8 +-
 src/agents/bash-tools.exec.ts                 |   2 +
 src/config/schema.ts                          |   2 +
 src/config/types.clawdbot.ts                  |   6 +
 src/gateway/assistant-identity.ts             |  55 +++++++++
 src/gateway/control-ui.ts                     | 111 +++++-------------
 src/gateway/protocol/index.ts                 |  10 ++
 src/gateway/protocol/schema/agent.ts          |  17 +++
 .../protocol/schema/protocol-schemas.ts       |   4 +
 src/gateway/protocol/schema/types.ts          |   4 +
 src/gateway/server-http.ts                    |   2 +
 src/gateway/server-methods-list.ts            |   1 +
 src/gateway/server-methods.ts                 |   1 +
 src/gateway/server-methods/agent.ts           |  40 +++++++
 ui/src/ui/app-gateway.ts                      |   5 +
 ui/src/ui/app-render.helpers.ts               |   1 +
 ui/src/ui/app-render.ts                       |   4 +
 ui/src/ui/app-view-state.ts                   |   4 +
 ui/src/ui/app.ts                              |  12 ++
 ui/src/ui/assistant-identity.ts               |  49 ++++++++
 ui/src/ui/chat/grouped-render.ts              |  57 ++++++---
 ui/src/ui/controllers/assistant-identity.ts   |  35 ++++++
 ui/src/ui/views/chat.ts                       |  13 +-
 24 files changed, 340 insertions(+), 104 deletions(-)
 create mode 100644 src/gateway/assistant-identity.ts
 create mode 100644 ui/src/ui/assistant-identity.ts
 create mode 100644 ui/src/ui/controllers/assistant-identity.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4baa46ea4..3658404b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Docs: https://docs.clawd.bot
 - Docs: add troubleshooting entry for gateway.mode blocking gateway start. https://docs.clawd.bot/gateway/troubleshooting
 - Docs: add /model allowlist troubleshooting note. (#1405)
 - Docs: add per-message Gmail search example for gog. (#1220) Thanks @mbelinky.
+- UI: show per-session assistant identity in the Control UI. (#1420) Thanks @robbyczgw-cla.
 - Onboarding: remove the run setup-token auth option (paste setup-token or reuse CLI creds instead).
 - Signal: add typing indicators and DM read receipts via signal-cli.
 - MSTeams: add file uploads, adaptive cards, and attachment handling improvements. (#1410) Thanks @Evizero.
diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md
index 6f2b064bf..a6e190d9e 100644
--- a/docs/gateway/configuration.md
+++ b/docs/gateway/configuration.md
@@ -2654,7 +2654,13 @@ If unset, clients fall back to a muted light-blue.
 ```json5
 {
   ui: {
-    seamColor: "#FF4500" // hex (RRGGBB or #RRGGBB)
+    seamColor: "#FF4500", // hex (RRGGBB or #RRGGBB)
+    // Optional: Control UI assistant identity override.
+    // If unset, the Control UI uses the active agent identity (config or IDENTITY.md).
+    assistant: {
+      name: "Clawdbot",
+      avatar: "CB" // emoji, short text, or image URL/data URI
+    }
   }
 }
 ```
diff --git a/src/agents/bash-tools.exec.ts b/src/agents/bash-tools.exec.ts
index 1ddcbc913..79082e321 100644
--- a/src/agents/bash-tools.exec.ts
+++ b/src/agents/bash-tools.exec.ts
@@ -756,6 +756,8 @@ export function createExecTool(
               .join("\n"),
           );
         }
+      }
+      if (elevatedRequested) {
         logInfo(`exec: elevated command ${truncateMiddle(params.command, 120)}`);
       }
       const configuredHost = defaults?.host ?? "sandbox";
diff --git a/src/config/schema.ts b/src/config/schema.ts
index 3bb39674d..5404e6538 100644
--- a/src/config/schema.ts
+++ b/src/config/schema.ts
@@ -261,6 +261,8 @@ const FIELD_LABELS: Record<string, string> = {
   "commands.restart": "Allow Restart",
   "commands.useAccessGroups": "Use Access Groups",
   "ui.seamColor": "Accent Color",
+  "ui.assistant.name": "Assistant Name",
+  "ui.assistant.avatar": "Assistant Avatar",
   "browser.controlUrl": "Browser Control URL",
   "browser.snapshotDefaults": "Browser Snapshot Defaults",
   "browser.snapshotDefaults.mode": "Browser Snapshot Mode",
diff --git a/src/config/types.clawdbot.ts b/src/config/types.clawdbot.ts
index d80b74284..102febcf2 100644
--- a/src/config/types.clawdbot.ts
+++ b/src/config/types.clawdbot.ts
@@ -65,6 +65,12 @@ export type ClawdbotConfig = {
   ui?: {
     /** Accent color for Clawdbot UI chrome (hex). */
     seamColor?: string;
+    assistant?: {
+      /** Assistant display name for UI surfaces. */
+      name?: string;
+      /** Assistant avatar (emoji, short text, or image URL/data URI). */
+      avatar?: string;
+    };
   };
   skills?: SkillsConfig;
   plugins?: PluginsConfig;
diff --git a/src/gateway/assistant-identity.ts b/src/gateway/assistant-identity.ts
new file mode 100644
index 000000000..72f521d12
--- /dev/null
+++ b/src/gateway/assistant-identity.ts
@@ -0,0 +1,55 @@
+import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js";
+import { resolveAgentIdentity } from "../agents/identity.js";
+import { loadAgentIdentity } from "../commands/agents.config.js";
+import type { ClawdbotConfig } from "../config/config.js";
+import { normalizeAgentId } from "../routing/session-key.js";
+
+const MAX_ASSISTANT_NAME = 50;
+const MAX_ASSISTANT_AVATAR = 200;
+
+export const DEFAULT_ASSISTANT_IDENTITY = {
+  name: "Assistant",
+  avatar: "A",
+};
+
+export type AssistantIdentity = {
+  agentId: string;
+  name: string;
+  avatar: string;
+};
+
+function coerceIdentityValue(value: string | undefined, maxLength: number): string | undefined {
+  if (typeof value !== "string") return undefined;
+  const trimmed = value.trim();
+  if (!trimmed) return undefined;
+  if (trimmed.length <= maxLength) return trimmed;
+  return trimmed.slice(0, maxLength);
+}
+
+export function resolveAssistantIdentity(params: {
+  cfg: ClawdbotConfig;
+  agentId?: string | null;
+  workspaceDir?: string | null;
+}): AssistantIdentity {
+  const agentId = normalizeAgentId(params.agentId ?? resolveDefaultAgentId(params.cfg));
+  const workspaceDir = params.workspaceDir ?? resolveAgentWorkspaceDir(params.cfg, agentId);
+  const configAssistant = params.cfg.ui?.assistant;
+  const agentIdentity = resolveAgentIdentity(params.cfg, agentId);
+  const fileIdentity = workspaceDir ? loadAgentIdentity(workspaceDir) : null;
+
+  const name =
+    coerceIdentityValue(configAssistant?.name, MAX_ASSISTANT_NAME) ??
+    coerceIdentityValue(agentIdentity?.name, MAX_ASSISTANT_NAME) ??
+    coerceIdentityValue(fileIdentity?.name, MAX_ASSISTANT_NAME) ??
+    DEFAULT_ASSISTANT_IDENTITY.name;
+
+  const avatar =
+    coerceIdentityValue(configAssistant?.avatar, MAX_ASSISTANT_AVATAR) ??
+    coerceIdentityValue(agentIdentity?.avatar, MAX_ASSISTANT_AVATAR) ??
+    coerceIdentityValue(agentIdentity?.emoji, MAX_ASSISTANT_AVATAR) ??
+    coerceIdentityValue(fileIdentity?.avatar, MAX_ASSISTANT_AVATAR) ??
+    coerceIdentityValue(fileIdentity?.emoji, MAX_ASSISTANT_AVATAR) ??
+    DEFAULT_ASSISTANT_IDENTITY.avatar;
+
+  return { agentId, name, avatar };
+}
diff --git a/src/gateway/control-ui.ts b/src/gateway/control-ui.ts
index 416f803d7..8d2d881b1 100644
--- a/src/gateway/control-ui.ts
+++ b/src/gateway/control-ui.ts
@@ -3,84 +3,16 @@ import type { IncomingMessage, ServerResponse } from "node:http";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
+import type { ClawdbotConfig } from "../config/config.js";
+import { DEFAULT_ASSISTANT_IDENTITY, resolveAssistantIdentity } from "./assistant-identity.js";
+
 const ROOT_PREFIX = "/";
 const AVATAR_PREFIX = "/avatar";
 
-// === Assistant Identity Resolution ===
-
-const DEFAULT_ASSISTANT_IDENTITY = {
-  name: "Assistant",
-  avatar: "A",
-};
-
-interface AssistantIdentity {
-  name: string;
-  avatar: string;
-}
-
-interface AssistantConfig {
-  name?: string;
-  avatar?: string;
-}
-
-function parseIdentityMd(content: string): Partial<AssistantIdentity> {
-  const result: Partial<AssistantIdentity> = {};
-  const nameMatch = content.match(/^-\s*Name:\s*(.+)$/im);
-  if (nameMatch?.[1]) {
-    const name = nameMatch[1].trim();
-    if (name && name.length <= 50) {
-      result.name = name;
-    }
-  }
-  const emojiMatch = content.match(/^-\s*Emoji:\s*(.+)$/im);
-  if (emojiMatch?.[1]) {
-    const emoji = emojiMatch[1].trim();
-    if (emoji) {
-      result.avatar = emoji;
-    }
-  }
-  return result;
-}
-
-function resolveAssistantIdentity(opts?: {
-  configAssistant?: AssistantConfig;
-  workspaceDir?: string;
-}): AssistantIdentity {
-  const { configAssistant, workspaceDir } = opts ?? {};
-  let name = DEFAULT_ASSISTANT_IDENTITY.name;
-  let avatar = DEFAULT_ASSISTANT_IDENTITY.avatar;
-
-  // Try IDENTITY.md from workspace
-  if (workspaceDir) {
-    try {
-      const identityPath = path.join(workspaceDir, "IDENTITY.md");
-      if (fs.existsSync(identityPath)) {
-        const identityMd = parseIdentityMd(fs.readFileSync(identityPath, "utf8"));
-        if (identityMd.name) name = identityMd.name;
-        if (identityMd.avatar) avatar = identityMd.avatar;
-      }
-    } catch {
-      // Ignore errors reading IDENTITY.md
-    }
-  }
-
-  // Config overrides IDENTITY.md
-  if (configAssistant?.name?.trim()) name = configAssistant.name.trim();
-  if (configAssistant?.avatar?.trim()) avatar = configAssistant.avatar.trim();
-
-  return { name, avatar };
-}
-
-// === End Assistant Identity ===
-
 export type ControlUiRequestOptions = {
   basePath?: string;
-  config?: {
-    ui?: {
-      assistant?: AssistantConfig;
-    };
-  };
-  workspaceDir?: string;
+  config?: ClawdbotConfig;
+  agentId?: string;
 };
 
 export function normalizeControlUiBasePath(basePath?: string): string {
@@ -252,8 +184,12 @@ function injectControlUiConfig(html: string, opts: ControlUiInjectionOpts): stri
   const script =
     `<script>` +
     `window.__CLAWDBOT_CONTROL_UI_BASE_PATH__=${JSON.stringify(basePath)};` +
-    `window.__CLAWDBOT_ASSISTANT_NAME__=${JSON.stringify(assistantName ?? "Assistant")};` +
-    `window.__CLAWDBOT_ASSISTANT_AVATAR__=${JSON.stringify(assistantAvatar ?? "A")};` +
+    `window.__CLAWDBOT_ASSISTANT_NAME__=${JSON.stringify(
+      assistantName ?? DEFAULT_ASSISTANT_IDENTITY.name,
+    )};` +
+    `window.__CLAWDBOT_ASSISTANT_AVATAR__=${JSON.stringify(
+      assistantAvatar ?? DEFAULT_ASSISTANT_IDENTITY.avatar,
+    )};` +
     `</script>`;
   // Check if already injected
   if (html.includes("__CLAWDBOT_ASSISTANT_NAME__")) return html;
@@ -266,16 +202,15 @@ function injectControlUiConfig(html: string, opts: ControlUiInjectionOpts): stri
 
 interface ServeIndexHtmlOpts {
   basePath: string;
-  config?: ControlUiRequestOptions["config"];
-  workspaceDir?: string;
+  config?: ClawdbotConfig;
+  agentId?: string;
 }
 
 function serveIndexHtml(res: ServerResponse, indexPath: string, opts: ServeIndexHtmlOpts) {
-  const { basePath, config, workspaceDir } = opts;
-  const identity = resolveAssistantIdentity({
-    configAssistant: config?.ui?.assistant,
-    workspaceDir,
-  });
+  const { basePath, config, agentId } = opts;
+  const identity = config
+    ? resolveAssistantIdentity({ cfg: config, agentId })
+    : DEFAULT_ASSISTANT_IDENTITY;
   res.setHeader("Content-Type", "text/html; charset=utf-8");
   res.setHeader("Cache-Control", "no-cache");
   const raw = fs.readFileSync(indexPath, "utf8");
@@ -364,7 +299,11 @@ export function handleControlUiHttpRequest(
 
   if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
     if (path.basename(filePath) === "index.html") {
-      serveIndexHtml(res, filePath, { basePath, config: opts?.config, workspaceDir: opts?.workspaceDir });
+      serveIndexHtml(res, filePath, {
+        basePath,
+        config: opts?.config,
+        agentId: opts?.agentId,
+      });
       return true;
     }
     serveFile(res, filePath);
@@ -374,7 +313,11 @@ export function handleControlUiHttpRequest(
   // SPA fallback (client-side router): serve index.html for unknown paths.
   const indexPath = path.join(root, "index.html");
   if (fs.existsSync(indexPath)) {
-    serveIndexHtml(res, indexPath, { basePath, config: opts?.config, workspaceDir: opts?.workspaceDir });
+    serveIndexHtml(res, indexPath, {
+      basePath,
+      config: opts?.config,
+      agentId: opts?.agentId,
+    });
     return true;
   }
 
diff --git a/src/gateway/protocol/index.ts b/src/gateway/protocol/index.ts
index dba040fe5..d1656135c 100644
--- a/src/gateway/protocol/index.ts
+++ b/src/gateway/protocol/index.ts
@@ -2,6 +2,10 @@ import AjvPkg, { type ErrorObject } from "ajv";
 import {
   type AgentEvent,
   AgentEventSchema,
+  type AgentIdentityParams,
+  AgentIdentityParamsSchema,
+  type AgentIdentityResult,
+  AgentIdentityResultSchema,
   AgentParamsSchema,
   type AgentSummary,
   AgentSummarySchema,
@@ -198,6 +202,8 @@ export const validateEventFrame = ajv.compile<EventFrame>(EventFrameSchema);
 export const validateSendParams = ajv.compile(SendParamsSchema);
 export const validatePollParams = ajv.compile<PollParams>(PollParamsSchema);
 export const validateAgentParams = ajv.compile(AgentParamsSchema);
+export const validateAgentIdentityParams =
+  ajv.compile<AgentIdentityParams>(AgentIdentityParamsSchema);
 export const validateAgentWaitParams = ajv.compile<AgentWaitParams>(AgentWaitParamsSchema);
 export const validateWakeParams = ajv.compile<WakeParams>(WakeParamsSchema);
 export const validateAgentsListParams = ajv.compile<AgentsListParams>(AgentsListParamsSchema);
@@ -359,6 +365,8 @@ export {
   SendParamsSchema,
   PollParamsSchema,
   AgentParamsSchema,
+  AgentIdentityParamsSchema,
+  AgentIdentityResultSchema,
   WakeParamsSchema,
   NodePairRequestParamsSchema,
   NodePairListParamsSchema,
@@ -432,6 +440,8 @@ export type {
   ErrorShape,
   StateVersion,
   AgentEvent,
+  AgentIdentityParams,
+  AgentIdentityResult,
   AgentWaitParams,
   ChatEvent,
   TickEvent,
diff --git a/src/gateway/protocol/schema/agent.ts b/src/gateway/protocol/schema/agent.ts
index f31b6cd92..54da9d23c 100644
--- a/src/gateway/protocol/schema/agent.ts
+++ b/src/gateway/protocol/schema/agent.ts
@@ -68,6 +68,23 @@ export const AgentParamsSchema = Type.Object(
   { additionalProperties: false },
 );
 
+export const AgentIdentityParamsSchema = Type.Object(
+  {
+    agentId: Type.Optional(NonEmptyString),
+    sessionKey: Type.Optional(Type.String()),
+  },
+  { additionalProperties: false },
+);
+
+export const AgentIdentityResultSchema = Type.Object(
+  {
+    agentId: NonEmptyString,
+    name: Type.Optional(NonEmptyString),
+    avatar: Type.Optional(NonEmptyString),
+  },
+  { additionalProperties: false },
+);
+
 export const AgentWaitParamsSchema = Type.Object(
   {
     runId: NonEmptyString,
diff --git a/src/gateway/protocol/schema/protocol-schemas.ts b/src/gateway/protocol/schema/protocol-schemas.ts
index 9a18af061..7e55d2075 100644
--- a/src/gateway/protocol/schema/protocol-schemas.ts
+++ b/src/gateway/protocol/schema/protocol-schemas.ts
@@ -2,6 +2,8 @@ import type { TSchema } from "@sinclair/typebox";
 
 import {
   AgentEventSchema,
+  AgentIdentityParamsSchema,
+  AgentIdentityResultSchema,
   AgentParamsSchema,
   AgentWaitParamsSchema,
   PollParamsSchema,
@@ -136,6 +138,8 @@ export const ProtocolSchemas: Record<string, TSchema> = {
   SendParams: SendParamsSchema,
   PollParams: PollParamsSchema,
   AgentParams: AgentParamsSchema,
+  AgentIdentityParams: AgentIdentityParamsSchema,
+  AgentIdentityResult: AgentIdentityResultSchema,
   AgentWaitParams: AgentWaitParamsSchema,
   WakeParams: WakeParamsSchema,
   NodePairRequestParams: NodePairRequestParamsSchema,
diff --git a/src/gateway/protocol/schema/types.ts b/src/gateway/protocol/schema/types.ts
index 01de1749f..164d6b902 100644
--- a/src/gateway/protocol/schema/types.ts
+++ b/src/gateway/protocol/schema/types.ts
@@ -2,6 +2,8 @@ import type { Static } from "@sinclair/typebox";
 
 import type {
   AgentEventSchema,
+  AgentIdentityParamsSchema,
+  AgentIdentityResultSchema,
   AgentWaitParamsSchema,
   PollParamsSchema,
   WakeParamsSchema,
@@ -125,6 +127,8 @@ export type PresenceEntry = Static<typeof PresenceEntrySchema>;
 export type ErrorShape = Static<typeof ErrorShapeSchema>;
 export type StateVersion = Static<typeof StateVersionSchema>;
 export type AgentEvent = Static<typeof AgentEventSchema>;
+export type AgentIdentityParams = Static<typeof AgentIdentityParamsSchema>;
+export type AgentIdentityResult = Static<typeof AgentIdentityResultSchema>;
 export type PollParams = Static<typeof PollParamsSchema>;
 export type AgentWaitParams = Static<typeof AgentWaitParamsSchema>;
 export type WakeParams = Static<typeof WakeParamsSchema>;
diff --git a/src/gateway/server-http.ts b/src/gateway/server-http.ts
index 2d736e092..49257c61d 100644
--- a/src/gateway/server-http.ts
+++ b/src/gateway/server-http.ts
@@ -9,6 +9,7 @@ import type { TlsOptions } from "node:tls";
 import type { WebSocketServer } from "ws";
 import { handleA2uiHttpRequest } from "../canvas-host/a2ui.js";
 import type { CanvasHostHandler } from "../canvas-host/server.js";
+import { loadConfig } from "../config/config.js";
 import type { createSubsystemLogger } from "../logging/subsystem.js";
 import { handleSlackHttpRequest } from "../slack/http/index.js";
 import { resolveAgentAvatar } from "../agents/identity-avatar.js";
@@ -256,6 +257,7 @@ export function createGatewayHttpServer(opts: {
         if (
           handleControlUiHttpRequest(req, res, {
             basePath: controlUiBasePath,
+            config: loadConfig(),
           })
         )
           return;
diff --git a/src/gateway/server-methods-list.ts b/src/gateway/server-methods-list.ts
index a1aa20cbb..b90643df8 100644
--- a/src/gateway/server-methods-list.ts
+++ b/src/gateway/server-methods-list.ts
@@ -68,6 +68,7 @@ const BASE_METHODS = [
   "system-event",
   "send",
   "agent",
+  "agent.identity.get",
   "agent.wait",
   // WebChat WebSocket-native chat methods
   "chat.history",
diff --git a/src/gateway/server-methods.ts b/src/gateway/server-methods.ts
index 0759744d8..486bd249c 100644
--- a/src/gateway/server-methods.ts
+++ b/src/gateway/server-methods.ts
@@ -55,6 +55,7 @@ const READ_METHODS = new Set([
   "usage.cost",
   "models.list",
   "agents.list",
+  "agent.identity.get",
   "skills.status",
   "voicewake.get",
   "sessions.list",
diff --git a/src/gateway/server-methods/agent.ts b/src/gateway/server-methods/agent.ts
index a82e31676..aaeb3c272 100644
--- a/src/gateway/server-methods/agent.ts
+++ b/src/gateway/server-methods/agent.ts
@@ -26,15 +26,18 @@ import {
 import { normalizeAgentId } from "../../routing/session-key.js";
 import { parseMessageWithAttachments } from "../chat-attachments.js";
 import {
+  type AgentIdentityParams,
   type AgentWaitParams,
   ErrorCodes,
   errorShape,
   formatValidationErrors,
+  validateAgentIdentityParams,
   validateAgentParams,
   validateAgentWaitParams,
 } from "../protocol/index.js";
 import { loadSessionEntry } from "../session-utils.js";
 import { formatForLog } from "../ws-log.js";
+import { resolveAssistantIdentity } from "../assistant-identity.js";
 import { waitForAgentJob } from "./agent-job.js";
 import type { GatewayRequestHandlers } from "./types.js";
 
@@ -369,6 +372,43 @@ export const agentHandlers: GatewayRequestHandlers = {
         });
       });
   },
+  "agent.identity.get": ({ params, respond }) => {
+    if (!validateAgentIdentityParams(params)) {
+      respond(
+        false,
+        undefined,
+        errorShape(
+          ErrorCodes.INVALID_REQUEST,
+          `invalid agent.identity.get params: ${formatValidationErrors(
+            validateAgentIdentityParams.errors,
+          )}`,
+        ),
+      );
+      return;
+    }
+    const p = params as AgentIdentityParams;
+    const agentIdRaw = typeof p.agentId === "string" ? p.agentId.trim() : "";
+    const sessionKeyRaw = typeof p.sessionKey === "string" ? p.sessionKey.trim() : "";
+    let agentId = agentIdRaw ? normalizeAgentId(agentIdRaw) : undefined;
+    if (sessionKeyRaw) {
+      const resolved = resolveAgentIdFromSessionKey(sessionKeyRaw);
+      if (agentId && resolved !== agentId) {
+        respond(
+          false,
+          undefined,
+          errorShape(
+            ErrorCodes.INVALID_REQUEST,
+            `invalid agent.identity.get params: agent "${agentIdRaw}" does not match session key agent "${resolved}"`,
+          ),
+        );
+        return;
+      }
+      agentId = resolved;
+    }
+    const cfg = loadConfig();
+    const identity = resolveAssistantIdentity({ cfg, agentId });
+    respond(true, identity, undefined);
+  },
   "agent.wait": async ({ params, respond }) => {
     if (!validateAgentWaitParams(params)) {
       respond(
diff --git a/ui/src/ui/app-gateway.ts b/ui/src/ui/app-gateway.ts
index d5bc0c5d9..e35c5e078 100644
--- a/ui/src/ui/app-gateway.ts
+++ b/ui/src/ui/app-gateway.ts
@@ -25,6 +25,7 @@ import {
 } from "./controllers/exec-approval";
 import type { ClawdbotApp } from "./app";
 import type { ExecApprovalRequest } from "./controllers/exec-approval";
+import { loadAssistantIdentity } from "./controllers/assistant-identity";
 
 type GatewayHost = {
   settings: UiSettings;
@@ -43,6 +44,9 @@ type GatewayHost = {
   agentsList: AgentsListResult | null;
   agentsError: string | null;
   debugHealth: HealthSnapshot | null;
+  assistantName: string;
+  assistantAvatar: string | null;
+  assistantAgentId: string | null;
   sessionKey: string;
   chatRunId: string | null;
   execApprovalQueue: ExecApprovalRequest[];
@@ -121,6 +125,7 @@ export function connectGateway(host: GatewayHost) {
       host.connected = true;
       host.hello = hello;
       applySnapshot(host, hello);
+      void loadAssistantIdentity(host as unknown as ClawdbotApp);
       void loadAgents(host as unknown as ClawdbotApp);
       void loadNodes(host as unknown as ClawdbotApp, { quiet: true });
       void loadDevices(host as unknown as ClawdbotApp, { quiet: true });
diff --git a/ui/src/ui/app-render.helpers.ts b/ui/src/ui/app-render.helpers.ts
index 7f7ed7db9..e8a93a100 100644
--- a/ui/src/ui/app-render.helpers.ts
+++ b/ui/src/ui/app-render.helpers.ts
@@ -62,6 +62,7 @@ export function renderChatControls(state: AppViewState) {
               sessionKey: next,
               lastActiveSessionKey: next,
             });
+            void state.loadAssistantIdentity();
             syncUrlWithSessionKey(state, next, true);
             void loadChatHistory(state);
           }}
diff --git a/ui/src/ui/app-render.ts b/ui/src/ui/app-render.ts
index 37f0b6bea..81176ebc3 100644
--- a/ui/src/ui/app-render.ts
+++ b/ui/src/ui/app-render.ts
@@ -221,6 +221,7 @@ export function renderApp(state: AppViewState) {
                   sessionKey: next,
                   lastActiveSessionKey: next,
                 });
+                void state.loadAssistantIdentity();
               },
               onConnect: () => state.connect(),
               onRefresh: () => state.loadOverview(),
@@ -434,6 +435,7 @@ export function renderApp(state: AppViewState) {
                   sessionKey: next,
                   lastActiveSessionKey: next,
                 });
+                void state.loadAssistantIdentity();
                 void loadChatHistory(state);
                 void refreshChatAvatar(state);
               },
@@ -479,6 +481,8 @@ export function renderApp(state: AppViewState) {
               onOpenSidebar: (content: string) => state.handleOpenSidebar(content),
               onCloseSidebar: () => state.handleCloseSidebar(),
               onSplitRatioChange: (ratio: number) => state.handleSplitRatioChange(ratio),
+              assistantName: state.assistantName,
+              assistantAvatar: state.assistantAvatar,
             })
           : nothing}
 
diff --git a/ui/src/ui/app-view-state.ts b/ui/src/ui/app-view-state.ts
index 3f969e5b9..5832e879a 100644
--- a/ui/src/ui/app-view-state.ts
+++ b/ui/src/ui/app-view-state.ts
@@ -41,6 +41,9 @@ export type AppViewState = {
   hello: GatewayHelloOk | null;
   lastError: string | null;
   eventLog: EventLogEntry[];
+  assistantName: string;
+  assistantAvatar: string | null;
+  assistantAgentId: string | null;
   sessionKey: string;
   chatLoading: boolean;
   chatSending: boolean;
@@ -144,6 +147,7 @@ export type AppViewState = {
   setTheme: (theme: ThemeMode, context?: ThemeTransitionContext) => void;
   applySettings: (next: UiSettings) => void;
   loadOverview: () => Promise<void>;
+  loadAssistantIdentity: () => Promise<void>;
   loadCron: () => Promise<void>;
   handleWhatsAppStart: (force: boolean) => Promise<void>;
   handleWhatsAppWait: () => Promise<void>;
diff --git a/ui/src/ui/app.ts b/ui/src/ui/app.ts
index 35506e76a..ba0622d57 100644
--- a/ui/src/ui/app.ts
+++ b/ui/src/ui/app.ts
@@ -2,6 +2,7 @@ import { LitElement, html, nothing } from "lit";
 import { customElement, state } from "lit/decorators.js";
 
 import type { GatewayBrowserClient, GatewayHelloOk } from "./gateway";
+import { resolveInjectedAssistantIdentity } from "./assistant-identity";
 import { loadSettings, type UiSettings } from "./storage";
 import { renderApp } from "./app-render";
 import type { Tab } from "./navigation";
@@ -76,6 +77,7 @@ import {
   handleWhatsAppWait as handleWhatsAppWaitInternal,
 } from "./app-channels";
 import type { NostrProfileFormState } from "./views/channels.nostr-profile-form";
+import { loadAssistantIdentity as loadAssistantIdentityInternal } from "./controllers/assistant-identity";
 
 declare global {
   interface Window {
@@ -83,6 +85,8 @@ declare global {
   }
 }
 
+const injectedAssistantIdentity = resolveInjectedAssistantIdentity();
+
 @customElement("clawdbot-app")
 export class ClawdbotApp extends LitElement {
   @state() settings: UiSettings = loadSettings();
@@ -98,6 +102,10 @@ export class ClawdbotApp extends LitElement {
   private toolStreamSyncTimer: number | null = null;
   private sidebarCloseTimer: number | null = null;
 
+  @state() assistantName = injectedAssistantIdentity.name;
+  @state() assistantAvatar = injectedAssistantIdentity.avatar;
+  @state() assistantAgentId = injectedAssistantIdentity.agentId ?? null;
+
   @state() sessionKey = this.settings.sessionKey;
   @state() chatLoading = false;
   @state() chatSending = false;
@@ -306,6 +314,10 @@ export class ClawdbotApp extends LitElement {
     );
   }
 
+  async loadAssistantIdentity() {
+    await loadAssistantIdentityInternal(this);
+  }
+
   applySettings(next: UiSettings) {
     applySettingsInternal(
       this as unknown as Parameters<typeof applySettingsInternal>[0],
diff --git a/ui/src/ui/assistant-identity.ts b/ui/src/ui/assistant-identity.ts
new file mode 100644
index 000000000..c21ac6de6
--- /dev/null
+++ b/ui/src/ui/assistant-identity.ts
@@ -0,0 +1,49 @@
+const MAX_ASSISTANT_NAME = 50;
+const MAX_ASSISTANT_AVATAR = 200;
+
+export const DEFAULT_ASSISTANT_NAME = "Assistant";
+export const DEFAULT_ASSISTANT_AVATAR = "A";
+
+export type AssistantIdentity = {
+  agentId?: string | null;
+  name: string;
+  avatar: string | null;
+};
+
+declare global {
+  interface Window {
+    __CLAWDBOT_ASSISTANT_NAME__?: string;
+    __CLAWDBOT_ASSISTANT_AVATAR__?: string;
+  }
+}
+
+function coerceIdentityValue(value: string | undefined, maxLength: number): string | undefined {
+  if (typeof value !== "string") return undefined;
+  const trimmed = value.trim();
+  if (!trimmed) return undefined;
+  if (trimmed.length <= maxLength) return trimmed;
+  return trimmed.slice(0, maxLength);
+}
+
+export function normalizeAssistantIdentity(
+  input?: Partial<AssistantIdentity> | null,
+): AssistantIdentity {
+  const name =
+    coerceIdentityValue(input?.name, MAX_ASSISTANT_NAME) ?? DEFAULT_ASSISTANT_NAME;
+  const avatar = coerceIdentityValue(input?.avatar ?? undefined, MAX_ASSISTANT_AVATAR) ?? null;
+  const agentId =
+    typeof input?.agentId === "string" && input.agentId.trim()
+      ? input.agentId.trim()
+      : null;
+  return { agentId, name, avatar };
+}
+
+export function resolveInjectedAssistantIdentity(): AssistantIdentity {
+  if (typeof window === "undefined") {
+    return normalizeAssistantIdentity({});
+  }
+  return normalizeAssistantIdentity({
+    name: window.__CLAWDBOT_ASSISTANT_NAME__,
+    avatar: window.__CLAWDBOT_ASSISTANT_AVATAR__,
+  });
+}
diff --git a/ui/src/ui/chat/grouped-render.ts b/ui/src/ui/chat/grouped-render.ts
index ff155a256..6a36c7898 100644
--- a/ui/src/ui/chat/grouped-render.ts
+++ b/ui/src/ui/chat/grouped-render.ts
@@ -1,6 +1,7 @@
 import { html, nothing } from "lit";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
 
+import type { AssistantIdentity } from "../assistant-identity";
 import { toSanitizedMarkdownHtml } from "../markdown";
 import type { MessageGroup } from "../types/chat-types";
 import { renderCopyAsMarkdownButton } from "./copy-as-markdown";
@@ -12,10 +13,10 @@ import {
 } from "./message-extract";
 import { extractToolCards, renderToolCardSidebar } from "./tool-cards";
 
-export function renderReadingIndicatorGroup(assistantAvatarUrl?: string | null) {
+export function renderReadingIndicatorGroup(assistant?: AssistantIdentity) {
   return html`
     <div class="chat-group assistant">
-      ${renderAvatar("assistant", assistantAvatarUrl ?? undefined)}
+      ${renderAvatar("assistant", assistant)}
       <div class="chat-group-messages">
         <div class="chat-bubble chat-reading-indicator" aria-hidden="true">
           <span class="chat-reading-indicator__dots">
@@ -30,17 +31,18 @@ export function renderReadingIndicatorGroup(assistantAvatarUrl?: string | null)
 export function renderStreamingGroup(
   text: string,
   startedAt: number,
-  assistantAvatarUrl?: string | null,
   onOpenSidebar?: (content: string) => void,
+  assistant?: AssistantIdentity,
 ) {
   const timestamp = new Date(startedAt).toLocaleTimeString([], {
     hour: "numeric",
     minute: "2-digit",
   });
+  const name = assistant?.name ?? "Assistant";
 
   return html`
     <div class="chat-group assistant">
-      ${renderAvatar("assistant", assistantAvatarUrl ?? undefined)}
+      ${renderAvatar("assistant", assistant)}
       <div class="chat-group-messages">
         ${renderGroupedMessage(
           {
@@ -52,7 +54,7 @@ export function renderStreamingGroup(
           onOpenSidebar,
         )}
         <div class="chat-group-footer">
-          <span class="chat-sender-name">Assistant</span>
+          <span class="chat-sender-name">${name}</span>
           <span class="chat-group-timestamp">${timestamp}</span>
         </div>
       </div>
@@ -65,15 +67,17 @@ export function renderMessageGroup(
   opts: {
     onOpenSidebar?: (content: string) => void;
     showReasoning: boolean;
-    assistantAvatarUrl?: string | null;
+    assistantName?: string;
+    assistantAvatar?: string | null;
   },
 ) {
   const normalizedRole = normalizeRoleForGrouping(group.role);
+  const assistantName = opts.assistantName ?? "Assistant";
   const who =
     normalizedRole === "user"
       ? "You"
       : normalizedRole === "assistant"
-        ? "Assistant"
+        ? assistantName
         : normalizedRole;
   const roleClass =
     normalizedRole === "user"
@@ -88,7 +92,10 @@ export function renderMessageGroup(
 
   return html`
     <div class="chat-group ${roleClass}">
-      ${renderAvatar(group.role, opts.assistantAvatarUrl ?? undefined)}
+      ${renderAvatar(group.role, {
+        name: assistantName,
+        avatar: opts.assistantAvatar ?? null,
+      })}
       <div class="chat-group-messages">
         ${group.messages.map((item, index) =>
           renderGroupedMessage(
@@ -110,13 +117,18 @@ export function renderMessageGroup(
   `;
 }
 
-function renderAvatar(role: string, avatarUrl?: string) {
+function renderAvatar(
+  role: string,
+  assistant?: Pick<AssistantIdentity, "name" | "avatar">,
+) {
   const normalized = normalizeRoleForGrouping(role);
+  const assistantName = assistant?.name?.trim() || "Assistant";
+  const assistantAvatar = assistant?.avatar?.trim() || "";
   const initial =
     normalized === "user"
       ? "U"
       : normalized === "assistant"
-        ? "A"
+        ? assistantName.charAt(0).toUpperCase() || "A"
         : normalized === "tool"
           ? "⚙"
           : "?";
@@ -125,18 +137,31 @@ function renderAvatar(role: string, avatarUrl?: string) {
       ? "user"
       : normalized === "assistant"
         ? "assistant"
-        : normalized === "tool"
+      : normalized === "tool"
           ? "tool"
           : "other";
-  
-  // If avatar URL is provided for assistant, show image
-  if (avatarUrl && normalized === "assistant") {
-    return html`<img class="chat-avatar ${className}" src="${avatarUrl}" alt="Assistant" />`;
+
+  if (assistantAvatar && normalized === "assistant") {
+    if (isAvatarUrl(assistantAvatar)) {
+      return html`<img
+        class="chat-avatar ${className}"
+        src="${assistantAvatar}"
+        alt="${assistantName}"
+      />`;
+    }
+    return html`<div class="chat-avatar ${className}">${assistantAvatar}</div>`;
   }
-  
+
   return html`<div class="chat-avatar ${className}">${initial}</div>`;
 }
 
+function isAvatarUrl(value: string): boolean {
+  return (
+    /^https?:\/\//i.test(value) ||
+    /^data:image\//i.test(value)
+  );
+}
+
 function renderGroupedMessage(
   message: unknown,
   opts: { isStreaming: boolean; showReasoning: boolean },
diff --git a/ui/src/ui/controllers/assistant-identity.ts b/ui/src/ui/controllers/assistant-identity.ts
new file mode 100644
index 000000000..dd720efd3
--- /dev/null
+++ b/ui/src/ui/controllers/assistant-identity.ts
@@ -0,0 +1,35 @@
+import type { GatewayBrowserClient } from "../gateway";
+import {
+  normalizeAssistantIdentity,
+  type AssistantIdentity,
+} from "../assistant-identity";
+
+export type AssistantIdentityState = {
+  client: GatewayBrowserClient | null;
+  connected: boolean;
+  sessionKey: string;
+  assistantName: string;
+  assistantAvatar: string | null;
+  assistantAgentId: string | null;
+};
+
+export async function loadAssistantIdentity(
+  state: AssistantIdentityState,
+  opts?: { sessionKey?: string },
+) {
+  if (!state.client || !state.connected) return;
+  const sessionKey = opts?.sessionKey?.trim() || state.sessionKey.trim();
+  const params = sessionKey ? { sessionKey } : {};
+  try {
+    const res = (await state.client.request("agent.identity.get", params)) as
+      | Partial<AssistantIdentity>
+      | undefined;
+    if (!res) return;
+    const normalized = normalizeAssistantIdentity(res);
+    state.assistantName = normalized.name;
+    state.assistantAvatar = normalized.avatar;
+    state.assistantAgentId = normalized.agentId ?? null;
+  } catch {
+    // Ignore errors; keep last known identity.
+  }
+}
diff --git a/ui/src/ui/views/chat.ts b/ui/src/ui/views/chat.ts
index c8938521e..01b06f22e 100644
--- a/ui/src/ui/views/chat.ts
+++ b/ui/src/ui/views/chat.ts
@@ -43,6 +43,8 @@ export type ChatProps = {
   sidebarContent?: string | null;
   sidebarError?: string | null;
   splitRatio?: number;
+  assistantName: string;
+  assistantAvatar: string | null;
   // Event handlers
   onRefresh: () => void;
   onToggleFocusMode: () => void;
@@ -65,6 +67,10 @@ export function renderChat(props: ChatProps) {
   );
   const reasoningLevel = activeSession?.reasoningLevel ?? "off";
   const showReasoning = props.showThinking && reasoningLevel !== "off";
+  const assistantIdentity = {
+    name: props.assistantName,
+    avatar: props.assistantAvatar ?? props.assistantAvatarUrl ?? null,
+  };
 
   const composePlaceholder = props.connected
     ? "Message (↩ to send, Shift+↩ for line breaks)"
@@ -115,15 +121,15 @@ export function renderChat(props: ChatProps) {
               : nothing}
             ${repeat(buildChatItems(props), (item) => item.key, (item) => {
               if (item.kind === "reading-indicator") {
-                return renderReadingIndicatorGroup(props.assistantAvatarUrl ?? null);
+                return renderReadingIndicatorGroup(assistantIdentity);
               }
 
               if (item.kind === "stream") {
                 return renderStreamingGroup(
                   item.text,
                   item.startedAt,
-                  props.assistantAvatarUrl ?? null,
                   props.onOpenSidebar,
+                  assistantIdentity,
                 );
               }
 
@@ -131,7 +137,8 @@ export function renderChat(props: ChatProps) {
                 return renderMessageGroup(item, {
                   onOpenSidebar: props.onOpenSidebar,
                   showReasoning,
-                  assistantAvatarUrl: props.assistantAvatarUrl ?? null,
+                  assistantName: props.assistantName,
+                  assistantAvatar: assistantIdentity.avatar,
                 });
               }
 

From 37cbe387bfd3709c3716bf39172911bb860817b3 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 07:00:24 +0000
Subject: [PATCH 164/171] chore: update clawtributors

---
 README.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 5474411cf..6854580f5 100644
--- a/README.md
+++ b/README.md
@@ -479,7 +479,7 @@ Thanks to all clawtributors:
 <p align="left">
   <a href="https://github.com/steipete"><img src="https://avatars.githubusercontent.com/u/58493?v=4&s=48" width="48" height="48" alt="steipete" title="steipete"/></a> <a href="https://github.com/bohdanpodvirnyi"><img src="https://avatars.githubusercontent.com/u/31819391?v=4&s=48" width="48" height="48" alt="bohdanpodvirnyi" title="bohdanpodvirnyi"/></a> <a href="https://github.com/joaohlisboa"><img src="https://avatars.githubusercontent.com/u/8200873?v=4&s=48" width="48" height="48" alt="joaohlisboa" title="joaohlisboa"/></a> <a href="https://github.com/mneves75"><img src="https://avatars.githubusercontent.com/u/2423436?v=4&s=48" width="48" height="48" alt="mneves75" title="mneves75"/></a> <a href="https://github.com/MatthieuBizien"><img src="https://avatars.githubusercontent.com/u/173090?v=4&s=48" width="48" height="48" alt="MatthieuBizien" title="MatthieuBizien"/></a> <a href="https://github.com/MaudeBot"><img src="https://avatars.githubusercontent.com/u/255777700?v=4&s=48" width="48" height="48" alt="MaudeBot" title="MaudeBot"/></a> <a href="https://github.com/rahthakor"><img src="https://avatars.githubusercontent.com/u/8470553?v=4&s=48" width="48" height="48" alt="rahthakor" title="rahthakor"/></a> <a href="https://github.com/vrknetha"><img src="https://avatars.githubusercontent.com/u/20596261?v=4&s=48" width="48" height="48" alt="vrknetha" title="vrknetha"/></a> <a href="https://github.com/radek-paclt"><img src="https://avatars.githubusercontent.com/u/50451445?v=4&s=48" width="48" height="48" alt="radek-paclt" title="radek-paclt"/></a> <a href="https://github.com/joshp123"><img src="https://avatars.githubusercontent.com/u/1497361?v=4&s=48" width="48" height="48" alt="joshp123" title="joshp123"/></a>
   <a href="https://github.com/mukhtharcm"><img src="https://avatars.githubusercontent.com/u/56378562?v=4&s=48" width="48" height="48" alt="mukhtharcm" title="mukhtharcm"/></a> <a href="https://github.com/maxsumrall"><img src="https://avatars.githubusercontent.com/u/628843?v=4&s=48" width="48" height="48" alt="maxsumrall" title="maxsumrall"/></a> <a href="https://github.com/xadenryan"><img src="https://avatars.githubusercontent.com/u/165437834?v=4&s=48" width="48" height="48" alt="xadenryan" title="xadenryan"/></a> <a href="https://github.com/tobiasbischoff"><img src="https://avatars.githubusercontent.com/u/711564?v=4&s=48" width="48" height="48" alt="Tobias Bischoff" title="Tobias Bischoff"/></a> <a href="https://github.com/juanpablodlc"><img src="https://avatars.githubusercontent.com/u/92012363?v=4&s=48" width="48" height="48" alt="juanpablodlc" title="juanpablodlc"/></a> <a href="https://github.com/hsrvc"><img src="https://avatars.githubusercontent.com/u/129702169?v=4&s=48" width="48" height="48" alt="hsrvc" title="hsrvc"/></a> <a href="https://github.com/magimetal"><img src="https://avatars.githubusercontent.com/u/36491250?v=4&s=48" width="48" height="48" alt="magimetal" title="magimetal"/></a> <a href="https://github.com/meaningfool"><img src="https://avatars.githubusercontent.com/u/2862331?v=4&s=48" width="48" height="48" alt="meaningfool" title="meaningfool"/></a> <a href="https://github.com/NicholasSpisak"><img src="https://avatars.githubusercontent.com/u/129075147?v=4&s=48" width="48" height="48" alt="NicholasSpisak" title="NicholasSpisak"/></a> <a href="https://github.com/sebslight"><img src="https://avatars.githubusercontent.com/u/19554889?v=4&s=48" width="48" height="48" alt="sebslight" title="sebslight"/></a>
-  <a href="https://github.com/AbhisekBasu1"><img src="https://avatars.githubusercontent.com/u/40645221?v=4&s=48" width="48" height="48" alt="abhisekbasu1" title="abhisekbasu1"/></a> <a href="https://github.com/zerone0x"><img src="https://avatars.githubusercontent.com/u/39543393?v=4&s=48" width="48" height="48" alt="zerone0x" title="zerone0x"/></a> <a href="https://github.com/claude"><img src="https://avatars.githubusercontent.com/u/81847?v=4&s=48" width="48" height="48" alt="claude" title="claude"/></a> <a href="https://github.com/jamesgroat"><img src="https://avatars.githubusercontent.com/u/2634024?v=4&s=48" width="48" height="48" alt="jamesgroat" title="jamesgroat"/></a> <a href="https://github.com/SocialNerd42069"><img src="https://avatars.githubusercontent.com/u/118244303?v=4&s=48" width="48" height="48" alt="SocialNerd42069" title="SocialNerd42069"/></a> <a href="https://github.com/Hyaxia"><img src="https://avatars.githubusercontent.com/u/36747317?v=4&s=48" width="48" height="48" alt="Hyaxia" title="Hyaxia"/></a> <a href="https://github.com/dantelex"><img src="https://avatars.githubusercontent.com/u/631543?v=4&s=48" width="48" height="48" alt="dantelex" title="dantelex"/></a> <a href="https://github.com/daveonkels"><img src="https://avatars.githubusercontent.com/u/533642?v=4&s=48" width="48" height="48" alt="daveonkels" title="daveonkels"/></a> <a href="https://github.com/mteam88"><img src="https://avatars.githubusercontent.com/u/84196639?v=4&s=48" width="48" height="48" alt="mteam88" title="mteam88"/></a> <a href="https://github.com/omniwired"><img src="https://avatars.githubusercontent.com/u/322761?v=4&s=48" width="48" height="48" alt="Eng. Juan Combetto" title="Eng. Juan Combetto"/></a>
+  <a href="https://github.com/AbhisekBasu1"><img src="https://avatars.githubusercontent.com/u/40645221?v=4&s=48" width="48" height="48" alt="abhisekbasu1" title="abhisekbasu1"/></a> <a href="https://github.com/jamesgroat"><img src="https://avatars.githubusercontent.com/u/2634024?v=4&s=48" width="48" height="48" alt="jamesgroat" title="jamesgroat"/></a> <a href="https://github.com/zerone0x"><img src="https://avatars.githubusercontent.com/u/39543393?v=4&s=48" width="48" height="48" alt="zerone0x" title="zerone0x"/></a> <a href="https://github.com/claude"><img src="https://avatars.githubusercontent.com/u/81847?v=4&s=48" width="48" height="48" alt="claude" title="claude"/></a> <a href="https://github.com/SocialNerd42069"><img src="https://avatars.githubusercontent.com/u/118244303?v=4&s=48" width="48" height="48" alt="SocialNerd42069" title="SocialNerd42069"/></a> <a href="https://github.com/Hyaxia"><img src="https://avatars.githubusercontent.com/u/36747317?v=4&s=48" width="48" height="48" alt="Hyaxia" title="Hyaxia"/></a> <a href="https://github.com/dantelex"><img src="https://avatars.githubusercontent.com/u/631543?v=4&s=48" width="48" height="48" alt="dantelex" title="dantelex"/></a> <a href="https://github.com/daveonkels"><img src="https://avatars.githubusercontent.com/u/533642?v=4&s=48" width="48" height="48" alt="daveonkels" title="daveonkels"/></a> <a href="https://github.com/mteam88"><img src="https://avatars.githubusercontent.com/u/84196639?v=4&s=48" width="48" height="48" alt="mteam88" title="mteam88"/></a> <a href="https://github.com/omniwired"><img src="https://avatars.githubusercontent.com/u/322761?v=4&s=48" width="48" height="48" alt="Eng. Juan Combetto" title="Eng. Juan Combetto"/></a>
   <a href="https://github.com/mbelinky"><img src="https://avatars.githubusercontent.com/u/132747814?v=4&s=48" width="48" height="48" alt="Mariano Belinky" title="Mariano Belinky"/></a> <a href="https://github.com/dbhurley"><img src="https://avatars.githubusercontent.com/u/5251425?v=4&s=48" width="48" height="48" alt="dbhurley" title="dbhurley"/></a> <a href="https://github.com/TSavo"><img src="https://avatars.githubusercontent.com/u/877990?v=4&s=48" width="48" height="48" alt="TSavo" title="TSavo"/></a> <a href="https://github.com/julianengel"><img src="https://avatars.githubusercontent.com/u/10634231?v=4&s=48" width="48" height="48" alt="julianengel" title="julianengel"/></a> <a href="https://github.com/benithors"><img src="https://avatars.githubusercontent.com/u/20652882?v=4&s=48" width="48" height="48" alt="benithors" title="benithors"/></a> <a href="https://github.com/bradleypriest"><img src="https://avatars.githubusercontent.com/u/167215?v=4&s=48" width="48" height="48" alt="bradleypriest" title="bradleypriest"/></a> <a href="https://github.com/timolins"><img src="https://avatars.githubusercontent.com/u/1440854?v=4&s=48" width="48" height="48" alt="timolins" title="timolins"/></a> <a href="https://github.com/Nachx639"><img src="https://avatars.githubusercontent.com/u/71144023?v=4&s=48" width="48" height="48" alt="nachx639" title="nachx639"/></a> <a href="https://github.com/sreekaransrinath"><img src="https://avatars.githubusercontent.com/u/50989977?v=4&s=48" width="48" height="48" alt="sreekaransrinath" title="sreekaransrinath"/></a> <a href="https://github.com/gupsammy"><img src="https://avatars.githubusercontent.com/u/20296019?v=4&s=48" width="48" height="48" alt="gupsammy" title="gupsammy"/></a>
   <a href="https://github.com/cristip73"><img src="https://avatars.githubusercontent.com/u/24499421?v=4&s=48" width="48" height="48" alt="cristip73" title="cristip73"/></a> <a href="https://github.com/nachoiacovino"><img src="https://avatars.githubusercontent.com/u/50103937?v=4&s=48" width="48" height="48" alt="nachoiacovino" title="nachoiacovino"/></a> <a href="https://github.com/vsabavat"><img src="https://avatars.githubusercontent.com/u/50385532?v=4&s=48" width="48" height="48" alt="Vasanth Rao Naik Sabavat" title="Vasanth Rao Naik Sabavat"/></a> <a href="https://github.com/cpojer"><img src="https://avatars.githubusercontent.com/u/13352?v=4&s=48" width="48" height="48" alt="cpojer" title="cpojer"/></a> <a href="https://github.com/lc0rp"><img src="https://avatars.githubusercontent.com/u/2609441?v=4&s=48" width="48" height="48" alt="lc0rp" title="lc0rp"/></a> <a href="https://github.com/scald"><img src="https://avatars.githubusercontent.com/u/1215913?v=4&s=48" width="48" height="48" alt="scald" title="scald"/></a> <a href="https://github.com/gumadeiras"><img src="https://avatars.githubusercontent.com/u/5599352?v=4&s=48" width="48" height="48" alt="gumadeiras" title="gumadeiras"/></a> <a href="https://github.com/andranik-sahakyan"><img src="https://avatars.githubusercontent.com/u/8908029?v=4&s=48" width="48" height="48" alt="andranik-sahakyan" title="andranik-sahakyan"/></a> <a href="https://github.com/davidguttman"><img src="https://avatars.githubusercontent.com/u/431696?v=4&s=48" width="48" height="48" alt="davidguttman" title="davidguttman"/></a> <a href="https://github.com/sleontenko"><img src="https://avatars.githubusercontent.com/u/7135949?v=4&s=48" width="48" height="48" alt="sleontenko" title="sleontenko"/></a>
   <a href="https://github.com/sircrumpet"><img src="https://avatars.githubusercontent.com/u/4436535?v=4&s=48" width="48" height="48" alt="sircrumpet" title="sircrumpet"/></a> <a href="https://github.com/peschee"><img src="https://avatars.githubusercontent.com/u/63866?v=4&s=48" width="48" height="48" alt="peschee" title="peschee"/></a> <a href="https://github.com/rafaelreis-r"><img src="https://avatars.githubusercontent.com/u/57492577?v=4&s=48" width="48" height="48" alt="rafaelreis-r" title="rafaelreis-r"/></a> <a href="https://github.com/thewilloftheshadow"><img src="https://avatars.githubusercontent.com/u/35580099?v=4&s=48" width="48" height="48" alt="thewilloftheshadow" title="thewilloftheshadow"/></a> <a href="https://github.com/ratulsarna"><img src="https://avatars.githubusercontent.com/u/105903728?v=4&s=48" width="48" height="48" alt="ratulsarna" title="ratulsarna"/></a> <a href="https://github.com/lutr0"><img src="https://avatars.githubusercontent.com/u/76906369?v=4&s=48" width="48" height="48" alt="lutr0" title="lutr0"/></a> <a href="https://github.com/danielz1z"><img src="https://avatars.githubusercontent.com/u/235270390?v=4&s=48" width="48" height="48" alt="danielz1z" title="danielz1z"/></a> <a href="https://github.com/emanuelst"><img src="https://avatars.githubusercontent.com/u/9994339?v=4&s=48" width="48" height="48" alt="emanuelst" title="emanuelst"/></a> <a href="https://github.com/KristijanJovanovski"><img src="https://avatars.githubusercontent.com/u/8942284?v=4&s=48" width="48" height="48" alt="KristijanJovanovski" title="KristijanJovanovski"/></a> <a href="https://github.com/CashWilliams"><img src="https://avatars.githubusercontent.com/u/613573?v=4&s=48" width="48" height="48" alt="CashWilliams" title="CashWilliams"/></a>
@@ -489,16 +489,16 @@ Thanks to all clawtributors:
   <a href="https://github.com/ysqander"><img src="https://avatars.githubusercontent.com/u/80843820?v=4&s=48" width="48" height="48" alt="ysqander" title="ysqander"/></a> <a href="https://github.com/superman32432432"><img src="https://avatars.githubusercontent.com/u/7228420?v=4&s=48" width="48" height="48" alt="superman32432432" title="superman32432432"/></a> <a href="https://github.com/search?q=Yurii%20Chukhlib"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Yurii Chukhlib" title="Yurii Chukhlib"/></a> <a href="https://github.com/grp06"><img src="https://avatars.githubusercontent.com/u/1573959?v=4&s=48" width="48" height="48" alt="grp06" title="grp06"/></a> <a href="https://github.com/antons"><img src="https://avatars.githubusercontent.com/u/129705?v=4&s=48" width="48" height="48" alt="antons" title="antons"/></a> <a href="https://github.com/austinm911"><img src="https://avatars.githubusercontent.com/u/31991302?v=4&s=48" width="48" height="48" alt="austinm911" title="austinm911"/></a> <a href="https://github.com/apps/blacksmith-sh"><img src="https://avatars.githubusercontent.com/in/807020?v=4&s=48" width="48" height="48" alt="blacksmith-sh[bot]" title="blacksmith-sh[bot]"/></a> <a href="https://github.com/dan-dr"><img src="https://avatars.githubusercontent.com/u/6669808?v=4&s=48" width="48" height="48" alt="dan-dr" title="dan-dr"/></a> <a href="https://github.com/HeimdallStrategy"><img src="https://avatars.githubusercontent.com/u/223014405?v=4&s=48" width="48" height="48" alt="HeimdallStrategy" title="HeimdallStrategy"/></a> <a href="https://github.com/imfing"><img src="https://avatars.githubusercontent.com/u/5097752?v=4&s=48" width="48" height="48" alt="imfing" title="imfing"/></a>
   <a href="https://github.com/jalehman"><img src="https://avatars.githubusercontent.com/u/550978?v=4&s=48" width="48" height="48" alt="jalehman" title="jalehman"/></a> <a href="https://github.com/jarvis-medmatic"><img src="https://avatars.githubusercontent.com/u/252428873?v=4&s=48" width="48" height="48" alt="jarvis-medmatic" title="jarvis-medmatic"/></a> <a href="https://github.com/kkarimi"><img src="https://avatars.githubusercontent.com/u/875218?v=4&s=48" width="48" height="48" alt="kkarimi" title="kkarimi"/></a> <a href="https://github.com/mahmoudashraf93"><img src="https://avatars.githubusercontent.com/u/9130129?v=4&s=48" width="48" height="48" alt="mahmoudashraf93" title="mahmoudashraf93"/></a> <a href="https://github.com/ngutman"><img src="https://avatars.githubusercontent.com/u/1540134?v=4&s=48" width="48" height="48" alt="ngutman" title="ngutman"/></a> <a href="https://github.com/petter-b"><img src="https://avatars.githubusercontent.com/u/62076402?v=4&s=48" width="48" height="48" alt="petter-b" title="petter-b"/></a> <a href="https://github.com/pkrmf"><img src="https://avatars.githubusercontent.com/u/1714267?v=4&s=48" width="48" height="48" alt="pkrmf" title="pkrmf"/></a> <a href="https://github.com/RandyVentures"><img src="https://avatars.githubusercontent.com/u/149904821?v=4&s=48" width="48" height="48" alt="RandyVentures" title="RandyVentures"/></a> <a href="https://github.com/search?q=Ryan%20Lisse"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ryan Lisse" title="Ryan Lisse"/></a> <a href="https://github.com/dougvk"><img src="https://avatars.githubusercontent.com/u/401660?v=4&s=48" width="48" height="48" alt="dougvk" title="dougvk"/></a>
   <a href="https://github.com/erikpr1994"><img src="https://avatars.githubusercontent.com/u/6299331?v=4&s=48" width="48" height="48" alt="erikpr1994" title="erikpr1994"/></a> <a href="https://github.com/search?q=Ghost"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ghost" title="Ghost"/></a> <a href="https://github.com/jonasjancarik"><img src="https://avatars.githubusercontent.com/u/2459191?v=4&s=48" width="48" height="48" alt="jonasjancarik" title="jonasjancarik"/></a> <a href="https://github.com/search?q=Keith%20the%20Silly%20Goose"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Keith the Silly Goose" title="Keith the Silly Goose"/></a> <a href="https://github.com/search?q=L36%20Server"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="L36 Server" title="L36 Server"/></a> <a href="https://github.com/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></a> <a href="https://github.com/mitschabaude-bot"><img src="https://avatars.githubusercontent.com/u/247582884?v=4&s=48" width="48" height="48" alt="mitschabaude-bot" title="mitschabaude-bot"/></a> <a href="https://github.com/mkbehr"><img src="https://avatars.githubusercontent.com/u/1285?v=4&s=48" width="48" height="48" alt="mkbehr" title="mkbehr"/></a> <a href="https://github.com/neist"><img src="https://avatars.githubusercontent.com/u/1029724?v=4&s=48" width="48" height="48" alt="neist" title="neist"/></a> <a href="https://github.com/chrisrodz"><img src="https://avatars.githubusercontent.com/u/2967620?v=4&s=48" width="48" height="48" alt="chrisrodz" title="chrisrodz"/></a>
-  <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a> <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a> <a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a> <a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a> <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a>
-  <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a> <a href="https://github.com/siddhantjain"><img src="https://avatars.githubusercontent.com/u/4835232?v=4&s=48" width="48" height="48" alt="siddhantjain" title="siddhantjain"/></a> <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a> <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/24601"><img src="https://avatars.githubusercontent.com/u/1157207?v=4&s=48" width="48" height="48" alt="24601" title="24601"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a> <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a>
-  <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a> <a href="https://github.com/humanwritten"><img src="https://avatars.githubusercontent.com/u/206531610?v=4&s=48" width="48" height="48" alt="humanwritten" title="humanwritten"/></a> <a href="https://github.com/larlyssa"><img src="https://avatars.githubusercontent.com/u/13128869?v=4&s=48" width="48" height="48" alt="larlyssa" title="larlyssa"/></a> <a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/aaronveklabs"><img src="https://avatars.githubusercontent.com/u/225997828?v=4&s=48" width="48" height="48" alt="aaronveklabs" title="aaronveklabs"/></a> <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a> <a href="https://github.com/ameno-"><img src="https://avatars.githubusercontent.com/u/2416135?v=4&s=48" width="48" height="48" alt="ameno-" title="ameno-"/></a>
-  <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/search?q=Clawd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Clawd" title="Clawd"/></a> <a href="https://github.com/search?q=ClawdFx"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ClawdFx" title="ClawdFx"/></a> <a href="https://github.com/erik-agens"><img src="https://avatars.githubusercontent.com/u/80908960?v=4&s=48" width="48" height="48" alt="erik-agens" title="erik-agens"/></a> <a href="https://github.com/fcatuhe"><img src="https://avatars.githubusercontent.com/u/17382215?v=4&s=48" width="48" height="48" alt="fcatuhe" title="fcatuhe"/></a> <a href="https://github.com/ivanrvpereira"><img src="https://avatars.githubusercontent.com/u/183991?v=4&s=48" width="48" height="48" alt="ivanrvpereira" title="ivanrvpereira"/></a> <a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jeffersonwarrior"><img src="https://avatars.githubusercontent.com/u/89030989?v=4&s=48" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/search?q=jeffersonwarrior"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/jdrhyne"><img src="https://avatars.githubusercontent.com/u/7828464?v=4&s=48" width="48" height="48" alt="Jonathan D. Rhyne (DJ-D)" title="Jonathan D. Rhyne (DJ-D)"/></a>
-  <a href="https://github.com/jverdi"><img src="https://avatars.githubusercontent.com/u/345050?v=4&s=48" width="48" height="48" alt="jverdi" title="jverdi"/></a> <a href="https://github.com/longmaba"><img src="https://avatars.githubusercontent.com/u/9361500?v=4&s=48" width="48" height="48" alt="longmaba" title="longmaba"/></a> <a href="https://github.com/mickahouan"><img src="https://avatars.githubusercontent.com/u/31423109?v=4&s=48" width="48" height="48" alt="mickahouan" title="mickahouan"/></a> <a href="https://github.com/mjrussell"><img src="https://avatars.githubusercontent.com/u/1641895?v=4&s=48" width="48" height="48" alt="mjrussell" title="mjrussell"/></a> <a href="https://github.com/p6l-richard"><img src="https://avatars.githubusercontent.com/u/18185649?v=4&s=48" width="48" height="48" alt="p6l-richard" title="p6l-richard"/></a> <a href="https://github.com/philipp-spiess"><img src="https://avatars.githubusercontent.com/u/458591?v=4&s=48" width="48" height="48" alt="philipp-spiess" title="philipp-spiess"/></a> <a href="https://github.com/robaxelsen"><img src="https://avatars.githubusercontent.com/u/13132899?v=4&s=48" width="48" height="48" alt="robaxelsen" title="robaxelsen"/></a> <a href="https://github.com/search?q=Sash%20Catanzarite"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Sash Catanzarite" title="Sash Catanzarite"/></a> <a href="https://github.com/T5-AndyML"><img src="https://avatars.githubusercontent.com/u/22801233?v=4&s=48" width="48" height="48" alt="T5-AndyML" title="T5-AndyML"/></a> <a href="https://github.com/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></a>
-  <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/search?q=Andrii"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Andrii" title="Andrii"/></a> <a href="https://github.com/anpoirier"><img src="https://avatars.githubusercontent.com/u/1245729?v=4&s=48" width="48" height="48" alt="anpoirier" title="anpoirier"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a> <a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a> <a href="https://github.com/conhecendocontato"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendocontato" title="conhecendocontato"/></a> <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a> <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/search?q=Felix%20Krause"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Felix Krause" title="Felix Krause"/></a>
-  <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a> <a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a> <a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a> <a href="https://github.com/search?q=Kevin%20Lin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kevin Lin" title="Kevin Lin"/></a> <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a>
-  <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a> <a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a> <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a> <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/odysseus0"><img src="https://avatars.githubusercontent.com/u/8635094?v=4&s=48" width="48" height="48" alt="odysseus0" title="odysseus0"/></a>
-  <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/ptn1411"><img src="https://avatars.githubusercontent.com/u/57529765?v=4&s=48" width="48" height="48" alt="ptn1411" title="ptn1411"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a> <a href="https://github.com/rodrigouroz"><img src="https://avatars.githubusercontent.com/u/384037?v=4&s=48" width="48" height="48" alt="rodrigouroz" title="rodrigouroz"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a> <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a> <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a>
-  <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a> <a href="https://github.com/search?q=Vultr-Clawd%20Admin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Vultr-Clawd Admin" title="Vultr-Clawd Admin"/></a> <a href="https://github.com/search?q=Wimmie"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Wimmie" title="Wimmie"/></a> <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/yazinsai"><img src="https://avatars.githubusercontent.com/u/1846034?v=4&s=48" width="48" height="48" alt="yazinsai" title="yazinsai"/></a> <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a>
-  <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a> <a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a>
-  <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
+  <a href="https://github.com/dlauer"><img src="https://avatars.githubusercontent.com/u/757041?v=4&s=48" width="48" height="48" alt="dlauer" title="dlauer"/></a> <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a> <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a> <a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a> <a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a>
+  <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a> <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a> <a href="https://github.com/siddhantjain"><img src="https://avatars.githubusercontent.com/u/4835232?v=4&s=48" width="48" height="48" alt="siddhantjain" title="siddhantjain"/></a> <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a> <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/24601"><img src="https://avatars.githubusercontent.com/u/1157207?v=4&s=48" width="48" height="48" alt="24601" title="24601"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a>
+  <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a> <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a> <a href="https://github.com/humanwritten"><img src="https://avatars.githubusercontent.com/u/206531610?v=4&s=48" width="48" height="48" alt="humanwritten" title="humanwritten"/></a> <a href="https://github.com/larlyssa"><img src="https://avatars.githubusercontent.com/u/13128869?v=4&s=48" width="48" height="48" alt="larlyssa" title="larlyssa"/></a> <a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/aaronveklabs"><img src="https://avatars.githubusercontent.com/u/225997828?v=4&s=48" width="48" height="48" alt="aaronveklabs" title="aaronveklabs"/></a> <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a>
+  <a href="https://github.com/ameno-"><img src="https://avatars.githubusercontent.com/u/2416135?v=4&s=48" width="48" height="48" alt="ameno-" title="ameno-"/></a> <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/search?q=Clawd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Clawd" title="Clawd"/></a> <a href="https://github.com/search?q=ClawdFx"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ClawdFx" title="ClawdFx"/></a> <a href="https://github.com/czekaj"><img src="https://avatars.githubusercontent.com/u/1464539?v=4&s=48" width="48" height="48" alt="czekaj" title="czekaj"/></a> <a href="https://github.com/erik-agens"><img src="https://avatars.githubusercontent.com/u/80908960?v=4&s=48" width="48" height="48" alt="erik-agens" title="erik-agens"/></a> <a href="https://github.com/fcatuhe"><img src="https://avatars.githubusercontent.com/u/17382215?v=4&s=48" width="48" height="48" alt="fcatuhe" title="fcatuhe"/></a> <a href="https://github.com/ivanrvpereira"><img src="https://avatars.githubusercontent.com/u/183991?v=4&s=48" width="48" height="48" alt="ivanrvpereira" title="ivanrvpereira"/></a> <a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jeffersonwarrior"><img src="https://avatars.githubusercontent.com/u/89030989?v=4&s=48" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a>
+  <a href="https://github.com/search?q=jeffersonwarrior"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/jdrhyne"><img src="https://avatars.githubusercontent.com/u/7828464?v=4&s=48" width="48" height="48" alt="Jonathan D. Rhyne (DJ-D)" title="Jonathan D. Rhyne (DJ-D)"/></a> <a href="https://github.com/jverdi"><img src="https://avatars.githubusercontent.com/u/345050?v=4&s=48" width="48" height="48" alt="jverdi" title="jverdi"/></a> <a href="https://github.com/longmaba"><img src="https://avatars.githubusercontent.com/u/9361500?v=4&s=48" width="48" height="48" alt="longmaba" title="longmaba"/></a> <a href="https://github.com/mickahouan"><img src="https://avatars.githubusercontent.com/u/31423109?v=4&s=48" width="48" height="48" alt="mickahouan" title="mickahouan"/></a> <a href="https://github.com/mjrussell"><img src="https://avatars.githubusercontent.com/u/1641895?v=4&s=48" width="48" height="48" alt="mjrussell" title="mjrussell"/></a> <a href="https://github.com/p6l-richard"><img src="https://avatars.githubusercontent.com/u/18185649?v=4&s=48" width="48" height="48" alt="p6l-richard" title="p6l-richard"/></a> <a href="https://github.com/philipp-spiess"><img src="https://avatars.githubusercontent.com/u/458591?v=4&s=48" width="48" height="48" alt="philipp-spiess" title="philipp-spiess"/></a> <a href="https://github.com/robaxelsen"><img src="https://avatars.githubusercontent.com/u/13132899?v=4&s=48" width="48" height="48" alt="robaxelsen" title="robaxelsen"/></a> <a href="https://github.com/search?q=Sash%20Catanzarite"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Sash Catanzarite" title="Sash Catanzarite"/></a>
+  <a href="https://github.com/T5-AndyML"><img src="https://avatars.githubusercontent.com/u/22801233?v=4&s=48" width="48" height="48" alt="T5-AndyML" title="T5-AndyML"/></a> <a href="https://github.com/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></a> <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/andrewting19"><img src="https://avatars.githubusercontent.com/u/10536704?v=4&s=48" width="48" height="48" alt="andrewting19" title="andrewting19"/></a> <a href="https://github.com/search?q=Andrii"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Andrii" title="Andrii"/></a> <a href="https://github.com/anpoirier"><img src="https://avatars.githubusercontent.com/u/1245729?v=4&s=48" width="48" height="48" alt="anpoirier" title="anpoirier"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a> <a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a> <a href="https://github.com/conhecendoia"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendoia" title="conhecendoia"/></a>
+  <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a> <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/search?q=Felix%20Krause"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Felix Krause" title="Felix Krause"/></a> <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a> <a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a> <a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a>
+  <a href="https://github.com/search?q=Kevin%20Lin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kevin Lin" title="Kevin Lin"/></a> <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a> <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a> <a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a>
+  <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a> <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/odysseus0"><img src="https://avatars.githubusercontent.com/u/8635094?v=4&s=48" width="48" height="48" alt="odysseus0" title="odysseus0"/></a> <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/ptn1411"><img src="https://avatars.githubusercontent.com/u/57529765?v=4&s=48" width="48" height="48" alt="ptn1411" title="ptn1411"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a> <a href="https://github.com/rodrigouroz"><img src="https://avatars.githubusercontent.com/u/384037?v=4&s=48" width="48" height="48" alt="rodrigouroz" title="rodrigouroz"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a>
+  <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a> <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a> <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a> <a href="https://github.com/search?q=Vultr-Clawd%20Admin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Vultr-Clawd Admin" title="Vultr-Clawd Admin"/></a> <a href="https://github.com/search?q=Wimmie"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Wimmie" title="Wimmie"/></a> <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a>
+  <a href="https://github.com/yazinsai"><img src="https://avatars.githubusercontent.com/u/1846034?v=4&s=48" width="48" height="48" alt="yazinsai" title="yazinsai"/></a> <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a> <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a>
+  <a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a> <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
 </p>

From 0d37a92c169bb2eafa2f9e1df6bb72293fbf6998 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 07:04:28 +0000
Subject: [PATCH 165/171] fix: remove duplicate loadConfig import

---
 src/gateway/server-http.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gateway/server-http.ts b/src/gateway/server-http.ts
index 49257c61d..52cc6d09c 100644
--- a/src/gateway/server-http.ts
+++ b/src/gateway/server-http.ts
@@ -13,7 +13,6 @@ import { loadConfig } from "../config/config.js";
 import type { createSubsystemLogger } from "../logging/subsystem.js";
 import { handleSlackHttpRequest } from "../slack/http/index.js";
 import { resolveAgentAvatar } from "../agents/identity-avatar.js";
-import { loadConfig } from "../config/config.js";
 import { handleControlUiAvatarRequest, handleControlUiHttpRequest } from "./control-ui.js";
 import {
   extractHookToken,

From 7004616e039ed576f21d4aab3dd5611974a31580 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 07:09:20 +0000
Subject: [PATCH 166/171] docs: note node-gyp workaround for sharp

---
 docs/install/index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/install/index.md b/docs/install/index.md
index 57b09c4cf..dde0e5eeb 100644
--- a/docs/install/index.md
+++ b/docs/install/index.md
@@ -71,6 +71,8 @@ If you have libvips installed globally (common on macOS via Homebrew) and `sharp
 SHARP_IGNORE_GLOBAL_LIBVIPS=1 npm install -g clawdbot@latest
 ```
 
+If you see `sharp: Please add node-gyp to your dependencies`, either install build tooling (macOS: Xcode CLT + `npm install -g node-gyp`) or use the `SHARP_IGNORE_GLOBAL_LIBVIPS=1` workaround above to skip the native build.
+
 Or:
 
 ```bash

From d83ea7f2da3a2251066e0da0eaa2175780c18f2b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 07:15:10 +0000
Subject: [PATCH 167/171] fix: stabilize session previews

---
 .../Clawdbot/MenuSessionsInjector.swift       | 14 ++--
 .../Clawdbot/SessionMenuPreviewView.swift     | 77 ++++++++++++++++---
 2 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/MenuSessionsInjector.swift b/apps/macos/Sources/Clawdbot/MenuSessionsInjector.swift
index 7bbe907ba..ad0487893 100644
--- a/apps/macos/Sources/Clawdbot/MenuSessionsInjector.swift
+++ b/apps/macos/Sources/Clawdbot/MenuSessionsInjector.swift
@@ -145,10 +145,11 @@ extension MenuSessionsInjector {
             let headerItem = NSMenuItem()
             headerItem.tag = self.tag
             headerItem.isEnabled = false
+            let statusText = self.cachedErrorText ?? (isConnected ? nil : self.controlChannelStatusText(for: channelState))
             let hosted = self.makeHostedView(
                 rootView: AnyView(MenuSessionsHeaderView(
                     count: rows.count,
-                    statusText: isConnected ? nil : self.controlChannelStatusText(for: channelState))),
+                    statusText: statusText)),
                 width: width,
                 highlighted: false)
             headerItem.view = hosted
@@ -598,8 +599,11 @@ extension MenuSessionsInjector {
         }
 
         guard self.isControlChannelConnected else {
-            self.cachedSnapshot = nil
-            self.cachedErrorText = nil
+            if self.cachedSnapshot != nil {
+                self.cachedErrorText = "Gateway disconnected (showing cached)"
+            } else {
+                self.cachedErrorText = nil
+            }
             self.cacheUpdatedAt = Date()
             return
         }
@@ -624,8 +628,6 @@ extension MenuSessionsInjector {
         }
 
         guard self.isControlChannelConnected else {
-            self.cachedUsageSummary = nil
-            self.cachedUsageErrorText = nil
             self.usageCacheUpdatedAt = Date()
             return
         }
@@ -648,8 +650,6 @@ extension MenuSessionsInjector {
         }
 
         guard self.isControlChannelConnected else {
-            self.cachedCostSummary = nil
-            self.cachedCostErrorText = nil
             self.costCacheUpdatedAt = Date()
             return
         }
diff --git a/apps/macos/Sources/Clawdbot/SessionMenuPreviewView.swift b/apps/macos/Sources/Clawdbot/SessionMenuPreviewView.swift
index f48840385..88c75160e 100644
--- a/apps/macos/Sources/Clawdbot/SessionMenuPreviewView.swift
+++ b/apps/macos/Sources/Clawdbot/SessionMenuPreviewView.swift
@@ -52,6 +52,51 @@ actor SessionPreviewCache {
     }
 }
 
+actor SessionPreviewLimiter {
+    static let shared = SessionPreviewLimiter(maxConcurrent: 2)
+
+    private let maxConcurrent: Int
+    private var available: Int
+    private var waitQueue: [UUID] = []
+    private var waiters: [UUID: CheckedContinuation<Void, Never>] = [:]
+
+    init(maxConcurrent: Int) {
+        let normalized = max(1, maxConcurrent)
+        self.maxConcurrent = normalized
+        self.available = normalized
+    }
+
+    func withPermit<T>(_ operation: () async throws -> T) async throws -> T {
+        await self.acquire()
+        defer { self.release() }
+        if Task.isCancelled { throw CancellationError() }
+        return try await operation()
+    }
+
+    private func acquire() async {
+        if self.available > 0 {
+            self.available -= 1
+            return
+        }
+        let id = UUID()
+        await withCheckedContinuation { cont in
+            self.waitQueue.append(id)
+            self.waiters[id] = cont
+        }
+    }
+
+    private func release() {
+        if let id = self.waitQueue.first {
+            self.waitQueue.removeFirst()
+            if let cont = self.waiters.removeValue(forKey: id) {
+                cont.resume()
+            }
+            return
+        }
+        self.available = min(self.available + 1, self.maxConcurrent)
+    }
+}
+
 #if DEBUG
 extension SessionPreviewCache {
     func _testSet(items: [SessionPreviewItem], for sessionKey: String, updatedAt: Date = Date()) {
@@ -184,17 +229,31 @@ enum SessionMenuPreviewLoader {
             return self.snapshot(from: cached)
         }
 
+        let isConnected = await MainActor.run {
+            if case .connected = ControlChannel.shared.state { return true }
+            return false
+        }
+
+        guard isConnected else {
+            if let fallback = await SessionPreviewCache.shared.lastItems(for: sessionKey) {
+                return Self.snapshot(from: fallback)
+            }
+            return SessionMenuPreviewSnapshot(items: [], status: .error("Gateway disconnected"))
+        }
+
         do {
             let timeoutMs = Int(self.previewTimeoutSeconds * 1000)
-            let payload = try await AsyncTimeout.withTimeout(
-                seconds: self.previewTimeoutSeconds,
-                onTimeout: { PreviewTimeoutError() },
-                operation: {
-                    try await GatewayConnection.shared.chatHistory(
-                        sessionKey: sessionKey,
-                        limit: self.previewLimit(for: maxItems),
-                        timeoutMs: timeoutMs)
-                })
+            let payload = try await SessionPreviewLimiter.shared.withPermit {
+                try await AsyncTimeout.withTimeout(
+                    seconds: self.previewTimeoutSeconds,
+                    onTimeout: { PreviewTimeoutError() },
+                    operation: {
+                        try await GatewayConnection.shared.chatHistory(
+                            sessionKey: sessionKey,
+                            limit: self.previewLimit(for: maxItems),
+                            timeoutMs: timeoutMs)
+                    })
+            }
             let built = Self.previewItems(from: payload, maxItems: maxItems)
             await SessionPreviewCache.shared.store(items: built, for: sessionKey)
             return Self.snapshot(from: built)

From 4b3e9c0f339d3b0af21dbbd699b378899ec6e193 Mon Sep 17 00:00:00 2001
From: Lucas Czekaj <lukasz@czekaj.us>
Date: Wed, 21 Jan 2026 22:02:17 -0800
Subject: [PATCH 168/171] fix(exec): align node exec approvals (#1425)

Thanks @czekaj.

Co-authored-by: Lucas Czekaj <lukasz@czekaj.us>
---
 CHANGELOG.md                                  |   1 +
 .../bash-tools.exec.approval-id.test.ts       |  66 ++++++
 src/agents/bash-tools.exec.ts                 |  88 +++++---
 src/infra/exec-approvals.test.ts              | 200 ++++++++++++++++++
 src/infra/exec-approvals.ts                   |  50 +++++
 src/node-host/runner.ts                       |  42 ++--
 6 files changed, 395 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3658404b3..7c09f6607 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ Docs: https://docs.clawd.bot
 - Cron: cap reminder context history to 10 messages and honor `contextMessages`. (#1103) Thanks @mkbehr.
 - Exec approvals: treat main as the default agent + migrate legacy default allowlists. (#1417) Thanks @czekaj.
 - Exec: avoid defaulting to elevated mode when elevated is not allowed.
+- Exec approvals: align node/gateway allowlist prechecks and approval gating; avoid null optional params in approval requests. (#1425) Thanks @czekaj.
 - UI: refresh debug panel on route-driven tab changes. (#1373) Thanks @yazinsai.
 
 ## 2026.1.21
diff --git a/src/agents/bash-tools.exec.approval-id.test.ts b/src/agents/bash-tools.exec.approval-id.test.ts
index 54f6d7150..bd810ab3f 100644
--- a/src/agents/bash-tools.exec.approval-id.test.ts
+++ b/src/agents/bash-tools.exec.approval-id.test.ts
@@ -68,4 +68,70 @@ describe("exec approvals", () => {
     const runId = (invokeParams as { params?: { runId?: string } } | undefined)?.params?.runId;
     expect(runId).toBe(approvalId);
   });
+
+  it("skips approval when node allowlist is satisfied", async () => {
+    const { callGatewayTool } = await import("./tools/gateway.js");
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-test-bin-"));
+    const binDir = path.join(tempDir, "bin");
+    await fs.mkdir(binDir, { recursive: true });
+    const exeName = process.platform === "win32" ? "tool.cmd" : "tool";
+    const exePath = path.join(binDir, exeName);
+    await fs.writeFile(exePath, "");
+    if (process.platform !== "win32") {
+      await fs.chmod(exePath, 0o755);
+    }
+    const prevPath = process.env.PATH;
+    const prevPathExt = process.env.PATHEXT;
+    process.env.PATH = binDir;
+    if (process.platform === "win32") {
+      process.env.PATHEXT = ".CMD";
+    }
+
+    try {
+      const approvalsFile = {
+        version: 1,
+        defaults: { security: "allowlist", ask: "on-miss", askFallback: "deny" },
+        agents: {
+          main: {
+            allowlist: [{ pattern: exePath }],
+          },
+        },
+      };
+
+      const calls: string[] = [];
+      vi.mocked(callGatewayTool).mockImplementation(async (method) => {
+        calls.push(method);
+        if (method === "exec.approvals.node.get") {
+          return { file: approvalsFile };
+        }
+        if (method === "node.invoke") {
+          return { payload: { success: true, stdout: "ok" } };
+        }
+        if (method === "exec.approval.request") {
+          return { decision: "allow-once" };
+        }
+        return { ok: true };
+      });
+
+      const { createExecTool } = await import("./bash-tools.exec.js");
+      const tool = createExecTool({
+        host: "node",
+        ask: "on-miss",
+        approvalRunningNoticeMs: 0,
+      });
+
+      const result = await tool.execute("call2", { command: `${exeName} --help` });
+      expect(result.details.status).toBe("completed");
+      expect(calls).toContain("exec.approvals.node.get");
+      expect(calls).toContain("node.invoke");
+      expect(calls).not.toContain("exec.approval.request");
+    } finally {
+      process.env.PATH = prevPath;
+      if (prevPathExt === undefined) {
+        delete process.env.PATHEXT;
+      } else {
+        process.env.PATHEXT = prevPathExt;
+      }
+    }
+  });
 });
diff --git a/src/agents/bash-tools.exec.ts b/src/agents/bash-tools.exec.ts
index 79082e321..75f6b1927 100644
--- a/src/agents/bash-tools.exec.ts
+++ b/src/agents/bash-tools.exec.ts
@@ -8,16 +8,17 @@ import {
   type ExecAsk,
   type ExecHost,
   type ExecSecurity,
-  type ExecAllowlistEntry,
+  type ExecApprovalsFile,
   addAllowlistEntry,
   analyzeShellCommand,
-  isSafeBinUsage,
-  matchAllowlist,
+  evaluateExecAllowlist,
   maxAsk,
   minSecurity,
+  requiresExecApproval,
   resolveSafeBins,
   recordAllowlistUse,
   resolveExecApprovals,
+  resolveExecApprovalsFromFile,
 } from "../infra/exec-approvals.js";
 import { requestHeartbeatNow } from "../infra/heartbeat-wake.js";
 import { buildNodeShellCommand } from "../infra/node-shell.js";
@@ -870,7 +871,43 @@ export function createExecTool(
         if (nodeEnv) {
           applyPathPrepend(nodeEnv, defaultPathPrepend, { requireExisting: true });
         }
-        const requiresAsk = hostAsk === "always" || hostAsk === "on-miss";
+        const analysis = analyzeShellCommand({ command: params.command, cwd: workdir, env });
+        let allowlistSatisfied = false;
+        if (hostAsk === "on-miss" && hostSecurity === "allowlist") {
+          try {
+            const approvalsSnapshot = (await callGatewayTool(
+              "exec.approvals.node.get",
+              { timeoutMs: 10_000 },
+              { nodeId },
+            )) as { file?: unknown } | null;
+            const approvalsFile =
+              approvalsSnapshot && typeof approvalsSnapshot === "object"
+                ? approvalsSnapshot.file
+                : undefined;
+            if (approvalsFile && typeof approvalsFile === "object") {
+              const resolved = resolveExecApprovalsFromFile({
+                file: approvalsFile as ExecApprovalsFile,
+                agentId,
+                overrides: { security: "allowlist" },
+              });
+              // Allowlist-only precheck; safe bins are node-local and may diverge.
+              allowlistSatisfied = evaluateExecAllowlist({
+                analysis,
+                allowlist: resolved.allowlist,
+                safeBins: new Set(),
+                cwd: workdir,
+              }).allowlistSatisfied;
+            }
+          } catch {
+            // Fall back to requiring approval if node approvals cannot be fetched.
+          }
+        }
+        const requiresAsk = requiresExecApproval({
+          ask: hostAsk,
+          security: hostSecurity,
+          analysisOk: analysis.ok,
+          allowlistSatisfied,
+        });
         const commandText = params.command;
         const invokeTimeoutMs = Math.max(
           10_000,
@@ -921,8 +958,8 @@ export function createExecTool(
                   security: hostSecurity,
                   ask: hostAsk,
                   agentId,
-                  resolvedPath: null,
-                  sessionKey: defaults?.sessionKey ?? null,
+                  resolvedPath: undefined,
+                  sessionKey: defaults?.sessionKey,
                   timeoutMs: DEFAULT_APPROVAL_TIMEOUT_MS,
                 },
               )) as { decision?: string } | null;
@@ -1059,33 +1096,28 @@ export function createExecTool(
           throw new Error("exec denied: host=gateway security=deny");
         }
         const analysis = analyzeShellCommand({ command: params.command, cwd: workdir, env });
-        const allowlistMatches: ExecAllowlistEntry[] = [];
-        let allowlistSatisfied = false;
-        if (hostSecurity === "allowlist" && analysis.ok && analysis.segments.length > 0) {
-          allowlistSatisfied = analysis.segments.every((segment) => {
-            const match = matchAllowlist(approvals.allowlist, segment.resolution);
-            if (match) allowlistMatches.push(match);
-            const safe = isSafeBinUsage({
-              argv: segment.argv,
-              resolution: segment.resolution,
-              safeBins,
-              cwd: workdir,
-            });
-            return Boolean(match || safe);
-          });
-        }
-        const requiresAsk =
-          hostAsk === "always" ||
-          (hostAsk === "on-miss" &&
-            hostSecurity === "allowlist" &&
-            (!analysis.ok || !allowlistSatisfied));
+        const allowlistEval = evaluateExecAllowlist({
+          analysis,
+          allowlist: approvals.allowlist,
+          safeBins,
+          cwd: workdir,
+        });
+        const allowlistMatches = allowlistEval.allowlistMatches;
+        const allowlistSatisfied =
+          hostSecurity === "allowlist" && analysis.ok ? allowlistEval.allowlistSatisfied : false;
+        const requiresAsk = requiresExecApproval({
+          ask: hostAsk,
+          security: hostSecurity,
+          analysisOk: analysis.ok,
+          allowlistSatisfied,
+        });
 
         if (requiresAsk) {
           const approvalId = crypto.randomUUID();
           const approvalSlug = createApprovalSlug(approvalId);
           const expiresAtMs = Date.now() + DEFAULT_APPROVAL_TIMEOUT_MS;
           const contextKey = `exec:${approvalId}`;
-          const resolvedPath = analysis.segments[0]?.resolution?.resolvedPath ?? null;
+          const resolvedPath = analysis.segments[0]?.resolution?.resolvedPath;
           const noticeSeconds = Math.max(1, Math.round(approvalRunningNoticeMs / 1000));
           const commandText = params.command;
           const effectiveTimeout =
@@ -1107,7 +1139,7 @@ export function createExecTool(
                   ask: hostAsk,
                   agentId,
                   resolvedPath,
-                  sessionKey: defaults?.sessionKey ?? null,
+                  sessionKey: defaults?.sessionKey,
                   timeoutMs: DEFAULT_APPROVAL_TIMEOUT_MS,
                 },
               )) as { decision?: string } | null;
diff --git a/src/infra/exec-approvals.test.ts b/src/infra/exec-approvals.test.ts
index f6d77b2f1..191cc08bc 100644
--- a/src/infra/exec-approvals.test.ts
+++ b/src/infra/exec-approvals.test.ts
@@ -7,11 +7,13 @@ import { describe, expect, it, vi } from "vitest";
 import {
   analyzeArgvCommand,
   analyzeShellCommand,
+  evaluateExecAllowlist,
   isSafeBinUsage,
   matchAllowlist,
   maxAsk,
   minSecurity,
   normalizeSafeBins,
+  requiresExecApproval,
   resolveCommandResolution,
   resolveExecApprovals,
   resolveExecApprovalsFromFile,
@@ -183,6 +185,85 @@ describe("exec approvals safe bins", () => {
   });
 });
 
+describe("exec approvals allowlist evaluation", () => {
+  it("satisfies allowlist on exact match", () => {
+    const analysis = {
+      ok: true,
+      segments: [
+        {
+          raw: "tool",
+          argv: ["tool"],
+          resolution: {
+            rawExecutable: "tool",
+            resolvedPath: "/usr/bin/tool",
+            executableName: "tool",
+          },
+        },
+      ],
+    };
+    const allowlist: ExecAllowlistEntry[] = [{ pattern: "/usr/bin/tool" }];
+    const result = evaluateExecAllowlist({
+      analysis,
+      allowlist,
+      safeBins: new Set(),
+      cwd: "/tmp",
+    });
+    expect(result.allowlistSatisfied).toBe(true);
+    expect(result.allowlistMatches.map((entry) => entry.pattern)).toEqual(["/usr/bin/tool"]);
+  });
+
+  it("satisfies allowlist via safe bins", () => {
+    const analysis = {
+      ok: true,
+      segments: [
+        {
+          raw: "jq .foo",
+          argv: ["jq", ".foo"],
+          resolution: {
+            rawExecutable: "jq",
+            resolvedPath: "/usr/bin/jq",
+            executableName: "jq",
+          },
+        },
+      ],
+    };
+    const result = evaluateExecAllowlist({
+      analysis,
+      allowlist: [],
+      safeBins: normalizeSafeBins(["jq"]),
+      cwd: "/tmp",
+    });
+    expect(result.allowlistSatisfied).toBe(true);
+    expect(result.allowlistMatches).toEqual([]);
+  });
+
+  it("satisfies allowlist via auto-allow skills", () => {
+    const analysis = {
+      ok: true,
+      segments: [
+        {
+          raw: "skill-bin",
+          argv: ["skill-bin", "--help"],
+          resolution: {
+            rawExecutable: "skill-bin",
+            resolvedPath: "/opt/skills/skill-bin",
+            executableName: "skill-bin",
+          },
+        },
+      ],
+    };
+    const result = evaluateExecAllowlist({
+      analysis,
+      allowlist: [],
+      safeBins: new Set(),
+      skillBins: new Set(["skill-bin"]),
+      autoAllowSkills: true,
+      cwd: "/tmp",
+    });
+    expect(result.allowlistSatisfied).toBe(true);
+  });
+});
+
 describe("exec approvals policy helpers", () => {
   it("minSecurity returns the more restrictive value", () => {
     expect(minSecurity("deny", "full")).toBe("deny");
@@ -193,6 +274,49 @@ describe("exec approvals policy helpers", () => {
     expect(maxAsk("off", "always")).toBe("always");
     expect(maxAsk("on-miss", "off")).toBe("on-miss");
   });
+
+  it("requiresExecApproval respects ask mode and allowlist satisfaction", () => {
+    expect(
+      requiresExecApproval({
+        ask: "always",
+        security: "allowlist",
+        analysisOk: true,
+        allowlistSatisfied: true,
+      }),
+    ).toBe(true);
+    expect(
+      requiresExecApproval({
+        ask: "off",
+        security: "allowlist",
+        analysisOk: true,
+        allowlistSatisfied: false,
+      }),
+    ).toBe(false);
+    expect(
+      requiresExecApproval({
+        ask: "on-miss",
+        security: "allowlist",
+        analysisOk: true,
+        allowlistSatisfied: true,
+      }),
+    ).toBe(false);
+    expect(
+      requiresExecApproval({
+        ask: "on-miss",
+        security: "allowlist",
+        analysisOk: false,
+        allowlistSatisfied: false,
+      }),
+    ).toBe(true);
+    expect(
+      requiresExecApproval({
+        ask: "on-miss",
+        security: "full",
+        analysisOk: false,
+        allowlistSatisfied: false,
+      }),
+    ).toBe(false);
+  });
 });
 
 describe("exec approvals wildcard agent", () => {
@@ -229,6 +353,82 @@ describe("exec approvals wildcard agent", () => {
   });
 });
 
+describe("exec approvals node host allowlist check", () => {
+  // These tests verify the allowlist satisfaction logic used by the node host path
+  // The node host checks: matchAllowlist() || isSafeBinUsage() for each command segment
+  // Using hardcoded resolution objects for cross-platform compatibility
+
+  it("satisfies allowlist when command matches exact path pattern", () => {
+    const resolution = {
+      rawExecutable: "python3",
+      resolvedPath: "/usr/bin/python3",
+      executableName: "python3",
+    };
+    const entries: ExecAllowlistEntry[] = [{ pattern: "/usr/bin/python3" }];
+    const match = matchAllowlist(entries, resolution);
+    expect(match).not.toBeNull();
+    expect(match?.pattern).toBe("/usr/bin/python3");
+  });
+
+  it("satisfies allowlist when command matches ** wildcard pattern", () => {
+    // Simulates symlink resolution: /opt/homebrew/bin/python3 -> /opt/homebrew/opt/python@3.14/bin/python3.14
+    const resolution = {
+      rawExecutable: "python3",
+      resolvedPath: "/opt/homebrew/opt/python@3.14/bin/python3.14",
+      executableName: "python3.14",
+    };
+    // Pattern with ** matches across multiple directories
+    const entries: ExecAllowlistEntry[] = [{ pattern: "/opt/**/python*" }];
+    const match = matchAllowlist(entries, resolution);
+    expect(match?.pattern).toBe("/opt/**/python*");
+  });
+
+  it("does not satisfy allowlist when command is not in allowlist", () => {
+    const resolution = {
+      rawExecutable: "unknown-tool",
+      resolvedPath: "/usr/local/bin/unknown-tool",
+      executableName: "unknown-tool",
+    };
+    // Allowlist has different commands
+    const entries: ExecAllowlistEntry[] = [
+      { pattern: "/usr/bin/python3" },
+      { pattern: "/opt/**/node" },
+    ];
+    const match = matchAllowlist(entries, resolution);
+    expect(match).toBeNull();
+
+    // Also not a safe bin
+    const safe = isSafeBinUsage({
+      argv: ["unknown-tool", "--help"],
+      resolution,
+      safeBins: normalizeSafeBins(["jq", "curl"]),
+      cwd: "/tmp",
+    });
+    expect(safe).toBe(false);
+  });
+
+  it("satisfies via safeBins even when not in allowlist", () => {
+    const resolution = {
+      rawExecutable: "jq",
+      resolvedPath: "/usr/bin/jq",
+      executableName: "jq",
+    };
+    // Not in allowlist
+    const entries: ExecAllowlistEntry[] = [{ pattern: "/usr/bin/python3" }];
+    const match = matchAllowlist(entries, resolution);
+    expect(match).toBeNull();
+
+    // But is a safe bin with non-file args
+    const safe = isSafeBinUsage({
+      argv: ["jq", ".foo"],
+      resolution,
+      safeBins: normalizeSafeBins(["jq"]),
+      cwd: "/tmp",
+    });
+    expect(safe).toBe(true);
+  });
+});
+
 describe("exec approvals default agent migration", () => {
   it("migrates legacy default agent entries to main", () => {
     const file = {
diff --git a/src/infra/exec-approvals.ts b/src/infra/exec-approvals.ts
index b6d3549f4..7047abf89 100644
--- a/src/infra/exec-approvals.ts
+++ b/src/infra/exec-approvals.ts
@@ -727,6 +727,56 @@ export function isSafeBinUsage(params: {
   return true;
 }
 
+export type ExecAllowlistEvaluation = {
+  allowlistSatisfied: boolean;
+  allowlistMatches: ExecAllowlistEntry[];
+};
+
+export function evaluateExecAllowlist(params: {
+  analysis: ExecCommandAnalysis;
+  allowlist: ExecAllowlistEntry[];
+  safeBins: Set<string>;
+  cwd?: string;
+  skillBins?: Set<string>;
+  autoAllowSkills?: boolean;
+}): ExecAllowlistEvaluation {
+  const allowlistMatches: ExecAllowlistEntry[] = [];
+  if (!params.analysis.ok || params.analysis.segments.length === 0) {
+    return { allowlistSatisfied: false, allowlistMatches };
+  }
+  const allowSkills = params.autoAllowSkills === true && (params.skillBins?.size ?? 0) > 0;
+  const allowlistSatisfied = params.analysis.segments.every((segment) => {
+    const match = matchAllowlist(params.allowlist, segment.resolution);
+    if (match) allowlistMatches.push(match);
+    const safe = isSafeBinUsage({
+      argv: segment.argv,
+      resolution: segment.resolution,
+      safeBins: params.safeBins,
+      cwd: params.cwd,
+    });
+    const skillAllow =
+      allowSkills && segment.resolution?.executableName
+        ? params.skillBins?.has(segment.resolution.executableName)
+        : false;
+    return Boolean(match || safe || skillAllow);
+  });
+  return { allowlistSatisfied, allowlistMatches };
+}
+
+export function requiresExecApproval(params: {
+  ask: ExecAsk;
+  security: ExecSecurity;
+  analysisOk: boolean;
+  allowlistSatisfied: boolean;
+}): boolean {
+  return (
+    params.ask === "always" ||
+    (params.ask === "on-miss" &&
+      params.security === "allowlist" &&
+      (!params.analysisOk || !params.allowlistSatisfied))
+  );
+}
+
 export function recordAllowlistUse(
   approvals: ExecApprovalsFile,
   agentId: string | undefined,
diff --git a/src/node-host/runner.ts b/src/node-host/runner.ts
index 0d4892e35..a66aa63f1 100644
--- a/src/node-host/runner.ts
+++ b/src/node-host/runner.ts
@@ -4,12 +4,11 @@ import fs from "node:fs";
 import path from "node:path";
 
 import {
-  type ExecAllowlistEntry,
   addAllowlistEntry,
   analyzeArgvCommand,
   analyzeShellCommand,
-  isSafeBinUsage,
-  matchAllowlist,
+  evaluateExecAllowlist,
+  requiresExecApproval,
   normalizeExecApprovals,
   recordAllowlistUse,
   resolveExecApprovals,
@@ -592,26 +591,18 @@ async function handleInvoke(
   const cfg = loadConfig();
   const agentExec = agentId ? resolveAgentConfig(cfg, agentId)?.tools?.exec : undefined;
   const safeBins = resolveSafeBins(agentExec?.safeBins ?? cfg.tools?.exec?.safeBins);
-  const allowlistMatches: ExecAllowlistEntry[] = [];
   const bins = autoAllowSkills ? await skillBins.current() : new Set<string>();
+  const allowlistEval = evaluateExecAllowlist({
+    analysis,
+    allowlist: approvals.allowlist,
+    safeBins,
+    cwd: params.cwd ?? undefined,
+    skillBins: bins,
+    autoAllowSkills,
+  });
+  const allowlistMatches = allowlistEval.allowlistMatches;
   const allowlistSatisfied =
-    security === "allowlist" && analysis.ok && analysis.segments.length > 0
-      ? analysis.segments.every((segment) => {
-          const match = matchAllowlist(approvals.allowlist, segment.resolution);
-          if (match) allowlistMatches.push(match);
-          const safe = isSafeBinUsage({
-            argv: segment.argv,
-            resolution: segment.resolution,
-            safeBins,
-            cwd: params.cwd ?? undefined,
-          });
-          const skillAllow =
-            autoAllowSkills && segment.resolution?.executableName
-              ? bins.has(segment.resolution.executableName)
-              : false;
-          return Boolean(match || safe || skillAllow);
-        })
-      : false;
+    security === "allowlist" && analysis.ok ? allowlistEval.allowlistSatisfied : false;
 
   const useMacAppExec = process.platform === "darwin";
   if (useMacAppExec) {
@@ -715,9 +706,12 @@ async function handleInvoke(
     return;
   }
 
-  const requiresAsk =
-    ask === "always" ||
-    (ask === "on-miss" && security === "allowlist" && (!analysis.ok || !allowlistSatisfied));
+  const requiresAsk = requiresExecApproval({
+    ask,
+    security,
+    analysisOk: analysis.ok,
+    allowlistSatisfied,
+  });
 
   const approvalDecision =
     params.approvalDecision === "allow-once" || params.approvalDecision === "allow-always"

From bc8e5ad6b372a7a9114dd058cd5cd32410337d08 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 07:22:56 +0000
Subject: [PATCH 169/171] fix: stabilize avatar tests on Windows

---
 .../ClawdbotProtocol/GatewayModels.swift      | 44 ++++++++++++++++++-
 .../ClawdbotProtocol/GatewayModels.swift      | 44 ++++++++++++++++++-
 src/agents/identity-avatar.test.ts            | 10 +++--
 3 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift b/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
index 7d8189248..aefbdb572 100644
--- a/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
+++ b/apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
@@ -552,6 +552,44 @@ public struct AgentParams: Codable, Sendable {
     }
 }
 
+public struct AgentIdentityParams: Codable, Sendable {
+    public let agentid: String?
+    public let sessionkey: String?
+
+    public init(
+        agentid: String?,
+        sessionkey: String?
+    ) {
+        self.agentid = agentid
+        self.sessionkey = sessionkey
+    }
+    private enum CodingKeys: String, CodingKey {
+        case agentid = "agentId"
+        case sessionkey = "sessionKey"
+    }
+}
+
+public struct AgentIdentityResult: Codable, Sendable {
+    public let agentid: String
+    public let name: String?
+    public let avatar: String?
+
+    public init(
+        agentid: String,
+        name: String?,
+        avatar: String?
+    ) {
+        self.agentid = agentid
+        self.name = name
+        self.avatar = avatar
+    }
+    private enum CodingKeys: String, CodingKey {
+        case agentid = "agentId"
+        case name
+        case avatar
+    }
+}
+
 public struct AgentWaitParams: Codable, Sendable {
     public let runid: String
     public let timeoutms: Int?
@@ -1447,17 +1485,21 @@ public struct WebLoginWaitParams: Codable, Sendable {
 public struct AgentSummary: Codable, Sendable {
     public let id: String
     public let name: String?
+    public let identity: [String: AnyCodable]?
 
     public init(
         id: String,
-        name: String?
+        name: String?,
+        identity: [String: AnyCodable]?
     ) {
         self.id = id
         self.name = name
+        self.identity = identity
     }
     private enum CodingKeys: String, CodingKey {
         case id
         case name
+        case identity
     }
 }
 
diff --git a/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift b/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
index 7d8189248..aefbdb572 100644
--- a/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
+++ b/apps/shared/ClawdbotKit/Sources/ClawdbotProtocol/GatewayModels.swift
@@ -552,6 +552,44 @@ public struct AgentParams: Codable, Sendable {
     }
 }
 
+public struct AgentIdentityParams: Codable, Sendable {
+    public let agentid: String?
+    public let sessionkey: String?
+
+    public init(
+        agentid: String?,
+        sessionkey: String?
+    ) {
+        self.agentid = agentid
+        self.sessionkey = sessionkey
+    }
+    private enum CodingKeys: String, CodingKey {
+        case agentid = "agentId"
+        case sessionkey = "sessionKey"
+    }
+}
+
+public struct AgentIdentityResult: Codable, Sendable {
+    public let agentid: String
+    public let name: String?
+    public let avatar: String?
+
+    public init(
+        agentid: String,
+        name: String?,
+        avatar: String?
+    ) {
+        self.agentid = agentid
+        self.name = name
+        self.avatar = avatar
+    }
+    private enum CodingKeys: String, CodingKey {
+        case agentid = "agentId"
+        case name
+        case avatar
+    }
+}
+
 public struct AgentWaitParams: Codable, Sendable {
     public let runid: String
     public let timeoutms: Int?
@@ -1447,17 +1485,21 @@ public struct WebLoginWaitParams: Codable, Sendable {
 public struct AgentSummary: Codable, Sendable {
     public let id: String
     public let name: String?
+    public let identity: [String: AnyCodable]?
 
     public init(
         id: String,
-        name: String?
+        name: String?,
+        identity: [String: AnyCodable]?
     ) {
         self.id = id
         self.name = name
+        self.identity = identity
     }
     private enum CodingKeys: String, CodingKey {
         case id
         case name
+        case identity
     }
 }
 
diff --git a/src/agents/identity-avatar.test.ts b/src/agents/identity-avatar.test.ts
index 3d5d42611..d2b9449e8 100644
--- a/src/agents/identity-avatar.test.ts
+++ b/src/agents/identity-avatar.test.ts
@@ -31,11 +31,12 @@ describe("resolveAgentAvatar", () => {
       },
     };
 
-    const expectedPath = await fs.realpath(avatarPath);
+    const workspaceReal = await fs.realpath(workspace);
     const resolved = resolveAgentAvatar(cfg, "main");
     expect(resolved.kind).toBe("local");
     if (resolved.kind === "local") {
-      expect(resolved.filePath).toBe(expectedPath);
+      const resolvedReal = await fs.realpath(resolved.filePath);
+      expect(path.relative(workspaceReal, resolvedReal)).toBe(path.join("avatars", "main.png"));
     }
   });
 
@@ -83,11 +84,12 @@ describe("resolveAgentAvatar", () => {
       },
     };
 
-    const expectedPath = await fs.realpath(avatarPath);
+    const workspaceReal = await fs.realpath(workspace);
     const resolved = resolveAgentAvatar(cfg, "main");
     expect(resolved.kind).toBe("local");
     if (resolved.kind === "local") {
-      expect(resolved.filePath).toBe(expectedPath);
+      const resolvedReal = await fs.realpath(resolved.filePath);
+      expect(path.relative(workspaceReal, resolvedReal)).toBe(path.join("avatars", "fallback.png"));
     }
   });
 

From d30e9b7d5644e8260eb6cce7982c8f86e6237641 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 07:35:50 +0000
Subject: [PATCH 170/171] fix: keep chat pinned on stream

---
 CHANGELOG.md                                  |  1 +
 .../Sources/ClawdbotChatUI/ChatView.swift     | 37 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c09f6607..4a6a80d80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ Docs: https://docs.clawd.bot
 - Models: inherit session model overrides in thread/topic sessions (Telegram topics, Slack/Discord threads). (#1376)
 - macOS: keep local auto bind loopback-first; only use tailnet when bind=tailnet.
 - macOS: include Textual syntax highlighting resources in packaged app to prevent chat crashes. (#1362)
+- macOS: keep chat pinned to bottom during streaming replies. (#1279)
 - Cron: cap reminder context history to 10 messages and honor `contextMessages`. (#1103) Thanks @mkbehr.
 - Exec approvals: treat main as the default agent + migrate legacy default allowlists. (#1417) Thanks @czekaj.
 - Exec: avoid defaulting to elevated mode when elevated is not allowed.
diff --git a/apps/shared/ClawdbotKit/Sources/ClawdbotChatUI/ChatView.swift b/apps/shared/ClawdbotKit/Sources/ClawdbotChatUI/ChatView.swift
index d243f6a96..44399a3e6 100644
--- a/apps/shared/ClawdbotKit/Sources/ClawdbotChatUI/ChatView.swift
+++ b/apps/shared/ClawdbotKit/Sources/ClawdbotChatUI/ChatView.swift
@@ -12,6 +12,7 @@ public struct ClawdbotChatView: View {
     @State private var scrollPosition: UUID?
     @State private var showSessions = false
     @State private var hasPerformedInitialScroll = false
+    @State private var isPinnedToBottom = true
     private let showsSessionSwitcher: Bool
     private let style: Style
     private let markdownVariant: ChatMarkdownVariant
@@ -87,36 +88,28 @@ public struct ClawdbotChatView: View {
     private var messageList: some View {
         ZStack {
             ScrollView {
-                #if os(macOS)
-                VStack(spacing: 0) {
-                    LazyVStack(spacing: Layout.messageSpacing) {
-                        self.messageListRows
-                    }
-
-                    Color.clear
-                        .frame(height: Layout.messageListPaddingBottom)
-                        .id(self.scrollerBottomID)
-                }
-                // Use scroll targets for stable auto-scroll without ScrollViewReader relayout glitches.
-                .scrollTargetLayout()
-                .padding(.top, Layout.messageListPaddingTop)
-                .padding(.horizontal, Layout.messageListPaddingHorizontal)
-                #else
                 LazyVStack(spacing: Layout.messageSpacing) {
                     self.messageListRows
 
                     Color.clear
+                        #if os(macOS)
+                        .frame(height: Layout.messageListPaddingBottom)
+                        #else
                         .frame(height: Layout.messageListPaddingBottom + 1)
+                        #endif
                         .id(self.scrollerBottomID)
                 }
                 // Use scroll targets for stable auto-scroll without ScrollViewReader relayout glitches.
                 .scrollTargetLayout()
                 .padding(.top, Layout.messageListPaddingTop)
                 .padding(.horizontal, Layout.messageListPaddingHorizontal)
-                #endif
             }
             // Keep the scroll pinned to the bottom for new messages.
             .scrollPosition(id: self.$scrollPosition, anchor: .bottom)
+            .onChange(of: self.scrollPosition) { _, position in
+                guard let position else { return }
+                self.isPinnedToBottom = position == self.scrollerBottomID
+            }
 
             if self.viewModel.isLoading {
                 ProgressView()
@@ -133,18 +126,26 @@ public struct ClawdbotChatView: View {
             guard !isLoading, !self.hasPerformedInitialScroll else { return }
             self.scrollPosition = self.scrollerBottomID
             self.hasPerformedInitialScroll = true
+            self.isPinnedToBottom = true
         }
         .onChange(of: self.viewModel.sessionKey) { _, _ in
             self.hasPerformedInitialScroll = false
+            self.isPinnedToBottom = true
         }
         .onChange(of: self.viewModel.messages.count) { _, _ in
-            guard self.hasPerformedInitialScroll else { return }
+            guard self.hasPerformedInitialScroll, self.isPinnedToBottom else { return }
             withAnimation(.snappy(duration: 0.22)) {
                 self.scrollPosition = self.scrollerBottomID
             }
         }
         .onChange(of: self.viewModel.pendingRunCount) { _, _ in
-            guard self.hasPerformedInitialScroll else { return }
+            guard self.hasPerformedInitialScroll, self.isPinnedToBottom else { return }
+            withAnimation(.snappy(duration: 0.22)) {
+                self.scrollPosition = self.scrollerBottomID
+            }
+        }
+        .onChange(of: self.viewModel.streamingAssistantText) { _, _ in
+            guard self.hasPerformedInitialScroll, self.isPinnedToBottom else { return }
             withAnimation(.snappy(duration: 0.22)) {
                 self.scrollPosition = self.scrollerBottomID
             }

From 40b7447a80e521485d20e894a14421be861e3d62 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 07:34:53 +0000
Subject: [PATCH 171/171] docs: update clawtributors

---
 README.md | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 6854580f5..2a58b9155 100644
--- a/README.md
+++ b/README.md
@@ -484,21 +484,21 @@ Thanks to all clawtributors:
   <a href="https://github.com/cristip73"><img src="https://avatars.githubusercontent.com/u/24499421?v=4&s=48" width="48" height="48" alt="cristip73" title="cristip73"/></a> <a href="https://github.com/nachoiacovino"><img src="https://avatars.githubusercontent.com/u/50103937?v=4&s=48" width="48" height="48" alt="nachoiacovino" title="nachoiacovino"/></a> <a href="https://github.com/vsabavat"><img src="https://avatars.githubusercontent.com/u/50385532?v=4&s=48" width="48" height="48" alt="Vasanth Rao Naik Sabavat" title="Vasanth Rao Naik Sabavat"/></a> <a href="https://github.com/cpojer"><img src="https://avatars.githubusercontent.com/u/13352?v=4&s=48" width="48" height="48" alt="cpojer" title="cpojer"/></a> <a href="https://github.com/lc0rp"><img src="https://avatars.githubusercontent.com/u/2609441?v=4&s=48" width="48" height="48" alt="lc0rp" title="lc0rp"/></a> <a href="https://github.com/scald"><img src="https://avatars.githubusercontent.com/u/1215913?v=4&s=48" width="48" height="48" alt="scald" title="scald"/></a> <a href="https://github.com/gumadeiras"><img src="https://avatars.githubusercontent.com/u/5599352?v=4&s=48" width="48" height="48" alt="gumadeiras" title="gumadeiras"/></a> <a href="https://github.com/andranik-sahakyan"><img src="https://avatars.githubusercontent.com/u/8908029?v=4&s=48" width="48" height="48" alt="andranik-sahakyan" title="andranik-sahakyan"/></a> <a href="https://github.com/davidguttman"><img src="https://avatars.githubusercontent.com/u/431696?v=4&s=48" width="48" height="48" alt="davidguttman" title="davidguttman"/></a> <a href="https://github.com/sleontenko"><img src="https://avatars.githubusercontent.com/u/7135949?v=4&s=48" width="48" height="48" alt="sleontenko" title="sleontenko"/></a>
   <a href="https://github.com/sircrumpet"><img src="https://avatars.githubusercontent.com/u/4436535?v=4&s=48" width="48" height="48" alt="sircrumpet" title="sircrumpet"/></a> <a href="https://github.com/peschee"><img src="https://avatars.githubusercontent.com/u/63866?v=4&s=48" width="48" height="48" alt="peschee" title="peschee"/></a> <a href="https://github.com/rafaelreis-r"><img src="https://avatars.githubusercontent.com/u/57492577?v=4&s=48" width="48" height="48" alt="rafaelreis-r" title="rafaelreis-r"/></a> <a href="https://github.com/thewilloftheshadow"><img src="https://avatars.githubusercontent.com/u/35580099?v=4&s=48" width="48" height="48" alt="thewilloftheshadow" title="thewilloftheshadow"/></a> <a href="https://github.com/ratulsarna"><img src="https://avatars.githubusercontent.com/u/105903728?v=4&s=48" width="48" height="48" alt="ratulsarna" title="ratulsarna"/></a> <a href="https://github.com/lutr0"><img src="https://avatars.githubusercontent.com/u/76906369?v=4&s=48" width="48" height="48" alt="lutr0" title="lutr0"/></a> <a href="https://github.com/danielz1z"><img src="https://avatars.githubusercontent.com/u/235270390?v=4&s=48" width="48" height="48" alt="danielz1z" title="danielz1z"/></a> <a href="https://github.com/emanuelst"><img src="https://avatars.githubusercontent.com/u/9994339?v=4&s=48" width="48" height="48" alt="emanuelst" title="emanuelst"/></a> <a href="https://github.com/KristijanJovanovski"><img src="https://avatars.githubusercontent.com/u/8942284?v=4&s=48" width="48" height="48" alt="KristijanJovanovski" title="KristijanJovanovski"/></a> <a href="https://github.com/CashWilliams"><img src="https://avatars.githubusercontent.com/u/613573?v=4&s=48" width="48" height="48" alt="CashWilliams" title="CashWilliams"/></a>
   <a href="https://github.com/rdev"><img src="https://avatars.githubusercontent.com/u/8418866?v=4&s=48" width="48" height="48" alt="rdev" title="rdev"/></a> <a href="https://github.com/osolmaz"><img src="https://avatars.githubusercontent.com/u/2453968?v=4&s=48" width="48" height="48" alt="osolmaz" title="osolmaz"/></a> <a href="https://github.com/joshrad-dev"><img src="https://avatars.githubusercontent.com/u/62785552?v=4&s=48" width="48" height="48" alt="joshrad-dev" title="joshrad-dev"/></a> <a href="https://github.com/kiranjd"><img src="https://avatars.githubusercontent.com/u/25822851?v=4&s=48" width="48" height="48" alt="kiranjd" title="kiranjd"/></a> <a href="https://github.com/adityashaw2"><img src="https://avatars.githubusercontent.com/u/41204444?v=4&s=48" width="48" height="48" alt="adityashaw2" title="adityashaw2"/></a> <a href="https://github.com/search?q=sheeek"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="sheeek" title="sheeek"/></a> <a href="https://github.com/artuskg"><img src="https://avatars.githubusercontent.com/u/11966157?v=4&s=48" width="48" height="48" alt="artuskg" title="artuskg"/></a> <a href="https://github.com/onutc"><img src="https://avatars.githubusercontent.com/u/152018508?v=4&s=48" width="48" height="48" alt="onutc" title="onutc"/></a> <a href="https://github.com/tyler6204"><img src="https://avatars.githubusercontent.com/u/64381258?v=4&s=48" width="48" height="48" alt="tyler6204" title="tyler6204"/></a> <a href="https://github.com/ManuelHettich"><img src="https://avatars.githubusercontent.com/u/17690367?v=4&s=48" width="48" height="48" alt="manuelhettich" title="manuelhettich"/></a>
-  <a href="https://github.com/minghinmatthewlam"><img src="https://avatars.githubusercontent.com/u/14224566?v=4&s=48" width="48" height="48" alt="minghinmatthewlam" title="minghinmatthewlam"/></a> <a href="https://github.com/myfunc"><img src="https://avatars.githubusercontent.com/u/19294627?v=4&s=48" width="48" height="48" alt="myfunc" title="myfunc"/></a> <a href="https://github.com/buddyh"><img src="https://avatars.githubusercontent.com/u/31752869?v=4&s=48" width="48" height="48" alt="buddyh" title="buddyh"/></a> <a href="https://github.com/connorshea"><img src="https://avatars.githubusercontent.com/u/2977353?v=4&s=48" width="48" height="48" alt="connorshea" title="connorshea"/></a> <a href="https://github.com/mcinteerj"><img src="https://avatars.githubusercontent.com/u/3613653?v=4&s=48" width="48" height="48" alt="mcinteerj" title="mcinteerj"/></a> <a href="https://github.com/vignesh07"><img src="https://avatars.githubusercontent.com/u/1436853?v=4&s=48" width="48" height="48" alt="vignesh07" title="vignesh07"/></a> <a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4&s=48" width="48" height="48" alt="dependabot[bot]" title="dependabot[bot]"/></a> <a href="https://github.com/John-Rood"><img src="https://avatars.githubusercontent.com/u/62669593?v=4&s=48" width="48" height="48" alt="John-Rood" title="John-Rood"/></a> <a href="https://github.com/timkrase"><img src="https://avatars.githubusercontent.com/u/38947626?v=4&s=48" width="48" height="48" alt="timkrase" title="timkrase"/></a> <a href="https://github.com/gerardward2007"><img src="https://avatars.githubusercontent.com/u/3002155?v=4&s=48" width="48" height="48" alt="gerardward2007" title="gerardward2007"/></a>
+  <a href="https://github.com/minghinmatthewlam"><img src="https://avatars.githubusercontent.com/u/14224566?v=4&s=48" width="48" height="48" alt="minghinmatthewlam" title="minghinmatthewlam"/></a> <a href="https://github.com/myfunc"><img src="https://avatars.githubusercontent.com/u/19294627?v=4&s=48" width="48" height="48" alt="myfunc" title="myfunc"/></a> <a href="https://github.com/buddyh"><img src="https://avatars.githubusercontent.com/u/31752869?v=4&s=48" width="48" height="48" alt="buddyh" title="buddyh"/></a> <a href="https://github.com/connorshea"><img src="https://avatars.githubusercontent.com/u/2977353?v=4&s=48" width="48" height="48" alt="connorshea" title="connorshea"/></a> <a href="https://github.com/vignesh07"><img src="https://avatars.githubusercontent.com/u/1436853?v=4&s=48" width="48" height="48" alt="vignesh07" title="vignesh07"/></a> <a href="https://github.com/mcinteerj"><img src="https://avatars.githubusercontent.com/u/3613653?v=4&s=48" width="48" height="48" alt="mcinteerj" title="mcinteerj"/></a> <a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4&s=48" width="48" height="48" alt="dependabot[bot]" title="dependabot[bot]"/></a> <a href="https://github.com/John-Rood"><img src="https://avatars.githubusercontent.com/u/62669593?v=4&s=48" width="48" height="48" alt="John-Rood" title="John-Rood"/></a> <a href="https://github.com/timkrase"><img src="https://avatars.githubusercontent.com/u/38947626?v=4&s=48" width="48" height="48" alt="timkrase" title="timkrase"/></a> <a href="https://github.com/gerardward2007"><img src="https://avatars.githubusercontent.com/u/3002155?v=4&s=48" width="48" height="48" alt="gerardward2007" title="gerardward2007"/></a>
   <a href="https://github.com/obviyus"><img src="https://avatars.githubusercontent.com/u/22031114?v=4&s=48" width="48" height="48" alt="obviyus" title="obviyus"/></a> <a href="https://github.com/tosh-hamburg"><img src="https://avatars.githubusercontent.com/u/58424326?v=4&s=48" width="48" height="48" alt="tosh-hamburg" title="tosh-hamburg"/></a> <a href="https://github.com/azade-c"><img src="https://avatars.githubusercontent.com/u/252790079?v=4&s=48" width="48" height="48" alt="azade-c" title="azade-c"/></a> <a href="https://github.com/roshanasingh4"><img src="https://avatars.githubusercontent.com/u/88576930?v=4&s=48" width="48" height="48" alt="roshanasingh4" title="roshanasingh4"/></a> <a href="https://github.com/bjesuiter"><img src="https://avatars.githubusercontent.com/u/2365676?v=4&s=48" width="48" height="48" alt="bjesuiter" title="bjesuiter"/></a> <a href="https://github.com/cheeeee"><img src="https://avatars.githubusercontent.com/u/21245729?v=4&s=48" width="48" height="48" alt="cheeeee" title="cheeeee"/></a> <a href="https://github.com/j1philli"><img src="https://avatars.githubusercontent.com/u/3744255?v=4&s=48" width="48" height="48" alt="Josh Phillips" title="Josh Phillips"/></a> <a href="https://github.com/Whoaa512"><img src="https://avatars.githubusercontent.com/u/1581943?v=4&s=48" width="48" height="48" alt="Whoaa512" title="Whoaa512"/></a> <a href="https://github.com/YuriNachos"><img src="https://avatars.githubusercontent.com/u/19365375?v=4&s=48" width="48" height="48" alt="YuriNachos" title="YuriNachos"/></a> <a href="https://github.com/chriseidhof"><img src="https://avatars.githubusercontent.com/u/5382?v=4&s=48" width="48" height="48" alt="chriseidhof" title="chriseidhof"/></a>
-  <a href="https://github.com/ysqander"><img src="https://avatars.githubusercontent.com/u/80843820?v=4&s=48" width="48" height="48" alt="ysqander" title="ysqander"/></a> <a href="https://github.com/superman32432432"><img src="https://avatars.githubusercontent.com/u/7228420?v=4&s=48" width="48" height="48" alt="superman32432432" title="superman32432432"/></a> <a href="https://github.com/search?q=Yurii%20Chukhlib"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Yurii Chukhlib" title="Yurii Chukhlib"/></a> <a href="https://github.com/grp06"><img src="https://avatars.githubusercontent.com/u/1573959?v=4&s=48" width="48" height="48" alt="grp06" title="grp06"/></a> <a href="https://github.com/antons"><img src="https://avatars.githubusercontent.com/u/129705?v=4&s=48" width="48" height="48" alt="antons" title="antons"/></a> <a href="https://github.com/austinm911"><img src="https://avatars.githubusercontent.com/u/31991302?v=4&s=48" width="48" height="48" alt="austinm911" title="austinm911"/></a> <a href="https://github.com/apps/blacksmith-sh"><img src="https://avatars.githubusercontent.com/in/807020?v=4&s=48" width="48" height="48" alt="blacksmith-sh[bot]" title="blacksmith-sh[bot]"/></a> <a href="https://github.com/dan-dr"><img src="https://avatars.githubusercontent.com/u/6669808?v=4&s=48" width="48" height="48" alt="dan-dr" title="dan-dr"/></a> <a href="https://github.com/HeimdallStrategy"><img src="https://avatars.githubusercontent.com/u/223014405?v=4&s=48" width="48" height="48" alt="HeimdallStrategy" title="HeimdallStrategy"/></a> <a href="https://github.com/imfing"><img src="https://avatars.githubusercontent.com/u/5097752?v=4&s=48" width="48" height="48" alt="imfing" title="imfing"/></a>
-  <a href="https://github.com/jalehman"><img src="https://avatars.githubusercontent.com/u/550978?v=4&s=48" width="48" height="48" alt="jalehman" title="jalehman"/></a> <a href="https://github.com/jarvis-medmatic"><img src="https://avatars.githubusercontent.com/u/252428873?v=4&s=48" width="48" height="48" alt="jarvis-medmatic" title="jarvis-medmatic"/></a> <a href="https://github.com/kkarimi"><img src="https://avatars.githubusercontent.com/u/875218?v=4&s=48" width="48" height="48" alt="kkarimi" title="kkarimi"/></a> <a href="https://github.com/mahmoudashraf93"><img src="https://avatars.githubusercontent.com/u/9130129?v=4&s=48" width="48" height="48" alt="mahmoudashraf93" title="mahmoudashraf93"/></a> <a href="https://github.com/ngutman"><img src="https://avatars.githubusercontent.com/u/1540134?v=4&s=48" width="48" height="48" alt="ngutman" title="ngutman"/></a> <a href="https://github.com/petter-b"><img src="https://avatars.githubusercontent.com/u/62076402?v=4&s=48" width="48" height="48" alt="petter-b" title="petter-b"/></a> <a href="https://github.com/pkrmf"><img src="https://avatars.githubusercontent.com/u/1714267?v=4&s=48" width="48" height="48" alt="pkrmf" title="pkrmf"/></a> <a href="https://github.com/RandyVentures"><img src="https://avatars.githubusercontent.com/u/149904821?v=4&s=48" width="48" height="48" alt="RandyVentures" title="RandyVentures"/></a> <a href="https://github.com/search?q=Ryan%20Lisse"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ryan Lisse" title="Ryan Lisse"/></a> <a href="https://github.com/dougvk"><img src="https://avatars.githubusercontent.com/u/401660?v=4&s=48" width="48" height="48" alt="dougvk" title="dougvk"/></a>
-  <a href="https://github.com/erikpr1994"><img src="https://avatars.githubusercontent.com/u/6299331?v=4&s=48" width="48" height="48" alt="erikpr1994" title="erikpr1994"/></a> <a href="https://github.com/search?q=Ghost"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ghost" title="Ghost"/></a> <a href="https://github.com/jonasjancarik"><img src="https://avatars.githubusercontent.com/u/2459191?v=4&s=48" width="48" height="48" alt="jonasjancarik" title="jonasjancarik"/></a> <a href="https://github.com/search?q=Keith%20the%20Silly%20Goose"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Keith the Silly Goose" title="Keith the Silly Goose"/></a> <a href="https://github.com/search?q=L36%20Server"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="L36 Server" title="L36 Server"/></a> <a href="https://github.com/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></a> <a href="https://github.com/mitschabaude-bot"><img src="https://avatars.githubusercontent.com/u/247582884?v=4&s=48" width="48" height="48" alt="mitschabaude-bot" title="mitschabaude-bot"/></a> <a href="https://github.com/mkbehr"><img src="https://avatars.githubusercontent.com/u/1285?v=4&s=48" width="48" height="48" alt="mkbehr" title="mkbehr"/></a> <a href="https://github.com/neist"><img src="https://avatars.githubusercontent.com/u/1029724?v=4&s=48" width="48" height="48" alt="neist" title="neist"/></a> <a href="https://github.com/chrisrodz"><img src="https://avatars.githubusercontent.com/u/2967620?v=4&s=48" width="48" height="48" alt="chrisrodz" title="chrisrodz"/></a>
-  <a href="https://github.com/dlauer"><img src="https://avatars.githubusercontent.com/u/757041?v=4&s=48" width="48" height="48" alt="dlauer" title="dlauer"/></a> <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a> <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a> <a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a> <a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a>
-  <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a> <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a> <a href="https://github.com/siddhantjain"><img src="https://avatars.githubusercontent.com/u/4835232?v=4&s=48" width="48" height="48" alt="siddhantjain" title="siddhantjain"/></a> <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a> <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/24601"><img src="https://avatars.githubusercontent.com/u/1157207?v=4&s=48" width="48" height="48" alt="24601" title="24601"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a>
-  <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a> <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a> <a href="https://github.com/humanwritten"><img src="https://avatars.githubusercontent.com/u/206531610?v=4&s=48" width="48" height="48" alt="humanwritten" title="humanwritten"/></a> <a href="https://github.com/larlyssa"><img src="https://avatars.githubusercontent.com/u/13128869?v=4&s=48" width="48" height="48" alt="larlyssa" title="larlyssa"/></a> <a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/aaronveklabs"><img src="https://avatars.githubusercontent.com/u/225997828?v=4&s=48" width="48" height="48" alt="aaronveklabs" title="aaronveklabs"/></a> <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a>
-  <a href="https://github.com/ameno-"><img src="https://avatars.githubusercontent.com/u/2416135?v=4&s=48" width="48" height="48" alt="ameno-" title="ameno-"/></a> <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/search?q=Clawd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Clawd" title="Clawd"/></a> <a href="https://github.com/search?q=ClawdFx"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ClawdFx" title="ClawdFx"/></a> <a href="https://github.com/czekaj"><img src="https://avatars.githubusercontent.com/u/1464539?v=4&s=48" width="48" height="48" alt="czekaj" title="czekaj"/></a> <a href="https://github.com/erik-agens"><img src="https://avatars.githubusercontent.com/u/80908960?v=4&s=48" width="48" height="48" alt="erik-agens" title="erik-agens"/></a> <a href="https://github.com/fcatuhe"><img src="https://avatars.githubusercontent.com/u/17382215?v=4&s=48" width="48" height="48" alt="fcatuhe" title="fcatuhe"/></a> <a href="https://github.com/ivanrvpereira"><img src="https://avatars.githubusercontent.com/u/183991?v=4&s=48" width="48" height="48" alt="ivanrvpereira" title="ivanrvpereira"/></a> <a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jeffersonwarrior"><img src="https://avatars.githubusercontent.com/u/89030989?v=4&s=48" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a>
+  <a href="https://github.com/ysqander"><img src="https://avatars.githubusercontent.com/u/80843820?v=4&s=48" width="48" height="48" alt="ysqander" title="ysqander"/></a> <a href="https://github.com/superman32432432"><img src="https://avatars.githubusercontent.com/u/7228420?v=4&s=48" width="48" height="48" alt="superman32432432" title="superman32432432"/></a> <a href="https://github.com/search?q=Yurii%20Chukhlib"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Yurii Chukhlib" title="Yurii Chukhlib"/></a> <a href="https://github.com/grp06"><img src="https://avatars.githubusercontent.com/u/1573959?v=4&s=48" width="48" height="48" alt="grp06" title="grp06"/></a> <a href="https://github.com/antons"><img src="https://avatars.githubusercontent.com/u/129705?v=4&s=48" width="48" height="48" alt="antons" title="antons"/></a> <a href="https://github.com/austinm911"><img src="https://avatars.githubusercontent.com/u/31991302?v=4&s=48" width="48" height="48" alt="austinm911" title="austinm911"/></a> <a href="https://github.com/apps/blacksmith-sh"><img src="https://avatars.githubusercontent.com/in/807020?v=4&s=48" width="48" height="48" alt="blacksmith-sh[bot]" title="blacksmith-sh[bot]"/></a> <a href="https://github.com/dan-dr"><img src="https://avatars.githubusercontent.com/u/6669808?v=4&s=48" width="48" height="48" alt="dan-dr" title="dan-dr"/></a> <a href="https://github.com/dlauer"><img src="https://avatars.githubusercontent.com/u/757041?v=4&s=48" width="48" height="48" alt="dlauer" title="dlauer"/></a> <a href="https://github.com/HeimdallStrategy"><img src="https://avatars.githubusercontent.com/u/223014405?v=4&s=48" width="48" height="48" alt="HeimdallStrategy" title="HeimdallStrategy"/></a>
+  <a href="https://github.com/imfing"><img src="https://avatars.githubusercontent.com/u/5097752?v=4&s=48" width="48" height="48" alt="imfing" title="imfing"/></a> <a href="https://github.com/jalehman"><img src="https://avatars.githubusercontent.com/u/550978?v=4&s=48" width="48" height="48" alt="jalehman" title="jalehman"/></a> <a href="https://github.com/jarvis-medmatic"><img src="https://avatars.githubusercontent.com/u/252428873?v=4&s=48" width="48" height="48" alt="jarvis-medmatic" title="jarvis-medmatic"/></a> <a href="https://github.com/kkarimi"><img src="https://avatars.githubusercontent.com/u/875218?v=4&s=48" width="48" height="48" alt="kkarimi" title="kkarimi"/></a> <a href="https://github.com/mahmoudashraf93"><img src="https://avatars.githubusercontent.com/u/9130129?v=4&s=48" width="48" height="48" alt="mahmoudashraf93" title="mahmoudashraf93"/></a> <a href="https://github.com/ngutman"><img src="https://avatars.githubusercontent.com/u/1540134?v=4&s=48" width="48" height="48" alt="ngutman" title="ngutman"/></a> <a href="https://github.com/petter-b"><img src="https://avatars.githubusercontent.com/u/62076402?v=4&s=48" width="48" height="48" alt="petter-b" title="petter-b"/></a> <a href="https://github.com/pkrmf"><img src="https://avatars.githubusercontent.com/u/1714267?v=4&s=48" width="48" height="48" alt="pkrmf" title="pkrmf"/></a> <a href="https://github.com/RandyVentures"><img src="https://avatars.githubusercontent.com/u/149904821?v=4&s=48" width="48" height="48" alt="RandyVentures" title="RandyVentures"/></a> <a href="https://github.com/search?q=Ryan%20Lisse"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ryan Lisse" title="Ryan Lisse"/></a>
+  <a href="https://github.com/dougvk"><img src="https://avatars.githubusercontent.com/u/401660?v=4&s=48" width="48" height="48" alt="dougvk" title="dougvk"/></a> <a href="https://github.com/erikpr1994"><img src="https://avatars.githubusercontent.com/u/6299331?v=4&s=48" width="48" height="48" alt="erikpr1994" title="erikpr1994"/></a> <a href="https://github.com/search?q=Ghost"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ghost" title="Ghost"/></a> <a href="https://github.com/jonasjancarik"><img src="https://avatars.githubusercontent.com/u/2459191?v=4&s=48" width="48" height="48" alt="jonasjancarik" title="jonasjancarik"/></a> <a href="https://github.com/search?q=Keith%20the%20Silly%20Goose"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Keith the Silly Goose" title="Keith the Silly Goose"/></a> <a href="https://github.com/search?q=L36%20Server"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="L36 Server" title="L36 Server"/></a> <a href="https://github.com/search?q=Marc"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Marc" title="Marc"/></a> <a href="https://github.com/mitschabaude-bot"><img src="https://avatars.githubusercontent.com/u/247582884?v=4&s=48" width="48" height="48" alt="mitschabaude-bot" title="mitschabaude-bot"/></a> <a href="https://github.com/mkbehr"><img src="https://avatars.githubusercontent.com/u/1285?v=4&s=48" width="48" height="48" alt="mkbehr" title="mkbehr"/></a> <a href="https://github.com/neist"><img src="https://avatars.githubusercontent.com/u/1029724?v=4&s=48" width="48" height="48" alt="neist" title="neist"/></a>
+  <a href="https://github.com/chrisrodz"><img src="https://avatars.githubusercontent.com/u/2967620?v=4&s=48" width="48" height="48" alt="chrisrodz" title="chrisrodz"/></a> <a href="https://github.com/search?q=Friederike%20Seiler"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Friederike Seiler" title="Friederike Seiler"/></a> <a href="https://github.com/gabriel-trigo"><img src="https://avatars.githubusercontent.com/u/38991125?v=4&s=48" width="48" height="48" alt="gabriel-trigo" title="gabriel-trigo"/></a> <a href="https://github.com/Iamadig"><img src="https://avatars.githubusercontent.com/u/102129234?v=4&s=48" width="48" height="48" alt="iamadig" title="iamadig"/></a> <a href="https://github.com/search?q=Kit"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kit" title="Kit"/></a> <a href="https://github.com/koala73"><img src="https://avatars.githubusercontent.com/u/996596?v=4&s=48" width="48" height="48" alt="koala73" title="koala73"/></a> <a href="https://github.com/manmal"><img src="https://avatars.githubusercontent.com/u/142797?v=4&s=48" width="48" height="48" alt="manmal" title="manmal"/></a> <a href="https://github.com/ogulcancelik"><img src="https://avatars.githubusercontent.com/u/7064011?v=4&s=48" width="48" height="48" alt="ogulcancelik" title="ogulcancelik"/></a> <a href="https://github.com/pasogott"><img src="https://avatars.githubusercontent.com/u/23458152?v=4&s=48" width="48" height="48" alt="pasogott" title="pasogott"/></a> <a href="https://github.com/petradonka"><img src="https://avatars.githubusercontent.com/u/7353770?v=4&s=48" width="48" height="48" alt="petradonka" title="petradonka"/></a>
+  <a href="https://github.com/rubyrunsstuff"><img src="https://avatars.githubusercontent.com/u/246602379?v=4&s=48" width="48" height="48" alt="rubyrunsstuff" title="rubyrunsstuff"/></a> <a href="https://github.com/sibbl"><img src="https://avatars.githubusercontent.com/u/866535?v=4&s=48" width="48" height="48" alt="sibbl" title="sibbl"/></a> <a href="https://github.com/siddhantjain"><img src="https://avatars.githubusercontent.com/u/4835232?v=4&s=48" width="48" height="48" alt="siddhantjain" title="siddhantjain"/></a> <a href="https://github.com/suminhthanh"><img src="https://avatars.githubusercontent.com/u/2907636?v=4&s=48" width="48" height="48" alt="suminhthanh" title="suminhthanh"/></a> <a href="https://github.com/VACInc"><img src="https://avatars.githubusercontent.com/u/3279061?v=4&s=48" width="48" height="48" alt="VACInc" title="VACInc"/></a> <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/zats"><img src="https://avatars.githubusercontent.com/u/2688806?v=4&s=48" width="48" height="48" alt="zats" title="zats"/></a> <a href="https://github.com/24601"><img src="https://avatars.githubusercontent.com/u/1157207?v=4&s=48" width="48" height="48" alt="24601" title="24601"/></a> <a href="https://github.com/search?q=Chris%20Taylor"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Chris Taylor" title="Chris Taylor"/></a> <a href="https://github.com/czekaj"><img src="https://avatars.githubusercontent.com/u/1464539?v=4&s=48" width="48" height="48" alt="czekaj" title="czekaj"/></a>
+  <a href="https://github.com/djangonavarro220"><img src="https://avatars.githubusercontent.com/u/251162586?v=4&s=48" width="48" height="48" alt="Django Navarro" title="Django Navarro"/></a> <a href="https://github.com/evalexpr"><img src="https://avatars.githubusercontent.com/u/23485511?v=4&s=48" width="48" height="48" alt="evalexpr" title="evalexpr"/></a> <a href="https://github.com/henrino3"><img src="https://avatars.githubusercontent.com/u/4260288?v=4&s=48" width="48" height="48" alt="henrino3" title="henrino3"/></a> <a href="https://github.com/humanwritten"><img src="https://avatars.githubusercontent.com/u/206531610?v=4&s=48" width="48" height="48" alt="humanwritten" title="humanwritten"/></a> <a href="https://github.com/larlyssa"><img src="https://avatars.githubusercontent.com/u/13128869?v=4&s=48" width="48" height="48" alt="larlyssa" title="larlyssa"/></a> <a href="https://github.com/oswalpalash"><img src="https://avatars.githubusercontent.com/u/6431196?v=4&s=48" width="48" height="48" alt="oswalpalash" title="oswalpalash"/></a> <a href="https://github.com/pcty-nextgen-service-account"><img src="https://avatars.githubusercontent.com/u/112553441?v=4&s=48" width="48" height="48" alt="pcty-nextgen-service-account" title="pcty-nextgen-service-account"/></a> <a href="https://github.com/Syhids"><img src="https://avatars.githubusercontent.com/u/671202?v=4&s=48" width="48" height="48" alt="Syhids" title="Syhids"/></a> <a href="https://github.com/search?q=Aaron%20Konyer"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Aaron Konyer" title="Aaron Konyer"/></a> <a href="https://github.com/aaronveklabs"><img src="https://avatars.githubusercontent.com/u/225997828?v=4&s=48" width="48" height="48" alt="aaronveklabs" title="aaronveklabs"/></a>
+  <a href="https://github.com/adam91holt"><img src="https://avatars.githubusercontent.com/u/9592417?v=4&s=48" width="48" height="48" alt="adam91holt" title="adam91holt"/></a> <a href="https://github.com/ameno-"><img src="https://avatars.githubusercontent.com/u/2416135?v=4&s=48" width="48" height="48" alt="ameno-" title="ameno-"/></a> <a href="https://github.com/cash-echo-bot"><img src="https://avatars.githubusercontent.com/u/252747386?v=4&s=48" width="48" height="48" alt="cash-echo-bot" title="cash-echo-bot"/></a> <a href="https://github.com/search?q=Clawd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Clawd" title="Clawd"/></a> <a href="https://github.com/search?q=ClawdFx"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ClawdFx" title="ClawdFx"/></a> <a href="https://github.com/erik-agens"><img src="https://avatars.githubusercontent.com/u/80908960?v=4&s=48" width="48" height="48" alt="erik-agens" title="erik-agens"/></a> <a href="https://github.com/fcatuhe"><img src="https://avatars.githubusercontent.com/u/17382215?v=4&s=48" width="48" height="48" alt="fcatuhe" title="fcatuhe"/></a> <a href="https://github.com/ivanrvpereira"><img src="https://avatars.githubusercontent.com/u/183991?v=4&s=48" width="48" height="48" alt="ivanrvpereira" title="ivanrvpereira"/></a> <a href="https://github.com/jayhickey"><img src="https://avatars.githubusercontent.com/u/1676460?v=4&s=48" width="48" height="48" alt="jayhickey" title="jayhickey"/></a> <a href="https://github.com/jeffersonwarrior"><img src="https://avatars.githubusercontent.com/u/89030989?v=4&s=48" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a>
   <a href="https://github.com/search?q=jeffersonwarrior"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="jeffersonwarrior" title="jeffersonwarrior"/></a> <a href="https://github.com/jdrhyne"><img src="https://avatars.githubusercontent.com/u/7828464?v=4&s=48" width="48" height="48" alt="Jonathan D. Rhyne (DJ-D)" title="Jonathan D. Rhyne (DJ-D)"/></a> <a href="https://github.com/jverdi"><img src="https://avatars.githubusercontent.com/u/345050?v=4&s=48" width="48" height="48" alt="jverdi" title="jverdi"/></a> <a href="https://github.com/longmaba"><img src="https://avatars.githubusercontent.com/u/9361500?v=4&s=48" width="48" height="48" alt="longmaba" title="longmaba"/></a> <a href="https://github.com/mickahouan"><img src="https://avatars.githubusercontent.com/u/31423109?v=4&s=48" width="48" height="48" alt="mickahouan" title="mickahouan"/></a> <a href="https://github.com/mjrussell"><img src="https://avatars.githubusercontent.com/u/1641895?v=4&s=48" width="48" height="48" alt="mjrussell" title="mjrussell"/></a> <a href="https://github.com/p6l-richard"><img src="https://avatars.githubusercontent.com/u/18185649?v=4&s=48" width="48" height="48" alt="p6l-richard" title="p6l-richard"/></a> <a href="https://github.com/philipp-spiess"><img src="https://avatars.githubusercontent.com/u/458591?v=4&s=48" width="48" height="48" alt="philipp-spiess" title="philipp-spiess"/></a> <a href="https://github.com/robaxelsen"><img src="https://avatars.githubusercontent.com/u/13132899?v=4&s=48" width="48" height="48" alt="robaxelsen" title="robaxelsen"/></a> <a href="https://github.com/search?q=Sash%20Catanzarite"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Sash Catanzarite" title="Sash Catanzarite"/></a>
-  <a href="https://github.com/T5-AndyML"><img src="https://avatars.githubusercontent.com/u/22801233?v=4&s=48" width="48" height="48" alt="T5-AndyML" title="T5-AndyML"/></a> <a href="https://github.com/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></a> <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/andrewting19"><img src="https://avatars.githubusercontent.com/u/10536704?v=4&s=48" width="48" height="48" alt="andrewting19" title="andrewting19"/></a> <a href="https://github.com/search?q=Andrii"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Andrii" title="Andrii"/></a> <a href="https://github.com/anpoirier"><img src="https://avatars.githubusercontent.com/u/1245729?v=4&s=48" width="48" height="48" alt="anpoirier" title="anpoirier"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a> <a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a> <a href="https://github.com/conhecendoia"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendoia" title="conhecendoia"/></a>
-  <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a> <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/search?q=Felix%20Krause"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Felix Krause" title="Felix Krause"/></a> <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a> <a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a> <a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a>
-  <a href="https://github.com/search?q=Kevin%20Lin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kevin Lin" title="Kevin Lin"/></a> <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a> <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a> <a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a>
-  <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a> <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/odysseus0"><img src="https://avatars.githubusercontent.com/u/8635094?v=4&s=48" width="48" height="48" alt="odysseus0" title="odysseus0"/></a> <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/ptn1411"><img src="https://avatars.githubusercontent.com/u/57529765?v=4&s=48" width="48" height="48" alt="ptn1411" title="ptn1411"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a> <a href="https://github.com/rodrigouroz"><img src="https://avatars.githubusercontent.com/u/384037?v=4&s=48" width="48" height="48" alt="rodrigouroz" title="rodrigouroz"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a>
-  <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a> <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a> <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a> <a href="https://github.com/search?q=Vultr-Clawd%20Admin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Vultr-Clawd Admin" title="Vultr-Clawd Admin"/></a> <a href="https://github.com/search?q=Wimmie"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Wimmie" title="Wimmie"/></a> <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a>
-  <a href="https://github.com/yazinsai"><img src="https://avatars.githubusercontent.com/u/1846034?v=4&s=48" width="48" height="48" alt="yazinsai" title="yazinsai"/></a> <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a> <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a>
-  <a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a> <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
+  <a href="https://github.com/T5-AndyML"><img src="https://avatars.githubusercontent.com/u/22801233?v=4&s=48" width="48" height="48" alt="T5-AndyML" title="T5-AndyML"/></a> <a href="https://github.com/search?q=VAC"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="VAC" title="VAC"/></a> <a href="https://github.com/zknicker"><img src="https://avatars.githubusercontent.com/u/1164085?v=4&s=48" width="48" height="48" alt="zknicker" title="zknicker"/></a> <a href="https://github.com/aj47"><img src="https://avatars.githubusercontent.com/u/8023513?v=4&s=48" width="48" height="48" alt="aj47" title="aj47"/></a> <a href="https://github.com/search?q=alejandro%20maza"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="alejandro maza" title="alejandro maza"/></a> <a href="https://github.com/andrewting19"><img src="https://avatars.githubusercontent.com/u/10536704?v=4&s=48" width="48" height="48" alt="andrewting19" title="andrewting19"/></a> <a href="https://github.com/search?q=Andrii"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Andrii" title="Andrii"/></a> <a href="https://github.com/anpoirier"><img src="https://avatars.githubusercontent.com/u/1245729?v=4&s=48" width="48" height="48" alt="anpoirier" title="anpoirier"/></a> <a href="https://github.com/Asleep123"><img src="https://avatars.githubusercontent.com/u/122379135?v=4&s=48" width="48" height="48" alt="Asleep123" title="Asleep123"/></a> <a href="https://github.com/bolismauro"><img src="https://avatars.githubusercontent.com/u/771999?v=4&s=48" width="48" height="48" alt="bolismauro" title="bolismauro"/></a>
+  <a href="https://github.com/conhecendoia"><img src="https://avatars.githubusercontent.com/u/82890727?v=4&s=48" width="48" height="48" alt="conhecendoia" title="conhecendoia"/></a> <a href="https://github.com/search?q=Dimitrios%20Ploutarchos"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Dimitrios Ploutarchos" title="Dimitrios Ploutarchos"/></a> <a href="https://github.com/search?q=Drake%20Thomsen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Drake Thomsen" title="Drake Thomsen"/></a> <a href="https://github.com/search?q=Felix%20Krause"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Felix Krause" title="Felix Krause"/></a> <a href="https://github.com/gtsifrikas"><img src="https://avatars.githubusercontent.com/u/8904378?v=4&s=48" width="48" height="48" alt="gtsifrikas" title="gtsifrikas"/></a> <a href="https://github.com/HazAT"><img src="https://avatars.githubusercontent.com/u/363802?v=4&s=48" width="48" height="48" alt="HazAT" title="HazAT"/></a> <a href="https://github.com/hrdwdmrbl"><img src="https://avatars.githubusercontent.com/u/554881?v=4&s=48" width="48" height="48" alt="hrdwdmrbl" title="hrdwdmrbl"/></a> <a href="https://github.com/hugobarauna"><img src="https://avatars.githubusercontent.com/u/2719?v=4&s=48" width="48" height="48" alt="hugobarauna" title="hugobarauna"/></a> <a href="https://github.com/search?q=Jamie%20Openshaw"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jamie Openshaw" title="Jamie Openshaw"/></a> <a href="https://github.com/search?q=Jarvis"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jarvis" title="Jarvis"/></a>
+  <a href="https://github.com/search?q=Jefferson%20Nunn"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Jefferson Nunn" title="Jefferson Nunn"/></a> <a href="https://github.com/search?q=Kevin%20Lin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Kevin Lin" title="Kevin Lin"/></a> <a href="https://github.com/kitze"><img src="https://avatars.githubusercontent.com/u/1160594?v=4&s=48" width="48" height="48" alt="kitze" title="kitze"/></a> <a href="https://github.com/levifig"><img src="https://avatars.githubusercontent.com/u/1605?v=4&s=48" width="48" height="48" alt="levifig" title="levifig"/></a> <a href="https://github.com/search?q=Lloyd"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Lloyd" title="Lloyd"/></a> <a href="https://github.com/loukotal"><img src="https://avatars.githubusercontent.com/u/18210858?v=4&s=48" width="48" height="48" alt="loukotal" title="loukotal"/></a> <a href="https://github.com/martinpucik"><img src="https://avatars.githubusercontent.com/u/5503097?v=4&s=48" width="48" height="48" alt="martinpucik" title="martinpucik"/></a> <a href="https://github.com/search?q=Miles"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Miles" title="Miles"/></a> <a href="https://github.com/mrdbstn"><img src="https://avatars.githubusercontent.com/u/58957632?v=4&s=48" width="48" height="48" alt="mrdbstn" title="mrdbstn"/></a> <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a>
+  <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a> <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a> <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/odysseus0"><img src="https://avatars.githubusercontent.com/u/8635094?v=4&s=48" width="48" height="48" alt="odysseus0" title="odysseus0"/></a> <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/ptn1411"><img src="https://avatars.githubusercontent.com/u/57529765?v=4&s=48" width="48" height="48" alt="ptn1411" title="ptn1411"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a> <a href="https://github.com/robbyczgw-cla"><img src="https://avatars.githubusercontent.com/u/239660374?v=4&s=48" width="48" height="48" alt="robbyczgw-cla" title="robbyczgw-cla"/></a> <a href="https://github.com/rodrigouroz"><img src="https://avatars.githubusercontent.com/u/384037?v=4&s=48" width="48" height="48" alt="rodrigouroz" title="rodrigouroz"/></a>
+  <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a> <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a> <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a> <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=Ubuntu"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Ubuntu" title="Ubuntu"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a> <a href="https://github.com/search?q=Vultr-Clawd%20Admin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Vultr-Clawd Admin" title="Vultr-Clawd Admin"/></a>
+  <a href="https://github.com/search?q=Wimmie"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Wimmie" title="Wimmie"/></a> <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/yazinsai"><img src="https://avatars.githubusercontent.com/u/1846034?v=4&s=48" width="48" height="48" alt="yazinsai" title="yazinsai"/></a> <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a> <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a>
+  <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a> <a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a> <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
 </p>