diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1eba08595a4..6983b27cc6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,21 +4,27 @@ Docs: https://docs.openclaw.ai
## Unreleased
+### Security
+
+- Gateway/WebSocket: enforce browser origin validation for all browser-originated connections regardless of whether proxy headers are present, closing a cross-site WebSocket hijacking path in `trusted-proxy` mode that could grant untrusted origins `operator.admin` access. (GHSA-5wcw-8jjv-m286)
+
### Changes
-- Gateway/node pending work: add narrow in-memory pending-work queue primitives (`node.pending.enqueue` / `node.pending.drain`) and wake-helper reuse as a foundation for dormant-node work delivery. (#41409) Thanks @mbelinky.
-- Git/runtime state: ignore the gateway-generated `.dev-state` file so local runtime state does not show up as untracked repo noise. (#41848) Thanks @smysle.
-- ACP/sessions_spawn: add optional `resumeSessionId` for `runtime: "acp"` so spawned ACP sessions can resume an existing ACPX/Codex conversation instead of always starting fresh. (#41847) Thanks @pejmanjohn.
-- Exec/child commands: mark child command environments with `OPENCLAW_CLI` so subprocesses can detect when they were launched from the OpenClaw CLI. (#41411) Thanks @vincentkoc.
+- OpenRouter/models: add temporary Hunter Alpha and Healer Alpha entries to the built-in catalog so OpenRouter users can try the new free stealth models during their roughly one-week availability window. (#43642) Thanks @ping-Toven.
- iOS/Home canvas: add a bundled welcome screen with a live agent overview that refreshes on connect, reconnect, and foreground return, and move the compact connection pill off the top-left canvas overlay. (#42456) Thanks @ngutman.
- iOS/Home canvas: replace floating controls with a docked toolbar, make the bundled home scaffold adapt to smaller phones, and open chat in the resolved main session instead of a synthetic `ios` session. (#42456) Thanks @ngutman.
-- Memory/Gemini: add `gemini-embedding-2-preview` memory-search support with configurable output dimensions and automatic reindexing when the configured dimensions change. (#42501) Thanks @BillChirico and @gumadeiras.
-- Discord/auto threads: add `autoArchiveDuration` channel config for auto-created threads so Discord thread archiving can stay at 1 hour, 1 day, 3 days, or 1 week instead of always using the 1-hour default. (#35065) Thanks @davidguttman.
-- OpenCode/onboarding: add new OpenCode Go provider, treat Zen and Go as one OpenCode setup in the wizard/docs while keeping the runtime providers split, store one shared OpenCode key for both profiles, and stop overriding the built-in `opencode-go` catalog routing. (#42313) Thanks @ImLukeF and @vincentkoc.
- macOS/chat UI: add a chat model picker, persist explicit thinking-level selections across relaunch, and harden provider-aware session model sync for the shared chat composer. (#42314) Thanks @ImLukeF.
-- iOS/TestFlight: add a local beta release flow with Fastlane prepare/archive/upload support, canonical beta bundle IDs, and watch-app archive fixes. (#42991) Thanks @ngutman.
-- macOS/onboarding: detect when remote gateways need a shared auth token, explain where to find it on the gateway host, and clarify when a successful check used paired-device auth instead. (#43100) Thanks @ngutman.
- Onboarding/Ollama: add first-class Ollama setup with Local or Cloud + Local modes, browser-based cloud sign-in, curated model suggestions, and cloud-model handling that skips unnecessary local pulls. (#41529) Thanks @BruceMacD.
+- OpenCode/onboarding: add new OpenCode Go provider, treat Zen and Go as one OpenCode setup in the wizard/docs while keeping the runtime providers split, store one shared OpenCode key for both profiles, and stop overriding the built-in `opencode-go` catalog routing. (#42313) Thanks @ImLukeF and @vincentkoc.
+- Memory: add opt-in multimodal image and audio indexing for `memorySearch.extraPaths` with Gemini `gemini-embedding-2-preview`, strict fallback gating, and scope-based reindexing. (#43460) Thanks @gumadeiras.
+- Memory/Gemini: add `gemini-embedding-2-preview` memory-search support with configurable output dimensions and automatic reindexing when the configured dimensions change. (#42501) Thanks @BillChirico and @gumadeiras.
+- macOS/onboarding: detect when remote gateways need a shared auth token, explain where to find it on the gateway host, and clarify when a successful check used paired-device auth instead. (#43100) Thanks @ngutman.
+- Discord/auto threads: add `autoArchiveDuration` channel config for auto-created threads so Discord thread archiving can stay at 1 hour, 1 day, 3 days, or 1 week instead of always using the 1-hour default. (#35065) Thanks @davidguttman.
+- iOS/TestFlight: add a local beta release flow with Fastlane prepare/archive/upload support, canonical beta bundle IDs, and watch-app archive fixes. (#42991) Thanks @ngutman.
+- ACP/sessions_spawn: add optional `resumeSessionId` for `runtime: "acp"` so spawned ACP sessions can resume an existing ACPX/Codex conversation instead of always starting fresh. (#41847) Thanks @pejmanjohn.
+- Gateway/node pending work: add narrow in-memory pending-work queue primitives (`node.pending.enqueue` / `node.pending.drain`) and wake-helper reuse as a foundation for dormant-node work delivery. (#41409) Thanks @mbelinky.
+- Git/runtime state: ignore the gateway-generated `.dev-state` file so local runtime state does not show up as untracked repo noise. (#41848) Thanks @smysle.
+- Exec/child commands: mark child command environments with `OPENCLAW_CLI` so subprocesses can detect when they were launched from the OpenClaw CLI. (#41411) Thanks @vincentkoc.
### Breaking
@@ -27,87 +33,97 @@ Docs: https://docs.openclaw.ai
### Fixes
- Agents/text sanitization: strip leaked model control tokens (`<|...|>` and full-width `<｜...｜>` variants) from user-facing assistant text, preventing GLM-5 and DeepSeek internal delimiters from reaching end users. (#42173) Thanks @imwyvern.
-- Resolve web tool SecretRefs atomically at runtime. (#41599) Thanks @joshavant.
-- Feishu/local image auto-convert: pass `mediaLocalRoots` through the `sendText` local-image shim so allowed local image paths upload as Feishu images again instead of falling back to raw path text. (#40623) Thanks @ayanesakura.
-- ACP/ACPX plugin: bump the bundled `acpx` pin to `0.1.16` so plugin-local installs and strict version checks match the latest published CLI. (#41975) Thanks @dutifulbob.
-- macOS/LaunchAgent install: tighten LaunchAgent directory and plist permissions during install so launchd bootstrap does not fail when the target home path or generated plist inherited group/world-writable modes.
+- iOS/gateway foreground recovery: reconnect immediately on foreground return after stale background sockets are torn down, so the app no longer stays disconnected until a later wake path happens. (#41384) Thanks @mbelinky.
- Gateway/Control UI: keep dashboard auth tokens in session-scoped browser storage so same-tab refreshes preserve remote token auth without restoring long-lived localStorage token persistence, while scoping tokens to the selected gateway URL and fragment-only bootstrap flow. (#40892) thanks @velvet-shark.
+- Gateway/macOS launchd restarts: keep the LaunchAgent registered during explicit restarts, hand off self-restarts through a detached launchd helper, and recover config/hot reload restart paths without unloading the service. Fixes #43311, #43406, #43035, and #43049.
+- macOS/LaunchAgent install: tighten LaunchAgent directory and plist permissions during install so launchd bootstrap does not fail when the target home path or generated plist inherited group/world-writable modes.
+- Discord/reply chunking: resolve the effective `maxLinesPerMessage` config across live reply paths and preserve `chunkMode` in the fast send path so long Discord replies no longer split unexpectedly at the default 17-line limit. (#40133) thanks @rbutera.
+- Feishu/local image auto-convert: pass `mediaLocalRoots` through the `sendText` local-image shim so allowed local image paths upload as Feishu images again instead of falling back to raw path text. (#40623) Thanks @ayanesakura.
+- Models/Kimi Coding: send `anthropic-messages` tools in native Anthropic format again so `kimi-coding` stops degrading tool calls into XML/plain-text pseudo invocations instead of real `tool_use` blocks. (#38669, #39907, #40552) Thanks @opriz.
+- Telegram/outbound HTML sends: chunk long HTML-mode messages, preserve plain-text fallback and silent-delivery params across retries, and cut over to plain text when HTML chunk planning cannot safely preserve the full message. (#42240) thanks @obviyus.
+- Telegram/final preview delivery: split active preview lifecycle from cleanup retention so missing archived preview edits avoid duplicate fallback sends without clearing the live preview or blocking later in-place finalization. (#41662) thanks @hougangdev.
+- Telegram/final preview delivery followup: keep ambiguous missing-`message_id` finals only when a preview was already visible, while first-preview/no-id cases still fall back so Telegram users do not lose the final reply. (#41932) thanks @hougangdev.
+- Telegram/final preview cleanup follow-up: clear stale cleanup-retain state only for transient preview finals so archived-preview retains no longer leave a stale partial bubble beside a later fallback-sent final. (#41763) Thanks @obviyus.
+- Gateway/auth: allow one trusted device-token retry on shared-token mismatch with recovery hints to prevent reconnect churn during token drift. (#42507) Thanks @joshavant.
+- Gateway/config errors: surface up to three validation issues in top-level `config.set`, `config.patch`, and `config.apply` error messages while preserving structured issue details. (#42664) Thanks @huntharo.
+- Agents/Azure OpenAI Responses: include the `azure-openai` provider in the Responses API store override so Azure OpenAI multi-turn cron jobs and embedded agent runs no longer fail with HTTP 400 "store is set to false". (#42934, fixes #42800) Thanks @ademczuk.
+- Agents/error rendering: ignore stale assistant `errorMessage` fields on successful turns so background/tool-side failures no longer prepend synthetic billing errors over valid replies. (#40616) Thanks @ingyukoh.
+- Agents/billing recovery: probe single-provider billing cooldowns on the existing throttle so topping up credits can recover without a manual gateway restart. (#41422) thanks @altaywtf.
+- Agents/fallback: treat HTTP 499 responses as transient in both raw-text and structured failover paths so Anthropic-style client-closed overload responses trigger model fallback reliably. (#41468) thanks @zeroasterisk.
+- Agents/fallback: recognize Venice `402 Insufficient USD or Diem balance` billing errors so configured model fallbacks trigger instead of surfacing the raw provider error. (#43205) Thanks @Squabble9.
+- Agents/fallback: recognize Poe `402 You've used up your points!` billing errors so configured model fallbacks trigger instead of surfacing the raw provider error. (#42278) Thanks @CryUshio.
+- Agents/failover: treat Gemini `MALFORMED_RESPONSE` stop reasons as retryable timeouts so preview-model enum drift falls back cleanly instead of crashing the run, without also reclassifying malformed function-call errors. (#42292) Thanks @jnMetaCode.
+- Agents/cooldowns: default cooldown windows with no recorded failure history to `unknown` instead of `rate_limit`, avoiding false API rate-limit warnings while preserving cooldown recovery probes. (#42911) Thanks @VibhorGautam.
+- Auth/cooldowns: reset expired auth-profile cooldown error counters before computing the next backoff so stale on-disk counters do not re-escalate into long cooldown loops after expiry. (#41028) thanks @zerone0x.
+- Agents/memory flush: forward `memoryFlushWritePath` through `runEmbeddedPiAgent` so memory-triggered flush turns keep the append-only write guard without aborting before tool setup. Follows up on #38574. (#41761) Thanks @frankekn.
+- Agents/context pruning: prune image-only tool results during soft-trim, align context-pruning coverage with the new tool-result contract, and extend historical image cleanup to the same screenshot-heavy session path. (#43045) Thanks @MoerAI.
+- Sessions/reset model recompute: clear stale runtime model, context-token, and system-prompt metadata before session resets recompute the replacement session, so resets pick up current defaults and explicit overrides instead of reusing old runtime model state. (#41173) thanks @PonyX-lab.
+- Channels/allowlists: remove stale matcher caching so same-array allowlist edits and wildcard replacements take effect immediately, with regression coverage for in-place mutation cases.
+- Discord/Telegram outbound runtime config: thread runtime-resolved config through Discord and Telegram send paths so SecretRef-based credentials stay resolved during message delivery. (#42352) Thanks @joshavant.
+- Tools/web search: treat Brave `llm-context` grounding snippets as plain strings so `web_search` no longer returns empty snippet arrays in LLM Context mode. (#41387) thanks @zheliu2.
+- Tools/web search: recover OpenRouter Perplexity citation extraction from `message.annotations` when chat-completions responses omit top-level citations. (#40881) Thanks @laurieluo.
+- CLI/skills JSON: strip ANSI and C1 control bytes from `skills list --json`, `skills info --json`, and `skills check --json` so machine-readable output stays valid for terminals and skill metadata with embedded control characters. Fixes #27530. Related #27557. Thanks @Jimmy-xuzimo and @vincentkoc.
+- CLI/tables: default shared tables to ASCII borders on legacy Windows consoles while keeping Unicode borders on modern Windows terminals, so commands like `openclaw skills` stop rendering mojibake under GBK/936 consoles. Fixes #40853. Related #41015. Thanks @ApacheBin and @vincentkoc.
+- CLI/memory teardown: close cached memory search/index managers in the one-shot CLI shutdown path so watcher-backed memory caches no longer keep completed CLI runs alive after output finishes. (#40389) thanks @Julbarth.
+- Control UI/Sessions: restore single-column session table collapse on narrow viewport or container widths by moving the responsive table override next to the base grid rule and enabling inline-size container queries. (#12175) Thanks @benjipeng.
+- Telegram/network env-proxy: apply configured transport policy to proxied HTTPS dispatchers as well as direct `NO_PROXY` bypasses, so resolver-scoped IPv4 fallback and network settings work consistently for env-proxied Telegram traffic. (#40740) Thanks @sircrumpet.
+- Mattermost/Markdown formatting: preserve first-line indentation when stripping bot mentions so nested list items and indented code blocks keep their structure, and render Mattermost tables natively by default instead of fenced-code fallback. (#18655) thanks @echo931.
+- Mattermost/plugin send actions: normalize direct `replyTo` fallback handling so threaded plugin sends trim blank IDs and reuse the correct reply target again. (#41176) Thanks @hnykda.
+- MS Teams/allowlist resolution: use the General channel conversation ID as the resolved team key (with Graph GUID fallback) so Bot Framework runtime `channelData.team.id` matching works for team and team/channel allowlist entries. (#41838) Thanks @BradGroux.
+- Signal/config schema: accept `channels.signal.accountUuid` in strict config validation so loop-protection configs no longer fail with an unrecognized-key error. (#35578) Thanks @ingyukoh.
+- Telegram/config schema: accept `channels.telegram.actions.editMessage` and `createForumTopic` in strict config validation so existing Telegram action toggles no longer fail as unrecognized keys. (#35498) Thanks @ingyukoh.
+- Telegram/docs: clarify that `channels.telegram.groups` allowlists chats while `groupAllowFrom` allowlists users inside those chats, and point invalid negative chat IDs at the right config key. (#42451) Thanks @altaywtf.
+- Discord/config typing: expose channel-level `autoThread` on the canonical guild-channel config type so strict config loading matches the existing Discord schema and runtime behavior. (#35608) Thanks @ingyukoh.
+- fix(models): guard optional model.input capability checks (#42096) thanks @andyliu
+- Models/Alibaba Cloud Model Studio: wire `MODELSTUDIO_API_KEY` through shared env auth, implicit provider discovery, and shell-env fallback so onboarding works outside the wizard too. (#40634) Thanks @pomelo-nwu.
+- Resolve web tool SecretRefs atomically at runtime. (#41599) Thanks @joshavant.
- Secret files: harden CLI and channel credential file reads against path-swap races by requiring direct regular files for `*File` secret inputs and rejecting symlink-backed secret files.
- Archive extraction: harden TAR and external `tar.bz2` installs against destination symlink and pre-existing child-symlink escapes by extracting into staging first and merging into the canonical destination with safe file opens.
-- Models/Kimi Coding: send `anthropic-messages` tools in native Anthropic format again so `kimi-coding` stops degrading tool calls into XML/plain-text pseudo invocations instead of real `tool_use` blocks. (#38669, #39907, #40552) Thanks @opriz.
-- Context engine/tests: add bundled-registry regression coverage for cross-chunk resolution, plugin-sdk re-exports, and concurrent chunk registration. (#40460) thanks @dsantoreis.
-- Agents/embedded runner: bound compaction retry waiting and drain embedded runs during SIGUSR1 restart so session lanes recover instead of staying blocked behind compaction. (#40324) thanks @cgdusek.
+- Secrets/SecretRef: reject exec SecretRef traversal ids across schema, runtime, and gateway. (#42370) Thanks @joshavant.
+- Sandbox/fs bridge: pin staged writes to verified parent directories so temporary write files cannot materialize outside the allowed mount before atomic replace. Thanks @tdjackey.
+- Gateway/auth: fail closed when local `gateway.auth.*` SecretRefs are configured but unavailable, instead of silently falling back to `gateway.remote.*` credentials in local mode. (#42672) Thanks @joshavant.
+- Commands/config writes: enforce `configWrites` against both the originating account and the targeted account scope for `/config` and config-backed `/allowlist` edits, blocking sibling-account mutations while preserving gateway `operator.admin` flows. Thanks @tdjackey for reporting.
+- Security/system.run: fail closed for approval-backed interpreter/runtime commands when OpenClaw cannot bind exactly one concrete local file operand, while extending best-effort direct-file binding to additional runtime forms. Thanks @tdjackey for reporting.
+- Gateway/session reset auth: split conversation `/new` and `/reset` handling away from the admin-only `sessions.reset` control-plane RPC so write-scoped gateway callers can no longer reach the privileged reset path through `agent`. Thanks @tdjackey for reporting.
+- Security/plugin runtime: stop unauthenticated plugin HTTP routes from inheriting synthetic admin gateway scopes when they call `runtime.subagent.*`, so admin-only methods like `sessions.delete` stay blocked without gateway auth.
+- Security/session_status: enforce sandbox session-tree visibility and shared agent-to-agent access guards before reading or mutating target session state, so sandboxed subagents can no longer inspect parent session metadata or write parent model overrides via `session_status`.
+- Security/nodes: treat the `nodes` agent tool as owner-only fallback policy so non-owner senders cannot reach paired-node approval or invoke paths through the shared tool set.
+- Security/external content: treat whitespace-delimited `EXTERNAL UNTRUSTED CONTENT` boundary markers like underscore-delimited variants so prompt wrappers cannot bypass marker sanitization. (#35983) Thanks @urianpaul94.
+- Telegram/exec approvals: reject `/approve` commands aimed at other bots, keep deterministic approval prompts visible when tool-result delivery fails, and stop resolved exact IDs from matching other pending approvals by prefix. (#37233) Thanks @huntharo.
+- Subagents/authority: persist leaf vs orchestrator control scope at spawn time and route tool plus slash-command control through shared ownership checks, so leaf sessions cannot regain orchestration privileges after restore or flat-key lookups. Thanks @tdjackey.
+- ACP/ACPX plugin: bump the bundled `acpx` pin to `0.1.16` so plugin-local installs and strict version checks match the latest published CLI. (#41975) Thanks @dutifulbob.
- ACP/sessions.patch: allow `spawnedBy` and `spawnDepth` lineage fields on ACP session keys so `sessions_spawn` with `runtime: "acp"` no longer fails during child-session setup. Fixes #40971. (#40995) thanks @xaeon2026.
- ACP/stop reason mapping: resolve gateway chat `state: "error"` completions as ACP `end_turn` instead of `refusal` so transient backend failures are not surfaced as deliberate refusals. (#41187) thanks @pejmanjohn.
- ACP/setSessionMode: propagate gateway `sessions.patch` failures back to ACP clients so rejected mode changes no longer return silent success. (#41185) thanks @pejmanjohn.
-- Agents/embedded logs: add structured, sanitized lifecycle and failover observation events so overload and provider failures are easier to tail and filter. (#41336) thanks @altaywtf.
-- iOS/gateway foreground recovery: reconnect immediately on foreground return after stale background sockets are torn down, so the app no longer stays disconnected until a later wake path happens. (#41384) Thanks @mbelinky.
-- Cron/subagent followup: do not misclassify empty or `NO_REPLY` cron responses as interim acknowledgements that need a rerun, so deliberately silent cron jobs are no longer retried. (#41383) thanks @jackal092927.
-- Auth/cooldowns: reset expired auth-profile cooldown error counters before computing the next backoff so stale on-disk counters do not re-escalate into long cooldown loops after expiry. (#41028) thanks @zerone0x.
-- Gateway/node pending drain followup: keep `hasMore` true when the deferred baseline status item still needs delivery, and avoid allocating empty pending-work state for drain-only nodes with no queued work. (#41429) Thanks @mbelinky.
- ACP/bridge mode: reject unsupported per-session MCP server setup and propagate rejected session-mode changes so IDE clients see explicit bridge limitations instead of silent success. (#41424) Thanks @mbelinky.
- ACP/session UX: replay stored user and assistant text on `loadSession`, expose Gateway-backed session controls and metadata, and emit approximate session usage updates so IDE clients restore context more faithfully. (#41425) Thanks @mbelinky.
- ACP/tool streaming: enrich `tool_call` and `tool_call_update` events with best-effort text content and file-location hints so IDE clients can follow bridge tool activity more naturally. (#41442) Thanks @mbelinky.
- ACP/runtime attachments: forward normalized inbound image attachments into ACP runtime turns so ACPX sessions can preserve image prompt content on the runtime path. (#41427) Thanks @mbelinky.
- ACP/regressions: add gateway RPC coverage for ACP lineage patching, ACPX runtime coverage for image prompt serialization, and an operator smoke-test procedure for live ACP spawn verification. (#41456) Thanks @mbelinky.
-- Agents/billing recovery: probe single-provider billing cooldowns on the existing throttle so topping up credits can recover without a manual gateway restart. (#41422) thanks @altaywtf.
- ACP/follow-up hardening: make session restore and prompt completion degrade gracefully on transcript/update failures, enforce bounded tool-location traversal, and skip non-image ACPX turns the runtime cannot serialize. (#41464) Thanks @mbelinky.
-- Agents/fallback observability: add structured, sanitized model-fallback decision and auth-profile failure-state events with correlated run IDs so cooldown probes and failover paths are easier to trace in logs. (#41337) thanks @altaywtf.
-- Protocol/Swift model sync: regenerate pending node work Swift bindings after the landed `node.pending.*` schema additions so generated protocol artifacts are consistent again. (#41477) Thanks @mbelinky.
-- Discord/reply chunking: resolve the effective `maxLinesPerMessage` config across live reply paths and preserve `chunkMode` in the fast send path so long Discord replies no longer split unexpectedly at the default 17-line limit. (#40133) thanks @rbutera.
-- Logging/probe observations: suppress structured embedded and model-fallback probe warnings on the console without hiding error or fatal output. (#41338) thanks @altaywtf.
-- Agents/fallback: treat HTTP 499 responses as transient in both raw-text and structured failover paths so Anthropic-style client-closed overload responses trigger model fallback reliably. (#41468) thanks @zeroasterisk.
+- ACP/sessions_spawn: implicitly stream `mode="run"` ACP spawns to parent only for eligible subagent orchestrator sessions (heartbeat `target: "last"` with a usable session-local route), restoring parent progress relays without thread binding. (#42404) Thanks @davidguttman.
+- ACP/main session aliases: canonicalize `main` before ACP session lookup so restarted ACP main sessions rehydrate instead of failing closed with `Session is not ACP-enabled: main`. (#43285, fixes #25692)
- Plugins/context-engine model auth: expose `runtime.modelAuth` and plugin-sdk auth helpers so plugins can resolve provider/model API keys through the normal auth pipeline. (#41090) thanks @xinhuagu.
-- CLI/memory teardown: close cached memory search/index managers in the one-shot CLI shutdown path so watcher-backed memory caches no longer keep completed CLI runs alive after output finishes. (#40389) thanks @Julbarth.
-- Tools/web search: treat Brave `llm-context` grounding snippets as plain strings so `web_search` no longer returns empty snippet arrays in LLM Context mode. (#41387) thanks @zheliu2.
-- Telegram/exec approvals: reject `/approve` commands aimed at other bots, keep deterministic approval prompts visible when tool-result delivery fails, and stop resolved exact IDs from matching other pending approvals by prefix. (#37233) Thanks @huntharo.
-- Control UI/Sessions: restore single-column session table collapse on narrow viewport or container widths by moving the responsive table override next to the base grid rule and enabling inline-size container queries. (#12175) Thanks @benjipeng.
-- Telegram/final preview delivery: split active preview lifecycle from cleanup retention so missing archived preview edits avoid duplicate fallback sends without clearing the live preview or blocking later in-place finalization. (#41662) thanks @hougangdev.
+- Hooks/plugin context parity followup: pass `trigger` and `channelId` through embedded `llm_input`, `agent_end`, and `llm_output` hook contexts so plugins receive the same agent metadata across hook phases. (#42362) Thanks @zhoulf1006.
+- Plugins/global hook runner: harden singleton state handling so shared global hook runner reuse does not leak or corrupt runner state across executions. (#40184) Thanks @vincentkoc.
+- Context engine/tests: add bundled-registry regression coverage for cross-chunk resolution, plugin-sdk re-exports, and concurrent chunk registration. (#40460) thanks @dsantoreis.
+- Agents/embedded runner: bound compaction retry waiting and drain embedded runs during SIGUSR1 restart so session lanes recover instead of staying blocked behind compaction. (#40324) thanks @cgdusek.
+- Agents/embedded logs: add structured, sanitized lifecycle and failover observation events so overload and provider failures are easier to tail and filter. (#41336) thanks @altaywtf.
+- Agents/embedded overload logs: include the failing model and provider in error-path console output, with lifecycle regression coverage for the rendered and sanitized `consoleMessage`. (#41236) thanks @jiarung.
+- Agents/fallback observability: add structured, sanitized model-fallback decision and auth-profile failure-state events with correlated run IDs so cooldown probes and failover paths are easier to trace in logs. (#41337) thanks @altaywtf.
+- Logging/probe observations: suppress structured embedded and model-fallback probe warnings on the console without hiding error or fatal output. (#41338) thanks @altaywtf.
+- Agents/context-engine compaction: guard thrown engine-owned overflow compaction attempts and fire compaction hooks for `ownsCompaction` engines so overflow recovery no longer crashes and plugin subscribers still observe compact runs. (#41361) thanks @davidrudduck.
+- Gateway/node pending drain followup: keep `hasMore` true when the deferred baseline status item still needs delivery, and avoid allocating empty pending-work state for drain-only nodes with no queued work. (#41429) Thanks @mbelinky.
+- Protocol/Swift model sync: regenerate pending node work Swift bindings after the landed `node.pending.*` schema additions so generated protocol artifacts are consistent again. (#41477) Thanks @mbelinky.
+- Cron/subagent followup: do not misclassify empty or `NO_REPLY` cron responses as interim acknowledgements that need a rerun, so deliberately silent cron jobs are no longer retried. (#41383) thanks @jackal092927.
- Cron/state errors: record `lastErrorReason` in cron job state and keep the gateway schema aligned with the full failover-reason set, including regression coverage for protocol conformance. (#14382) thanks @futuremind2026.
-- Tools/web search: recover OpenRouter Perplexity citation extraction from `message.annotations` when chat-completions responses omit top-level citations. (#40881) Thanks @laurieluo.
-- Security/external content: treat whitespace-delimited `EXTERNAL UNTRUSTED CONTENT` boundary markers like underscore-delimited variants so prompt wrappers cannot bypass marker sanitization. (#35983) Thanks @urianpaul94.
-- Telegram/network env-proxy: apply configured transport policy to proxied HTTPS dispatchers as well as direct `NO_PROXY` bypasses, so resolver-scoped IPv4 fallback and network settings work consistently for env-proxied Telegram traffic. (#40740) Thanks @sircrumpet.
-- Agents/memory flush: forward `memoryFlushWritePath` through `runEmbeddedPiAgent` so memory-triggered flush turns keep the append-only write guard without aborting before tool setup. Follows up on #38574. (#41761) Thanks @frankekn.
+- Browser/Browserbase 429 handling: surface stable no-retry rate-limit guidance without buffering discarded HTTP 429 response bodies from remote browser services. (#40491) thanks @mvanhorn.
- CI/CodeQL Swift toolchain: select Xcode 26.1 before installing Swift build tools so the CodeQL Swift job uses Swift tools 6.2 on `macos-latest`. (#41787) thanks @BunsDev.
- Sandbox/subagents: pass the real configured workspace through `sessions_spawn` inheritance when a parent agent runs in a copied-workspace sandbox, so child `/agent` mounts point at the configured workspace instead of the parent sandbox copy. (#40757) Thanks @dsantoreis.
-- Mattermost/plugin send actions: normalize direct `replyTo` fallback handling so threaded plugin sends trim blank IDs and reuse the correct reply target again. (#41176) Thanks @hnykda.
-- MS Teams/allowlist resolution: use the General channel conversation ID as the resolved team key (with Graph GUID fallback) so Bot Framework runtime `channelData.team.id` matching works for team and team/channel allowlist entries. (#41838) Thanks @BradGroux.
-- Mattermost/Markdown formatting: preserve first-line indentation when stripping bot mentions so nested list items and indented code blocks keep their structure, and render Mattermost tables natively by default instead of fenced-code fallback. (#18655) thanks @echo931.
- Agents/fallback cooldown probing: cap cooldown-bypass probing to one attempt per provider per fallback run so multi-model same-provider cooldown chains can continue to cross-provider fallbacks instead of repeatedly stalling on duplicate cooldown probes. (#41711) Thanks @cgdusek.
- Telegram/direct delivery: bridge direct delivery sends to internal `message:sent` hooks so internal hook listeners observe successful Telegram deliveries. (#40185) Thanks @vincentkoc.
-- Plugins/global hook runner: harden singleton state handling so shared global hook runner reuse does not leak or corrupt runner state across executions. (#40184) Thanks @vincentkoc.
-- Agents/fallback: recognize Poe `402 You've used up your points!` billing errors so configured model fallbacks trigger instead of surfacing the raw provider error. (#42278) Thanks @CryUshio.
-- Telegram/outbound HTML sends: chunk long HTML-mode messages, preserve plain-text fallback and silent-delivery params across retries, and cut over to plain text when HTML chunk planning cannot safely preserve the full message. (#42240) thanks @obviyus.
-- Agents/embedded overload logs: include the failing model and provider in error-path console output, with lifecycle regression coverage for the rendered and sanitized `consoleMessage`. (#41236) thanks @jiarung.
-- Agents/failover: treat Gemini `MALFORMED_RESPONSE` stop reasons as retryable timeouts so preview-model enum drift falls back cleanly instead of crashing the run, without also reclassifying malformed function-call errors. (#42292) Thanks @jnMetaCode.
-- Discord/Telegram outbound runtime config: thread runtime-resolved config through Discord and Telegram send paths so SecretRef-based credentials stay resolved during message delivery. (#42352) Thanks @joshavant.
-- Secrets/SecretRef: reject exec SecretRef traversal ids across schema, runtime, and gateway. (#42370) Thanks @joshavant.
-- Telegram/docs: clarify that `channels.telegram.groups` allowlists chats while `groupAllowFrom` allowlists users inside those chats, and point invalid negative chat IDs at the right config key. (#42451) Thanks @altaywtf.
-- Models/Alibaba Cloud Model Studio: wire `MODELSTUDIO_API_KEY` through shared env auth, implicit provider discovery, and shell-env fallback so onboarding works outside the wizard too. (#40634) Thanks @pomelo-nwu.
-- Subagents/authority: persist leaf vs orchestrator control scope at spawn time and route tool plus slash-command control through shared ownership checks, so leaf sessions cannot regain orchestration privileges after restore or flat-key lookups. Thanks @tdjackey.
-- ACP/sessions_spawn: implicitly stream `mode="run"` ACP spawns to parent only for eligible subagent orchestrator sessions (heartbeat `target: "last"` with a usable session-local route), restoring parent progress relays without thread binding. (#42404) Thanks @davidguttman.
-- Sessions/reset model recompute: clear stale runtime model, context-token, and system-prompt metadata before session resets recompute the replacement session, so resets pick up current defaults and explicit overrides instead of reusing old runtime model state. (#41173) thanks @PonyX-lab.
-- Browser/Browserbase 429 handling: surface stable no-retry rate-limit guidance without buffering discarded HTTP 429 response bodies from remote browser services. (#40491) thanks @mvanhorn.
-- Gateway/auth: allow one trusted device-token retry on shared-token mismatch with recovery hints to prevent reconnect churn during token drift. (#42507) Thanks @joshavant.
-- Channels/allowlists: remove stale matcher caching so same-array allowlist edits and wildcard replacements take effect immediately, with regression coverage for in-place mutation cases.
-- Gateway/auth: fail closed when local `gateway.auth.*` SecretRefs are configured but unavailable, instead of silently falling back to `gateway.remote.*` credentials in local mode. (#42672) Thanks @joshavant.
-- Sandbox/fs bridge: pin staged writes to verified parent directories so temporary write files cannot materialize outside the allowed mount before atomic replace. Thanks @tdjackey.
-- Commands/config writes: enforce `configWrites` against both the originating account and the targeted account scope for `/config` and config-backed `/allowlist` edits, blocking sibling-account mutations while preserving gateway `operator.admin` flows. Thanks @tdjackey for reporting.
-- Security/system.run: fail closed for approval-backed interpreter/runtime commands when OpenClaw cannot bind exactly one concrete local file operand, while extending best-effort direct-file binding to additional runtime forms. Thanks @tdjackey for reporting.
-- Gateway/session reset auth: split conversation `/new` and `/reset` handling away from the admin-only `sessions.reset` control-plane RPC so write-scoped gateway callers can no longer reach the privileged reset path through `agent`. Thanks @tdjackey for reporting.
-- Telegram/final preview delivery followup: keep ambiguous missing-`message_id` finals only when a preview was already visible, while first-preview/no-id cases still fall back so Telegram users do not lose the final reply. (#41932) thanks @hougangdev.
-- Agents/Azure OpenAI Responses: include the `azure-openai` provider in the Responses API store override so Azure OpenAI multi-turn cron jobs and embedded agent runs no longer fail with HTTP 400 "store is set to false". (#42934, fixes #42800) Thanks @ademczuk.
-- Agents/context pruning: prune image-only tool results during soft-trim, align context-pruning coverage with the new tool-result contract, and extend historical image cleanup to the same screenshot-heavy session path. (#43045) Thanks @MoerAI.
-- fix(models): guard optional model.input capability checks (#42096) thanks @andyliu
-- Security/plugin runtime: stop unauthenticated plugin HTTP routes from inheriting synthetic admin gateway scopes when they call `runtime.subagent.*`, so admin-only methods like `sessions.delete` stay blocked without gateway auth.
-- Security/session_status: enforce sandbox session-tree visibility and shared agent-to-agent access guards before reading or mutating target session state, so sandboxed subagents can no longer inspect parent session metadata or write parent model overrides via `session_status`.
-- Security/nodes: treat the `nodes` agent tool as owner-only fallback policy so non-owner senders cannot reach paired-node approval or invoke paths through the shared tool set.
-- Telegram/final preview cleanup follow-up: clear stale cleanup-retain state only for transient preview finals so archived-preview retains no longer leave a stale partial bubble beside a later fallback-sent final. (#41763) Thanks @obviyus.
-- Signal/config schema: accept `channels.signal.accountUuid` in strict config validation so loop-protection configs no longer fail with an unrecognized-key error. (#35578) Thanks @ingyukoh.
-- Telegram/config schema: accept `channels.telegram.actions.editMessage` and `createForumTopic` in strict config validation so existing Telegram action toggles no longer fail as unrecognized keys. (#35498) Thanks @ingyukoh.
-- Agents/cooldowns: default cooldown windows with no recorded failure history to `unknown` instead of `rate_limit`, avoiding false API rate-limit warnings while preserving cooldown recovery probes. (#42911) Thanks @VibhorGautam.
-- Discord/config typing: expose channel-level `autoThread` on the canonical guild-channel config type so strict config loading matches the existing Discord schema and runtime behavior. (#35608) Thanks @ingyukoh.
-- Agents/error rendering: ignore stale assistant `errorMessage` fields on successful turns so background/tool-side failures no longer prepend synthetic billing errors over valid replies. (#40616) Thanks @ingyukoh.
+- Dependencies: refresh workspace dependencies except the pinned Carbon package, and harden ACP session-config writes against non-string SDK values so newer ACP clients fail fast instead of tripping type/runtime mismatches.
+- Telegram/polling restarts: clear bounded cleanup timeout handles after `runner.stop()` and `bot.stop()` settle so stall recovery no longer leaves stray 15-second timers behind on clean shutdown. (#43188) thanks @kyohwang.
## 2026.3.8
@@ -4023,6 +4039,7 @@ Thanks @AlexMikhalev, @CoreyH, @John-Rood, @KrauseFx, @MaudeBot, @Nachx639, @Nic
- Gateway/Daemon/Doctor: atomic config writes; repair gateway service entrypoint + install switches; non-interactive legacy migrations; systemd unit alignment + KillMode=process; node bridge keepalive/pings; Launch at Login persistence; bundle MoltbotKit resources + Swift 6.2 compat dylib; relay version check + remove smoke test; regen Swift GatewayModels + keep agent provider string; cron jobId alias + channel alias migration + main session key normalization; heartbeat Telegram accountId resolution; avoid WhatsApp fallback for internal runs; gateway listener error wording; serveBaseUrl param; honor gateway --dev; fix wide-area discovery updates; align agents.defaults schema; provider account metadata in daemon status; refresh Carbon patch for gateway fixes; restore doctor prompter initialValue handling.
- Control UI/TUI: persist per-session verbose off + hide tool cards; logs tab opens at bottom; relative asset paths + landing cleanup; session labels lookup/persistence; stop pinning main session in recents; start logs at bottom; TUI status bar refresh + timeout handling + hide reasoning label when off.
- Onboarding/Configure: QuickStart single-select provider picker; avoid Codex CLI false-expiry warnings; clarify WhatsApp owner prompt; fix Minimax hosted onboarding (agents.defaults + msteams heartbeat target); remove configure Control UI prompt; honor gateway --dev flag.
+- Agent loop: guard overflow compaction throws and restore compaction hooks for engine-owned context engines. (#41361) — thanks @davidrudduck
### Maintenance
diff --git a/apps/android/app/build.gradle.kts b/apps/android/app/build.gradle.kts
index 3b52bcf50de..10b70cea283 100644
--- a/apps/android/app/build.gradle.kts
+++ b/apps/android/app/build.gradle.kts
@@ -63,8 +63,8 @@ android {
applicationId = "ai.openclaw.app"
minSdk = 31
targetSdk = 36
- versionCode = 202603090
- versionName = "2026.3.9"
+ versionCode = 202603110
+ versionName = "2026.3.11-beta.1"
ndk {
// Support all major ABIs — native libs are tiny (~47 KB per ABI)
abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
diff --git a/apps/ios/README.md b/apps/ios/README.md
index 42c5a51dec2..6eb35a1d639 100644
--- a/apps/ios/README.md
+++ b/apps/ios/README.md
@@ -64,9 +64,9 @@ Release behavior:
- Beta release uses canonical `ai.openclaw.client*` bundle IDs through a temporary generated xcconfig in `apps/ios/build/BetaRelease.xcconfig`.
- The beta flow does not modify `apps/ios/.local-signing.xcconfig` or `apps/ios/LocalSigning.xcconfig`.
- Root `package.json.version` is the only version source for iOS.
-- A root version like `2026.3.9-beta.1` becomes:
- - `CFBundleShortVersionString = 2026.3.9`
- - `CFBundleVersion = next TestFlight build number for 2026.3.9`
+- A root version like `2026.3.11-beta.1` becomes:
+ - `CFBundleShortVersionString = 2026.3.11`
+ - `CFBundleVersion = next TestFlight build number for 2026.3.11`
Archive without upload:
diff --git a/apps/ios/fastlane/Fastfile b/apps/ios/fastlane/Fastfile
index 62d79f9995c..e7b286b4dd5 100644
--- a/apps/ios/fastlane/Fastfile
+++ b/apps/ios/fastlane/Fastfile
@@ -99,7 +99,7 @@ def normalize_release_version(raw_value)
version = raw_value.to_s.strip.sub(/\Av/, "")
UI.user_error!("Missing root package.json version.") unless env_present?(version)
unless version.match?(/\A\d+\.\d+\.\d+(?:[.-]?beta[.-]\d+)?\z/i)
- UI.user_error!("Invalid package.json version '#{raw_value}'. Expected 2026.3.9 or 2026.3.9-beta.1.")
+ UI.user_error!("Invalid package.json version '#{raw_value}'. Expected 2026.3.11 or 2026.3.11-beta.1.")
end
version
diff --git a/apps/macos/Sources/OpenClaw/Resources/Info.plist b/apps/macos/Sources/OpenClaw/Resources/Info.plist
index 706fe7029c4..8605ee1264d 100644
--- a/apps/macos/Sources/OpenClaw/Resources/Info.plist
+++ b/apps/macos/Sources/OpenClaw/Resources/Info.plist
@@ -15,9 +15,9 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2026.3.9
+ 2026.3.11-beta.1
CFBundleVersion
- 202603080
+ 202603110
CFBundleIconFile
OpenClaw
CFBundleURLTypes
diff --git a/docs/concepts/memory.md b/docs/concepts/memory.md
index 35c51f6b523..8ed755b394c 100644
--- a/docs/concepts/memory.md
+++ b/docs/concepts/memory.md
@@ -284,9 +284,46 @@ Notes:
- Paths can be absolute or workspace-relative.
- Directories are scanned recursively for `.md` files.
-- Only Markdown files are indexed.
+- By default, only Markdown files are indexed.
+- If `memorySearch.multimodal.enabled = true`, OpenClaw also indexes supported image/audio files under `extraPaths` only. Default memory roots (`MEMORY.md`, `memory.md`, `memory/**/*.md`) stay Markdown-only.
- Symlinks are ignored (files or directories).
+### Multimodal memory files (Gemini image + audio)
+
+OpenClaw can index image and audio files from `memorySearch.extraPaths` when using Gemini embedding 2:
+
+```json5
+agents: {
+ defaults: {
+ memorySearch: {
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ extraPaths: ["assets/reference", "voice-notes"],
+ multimodal: {
+ enabled: true,
+ modalities: ["image", "audio"], // or ["all"]
+ maxFileBytes: 10000000
+ },
+ remote: {
+ apiKey: "YOUR_GEMINI_API_KEY"
+ }
+ }
+ }
+}
+```
+
+Notes:
+
+- Multimodal memory is currently supported only for `gemini-embedding-2-preview`.
+- Multimodal indexing applies only to files discovered through `memorySearch.extraPaths`.
+- Supported modalities in this phase: image and audio.
+- `memorySearch.fallback` must stay `"none"` while multimodal memory is enabled.
+- Matching image/audio file bytes are uploaded to the configured Gemini embedding endpoint during indexing.
+- Supported image extensions: `.jpg`, `.jpeg`, `.png`, `.webp`, `.gif`, `.heic`, `.heif`.
+- Supported audio extensions: `.mp3`, `.wav`, `.ogg`, `.opus`, `.m4a`, `.aac`, `.flac`.
+- Search queries remain text, but Gemini can compare those text queries against indexed image/audio embeddings.
+- `memory_get` still reads Markdown only; binary files are searchable but not returned as raw file contents.
+
### Gemini embeddings (native)
Set the provider to `gemini` to use the Gemini embeddings API directly:
diff --git a/docs/concepts/model-providers.md b/docs/concepts/model-providers.md
index 4f3d80b2420..549875c77b4 100644
--- a/docs/concepts/model-providers.md
+++ b/docs/concepts/model-providers.md
@@ -357,7 +357,7 @@ Ollama is a local LLM runtime that provides an OpenAI-compatible API:
- Provider: `ollama`
- Auth: None required (local server)
- Example model: `ollama/llama3.3`
-- Installation: [https://ollama.ai](https://ollama.ai)
+- Installation: [https://ollama.com/download](https://ollama.com/download)
```bash
# Install Ollama, then pull a model:
@@ -372,7 +372,7 @@ ollama pull llama3.3
}
```
-Ollama is automatically detected when running locally at `http://127.0.0.1:11434/v1`. See [/providers/ollama](/providers/ollama) for model recommendations and custom configuration.
+Ollama is detected locally at `http://127.0.0.1:11434` when you opt in with `OLLAMA_API_KEY`, and `openclaw onboard` can configure it directly as a first-class provider. See [/providers/ollama](/providers/ollama) for onboarding, cloud/local mode, and custom configuration.
### vLLM
diff --git a/docs/gateway/local-models.md b/docs/gateway/local-models.md
index 8a07a827467..4059f988776 100644
--- a/docs/gateway/local-models.md
+++ b/docs/gateway/local-models.md
@@ -11,6 +11,8 @@ title: "Local Models"
Local is doable, but OpenClaw expects large context + strong defenses against prompt injection. Small cards truncate context and leak safety. Aim high: **≥2 maxed-out Mac Studios or equivalent GPU rig (~$30k+)**. A single **24 GB** GPU works only for lighter prompts with higher latency. Use the **largest / full-size model variant you can run**; aggressively quantized or “small” checkpoints raise prompt-injection risk (see [Security](/gateway/security)).
+If you want the lowest-friction local setup, start with [Ollama](/providers/ollama) and `openclaw onboard`. This page is the opinionated guide for higher-end local stacks and custom OpenAI-compatible local servers.
+
## Recommended: LM Studio + MiniMax M2.5 (Responses API, full-size)
Best current local stack. Load MiniMax M2.5 in LM Studio, enable the local server (default `http://127.0.0.1:1234`), and use Responses API to keep reasoning separate from final text.
diff --git a/docs/help/faq.md b/docs/help/faq.md
index 8b738b60fc2..453688c1c5f 100644
--- a/docs/help/faq.md
+++ b/docs/help/faq.md
@@ -2084,8 +2084,21 @@ More context: [Models](/concepts/models).
### Can I use selfhosted models llamacpp vLLM Ollama
-Yes. If your local server exposes an OpenAI-compatible API, you can point a
-custom provider at it. Ollama is supported directly and is the easiest path.
+Yes. Ollama is the easiest path for local models.
+
+Quickest setup:
+
+1. Install Ollama from `https://ollama.com/download`
+2. Pull a local model such as `ollama pull glm-4.7-flash`
+3. If you want Ollama Cloud too, run `ollama signin`
+4. Run `openclaw onboard` and choose `Ollama`
+5. Pick `Local` or `Cloud + Local`
+
+Notes:
+
+- `Cloud + Local` gives you Ollama Cloud models plus your local Ollama models
+- cloud models such as `kimi-k2.5:cloud` do not need a local pull
+- for manual switching, use `openclaw models list` and `openclaw models set ollama/`
Security note: smaller or heavily quantized models are more vulnerable to prompt
injection. We strongly recommend **large models** for any bot that can use tools.
diff --git a/docs/platforms/mac/release.md b/docs/platforms/mac/release.md
index 180a52075ed..cd4052ac9dc 100644
--- a/docs/platforms/mac/release.md
+++ b/docs/platforms/mac/release.md
@@ -39,7 +39,7 @@ Notes:
# Default is auto-derived from APP_VERSION when omitted.
SKIP_NOTARIZE=1 \
BUNDLE_ID=ai.openclaw.mac \
-APP_VERSION=2026.3.9 \
+APP_VERSION=2026.3.11 \
BUILD_CONFIG=release \
SIGN_IDENTITY="Developer ID Application: ()" \
scripts/package-mac-dist.sh
@@ -47,10 +47,10 @@ scripts/package-mac-dist.sh
# `package-mac-dist.sh` already creates the zip + DMG.
# If you used `package-mac-app.sh` directly instead, create them manually:
# If you want notarization/stapling in this step, use the NOTARIZE command below.
-ditto -c -k --sequesterRsrc --keepParent dist/OpenClaw.app dist/OpenClaw-2026.3.9.zip
+ditto -c -k --sequesterRsrc --keepParent dist/OpenClaw.app dist/OpenClaw-2026.3.11.zip
# Optional: build a styled DMG for humans (drag to /Applications)
-scripts/create-dmg.sh dist/OpenClaw.app dist/OpenClaw-2026.3.9.dmg
+scripts/create-dmg.sh dist/OpenClaw.app dist/OpenClaw-2026.3.11.dmg
# Recommended: build + notarize/staple zip + DMG
# First, create a keychain profile once:
@@ -58,13 +58,13 @@ scripts/create-dmg.sh dist/OpenClaw.app dist/OpenClaw-2026.3.9.dmg
# --apple-id "" --team-id "" --password ""
NOTARIZE=1 NOTARYTOOL_PROFILE=openclaw-notary \
BUNDLE_ID=ai.openclaw.mac \
-APP_VERSION=2026.3.9 \
+APP_VERSION=2026.3.11 \
BUILD_CONFIG=release \
SIGN_IDENTITY="Developer ID Application: ()" \
scripts/package-mac-dist.sh
# Optional: ship dSYM alongside the release
-ditto -c -k --keepParent apps/macos/.build/release/OpenClaw.app.dSYM dist/OpenClaw-2026.3.9.dSYM.zip
+ditto -c -k --keepParent apps/macos/.build/release/OpenClaw.app.dSYM dist/OpenClaw-2026.3.11.dSYM.zip
```
## Appcast entry
@@ -72,7 +72,7 @@ ditto -c -k --keepParent apps/macos/.build/release/OpenClaw.app.dSYM dist/OpenCl
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/OpenClaw-2026.3.9.zip https://raw.githubusercontent.com/openclaw/openclaw/main/appcast.xml
+SPARKLE_PRIVATE_KEY_FILE=/path/to/ed25519-private-key scripts/make_appcast.sh dist/OpenClaw-2026.3.11.zip https://raw.githubusercontent.com/openclaw/openclaw/main/appcast.xml
```
Generates HTML release notes from `CHANGELOG.md` (via [`scripts/changelog-to-html.sh`](https://github.com/openclaw/openclaw/blob/main/scripts/changelog-to-html.sh)) and embeds them in the appcast entry.
@@ -80,7 +80,7 @@ Commit the updated `appcast.xml` alongside the release assets (zip + dSYM) when
## Publish & verify
-- Upload `OpenClaw-2026.3.9.zip` (and `OpenClaw-2026.3.9.dSYM.zip`) to the GitHub release for tag `v2026.3.9`.
+- Upload `OpenClaw-2026.3.11.zip` (and `OpenClaw-2026.3.11.dSYM.zip`) to the GitHub release for tag `v2026.3.11`.
- Ensure the raw appcast URL matches the baked feed: `https://raw.githubusercontent.com/openclaw/openclaw/main/appcast.xml`.
- Sanity checks:
- `curl -I https://raw.githubusercontent.com/openclaw/openclaw/main/appcast.xml` returns 200.
diff --git a/docs/platforms/raspberry-pi.md b/docs/platforms/raspberry-pi.md
index e46076e869d..247bf757b91 100644
--- a/docs/platforms/raspberry-pi.md
+++ b/docs/platforms/raspberry-pi.md
@@ -153,30 +153,33 @@ sudo systemctl status openclaw
journalctl -u openclaw -f
```
-## 9) Access the Dashboard
+## 9) Access the OpenClaw Dashboard
-Since the Pi is headless, use an SSH tunnel:
+Replace `user@gateway-host` with your Pi username and hostname or IP address.
+
+On your computer, ask the Pi to print a fresh dashboard URL:
```bash
-# From your laptop/desktop
-ssh -L 18789:localhost:18789 user@gateway-host
-
-# Then open in browser
-open http://localhost:18789
+ssh user@gateway-host 'openclaw dashboard --no-open'
```
-Or use Tailscale for always-on access:
+The command prints `Dashboard URL:`. Depending on how `gateway.auth.token`
+is configured, the URL may be a plain `http://127.0.0.1:18789/` link or one
+that includes `#token=...`.
+
+In another terminal on your computer, create the SSH tunnel:
```bash
-# On the Pi
-curl -fsSL https://tailscale.com/install.sh | sh
-sudo tailscale up
-
-# Update config
-openclaw config set gateway.bind tailnet
-sudo systemctl restart openclaw
+ssh -N -L 18789:127.0.0.1:18789 user@gateway-host
```
+Then open the printed Dashboard URL in your local browser.
+
+If the UI asks for auth, paste the token from `gateway.auth.token`
+(or `OPENCLAW_GATEWAY_TOKEN`) into Control UI settings.
+
+For always-on remote access, see [Tailscale](/gateway/tailscale).
+
---
## Performance Optimizations
diff --git a/docs/providers/ollama.md b/docs/providers/ollama.md
index b82f6411b68..abc41361ed0 100644
--- a/docs/providers/ollama.md
+++ b/docs/providers/ollama.md
@@ -8,7 +8,7 @@ title: "Ollama"
# Ollama
-Ollama is a local LLM runtime that makes it easy to run open-source models on your machine. OpenClaw integrates with Ollama's native API (`/api/chat`), supporting streaming and tool calling, and can **auto-discover tool-capable models** when you opt in with `OLLAMA_API_KEY` (or an auth profile) and do not define an explicit `models.providers.ollama` entry.
+Ollama is a local LLM runtime that makes it easy to run open-source models on your machine. OpenClaw integrates with Ollama's native API (`/api/chat`), supports streaming and tool calling, and can auto-discover local Ollama models when you opt in with `OLLAMA_API_KEY` (or an auth profile) and do not define an explicit `models.providers.ollama` entry.
**Remote Ollama users**: Do not use the `/v1` OpenAI-compatible URL (`http://host:11434/v1`) with OpenClaw. This breaks tool calling and models may output raw tool JSON as plain text. Use the native Ollama API URL instead: `baseUrl: "http://host:11434"` (no `/v1`).
@@ -16,21 +16,40 @@ Ollama is a local LLM runtime that makes it easy to run open-source models on yo
## Quick start
-1. Install Ollama: [https://ollama.ai](https://ollama.ai)
+1. Install Ollama: [https://ollama.com/download](https://ollama.com/download)
-2. Pull a model:
+2. Pull a local model if you want local inference:
```bash
+ollama pull glm-4.7-flash
+# or
ollama pull gpt-oss:20b
# or
ollama pull llama3.3
-# or
-ollama pull qwen2.5-coder:32b
-# or
-ollama pull deepseek-r1:32b
```
-3. Enable Ollama for OpenClaw (any value works; Ollama doesn't require a real key):
+3. If you want Ollama Cloud models too, sign in:
+
+```bash
+ollama signin
+```
+
+4. Run onboarding and choose `Ollama`:
+
+```bash
+openclaw onboard
+```
+
+- `Local`: local models only
+- `Cloud + Local`: local models plus Ollama Cloud models
+- Cloud models such as `kimi-k2.5:cloud`, `minimax-m2.5:cloud`, and `glm-5:cloud` do **not** require a local `ollama pull`
+
+OpenClaw currently suggests:
+
+- local default: `glm-4.7-flash`
+- cloud defaults: `kimi-k2.5:cloud`, `minimax-m2.5:cloud`, `glm-5:cloud`
+
+5. If you prefer manual setup, enable Ollama for OpenClaw directly (any value works; Ollama doesn't require a real key):
```bash
# Set environment variable
@@ -40,13 +59,20 @@ export OLLAMA_API_KEY="ollama-local"
openclaw config set models.providers.ollama.apiKey "ollama-local"
```
-4. Use Ollama models:
+6. Inspect or switch models:
+
+```bash
+openclaw models list
+openclaw models set ollama/glm-4.7-flash
+```
+
+7. Or set the default in config:
```json5
{
agents: {
defaults: {
- model: { primary: "ollama/gpt-oss:20b" },
+ model: { primary: "ollama/glm-4.7-flash" },
},
},
}
@@ -56,14 +82,13 @@ openclaw config set models.providers.ollama.apiKey "ollama-local"
When you set `OLLAMA_API_KEY` (or an auth profile) and **do not** define `models.providers.ollama`, OpenClaw discovers models from the local Ollama instance at `http://127.0.0.1:11434`:
-- Queries `/api/tags` and `/api/show`
-- Keeps only models that report `tools` capability
-- Marks `reasoning` when the model reports `thinking`
-- Reads `contextWindow` from `model_info[".context_length"]` when available
-- Sets `maxTokens` to 10× the context window
+- Queries `/api/tags`
+- Uses best-effort `/api/show` lookups to read `contextWindow` when available
+- Marks `reasoning` with a model-name heuristic (`r1`, `reasoning`, `think`)
+- Sets `maxTokens` to the default Ollama max-token cap used by OpenClaw
- Sets all costs to `0`
-This avoids manual model entries while keeping the catalog aligned with Ollama's capabilities.
+This avoids manual model entries while keeping the catalog aligned with the local Ollama instance.
To see what models are available:
@@ -98,7 +123,7 @@ Use explicit config when:
- Ollama runs on another host/port.
- You want to force specific context windows or model lists.
-- You want to include models that do not report tool support.
+- You want fully manual model definitions.
```json5
{
@@ -170,7 +195,7 @@ Once configured, all your Ollama models are available:
### Reasoning models
-OpenClaw marks models as reasoning-capable when Ollama reports `thinking` in `/api/show`:
+OpenClaw treats models with names such as `deepseek-r1`, `reasoning`, or `think` as reasoning-capable by default:
```bash
ollama pull deepseek-r1:32b
@@ -230,7 +255,7 @@ When `api: "openai-completions"` is used with Ollama, OpenClaw injects `options.
### Context windows
-For auto-discovered models, OpenClaw uses the context window reported by Ollama when available, otherwise it defaults to `8192`. You can override `contextWindow` and `maxTokens` in explicit provider config.
+For auto-discovered models, OpenClaw uses the context window reported by Ollama when available, otherwise it falls back to the default Ollama context window used by OpenClaw. You can override `contextWindow` and `maxTokens` in explicit provider config.
## Troubleshooting
@@ -250,16 +275,17 @@ curl http://localhost:11434/api/tags
### No models available
-OpenClaw only auto-discovers models that report tool support. If your model isn't listed, either:
+If your model is not listed, either:
-- Pull a tool-capable model, or
+- Pull the model locally, or
- Define the model explicitly in `models.providers.ollama`.
To add models:
```bash
ollama list # See what's installed
-ollama pull gpt-oss:20b # Pull a tool-capable model
+ollama pull glm-4.7-flash
+ollama pull gpt-oss:20b
ollama pull llama3.3 # Or another model
```
diff --git a/extensions/acpx/package.json b/extensions/acpx/package.json
index 599d71579b0..ae4f7e695ef 100644
--- a/extensions/acpx/package.json
+++ b/extensions/acpx/package.json
@@ -1,10 +1,10 @@
{
"name": "@openclaw/acpx",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw ACP runtime backend via acpx",
"type": "module",
"dependencies": {
- "acpx": "0.1.16"
+ "acpx": "0.2.0"
},
"openclaw": {
"extensions": [
diff --git a/extensions/bluebubbles/package.json b/extensions/bluebubbles/package.json
index 3c8605ef312..4918e9d3c02 100644
--- a/extensions/bluebubbles/package.json
+++ b/extensions/bluebubbles/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/bluebubbles",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw BlueBubbles channel plugin",
"type": "module",
"dependencies": {
diff --git a/extensions/copilot-proxy/package.json b/extensions/copilot-proxy/package.json
index e060ddd67f1..56f6c1085ee 100644
--- a/extensions/copilot-proxy/package.json
+++ b/extensions/copilot-proxy/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/copilot-proxy",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw Copilot Proxy provider plugin",
"type": "module",
diff --git a/extensions/diagnostics-otel/package.json b/extensions/diagnostics-otel/package.json
index 29c9b0ac79b..91aea1e9256 100644
--- a/extensions/diagnostics-otel/package.json
+++ b/extensions/diagnostics-otel/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/diagnostics-otel",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw diagnostics OpenTelemetry exporter",
"type": "module",
"dependencies": {
diff --git a/extensions/diffs/package.json b/extensions/diffs/package.json
index b685f985108..c9e30cee333 100644
--- a/extensions/diffs/package.json
+++ b/extensions/diffs/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/diffs",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw diff viewer plugin",
"type": "module",
diff --git a/extensions/discord/package.json b/extensions/discord/package.json
index f30f10ade51..7f291bd1c7a 100644
--- a/extensions/discord/package.json
+++ b/extensions/discord/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/discord",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw Discord channel plugin",
"type": "module",
"openclaw": {
diff --git a/extensions/feishu/package.json b/extensions/feishu/package.json
index fc38816e1bd..116f15f08d2 100644
--- a/extensions/feishu/package.json
+++ b/extensions/feishu/package.json
@@ -1,12 +1,12 @@
{
"name": "@openclaw/feishu",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw Feishu/Lark channel plugin (community maintained by @m1heng)",
"type": "module",
"dependencies": {
"@larksuiteoapi/node-sdk": "^1.59.0",
"@sinclair/typebox": "0.34.48",
- "https-proxy-agent": "^7.0.6",
+ "https-proxy-agent": "^8.0.0",
"zod": "^4.3.6"
},
"openclaw": {
diff --git a/extensions/google-gemini-cli-auth/package.json b/extensions/google-gemini-cli-auth/package.json
index 2ab1c6a6ca8..7a84f58020a 100644
--- a/extensions/google-gemini-cli-auth/package.json
+++ b/extensions/google-gemini-cli-auth/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/google-gemini-cli-auth",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw Gemini CLI OAuth provider plugin",
"type": "module",
diff --git a/extensions/googlechat/package.json b/extensions/googlechat/package.json
index 61128b78032..2b9eee3932e 100644
--- a/extensions/googlechat/package.json
+++ b/extensions/googlechat/package.json
@@ -1,15 +1,12 @@
{
"name": "@openclaw/googlechat",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw Google Chat channel plugin",
"type": "module",
"dependencies": {
"google-auth-library": "^10.6.1"
},
- "devDependencies": {
- "openclaw": "workspace:*"
- },
"peerDependencies": {
"openclaw": ">=2026.3.7"
},
diff --git a/extensions/imessage/package.json b/extensions/imessage/package.json
index 3f38e01efe1..8add26a2fe7 100644
--- a/extensions/imessage/package.json
+++ b/extensions/imessage/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/imessage",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw iMessage channel plugin",
"type": "module",
diff --git a/extensions/irc/package.json b/extensions/irc/package.json
index 34c7de1dcfb..e6e9bdfe6b4 100644
--- a/extensions/irc/package.json
+++ b/extensions/irc/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/irc",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw IRC channel plugin",
"type": "module",
"dependencies": {
diff --git a/extensions/line/package.json b/extensions/line/package.json
index 9ec37f833e7..4f98b21c7a2 100644
--- a/extensions/line/package.json
+++ b/extensions/line/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/line",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw LINE channel plugin",
"type": "module",
diff --git a/extensions/llm-task/package.json b/extensions/llm-task/package.json
index 8a74b2ead7e..bf63c9b28fc 100644
--- a/extensions/llm-task/package.json
+++ b/extensions/llm-task/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/llm-task",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw JSON-only LLM task plugin",
"type": "module",
diff --git a/extensions/lobster/package.json b/extensions/lobster/package.json
index 4c137401fbb..c0c243b28c0 100644
--- a/extensions/lobster/package.json
+++ b/extensions/lobster/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/lobster",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "Lobster workflow tool plugin (typed pipelines + resumable approvals)",
"type": "module",
"dependencies": {
diff --git a/extensions/matrix/CHANGELOG.md b/extensions/matrix/CHANGELOG.md
index a3b32a18c85..65f31b8445e 100644
--- a/extensions/matrix/CHANGELOG.md
+++ b/extensions/matrix/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## 2026.3.11
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
+## 2026.3.10
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
## 2026.3.9
### Changes
diff --git a/extensions/matrix/package.json b/extensions/matrix/package.json
index c1b5859b43e..8a132a9edf5 100644
--- a/extensions/matrix/package.json
+++ b/extensions/matrix/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/matrix",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw Matrix channel plugin",
"type": "module",
"dependencies": {
diff --git a/extensions/mattermost/package.json b/extensions/mattermost/package.json
index d532764db87..e16e158545e 100644
--- a/extensions/mattermost/package.json
+++ b/extensions/mattermost/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/mattermost",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw Mattermost channel plugin",
"type": "module",
"dependencies": {
diff --git a/extensions/memory-core/package.json b/extensions/memory-core/package.json
index 0af3fc45281..640c81e1539 100644
--- a/extensions/memory-core/package.json
+++ b/extensions/memory-core/package.json
@@ -1,12 +1,9 @@
{
"name": "@openclaw/memory-core",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw core memory search plugin",
"type": "module",
- "devDependencies": {
- "openclaw": "workspace:*"
- },
"peerDependencies": {
"openclaw": ">=2026.3.7"
},
diff --git a/extensions/memory-lancedb/package.json b/extensions/memory-lancedb/package.json
index abd920833ca..2a1b2a9994b 100644
--- a/extensions/memory-lancedb/package.json
+++ b/extensions/memory-lancedb/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/memory-lancedb",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw LanceDB-backed long-term memory plugin with auto-recall/capture",
"type": "module",
diff --git a/extensions/minimax-portal-auth/package.json b/extensions/minimax-portal-auth/package.json
index 9443f37d524..6e11b99212f 100644
--- a/extensions/minimax-portal-auth/package.json
+++ b/extensions/minimax-portal-auth/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/minimax-portal-auth",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw MiniMax Portal OAuth provider plugin",
"type": "module",
diff --git a/extensions/msteams/CHANGELOG.md b/extensions/msteams/CHANGELOG.md
index 38d5614305c..bf82200cf59 100644
--- a/extensions/msteams/CHANGELOG.md
+++ b/extensions/msteams/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## 2026.3.11
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
+## 2026.3.10
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
## 2026.3.9
### Changes
diff --git a/extensions/msteams/package.json b/extensions/msteams/package.json
index c4453f82f6e..c159d091977 100644
--- a/extensions/msteams/package.json
+++ b/extensions/msteams/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/msteams",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw Microsoft Teams channel plugin",
"type": "module",
"dependencies": {
diff --git a/extensions/nextcloud-talk/package.json b/extensions/nextcloud-talk/package.json
index 96797d4b76e..9ef0a1daf09 100644
--- a/extensions/nextcloud-talk/package.json
+++ b/extensions/nextcloud-talk/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/nextcloud-talk",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw Nextcloud Talk channel plugin",
"type": "module",
"dependencies": {
diff --git a/extensions/nostr/CHANGELOG.md b/extensions/nostr/CHANGELOG.md
index 3088efcc2bb..dcb4c18fdfa 100644
--- a/extensions/nostr/CHANGELOG.md
+++ b/extensions/nostr/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## 2026.3.11
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
+## 2026.3.10
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
## 2026.3.9
### Changes
diff --git a/extensions/nostr/package.json b/extensions/nostr/package.json
index dbee4bc09d7..f02b67b6837 100644
--- a/extensions/nostr/package.json
+++ b/extensions/nostr/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/nostr",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw Nostr channel plugin for NIP-04 encrypted DMs",
"type": "module",
"dependencies": {
diff --git a/extensions/open-prose/package.json b/extensions/open-prose/package.json
index 240a2bbcb41..de86909f961 100644
--- a/extensions/open-prose/package.json
+++ b/extensions/open-prose/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/open-prose",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenProse VM skill pack plugin (slash command + telemetry).",
"type": "module",
diff --git a/extensions/signal/package.json b/extensions/signal/package.json
index 743c8212d31..6fd516cfd42 100644
--- a/extensions/signal/package.json
+++ b/extensions/signal/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/signal",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw Signal channel plugin",
"type": "module",
diff --git a/extensions/slack/package.json b/extensions/slack/package.json
index 539541bdc6d..dbc4a4483c4 100644
--- a/extensions/slack/package.json
+++ b/extensions/slack/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/slack",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw Slack channel plugin",
"type": "module",
diff --git a/extensions/synology-chat/package.json b/extensions/synology-chat/package.json
index 00503898817..0e7b4847494 100644
--- a/extensions/synology-chat/package.json
+++ b/extensions/synology-chat/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/synology-chat",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "Synology Chat channel plugin for OpenClaw",
"type": "module",
"dependencies": {
diff --git a/extensions/telegram/package.json b/extensions/telegram/package.json
index 6602b46f2c8..8ffa3acf603 100644
--- a/extensions/telegram/package.json
+++ b/extensions/telegram/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/telegram",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw Telegram channel plugin",
"type": "module",
diff --git a/extensions/tlon/package.json b/extensions/tlon/package.json
index 0cb79328d89..154e1dd6dbd 100644
--- a/extensions/tlon/package.json
+++ b/extensions/tlon/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/tlon",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw Tlon/Urbit channel plugin",
"type": "module",
"dependencies": {
diff --git a/extensions/twitch/CHANGELOG.md b/extensions/twitch/CHANGELOG.md
index 48160f427e8..844ef13dc6c 100644
--- a/extensions/twitch/CHANGELOG.md
+++ b/extensions/twitch/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## 2026.3.11
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
+## 2026.3.10
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
## 2026.3.9
### Changes
diff --git a/extensions/twitch/package.json b/extensions/twitch/package.json
index 5fbf49cc971..3bcdf9fe847 100644
--- a/extensions/twitch/package.json
+++ b/extensions/twitch/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/twitch",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw Twitch channel plugin",
"type": "module",
"dependencies": {
diff --git a/extensions/voice-call/CHANGELOG.md b/extensions/voice-call/CHANGELOG.md
index a8a4586116c..93aba26c868 100644
--- a/extensions/voice-call/CHANGELOG.md
+++ b/extensions/voice-call/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## 2026.3.11
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
+## 2026.3.10
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
## 2026.3.9
### Changes
diff --git a/extensions/voice-call/package.json b/extensions/voice-call/package.json
index 420f8b41560..9bdadd3b226 100644
--- a/extensions/voice-call/package.json
+++ b/extensions/voice-call/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/voice-call",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw voice-call plugin",
"type": "module",
"dependencies": {
diff --git a/extensions/whatsapp/package.json b/extensions/whatsapp/package.json
index c87a5f26c2b..1a21be8eba9 100644
--- a/extensions/whatsapp/package.json
+++ b/extensions/whatsapp/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/whatsapp",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"private": true,
"description": "OpenClaw WhatsApp channel plugin",
"type": "module",
diff --git a/extensions/zalo/CHANGELOG.md b/extensions/zalo/CHANGELOG.md
index 5ae5323034f..178f993e825 100644
--- a/extensions/zalo/CHANGELOG.md
+++ b/extensions/zalo/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## 2026.3.11
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
+## 2026.3.10
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
## 2026.3.9
### Changes
diff --git a/extensions/zalo/package.json b/extensions/zalo/package.json
index 6de5909736f..463887c68fe 100644
--- a/extensions/zalo/package.json
+++ b/extensions/zalo/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/zalo",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw Zalo channel plugin",
"type": "module",
"dependencies": {
diff --git a/extensions/zalouser/CHANGELOG.md b/extensions/zalouser/CHANGELOG.md
index 10c22ce4029..b5a0fbb6f57 100644
--- a/extensions/zalouser/CHANGELOG.md
+++ b/extensions/zalouser/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## 2026.3.11
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
+## 2026.3.10
+
+### Changes
+
+- Version alignment with core OpenClaw release numbers.
+
## 2026.3.9
### Changes
diff --git a/extensions/zalouser/package.json b/extensions/zalouser/package.json
index 79bf5723d48..2b803b0b150 100644
--- a/extensions/zalouser/package.json
+++ b/extensions/zalouser/package.json
@@ -1,6 +1,6 @@
{
"name": "@openclaw/zalouser",
- "version": "2026.3.9",
+ "version": "2026.3.11",
"description": "OpenClaw Zalo Personal Account plugin via native zca-js integration",
"type": "module",
"dependencies": {
diff --git a/package.json b/package.json
index f673633009c..d84428da146 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "openclaw",
- "version": "2026.3.9",
+ "version": "2026.3.11-beta.1",
"description": "Multi-channel AI gateway with extensible messaging integrations",
"keywords": [],
"homepage": "https://github.com/openclaw/openclaw#readme",
@@ -338,11 +338,11 @@
"ui:install": "node scripts/ui.js install"
},
"dependencies": {
- "@agentclientprotocol/sdk": "0.15.0",
- "@aws-sdk/client-bedrock": "^3.1004.0",
+ "@agentclientprotocol/sdk": "0.16.1",
+ "@aws-sdk/client-bedrock": "^3.1007.0",
"@buape/carbon": "0.0.0-beta-20260216184201",
"@clack/prompts": "^1.1.0",
- "@discordjs/voice": "^0.19.0",
+ "@discordjs/voice": "^0.19.1",
"@grammyjs/runner": "^2.0.3",
"@grammyjs/transformer-throttler": "^1.2.1",
"@homebridge/ciao": "^1.3.5",
@@ -364,13 +364,13 @@
"cli-highlight": "^2.1.11",
"commander": "^14.0.3",
"croner": "^10.0.1",
- "discord-api-types": "^0.38.41",
+ "discord-api-types": "^0.38.42",
"dotenv": "^17.3.1",
"express": "^5.2.1",
"file-type": "^21.3.1",
"grammy": "^1.41.1",
"hono": "4.12.7",
- "https-proxy-agent": "^7.0.6",
+ "https-proxy-agent": "^8.0.0",
"ipaddr.js": "^2.3.0",
"jiti": "^2.6.1",
"json5": "^2.2.3",
@@ -399,18 +399,18 @@
"@lit/context": "^1.1.6",
"@types/express": "^5.0.6",
"@types/markdown-it": "^14.1.2",
- "@types/node": "^25.3.5",
+ "@types/node": "^25.4.0",
"@types/qrcode-terminal": "^0.12.2",
"@types/ws": "^8.18.1",
- "@typescript/native-preview": "7.0.0-dev.20260308.1",
+ "@typescript/native-preview": "7.0.0-dev.20260311.1",
"@vitest/coverage-v8": "^4.0.18",
"jscpd": "4.0.8",
"lit": "^3.3.2",
- "oxfmt": "0.36.0",
- "oxlint": "^1.51.0",
+ "oxfmt": "0.38.0",
+ "oxlint": "^1.53.0",
"oxlint-tsgolint": "^0.16.0",
"signal-utils": "0.21.1",
- "tsdown": "0.21.0",
+ "tsdown": "0.21.2",
"tsx": "^4.21.0",
"typescript": "^5.9.3",
"vitest": "^4.0.18"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 72fa7353329..1e26495971c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,11 +26,11 @@ importers:
.:
dependencies:
'@agentclientprotocol/sdk':
- specifier: 0.15.0
- version: 0.15.0(zod@4.3.6)
+ specifier: 0.16.1
+ version: 0.16.1(zod@4.3.6)
'@aws-sdk/client-bedrock':
- specifier: ^3.1004.0
- version: 3.1004.0
+ specifier: ^3.1007.0
+ version: 3.1007.0
'@buape/carbon':
specifier: 0.0.0-beta-20260216184201
version: 0.0.0-beta-20260216184201(@discordjs/opus@0.10.0)(hono@4.12.7)(opusscript@0.1.1)
@@ -38,8 +38,8 @@ importers:
specifier: ^1.1.0
version: 1.1.0
'@discordjs/voice':
- specifier: ^0.19.0
- version: 0.19.0(@discordjs/opus@0.10.0)(opusscript@0.1.1)
+ specifier: ^0.19.1
+ version: 0.19.1(@discordjs/opus@0.10.0)(opusscript@0.1.1)
'@grammyjs/runner':
specifier: ^2.0.3
version: 2.0.3(grammy@1.41.1)
@@ -107,8 +107,8 @@ importers:
specifier: ^10.0.1
version: 10.0.1
discord-api-types:
- specifier: ^0.38.41
- version: 0.38.41
+ specifier: ^0.38.42
+ version: 0.38.42
dotenv:
specifier: ^17.3.1
version: 17.3.1
@@ -125,8 +125,8 @@ importers:
specifier: 4.12.7
version: 4.12.7
https-proxy-agent:
- specifier: ^7.0.6
- version: 7.0.6
+ specifier: ^8.0.0
+ version: 8.0.0
ipaddr.js:
specifier: ^2.3.0
version: 2.3.0
@@ -210,8 +210,8 @@ importers:
specifier: ^14.1.2
version: 14.1.2
'@types/node':
- specifier: ^25.3.5
- version: 25.3.5
+ specifier: ^25.4.0
+ version: 25.4.0
'@types/qrcode-terminal':
specifier: ^0.12.2
version: 0.12.2
@@ -219,11 +219,11 @@ importers:
specifier: ^8.18.1
version: 8.18.1
'@typescript/native-preview':
- specifier: 7.0.0-dev.20260308.1
- version: 7.0.0-dev.20260308.1
+ specifier: 7.0.0-dev.20260311.1
+ version: 7.0.0-dev.20260311.1
'@vitest/coverage-v8':
specifier: ^4.0.18
- version: 4.0.18(@vitest/browser@4.0.18(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18))(vitest@4.0.18)
+ version: 4.0.18(@vitest/browser@4.0.18(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18))(vitest@4.0.18)
jscpd:
specifier: 4.0.8
version: 4.0.8
@@ -231,11 +231,11 @@ importers:
specifier: ^3.3.2
version: 3.3.2
oxfmt:
- specifier: 0.36.0
- version: 0.36.0
+ specifier: 0.38.0
+ version: 0.38.0
oxlint:
- specifier: ^1.51.0
- version: 1.51.0(oxlint-tsgolint@0.16.0)
+ specifier: ^1.53.0
+ version: 1.53.0(oxlint-tsgolint@0.16.0)
oxlint-tsgolint:
specifier: ^0.16.0
version: 0.16.0
@@ -243,8 +243,8 @@ importers:
specifier: 0.21.1
version: 0.21.1(signal-polyfill@0.2.2)
tsdown:
- specifier: 0.21.0
- version: 0.21.0(@typescript/native-preview@7.0.0-dev.20260308.1)(typescript@5.9.3)
+ specifier: 0.21.2
+ version: 0.21.2(@typescript/native-preview@7.0.0-dev.20260311.1)(typescript@5.9.3)
tsx:
specifier: ^4.21.0
version: 4.21.0
@@ -253,13 +253,13 @@ importers:
version: 5.9.3
vitest:
specifier: ^4.0.18
- version: 4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.3.5)(@vitest/browser-playwright@4.0.18)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+ version: 4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.4.0)(@vitest/browser-playwright@4.0.18)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
extensions/acpx:
dependencies:
acpx:
- specifier: 0.1.16
- version: 0.1.16(zod@4.3.6)
+ specifier: 0.2.0
+ version: 0.2.0(zod@4.3.6)
extensions/bluebubbles:
dependencies:
@@ -328,8 +328,8 @@ importers:
specifier: 0.34.48
version: 0.34.48
https-proxy-agent:
- specifier: ^7.0.6
- version: 7.0.6
+ specifier: ^8.0.0
+ version: 8.0.0
zod:
specifier: ^4.3.6
version: 4.3.6
@@ -341,10 +341,9 @@ importers:
google-auth-library:
specifier: ^10.6.1
version: 10.6.1
- devDependencies:
openclaw:
- specifier: workspace:*
- version: link:../..
+ specifier: '>=2026.3.7'
+ version: 2026.3.8(@discordjs/opus@0.10.0)(@napi-rs/canvas@0.1.95)(@types/express@5.0.6)(audio-decode@2.2.3)(hono@4.12.7)(node-llama-cpp@3.16.2(typescript@5.9.3))
extensions/imessage: {}
@@ -402,10 +401,10 @@ importers:
version: 4.3.6
extensions/memory-core:
- devDependencies:
+ dependencies:
openclaw:
- specifier: workspace:*
- version: link:../..
+ specifier: '>=2026.3.7'
+ version: 2026.3.8(@discordjs/opus@0.10.0)(@napi-rs/canvas@0.1.95)(@types/express@5.0.6)(audio-decode@2.2.3)(hono@4.12.7)(node-llama-cpp@3.16.2(typescript@5.9.3))
extensions/memory-lancedb:
dependencies:
@@ -551,8 +550,8 @@ importers:
specifier: 3.0.0
version: 3.0.0
dompurify:
- specifier: ^3.3.2
- version: 3.3.2
+ specifier: ^3.3.3
+ version: 3.3.3
lit:
specifier: ^3.3.2
version: 3.3.2
@@ -567,17 +566,17 @@ importers:
version: 0.21.1(signal-polyfill@0.2.2)
vite:
specifier: 7.3.1
- version: 7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+ version: 7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
devDependencies:
'@vitest/browser-playwright':
specifier: 4.0.18
- version: 4.0.18(playwright@1.58.2)(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)
+ version: 4.0.18(playwright@1.58.2)(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)
playwright:
specifier: ^1.58.2
version: 1.58.2
vitest:
specifier: 4.0.18
- version: 4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.3.5)(@vitest/browser-playwright@4.0.18)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+ version: 4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.4.0)(@vitest/browser-playwright@4.0.18)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
packages:
@@ -586,6 +585,11 @@ packages:
peerDependencies:
zod: ^3.25.0 || ^4.0.0
+ '@agentclientprotocol/sdk@0.16.1':
+ resolution: {integrity: sha512-1ad+Sc/0sCtZGHthxxvgEUo5Wsbw16I+aF+YwdiLnPwkZG8KAGUEAPK6LM6Pf69lCyJPt1Aomk1d+8oE3C4ZEw==}
+ peerDependencies:
+ zod: ^3.25.0 || ^4.0.0
+
'@anthropic-ai/sdk@0.73.0':
resolution: {integrity: sha512-URURVzhxXGJDGUGFunIOtBlSl7KWvZiAAKY/ttTkZAkXT9bTPqdk2eK0b8qqSxXpikh3QKPnPYpiyX98zf5ebw==}
hasBin: true
@@ -622,8 +626,8 @@ packages:
resolution: {integrity: sha512-t8cl+bPLlHZQD2Sw1a4hSLUybqJZU71+m8znkyeU8CHntFqEp2mMbuLKdHKaAYQ1fAApXMsvzenCAkDzNeeJlw==}
engines: {node: '>=20.0.0'}
- '@aws-sdk/client-bedrock@3.1004.0':
- resolution: {integrity: sha512-JbfZSV85IL+43S7rPBmeMbvoOYXs1wmrfbEpHkDBjkvbukRQWtoetiPAXNSKDfFq1qVsoq8sWPdoerDQwlUO8w==}
+ '@aws-sdk/client-bedrock@3.1007.0':
+ resolution: {integrity: sha512-49hH8o6ALKkCiBUgg20HkwxNamP1yYA/n8Si73Z438EqhZGpCfScP3FfxVhrfD5o+4bV4Whi9BTzPKCa/PfUww==}
engines: {node: '>=20.0.0'}
'@aws-sdk/client-s3@3.1000.0':
@@ -638,6 +642,10 @@ packages:
resolution: {integrity: sha512-GUIlegfcK2LO1J2Y98sCJy63rQSiLiDOgVw7HiHPRqfI2vb3XozTVqemwO0VSGXp54ngCnAQz0Lf0YPCBINNxA==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/core@3.973.19':
+ resolution: {integrity: sha512-56KePyOcZnKTWCd89oJS1G6j3HZ9Kc+bh/8+EbvtaCCXdP6T7O7NzCiPuHRhFLWnzXIaXX3CxAz0nI5My9spHQ==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/crc64-nvme@3.972.3':
resolution: {integrity: sha512-UExeK+EFiq5LAcbHm96CQLSia+5pvpUVSAsVApscBzayb7/6dJBJKwV4/onsk4VbWSmqxDMcfuTD+pC4RxgZHg==}
engines: {node: '>=20.0.0'}
@@ -650,6 +658,10 @@ packages:
resolution: {integrity: sha512-HrdtnadvTGAQUr18sPzGlE5El3ICphnH6SU7UQOMOWFgRKbTRNN8msTxM4emzguUso9CzaHU2xy5ctSrmK5YNA==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/credential-provider-env@3.972.17':
+ resolution: {integrity: sha512-MBAMW6YELzE1SdkOniqr51mrjapQUv8JXSGxtwRjQV0mwVDutVsn22OPAUt4RcLRvdiHQmNBDEFP9iTeSVCOlA==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/credential-provider-http@3.972.15':
resolution: {integrity: sha512-dJuSTreu/T8f24SHDNTjd7eQ4rabr0TzPh2UTCwYexQtzG3nTDKm1e5eIdhiroTMDkPEJeY+WPkA6F9wod/20A==}
engines: {node: '>=20.0.0'}
@@ -658,6 +670,10 @@ packages:
resolution: {integrity: sha512-NyB6smuZAixND5jZumkpkunQ0voc4Mwgkd+SZ6cvAzIB7gK8HV8Zd4rS8Kn5MmoGgusyNfVGG+RLoYc4yFiw+A==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/credential-provider-http@3.972.19':
+ resolution: {integrity: sha512-9EJROO8LXll5a7eUFqu48k6BChrtokbmgeMWmsH7lBb6lVbtjslUYz/ShLi+SHkYzTomiGBhmzTW7y+H4BxsnA==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/credential-provider-ini@3.972.13':
resolution: {integrity: sha512-JKSoGb7XeabZLBJptpqoZIFbROUIS65NuQnEHGOpuT9GuuZwag2qciKANiDLFiYk4u8nSrJC9JIOnWKVvPVjeA==}
engines: {node: '>=20.0.0'}
@@ -666,6 +682,10 @@ packages:
resolution: {integrity: sha512-dFqh7nfX43B8dO1aPQHOcjC0SnCJ83H3F+1LoCh3X1P7E7N09I+0/taID0asU6GCddfDExqnEvQtDdkuMe5tKQ==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/credential-provider-ini@3.972.18':
+ resolution: {integrity: sha512-vthIAXJISZnj2576HeyLBj4WTeX+I7PwWeRkbOa0mVX39K13SCGxCgOFuKj2ytm9qTlLOmXe4cdEnroteFtJfw==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/credential-provider-login@3.972.13':
resolution: {integrity: sha512-RtYcrxdnJHKY8MFQGLltCURcjuMjnaQpAxPE6+/QEdDHHItMKZgabRe/KScX737F9vJMQsmJy9EmMOkCnoC1JQ==}
engines: {node: '>=20.0.0'}
@@ -674,6 +694,10 @@ packages:
resolution: {integrity: sha512-gf2E5b7LpKb+JX2oQsRIDxdRZjBFZt2olCGlWCdb3vBERbXIPgm2t1R5mEnwd4j0UEO/Tbg5zN2KJbHXttJqwA==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/credential-provider-login@3.972.18':
+ resolution: {integrity: sha512-kINzc5BBxdYBkPZ0/i1AMPMOk5b5QaFNbYMElVw5QTX13AKj6jcxnv/YNl9oW9mg+Y08ti19hh01HhyEAxsSJQ==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/credential-provider-node@3.972.14':
resolution: {integrity: sha512-WqoC2aliIjQM/L3oFf6j+op/enT2i9Cc4UTxxMEKrJNECkq4/PlKE5BOjSYFcq6G9mz65EFbXJh7zOU4CvjSKQ==}
engines: {node: '>=20.0.0'}
@@ -682,6 +706,10 @@ packages:
resolution: {integrity: sha512-ZDJa2gd1xiPg/nBDGhUlat02O8obaDEnICBAVS8qieZ0+nDfaB0Z3ec6gjZj27OqFTjnB/Q5a0GwQwb7rMVViw==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/credential-provider-node@3.972.19':
+ resolution: {integrity: sha512-yDWQ9dFTr+IMxwanFe7+tbN5++q8psZBjlUwOiCXn1EzANoBgtqBwcpYcHaMGtn0Wlfj4NuXdf2JaEx1lz5RaQ==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/credential-provider-process@3.972.13':
resolution: {integrity: sha512-rsRG0LQA4VR+jnDyuqtXi2CePYSmfm5GNL9KxiW8DSe25YwJSr06W8TdUfONAC+rjsTI+aIH2rBGG5FjMeANrw==}
engines: {node: '>=20.0.0'}
@@ -690,6 +718,10 @@ packages:
resolution: {integrity: sha512-n89ibATwnLEg0ZdZmUds5bq8AfBAdoYEDpqP3uzPLaRuGelsKlIvCYSNNvfgGLi8NaHPNNhs1HjJZYbqkW9b+g==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/credential-provider-process@3.972.17':
+ resolution: {integrity: sha512-c8G8wT1axpJDgaP3xzcy+q8Y1fTi9A2eIQJvyhQ9xuXrUZhlCfXbC0vM9bM1CUXiZppFQ1p7g0tuUMvil/gCPg==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/credential-provider-sso@3.972.13':
resolution: {integrity: sha512-fr0UU1wx8kNHDhTQBXioc/YviSW8iXuAxHvnH7eQUtn8F8o/FU3uu6EUMvAQgyvn7Ne5QFnC0Cj0BFlwCk+RFw==}
engines: {node: '>=20.0.0'}
@@ -698,6 +730,10 @@ packages:
resolution: {integrity: sha512-wGtte+48xnhnhHMl/MsxzacBPs5A+7JJedjiP452IkHY7vsbYKcvQBqFye8LwdTJVeHtBHv+JFeTscnwepoWGg==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/credential-provider-sso@3.972.18':
+ resolution: {integrity: sha512-YHYEfj5S2aqInRt5ub8nDOX8vAxgMvd84wm2Y3WVNfFa/53vOv9T7WOAqXI25qjj3uEcV46xxfqdDQk04h5XQA==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/credential-provider-web-identity@3.972.13':
resolution: {integrity: sha512-a6iFMh1pgUH0TdcouBppLJUfPM7Yd3R9S1xFodPtCRoLqCz2RQFA3qjA8x4112PVYXEd4/pHX2eihapq39w0rA==}
engines: {node: '>=20.0.0'}
@@ -706,6 +742,10 @@ packages:
resolution: {integrity: sha512-8aiVJh6fTdl8gcyL+sVNcNwTtWpmoFa1Sh7xlj6Z7L/cZ/tYMEBHq44wTYG8Kt0z/PpGNopD89nbj3FHl9QmTA==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/credential-provider-web-identity@3.972.18':
+ resolution: {integrity: sha512-OqlEQpJ+J3T5B96qtC1zLLwkBloechP+fezKbCH0sbd2cCc0Ra55XpxWpk/hRj69xAOYtHvoC4orx6eTa4zU7g==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/eventstream-handler-node@3.972.10':
resolution: {integrity: sha512-g2Z9s6Y4iNh0wICaEqutgYgt/Pmhv5Ev9G3eKGFe2w9VuZDhc76vYdop6I5OocmpHV79d4TuLG+JWg5rQIVDVA==}
engines: {node: '>=20.0.0'}
@@ -770,6 +810,10 @@ packages:
resolution: {integrity: sha512-Km90fcXt3W/iqujHzuM6IaDkYCj73gsYufcuWXApWdzoTy6KGk8fnchAjePMARU0xegIR3K4N3yIo1vy7OVe8A==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/middleware-user-agent@3.972.20':
+ resolution: {integrity: sha512-3kNTLtpUdeahxtnJRnj/oIdLAUdzTfr9N40KtxNhtdrq+Q1RPMdCJINRXq37m4t5+r3H70wgC3opW46OzFcZYA==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/middleware-websocket@3.972.12':
resolution: {integrity: sha512-iyPP6FVDKe/5wy5ojC0akpDFG1vX3FeCUU47JuwN8xfvT66xlEI8qUJZPtN55TJVFzzWZJpWL78eqUE31md08Q==}
engines: {node: '>= 14.0.0'}
@@ -782,6 +826,10 @@ packages:
resolution: {integrity: sha512-MlGWA8uPaOs5AiTZ5JLM4uuWDm9EEAnm9cqwvqQIc6kEgel/8s1BaOWm9QgUcfc9K8qd7KkC3n43yDbeXOA2tg==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/nested-clients@3.996.8':
+ resolution: {integrity: sha512-6HlLm8ciMW8VzfB80kfIx16PBA9lOa9Dl+dmCBi78JDhvGlx3I7Rorwi5PpVRkL31RprXnYna3yBf6UKkD/PqA==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/region-config-resolver@3.972.6':
resolution: {integrity: sha512-Aa5PusHLXAqLTX1UKDvI3pHQJtIsF7Q+3turCHqfz/1F61/zDMWfbTC8evjhrrYVAtz9Vsv3SJ/waSUeu7B6gw==}
engines: {node: '>=20.0.0'}
@@ -802,6 +850,14 @@ packages:
resolution: {integrity: sha512-j9BwZZId9sFp+4GPhf6KrwO8Tben2sXibZA8D1vv2I1zBdvkUHcBA2g4pkqIpTRalMTLC0NPkBPX0gERxfy/iA==}
engines: {node: '>=20.0.0'}
+ '@aws-sdk/token-providers@3.1005.0':
+ resolution: {integrity: sha512-vMxd+ivKqSxU9bHx5vmAlFKDAkjGotFU56IOkDa5DaTu1WWwbcse0yFHEm9I537oVvodaiwMl3VBwgHfzQ2rvw==}
+ engines: {node: '>=20.0.0'}
+
+ '@aws-sdk/token-providers@3.1007.0':
+ resolution: {integrity: sha512-kKvVyr53vvVc5k6RbvI6jhafxufxO2SkEw8QeEzJqwOXH/IMY7Cm0IyhnBGdqj80iiIIiIM2jGe7Fn3TIdwdrw==}
+ engines: {node: '>=20.0.0'}
+
'@aws-sdk/token-providers@3.999.0':
resolution: {integrity: sha512-cx0hHUlgXULfykx4rdu/ciNAJaa3AL5xz3rieCz7NKJ68MJwlj3664Y8WR5MGgxfyYJBdamnkjNSx5Kekuc0cg==}
engines: {node: '>=20.0.0'}
@@ -862,6 +918,15 @@ packages:
aws-crt:
optional: true
+ '@aws-sdk/util-user-agent-node@3.973.5':
+ resolution: {integrity: sha512-Dyy38O4GeMk7UQ48RupfHif//gqnOPbq/zlvRssc11E2mClT+aUfc3VS2yD8oLtzqO3RsqQ9I3gOBB4/+HjPOw==}
+ engines: {node: '>=20.0.0'}
+ peerDependencies:
+ aws-crt: '>=1.0.0'
+ peerDependenciesMeta:
+ aws-crt:
+ optional: true
+
'@aws-sdk/xml-builder@3.972.10':
resolution: {integrity: sha512-OnejAIVD+CxzyAUrVic7lG+3QRltyja9LoNqCE/1YVs8ichoTbJlVSaZ9iSMcnHLyzrSNtvaOGjSDRP+d/ouFA==}
engines: {node: '>=20.0.0'}
@@ -1024,6 +1089,10 @@ packages:
resolution: {integrity: sha512-UyX6rGEXzVyPzb1yvjHtPfTlnLvB5jX/stAMdiytHhfoydX+98hfympdOwsnTktzr+IRvphxTbdErgYDJkEsvw==}
engines: {node: '>=22.12.0'}
+ '@discordjs/voice@0.19.1':
+ resolution: {integrity: sha512-XYbFVyUBB7zhRvrjREfiWDwio24nEp/vFaVe6u9aBIC5UYuT7HvoMt8LgNfZ5hOyaCW0flFr72pkhUGz+gWw4Q==}
+ engines: {node: '>=22.12.0'}
+
'@emnapi/core@1.8.1':
resolution: {integrity: sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==}
@@ -2102,116 +2171,116 @@ packages:
'@oxc-project/types@0.115.0':
resolution: {integrity: sha512-4n91DKnebUS4yjUHl2g3/b2T+IUdCfmoZGhmwsovZCDaJSs+QkVAM+0AqqTxHSsHfeiMuueT75cZaZcT/m0pSw==}
- '@oxfmt/binding-android-arm-eabi@0.36.0':
- resolution: {integrity: sha512-Z4yVHJWx/swHHjtr0dXrBZb6LxS+qNz1qdza222mWwPTUK4L790+5i3LTgjx3KYGBzcYpjaiZBw4vOx94dH7MQ==}
+ '@oxfmt/binding-android-arm-eabi@0.38.0':
+ resolution: {integrity: sha512-lTN4//sgYywK8ulQo7a/EZVzOTGomGQv2IG/7tMYdqTV3xN3QTqWpXcZBGUzaicC4B882N+5zJLYZ37IWfUMcg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm]
os: [android]
- '@oxfmt/binding-android-arm64@0.36.0':
- resolution: {integrity: sha512-3ElCJRFNPQl7jexf2CAa9XmAm8eC5JPrIDSjc9jSchkVSFTEqyL0NtZinBB2h1a4i4JgP1oGl/5G5n8YR4FN8Q==}
+ '@oxfmt/binding-android-arm64@0.38.0':
+ resolution: {integrity: sha512-XbVgqR1WsIcCkfxwh2tdg3M1MWgR23YOboW2nbB8ab0gInNNLGy7cIAdr78XaoG/bGdaF4488XRhuGWq67xrzA==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [android]
- '@oxfmt/binding-darwin-arm64@0.36.0':
- resolution: {integrity: sha512-nak4znWCqIExKhYSY/mz/lWsqWIpdsS7o0+SRzXR1Q0m7GrMcG1UrF1pS7TLGZhhkf7nTfEF7q6oZzJiodRDuw==}
+ '@oxfmt/binding-darwin-arm64@0.38.0':
+ resolution: {integrity: sha512-AHb6zUzWaSJra7lnPkI+Sqwu33bVWVTwCozcw9QTX8vwHaI1+5d5STqBcsJf63eSuRVRlflwMS4erlAPh3fXZw==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [darwin]
- '@oxfmt/binding-darwin-x64@0.36.0':
- resolution: {integrity: sha512-V4GP96thDnpKx6ADnMDnhIXNdtV+Ql9D4HUU+a37VTeVbs5qQSF/s6hhUP1b3xUqU7iRcwh72jUU2Y12rtGHAw==}
+ '@oxfmt/binding-darwin-x64@0.38.0':
+ resolution: {integrity: sha512-VmlmTyn7LL7Xi5htjosxGpJJHf3Drx5mgXxKE8+NT10uBXTaG3FHpRYhW3Zg5Qp7omH92Lj1+IHYqQG/HZpLnw==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [darwin]
- '@oxfmt/binding-freebsd-x64@0.36.0':
- resolution: {integrity: sha512-/xapWCADfI5wrhxpEUjhI9fnw7MV5BUZizVa8e24n3VSK6A3Y1TB/ClOP1tfxNspykFKXp4NBWl6NtDJP3osqQ==}
+ '@oxfmt/binding-freebsd-x64@0.38.0':
+ resolution: {integrity: sha512-LynMLRqaUEAV6n4svTFanFOAnJ9D6aCCfymJ2yhMSh5fYFgCCO4q5LzPV2nATKKoyPocSErFSmYREsOFbkIlCg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [freebsd]
- '@oxfmt/binding-linux-arm-gnueabihf@0.36.0':
- resolution: {integrity: sha512-1lOmv61XMFIH5uNm27620kRRzWt/RK6tdn250BRDoG9W7OXGOQ5UyI1HVT+SFkoOoKztBiinWgi68+NA1MjBVQ==}
+ '@oxfmt/binding-linux-arm-gnueabihf@0.38.0':
+ resolution: {integrity: sha512-HRRZtOXcss5+bGqQcYahILgt14+Iu/Olf6fnoKq5ctOzU21PGHVB+zuocgt+/+ixoMLV1Drvok3ns7QwnLwNTA==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm]
os: [linux]
- '@oxfmt/binding-linux-arm-musleabihf@0.36.0':
- resolution: {integrity: sha512-vMH23AskdR1ujUS9sPck2Df9rBVoZUnCVY86jisILzIQ/QQ/yKUTi7tgnIvydPx7TyB/48wsQ5QMr5Knq5p/aw==}
+ '@oxfmt/binding-linux-arm-musleabihf@0.38.0':
+ resolution: {integrity: sha512-kScH8XnH7TRUckMOSZ5115Vvr2CQq+iPsuXPEzwUXSxh+gDLzt+GsXuvCsaPxp1KP+dQj88VrIjeQ4V0f9NRKw==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm]
os: [linux]
- '@oxfmt/binding-linux-arm64-gnu@0.36.0':
- resolution: {integrity: sha512-Hy1V+zOBHpBiENRx77qrUTt5aPDHeCASRc8K5KwwAHkX2AKP0nV89eL17hsZrE9GmnXFjsNmd80lyf7aRTXsbw==}
+ '@oxfmt/binding-linux-arm64-gnu@0.38.0':
+ resolution: {integrity: sha512-PUVn/vGsMs83eLhNXLNjR+Qw/EPiNxU9Tx+p+aZBK0RT9/k6RNgh/O4F1TxS4tdISmf3SSgjdnMOVW3ZfQZ2mA==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [linux]
- '@oxfmt/binding-linux-arm64-musl@0.36.0':
- resolution: {integrity: sha512-SPGLJkOIHSIC6ABUQ5V8NqJpvYhMJueJv26NYqfCnwi/Mn6A61amkpJJ9Suy0Nmvs+OWESJpcebrBUbXPGZyQQ==}
+ '@oxfmt/binding-linux-arm64-musl@0.38.0':
+ resolution: {integrity: sha512-LhtmaLCMGtAIEtaTBAoKLF3QVt+IDKIjdEZvsf0msLeTUFKxyoTNScYBXbkmvqGrm37vV0JjTPvm+OaSh3np5A==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [linux]
- '@oxfmt/binding-linux-ppc64-gnu@0.36.0':
- resolution: {integrity: sha512-3EuoyB8x9x8ysYJjbEO/M9fkSk72zQKnXCvpZMDHXlnY36/1qMp55Nm0PrCwjGO/1pen5hdOVkz9WmP3nAp2IQ==}
+ '@oxfmt/binding-linux-ppc64-gnu@0.38.0':
+ resolution: {integrity: sha512-tO6tPaS21o0MaRqmOi9e3sDotlW4c+1gCx4SwdrfDXm3Y1vmIZWh0qB6t/Xh77bIGVr/4fC95eKOhKLPGwdL+Q==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [ppc64]
os: [linux]
- '@oxfmt/binding-linux-riscv64-gnu@0.36.0':
- resolution: {integrity: sha512-MpY3itLwpGh8dnywtrZtaZ604T1m715SydCKy0+qTxetv+IHzuA+aO/AGzrlzUNYZZmtWtmDBrChZGibvZxbRQ==}
+ '@oxfmt/binding-linux-riscv64-gnu@0.38.0':
+ resolution: {integrity: sha512-djEqwFUHczstFKp5aT43TuRWxyKZSkIZUfGXIEKa0srmIAt1CXQO5O8xLgNG4SGkXTRB1domFfCE68t9SkSmfA==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [riscv64]
os: [linux]
- '@oxfmt/binding-linux-riscv64-musl@0.36.0':
- resolution: {integrity: sha512-mmDhe4Vtx+XwQPRPn/V25+APnkApYgZ23q+6GVsNYY98pf3aU0aI3Me96pbRs/AfJ1jIiGC+/6q71FEu8dHcHw==}
+ '@oxfmt/binding-linux-riscv64-musl@0.38.0':
+ resolution: {integrity: sha512-76EgMMtS6sIE+9Pl9q2GZgZpbZSzqtjQhUUIWl0RVNfHg66tstdJMhY2LXESjDYhc5vFYt9qdQNM0w0zg3onPw==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [riscv64]
os: [linux]
- '@oxfmt/binding-linux-s390x-gnu@0.36.0':
- resolution: {integrity: sha512-AYXhU+DmNWLSnvVwkHM92fuYhogtVHab7UQrPNaDf1sxadugg9gWVmcgJDlIwxJdpk5CVW/TFvwUKwI432zhhA==}
+ '@oxfmt/binding-linux-s390x-gnu@0.38.0':
+ resolution: {integrity: sha512-JYNr3i9z/YguZg088kopjvz49hDxTEL193mYL2/02uq/6BLlQRMaKrePEITTHm/vUu4ZquAKgu4mDib6pGWdyg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [s390x]
os: [linux]
- '@oxfmt/binding-linux-x64-gnu@0.36.0':
- resolution: {integrity: sha512-H16QhhQ3usoakMleiAAQ2mg0NsBDAdyE9agUgfC8IHHh3jZEbr0rIKwjEqwbOHK5M0EmfhJmr+aGO/MgZPsneA==}
+ '@oxfmt/binding-linux-x64-gnu@0.38.0':
+ resolution: {integrity: sha512-Lf+/Keaw1kBKx0U3HT5PsA7/3VO4ZOmaqo4sWaeAJ6tYeX8h/2IZcEONhjry6T4BETza78z6xI3Qx+18QZix6A==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [linux]
- '@oxfmt/binding-linux-x64-musl@0.36.0':
- resolution: {integrity: sha512-EFFGkixA39BcmHiCe2ECdrq02D6FCve5ka6ObbvrheXl4V+R0U/E+/uLyVx1X65LW8TA8QQHdnbdDallRekohw==}
+ '@oxfmt/binding-linux-x64-musl@0.38.0':
+ resolution: {integrity: sha512-4O6sf6OQuz1flk0TDrrtmXOVO3letA7fYe2IEAiJOQvKhJcMU08NiIVODQjMGZ6IQh1q91B+TlliDfbsYalw8A==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [linux]
- '@oxfmt/binding-openharmony-arm64@0.36.0':
- resolution: {integrity: sha512-zr/t369wZWFOj1qf06Z5gGNjFymfUNDrxKMmr7FKiDRVI1sNsdKRCuRL4XVjtcptKQ+ao3FfxLN1vrynivmCYg==}
+ '@oxfmt/binding-openharmony-arm64@0.38.0':
+ resolution: {integrity: sha512-GNocbjYnielmKVBk+r/2Vc4E3oTsAO4+5gRuroUVx86Jv+mpD+hyFkf260/by0YtpF1ipqyxR8chOSgRQvD2zQ==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [openharmony]
- '@oxfmt/binding-win32-arm64-msvc@0.36.0':
- resolution: {integrity: sha512-FxO7UksTv8h4olzACgrqAXNF6BP329+H322323iDrMB5V/+a1kcAw07fsOsUmqNrb9iJBsCQgH/zqcqp5903ag==}
+ '@oxfmt/binding-win32-arm64-msvc@0.38.0':
+ resolution: {integrity: sha512-AwgjBHRxPckbazLpECuPOSzYlppYR1CBeUSuzZuClsmTnlZA9O1MexCEP9CROe03Yo1xBGvYtiCjwKZMBChGkg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [win32]
- '@oxfmt/binding-win32-ia32-msvc@0.36.0':
- resolution: {integrity: sha512-OjoMQ89H01M0oLMfr/CPNH1zi48ZIwxAKObUl57oh7ssUBNDp/2Vjf7E1TQ8M4oj4VFQ/byxl2SmcPNaI2YNDg==}
+ '@oxfmt/binding-win32-ia32-msvc@0.38.0':
+ resolution: {integrity: sha512-c3u+ak6Zrh1g6pM2TgNVvOgkm7q1XaIX+5Mgxvu38ozJ5OfM8c7HZk3glMdBzlTD2uK0sSfgBq1kuXwCe1NOGg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [ia32]
os: [win32]
- '@oxfmt/binding-win32-x64-msvc@0.36.0':
- resolution: {integrity: sha512-MoyeQ9S36ZTz/4bDhOKJgOBIDROd4dQ5AkT9iezhEaUBxAPdNX9Oq0jD8OSnCj3G4wam/XNxVWKMA52kmzmPtQ==}
+ '@oxfmt/binding-win32-x64-msvc@0.38.0':
+ resolution: {integrity: sha512-wud1Hz0D2hYrhk6exxQQndn1htcA28wAcFb1vtP3ZXSzPFtMvc7ag/VNPv6nz6mDzM8X660jUwGEac99QcrVsA==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [win32]
@@ -2246,116 +2315,116 @@ packages:
cpu: [x64]
os: [win32]
- '@oxlint/binding-android-arm-eabi@1.51.0':
- resolution: {integrity: sha512-jJYIqbx4sX+suIxWstc4P7SzhEwb4ArWA2KVrmEuu9vH2i0qM6QIHz/ehmbGE4/2fZbpuMuBzTl7UkfNoqiSgw==}
+ '@oxlint/binding-android-arm-eabi@1.53.0':
+ resolution: {integrity: sha512-JC89/jAx4d2zhDIbK8MC4L659FN1WiMXMBkNg7b33KXSkYpUgcbf+0nz7+EPRg+VwWiZVfaoFkNHJ7RXYb5Neg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm]
os: [android]
- '@oxlint/binding-android-arm64@1.51.0':
- resolution: {integrity: sha512-GtXyBCcH4ti98YdiMNCrpBNGitx87EjEWxevnyhcBK12k/Vu4EzSB45rzSC4fGFUD6sQgeaxItRCEEWeVwPafw==}
+ '@oxlint/binding-android-arm64@1.53.0':
+ resolution: {integrity: sha512-CY+pZfi+uyeU7AwFrEnjsNT+VfxYmKLMuk7bVxArd8f+09hQbJb8f7C7EpvTfNqrCK1J8zZlaYI4LltmEctgbQ==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [android]
- '@oxlint/binding-darwin-arm64@1.51.0':
- resolution: {integrity: sha512-3QJbeYaMHn6Bh2XeBXuITSsbnIctyTjvHf5nRjKYrT9pPeErNIpp5VDEeAXC0CZSwSVTsc8WOSDwgrAI24JolQ==}
+ '@oxlint/binding-darwin-arm64@1.53.0':
+ resolution: {integrity: sha512-0aqsC4HDQ94oI6kMz64iaOJ1f3bCVArxvaHJGOScBvFz6CcQedXi5b70Xg09CYjKNaHA56dW0QJfoZ/111kz1A==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [darwin]
- '@oxlint/binding-darwin-x64@1.51.0':
- resolution: {integrity: sha512-NzErhMaTEN1cY0E8C5APy74lw5VwsNfJfVPBMWPVQLqAbO0k4FFLjvHURvkUL+Y18Wu+8Vs1kbqPh2hjXYA4pg==}
+ '@oxlint/binding-darwin-x64@1.53.0':
+ resolution: {integrity: sha512-e+KvuaWtnisyWojO/t5qKDbp2dvVpg+1dl4MGnTb21QpY4+4+9Y1XmZPaztcA2XNvy4BIaXFW+9JH9tMpSBqUg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [darwin]
- '@oxlint/binding-freebsd-x64@1.51.0':
- resolution: {integrity: sha512-msAIh3vPAoKoHlOE/oe6Q5C/n9umypv/k81lED82ibrJotn+3YG2Qp1kiR8o/Dg5iOEU97c6tl0utxcyFenpFw==}
+ '@oxlint/binding-freebsd-x64@1.53.0':
+ resolution: {integrity: sha512-hpU0ZHVeblFjmZDfgi9BxhhCpURh0KjoFy5V+Tvp9sg/fRcnMUEfaJrgz+jQfOX4jctlVWrAs1ANs91+5iV+zA==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [freebsd]
- '@oxlint/binding-linux-arm-gnueabihf@1.51.0':
- resolution: {integrity: sha512-CqQPcvqYyMe9ZBot2stjGogEzk1z8gGAngIX7srSzrzexmXixwVxBdFZyxTVM0CjGfDeV+Ru0w25/WNjlMM2Hw==}
+ '@oxlint/binding-linux-arm-gnueabihf@1.53.0':
+ resolution: {integrity: sha512-ccKxOpw+X4xa2pO+qbTOpxQ2x1+Ag3ViRQMnWt3gHp1LcpNgS1xd6GYc3OvehmHtrXqEV3YGczZ0I1qpBB4/2A==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm]
os: [linux]
- '@oxlint/binding-linux-arm-musleabihf@1.51.0':
- resolution: {integrity: sha512-dstrlYQgZMnyOssxSbolGCge/sDbko12N/35RBNuqLpoPbft2aeBidBAb0dvQlyBd9RJ6u8D4o4Eh8Un6iTgyQ==}
+ '@oxlint/binding-linux-arm-musleabihf@1.53.0':
+ resolution: {integrity: sha512-UBkBvmzSmlyH2ZObQMDKW/TuyTmUtP/XClPUyU2YLwj0qLopZTZxnDz4VG5d3wz1HQuZXO0o1QqsnQUW1v4a6Q==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm]
os: [linux]
- '@oxlint/binding-linux-arm64-gnu@1.51.0':
- resolution: {integrity: sha512-QEjUpXO7d35rP1/raLGGbAsBLLGZIzV3ZbeSjqWlD3oRnxpRIZ6iL4o51XQHkconn3uKssc+1VKdtHJ81BBhDA==}
+ '@oxlint/binding-linux-arm64-gnu@1.53.0':
+ resolution: {integrity: sha512-PQJJ1izoH9p61las6rZ0BWOznAhTDMmdUPL2IEBLuXFwhy2mSloYHvRkk39PSYJ1DyG+trqU5Z9ZbtHSGH6plg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [linux]
- '@oxlint/binding-linux-arm64-musl@1.51.0':
- resolution: {integrity: sha512-YSJua5irtG4DoMAjUapDTPhkQLHhBIY0G9JqlZS6/SZPzqDkPku/1GdWs0D6h/wyx0Iz31lNCfIaWKBQhzP0wQ==}
+ '@oxlint/binding-linux-arm64-musl@1.53.0':
+ resolution: {integrity: sha512-GXI1o4Thn/rtnRIL38BwrDMwVcUbIHKCsOixIWf/CkU3fCG3MXFzFTtDMt+34ik0Qk452d8kcpksL0w/hUkMZA==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [linux]
- '@oxlint/binding-linux-ppc64-gnu@1.51.0':
- resolution: {integrity: sha512-7L4Wj2IEUNDETKssB9IDYt16T6WlF+X2jgC/hBq3diGHda9vJLpAgb09+D3quFq7TdkFtI7hwz/jmuQmQFPc1Q==}
+ '@oxlint/binding-linux-ppc64-gnu@1.53.0':
+ resolution: {integrity: sha512-Uahk7IVs2yBamCgeJ3XKpKT9Vh+de0pDKISFKnjEcI3c/w2CFHk1+W6Q6G3KI56HGwE9PWCp6ayhA9whXWkNIQ==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [ppc64]
os: [linux]
- '@oxlint/binding-linux-riscv64-gnu@1.51.0':
- resolution: {integrity: sha512-cBUHqtOXy76G41lOB401qpFoKx1xq17qYkhWrLSM7eEjiHM9sOtYqpr6ZdqCnN9s6ZpzudX4EkeHOFH2E9q0vA==}
+ '@oxlint/binding-linux-riscv64-gnu@1.53.0':
+ resolution: {integrity: sha512-sWtcU9UkrKMWsGKdFy8R6jkm9Q0VVG1VCpxVuh0HzRQQi3ENI1Nh5CkpsdfUs2MKRcOoHKbXqTscunuXjhxoxQ==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [riscv64]
os: [linux]
- '@oxlint/binding-linux-riscv64-musl@1.51.0':
- resolution: {integrity: sha512-WKbg8CysgZcHfZX0ixQFBRSBvFZUHa3SBnEjHY2FVYt2nbNJEjzTxA3ZR5wMU0NOCNKIAFUFvAh5/XJKPRJuJg==}
+ '@oxlint/binding-linux-riscv64-musl@1.53.0':
+ resolution: {integrity: sha512-aXew1+HDvCdExijX/8NBVC854zJwxhKP3l9AHFSHQNo4EanlHtzDMIlIvP3raUkL0vXtFCkTFYezzU5HjstB8A==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [riscv64]
os: [linux]
- '@oxlint/binding-linux-s390x-gnu@1.51.0':
- resolution: {integrity: sha512-N1QRUvJTxqXNSu35YOufdjsAVmKVx5bkrggOWAhTWBc3J4qjcBwr1IfyLh/6YCg8sYRSR1GraldS9jUgJL/U4A==}
+ '@oxlint/binding-linux-s390x-gnu@1.53.0':
+ resolution: {integrity: sha512-rVpyBSqPGou9sITcsoXqUoGBUH74bxYLYOAGUqN599Zu6BQBlBU9hh3bJQ/20D1xrhhrsbiCpVPvXpLPM5nL1w==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [s390x]
os: [linux]
- '@oxlint/binding-linux-x64-gnu@1.51.0':
- resolution: {integrity: sha512-e0Mz0DizsCoqNIjeOg6OUKe8JKJWZ5zZlwsd05Bmr51Jo3AOL4UJnPvwKumr4BBtBrDZkCmOLhCvDGm95nJM2g==}
+ '@oxlint/binding-linux-x64-gnu@1.53.0':
+ resolution: {integrity: sha512-eOyeQ8qFQ2geXmlWJuXAOaek0hFhbMLlYsU457NMLKDRoC43Xf+eDPZ9Yk0n9jDaGJ5zBl/3Dy8wo41cnIXuLA==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [linux]
- '@oxlint/binding-linux-x64-musl@1.51.0':
- resolution: {integrity: sha512-wD8HGTWhYBKXvRDvoBVB1y+fEYV01samhWQSy1Zkxq2vpezvMnjaFKRuiP6tBNITLGuffbNDEXOwcAhJ3gI5Ug==}
+ '@oxlint/binding-linux-x64-musl@1.53.0':
+ resolution: {integrity: sha512-S6rBArW/zD1tob8M9PwKYrRmz+j1ss1+wjbRAJCWKd7TC3JB6noDiA95pIj9zOZVVp04MIzy5qymnYusrEyXzg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [linux]
- '@oxlint/binding-openharmony-arm64@1.51.0':
- resolution: {integrity: sha512-5NSwQ2hDEJ0GPXqikjWtwzgAQCsS7P9aLMNenjjKa+gknN3lTCwwwERsT6lKXSirfU3jLjexA2XQvQALh5h27w==}
+ '@oxlint/binding-openharmony-arm64@1.53.0':
+ resolution: {integrity: sha512-sd/A0Ny5sN0D/MJtlk7w2jGY4bJQou7gToa9WZF7Sj6HTyVzvlzKJWiOHfr4SulVk4ndiFQ8rKmF9rXP0EcF3A==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [openharmony]
- '@oxlint/binding-win32-arm64-msvc@1.51.0':
- resolution: {integrity: sha512-JEZyah1M0RHMw8d+jjSSJmSmO8sABA1J1RtrHYujGPeCkYg1NeH0TGuClpe2h5QtioRTaF57y/TZfn/2IFV6fA==}
+ '@oxlint/binding-win32-arm64-msvc@1.53.0':
+ resolution: {integrity: sha512-QC3q7b51Er/ZurEFcFzc7RpQ/YEoEBLJuCp3WoOzhSHHH/nkUKFy+igOxlj1z3LayhEZPDQQ7sXvv2PM2cdG3Q==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [win32]
- '@oxlint/binding-win32-ia32-msvc@1.51.0':
- resolution: {integrity: sha512-q3cEoKH6kwjz/WRyHwSf0nlD2F5Qw536kCXvmlSu+kaShzgrA0ojmh45CA81qL+7udfCaZL2SdKCZlLiGBVFlg==}
+ '@oxlint/binding-win32-ia32-msvc@1.53.0':
+ resolution: {integrity: sha512-3OvLgOqwd705hWHV2i8ni80pilvg6BUgpC2+xtVu++e/q28LKVohGh5J5QYJOrRMfWmxK0M/AUu43vUw62LAKQ==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [ia32]
os: [win32]
- '@oxlint/binding-win32-x64-msvc@1.51.0':
- resolution: {integrity: sha512-Q14+fOGb9T28nWF/0EUsYqERiRA7cl1oy4TJrGmLaqhm+aO2cV+JttboHI3CbdeMCAyDI1+NoSlrM7Melhp/cw==}
+ '@oxlint/binding-win32-x64-msvc@1.53.0':
+ resolution: {integrity: sha512-xTiOkntexCdJytZ7ArIIgl3vGW5ujMM3sJNM7/+iqGAVJagCqjFFWn68HRWRLeyT66c95uR+CeFmQFI6mLQqDw==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [win32]
@@ -2461,97 +2530,97 @@ packages:
resolution: {integrity: sha512-DmCG8GzysnCZ15bres3N5AHCmwBwYgp0As6xjhQ47rAUTUXxJiK+lLUxaGsX3hd/30qUpVElh05PbGuxRPgJwA==}
engines: {node: '>= 10'}
- '@rolldown/binding-android-arm64@1.0.0-rc.7':
- resolution: {integrity: sha512-/uadfNUaMLFFBGvcIOiq8NnlhvTZTjOyybJaJnhGxD0n9k5vZRJfTaitH5GHnbwmc6T2PC+ZpS1FQH+vXyS/UA==}
+ '@rolldown/binding-android-arm64@1.0.0-rc.9':
+ resolution: {integrity: sha512-lcJL0bN5hpgJfSIz/8PIf02irmyL43P+j1pTCfbD1DbLkmGRuFIA4DD3B3ZOvGqG0XiVvRznbKtN0COQVaKUTg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [android]
- '@rolldown/binding-darwin-arm64@1.0.0-rc.7':
- resolution: {integrity: sha512-zokYr1KgRn0hRA89dmgtPj/BmKp9DxgrfAJvOEFfXa8nfYWW2nmgiYIBGpSIAJrEg7Qc/Qznovy6xYwmKh0M8g==}
+ '@rolldown/binding-darwin-arm64@1.0.0-rc.9':
+ resolution: {integrity: sha512-J7Zk3kLYFsLtuH6U+F4pS2sYVzac0qkjcO5QxHS7OS7yZu2LRs+IXo+uvJ/mvpyUljDJ3LROZPoQfgBIpCMhdQ==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [darwin]
- '@rolldown/binding-darwin-x64@1.0.0-rc.7':
- resolution: {integrity: sha512-eZFjbmrapCBVgMmuLALH3pmQQQStHFuRhsFceJHk6KISW8CkI2e9OPLp9V4qXksrySQcD8XM8fpvGLs5l5C7LQ==}
+ '@rolldown/binding-darwin-x64@1.0.0-rc.9':
+ resolution: {integrity: sha512-iwtmmghy8nhfRGeNAIltcNXzD0QMNaaA5U/NyZc1Ia4bxrzFByNMDoppoC+hl7cDiUq5/1CnFthpT9n+UtfFyg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [darwin]
- '@rolldown/binding-freebsd-x64@1.0.0-rc.7':
- resolution: {integrity: sha512-xjMrh8Dmu2DNwdY6DZsrF6YPGeesc3PaTlkh8v9cqmkSCNeTxnhX3ErhVnuv1j3n8t2IuuhQIwM9eZDINNEt5Q==}
+ '@rolldown/binding-freebsd-x64@1.0.0-rc.9':
+ resolution: {integrity: sha512-DLFYI78SCiZr5VvdEplsVC2Vx53lnA4/Ga5C65iyldMVaErr86aiqCoNBLl92PXPfDtUYjUh+xFFor40ueNs4Q==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [freebsd]
- '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.7':
- resolution: {integrity: sha512-mOvftrHiXg4/xFdxJY3T9Wl1/zDAOSlMN8z9an2bXsCwuvv3RdyhYbSMZDuDO52S04w9z7+cBd90lvQSPTAQtw==}
+ '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.9':
+ resolution: {integrity: sha512-CsjTmTwd0Hri6iTw/DRMK7kOZ7FwAkrO4h8YWKoX/kcj833e4coqo2wzIFywtch/8Eb5enQ/lwLM7w6JX1W5RQ==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm]
os: [linux]
- '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.7':
- resolution: {integrity: sha512-TuUkeuEEPRyXMBbJ86NRhAiPNezxHW8merl3Om2HASA9Pl1rI+VZcTtsVQ6v/P0MDIFpSl0k0+tUUze9HIXyEw==}
+ '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.9':
+ resolution: {integrity: sha512-2x9O2JbSPxpxMDhP9Z74mahAStibTlrBMW0520+epJH5sac7/LwZW5Bmg/E6CXuEF53JJFW509uP+lSedaUNxg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [linux]
- '@rolldown/binding-linux-arm64-musl@1.0.0-rc.7':
- resolution: {integrity: sha512-G43ZElEvaby+YSOgrXfBgpeQv42LdS0ivFFYQufk2tBDWeBfzE/+ob5DmO8Izbyn4Y8k6GgLF11jFDYNnmU/3w==}
+ '@rolldown/binding-linux-arm64-musl@1.0.0-rc.9':
+ resolution: {integrity: sha512-JA1QRW31ogheAIRhIg9tjMfsYbglXXYGNPLdPEYrwFxdbkQCAzvpSCSHCDWNl4hTtrol8WeboCSEpjdZK8qrCg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [linux]
- '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.7':
- resolution: {integrity: sha512-Y48ShVxGE2zUTt0A0PR3grCLNxW4DWtAfe5lxf6L3uYEQujwo/LGuRogMsAtOJeYLCPTJo2i714LOdnK34cHpw==}
+ '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.9':
+ resolution: {integrity: sha512-aOKU9dJheda8Kj8Y3w9gnt9QFOO+qKPAl8SWd7JPHP+Cu0EuDAE5wokQubLzIDQWg2myXq2XhTpOVS07qqvT+w==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [ppc64]
os: [linux]
- '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.7':
- resolution: {integrity: sha512-KU5DUYvX3qI8/TX6D3RA4awXi4Ge/1+M6Jqv7kRiUndpqoVGgD765xhV3Q6QvtABnYjLJenrWDl3S1B5U56ixA==}
+ '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.9':
+ resolution: {integrity: sha512-OalO94fqj7IWRn3VdXWty75jC5dk4C197AWEuMhIpvVv2lw9fiPhud0+bW2ctCxb3YoBZor71QHbY+9/WToadA==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [s390x]
os: [linux]
- '@rolldown/binding-linux-x64-gnu@1.0.0-rc.7':
- resolution: {integrity: sha512-1THb6FdBkAEL12zvUue2bmK4W1+P+tz8Pgu5uEzq+xrtYa3iBzmmKNlyfUzCFNCqsPd8WJEQrYdLcw4iMW4AVw==}
+ '@rolldown/binding-linux-x64-gnu@1.0.0-rc.9':
+ resolution: {integrity: sha512-cVEl1vZtBsBZna3YMjGXNvnYYrOJ7RzuWvZU0ffvJUexWkukMaDuGhUXn0rjnV0ptzGVkvc+vW9Yqy6h8YX4pg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [linux]
- '@rolldown/binding-linux-x64-musl@1.0.0-rc.7':
- resolution: {integrity: sha512-12o73atFNWDgYnLyA52QEUn9AH8pHIe12W28cmqjyHt4bIEYRzMICvYVCPa2IQm6DJBvCBrEhD9K+ct4wr2hwg==}
+ '@rolldown/binding-linux-x64-musl@1.0.0-rc.9':
+ resolution: {integrity: sha512-UzYnKCIIc4heAKgI4PZ3dfBGUZefGCJ1TPDuLHoCzgrMYPb5Rv6TLFuYtyM4rWyHM7hymNdsg5ik2C+UD9VDbA==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [linux]
- '@rolldown/binding-openharmony-arm64@1.0.0-rc.7':
- resolution: {integrity: sha512-+uUgGwvuUCXl894MTsmTS2J0BnCZccFsmzV7y1jFxW5pTSxkuwL5agyPuDvDOztPeS6RrdqWkn7sT0jRd0ECkg==}
+ '@rolldown/binding-openharmony-arm64@1.0.0-rc.9':
+ resolution: {integrity: sha512-+6zoiF+RRyf5cdlFQP7nm58mq7+/2PFaY2DNQeD4B87N36JzfF/l9mdBkkmTvSYcYPE8tMh/o3cRlsx1ldLfog==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [openharmony]
- '@rolldown/binding-wasm32-wasi@1.0.0-rc.7':
- resolution: {integrity: sha512-53p2L/NSy21UiFOqUGlC11kJDZS2Nx2GJRz1QvbkXovypA3cOHbsyZHLkV72JsLSbiEQe+kg4tndUhSiC31UEA==}
+ '@rolldown/binding-wasm32-wasi@1.0.0-rc.9':
+ resolution: {integrity: sha512-rgFN6sA/dyebil3YTlL2evvi/M+ivhfnyxec7AccTpRPccno/rPoNlqybEZQBkcbZu8Hy+eqNJCqfBR8P7Pg8g==}
engines: {node: '>=14.0.0'}
cpu: [wasm32]
- '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.7':
- resolution: {integrity: sha512-K6svNRljO6QrL6VTKxwh4yThhlR9DT/tK0XpaFQMnJwwQKng+NYcVEtUkAM0WsoiZHw+Hnh3DGnn3taf/pNYGg==}
+ '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.9':
+ resolution: {integrity: sha512-lHVNUG/8nlF1IQk1C0Ci574qKYyty2goMiPlRqkC5R+3LkXDkL5Dhx8ytbxq35m+pkHVIvIxviD+TWLdfeuadA==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [win32]
- '@rolldown/binding-win32-x64-msvc@1.0.0-rc.7':
- resolution: {integrity: sha512-3ZJBT47VWLKVKIyvHhUSUgVwHzzZW761YAIkM3tOT+8ZTjFVp0acCM0Y2Z2j3jCl+XYi2d9y2uEWQ8H0PvvpPw==}
+ '@rolldown/binding-win32-x64-msvc@1.0.0-rc.9':
+ resolution: {integrity: sha512-G0oA4+w1iY5AGi5HcDTxWsoxF509hrFIPB2rduV5aDqS9FtDg1CAfa7V34qImbjfhIcA8C+RekocJZA96EarwQ==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [win32]
- '@rolldown/pluginutils@1.0.0-rc.7':
- resolution: {integrity: sha512-qujRfC8sFVInYSPPMLQByRh7zhwkGFS4+tyMQ83srV1qrxL4g8E2tyxVVyxd0+8QeBM1mIk9KbWxkegRr76XzA==}
+ '@rolldown/pluginutils@1.0.0-rc.9':
+ resolution: {integrity: sha512-w6oiRWgEBl04QkFZgmW+jnU1EC9b57Oihi2ot3HNWIQRqgHp5PnYDia5iZ5FF7rpa4EQdiqMDXjlqKGXBhsoXw==}
'@rollup/rollup-android-arm-eabi@4.59.0':
resolution: {integrity: sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==}
@@ -3138,6 +3207,93 @@ packages:
resolution: {integrity: sha512-O/IEdcCUKkubz60tFbGA7ceITTAJsty+lBjNoorP4Z6XRqaFb/OjQjZODophEcuq68nKm6/0r+6/lLQ+XVpk8g==}
engines: {node: '>=18.0.0'}
+ '@snazzah/davey-android-arm-eabi@0.1.10':
+ resolution: {integrity: sha512-7bwHxSNEI2wVXOT6xnmpnO9SHb2xwAnf9oEdL45dlfVHTgU1Okg5rwGwRvZ2aLVFFbTyecfC8EVZyhpyTkjLSw==}
+ engines: {node: '>= 10'}
+ cpu: [arm]
+ os: [android]
+
+ '@snazzah/davey-android-arm64@0.1.10':
+ resolution: {integrity: sha512-68WUf2LQwQTP9MgPcCqTWwJztJSIk0keGfF2Y/b+MihSDh29fYJl7C0rbz69aUrVCvCC2lYkB/46P8X1kBz7yg==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [android]
+
+ '@snazzah/davey-darwin-arm64@0.1.10':
+ resolution: {integrity: sha512-nYC+DWCGUC1jUGEenCNQE/jJpL/02m0ebY/NvTCQbul5ktI/ShVzgA3kzssEhZvhf6jbH048Rs39wDhp/b24Jg==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [darwin]
+
+ '@snazzah/davey-darwin-x64@0.1.10':
+ resolution: {integrity: sha512-0q5Rrcs+O9sSSnPX+A3R3djEQs2nTAtMe5N3lApO6lZas/QNMl6wkEWCvTbDc2cfAYBMSk2jgc1awlRXi4LX3Q==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [darwin]
+
+ '@snazzah/davey-freebsd-x64@0.1.10':
+ resolution: {integrity: sha512-/Gq5YDD6Oz8iBqVJLswUnetCv9JCRo1quYX5ujzpAG8zPCNItZo4g4h5p9C+h4Yoay2quWBYhoaVqQKT96bm8g==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [freebsd]
+
+ '@snazzah/davey-linux-arm-gnueabihf@0.1.10':
+ resolution: {integrity: sha512-0Z7Vrt0WIbgxws9CeHB9qlueYJlvltI44rUuZmysdi70UcHGxlr7nE3MnzYCr9nRWRegohn8EQPWHMKMDJH2GA==}
+ engines: {node: '>= 10'}
+ cpu: [arm]
+ os: [linux]
+
+ '@snazzah/davey-linux-arm64-gnu@0.1.10':
+ resolution: {integrity: sha512-xhZQycn4QB+qXhqm/QmZ+kb9MHMXcbjjoPfvcIL4WMQXFG/zUWHW8EiBk7ZTEGMOpeab3F9D1+MlgumglYByUQ==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [linux]
+
+ '@snazzah/davey-linux-arm64-musl@0.1.10':
+ resolution: {integrity: sha512-pudzQCP9rZItwW4qHHvciMwtNd9kWH4l73g6Id1LRpe6sc8jiFBV7W+YXITj2PZbI0by6XPfkRP6Dk5IkGOuAw==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [linux]
+
+ '@snazzah/davey-linux-x64-gnu@0.1.10':
+ resolution: {integrity: sha512-DC8qRmk+xJEFNqjxKB46cETKeDQqgUqE5p39KXS2k6Vl/XTi8pw8pXOxrPfYte5neoqlWAVQzbxuLnwpyRJVEQ==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [linux]
+
+ '@snazzah/davey-linux-x64-musl@0.1.10':
+ resolution: {integrity: sha512-wPR5/2QmsF7sR0WUaCwbk4XI3TLcxK9PVK8mhgcAYyuRpbhcVgNGWXs8ulcyMSXve5pFRJAFAuMTGCEb014peg==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [linux]
+
+ '@snazzah/davey-wasm32-wasi@0.1.10':
+ resolution: {integrity: sha512-SfQavU+eKTDbRmPeLRodrVSfsWq25PYTmH1nIZW3B27L6IkijzjXZZuxiU1ZG1gdI5fB7mwXrOTtx34t+vAG7Q==}
+ engines: {node: '>=14.0.0'}
+ cpu: [wasm32]
+
+ '@snazzah/davey-win32-arm64-msvc@0.1.10':
+ resolution: {integrity: sha512-Raafk53smYs67wZCY9bQXHXzbaiRMS5QCdjTdin3D9fF5A06T/0Zv1z7/YnaN+O3GSL/Ou3RvynF7SziToYiFQ==}
+ engines: {node: '>= 10'}
+ cpu: [arm64]
+ os: [win32]
+
+ '@snazzah/davey-win32-ia32-msvc@0.1.10':
+ resolution: {integrity: sha512-pAs43l/DiZ+icqBwxIwNePzuYxFM1ZblVuf7t6vwwSLxvova7vnREnU7qDVjbc5/YTUHOsqYy3S6TpZMzDo2lw==}
+ engines: {node: '>= 10'}
+ cpu: [ia32]
+ os: [win32]
+
+ '@snazzah/davey-win32-x64-msvc@0.1.10':
+ resolution: {integrity: sha512-kr6148VVBoUT4CtD+5hYshTFRny7R/xQZxXFhFc0fYjtmdMVM8Px9M91olg1JFNxuNzdfMfTufR58Q3wfBocug==}
+ engines: {node: '>= 10'}
+ cpu: [x64]
+ os: [win32]
+
+ '@snazzah/davey@0.1.10':
+ resolution: {integrity: sha512-J5f7vV5/tnj0xGnqufFRd6qiWn3FcR3iXjpjpEmO2Ok+Io0AASkMaZ3I39TsL45as0Qo5bq9wWuamFQ77PjJ+g==}
+ engines: {node: '>= 10'}
+
'@standard-schema/spec@1.1.0':
resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
@@ -3304,11 +3460,11 @@ packages:
'@types/node@20.19.37':
resolution: {integrity: sha512-8kzdPJ3FsNsVIurqBs7oodNnCEVbni9yUEkaHbgptDACOPW04jimGagZ51E6+lXUwJjgnBw+hyko/lkFWCldqw==}
- '@types/node@24.11.0':
- resolution: {integrity: sha512-fPxQqz4VTgPI/IQ+lj9r0h+fDR66bzoeMGHp8ASee+32OSGIkeASsoZuJixsQoVef1QJbeubcPBxKk22QVoWdw==}
+ '@types/node@24.12.0':
+ resolution: {integrity: sha512-GYDxsZi3ChgmckRT9HPU0WEhKLP08ev/Yfcq2AstjrDASOYCSXeyjDsHg4v5t4jOj7cyDX3vmprafKlWIG9MXQ==}
- '@types/node@25.3.5':
- resolution: {integrity: sha512-oX8xrhvpiyRCQkG1MFchB09f+cXftgIXb3a7UUa4Y3wpmZPw5tyZGTLWhlESOLq1Rq6oDlc8npVU2/9xiCuXMA==}
+ '@types/node@25.4.0':
+ resolution: {integrity: sha512-9wLpoeWuBlcbBpOY3XmzSTG3oscB6xjBEEtn+pYXTfhyXhIxC5FsBer2KTopBlvKEiW9l13po9fq+SJY/5lkhw==}
'@types/qrcode-terminal@0.12.2':
resolution: {integrity: sha512-v+RcIEJ+Uhd6ygSQ0u5YYY7ZM+la7GgPbs0V/7l/kFs2uO4S8BcIUEMoP7za4DNIqNnUD5npf0A/7kBhrCKG5Q==}
@@ -3355,43 +3511,43 @@ packages:
'@types/yauzl@2.10.3':
resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
- '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260308.1':
- resolution: {integrity: sha512-mywkctYr45fUBUYD35poInc9HEjup0zyCO5z3ZU2QC9eCQShpwYSDceoSCwxVKB/b/f/CU6H3LqINFeIz5CvrQ==}
+ '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260311.1':
+ resolution: {integrity: sha512-k3UqlA40U9m8meAyliJdbTayDSGZRBGNsEDP2rtjOomLUo2IA0eIi4vNAjQKzsXFtyfoQ59MGAqOLSO/CzVrQA==}
cpu: [arm64]
os: [darwin]
- '@typescript/native-preview-darwin-x64@7.0.0-dev.20260308.1':
- resolution: {integrity: sha512-iF+Y4USbCiD5BxmXI6xYuy+S6d2BhxKDb3YHjchzqg3AgleDNTd2rqSzlWv4ku26V2iOSfpM9t1H/xluL9pgNw==}
+ '@typescript/native-preview-darwin-x64@7.0.0-dev.20260311.1':
+ resolution: {integrity: sha512-8PNUCS1HPeXMK1F+1D3A4MyD+9Nil2mM3mWSwayUZpqT/A+dfEtcoo4Oe7Gz6qvMZbhCjbipwhTC84ilisiE1g==}
cpu: [x64]
os: [darwin]
- '@typescript/native-preview-linux-arm64@7.0.0-dev.20260308.1':
- resolution: {integrity: sha512-uEIIbW1JYPGEesVh/P5xA+xox7pQ6toeFPeke2X2H2bs5YkWHVaUQtVZuKNmGelw+2PCG6XRrXvMgMp056ebuQ==}
+ '@typescript/native-preview-linux-arm64@7.0.0-dev.20260311.1':
+ resolution: {integrity: sha512-WwRJO5ryMEs4Flro6JKNq0T+hR78eYFrItautu9o6EsIpeevk7Cq7T0BBgCrAf+A5aKts21HpiWzfHI0YP/CuQ==}
cpu: [arm64]
os: [linux]
- '@typescript/native-preview-linux-arm@7.0.0-dev.20260308.1':
- resolution: {integrity: sha512-vg8hwfwIhT8CmYJI5lG3PP8IoNzKKBGbq1cKjxQabSZTPuQKwVFVity2XKTKZKd+qRGL7xW4UWMJZLFgSx3b2Q==}
+ '@typescript/native-preview-linux-arm@7.0.0-dev.20260311.1':
+ resolution: {integrity: sha512-9T8kwNALCWzuNe00ri/f6wwoVD64YZW24cqkycFeptIF+DfNxfHMddWd7fvtHf0OKzPtkL83mkjBtviNeVKOfQ==}
cpu: [arm]
os: [linux]
- '@typescript/native-preview-linux-x64@7.0.0-dev.20260308.1':
- resolution: {integrity: sha512-Yd/ht0CGE4NYUAjuHa1u4VbiJbyUgvDh+b2o+Zcb2h5t8B761DIzDm24QqVXh+KhvGUoEodXWg3g3APxLHqj8Q==}
+ '@typescript/native-preview-linux-x64@7.0.0-dev.20260311.1':
+ resolution: {integrity: sha512-oMm3cb4njzMLBb61TI4EGq5Igxc+hoPHHNpMWqORfiYu/uQZWnter/twamTrZo6boCFtIa59mrGkhR3Qz7kauA==}
cpu: [x64]
os: [linux]
- '@typescript/native-preview-win32-arm64@7.0.0-dev.20260308.1':
- resolution: {integrity: sha512-Klk6BoiHegfPmkO0YYrXmbYVdPjOfN25lRkzenqDIwbyzPlABHvICCyo5YRvWD3HU4EeDfLisIFU9wEd/0duCw==}
+ '@typescript/native-preview-win32-arm64@7.0.0-dev.20260311.1':
+ resolution: {integrity: sha512-EQ5nz4qrwtzMZ5bjdMVQ2ke5BHQWDBz9IQsdh/8UU819cs5ZBnKmFFe5wOrIngqFvq4EoWKDXf983Vw0q4erkg==}
cpu: [arm64]
os: [win32]
- '@typescript/native-preview-win32-x64@7.0.0-dev.20260308.1':
- resolution: {integrity: sha512-4LrXmaMfzedwczANIkD/M9guPD4EWuQnCxOJsJkdYi3ExWQDjIFwfmxTtAmfPBWxVExLfn7UUkz/yCtcv2Wd+w==}
+ '@typescript/native-preview-win32-x64@7.0.0-dev.20260311.1':
+ resolution: {integrity: sha512-Y/5A7BaRFV1Pro4BqNW3nVDuId7YdPXktl769x1yUjTDQLH6YJEJVeBkFkT0+4e1O5IL92rxxr8rWMLypNKnTw==}
cpu: [x64]
os: [win32]
- '@typescript/native-preview@7.0.0-dev.20260308.1':
- resolution: {integrity: sha512-8a3oe5IAfBkEfMouRheNhOXUScBSHIUknPvUdsbxx7s+Ja1lxFNA1X1TTl2T18vu72Q/mM86vxefw5eW8/ps3g==}
+ '@typescript/native-preview@7.0.0-dev.20260311.1':
+ resolution: {integrity: sha512-BnyOW/mdZVZGevyeJ4RRY60CI4F121QBa++8Rwd+/Ms48OKQ30eMhaIKWGowz/u4WjJZmrzhFxIzN92XeSWMCQ==}
hasBin: true
'@typespec/ts-http-runtime@0.3.3':
@@ -3523,8 +3679,8 @@ packages:
engines: {node: '>=0.4.0'}
hasBin: true
- acpx@0.1.16:
- resolution: {integrity: sha512-CxHkUIP9dPSjh+RyoZkQg0AXjSiSus/dF4xKEeG9c+7JboZp5bZuWie/n4V7sBeKTMheMoEYGrMUslrdUadrqg==}
+ acpx@0.2.0:
+ resolution: {integrity: sha512-5E38uizINoEpTuHjLvlkWTfFqeLRqnO7vS3z3qmAXZCEZVExE+oYhJ1TClIl8KZZ9gKaoJF+5c0ltDcJDzG67g==}
engines: {node: '>=22.12.0'}
hasBin: true
@@ -3536,6 +3692,10 @@ packages:
resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
engines: {node: '>= 14'}
+ agent-base@8.0.0:
+ resolution: {integrity: sha512-QT8i0hCz6C/KQ+KTAbSNwCHDGdmUJl2tp2ZpNlGSWCfhUNVbYG2WLE3MdZGBAgXPV4GAvjGMxo+C1hroyxmZEg==}
+ engines: {node: '>= 14'}
+
ajv-formats@3.0.1:
resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
peerDependencies:
@@ -3697,6 +3857,36 @@ packages:
bare-abort-controller:
optional: true
+ bare-fs@4.5.5:
+ resolution: {integrity: sha512-XvwYM6VZqKoqDll8BmSww5luA5eflDzY0uEFfBJtFKe4PAAtxBjU3YIxzIBzhyaEQBy1VXEQBto4cpN5RZJw+w==}
+ engines: {bare: '>=1.16.0'}
+ peerDependencies:
+ bare-buffer: '*'
+ peerDependenciesMeta:
+ bare-buffer:
+ optional: true
+
+ bare-os@3.7.1:
+ resolution: {integrity: sha512-ebvMaS5BgZKmJlvuWh14dg9rbUI84QeV3WlWn6Ph6lFI8jJoh7ADtVTyD2c93euwbe+zgi0DVrl4YmqXeM9aIA==}
+ engines: {bare: '>=1.14.0'}
+
+ bare-path@3.0.0:
+ resolution: {integrity: sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==}
+
+ bare-stream@2.8.1:
+ resolution: {integrity: sha512-bSeR8RfvbRwDpD7HWZvn8M3uYNDrk7m9DQjYOFkENZlXW8Ju/MPaqUPQq5LqJ3kyjEm07siTaAQ7wBKCU59oHg==}
+ peerDependencies:
+ bare-buffer: '*'
+ bare-events: '*'
+ peerDependenciesMeta:
+ bare-buffer:
+ optional: true
+ bare-events:
+ optional: true
+
+ bare-url@2.3.2:
+ resolution: {integrity: sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw==}
+
base64-js@1.5.1:
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
@@ -4059,8 +4249,8 @@ packages:
discord-api-types@0.38.37:
resolution: {integrity: sha512-Cv47jzY1jkGkh5sv0bfHYqGgKOWO1peOrGMkDFM4UmaGMOTgOW8QSexhvixa9sVOiz8MnVOBryWYyw/CEVhj7w==}
- discord-api-types@0.38.41:
- resolution: {integrity: sha512-yMECyR8j9c2fVTvCQ+Qc24pweYFIZk/XoxDOmt1UvPeSw5tK6gXBd/2hhP+FEAe9Y6ny8pRMaf618XDK4U53OQ==}
+ discord-api-types@0.38.42:
+ resolution: {integrity: sha512-qs1kya7S84r5RR8m9kgttywGrmmoHaRifU1askAoi+wkoSefLpZP6aGXusjNw5b0jD3zOg3LTwUa3Tf2iHIceQ==}
doctypes@1.1.0:
resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==}
@@ -4075,9 +4265,8 @@ packages:
resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
engines: {node: '>= 4'}
- dompurify@3.3.2:
- resolution: {integrity: sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==}
- engines: {node: '>=20'}
+ dompurify@3.3.3:
+ resolution: {integrity: sha512-Oj6pzI2+RqBfFG+qOaOLbFXLQ90ARpcGG6UePL82bJLtdsa6CYJD7nmiU8MW9nQNOtCHV3lZ/Bzq1X0QYbBZCA==}
domutils@3.2.2:
resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==}
@@ -4559,6 +4748,10 @@ packages:
resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
engines: {node: '>= 14'}
+ https-proxy-agent@8.0.0:
+ resolution: {integrity: sha512-YYeW+iCnAS3xhvj2dvVoWgsbca3RfQy/IlaNHHOtDmU0jMqPI9euIq3Y9BJETdxk16h9NHHCKqp/KB9nIMStCQ==}
+ engines: {node: '>= 14'}
+
human-signals@1.1.1:
resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
engines: {node: '>=8.12.0'}
@@ -5332,6 +5525,14 @@ packages:
zod:
optional: true
+ openclaw@2026.3.8:
+ resolution: {integrity: sha512-e5Rk2Aj55sD/5LyX94mdYCQj7zpHXo0xIZsl+k140+nRopePfPAxC7nsu0V/NyypPRtaotP1riFfzK7IhaYkuQ==}
+ engines: {node: '>=22.12.0'}
+ hasBin: true
+ peerDependencies:
+ '@napi-rs/canvas': ^0.1.89
+ node-llama-cpp: 3.16.2
+
opus-decoder@0.7.11:
resolution: {integrity: sha512-+e+Jz3vGQLxRTBHs8YJQPRPc1Tr+/aC6coV/DlZylriA29BdHQAYXhvNRKtjftof17OFng0+P4wsFIqQu3a48A==}
@@ -5346,8 +5547,8 @@ packages:
resolution: {integrity: sha512-4/8JfsetakdeEa4vAYV45FW20aY+B/+K8NEXp5Eiar3wR8726whgHrbSg5Ar/ZY1FLJ/AGtUqV7W2IVF+Gvp9A==}
engines: {node: '>=20'}
- oxfmt@0.36.0:
- resolution: {integrity: sha512-/ejJ+KoSW6J9bcNT9a9UtJSJNWhJ3yOLSBLbkoFHJs/8CZjmaZVZAJe4YgO1KMJlKpNQasrn/G9JQUEZI3p0EQ==}
+ oxfmt@0.38.0:
+ resolution: {integrity: sha512-RGYfnnxmCz8dMQ1Oo5KrYkNRc9cne2WL2vfE+datWNkgiSAkfUsqpGLR7rnkN6cQFgQkHDZH400eXN6izJ8Lww==}
engines: {node: ^20.19.0 || >=22.12.0}
hasBin: true
@@ -5355,8 +5556,8 @@ packages:
resolution: {integrity: sha512-4RuJK2jP08XwqtUu+5yhCbxEauCm6tv2MFHKEMsjbosK2+vy5us82oI3VLuHwbNyZG7ekZA26U2LLHnGR4frIA==}
hasBin: true
- oxlint@1.51.0:
- resolution: {integrity: sha512-g6DNPaV9/WI9MoX2XllafxQuxwY1TV++j7hP8fTJByVBuCoVtm3dy9f/2vtH/HU40JztcgWF4G7ua+gkainklQ==}
+ oxlint@1.53.0:
+ resolution: {integrity: sha512-TLW0PzGbpO1JxUnuy1pIqVPjQUGh4fNfxu5XJbdFIRFVaJ0UFzTjjk/hSFTMRxN6lZub53xL/IwJNEkrh7VtDg==}
engines: {node: ^20.19.0 || >=22.12.0}
hasBin: true
peerDependencies:
@@ -5781,8 +5982,8 @@ packages:
resolution: {integrity: sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==}
hasBin: true
- rolldown-plugin-dts@0.22.4:
- resolution: {integrity: sha512-pueqTPyN1N6lWYivyDGad+j+GO3DT67pzpct8s8e6KGVIezvnrDjejuw1AXFeyDRas3xTq4Ja6Lj5R5/04C5GQ==}
+ rolldown-plugin-dts@0.22.5:
+ resolution: {integrity: sha512-M/HXfM4cboo+jONx9Z0X+CUf3B5tCi7ni+kR5fUW50Fp9AlZk0oVLesibGWgCXDKFp5lpgQ9yhKoImUFjl3VZw==}
engines: {node: '>=20.19.0'}
peerDependencies:
'@ts-macro/tsc': ^0.3.6
@@ -5800,8 +6001,8 @@ packages:
vue-tsc:
optional: true
- rolldown@1.0.0-rc.7:
- resolution: {integrity: sha512-5X0zEeQFzDpB3MqUWQZyO2TUQqP9VnT7CqXHF2laTFRy487+b6QZyotCazOySAuZLAvplCaOVsg1tVn/Zlmwfg==}
+ rolldown@1.0.0-rc.9:
+ resolution: {integrity: sha512-9EbgWge7ZH+yqb4d2EnELAntgPTWbfL8ajiTW+SyhJEC4qhBbkCKbqFV4Ge4zmu5ziQuVbWxb/XwLZ+RIO7E8Q==}
engines: {node: ^20.19.0 || >=22.12.0}
hasBin: true
@@ -6115,13 +6316,16 @@ packages:
resolution: {integrity: sha512-iK5/YhZxq5GO5z8wb0bY1317uDF3Zjpha0QFFLA8/trAoiLbQD0HUbMesEaxyzUgDxi2QlcbM8IvqOlEjgoXBA==}
engines: {node: '>=12.17'}
- tar-stream@3.1.7:
- resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==}
+ tar-stream@3.1.8:
+ resolution: {integrity: sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==}
tar@7.5.11:
resolution: {integrity: sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==}
engines: {node: '>=18'}
+ teex@1.0.1:
+ resolution: {integrity: sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==}
+
text-decoder@1.2.7:
resolution: {integrity: sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==}
@@ -6194,14 +6398,14 @@ packages:
ts-algebra@2.0.0:
resolution: {integrity: sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw==}
- tsdown@0.21.0:
- resolution: {integrity: sha512-Sw/ehzVhjYLD7HVBPybJHDxpcaeyFjPcaDCME23o9O4fyuEl6ibYEdrnB8W8UchYAGoayKqzWQqx/oIp3jn/Vg==}
+ tsdown@0.21.2:
+ resolution: {integrity: sha512-pP8eAcd1XAWjl5gjosuJs0BAuVoheUe3V8VDHx31QK7YOgXjcCMsBSyFWO3CMh/CSUkjRUzR96JtGH3WJFTExQ==}
engines: {node: '>=20.19.0'}
hasBin: true
peerDependencies:
'@arethetypeswrong/core': ^0.18.1
- '@tsdown/css': 0.21.0
- '@tsdown/exe': 0.21.0
+ '@tsdown/css': 0.21.2
+ '@tsdown/exe': 0.21.2
'@vitejs/devtools': '*'
publint: ^0.3.0
typescript: ^5.0.0
@@ -6324,8 +6528,8 @@ packages:
resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
engines: {node: '>= 0.8'}
- unrun@0.2.30:
- resolution: {integrity: sha512-a4W1wDADI0gvDDr14T0ho1FgMhmfjq6M8Iz8q234EnlxgH/9cMHDueUSLwTl1fwSBs5+mHrLFYH+7B8ao36EBA==}
+ unrun@0.2.32:
+ resolution: {integrity: sha512-opd3z6791rf281JdByf0RdRQrpcc7WyzqittqIXodM/5meNWdTwrVxeyzbaCp4/Rgls/um14oUaif1gomO8YGg==}
engines: {node: '>=20.19.0'}
hasBin: true
peerDependencies:
@@ -6580,6 +6784,10 @@ snapshots:
dependencies:
zod: 4.3.6
+ '@agentclientprotocol/sdk@0.16.1(zod@4.3.6)':
+ dependencies:
+ zod: 4.3.6
+
'@anthropic-ai/sdk@0.73.0(zod@4.3.6)':
dependencies:
json-schema-to-ts: 3.1.1
@@ -6685,22 +6893,22 @@ snapshots:
transitivePeerDependencies:
- aws-crt
- '@aws-sdk/client-bedrock@3.1004.0':
+ '@aws-sdk/client-bedrock@3.1007.0':
dependencies:
'@aws-crypto/sha256-browser': 5.2.0
'@aws-crypto/sha256-js': 5.2.0
- '@aws-sdk/core': 3.973.18
- '@aws-sdk/credential-provider-node': 3.972.18
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/credential-provider-node': 3.972.19
'@aws-sdk/middleware-host-header': 3.972.7
'@aws-sdk/middleware-logger': 3.972.7
'@aws-sdk/middleware-recursion-detection': 3.972.7
- '@aws-sdk/middleware-user-agent': 3.972.19
+ '@aws-sdk/middleware-user-agent': 3.972.20
'@aws-sdk/region-config-resolver': 3.972.7
- '@aws-sdk/token-providers': 3.1004.0
+ '@aws-sdk/token-providers': 3.1007.0
'@aws-sdk/types': 3.973.5
'@aws-sdk/util-endpoints': 3.996.4
'@aws-sdk/util-user-agent-browser': 3.972.7
- '@aws-sdk/util-user-agent-node': 3.973.4
+ '@aws-sdk/util-user-agent-node': 3.973.5
'@smithy/config-resolver': 4.4.10
'@smithy/core': 3.23.9
'@smithy/fetch-http-handler': 5.3.13
@@ -6822,6 +7030,22 @@ snapshots:
'@smithy/util-utf8': 4.2.2
tslib: 2.8.1
+ '@aws-sdk/core@3.973.19':
+ dependencies:
+ '@aws-sdk/types': 3.973.5
+ '@aws-sdk/xml-builder': 3.972.10
+ '@smithy/core': 3.23.9
+ '@smithy/node-config-provider': 4.3.11
+ '@smithy/property-provider': 4.2.11
+ '@smithy/protocol-http': 5.3.11
+ '@smithy/signature-v4': 5.3.11
+ '@smithy/smithy-client': 4.12.3
+ '@smithy/types': 4.13.0
+ '@smithy/util-base64': 4.3.2
+ '@smithy/util-middleware': 4.2.11
+ '@smithy/util-utf8': 4.2.2
+ tslib: 2.8.1
+
'@aws-sdk/crc64-nvme@3.972.3':
dependencies:
'@smithy/types': 4.13.0
@@ -6843,6 +7067,14 @@ snapshots:
'@smithy/types': 4.13.0
tslib: 2.8.1
+ '@aws-sdk/credential-provider-env@3.972.17':
+ dependencies:
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/types': 3.973.5
+ '@smithy/property-provider': 4.2.11
+ '@smithy/types': 4.13.0
+ tslib: 2.8.1
+
'@aws-sdk/credential-provider-http@3.972.15':
dependencies:
'@aws-sdk/core': 3.973.15
@@ -6869,6 +7101,19 @@ snapshots:
'@smithy/util-stream': 4.5.17
tslib: 2.8.1
+ '@aws-sdk/credential-provider-http@3.972.19':
+ dependencies:
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/types': 3.973.5
+ '@smithy/fetch-http-handler': 5.3.13
+ '@smithy/node-http-handler': 4.4.14
+ '@smithy/property-provider': 4.2.11
+ '@smithy/protocol-http': 5.3.11
+ '@smithy/smithy-client': 4.12.3
+ '@smithy/types': 4.13.0
+ '@smithy/util-stream': 4.5.17
+ tslib: 2.8.1
+
'@aws-sdk/credential-provider-ini@3.972.13':
dependencies:
'@aws-sdk/core': 3.973.15
@@ -6907,6 +7152,25 @@ snapshots:
transitivePeerDependencies:
- aws-crt
+ '@aws-sdk/credential-provider-ini@3.972.18':
+ dependencies:
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/credential-provider-env': 3.972.17
+ '@aws-sdk/credential-provider-http': 3.972.19
+ '@aws-sdk/credential-provider-login': 3.972.18
+ '@aws-sdk/credential-provider-process': 3.972.17
+ '@aws-sdk/credential-provider-sso': 3.972.18
+ '@aws-sdk/credential-provider-web-identity': 3.972.18
+ '@aws-sdk/nested-clients': 3.996.8
+ '@aws-sdk/types': 3.973.5
+ '@smithy/credential-provider-imds': 4.2.11
+ '@smithy/property-provider': 4.2.11
+ '@smithy/shared-ini-file-loader': 4.4.6
+ '@smithy/types': 4.13.0
+ tslib: 2.8.1
+ transitivePeerDependencies:
+ - aws-crt
+
'@aws-sdk/credential-provider-login@3.972.13':
dependencies:
'@aws-sdk/core': 3.973.15
@@ -6933,6 +7197,19 @@ snapshots:
transitivePeerDependencies:
- aws-crt
+ '@aws-sdk/credential-provider-login@3.972.18':
+ dependencies:
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/nested-clients': 3.996.8
+ '@aws-sdk/types': 3.973.5
+ '@smithy/property-provider': 4.2.11
+ '@smithy/protocol-http': 5.3.11
+ '@smithy/shared-ini-file-loader': 4.4.6
+ '@smithy/types': 4.13.0
+ tslib: 2.8.1
+ transitivePeerDependencies:
+ - aws-crt
+
'@aws-sdk/credential-provider-node@3.972.14':
dependencies:
'@aws-sdk/credential-provider-env': 3.972.13
@@ -6967,6 +7244,23 @@ snapshots:
transitivePeerDependencies:
- aws-crt
+ '@aws-sdk/credential-provider-node@3.972.19':
+ dependencies:
+ '@aws-sdk/credential-provider-env': 3.972.17
+ '@aws-sdk/credential-provider-http': 3.972.19
+ '@aws-sdk/credential-provider-ini': 3.972.18
+ '@aws-sdk/credential-provider-process': 3.972.17
+ '@aws-sdk/credential-provider-sso': 3.972.18
+ '@aws-sdk/credential-provider-web-identity': 3.972.18
+ '@aws-sdk/types': 3.973.5
+ '@smithy/credential-provider-imds': 4.2.11
+ '@smithy/property-provider': 4.2.11
+ '@smithy/shared-ini-file-loader': 4.4.6
+ '@smithy/types': 4.13.0
+ tslib: 2.8.1
+ transitivePeerDependencies:
+ - aws-crt
+
'@aws-sdk/credential-provider-process@3.972.13':
dependencies:
'@aws-sdk/core': 3.973.15
@@ -6985,6 +7279,15 @@ snapshots:
'@smithy/types': 4.13.0
tslib: 2.8.1
+ '@aws-sdk/credential-provider-process@3.972.17':
+ dependencies:
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/types': 3.973.5
+ '@smithy/property-provider': 4.2.11
+ '@smithy/shared-ini-file-loader': 4.4.6
+ '@smithy/types': 4.13.0
+ tslib: 2.8.1
+
'@aws-sdk/credential-provider-sso@3.972.13':
dependencies:
'@aws-sdk/core': 3.973.15
@@ -7011,6 +7314,19 @@ snapshots:
transitivePeerDependencies:
- aws-crt
+ '@aws-sdk/credential-provider-sso@3.972.18':
+ dependencies:
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/nested-clients': 3.996.8
+ '@aws-sdk/token-providers': 3.1005.0
+ '@aws-sdk/types': 3.973.5
+ '@smithy/property-provider': 4.2.11
+ '@smithy/shared-ini-file-loader': 4.4.6
+ '@smithy/types': 4.13.0
+ tslib: 2.8.1
+ transitivePeerDependencies:
+ - aws-crt
+
'@aws-sdk/credential-provider-web-identity@3.972.13':
dependencies:
'@aws-sdk/core': 3.973.15
@@ -7035,6 +7351,18 @@ snapshots:
transitivePeerDependencies:
- aws-crt
+ '@aws-sdk/credential-provider-web-identity@3.972.18':
+ dependencies:
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/nested-clients': 3.996.8
+ '@aws-sdk/types': 3.973.5
+ '@smithy/property-provider': 4.2.11
+ '@smithy/shared-ini-file-loader': 4.4.6
+ '@smithy/types': 4.13.0
+ tslib: 2.8.1
+ transitivePeerDependencies:
+ - aws-crt
+
'@aws-sdk/eventstream-handler-node@3.972.10':
dependencies:
'@aws-sdk/types': 3.973.5
@@ -7175,6 +7503,17 @@ snapshots:
'@smithy/util-retry': 4.2.11
tslib: 2.8.1
+ '@aws-sdk/middleware-user-agent@3.972.20':
+ dependencies:
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/types': 3.973.5
+ '@aws-sdk/util-endpoints': 3.996.4
+ '@smithy/core': 3.23.9
+ '@smithy/protocol-http': 5.3.11
+ '@smithy/types': 4.13.0
+ '@smithy/util-retry': 4.2.11
+ tslib: 2.8.1
+
'@aws-sdk/middleware-websocket@3.972.12':
dependencies:
'@aws-sdk/types': 3.973.5
@@ -7276,6 +7615,49 @@ snapshots:
transitivePeerDependencies:
- aws-crt
+ '@aws-sdk/nested-clients@3.996.8':
+ dependencies:
+ '@aws-crypto/sha256-browser': 5.2.0
+ '@aws-crypto/sha256-js': 5.2.0
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/middleware-host-header': 3.972.7
+ '@aws-sdk/middleware-logger': 3.972.7
+ '@aws-sdk/middleware-recursion-detection': 3.972.7
+ '@aws-sdk/middleware-user-agent': 3.972.20
+ '@aws-sdk/region-config-resolver': 3.972.7
+ '@aws-sdk/types': 3.973.5
+ '@aws-sdk/util-endpoints': 3.996.4
+ '@aws-sdk/util-user-agent-browser': 3.972.7
+ '@aws-sdk/util-user-agent-node': 3.973.5
+ '@smithy/config-resolver': 4.4.10
+ '@smithy/core': 3.23.9
+ '@smithy/fetch-http-handler': 5.3.13
+ '@smithy/hash-node': 4.2.11
+ '@smithy/invalid-dependency': 4.2.11
+ '@smithy/middleware-content-length': 4.2.11
+ '@smithy/middleware-endpoint': 4.4.23
+ '@smithy/middleware-retry': 4.4.40
+ '@smithy/middleware-serde': 4.2.12
+ '@smithy/middleware-stack': 4.2.11
+ '@smithy/node-config-provider': 4.3.11
+ '@smithy/node-http-handler': 4.4.14
+ '@smithy/protocol-http': 5.3.11
+ '@smithy/smithy-client': 4.12.3
+ '@smithy/types': 4.13.0
+ '@smithy/url-parser': 4.2.11
+ '@smithy/util-base64': 4.3.2
+ '@smithy/util-body-length-browser': 4.2.2
+ '@smithy/util-body-length-node': 4.2.3
+ '@smithy/util-defaults-mode-browser': 4.3.39
+ '@smithy/util-defaults-mode-node': 4.2.42
+ '@smithy/util-endpoints': 3.3.2
+ '@smithy/util-middleware': 4.2.11
+ '@smithy/util-retry': 4.2.11
+ '@smithy/util-utf8': 4.2.2
+ tslib: 2.8.1
+ transitivePeerDependencies:
+ - aws-crt
+
'@aws-sdk/region-config-resolver@3.972.6':
dependencies:
'@aws-sdk/types': 3.973.4
@@ -7324,6 +7706,30 @@ snapshots:
transitivePeerDependencies:
- aws-crt
+ '@aws-sdk/token-providers@3.1005.0':
+ dependencies:
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/nested-clients': 3.996.8
+ '@aws-sdk/types': 3.973.5
+ '@smithy/property-provider': 4.2.11
+ '@smithy/shared-ini-file-loader': 4.4.6
+ '@smithy/types': 4.13.0
+ tslib: 2.8.1
+ transitivePeerDependencies:
+ - aws-crt
+
+ '@aws-sdk/token-providers@3.1007.0':
+ dependencies:
+ '@aws-sdk/core': 3.973.19
+ '@aws-sdk/nested-clients': 3.996.8
+ '@aws-sdk/types': 3.973.5
+ '@smithy/property-provider': 4.2.11
+ '@smithy/shared-ini-file-loader': 4.4.6
+ '@smithy/types': 4.13.0
+ tslib: 2.8.1
+ transitivePeerDependencies:
+ - aws-crt
+
'@aws-sdk/token-providers@3.999.0':
dependencies:
'@aws-sdk/core': 3.973.15
@@ -7414,6 +7820,14 @@ snapshots:
'@smithy/types': 4.13.0
tslib: 2.8.1
+ '@aws-sdk/util-user-agent-node@3.973.5':
+ dependencies:
+ '@aws-sdk/middleware-user-agent': 3.972.20
+ '@aws-sdk/types': 3.973.5
+ '@smithy/node-config-provider': 4.3.11
+ '@smithy/types': 4.13.0
+ tslib: 2.8.1
+
'@aws-sdk/xml-builder@3.972.10':
dependencies:
'@smithy/types': 4.13.0
@@ -7499,7 +7913,7 @@ snapshots:
'@buape/carbon@0.0.0-beta-20260216184201(@discordjs/opus@0.10.0)(hono@4.12.7)(opusscript@0.1.1)':
dependencies:
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
discord-api-types: 0.38.37
optionalDependencies:
'@cloudflare/workers-types': 4.20260120.0
@@ -7657,7 +8071,24 @@ snapshots:
'@discordjs/voice@0.19.0(@discordjs/opus@0.10.0)(opusscript@0.1.1)':
dependencies:
'@types/ws': 8.18.1
- discord-api-types: 0.38.41
+ discord-api-types: 0.38.42
+ prism-media: 1.3.5(@discordjs/opus@0.10.0)(opusscript@0.1.1)
+ tslib: 2.8.1
+ ws: 8.19.0
+ transitivePeerDependencies:
+ - '@discordjs/opus'
+ - bufferutil
+ - ffmpeg-static
+ - node-opus
+ - opusscript
+ - utf-8-validate
+ optional: true
+
+ '@discordjs/voice@0.19.1(@discordjs/opus@0.10.0)(opusscript@0.1.1)':
+ dependencies:
+ '@snazzah/davey': 0.1.10
+ '@types/ws': 8.18.1
+ discord-api-types: 0.38.42
prism-media: 1.3.5(@discordjs/opus@0.10.0)(opusscript@0.1.1)
tslib: 2.8.1
ws: 8.19.0
@@ -8049,7 +8480,7 @@ snapshots:
'@line/bot-sdk@10.6.0':
dependencies:
- '@types/node': 24.11.0
+ '@types/node': 24.12.0
optionalDependencies:
axios: 1.13.5
transitivePeerDependencies:
@@ -8768,61 +9199,61 @@ snapshots:
'@oxc-project/types@0.115.0': {}
- '@oxfmt/binding-android-arm-eabi@0.36.0':
+ '@oxfmt/binding-android-arm-eabi@0.38.0':
optional: true
- '@oxfmt/binding-android-arm64@0.36.0':
+ '@oxfmt/binding-android-arm64@0.38.0':
optional: true
- '@oxfmt/binding-darwin-arm64@0.36.0':
+ '@oxfmt/binding-darwin-arm64@0.38.0':
optional: true
- '@oxfmt/binding-darwin-x64@0.36.0':
+ '@oxfmt/binding-darwin-x64@0.38.0':
optional: true
- '@oxfmt/binding-freebsd-x64@0.36.0':
+ '@oxfmt/binding-freebsd-x64@0.38.0':
optional: true
- '@oxfmt/binding-linux-arm-gnueabihf@0.36.0':
+ '@oxfmt/binding-linux-arm-gnueabihf@0.38.0':
optional: true
- '@oxfmt/binding-linux-arm-musleabihf@0.36.0':
+ '@oxfmt/binding-linux-arm-musleabihf@0.38.0':
optional: true
- '@oxfmt/binding-linux-arm64-gnu@0.36.0':
+ '@oxfmt/binding-linux-arm64-gnu@0.38.0':
optional: true
- '@oxfmt/binding-linux-arm64-musl@0.36.0':
+ '@oxfmt/binding-linux-arm64-musl@0.38.0':
optional: true
- '@oxfmt/binding-linux-ppc64-gnu@0.36.0':
+ '@oxfmt/binding-linux-ppc64-gnu@0.38.0':
optional: true
- '@oxfmt/binding-linux-riscv64-gnu@0.36.0':
+ '@oxfmt/binding-linux-riscv64-gnu@0.38.0':
optional: true
- '@oxfmt/binding-linux-riscv64-musl@0.36.0':
+ '@oxfmt/binding-linux-riscv64-musl@0.38.0':
optional: true
- '@oxfmt/binding-linux-s390x-gnu@0.36.0':
+ '@oxfmt/binding-linux-s390x-gnu@0.38.0':
optional: true
- '@oxfmt/binding-linux-x64-gnu@0.36.0':
+ '@oxfmt/binding-linux-x64-gnu@0.38.0':
optional: true
- '@oxfmt/binding-linux-x64-musl@0.36.0':
+ '@oxfmt/binding-linux-x64-musl@0.38.0':
optional: true
- '@oxfmt/binding-openharmony-arm64@0.36.0':
+ '@oxfmt/binding-openharmony-arm64@0.38.0':
optional: true
- '@oxfmt/binding-win32-arm64-msvc@0.36.0':
+ '@oxfmt/binding-win32-arm64-msvc@0.38.0':
optional: true
- '@oxfmt/binding-win32-ia32-msvc@0.36.0':
+ '@oxfmt/binding-win32-ia32-msvc@0.38.0':
optional: true
- '@oxfmt/binding-win32-x64-msvc@0.36.0':
+ '@oxfmt/binding-win32-x64-msvc@0.38.0':
optional: true
'@oxlint-tsgolint/darwin-arm64@0.16.0':
@@ -8843,61 +9274,61 @@ snapshots:
'@oxlint-tsgolint/win32-x64@0.16.0':
optional: true
- '@oxlint/binding-android-arm-eabi@1.51.0':
+ '@oxlint/binding-android-arm-eabi@1.53.0':
optional: true
- '@oxlint/binding-android-arm64@1.51.0':
+ '@oxlint/binding-android-arm64@1.53.0':
optional: true
- '@oxlint/binding-darwin-arm64@1.51.0':
+ '@oxlint/binding-darwin-arm64@1.53.0':
optional: true
- '@oxlint/binding-darwin-x64@1.51.0':
+ '@oxlint/binding-darwin-x64@1.53.0':
optional: true
- '@oxlint/binding-freebsd-x64@1.51.0':
+ '@oxlint/binding-freebsd-x64@1.53.0':
optional: true
- '@oxlint/binding-linux-arm-gnueabihf@1.51.0':
+ '@oxlint/binding-linux-arm-gnueabihf@1.53.0':
optional: true
- '@oxlint/binding-linux-arm-musleabihf@1.51.0':
+ '@oxlint/binding-linux-arm-musleabihf@1.53.0':
optional: true
- '@oxlint/binding-linux-arm64-gnu@1.51.0':
+ '@oxlint/binding-linux-arm64-gnu@1.53.0':
optional: true
- '@oxlint/binding-linux-arm64-musl@1.51.0':
+ '@oxlint/binding-linux-arm64-musl@1.53.0':
optional: true
- '@oxlint/binding-linux-ppc64-gnu@1.51.0':
+ '@oxlint/binding-linux-ppc64-gnu@1.53.0':
optional: true
- '@oxlint/binding-linux-riscv64-gnu@1.51.0':
+ '@oxlint/binding-linux-riscv64-gnu@1.53.0':
optional: true
- '@oxlint/binding-linux-riscv64-musl@1.51.0':
+ '@oxlint/binding-linux-riscv64-musl@1.53.0':
optional: true
- '@oxlint/binding-linux-s390x-gnu@1.51.0':
+ '@oxlint/binding-linux-s390x-gnu@1.53.0':
optional: true
- '@oxlint/binding-linux-x64-gnu@1.51.0':
+ '@oxlint/binding-linux-x64-gnu@1.53.0':
optional: true
- '@oxlint/binding-linux-x64-musl@1.51.0':
+ '@oxlint/binding-linux-x64-musl@1.53.0':
optional: true
- '@oxlint/binding-openharmony-arm64@1.51.0':
+ '@oxlint/binding-openharmony-arm64@1.53.0':
optional: true
- '@oxlint/binding-win32-arm64-msvc@1.51.0':
+ '@oxlint/binding-win32-arm64-msvc@1.53.0':
optional: true
- '@oxlint/binding-win32-ia32-msvc@1.51.0':
+ '@oxlint/binding-win32-ia32-msvc@1.53.0':
optional: true
- '@oxlint/binding-win32-x64-msvc@1.51.0':
+ '@oxlint/binding-win32-x64-msvc@1.53.0':
optional: true
'@pierre/diffs@1.0.11(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
@@ -8982,54 +9413,54 @@ snapshots:
'@reflink/reflink-win32-x64-msvc': 0.1.19
optional: true
- '@rolldown/binding-android-arm64@1.0.0-rc.7':
+ '@rolldown/binding-android-arm64@1.0.0-rc.9':
optional: true
- '@rolldown/binding-darwin-arm64@1.0.0-rc.7':
+ '@rolldown/binding-darwin-arm64@1.0.0-rc.9':
optional: true
- '@rolldown/binding-darwin-x64@1.0.0-rc.7':
+ '@rolldown/binding-darwin-x64@1.0.0-rc.9':
optional: true
- '@rolldown/binding-freebsd-x64@1.0.0-rc.7':
+ '@rolldown/binding-freebsd-x64@1.0.0-rc.9':
optional: true
- '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.7':
+ '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.9':
optional: true
- '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.7':
+ '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.9':
optional: true
- '@rolldown/binding-linux-arm64-musl@1.0.0-rc.7':
+ '@rolldown/binding-linux-arm64-musl@1.0.0-rc.9':
optional: true
- '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.7':
+ '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.9':
optional: true
- '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.7':
+ '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.9':
optional: true
- '@rolldown/binding-linux-x64-gnu@1.0.0-rc.7':
+ '@rolldown/binding-linux-x64-gnu@1.0.0-rc.9':
optional: true
- '@rolldown/binding-linux-x64-musl@1.0.0-rc.7':
+ '@rolldown/binding-linux-x64-musl@1.0.0-rc.9':
optional: true
- '@rolldown/binding-openharmony-arm64@1.0.0-rc.7':
+ '@rolldown/binding-openharmony-arm64@1.0.0-rc.9':
optional: true
- '@rolldown/binding-wasm32-wasi@1.0.0-rc.7':
+ '@rolldown/binding-wasm32-wasi@1.0.0-rc.9':
dependencies:
'@napi-rs/wasm-runtime': 1.1.1
optional: true
- '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.7':
+ '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.9':
optional: true
- '@rolldown/binding-win32-x64-msvc@1.0.0-rc.7':
+ '@rolldown/binding-win32-x64-msvc@1.0.0-rc.9':
optional: true
- '@rolldown/pluginutils@1.0.0-rc.7': {}
+ '@rolldown/pluginutils@1.0.0-rc.9': {}
'@rollup/rollup-android-arm-eabi@4.59.0':
optional: true
@@ -9187,14 +9618,14 @@ snapshots:
'@slack/logger@4.0.0':
dependencies:
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@slack/oauth@3.0.4':
dependencies:
'@slack/logger': 4.0.0
'@slack/web-api': 7.14.1
'@types/jsonwebtoken': 9.0.10
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
jsonwebtoken: 9.0.3
transitivePeerDependencies:
- debug
@@ -9203,7 +9634,7 @@ snapshots:
dependencies:
'@slack/logger': 4.0.0
'@slack/web-api': 7.14.1
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@types/ws': 8.18.1
eventemitter3: 5.0.4
ws: 8.19.0
@@ -9218,7 +9649,7 @@ snapshots:
dependencies:
'@slack/logger': 4.0.0
'@slack/types': 2.20.0
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@types/retry': 0.12.0
axios: 1.13.5
eventemitter3: 5.0.4
@@ -9855,6 +10286,67 @@ snapshots:
dependencies:
tslib: 2.8.1
+ '@snazzah/davey-android-arm-eabi@0.1.10':
+ optional: true
+
+ '@snazzah/davey-android-arm64@0.1.10':
+ optional: true
+
+ '@snazzah/davey-darwin-arm64@0.1.10':
+ optional: true
+
+ '@snazzah/davey-darwin-x64@0.1.10':
+ optional: true
+
+ '@snazzah/davey-freebsd-x64@0.1.10':
+ optional: true
+
+ '@snazzah/davey-linux-arm-gnueabihf@0.1.10':
+ optional: true
+
+ '@snazzah/davey-linux-arm64-gnu@0.1.10':
+ optional: true
+
+ '@snazzah/davey-linux-arm64-musl@0.1.10':
+ optional: true
+
+ '@snazzah/davey-linux-x64-gnu@0.1.10':
+ optional: true
+
+ '@snazzah/davey-linux-x64-musl@0.1.10':
+ optional: true
+
+ '@snazzah/davey-wasm32-wasi@0.1.10':
+ dependencies:
+ '@napi-rs/wasm-runtime': 1.1.1
+ optional: true
+
+ '@snazzah/davey-win32-arm64-msvc@0.1.10':
+ optional: true
+
+ '@snazzah/davey-win32-ia32-msvc@0.1.10':
+ optional: true
+
+ '@snazzah/davey-win32-x64-msvc@0.1.10':
+ optional: true
+
+ '@snazzah/davey@0.1.10':
+ optionalDependencies:
+ '@snazzah/davey-android-arm-eabi': 0.1.10
+ '@snazzah/davey-android-arm64': 0.1.10
+ '@snazzah/davey-darwin-arm64': 0.1.10
+ '@snazzah/davey-darwin-x64': 0.1.10
+ '@snazzah/davey-freebsd-x64': 0.1.10
+ '@snazzah/davey-linux-arm-gnueabihf': 0.1.10
+ '@snazzah/davey-linux-arm64-gnu': 0.1.10
+ '@snazzah/davey-linux-arm64-musl': 0.1.10
+ '@snazzah/davey-linux-x64-gnu': 0.1.10
+ '@snazzah/davey-linux-x64-musl': 0.1.10
+ '@snazzah/davey-wasm32-wasi': 0.1.10
+ '@snazzah/davey-win32-arm64-msvc': 0.1.10
+ '@snazzah/davey-win32-ia32-msvc': 0.1.10
+ '@snazzah/davey-win32-x64-msvc': 0.1.10
+
'@standard-schema/spec@1.1.0': {}
'@swc/helpers@0.5.19':
@@ -9982,7 +10474,7 @@ snapshots:
'@types/body-parser@1.19.6':
dependencies:
'@types/connect': 3.4.38
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@types/bun@1.3.9':
dependencies:
@@ -10002,7 +10494,7 @@ snapshots:
'@types/connect@3.4.38':
dependencies:
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@types/deep-eql@4.0.2': {}
@@ -10010,14 +10502,14 @@ snapshots:
'@types/express-serve-static-core@4.19.8':
dependencies:
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@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.3.5
+ '@types/node': 25.4.0
'@types/qs': 6.14.0
'@types/range-parser': 1.2.7
'@types/send': 1.2.1
@@ -10046,7 +10538,7 @@ snapshots:
'@types/jsonwebtoken@9.0.10':
dependencies:
'@types/ms': 2.1.0
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@types/linkify-it@5.0.0': {}
@@ -10075,11 +10567,11 @@ snapshots:
dependencies:
undici-types: 6.21.0
- '@types/node@24.11.0':
+ '@types/node@24.12.0':
dependencies:
undici-types: 7.16.0
- '@types/node@25.3.5':
+ '@types/node@25.4.0':
dependencies:
undici-types: 7.18.2
@@ -10092,7 +10584,7 @@ snapshots:
'@types/request@2.48.13':
dependencies:
'@types/caseless': 0.12.5
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@types/tough-cookie': 4.0.5
form-data: 2.5.4
@@ -10103,22 +10595,22 @@ snapshots:
'@types/send@0.17.6':
dependencies:
'@types/mime': 1.3.5
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@types/send@1.2.1':
dependencies:
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@types/serve-static@1.15.10':
dependencies:
'@types/http-errors': 2.0.5
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@types/send': 0.17.6
'@types/serve-static@2.2.0':
dependencies:
'@types/http-errors': 2.0.5
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@types/tough-cookie@4.0.5': {}
@@ -10128,43 +10620,43 @@ snapshots:
'@types/ws@8.18.1':
dependencies:
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
'@types/yauzl@2.10.3':
dependencies:
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
optional: true
- '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260308.1':
+ '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260311.1':
optional: true
- '@typescript/native-preview-darwin-x64@7.0.0-dev.20260308.1':
+ '@typescript/native-preview-darwin-x64@7.0.0-dev.20260311.1':
optional: true
- '@typescript/native-preview-linux-arm64@7.0.0-dev.20260308.1':
+ '@typescript/native-preview-linux-arm64@7.0.0-dev.20260311.1':
optional: true
- '@typescript/native-preview-linux-arm@7.0.0-dev.20260308.1':
+ '@typescript/native-preview-linux-arm@7.0.0-dev.20260311.1':
optional: true
- '@typescript/native-preview-linux-x64@7.0.0-dev.20260308.1':
+ '@typescript/native-preview-linux-x64@7.0.0-dev.20260311.1':
optional: true
- '@typescript/native-preview-win32-arm64@7.0.0-dev.20260308.1':
+ '@typescript/native-preview-win32-arm64@7.0.0-dev.20260311.1':
optional: true
- '@typescript/native-preview-win32-x64@7.0.0-dev.20260308.1':
+ '@typescript/native-preview-win32-x64@7.0.0-dev.20260311.1':
optional: true
- '@typescript/native-preview@7.0.0-dev.20260308.1':
+ '@typescript/native-preview@7.0.0-dev.20260311.1':
optionalDependencies:
- '@typescript/native-preview-darwin-arm64': 7.0.0-dev.20260308.1
- '@typescript/native-preview-darwin-x64': 7.0.0-dev.20260308.1
- '@typescript/native-preview-linux-arm': 7.0.0-dev.20260308.1
- '@typescript/native-preview-linux-arm64': 7.0.0-dev.20260308.1
- '@typescript/native-preview-linux-x64': 7.0.0-dev.20260308.1
- '@typescript/native-preview-win32-arm64': 7.0.0-dev.20260308.1
- '@typescript/native-preview-win32-x64': 7.0.0-dev.20260308.1
+ '@typescript/native-preview-darwin-arm64': 7.0.0-dev.20260311.1
+ '@typescript/native-preview-darwin-x64': 7.0.0-dev.20260311.1
+ '@typescript/native-preview-linux-arm': 7.0.0-dev.20260311.1
+ '@typescript/native-preview-linux-arm64': 7.0.0-dev.20260311.1
+ '@typescript/native-preview-linux-x64': 7.0.0-dev.20260311.1
+ '@typescript/native-preview-win32-arm64': 7.0.0-dev.20260311.1
+ '@typescript/native-preview-win32-x64': 7.0.0-dev.20260311.1
'@typespec/ts-http-runtime@0.3.3':
dependencies:
@@ -10205,29 +10697,29 @@ snapshots:
- '@cypress/request'
- supports-color
- '@vitest/browser-playwright@4.0.18(playwright@1.58.2)(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)':
+ '@vitest/browser-playwright@4.0.18(playwright@1.58.2)(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)':
dependencies:
- '@vitest/browser': 4.0.18(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)
- '@vitest/mocker': 4.0.18(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
+ '@vitest/browser': 4.0.18(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)
+ '@vitest/mocker': 4.0.18(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
playwright: 1.58.2
tinyrainbow: 3.0.3
- vitest: 4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.3.5)(@vitest/browser-playwright@4.0.18)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+ vitest: 4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.4.0)(@vitest/browser-playwright@4.0.18)(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.18(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)':
+ '@vitest/browser@4.0.18(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)':
dependencies:
- '@vitest/mocker': 4.0.18(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
+ '@vitest/mocker': 4.0.18(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
'@vitest/utils': 4.0.18
magic-string: 0.30.21
pixelmatch: 7.1.0
pngjs: 7.0.0
sirv: 3.0.2
tinyrainbow: 3.0.3
- vitest: 4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.3.5)(@vitest/browser-playwright@4.0.18)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+ vitest: 4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.4.0)(@vitest/browser-playwright@4.0.18)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
ws: 8.19.0
transitivePeerDependencies:
- bufferutil
@@ -10235,7 +10727,7 @@ snapshots:
- utf-8-validate
- vite
- '@vitest/coverage-v8@4.0.18(@vitest/browser@4.0.18(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18))(vitest@4.0.18)':
+ '@vitest/coverage-v8@4.0.18(@vitest/browser@4.0.18(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18))(vitest@4.0.18)':
dependencies:
'@bcoe/v8-coverage': 1.0.2
'@vitest/utils': 4.0.18
@@ -10247,9 +10739,9 @@ snapshots:
obug: 2.1.1
std-env: 3.10.0
tinyrainbow: 3.0.3
- vitest: 4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.3.5)(@vitest/browser-playwright@4.0.18)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+ vitest: 4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.4.0)(@vitest/browser-playwright@4.0.18)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
optionalDependencies:
- '@vitest/browser': 4.0.18(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)
+ '@vitest/browser': 4.0.18(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)
'@vitest/expect@4.0.18':
dependencies:
@@ -10260,13 +10752,13 @@ snapshots:
chai: 6.2.2
tinyrainbow: 3.0.3
- '@vitest/mocker@4.0.18(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))':
+ '@vitest/mocker@4.0.18(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))':
dependencies:
'@vitest/spy': 4.0.18
estree-walker: 3.0.3
magic-string: 0.30.21
optionalDependencies:
- vite: 7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+ vite: 7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
'@vitest/pretty-format@4.0.18':
dependencies:
@@ -10363,13 +10855,14 @@ snapshots:
acorn@8.16.0: {}
- acpx@0.1.16(zod@4.3.6):
+ acpx@0.2.0(zod@4.3.6):
dependencies:
'@agentclientprotocol/sdk': 0.15.0(zod@4.3.6)
commander: 14.0.3
skillflag: 0.1.4
transitivePeerDependencies:
- bare-abort-controller
+ - bare-buffer
- react-native-b4a
- zod
@@ -10382,6 +10875,8 @@ snapshots:
agent-base@7.1.4: {}
+ agent-base@8.0.0: {}
+
ajv-formats@3.0.1(ajv@8.18.0):
optionalDependencies:
ajv: 8.18.0
@@ -10526,6 +11021,37 @@ snapshots:
bare-events@2.8.2: {}
+ bare-fs@4.5.5:
+ dependencies:
+ bare-events: 2.8.2
+ bare-path: 3.0.0
+ bare-stream: 2.8.1(bare-events@2.8.2)
+ bare-url: 2.3.2
+ fast-fifo: 1.3.2
+ transitivePeerDependencies:
+ - bare-abort-controller
+ - react-native-b4a
+
+ bare-os@3.7.1: {}
+
+ bare-path@3.0.0:
+ dependencies:
+ bare-os: 3.7.1
+
+ bare-stream@2.8.1(bare-events@2.8.2):
+ dependencies:
+ streamx: 2.23.0
+ teex: 1.0.1
+ optionalDependencies:
+ bare-events: 2.8.2
+ transitivePeerDependencies:
+ - bare-abort-controller
+ - react-native-b4a
+
+ bare-url@2.3.2:
+ dependencies:
+ bare-path: 3.0.0
+
base64-js@1.5.1: {}
basic-auth@2.0.1:
@@ -10613,7 +11139,7 @@ snapshots:
bun-types@1.3.9:
dependencies:
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
optional: true
bytes@3.1.2: {}
@@ -10865,7 +11391,7 @@ snapshots:
discord-api-types@0.38.37: {}
- discord-api-types@0.38.41: {}
+ discord-api-types@0.38.42: {}
doctypes@1.1.0: {}
@@ -10881,7 +11407,7 @@ snapshots:
dependencies:
domelementtype: 2.3.0
- dompurify@3.3.2:
+ dompurify@3.3.3:
optionalDependencies:
'@types/trusted-types': 2.0.7
@@ -11507,6 +12033,13 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ https-proxy-agent@8.0.0:
+ dependencies:
+ agent-base: 8.0.0
+ debug: 4.4.3
+ transitivePeerDependencies:
+ - supports-color
+
human-signals@1.1.1: {}
iconv-lite@0.4.24:
@@ -12305,6 +12838,81 @@ snapshots:
ws: 8.19.0
zod: 4.3.6
+ openclaw@2026.3.8(@discordjs/opus@0.10.0)(@napi-rs/canvas@0.1.95)(@types/express@5.0.6)(audio-decode@2.2.3)(hono@4.12.7)(node-llama-cpp@3.16.2(typescript@5.9.3)):
+ dependencies:
+ '@agentclientprotocol/sdk': 0.15.0(zod@4.3.6)
+ '@aws-sdk/client-bedrock': 3.1007.0
+ '@buape/carbon': 0.0.0-beta-20260216184201(@discordjs/opus@0.10.0)(hono@4.12.7)(opusscript@0.1.1)
+ '@clack/prompts': 1.1.0
+ '@discordjs/voice': 0.19.1(@discordjs/opus@0.10.0)(opusscript@0.1.1)
+ '@grammyjs/runner': 2.0.3(grammy@1.41.1)
+ '@grammyjs/transformer-throttler': 1.2.1(grammy@1.41.1)
+ '@homebridge/ciao': 1.3.5
+ '@larksuiteoapi/node-sdk': 1.59.0
+ '@line/bot-sdk': 10.6.0
+ '@lydell/node-pty': 1.2.0-beta.3
+ '@mariozechner/pi-agent-core': 0.57.1(ws@8.19.0)(zod@4.3.6)
+ '@mariozechner/pi-ai': 0.57.1(ws@8.19.0)(zod@4.3.6)
+ '@mariozechner/pi-coding-agent': 0.57.1(ws@8.19.0)(zod@4.3.6)
+ '@mariozechner/pi-tui': 0.57.1
+ '@mozilla/readability': 0.6.0
+ '@napi-rs/canvas': 0.1.95
+ '@sinclair/typebox': 0.34.48
+ '@slack/bolt': 4.6.0(@types/express@5.0.6)
+ '@slack/web-api': 7.14.1
+ '@whiskeysockets/baileys': 7.0.0-rc.9(audio-decode@2.2.3)(sharp@0.34.5)
+ ajv: 8.18.0
+ chalk: 5.6.2
+ chokidar: 5.0.0
+ cli-highlight: 2.1.11
+ commander: 14.0.3
+ croner: 10.0.1
+ discord-api-types: 0.38.42
+ dotenv: 17.3.1
+ express: 5.2.1
+ file-type: 21.3.1
+ grammy: 1.41.1
+ https-proxy-agent: 7.0.6
+ ipaddr.js: 2.3.0
+ jiti: 2.6.1
+ json5: 2.2.3
+ jszip: 3.10.1
+ linkedom: 0.18.12
+ long: 5.3.2
+ markdown-it: 14.1.1
+ node-edge-tts: 1.2.10
+ node-llama-cpp: 3.16.2(typescript@5.9.3)
+ opusscript: 0.1.1
+ osc-progress: 0.3.0
+ pdfjs-dist: 5.5.207
+ playwright-core: 1.58.2
+ qrcode-terminal: 0.12.0
+ sharp: 0.34.5
+ sqlite-vec: 0.1.7-alpha.2
+ tar: 7.5.11
+ tslog: 4.10.2
+ undici: 7.22.0
+ ws: 8.19.0
+ yaml: 2.8.2
+ zod: 4.3.6
+ transitivePeerDependencies:
+ - '@discordjs/opus'
+ - '@modelcontextprotocol/sdk'
+ - '@types/express'
+ - audio-decode
+ - aws-crt
+ - bufferutil
+ - canvas
+ - debug
+ - encoding
+ - ffmpeg-static
+ - hono
+ - jimp
+ - link-preview-js
+ - node-opus
+ - supports-color
+ - utf-8-validate
+
opus-decoder@0.7.11:
dependencies:
'@wasm-audio-decoders/common': 9.0.7
@@ -12325,29 +12933,29 @@ snapshots:
osc-progress@0.3.0: {}
- oxfmt@0.36.0:
+ oxfmt@0.38.0:
dependencies:
tinypool: 2.1.0
optionalDependencies:
- '@oxfmt/binding-android-arm-eabi': 0.36.0
- '@oxfmt/binding-android-arm64': 0.36.0
- '@oxfmt/binding-darwin-arm64': 0.36.0
- '@oxfmt/binding-darwin-x64': 0.36.0
- '@oxfmt/binding-freebsd-x64': 0.36.0
- '@oxfmt/binding-linux-arm-gnueabihf': 0.36.0
- '@oxfmt/binding-linux-arm-musleabihf': 0.36.0
- '@oxfmt/binding-linux-arm64-gnu': 0.36.0
- '@oxfmt/binding-linux-arm64-musl': 0.36.0
- '@oxfmt/binding-linux-ppc64-gnu': 0.36.0
- '@oxfmt/binding-linux-riscv64-gnu': 0.36.0
- '@oxfmt/binding-linux-riscv64-musl': 0.36.0
- '@oxfmt/binding-linux-s390x-gnu': 0.36.0
- '@oxfmt/binding-linux-x64-gnu': 0.36.0
- '@oxfmt/binding-linux-x64-musl': 0.36.0
- '@oxfmt/binding-openharmony-arm64': 0.36.0
- '@oxfmt/binding-win32-arm64-msvc': 0.36.0
- '@oxfmt/binding-win32-ia32-msvc': 0.36.0
- '@oxfmt/binding-win32-x64-msvc': 0.36.0
+ '@oxfmt/binding-android-arm-eabi': 0.38.0
+ '@oxfmt/binding-android-arm64': 0.38.0
+ '@oxfmt/binding-darwin-arm64': 0.38.0
+ '@oxfmt/binding-darwin-x64': 0.38.0
+ '@oxfmt/binding-freebsd-x64': 0.38.0
+ '@oxfmt/binding-linux-arm-gnueabihf': 0.38.0
+ '@oxfmt/binding-linux-arm-musleabihf': 0.38.0
+ '@oxfmt/binding-linux-arm64-gnu': 0.38.0
+ '@oxfmt/binding-linux-arm64-musl': 0.38.0
+ '@oxfmt/binding-linux-ppc64-gnu': 0.38.0
+ '@oxfmt/binding-linux-riscv64-gnu': 0.38.0
+ '@oxfmt/binding-linux-riscv64-musl': 0.38.0
+ '@oxfmt/binding-linux-s390x-gnu': 0.38.0
+ '@oxfmt/binding-linux-x64-gnu': 0.38.0
+ '@oxfmt/binding-linux-x64-musl': 0.38.0
+ '@oxfmt/binding-openharmony-arm64': 0.38.0
+ '@oxfmt/binding-win32-arm64-msvc': 0.38.0
+ '@oxfmt/binding-win32-ia32-msvc': 0.38.0
+ '@oxfmt/binding-win32-x64-msvc': 0.38.0
oxlint-tsgolint@0.16.0:
optionalDependencies:
@@ -12358,27 +12966,27 @@ snapshots:
'@oxlint-tsgolint/win32-arm64': 0.16.0
'@oxlint-tsgolint/win32-x64': 0.16.0
- oxlint@1.51.0(oxlint-tsgolint@0.16.0):
+ oxlint@1.53.0(oxlint-tsgolint@0.16.0):
optionalDependencies:
- '@oxlint/binding-android-arm-eabi': 1.51.0
- '@oxlint/binding-android-arm64': 1.51.0
- '@oxlint/binding-darwin-arm64': 1.51.0
- '@oxlint/binding-darwin-x64': 1.51.0
- '@oxlint/binding-freebsd-x64': 1.51.0
- '@oxlint/binding-linux-arm-gnueabihf': 1.51.0
- '@oxlint/binding-linux-arm-musleabihf': 1.51.0
- '@oxlint/binding-linux-arm64-gnu': 1.51.0
- '@oxlint/binding-linux-arm64-musl': 1.51.0
- '@oxlint/binding-linux-ppc64-gnu': 1.51.0
- '@oxlint/binding-linux-riscv64-gnu': 1.51.0
- '@oxlint/binding-linux-riscv64-musl': 1.51.0
- '@oxlint/binding-linux-s390x-gnu': 1.51.0
- '@oxlint/binding-linux-x64-gnu': 1.51.0
- '@oxlint/binding-linux-x64-musl': 1.51.0
- '@oxlint/binding-openharmony-arm64': 1.51.0
- '@oxlint/binding-win32-arm64-msvc': 1.51.0
- '@oxlint/binding-win32-ia32-msvc': 1.51.0
- '@oxlint/binding-win32-x64-msvc': 1.51.0
+ '@oxlint/binding-android-arm-eabi': 1.53.0
+ '@oxlint/binding-android-arm64': 1.53.0
+ '@oxlint/binding-darwin-arm64': 1.53.0
+ '@oxlint/binding-darwin-x64': 1.53.0
+ '@oxlint/binding-freebsd-x64': 1.53.0
+ '@oxlint/binding-linux-arm-gnueabihf': 1.53.0
+ '@oxlint/binding-linux-arm-musleabihf': 1.53.0
+ '@oxlint/binding-linux-arm64-gnu': 1.53.0
+ '@oxlint/binding-linux-arm64-musl': 1.53.0
+ '@oxlint/binding-linux-ppc64-gnu': 1.53.0
+ '@oxlint/binding-linux-riscv64-gnu': 1.53.0
+ '@oxlint/binding-linux-riscv64-musl': 1.53.0
+ '@oxlint/binding-linux-s390x-gnu': 1.53.0
+ '@oxlint/binding-linux-x64-gnu': 1.53.0
+ '@oxlint/binding-linux-x64-musl': 1.53.0
+ '@oxlint/binding-openharmony-arm64': 1.53.0
+ '@oxlint/binding-win32-arm64-msvc': 1.53.0
+ '@oxlint/binding-win32-ia32-msvc': 1.53.0
+ '@oxlint/binding-win32-x64-msvc': 1.53.0
oxlint-tsgolint: 0.16.0
p-finally@1.0.0: {}
@@ -12594,7 +13202,7 @@ snapshots:
'@protobufjs/path': 1.1.2
'@protobufjs/pool': 1.1.0
'@protobufjs/utf8': 1.1.0
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
long: 5.3.2
proxy-addr@2.0.7:
@@ -12833,7 +13441,7 @@ snapshots:
dependencies:
glob: 10.5.0
- rolldown-plugin-dts@0.22.4(@typescript/native-preview@7.0.0-dev.20260308.1)(rolldown@1.0.0-rc.7)(typescript@5.9.3):
+ rolldown-plugin-dts@0.22.5(@typescript/native-preview@7.0.0-dev.20260311.1)(rolldown@1.0.0-rc.9)(typescript@5.9.3):
dependencies:
'@babel/generator': 8.0.0-rc.2
'@babel/helper-validator-identifier': 8.0.0-rc.2
@@ -12844,33 +13452,33 @@ snapshots:
dts-resolver: 2.1.3
get-tsconfig: 4.13.6
obug: 2.1.1
- rolldown: 1.0.0-rc.7
+ rolldown: 1.0.0-rc.9
optionalDependencies:
- '@typescript/native-preview': 7.0.0-dev.20260308.1
+ '@typescript/native-preview': 7.0.0-dev.20260311.1
typescript: 5.9.3
transitivePeerDependencies:
- oxc-resolver
- rolldown@1.0.0-rc.7:
+ rolldown@1.0.0-rc.9:
dependencies:
'@oxc-project/types': 0.115.0
- '@rolldown/pluginutils': 1.0.0-rc.7
+ '@rolldown/pluginutils': 1.0.0-rc.9
optionalDependencies:
- '@rolldown/binding-android-arm64': 1.0.0-rc.7
- '@rolldown/binding-darwin-arm64': 1.0.0-rc.7
- '@rolldown/binding-darwin-x64': 1.0.0-rc.7
- '@rolldown/binding-freebsd-x64': 1.0.0-rc.7
- '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-rc.7
- '@rolldown/binding-linux-arm64-gnu': 1.0.0-rc.7
- '@rolldown/binding-linux-arm64-musl': 1.0.0-rc.7
- '@rolldown/binding-linux-ppc64-gnu': 1.0.0-rc.7
- '@rolldown/binding-linux-s390x-gnu': 1.0.0-rc.7
- '@rolldown/binding-linux-x64-gnu': 1.0.0-rc.7
- '@rolldown/binding-linux-x64-musl': 1.0.0-rc.7
- '@rolldown/binding-openharmony-arm64': 1.0.0-rc.7
- '@rolldown/binding-wasm32-wasi': 1.0.0-rc.7
- '@rolldown/binding-win32-arm64-msvc': 1.0.0-rc.7
- '@rolldown/binding-win32-x64-msvc': 1.0.0-rc.7
+ '@rolldown/binding-android-arm64': 1.0.0-rc.9
+ '@rolldown/binding-darwin-arm64': 1.0.0-rc.9
+ '@rolldown/binding-darwin-x64': 1.0.0-rc.9
+ '@rolldown/binding-freebsd-x64': 1.0.0-rc.9
+ '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-rc.9
+ '@rolldown/binding-linux-arm64-gnu': 1.0.0-rc.9
+ '@rolldown/binding-linux-arm64-musl': 1.0.0-rc.9
+ '@rolldown/binding-linux-ppc64-gnu': 1.0.0-rc.9
+ '@rolldown/binding-linux-s390x-gnu': 1.0.0-rc.9
+ '@rolldown/binding-linux-x64-gnu': 1.0.0-rc.9
+ '@rolldown/binding-linux-x64-musl': 1.0.0-rc.9
+ '@rolldown/binding-openharmony-arm64': 1.0.0-rc.9
+ '@rolldown/binding-wasm32-wasi': 1.0.0-rc.9
+ '@rolldown/binding-win32-arm64-msvc': 1.0.0-rc.9
+ '@rolldown/binding-win32-x64-msvc': 1.0.0-rc.9
rollup@4.59.0:
dependencies:
@@ -13114,9 +13722,10 @@ snapshots:
skillflag@0.1.4:
dependencies:
'@clack/prompts': 1.1.0
- tar-stream: 3.1.7
+ tar-stream: 3.1.8
transitivePeerDependencies:
- bare-abort-controller
+ - bare-buffer
- react-native-b4a
sleep-promise@9.1.0: {}
@@ -13300,13 +13909,15 @@ snapshots:
array-back: 6.2.2
wordwrapjs: 5.1.1
- tar-stream@3.1.7:
+ tar-stream@3.1.8:
dependencies:
b4a: 1.8.0
+ bare-fs: 4.5.5
fast-fifo: 1.3.2
streamx: 2.23.0
transitivePeerDependencies:
- bare-abort-controller
+ - bare-buffer
- react-native-b4a
tar@7.5.11:
@@ -13317,6 +13928,13 @@ snapshots:
minizlib: 3.1.0
yallist: 5.0.0
+ teex@1.0.1:
+ dependencies:
+ streamx: 2.23.0
+ transitivePeerDependencies:
+ - bare-abort-controller
+ - react-native-b4a
+
text-decoder@1.2.7:
dependencies:
b4a: 1.8.0
@@ -13381,7 +13999,7 @@ snapshots:
ts-algebra@2.0.0: {}
- tsdown@0.21.0(@typescript/native-preview@7.0.0-dev.20260308.1)(typescript@5.9.3):
+ tsdown@0.21.2(@typescript/native-preview@7.0.0-dev.20260311.1)(typescript@5.9.3):
dependencies:
ansis: 4.2.0
cac: 7.0.0
@@ -13391,14 +14009,14 @@ snapshots:
import-without-cache: 0.2.5
obug: 2.1.1
picomatch: 4.0.3
- rolldown: 1.0.0-rc.7
- rolldown-plugin-dts: 0.22.4(@typescript/native-preview@7.0.0-dev.20260308.1)(rolldown@1.0.0-rc.7)(typescript@5.9.3)
+ rolldown: 1.0.0-rc.9
+ rolldown-plugin-dts: 0.22.5(@typescript/native-preview@7.0.0-dev.20260311.1)(rolldown@1.0.0-rc.9)(typescript@5.9.3)
semver: 7.7.4
tinyexec: 1.0.2
tinyglobby: 0.2.15
tree-kill: 1.2.2
unconfig-core: 7.5.0
- unrun: 0.2.30
+ unrun: 0.2.32
optionalDependencies:
typescript: 5.9.3
transitivePeerDependencies:
@@ -13496,9 +14114,9 @@ snapshots:
unpipe@1.0.0: {}
- unrun@0.2.30:
+ unrun@0.2.32:
dependencies:
- rolldown: 1.0.0-rc.7
+ rolldown: 1.0.0-rc.9
url-join@4.0.1: {}
@@ -13537,7 +14155,7 @@ snapshots:
'@types/unist': 3.0.3
vfile-message: 4.0.3
- vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2):
+ vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2):
dependencies:
esbuild: 0.27.3
fdir: 6.5.0(picomatch@4.0.3)
@@ -13546,17 +14164,17 @@ snapshots:
rollup: 4.59.0
tinyglobby: 0.2.15
optionalDependencies:
- '@types/node': 25.3.5
+ '@types/node': 25.4.0
fsevents: 2.3.3
jiti: 2.6.1
lightningcss: 1.30.2
tsx: 4.21.0
yaml: 2.8.2
- vitest@4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.3.5)(@vitest/browser-playwright@4.0.18)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2):
+ vitest@4.0.18(@opentelemetry/api@1.9.0)(@types/node@25.4.0)(@vitest/browser-playwright@4.0.18)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2):
dependencies:
'@vitest/expect': 4.0.18
- '@vitest/mocker': 4.0.18(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
+ '@vitest/mocker': 4.0.18(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
'@vitest/pretty-format': 4.0.18
'@vitest/runner': 4.0.18
'@vitest/snapshot': 4.0.18
@@ -13573,12 +14191,12 @@ snapshots:
tinyexec: 1.0.2
tinyglobby: 0.2.15
tinyrainbow: 3.0.3
- vite: 7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+ vite: 7.3.1(@types/node@25.4.0)(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.3.5
- '@vitest/browser-playwright': 4.0.18(playwright@1.58.2)(vite@7.3.1(@types/node@25.3.5)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)
+ '@types/node': 25.4.0
+ '@vitest/browser-playwright': 4.0.18(playwright@1.58.2)(vite@7.3.1(@types/node@25.4.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.18)
transitivePeerDependencies:
- jiti
- less
diff --git a/scripts/ios-write-version-xcconfig.sh b/scripts/ios-write-version-xcconfig.sh
index e6214c9188c..b63d3e81adb 100755
--- a/scripts/ios-write-version-xcconfig.sh
+++ b/scripts/ios-write-version-xcconfig.sh
@@ -73,7 +73,7 @@ fi
if [[ "${PACKAGE_VERSION}" =~ ^([0-9]{4}\.[0-9]{1,2}\.[0-9]{1,2})([.-]?beta[.-][0-9]+)?$ ]]; then
MARKETING_VERSION="${BASH_REMATCH[1]}"
else
- echo "Unsupported package.json.version '${PACKAGE_VERSION}'. Expected 2026.3.9 or 2026.3.9-beta.1." >&2
+ echo "Unsupported package.json.version '${PACKAGE_VERSION}'. Expected 2026.3.11 or 2026.3.11-beta.1." >&2
exit 1
fi
diff --git a/src/acp/control-plane/manager.core.ts b/src/acp/control-plane/manager.core.ts
index 558e1ca24a8..b15aa3bd72e 100644
--- a/src/acp/control-plane/manager.core.ts
+++ b/src/acp/control-plane/manager.core.ts
@@ -44,11 +44,11 @@ import {
type TurnLatencyStats,
} from "./manager.types.js";
import {
+ canonicalizeAcpSessionKey,
createUnsupportedControlError,
hasLegacyAcpIdentityProjection,
normalizeAcpErrorCode,
normalizeActorKey,
- normalizeSessionKey,
requireReadySessionMeta,
resolveAcpAgentFromSessionKey,
resolveAcpSessionResolutionError,
@@ -87,7 +87,7 @@ export class AcpSessionManager {
constructor(private readonly deps: AcpSessionManagerDeps = DEFAULT_DEPS) {}
resolveSession(params: { cfg: OpenClawConfig; sessionKey: string }): AcpSessionResolution {
- const sessionKey = normalizeSessionKey(params.sessionKey);
+ const sessionKey = canonicalizeAcpSessionKey(params);
if (!sessionKey) {
return {
kind: "none",
@@ -213,7 +213,10 @@ export class AcpSessionManager {
handle: AcpRuntimeHandle;
meta: SessionAcpMeta;
}> {
- const sessionKey = normalizeSessionKey(input.sessionKey);
+ const sessionKey = canonicalizeAcpSessionKey({
+ cfg: input.cfg,
+ sessionKey: input.sessionKey,
+ });
if (!sessionKey) {
throw new AcpRuntimeError("ACP_SESSION_INIT_FAILED", "ACP session key is required.");
}
@@ -321,7 +324,7 @@ export class AcpSessionManager {
sessionKey: string;
signal?: AbortSignal;
}): Promise {
- const sessionKey = normalizeSessionKey(params.sessionKey);
+ const sessionKey = canonicalizeAcpSessionKey(params);
if (!sessionKey) {
throw new AcpRuntimeError("ACP_SESSION_INIT_FAILED", "ACP session key is required.");
}
@@ -397,7 +400,7 @@ export class AcpSessionManager {
sessionKey: string;
runtimeMode: string;
}): Promise {
- const sessionKey = normalizeSessionKey(params.sessionKey);
+ const sessionKey = canonicalizeAcpSessionKey(params);
if (!sessionKey) {
throw new AcpRuntimeError("ACP_SESSION_INIT_FAILED", "ACP session key is required.");
}
@@ -452,7 +455,7 @@ export class AcpSessionManager {
key: string;
value: string;
}): Promise {
- const sessionKey = normalizeSessionKey(params.sessionKey);
+ const sessionKey = canonicalizeAcpSessionKey(params);
if (!sessionKey) {
throw new AcpRuntimeError("ACP_SESSION_INIT_FAILED", "ACP session key is required.");
}
@@ -525,7 +528,7 @@ export class AcpSessionManager {
sessionKey: string;
patch: Partial;
}): Promise {
- const sessionKey = normalizeSessionKey(params.sessionKey);
+ const sessionKey = canonicalizeAcpSessionKey(params);
const validatedPatch = validateRuntimeOptionPatch(params.patch);
if (!sessionKey) {
throw new AcpRuntimeError("ACP_SESSION_INIT_FAILED", "ACP session key is required.");
@@ -555,7 +558,7 @@ export class AcpSessionManager {
cfg: OpenClawConfig;
sessionKey: string;
}): Promise {
- const sessionKey = normalizeSessionKey(params.sessionKey);
+ const sessionKey = canonicalizeAcpSessionKey(params);
if (!sessionKey) {
throw new AcpRuntimeError("ACP_SESSION_INIT_FAILED", "ACP session key is required.");
}
@@ -591,7 +594,10 @@ export class AcpSessionManager {
}
async runTurn(input: AcpRunTurnInput): Promise {
- const sessionKey = normalizeSessionKey(input.sessionKey);
+ const sessionKey = canonicalizeAcpSessionKey({
+ cfg: input.cfg,
+ sessionKey: input.sessionKey,
+ });
if (!sessionKey) {
throw new AcpRuntimeError("ACP_SESSION_INIT_FAILED", "ACP session key is required.");
}
@@ -738,7 +744,7 @@ export class AcpSessionManager {
sessionKey: string;
reason?: string;
}): Promise {
- const sessionKey = normalizeSessionKey(params.sessionKey);
+ const sessionKey = canonicalizeAcpSessionKey(params);
if (!sessionKey) {
throw new AcpRuntimeError("ACP_SESSION_INIT_FAILED", "ACP session key is required.");
}
@@ -806,7 +812,10 @@ export class AcpSessionManager {
}
async closeSession(input: AcpCloseSessionInput): Promise {
- const sessionKey = normalizeSessionKey(input.sessionKey);
+ const sessionKey = canonicalizeAcpSessionKey({
+ cfg: input.cfg,
+ sessionKey: input.sessionKey,
+ });
if (!sessionKey) {
throw new AcpRuntimeError("ACP_SESSION_INIT_FAILED", "ACP session key is required.");
}
diff --git a/src/acp/control-plane/manager.test.ts b/src/acp/control-plane/manager.test.ts
index ebdf356ca9f..8152944834c 100644
--- a/src/acp/control-plane/manager.test.ts
+++ b/src/acp/control-plane/manager.test.ts
@@ -170,6 +170,57 @@ describe("AcpSessionManager", () => {
expect(resolved.error.message).toContain("ACP metadata is missing");
});
+ it("canonicalizes the main alias before ACP rehydrate after restart", async () => {
+ const runtimeState = createRuntime();
+ hoisted.requireAcpRuntimeBackendMock.mockReturnValue({
+ id: "acpx",
+ runtime: runtimeState.runtime,
+ });
+ hoisted.readAcpSessionEntryMock.mockImplementation((paramsUnknown: unknown) => {
+ const sessionKey = (paramsUnknown as { sessionKey?: string }).sessionKey;
+ if (sessionKey !== "agent:main:main") {
+ return null;
+ }
+ return {
+ sessionKey,
+ storeSessionKey: sessionKey,
+ acp: {
+ ...readySessionMeta(),
+ agent: "main",
+ runtimeSessionName: sessionKey,
+ },
+ };
+ });
+
+ const manager = new AcpSessionManager();
+ const cfg = {
+ ...baseCfg,
+ session: { mainKey: "main" },
+ agents: { list: [{ id: "main", default: true }] },
+ } as OpenClawConfig;
+
+ await manager.runTurn({
+ cfg,
+ sessionKey: "main",
+ text: "after restart",
+ mode: "prompt",
+ requestId: "r-main",
+ });
+
+ expect(hoisted.readAcpSessionEntryMock).toHaveBeenCalledWith(
+ expect.objectContaining({
+ cfg,
+ sessionKey: "agent:main:main",
+ }),
+ );
+ expect(runtimeState.ensureSession).toHaveBeenCalledWith(
+ expect.objectContaining({
+ agent: "main",
+ sessionKey: "agent:main:main",
+ }),
+ );
+ });
+
it("serializes concurrent turns for the same ACP session", async () => {
const runtimeState = createRuntime();
hoisted.requireAcpRuntimeBackendMock.mockReturnValue({
diff --git a/src/acp/control-plane/manager.utils.ts b/src/acp/control-plane/manager.utils.ts
index 17729c6c2fc..90f7c516538 100644
--- a/src/acp/control-plane/manager.utils.ts
+++ b/src/acp/control-plane/manager.utils.ts
@@ -1,6 +1,14 @@
import type { OpenClawConfig } from "../../config/config.js";
+import {
+ canonicalizeMainSessionAlias,
+ resolveMainSessionKey,
+} from "../../config/sessions/main-session.js";
import type { SessionAcpMeta } from "../../config/sessions/types.js";
-import { normalizeAgentId, parseAgentSessionKey } from "../../routing/session-key.js";
+import {
+ normalizeAgentId,
+ normalizeMainKey,
+ parseAgentSessionKey,
+} from "../../routing/session-key.js";
import { ACP_ERROR_CODES, AcpRuntimeError } from "../runtime/errors.js";
import type { AcpSessionResolution } from "./manager.types.js";
@@ -42,6 +50,33 @@ export function normalizeSessionKey(sessionKey: string): string {
return sessionKey.trim();
}
+export function canonicalizeAcpSessionKey(params: {
+ cfg: OpenClawConfig;
+ sessionKey: string;
+}): string {
+ const normalized = normalizeSessionKey(params.sessionKey);
+ if (!normalized) {
+ return "";
+ }
+ const lowered = normalized.toLowerCase();
+ if (lowered === "global" || lowered === "unknown") {
+ return lowered;
+ }
+ const parsed = parseAgentSessionKey(lowered);
+ if (parsed) {
+ return canonicalizeMainSessionAlias({
+ cfg: params.cfg,
+ agentId: parsed.agentId,
+ sessionKey: lowered,
+ });
+ }
+ const mainKey = normalizeMainKey(params.cfg.session?.mainKey);
+ if (lowered === "main" || lowered === mainKey) {
+ return resolveMainSessionKey(params.cfg);
+ }
+ return lowered;
+}
+
export function normalizeActorKey(sessionKey: string): string {
return sessionKey.trim().toLowerCase();
}
diff --git a/src/acp/translator.session-rate-limit.test.ts b/src/acp/translator.session-rate-limit.test.ts
index d08ae1a1567..d0f774678a9 100644
--- a/src/acp/translator.session-rate-limit.test.ts
+++ b/src/acp/translator.session-rate-limit.test.ts
@@ -52,7 +52,7 @@ function createSetSessionModeRequest(sessionId: string, modeId: string): SetSess
function createSetSessionConfigOptionRequest(
sessionId: string,
configId: string,
- value: string,
+ value: string | boolean,
): SetSessionConfigOptionRequest {
return {
sessionId,
@@ -644,6 +644,55 @@ describe("acp setSessionConfigOption bridge behavior", () => {
sessionStore.clearAllSessionsForTest();
});
+
+ it("rejects non-string ACP config option values", async () => {
+ const sessionStore = createInMemorySessionStore();
+ const connection = createAcpConnection();
+ const request = vi.fn(async (method: string) => {
+ if (method === "sessions.list") {
+ return {
+ ts: Date.now(),
+ path: "/tmp/sessions.json",
+ count: 1,
+ defaults: {
+ modelProvider: null,
+ model: null,
+ contextTokens: null,
+ },
+ sessions: [
+ {
+ key: "bool-config-session",
+ kind: "direct",
+ updatedAt: Date.now(),
+ thinkingLevel: "minimal",
+ modelProvider: "openai",
+ model: "gpt-5.4",
+ },
+ ],
+ };
+ }
+ return { ok: true };
+ }) as GatewayClient["request"];
+ const agent = new AcpGatewayAgent(connection, createAcpGateway(request), {
+ sessionStore,
+ });
+
+ await agent.loadSession(createLoadSessionRequest("bool-config-session"));
+
+ await expect(
+ agent.setSessionConfigOption(
+ createSetSessionConfigOptionRequest("bool-config-session", "thought_level", false),
+ ),
+ ).rejects.toThrow(
+ 'ACP bridge does not support non-string session config option values for "thought_level".',
+ );
+ expect(request).not.toHaveBeenCalledWith(
+ "sessions.patch",
+ expect.objectContaining({ key: "bool-config-session" }),
+ );
+
+ sessionStore.clearAllSessionsForTest();
+ });
});
describe("acp tool streaming bridge behavior", () => {
diff --git a/src/acp/translator.ts b/src/acp/translator.ts
index 585f97c8f43..bb52db7b26b 100644
--- a/src/acp/translator.ts
+++ b/src/acp/translator.ts
@@ -937,11 +937,16 @@ export class AcpGatewayAgent implements Agent {
private resolveSessionConfigPatch(
configId: string,
- value: string,
+ value: string | boolean,
): {
overrides: Partial;
patch: Record;
} {
+ if (typeof value !== "string") {
+ throw new Error(
+ `ACP bridge does not support non-string session config option values for "${configId}".`,
+ );
+ }
switch (configId) {
case ACP_THOUGHT_LEVEL_CONFIG_ID:
return {
diff --git a/src/agents/memory-search.test.ts b/src/agents/memory-search.test.ts
index 9372b4c7696..1d04b730351 100644
--- a/src/agents/memory-search.test.ts
+++ b/src/agents/memory-search.test.ts
@@ -131,6 +131,113 @@ describe("memory search config", () => {
expect(resolved?.extraPaths).toEqual(["/shared/notes", "docs", "../team-notes"]);
});
+ it("normalizes multimodal settings", () => {
+ const cfg = asConfig({
+ agents: {
+ defaults: {
+ memorySearch: {
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ multimodal: {
+ enabled: true,
+ modalities: ["all"],
+ maxFileBytes: 8192,
+ },
+ },
+ },
+ },
+ });
+ const resolved = resolveMemorySearchConfig(cfg, "main");
+ expect(resolved?.multimodal).toEqual({
+ enabled: true,
+ modalities: ["image", "audio"],
+ maxFileBytes: 8192,
+ });
+ });
+
+ it("keeps an explicit empty multimodal modalities list empty", () => {
+ const cfg = asConfig({
+ agents: {
+ defaults: {
+ memorySearch: {
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ multimodal: {
+ enabled: true,
+ modalities: [],
+ },
+ },
+ },
+ },
+ });
+ const resolved = resolveMemorySearchConfig(cfg, "main");
+ expect(resolved?.multimodal).toEqual({
+ enabled: true,
+ modalities: [],
+ maxFileBytes: 10 * 1024 * 1024,
+ });
+ expect(resolved?.provider).toBe("gemini");
+ });
+
+ it("does not enforce multimodal provider validation when no modalities are active", () => {
+ const cfg = asConfig({
+ agents: {
+ defaults: {
+ memorySearch: {
+ provider: "openai",
+ model: "text-embedding-3-small",
+ fallback: "openai",
+ multimodal: {
+ enabled: true,
+ modalities: [],
+ },
+ },
+ },
+ },
+ });
+ const resolved = resolveMemorySearchConfig(cfg, "main");
+ expect(resolved?.multimodal).toEqual({
+ enabled: true,
+ modalities: [],
+ maxFileBytes: 10 * 1024 * 1024,
+ });
+ });
+
+ it("rejects multimodal memory on unsupported providers", () => {
+ const cfg = asConfig({
+ agents: {
+ defaults: {
+ memorySearch: {
+ provider: "openai",
+ model: "text-embedding-3-small",
+ multimodal: { enabled: true, modalities: ["image"] },
+ },
+ },
+ },
+ });
+ expect(() => resolveMemorySearchConfig(cfg, "main")).toThrow(
+ /memorySearch\.multimodal requires memorySearch\.provider = "gemini"/,
+ );
+ });
+
+ it("rejects multimodal memory when fallback is configured", () => {
+ const cfg = asConfig({
+ agents: {
+ defaults: {
+ memorySearch: {
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ fallback: "openai",
+ multimodal: { enabled: true, modalities: ["image"] },
+ },
+ },
+ },
+ });
+ expect(() => resolveMemorySearchConfig(cfg, "main")).toThrow(
+ /memorySearch\.multimodal does not support memorySearch\.fallback/,
+ );
+ });
+
it("includes batch defaults for openai without remote overrides", () => {
const cfg = configWithDefaultProvider("openai");
const resolved = resolveMemorySearchConfig(cfg, "main");
diff --git a/src/agents/memory-search.ts b/src/agents/memory-search.ts
index 6bcacfec2db..d00dae70639 100644
--- a/src/agents/memory-search.ts
+++ b/src/agents/memory-search.ts
@@ -3,6 +3,12 @@ import path from "node:path";
import type { OpenClawConfig, MemorySearchConfig } from "../config/config.js";
import { resolveStateDir } from "../config/paths.js";
import type { SecretInput } from "../config/types.secrets.js";
+import {
+ isMemoryMultimodalEnabled,
+ normalizeMemoryMultimodalSettings,
+ supportsMemoryMultimodalEmbeddings,
+ type MemoryMultimodalSettings,
+} from "../memory/multimodal.js";
import { clampInt, clampNumber, resolveUserPath } from "../utils.js";
import { resolveAgentConfig } from "./agent-scope.js";
@@ -10,6 +16,7 @@ export type ResolvedMemorySearchConfig = {
enabled: boolean;
sources: Array<"memory" | "sessions">;
extraPaths: string[];
+ multimodal: MemoryMultimodalSettings;
provider: "openai" | "local" | "gemini" | "voyage" | "mistral" | "ollama" | "auto";
remote?: {
baseUrl?: string;
@@ -204,6 +211,11 @@ function mergeConfig(
.map((value) => value.trim())
.filter(Boolean);
const extraPaths = Array.from(new Set(rawPaths));
+ const multimodal = normalizeMemoryMultimodalSettings({
+ enabled: overrides?.multimodal?.enabled ?? defaults?.multimodal?.enabled,
+ modalities: overrides?.multimodal?.modalities ?? defaults?.multimodal?.modalities,
+ maxFileBytes: overrides?.multimodal?.maxFileBytes ?? defaults?.multimodal?.maxFileBytes,
+ });
const vector = {
enabled: overrides?.store?.vector?.enabled ?? defaults?.store?.vector?.enabled ?? true,
extensionPath:
@@ -307,6 +319,7 @@ function mergeConfig(
enabled,
sources,
extraPaths,
+ multimodal,
provider,
remote,
experimental: {
@@ -365,5 +378,22 @@ export function resolveMemorySearchConfig(
if (!resolved.enabled) {
return null;
}
+ const multimodalActive = isMemoryMultimodalEnabled(resolved.multimodal);
+ if (
+ multimodalActive &&
+ !supportsMemoryMultimodalEmbeddings({
+ provider: resolved.provider,
+ model: resolved.model,
+ })
+ ) {
+ throw new Error(
+ 'agents.*.memorySearch.multimodal requires memorySearch.provider = "gemini" and model = "gemini-embedding-2-preview".',
+ );
+ }
+ if (multimodalActive && resolved.fallback !== "none") {
+ throw new Error(
+ 'agents.*.memorySearch.multimodal does not support memorySearch.fallback. Set fallback to "none".',
+ );
+ }
return resolved;
}
diff --git a/src/agents/models-config.providers.discovery.ts b/src/agents/models-config.providers.discovery.ts
index dd0504d2a53..64e1a9abe61 100644
--- a/src/agents/models-config.providers.discovery.ts
+++ b/src/agents/models-config.providers.discovery.ts
@@ -10,6 +10,7 @@ import {
} from "./huggingface-models.js";
import { discoverKilocodeModels } from "./kilocode-models.js";
import {
+ enrichOllamaModelsWithContext,
OLLAMA_DEFAULT_CONTEXT_WINDOW,
OLLAMA_DEFAULT_COST,
OLLAMA_DEFAULT_MAX_TOKENS,
@@ -46,38 +47,6 @@ type VllmModelsResponse = {
}>;
};
-async function queryOllamaContextWindow(
- apiBase: string,
- modelName: string,
-): Promise {
- try {
- const response = await fetch(`${apiBase}/api/show`, {
- method: "POST",
- headers: { "Content-Type": "application/json" },
- body: JSON.stringify({ name: modelName }),
- signal: AbortSignal.timeout(3000),
- });
- if (!response.ok) {
- return undefined;
- }
- const data = (await response.json()) as { model_info?: Record };
- if (!data.model_info) {
- return undefined;
- }
- for (const [key, value] of Object.entries(data.model_info)) {
- if (key.endsWith(".context_length") && typeof value === "number" && Number.isFinite(value)) {
- const contextWindow = Math.floor(value);
- if (contextWindow > 0) {
- return contextWindow;
- }
- }
- }
- return undefined;
- } catch {
- return undefined;
- }
-}
-
async function discoverOllamaModels(
baseUrl?: string,
opts?: { quiet?: boolean },
@@ -107,27 +76,18 @@ async function discoverOllamaModels(
`Capping Ollama /api/show inspection to ${OLLAMA_SHOW_MAX_MODELS} models (received ${data.models.length})`,
);
}
- const discovered: ModelDefinitionConfig[] = [];
- for (let index = 0; index < modelsToInspect.length; index += OLLAMA_SHOW_CONCURRENCY) {
- const batch = modelsToInspect.slice(index, index + OLLAMA_SHOW_CONCURRENCY);
- const batchDiscovered = await Promise.all(
- batch.map(async (model) => {
- const modelId = model.name;
- const contextWindow = await queryOllamaContextWindow(apiBase, modelId);
- return {
- id: modelId,
- name: modelId,
- reasoning: isReasoningModelHeuristic(modelId),
- input: ["text"],
- cost: OLLAMA_DEFAULT_COST,
- contextWindow: contextWindow ?? OLLAMA_DEFAULT_CONTEXT_WINDOW,
- maxTokens: OLLAMA_DEFAULT_MAX_TOKENS,
- } satisfies ModelDefinitionConfig;
- }),
- );
- discovered.push(...batchDiscovered);
- }
- return discovered;
+ const discovered = await enrichOllamaModelsWithContext(apiBase, modelsToInspect, {
+ concurrency: OLLAMA_SHOW_CONCURRENCY,
+ });
+ return discovered.map((model) => ({
+ id: model.name,
+ name: model.name,
+ reasoning: isReasoningModelHeuristic(model.name),
+ input: ["text"],
+ cost: OLLAMA_DEFAULT_COST,
+ contextWindow: model.contextWindow ?? OLLAMA_DEFAULT_CONTEXT_WINDOW,
+ maxTokens: OLLAMA_DEFAULT_MAX_TOKENS,
+ }));
} catch (error) {
if (!opts?.quiet) {
log.warn(`Failed to discover Ollama models: ${String(error)}`);
diff --git a/src/agents/models-config.providers.static.ts b/src/agents/models-config.providers.static.ts
index 08b3d1c2a66..c525cb32f53 100644
--- a/src/agents/models-config.providers.static.ts
+++ b/src/agents/models-config.providers.static.ts
@@ -429,6 +429,24 @@ export function buildOpenrouterProvider(): ProviderConfig {
contextWindow: OPENROUTER_DEFAULT_CONTEXT_WINDOW,
maxTokens: OPENROUTER_DEFAULT_MAX_TOKENS,
},
+ {
+ id: "openrouter/hunter-alpha",
+ name: "Hunter Alpha",
+ reasoning: true,
+ input: ["text"],
+ cost: OPENROUTER_DEFAULT_COST,
+ contextWindow: 1048576,
+ maxTokens: 65536,
+ },
+ {
+ id: "openrouter/healer-alpha",
+ name: "Healer Alpha",
+ reasoning: true,
+ input: ["text", "image"],
+ cost: OPENROUTER_DEFAULT_COST,
+ contextWindow: 262144,
+ maxTokens: 65536,
+ },
],
};
}
diff --git a/src/agents/ollama-models.test.ts b/src/agents/ollama-models.test.ts
new file mode 100644
index 00000000000..7877d40bdf9
--- /dev/null
+++ b/src/agents/ollama-models.test.ts
@@ -0,0 +1,61 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import {
+ enrichOllamaModelsWithContext,
+ resolveOllamaApiBase,
+ type OllamaTagModel,
+} from "./ollama-models.js";
+
+function jsonResponse(body: unknown, status = 200): Response {
+ return new Response(JSON.stringify(body), {
+ status,
+ headers: { "Content-Type": "application/json" },
+ });
+}
+
+function requestUrl(input: string | URL | Request): string {
+ if (typeof input === "string") {
+ return input;
+ }
+ if (input instanceof URL) {
+ return input.toString();
+ }
+ return input.url;
+}
+
+function requestBody(body: BodyInit | null | undefined): string {
+ return typeof body === "string" ? body : "{}";
+}
+
+describe("ollama-models", () => {
+ afterEach(() => {
+ vi.unstubAllGlobals();
+ });
+
+ it("strips /v1 when resolving the Ollama API base", () => {
+ expect(resolveOllamaApiBase("http://127.0.0.1:11434/v1")).toBe("http://127.0.0.1:11434");
+ expect(resolveOllamaApiBase("http://127.0.0.1:11434///")).toBe("http://127.0.0.1:11434");
+ });
+
+ it("enriches discovered models with context windows from /api/show", async () => {
+ const models: OllamaTagModel[] = [{ name: "llama3:8b" }, { name: "deepseek-r1:14b" }];
+ const fetchMock = vi.fn(async (input: string | URL | Request, init?: RequestInit) => {
+ const url = requestUrl(input);
+ if (!url.endsWith("/api/show")) {
+ throw new Error(`Unexpected fetch: ${url}`);
+ }
+ const body = JSON.parse(requestBody(init?.body)) as { name?: string };
+ if (body.name === "llama3:8b") {
+ return jsonResponse({ model_info: { "llama.context_length": 65536 } });
+ }
+ return jsonResponse({});
+ });
+ vi.stubGlobal("fetch", fetchMock);
+
+ const enriched = await enrichOllamaModelsWithContext("http://127.0.0.1:11434", models);
+
+ expect(enriched).toEqual([
+ { name: "llama3:8b", contextWindow: 65536 },
+ { name: "deepseek-r1:14b", contextWindow: undefined },
+ ]);
+ });
+});
diff --git a/src/agents/ollama-models.ts b/src/agents/ollama-models.ts
index 19d95605203..20406b3a80e 100644
--- a/src/agents/ollama-models.ts
+++ b/src/agents/ollama-models.ts
@@ -27,6 +27,12 @@ export type OllamaTagsResponse = {
models?: OllamaTagModel[];
};
+export type OllamaModelWithContext = OllamaTagModel & {
+ contextWindow?: number;
+};
+
+const OLLAMA_SHOW_CONCURRENCY = 8;
+
/**
* Derive the Ollama native API base URL from a configured base URL.
*
@@ -43,6 +49,58 @@ export function resolveOllamaApiBase(configuredBaseUrl?: string): string {
return trimmed.replace(/\/v1$/i, "");
}
+export async function queryOllamaContextWindow(
+ apiBase: string,
+ modelName: string,
+): Promise {
+ try {
+ const response = await fetch(`${apiBase}/api/show`, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ name: modelName }),
+ signal: AbortSignal.timeout(3000),
+ });
+ if (!response.ok) {
+ return undefined;
+ }
+ const data = (await response.json()) as { model_info?: Record };
+ if (!data.model_info) {
+ return undefined;
+ }
+ for (const [key, value] of Object.entries(data.model_info)) {
+ if (key.endsWith(".context_length") && typeof value === "number" && Number.isFinite(value)) {
+ const contextWindow = Math.floor(value);
+ if (contextWindow > 0) {
+ return contextWindow;
+ }
+ }
+ }
+ return undefined;
+ } catch {
+ return undefined;
+ }
+}
+
+export async function enrichOllamaModelsWithContext(
+ apiBase: string,
+ models: OllamaTagModel[],
+ opts?: { concurrency?: number },
+): Promise {
+ const concurrency = Math.max(1, Math.floor(opts?.concurrency ?? OLLAMA_SHOW_CONCURRENCY));
+ const enriched: OllamaModelWithContext[] = [];
+ for (let index = 0; index < models.length; index += concurrency) {
+ const batch = models.slice(index, index + concurrency);
+ const batchResults = await Promise.all(
+ batch.map(async (model) => ({
+ ...model,
+ contextWindow: await queryOllamaContextWindow(apiBase, model.name),
+ })),
+ );
+ enriched.push(...batchResults);
+ }
+ return enriched;
+}
+
/** Heuristic: treat models with "r1", "reasoning", or "think" in the name as reasoning models. */
export function isReasoningModelHeuristic(modelId: string): boolean {
return /r1|reasoning|think|reason/i.test(modelId);
diff --git a/src/agents/openai-responses.reasoning-replay.test.ts b/src/agents/openai-responses.reasoning-replay.test.ts
index b5ccc50e4b4..0fcb02ece6d 100644
--- a/src/agents/openai-responses.reasoning-replay.test.ts
+++ b/src/agents/openai-responses.reasoning-replay.test.ts
@@ -30,6 +30,13 @@ function extractInputTypes(input: unknown[]) {
.filter((t): t is string => typeof t === "string");
}
+function extractInputMessages(input: unknown[]) {
+ return input.filter(
+ (item): item is Record =>
+ !!item && typeof item === "object" && (item as Record).type === "message",
+ );
+}
+
const ZERO_USAGE = {
input: 0,
output: 0,
@@ -184,4 +191,36 @@ describe("openai-responses reasoning replay", () => {
expect(types).toContain("reasoning");
expect(types).toContain("message");
});
+
+ it.each(["commentary", "final_answer"] as const)(
+ "replays assistant message phase metadata for %s",
+ async (phase) => {
+ const assistantWithText = buildAssistantMessage({
+ stopReason: "stop",
+ content: [
+ buildReasoningPart(),
+ {
+ type: "text",
+ text: "hello",
+ textSignature: JSON.stringify({ v: 1, id: `msg_${phase}`, phase }),
+ },
+ ],
+ });
+
+ const { input, types } = await runAbortedOpenAIResponsesStream({
+ messages: [
+ { role: "user", content: "Hi", timestamp: Date.now() },
+ assistantWithText,
+ { role: "user", content: "Ok", timestamp: Date.now() },
+ ],
+ });
+
+ expect(types).toContain("message");
+
+ const replayedMessage = extractInputMessages(input).find(
+ (item) => item.id === `msg_${phase}`,
+ );
+ expect(replayedMessage?.phase).toBe(phase);
+ },
+ );
});
diff --git a/src/agents/openai-ws-connection.test.ts b/src/agents/openai-ws-connection.test.ts
index fb80f510ac1..2a7b95f7eb9 100644
--- a/src/agents/openai-ws-connection.test.ts
+++ b/src/agents/openai-ws-connection.test.ts
@@ -595,14 +595,12 @@ describe("OpenAIWebSocketManager", () => {
manager.warmUp({
model: "gpt-5.2",
- tools: [{ type: "function", function: { name: "exec", description: "Run a command" } }],
+ tools: [{ type: "function", name: "exec", description: "Run a command" }],
});
const sent = JSON.parse(sock.sentMessages[0] ?? "{}") as Record;
expect(sent["tools"]).toHaveLength(1);
- expect((sent["tools"] as Array<{ function?: { name?: string } }>)[0]?.function?.name).toBe(
- "exec",
- );
+ expect((sent["tools"] as Array<{ name?: string }>)[0]?.name).toBe("exec");
});
});
diff --git a/src/agents/openai-ws-connection.ts b/src/agents/openai-ws-connection.ts
index a765c0f3780..2d9c6ffe7e6 100644
--- a/src/agents/openai-ws-connection.ts
+++ b/src/agents/openai-ws-connection.ts
@@ -37,12 +37,15 @@ export interface UsageInfo {
total_tokens: number;
}
+export type OpenAIResponsesAssistantPhase = "commentary" | "final_answer";
+
export type OutputItem =
| {
type: "message";
id: string;
role: "assistant";
content: Array<{ type: "output_text"; text: string }>;
+ phase?: OpenAIResponsesAssistantPhase;
status?: "in_progress" | "completed";
}
| {
@@ -190,6 +193,7 @@ export type InputItem =
type: "message";
role: "system" | "developer" | "user" | "assistant";
content: string | ContentPart[];
+ phase?: OpenAIResponsesAssistantPhase;
}
| { type: "function_call"; id?: string; call_id?: string; name: string; arguments: string }
| { type: "function_call_output"; call_id: string; output: string }
@@ -204,11 +208,10 @@ export type ToolChoice =
export interface FunctionToolDefinition {
type: "function";
- function: {
- name: string;
- description?: string;
- parameters?: Record;
- };
+ name: string;
+ description?: string;
+ parameters?: Record;
+ strict?: boolean;
}
/** Standard response.create event payload (full turn) */
diff --git a/src/agents/openai-ws-stream.e2e.test.ts b/src/agents/openai-ws-stream.e2e.test.ts
index 2b90d0dbc78..1146d71ffe3 100644
--- a/src/agents/openai-ws-stream.e2e.test.ts
+++ b/src/agents/openai-ws-stream.e2e.test.ts
@@ -14,6 +14,7 @@
* Skipped in CI — no API key available and we avoid billable external calls.
*/
+import type { AssistantMessage, Context } from "@mariozechner/pi-ai";
import { describe, it, expect, afterEach } from "vitest";
import {
createOpenAIWebSocketStreamFn,
@@ -28,14 +29,13 @@ const testFn = LIVE ? it : it.skip;
const model = {
api: "openai-responses" as const,
provider: "openai",
- id: "gpt-4o-mini",
- name: "gpt-4o-mini",
- baseUrl: "",
- reasoning: false,
- input: { maxTokens: 128_000 },
- output: { maxTokens: 16_384 },
- cache: false,
- compat: {},
+ id: "gpt-5.2",
+ name: "gpt-5.2",
+ contextWindow: 128_000,
+ maxTokens: 4_096,
+ reasoning: true,
+ input: ["text"],
+ cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
} as unknown as Parameters>[0];
type StreamFnParams = Parameters>;
@@ -47,6 +47,61 @@ function makeContext(userMessage: string): StreamFnParams[1] {
} as unknown as StreamFnParams[1];
}
+function makeToolContext(userMessage: string): StreamFnParams[1] {
+ return {
+ systemPrompt: "You are a precise assistant. Follow tool instructions exactly.",
+ messages: [{ role: "user" as const, content: userMessage }],
+ tools: [
+ {
+ name: "noop",
+ description: "Return the supplied tool result to the user.",
+ parameters: {
+ type: "object",
+ additionalProperties: false,
+ properties: {},
+ },
+ },
+ ],
+ } as unknown as Context;
+}
+
+function makeToolResultMessage(
+ callId: string,
+ output: string,
+): StreamFnParams[1]["messages"][number] {
+ return {
+ role: "toolResult" as const,
+ toolCallId: callId,
+ toolName: "noop",
+ content: [{ type: "text" as const, text: output }],
+ isError: false,
+ timestamp: Date.now(),
+ } as unknown as StreamFnParams[1]["messages"][number];
+}
+
+async function collectEvents(
+ stream: ReturnType>,
+): Promise> {
+ const events: Array<{ type: string; message?: AssistantMessage }> = [];
+ for await (const event of stream as AsyncIterable<{ type: string; message?: AssistantMessage }>) {
+ events.push(event);
+ }
+ return events;
+}
+
+function expectDone(events: Array<{ type: string; message?: AssistantMessage }>): AssistantMessage {
+ const done = events.find((event) => event.type === "done")?.message;
+ expect(done).toBeDefined();
+ return done!;
+}
+
+function assistantText(message: AssistantMessage): string {
+ return message.content
+ .filter((block) => block.type === "text")
+ .map((block) => block.text)
+ .join("");
+}
+
/** Each test gets a unique session ID to avoid cross-test interference. */
const sessions: string[] = [];
function freshSession(name: string): string {
@@ -68,26 +123,14 @@ describe("OpenAI WebSocket e2e", () => {
async () => {
const sid = freshSession("single");
const streamFn = createOpenAIWebSocketStreamFn(API_KEY!, sid);
- const stream = streamFn(model, makeContext("What is 2+2?"), {});
+ const stream = streamFn(model, makeContext("What is 2+2?"), { transport: "websocket" });
+ const done = expectDone(await collectEvents(stream));
- const events: Array<{ type: string }> = [];
- for await (const event of stream as AsyncIterable<{ type: string }>) {
- events.push(event);
- }
-
- const done = events.find((e) => e.type === "done") as
- | { type: "done"; message: { content: Array<{ type: string; text?: string }> } }
- | undefined;
- expect(done).toBeDefined();
- expect(done!.message.content.length).toBeGreaterThan(0);
-
- const text = done!.message.content
- .filter((c) => c.type === "text")
- .map((c) => c.text)
- .join("");
+ expect(done.content.length).toBeGreaterThan(0);
+ const text = assistantText(done);
expect(text).toMatch(/4/);
},
- 30_000,
+ 45_000,
);
testFn(
@@ -96,19 +139,80 @@ describe("OpenAI WebSocket e2e", () => {
const sid = freshSession("temp");
const streamFn = createOpenAIWebSocketStreamFn(API_KEY!, sid);
const stream = streamFn(model, makeContext("Pick a random number between 1 and 1000."), {
+ transport: "websocket",
temperature: 0.8,
});
-
- const events: Array<{ type: string }> = [];
- for await (const event of stream as AsyncIterable<{ type: string }>) {
- events.push(event);
- }
+ const events = await collectEvents(stream);
// Stream must complete (done or error with fallback) — must NOT hang.
const hasTerminal = events.some((e) => e.type === "done" || e.type === "error");
expect(hasTerminal).toBe(true);
},
- 30_000,
+ 45_000,
+ );
+
+ testFn(
+ "reuses the websocket session for tool-call follow-up turns",
+ async () => {
+ const sid = freshSession("tool-roundtrip");
+ const streamFn = createOpenAIWebSocketStreamFn(API_KEY!, sid);
+ const firstContext = makeToolContext(
+ "Call the tool `noop` with {}. After the tool result arrives, reply with exactly the tool output and nothing else.",
+ );
+ const firstEvents = await collectEvents(
+ streamFn(model, firstContext, {
+ transport: "websocket",
+ toolChoice: "required",
+ maxTokens: 128,
+ } as unknown as StreamFnParams[2]),
+ );
+ const firstDone = expectDone(firstEvents);
+ const toolCall = firstDone.content.find((block) => block.type === "toolCall") as
+ | { type: "toolCall"; id: string; name: string }
+ | undefined;
+ expect(toolCall?.name).toBe("noop");
+ expect(toolCall?.id).toBeTruthy();
+
+ const secondContext = {
+ ...firstContext,
+ messages: [
+ ...firstContext.messages,
+ firstDone,
+ makeToolResultMessage(toolCall!.id, "TOOL_OK"),
+ ],
+ } as unknown as StreamFnParams[1];
+ const secondDone = expectDone(
+ await collectEvents(
+ streamFn(model, secondContext, {
+ transport: "websocket",
+ maxTokens: 128,
+ }),
+ ),
+ );
+
+ expect(assistantText(secondDone)).toMatch(/TOOL_OK/);
+ },
+ 60_000,
+ );
+
+ testFn(
+ "supports websocket warm-up before the first request",
+ async () => {
+ const sid = freshSession("warmup");
+ const streamFn = createOpenAIWebSocketStreamFn(API_KEY!, sid);
+ const done = expectDone(
+ await collectEvents(
+ streamFn(model, makeContext("Reply with the word warmed."), {
+ transport: "websocket",
+ openaiWsWarmup: true,
+ maxTokens: 32,
+ } as unknown as StreamFnParams[2]),
+ ),
+ );
+
+ expect(assistantText(done).toLowerCase()).toContain("warmed");
+ },
+ 45_000,
);
testFn(
@@ -119,16 +223,13 @@ describe("OpenAI WebSocket e2e", () => {
expect(hasWsSession(sid)).toBe(false);
- const stream = streamFn(model, makeContext("Say hello."), {});
- for await (const _ of stream as AsyncIterable) {
- /* consume */
- }
+ await collectEvents(streamFn(model, makeContext("Say hello."), { transport: "websocket" }));
expect(hasWsSession(sid)).toBe(true);
releaseWsSession(sid);
expect(hasWsSession(sid)).toBe(false);
},
- 30_000,
+ 45_000,
);
testFn(
@@ -137,15 +238,11 @@ describe("OpenAI WebSocket e2e", () => {
const sid = freshSession("fallback");
const streamFn = createOpenAIWebSocketStreamFn("sk-invalid-key", sid);
const stream = streamFn(model, makeContext("Hello"), {});
-
- const events: Array<{ type: string }> = [];
- for await (const event of stream as AsyncIterable<{ type: string }>) {
- events.push(event);
- }
+ const events = await collectEvents(stream);
const hasTerminal = events.some((e) => e.type === "done" || e.type === "error");
expect(hasTerminal).toBe(true);
},
- 30_000,
+ 45_000,
);
});
diff --git a/src/agents/openai-ws-stream.test.ts b/src/agents/openai-ws-stream.test.ts
index a9c3679f561..cd3425bec83 100644
--- a/src/agents/openai-ws-stream.test.ts
+++ b/src/agents/openai-ws-stream.test.ts
@@ -224,6 +224,7 @@ type FakeMessage =
| {
role: "assistant";
content: unknown[];
+ phase?: "commentary" | "final_answer";
stopReason: string;
api: string;
provider: string;
@@ -247,6 +248,7 @@ function userMsg(text: string): FakeMessage {
function assistantMsg(
textBlocks: string[],
toolCalls: Array<{ id: string; name: string; args: Record }> = [],
+ phase?: "commentary" | "final_answer",
): FakeMessage {
const content: unknown[] = [];
for (const t of textBlocks) {
@@ -258,6 +260,7 @@ function assistantMsg(
return {
role: "assistant",
content,
+ phase,
stopReason: toolCalls.length > 0 ? "toolUse" : "stop",
api: "openai-responses",
provider: "openai",
@@ -302,6 +305,7 @@ function makeResponseObject(
id: string,
outputText?: string,
toolCallName?: string,
+ phase?: "commentary" | "final_answer",
): ResponseObject {
const output: ResponseObject["output"] = [];
if (outputText) {
@@ -310,6 +314,7 @@ function makeResponseObject(
id: "item_1",
role: "assistant",
content: [{ type: "output_text", text: outputText }],
+ phase,
});
}
if (toolCallName) {
@@ -357,18 +362,16 @@ describe("convertTools", () => {
expect(result).toHaveLength(1);
expect(result[0]).toMatchObject({
type: "function",
- function: {
- name: "exec",
- description: "Run a command",
- parameters: { type: "object", properties: { cmd: { type: "string" } } },
- },
+ name: "exec",
+ description: "Run a command",
+ parameters: { type: "object", properties: { cmd: { type: "string" } } },
});
});
it("handles tools without description", () => {
const tools = [{ name: "ping", description: "", parameters: {} }];
const result = convertTools(tools as Parameters[0]);
- expect(result[0]?.function?.name).toBe("ping");
+ expect(result[0]?.name).toBe("ping");
});
});
@@ -391,6 +394,19 @@ describe("convertMessagesToInputItems", () => {
expect(items[0]).toMatchObject({ type: "message", role: "assistant", content: "Hi there." });
});
+ it("preserves assistant phase on replayed assistant messages", () => {
+ const items = convertMessagesToInputItems([
+ assistantMsg(["Working on it."], [], "commentary"),
+ ] as Parameters[0]);
+ expect(items).toHaveLength(1);
+ expect(items[0]).toMatchObject({
+ type: "message",
+ role: "assistant",
+ content: "Working on it.",
+ phase: "commentary",
+ });
+ });
+
it("converts an assistant message with a tool call", () => {
const msg = assistantMsg(
["Let me run that."],
@@ -408,10 +424,58 @@ describe("convertMessagesToInputItems", () => {
call_id: "call_1",
name: "exec",
});
+ expect(textItem).not.toHaveProperty("phase");
const fc = fcItem as { arguments: string };
expect(JSON.parse(fc.arguments)).toEqual({ cmd: "ls" });
});
+ it("preserves assistant phase on commentary text before tool calls", () => {
+ const msg = assistantMsg(
+ ["Let me run that."],
+ [{ id: "call_1", name: "exec", args: { cmd: "ls" } }],
+ "commentary",
+ );
+ const items = convertMessagesToInputItems([msg] as Parameters<
+ typeof convertMessagesToInputItems
+ >[0]);
+ const textItem = items.find((i) => i.type === "message");
+ expect(textItem).toMatchObject({
+ type: "message",
+ role: "assistant",
+ content: "Let me run that.",
+ phase: "commentary",
+ });
+ });
+
+ it("preserves assistant phase from textSignature metadata without local phase field", () => {
+ const msg = {
+ role: "assistant" as const,
+ content: [
+ {
+ type: "text" as const,
+ text: "Working on it.",
+ textSignature: JSON.stringify({ v: 1, id: "msg_sig", phase: "commentary" }),
+ },
+ ],
+ stopReason: "stop",
+ api: "openai-responses",
+ provider: "openai",
+ model: "gpt-5.2",
+ usage: {},
+ timestamp: 0,
+ };
+ const items = convertMessagesToInputItems([msg] as Parameters<
+ typeof convertMessagesToInputItems
+ >[0]);
+ expect(items).toHaveLength(1);
+ expect(items[0]).toMatchObject({
+ type: "message",
+ role: "assistant",
+ content: "Working on it.",
+ phase: "commentary",
+ });
+ });
+
it("converts a tool result message", () => {
const items = convertMessagesToInputItems([toolResultMsg("call_1", "file.txt")] as Parameters<
typeof convertMessagesToInputItems
@@ -518,6 +582,34 @@ describe("convertMessagesToInputItems", () => {
expect((items[0] as { content?: unknown }).content).toBe("Here is my answer.");
});
+ it("replays reasoning blocks from thinking signatures", () => {
+ const msg = {
+ role: "assistant" as const,
+ content: [
+ {
+ type: "thinking" as const,
+ thinking: "internal reasoning...",
+ thinkingSignature: JSON.stringify({
+ type: "reasoning",
+ id: "rs_test",
+ summary: [],
+ }),
+ },
+ { type: "text" as const, text: "Here is my answer." },
+ ],
+ stopReason: "stop",
+ api: "openai-responses",
+ provider: "openai",
+ model: "gpt-5.2",
+ usage: {},
+ timestamp: 0,
+ };
+ const items = convertMessagesToInputItems([msg] as Parameters<
+ typeof convertMessagesToInputItems
+ >[0]);
+ expect(items.map((item) => item.type)).toEqual(["reasoning", "message"]);
+ });
+
it("returns empty array for empty messages", () => {
expect(convertMessagesToInputItems([])).toEqual([]);
});
@@ -594,6 +686,16 @@ describe("buildAssistantMessageFromResponse", () => {
expect(msg.content).toEqual([]);
expect(msg.stopReason).toBe("stop");
});
+
+ it("preserves phase from assistant message output items", () => {
+ const response = makeResponseObject("resp_8", "Final answer", undefined, "final_answer");
+ const msg = buildAssistantMessageFromResponse(response, modelInfo) as {
+ phase?: string;
+ content: Array<{ type: string; text?: string }>;
+ };
+ expect(msg.phase).toBe("final_answer");
+ expect(msg.content[0]?.text).toBe("Final answer");
+ });
});
// ─────────────────────────────────────────────────────────────────────────────
@@ -633,6 +735,7 @@ describe("createOpenAIWebSocketStreamFn", () => {
releaseWsSession("sess-fallback");
releaseWsSession("sess-incremental");
releaseWsSession("sess-full");
+ releaseWsSession("sess-phase");
releaseWsSession("sess-tools");
releaseWsSession("sess-store-default");
releaseWsSession("sess-store-compat");
@@ -795,6 +898,40 @@ describe("createOpenAIWebSocketStreamFn", () => {
expect(doneEvent?.message.content[0]?.text).toBe("Hello back!");
});
+ it("keeps assistant phase on completed WebSocket responses", async () => {
+ const streamFn = createOpenAIWebSocketStreamFn("sk-test", "sess-phase");
+ const stream = streamFn(
+ modelStub as Parameters[0],
+ contextStub as Parameters[1],
+ );
+
+ const events: unknown[] = [];
+ const done = (async () => {
+ for await (const ev of await resolveStream(stream)) {
+ events.push(ev);
+ }
+ })();
+
+ await new Promise((r) => setImmediate(r));
+ const manager = MockManager.lastInstance!;
+ manager.simulateEvent({
+ type: "response.completed",
+ response: makeResponseObject("resp_phase", "Working...", "exec", "commentary"),
+ });
+
+ await done;
+
+ const doneEvent = events.find((e) => (e as { type?: string }).type === "done") as
+ | {
+ type: string;
+ reason: string;
+ message: { phase?: string; stopReason: string };
+ }
+ | undefined;
+ expect(doneEvent?.message.phase).toBe("commentary");
+ expect(doneEvent?.message.stopReason).toBe("toolUse");
+ });
+
it("falls back to HTTP when WebSocket connect fails (session pre-broken via flag)", async () => {
// Set the class-level flag BEFORE calling streamFn so the new instance
// fails on connect(). We patch the static default via MockManager directly.
diff --git a/src/agents/openai-ws-stream.ts b/src/agents/openai-ws-stream.ts
index dd82ced9e95..5b7a80f52ec 100644
--- a/src/agents/openai-ws-stream.ts
+++ b/src/agents/openai-ws-stream.ts
@@ -37,6 +37,7 @@ import {
type ContentPart,
type FunctionToolDefinition,
type InputItem,
+ type OpenAIResponsesAssistantPhase,
type OpenAIWebSocketManagerOptions,
type ResponseObject,
} from "./openai-ws-connection.js";
@@ -100,6 +101,8 @@ export function hasWsSession(sessionId: string): boolean {
// ─────────────────────────────────────────────────────────────────────────────
type AnyMessage = Message & { role: string; content: unknown };
+type AssistantMessageWithPhase = AssistantMessage & { phase?: OpenAIResponsesAssistantPhase };
+type ReplayModelInfo = { input?: ReadonlyArray };
function toNonEmptyString(value: unknown): string | null {
if (typeof value !== "string") {
@@ -109,6 +112,50 @@ function toNonEmptyString(value: unknown): string | null {
return trimmed.length > 0 ? trimmed : null;
}
+function normalizeAssistantPhase(value: unknown): OpenAIResponsesAssistantPhase | undefined {
+ return value === "commentary" || value === "final_answer" ? value : undefined;
+}
+
+function encodeAssistantTextSignature(params: {
+ id: string;
+ phase?: OpenAIResponsesAssistantPhase;
+}): string {
+ return JSON.stringify({
+ v: 1,
+ id: params.id,
+ ...(params.phase ? { phase: params.phase } : {}),
+ });
+}
+
+function parseAssistantTextSignature(
+ value: unknown,
+): { id: string; phase?: OpenAIResponsesAssistantPhase } | null {
+ if (typeof value !== "string" || value.trim().length === 0) {
+ return null;
+ }
+ if (!value.startsWith("{")) {
+ return { id: value };
+ }
+ try {
+ const parsed = JSON.parse(value) as { v?: unknown; id?: unknown; phase?: unknown };
+ if (parsed.v !== 1 || typeof parsed.id !== "string") {
+ return null;
+ }
+ return {
+ id: parsed.id,
+ ...(normalizeAssistantPhase(parsed.phase)
+ ? { phase: normalizeAssistantPhase(parsed.phase) }
+ : {}),
+ };
+ } catch {
+ return null;
+ }
+}
+
+function supportsImageInput(modelOverride?: ReplayModelInfo): boolean {
+ return !Array.isArray(modelOverride?.input) || modelOverride.input.includes("image");
+}
+
/** Convert pi-ai content (string | ContentPart[]) to plain text. */
function contentToText(content: unknown): string {
if (typeof content === "string") {
@@ -117,30 +164,50 @@ function contentToText(content: unknown): string {
if (!Array.isArray(content)) {
return "";
}
- return (content as Array<{ type?: string; text?: string }>)
- .filter((p) => p.type === "text" && typeof p.text === "string")
- .map((p) => p.text as string)
+ return content
+ .filter(
+ (part): part is { type?: string; text?: string } => Boolean(part) && typeof part === "object",
+ )
+ .filter(
+ (part) =>
+ (part.type === "text" || part.type === "input_text" || part.type === "output_text") &&
+ typeof part.text === "string",
+ )
+ .map((part) => part.text as string)
.join("");
}
/** Convert pi-ai content to OpenAI ContentPart[]. */
-function contentToOpenAIParts(content: unknown): ContentPart[] {
+function contentToOpenAIParts(content: unknown, modelOverride?: ReplayModelInfo): ContentPart[] {
if (typeof content === "string") {
return content ? [{ type: "input_text", text: content }] : [];
}
if (!Array.isArray(content)) {
return [];
}
+
+ const includeImages = supportsImageInput(modelOverride);
const parts: ContentPart[] = [];
for (const part of content as Array<{
type?: string;
text?: string;
data?: string;
mimeType?: string;
+ source?: unknown;
}>) {
- if (part.type === "text" && typeof part.text === "string") {
+ if (
+ (part.type === "text" || part.type === "input_text" || part.type === "output_text") &&
+ typeof part.text === "string"
+ ) {
parts.push({ type: "input_text", text: part.text });
- } else if (part.type === "image" && typeof part.data === "string") {
+ continue;
+ }
+
+ if (!includeImages) {
+ continue;
+ }
+
+ if (part.type === "image" && typeof part.data === "string") {
parts.push({
type: "input_image",
source: {
@@ -149,11 +216,60 @@ function contentToOpenAIParts(content: unknown): ContentPart[] {
data: part.data,
},
});
+ continue;
+ }
+
+ if (
+ part.type === "input_image" &&
+ part.source &&
+ typeof part.source === "object" &&
+ typeof (part.source as { type?: unknown }).type === "string"
+ ) {
+ parts.push({
+ type: "input_image",
+ source: part.source as
+ | { type: "url"; url: string }
+ | { type: "base64"; media_type: string; data: string },
+ });
}
}
return parts;
}
+function parseReasoningItem(value: unknown): Extract | null {
+ if (!value || typeof value !== "object") {
+ return null;
+ }
+ const record = value as {
+ type?: unknown;
+ content?: unknown;
+ encrypted_content?: unknown;
+ summary?: unknown;
+ };
+ if (record.type !== "reasoning") {
+ return null;
+ }
+ return {
+ type: "reasoning",
+ ...(typeof record.content === "string" ? { content: record.content } : {}),
+ ...(typeof record.encrypted_content === "string"
+ ? { encrypted_content: record.encrypted_content }
+ : {}),
+ ...(typeof record.summary === "string" ? { summary: record.summary } : {}),
+ };
+}
+
+function parseThinkingSignature(value: unknown): Extract | null {
+ if (typeof value !== "string" || value.trim().length === 0) {
+ return null;
+ }
+ try {
+ return parseReasoningItem(JSON.parse(value));
+ } catch {
+ return null;
+ }
+}
+
/** Convert pi-ai tool array to OpenAI FunctionToolDefinition[]. */
export function convertTools(tools: Context["tools"]): FunctionToolDefinition[] {
if (!tools || tools.length === 0) {
@@ -161,11 +277,9 @@ export function convertTools(tools: Context["tools"]): FunctionToolDefinition[]
}
return tools.map((tool) => ({
type: "function" as const,
- function: {
- name: tool.name,
- description: typeof tool.description === "string" ? tool.description : undefined,
- parameters: (tool.parameters ?? {}) as Record,
- },
+ name: tool.name,
+ description: typeof tool.description === "string" ? tool.description : undefined,
+ parameters: (tool.parameters ?? {}) as Record,
}));
}
@@ -173,14 +287,24 @@ export function convertTools(tools: Context["tools"]): FunctionToolDefinition[]
* Convert the full pi-ai message history to an OpenAI `input` array.
* Handles user messages, assistant text+tool-call messages, and tool results.
*/
-export function convertMessagesToInputItems(messages: Message[]): InputItem[] {
+export function convertMessagesToInputItems(
+ messages: Message[],
+ modelOverride?: ReplayModelInfo,
+): InputItem[] {
const items: InputItem[] = [];
for (const msg of messages) {
- const m = msg as AnyMessage;
+ const m = msg as AnyMessage & {
+ phase?: unknown;
+ toolCallId?: unknown;
+ toolUseId?: unknown;
+ };
if (m.role === "user") {
- const parts = contentToOpenAIParts(m.content);
+ const parts = contentToOpenAIParts(m.content, modelOverride);
+ if (parts.length === 0) {
+ continue;
+ }
items.push({
type: "message",
role: "user",
@@ -194,87 +318,116 @@ export function convertMessagesToInputItems(messages: Message[]): InputItem[] {
if (m.role === "assistant") {
const content = m.content;
+ let assistantPhase = normalizeAssistantPhase(m.phase);
if (Array.isArray(content)) {
- // Collect text blocks and tool calls separately
const textParts: string[] = [];
- for (const block of content as Array<{
- type?: string;
- text?: string;
- id?: string;
- name?: string;
- arguments?: Record;
- thinking?: string;
- }>) {
- if (block.type === "text" && typeof block.text === "string") {
- textParts.push(block.text);
- } else if (block.type === "thinking" && typeof block.thinking === "string") {
- // Skip thinking blocks — not sent back to the model
- } else if (block.type === "toolCall") {
- // Push accumulated text first
- if (textParts.length > 0) {
- items.push({
- type: "message",
- role: "assistant",
- content: textParts.join(""),
- });
- textParts.length = 0;
- }
- const callId = toNonEmptyString(block.id);
- const toolName = toNonEmptyString(block.name);
- if (!callId || !toolName) {
- continue;
- }
- // Push function_call item
- items.push({
- type: "function_call",
- call_id: callId,
- name: toolName,
- arguments:
- typeof block.arguments === "string"
- ? block.arguments
- : JSON.stringify(block.arguments ?? {}),
- });
+ const pushAssistantText = () => {
+ if (textParts.length === 0) {
+ return;
}
- }
- if (textParts.length > 0) {
items.push({
type: "message",
role: "assistant",
content: textParts.join(""),
+ ...(assistantPhase ? { phase: assistantPhase } : {}),
});
- }
- } else {
- const text = contentToText(m.content);
- if (text) {
+ textParts.length = 0;
+ };
+
+ for (const block of content as Array<{
+ type?: string;
+ text?: string;
+ textSignature?: unknown;
+ id?: unknown;
+ name?: unknown;
+ arguments?: unknown;
+ thinkingSignature?: unknown;
+ }>) {
+ if (block.type === "text" && typeof block.text === "string") {
+ const parsedSignature = parseAssistantTextSignature(block.textSignature);
+ if (!assistantPhase) {
+ assistantPhase = parsedSignature?.phase;
+ }
+ textParts.push(block.text);
+ continue;
+ }
+
+ if (block.type === "thinking") {
+ pushAssistantText();
+ const reasoningItem = parseThinkingSignature(block.thinkingSignature);
+ if (reasoningItem) {
+ items.push(reasoningItem);
+ }
+ continue;
+ }
+
+ if (block.type !== "toolCall") {
+ continue;
+ }
+
+ pushAssistantText();
+ const callIdRaw = toNonEmptyString(block.id);
+ const toolName = toNonEmptyString(block.name);
+ if (!callIdRaw || !toolName) {
+ continue;
+ }
+ const [callId, itemId] = callIdRaw.split("|", 2);
items.push({
- type: "message",
- role: "assistant",
- content: text,
+ type: "function_call",
+ ...(itemId ? { id: itemId } : {}),
+ call_id: callId,
+ name: toolName,
+ arguments:
+ typeof block.arguments === "string"
+ ? block.arguments
+ : JSON.stringify(block.arguments ?? {}),
});
}
+
+ pushAssistantText();
+ continue;
}
+
+ const text = contentToText(content);
+ if (!text) {
+ continue;
+ }
+ items.push({
+ type: "message",
+ role: "assistant",
+ content: text,
+ ...(assistantPhase ? { phase: assistantPhase } : {}),
+ });
continue;
}
- if (m.role === "toolResult") {
- const tr = m as unknown as {
- toolCallId?: string;
- toolUseId?: string;
- content: unknown;
- isError: boolean;
- };
- const callId = toNonEmptyString(tr.toolCallId) ?? toNonEmptyString(tr.toolUseId);
- if (!callId) {
- continue;
- }
- const outputText = contentToText(tr.content);
- items.push({
- type: "function_call_output",
- call_id: callId,
- output: outputText,
- });
+ if (m.role !== "toolResult") {
continue;
}
+
+ const toolCallId = toNonEmptyString(m.toolCallId) ?? toNonEmptyString(m.toolUseId);
+ if (!toolCallId) {
+ continue;
+ }
+ const [callId] = toolCallId.split("|", 2);
+ const parts = Array.isArray(m.content) ? contentToOpenAIParts(m.content, modelOverride) : [];
+ const textOutput = contentToText(m.content);
+ const imageParts = parts.filter((part) => part.type === "input_image");
+ items.push({
+ type: "function_call_output",
+ call_id: callId,
+ output: textOutput || (imageParts.length > 0 ? "(see attached image)" : ""),
+ });
+ if (imageParts.length > 0) {
+ items.push({
+ type: "message",
+ role: "user",
+ content: [
+ { type: "input_text", text: "Attached image(s) from tool result:" },
+ ...imageParts,
+ ],
+ });
+ }
}
return items;
@@ -289,12 +442,24 @@ export function buildAssistantMessageFromResponse(
modelInfo: { api: string; provider: string; id: string },
): AssistantMessage {
const content: (TextContent | ToolCall)[] = [];
+ let assistantPhase: OpenAIResponsesAssistantPhase | undefined;
for (const item of response.output ?? []) {
if (item.type === "message") {
+ const itemPhase = normalizeAssistantPhase(item.phase);
+ if (itemPhase) {
+ assistantPhase = itemPhase;
+ }
for (const part of item.content ?? []) {
if (part.type === "output_text" && part.text) {
- content.push({ type: "text", text: part.text });
+ content.push({
+ type: "text",
+ text: part.text,
+ textSignature: encodeAssistantTextSignature({
+ id: item.id,
+ ...(itemPhase ? { phase: itemPhase } : {}),
+ }),
+ });
}
}
} else if (item.type === "function_call") {
@@ -321,7 +486,7 @@ export function buildAssistantMessageFromResponse(
const hasToolCalls = content.some((c) => c.type === "toolCall");
const stopReason: StopReason = hasToolCalls ? "toolUse" : "stop";
- return buildAssistantMessage({
+ const message = buildAssistantMessage({
model: modelInfo,
content,
stopReason,
@@ -331,6 +496,10 @@ export function buildAssistantMessageFromResponse(
totalTokens: response.usage?.total_tokens ?? 0,
}),
});
+
+ return assistantPhase
+ ? ({ ...message, phase: assistantPhase } as AssistantMessageWithPhase)
+ : message;
}
// ─────────────────────────────────────────────────────────────────────────────
@@ -504,6 +673,7 @@ export function createOpenAIWebSocketStreamFn(
if (resolveWsWarmup(options) && !session.warmUpAttempted) {
session.warmUpAttempted = true;
+ let warmupFailed = false;
try {
await runWarmUp({
manager: session.manager,
@@ -517,10 +687,33 @@ export function createOpenAIWebSocketStreamFn(
if (signal?.aborted) {
throw warmErr instanceof Error ? warmErr : new Error(String(warmErr));
}
+ warmupFailed = true;
log.warn(
`[ws-stream] warm-up failed for session=${sessionId}; continuing without warm-up. error=${String(warmErr)}`,
);
}
+ if (warmupFailed && !session.manager.isConnected()) {
+ try {
+ session.manager.close();
+ } catch {
+ /* ignore */
+ }
+ try {
+ await session.manager.connect(apiKey);
+ session.everConnected = true;
+ log.debug(`[ws-stream] reconnected after warm-up failure for session=${sessionId}`);
+ } catch (reconnectErr) {
+ session.broken = true;
+ wsRegistry.delete(sessionId);
+ if (transport === "websocket") {
+ throw reconnectErr instanceof Error ? reconnectErr : new Error(String(reconnectErr));
+ }
+ log.warn(
+ `[ws-stream] reconnect after warm-up failed for session=${sessionId}; falling back to HTTP. error=${String(reconnectErr)}`,
+ );
+ return fallbackToHttp(model, context, options, eventStream, opts.signal);
+ }
+ }
}
// ── 3. Compute incremental vs full input ─────────────────────────────
@@ -537,16 +730,16 @@ export function createOpenAIWebSocketStreamFn(
log.debug(
`[ws-stream] session=${sessionId}: no new tool results found; sending full context`,
);
- inputItems = buildFullInput(context);
+ inputItems = buildFullInput(context, model);
} else {
- inputItems = convertMessagesToInputItems(toolResults);
+ inputItems = convertMessagesToInputItems(toolResults, model);
}
log.debug(
`[ws-stream] session=${sessionId}: incremental send (${inputItems.length} tool results) previous_response_id=${prevResponseId}`,
);
} else {
// First turn: send full context
- inputItems = buildFullInput(context);
+ inputItems = buildFullInput(context, model);
log.debug(
`[ws-stream] session=${sessionId}: full context send (${inputItems.length} items)`,
);
@@ -605,10 +798,9 @@ export function createOpenAIWebSocketStreamFn(
...extraParams,
};
const nextPayload = await options?.onPayload?.(payload, model);
- const requestPayload =
- nextPayload && typeof nextPayload === "object"
- ? (nextPayload as Parameters[0])
- : (payload as Parameters[0]);
+ const requestPayload = (nextPayload ?? payload) as Parameters<
+ OpenAIWebSocketManager["send"]
+ >[0];
try {
session.manager.send(requestPayload);
@@ -734,8 +926,8 @@ export function createOpenAIWebSocketStreamFn(
// ─────────────────────────────────────────────────────────────────────────────
/** Build full input items from context (system prompt is passed via `instructions` field). */
-function buildFullInput(context: Context): InputItem[] {
- return convertMessagesToInputItems(context.messages);
+function buildFullInput(context: Context, model: ReplayModelInfo): InputItem[] {
+ return convertMessagesToInputItems(context.messages, model);
}
/**
diff --git a/src/agents/pi-embedded-helpers.isbillingerrormessage.test.ts b/src/agents/pi-embedded-helpers.isbillingerrormessage.test.ts
index 0430bd3814b..27c89afe425 100644
--- a/src/agents/pi-embedded-helpers.isbillingerrormessage.test.ts
+++ b/src/agents/pi-embedded-helpers.isbillingerrormessage.test.ts
@@ -106,6 +106,9 @@ describe("isBillingErrorMessage", () => {
"Payment Required",
"HTTP 402 Payment Required",
"plans & billing",
+ // Venice returns "Insufficient USD or Diem balance" which has extra words
+ // between "insufficient" and "balance"
+ "Insufficient USD or Diem balance to complete request. Visit https://venice.ai/settings/api to add credits.",
];
for (const sample of samples) {
expect(isBillingErrorMessage(sample)).toBe(true);
@@ -149,6 +152,11 @@ describe("isBillingErrorMessage", () => {
expect(longResponse.length).toBeGreaterThan(512);
expect(isBillingErrorMessage(longResponse)).toBe(false);
});
+ it("does not false-positive on short non-billing text that mentions insufficient and balance", () => {
+ const sample = "The evidence is insufficient to reconcile the final balance after compaction.";
+ expect(isBillingErrorMessage(sample)).toBe(false);
+ expect(classifyFailoverReason(sample)).toBeNull();
+ });
it("still matches explicit 402 markers in long payloads", () => {
const longStructuredError =
'{"error":{"code":402,"message":"payment required","details":"' + "x".repeat(700) + '"}}';
@@ -650,6 +658,12 @@ describe("classifyFailoverReason", () => {
expect(classifyFailoverReason(TOGETHER_ENGINE_OVERLOADED_MESSAGE)).toBe("overloaded");
expect(classifyFailoverReason(GROQ_TOO_MANY_REQUESTS_MESSAGE)).toBe("rate_limit");
expect(classifyFailoverReason(GROQ_SERVICE_UNAVAILABLE_MESSAGE)).toBe("overloaded");
+ // Venice 402 billing error with extra words between "insufficient" and "balance"
+ expect(
+ classifyFailoverReason(
+ "Insufficient USD or Diem balance to complete request. Visit https://venice.ai/settings/api to add credits.",
+ ),
+ ).toBe("billing");
});
it("classifies internal and compatibility error messages", () => {
diff --git a/src/agents/pi-embedded-helpers/failover-matches.ts b/src/agents/pi-embedded-helpers/failover-matches.ts
index a7948703f39..a9f16fa6202 100644
--- a/src/agents/pi-embedded-helpers/failover-matches.ts
+++ b/src/agents/pi-embedded-helpers/failover-matches.ts
@@ -52,6 +52,7 @@ const ERROR_PATTERNS = {
"credit balance",
"plans & billing",
"insufficient balance",
+ "insufficient usd or diem balance",
],
authPermanent: [
/api[_ ]?key[_ ]?(?:revoked|invalid|deactivated|deleted)/i,
diff --git a/src/agents/pi-embedded-runner-extraparams.test.ts b/src/agents/pi-embedded-runner-extraparams.test.ts
index 500df72cced..3f6fb7a2f5a 100644
--- a/src/agents/pi-embedded-runner-extraparams.test.ts
+++ b/src/agents/pi-embedded-runner-extraparams.test.ts
@@ -276,7 +276,7 @@ describe("applyExtraParamsToAgent", () => {
const payloads: Record[] = [];
const baseStreamFn: StreamFn = (_model, _context, options) => {
const payload: Record = { model: "deepseek/deepseek-r1" };
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -308,7 +308,7 @@ describe("applyExtraParamsToAgent", () => {
const payloads: Record[] = [];
const baseStreamFn: StreamFn = (_model, _context, options) => {
const payload: Record = {};
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -332,7 +332,7 @@ describe("applyExtraParamsToAgent", () => {
const payloads: Record[] = [];
const baseStreamFn: StreamFn = (_model, _context, options) => {
const payload: Record = { reasoning_effort: "high" };
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -357,7 +357,7 @@ describe("applyExtraParamsToAgent", () => {
const payloads: Record[] = [];
const baseStreamFn: StreamFn = (_model, _context, options) => {
const payload: Record = { reasoning: { max_tokens: 256 } };
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -381,7 +381,7 @@ describe("applyExtraParamsToAgent", () => {
const payloads: Record[] = [];
const baseStreamFn: StreamFn = (_model, _context, options) => {
const payload: Record = { reasoning_effort: "medium" };
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -588,7 +588,7 @@ describe("applyExtraParamsToAgent", () => {
const payloads: Record[] = [];
const baseStreamFn: StreamFn = (_model, _context, options) => {
const payload: Record = { thinking: "off" };
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -619,7 +619,7 @@ describe("applyExtraParamsToAgent", () => {
const payloads: Record[] = [];
const baseStreamFn: StreamFn = (_model, _context, options) => {
const payload: Record = { thinking: "off" };
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -650,7 +650,7 @@ describe("applyExtraParamsToAgent", () => {
const payloads: Record[] = [];
const baseStreamFn: StreamFn = (_model, _context, options) => {
const payload: Record = {};
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -674,7 +674,7 @@ describe("applyExtraParamsToAgent", () => {
const payloads: Record[] = [];
const baseStreamFn: StreamFn = (_model, _context, options) => {
const payload: Record = { tool_choice: "required" };
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -699,7 +699,7 @@ describe("applyExtraParamsToAgent", () => {
const payloads: Record[] = [];
const baseStreamFn: StreamFn = (_model, _context, options) => {
const payload: Record = {};
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -749,7 +749,7 @@ describe("applyExtraParamsToAgent", () => {
],
tool_choice: { type: "tool", name: "read" },
};
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -793,7 +793,7 @@ describe("applyExtraParamsToAgent", () => {
},
],
};
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -832,7 +832,7 @@ describe("applyExtraParamsToAgent", () => {
},
],
};
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -896,7 +896,7 @@ describe("applyExtraParamsToAgent", () => {
},
},
};
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -943,7 +943,7 @@ describe("applyExtraParamsToAgent", () => {
},
},
};
- options?.onPayload?.(payload, _model);
+ options?.onPayload?.(payload, model);
payloads.push(payload);
return {} as ReturnType;
};
@@ -1081,7 +1081,7 @@ describe("applyExtraParamsToAgent", () => {
expect(calls).toHaveLength(1);
expect(calls[0]?.transport).toBe("auto");
- expect(calls[0]?.openaiWsWarmup).toBe(true);
+ expect(calls[0]?.openaiWsWarmup).toBe(false);
});
it("lets runtime options override OpenAI default transport", () => {
diff --git a/src/agents/pi-embedded-runner/compact.hooks.test.ts b/src/agents/pi-embedded-runner/compact.hooks.test.ts
index 9ef2a3efe76..dc1511a5e05 100644
--- a/src/agents/pi-embedded-runner/compact.hooks.test.ts
+++ b/src/agents/pi-embedded-runner/compact.hooks.test.ts
@@ -7,6 +7,7 @@ const {
sessionCompactImpl,
triggerInternalHook,
sanitizeSessionHistoryMock,
+ contextEngineCompactMock,
} = vi.hoisted(() => ({
hookRunner: {
hasHooks: vi.fn(),
@@ -28,6 +29,14 @@ const {
})),
triggerInternalHook: vi.fn(),
sanitizeSessionHistoryMock: vi.fn(async (params: { messages: unknown[] }) => params.messages),
+ contextEngineCompactMock: vi.fn(async () => ({
+ ok: true as boolean,
+ compacted: true as boolean,
+ reason: undefined as string | undefined,
+ result: { summary: "engine-summary", tokensAfter: 50 } as
+ | { summary: string; tokensAfter: number }
+ | undefined,
+ })),
}));
vi.mock("../../plugins/hook-runner-global.js", () => ({
@@ -123,6 +132,27 @@ vi.mock("../session-write-lock.js", () => ({
resolveSessionLockMaxHoldFromTimeout: vi.fn(() => 0),
}));
+vi.mock("../../context-engine/index.js", () => ({
+ ensureContextEnginesInitialized: vi.fn(),
+ resolveContextEngine: vi.fn(async () => ({
+ info: { ownsCompaction: true },
+ compact: contextEngineCompactMock,
+ })),
+}));
+
+vi.mock("../../process/command-queue.js", () => ({
+ enqueueCommandInLane: vi.fn((_lane: unknown, task: () => unknown) => task()),
+}));
+
+vi.mock("./lanes.js", () => ({
+ resolveSessionLane: vi.fn(() => "test-session-lane"),
+ resolveGlobalLane: vi.fn(() => "test-global-lane"),
+}));
+
+vi.mock("../context-window-guard.js", () => ({
+ resolveContextWindowInfo: vi.fn(() => ({ tokens: 128_000 })),
+}));
+
vi.mock("../bootstrap-files.js", () => ({
makeBootstrapWarn: vi.fn(() => () => {}),
resolveBootstrapContextForRun: vi.fn(async () => ({ contextFiles: [] })),
@@ -160,7 +190,7 @@ vi.mock("../transcript-policy.js", () => ({
}));
vi.mock("./extensions.js", () => ({
- buildEmbeddedExtensionFactories: vi.fn(() => []),
+ buildEmbeddedExtensionFactories: vi.fn(() => ({ factories: [] })),
}));
vi.mock("./history.js", () => ({
@@ -251,7 +281,7 @@ vi.mock("./utils.js", () => ({
import { getApiProvider, unregisterApiProviders } from "@mariozechner/pi-ai";
import { getCustomApiRegistrySourceId } from "../custom-api-registry.js";
-import { compactEmbeddedPiSessionDirect } from "./compact.js";
+import { compactEmbeddedPiSessionDirect, compactEmbeddedPiSession } from "./compact.js";
const sessionHook = (action: string) =>
triggerInternalHook.mock.calls.find(
@@ -436,3 +466,103 @@ describe("compactEmbeddedPiSessionDirect hooks", () => {
expect(result.ok).toBe(true);
});
});
+
+describe("compactEmbeddedPiSession hooks (ownsCompaction engine)", () => {
+ beforeEach(() => {
+ hookRunner.hasHooks.mockReset();
+ hookRunner.runBeforeCompaction.mockReset();
+ hookRunner.runAfterCompaction.mockReset();
+ contextEngineCompactMock.mockReset();
+ contextEngineCompactMock.mockResolvedValue({
+ ok: true,
+ compacted: true,
+ reason: undefined,
+ result: { summary: "engine-summary", tokensAfter: 50 },
+ });
+ resolveModelMock.mockReset();
+ resolveModelMock.mockReturnValue({
+ model: { provider: "openai", api: "responses", id: "fake", input: [] },
+ error: null,
+ authStorage: { setRuntimeApiKey: vi.fn() },
+ modelRegistry: {},
+ });
+ });
+
+ it("fires before_compaction with sentinel -1 and after_compaction on success", async () => {
+ hookRunner.hasHooks.mockReturnValue(true);
+
+ const result = await compactEmbeddedPiSession({
+ sessionId: "session-1",
+ sessionKey: "agent:main:session-1",
+ sessionFile: "/tmp/session.jsonl",
+ workspaceDir: "/tmp",
+ messageChannel: "telegram",
+ customInstructions: "focus on decisions",
+ enqueue: (task) => task(),
+ });
+
+ expect(result.ok).toBe(true);
+ expect(result.compacted).toBe(true);
+
+ expect(hookRunner.runBeforeCompaction).toHaveBeenCalledWith(
+ { messageCount: -1, sessionFile: "/tmp/session.jsonl" },
+ expect.objectContaining({
+ sessionKey: "agent:main:session-1",
+ messageProvider: "telegram",
+ }),
+ );
+ expect(hookRunner.runAfterCompaction).toHaveBeenCalledWith(
+ {
+ messageCount: -1,
+ compactedCount: -1,
+ tokenCount: 50,
+ sessionFile: "/tmp/session.jsonl",
+ },
+ expect.objectContaining({
+ sessionKey: "agent:main:session-1",
+ messageProvider: "telegram",
+ }),
+ );
+ });
+
+ it("does not fire after_compaction when compaction fails", async () => {
+ hookRunner.hasHooks.mockReturnValue(true);
+ contextEngineCompactMock.mockResolvedValue({
+ ok: false,
+ compacted: false,
+ reason: "nothing to compact",
+ result: undefined,
+ });
+
+ const result = await compactEmbeddedPiSession({
+ sessionId: "session-1",
+ sessionKey: "agent:main:session-1",
+ sessionFile: "/tmp/session.jsonl",
+ workspaceDir: "/tmp",
+ customInstructions: "focus on decisions",
+ enqueue: (task) => task(),
+ });
+
+ expect(result.ok).toBe(false);
+ expect(hookRunner.runBeforeCompaction).toHaveBeenCalled();
+ expect(hookRunner.runAfterCompaction).not.toHaveBeenCalled();
+ });
+
+ it("catches and logs hook exceptions without aborting compaction", async () => {
+ hookRunner.hasHooks.mockReturnValue(true);
+ hookRunner.runBeforeCompaction.mockRejectedValue(new Error("hook boom"));
+
+ const result = await compactEmbeddedPiSession({
+ sessionId: "session-1",
+ sessionKey: "agent:main:session-1",
+ sessionFile: "/tmp/session.jsonl",
+ workspaceDir: "/tmp",
+ customInstructions: "focus on decisions",
+ enqueue: (task) => task(),
+ });
+
+ expect(result.ok).toBe(true);
+ expect(result.compacted).toBe(true);
+ expect(contextEngineCompactMock).toHaveBeenCalled();
+ });
+});
diff --git a/src/agents/pi-embedded-runner/compact.ts b/src/agents/pi-embedded-runner/compact.ts
index 91f99571db4..feba0f81493 100644
--- a/src/agents/pi-embedded-runner/compact.ts
+++ b/src/agents/pi-embedded-runner/compact.ts
@@ -936,6 +936,43 @@ export async function compactEmbeddedPiSession(
modelContextWindow: ceModel?.contextWindow,
defaultTokens: DEFAULT_CONTEXT_TOKENS,
});
+ // When the context engine owns compaction, its compact() implementation
+ // bypasses compactEmbeddedPiSessionDirect (which fires the hooks internally).
+ // Fire before_compaction / after_compaction hooks here so plugin subscribers
+ // are notified regardless of which engine is active.
+ const engineOwnsCompaction = contextEngine.info.ownsCompaction === true;
+ const hookRunner = engineOwnsCompaction ? getGlobalHookRunner() : null;
+ const hookSessionKey = params.sessionKey?.trim() || params.sessionId;
+ const { sessionAgentId } = resolveSessionAgentIds({
+ sessionKey: params.sessionKey,
+ config: params.config,
+ });
+ const resolvedMessageProvider = params.messageChannel ?? params.messageProvider;
+ const hookCtx = {
+ sessionId: params.sessionId,
+ agentId: sessionAgentId,
+ sessionKey: hookSessionKey,
+ workspaceDir: resolveUserPath(params.workspaceDir),
+ messageProvider: resolvedMessageProvider,
+ };
+ // Engine-owned compaction doesn't load the transcript at this level, so
+ // message counts are unavailable. We pass sessionFile so hook subscribers
+ // can read the transcript themselves if they need exact counts.
+ if (hookRunner?.hasHooks("before_compaction")) {
+ try {
+ await hookRunner.runBeforeCompaction(
+ {
+ messageCount: -1,
+ sessionFile: params.sessionFile,
+ },
+ hookCtx,
+ );
+ } catch (err) {
+ log.warn("before_compaction hook failed", {
+ errorMessage: err instanceof Error ? err.message : String(err),
+ });
+ }
+ }
const result = await contextEngine.compact({
sessionId: params.sessionId,
sessionFile: params.sessionFile,
@@ -944,6 +981,23 @@ export async function compactEmbeddedPiSession(
force: params.trigger === "manual",
runtimeContext: params as Record,
});
+ if (result.ok && result.compacted && hookRunner?.hasHooks("after_compaction")) {
+ try {
+ await hookRunner.runAfterCompaction(
+ {
+ messageCount: -1,
+ compactedCount: -1,
+ tokenCount: result.result?.tokensAfter,
+ sessionFile: params.sessionFile,
+ },
+ hookCtx,
+ );
+ } catch (err) {
+ log.warn("after_compaction hook failed", {
+ errorMessage: err instanceof Error ? err.message : String(err),
+ });
+ }
+ }
return {
ok: result.ok,
compacted: result.compacted,
diff --git a/src/agents/pi-embedded-runner/model.test.ts b/src/agents/pi-embedded-runner/model.test.ts
index 5789dfaad75..062369d9a96 100644
--- a/src/agents/pi-embedded-runner/model.test.ts
+++ b/src/agents/pi-embedded-runner/model.test.ts
@@ -382,6 +382,40 @@ describe("resolveModel", () => {
expect(result.model?.reasoning).toBe(true);
});
+ it("matches prefixed OpenRouter native ids in configured fallback models", () => {
+ const cfg = {
+ models: {
+ providers: {
+ openrouter: {
+ baseUrl: "https://openrouter.ai/api/v1",
+ api: "openai-completions",
+ models: [
+ {
+ ...makeModel("openrouter/healer-alpha"),
+ reasoning: true,
+ input: ["text", "image"],
+ contextWindow: 262144,
+ maxTokens: 65536,
+ },
+ ],
+ },
+ },
+ },
+ } as OpenClawConfig;
+
+ const result = resolveModel("openrouter", "openrouter/healer-alpha", "/tmp/agent", cfg);
+
+ expect(result.error).toBeUndefined();
+ expect(result.model).toMatchObject({
+ provider: "openrouter",
+ id: "openrouter/healer-alpha",
+ reasoning: true,
+ input: ["text", "image"],
+ contextWindow: 262144,
+ maxTokens: 65536,
+ });
+ });
+
it("prefers configured provider api metadata over discovered registry model", () => {
mockDiscoveredModel({
provider: "onehub",
diff --git a/src/agents/pi-embedded-runner/openai-stream-wrappers.ts b/src/agents/pi-embedded-runner/openai-stream-wrappers.ts
index dfe42ff1835..c9bc2304f97 100644
--- a/src/agents/pi-embedded-runner/openai-stream-wrappers.ts
+++ b/src/agents/pi-embedded-runner/openai-stream-wrappers.ts
@@ -250,7 +250,7 @@ export function createOpenAIDefaultTransportWrapper(baseStreamFn: StreamFn | und
const mergedOptions = {
...options,
transport: options?.transport ?? "auto",
- openaiWsWarmup: typedOptions?.openaiWsWarmup ?? true,
+ openaiWsWarmup: typedOptions?.openaiWsWarmup ?? false,
} as SimpleStreamOptions;
return underlying(model, context, mergedOptions);
};
diff --git a/src/agents/pi-embedded-runner/run.overflow-compaction.fixture.ts b/src/agents/pi-embedded-runner/run.overflow-compaction.fixture.ts
index 8c7afc834d2..8c320f765be 100644
--- a/src/agents/pi-embedded-runner/run.overflow-compaction.fixture.ts
+++ b/src/agents/pi-embedded-runner/run.overflow-compaction.fixture.ts
@@ -9,16 +9,18 @@ export function makeOverflowError(message: string = DEFAULT_OVERFLOW_ERROR_MESSA
export function makeCompactionSuccess(params: {
summary: string;
- firstKeptEntryId: string;
- tokensBefore: number;
+ firstKeptEntryId?: string;
+ tokensBefore?: number;
+ tokensAfter?: number;
}) {
return {
ok: true as const,
compacted: true as const,
result: {
summary: params.summary,
- firstKeptEntryId: params.firstKeptEntryId,
- tokensBefore: params.tokensBefore,
+ ...(params.firstKeptEntryId ? { firstKeptEntryId: params.firstKeptEntryId } : {}),
+ ...(params.tokensBefore !== undefined ? { tokensBefore: params.tokensBefore } : {}),
+ ...(params.tokensAfter !== undefined ? { tokensAfter: params.tokensAfter } : {}),
},
};
}
@@ -55,8 +57,9 @@ type MockCompactDirect = {
compacted: true;
result: {
summary: string;
- firstKeptEntryId: string;
- tokensBefore: number;
+ firstKeptEntryId?: string;
+ tokensBefore?: number;
+ tokensAfter?: number;
};
}) => unknown;
};
diff --git a/src/agents/pi-embedded-runner/run.overflow-compaction.loop.test.ts b/src/agents/pi-embedded-runner/run.overflow-compaction.loop.test.ts
index 5980170be62..7a2550ba1e9 100644
--- a/src/agents/pi-embedded-runner/run.overflow-compaction.loop.test.ts
+++ b/src/agents/pi-embedded-runner/run.overflow-compaction.loop.test.ts
@@ -2,9 +2,13 @@ import "./run.overflow-compaction.mocks.shared.js";
import { beforeEach, describe, expect, it, vi } from "vitest";
import { isCompactionFailureError, isLikelyContextOverflowError } from "../pi-embedded-helpers.js";
-vi.mock("../../utils.js", () => ({
- resolveUserPath: vi.fn((p: string) => p),
-}));
+vi.mock(import("../../utils.js"), async (importOriginal) => {
+ const actual = await importOriginal();
+ return {
+ ...actual,
+ resolveUserPath: vi.fn((p: string) => p),
+ };
+});
import { log } from "./logger.js";
import { runEmbeddedPiAgent } from "./run.js";
@@ -16,6 +20,7 @@ import {
queueOverflowAttemptWithOversizedToolOutput,
} from "./run.overflow-compaction.fixture.js";
import {
+ mockedContextEngine,
mockedCompactDirect,
mockedRunEmbeddedAttempt,
mockedSessionLikelyHasOversizedToolResults,
@@ -30,6 +35,11 @@ const mockedIsLikelyContextOverflowError = vi.mocked(isLikelyContextOverflowErro
describe("overflow compaction in run loop", () => {
beforeEach(() => {
vi.clearAllMocks();
+ mockedRunEmbeddedAttempt.mockReset();
+ mockedCompactDirect.mockReset();
+ mockedSessionLikelyHasOversizedToolResults.mockReset();
+ mockedTruncateOversizedToolResultsInSession.mockReset();
+ mockedContextEngine.info.ownsCompaction = false;
mockedIsCompactionFailureError.mockImplementation((msg?: string) => {
if (!msg) {
return false;
@@ -72,7 +82,9 @@ describe("overflow compaction in run loop", () => {
expect(mockedCompactDirect).toHaveBeenCalledTimes(1);
expect(mockedCompactDirect).toHaveBeenCalledWith(
- expect.objectContaining({ authProfileId: "test-profile" }),
+ expect.objectContaining({
+ runtimeContext: expect.objectContaining({ authProfileId: "test-profile" }),
+ }),
);
expect(mockedRunEmbeddedAttempt).toHaveBeenCalledTimes(2);
expect(log.warn).toHaveBeenCalledWith(
diff --git a/src/agents/pi-embedded-runner/run.overflow-compaction.mocks.shared.ts b/src/agents/pi-embedded-runner/run.overflow-compaction.mocks.shared.ts
index 22dee7b49cd..51f711508b1 100644
--- a/src/agents/pi-embedded-runner/run.overflow-compaction.mocks.shared.ts
+++ b/src/agents/pi-embedded-runner/run.overflow-compaction.mocks.shared.ts
@@ -6,6 +6,25 @@ import type {
PluginHookBeforePromptBuildResult,
} from "../../plugins/types.js";
+type MockCompactionResult =
+ | {
+ ok: true;
+ compacted: true;
+ result: {
+ summary: string;
+ firstKeptEntryId?: string;
+ tokensBefore?: number;
+ tokensAfter?: number;
+ };
+ reason?: string;
+ }
+ | {
+ ok: false;
+ compacted: false;
+ reason: string;
+ result?: undefined;
+ };
+
export const mockedGlobalHookRunner = {
hasHooks: vi.fn((_hookName: string) => false),
runBeforeAgentStart: vi.fn(
@@ -26,12 +45,35 @@ export const mockedGlobalHookRunner = {
_ctx: PluginHookAgentContext,
): Promise => undefined,
),
+ runBeforeCompaction: vi.fn(async () => undefined),
+ runAfterCompaction: vi.fn(async () => undefined),
};
+export const mockedContextEngine = {
+ info: { ownsCompaction: false as boolean },
+ compact: vi.fn<(params: unknown) => Promise>(async () => ({
+ ok: false as const,
+ compacted: false as const,
+ reason: "nothing to compact",
+ })),
+};
+
+export const mockedContextEngineCompact = vi.mocked(mockedContextEngine.compact);
+export const mockedEnsureRuntimePluginsLoaded: (...args: unknown[]) => void = vi.fn();
+
vi.mock("../../plugins/hook-runner-global.js", () => ({
getGlobalHookRunner: vi.fn(() => mockedGlobalHookRunner),
}));
+vi.mock("../../context-engine/index.js", () => ({
+ ensureContextEnginesInitialized: vi.fn(),
+ resolveContextEngine: vi.fn(async () => mockedContextEngine),
+}));
+
+vi.mock("../runtime-plugins.js", () => ({
+ ensureRuntimePluginsLoaded: mockedEnsureRuntimePluginsLoaded,
+}));
+
vi.mock("../auth-profiles.js", () => ({
isProfileInCooldown: vi.fn(() => false),
markAuthProfileFailure: vi.fn(async () => {}),
@@ -141,9 +183,13 @@ vi.mock("../../process/command-queue.js", () => ({
enqueueCommandInLane: vi.fn((_lane: string, task: () => unknown) => task()),
}));
-vi.mock("../../utils/message-channel.js", () => ({
- isMarkdownCapableMessageChannel: vi.fn(() => true),
-}));
+vi.mock(import("../../utils/message-channel.js"), async (importOriginal) => {
+ const actual = await importOriginal();
+ return {
+ ...actual,
+ isMarkdownCapableMessageChannel: vi.fn(() => true),
+ };
+});
vi.mock("../agent-paths.js", () => ({
resolveOpenClawAgentDir: vi.fn(() => "/tmp/agent-dir"),
diff --git a/src/agents/pi-embedded-runner/run.overflow-compaction.shared-test.ts b/src/agents/pi-embedded-runner/run.overflow-compaction.shared-test.ts
index 45bab82e1b8..c697ac9526a 100644
--- a/src/agents/pi-embedded-runner/run.overflow-compaction.shared-test.ts
+++ b/src/agents/pi-embedded-runner/run.overflow-compaction.shared-test.ts
@@ -1,5 +1,8 @@
import { vi } from "vitest";
-import { compactEmbeddedPiSessionDirect } from "./compact.js";
+import {
+ mockedContextEngine,
+ mockedContextEngineCompact,
+} from "./run.overflow-compaction.mocks.shared.js";
import { runEmbeddedAttempt } from "./run/attempt.js";
import {
sessionLikelyHasOversizedToolResults,
@@ -7,13 +10,14 @@ import {
} from "./tool-result-truncation.js";
export const mockedRunEmbeddedAttempt = vi.mocked(runEmbeddedAttempt);
-export const mockedCompactDirect = vi.mocked(compactEmbeddedPiSessionDirect);
+export const mockedCompactDirect = mockedContextEngineCompact;
export const mockedSessionLikelyHasOversizedToolResults = vi.mocked(
sessionLikelyHasOversizedToolResults,
);
export const mockedTruncateOversizedToolResultsInSession = vi.mocked(
truncateOversizedToolResultsInSession,
);
+export { mockedContextEngine };
export const overflowBaseRunParams = {
sessionId: "test-session",
diff --git a/src/agents/pi-embedded-runner/run.overflow-compaction.test.ts b/src/agents/pi-embedded-runner/run.overflow-compaction.test.ts
index 19b4a81d279..b29394eedfd 100644
--- a/src/agents/pi-embedded-runner/run.overflow-compaction.test.ts
+++ b/src/agents/pi-embedded-runner/run.overflow-compaction.test.ts
@@ -11,6 +11,7 @@ import {
} from "./run.overflow-compaction.fixture.js";
import { mockedGlobalHookRunner } from "./run.overflow-compaction.mocks.shared.js";
import {
+ mockedContextEngine,
mockedCompactDirect,
mockedRunEmbeddedAttempt,
mockedSessionLikelyHasOversizedToolResults,
@@ -22,6 +23,25 @@ const mockedPickFallbackThinkingLevel = vi.mocked(pickFallbackThinkingLevel);
describe("runEmbeddedPiAgent overflow compaction trigger routing", () => {
beforeEach(() => {
vi.clearAllMocks();
+ mockedRunEmbeddedAttempt.mockReset();
+ mockedCompactDirect.mockReset();
+ mockedSessionLikelyHasOversizedToolResults.mockReset();
+ mockedTruncateOversizedToolResultsInSession.mockReset();
+ mockedGlobalHookRunner.runBeforeAgentStart.mockReset();
+ mockedGlobalHookRunner.runBeforeCompaction.mockReset();
+ mockedGlobalHookRunner.runAfterCompaction.mockReset();
+ mockedContextEngine.info.ownsCompaction = false;
+ mockedCompactDirect.mockResolvedValue({
+ ok: false,
+ compacted: false,
+ reason: "nothing to compact",
+ });
+ mockedSessionLikelyHasOversizedToolResults.mockReturnValue(false);
+ mockedTruncateOversizedToolResultsInSession.mockResolvedValue({
+ truncated: false,
+ truncatedCount: 0,
+ reason: "no oversized tool results",
+ });
mockedGlobalHookRunner.hasHooks.mockImplementation(() => false);
});
@@ -81,8 +101,12 @@ describe("runEmbeddedPiAgent overflow compaction trigger routing", () => {
expect(mockedCompactDirect).toHaveBeenCalledTimes(1);
expect(mockedCompactDirect).toHaveBeenCalledWith(
expect.objectContaining({
- trigger: "overflow",
- authProfileId: "test-profile",
+ sessionId: "test-session",
+ sessionFile: "/tmp/session.json",
+ runtimeContext: expect.objectContaining({
+ trigger: "overflow",
+ authProfileId: "test-profile",
+ }),
}),
);
});
@@ -132,6 +156,63 @@ describe("runEmbeddedPiAgent overflow compaction trigger routing", () => {
expect(result.meta.error?.kind).toBe("context_overflow");
});
+ it("fires compaction hooks during overflow recovery for ownsCompaction engines", async () => {
+ mockedContextEngine.info.ownsCompaction = true;
+ mockedGlobalHookRunner.hasHooks.mockImplementation(
+ (hookName) => hookName === "before_compaction" || hookName === "after_compaction",
+ );
+ mockedRunEmbeddedAttempt
+ .mockResolvedValueOnce(makeAttemptResult({ promptError: makeOverflowError() }))
+ .mockResolvedValueOnce(makeAttemptResult({ promptError: null }));
+ mockedCompactDirect.mockResolvedValueOnce({
+ ok: true,
+ compacted: true,
+ result: {
+ summary: "engine-owned compaction",
+ tokensAfter: 50,
+ },
+ });
+
+ await runEmbeddedPiAgent(overflowBaseRunParams);
+
+ expect(mockedGlobalHookRunner.runBeforeCompaction).toHaveBeenCalledWith(
+ { messageCount: -1, sessionFile: "/tmp/session.json" },
+ expect.objectContaining({
+ sessionKey: "test-key",
+ }),
+ );
+ expect(mockedGlobalHookRunner.runAfterCompaction).toHaveBeenCalledWith(
+ {
+ messageCount: -1,
+ compactedCount: -1,
+ tokenCount: 50,
+ sessionFile: "/tmp/session.json",
+ },
+ expect.objectContaining({
+ sessionKey: "test-key",
+ }),
+ );
+ });
+
+ it("guards thrown engine-owned overflow compaction attempts", async () => {
+ mockedContextEngine.info.ownsCompaction = true;
+ mockedGlobalHookRunner.hasHooks.mockImplementation(
+ (hookName) => hookName === "before_compaction" || hookName === "after_compaction",
+ );
+ mockedRunEmbeddedAttempt.mockResolvedValueOnce(
+ makeAttemptResult({ promptError: makeOverflowError() }),
+ );
+ mockedCompactDirect.mockRejectedValueOnce(new Error("engine boom"));
+
+ const result = await runEmbeddedPiAgent(overflowBaseRunParams);
+
+ expect(mockedCompactDirect).toHaveBeenCalledTimes(1);
+ expect(mockedGlobalHookRunner.runBeforeCompaction).toHaveBeenCalledTimes(1);
+ expect(mockedGlobalHookRunner.runAfterCompaction).not.toHaveBeenCalled();
+ expect(result.meta.error?.kind).toBe("context_overflow");
+ expect(result.payloads?.[0]?.isError).toBe(true);
+ });
+
it("returns retry_limit when repeated retries never converge", async () => {
mockedRunEmbeddedAttempt.mockClear();
mockedCompactDirect.mockClear();
diff --git a/src/agents/pi-embedded-runner/run.ts b/src/agents/pi-embedded-runner/run.ts
index a28d74bf71e..09d5adda724 100644
--- a/src/agents/pi-embedded-runner/run.ts
+++ b/src/agents/pi-embedded-runner/run.ts
@@ -1028,37 +1028,84 @@ export async function runEmbeddedPiAgent(
log.warn(
`context overflow detected (attempt ${overflowCompactionAttempts}/${MAX_OVERFLOW_COMPACTION_ATTEMPTS}); attempting auto-compaction for ${provider}/${modelId}`,
);
- const compactResult = await contextEngine.compact({
- sessionId: params.sessionId,
- sessionFile: params.sessionFile,
- tokenBudget: ctxInfo.tokens,
- force: true,
- compactionTarget: "budget",
- runtimeContext: {
- sessionKey: params.sessionKey,
- messageChannel: params.messageChannel,
- messageProvider: params.messageProvider,
- agentAccountId: params.agentAccountId,
- authProfileId: lastProfileId,
- workspaceDir: resolvedWorkspace,
- agentDir,
- config: params.config,
- skillsSnapshot: params.skillsSnapshot,
- senderIsOwner: params.senderIsOwner,
- provider,
- model: modelId,
- runId: params.runId,
- thinkLevel,
- reasoningLevel: params.reasoningLevel,
- bashElevated: params.bashElevated,
- extraSystemPrompt: params.extraSystemPrompt,
- ownerNumbers: params.ownerNumbers,
- trigger: "overflow",
- diagId: overflowDiagId,
- attempt: overflowCompactionAttempts,
- maxAttempts: MAX_OVERFLOW_COMPACTION_ATTEMPTS,
- },
- });
+ let compactResult: Awaited>;
+ // When the engine owns compaction, hooks are not fired inside
+ // compactEmbeddedPiSessionDirect (which is bypassed). Fire them
+ // here so subscribers (memory extensions, usage trackers) are
+ // notified even on overflow-recovery compactions.
+ const overflowEngineOwnsCompaction = contextEngine.info.ownsCompaction === true;
+ const overflowHookRunner = overflowEngineOwnsCompaction ? hookRunner : null;
+ if (overflowHookRunner?.hasHooks("before_compaction")) {
+ try {
+ await overflowHookRunner.runBeforeCompaction(
+ { messageCount: -1, sessionFile: params.sessionFile },
+ hookCtx,
+ );
+ } catch (hookErr) {
+ log.warn(
+ `before_compaction hook failed during overflow recovery: ${String(hookErr)}`,
+ );
+ }
+ }
+ try {
+ compactResult = await contextEngine.compact({
+ sessionId: params.sessionId,
+ sessionFile: params.sessionFile,
+ tokenBudget: ctxInfo.tokens,
+ force: true,
+ compactionTarget: "budget",
+ runtimeContext: {
+ sessionKey: params.sessionKey,
+ messageChannel: params.messageChannel,
+ messageProvider: params.messageProvider,
+ agentAccountId: params.agentAccountId,
+ authProfileId: lastProfileId,
+ workspaceDir: resolvedWorkspace,
+ agentDir,
+ config: params.config,
+ skillsSnapshot: params.skillsSnapshot,
+ senderIsOwner: params.senderIsOwner,
+ provider,
+ model: modelId,
+ runId: params.runId,
+ thinkLevel,
+ reasoningLevel: params.reasoningLevel,
+ bashElevated: params.bashElevated,
+ extraSystemPrompt: params.extraSystemPrompt,
+ ownerNumbers: params.ownerNumbers,
+ trigger: "overflow",
+ diagId: overflowDiagId,
+ attempt: overflowCompactionAttempts,
+ maxAttempts: MAX_OVERFLOW_COMPACTION_ATTEMPTS,
+ },
+ });
+ } catch (compactErr) {
+ log.warn(
+ `contextEngine.compact() threw during overflow recovery for ${provider}/${modelId}: ${String(compactErr)}`,
+ );
+ compactResult = { ok: false, compacted: false, reason: String(compactErr) };
+ }
+ if (
+ compactResult.ok &&
+ compactResult.compacted &&
+ overflowHookRunner?.hasHooks("after_compaction")
+ ) {
+ try {
+ await overflowHookRunner.runAfterCompaction(
+ {
+ messageCount: -1,
+ compactedCount: -1,
+ tokenCount: compactResult.result?.tokensAfter,
+ sessionFile: params.sessionFile,
+ },
+ hookCtx,
+ );
+ } catch (hookErr) {
+ log.warn(
+ `after_compaction hook failed during overflow recovery: ${String(hookErr)}`,
+ );
+ }
+ }
if (compactResult.compacted) {
autoCompactionCount += 1;
log.info(`auto-compaction succeeded for ${provider}/${modelId}; retrying prompt`);
diff --git a/src/agents/pi-embedded-runner/run/attempt.ts b/src/agents/pi-embedded-runner/run/attempt.ts
index 0014475a880..2f5f3d04d5f 100644
--- a/src/agents/pi-embedded-runner/run/attempt.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.ts
@@ -1774,6 +1774,8 @@ export async function runEmbeddedAttempt(
sessionId: params.sessionId,
workspaceDir: params.workspaceDir,
messageProvider: params.messageProvider ?? undefined,
+ trigger: params.trigger,
+ channelId: params.messageChannel ?? params.messageProvider ?? undefined,
},
)
.catch((err) => {
@@ -1982,6 +1984,8 @@ export async function runEmbeddedAttempt(
sessionId: params.sessionId,
workspaceDir: params.workspaceDir,
messageProvider: params.messageProvider ?? undefined,
+ trigger: params.trigger,
+ channelId: params.messageChannel ?? params.messageProvider ?? undefined,
},
)
.catch((err) => {
@@ -2042,6 +2046,8 @@ export async function runEmbeddedAttempt(
sessionId: params.sessionId,
workspaceDir: params.workspaceDir,
messageProvider: params.messageProvider ?? undefined,
+ trigger: params.trigger,
+ channelId: params.messageChannel ?? params.messageProvider ?? undefined,
},
)
.catch((err) => {
diff --git a/src/agents/pi-tools.workspace-only-false.test.ts b/src/agents/pi-tools.workspace-only-false.test.ts
index fb18260db09..146eb943c49 100644
--- a/src/agents/pi-tools.workspace-only-false.test.ts
+++ b/src/agents/pi-tools.workspace-only-false.test.ts
@@ -3,10 +3,14 @@ import os from "node:os";
import path from "node:path";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-vi.mock("@mariozechner/pi-ai/oauth", () => ({
- getOAuthApiKey: () => undefined,
- getOAuthProviders: () => [],
-}));
+vi.mock("@mariozechner/pi-ai", async (importOriginal) => {
+ const original = await importOriginal();
+ return {
+ ...original,
+ getOAuthApiKey: () => undefined,
+ getOAuthProviders: () => [],
+ };
+});
import { createOpenClawCodingTools } from "./pi-tools.js";
diff --git a/src/agents/sandbox/fs-bridge-path-safety.ts b/src/agents/sandbox/fs-bridge-path-safety.ts
index dfc6c6692a1..9ca4c52e537 100644
--- a/src/agents/sandbox/fs-bridge-path-safety.ts
+++ b/src/agents/sandbox/fs-bridge-path-safety.ts
@@ -24,6 +24,11 @@ export type PinnedSandboxEntry = {
basename: string;
};
+export type AnchoredSandboxEntry = {
+ canonicalParentPath: string;
+ basename: string;
+};
+
export type PinnedSandboxDirectoryEntry = {
mountRootPath: string;
relativePath: string;
@@ -154,6 +159,48 @@ export class SandboxFsPathGuard {
};
}
+ async resolveAnchoredSandboxEntry(
+ target: SandboxResolvedFsPath,
+ action: string,
+ ): Promise {
+ const basename = path.posix.basename(target.containerPath);
+ if (!basename || basename === "." || basename === "/") {
+ throw new Error(`Invalid sandbox entry target: ${target.containerPath}`);
+ }
+ const parentPath = normalizeContainerPath(path.posix.dirname(target.containerPath));
+ const canonicalParentPath = await this.resolveCanonicalContainerPath({
+ containerPath: parentPath,
+ allowFinalSymlinkForUnlink: false,
+ });
+ this.resolveRequiredMount(canonicalParentPath, action);
+ return {
+ canonicalParentPath,
+ basename,
+ };
+ }
+
+ async resolveAnchoredPinnedEntry(
+ target: SandboxResolvedFsPath,
+ action: string,
+ ): Promise {
+ const anchoredTarget = await this.resolveAnchoredSandboxEntry(target, action);
+ const mount = this.resolveRequiredMount(anchoredTarget.canonicalParentPath, action);
+ const relativeParentPath = path.posix.relative(
+ mount.containerRoot,
+ anchoredTarget.canonicalParentPath,
+ );
+ if (relativeParentPath.startsWith("..") || path.posix.isAbsolute(relativeParentPath)) {
+ throw new Error(
+ `Sandbox path escapes allowed mounts; cannot ${action}: ${target.containerPath}`,
+ );
+ }
+ return {
+ mountRootPath: mount.containerRoot,
+ relativeParentPath: relativeParentPath === "." ? "" : relativeParentPath,
+ basename: anchoredTarget.basename,
+ };
+ }
+
resolvePinnedDirectoryEntry(
target: SandboxResolvedFsPath,
action: string,
diff --git a/src/agents/sandbox/fs-bridge-shell-command-plans.ts b/src/agents/sandbox/fs-bridge-shell-command-plans.ts
index 2987472762b..4bcd1ae04de 100644
--- a/src/agents/sandbox/fs-bridge-shell-command-plans.ts
+++ b/src/agents/sandbox/fs-bridge-shell-command-plans.ts
@@ -1,4 +1,4 @@
-import type { PathSafetyCheck } from "./fs-bridge-path-safety.js";
+import type { AnchoredSandboxEntry, PathSafetyCheck } from "./fs-bridge-path-safety.js";
import type { SandboxResolvedFsPath } from "./fs-paths.js";
export type SandboxFsCommandPlan = {
@@ -10,11 +10,14 @@ export type SandboxFsCommandPlan = {
allowFailure?: boolean;
};
-export function buildStatPlan(target: SandboxResolvedFsPath): SandboxFsCommandPlan {
+export function buildStatPlan(
+ target: SandboxResolvedFsPath,
+ anchoredTarget: AnchoredSandboxEntry,
+): SandboxFsCommandPlan {
return {
checks: [{ target, options: { action: "stat files" } }],
- script: 'set -eu; stat -c "%F|%s|%Y" -- "$1"',
- args: [target.containerPath],
+ script: 'set -eu\ncd -- "$1"\nstat -c "%F|%s|%Y" -- "$2"',
+ args: [anchoredTarget.canonicalParentPath, anchoredTarget.basename],
allowFailure: true,
};
}
diff --git a/src/agents/sandbox/fs-bridge.anchored-ops.test.ts b/src/agents/sandbox/fs-bridge.anchored-ops.test.ts
index 9b15f02adf5..a2a17194347 100644
--- a/src/agents/sandbox/fs-bridge.anchored-ops.test.ts
+++ b/src/agents/sandbox/fs-bridge.anchored-ops.test.ts
@@ -4,7 +4,12 @@ import { describe, expect, it } from "vitest";
import {
createSandbox,
createSandboxFsBridge,
+ dockerExecResult,
+ findCallsByScriptFragment,
+ findCallByDockerArg,
+ findCallByScriptFragment,
getDockerArg,
+ getDockerScript,
installFsBridgeTestHarness,
mockedExecDockerRaw,
withTempDir,
@@ -66,6 +71,13 @@ describe("sandbox fs bridge anchored ops", () => {
});
const pinnedCases = [
+ {
+ name: "write pins canonical parent + basename",
+ invoke: (bridge: ReturnType) =>
+ bridge.writeFile({ filePath: "nested/file.txt", data: "updated" }),
+ expectedArgs: ["write", "/workspace", "nested", "file.txt", "1"],
+ forbiddenArgs: ["/workspace/nested/file.txt"],
+ },
{
name: "mkdirp pins mount root + relative path",
invoke: (bridge: ReturnType) =>
@@ -121,4 +133,74 @@ describe("sandbox fs bridge anchored ops", () => {
});
});
});
+
+ it.runIf(process.platform !== "win32")(
+ "write resolves symlink parents to canonical pinned paths",
+ async () => {
+ await withTempDir("openclaw-fs-bridge-contract-write-", async (stateDir) => {
+ const workspaceDir = path.join(stateDir, "workspace");
+ const realDir = path.join(workspaceDir, "real");
+ await fs.mkdir(realDir, { recursive: true });
+ await fs.symlink(realDir, path.join(workspaceDir, "alias"));
+
+ mockedExecDockerRaw.mockImplementation(async (args) => {
+ const script = getDockerScript(args);
+ if (script.includes('readlink -f -- "$cursor"')) {
+ const target = getDockerArg(args, 1);
+ return dockerExecResult(`${target.replace("/workspace/alias", "/workspace/real")}\n`);
+ }
+ if (script.includes('stat -c "%F|%s|%Y"')) {
+ return dockerExecResult("regular file|1|2");
+ }
+ return dockerExecResult("");
+ });
+
+ const bridge = createSandboxFsBridge({
+ sandbox: createSandbox({
+ workspaceDir,
+ agentWorkspaceDir: workspaceDir,
+ }),
+ });
+
+ await bridge.writeFile({ filePath: "alias/note.txt", data: "updated" });
+
+ const writeCall = findCallByDockerArg(1, "write");
+ expect(writeCall).toBeDefined();
+ const args = writeCall?.[0] ?? [];
+ expect(getDockerArg(args, 2)).toBe("/workspace");
+ expect(getDockerArg(args, 3)).toBe("real");
+ expect(getDockerArg(args, 4)).toBe("note.txt");
+ expect(args).not.toContain("alias");
+
+ const canonicalCalls = findCallsByScriptFragment('readlink -f -- "$cursor"');
+ expect(
+ canonicalCalls.some(([callArgs]) => getDockerArg(callArgs, 1) === "/workspace/alias"),
+ ).toBe(true);
+ });
+ },
+ );
+
+ it("stat anchors parent + basename", async () => {
+ await withTempDir("openclaw-fs-bridge-contract-stat-", async (stateDir) => {
+ const workspaceDir = path.join(stateDir, "workspace");
+ await fs.mkdir(path.join(workspaceDir, "nested"), { recursive: true });
+ await fs.writeFile(path.join(workspaceDir, "nested", "file.txt"), "bye", "utf8");
+
+ const bridge = createSandboxFsBridge({
+ sandbox: createSandbox({
+ workspaceDir,
+ agentWorkspaceDir: workspaceDir,
+ }),
+ });
+
+ await bridge.stat({ filePath: "nested/file.txt" });
+
+ const statCall = findCallByScriptFragment('stat -c "%F|%s|%Y" -- "$2"');
+ expect(statCall).toBeDefined();
+ const args = statCall?.[0] ?? [];
+ expect(getDockerArg(args, 1)).toBe("/workspace/nested");
+ expect(getDockerArg(args, 2)).toBe("file.txt");
+ expect(args).not.toContain("/workspace/nested/file.txt");
+ });
+ });
});
diff --git a/src/agents/sandbox/fs-bridge.ts b/src/agents/sandbox/fs-bridge.ts
index 83504d9b908..7a9a22d4459 100644
--- a/src/agents/sandbox/fs-bridge.ts
+++ b/src/agents/sandbox/fs-bridge.ts
@@ -118,7 +118,10 @@ class SandboxFsBridgeImpl implements SandboxFsBridge {
const buffer = Buffer.isBuffer(params.data)
? params.data
: Buffer.from(params.data, params.encoding ?? "utf8");
- const pinnedWriteTarget = this.pathGuard.resolvePinnedEntry(target, "write files");
+ const pinnedWriteTarget = await this.pathGuard.resolveAnchoredPinnedEntry(
+ target,
+ "write files",
+ );
await this.runCheckedCommand({
...buildPinnedWritePlan({
check: writeCheck,
@@ -218,7 +221,11 @@ class SandboxFsBridgeImpl implements SandboxFsBridge {
signal?: AbortSignal;
}): Promise {
const target = this.resolveResolvedPath(params);
- const result = await this.runPlannedCommand(buildStatPlan(target), params.signal);
+ const anchoredTarget = await this.pathGuard.resolveAnchoredSandboxEntry(target, "stat files");
+ const result = await this.runPlannedCommand(
+ buildStatPlan(target, anchoredTarget),
+ params.signal,
+ );
if (result.code !== 0) {
const stderr = result.stderr.toString("utf8");
if (stderr.includes("No such file or directory")) {
diff --git a/src/agents/tool-catalog.test.ts b/src/agents/tool-catalog.test.ts
new file mode 100644
index 00000000000..120a744432c
--- /dev/null
+++ b/src/agents/tool-catalog.test.ts
@@ -0,0 +1,11 @@
+import { describe, expect, it } from "vitest";
+import { resolveCoreToolProfilePolicy } from "./tool-catalog.js";
+
+describe("tool-catalog", () => {
+ it("includes web_search and web_fetch in the coding profile policy", () => {
+ const policy = resolveCoreToolProfilePolicy("coding");
+ expect(policy).toBeDefined();
+ expect(policy!.allow).toContain("web_search");
+ expect(policy!.allow).toContain("web_fetch");
+ });
+});
diff --git a/src/agents/tool-catalog.ts b/src/agents/tool-catalog.ts
index bbada8e7bc9..5ba7ff3b3dc 100644
--- a/src/agents/tool-catalog.ts
+++ b/src/agents/tool-catalog.ts
@@ -86,7 +86,7 @@ const CORE_TOOL_DEFINITIONS: CoreToolDefinition[] = [
label: "web_search",
description: "Search the web",
sectionId: "web",
- profiles: [],
+ profiles: ["coding"],
includeInOpenClawGroup: true,
},
{
@@ -94,7 +94,7 @@ const CORE_TOOL_DEFINITIONS: CoreToolDefinition[] = [
label: "web_fetch",
description: "Fetch web content",
sectionId: "web",
- profiles: [],
+ profiles: ["coding"],
includeInOpenClawGroup: true,
},
{
diff --git a/src/channels/plugins/outbound/whatsapp.sendpayload.test.ts b/src/channels/plugins/outbound/whatsapp.sendpayload.test.ts
index e98351cfa61..943c8a8ba9b 100644
--- a/src/channels/plugins/outbound/whatsapp.sendpayload.test.ts
+++ b/src/channels/plugins/outbound/whatsapp.sendpayload.test.ts
@@ -1,4 +1,4 @@
-import { describe, vi } from "vitest";
+import { describe, expect, it, vi } from "vitest";
import type { ReplyPayload } from "../../../auto-reply/types.js";
import {
installSendPayloadContractSuite,
@@ -34,4 +34,92 @@ describe("whatsappOutbound sendPayload", () => {
chunking: { mode: "split", longTextLength: 5000, maxChunkLength: 4000 },
createHarness,
});
+
+ it("trims leading whitespace for direct text sends", async () => {
+ const sendWhatsApp = vi.fn(async () => ({ messageId: "wa-1", toJid: "jid" }));
+
+ await whatsappOutbound.sendText!({
+ cfg: {},
+ to: "5511999999999@c.us",
+ text: "\n \thello",
+ deps: { sendWhatsApp },
+ });
+
+ expect(sendWhatsApp).toHaveBeenCalledWith("5511999999999@c.us", "hello", {
+ verbose: false,
+ cfg: {},
+ accountId: undefined,
+ gifPlayback: undefined,
+ });
+ });
+
+ it("trims leading whitespace for direct media captions", async () => {
+ const sendWhatsApp = vi.fn(async () => ({ messageId: "wa-1", toJid: "jid" }));
+
+ await whatsappOutbound.sendMedia!({
+ cfg: {},
+ to: "5511999999999@c.us",
+ text: "\n \tcaption",
+ mediaUrl: "/tmp/test.png",
+ deps: { sendWhatsApp },
+ });
+
+ expect(sendWhatsApp).toHaveBeenCalledWith("5511999999999@c.us", "caption", {
+ verbose: false,
+ cfg: {},
+ mediaUrl: "/tmp/test.png",
+ mediaLocalRoots: undefined,
+ accountId: undefined,
+ gifPlayback: undefined,
+ });
+ });
+
+ it("trims leading whitespace for sendPayload text and caption delivery", async () => {
+ const sendWhatsApp = vi.fn(async () => ({ messageId: "wa-1", toJid: "jid" }));
+
+ await whatsappOutbound.sendPayload!({
+ cfg: {},
+ to: "5511999999999@c.us",
+ text: "",
+ payload: { text: "\n\nhello" },
+ deps: { sendWhatsApp },
+ });
+ await whatsappOutbound.sendPayload!({
+ cfg: {},
+ to: "5511999999999@c.us",
+ text: "",
+ payload: { text: "\n\ncaption", mediaUrl: "/tmp/test.png" },
+ deps: { sendWhatsApp },
+ });
+
+ expect(sendWhatsApp).toHaveBeenNthCalledWith(1, "5511999999999@c.us", "hello", {
+ verbose: false,
+ cfg: {},
+ accountId: undefined,
+ gifPlayback: undefined,
+ });
+ expect(sendWhatsApp).toHaveBeenNthCalledWith(2, "5511999999999@c.us", "caption", {
+ verbose: false,
+ cfg: {},
+ mediaUrl: "/tmp/test.png",
+ mediaLocalRoots: undefined,
+ accountId: undefined,
+ gifPlayback: undefined,
+ });
+ });
+
+ it("skips whitespace-only text payloads", async () => {
+ const sendWhatsApp = vi.fn();
+
+ const result = await whatsappOutbound.sendPayload!({
+ cfg: {},
+ to: "5511999999999@c.us",
+ text: "",
+ payload: { text: "\n \t" },
+ deps: { sendWhatsApp },
+ });
+
+ expect(result).toEqual({ channel: "whatsapp", messageId: "" });
+ expect(sendWhatsApp).not.toHaveBeenCalled();
+ });
});
diff --git a/src/channels/plugins/outbound/whatsapp.ts b/src/channels/plugins/outbound/whatsapp.ts
index e5de15241ae..58004676e6e 100644
--- a/src/channels/plugins/outbound/whatsapp.ts
+++ b/src/channels/plugins/outbound/whatsapp.ts
@@ -5,6 +5,10 @@ import { resolveWhatsAppOutboundTarget } from "../../../whatsapp/resolve-outboun
import type { ChannelOutboundAdapter } from "../types.js";
import { sendTextMediaPayload } from "./direct-text-media.js";
+function trimLeadingWhitespace(text: string | undefined): string {
+ return text?.trimStart() ?? "";
+}
+
export const whatsappOutbound: ChannelOutboundAdapter = {
deliveryMode: "gateway",
chunker: chunkText,
@@ -13,12 +17,32 @@ export const whatsappOutbound: ChannelOutboundAdapter = {
pollMaxOptions: 12,
resolveTarget: ({ to, allowFrom, mode }) =>
resolveWhatsAppOutboundTarget({ to, allowFrom, mode }),
- sendPayload: async (ctx) =>
- await sendTextMediaPayload({ channel: "whatsapp", ctx, adapter: whatsappOutbound }),
+ sendPayload: async (ctx) => {
+ const text = trimLeadingWhitespace(ctx.payload.text);
+ const hasMedia = Boolean(ctx.payload.mediaUrl) || (ctx.payload.mediaUrls?.length ?? 0) > 0;
+ if (!text && !hasMedia) {
+ return { channel: "whatsapp", messageId: "" };
+ }
+ return await sendTextMediaPayload({
+ channel: "whatsapp",
+ ctx: {
+ ...ctx,
+ payload: {
+ ...ctx.payload,
+ text,
+ },
+ },
+ adapter: whatsappOutbound,
+ });
+ },
sendText: async ({ cfg, to, text, accountId, deps, gifPlayback }) => {
+ const normalizedText = trimLeadingWhitespace(text);
+ if (!normalizedText) {
+ return { channel: "whatsapp", messageId: "" };
+ }
const send =
deps?.sendWhatsApp ?? (await import("../../../web/outbound.js")).sendMessageWhatsApp;
- const result = await send(to, text, {
+ const result = await send(to, normalizedText, {
verbose: false,
cfg,
accountId: accountId ?? undefined,
@@ -27,9 +51,10 @@ export const whatsappOutbound: ChannelOutboundAdapter = {
return { channel: "whatsapp", ...result };
},
sendMedia: async ({ cfg, to, text, mediaUrl, mediaLocalRoots, accountId, deps, gifPlayback }) => {
+ const normalizedText = trimLeadingWhitespace(text);
const send =
deps?.sendWhatsApp ?? (await import("../../../web/outbound.js")).sendMessageWhatsApp;
- const result = await send(to, text, {
+ const result = await send(to, normalizedText, {
verbose: false,
cfg,
mediaUrl,
diff --git a/src/cli/daemon-cli.coverage.test.ts b/src/cli/daemon-cli.coverage.test.ts
index d897eee11cc..8faf44cdde3 100644
--- a/src/cli/daemon-cli.coverage.test.ts
+++ b/src/cli/daemon-cli.coverage.test.ts
@@ -10,7 +10,7 @@ const resolveGatewayProgramArguments = vi.fn(async (_opts?: unknown) => ({
const serviceInstall = vi.fn().mockResolvedValue(undefined);
const serviceUninstall = vi.fn().mockResolvedValue(undefined);
const serviceStop = vi.fn().mockResolvedValue(undefined);
-const serviceRestart = vi.fn().mockResolvedValue(undefined);
+const serviceRestart = vi.fn().mockResolvedValue({ outcome: "completed" });
const serviceIsLoaded = vi.fn().mockResolvedValue(false);
const serviceReadCommand = vi.fn().mockResolvedValue(null);
const serviceReadRuntime = vi.fn().mockResolvedValue({ status: "running" });
@@ -48,20 +48,24 @@ vi.mock("../daemon/program-args.js", () => ({
resolveGatewayProgramArguments: (opts: unknown) => resolveGatewayProgramArguments(opts),
}));
-vi.mock("../daemon/service.js", () => ({
- resolveGatewayService: () => ({
- label: "LaunchAgent",
- loadedText: "loaded",
- notLoadedText: "not loaded",
- install: serviceInstall,
- uninstall: serviceUninstall,
- stop: serviceStop,
- restart: serviceRestart,
- isLoaded: serviceIsLoaded,
- readCommand: serviceReadCommand,
- readRuntime: serviceReadRuntime,
- }),
-}));
+vi.mock("../daemon/service.js", async (importOriginal) => {
+ const actual = await importOriginal();
+ return {
+ ...actual,
+ resolveGatewayService: () => ({
+ label: "LaunchAgent",
+ loadedText: "loaded",
+ notLoadedText: "not loaded",
+ install: serviceInstall,
+ uninstall: serviceUninstall,
+ stop: serviceStop,
+ restart: serviceRestart,
+ isLoaded: serviceIsLoaded,
+ readCommand: serviceReadCommand,
+ readRuntime: serviceReadRuntime,
+ }),
+ };
+});
vi.mock("../daemon/legacy.js", () => ({
findLegacyGatewayServices: async () => [],
diff --git a/src/cli/daemon-cli/lifecycle-core.config-guard.test.ts b/src/cli/daemon-cli/lifecycle-core.config-guard.test.ts
index a785cde4d9b..188e7090915 100644
--- a/src/cli/daemon-cli/lifecycle-core.config-guard.test.ts
+++ b/src/cli/daemon-cli/lifecycle-core.config-guard.test.ts
@@ -65,7 +65,7 @@ describe("runServiceRestart config pre-flight (#35862)", () => {
service.restart.mockClear();
service.isLoaded.mockResolvedValue(true);
service.readCommand.mockResolvedValue({ environment: {} });
- service.restart.mockResolvedValue(undefined);
+ service.restart.mockResolvedValue({ outcome: "completed" });
vi.unstubAllEnvs();
vi.stubEnv("OPENCLAW_GATEWAY_TOKEN", "");
vi.stubEnv("CLAWDBOT_GATEWAY_TOKEN", "");
@@ -163,7 +163,7 @@ describe("runServiceStart config pre-flight (#35862)", () => {
service.isLoaded.mockClear();
service.restart.mockClear();
service.isLoaded.mockResolvedValue(true);
- service.restart.mockResolvedValue(undefined);
+ service.restart.mockResolvedValue({ outcome: "completed" });
});
it("aborts start when config is invalid", async () => {
diff --git a/src/cli/daemon-cli/lifecycle-core.test.ts b/src/cli/daemon-cli/lifecycle-core.test.ts
index 8fa7ded1bde..ff66bd17653 100644
--- a/src/cli/daemon-cli/lifecycle-core.test.ts
+++ b/src/cli/daemon-cli/lifecycle-core.test.ts
@@ -40,11 +40,12 @@ vi.mock("../../runtime.js", () => ({
}));
let runServiceRestart: typeof import("./lifecycle-core.js").runServiceRestart;
+let runServiceStart: typeof import("./lifecycle-core.js").runServiceStart;
let runServiceStop: typeof import("./lifecycle-core.js").runServiceStop;
describe("runServiceRestart token drift", () => {
beforeAll(async () => {
- ({ runServiceRestart, runServiceStop } = await import("./lifecycle-core.js"));
+ ({ runServiceRestart, runServiceStart, runServiceStop } = await import("./lifecycle-core.js"));
});
beforeEach(() => {
@@ -64,7 +65,7 @@ describe("runServiceRestart token drift", () => {
service.readCommand.mockResolvedValue({
environment: { OPENCLAW_GATEWAY_TOKEN: "service-token" },
});
- service.restart.mockResolvedValue(undefined);
+ service.restart.mockResolvedValue({ outcome: "completed" });
vi.unstubAllEnvs();
vi.stubEnv("OPENCLAW_GATEWAY_TOKEN", "");
vi.stubEnv("CLAWDBOT_GATEWAY_TOKEN", "");
@@ -176,4 +177,41 @@ describe("runServiceRestart token drift", () => {
expect(payload.result).toBe("restarted");
expect(payload.message).toContain("unmanaged process");
});
+
+ it("skips restart health checks when restart is only scheduled", async () => {
+ const postRestartCheck = vi.fn(async () => {});
+ service.restart.mockResolvedValue({ outcome: "scheduled" });
+
+ const result = await runServiceRestart({
+ serviceNoun: "Gateway",
+ service,
+ renderStartHints: () => [],
+ opts: { json: true },
+ postRestartCheck,
+ });
+
+ expect(result).toBe(true);
+ expect(postRestartCheck).not.toHaveBeenCalled();
+ const jsonLine = runtimeLogs.find((line) => line.trim().startsWith("{"));
+ const payload = JSON.parse(jsonLine ?? "{}") as { result?: string; message?: string };
+ expect(payload.result).toBe("scheduled");
+ expect(payload.message).toBe("restart scheduled, gateway will restart momentarily");
+ });
+
+ it("emits scheduled when service start routes through a scheduled restart", async () => {
+ service.restart.mockResolvedValue({ outcome: "scheduled" });
+
+ await runServiceStart({
+ serviceNoun: "Gateway",
+ service,
+ renderStartHints: () => [],
+ opts: { json: true },
+ });
+
+ expect(service.isLoaded).toHaveBeenCalledTimes(1);
+ const jsonLine = runtimeLogs.find((line) => line.trim().startsWith("{"));
+ const payload = JSON.parse(jsonLine ?? "{}") as { result?: string; message?: string };
+ expect(payload.result).toBe("scheduled");
+ expect(payload.message).toBe("restart scheduled, gateway will restart momentarily");
+ });
});
diff --git a/src/cli/daemon-cli/lifecycle-core.ts b/src/cli/daemon-cli/lifecycle-core.ts
index 75bba03b418..a1ad4073584 100644
--- a/src/cli/daemon-cli/lifecycle-core.ts
+++ b/src/cli/daemon-cli/lifecycle-core.ts
@@ -3,6 +3,8 @@ import { readBestEffortConfig, readConfigFileSnapshot } from "../../config/confi
import { formatConfigIssueLines } from "../../config/issue-format.js";
import { resolveIsNixMode } from "../../config/paths.js";
import { checkTokenDrift } from "../../daemon/service-audit.js";
+import type { GatewayServiceRestartResult } from "../../daemon/service-types.js";
+import { describeGatewayServiceRestart } from "../../daemon/service.js";
import type { GatewayService } from "../../daemon/service.js";
import { renderSystemdUnavailableHints } from "../../daemon/systemd-hints.js";
import { isSystemdUserServiceAvailable } from "../../daemon/systemd.js";
@@ -223,7 +225,20 @@ export async function runServiceStart(params: {
}
try {
- await params.service.restart({ env: process.env, stdout });
+ const restartResult = await params.service.restart({ env: process.env, stdout });
+ const restartStatus = describeGatewayServiceRestart(params.serviceNoun, restartResult);
+ if (restartStatus.scheduled) {
+ emit({
+ ok: true,
+ result: restartStatus.daemonActionResult,
+ message: restartStatus.message,
+ service: buildDaemonServiceSnapshot(params.service, loaded),
+ });
+ if (!json) {
+ defaultRuntime.log(restartStatus.message);
+ }
+ return;
+ }
} catch (err) {
const hints = params.renderStartHints();
fail(`${params.serviceNoun} start failed: ${String(err)}`, hints);
@@ -317,7 +332,7 @@ export async function runServiceRestart(params: {
renderStartHints: () => string[];
opts?: DaemonLifecycleOptions;
checkTokenDrift?: boolean;
- postRestartCheck?: (ctx: RestartPostCheckContext) => Promise;
+ postRestartCheck?: (ctx: RestartPostCheckContext) => Promise;
onNotLoaded?: (ctx: NotLoadedActionContext) => Promise;
}): Promise {
const json = Boolean(params.opts?.json);
@@ -402,11 +417,42 @@ export async function runServiceRestart(params: {
}
try {
+ let restartResult: GatewayServiceRestartResult = { outcome: "completed" };
if (loaded) {
- await params.service.restart({ env: process.env, stdout });
+ restartResult = await params.service.restart({ env: process.env, stdout });
+ }
+ let restartStatus = describeGatewayServiceRestart(params.serviceNoun, restartResult);
+ if (restartStatus.scheduled) {
+ emit({
+ ok: true,
+ result: restartStatus.daemonActionResult,
+ message: restartStatus.message,
+ service: buildDaemonServiceSnapshot(params.service, loaded),
+ warnings: warnings.length ? warnings : undefined,
+ });
+ if (!json) {
+ defaultRuntime.log(restartStatus.message);
+ }
+ return true;
}
if (params.postRestartCheck) {
- await params.postRestartCheck({ json, stdout, warnings, fail });
+ const postRestartResult = await params.postRestartCheck({ json, stdout, warnings, fail });
+ if (postRestartResult) {
+ restartStatus = describeGatewayServiceRestart(params.serviceNoun, postRestartResult);
+ if (restartStatus.scheduled) {
+ emit({
+ ok: true,
+ result: restartStatus.daemonActionResult,
+ message: restartStatus.message,
+ service: buildDaemonServiceSnapshot(params.service, loaded),
+ warnings: warnings.length ? warnings : undefined,
+ });
+ if (!json) {
+ defaultRuntime.log(restartStatus.message);
+ }
+ return true;
+ }
+ }
}
let restarted = loaded;
if (loaded) {
diff --git a/src/cli/daemon-cli/lifecycle.test.ts b/src/cli/daemon-cli/lifecycle.test.ts
index f1e87fc4938..61899e4e78c 100644
--- a/src/cli/daemon-cli/lifecycle.test.ts
+++ b/src/cli/daemon-cli/lifecycle.test.ts
@@ -132,6 +132,7 @@ describe("runDaemonRestart health checks", () => {
programArguments: ["openclaw", "gateway", "--port", "18789"],
environment: {},
});
+ service.restart.mockResolvedValue({ outcome: "completed" });
runServiceRestart.mockImplementation(async (params: RestartParams) => {
const fail = (message: string, hints?: string[]) => {
@@ -204,6 +205,25 @@ describe("runDaemonRestart health checks", () => {
expect(waitForGatewayHealthyRestart).toHaveBeenCalledTimes(2);
});
+ it("skips stale-pid retry health checks when the retry restart is only scheduled", async () => {
+ const unhealthy: RestartHealthSnapshot = {
+ healthy: false,
+ staleGatewayPids: [1993],
+ runtime: { status: "stopped" },
+ portUsage: { port: 18789, status: "busy", listeners: [], hints: [] },
+ };
+ waitForGatewayHealthyRestart.mockResolvedValueOnce(unhealthy);
+ terminateStaleGatewayPids.mockResolvedValue([1993]);
+ service.restart.mockResolvedValueOnce({ outcome: "scheduled" });
+
+ const result = await runDaemonRestart({ json: true });
+
+ expect(result).toBe(true);
+ expect(terminateStaleGatewayPids).toHaveBeenCalledWith([1993]);
+ expect(service.restart).toHaveBeenCalledTimes(1);
+ expect(waitForGatewayHealthyRestart).toHaveBeenCalledTimes(1);
+ });
+
it("fails restart when gateway remains unhealthy", async () => {
const unhealthy: RestartHealthSnapshot = {
healthy: false,
diff --git a/src/cli/daemon-cli/lifecycle.ts b/src/cli/daemon-cli/lifecycle.ts
index 7fa7396d0b0..2b0775b0c48 100644
--- a/src/cli/daemon-cli/lifecycle.ts
+++ b/src/cli/daemon-cli/lifecycle.ts
@@ -286,7 +286,10 @@ export async function runDaemonRestart(opts: DaemonLifecycleOptions = {}): Promi
}
await terminateStaleGatewayPids(health.staleGatewayPids);
- await service.restart({ env: process.env, stdout });
+ const retryRestart = await service.restart({ env: process.env, stdout });
+ if (retryRestart.outcome === "scheduled") {
+ return retryRestart;
+ }
health = await waitForGatewayHealthyRestart({
service,
port: restartPort,
diff --git a/src/cli/skills-cli.format.ts b/src/cli/skills-cli.format.ts
index 580f17b2d40..9e39eeca30e 100644
--- a/src/cli/skills-cli.format.ts
+++ b/src/cli/skills-cli.format.ts
@@ -1,4 +1,5 @@
import type { SkillStatusEntry, SkillStatusReport } from "../agents/skills-status.js";
+import { stripAnsi } from "../terminal/ansi.js";
import { getTerminalTableWidth, renderTable } from "../terminal/table.js";
import { theme } from "../terminal/theme.js";
import { shortenHomePath } from "../utils.js";
@@ -42,6 +43,33 @@ function normalizeSkillEmoji(emoji?: string): string {
return (emoji ?? "📦").replaceAll("\uFE0E", "\uFE0F");
}
+const REMAINING_ESC_SEQUENCE_REGEX = new RegExp(
+ String.raw`\u001b(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])`,
+ "g",
+);
+const JSON_CONTROL_CHAR_REGEX = new RegExp(String.raw`[\u0000-\u001f\u007f-\u009f]`, "g");
+
+function sanitizeJsonString(value: string): string {
+ return stripAnsi(value)
+ .replace(REMAINING_ESC_SEQUENCE_REGEX, "")
+ .replace(JSON_CONTROL_CHAR_REGEX, "");
+}
+
+function sanitizeJsonValue(value: unknown): unknown {
+ if (typeof value === "string") {
+ return sanitizeJsonString(value);
+ }
+ if (Array.isArray(value)) {
+ return value.map((item) => sanitizeJsonValue(item));
+ }
+ if (value && typeof value === "object") {
+ return Object.fromEntries(
+ Object.entries(value).map(([key, entryValue]) => [key, sanitizeJsonValue(entryValue)]),
+ );
+ }
+ return value;
+}
+
function formatSkillName(skill: SkillStatusEntry): string {
const emoji = normalizeSkillEmoji(skill.emoji);
return `${emoji} ${theme.command(skill.name)}`;
@@ -71,7 +99,7 @@ export function formatSkillsList(report: SkillStatusReport, opts: SkillsListOpti
const skills = opts.eligible ? report.skills.filter((s) => s.eligible) : report.skills;
if (opts.json) {
- const jsonReport = {
+ const jsonReport = sanitizeJsonValue({
workspaceDir: report.workspaceDir,
managedSkillsDir: report.managedSkillsDir,
skills: skills.map((s) => ({
@@ -87,7 +115,7 @@ export function formatSkillsList(report: SkillStatusReport, opts: SkillsListOpti
homepage: s.homepage,
missing: s.missing,
})),
- };
+ });
return JSON.stringify(jsonReport, null, 2);
}
@@ -154,7 +182,7 @@ export function formatSkillInfo(
}
if (opts.json) {
- return JSON.stringify(skill, null, 2);
+ return JSON.stringify(sanitizeJsonValue(skill), null, 2);
}
const lines: string[] = [];
@@ -251,7 +279,7 @@ export function formatSkillsCheck(report: SkillStatusReport, opts: SkillsCheckOp
if (opts.json) {
return JSON.stringify(
- {
+ sanitizeJsonValue({
summary: {
total: report.skills.length,
eligible: eligible.length,
@@ -267,7 +295,7 @@ export function formatSkillsCheck(report: SkillStatusReport, opts: SkillsCheckOp
missing: s.missing,
install: s.install,
})),
- },
+ }),
null,
2,
);
diff --git a/src/cli/skills-cli.test.ts b/src/cli/skills-cli.test.ts
index e87f8b2d313..27031fc0fdf 100644
--- a/src/cli/skills-cli.test.ts
+++ b/src/cli/skills-cli.test.ts
@@ -243,5 +243,46 @@ describe("skills-cli", () => {
const parsed = JSON.parse(output) as Record;
assert(parsed);
});
+
+ it("sanitizes ANSI and C1 controls in skills list JSON output", () => {
+ const report = createMockReport([
+ createMockSkill({
+ name: "json-skill",
+ emoji: "\u001b[31m📧\u001b[0m\u009f",
+ description: "desc\u0093\u001b[2J\u001b[33m colored\u001b[0m",
+ }),
+ ]);
+
+ const output = formatSkillsList(report, { json: true });
+ const parsed = JSON.parse(output) as {
+ skills: Array<{ emoji: string; description: string }>;
+ };
+
+ expect(parsed.skills[0]?.emoji).toBe("📧");
+ expect(parsed.skills[0]?.description).toBe("desc colored");
+ expect(output).not.toContain("\\u001b");
+ });
+
+ it("sanitizes skills info JSON output", () => {
+ const report = createMockReport([
+ createMockSkill({
+ name: "info-json",
+ emoji: "\u001b[31m🎙\u001b[0m\u009f",
+ description: "hi\u0091",
+ homepage: "https://example.com/\u0092docs",
+ }),
+ ]);
+
+ const output = formatSkillInfo(report, "info-json", { json: true });
+ const parsed = JSON.parse(output) as {
+ emoji: string;
+ description: string;
+ homepage: string;
+ };
+
+ expect(parsed.emoji).toBe("🎙");
+ expect(parsed.description).toBe("hi");
+ expect(parsed.homepage).toBe("https://example.com/docs");
+ });
});
});
diff --git a/src/commands/configure.daemon.test.ts b/src/commands/configure.daemon.test.ts
index 9a7aa76e0c8..11b54dc6b19 100644
--- a/src/commands/configure.daemon.test.ts
+++ b/src/commands/configure.daemon.test.ts
@@ -1,13 +1,22 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
-const withProgress = vi.hoisted(() => vi.fn(async (_opts, run) => run({ setLabel: vi.fn() })));
+const progressSetLabel = vi.hoisted(() => vi.fn());
+const withProgress = vi.hoisted(() =>
+ vi.fn(async (_opts, run) => run({ setLabel: progressSetLabel })),
+);
const loadConfig = vi.hoisted(() => vi.fn());
const resolveGatewayInstallToken = vi.hoisted(() => vi.fn());
const buildGatewayInstallPlan = vi.hoisted(() => vi.fn());
const note = vi.hoisted(() => vi.fn());
const serviceIsLoaded = vi.hoisted(() => vi.fn(async () => false));
const serviceInstall = vi.hoisted(() => vi.fn(async () => {}));
+const serviceRestart = vi.hoisted(() =>
+ vi.fn<() => Promise<{ outcome: "completed" } | { outcome: "scheduled" }>>(async () => ({
+ outcome: "completed",
+ })),
+);
const ensureSystemdUserLingerInteractive = vi.hoisted(() => vi.fn(async () => {}));
+const select = vi.hoisted(() => vi.fn(async () => "node"));
vi.mock("../cli/progress.js", () => ({
withProgress,
@@ -32,7 +41,7 @@ vi.mock("../terminal/note.js", () => ({
vi.mock("./configure.shared.js", () => ({
confirm: vi.fn(async () => true),
- select: vi.fn(async () => "node"),
+ select,
}));
vi.mock("./daemon-runtime.js", () => ({
@@ -40,12 +49,17 @@ vi.mock("./daemon-runtime.js", () => ({
GATEWAY_DAEMON_RUNTIME_OPTIONS: [{ value: "node", label: "Node" }],
}));
-vi.mock("../daemon/service.js", () => ({
- resolveGatewayService: vi.fn(() => ({
- isLoaded: serviceIsLoaded,
- install: serviceInstall,
- })),
-}));
+vi.mock("../daemon/service.js", async (importOriginal) => {
+ const actual = await importOriginal();
+ return {
+ ...actual,
+ resolveGatewayService: vi.fn(() => ({
+ isLoaded: serviceIsLoaded,
+ install: serviceInstall,
+ restart: serviceRestart,
+ })),
+ };
+});
vi.mock("./onboard-helpers.js", () => ({
guardCancel: (value: unknown) => value,
@@ -60,8 +74,10 @@ const { maybeInstallDaemon } = await import("./configure.daemon.js");
describe("maybeInstallDaemon", () => {
beforeEach(() => {
vi.clearAllMocks();
+ progressSetLabel.mockReset();
serviceIsLoaded.mockResolvedValue(false);
serviceInstall.mockResolvedValue(undefined);
+ serviceRestart.mockResolvedValue({ outcome: "completed" });
loadConfig.mockReturnValue({});
resolveGatewayInstallToken.mockResolvedValue({
token: undefined,
@@ -152,4 +168,19 @@ describe("maybeInstallDaemon", () => {
expect(serviceInstall).toHaveBeenCalledTimes(1);
});
+
+ it("shows restart scheduled when a loaded service defers restart handoff", async () => {
+ serviceIsLoaded.mockResolvedValue(true);
+ select.mockResolvedValueOnce("restart");
+ serviceRestart.mockResolvedValueOnce({ outcome: "scheduled" });
+
+ await maybeInstallDaemon({
+ runtime: { log: vi.fn(), error: vi.fn(), exit: vi.fn() },
+ port: 18789,
+ });
+
+ expect(serviceRestart).toHaveBeenCalledTimes(1);
+ expect(serviceInstall).not.toHaveBeenCalled();
+ expect(progressSetLabel).toHaveBeenLastCalledWith("Gateway service restart scheduled.");
+ });
});
diff --git a/src/commands/configure.daemon.ts b/src/commands/configure.daemon.ts
index 4f943982a38..64272c9e2bc 100644
--- a/src/commands/configure.daemon.ts
+++ b/src/commands/configure.daemon.ts
@@ -1,6 +1,6 @@
import { withProgress } from "../cli/progress.js";
import { loadConfig } from "../config/config.js";
-import { resolveGatewayService } from "../daemon/service.js";
+import { describeGatewayServiceRestart, resolveGatewayService } from "../daemon/service.js";
import { isNonFatalSystemdInstallProbeError } from "../daemon/systemd.js";
import type { RuntimeEnv } from "../runtime.js";
import { note } from "../terminal/note.js";
@@ -50,11 +50,13 @@ export async function maybeInstallDaemon(params: {
{ label: "Gateway service", indeterminate: true, delayMs: 0 },
async (progress) => {
progress.setLabel("Restarting Gateway service…");
- await service.restart({
+ const restartResult = await service.restart({
env: process.env,
stdout: process.stdout,
});
- progress.setLabel("Gateway service restarted.");
+ progress.setLabel(
+ describeGatewayServiceRestart("Gateway", restartResult).progressMessage,
+ );
},
);
shouldCheckLinger = true;
diff --git a/src/commands/doctor-gateway-daemon-flow.test.ts b/src/commands/doctor-gateway-daemon-flow.test.ts
new file mode 100644
index 00000000000..02c0b885bb0
--- /dev/null
+++ b/src/commands/doctor-gateway-daemon-flow.test.ts
@@ -0,0 +1,194 @@
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+const service = vi.hoisted(() => ({
+ isLoaded: vi.fn(),
+ readRuntime: vi.fn(),
+ restart: vi.fn(),
+ install: vi.fn(),
+ readCommand: vi.fn(),
+}));
+const note = vi.hoisted(() => vi.fn());
+const sleep = vi.hoisted(() => vi.fn(async () => {}));
+const healthCommand = vi.hoisted(() => vi.fn(async () => {}));
+const inspectPortUsage = vi.hoisted(() => vi.fn());
+const readLastGatewayErrorLine = vi.hoisted(() => vi.fn(async () => null));
+
+vi.mock("../config/config.js", () => ({
+ resolveGatewayPort: vi.fn(() => 18789),
+}));
+
+vi.mock("../daemon/constants.js", () => ({
+ resolveGatewayLaunchAgentLabel: vi.fn(() => "ai.openclaw.gateway"),
+ resolveNodeLaunchAgentLabel: vi.fn(() => "ai.openclaw.node"),
+}));
+
+vi.mock("../daemon/diagnostics.js", () => ({
+ readLastGatewayErrorLine,
+}));
+
+vi.mock("../daemon/launchd.js", async (importOriginal) => {
+ const actual = await importOriginal();
+ return {
+ ...actual,
+ isLaunchAgentListed: vi.fn(async () => false),
+ isLaunchAgentLoaded: vi.fn(async () => false),
+ launchAgentPlistExists: vi.fn(async () => false),
+ repairLaunchAgentBootstrap: vi.fn(async () => ({ ok: true })),
+ };
+});
+
+vi.mock("../daemon/service.js", async (importOriginal) => {
+ const actual = await importOriginal();
+ return {
+ ...actual,
+ resolveGatewayService: () => service,
+ };
+});
+
+vi.mock("../daemon/systemd-hints.js", () => ({
+ renderSystemdUnavailableHints: vi.fn(() => []),
+}));
+
+vi.mock("../daemon/systemd.js", async (importOriginal) => {
+ const actual = await importOriginal();
+ return {
+ ...actual,
+ isSystemdUserServiceAvailable: vi.fn(async () => true),
+ };
+});
+
+vi.mock("../infra/ports.js", () => ({
+ inspectPortUsage,
+ formatPortDiagnostics: vi.fn(() => []),
+}));
+
+vi.mock("../infra/wsl.js", () => ({
+ isWSL: vi.fn(async () => false),
+}));
+
+vi.mock("../terminal/note.js", () => ({
+ note,
+}));
+
+vi.mock("../utils.js", () => ({
+ sleep,
+}));
+
+vi.mock("./daemon-install-helpers.js", () => ({
+ buildGatewayInstallPlan: vi.fn(),
+ gatewayInstallErrorHint: vi.fn(() => "hint"),
+}));
+
+vi.mock("./doctor-format.js", () => ({
+ buildGatewayRuntimeHints: vi.fn(() => []),
+ formatGatewayRuntimeSummary: vi.fn(() => null),
+}));
+
+vi.mock("./gateway-install-token.js", () => ({
+ resolveGatewayInstallToken: vi.fn(),
+}));
+
+vi.mock("./health-format.js", () => ({
+ formatHealthCheckFailure: vi.fn(() => "health failed"),
+}));
+
+vi.mock("./health.js", () => ({
+ healthCommand,
+}));
+
+describe("maybeRepairGatewayDaemon", () => {
+ let maybeRepairGatewayDaemon: typeof import("./doctor-gateway-daemon-flow.js").maybeRepairGatewayDaemon;
+ const originalPlatformDescriptor = Object.getOwnPropertyDescriptor(process, "platform");
+
+ beforeAll(async () => {
+ ({ maybeRepairGatewayDaemon } = await import("./doctor-gateway-daemon-flow.js"));
+ });
+
+ beforeEach(() => {
+ vi.clearAllMocks();
+ service.isLoaded.mockResolvedValue(true);
+ service.readRuntime.mockResolvedValue({ status: "running" });
+ service.restart.mockResolvedValue({ outcome: "completed" });
+ inspectPortUsage.mockResolvedValue({
+ port: 18789,
+ status: "free",
+ listeners: [],
+ hints: [],
+ });
+ });
+
+ afterEach(() => {
+ if (originalPlatformDescriptor) {
+ Object.defineProperty(process, "platform", originalPlatformDescriptor);
+ }
+ });
+
+ function setPlatform(platform: NodeJS.Platform) {
+ if (!originalPlatformDescriptor) {
+ return;
+ }
+ Object.defineProperty(process, "platform", {
+ ...originalPlatformDescriptor,
+ value: platform,
+ });
+ }
+
+ function createPrompter(confirmImpl: (message: string) => boolean) {
+ return {
+ confirm: vi.fn(),
+ confirmRepair: vi.fn(),
+ confirmAggressive: vi.fn(),
+ confirmSkipInNonInteractive: vi.fn(async ({ message }: { message: string }) =>
+ confirmImpl(message),
+ ),
+ select: vi.fn(),
+ shouldRepair: false,
+ shouldForce: false,
+ };
+ }
+
+ it("skips restart verification when a running service restart is only scheduled", async () => {
+ setPlatform("linux");
+ service.restart.mockResolvedValueOnce({ outcome: "scheduled" });
+
+ await maybeRepairGatewayDaemon({
+ cfg: { gateway: {} },
+ runtime: { log: vi.fn(), error: vi.fn(), exit: vi.fn() },
+ prompter: createPrompter((message) => message === "Restart gateway service now?"),
+ options: { deep: false },
+ gatewayDetailsMessage: "details",
+ healthOk: false,
+ });
+
+ expect(service.restart).toHaveBeenCalledTimes(1);
+ expect(note).toHaveBeenCalledWith(
+ "restart scheduled, gateway will restart momentarily",
+ "Gateway",
+ );
+ expect(sleep).not.toHaveBeenCalled();
+ expect(healthCommand).not.toHaveBeenCalled();
+ });
+
+ it("skips start verification when a stopped service start is only scheduled", async () => {
+ setPlatform("linux");
+ service.readRuntime.mockResolvedValue({ status: "stopped" });
+ service.restart.mockResolvedValueOnce({ outcome: "scheduled" });
+
+ await maybeRepairGatewayDaemon({
+ cfg: { gateway: {} },
+ runtime: { log: vi.fn(), error: vi.fn(), exit: vi.fn() },
+ prompter: createPrompter((message) => message === "Start gateway service now?"),
+ options: { deep: false },
+ gatewayDetailsMessage: "details",
+ healthOk: false,
+ });
+
+ expect(service.restart).toHaveBeenCalledTimes(1);
+ expect(note).toHaveBeenCalledWith(
+ "restart scheduled, gateway will restart momentarily",
+ "Gateway",
+ );
+ expect(sleep).not.toHaveBeenCalled();
+ expect(healthCommand).not.toHaveBeenCalled();
+ });
+});
diff --git a/src/commands/doctor-gateway-daemon-flow.ts b/src/commands/doctor-gateway-daemon-flow.ts
index 4fd8df3490b..c476efa615f 100644
--- a/src/commands/doctor-gateway-daemon-flow.ts
+++ b/src/commands/doctor-gateway-daemon-flow.ts
@@ -12,7 +12,7 @@ import {
launchAgentPlistExists,
repairLaunchAgentBootstrap,
} from "../daemon/launchd.js";
-import { resolveGatewayService } from "../daemon/service.js";
+import { describeGatewayServiceRestart, resolveGatewayService } from "../daemon/service.js";
import { renderSystemdUnavailableHints } from "../daemon/systemd-hints.js";
import { isSystemdUserServiceAvailable } from "../daemon/systemd.js";
import { formatPortDiagnostics, inspectPortUsage } from "../infra/ports.js";
@@ -235,11 +235,16 @@ export async function maybeRepairGatewayDaemon(params: {
initialValue: true,
});
if (start) {
- await service.restart({
+ const restartResult = await service.restart({
env: process.env,
stdout: process.stdout,
});
- await sleep(1500);
+ const restartStatus = describeGatewayServiceRestart("Gateway", restartResult);
+ if (!restartStatus.scheduled) {
+ await sleep(1500);
+ } else {
+ note(restartStatus.message, "Gateway");
+ }
}
}
@@ -257,10 +262,15 @@ export async function maybeRepairGatewayDaemon(params: {
initialValue: true,
});
if (restart) {
- await service.restart({
+ const restartResult = await service.restart({
env: process.env,
stdout: process.stdout,
});
+ const restartStatus = describeGatewayServiceRestart("Gateway", restartResult);
+ if (restartStatus.scheduled) {
+ note(restartStatus.message, "Gateway");
+ return;
+ }
await sleep(1500);
try {
await healthCommand({ json: false, timeoutMs: 10_000 }, params.runtime);
diff --git a/src/commands/ollama-setup.test.ts b/src/commands/ollama-setup.test.ts
index 2313588f180..124254c53b2 100644
--- a/src/commands/ollama-setup.test.ts
+++ b/src/commands/ollama-setup.test.ts
@@ -30,6 +30,53 @@ function jsonResponse(body: unknown, status = 200): Response {
});
}
+function requestUrl(input: string | URL | Request): string {
+ if (typeof input === "string") {
+ return input;
+ }
+ if (input instanceof URL) {
+ return input.toString();
+ }
+ return input.url;
+}
+
+function requestBody(body: BodyInit | null | undefined): string {
+ return typeof body === "string" ? body : "{}";
+}
+
+function createOllamaFetchMock(params: {
+ tags?: string[];
+ show?: Record;
+ meResponses?: Response[];
+ pullResponse?: Response;
+ tagsError?: Error;
+}) {
+ const meResponses = [...(params.meResponses ?? [])];
+ return vi.fn(async (input: string | URL | Request, init?: RequestInit) => {
+ const url = requestUrl(input);
+ if (url.endsWith("/api/tags")) {
+ if (params.tagsError) {
+ throw params.tagsError;
+ }
+ return jsonResponse({ models: (params.tags ?? []).map((name) => ({ name })) });
+ }
+ if (url.endsWith("/api/show")) {
+ const body = JSON.parse(requestBody(init?.body)) as { name?: string };
+ const contextWindow = body.name ? params.show?.[body.name] : undefined;
+ return contextWindow
+ ? jsonResponse({ model_info: { "llama.context_length": contextWindow } })
+ : jsonResponse({});
+ }
+ if (url.endsWith("/api/me")) {
+ return meResponses.shift() ?? jsonResponse({ username: "testuser" });
+ }
+ if (url.endsWith("/api/pull")) {
+ return params.pullResponse ?? new Response('{"status":"success"}\n', { status: 200 });
+ }
+ throw new Error(`Unexpected fetch: ${url}`);
+ });
+}
+
describe("ollama setup", () => {
afterEach(() => {
vi.unstubAllGlobals();
@@ -45,9 +92,7 @@ describe("ollama setup", () => {
note: vi.fn(async () => undefined),
} as unknown as WizardPrompter;
- const fetchMock = vi
- .fn()
- .mockResolvedValueOnce(jsonResponse({ models: [{ name: "llama3:8b" }] }));
+ const fetchMock = createOllamaFetchMock({ tags: ["llama3:8b"] });
vi.stubGlobal("fetch", fetchMock);
const result = await promptAndConfigureOllama({ cfg: {}, prompter });
@@ -62,10 +107,7 @@ describe("ollama setup", () => {
note: vi.fn(async () => undefined),
} as unknown as WizardPrompter;
- const fetchMock = vi
- .fn()
- .mockResolvedValueOnce(jsonResponse({ models: [{ name: "llama3:8b" }] }))
- .mockResolvedValueOnce(jsonResponse({ username: "testuser" }));
+ const fetchMock = createOllamaFetchMock({ tags: ["llama3:8b"] });
vi.stubGlobal("fetch", fetchMock);
const result = await promptAndConfigureOllama({ cfg: {}, prompter });
@@ -80,11 +122,7 @@ describe("ollama setup", () => {
note: vi.fn(async () => undefined),
} as unknown as WizardPrompter;
- const fetchMock = vi
- .fn()
- .mockResolvedValueOnce(
- jsonResponse({ models: [{ name: "llama3:8b" }, { name: "glm-4.7-flash" }] }),
- );
+ const fetchMock = createOllamaFetchMock({ tags: ["llama3:8b", "glm-4.7-flash"] });
vi.stubGlobal("fetch", fetchMock);
const result = await promptAndConfigureOllama({ cfg: {}, prompter });
@@ -103,13 +141,13 @@ describe("ollama setup", () => {
note: vi.fn(async () => undefined),
} as unknown as WizardPrompter;
- const fetchMock = vi
- .fn()
- .mockResolvedValueOnce(jsonResponse({ models: [{ name: "llama3:8b" }] }))
- .mockResolvedValueOnce(
+ const fetchMock = createOllamaFetchMock({
+ tags: ["llama3:8b"],
+ meResponses: [
jsonResponse({ error: "not signed in", signin_url: "https://ollama.com/signin" }, 401),
- )
- .mockResolvedValueOnce(jsonResponse({ username: "testuser" }));
+ jsonResponse({ username: "testuser" }),
+ ],
+ });
vi.stubGlobal("fetch", fetchMock);
await promptAndConfigureOllama({ cfg: {}, prompter });
@@ -127,13 +165,13 @@ describe("ollama setup", () => {
note: vi.fn(async () => undefined),
} as unknown as WizardPrompter;
- const fetchMock = vi
- .fn()
- .mockResolvedValueOnce(jsonResponse({ models: [{ name: "llama3:8b" }] }))
- .mockResolvedValueOnce(
+ const fetchMock = createOllamaFetchMock({
+ tags: ["llama3:8b"],
+ meResponses: [
jsonResponse({ error: "not signed in", signin_url: "https://ollama.com/signin" }, 401),
- )
- .mockResolvedValueOnce(jsonResponse({ username: "testuser" }));
+ jsonResponse({ username: "testuser" }),
+ ],
+ });
vi.stubGlobal("fetch", fetchMock);
await promptAndConfigureOllama({ cfg: {}, prompter });
@@ -148,15 +186,16 @@ describe("ollama setup", () => {
note: vi.fn(async () => undefined),
} as unknown as WizardPrompter;
- const fetchMock = vi
- .fn()
- .mockResolvedValueOnce(jsonResponse({ models: [{ name: "llama3:8b" }] }));
+ const fetchMock = createOllamaFetchMock({ tags: ["llama3:8b"] });
vi.stubGlobal("fetch", fetchMock);
await promptAndConfigureOllama({ cfg: {}, prompter });
- expect(fetchMock).toHaveBeenCalledTimes(1);
- expect(fetchMock.mock.calls[0][0]).toContain("/api/tags");
+ expect(fetchMock).toHaveBeenCalledTimes(2);
+ expect(fetchMock.mock.calls[0]?.[0]).toContain("/api/tags");
+ expect(fetchMock.mock.calls.some((call) => requestUrl(call[0]).includes("/api/me"))).toBe(
+ false,
+ );
});
it("suggested models appear first in model list (cloud+local)", async () => {
@@ -166,14 +205,9 @@ describe("ollama setup", () => {
note: vi.fn(async () => undefined),
} as unknown as WizardPrompter;
- const fetchMock = vi
- .fn()
- .mockResolvedValueOnce(
- jsonResponse({
- models: [{ name: "llama3:8b" }, { name: "glm-4.7-flash" }, { name: "deepseek-r1:14b" }],
- }),
- )
- .mockResolvedValueOnce(jsonResponse({ username: "testuser" }));
+ const fetchMock = createOllamaFetchMock({
+ tags: ["llama3:8b", "glm-4.7-flash", "deepseek-r1:14b"],
+ });
vi.stubGlobal("fetch", fetchMock);
const result = await promptAndConfigureOllama({ cfg: {}, prompter });
@@ -189,6 +223,27 @@ describe("ollama setup", () => {
]);
});
+ it("uses /api/show context windows when building Ollama model configs", async () => {
+ const prompter = {
+ text: vi.fn().mockResolvedValueOnce("http://127.0.0.1:11434"),
+ select: vi.fn().mockResolvedValueOnce("local"),
+ note: vi.fn(async () => undefined),
+ } as unknown as WizardPrompter;
+
+ const fetchMock = createOllamaFetchMock({
+ tags: ["llama3:8b"],
+ show: { "llama3:8b": 65536 },
+ });
+ vi.stubGlobal("fetch", fetchMock);
+
+ const result = await promptAndConfigureOllama({ cfg: {}, prompter });
+ const model = result.config.models?.providers?.ollama?.models?.find(
+ (m) => m.id === "llama3:8b",
+ );
+
+ expect(model?.contextWindow).toBe(65536);
+ });
+
describe("ensureOllamaModelPulled", () => {
it("pulls model when not available locally", async () => {
const progress = { update: vi.fn(), stop: vi.fn() };
@@ -196,12 +251,10 @@ describe("ollama setup", () => {
progress: vi.fn(() => progress),
} as unknown as WizardPrompter;
- const fetchMock = vi
- .fn()
- // /api/tags — model not present
- .mockResolvedValueOnce(jsonResponse({ models: [{ name: "llama3:8b" }] }))
- // /api/pull
- .mockResolvedValueOnce(new Response('{"status":"success"}\n', { status: 200 }));
+ const fetchMock = createOllamaFetchMock({
+ tags: ["llama3:8b"],
+ pullResponse: new Response('{"status":"success"}\n', { status: 200 }),
+ });
vi.stubGlobal("fetch", fetchMock);
await ensureOllamaModelPulled({
@@ -219,9 +272,7 @@ describe("ollama setup", () => {
it("skips pull when model is already available", async () => {
const prompter = {} as unknown as WizardPrompter;
- const fetchMock = vi
- .fn()
- .mockResolvedValueOnce(jsonResponse({ models: [{ name: "glm-4.7-flash" }] }));
+ const fetchMock = createOllamaFetchMock({ tags: ["glm-4.7-flash"] });
vi.stubGlobal("fetch", fetchMock);
await ensureOllamaModelPulled({
@@ -268,10 +319,10 @@ describe("ollama setup", () => {
});
it("uses discovered model when requested non-interactive download fails", async () => {
- const fetchMock = vi
- .fn()
- .mockResolvedValueOnce(jsonResponse({ models: [{ name: "qwen2.5-coder:7b" }] }))
- .mockResolvedValueOnce(new Response('{"error":"disk full"}\n', { status: 200 }));
+ const fetchMock = createOllamaFetchMock({
+ tags: ["qwen2.5-coder:7b"],
+ pullResponse: new Response('{"error":"disk full"}\n', { status: 200 }),
+ });
vi.stubGlobal("fetch", fetchMock);
const runtime = {
@@ -306,10 +357,10 @@ describe("ollama setup", () => {
});
it("normalizes ollama/ prefix in non-interactive custom model download", async () => {
- const fetchMock = vi
- .fn()
- .mockResolvedValueOnce(jsonResponse({ models: [] }))
- .mockResolvedValueOnce(new Response('{"status":"success"}\n', { status: 200 }));
+ const fetchMock = createOllamaFetchMock({
+ tags: [],
+ pullResponse: new Response('{"status":"success"}\n', { status: 200 }),
+ });
vi.stubGlobal("fetch", fetchMock);
const runtime = {
@@ -328,14 +379,14 @@ describe("ollama setup", () => {
});
const pullRequest = fetchMock.mock.calls[1]?.[1];
- expect(JSON.parse(String(pullRequest?.body))).toEqual({ name: "llama3.2:latest" });
+ expect(JSON.parse(requestBody(pullRequest?.body))).toEqual({ name: "llama3.2:latest" });
expect(result.agents?.defaults?.model).toEqual(
expect.objectContaining({ primary: "ollama/llama3.2:latest" }),
);
});
it("accepts cloud models in non-interactive mode without pulling", async () => {
- const fetchMock = vi.fn().mockResolvedValueOnce(jsonResponse({ models: [] }));
+ const fetchMock = createOllamaFetchMock({ tags: [] });
vi.stubGlobal("fetch", fetchMock);
const runtime = {
@@ -363,7 +414,9 @@ describe("ollama setup", () => {
});
it("exits when Ollama is unreachable", async () => {
- const fetchMock = vi.fn().mockRejectedValueOnce(new Error("connect ECONNREFUSED"));
+ const fetchMock = createOllamaFetchMock({
+ tagsError: new Error("connect ECONNREFUSED"),
+ });
vi.stubGlobal("fetch", fetchMock);
const runtime = {
diff --git a/src/commands/ollama-setup.ts b/src/commands/ollama-setup.ts
index 7af3e18cff1..f6aec85dafc 100644
--- a/src/commands/ollama-setup.ts
+++ b/src/commands/ollama-setup.ts
@@ -2,8 +2,10 @@ import { upsertAuthProfileWithLock } from "../agents/auth-profiles.js";
import {
OLLAMA_DEFAULT_BASE_URL,
buildOllamaModelDefinition,
+ enrichOllamaModelsWithContext,
fetchOllamaModels,
resolveOllamaApiBase,
+ type OllamaModelWithContext,
} from "../agents/ollama-models.js";
import type { OpenClawConfig } from "../config/config.js";
import type { RuntimeEnv } from "../runtime.js";
@@ -239,14 +241,20 @@ async function pullOllamaModelNonInteractive(
return true;
}
-function buildOllamaModelsConfig(modelNames: string[]) {
- return modelNames.map((name) => buildOllamaModelDefinition(name));
+function buildOllamaModelsConfig(
+ modelNames: string[],
+ discoveredModelsByName?: Map,
+) {
+ return modelNames.map((name) =>
+ buildOllamaModelDefinition(name, discoveredModelsByName?.get(name)?.contextWindow),
+ );
}
function applyOllamaProviderConfig(
cfg: OpenClawConfig,
baseUrl: string,
modelNames: string[],
+ discoveredModelsByName?: Map,
): OpenClawConfig {
return {
...cfg,
@@ -259,7 +267,7 @@ function applyOllamaProviderConfig(
baseUrl,
api: "ollama",
apiKey: "OLLAMA_API_KEY", // pragma: allowlist secret
- models: buildOllamaModelsConfig(modelNames),
+ models: buildOllamaModelsConfig(modelNames, discoveredModelsByName),
},
},
},
@@ -299,7 +307,6 @@ export async function promptAndConfigureOllama(params: {
// 2. Check reachability
const { reachable, models } = await fetchOllamaModels(baseUrl);
- const modelNames = models.map((m) => m.name);
if (!reachable) {
await prompter.note(
@@ -314,6 +321,10 @@ export async function promptAndConfigureOllama(params: {
throw new WizardCancelledError("Ollama not reachable");
}
+ const enrichedModels = await enrichOllamaModelsWithContext(baseUrl, models.slice(0, 50));
+ const discoveredModelsByName = new Map(enrichedModels.map((model) => [model.name, model]));
+ const modelNames = models.map((m) => m.name);
+
// 3. Mode selection
const mode = (await prompter.select({
message: "Ollama mode",
@@ -387,7 +398,12 @@ export async function promptAndConfigureOllama(params: {
await storeOllamaCredential(params.agentDir);
const defaultModelId = suggestedModels[0] ?? OLLAMA_DEFAULT_MODEL;
- const config = applyOllamaProviderConfig(params.cfg, baseUrl, orderedModelNames);
+ const config = applyOllamaProviderConfig(
+ params.cfg,
+ baseUrl,
+ orderedModelNames,
+ discoveredModelsByName,
+ );
return { config, defaultModelId };
}
@@ -405,7 +421,6 @@ export async function configureOllamaNonInteractive(params: {
const baseUrl = resolveOllamaApiBase(configuredBaseUrl);
const { reachable, models } = await fetchOllamaModels(baseUrl);
- const modelNames = models.map((m) => m.name);
const explicitModel = normalizeOllamaModelName(opts.customModelId);
if (!reachable) {
@@ -421,6 +436,10 @@ export async function configureOllamaNonInteractive(params: {
await storeOllamaCredential();
+ const enrichedModels = await enrichOllamaModelsWithContext(baseUrl, models.slice(0, 50));
+ const discoveredModelsByName = new Map(enrichedModels.map((model) => [model.name, model]));
+ const modelNames = models.map((m) => m.name);
+
// Apply local suggested model ordering.
const suggestedModels = OLLAMA_SUGGESTED_MODELS_LOCAL;
const orderedModelNames = [
@@ -478,7 +497,12 @@ export async function configureOllamaNonInteractive(params: {
}
}
- const config = applyOllamaProviderConfig(params.nextConfig, baseUrl, allModelNames);
+ const config = applyOllamaProviderConfig(
+ params.nextConfig,
+ baseUrl,
+ allModelNames,
+ discoveredModelsByName,
+ );
const modelRef = `ollama/${defaultModelId}`;
runtime.log(`Default Ollama model: ${defaultModelId}`);
return applyAgentDefaultModelPrimary(config, modelRef);
diff --git a/src/commands/onboard-custom.test.ts b/src/commands/onboard-custom.test.ts
index b04f7bc08ab..bc1a1927bdc 100644
--- a/src/commands/onboard-custom.test.ts
+++ b/src/commands/onboard-custom.test.ts
@@ -1,5 +1,6 @@
import { afterEach, describe, expect, it, vi } from "vitest";
import { CONTEXT_WINDOW_HARD_MIN_TOKENS } from "../agents/context-window-guard.js";
+import { OLLAMA_DEFAULT_BASE_URL } from "../agents/ollama-models.js";
import type { OpenClawConfig } from "../config/config.js";
import { defaultRuntime } from "../runtime.js";
import {
@@ -133,6 +134,23 @@ describe("promptCustomApiConfig", () => {
expect(result.config.agents?.defaults?.models?.["custom/llama3"]?.alias).toBe("local");
});
+ it("defaults custom onboarding to the native Ollama base URL", async () => {
+ const prompter = createTestPrompter({
+ text: ["http://localhost:11434", "", "llama3", "custom", ""],
+ select: ["plaintext", "openai"],
+ });
+ stubFetchSequence([{ ok: true }]);
+
+ await runPromptCustomApi(prompter);
+
+ expect(prompter.text).toHaveBeenCalledWith(
+ expect.objectContaining({
+ message: "API Base URL",
+ initialValue: OLLAMA_DEFAULT_BASE_URL,
+ }),
+ );
+ });
+
it("retries when verification fails", async () => {
const prompter = createTestPrompter({
text: ["http://localhost:11434/v1", "", "bad-model", "good-model", "custom", ""],
diff --git a/src/commands/onboard-custom.ts b/src/commands/onboard-custom.ts
index a05922aafe0..874018a74ea 100644
--- a/src/commands/onboard-custom.ts
+++ b/src/commands/onboard-custom.ts
@@ -1,6 +1,7 @@
import { CONTEXT_WINDOW_HARD_MIN_TOKENS } from "../agents/context-window-guard.js";
import { DEFAULT_PROVIDER } from "../agents/defaults.js";
import { buildModelAliasIndex, modelKey } from "../agents/model-selection.js";
+import { OLLAMA_DEFAULT_BASE_URL } from "../agents/ollama-models.js";
import type { OpenClawConfig } from "../config/config.js";
import type { ModelProviderConfig } from "../config/types.models.js";
import { isSecretRef, type SecretInput } from "../config/types.secrets.js";
@@ -16,7 +17,6 @@ import { applyPrimaryModel } from "./model-picker.js";
import { normalizeAlias } from "./models/shared.js";
import type { SecretInputMode } from "./onboard-types.js";
-const DEFAULT_OLLAMA_BASE_URL = "http://127.0.0.1:11434/v1";
const DEFAULT_CONTEXT_WINDOW = CONTEXT_WINDOW_HARD_MIN_TOKENS;
const DEFAULT_MAX_TOKENS = 4096;
const VERIFY_TIMEOUT_MS = 30_000;
@@ -389,7 +389,7 @@ async function promptBaseUrlAndKey(params: {
}): Promise<{ baseUrl: string; apiKey?: SecretInput; resolvedApiKey: string }> {
const baseUrlInput = await params.prompter.text({
message: "API Base URL",
- initialValue: params.initialBaseUrl ?? DEFAULT_OLLAMA_BASE_URL,
+ initialValue: params.initialBaseUrl ?? OLLAMA_DEFAULT_BASE_URL,
placeholder: "https://api.example.com/v1",
validate: (val) => {
try {
diff --git a/src/commands/status.service-summary.test.ts b/src/commands/status.service-summary.test.ts
index fb51d8036e4..f1a688ea092 100644
--- a/src/commands/status.service-summary.test.ts
+++ b/src/commands/status.service-summary.test.ts
@@ -10,7 +10,7 @@ function createService(overrides: Partial): GatewayService {
install: vi.fn(async () => {}),
uninstall: vi.fn(async () => {}),
stop: vi.fn(async () => {}),
- restart: vi.fn(async () => {}),
+ restart: vi.fn(async () => ({ outcome: "completed" as const })),
isLoaded: vi.fn(async () => false),
readCommand: vi.fn(async () => null),
readRuntime: vi.fn(async () => ({ status: "stopped" as const })),
diff --git a/src/commands/status.summary.redaction.test.ts b/src/commands/status.summary.redaction.test.ts
index 02eaecbcb35..26e28887560 100644
--- a/src/commands/status.summary.redaction.test.ts
+++ b/src/commands/status.summary.redaction.test.ts
@@ -22,6 +22,7 @@ function createRecentSessionRow() {
describe("redactSensitiveStatusSummary", () => {
it("removes sensitive session and path details while preserving summary structure", () => {
const input: StatusSummary = {
+ runtimeVersion: "2026.3.8",
heartbeat: {
defaultAgentId: "main",
agents: [{ agentId: "main", enabled: true, every: "5m", everyMs: 300_000 }],
@@ -50,6 +51,7 @@ describe("redactSensitiveStatusSummary", () => {
expect(redacted.sessions.recent).toEqual([]);
expect(redacted.sessions.byAgent[0]?.path).toBe("[redacted]");
expect(redacted.sessions.byAgent[0]?.recent).toEqual([]);
+ expect(redacted.runtimeVersion).toBe("2026.3.8");
expect(redacted.heartbeat).toEqual(input.heartbeat);
expect(redacted.channelSummary).toEqual(input.channelSummary);
});
diff --git a/src/commands/status.summary.test.ts b/src/commands/status.summary.test.ts
new file mode 100644
index 00000000000..addda823a23
--- /dev/null
+++ b/src/commands/status.summary.test.ts
@@ -0,0 +1,85 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("../agents/context.js", () => ({
+ resolveContextTokensForModel: vi.fn(() => 200_000),
+}));
+
+vi.mock("../agents/defaults.js", () => ({
+ DEFAULT_CONTEXT_TOKENS: 200_000,
+ DEFAULT_MODEL: "gpt-5.2",
+ DEFAULT_PROVIDER: "openai",
+}));
+
+vi.mock("../agents/model-selection.js", () => ({
+ resolveConfiguredModelRef: vi.fn(() => ({
+ provider: "openai",
+ model: "gpt-5.2",
+ })),
+}));
+
+vi.mock("../config/config.js", () => ({
+ loadConfig: vi.fn(() => ({})),
+}));
+
+vi.mock("../config/sessions.js", () => ({
+ loadSessionStore: vi.fn(() => ({})),
+ resolveFreshSessionTotalTokens: vi.fn(() => undefined),
+ resolveMainSessionKey: vi.fn(() => "main"),
+ resolveStorePath: vi.fn(() => "/tmp/sessions.json"),
+}));
+
+vi.mock("../gateway/session-utils.js", () => ({
+ classifySessionKey: vi.fn(() => "direct"),
+ listAgentsForGateway: vi.fn(() => ({
+ defaultId: "main",
+ agents: [{ id: "main" }],
+ })),
+ resolveSessionModelRef: vi.fn(() => ({
+ provider: "openai",
+ model: "gpt-5.2",
+ })),
+}));
+
+vi.mock("../infra/channel-summary.js", () => ({
+ buildChannelSummary: vi.fn(async () => ["ok"]),
+}));
+
+vi.mock("../infra/heartbeat-runner.js", () => ({
+ resolveHeartbeatSummaryForAgent: vi.fn(() => ({
+ enabled: true,
+ every: "5m",
+ everyMs: 300_000,
+ })),
+}));
+
+vi.mock("../infra/system-events.js", () => ({
+ peekSystemEvents: vi.fn(() => []),
+}));
+
+vi.mock("../routing/session-key.js", () => ({
+ parseAgentSessionKey: vi.fn(() => null),
+}));
+
+vi.mock("../version.js", () => ({
+ resolveRuntimeServiceVersion: vi.fn(() => "2026.3.8"),
+}));
+
+vi.mock("./status.link-channel.js", () => ({
+ resolveLinkChannelContext: vi.fn(async () => undefined),
+}));
+
+describe("getStatusSummary", () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ });
+
+ it("includes runtimeVersion in the status payload", async () => {
+ const { getStatusSummary } = await import("./status.summary.js");
+
+ const summary = await getStatusSummary();
+
+ expect(summary.runtimeVersion).toBe("2026.3.8");
+ expect(summary.heartbeat.defaultAgentId).toBe("main");
+ expect(summary.channelSummary).toEqual(["ok"]);
+ });
+});
diff --git a/src/commands/status.summary.ts b/src/commands/status.summary.ts
index 3a71464973f..79a51f0d9d3 100644
--- a/src/commands/status.summary.ts
+++ b/src/commands/status.summary.ts
@@ -19,6 +19,7 @@ import { buildChannelSummary } from "../infra/channel-summary.js";
import { resolveHeartbeatSummaryForAgent } from "../infra/heartbeat-runner.js";
import { peekSystemEvents } from "../infra/system-events.js";
import { parseAgentSessionKey } from "../routing/session-key.js";
+import { resolveRuntimeServiceVersion } from "../version.js";
import { resolveLinkChannelContext } from "./status.link-channel.js";
import type { HeartbeatStatus, SessionStatus, StatusSummary } from "./status.types.js";
@@ -210,6 +211,7 @@ export async function getStatusSummary(
const totalSessions = allSessions.length;
const summary: StatusSummary = {
+ runtimeVersion: resolveRuntimeServiceVersion(process.env),
linkChannel: linkContext
? {
id: linkContext.plugin.id,
diff --git a/src/commands/status.types.ts b/src/commands/status.types.ts
index a3e0a5ca8e2..ec157b3488a 100644
--- a/src/commands/status.types.ts
+++ b/src/commands/status.types.ts
@@ -34,6 +34,7 @@ export type HeartbeatStatus = {
};
export type StatusSummary = {
+ runtimeVersion?: string | null;
linkChannel?: {
id: ChannelId;
label: string;
diff --git a/src/config/config.plugin-validation.test.ts b/src/config/config.plugin-validation.test.ts
index 99438a13e16..464a5f37ced 100644
--- a/src/config/config.plugin-validation.test.ts
+++ b/src/config/config.plugin-validation.test.ts
@@ -38,12 +38,15 @@ describe("config plugin validation", () => {
let enumPluginDir = "";
let bluebubblesPluginDir = "";
let voiceCallSchemaPluginDir = "";
- const envSnapshot = {
- OPENCLAW_STATE_DIR: process.env.OPENCLAW_STATE_DIR,
- OPENCLAW_PLUGIN_MANIFEST_CACHE_MS: process.env.OPENCLAW_PLUGIN_MANIFEST_CACHE_MS,
- };
+ const suiteEnv = () =>
+ ({
+ ...process.env,
+ OPENCLAW_STATE_DIR: path.join(suiteHome, ".openclaw"),
+ OPENCLAW_PLUGIN_MANIFEST_CACHE_MS: "10000",
+ }) satisfies NodeJS.ProcessEnv;
- const validateInSuite = (raw: unknown) => validateConfigObjectWithPlugins(raw);
+ const validateInSuite = (raw: unknown) =>
+ validateConfigObjectWithPlugins(raw, { env: suiteEnv() });
beforeAll(async () => {
fixtureRoot = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-config-plugin-validation-"));
@@ -102,8 +105,6 @@ describe("config plugin validation", () => {
id: "voice-call-schema-fixture",
schema: voiceCallManifest.configSchema,
});
- process.env.OPENCLAW_STATE_DIR = path.join(suiteHome, ".openclaw");
- process.env.OPENCLAW_PLUGIN_MANIFEST_CACHE_MS = "10000";
clearPluginManifestRegistryCache();
// Warm the plugin manifest cache once so path-based validations can reuse
// parsed manifests across test cases.
@@ -118,16 +119,6 @@ describe("config plugin validation", () => {
afterAll(async () => {
await fs.rm(fixtureRoot, { recursive: true, force: true });
clearPluginManifestRegistryCache();
- if (envSnapshot.OPENCLAW_STATE_DIR === undefined) {
- delete process.env.OPENCLAW_STATE_DIR;
- } else {
- process.env.OPENCLAW_STATE_DIR = envSnapshot.OPENCLAW_STATE_DIR;
- }
- if (envSnapshot.OPENCLAW_PLUGIN_MANIFEST_CACHE_MS === undefined) {
- delete process.env.OPENCLAW_PLUGIN_MANIFEST_CACHE_MS;
- } else {
- process.env.OPENCLAW_PLUGIN_MANIFEST_CACHE_MS = envSnapshot.OPENCLAW_PLUGIN_MANIFEST_CACHE_MS;
- }
});
it("reports missing plugin refs across load paths, entries, and allowlist surfaces", async () => {
diff --git a/src/config/io.ts b/src/config/io.ts
index 2b542bba755..fba17f253aa 100644
--- a/src/config/io.ts
+++ b/src/config/io.ts
@@ -164,6 +164,32 @@ function hashConfigRaw(raw: string | null): string {
.digest("hex");
}
+async function tightenStateDirPermissionsIfNeeded(params: {
+ configPath: string;
+ env: NodeJS.ProcessEnv;
+ homedir: () => string;
+ fsModule: typeof fs;
+}): Promise {
+ if (process.platform === "win32") {
+ return;
+ }
+ const stateDir = resolveStateDir(params.env, params.homedir);
+ const configDir = path.dirname(params.configPath);
+ if (path.resolve(configDir) !== path.resolve(stateDir)) {
+ return;
+ }
+ try {
+ const stat = await params.fsModule.promises.stat(configDir);
+ const mode = stat.mode & 0o777;
+ if ((mode & 0o077) === 0) {
+ return;
+ }
+ await params.fsModule.promises.chmod(configDir, 0o700);
+ } catch {
+ // Best-effort hardening only; callers still need the config write to proceed.
+ }
+}
+
function formatConfigValidationFailure(pathLabel: string, issueMessage: string): string {
const match = issueMessage.match(OPEN_DM_POLICY_ALLOW_FROM_RE);
const policyPath = match?.groups?.policyPath?.trim();
@@ -1136,6 +1162,12 @@ export function createConfigIO(overrides: ConfigIoDeps = {}) {
const dir = path.dirname(configPath);
await deps.fs.promises.mkdir(dir, { recursive: true, mode: 0o700 });
+ await tightenStateDirPermissionsIfNeeded({
+ configPath,
+ env: deps.env,
+ homedir: deps.homedir,
+ fsModule: deps.fs,
+ });
const outputConfigBase =
envRefMap && changedPaths
? (restoreEnvRefsFromMap(cfgToWrite, "", envRefMap, changedPaths) as OpenClawConfig)
diff --git a/src/config/io.write-config.test.ts b/src/config/io.write-config.test.ts
index 6b73b9fbd30..68709725d83 100644
--- a/src/config/io.write-config.test.ts
+++ b/src/config/io.write-config.test.ts
@@ -142,6 +142,28 @@ describe("config io write", () => {
});
});
+ it.runIf(process.platform !== "win32")(
+ "tightens world-writable state dir when writing the default config",
+ async () => {
+ await withSuiteHome(async (home) => {
+ const stateDir = path.join(home, ".openclaw");
+ await fs.mkdir(stateDir, { recursive: true, mode: 0o777 });
+ await fs.chmod(stateDir, 0o777);
+
+ const io = createConfigIO({
+ env: {} as NodeJS.ProcessEnv,
+ homedir: () => home,
+ logger: silentLogger,
+ });
+
+ await io.writeConfigFile({ gateway: { mode: "local" } });
+
+ const stat = await fs.stat(stateDir);
+ expect(stat.mode & 0o777).toBe(0o700);
+ });
+ },
+ );
+
it('shows actionable guidance for dmPolicy="open" without wildcard allowFrom', async () => {
await withSuiteHome(async (home) => {
const io = createConfigIO({
diff --git a/src/config/schema.help.quality.test.ts b/src/config/schema.help.quality.test.ts
index 730dd397831..965eed0e55d 100644
--- a/src/config/schema.help.quality.test.ts
+++ b/src/config/schema.help.quality.test.ts
@@ -72,6 +72,10 @@ const TARGET_KEYS = [
"agents.defaults.memorySearch.fallback",
"agents.defaults.memorySearch.sources",
"agents.defaults.memorySearch.extraPaths",
+ "agents.defaults.memorySearch.multimodal",
+ "agents.defaults.memorySearch.multimodal.enabled",
+ "agents.defaults.memorySearch.multimodal.modalities",
+ "agents.defaults.memorySearch.multimodal.maxFileBytes",
"agents.defaults.memorySearch.experimental.sessionMemory",
"agents.defaults.memorySearch.remote.baseUrl",
"agents.defaults.memorySearch.remote.apiKey",
diff --git a/src/config/schema.help.ts b/src/config/schema.help.ts
index bd93f711d91..3db7f40fe73 100644
--- a/src/config/schema.help.ts
+++ b/src/config/schema.help.ts
@@ -778,7 +778,15 @@ export const FIELD_HELP: Record = {
"agents.defaults.memorySearch.sources":
'Chooses which sources are indexed: "memory" reads MEMORY.md + memory files, and "sessions" includes transcript history. Keep ["memory"] unless you need recall from prior chat transcripts.',
"agents.defaults.memorySearch.extraPaths":
- "Adds extra directories or .md files to the memory index beyond default memory files. Use this when key reference docs live elsewhere in your repo; keep paths small and intentional to avoid noisy recall.",
+ "Adds extra directories or .md files to the memory index beyond default memory files. Use this when key reference docs live elsewhere in your repo; when multimodal memory is enabled, matching image/audio files under these paths are also eligible for indexing.",
+ "agents.defaults.memorySearch.multimodal":
+ 'Optional multimodal memory settings for indexing image and audio files from configured extra paths. Keep this off unless your embedding model explicitly supports cross-modal embeddings, and set `memorySearch.fallback` to "none" while it is enabled. Matching files are uploaded to the configured remote embedding provider during indexing.',
+ "agents.defaults.memorySearch.multimodal.enabled":
+ "Enables image/audio memory indexing from extraPaths. This currently requires Gemini embedding-2, keeps the default memory roots Markdown-only, disables memory-search fallback providers, and uploads matching binary content to the configured remote embedding provider.",
+ "agents.defaults.memorySearch.multimodal.modalities":
+ 'Selects which multimodal file types are indexed from extraPaths: "image", "audio", or "all". Keep this narrow to avoid indexing large binary corpora unintentionally.',
+ "agents.defaults.memorySearch.multimodal.maxFileBytes":
+ "Sets the maximum bytes allowed per multimodal file before it is skipped during memory indexing. Use this to cap upload cost and indexing latency, or raise it for short high-quality audio clips.",
"agents.defaults.memorySearch.experimental.sessionMemory":
"Indexes session transcripts into memory search so responses can reference prior chat turns. Keep this off unless transcript recall is needed, because indexing cost and storage usage both increase.",
"agents.defaults.memorySearch.provider":
diff --git a/src/config/schema.labels.ts b/src/config/schema.labels.ts
index b7477b4798a..01b8d0f57dd 100644
--- a/src/config/schema.labels.ts
+++ b/src/config/schema.labels.ts
@@ -319,6 +319,10 @@ export const FIELD_LABELS: Record = {
"agents.defaults.memorySearch.enabled": "Enable Memory Search",
"agents.defaults.memorySearch.sources": "Memory Search Sources",
"agents.defaults.memorySearch.extraPaths": "Extra Memory Paths",
+ "agents.defaults.memorySearch.multimodal": "Memory Search Multimodal",
+ "agents.defaults.memorySearch.multimodal.enabled": "Enable Memory Search Multimodal",
+ "agents.defaults.memorySearch.multimodal.modalities": "Memory Search Multimodal Modalities",
+ "agents.defaults.memorySearch.multimodal.maxFileBytes": "Memory Search Multimodal Max File Bytes",
"agents.defaults.memorySearch.experimental.sessionMemory":
"Memory Search Session Index (Experimental)",
"agents.defaults.memorySearch.provider": "Memory Search Provider",
diff --git a/src/config/types.tools.ts b/src/config/types.tools.ts
index 5de1b4cafa5..aaf6cb33e79 100644
--- a/src/config/types.tools.ts
+++ b/src/config/types.tools.ts
@@ -319,6 +319,15 @@ export type MemorySearchConfig = {
sources?: Array<"memory" | "sessions">;
/** Extra paths to include in memory search (directories or .md files). */
extraPaths?: string[];
+ /** Optional multimodal file indexing for selected extra paths. */
+ multimodal?: {
+ /** Enable image/audio embeddings from extraPaths. */
+ enabled?: boolean;
+ /** Which non-text file types to index. */
+ modalities?: Array<"image" | "audio" | "all">;
+ /** Max bytes allowed per multimodal file before it is skipped. */
+ maxFileBytes?: number;
+ };
/** Experimental memory search settings. */
experimental?: {
/** Enable session transcript indexing (experimental, default: false). */
diff --git a/src/config/validation.ts b/src/config/validation.ts
index 90d733e0818..686dbb0ed43 100644
--- a/src/config/validation.ts
+++ b/src/config/validation.ts
@@ -297,17 +297,23 @@ type ValidateConfigWithPluginsResult =
warnings: ConfigValidationIssue[];
};
-export function validateConfigObjectWithPlugins(raw: unknown): ValidateConfigWithPluginsResult {
- return validateConfigObjectWithPluginsBase(raw, { applyDefaults: true });
+export function validateConfigObjectWithPlugins(
+ raw: unknown,
+ params?: { env?: NodeJS.ProcessEnv },
+): ValidateConfigWithPluginsResult {
+ return validateConfigObjectWithPluginsBase(raw, { applyDefaults: true, env: params?.env });
}
-export function validateConfigObjectRawWithPlugins(raw: unknown): ValidateConfigWithPluginsResult {
- return validateConfigObjectWithPluginsBase(raw, { applyDefaults: false });
+export function validateConfigObjectRawWithPlugins(
+ raw: unknown,
+ params?: { env?: NodeJS.ProcessEnv },
+): ValidateConfigWithPluginsResult {
+ return validateConfigObjectWithPluginsBase(raw, { applyDefaults: false, env: params?.env });
}
function validateConfigObjectWithPluginsBase(
raw: unknown,
- opts: { applyDefaults: boolean },
+ opts: { applyDefaults: boolean; env?: NodeJS.ProcessEnv },
): ValidateConfigWithPluginsResult {
const base = opts.applyDefaults ? validateConfigObject(raw) : validateConfigObjectRaw(raw);
if (!base.ok) {
@@ -345,6 +351,7 @@ function validateConfigObjectWithPluginsBase(
const registry = loadPluginManifestRegistry({
config,
workspaceDir: workspaceDir ?? undefined,
+ env: opts.env,
});
for (const diag of registry.diagnostics) {
diff --git a/src/config/zod-schema.agent-runtime.ts b/src/config/zod-schema.agent-runtime.ts
index a240eba5d43..d5b9eeedb16 100644
--- a/src/config/zod-schema.agent-runtime.ts
+++ b/src/config/zod-schema.agent-runtime.ts
@@ -553,6 +553,16 @@ export const MemorySearchSchema = z
enabled: z.boolean().optional(),
sources: z.array(z.union([z.literal("memory"), z.literal("sessions")])).optional(),
extraPaths: z.array(z.string()).optional(),
+ multimodal: z
+ .object({
+ enabled: z.boolean().optional(),
+ modalities: z
+ .array(z.union([z.literal("image"), z.literal("audio"), z.literal("all")]))
+ .optional(),
+ maxFileBytes: z.number().int().positive().optional(),
+ })
+ .strict()
+ .optional(),
experimental: z
.object({
sessionMemory: z.boolean().optional(),
diff --git a/src/daemon/launchd-restart-handoff.test.ts b/src/daemon/launchd-restart-handoff.test.ts
new file mode 100644
index 00000000000..d685e64d851
--- /dev/null
+++ b/src/daemon/launchd-restart-handoff.test.ts
@@ -0,0 +1,43 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const spawnMock = vi.hoisted(() => vi.fn());
+const unrefMock = vi.hoisted(() => vi.fn());
+
+vi.mock("node:child_process", () => ({
+ spawn: (...args: unknown[]) => spawnMock(...args),
+}));
+
+import { scheduleDetachedLaunchdRestartHandoff } from "./launchd-restart-handoff.js";
+
+afterEach(() => {
+ spawnMock.mockReset();
+ unrefMock.mockReset();
+ spawnMock.mockReturnValue({ pid: 4242, unref: unrefMock });
+});
+
+describe("scheduleDetachedLaunchdRestartHandoff", () => {
+ it("waits for the caller pid before kickstarting launchd", () => {
+ const env = {
+ HOME: "/Users/test",
+ OPENCLAW_PROFILE: "default",
+ };
+ spawnMock.mockReturnValue({ pid: 4242, unref: unrefMock });
+
+ const result = scheduleDetachedLaunchdRestartHandoff({
+ env,
+ mode: "kickstart",
+ waitForPid: 9876,
+ });
+
+ expect(result).toEqual({ ok: true, pid: 4242 });
+ expect(spawnMock).toHaveBeenCalledTimes(1);
+ const [, args] = spawnMock.mock.calls[0] as [string, string[]];
+ expect(args[0]).toBe("-c");
+ expect(args[2]).toBe("openclaw-launchd-restart-handoff");
+ expect(args[6]).toBe("9876");
+ expect(args[1]).toContain('while kill -0 "$wait_pid" >/dev/null 2>&1; do');
+ expect(args[1]).toContain('launchctl kickstart -k "$service_target" >/dev/null 2>&1');
+ expect(args[1]).not.toContain("sleep 1");
+ expect(unrefMock).toHaveBeenCalledTimes(1);
+ });
+});
diff --git a/src/daemon/launchd-restart-handoff.ts b/src/daemon/launchd-restart-handoff.ts
new file mode 100644
index 00000000000..ff2fa9dc612
--- /dev/null
+++ b/src/daemon/launchd-restart-handoff.ts
@@ -0,0 +1,138 @@
+import { spawn } from "node:child_process";
+import os from "node:os";
+import path from "node:path";
+import { resolveGatewayLaunchAgentLabel } from "./constants.js";
+
+export type LaunchdRestartHandoffMode = "kickstart" | "start-after-exit";
+
+export type LaunchdRestartHandoffResult = {
+ ok: boolean;
+ pid?: number;
+ detail?: string;
+};
+
+export type LaunchdRestartTarget = {
+ domain: string;
+ label: string;
+ plistPath: string;
+ serviceTarget: string;
+};
+
+function resolveGuiDomain(): string {
+ if (typeof process.getuid !== "function") {
+ return "gui/501";
+ }
+ return `gui/${process.getuid()}`;
+}
+
+function resolveLaunchAgentLabel(env?: Record): string {
+ const envLabel = env?.OPENCLAW_LAUNCHD_LABEL?.trim();
+ if (envLabel) {
+ return envLabel;
+ }
+ return resolveGatewayLaunchAgentLabel(env?.OPENCLAW_PROFILE);
+}
+
+export function resolveLaunchdRestartTarget(
+ env: Record = process.env,
+): LaunchdRestartTarget {
+ const domain = resolveGuiDomain();
+ const label = resolveLaunchAgentLabel(env);
+ const home = env.HOME?.trim() || os.homedir();
+ const plistPath = path.join(home, "Library", "LaunchAgents", `${label}.plist`);
+ return {
+ domain,
+ label,
+ plistPath,
+ serviceTarget: `${domain}/${label}`,
+ };
+}
+
+export function isCurrentProcessLaunchdServiceLabel(
+ label: string,
+ env: NodeJS.ProcessEnv = process.env,
+): boolean {
+ const launchdLabel =
+ env.LAUNCH_JOB_LABEL?.trim() || env.LAUNCH_JOB_NAME?.trim() || env.XPC_SERVICE_NAME?.trim();
+ if (launchdLabel) {
+ return launchdLabel === label;
+ }
+ const configuredLabel = env.OPENCLAW_LAUNCHD_LABEL?.trim();
+ return Boolean(configuredLabel && configuredLabel === label);
+}
+
+function buildLaunchdRestartScript(mode: LaunchdRestartHandoffMode): string {
+ const waitForCallerPid = `wait_pid="$4"
+if [ -n "$wait_pid" ] && [ "$wait_pid" -gt 1 ] 2>/dev/null; then
+ while kill -0 "$wait_pid" >/dev/null 2>&1; do
+ sleep 0.1
+ done
+fi
+`;
+
+ if (mode === "kickstart") {
+ return `service_target="$1"
+domain="$2"
+plist_path="$3"
+${waitForCallerPid}
+if ! launchctl kickstart -k "$service_target" >/dev/null 2>&1; then
+ launchctl enable "$service_target" >/dev/null 2>&1
+ if launchctl bootstrap "$domain" "$plist_path" >/dev/null 2>&1; then
+ launchctl kickstart -k "$service_target" >/dev/null 2>&1 || true
+ fi
+fi
+`;
+ }
+
+ return `service_target="$1"
+domain="$2"
+plist_path="$3"
+${waitForCallerPid}
+if ! launchctl start "$service_target" >/dev/null 2>&1; then
+ launchctl enable "$service_target" >/dev/null 2>&1
+ if launchctl bootstrap "$domain" "$plist_path" >/dev/null 2>&1; then
+ launchctl start "$service_target" >/dev/null 2>&1 || launchctl kickstart -k "$service_target" >/dev/null 2>&1 || true
+ else
+ launchctl kickstart -k "$service_target" >/dev/null 2>&1 || true
+ fi
+fi
+`;
+}
+
+export function scheduleDetachedLaunchdRestartHandoff(params: {
+ env?: Record;
+ mode: LaunchdRestartHandoffMode;
+ waitForPid?: number;
+}): LaunchdRestartHandoffResult {
+ const target = resolveLaunchdRestartTarget(params.env);
+ const waitForPid =
+ typeof params.waitForPid === "number" && Number.isFinite(params.waitForPid)
+ ? Math.floor(params.waitForPid)
+ : 0;
+ try {
+ const child = spawn(
+ "/bin/sh",
+ [
+ "-c",
+ buildLaunchdRestartScript(params.mode),
+ "openclaw-launchd-restart-handoff",
+ target.serviceTarget,
+ target.domain,
+ target.plistPath,
+ String(waitForPid),
+ ],
+ {
+ detached: true,
+ stdio: "ignore",
+ env: { ...process.env, ...params.env },
+ },
+ );
+ child.unref();
+ return { ok: true, pid: child.pid ?? undefined };
+ } catch (err) {
+ return {
+ ok: false,
+ detail: err instanceof Error ? err.message : String(err),
+ };
+ }
+}
diff --git a/src/daemon/launchd.test.ts b/src/daemon/launchd.test.ts
index 99e5e1f933e..3acd239afe1 100644
--- a/src/daemon/launchd.test.ts
+++ b/src/daemon/launchd.test.ts
@@ -18,11 +18,17 @@ const state = vi.hoisted(() => ({
listOutput: "",
printOutput: "",
bootstrapError: "",
+ kickstartError: "",
+ kickstartFailuresRemaining: 0,
dirs: new Set(),
dirModes: new Map(),
files: new Map(),
fileModes: new Map(),
}));
+const launchdRestartHandoffState = vi.hoisted(() => ({
+ isCurrentProcessLaunchdServiceLabel: vi.fn<(label: string) => boolean>(() => false),
+ scheduleDetachedLaunchdRestartHandoff: vi.fn((_params: unknown) => ({ ok: true, pid: 7331 })),
+}));
const defaultProgramArguments = ["node", "-e", "process.exit(0)"];
function normalizeLaunchctlArgs(file: string, args: string[]): string[] {
@@ -49,10 +55,21 @@ vi.mock("./exec-file.js", () => ({
if (call[0] === "bootstrap" && state.bootstrapError) {
return { stdout: "", stderr: state.bootstrapError, code: 1 };
}
+ if (call[0] === "kickstart" && state.kickstartError && state.kickstartFailuresRemaining > 0) {
+ state.kickstartFailuresRemaining -= 1;
+ return { stdout: "", stderr: state.kickstartError, code: 1 };
+ }
return { stdout: "", stderr: "", code: 0 };
}),
}));
+vi.mock("./launchd-restart-handoff.js", () => ({
+ isCurrentProcessLaunchdServiceLabel: (label: string) =>
+ launchdRestartHandoffState.isCurrentProcessLaunchdServiceLabel(label),
+ scheduleDetachedLaunchdRestartHandoff: (params: unknown) =>
+ launchdRestartHandoffState.scheduleDetachedLaunchdRestartHandoff(params),
+}));
+
vi.mock("node:fs/promises", async (importOriginal) => {
const actual = await importOriginal();
const wrapped = {
@@ -109,10 +126,19 @@ beforeEach(() => {
state.listOutput = "";
state.printOutput = "";
state.bootstrapError = "";
+ state.kickstartError = "";
+ state.kickstartFailuresRemaining = 0;
state.dirs.clear();
state.dirModes.clear();
state.files.clear();
state.fileModes.clear();
+ launchdRestartHandoffState.isCurrentProcessLaunchdServiceLabel.mockReset();
+ launchdRestartHandoffState.isCurrentProcessLaunchdServiceLabel.mockReturnValue(false);
+ launchdRestartHandoffState.scheduleDetachedLaunchdRestartHandoff.mockReset();
+ launchdRestartHandoffState.scheduleDetachedLaunchdRestartHandoff.mockReturnValue({
+ ok: true,
+ pid: 7331,
+ });
vi.clearAllMocks();
});
@@ -304,9 +330,28 @@ describe("launchd install", () => {
expect(state.fileModes.get(plistPath)).toBe(0o644);
});
- it("restarts LaunchAgent with bootout-enable-bootstrap-kickstart order", async () => {
+ it("restarts LaunchAgent with kickstart and no bootout", async () => {
const env = createDefaultLaunchdEnv();
- await restartLaunchAgent({
+ const result = await restartLaunchAgent({
+ env,
+ stdout: new PassThrough(),
+ });
+
+ const domain = typeof process.getuid === "function" ? `gui/${process.getuid()}` : "gui/501";
+ const label = "ai.openclaw.gateway";
+ const serviceId = `${domain}/${label}`;
+ expect(result).toEqual({ outcome: "completed" });
+ expect(state.launchctlCalls).toContainEqual(["kickstart", "-k", serviceId]);
+ expect(state.launchctlCalls.some((call) => call[0] === "bootout")).toBe(false);
+ expect(state.launchctlCalls.some((call) => call[0] === "bootstrap")).toBe(false);
+ });
+
+ it("falls back to bootstrap when kickstart cannot find the service", async () => {
+ const env = createDefaultLaunchdEnv();
+ state.kickstartError = "Could not find service";
+ state.kickstartFailuresRemaining = 1;
+
+ const result = await restartLaunchAgent({
env,
stdout: new PassThrough(),
});
@@ -315,8 +360,8 @@ describe("launchd install", () => {
const label = "ai.openclaw.gateway";
const plistPath = resolveLaunchAgentPlistPath(env);
const serviceId = `${domain}/${label}`;
- const bootoutIndex = state.launchctlCalls.findIndex(
- (c) => c[0] === "bootout" && c[1] === serviceId,
+ const kickstartCalls = state.launchctlCalls.filter(
+ (c) => c[0] === "kickstart" && c[1] === "-k" && c[2] === serviceId,
);
const enableIndex = state.launchctlCalls.findIndex(
(c) => c[0] === "enable" && c[1] === serviceId,
@@ -324,53 +369,46 @@ describe("launchd install", () => {
const bootstrapIndex = state.launchctlCalls.findIndex(
(c) => c[0] === "bootstrap" && c[1] === domain && c[2] === plistPath,
);
- const kickstartIndex = state.launchctlCalls.findIndex(
- (c) => c[0] === "kickstart" && c[1] === "-k" && c[2] === serviceId,
- );
- expect(bootoutIndex).toBeGreaterThanOrEqual(0);
+ expect(result).toEqual({ outcome: "completed" });
+ expect(kickstartCalls).toHaveLength(2);
expect(enableIndex).toBeGreaterThanOrEqual(0);
expect(bootstrapIndex).toBeGreaterThanOrEqual(0);
- expect(kickstartIndex).toBeGreaterThanOrEqual(0);
- expect(bootoutIndex).toBeLessThan(enableIndex);
- expect(enableIndex).toBeLessThan(bootstrapIndex);
- expect(bootstrapIndex).toBeLessThan(kickstartIndex);
+ expect(state.launchctlCalls.some((call) => call[0] === "bootout")).toBe(false);
});
- it("waits for previous launchd pid to exit before bootstrapping", async () => {
+ it("surfaces the original kickstart failure when the service is still loaded", async () => {
const env = createDefaultLaunchdEnv();
- state.printOutput = ["state = running", "pid = 4242"].join("\n");
- const killSpy = vi.spyOn(process, "kill");
- killSpy
- .mockImplementationOnce(() => true)
- .mockImplementationOnce(() => {
- const err = new Error("no such process") as NodeJS.ErrnoException;
- err.code = "ESRCH";
- throw err;
- });
+ state.kickstartError = "Input/output error";
+ state.kickstartFailuresRemaining = 1;
- vi.useFakeTimers();
- try {
- const restartPromise = restartLaunchAgent({
+ await expect(
+ restartLaunchAgent({
env,
stdout: new PassThrough(),
- });
- await vi.advanceTimersByTimeAsync(250);
- await restartPromise;
- expect(killSpy).toHaveBeenCalledWith(4242, 0);
- const domain = typeof process.getuid === "function" ? `gui/${process.getuid()}` : "gui/501";
- const label = "ai.openclaw.gateway";
- const bootoutIndex = state.launchctlCalls.findIndex(
- (c) => c[0] === "bootout" && c[1] === `${domain}/${label}`,
- );
- const bootstrapIndex = state.launchctlCalls.findIndex((c) => c[0] === "bootstrap");
- expect(bootoutIndex).toBeGreaterThanOrEqual(0);
- expect(bootstrapIndex).toBeGreaterThanOrEqual(0);
- expect(bootoutIndex).toBeLessThan(bootstrapIndex);
- } finally {
- vi.useRealTimers();
- killSpy.mockRestore();
- }
+ }),
+ ).rejects.toThrow("launchctl kickstart failed: Input/output error");
+
+ expect(state.launchctlCalls.some((call) => call[0] === "enable")).toBe(false);
+ expect(state.launchctlCalls.some((call) => call[0] === "bootstrap")).toBe(false);
+ });
+
+ it("hands restart off to a detached helper when invoked from the current LaunchAgent", async () => {
+ const env = createDefaultLaunchdEnv();
+ launchdRestartHandoffState.isCurrentProcessLaunchdServiceLabel.mockReturnValue(true);
+
+ const result = await restartLaunchAgent({
+ env,
+ stdout: new PassThrough(),
+ });
+
+ expect(result).toEqual({ outcome: "scheduled" });
+ expect(launchdRestartHandoffState.scheduleDetachedLaunchdRestartHandoff).toHaveBeenCalledWith({
+ env,
+ mode: "kickstart",
+ waitForPid: process.pid,
+ });
+ expect(state.launchctlCalls).toEqual([]);
});
it("shows actionable guidance when launchctl gui domain does not support bootstrap", async () => {
diff --git a/src/daemon/launchd.ts b/src/daemon/launchd.ts
index 492eb2e4d6e..68ae1b43edd 100644
--- a/src/daemon/launchd.ts
+++ b/src/daemon/launchd.ts
@@ -12,6 +12,10 @@ import {
buildLaunchAgentPlist as buildLaunchAgentPlistImpl,
readLaunchAgentProgramArgumentsFromFile,
} from "./launchd-plist.js";
+import {
+ isCurrentProcessLaunchdServiceLabel,
+ scheduleDetachedLaunchdRestartHandoff,
+} from "./launchd-restart-handoff.js";
import { formatLine, toPosixPath, writeFormattedLines } from "./output.js";
import { resolveGatewayStateDir, resolveHomeDir } from "./paths.js";
import { parseKeyValueOutput } from "./runtime-parse.js";
@@ -23,6 +27,7 @@ import type {
GatewayServiceEnvArgs,
GatewayServiceInstallArgs,
GatewayServiceManageArgs,
+ GatewayServiceRestartResult,
} from "./service-types.js";
const LAUNCH_AGENT_DIR_MODE = 0o755;
@@ -352,34 +357,6 @@ function isUnsupportedGuiDomain(detail: string): boolean {
);
}
-const RESTART_PID_WAIT_TIMEOUT_MS = 10_000;
-const RESTART_PID_WAIT_INTERVAL_MS = 200;
-
-async function sleepMs(ms: number): Promise {
- await new Promise((resolve) => {
- setTimeout(resolve, ms);
- });
-}
-
-async function waitForPidExit(pid: number): Promise {
- if (!Number.isFinite(pid) || pid <= 1) {
- return;
- }
- const deadline = Date.now() + RESTART_PID_WAIT_TIMEOUT_MS;
- while (Date.now() < deadline) {
- try {
- process.kill(pid, 0);
- } catch (err) {
- const code = (err as NodeJS.ErrnoException).code;
- if (code === "ESRCH" || code === "EPERM") {
- return;
- }
- return;
- }
- await sleepMs(RESTART_PID_WAIT_INTERVAL_MS);
- }
-}
-
export async function stopLaunchAgent({ stdout, env }: GatewayServiceControlArgs): Promise {
const domain = resolveGuiDomain();
const label = resolveLaunchAgentLabel({ env });
@@ -471,29 +448,53 @@ export async function installLaunchAgent({
export async function restartLaunchAgent({
stdout,
env,
-}: GatewayServiceControlArgs): Promise {
+}: GatewayServiceControlArgs): Promise {
const serviceEnv = env ?? (process.env as GatewayServiceEnv);
const domain = resolveGuiDomain();
const label = resolveLaunchAgentLabel({ env: serviceEnv });
const plistPath = resolveLaunchAgentPlistPath(serviceEnv);
+ const serviceTarget = `${domain}/${label}`;
- const runtime = await execLaunchctl(["print", `${domain}/${label}`]);
- const previousPid =
- runtime.code === 0
- ? parseLaunchctlPrint(runtime.stdout || runtime.stderr || "").pid
- : undefined;
-
- const stop = await execLaunchctl(["bootout", `${domain}/${label}`]);
- if (stop.code !== 0 && !isLaunchctlNotLoaded(stop)) {
- throw new Error(`launchctl bootout failed: ${stop.stderr || stop.stdout}`.trim());
- }
- if (typeof previousPid === "number") {
- await waitForPidExit(previousPid);
+ // Restart requests issued from inside the managed gateway process tree need a
+ // detached handoff. A direct `kickstart -k` would terminate the caller before
+ // it can finish the restart command.
+ if (isCurrentProcessLaunchdServiceLabel(label)) {
+ const handoff = scheduleDetachedLaunchdRestartHandoff({
+ env: serviceEnv,
+ mode: "kickstart",
+ waitForPid: process.pid,
+ });
+ if (!handoff.ok) {
+ throw new Error(`launchd restart handoff failed: ${handoff.detail ?? "unknown error"}`);
+ }
+ try {
+ stdout.write(`${formatLine("Scheduled LaunchAgent restart", serviceTarget)}\n`);
+ } catch (err: unknown) {
+ if ((err as NodeJS.ErrnoException)?.code !== "EPIPE") {
+ throw err;
+ }
+ }
+ return { outcome: "scheduled" };
}
- // launchd can persist "disabled" state after bootout; clear it before bootstrap
- // (matches the same guard in installLaunchAgent).
- await execLaunchctl(["enable", `${domain}/${label}`]);
+ const start = await execLaunchctl(["kickstart", "-k", serviceTarget]);
+ if (start.code === 0) {
+ try {
+ stdout.write(`${formatLine("Restarted LaunchAgent", serviceTarget)}\n`);
+ } catch (err: unknown) {
+ if ((err as NodeJS.ErrnoException)?.code !== "EPIPE") {
+ throw err;
+ }
+ }
+ return { outcome: "completed" };
+ }
+
+ if (!isLaunchctlNotLoaded(start)) {
+ throw new Error(`launchctl kickstart failed: ${start.stderr || start.stdout}`.trim());
+ }
+
+ // If the service was previously booted out, re-register the plist and retry.
+ await execLaunchctl(["enable", serviceTarget]);
const boot = await execLaunchctl(["bootstrap", domain, plistPath]);
if (boot.code !== 0) {
const detail = (boot.stderr || boot.stdout).trim();
@@ -511,15 +512,16 @@ export async function restartLaunchAgent({
throw new Error(`launchctl bootstrap failed: ${detail}`);
}
- const start = await execLaunchctl(["kickstart", "-k", `${domain}/${label}`]);
- if (start.code !== 0) {
- throw new Error(`launchctl kickstart failed: ${start.stderr || start.stdout}`.trim());
+ const retry = await execLaunchctl(["kickstart", "-k", serviceTarget]);
+ if (retry.code !== 0) {
+ throw new Error(`launchctl kickstart failed: ${retry.stderr || retry.stdout}`.trim());
}
try {
- stdout.write(`${formatLine("Restarted LaunchAgent", `${domain}/${label}`)}\n`);
+ stdout.write(`${formatLine("Restarted LaunchAgent", serviceTarget)}\n`);
} catch (err: unknown) {
if ((err as NodeJS.ErrnoException)?.code !== "EPIPE") {
throw err;
}
}
+ return { outcome: "completed" };
}
diff --git a/src/daemon/schtasks.ts b/src/daemon/schtasks.ts
index af09d2ca564..ddca704f6a4 100644
--- a/src/daemon/schtasks.ts
+++ b/src/daemon/schtasks.ts
@@ -16,6 +16,7 @@ import type {
GatewayServiceInstallArgs,
GatewayServiceManageArgs,
GatewayServiceRenderArgs,
+ GatewayServiceRestartResult,
} from "./service-types.js";
function resolveTaskName(env: GatewayServiceEnv): string {
@@ -316,7 +317,7 @@ export async function stopScheduledTask({ stdout, env }: GatewayServiceControlAr
export async function restartScheduledTask({
stdout,
env,
-}: GatewayServiceControlArgs): Promise {
+}: GatewayServiceControlArgs): Promise {
await assertSchtasksAvailable();
const taskName = resolveTaskName(env ?? (process.env as GatewayServiceEnv));
await execSchtasks(["/End", "/TN", taskName]);
@@ -325,6 +326,7 @@ export async function restartScheduledTask({
throw new Error(`schtasks run failed: ${res.stderr || res.stdout}`.trim());
}
stdout.write(`${formatLine("Restarted Scheduled Task", taskName)}\n`);
+ return { outcome: "completed" };
}
export async function isScheduledTaskInstalled(args: GatewayServiceEnvArgs): Promise {
diff --git a/src/daemon/service-types.ts b/src/daemon/service-types.ts
index ae7d8d1a28f..202930bd6ce 100644
--- a/src/daemon/service-types.ts
+++ b/src/daemon/service-types.ts
@@ -19,6 +19,8 @@ export type GatewayServiceControlArgs = {
env?: GatewayServiceEnv;
};
+export type GatewayServiceRestartResult = { outcome: "completed" } | { outcome: "scheduled" };
+
export type GatewayServiceEnvArgs = {
env?: GatewayServiceEnv;
};
diff --git a/src/daemon/service.test.ts b/src/daemon/service.test.ts
index 19811e49699..ea2c53e8e1a 100644
--- a/src/daemon/service.test.ts
+++ b/src/daemon/service.test.ts
@@ -1,5 +1,5 @@
import { afterEach, describe, expect, it } from "vitest";
-import { resolveGatewayService } from "./service.js";
+import { describeGatewayServiceRestart, resolveGatewayService } from "./service.js";
const originalPlatformDescriptor = Object.getOwnPropertyDescriptor(process, "platform");
@@ -37,4 +37,13 @@ describe("resolveGatewayService", () => {
setPlatform("aix");
expect(() => resolveGatewayService()).toThrow("Gateway service install not supported on aix");
});
+
+ it("describes scheduled restart handoffs consistently", () => {
+ expect(describeGatewayServiceRestart("Gateway", { outcome: "scheduled" })).toEqual({
+ scheduled: true,
+ daemonActionResult: "scheduled",
+ message: "restart scheduled, gateway will restart momentarily",
+ progressMessage: "Gateway service restart scheduled.",
+ });
+ });
});
diff --git a/src/daemon/service.ts b/src/daemon/service.ts
index 9685ed1ece5..8083ce4b5e1 100644
--- a/src/daemon/service.ts
+++ b/src/daemon/service.ts
@@ -24,6 +24,7 @@ import type {
GatewayServiceEnvArgs,
GatewayServiceInstallArgs,
GatewayServiceManageArgs,
+ GatewayServiceRestartResult,
} from "./service-types.js";
import {
installSystemdService,
@@ -41,6 +42,7 @@ export type {
GatewayServiceEnvArgs,
GatewayServiceInstallArgs,
GatewayServiceManageArgs,
+ GatewayServiceRestartResult,
} from "./service-types.js";
function ignoreInstallResult(
@@ -58,12 +60,37 @@ export type GatewayService = {
install: (args: GatewayServiceInstallArgs) => Promise;
uninstall: (args: GatewayServiceManageArgs) => Promise;
stop: (args: GatewayServiceControlArgs) => Promise;
- restart: (args: GatewayServiceControlArgs) => Promise;
+ restart: (args: GatewayServiceControlArgs) => Promise;
isLoaded: (args: GatewayServiceEnvArgs) => Promise;
readCommand: (env: GatewayServiceEnv) => Promise;
readRuntime: (env: GatewayServiceEnv) => Promise;
};
+export function describeGatewayServiceRestart(
+ serviceNoun: string,
+ result: GatewayServiceRestartResult,
+): {
+ scheduled: boolean;
+ daemonActionResult: "restarted" | "scheduled";
+ message: string;
+ progressMessage: string;
+} {
+ if (result.outcome === "scheduled") {
+ return {
+ scheduled: true,
+ daemonActionResult: "scheduled",
+ message: `restart scheduled, ${serviceNoun.toLowerCase()} will restart momentarily`,
+ progressMessage: `${serviceNoun} service restart scheduled.`,
+ };
+ }
+ return {
+ scheduled: false,
+ daemonActionResult: "restarted",
+ message: `${serviceNoun} service restarted.`,
+ progressMessage: `${serviceNoun} service restarted.`,
+ };
+}
+
type SupportedGatewayServicePlatform = "darwin" | "linux" | "win32";
const GATEWAY_SERVICE_REGISTRY: Record = {
diff --git a/src/daemon/systemd.ts b/src/daemon/systemd.ts
index bce7593e24e..62ab2dfa146 100644
--- a/src/daemon/systemd.ts
+++ b/src/daemon/systemd.ts
@@ -20,6 +20,7 @@ import type {
GatewayServiceEnvArgs,
GatewayServiceInstallArgs,
GatewayServiceManageArgs,
+ GatewayServiceRestartResult,
} from "./service-types.js";
import {
enableSystemdUserLinger,
@@ -570,13 +571,14 @@ export async function stopSystemdService({
export async function restartSystemdService({
stdout,
env,
-}: GatewayServiceControlArgs): Promise {
+}: GatewayServiceControlArgs): Promise {
await runSystemdServiceAction({
stdout,
env,
action: "restart",
label: "Restarted systemd service",
});
+ return { outcome: "completed" };
}
export async function isSystemdServiceEnabled(args: GatewayServiceEnvArgs): Promise {
diff --git a/src/discord/monitor.test.ts b/src/discord/monitor.test.ts
index 10c7dc66747..9471a3fe6bc 100644
--- a/src/discord/monitor.test.ts
+++ b/src/discord/monitor.test.ts
@@ -38,6 +38,7 @@ const makeEntries = (
requireMention: value.requireMention,
reactionNotifications: value.reactionNotifications,
users: value.users,
+ roles: value.roles,
channels: value.channels,
};
}
@@ -730,6 +731,17 @@ describe("discord reaction notification gating", () => {
},
expected: true,
},
+ {
+ name: "all mode blocks non-allowlisted guild member",
+ input: {
+ mode: "all" as const,
+ botId: "bot-1",
+ messageAuthorId: "user-1",
+ userId: "user-2",
+ guildInfo: { users: ["trusted-user"] },
+ },
+ expected: false,
+ },
{
name: "own mode with bot-authored message",
input: {
@@ -750,6 +762,17 @@ describe("discord reaction notification gating", () => {
},
expected: false,
},
+ {
+ name: "own mode still blocks member outside users allowlist",
+ input: {
+ mode: "own" as const,
+ botId: "bot-1",
+ messageAuthorId: "bot-1",
+ userId: "user-3",
+ guildInfo: { users: ["trusted-user"] },
+ },
+ expected: false,
+ },
{
name: "allowlist mode without match",
input: {
@@ -769,7 +792,7 @@ describe("discord reaction notification gating", () => {
messageAuthorId: "user-1",
userId: "123",
userName: "steipete",
- allowlist: ["123", "other"] as string[],
+ guildInfo: { users: ["123", "other"] },
},
expected: true,
},
@@ -781,7 +804,7 @@ describe("discord reaction notification gating", () => {
messageAuthorId: "user-1",
userId: "999",
userName: "trusted-user",
- allowlist: ["trusted-user"] as string[],
+ guildInfo: { users: ["trusted-user"] },
},
expected: false,
},
@@ -793,21 +816,29 @@ describe("discord reaction notification gating", () => {
messageAuthorId: "user-1",
userId: "999",
userName: "trusted-user",
- allowlist: ["trusted-user"] as string[],
+ guildInfo: { users: ["trusted-user"] },
allowNameMatching: true,
},
expected: true,
},
+ {
+ name: "allowlist mode matches allowed role",
+ input: {
+ mode: "allowlist" as const,
+ botId: "bot-1",
+ messageAuthorId: "user-1",
+ userId: "999",
+ guildInfo: { roles: ["role:trusted-role"] },
+ memberRoleIds: ["trusted-role"],
+ },
+ expected: true,
+ },
]);
for (const testCase of cases) {
expect(
shouldEmitDiscordReactionNotification({
...testCase.input,
- allowlist:
- "allowlist" in testCase.input && testCase.input.allowlist
- ? [...testCase.input.allowlist]
- : undefined,
}),
testCase.name,
).toBe(testCase.expected);
@@ -863,6 +894,7 @@ function makeReactionEvent(overrides?: {
messageAuthorId?: string;
messageFetch?: ReturnType;
guild?: { name?: string; id?: string };
+ memberRoleIds?: string[];
}) {
const userId = overrides?.userId ?? "user-1";
const messageId = overrides?.messageId ?? "msg-1";
@@ -882,6 +914,7 @@ function makeReactionEvent(overrides?: {
message_id: messageId,
emoji: { name: overrides?.emojiName ?? "👍", id: null },
guild: overrides?.guild,
+ rawMember: overrides?.memberRoleIds ? { roles: overrides.memberRoleIds } : undefined,
user: {
id: userId,
bot: false,
@@ -1059,7 +1092,31 @@ describe("discord DM reaction handling", () => {
expect(enqueueSystemEventSpy).not.toHaveBeenCalled();
});
- it("still processes guild reactions (no regression)", async () => {
+ it("blocks guild reactions for sender outside users allowlist", async () => {
+ const data = makeReactionEvent({
+ guildId: "guild-123",
+ userId: "attacker-user",
+ botAsAuthor: true,
+ guild: { id: "guild-123", name: "Test Guild" },
+ });
+ const client = makeReactionClient({ channelType: ChannelType.GuildText });
+ const listener = new DiscordReactionListener(
+ makeReactionListenerParams({
+ guildEntries: makeEntries({
+ "guild-123": {
+ users: ["user:trusted-user"],
+ },
+ }),
+ }),
+ );
+
+ await listener.handle(data, client);
+
+ expect(enqueueSystemEventSpy).not.toHaveBeenCalled();
+ expect(resolveAgentRouteMock).not.toHaveBeenCalled();
+ });
+
+ it("allows guild reactions for sender in channel role allowlist override", async () => {
resolveAgentRouteMock.mockReturnValueOnce({
agentId: "default",
channel: "discord",
@@ -1069,11 +1126,27 @@ describe("discord DM reaction handling", () => {
const data = makeReactionEvent({
guildId: "guild-123",
+ userId: "member-user",
botAsAuthor: true,
- guild: { name: "Test Guild" },
+ guild: { id: "guild-123", name: "Test Guild" },
+ memberRoleIds: ["trusted-role"],
});
const client = makeReactionClient({ channelType: ChannelType.GuildText });
- const listener = new DiscordReactionListener(makeReactionListenerParams());
+ const listener = new DiscordReactionListener(
+ makeReactionListenerParams({
+ guildEntries: makeEntries({
+ "guild-123": {
+ roles: ["role:blocked-role"],
+ channels: {
+ "channel-1": {
+ allow: true,
+ roles: ["role:trusted-role"],
+ },
+ },
+ },
+ }),
+ }),
+ );
await listener.handle(data, client);
diff --git a/src/discord/monitor/allow-list.ts b/src/discord/monitor/allow-list.ts
index b736928e276..7c1250cb8ef 100644
--- a/src/discord/monitor/allow-list.ts
+++ b/src/discord/monitor/allow-list.ts
@@ -556,6 +556,9 @@ export function shouldEmitDiscordReactionNotification(params: {
userId: string;
userName?: string;
userTag?: string;
+ channelConfig?: DiscordChannelConfigResolved | null;
+ guildInfo?: DiscordGuildEntryResolved | null;
+ memberRoleIds?: string[];
allowlist?: string[];
allowNameMatching?: boolean;
}) {
@@ -563,26 +566,31 @@ export function shouldEmitDiscordReactionNotification(params: {
if (mode === "off") {
return false;
}
+ const accessGuildInfo =
+ params.guildInfo ??
+ (params.allowlist ? ({ users: params.allowlist } satisfies DiscordGuildEntryResolved) : null);
+ const { hasAccessRestrictions, memberAllowed } = resolveDiscordMemberAccessState({
+ channelConfig: params.channelConfig,
+ guildInfo: accessGuildInfo,
+ memberRoleIds: params.memberRoleIds ?? [],
+ sender: {
+ id: params.userId,
+ name: params.userName,
+ tag: params.userTag,
+ },
+ allowNameMatching: params.allowNameMatching,
+ });
+ if (mode === "allowlist") {
+ return hasAccessRestrictions && memberAllowed;
+ }
+ if (hasAccessRestrictions && !memberAllowed) {
+ return false;
+ }
if (mode === "all") {
return true;
}
if (mode === "own") {
return Boolean(params.botId && params.messageAuthorId === params.botId);
}
- if (mode === "allowlist") {
- const list = normalizeDiscordAllowList(params.allowlist, ["discord:", "user:", "pk:"]);
- if (!list) {
- return false;
- }
- return allowListMatches(
- list,
- {
- id: params.userId,
- name: params.userName,
- tag: params.userTag,
- },
- { allowNameMatching: params.allowNameMatching },
- );
- }
return false;
}
diff --git a/src/discord/monitor/listeners.ts b/src/discord/monitor/listeners.ts
index 056a1ad7116..824cb5fb19a 100644
--- a/src/discord/monitor/listeners.ts
+++ b/src/discord/monitor/listeners.ts
@@ -24,6 +24,7 @@ import {
normalizeDiscordSlug,
resolveDiscordAllowListMatch,
resolveDiscordChannelConfigWithFallback,
+ resolveDiscordMemberAccessState,
resolveGroupDmAllow,
resolveDiscordGuildEntry,
shouldEmitDiscordReactionNotification,
@@ -294,6 +295,7 @@ async function runDiscordReactionHandler(params: {
type DiscordReactionIngressAuthorizationParams = {
accountId: string;
user: User;
+ memberRoleIds: string[];
isDirectMessage: boolean;
isGroupDm: boolean;
isGuildMessage: boolean;
@@ -308,7 +310,7 @@ type DiscordReactionIngressAuthorizationParams = {
groupPolicy: "open" | "allowlist" | "disabled";
allowNameMatching: boolean;
guildInfo: import("./allow-list.js").DiscordGuildEntryResolved | null;
- channelConfig?: { allowed?: boolean } | null;
+ channelConfig?: import("./allow-list.js").DiscordChannelConfigResolved | null;
};
async function authorizeDiscordReactionIngress(
@@ -383,6 +385,20 @@ async function authorizeDiscordReactionIngress(
if (params.channelConfig?.allowed === false) {
return { allowed: false, reason: "guild-channel-denied" };
}
+ const { hasAccessRestrictions, memberAllowed } = resolveDiscordMemberAccessState({
+ channelConfig: params.channelConfig,
+ guildInfo: params.guildInfo,
+ memberRoleIds: params.memberRoleIds,
+ sender: {
+ id: params.user.id,
+ name: params.user.username,
+ tag: formatDiscordUserTag(params.user),
+ },
+ allowNameMatching: params.allowNameMatching,
+ });
+ if (hasAccessRestrictions && !memberAllowed) {
+ return { allowed: false, reason: "guild-member-denied" };
+ }
return { allowed: true };
}
@@ -434,9 +450,13 @@ async function handleDiscordReactionEvent(
channelType === ChannelType.PublicThread ||
channelType === ChannelType.PrivateThread ||
channelType === ChannelType.AnnouncementThread;
+ const memberRoleIds = Array.isArray(data.rawMember?.roles)
+ ? data.rawMember.roles.map((roleId: string) => String(roleId))
+ : [];
const reactionIngressBase: Omit = {
accountId: params.accountId,
user,
+ memberRoleIds,
isDirectMessage,
isGroupDm,
isGuildMessage,
@@ -452,17 +472,18 @@ async function handleDiscordReactionEvent(
allowNameMatching: params.allowNameMatching,
guildInfo,
};
- const ingressAccess = await authorizeDiscordReactionIngress(reactionIngressBase);
- if (!ingressAccess.allowed) {
- logVerbose(`discord reaction blocked sender=${user.id} (reason=${ingressAccess.reason})`);
- return;
+ // Guild reactions need resolved channel/thread config before member access
+ // can mirror the normal message preflight path.
+ if (!isGuildMessage) {
+ const ingressAccess = await authorizeDiscordReactionIngress(reactionIngressBase);
+ if (!ingressAccess.allowed) {
+ logVerbose(`discord reaction blocked sender=${user.id} (reason=${ingressAccess.reason})`);
+ return;
+ }
}
let parentId = "parentId" in channel ? (channel.parentId ?? undefined) : undefined;
let parentName: string | undefined;
let parentSlug = "";
- const memberRoleIds = Array.isArray(data.rawMember?.roles)
- ? data.rawMember.roles.map((roleId: string) => String(roleId))
- : [];
let reactionBase: { baseText: string; contextKey: string } | null = null;
const resolveReactionBase = () => {
if (reactionBase) {
@@ -507,6 +528,7 @@ async function handleDiscordReactionEvent(
const shouldNotifyReaction = (options: {
mode: "off" | "own" | "all" | "allowlist";
messageAuthorId?: string;
+ channelConfig?: ReturnType;
}) =>
shouldEmitDiscordReactionNotification({
mode: options.mode,
@@ -515,7 +537,9 @@ async function handleDiscordReactionEvent(
userId: user.id,
userName: user.username,
userTag: formatDiscordUserTag(user),
- allowlist: guildInfo?.users,
+ channelConfig: options.channelConfig,
+ guildInfo,
+ memberRoleIds,
allowNameMatching: params.allowNameMatching,
});
const emitReactionWithAuthor = (message: { author?: User } | null) => {
@@ -550,10 +574,12 @@ async function handleDiscordReactionEvent(
...reactionIngressBase,
channelConfig,
});
- const authorizeThreadChannelAccess = async (channelInfo: { parentId?: string } | null) => {
+ const resolveThreadChannelAccess = async (channelInfo: { parentId?: string } | null) => {
parentId = channelInfo?.parentId;
await loadThreadParentInfo();
- return await authorizeReactionIngressForChannel(resolveThreadChannelConfig());
+ const channelConfig = resolveThreadChannelConfig();
+ const access = await authorizeReactionIngressForChannel(channelConfig);
+ return { access, channelConfig };
};
// Parallelize async operations for thread channels
@@ -572,16 +598,18 @@ async function handleDiscordReactionEvent(
// Fast path: for "all" and "allowlist" modes, we don't need to fetch the message
if (reactionMode === "all" || reactionMode === "allowlist") {
const channelInfo = await channelInfoPromise;
- const threadAccess = await authorizeThreadChannelAccess(channelInfo);
+ const { access: threadAccess, channelConfig: threadChannelConfig } =
+ await resolveThreadChannelAccess(channelInfo);
if (!threadAccess.allowed) {
return;
}
-
- // For allowlist mode, check if user is in allowlist first
- if (reactionMode === "allowlist") {
- if (!shouldNotifyReaction({ mode: reactionMode })) {
- return;
- }
+ if (
+ !shouldNotifyReaction({
+ mode: reactionMode,
+ channelConfig: threadChannelConfig,
+ })
+ ) {
+ return;
}
const { baseText } = resolveReactionBase();
@@ -593,13 +621,20 @@ async function handleDiscordReactionEvent(
const messagePromise = data.message.fetch().catch(() => null);
const [channelInfo, message] = await Promise.all([channelInfoPromise, messagePromise]);
- const threadAccess = await authorizeThreadChannelAccess(channelInfo);
+ const { access: threadAccess, channelConfig: threadChannelConfig } =
+ await resolveThreadChannelAccess(channelInfo);
if (!threadAccess.allowed) {
return;
}
const messageAuthorId = message?.author?.id ?? undefined;
- if (!shouldNotifyReaction({ mode: reactionMode, messageAuthorId })) {
+ if (
+ !shouldNotifyReaction({
+ mode: reactionMode,
+ messageAuthorId,
+ channelConfig: threadChannelConfig,
+ })
+ ) {
return;
}
@@ -634,11 +669,8 @@ async function handleDiscordReactionEvent(
// Fast path: for "all" and "allowlist" modes, we don't need to fetch the message
if (reactionMode === "all" || reactionMode === "allowlist") {
- // For allowlist mode, check if user is in allowlist first
- if (reactionMode === "allowlist") {
- if (!shouldNotifyReaction({ mode: reactionMode })) {
- return;
- }
+ if (!shouldNotifyReaction({ mode: reactionMode, channelConfig })) {
+ return;
}
const { baseText } = resolveReactionBase();
@@ -649,7 +681,7 @@ async function handleDiscordReactionEvent(
// For "own" mode, we need to fetch the message to check the author
const message = await data.message.fetch().catch(() => null);
const messageAuthorId = message?.author?.id ?? undefined;
- if (!shouldNotifyReaction({ mode: reactionMode, messageAuthorId })) {
+ if (!shouldNotifyReaction({ mode: reactionMode, messageAuthorId, channelConfig })) {
return;
}
diff --git a/src/gateway/server-methods/config.ts b/src/gateway/server-methods/config.ts
index 9b57a126e5f..1d3d1c85977 100644
--- a/src/gateway/server-methods/config.ts
+++ b/src/gateway/server-methods/config.ts
@@ -10,6 +10,7 @@ import {
validateConfigObjectWithPlugins,
writeConfigFile,
} from "../../config/config.js";
+import { formatConfigIssueLines } from "../../config/issue-format.js";
import { applyLegacyMigrations } from "../../config/legacy.js";
import { applyMergePatch } from "../../config/merge-patch.js";
import {
@@ -23,7 +24,7 @@ import {
type ConfigSchemaResponse,
} from "../../config/schema.js";
import { extractDeliveryInfo } from "../../config/sessions.js";
-import type { OpenClawConfig } from "../../config/types.openclaw.js";
+import type { ConfigValidationIssue, OpenClawConfig } from "../../config/types.openclaw.js";
import {
formatDoctorNonInteractiveHint,
type RestartSentinelPayload,
@@ -54,6 +55,8 @@ import { parseRestartRequestParams } from "./restart-request.js";
import type { GatewayRequestHandlers, RespondFn } from "./types.js";
import { assertValidParams } from "./validation.js";
+const MAX_CONFIG_ISSUES_IN_ERROR_MESSAGE = 3;
+
function requireConfigBaseHash(
params: unknown,
snapshot: Awaited>,
@@ -158,7 +161,7 @@ function parseValidateConfigFromRawOrRespond(
respond(
false,
undefined,
- errorShape(ErrorCodes.INVALID_REQUEST, "invalid config", {
+ errorShape(ErrorCodes.INVALID_REQUEST, summarizeConfigValidationIssues(validated.issues), {
details: { issues: validated.issues },
}),
);
@@ -167,6 +170,20 @@ function parseValidateConfigFromRawOrRespond(
return { config: validated.config, schema };
}
+function summarizeConfigValidationIssues(issues: ReadonlyArray): string {
+ const trimmed = issues.slice(0, MAX_CONFIG_ISSUES_IN_ERROR_MESSAGE);
+ const lines = formatConfigIssueLines(trimmed, "", { normalizeRoot: true })
+ .map((line) => line.trim())
+ .filter(Boolean);
+ if (lines.length === 0) {
+ return "invalid config";
+ }
+ const hiddenCount = Math.max(0, issues.length - lines.length);
+ return `invalid config: ${lines.join("; ")}${
+ hiddenCount > 0 ? ` (+${hiddenCount} more issue${hiddenCount === 1 ? "" : "s"})` : ""
+ }`;
+}
+
function resolveConfigRestartRequest(params: unknown): {
sessionKey: string | undefined;
note: string | undefined;
@@ -398,7 +415,7 @@ export const configHandlers: GatewayRequestHandlers = {
respond(
false,
undefined,
- errorShape(ErrorCodes.INVALID_REQUEST, "invalid config", {
+ errorShape(ErrorCodes.INVALID_REQUEST, summarizeConfigValidationIssues(validated.issues), {
details: { issues: validated.issues },
}),
);
diff --git a/src/gateway/server.auth.browser-hardening.test.ts b/src/gateway/server.auth.browser-hardening.test.ts
index e9550a8b1aa..c4060716bd4 100644
--- a/src/gateway/server.auth.browser-hardening.test.ts
+++ b/src/gateway/server.auth.browser-hardening.test.ts
@@ -12,6 +12,7 @@ import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-cha
import { buildDeviceAuthPayload } from "./device-auth.js";
import {
connectReq,
+ connectOk,
installGatewayTestHooks,
readConnectChallengeNonce,
testState,
@@ -27,6 +28,7 @@ const TEST_OPERATOR_CLIENT = {
platform: "test",
mode: GATEWAY_CLIENT_MODES.TEST,
};
+const ALLOWED_BROWSER_ORIGIN = "https://control.example.com";
const originForPort = (port: number) => `http://127.0.0.1:${port}`;
@@ -73,6 +75,127 @@ async function createSignedDevice(params: {
}
describe("gateway auth browser hardening", () => {
+ test("rejects trusted-proxy browser connects from origins outside the allowlist", async () => {
+ const { writeConfigFile } = await import("../config/config.js");
+ await writeConfigFile({
+ gateway: {
+ auth: {
+ mode: "trusted-proxy",
+ trustedProxy: {
+ userHeader: "x-forwarded-user",
+ requiredHeaders: ["x-forwarded-proto"],
+ },
+ },
+ trustedProxies: ["127.0.0.1"],
+ controlUi: {
+ allowedOrigins: [ALLOWED_BROWSER_ORIGIN],
+ },
+ },
+ });
+
+ await withGatewayServer(async ({ port }) => {
+ const ws = await openWs(port, {
+ origin: "https://evil.example",
+ "x-forwarded-for": "203.0.113.50",
+ "x-forwarded-proto": "https",
+ "x-forwarded-user": "operator@example.com",
+ });
+ try {
+ const res = await connectReq(ws, {
+ client: TEST_OPERATOR_CLIENT,
+ device: null,
+ });
+ expect(res.ok).toBe(false);
+ expect(res.error?.message ?? "").toContain("origin not allowed");
+ } finally {
+ ws.close();
+ }
+ });
+ });
+
+ test("accepts trusted-proxy browser connects from allowed origins", async () => {
+ const { writeConfigFile } = await import("../config/config.js");
+ await writeConfigFile({
+ gateway: {
+ auth: {
+ mode: "trusted-proxy",
+ trustedProxy: {
+ userHeader: "x-forwarded-user",
+ requiredHeaders: ["x-forwarded-proto"],
+ },
+ },
+ trustedProxies: ["127.0.0.1"],
+ controlUi: {
+ allowedOrigins: [ALLOWED_BROWSER_ORIGIN],
+ },
+ },
+ });
+
+ await withGatewayServer(async ({ port }) => {
+ const ws = await openWs(port, {
+ origin: ALLOWED_BROWSER_ORIGIN,
+ "x-forwarded-for": "203.0.113.50",
+ "x-forwarded-proto": "https",
+ "x-forwarded-user": "operator@example.com",
+ });
+ try {
+ const payload = await connectOk(ws, {
+ client: TEST_OPERATOR_CLIENT,
+ device: null,
+ });
+ expect(payload.type).toBe("hello-ok");
+ } finally {
+ ws.close();
+ }
+ });
+ });
+
+ test.each([
+ {
+ name: "rejects disallowed origins",
+ origin: "https://evil.example",
+ ok: false,
+ expectedMessage: "origin not allowed",
+ },
+ {
+ name: "accepts allowed origins",
+ origin: ALLOWED_BROWSER_ORIGIN,
+ ok: true,
+ },
+ ])(
+ "keeps non-proxy browser-origin behavior unchanged: $name",
+ async ({ origin, ok, expectedMessage }) => {
+ const { writeConfigFile } = await import("../config/config.js");
+ testState.gatewayAuth = { mode: "token", token: "secret" };
+ await writeConfigFile({
+ gateway: {
+ controlUi: {
+ allowedOrigins: [ALLOWED_BROWSER_ORIGIN],
+ },
+ },
+ });
+
+ await withGatewayServer(async ({ port }) => {
+ const ws = await openWs(port, { origin });
+ try {
+ const res = await connectReq(ws, {
+ token: "secret",
+ client: TEST_OPERATOR_CLIENT,
+ device: null,
+ });
+ expect(res.ok).toBe(ok);
+ if (ok) {
+ expect((res.payload as { type?: string } | undefined)?.type).toBe("hello-ok");
+ } else {
+ expect(res.error?.message ?? "").toContain(expectedMessage ?? "");
+ }
+ } finally {
+ ws.close();
+ }
+ });
+ },
+ );
+
test("rejects non-local browser origins for non-control-ui clients", async () => {
testState.gatewayAuth = { mode: "token", token: "secret" };
await withGatewayServer(async ({ port }) => {
diff --git a/src/gateway/server.config-patch.test.ts b/src/gateway/server.config-patch.test.ts
index 1f2d465b4da..67efe9b79be 100644
--- a/src/gateway/server.config-patch.test.ts
+++ b/src/gateway/server.config-patch.test.ts
@@ -72,6 +72,38 @@ describe("gateway config methods", () => {
expect(res.payload?.config).toBeTruthy();
});
+ it("returns config.set validation details in the top-level error message", async () => {
+ const current = await rpcReq<{
+ hash?: string;
+ }>(requireWs(), "config.get", {});
+ expect(current.ok).toBe(true);
+ expect(typeof current.payload?.hash).toBe("string");
+
+ const res = await rpcReq<{
+ ok?: boolean;
+ error?: {
+ message?: string;
+ };
+ }>(requireWs(), "config.set", {
+ raw: JSON.stringify({ gateway: { bind: 123 } }),
+ baseHash: current.payload?.hash,
+ });
+ const error = res.error as
+ | {
+ message?: string;
+ details?: {
+ issues?: Array<{ path?: string; message?: string }>;
+ };
+ }
+ | undefined;
+
+ expect(res.ok).toBe(false);
+ expect(error?.message ?? "").toContain("invalid config:");
+ expect(error?.message ?? "").toContain("gateway.bind");
+ expect(error?.message ?? "").toContain("allowed:");
+ expect(error?.details?.issues?.[0]?.path).toBe("gateway.bind");
+ });
+
it("returns a path-scoped config schema lookup", async () => {
const res = await rpcReq<{
path: string;
diff --git a/src/gateway/server/ws-connection/message-handler.ts b/src/gateway/server/ws-connection/message-handler.ts
index 83d1b5f12a3..0897b51e937 100644
--- a/src/gateway/server/ws-connection/message-handler.ts
+++ b/src/gateway/server/ws-connection/message-handler.ts
@@ -114,7 +114,7 @@ function resolveHandshakeBrowserSecurityContext(params: {
);
return {
hasBrowserOriginHeader,
- enforceOriginCheckForAnyClient: hasBrowserOriginHeader && !params.hasProxyHeaders,
+ enforceOriginCheckForAnyClient: hasBrowserOriginHeader,
rateLimitClientIp:
hasBrowserOriginHeader && isLoopbackAddress(params.clientIp)
? BROWSER_ORIGIN_LOOPBACK_RATE_LIMIT_IP
diff --git a/src/gateway/tools-invoke-http.test.ts b/src/gateway/tools-invoke-http.test.ts
index 66a68bf5d9f..36b05c00d50 100644
--- a/src/gateway/tools-invoke-http.test.ts
+++ b/src/gateway/tools-invoke-http.test.ts
@@ -1,8 +1,22 @@
import { createServer, type IncomingMessage, type ServerResponse } from "node:http";
import type { AddressInfo } from "node:net";
import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import type { runBeforeToolCallHook as runBeforeToolCallHookType } from "../agents/pi-tools.before-tool-call.js";
+
+type RunBeforeToolCallHook = typeof runBeforeToolCallHookType;
+type RunBeforeToolCallHookArgs = Parameters[0];
+type RunBeforeToolCallHookResult = Awaited>;
const TEST_GATEWAY_TOKEN = "test-gateway-token-1234567890";
+const hookMocks = vi.hoisted(() => ({
+ resolveToolLoopDetectionConfig: vi.fn(() => ({ warnAt: 3 })),
+ runBeforeToolCallHook: vi.fn(
+ async (args: RunBeforeToolCallHookArgs): Promise => ({
+ blocked: false,
+ params: args.params,
+ }),
+ ),
+}));
let cfg: Record = {};
let lastCreateOpenClawToolsContext: Record | undefined;
@@ -152,6 +166,14 @@ vi.mock("../agents/openclaw-tools.js", () => {
};
});
+vi.mock("../agents/pi-tools.js", () => ({
+ resolveToolLoopDetectionConfig: hookMocks.resolveToolLoopDetectionConfig,
+}));
+
+vi.mock("../agents/pi-tools.before-tool-call.js", () => ({
+ runBeforeToolCallHook: hookMocks.runBeforeToolCallHook,
+}));
+
const { handleToolsInvokeHttpRequest } = await import("./tools-invoke-http.js");
let pluginHttpHandlers: Array<(req: IncomingMessage, res: ServerResponse) => Promise> = [];
@@ -206,6 +228,15 @@ beforeEach(() => {
pluginHttpHandlers = [];
cfg = {};
lastCreateOpenClawToolsContext = undefined;
+ hookMocks.resolveToolLoopDetectionConfig.mockClear();
+ hookMocks.resolveToolLoopDetectionConfig.mockImplementation(() => ({ warnAt: 3 }));
+ hookMocks.runBeforeToolCallHook.mockClear();
+ hookMocks.runBeforeToolCallHook.mockImplementation(
+ async (args: RunBeforeToolCallHookArgs): Promise => ({
+ blocked: false,
+ params: args.params,
+ }),
+ );
});
const resolveGatewayToken = (): string => TEST_GATEWAY_TOKEN;
@@ -336,6 +367,56 @@ describe("POST /tools/invoke", () => {
expect(body.ok).toBe(true);
expect(body).toHaveProperty("result");
expect(lastCreateOpenClawToolsContext?.allowMediaInvokeCommands).toBe(true);
+ expect(hookMocks.runBeforeToolCallHook).toHaveBeenCalledWith(
+ expect.objectContaining({
+ toolName: "agents_list",
+ ctx: expect.objectContaining({
+ agentId: "main",
+ sessionKey: "agent:main:main",
+ loopDetection: { warnAt: 3 },
+ }),
+ }),
+ );
+ });
+
+ it("blocks tool execution when before_tool_call rejects the invoke", async () => {
+ setMainAllowedTools({ allow: ["tools_invoke_test"] });
+ hookMocks.runBeforeToolCallHook.mockResolvedValueOnce({
+ blocked: true,
+ reason: "blocked by test hook",
+ });
+
+ const res = await invokeToolAuthed({
+ tool: "tools_invoke_test",
+ args: { mode: "ok" },
+ sessionKey: "main",
+ });
+
+ expect(res.status).toBe(403);
+ await expect(res.json()).resolves.toMatchObject({
+ ok: false,
+ error: {
+ type: "tool_call_blocked",
+ message: "blocked by test hook",
+ },
+ });
+ });
+
+ it("uses before_tool_call adjusted params for HTTP tool execution", async () => {
+ setMainAllowedTools({ allow: ["tools_invoke_test"] });
+ hookMocks.runBeforeToolCallHook.mockImplementationOnce(async () => ({
+ blocked: false,
+ params: { mode: "rewritten" },
+ }));
+
+ const res = await invokeToolAuthed({
+ tool: "tools_invoke_test",
+ args: { mode: "input" },
+ sessionKey: "main",
+ });
+
+ const body = await expectOkInvokeResponse(res);
+ expect(body.result).toMatchObject({ ok: true });
});
it("supports tools.alsoAllow in profile and implicit modes", async () => {
diff --git a/src/gateway/tools-invoke-http.ts b/src/gateway/tools-invoke-http.ts
index 88cea7b3845..0cccafce999 100644
--- a/src/gateway/tools-invoke-http.ts
+++ b/src/gateway/tools-invoke-http.ts
@@ -1,5 +1,7 @@
import type { IncomingMessage, ServerResponse } from "node:http";
import { createOpenClawTools } from "../agents/openclaw-tools.js";
+import { runBeforeToolCallHook } from "../agents/pi-tools.before-tool-call.js";
+import { resolveToolLoopDetectionConfig } from "../agents/pi-tools.js";
import {
resolveEffectiveToolPolicy,
resolveGroupToolPolicy,
@@ -311,14 +313,32 @@ export async function handleToolsInvokeHttpRequest(
}
try {
+ const toolCallId = `http-${Date.now()}`;
const toolArgs = mergeActionIntoArgsIfSupported({
// oxlint-disable-next-line typescript/no-explicit-any
toolSchema: (tool as any).parameters,
action,
args,
});
+ const hookResult = await runBeforeToolCallHook({
+ toolName,
+ params: toolArgs,
+ toolCallId,
+ ctx: {
+ agentId,
+ sessionKey,
+ loopDetection: resolveToolLoopDetectionConfig({ cfg, agentId }),
+ },
+ });
+ if (hookResult.blocked) {
+ sendJson(res, 403, {
+ ok: false,
+ error: { type: "tool_call_blocked", message: hookResult.reason },
+ });
+ return true;
+ }
// oxlint-disable-next-line typescript/no-explicit-any
- const result = await (tool as any).execute?.(`http-${Date.now()}`, toolArgs);
+ const result = await (tool as any).execute?.(toolCallId, hookResult.params);
sendJson(res, 200, { ok: true, result });
} catch (err) {
const inputStatus = resolveToolInputErrorStatus(err);
diff --git a/src/infra/git-commit.test.ts b/src/infra/git-commit.test.ts
index d00c50fbf6f..c0ddb136e85 100644
--- a/src/infra/git-commit.test.ts
+++ b/src/infra/git-commit.test.ts
@@ -198,7 +198,7 @@ describe("git commit resolution", () => {
await fs.mkdir(path.join(packageRoot, "dist"), { recursive: true });
await fs.writeFile(
path.join(packageRoot, "package.json"),
- JSON.stringify({ name: "openclaw", version: "2026.3.9" }),
+ JSON.stringify({ name: "openclaw", version: "2026.3.10" }),
"utf-8",
);
const moduleUrl = pathToFileURL(path.join(packageRoot, "dist", "entry.js")).href;
diff --git a/src/infra/process-respawn.test.ts b/src/infra/process-respawn.test.ts
index 7b9a9df1252..bacf4e1b24b 100644
--- a/src/infra/process-respawn.test.ts
+++ b/src/infra/process-respawn.test.ts
@@ -4,6 +4,7 @@ import { SUPERVISOR_HINT_ENV_VARS } from "./supervisor-markers.js";
const spawnMock = vi.hoisted(() => vi.fn());
const triggerOpenClawRestartMock = vi.hoisted(() => vi.fn());
+const scheduleDetachedLaunchdRestartHandoffMock = vi.hoisted(() => vi.fn());
vi.mock("node:child_process", () => ({
spawn: (...args: unknown[]) => spawnMock(...args),
@@ -11,6 +12,10 @@ vi.mock("node:child_process", () => ({
vi.mock("./restart.js", () => ({
triggerOpenClawRestart: (...args: unknown[]) => triggerOpenClawRestartMock(...args),
}));
+vi.mock("../daemon/launchd-restart-handoff.js", () => ({
+ scheduleDetachedLaunchdRestartHandoff: (...args: unknown[]) =>
+ scheduleDetachedLaunchdRestartHandoffMock(...args),
+}));
import { restartGatewayProcessWithFreshPid } from "./process-respawn.js";
@@ -35,6 +40,8 @@ afterEach(() => {
process.execArgv = [...originalExecArgv];
spawnMock.mockClear();
triggerOpenClawRestartMock.mockClear();
+ scheduleDetachedLaunchdRestartHandoffMock.mockReset();
+ scheduleDetachedLaunchdRestartHandoffMock.mockReturnValue({ ok: true, pid: 8123 });
if (originalPlatformDescriptor) {
Object.defineProperty(process, "platform", originalPlatformDescriptor);
}
@@ -54,6 +61,11 @@ function expectLaunchdSupervisedWithoutKickstart(params?: { launchJobLabel?: str
process.env.OPENCLAW_LAUNCHD_LABEL = "ai.openclaw.gateway";
const result = restartGatewayProcessWithFreshPid();
expect(result.mode).toBe("supervised");
+ expect(scheduleDetachedLaunchdRestartHandoffMock).toHaveBeenCalledWith({
+ env: process.env,
+ mode: "start-after-exit",
+ waitForPid: process.pid,
+ });
expect(triggerOpenClawRestartMock).not.toHaveBeenCalled();
expect(spawnMock).not.toHaveBeenCalled();
}
@@ -72,6 +84,12 @@ describe("restartGatewayProcessWithFreshPid", () => {
process.env.LAUNCH_JOB_LABEL = "ai.openclaw.gateway";
const result = restartGatewayProcessWithFreshPid();
expect(result.mode).toBe("supervised");
+ expect(result.detail).toContain("launchd restart handoff");
+ expect(scheduleDetachedLaunchdRestartHandoffMock).toHaveBeenCalledWith({
+ env: process.env,
+ mode: "start-after-exit",
+ waitForPid: process.pid,
+ });
expect(triggerOpenClawRestartMock).not.toHaveBeenCalled();
expect(spawnMock).not.toHaveBeenCalled();
});
@@ -96,6 +114,25 @@ describe("restartGatewayProcessWithFreshPid", () => {
expect(triggerOpenClawRestartMock).not.toHaveBeenCalled();
});
+ it("falls back to plain supervised exit when launchd handoff scheduling fails", () => {
+ clearSupervisorHints();
+ setPlatform("darwin");
+ process.env.XPC_SERVICE_NAME = "ai.openclaw.gateway";
+ scheduleDetachedLaunchdRestartHandoffMock.mockReturnValue({
+ ok: false,
+ detail: "spawn failed",
+ });
+
+ const result = restartGatewayProcessWithFreshPid();
+
+ expect(result).toEqual({
+ mode: "supervised",
+ detail: "launchd exit fallback (spawn failed)",
+ });
+ expect(triggerOpenClawRestartMock).not.toHaveBeenCalled();
+ expect(spawnMock).not.toHaveBeenCalled();
+ });
+
it("does not schedule kickstart on non-darwin platforms", () => {
setPlatform("linux");
process.env.INVOCATION_ID = "abc123";
diff --git a/src/infra/process-respawn.ts b/src/infra/process-respawn.ts
index 8bf1503b18f..473319f86fb 100644
--- a/src/infra/process-respawn.ts
+++ b/src/infra/process-respawn.ts
@@ -1,4 +1,5 @@
import { spawn } from "node:child_process";
+import { scheduleDetachedLaunchdRestartHandoff } from "../daemon/launchd-restart-handoff.js";
import { triggerOpenClawRestart } from "./restart.js";
import { detectRespawnSupervisor } from "./supervisor-markers.js";
@@ -30,10 +31,25 @@ export function restartGatewayProcessWithFreshPid(): GatewayRespawnResult {
}
const supervisor = detectRespawnSupervisor(process.env);
if (supervisor) {
- // launchd: exit(0) is sufficient — KeepAlive=true restarts the service.
- // Self-issued `kickstart -k` races with launchd's bootout state machine
- // and can leave the LaunchAgent permanently unloaded.
- // See: https://github.com/openclaw/openclaw/issues/39760
+ // Hand off launchd restarts to a detached helper before exiting so config
+ // reloads and SIGUSR1-driven restarts do not depend on exit/respawn timing.
+ if (supervisor === "launchd") {
+ const handoff = scheduleDetachedLaunchdRestartHandoff({
+ env: process.env,
+ mode: "start-after-exit",
+ waitForPid: process.pid,
+ });
+ if (!handoff.ok) {
+ return {
+ mode: "supervised",
+ detail: `launchd exit fallback (${handoff.detail ?? "restart handoff failed"})`,
+ };
+ }
+ return {
+ mode: "supervised",
+ detail: `launchd restart handoff pid ${handoff.pid ?? "unknown"}`,
+ };
+ }
if (supervisor === "schtasks") {
const restart = triggerOpenClawRestart();
if (!restart.ok) {
diff --git a/src/install-sh-version.test.ts b/src/install-sh-version.test.ts
index 824a5366efd..12336b803d6 100644
--- a/src/install-sh-version.test.ts
+++ b/src/install-sh-version.test.ts
@@ -73,10 +73,10 @@ describe("install.sh version resolution", () => {
it.runIf(process.platform !== "win32")(
"extracts the semantic version from decorated CLI output",
() => {
- const fixture = withFakeCli("OpenClaw 2026.3.9 (abcdef0)");
+ const fixture = withFakeCli("OpenClaw 2026.3.10 (abcdef0)");
tempRoots.push(fixture.root);
- expect(resolveVersionFromInstaller(fixture.cliPath)).toBe("2026.3.9");
+ expect(resolveVersionFromInstaller(fixture.cliPath)).toBe("2026.3.10");
},
);
@@ -93,7 +93,7 @@ describe("install.sh version resolution", () => {
it.runIf(process.platform !== "win32")(
"does not source version helpers from cwd when installer runs via stdin",
() => {
- const fixture = withFakeCli("OpenClaw 2026.3.9 (abcdef0)");
+ const fixture = withFakeCli("OpenClaw 2026.3.10 (abcdef0)");
tempRoots.push(fixture.root);
const hostileCwd = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-install-stdin-"));
@@ -115,7 +115,7 @@ extract_openclaw_semver() {
"utf-8",
);
- expect(resolveVersionFromInstallerViaStdin(fixture.cliPath, hostileCwd)).toBe("2026.3.9");
+ expect(resolveVersionFromInstallerViaStdin(fixture.cliPath, hostileCwd)).toBe("2026.3.10");
},
);
});
diff --git a/src/media/mime.ts b/src/media/mime.ts
index e551350c057..4c9b6bf1db3 100644
--- a/src/media/mime.ts
+++ b/src/media/mime.ts
@@ -12,6 +12,10 @@ const EXT_BY_MIME: Record = {
"image/gif": ".gif",
"audio/ogg": ".ogg",
"audio/mpeg": ".mp3",
+ "audio/wav": ".wav",
+ "audio/flac": ".flac",
+ "audio/aac": ".aac",
+ "audio/opus": ".opus",
"audio/x-m4a": ".m4a",
"audio/mp4": ".m4a",
"video/mp4": ".mp4",
diff --git a/src/memory/embedding-chunk-limits.ts b/src/memory/embedding-chunk-limits.ts
index 033b30a84a3..5c8cf9020f3 100644
--- a/src/memory/embedding-chunk-limits.ts
+++ b/src/memory/embedding-chunk-limits.ts
@@ -1,4 +1,5 @@
import { estimateUtf8Bytes, splitTextToUtf8ByteLimit } from "./embedding-input-limits.js";
+import { hasNonTextEmbeddingParts } from "./embedding-inputs.js";
import { resolveEmbeddingMaxInputTokens } from "./embedding-model-limits.js";
import type { EmbeddingProvider } from "./embeddings.js";
import { hashText, type MemoryChunk } from "./internal.js";
@@ -16,6 +17,10 @@ export function enforceEmbeddingMaxInputTokens(
const out: MemoryChunk[] = [];
for (const chunk of chunks) {
+ if (hasNonTextEmbeddingParts(chunk.embeddingInput)) {
+ out.push(chunk);
+ continue;
+ }
if (estimateUtf8Bytes(chunk.text) <= maxInputTokens) {
out.push(chunk);
continue;
@@ -27,6 +32,7 @@ export function enforceEmbeddingMaxInputTokens(
endLine: chunk.endLine,
text,
hash: hashText(text),
+ embeddingInput: { text },
});
}
}
diff --git a/src/memory/embedding-input-limits.ts b/src/memory/embedding-input-limits.ts
index dad83bb7aa7..4eadf1bf48d 100644
--- a/src/memory/embedding-input-limits.ts
+++ b/src/memory/embedding-input-limits.ts
@@ -1,3 +1,5 @@
+import type { EmbeddingInput } from "./embedding-inputs.js";
+
// Helpers for enforcing embedding model input size limits.
//
// We use UTF-8 byte length as a conservative upper bound for tokenizer output.
@@ -11,6 +13,22 @@ export function estimateUtf8Bytes(text: string): number {
return Buffer.byteLength(text, "utf8");
}
+export function estimateStructuredEmbeddingInputBytes(input: EmbeddingInput): number {
+ if (!input.parts?.length) {
+ return estimateUtf8Bytes(input.text);
+ }
+ let total = 0;
+ for (const part of input.parts) {
+ if (part.type === "text") {
+ total += estimateUtf8Bytes(part.text);
+ continue;
+ }
+ total += estimateUtf8Bytes(part.mimeType);
+ total += estimateUtf8Bytes(part.data);
+ }
+ return total;
+}
+
export function splitTextToUtf8ByteLimit(text: string, maxUtf8Bytes: number): string[] {
if (maxUtf8Bytes <= 0) {
return [text];
diff --git a/src/memory/embedding-inputs.ts b/src/memory/embedding-inputs.ts
new file mode 100644
index 00000000000..767a463f740
--- /dev/null
+++ b/src/memory/embedding-inputs.ts
@@ -0,0 +1,34 @@
+export type EmbeddingInputTextPart = {
+ type: "text";
+ text: string;
+};
+
+export type EmbeddingInputInlineDataPart = {
+ type: "inline-data";
+ mimeType: string;
+ data: string;
+};
+
+export type EmbeddingInputPart = EmbeddingInputTextPart | EmbeddingInputInlineDataPart;
+
+export type EmbeddingInput = {
+ text: string;
+ parts?: EmbeddingInputPart[];
+};
+
+export function buildTextEmbeddingInput(text: string): EmbeddingInput {
+ return { text };
+}
+
+export function isInlineDataEmbeddingInputPart(
+ part: EmbeddingInputPart,
+): part is EmbeddingInputInlineDataPart {
+ return part.type === "inline-data";
+}
+
+export function hasNonTextEmbeddingParts(input: EmbeddingInput | undefined): boolean {
+ if (!input?.parts?.length) {
+ return false;
+ }
+ return input.parts.some((part) => isInlineDataEmbeddingInputPart(part));
+}
diff --git a/src/memory/embeddings-gemini.test.ts b/src/memory/embeddings-gemini.test.ts
index ae65c8d72b8..f97cc6cb142 100644
--- a/src/memory/embeddings-gemini.test.ts
+++ b/src/memory/embeddings-gemini.test.ts
@@ -1,16 +1,13 @@
import { afterEach, describe, expect, it, vi } from "vitest";
import * as authModule from "../agents/model-auth.js";
import {
- buildFileDataPart,
- buildGeminiParts,
+ buildGeminiEmbeddingRequest,
buildGeminiTextEmbeddingRequest,
- buildInlineDataPart,
createGeminiEmbeddingProvider,
DEFAULT_GEMINI_EMBEDDING_MODEL,
GEMINI_EMBEDDING_2_MODELS,
isGeminiEmbedding2Model,
resolveGeminiOutputDimensionality,
- type GeminiPart,
} from "./embeddings-gemini.js";
vi.mock("../agents/model-auth.js", async () => {
@@ -61,40 +58,6 @@ function mockResolvedProviderKey(apiKey = "test-key") {
});
}
-// ---------- Helper function tests ----------
-
-describe("buildGeminiParts", () => {
- it("wraps a string into a single text part", () => {
- expect(buildGeminiParts("hello")).toEqual([{ text: "hello" }]);
- });
-
- it("passes through an existing parts array", () => {
- const parts: GeminiPart[] = [
- { text: "hello" },
- { inlineData: { mimeType: "image/png", data: "base64data" } },
- ];
- expect(buildGeminiParts(parts)).toBe(parts);
- });
-});
-
-describe("buildInlineDataPart", () => {
- it("produces the correct shape", () => {
- const part = buildInlineDataPart("image/jpeg", "abc123");
- expect(part).toEqual({
- inlineData: { mimeType: "image/jpeg", data: "abc123" },
- });
- });
-});
-
-describe("buildFileDataPart", () => {
- it("produces the correct shape", () => {
- const part = buildFileDataPart("application/pdf", "gs://bucket/file.pdf");
- expect(part).toEqual({
- fileData: { mimeType: "application/pdf", fileUri: "gs://bucket/file.pdf" },
- });
- });
-});
-
describe("buildGeminiTextEmbeddingRequest", () => {
it("builds a text embedding request with optional model and dimensions", () => {
expect(
@@ -113,6 +76,35 @@ describe("buildGeminiTextEmbeddingRequest", () => {
});
});
+describe("buildGeminiEmbeddingRequest", () => {
+ it("builds a multimodal request from structured input parts", () => {
+ expect(
+ buildGeminiEmbeddingRequest({
+ input: {
+ text: "Image file: diagram.png",
+ parts: [
+ { type: "text", text: "Image file: diagram.png" },
+ { type: "inline-data", mimeType: "image/png", data: "abc123" },
+ ],
+ },
+ taskType: "RETRIEVAL_DOCUMENT",
+ modelPath: "models/gemini-embedding-2-preview",
+ outputDimensionality: 1536,
+ }),
+ ).toEqual({
+ model: "models/gemini-embedding-2-preview",
+ content: {
+ parts: [
+ { text: "Image file: diagram.png" },
+ { inlineData: { mimeType: "image/png", data: "abc123" } },
+ ],
+ },
+ taskType: "RETRIEVAL_DOCUMENT",
+ outputDimensionality: 1536,
+ });
+ });
+});
+
// ---------- Model detection ----------
describe("isGeminiEmbedding2Model", () => {
@@ -319,6 +311,21 @@ describe("gemini-embedding-2-preview provider", () => {
expect(body.outputDimensionality).toBe(768);
});
+ it("sanitizes and normalizes embedQuery responses", async () => {
+ const fetchMock = createGeminiFetchMock([3, 4, Number.NaN]);
+ vi.stubGlobal("fetch", fetchMock);
+ mockResolvedProviderKey();
+
+ const { provider } = await createGeminiEmbeddingProvider({
+ config: {} as never,
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ fallback: "none",
+ });
+
+ await expect(provider.embedQuery("test")).resolves.toEqual([0.6, 0.8, 0]);
+ });
+
it("uses custom outputDimensionality for each embedBatch request", async () => {
const fetchMock = createGeminiBatchFetchMock(2);
vi.stubGlobal("fetch", fetchMock);
@@ -341,6 +348,88 @@ describe("gemini-embedding-2-preview provider", () => {
]);
});
+ it("sanitizes and normalizes structured batch responses", async () => {
+ const fetchMock = createGeminiBatchFetchMock(1, [0, Number.POSITIVE_INFINITY, 5]);
+ vi.stubGlobal("fetch", fetchMock);
+ mockResolvedProviderKey();
+
+ const { provider } = await createGeminiEmbeddingProvider({
+ config: {} as never,
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ fallback: "none",
+ });
+
+ await expect(
+ provider.embedBatchInputs?.([
+ {
+ text: "Image file: diagram.png",
+ parts: [
+ { type: "text", text: "Image file: diagram.png" },
+ { type: "inline-data", mimeType: "image/png", data: "img" },
+ ],
+ },
+ ]),
+ ).resolves.toEqual([[0, 0, 1]]);
+ });
+
+ it("supports multimodal embedBatchInputs requests", async () => {
+ const fetchMock = createGeminiBatchFetchMock(2);
+ vi.stubGlobal("fetch", fetchMock);
+ mockResolvedProviderKey();
+
+ const { provider } = await createGeminiEmbeddingProvider({
+ config: {} as never,
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ fallback: "none",
+ });
+
+ expect(provider.embedBatchInputs).toBeDefined();
+ await provider.embedBatchInputs?.([
+ {
+ text: "Image file: diagram.png",
+ parts: [
+ { type: "text", text: "Image file: diagram.png" },
+ { type: "inline-data", mimeType: "image/png", data: "img" },
+ ],
+ },
+ {
+ text: "Audio file: note.wav",
+ parts: [
+ { type: "text", text: "Audio file: note.wav" },
+ { type: "inline-data", mimeType: "audio/wav", data: "aud" },
+ ],
+ },
+ ]);
+
+ const body = parseFetchBody(fetchMock);
+ expect(body.requests).toEqual([
+ {
+ model: "models/gemini-embedding-2-preview",
+ content: {
+ parts: [
+ { text: "Image file: diagram.png" },
+ { inlineData: { mimeType: "image/png", data: "img" } },
+ ],
+ },
+ taskType: "RETRIEVAL_DOCUMENT",
+ outputDimensionality: 3072,
+ },
+ {
+ model: "models/gemini-embedding-2-preview",
+ content: {
+ parts: [
+ { text: "Audio file: note.wav" },
+ { inlineData: { mimeType: "audio/wav", data: "aud" } },
+ ],
+ },
+ taskType: "RETRIEVAL_DOCUMENT",
+ outputDimensionality: 3072,
+ },
+ ]);
+ });
+
it("throws for invalid outputDimensionality", async () => {
mockResolvedProviderKey();
diff --git a/src/memory/embeddings-gemini.ts b/src/memory/embeddings-gemini.ts
index 71c8b67fb1a..ab028241ed8 100644
--- a/src/memory/embeddings-gemini.ts
+++ b/src/memory/embeddings-gemini.ts
@@ -5,6 +5,7 @@ import {
import { requireApiKey, resolveApiKeyForProvider } from "../agents/model-auth.js";
import { parseGeminiAuth } from "../infra/gemini-auth.js";
import type { SsrFPolicy } from "../infra/net/ssrf.js";
+import type { EmbeddingInput } from "./embedding-inputs.js";
import { sanitizeAndNormalizeEmbedding } from "./embedding-vectors.js";
import { debugEmbeddingsLog } from "./embeddings-debug.js";
import type { EmbeddingProvider, EmbeddingProviderOptions } from "./embeddings.js";
@@ -50,34 +51,14 @@ export type GeminiTextPart = { text: string };
export type GeminiInlinePart = {
inlineData: { mimeType: string; data: string };
};
-export type GeminiFilePart = {
- fileData: { mimeType: string; fileUri: string };
-};
-export type GeminiPart = GeminiTextPart | GeminiInlinePart | GeminiFilePart;
-export type GeminiTextEmbeddingRequest = {
- content: { parts: GeminiTextPart[] };
+export type GeminiPart = GeminiTextPart | GeminiInlinePart;
+export type GeminiEmbeddingRequest = {
+ content: { parts: GeminiPart[] };
taskType: GeminiTaskType;
outputDimensionality?: number;
model?: string;
};
-
-/** Convert a string or pre-built parts array into `GeminiPart[]`. */
-export function buildGeminiParts(input: string | GeminiPart[]): GeminiPart[] {
- if (typeof input === "string") {
- return [{ text: input }];
- }
- return input;
-}
-
-/** Convenience: build an inline-data part for multimodal embeddings. */
-export function buildInlineDataPart(mimeType: string, base64Data: string): GeminiInlinePart {
- return { inlineData: { mimeType, data: base64Data } };
-}
-
-/** Convenience: build a file-data part for multimodal embeddings. */
-export function buildFileDataPart(mimeType: string, fileUri: string): GeminiFilePart {
- return { fileData: { mimeType, fileUri } };
-}
+export type GeminiTextEmbeddingRequest = GeminiEmbeddingRequest;
/** Builds the text-only Gemini embedding request shape used across direct and batch APIs. */
export function buildGeminiTextEmbeddingRequest(params: {
@@ -86,8 +67,30 @@ export function buildGeminiTextEmbeddingRequest(params: {
outputDimensionality?: number;
modelPath?: string;
}): GeminiTextEmbeddingRequest {
- const request: GeminiTextEmbeddingRequest = {
- content: { parts: [{ text: params.text }] },
+ return buildGeminiEmbeddingRequest({
+ input: { text: params.text },
+ taskType: params.taskType,
+ outputDimensionality: params.outputDimensionality,
+ modelPath: params.modelPath,
+ });
+}
+
+export function buildGeminiEmbeddingRequest(params: {
+ input: EmbeddingInput;
+ taskType: GeminiTaskType;
+ outputDimensionality?: number;
+ modelPath?: string;
+}): GeminiEmbeddingRequest {
+ const request: GeminiEmbeddingRequest = {
+ content: {
+ parts: params.input.parts?.map((part) =>
+ part.type === "text"
+ ? ({ text: part.text } satisfies GeminiTextPart)
+ : ({
+ inlineData: { mimeType: part.mimeType, data: part.data },
+ } satisfies GeminiInlinePart),
+ ) ?? [{ text: params.input.text }],
+ },
taskType: params.taskType,
};
if (params.modelPath) {
@@ -143,7 +146,7 @@ function resolveRemoteApiKey(remoteApiKey: unknown): string | undefined {
return trimmed;
}
-function normalizeGeminiModel(model: string): string {
+export function normalizeGeminiModel(model: string): string {
const trimmed = model.trim();
if (!trimmed) {
return DEFAULT_GEMINI_EMBEDDING_MODEL;
@@ -158,6 +161,46 @@ function normalizeGeminiModel(model: string): string {
return withoutPrefix;
}
+async function fetchGeminiEmbeddingPayload(params: {
+ client: GeminiEmbeddingClient;
+ endpoint: string;
+ body: unknown;
+}): Promise<{
+ embedding?: { values?: number[] };
+ embeddings?: Array<{ values?: number[] }>;
+}> {
+ return await executeWithApiKeyRotation({
+ provider: "google",
+ apiKeys: params.client.apiKeys,
+ execute: async (apiKey) => {
+ const authHeaders = parseGeminiAuth(apiKey);
+ const headers = {
+ ...authHeaders.headers,
+ ...params.client.headers,
+ };
+ return await withRemoteHttpResponse({
+ url: params.endpoint,
+ ssrfPolicy: params.client.ssrfPolicy,
+ init: {
+ method: "POST",
+ headers,
+ body: JSON.stringify(params.body),
+ },
+ onResponse: async (res) => {
+ if (!res.ok) {
+ const text = await res.text();
+ throw new Error(`gemini embeddings failed: ${res.status} ${text}`);
+ }
+ return (await res.json()) as {
+ embedding?: { values?: number[] };
+ embeddings?: Array<{ values?: number[] }>;
+ };
+ },
+ });
+ },
+ });
+}
+
function normalizeGeminiBaseUrl(raw: string): string {
const trimmed = raw.replace(/\/+$/, "");
const openAiIndex = trimmed.indexOf("/openai");
@@ -181,71 +224,50 @@ export async function createGeminiEmbeddingProvider(
const isV2 = isGeminiEmbedding2Model(client.model);
const outputDimensionality = client.outputDimensionality;
- const fetchWithGeminiAuth = async (apiKey: string, endpoint: string, body: unknown) => {
- const authHeaders = parseGeminiAuth(apiKey);
- const headers = {
- ...authHeaders.headers,
- ...client.headers,
- };
- const payload = await withRemoteHttpResponse({
- url: endpoint,
- ssrfPolicy: client.ssrfPolicy,
- init: {
- method: "POST",
- headers,
- body: JSON.stringify(body),
- },
- onResponse: async (res) => {
- if (!res.ok) {
- const text = await res.text();
- throw new Error(`gemini embeddings failed: ${res.status} ${text}`);
- }
- return (await res.json()) as {
- embedding?: { values?: number[] };
- embeddings?: Array<{ values?: number[] }>;
- };
- },
- });
- return payload;
- };
-
const embedQuery = async (text: string): Promise => {
if (!text.trim()) {
return [];
}
- const body = buildGeminiTextEmbeddingRequest({
- text,
- taskType: options.taskType ?? "RETRIEVAL_QUERY",
- outputDimensionality: isV2 ? outputDimensionality : undefined,
- });
- const payload = await executeWithApiKeyRotation({
- provider: "google",
- apiKeys: client.apiKeys,
- execute: (apiKey) => fetchWithGeminiAuth(apiKey, embedUrl, body),
+ const payload = await fetchGeminiEmbeddingPayload({
+ client,
+ endpoint: embedUrl,
+ body: buildGeminiTextEmbeddingRequest({
+ text,
+ taskType: options.taskType ?? "RETRIEVAL_QUERY",
+ outputDimensionality: isV2 ? outputDimensionality : undefined,
+ }),
});
return sanitizeAndNormalizeEmbedding(payload.embedding?.values ?? []);
};
- const embedBatch = async (texts: string[]): Promise => {
- if (texts.length === 0) {
+ const embedBatchInputs = async (inputs: EmbeddingInput[]): Promise => {
+ if (inputs.length === 0) {
return [];
}
- const requests = texts.map((text) =>
- buildGeminiTextEmbeddingRequest({
- text,
- modelPath: client.modelPath,
- taskType: options.taskType ?? "RETRIEVAL_DOCUMENT",
- outputDimensionality: isV2 ? outputDimensionality : undefined,
- }),
- );
- const batchBody = { requests };
- const payload = await executeWithApiKeyRotation({
- provider: "google",
- apiKeys: client.apiKeys,
- execute: (apiKey) => fetchWithGeminiAuth(apiKey, batchUrl, batchBody),
+ const payload = await fetchGeminiEmbeddingPayload({
+ client,
+ endpoint: batchUrl,
+ body: {
+ requests: inputs.map((input) =>
+ buildGeminiEmbeddingRequest({
+ input,
+ modelPath: client.modelPath,
+ taskType: options.taskType ?? "RETRIEVAL_DOCUMENT",
+ outputDimensionality: isV2 ? outputDimensionality : undefined,
+ }),
+ ),
+ },
});
const embeddings = Array.isArray(payload.embeddings) ? payload.embeddings : [];
- return texts.map((_, index) => sanitizeAndNormalizeEmbedding(embeddings[index]?.values ?? []));
+ return inputs.map((_, index) => sanitizeAndNormalizeEmbedding(embeddings[index]?.values ?? []));
+ };
+
+ const embedBatch = async (texts: string[]): Promise => {
+ return await embedBatchInputs(
+ texts.map((text) => ({
+ text,
+ })),
+ );
};
return {
@@ -255,6 +277,7 @@ export async function createGeminiEmbeddingProvider(
maxInputTokens: GEMINI_MAX_INPUT_TOKENS[client.model],
embedQuery,
embedBatch,
+ embedBatchInputs,
},
client,
};
diff --git a/src/memory/embeddings.ts b/src/memory/embeddings.ts
index a5da5222542..f9cc76eb19d 100644
--- a/src/memory/embeddings.ts
+++ b/src/memory/embeddings.ts
@@ -4,6 +4,7 @@ import type { OpenClawConfig } from "../config/config.js";
import type { SecretInput } from "../config/types.secrets.js";
import { formatErrorMessage } from "../infra/errors.js";
import { resolveUserPath } from "../utils.js";
+import type { EmbeddingInput } from "./embedding-inputs.js";
import { sanitizeAndNormalizeEmbedding } from "./embedding-vectors.js";
import {
createGeminiEmbeddingProvider,
@@ -31,6 +32,7 @@ export type EmbeddingProvider = {
maxInputTokens?: number;
embedQuery: (text: string) => Promise;
embedBatch: (texts: string[]) => Promise;
+ embedBatchInputs?: (inputs: EmbeddingInput[]) => Promise;
};
export type EmbeddingProviderId = "openai" | "local" | "gemini" | "voyage" | "mistral" | "ollama";
diff --git a/src/memory/index.test.ts b/src/memory/index.test.ts
index 8010c419494..23371056b18 100644
--- a/src/memory/index.test.ts
+++ b/src/memory/index.test.ts
@@ -1,3 +1,4 @@
+import { randomUUID } from "node:crypto";
import fs from "node:fs/promises";
import os from "node:os";
import path from "node:path";
@@ -6,6 +7,7 @@ import { getMemorySearchManager, type MemoryIndexManager } from "./index.js";
import "./test-runtime-mocks.js";
let embedBatchCalls = 0;
+let embedBatchInputCalls = 0;
let providerCalls: Array<{ provider?: string; model?: string; outputDimensionality?: number }> = [];
vi.mock("./embeddings.js", () => {
@@ -13,7 +15,9 @@ vi.mock("./embeddings.js", () => {
const lower = text.toLowerCase();
const alpha = lower.split("alpha").length - 1;
const beta = lower.split("beta").length - 1;
- return [alpha, beta];
+ const image = lower.split("image").length - 1;
+ const audio = lower.split("audio").length - 1;
+ return [alpha, beta, image, audio];
};
return {
createEmbeddingProvider: async (options: {
@@ -38,6 +42,36 @@ vi.mock("./embeddings.js", () => {
embedBatchCalls += 1;
return texts.map(embedText);
},
+ ...(providerId === "gemini"
+ ? {
+ embedBatchInputs: async (
+ inputs: Array<{
+ text: string;
+ parts?: Array<
+ | { type: "text"; text: string }
+ | { type: "inline-data"; mimeType: string; data: string }
+ >;
+ }>,
+ ) => {
+ embedBatchInputCalls += 1;
+ return inputs.map((input) => {
+ const inlineData = input.parts?.find((part) => part.type === "inline-data");
+ if (inlineData?.type === "inline-data" && inlineData.data.length > 9000) {
+ throw new Error("payload too large");
+ }
+ const mimeType =
+ inlineData?.type === "inline-data" ? inlineData.mimeType : undefined;
+ if (mimeType?.startsWith("image/")) {
+ return [0, 0, 1, 0];
+ }
+ if (mimeType?.startsWith("audio/")) {
+ return [0, 0, 0, 1];
+ }
+ return embedText(input.text);
+ });
+ },
+ }
+ : {}),
},
...(providerId === "gemini"
? {
@@ -64,6 +98,7 @@ describe("memory index", () => {
let indexVectorPath = "";
let indexMainPath = "";
let indexExtraPath = "";
+ let indexMultimodalPath = "";
let indexStatusPath = "";
let indexSourceChangePath = "";
let indexModelPath = "";
@@ -97,6 +132,7 @@ describe("memory index", () => {
indexMainPath = path.join(workspaceDir, "index-main.sqlite");
indexVectorPath = path.join(workspaceDir, "index-vector.sqlite");
indexExtraPath = path.join(workspaceDir, "index-extra.sqlite");
+ indexMultimodalPath = path.join(workspaceDir, "index-multimodal.sqlite");
indexStatusPath = path.join(workspaceDir, "index-status.sqlite");
indexSourceChangePath = path.join(workspaceDir, "index-source-change.sqlite");
indexModelPath = path.join(workspaceDir, "index-model-change.sqlite");
@@ -119,6 +155,7 @@ describe("memory index", () => {
// Keep atomic reindex tests on the safe path.
vi.stubEnv("OPENCLAW_TEST_MEMORY_UNSAFE_REINDEX", "1");
embedBatchCalls = 0;
+ embedBatchInputCalls = 0;
providerCalls = [];
// Keep the workspace stable to allow manager reuse across tests.
@@ -149,6 +186,11 @@ describe("memory index", () => {
provider?: "openai" | "gemini";
model?: string;
outputDimensionality?: number;
+ multimodal?: {
+ enabled?: boolean;
+ modalities?: Array<"image" | "audio" | "all">;
+ maxFileBytes?: number;
+ };
vectorEnabled?: boolean;
cacheEnabled?: boolean;
minScore?: number;
@@ -172,6 +214,7 @@ describe("memory index", () => {
},
cache: params.cacheEnabled ? { enabled: true } : undefined,
extraPaths: params.extraPaths,
+ multimodal: params.multimodal,
sources: params.sources,
experimental: { sessionMemory: params.sessionMemory ?? false },
},
@@ -247,6 +290,103 @@ describe("memory index", () => {
);
});
+ it("indexes multimodal image and audio files from extra paths with Gemini structured inputs", async () => {
+ const mediaDir = path.join(workspaceDir, "media-memory");
+ await fs.mkdir(mediaDir, { recursive: true });
+ await fs.writeFile(path.join(mediaDir, "diagram.png"), Buffer.from("png"));
+ await fs.writeFile(path.join(mediaDir, "meeting.wav"), Buffer.from("wav"));
+
+ const cfg = createCfg({
+ storePath: indexMultimodalPath,
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ extraPaths: [mediaDir],
+ multimodal: { enabled: true, modalities: ["image", "audio"] },
+ });
+ const manager = await getPersistentManager(cfg);
+ await manager.sync({ reason: "test" });
+
+ expect(embedBatchInputCalls).toBeGreaterThan(0);
+
+ const imageResults = await manager.search("image");
+ expect(imageResults.some((result) => result.path.endsWith("diagram.png"))).toBe(true);
+
+ const audioResults = await manager.search("audio");
+ expect(audioResults.some((result) => result.path.endsWith("meeting.wav"))).toBe(true);
+ });
+
+ it("skips oversized multimodal inputs without aborting sync", async () => {
+ const mediaDir = path.join(workspaceDir, "media-oversize");
+ await fs.mkdir(mediaDir, { recursive: true });
+ await fs.writeFile(path.join(mediaDir, "huge.png"), Buffer.alloc(7000, 1));
+
+ const cfg = createCfg({
+ storePath: path.join(workspaceDir, `index-oversize-${randomUUID()}.sqlite`),
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ extraPaths: [mediaDir],
+ multimodal: { enabled: true, modalities: ["image"] },
+ });
+ const manager = requireManager(await getMemorySearchManager({ cfg, agentId: "main" }));
+ await manager.sync({ reason: "test" });
+
+ expect(embedBatchInputCalls).toBeGreaterThan(0);
+ const imageResults = await manager.search("image");
+ expect(imageResults.some((result) => result.path.endsWith("huge.png"))).toBe(false);
+
+ const alphaResults = await manager.search("alpha");
+ expect(alphaResults.some((result) => result.path.endsWith("memory/2026-01-12.md"))).toBe(true);
+
+ await manager.close?.();
+ });
+
+ it("reindexes a multimodal file after a transient mid-sync disappearance", async () => {
+ const mediaDir = path.join(workspaceDir, "media-race");
+ const imagePath = path.join(mediaDir, "diagram.png");
+ await fs.mkdir(mediaDir, { recursive: true });
+ await fs.writeFile(imagePath, Buffer.from("png"));
+
+ const cfg = createCfg({
+ storePath: path.join(workspaceDir, `index-race-${randomUUID()}.sqlite`),
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ extraPaths: [mediaDir],
+ multimodal: { enabled: true, modalities: ["image"] },
+ });
+ const manager = requireManager(await getMemorySearchManager({ cfg, agentId: "main" }));
+ const realReadFile = fs.readFile.bind(fs);
+ let imageReads = 0;
+ const readSpy = vi.spyOn(fs, "readFile").mockImplementation(async (...args) => {
+ const [targetPath] = args;
+ if (typeof targetPath === "string" && targetPath === imagePath) {
+ imageReads += 1;
+ if (imageReads === 2) {
+ const err = Object.assign(
+ new Error(`ENOENT: no such file or directory, open '${imagePath}'`),
+ {
+ code: "ENOENT",
+ },
+ ) as NodeJS.ErrnoException;
+ throw err;
+ }
+ }
+ return await realReadFile(...args);
+ });
+
+ await manager.sync({ reason: "test" });
+ readSpy.mockRestore();
+
+ const callsAfterFirstSync = embedBatchInputCalls;
+ (manager as unknown as { dirty: boolean }).dirty = true;
+ await manager.sync({ reason: "test" });
+
+ expect(embedBatchInputCalls).toBeGreaterThan(callsAfterFirstSync);
+ const results = await manager.search("image");
+ expect(results.some((result) => result.path.endsWith("diagram.png"))).toBe(true);
+
+ await manager.close?.();
+ });
+
it("keeps dirty false in status-only manager after prior indexing", async () => {
const cfg = createCfg({ storePath: indexStatusPath });
@@ -433,6 +573,82 @@ describe("memory index", () => {
await secondManager.close?.();
});
+ it("reindexes when extraPaths change", async () => {
+ const storePath = path.join(workspaceDir, `index-scope-extra-${randomUUID()}.sqlite`);
+ const firstExtraDir = path.join(workspaceDir, "scope-extra-a");
+ const secondExtraDir = path.join(workspaceDir, "scope-extra-b");
+ await fs.rm(firstExtraDir, { recursive: true, force: true });
+ await fs.rm(secondExtraDir, { recursive: true, force: true });
+ await fs.mkdir(firstExtraDir, { recursive: true });
+ await fs.mkdir(secondExtraDir, { recursive: true });
+ await fs.writeFile(path.join(firstExtraDir, "a.md"), "alpha only");
+ await fs.writeFile(path.join(secondExtraDir, "b.md"), "beta only");
+
+ const first = await getMemorySearchManager({
+ cfg: createCfg({
+ storePath,
+ extraPaths: [firstExtraDir],
+ }),
+ agentId: "main",
+ });
+ const firstManager = requireManager(first);
+ await firstManager.sync?.({ reason: "test" });
+ await firstManager.close?.();
+
+ const second = await getMemorySearchManager({
+ cfg: createCfg({
+ storePath,
+ extraPaths: [secondExtraDir],
+ }),
+ agentId: "main",
+ });
+ const secondManager = requireManager(second);
+ await secondManager.sync?.({ reason: "test" });
+ const results = await secondManager.search("beta");
+ expect(results.some((result) => result.path.endsWith("scope-extra-b/b.md"))).toBe(true);
+ expect(results.some((result) => result.path.endsWith("scope-extra-a/a.md"))).toBe(false);
+ await secondManager.close?.();
+ });
+
+ it("reindexes when multimodal settings change", async () => {
+ const storePath = path.join(workspaceDir, `index-scope-multimodal-${randomUUID()}.sqlite`);
+ const mediaDir = path.join(workspaceDir, "scope-media");
+ await fs.rm(mediaDir, { recursive: true, force: true });
+ await fs.mkdir(mediaDir, { recursive: true });
+ await fs.writeFile(path.join(mediaDir, "diagram.png"), Buffer.from("png"));
+
+ const first = await getMemorySearchManager({
+ cfg: createCfg({
+ storePath,
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ extraPaths: [mediaDir],
+ }),
+ agentId: "main",
+ });
+ const firstManager = requireManager(first);
+ await firstManager.sync?.({ reason: "test" });
+ const multimodalCallsAfterFirstSync = embedBatchInputCalls;
+ await firstManager.close?.();
+
+ const second = await getMemorySearchManager({
+ cfg: createCfg({
+ storePath,
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ extraPaths: [mediaDir],
+ multimodal: { enabled: true, modalities: ["image"] },
+ }),
+ agentId: "main",
+ });
+ const secondManager = requireManager(second);
+ await secondManager.sync?.({ reason: "test" });
+ expect(embedBatchInputCalls).toBeGreaterThan(multimodalCallsAfterFirstSync);
+ const results = await secondManager.search("image");
+ expect(results.some((result) => result.path.endsWith("scope-media/diagram.png"))).toBe(true);
+ await secondManager.close?.();
+ });
+
it("reuses cached embeddings on forced reindex", async () => {
const cfg = createCfg({ storePath: indexMainPath, cacheEnabled: true });
const manager = await getPersistentManager(cfg);
diff --git a/src/memory/internal.test.ts b/src/memory/internal.test.ts
index 0f17843a88d..d18120b413a 100644
--- a/src/memory/internal.test.ts
+++ b/src/memory/internal.test.ts
@@ -3,12 +3,17 @@ import os from "node:os";
import path from "node:path";
import { afterEach, beforeEach, describe, expect, it } from "vitest";
import {
+ buildMultimodalChunkForIndexing,
buildFileEntry,
chunkMarkdown,
listMemoryFiles,
normalizeExtraMemoryPaths,
remapChunkLines,
} from "./internal.js";
+import {
+ DEFAULT_MEMORY_MULTIMODAL_MAX_FILE_BYTES,
+ type MemoryMultimodalSettings,
+} from "./multimodal.js";
function setupTempDirLifecycle(prefix: string): () => string {
let tmpDir = "";
@@ -38,6 +43,11 @@ describe("normalizeExtraMemoryPaths", () => {
describe("listMemoryFiles", () => {
const getTmpDir = setupTempDirLifecycle("memory-test-");
+ const multimodal: MemoryMultimodalSettings = {
+ enabled: true,
+ modalities: ["image", "audio"],
+ maxFileBytes: DEFAULT_MEMORY_MULTIMODAL_MAX_FILE_BYTES,
+ };
it("includes files from additional paths (directory)", async () => {
const tmpDir = getTmpDir();
@@ -131,10 +141,29 @@ describe("listMemoryFiles", () => {
const memoryMatches = files.filter((file) => file.endsWith("MEMORY.md"));
expect(memoryMatches).toHaveLength(1);
});
+
+ it("includes image and audio files from extra paths when multimodal is enabled", async () => {
+ const tmpDir = getTmpDir();
+ const extraDir = path.join(tmpDir, "media");
+ await fs.mkdir(extraDir, { recursive: true });
+ await fs.writeFile(path.join(extraDir, "diagram.png"), Buffer.from("png"));
+ await fs.writeFile(path.join(extraDir, "note.wav"), Buffer.from("wav"));
+ await fs.writeFile(path.join(extraDir, "ignore.bin"), Buffer.from("bin"));
+
+ const files = await listMemoryFiles(tmpDir, [extraDir], multimodal);
+ expect(files.some((file) => file.endsWith("diagram.png"))).toBe(true);
+ expect(files.some((file) => file.endsWith("note.wav"))).toBe(true);
+ expect(files.some((file) => file.endsWith("ignore.bin"))).toBe(false);
+ });
});
describe("buildFileEntry", () => {
const getTmpDir = setupTempDirLifecycle("memory-build-entry-");
+ const multimodal: MemoryMultimodalSettings = {
+ enabled: true,
+ modalities: ["image", "audio"],
+ maxFileBytes: DEFAULT_MEMORY_MULTIMODAL_MAX_FILE_BYTES,
+ };
it("returns null when the file disappears before reading", async () => {
const tmpDir = getTmpDir();
@@ -154,6 +183,59 @@ describe("buildFileEntry", () => {
expect(entry?.path).toBe("note.md");
expect(entry?.size).toBeGreaterThan(0);
});
+
+ it("returns multimodal metadata for eligible image files", async () => {
+ const tmpDir = getTmpDir();
+ const target = path.join(tmpDir, "diagram.png");
+ await fs.writeFile(target, Buffer.from("png"));
+
+ const entry = await buildFileEntry(target, tmpDir, multimodal);
+
+ expect(entry).toMatchObject({
+ path: "diagram.png",
+ kind: "multimodal",
+ modality: "image",
+ mimeType: "image/png",
+ contentText: "Image file: diagram.png",
+ });
+ });
+
+ it("builds a multimodal chunk lazily for indexing", async () => {
+ const tmpDir = getTmpDir();
+ const target = path.join(tmpDir, "diagram.png");
+ await fs.writeFile(target, Buffer.from("png"));
+
+ const entry = await buildFileEntry(target, tmpDir, multimodal);
+ const built = await buildMultimodalChunkForIndexing(entry!);
+
+ expect(built?.chunk.embeddingInput?.parts).toEqual([
+ { type: "text", text: "Image file: diagram.png" },
+ expect.objectContaining({ type: "inline-data", mimeType: "image/png" }),
+ ]);
+ expect(built?.structuredInputBytes).toBeGreaterThan(0);
+ });
+
+ it("skips lazy multimodal indexing when the file grows after discovery", async () => {
+ const tmpDir = getTmpDir();
+ const target = path.join(tmpDir, "diagram.png");
+ await fs.writeFile(target, Buffer.from("png"));
+
+ const entry = await buildFileEntry(target, tmpDir, multimodal);
+ await fs.writeFile(target, Buffer.alloc(entry!.size + 32, 1));
+
+ await expect(buildMultimodalChunkForIndexing(entry!)).resolves.toBeNull();
+ });
+
+ it("skips lazy multimodal indexing when file bytes change after discovery", async () => {
+ const tmpDir = getTmpDir();
+ const target = path.join(tmpDir, "diagram.png");
+ await fs.writeFile(target, Buffer.from("png"));
+
+ const entry = await buildFileEntry(target, tmpDir, multimodal);
+ await fs.writeFile(target, Buffer.from("gif"));
+
+ await expect(buildMultimodalChunkForIndexing(entry!)).resolves.toBeNull();
+ });
});
describe("chunkMarkdown", () => {
diff --git a/src/memory/internal.ts b/src/memory/internal.ts
index d39e355d2c0..d1d7e9c2e96 100644
--- a/src/memory/internal.ts
+++ b/src/memory/internal.ts
@@ -2,8 +2,17 @@ import crypto from "node:crypto";
import fsSync from "node:fs";
import fs from "node:fs/promises";
import path from "node:path";
+import { detectMime } from "../media/mime.js";
import { runTasksWithConcurrency } from "../utils/run-with-concurrency.js";
+import { estimateStructuredEmbeddingInputBytes } from "./embedding-input-limits.js";
+import { buildTextEmbeddingInput, type EmbeddingInput } from "./embedding-inputs.js";
import { isFileMissingError } from "./fs-utils.js";
+import {
+ buildMemoryMultimodalLabel,
+ classifyMemoryMultimodalPath,
+ type MemoryMultimodalModality,
+ type MemoryMultimodalSettings,
+} from "./multimodal.js";
export type MemoryFileEntry = {
path: string;
@@ -11,6 +20,11 @@ export type MemoryFileEntry = {
mtimeMs: number;
size: number;
hash: string;
+ dataHash?: string;
+ kind?: "markdown" | "multimodal";
+ contentText?: string;
+ modality?: MemoryMultimodalModality;
+ mimeType?: string;
};
export type MemoryChunk = {
@@ -18,6 +32,18 @@ export type MemoryChunk = {
endLine: number;
text: string;
hash: string;
+ embeddingInput?: EmbeddingInput;
+};
+
+export type MultimodalMemoryChunk = {
+ chunk: MemoryChunk;
+ structuredInputBytes: number;
+};
+
+const DISABLED_MULTIMODAL_SETTINGS: MemoryMultimodalSettings = {
+ enabled: false,
+ modalities: [],
+ maxFileBytes: 0,
};
export function ensureDir(dir: string): string {
@@ -56,7 +82,16 @@ export function isMemoryPath(relPath: string): boolean {
return normalized.startsWith("memory/");
}
-async function walkDir(dir: string, files: string[]) {
+function isAllowedMemoryFilePath(filePath: string, multimodal?: MemoryMultimodalSettings): boolean {
+ if (filePath.endsWith(".md")) {
+ return true;
+ }
+ return (
+ classifyMemoryMultimodalPath(filePath, multimodal ?? DISABLED_MULTIMODAL_SETTINGS) !== null
+ );
+}
+
+async function walkDir(dir: string, files: string[], multimodal?: MemoryMultimodalSettings) {
const entries = await fs.readdir(dir, { withFileTypes: true });
for (const entry of entries) {
const full = path.join(dir, entry.name);
@@ -64,13 +99,13 @@ async function walkDir(dir: string, files: string[]) {
continue;
}
if (entry.isDirectory()) {
- await walkDir(full, files);
+ await walkDir(full, files, multimodal);
continue;
}
if (!entry.isFile()) {
continue;
}
- if (!entry.name.endsWith(".md")) {
+ if (!isAllowedMemoryFilePath(full, multimodal)) {
continue;
}
files.push(full);
@@ -80,6 +115,7 @@ async function walkDir(dir: string, files: string[]) {
export async function listMemoryFiles(
workspaceDir: string,
extraPaths?: string[],
+ multimodal?: MemoryMultimodalSettings,
): Promise {
const result: string[] = [];
const memoryFile = path.join(workspaceDir, "MEMORY.md");
@@ -117,10 +153,10 @@ export async function listMemoryFiles(
continue;
}
if (stat.isDirectory()) {
- await walkDir(inputPath, result);
+ await walkDir(inputPath, result, multimodal);
continue;
}
- if (stat.isFile() && inputPath.endsWith(".md")) {
+ if (stat.isFile() && isAllowedMemoryFilePath(inputPath, multimodal)) {
result.push(inputPath);
}
} catch {}
@@ -152,6 +188,7 @@ export function hashText(value: string): string {
export async function buildFileEntry(
absPath: string,
workspaceDir: string,
+ multimodal?: MemoryMultimodalSettings,
): Promise {
let stat;
try {
@@ -162,6 +199,49 @@ export async function buildFileEntry(
}
throw err;
}
+ const normalizedPath = path.relative(workspaceDir, absPath).replace(/\\/g, "/");
+ const multimodalSettings = multimodal ?? DISABLED_MULTIMODAL_SETTINGS;
+ const modality = classifyMemoryMultimodalPath(absPath, multimodalSettings);
+ if (modality) {
+ if (stat.size > multimodalSettings.maxFileBytes) {
+ return null;
+ }
+ let buffer: Buffer;
+ try {
+ buffer = await fs.readFile(absPath);
+ } catch (err) {
+ if (isFileMissingError(err)) {
+ return null;
+ }
+ throw err;
+ }
+ const mimeType = await detectMime({ buffer: buffer.subarray(0, 512), filePath: absPath });
+ if (!mimeType || !mimeType.startsWith(`${modality}/`)) {
+ return null;
+ }
+ const contentText = buildMemoryMultimodalLabel(modality, normalizedPath);
+ const dataHash = crypto.createHash("sha256").update(buffer).digest("hex");
+ const chunkHash = hashText(
+ JSON.stringify({
+ path: normalizedPath,
+ contentText,
+ mimeType,
+ dataHash,
+ }),
+ );
+ return {
+ path: normalizedPath,
+ absPath,
+ mtimeMs: stat.mtimeMs,
+ size: stat.size,
+ hash: chunkHash,
+ dataHash,
+ kind: "multimodal",
+ contentText,
+ modality,
+ mimeType,
+ };
+ }
let content: string;
try {
content = await fs.readFile(absPath, "utf-8");
@@ -173,11 +253,81 @@ export async function buildFileEntry(
}
const hash = hashText(content);
return {
- path: path.relative(workspaceDir, absPath).replace(/\\/g, "/"),
+ path: normalizedPath,
absPath,
mtimeMs: stat.mtimeMs,
size: stat.size,
hash,
+ kind: "markdown",
+ };
+}
+
+async function loadMultimodalEmbeddingInput(
+ entry: Pick<
+ MemoryFileEntry,
+ "absPath" | "contentText" | "mimeType" | "kind" | "size" | "dataHash"
+ >,
+): Promise {
+ if (entry.kind !== "multimodal" || !entry.contentText || !entry.mimeType) {
+ return null;
+ }
+ let stat;
+ try {
+ stat = await fs.stat(entry.absPath);
+ } catch (err) {
+ if (isFileMissingError(err)) {
+ return null;
+ }
+ throw err;
+ }
+ if (stat.size !== entry.size) {
+ return null;
+ }
+ let buffer: Buffer;
+ try {
+ buffer = await fs.readFile(entry.absPath);
+ } catch (err) {
+ if (isFileMissingError(err)) {
+ return null;
+ }
+ throw err;
+ }
+ const dataHash = crypto.createHash("sha256").update(buffer).digest("hex");
+ if (entry.dataHash && entry.dataHash !== dataHash) {
+ return null;
+ }
+ return {
+ text: entry.contentText,
+ parts: [
+ { type: "text", text: entry.contentText },
+ {
+ type: "inline-data",
+ mimeType: entry.mimeType,
+ data: buffer.toString("base64"),
+ },
+ ],
+ };
+}
+
+export async function buildMultimodalChunkForIndexing(
+ entry: Pick<
+ MemoryFileEntry,
+ "absPath" | "contentText" | "mimeType" | "kind" | "hash" | "size" | "dataHash"
+ >,
+): Promise {
+ const embeddingInput = await loadMultimodalEmbeddingInput(entry);
+ if (!embeddingInput) {
+ return null;
+ }
+ return {
+ chunk: {
+ startLine: 1,
+ endLine: 1,
+ text: entry.contentText ?? embeddingInput.text,
+ hash: entry.hash,
+ embeddingInput,
+ },
+ structuredInputBytes: estimateStructuredEmbeddingInputBytes(embeddingInput),
};
}
@@ -213,6 +363,7 @@ export function chunkMarkdown(
endLine,
text,
hash: hashText(text),
+ embeddingInput: buildTextEmbeddingInput(text),
});
};
diff --git a/src/memory/manager-embedding-ops.ts b/src/memory/manager-embedding-ops.ts
index bcc653fda7a..49171d809cb 100644
--- a/src/memory/manager-embedding-ops.ts
+++ b/src/memory/manager-embedding-ops.ts
@@ -8,9 +8,14 @@ import {
} from "./batch-openai.js";
import { type VoyageBatchRequest, runVoyageEmbeddingBatches } from "./batch-voyage.js";
import { enforceEmbeddingMaxInputTokens } from "./embedding-chunk-limits.js";
-import { estimateUtf8Bytes } from "./embedding-input-limits.js";
-import { buildGeminiTextEmbeddingRequest } from "./embeddings-gemini.js";
import {
+ estimateStructuredEmbeddingInputBytes,
+ estimateUtf8Bytes,
+} from "./embedding-input-limits.js";
+import { type EmbeddingInput, hasNonTextEmbeddingParts } from "./embedding-inputs.js";
+import { buildGeminiEmbeddingRequest } from "./embeddings-gemini.js";
+import {
+ buildMultimodalChunkForIndexing,
chunkMarkdown,
hashText,
parseEmbedding,
@@ -53,7 +58,9 @@ export abstract class MemoryManagerEmbeddingOps extends MemoryManagerSyncOps {
let currentTokens = 0;
for (const chunk of chunks) {
- const estimate = estimateUtf8Bytes(chunk.text);
+ const estimate = chunk.embeddingInput
+ ? estimateStructuredEmbeddingInputBytes(chunk.embeddingInput)
+ : estimateUtf8Bytes(chunk.text);
const wouldExceed =
current.length > 0 && currentTokens + estimate > EMBEDDING_BATCH_MAX_TOKENS;
if (wouldExceed) {
@@ -188,9 +195,22 @@ export abstract class MemoryManagerEmbeddingOps extends MemoryManagerSyncOps {
const missingChunks = missing.map((m) => m.chunk);
const batches = this.buildEmbeddingBatches(missingChunks);
const toCache: Array<{ hash: string; embedding: number[] }> = [];
+ const provider = this.provider;
+ if (!provider) {
+ throw new Error("Cannot embed batch in FTS-only mode (no embedding provider)");
+ }
let cursor = 0;
for (const batch of batches) {
- const batchEmbeddings = await this.embedBatchWithRetry(batch.map((chunk) => chunk.text));
+ const inputs = batch.map((chunk) => chunk.embeddingInput ?? { text: chunk.text });
+ const hasStructuredInputs = inputs.some((input) => hasNonTextEmbeddingParts(input));
+ if (hasStructuredInputs && !provider.embedBatchInputs) {
+ throw new Error(
+ `Embedding provider "${provider.id}" does not support multimodal memory inputs.`,
+ );
+ }
+ const batchEmbeddings = hasStructuredInputs
+ ? await this.embedBatchInputsWithRetry(inputs)
+ : await this.embedBatchWithRetry(batch.map((chunk) => chunk.text));
for (let i = 0; i < batch.length; i += 1) {
const item = missing[cursor + i];
const embedding = batchEmbeddings[i] ?? [];
@@ -476,6 +496,9 @@ export abstract class MemoryManagerEmbeddingOps extends MemoryManagerSyncOps {
source: MemorySource,
): Promise {
const gemini = this.gemini;
+ if (chunks.some((chunk) => hasNonTextEmbeddingParts(chunk.embeddingInput))) {
+ return await this.embedChunksInBatches(chunks);
+ }
return await this.embedChunksWithProviderBatch({
chunks,
entry,
@@ -483,9 +506,10 @@ export abstract class MemoryManagerEmbeddingOps extends MemoryManagerSyncOps {
provider: "gemini",
enabled: Boolean(gemini),
buildRequest: (chunk) => ({
- request: buildGeminiTextEmbeddingRequest({
- text: chunk.text,
+ request: buildGeminiEmbeddingRequest({
+ input: chunk.embeddingInput ?? { text: chunk.text },
taskType: "RETRIEVAL_DOCUMENT",
+ modelPath: this.gemini?.modelPath,
outputDimensionality: this.gemini?.outputDimensionality,
}),
}),
@@ -536,6 +560,45 @@ export abstract class MemoryManagerEmbeddingOps extends MemoryManagerSyncOps {
}
}
+ protected async embedBatchInputsWithRetry(inputs: EmbeddingInput[]): Promise {
+ if (inputs.length === 0) {
+ return [];
+ }
+ if (!this.provider?.embedBatchInputs) {
+ return await this.embedBatchWithRetry(inputs.map((input) => input.text));
+ }
+ let attempt = 0;
+ let delayMs = EMBEDDING_RETRY_BASE_DELAY_MS;
+ while (true) {
+ try {
+ const timeoutMs = this.resolveEmbeddingTimeout("batch");
+ log.debug("memory embeddings: structured batch start", {
+ provider: this.provider.id,
+ items: inputs.length,
+ timeoutMs,
+ });
+ return await this.withTimeout(
+ this.provider.embedBatchInputs(inputs),
+ 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) {
+ throw err;
+ }
+ const waitMs = Math.min(
+ EMBEDDING_RETRY_MAX_DELAY_MS,
+ Math.round(delayMs * (1 + Math.random() * 0.2)),
+ );
+ log.warn(`memory embeddings rate limited; retrying structured batch in ${waitMs}ms`);
+ await new Promise((resolve) => setTimeout(resolve, waitMs));
+ delayMs *= 2;
+ attempt += 1;
+ }
+ }
+ }
+
private isRetryableEmbeddingError(message: string): boolean {
return /(rate[_ ]limit|too many requests|429|resource has been exhausted|5\d\d|cloudflare|tokens per day)/i.test(
message,
@@ -695,6 +758,49 @@ export abstract class MemoryManagerEmbeddingOps extends MemoryManagerSyncOps {
return this.batch.enabled ? this.batch.concurrency : EMBEDDING_INDEX_CONCURRENCY;
}
+ private clearIndexedFileData(pathname: string, source: MemorySource): void {
+ if (this.vector.enabled) {
+ try {
+ this.db
+ .prepare(
+ `DELETE FROM ${VECTOR_TABLE} WHERE id IN (SELECT id FROM chunks WHERE path = ? AND source = ?)`,
+ )
+ .run(pathname, source);
+ } catch {}
+ }
+ if (this.fts.enabled && this.fts.available && this.provider) {
+ try {
+ this.db
+ .prepare(`DELETE FROM ${FTS_TABLE} WHERE path = ? AND source = ? AND model = ?`)
+ .run(pathname, source, this.provider.model);
+ } catch {}
+ }
+ this.db.prepare(`DELETE FROM chunks WHERE path = ? AND source = ?`).run(pathname, source);
+ }
+
+ private upsertFileRecord(entry: MemoryFileEntry | SessionFileEntry, source: MemorySource): void {
+ this.db
+ .prepare(
+ `INSERT INTO files (path, source, hash, mtime, size) VALUES (?, ?, ?, ?, ?)
+ ON CONFLICT(path) DO UPDATE SET
+ source=excluded.source,
+ hash=excluded.hash,
+ mtime=excluded.mtime,
+ size=excluded.size`,
+ )
+ .run(entry.path, source, entry.hash, entry.mtimeMs, entry.size);
+ }
+
+ private deleteFileRecord(pathname: string, source: MemorySource): void {
+ this.db.prepare(`DELETE FROM files WHERE path = ? AND source = ?`).run(pathname, source);
+ }
+
+ private isStructuredInputTooLargeError(message: string): boolean {
+ return /(413|payload too large|request too large|input too large|too many tokens|input limit|request size)/i.test(
+ message,
+ );
+ }
+
protected async indexFile(
entry: MemoryFileEntry | SessionFileEntry,
options: { source: MemorySource; content?: string },
@@ -708,42 +814,59 @@ export abstract class MemoryManagerEmbeddingOps extends MemoryManagerSyncOps {
return;
}
- const content = options.content ?? (await fs.readFile(entry.absPath, "utf-8"));
- const chunks = enforceEmbeddingMaxInputTokens(
- this.provider,
- chunkMarkdown(content, this.settings.chunking).filter(
- (chunk) => chunk.text.trim().length > 0,
- ),
- EMBEDDING_BATCH_MAX_TOKENS,
- );
- if (options.source === "sessions" && "lineMap" in entry) {
- remapChunkLines(chunks, entry.lineMap);
+ let chunks: MemoryChunk[];
+ let structuredInputBytes: number | undefined;
+ if ("kind" in entry && entry.kind === "multimodal") {
+ const multimodalChunk = await buildMultimodalChunkForIndexing(entry);
+ if (!multimodalChunk) {
+ this.clearIndexedFileData(entry.path, options.source);
+ this.deleteFileRecord(entry.path, options.source);
+ return;
+ }
+ structuredInputBytes = multimodalChunk.structuredInputBytes;
+ chunks = [multimodalChunk.chunk];
+ } else {
+ const content = options.content ?? (await fs.readFile(entry.absPath, "utf-8"));
+ chunks = enforceEmbeddingMaxInputTokens(
+ this.provider,
+ chunkMarkdown(content, this.settings.chunking).filter(
+ (chunk) => chunk.text.trim().length > 0,
+ ),
+ EMBEDDING_BATCH_MAX_TOKENS,
+ );
+ if (options.source === "sessions" && "lineMap" in entry) {
+ remapChunkLines(chunks, entry.lineMap);
+ }
+ }
+ let embeddings: number[][];
+ try {
+ embeddings = this.batch.enabled
+ ? await this.embedChunksWithBatch(chunks, entry, options.source)
+ : await this.embedChunksInBatches(chunks);
+ } catch (err) {
+ const message = err instanceof Error ? err.message : String(err);
+ if (
+ "kind" in entry &&
+ entry.kind === "multimodal" &&
+ this.isStructuredInputTooLargeError(message)
+ ) {
+ log.warn("memory embeddings: skipping multimodal file rejected as too large", {
+ path: entry.path,
+ bytes: structuredInputBytes,
+ provider: this.provider.id,
+ model: this.provider.model,
+ error: message,
+ });
+ this.clearIndexedFileData(entry.path, options.source);
+ this.upsertFileRecord(entry, options.source);
+ return;
+ }
+ throw err;
}
- const embeddings = this.batch.enabled
- ? await this.embedChunksWithBatch(chunks, entry, options.source)
- : await this.embedChunksInBatches(chunks);
const sample = embeddings.find((embedding) => embedding.length > 0);
const vectorReady = sample ? await this.ensureVectorReady(sample.length) : false;
const now = Date.now();
- if (vectorReady) {
- try {
- this.db
- .prepare(
- `DELETE FROM ${VECTOR_TABLE} WHERE id IN (SELECT id FROM chunks WHERE path = ? AND source = ?)`,
- )
- .run(entry.path, options.source);
- } catch {}
- }
- if (this.fts.enabled && this.fts.available) {
- try {
- this.db
- .prepare(`DELETE FROM ${FTS_TABLE} WHERE path = ? AND source = ? AND model = ?`)
- .run(entry.path, options.source, this.provider.model);
- } catch {}
- }
- this.db
- .prepare(`DELETE FROM chunks WHERE path = ? AND source = ?`)
- .run(entry.path, options.source);
+ this.clearIndexedFileData(entry.path, options.source);
for (let i = 0; i < chunks.length; i++) {
const chunk = chunks[i];
const embedding = embeddings[i] ?? [];
@@ -798,15 +921,6 @@ export abstract class MemoryManagerEmbeddingOps extends MemoryManagerSyncOps {
);
}
}
- this.db
- .prepare(
- `INSERT INTO files (path, source, hash, mtime, size) VALUES (?, ?, ?, ?, ?)
- ON CONFLICT(path) DO UPDATE SET
- source=excluded.source,
- hash=excluded.hash,
- mtime=excluded.mtime,
- size=excluded.size`,
- )
- .run(entry.path, options.source, entry.hash, entry.mtimeMs, entry.size);
+ this.upsertFileRecord(entry, options.source);
}
}
diff --git a/src/memory/manager-sync-ops.ts b/src/memory/manager-sync-ops.ts
index 7bdf8fcdd2e..6fd3e6bb9c0 100644
--- a/src/memory/manager-sync-ops.ts
+++ b/src/memory/manager-sync-ops.ts
@@ -29,12 +29,18 @@ import { isFileMissingError } from "./fs-utils.js";
import {
buildFileEntry,
ensureDir,
+ hashText,
listMemoryFiles,
normalizeExtraMemoryPaths,
runWithConcurrency,
} from "./internal.js";
import { type MemoryFileEntry } from "./internal.js";
import { ensureMemoryIndexSchema } from "./memory-schema.js";
+import {
+ buildCaseInsensitiveExtensionGlob,
+ classifyMemoryMultimodalPath,
+ getMemoryMultimodalExtensions,
+} from "./multimodal.js";
import type { SessionFileEntry } from "./session-files.js";
import {
buildSessionEntry,
@@ -50,6 +56,7 @@ type MemoryIndexMeta = {
provider: string;
providerKey?: string;
sources?: MemorySource[];
+ scopeHash?: string;
chunkTokens: number;
chunkOverlap: number;
vectorDims?: number;
@@ -383,9 +390,22 @@ export abstract class MemoryManagerSyncOps {
}
if (stat.isDirectory()) {
watchPaths.add(path.join(entry, "**", "*.md"));
+ if (this.settings.multimodal.enabled) {
+ for (const modality of this.settings.multimodal.modalities) {
+ for (const extension of getMemoryMultimodalExtensions(modality)) {
+ watchPaths.add(
+ path.join(entry, "**", buildCaseInsensitiveExtensionGlob(extension)),
+ );
+ }
+ }
+ }
continue;
}
- if (stat.isFile() && entry.toLowerCase().endsWith(".md")) {
+ if (
+ stat.isFile() &&
+ (entry.toLowerCase().endsWith(".md") ||
+ classifyMemoryMultimodalPath(entry, this.settings.multimodal) !== null)
+ ) {
watchPaths.add(entry);
}
} catch {
@@ -649,9 +669,19 @@ export abstract class MemoryManagerSyncOps {
return;
}
- const files = await listMemoryFiles(this.workspaceDir, this.settings.extraPaths);
+ const files = await listMemoryFiles(
+ this.workspaceDir,
+ this.settings.extraPaths,
+ this.settings.multimodal,
+ );
const fileEntries = (
- await Promise.all(files.map(async (file) => buildFileEntry(file, this.workspaceDir)))
+ await runWithConcurrency(
+ files.map(
+ (file) => async () =>
+ await buildFileEntry(file, this.workspaceDir, this.settings.multimodal),
+ ),
+ this.getIndexConcurrency(),
+ )
).filter((entry): entry is MemoryFileEntry => entry !== null);
log.debug("memory sync: indexing memory files", {
files: fileEntries.length,
@@ -868,6 +898,7 @@ export abstract class MemoryManagerSyncOps {
const vectorReady = await this.ensureVectorReady();
const meta = this.readMeta();
const configuredSources = this.resolveConfiguredSourcesForMeta();
+ const configuredScopeHash = this.resolveConfiguredScopeHash();
const needsFullReindex =
params?.force ||
!meta ||
@@ -875,6 +906,7 @@ export abstract class MemoryManagerSyncOps {
(this.provider && meta.provider !== this.provider.id) ||
meta.providerKey !== this.providerKey ||
this.metaSourcesDiffer(meta, configuredSources) ||
+ meta.scopeHash !== configuredScopeHash ||
meta.chunkTokens !== this.settings.chunking.tokens ||
meta.chunkOverlap !== this.settings.chunking.overlap ||
(vectorReady && !meta?.vectorDims);
@@ -1088,6 +1120,7 @@ export abstract class MemoryManagerSyncOps {
provider: this.provider?.id ?? "none",
providerKey: this.providerKey!,
sources: this.resolveConfiguredSourcesForMeta(),
+ scopeHash: this.resolveConfiguredScopeHash(),
chunkTokens: this.settings.chunking.tokens,
chunkOverlap: this.settings.chunking.overlap,
};
@@ -1159,6 +1192,7 @@ export abstract class MemoryManagerSyncOps {
provider: this.provider?.id ?? "none",
providerKey: this.providerKey!,
sources: this.resolveConfiguredSourcesForMeta(),
+ scopeHash: this.resolveConfiguredScopeHash(),
chunkTokens: this.settings.chunking.tokens,
chunkOverlap: this.settings.chunking.overlap,
};
@@ -1236,6 +1270,22 @@ export abstract class MemoryManagerSyncOps {
return normalized.length > 0 ? normalized : ["memory"];
}
+ private resolveConfiguredScopeHash(): string {
+ const extraPaths = normalizeExtraMemoryPaths(this.workspaceDir, this.settings.extraPaths)
+ .map((value) => value.replace(/\\/g, "/"))
+ .toSorted();
+ return hashText(
+ JSON.stringify({
+ extraPaths,
+ multimodal: {
+ enabled: this.settings.multimodal.enabled,
+ modalities: [...this.settings.multimodal.modalities].toSorted(),
+ maxFileBytes: this.settings.multimodal.maxFileBytes,
+ },
+ }),
+ );
+ }
+
private metaSourcesDiffer(meta: MemoryIndexMeta, configuredSources: MemorySource[]): boolean {
const metaSources = this.normalizeMetaSources(meta);
if (metaSources.length !== configuredSources.length) {
diff --git a/src/memory/manager.watcher-config.test.ts b/src/memory/manager.watcher-config.test.ts
index 77221df34b6..43682183676 100644
--- a/src/memory/manager.watcher-config.test.ts
+++ b/src/memory/manager.watcher-config.test.ts
@@ -106,4 +106,50 @@ describe("memory watcher config", () => {
expect(ignored?.(path.join(workspaceDir, "memory", ".venv", "lib", "python.md"))).toBe(true);
expect(ignored?.(path.join(workspaceDir, "memory", "project", "notes.md"))).toBe(false);
});
+
+ it("watches multimodal extensions with case-insensitive globs", async () => {
+ workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-memory-watch-"));
+ extraDir = path.join(workspaceDir, "extra");
+ await fs.mkdir(path.join(workspaceDir, "memory"), { recursive: true });
+ await fs.mkdir(extraDir, { recursive: true });
+ await fs.writeFile(path.join(extraDir, "PHOTO.PNG"), "png");
+
+ const cfg = {
+ agents: {
+ defaults: {
+ workspace: workspaceDir,
+ memorySearch: {
+ provider: "gemini",
+ model: "gemini-embedding-2-preview",
+ fallback: "none",
+ store: { path: path.join(workspaceDir, "index.sqlite"), vector: { enabled: false } },
+ sync: { watch: true, watchDebounceMs: 25, onSessionStart: false, onSearch: false },
+ query: { minScore: 0, hybrid: { enabled: false } },
+ extraPaths: [extraDir],
+ multimodal: { enabled: true, modalities: ["image", "audio"] },
+ },
+ },
+ list: [{ id: "main", default: true }],
+ },
+ } as OpenClawConfig;
+
+ const result = await getMemorySearchManager({ cfg, agentId: "main" });
+ expect(result.manager).not.toBeNull();
+ if (!result.manager) {
+ throw new Error("manager missing");
+ }
+ manager = result.manager as unknown as MemoryIndexManager;
+
+ expect(watchMock).toHaveBeenCalledTimes(1);
+ const [watchedPaths] = watchMock.mock.calls[0] as unknown as [
+ string[],
+ Record,
+ ];
+ expect(watchedPaths).toEqual(
+ expect.arrayContaining([
+ path.join(extraDir, "**", "*.[pP][nN][gG]"),
+ path.join(extraDir, "**", "*.[wW][aA][vV]"),
+ ]),
+ );
+ });
});
diff --git a/src/memory/multimodal.ts b/src/memory/multimodal.ts
new file mode 100644
index 00000000000..df72ed8c495
--- /dev/null
+++ b/src/memory/multimodal.ts
@@ -0,0 +1,118 @@
+const MEMORY_MULTIMODAL_SPECS = {
+ image: {
+ labelPrefix: "Image file",
+ extensions: [".jpg", ".jpeg", ".png", ".webp", ".gif", ".heic", ".heif"],
+ },
+ audio: {
+ labelPrefix: "Audio file",
+ extensions: [".mp3", ".wav", ".ogg", ".opus", ".m4a", ".aac", ".flac"],
+ },
+} as const;
+
+export type MemoryMultimodalModality = keyof typeof MEMORY_MULTIMODAL_SPECS;
+export const MEMORY_MULTIMODAL_MODALITIES = Object.keys(
+ MEMORY_MULTIMODAL_SPECS,
+) as MemoryMultimodalModality[];
+export type MemoryMultimodalSelection = MemoryMultimodalModality | "all";
+
+export type MemoryMultimodalSettings = {
+ enabled: boolean;
+ modalities: MemoryMultimodalModality[];
+ maxFileBytes: number;
+};
+
+export const DEFAULT_MEMORY_MULTIMODAL_MAX_FILE_BYTES = 10 * 1024 * 1024;
+
+export function normalizeMemoryMultimodalModalities(
+ raw: MemoryMultimodalSelection[] | undefined,
+): MemoryMultimodalModality[] {
+ if (raw === undefined || raw.includes("all")) {
+ return [...MEMORY_MULTIMODAL_MODALITIES];
+ }
+ const normalized = new Set();
+ for (const value of raw) {
+ if (value === "image" || value === "audio") {
+ normalized.add(value);
+ }
+ }
+ return Array.from(normalized);
+}
+
+export function normalizeMemoryMultimodalSettings(raw: {
+ enabled?: boolean;
+ modalities?: MemoryMultimodalSelection[];
+ maxFileBytes?: number;
+}): MemoryMultimodalSettings {
+ const enabled = raw.enabled === true;
+ const maxFileBytes =
+ typeof raw.maxFileBytes === "number" && Number.isFinite(raw.maxFileBytes)
+ ? Math.max(1, Math.floor(raw.maxFileBytes))
+ : DEFAULT_MEMORY_MULTIMODAL_MAX_FILE_BYTES;
+ return {
+ enabled,
+ modalities: enabled ? normalizeMemoryMultimodalModalities(raw.modalities) : [],
+ maxFileBytes,
+ };
+}
+
+export function isMemoryMultimodalEnabled(settings: MemoryMultimodalSettings): boolean {
+ return settings.enabled && settings.modalities.length > 0;
+}
+
+export function getMemoryMultimodalExtensions(
+ modality: MemoryMultimodalModality,
+): readonly string[] {
+ return MEMORY_MULTIMODAL_SPECS[modality].extensions;
+}
+
+export function buildMemoryMultimodalLabel(
+ modality: MemoryMultimodalModality,
+ normalizedPath: string,
+): string {
+ return `${MEMORY_MULTIMODAL_SPECS[modality].labelPrefix}: ${normalizedPath}`;
+}
+
+export function buildCaseInsensitiveExtensionGlob(extension: string): string {
+ const normalized = extension.trim().replace(/^\./, "").toLowerCase();
+ if (!normalized) {
+ return "*";
+ }
+ const parts = Array.from(normalized, (char) => `[${char.toLowerCase()}${char.toUpperCase()}]`);
+ return `*.${parts.join("")}`;
+}
+
+export function classifyMemoryMultimodalPath(
+ filePath: string,
+ settings: MemoryMultimodalSettings,
+): MemoryMultimodalModality | null {
+ if (!isMemoryMultimodalEnabled(settings)) {
+ return null;
+ }
+ const lower = filePath.trim().toLowerCase();
+ for (const modality of settings.modalities) {
+ for (const extension of getMemoryMultimodalExtensions(modality)) {
+ if (lower.endsWith(extension)) {
+ return modality;
+ }
+ }
+ }
+ return null;
+}
+
+export function normalizeGeminiEmbeddingModelForMemory(model: string): string {
+ const trimmed = model.trim();
+ if (!trimmed) {
+ return "";
+ }
+ return trimmed.replace(/^models\//, "").replace(/^(gemini|google)\//, "");
+}
+
+export function supportsMemoryMultimodalEmbeddings(params: {
+ provider: string;
+ model: string;
+}): boolean {
+ if (params.provider !== "gemini") {
+ return false;
+ }
+ return normalizeGeminiEmbeddingModelForMemory(params.model) === "gemini-embedding-2-preview";
+}
diff --git a/src/node-host/invoke-system-run-plan.test.ts b/src/node-host/invoke-system-run-plan.test.ts
index c192509197e..3e1736000aa 100644
--- a/src/node-host/invoke-system-run-plan.test.ts
+++ b/src/node-host/invoke-system-run-plan.test.ts
@@ -246,6 +246,38 @@ describe("hardenApprovedExecutionPaths", () => {
initialBody: 'console.log("SAFE");\n',
expectedArgvIndex: 1,
},
+ {
+ name: "tsx direct file",
+ binName: "tsx",
+ argv: ["tsx", "./run.ts"],
+ scriptName: "run.ts",
+ initialBody: 'console.log("SAFE");\n',
+ expectedArgvIndex: 1,
+ },
+ {
+ name: "jiti direct file",
+ binName: "jiti",
+ argv: ["jiti", "./run.ts"],
+ scriptName: "run.ts",
+ initialBody: 'console.log("SAFE");\n',
+ expectedArgvIndex: 1,
+ },
+ {
+ name: "ts-node direct file",
+ binName: "ts-node",
+ argv: ["ts-node", "./run.ts"],
+ scriptName: "run.ts",
+ initialBody: 'console.log("SAFE");\n',
+ expectedArgvIndex: 1,
+ },
+ {
+ name: "vite-node direct file",
+ binName: "vite-node",
+ argv: ["vite-node", "./run.ts"],
+ scriptName: "run.ts",
+ initialBody: 'console.log("SAFE");\n',
+ expectedArgvIndex: 1,
+ },
{
name: "bun direct file",
binName: "bun",
@@ -387,4 +419,26 @@ describe("hardenApprovedExecutionPaths", () => {
},
});
});
+
+ it("rejects tsx eval invocations that do not bind a concrete file", () => {
+ withFakeRuntimeBin({
+ binName: "tsx",
+ run: () => {
+ const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-tsx-eval-"));
+ try {
+ const prepared = buildSystemRunApprovalPlan({
+ command: ["tsx", "--eval", "console.log('SAFE')"],
+ cwd: tmp,
+ });
+ expect(prepared).toEqual({
+ ok: false,
+ message:
+ "SYSTEM_RUN_DENIED: approval cannot safely bind this interpreter/runtime command",
+ });
+ } finally {
+ fs.rmSync(tmp, { recursive: true, force: true });
+ }
+ },
+ });
+ });
});
diff --git a/src/node-host/invoke-system-run-plan.ts b/src/node-host/invoke-system-run-plan.ts
index 606d50e7653..1b46312c3a1 100644
--- a/src/node-host/invoke-system-run-plan.ts
+++ b/src/node-host/invoke-system-run-plan.ts
@@ -33,6 +33,15 @@ const MUTABLE_ARGV1_INTERPRETER_PATTERNS = [
/^ruby$/,
] as const;
+const GENERIC_MUTABLE_SCRIPT_RUNNERS = new Set([
+ "esno",
+ "jiti",
+ "ts-node",
+ "ts-node-esm",
+ "tsx",
+ "vite-node",
+]);
+
const BUN_SUBCOMMANDS = new Set([
"add",
"audit",
@@ -409,6 +418,10 @@ function resolveDenoRunScriptOperandIndex(params: {
});
}
+function isMutableScriptRunner(executable: string): boolean {
+ return GENERIC_MUTABLE_SCRIPT_RUNNERS.has(executable) || isInterpreterLikeSafeBin(executable);
+}
+
function resolveMutableFileOperandIndex(argv: string[], cwd: string | undefined): number | null {
const unwrapped = unwrapArgvForMutableOperand(argv);
const executable = normalizeExecutableToken(unwrapped.argv[0] ?? "");
@@ -443,7 +456,7 @@ function resolveMutableFileOperandIndex(argv: string[], cwd: string | undefined)
return unwrapped.baseIndex + denoIndex;
}
}
- if (!isInterpreterLikeSafeBin(executable)) {
+ if (!isMutableScriptRunner(executable)) {
return null;
}
const genericIndex = resolveGenericInterpreterScriptOperandIndex({
@@ -468,10 +481,10 @@ function requiresStableInterpreterApprovalBindingWithShellCommand(params: {
if ((POSIX_SHELL_WRAPPERS as ReadonlySet).has(executable)) {
return false;
}
- return isInterpreterLikeSafeBin(executable);
+ return isMutableScriptRunner(executable);
}
-function resolveMutableFileOperandSnapshotSync(params: {
+export function resolveMutableFileOperandSnapshotSync(params: {
argv: string[];
cwd: string | undefined;
shellCommand: string | null;
diff --git a/src/node-host/invoke-system-run.test.ts b/src/node-host/invoke-system-run.test.ts
index c4e5bc345f6..d183f9087c3 100644
--- a/src/node-host/invoke-system-run.test.ts
+++ b/src/node-host/invoke-system-run.test.ts
@@ -109,27 +109,50 @@ describe("handleSystemRunInvoke mac app exec host routing", () => {
};
}
- function createRuntimeScriptOperandFixture(params: { tmp: string; runtime: "bun" | "deno" }): {
+ function createRuntimeScriptOperandFixture(params: {
+ tmp: string;
+ runtime: "bun" | "deno" | "jiti" | "tsx";
+ }): {
command: string[];
scriptPath: string;
initialBody: string;
changedBody: string;
} {
const scriptPath = path.join(params.tmp, "run.ts");
- if (params.runtime === "bun") {
- return {
- command: ["bun", "run", "./run.ts"],
- scriptPath,
- initialBody: 'console.log("SAFE");\n',
- changedBody: 'console.log("PWNED");\n',
- };
+ const initialBody = 'console.log("SAFE");\n';
+ const changedBody = 'console.log("PWNED");\n';
+ switch (params.runtime) {
+ case "bun":
+ return {
+ command: ["bun", "run", "./run.ts"],
+ scriptPath,
+ initialBody,
+ changedBody,
+ };
+ case "deno":
+ return {
+ command: ["deno", "run", "-A", "--allow-read", "--", "./run.ts"],
+ scriptPath,
+ initialBody,
+ changedBody,
+ };
+ case "jiti":
+ return {
+ command: ["jiti", "./run.ts"],
+ scriptPath,
+ initialBody,
+ changedBody,
+ };
+ case "tsx":
+ return {
+ command: ["tsx", "./run.ts"],
+ scriptPath,
+ initialBody,
+ changedBody,
+ };
}
- return {
- command: ["deno", "run", "-A", "--allow-read", "--", "./run.ts"],
- scriptPath,
- initialBody: 'console.log("SAFE");\n',
- changedBody: 'console.log("PWNED");\n',
- };
+ const unsupportedRuntime: never = params.runtime;
+ throw new Error(`unsupported runtime fixture: ${String(unsupportedRuntime)}`);
}
function buildNestedEnvShellCommand(params: { depth: number; payload: string }): string[] {
@@ -223,7 +246,7 @@ describe("handleSystemRunInvoke mac app exec host routing", () => {
}
async function withFakeRuntimeOnPath(params: {
- runtime: "bun" | "deno";
+ runtime: "bun" | "deno" | "jiti" | "tsx";
run: () => Promise;
}): Promise {
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), `openclaw-${params.runtime}-path-`));
@@ -842,7 +865,7 @@ describe("handleSystemRunInvoke mac app exec host routing", () => {
}
});
- for (const runtime of ["bun", "deno"] as const) {
+ for (const runtime of ["bun", "deno", "tsx", "jiti"] as const) {
it(`denies approval-based execution when a ${runtime} script operand changes after approval`, async () => {
await withFakeRuntimeOnPath({
runtime,
@@ -926,6 +949,50 @@ describe("handleSystemRunInvoke mac app exec host routing", () => {
});
}
+ it("denies approval-based execution when tsx is missing a required mutable script binding", async () => {
+ await withFakeRuntimeOnPath({
+ runtime: "tsx",
+ run: async () => {
+ const tmp = fs.mkdtempSync(
+ path.join(os.tmpdir(), "openclaw-approval-tsx-missing-binding-"),
+ );
+ const fixture = createRuntimeScriptOperandFixture({ tmp, runtime: "tsx" });
+ fs.writeFileSync(fixture.scriptPath, fixture.initialBody);
+ try {
+ const prepared = buildSystemRunApprovalPlan({
+ command: fixture.command,
+ cwd: tmp,
+ });
+ expect(prepared.ok).toBe(true);
+ if (!prepared.ok) {
+ throw new Error("unreachable");
+ }
+
+ const planWithoutBinding = { ...prepared.plan };
+ delete planWithoutBinding.mutableFileOperand;
+ const { runCommand, sendInvokeResult } = await runSystemInvoke({
+ preferMacAppExecHost: false,
+ command: prepared.plan.argv,
+ rawCommand: prepared.plan.commandText,
+ systemRunPlan: planWithoutBinding,
+ cwd: prepared.plan.cwd ?? tmp,
+ approved: true,
+ security: "full",
+ ask: "off",
+ });
+
+ expect(runCommand).not.toHaveBeenCalled();
+ expectInvokeErrorMessage(sendInvokeResult, {
+ message: "SYSTEM_RUN_DENIED: approval missing script operand binding",
+ exact: true,
+ });
+ } finally {
+ fs.rmSync(tmp, { recursive: true, force: true });
+ }
+ },
+ });
+ });
+
it("denies ./sh wrapper spoof in allowlist on-miss mode before execution", async () => {
const marker = path.join(os.tmpdir(), `openclaw-wrapper-spoof-${process.pid}-${Date.now()}`);
const runCommand = vi.fn(async () => {
diff --git a/src/node-host/invoke-system-run.ts b/src/node-host/invoke-system-run.ts
index 3ed2a30d188..3730e3b2824 100644
--- a/src/node-host/invoke-system-run.ts
+++ b/src/node-host/invoke-system-run.ts
@@ -29,6 +29,7 @@ import {
hardenApprovedExecutionPaths,
revalidateApprovedCwdSnapshot,
revalidateApprovedMutableFileOperand,
+ resolveMutableFileOperandSnapshotSync,
type ApprovedCwdSnapshot,
} from "./invoke-system-run-plan.js";
import type {
@@ -98,6 +99,8 @@ type SystemRunPolicyPhase = SystemRunParsePhase & {
const safeBinTrustedDirWarningCache = new Set();
const APPROVAL_CWD_DRIFT_DENIED_MESSAGE =
"SYSTEM_RUN_DENIED: approval cwd changed before execution";
+const APPROVAL_SCRIPT_OPERAND_BINDING_DENIED_MESSAGE =
+ "SYSTEM_RUN_DENIED: approval missing script operand binding";
const APPROVAL_SCRIPT_OPERAND_DRIFT_DENIED_MESSAGE =
"SYSTEM_RUN_DENIED: approval script operand changed before execution";
@@ -385,6 +388,29 @@ async function executeSystemRunPhase(
});
return;
}
+ const expectedMutableFileOperand = phase.approvalPlan
+ ? resolveMutableFileOperandSnapshotSync({
+ argv: phase.argv,
+ cwd: phase.cwd,
+ shellCommand: phase.shellPayload,
+ })
+ : null;
+ if (expectedMutableFileOperand && !expectedMutableFileOperand.ok) {
+ logWarn(`security: system.run approval script binding blocked (runId=${phase.runId})`);
+ await sendSystemRunDenied(opts, phase.execution, {
+ reason: "approval-required",
+ message: expectedMutableFileOperand.message,
+ });
+ return;
+ }
+ if (expectedMutableFileOperand?.snapshot && !phase.approvalPlan?.mutableFileOperand) {
+ logWarn(`security: system.run approval script binding missing (runId=${phase.runId})`);
+ await sendSystemRunDenied(opts, phase.execution, {
+ reason: "approval-required",
+ message: APPROVAL_SCRIPT_OPERAND_BINDING_DENIED_MESSAGE,
+ });
+ return;
+ }
if (
phase.approvalPlan?.mutableFileOperand &&
!revalidateApprovedMutableFileOperand({
diff --git a/src/plugins/bundled-dir.ts b/src/plugins/bundled-dir.ts
index 4837ae59dc9..09f28bcdc19 100644
--- a/src/plugins/bundled-dir.ts
+++ b/src/plugins/bundled-dir.ts
@@ -2,8 +2,8 @@ import fs from "node:fs";
import path from "node:path";
import { fileURLToPath } from "node:url";
-export function resolveBundledPluginsDir(): string | undefined {
- const override = process.env.OPENCLAW_BUNDLED_PLUGINS_DIR?.trim();
+export function resolveBundledPluginsDir(env: NodeJS.ProcessEnv = process.env): string | undefined {
+ const override = env.OPENCLAW_BUNDLED_PLUGINS_DIR?.trim();
if (override) {
return override;
}
diff --git a/src/plugins/discovery.test.ts b/src/plugins/discovery.test.ts
index aa33803c2ab..00430037b86 100644
--- a/src/plugins/discovery.test.ts
+++ b/src/plugins/discovery.test.ts
@@ -3,7 +3,6 @@ import fs from "node:fs";
import os from "node:os";
import path from "node:path";
import { afterEach, describe, expect, it } from "vitest";
-import { withEnvAsync } from "../test-utils/env.js";
import { clearPluginDiscoveryCache, discoverOpenClawPlugins } from "./discovery.js";
const tempDirs: string[] = [];
@@ -15,24 +14,20 @@ function makeTempDir() {
return dir;
}
-async function withStateDir(stateDir: string, fn: () => Promise) {
- return await withEnvAsync(
- {
- OPENCLAW_STATE_DIR: stateDir,
- CLAWDBOT_STATE_DIR: undefined,
- OPENCLAW_BUNDLED_PLUGINS_DIR: "/nonexistent/bundled/plugins",
- },
- fn,
- );
+function buildDiscoveryEnv(stateDir: string): NodeJS.ProcessEnv {
+ return {
+ ...process.env,
+ OPENCLAW_STATE_DIR: stateDir,
+ CLAWDBOT_STATE_DIR: undefined,
+ OPENCLAW_BUNDLED_PLUGINS_DIR: "/nonexistent/bundled/plugins",
+ };
}
async function discoverWithStateDir(
stateDir: string,
params: Parameters[0],
) {
- return await withStateDir(stateDir, async () => {
- return discoverOpenClawPlugins(params);
- });
+ return discoverOpenClawPlugins({ ...params, env: buildDiscoveryEnv(stateDir) });
}
function writePluginPackageManifest(params: {
@@ -80,9 +75,7 @@ describe("discoverOpenClawPlugins", () => {
fs.mkdirSync(workspaceExt, { recursive: true });
fs.writeFileSync(path.join(workspaceExt, "beta.ts"), "export default function () {}", "utf-8");
- const { candidates } = await withStateDir(stateDir, async () => {
- return discoverOpenClawPlugins({ workspaceDir });
- });
+ const { candidates } = await discoverWithStateDir(stateDir, { workspaceDir });
const ids = candidates.map((c) => c.idHint);
expect(ids).toContain("alpha");
@@ -110,9 +103,7 @@ describe("discoverOpenClawPlugins", () => {
fs.mkdirSync(liveDir, { recursive: true });
fs.writeFileSync(path.join(liveDir, "index.ts"), "export default function () {}", "utf-8");
- const { candidates } = await withStateDir(stateDir, async () => {
- return discoverOpenClawPlugins({});
- });
+ const { candidates } = await discoverWithStateDir(stateDir, {});
const ids = candidates.map((candidate) => candidate.idHint);
expect(ids).toContain("live");
@@ -142,9 +133,7 @@ describe("discoverOpenClawPlugins", () => {
"utf-8",
);
- const { candidates } = await withStateDir(stateDir, async () => {
- return discoverOpenClawPlugins({});
- });
+ const { candidates } = await discoverWithStateDir(stateDir, {});
const ids = candidates.map((c) => c.idHint);
expect(ids).toContain("pack/one");
@@ -167,9 +156,7 @@ describe("discoverOpenClawPlugins", () => {
"utf-8",
);
- const { candidates } = await withStateDir(stateDir, async () => {
- return discoverOpenClawPlugins({});
- });
+ const { candidates } = await discoverWithStateDir(stateDir, {});
const ids = candidates.map((c) => c.idHint);
expect(ids).toContain("voice-call");
@@ -187,9 +174,7 @@ describe("discoverOpenClawPlugins", () => {
});
fs.writeFileSync(path.join(packDir, "index.js"), "module.exports = {}", "utf-8");
- const { candidates } = await withStateDir(stateDir, async () => {
- return discoverOpenClawPlugins({ extraPaths: [packDir] });
- });
+ const { candidates } = await discoverWithStateDir(stateDir, { extraPaths: [packDir] });
const ids = candidates.map((c) => c.idHint);
expect(ids).toContain("demo-plugin-dir");
@@ -266,9 +251,7 @@ describe("discoverOpenClawPlugins", () => {
extensions: ["./escape.ts"],
});
- const { candidates, diagnostics } = await withStateDir(stateDir, async () => {
- return discoverOpenClawPlugins({});
- });
+ const { candidates, diagnostics } = await discoverWithStateDir(stateDir, {});
expect(candidates.some((candidate) => candidate.idHint === "pack")).toBe(false);
expectEscapesPackageDiagnostic(diagnostics);
@@ -303,9 +286,7 @@ describe("discoverOpenClawPlugins", () => {
throw err;
}
- const { candidates } = await withStateDir(stateDir, async () => {
- return discoverOpenClawPlugins({});
- });
+ const { candidates } = await discoverWithStateDir(stateDir, {});
expect(candidates.some((candidate) => candidate.idHint === "pack")).toBe(false);
});
@@ -318,9 +299,7 @@ describe("discoverOpenClawPlugins", () => {
fs.writeFileSync(pluginPath, "export default function () {}", "utf-8");
fs.chmodSync(pluginPath, 0o777);
- const result = await withStateDir(stateDir, async () => {
- return discoverOpenClawPlugins({});
- });
+ const result = await discoverWithStateDir(stateDir, {});
expect(result.candidates).toHaveLength(0);
expect(result.diagnostics.some((diag) => diag.message.includes("world-writable path"))).toBe(
@@ -328,6 +307,35 @@ describe("discoverOpenClawPlugins", () => {
);
});
+ it.runIf(process.platform !== "win32")(
+ "repairs world-writable bundled plugin dirs before loading them",
+ async () => {
+ const stateDir = makeTempDir();
+ const bundledDir = path.join(stateDir, "bundled");
+ const packDir = path.join(bundledDir, "demo-pack");
+ fs.mkdirSync(packDir, { recursive: true });
+ fs.writeFileSync(path.join(packDir, "index.ts"), "export default function () {}", "utf-8");
+ fs.chmodSync(packDir, 0o777);
+
+ const result = discoverOpenClawPlugins({
+ env: {
+ ...process.env,
+ OPENCLAW_STATE_DIR: stateDir,
+ CLAWDBOT_STATE_DIR: undefined,
+ OPENCLAW_BUNDLED_PLUGINS_DIR: bundledDir,
+ },
+ });
+
+ expect(result.candidates.some((candidate) => candidate.idHint === "demo-pack")).toBe(true);
+ expect(
+ result.diagnostics.some(
+ (diag) => diag.source === packDir && diag.message.includes("world-writable path"),
+ ),
+ ).toBe(false);
+ expect(fs.statSync(packDir).mode & 0o777).toBe(0o755);
+ },
+ );
+
it.runIf(process.platform !== "win32" && typeof process.getuid === "function")(
"blocks suspicious ownership when uid mismatch is detected",
async () => {
@@ -341,9 +349,7 @@ describe("discoverOpenClawPlugins", () => {
);
const actualUid = (process as NodeJS.Process & { getuid: () => number }).getuid();
- const result = await withStateDir(stateDir, async () => {
- return discoverOpenClawPlugins({ ownershipUid: actualUid + 1 });
- });
+ const result = await discoverWithStateDir(stateDir, { ownershipUid: actualUid + 1 });
const shouldBlockForMismatch = actualUid !== 0;
expect(result.candidates).toHaveLength(shouldBlockForMismatch ? 0 : 1);
expect(result.diagnostics.some((diag) => diag.message.includes("suspicious ownership"))).toBe(
@@ -359,32 +365,32 @@ describe("discoverOpenClawPlugins", () => {
const pluginPath = path.join(globalExt, "cached.ts");
fs.writeFileSync(pluginPath, "export default function () {}", "utf-8");
- const first = await withEnvAsync(
- {
+ const first = discoverOpenClawPlugins({
+ env: {
+ ...buildDiscoveryEnv(stateDir),
OPENCLAW_PLUGIN_DISCOVERY_CACHE_MS: "5000",
},
- async () => withStateDir(stateDir, async () => discoverOpenClawPlugins({})),
- );
+ });
expect(first.candidates.some((candidate) => candidate.idHint === "cached")).toBe(true);
fs.rmSync(pluginPath, { force: true });
- const second = await withEnvAsync(
- {
+ const second = discoverOpenClawPlugins({
+ env: {
+ ...buildDiscoveryEnv(stateDir),
OPENCLAW_PLUGIN_DISCOVERY_CACHE_MS: "5000",
},
- async () => withStateDir(stateDir, async () => discoverOpenClawPlugins({})),
- );
+ });
expect(second.candidates.some((candidate) => candidate.idHint === "cached")).toBe(true);
clearPluginDiscoveryCache();
- const third = await withEnvAsync(
- {
+ const third = discoverOpenClawPlugins({
+ env: {
+ ...buildDiscoveryEnv(stateDir),
OPENCLAW_PLUGIN_DISCOVERY_CACHE_MS: "5000",
},
- async () => withStateDir(stateDir, async () => discoverOpenClawPlugins({})),
- );
+ });
expect(third.candidates.some((candidate) => candidate.idHint === "cached")).toBe(false);
});
});
diff --git a/src/plugins/discovery.ts b/src/plugins/discovery.ts
index c03b0fe01bf..686c1f7fd86 100644
--- a/src/plugins/discovery.ts
+++ b/src/plugins/discovery.ts
@@ -69,10 +69,11 @@ function buildDiscoveryCacheKey(params: {
workspaceDir?: string;
extraPaths?: string[];
ownershipUid?: number | null;
+ env: NodeJS.ProcessEnv;
}): string {
const workspaceKey = params.workspaceDir ? resolveUserPath(params.workspaceDir) : "";
- const configExtensionsRoot = path.join(resolveConfigDir(), "extensions");
- const bundledRoot = resolveBundledPluginsDir() ?? "";
+ const configExtensionsRoot = path.join(resolveConfigDir(params.env), "extensions");
+ const bundledRoot = resolveBundledPluginsDir(params.env) ?? "";
const normalizedExtraPaths = (params.extraPaths ?? [])
.filter((entry): entry is string => typeof entry === "string")
.map((entry) => entry.trim())
@@ -153,7 +154,7 @@ function checkPathStatAndPermissions(params: {
continue;
}
seen.add(normalized);
- const stat = safeStatSync(targetPath);
+ let stat = safeStatSync(targetPath);
if (!stat) {
return {
reason: "path_stat_failed",
@@ -162,7 +163,28 @@ function checkPathStatAndPermissions(params: {
targetPath,
};
}
- const modeBits = stat.mode & 0o777;
+ let modeBits = stat.mode & 0o777;
+ if ((modeBits & 0o002) !== 0 && params.origin === "bundled") {
+ // npm/global installs can create package-managed extension dirs without
+ // directory entries in the tarball, which may widen them to 0777.
+ // Tighten bundled dirs in place before applying the normal safety gate.
+ try {
+ fs.chmodSync(targetPath, modeBits & ~0o022);
+ const repairedStat = safeStatSync(targetPath);
+ if (!repairedStat) {
+ return {
+ reason: "path_stat_failed",
+ sourcePath: params.source,
+ rootPath: params.rootDir,
+ targetPath,
+ };
+ }
+ stat = repairedStat;
+ modeBits = repairedStat.mode & 0o777;
+ } catch {
+ // Fall through to the normal block path below when repair is not possible.
+ }
+ }
if ((modeBits & 0o002) !== 0) {
return {
reason: "path_world_writable",
@@ -628,6 +650,7 @@ export function discoverOpenClawPlugins(params: {
workspaceDir: params.workspaceDir,
extraPaths: params.extraPaths,
ownershipUid: params.ownershipUid,
+ env,
});
if (cacheEnabled) {
const cached = discoveryCache.get(cacheKey);
@@ -676,7 +699,7 @@ export function discoverOpenClawPlugins(params: {
}
}
- const bundledDir = resolveBundledPluginsDir();
+ const bundledDir = resolveBundledPluginsDir(env);
if (bundledDir) {
discoverInDirectory({
dir: bundledDir,
@@ -690,7 +713,7 @@ export function discoverOpenClawPlugins(params: {
// Keep auto-discovered global extensions behind bundled plugins.
// Users can still intentionally override via plugins.load.paths (origin=config).
- const globalDir = path.join(resolveConfigDir(), "extensions");
+ const globalDir = path.join(resolveConfigDir(env), "extensions");
discoverInDirectory({
dir: globalDir,
origin: "global",
diff --git a/src/plugins/manifest-registry.ts b/src/plugins/manifest-registry.ts
index d392144f925..eb6702d54b1 100644
--- a/src/plugins/manifest-registry.ts
+++ b/src/plugins/manifest-registry.ts
@@ -1,6 +1,8 @@
import fs from "node:fs";
+import path from "node:path";
import type { OpenClawConfig } from "../config/config.js";
-import { resolveUserPath } from "../utils.js";
+import { resolveConfigDir, resolveUserPath } from "../utils.js";
+import { resolveBundledPluginsDir } from "./bundled-dir.js";
import { normalizePluginsConfig, type NormalizedPluginsConfig } from "./config-state.js";
import { discoverOpenClawPlugins, type PluginCandidate } from "./discovery.js";
import { loadPluginManifest, type PluginManifest } from "./manifest.js";
@@ -79,8 +81,11 @@ function shouldUseManifestCache(env: NodeJS.ProcessEnv): boolean {
function buildCacheKey(params: {
workspaceDir?: string;
plugins: NormalizedPluginsConfig;
+ env: NodeJS.ProcessEnv;
}): string {
const workspaceKey = params.workspaceDir ? resolveUserPath(params.workspaceDir) : "";
+ const configExtensionsRoot = path.join(resolveConfigDir(params.env), "extensions");
+ const bundledRoot = resolveBundledPluginsDir(params.env) ?? "";
// The manifest registry only depends on where plugins are discovered from (workspace + load paths).
// It does not depend on allow/deny/entries enable-state, so exclude those for higher cache hit rates.
const loadPaths = params.plugins.loadPaths
@@ -88,7 +93,7 @@ function buildCacheKey(params: {
.map((p) => p.trim())
.filter(Boolean)
.toSorted();
- return `${workspaceKey}::${JSON.stringify(loadPaths)}`;
+ return `${workspaceKey}::${configExtensionsRoot}::${bundledRoot}::${JSON.stringify(loadPaths)}`;
}
function safeStatMtimeMs(filePath: string): number | null {
@@ -142,8 +147,8 @@ export function loadPluginManifestRegistry(params: {
}): PluginManifestRegistry {
const config = params.config ?? {};
const normalized = normalizePluginsConfig(config.plugins);
- const cacheKey = buildCacheKey({ workspaceDir: params.workspaceDir, plugins: normalized });
const env = params.env ?? process.env;
+ const cacheKey = buildCacheKey({ workspaceDir: params.workspaceDir, plugins: normalized, env });
const cacheEnabled = params.cache !== false && shouldUseManifestCache(env);
if (cacheEnabled) {
const cached = registryCache.get(cacheKey);
@@ -160,6 +165,7 @@ export function loadPluginManifestRegistry(params: {
: discoverOpenClawPlugins({
workspaceDir: params.workspaceDir,
extraPaths: normalized.loadPaths,
+ env,
});
const diagnostics: PluginDiagnostic[] = [...discovery.diagnostics];
const candidates: PluginCandidate[] = discovery.candidates;
diff --git a/src/telegram/monitor.test.ts b/src/telegram/monitor.test.ts
index bd9a35fc97c..f8423866fd0 100644
--- a/src/telegram/monitor.test.ts
+++ b/src/telegram/monitor.test.ts
@@ -398,6 +398,20 @@ describe("monitorTelegramProvider (grammY)", () => {
expect(createdBotStops[0]).toHaveBeenCalledTimes(1);
});
+ it("clears bounded cleanup timers after a clean stop", async () => {
+ vi.useFakeTimers();
+ try {
+ const abort = new AbortController();
+ mockRunOnceAndAbort(abort);
+
+ await monitorTelegramProvider({ token: "tok", abortSignal: abort.signal });
+
+ expect(vi.getTimerCount()).toBe(0);
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+
it("surfaces non-recoverable errors", async () => {
runSpy.mockImplementationOnce(() =>
makeRunnerStub({
diff --git a/src/telegram/polling-session.ts b/src/telegram/polling-session.ts
index 784c8b2d759..3a78747e41f 100644
--- a/src/telegram/polling-session.ts
+++ b/src/telegram/polling-session.ts
@@ -15,6 +15,24 @@ const TELEGRAM_POLL_RESTART_POLICY = {
const POLL_STALL_THRESHOLD_MS = 90_000;
const POLL_WATCHDOG_INTERVAL_MS = 30_000;
+const POLL_STOP_GRACE_MS = 15_000;
+
+const waitForGracefulStop = async (stop: () => Promise) => {
+ let timer: ReturnType | undefined;
+ try {
+ await Promise.race([
+ stop(),
+ new Promise((resolve) => {
+ timer = setTimeout(resolve, POLL_STOP_GRACE_MS);
+ timer.unref?.();
+ }),
+ ]);
+ } finally {
+ if (timer) {
+ clearTimeout(timer);
+ }
+ }
+};
type TelegramBot = ReturnType;
@@ -176,6 +194,11 @@ export class TelegramPollingSession {
const fetchAbortController = this.#activeFetchAbort;
let stopPromise: Promise | undefined;
let stalledRestart = false;
+ let forceCycleTimer: ReturnType | undefined;
+ let forceCycleResolve: (() => void) | undefined;
+ const forceCyclePromise = new Promise((resolve) => {
+ forceCycleResolve = resolve;
+ });
const stopRunner = () => {
fetchAbortController?.abort();
stopPromise ??= Promise.resolve(runner.stop())
@@ -209,12 +232,24 @@ export class TelegramPollingSession {
`[telegram] Polling stall detected (no getUpdates for ${formatDurationPrecise(elapsed)}); forcing restart.`,
);
void stopRunner();
+ void stopBot();
+ if (!forceCycleTimer) {
+ forceCycleTimer = setTimeout(() => {
+ if (this.opts.abortSignal?.aborted) {
+ return;
+ }
+ this.opts.log(
+ `[telegram] Polling runner stop timed out after ${formatDurationPrecise(POLL_STOP_GRACE_MS)}; forcing restart cycle.`,
+ );
+ forceCycleResolve?.();
+ }, POLL_STOP_GRACE_MS);
+ }
}
}, POLL_WATCHDOG_INTERVAL_MS);
this.opts.abortSignal?.addEventListener("abort", stopOnAbort, { once: true });
try {
- await runner.task();
+ await Promise.race([runner.task(), forceCyclePromise]);
if (this.opts.abortSignal?.aborted) {
return "exit";
}
@@ -249,9 +284,12 @@ export class TelegramPollingSession {
return shouldRestart ? "continue" : "exit";
} finally {
clearInterval(watchdog);
+ if (forceCycleTimer) {
+ clearTimeout(forceCycleTimer);
+ }
this.opts.abortSignal?.removeEventListener("abort", stopOnAbort);
- await stopRunner();
- await stopBot();
+ await waitForGracefulStop(stopRunner);
+ await waitForGracefulStop(stopBot);
this.#activeRunner = undefined;
if (this.#activeFetchAbort === fetchAbortController) {
this.#activeFetchAbort = undefined;
diff --git a/src/terminal/table.test.ts b/src/terminal/table.test.ts
index 9c6d53eaece..bad2fe48cf2 100644
--- a/src/terminal/table.test.ts
+++ b/src/terminal/table.test.ts
@@ -1,9 +1,18 @@
-import { describe, expect, it } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
import { visibleWidth } from "./ansi.js";
import { wrapNoteMessage } from "./note.js";
import { renderTable } from "./table.js";
describe("renderTable", () => {
+ const originalPlatformDescriptor = Object.getOwnPropertyDescriptor(process, "platform");
+
+ afterEach(() => {
+ vi.unstubAllEnvs();
+ if (originalPlatformDescriptor) {
+ Object.defineProperty(process, "platform", originalPlatformDescriptor);
+ }
+ });
+
it("prefers shrinking flex columns to avoid wrapping non-flex labels", () => {
const out = renderTable({
width: 40,
@@ -170,6 +179,42 @@ describe("renderTable", () => {
expect(out).toContain("before");
expect(out).toContain("after");
});
+
+ it("falls back to ASCII borders on legacy Windows consoles", () => {
+ Object.defineProperty(process, "platform", { value: "win32", configurable: true });
+ vi.stubEnv("WT_SESSION", "");
+ vi.stubEnv("TERM_PROGRAM", "");
+ vi.stubEnv("TERM", "vt100");
+
+ const out = renderTable({
+ columns: [
+ { key: "A", header: "A", minWidth: 6 },
+ { key: "B", header: "B", minWidth: 10, flex: true },
+ ],
+ rows: [{ A: "row", B: "value" }],
+ });
+
+ expect(out).toContain("+");
+ expect(out).not.toContain("┌");
+ });
+
+ it("keeps unicode borders on modern Windows terminals", () => {
+ Object.defineProperty(process, "platform", { value: "win32", configurable: true });
+ vi.stubEnv("WT_SESSION", "1");
+ vi.stubEnv("TERM", "");
+ vi.stubEnv("TERM_PROGRAM", "");
+
+ const out = renderTable({
+ columns: [
+ { key: "A", header: "A", minWidth: 6 },
+ { key: "B", header: "B", minWidth: 10, flex: true },
+ ],
+ rows: [{ A: "row", B: "value" }],
+ });
+
+ expect(out).toContain("┌");
+ expect(out).not.toContain("+");
+ });
});
describe("wrapNoteMessage", () => {
diff --git a/src/terminal/table.ts b/src/terminal/table.ts
index a1fbb9f570b..7c55ba7f2dd 100644
--- a/src/terminal/table.ts
+++ b/src/terminal/table.ts
@@ -20,6 +20,26 @@ export type RenderTableOptions = {
border?: "unicode" | "ascii" | "none";
};
+function resolveDefaultBorder(
+ platform: NodeJS.Platform,
+ env: NodeJS.ProcessEnv,
+): "unicode" | "ascii" {
+ if (platform !== "win32") {
+ return "unicode";
+ }
+
+ const term = env.TERM ?? "";
+ const termProgram = env.TERM_PROGRAM ?? "";
+ const isModernTerminal =
+ Boolean(env.WT_SESSION) ||
+ term.includes("xterm") ||
+ term.includes("cygwin") ||
+ term.includes("msys") ||
+ termProgram === "vscode";
+
+ return isModernTerminal ? "unicode" : "ascii";
+}
+
function repeat(ch: string, n: number): string {
if (n <= 0) {
return "";
@@ -267,7 +287,7 @@ export function renderTable(opts: RenderTableOptions): string {
}
return next;
});
- const border = opts.border ?? "unicode";
+ const border = opts.border ?? resolveDefaultBorder(process.platform, process.env);
if (border === "none") {
const columns = opts.columns;
const header = columns.map((c) => c.header).join(" | ");
diff --git a/src/tts/tts.test.ts b/src/tts/tts.test.ts
index 642e403ec7b..d11190a21d4 100644
--- a/src/tts/tts.test.ts
+++ b/src/tts/tts.test.ts
@@ -7,15 +7,16 @@ import type { OpenClawConfig } from "../config/config.js";
import { withEnv } from "../test-utils/env.js";
import * as tts from "./tts.js";
-vi.mock("@mariozechner/pi-ai", () => ({
- completeSimple: vi.fn(),
-}));
-
-vi.mock("@mariozechner/pi-ai/oauth", () => ({
- // Some auth helpers import oauth provider metadata at module load time.
- getOAuthProviders: () => [],
- getOAuthApiKey: vi.fn(async () => null),
-}));
+vi.mock("@mariozechner/pi-ai", async (importOriginal) => {
+ const original = await importOriginal();
+ return {
+ ...original,
+ completeSimple: vi.fn(),
+ // Some auth helpers import oauth provider metadata at module load time.
+ getOAuthProviders: () => [],
+ getOAuthApiKey: vi.fn(async () => null),
+ };
+});
vi.mock("../agents/pi-embedded-runner/model.js", () => ({
resolveModel: vi.fn((provider: string, modelId: string) => ({
diff --git a/src/tui/tui-status-summary.ts b/src/tui/tui-status-summary.ts
index 64fc00adad6..dcbcd00329d 100644
--- a/src/tui/tui-status-summary.ts
+++ b/src/tui/tui-status-summary.ts
@@ -6,6 +6,9 @@ import type { GatewayStatusSummary } from "./tui-types.js";
export function formatStatusSummary(summary: GatewayStatusSummary) {
const lines: string[] = [];
lines.push("Gateway status");
+ if (summary.runtimeVersion) {
+ lines.push(`Version: ${summary.runtimeVersion}`);
+ }
if (!summary.linkChannel) {
lines.push("Link channel: unknown");
diff --git a/src/tui/tui-types.ts b/src/tui/tui-types.ts
index 087d7958950..e0af351d462 100644
--- a/src/tui/tui-types.ts
+++ b/src/tui/tui-types.ts
@@ -49,6 +49,7 @@ export type AgentSummary = {
};
export type GatewayStatusSummary = {
+ runtimeVersion?: string | null;
linkChannel?: {
id?: string;
label?: string;
diff --git a/src/web/outbound.test.ts b/src/web/outbound.test.ts
index e494392d750..506d7816630 100644
--- a/src/web/outbound.test.ts
+++ b/src/web/outbound.test.ts
@@ -48,6 +48,34 @@ describe("web outbound", () => {
expect(sendMessage).toHaveBeenCalledWith("+1555", "hi", undefined, undefined);
});
+ it("trims leading whitespace before sending text and captions", async () => {
+ await sendMessageWhatsApp("+1555", "\n \thello", { verbose: false });
+ expect(sendMessage).toHaveBeenLastCalledWith("+1555", "hello", undefined, undefined);
+
+ const buf = Buffer.from("img");
+ loadWebMediaMock.mockResolvedValueOnce({
+ buffer: buf,
+ contentType: "image/jpeg",
+ kind: "image",
+ });
+ await sendMessageWhatsApp("+1555", "\n \tcaption", {
+ verbose: false,
+ mediaUrl: "/tmp/pic.jpg",
+ });
+ expect(sendMessage).toHaveBeenLastCalledWith("+1555", "caption", buf, "image/jpeg");
+ });
+
+ it("skips whitespace-only text sends without media", async () => {
+ const result = await sendMessageWhatsApp("+1555", "\n \t", { verbose: false });
+
+ expect(result).toEqual({
+ messageId: "",
+ toJid: "1555@s.whatsapp.net",
+ });
+ expect(sendComposingTo).not.toHaveBeenCalled();
+ expect(sendMessage).not.toHaveBeenCalled();
+ });
+
it("throws a helpful error when no active listener exists", async () => {
setActiveWebListener(null);
await expect(
diff --git a/src/web/outbound.ts b/src/web/outbound.ts
index 43136c6f779..1fcaa807c37 100644
--- a/src/web/outbound.ts
+++ b/src/web/outbound.ts
@@ -26,7 +26,11 @@ export async function sendMessageWhatsApp(
accountId?: string;
},
): Promise<{ messageId: string; toJid: string }> {
- let text = body;
+ let text = body.trimStart();
+ const jid = toWhatsappJid(to);
+ if (!text && !options.mediaUrl) {
+ return { messageId: "", toJid: jid };
+ }
const correlationId = generateSecureUuid();
const startedAt = Date.now();
const { listener: active, accountId: resolvedAccountId } = requireActiveWebListener(
@@ -51,7 +55,6 @@ export async function sendMessageWhatsApp(
to: redactedTo,
});
try {
- const jid = toWhatsappJid(to);
const redactedJid = redactIdentifier(jid);
let mediaBuffer: Buffer | undefined;
let mediaType: string | undefined;
diff --git a/src/wizard/onboarding.finalize.test.ts b/src/wizard/onboarding.finalize.test.ts
index 314d22d8ca3..0fa67d16a8f 100644
--- a/src/wizard/onboarding.finalize.test.ts
+++ b/src/wizard/onboarding.finalize.test.ts
@@ -13,6 +13,13 @@ const buildGatewayInstallPlan = vi.hoisted(() =>
})),
);
const gatewayServiceInstall = vi.hoisted(() => vi.fn(async () => {}));
+const gatewayServiceRestart = vi.hoisted(() =>
+ vi.fn<() => Promise<{ outcome: "completed" } | { outcome: "scheduled" }>>(async () => ({
+ outcome: "completed",
+ })),
+);
+const gatewayServiceUninstall = vi.hoisted(() => vi.fn(async () => {}));
+const gatewayServiceIsLoaded = vi.hoisted(() => vi.fn(async () => false));
const resolveGatewayInstallToken = vi.hoisted(() =>
vi.fn(async () => ({
token: undefined,
@@ -56,14 +63,18 @@ vi.mock("../commands/health.js", () => ({
healthCommand: vi.fn(async () => {}),
}));
-vi.mock("../daemon/service.js", () => ({
- resolveGatewayService: vi.fn(() => ({
- isLoaded: vi.fn(async () => false),
- restart: vi.fn(async () => {}),
- uninstall: vi.fn(async () => {}),
- install: gatewayServiceInstall,
- })),
-}));
+vi.mock("../daemon/service.js", async (importOriginal) => {
+ const actual = await importOriginal();
+ return {
+ ...actual,
+ resolveGatewayService: vi.fn(() => ({
+ isLoaded: gatewayServiceIsLoaded,
+ restart: gatewayServiceRestart,
+ uninstall: gatewayServiceUninstall,
+ install: gatewayServiceInstall,
+ })),
+ };
+});
vi.mock("../daemon/systemd.js", async (importOriginal) => {
const actual = await importOriginal();
@@ -113,6 +124,11 @@ describe("finalizeOnboardingWizard", () => {
setupOnboardingShellCompletion.mockClear();
buildGatewayInstallPlan.mockClear();
gatewayServiceInstall.mockClear();
+ gatewayServiceIsLoaded.mockReset();
+ gatewayServiceIsLoaded.mockResolvedValue(false);
+ gatewayServiceRestart.mockReset();
+ gatewayServiceRestart.mockResolvedValue({ outcome: "completed" });
+ gatewayServiceUninstall.mockReset();
resolveGatewayInstallToken.mockClear();
isSystemdUserServiceAvailable.mockReset();
isSystemdUserServiceAvailable.mockResolvedValue(true);
@@ -244,4 +260,51 @@ describe("finalizeOnboardingWizard", () => {
expectFirstOnboardingInstallPlanCallOmitsToken();
expect(gatewayServiceInstall).toHaveBeenCalledTimes(1);
});
+
+ it("stops after a scheduled restart instead of reinstalling the service", async () => {
+ const progressUpdate = vi.fn();
+ const progressStop = vi.fn();
+ gatewayServiceIsLoaded.mockResolvedValue(true);
+ gatewayServiceRestart.mockResolvedValueOnce({ outcome: "scheduled" });
+ const prompter = buildWizardPrompter({
+ select: vi.fn(async (params: { message: string }) => {
+ if (params.message === "Gateway service already installed") {
+ return "restart";
+ }
+ return "later";
+ }) as never,
+ confirm: vi.fn(async () => false),
+ progress: vi.fn(() => ({ update: progressUpdate, stop: progressStop })),
+ });
+
+ await finalizeOnboardingWizard({
+ flow: "advanced",
+ opts: {
+ acceptRisk: true,
+ authChoice: "skip",
+ installDaemon: true,
+ skipHealth: true,
+ skipUi: true,
+ },
+ baseConfig: {},
+ nextConfig: {},
+ workspaceDir: "/tmp",
+ settings: {
+ port: 18789,
+ bind: "loopback",
+ authMode: "token",
+ gatewayToken: undefined,
+ tailscaleMode: "off",
+ tailscaleResetOnExit: false,
+ },
+ prompter,
+ runtime: createRuntime(),
+ });
+
+ expect(gatewayServiceRestart).toHaveBeenCalledTimes(1);
+ expect(gatewayServiceInstall).not.toHaveBeenCalled();
+ expect(gatewayServiceUninstall).not.toHaveBeenCalled();
+ expect(progressUpdate).toHaveBeenCalledWith("Restarting Gateway service…");
+ expect(progressStop).toHaveBeenCalledWith("Gateway service restart scheduled.");
+ });
});
diff --git a/src/wizard/onboarding.finalize.ts b/src/wizard/onboarding.finalize.ts
index fdb1143933c..b218e160ed5 100644
--- a/src/wizard/onboarding.finalize.ts
+++ b/src/wizard/onboarding.finalize.ts
@@ -23,7 +23,7 @@ import {
} from "../commands/onboard-helpers.js";
import type { OnboardOptions } from "../commands/onboard-types.js";
import type { OpenClawConfig } from "../config/config.js";
-import { resolveGatewayService } from "../daemon/service.js";
+import { describeGatewayServiceRestart, resolveGatewayService } from "../daemon/service.js";
import { isSystemdUserServiceAvailable } from "../daemon/systemd.js";
import { ensureControlUiAssetsBuilt } from "../infra/control-ui-assets.js";
import type { RuntimeEnv } from "../runtime.js";
@@ -53,14 +53,16 @@ export async function finalizeOnboardingWizard(
const withWizardProgress = async (
label: string,
- options: { doneMessage?: string },
+ options: { doneMessage?: string | (() => string | undefined) },
work: (progress: { update: (message: string) => void }) => Promise,
): Promise => {
const progress = prompter.progress(label);
try {
return await work(progress);
} finally {
- progress.stop(options.doneMessage);
+ progress.stop(
+ typeof options.doneMessage === "function" ? options.doneMessage() : options.doneMessage,
+ );
}
};
@@ -128,6 +130,7 @@ export async function finalizeOnboardingWizard(
}
const service = resolveGatewayService();
const loaded = await service.isLoaded({ env: process.env });
+ let restartWasScheduled = false;
if (loaded) {
const action = await prompter.select({
message: "Gateway service already installed",
@@ -138,15 +141,19 @@ export async function finalizeOnboardingWizard(
],
});
if (action === "restart") {
+ let restartDoneMessage = "Gateway service restarted.";
await withWizardProgress(
"Gateway service",
- { doneMessage: "Gateway service restarted." },
+ { doneMessage: () => restartDoneMessage },
async (progress) => {
progress.update("Restarting Gateway service…");
- await service.restart({
+ const restartResult = await service.restart({
env: process.env,
stdout: process.stdout,
});
+ const restartStatus = describeGatewayServiceRestart("Gateway", restartResult);
+ restartDoneMessage = restartStatus.progressMessage;
+ restartWasScheduled = restartStatus.scheduled;
},
);
} else if (action === "reinstall") {
@@ -161,7 +168,10 @@ export async function finalizeOnboardingWizard(
}
}
- if (!loaded || (loaded && !(await service.isLoaded({ env: process.env })))) {
+ if (
+ !loaded ||
+ (!restartWasScheduled && loaded && !(await service.isLoaded({ env: process.env })))
+ ) {
const progress = prompter.progress("Gateway service");
let installError: string | null = null;
try {
diff --git a/test/openclaw-npm-release-check.test.ts b/test/openclaw-npm-release-check.test.ts
index 7bd1c98d92d..50f4cb7a5ab 100644
--- a/test/openclaw-npm-release-check.test.ts
+++ b/test/openclaw-npm-release-check.test.ts
@@ -8,30 +8,30 @@ import {
describe("parseReleaseVersion", () => {
it("parses stable CalVer releases", () => {
- expect(parseReleaseVersion("2026.3.9")).toMatchObject({
- version: "2026.3.9",
+ expect(parseReleaseVersion("2026.3.10")).toMatchObject({
+ version: "2026.3.10",
channel: "stable",
year: 2026,
month: 3,
- day: 9,
+ day: 10,
});
});
it("parses beta CalVer releases", () => {
- expect(parseReleaseVersion("2026.3.9-beta.2")).toMatchObject({
- version: "2026.3.9-beta.2",
+ expect(parseReleaseVersion("2026.3.10-beta.2")).toMatchObject({
+ version: "2026.3.10-beta.2",
channel: "beta",
year: 2026,
month: 3,
- day: 9,
+ day: 10,
betaNumber: 2,
});
});
it("rejects legacy and malformed release formats", () => {
- expect(parseReleaseVersion("2026.3.9-1")).toBeNull();
+ expect(parseReleaseVersion("2026.3.10-1")).toBeNull();
expect(parseReleaseVersion("2026.03.09")).toBeNull();
- expect(parseReleaseVersion("v2026.3.9")).toBeNull();
+ expect(parseReleaseVersion("v2026.3.10")).toBeNull();
expect(parseReleaseVersion("2026.2.30")).toBeNull();
expect(parseReleaseVersion("2.0.0-beta2")).toBeNull();
});
@@ -49,8 +49,8 @@ describe("collectReleaseTagErrors", () => {
it("accepts versions within the two-day CalVer window", () => {
expect(
collectReleaseTagErrors({
- packageVersion: "2026.3.9",
- releaseTag: "v2026.3.9",
+ packageVersion: "2026.3.10",
+ releaseTag: "v2026.3.10",
now: new Date("2026-03-11T12:00:00Z"),
}),
).toEqual([]);
@@ -59,9 +59,9 @@ describe("collectReleaseTagErrors", () => {
it("rejects versions outside the two-day CalVer window", () => {
expect(
collectReleaseTagErrors({
- packageVersion: "2026.3.9",
- releaseTag: "v2026.3.9",
- now: new Date("2026-03-12T00:00:00Z"),
+ packageVersion: "2026.3.10",
+ releaseTag: "v2026.3.10",
+ now: new Date("2026-03-13T00:00:00Z"),
}),
).toContainEqual(expect.stringContaining("must be within 2 days"));
});
@@ -69,9 +69,9 @@ describe("collectReleaseTagErrors", () => {
it("rejects tags that do not match the current release format", () => {
expect(
collectReleaseTagErrors({
- packageVersion: "2026.3.9",
- releaseTag: "v2026.3.9-1",
- now: new Date("2026-03-09T00:00:00Z"),
+ packageVersion: "2026.3.10",
+ releaseTag: "v2026.3.10-1",
+ now: new Date("2026-03-10T00:00:00Z"),
}),
).toContainEqual(expect.stringContaining("must match vYYYY.M.D or vYYYY.M.D-beta.N"));
});
diff --git a/test/setup.ts b/test/setup.ts
index f232e5fc2d0..a6f902cb90f 100644
--- a/test/setup.ts
+++ b/test/setup.ts
@@ -1,5 +1,15 @@
import { afterAll, afterEach, beforeAll, vi } from "vitest";
+vi.mock("@mariozechner/pi-ai", async (importOriginal) => {
+ const original = await importOriginal();
+ return {
+ ...original,
+ getOAuthApiKey: () => undefined,
+ getOAuthProviders: () => [],
+ loginOpenAICodex: vi.fn(),
+ };
+});
+
vi.mock("@mariozechner/pi-ai/oauth", () => ({
getOAuthApiKey: () => undefined,
getOAuthProviders: () => [],
diff --git a/ui/package.json b/ui/package.json
index b1f548f2869..1944c788cae 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -12,7 +12,7 @@
"@lit-labs/signals": "^0.2.0",
"@lit/context": "^1.1.6",
"@noble/ed25519": "3.0.0",
- "dompurify": "^3.3.2",
+ "dompurify": "^3.3.3",
"lit": "^3.3.2",
"marked": "^17.0.4",
"signal-polyfill": "^0.2.2",