…penclaw#45531)

Move all Signal channel implementation files from src/signal/ to
extensions/signal/src/ and replace originals with re-export shims.
This continues the channel plugin migration pattern used by other
extensions, keeping backward compatibility via shims while the real
code lives in the extension.

- Copy 32 .ts files (source + tests) to extensions/signal/src/
- Transform all relative import paths for the new location
- Create 2-line re-export shims in src/signal/ for each moved file
- Preserve existing extension files (channel.ts, runtime.ts, etc.)
- Change tsconfig.plugin-sdk.dts.json rootDir from "src" to "."
  to support cross-boundary re-exports from extensions/

(cherry picked from commit 4540c6b)

(cherry picked from commit 0ce23dc)

# Conflicts:
#	extensions/imessage/src/monitor/self-chat-cache.test.ts
#	src/imessage/monitor/self-chat-cache.ts

…enclaw#45621)

Move all Slack channel implementation files from src/slack/ to
extensions/slack/src/ and replace originals with shim re-exports.
This follows the extension migration pattern for channel plugins.

- Copy all .ts files to extensions/slack/src/ (preserving directory
  structure: monitor/, http/, monitor/events/, monitor/message-handler/)
- Transform import paths: external src/ imports use relative paths
  back to src/, internal slack imports stay relative within extension
- Replace all src/slack/ files with shim re-exports pointing to
  the extension copies
- Update tsconfig.plugin-sdk.dts.json rootDir from "src" to "." so
  the DTS build can follow shim chains into extensions/
- Update write-plugin-sdk-entry-dts.ts re-export path accordingly
- Preserve extensions/slack/index.ts, package.json, openclaw.plugin.json,
  src/channel.ts, src/runtime.ts, src/channel.test.ts (untouched)

(cherry picked from commit 8746362)

# Conflicts:
#	src/slack/account-inspect.ts
#	src/slack/interactive-replies.test.ts
#	src/slack/interactive-replies.ts
#	src/slack/monitor/events/channels.test.ts
#	src/slack/monitor/slash-skill-commands.runtime.ts
#	src/slack/probe.test.ts

…aw#45635)

* refactor: move Telegram channel implementation to extensions/telegram/src/

Move all Telegram channel code (123 files + 10 bot/ files + 8 channel plugin
files) from src/telegram/ and src/channels/plugins/*/telegram.ts to
extensions/telegram/src/. Leave thin re-export shims at original locations so
cross-cutting src/ imports continue to resolve.

- Fix all relative import paths in moved files (../X/ -> ../../../src/X/)
- Fix vi.mock paths in 60 test files
- Fix inline typeof import() expressions
- Update tsconfig.plugin-sdk.dts.json rootDir to "." for cross-directory DTS
- Update write-plugin-sdk-entry-dts.ts for new rootDir structure
- Move channel plugin files with correct path remapping

* fix: support keyed telegram send deps

* fix: sync telegram extension copies with latest main

* fix: correct import paths and remove misplaced files in telegram extension

* fix: sync outbound-adapter with main (add sendTelegramPayloadMessages) and fix delivery.test import path

(cherry picked from commit e5bca08)

# Conflicts:
#	extensions/telegram/src/bot-native-commands.skills-allowlist.test.ts
#	extensions/telegram/src/model-buttons.test.ts
#	extensions/telegram/src/reasoning-lane-coordinator.test.ts
#	src/channels/plugins/outbound/telegram.test.ts
#	src/telegram/account-inspect.test.ts
#	src/telegram/approval-buttons.test.ts
#	src/telegram/approval-buttons.ts
#	src/telegram/exec-approvals-handler.test.ts
#	src/telegram/exec-approvals-handler.ts
#	src/telegram/exec-approvals.test.ts
#	src/telegram/exec-approvals.ts
#	src/telegram/model-buttons.ts
#	src/telegram/reasoning-lane-coordinator.ts

…w#45660)

* refactor: move Discord channel implementation to extensions/discord/src/

Move all Discord source files from src/discord/ to extensions/discord/src/,
following the extension migration pattern. Source files in src/discord/ are
replaced with re-export shims. Channel-plugin files from
src/channels/plugins/*/discord* are similarly moved and shimmed.

- Copy all .ts source files preserving subdirectory structure (monitor/, voice/)
- Move channel-plugin files (actions, normalize, onboarding, outbound, status-issues)
- Fix all relative imports to use correct paths from new location
- Create re-export shims at original locations for backward compatibility
- Delete test files from shim locations (tests live in extension now)
- Update tsconfig.plugin-sdk.dts.json rootDir from "src" to "." to accommodate
  extension files outside src/
- Update write-plugin-sdk-entry-dts.ts to match new declaration output paths

* fix: add importOriginal to thread-bindings session-meta mock for extensions test

* style: fix formatting in thread-bindings lifecycle test

(cherry picked from commit 5682ec3)

# Conflicts:
#	extensions/discord/src/account-inspect.test.ts
#	extensions/discord/src/accounts.test.ts
#	extensions/discord/src/api.test.ts
#	extensions/discord/src/audit.test.ts
#	extensions/discord/src/chunk.test.ts
#	extensions/discord/src/client.test.ts
#	extensions/discord/src/components.test.ts
#	extensions/discord/src/directory-live.test.ts
#	extensions/discord/src/gateway-logging.test.ts
#	extensions/discord/src/mentions.test.ts
#	extensions/discord/src/monitor.gateway.test.ts
#	extensions/discord/src/monitor.test.ts
#	extensions/discord/src/monitor.tool-result.accepts-guild-messages-mentionpatterns-match.e2e.test.ts
#	extensions/discord/src/monitor.tool-result.sends-status-replies-responseprefix.test.ts
#	extensions/discord/src/monitor/agent-components.wildcard.test.ts
#	extensions/discord/src/monitor/auto-presence.test.ts
#	extensions/discord/src/monitor/commands.test.ts
#	extensions/discord/src/monitor/dm-command-auth.test.ts
#	extensions/discord/src/monitor/dm-command-decision.test.ts
#	extensions/discord/src/monitor/exec-approvals.test.ts
#	extensions/discord/src/monitor/gateway-error-guard.test.ts
#	extensions/discord/src/monitor/inbound-context.test.ts
#	extensions/discord/src/monitor/inbound-job.test.ts
#	extensions/discord/src/monitor/listeners.test.ts
#	extensions/discord/src/monitor/message-handler.bot-self-filter.test.ts
#	extensions/discord/src/monitor/message-handler.inbound-contract.test.ts
#	extensions/discord/src/monitor/message-handler.preflight.acp-bindings.test.ts
#	extensions/discord/src/monitor/message-handler.preflight.test.ts
#	extensions/discord/src/monitor/message-handler.process.test.ts
#	extensions/discord/src/monitor/message-handler.queue.test.ts
#	extensions/discord/src/monitor/message-handler.test-harness.ts
#	extensions/discord/src/monitor/message-handler.test-helpers.ts
#	extensions/discord/src/monitor/message-utils.test.ts
#	extensions/discord/src/monitor/model-picker-preferences.test.ts
#	extensions/discord/src/monitor/model-picker.test-utils.ts
#	extensions/discord/src/monitor/model-picker.test.ts
#	extensions/discord/src/monitor/monitor.test.ts
#	extensions/discord/src/monitor/native-command-context.test.ts
#	extensions/discord/src/monitor/native-command.commands-allowfrom.test.ts
#	extensions/discord/src/monitor/native-command.model-picker.test.ts
#	extensions/discord/src/monitor/native-command.options.test.ts
#	extensions/discord/src/monitor/native-command.plugin-dispatch.test.ts
#	extensions/discord/src/monitor/presence.test.ts
#	extensions/discord/src/monitor/provider.allowlist.test.ts
#	extensions/discord/src/monitor/provider.group-policy.test.ts
#	extensions/discord/src/monitor/provider.lifecycle.test.ts
#	extensions/discord/src/monitor/provider.proxy.test.ts
#	extensions/discord/src/monitor/provider.rest-proxy.test.ts
#	extensions/discord/src/monitor/provider.skill-dedupe.test.ts
#	extensions/discord/src/monitor/provider.test.ts
#	extensions/discord/src/monitor/reply-delivery.test.ts
#	extensions/discord/src/monitor/route-resolution.test.ts
#	extensions/discord/src/monitor/thread-bindings.discord-api.test.ts
#	extensions/discord/src/monitor/thread-bindings.lifecycle.test.ts
#	extensions/discord/src/monitor/thread-bindings.persona.test.ts
#	extensions/discord/src/monitor/thread-bindings.shared-state.test.ts
#	extensions/discord/src/monitor/thread-session-close.test.ts
#	extensions/discord/src/monitor/threading.auto-thread.test.ts
#	extensions/discord/src/monitor/threading.parent-info.test.ts
#	extensions/discord/src/monitor/threading.starter.test.ts
#	extensions/discord/src/outbound-adapter.test.ts
#	extensions/discord/src/pluralkit.test.ts
#	extensions/discord/src/probe.intents.test.ts
#	extensions/discord/src/probe.parse-token.test.ts
#	extensions/discord/src/resolve-allowlist-common.test.ts
#	extensions/discord/src/resolve-channels.test.ts
#	extensions/discord/src/resolve-users.test.ts
#	extensions/discord/src/send.components.test.ts
#	extensions/discord/src/send.creates-thread.test.ts
#	extensions/discord/src/send.permissions.authz.test.ts
#	extensions/discord/src/send.sends-basic-channel-messages.test.ts
#	extensions/discord/src/send.webhook-activity.test.ts
#	extensions/discord/src/session-key-normalization.test.ts
#	extensions/discord/src/targets.test.ts
#	extensions/discord/src/token.test.ts
#	extensions/discord/src/voice-message.test.ts
#	extensions/discord/src/voice/command.test.ts
#	extensions/discord/src/voice/manager.e2e.test.ts
#	src/discord/exec-approvals.ts
#	src/discord/monitor/exec-approvals.ts
#	src/discord/monitor/model-picker-preferences.ts
#	src/discord/monitor/model-picker.ts
#	src/discord/monitor/thread-bindings.config.ts
#	src/discord/monitor/thread-bindings.persona.ts

…aw#45725)

* refactor: move WhatsApp channel from src/web/ to extensions/whatsapp/

Move all WhatsApp implementation code (77 source/test files + 9 channel
plugin files) from src/web/ and src/channels/plugins/*/whatsapp* to
extensions/whatsapp/src/.

- Leave thin re-export shims at all original locations so cross-cutting
  imports continue to resolve
- Update plugin-sdk/whatsapp.ts to only re-export generic framework
  utilities; channel-specific functions imported locally by the extension
- Update vi.mock paths in 15 cross-cutting test files
- Rename outbound.ts -> send.ts to match extension naming conventions
  and avoid false positive in cfg-threading guard test
- Widen tsconfig.plugin-sdk.dts.json rootDir to support shim->extension
  cross-directory references

Part of the core-channels-to-extensions migration (PR 6/10).

* style: format WhatsApp extension files

* fix: correct stale import paths in WhatsApp extension tests

Fix vi.importActual, test mock, and hardcoded source paths that weren't
updated during the file move:
- media.test.ts: vi.importActual path
- onboarding.test.ts: vi.importActual path
- test-helpers.ts: test/mocks/baileys.js path
- monitor-inbox.test-harness.ts: incomplete media/store mock
- login.test.ts: hardcoded source file path
- message-action-runner.media.test.ts: vi.mock/importActual path

(cherry picked from commit 1650571)

…sions (openclaw#45967)

* refactor: remove channel shim directories, point all imports to extensions

Delete the 6 backward-compat shim directories (src/telegram, src/discord,
src/slack, src/signal, src/imessage, src/web) that were re-exporting from
extensions. Update all 112+ source files to import directly from
extensions/{channel}/src/ instead of through the shims.

Also:
- Move src/channels/telegram/ (allow-from, api) to extensions/telegram/src/
- Fix outbound adapters to use resolveOutboundSendDep (fixes 5 pre-existing TS errors)
- Update cross-extension imports (src/web/media.js → extensions/whatsapp/src/media.js)
- Update vitest, tsdown, knip, labeler, and script configs for new paths
- Update guard test allowlists for extension paths

After this, src/ has zero channel-specific implementation code — only the
generic plugin framework remains.

* fix: update raw-fetch guard allowlist line numbers after shim removal

* refactor: document direct extension channel imports

* test: mock transcript module in delivery helpers

(cherry picked from commit 439c21e)

# Conflicts:
#	.github/labeler.yml
#	CHANGELOG.md
#	src/agents/pi-embedded-runner/compact.ts
#	src/agents/pi-embedded-runner/run/attempt.ts
#	src/agents/pi-embedded-runner/run/images.ts
#	src/agents/tools/image-tool.ts
#	src/agents/tools/media-tool-shared.ts
#	src/agents/tools/pdf-tool.test.ts
#	src/agents/tools/pdf-tool.ts
#	src/auto-reply/reply/commands-acp.test.ts
#	src/auto-reply/reply/commands-approve.ts
#	src/auto-reply/reply/commands-models.ts
#	src/auto-reply/reply/directive-handling.model.ts
#	src/auto-reply/reply/slack-directives.ts
#	src/channels/read-only-account-inspect.ts
#	src/infra/exec-approval-forwarder.ts
#	src/infra/exec-approval-surface.test.ts
#	src/infra/exec-approval-surface.ts
#	src/infra/outbound/deliver.test-helpers.ts
#	src/infra/outbound/message-action-runner.media.test.ts
#	src/slack/send.upload.test.ts

…nclaw#46066)

Verified:
- pnpm build
- pnpm check
- pnpm test:macmini

Co-authored-by: scoootscooob <[email protected]>
Co-authored-by: Tak Hoffman <[email protected]>
(cherry picked from commit ac29edf)

# Conflicts:
#	.github/workflows/docker-release.yml

(cherry picked from commit 56bc9b5)

(cherry picked from commit 9ebe38b)

# Conflicts:
#	extensions/acpx/src/test-utils/runtime-fixtures.ts
#	extensions/anthropic/index.ts
#	extensions/brave/index.ts
#	extensions/byteplus/index.ts
#	extensions/byteplus/provider-catalog.ts
#	extensions/cloudflare-ai-gateway/index.ts
#	extensions/cloudflare-ai-gateway/onboard.ts
#	extensions/discord/src/channel.setup.ts
#	extensions/discord/src/plugin-shared.ts
#	extensions/discord/src/setup-core.ts
#	extensions/discord/src/setup-surface.ts
#	extensions/discord/src/shared-interactive.ts
#	extensions/elevenlabs/index.ts
#	extensions/feishu/src/thread-bindings.ts
#	extensions/firecrawl/index.ts
#	extensions/firecrawl/src/config.ts
#	extensions/firecrawl/src/firecrawl-client.ts
#	extensions/firecrawl/src/firecrawl-scrape-tool.ts
#	extensions/firecrawl/src/firecrawl-search-provider.ts
#	extensions/firecrawl/src/firecrawl-search-tool.ts
#	extensions/github-copilot/index.ts
#	extensions/github-copilot/token.ts
#	extensions/google/gemini-cli-provider.ts
#	extensions/google/index.ts
#	extensions/google/oauth.flow.ts
#	extensions/google/oauth.http.ts
#	extensions/google/provider-models.ts
#	extensions/huggingface/index.ts
#	extensions/huggingface/onboard.ts
#	extensions/huggingface/provider-catalog.ts
#	extensions/imessage/src/channel.setup.ts
#	extensions/imessage/src/plugin-shared.ts
#	extensions/imessage/src/setup-core.ts
#	extensions/imessage/src/setup-surface.ts
#	extensions/irc/src/setup-core.ts
#	extensions/irc/src/setup-surface.ts
#	extensions/kilocode/index.ts
#	extensions/kilocode/onboard.ts
#	extensions/kilocode/provider-catalog.ts
#	extensions/kimi-coding/index.ts
#	extensions/kimi-coding/onboard.ts
#	extensions/kimi-coding/provider-catalog.ts
#	extensions/line/src/channel.setup.ts
#	extensions/line/src/setup-surface.ts
#	extensions/mattermost/src/setup-surface.ts
#	extensions/microsoft/index.ts
#	extensions/minimax/index.ts
#	extensions/minimax/onboard.ts
#	extensions/minimax/provider-catalog.ts
#	extensions/mistral/index.ts
#	extensions/mistral/onboard.ts
#	extensions/modelstudio/index.ts
#	extensions/modelstudio/onboard.ts
#	extensions/modelstudio/provider-catalog.ts
#	extensions/moonshot/index.ts
#	extensions/moonshot/onboard.ts
#	extensions/moonshot/provider-catalog.ts
#	extensions/nextcloud-talk/src/setup-core.ts
#	extensions/nextcloud-talk/src/setup-surface.ts
#	extensions/nostr/src/setup-surface.ts
#	extensions/nvidia/provider-catalog.ts
#	extensions/ollama/index.ts
#	extensions/openai/index.ts
#	extensions/openai/openai-codex-catalog.ts
#	extensions/openai/openai-codex-provider.ts
#	extensions/openai/openai-provider.ts
#	extensions/openai/shared.ts
#	extensions/opencode-go/index.ts
#	extensions/opencode-go/onboard.ts
#	extensions/opencode/index.ts
#	extensions/opencode/onboard.ts
#	extensions/openrouter/index.ts
#	extensions/openrouter/onboard.ts
#	extensions/openrouter/provider-catalog.ts
#	extensions/perplexity/index.ts
#	extensions/qianfan/index.ts
#	extensions/qianfan/onboard.ts
#	extensions/qianfan/provider-catalog.ts
#	extensions/qwen-portal-auth/index.ts
#	extensions/qwen-portal-auth/provider-catalog.ts
#	extensions/sglang/index.ts
#	extensions/signal/src/channel.setup.ts
#	extensions/signal/src/outbound-adapter.ts
#	extensions/signal/src/plugin-shared.ts
#	extensions/signal/src/setup-core.ts
#	extensions/signal/src/setup-surface.ts
#	extensions/slack/src/blocks-render.ts
#	extensions/slack/src/channel.setup.ts
#	extensions/slack/src/message-action-dispatch.ts
#	extensions/slack/src/monitor/events/interactions.block-actions.ts
#	extensions/slack/src/outbound-adapter.ts
#	extensions/slack/src/plugin-shared.ts
#	extensions/slack/src/setup-core.ts
#	extensions/slack/src/setup-surface.ts
#	extensions/synthetic/index.ts
#	extensions/synthetic/onboard.ts
#	extensions/synthetic/provider-catalog.ts
#	extensions/telegram/src/channel.setup.ts
#	extensions/telegram/src/plugin-shared.ts
#	extensions/telegram/src/setup-core.ts
#	extensions/telegram/src/setup-surface.ts
#	extensions/test-utils/plugin-api.ts
#	extensions/together/index.ts
#	extensions/together/onboard.ts
#	extensions/together/provider-catalog.ts
#	extensions/venice/index.ts
#	extensions/venice/onboard.ts
#	extensions/venice/provider-catalog.ts
#	extensions/vercel-ai-gateway/index.ts
#	extensions/vercel-ai-gateway/onboard.ts
#	extensions/vercel-ai-gateway/provider-catalog.ts
#	extensions/vllm/index.ts
#	extensions/volcengine/index.ts
#	extensions/volcengine/provider-catalog.ts
#	extensions/whatsapp/src/channel.setup.ts
#	extensions/whatsapp/src/plugin-shared.ts
#	extensions/xai/index.ts
#	extensions/xai/onboard.ts
#	extensions/xiaomi/index.ts
#	extensions/xiaomi/onboard.ts
#	extensions/xiaomi/provider-catalog.ts
#	extensions/zai/detect.ts
#	extensions/zai/index.ts
#	extensions/zai/onboard.ts
#	scripts/lib/plugin-sdk-entrypoints.json
#	src/channels/read-only-account-inspect.discord.runtime.ts
#	src/channels/read-only-account-inspect.slack.runtime.ts
#	src/channels/read-only-account-inspect.telegram.runtime.ts

(cherry picked from commit f9588da)

# Conflicts:
#	extensions/amazon-bedrock/index.test.ts
#	extensions/diffs/index.test.ts
#	extensions/diffs/src/http.test.ts
#	extensions/diffs/src/tool.test.ts
#	extensions/discord/src/monitor/provider.test-support.ts
#	extensions/feishu/src/monitor.bot-menu.test.ts
#	extensions/googlechat/src/setup-surface.test.ts
#	extensions/irc/src/channel.startup.test.ts
#	extensions/irc/src/setup-surface.test.ts
#	extensions/line/src/setup-surface.test.ts
#	extensions/mattermost/index.test.ts
#	extensions/nostr/src/setup-surface.test.ts
#	extensions/synology-chat/src/setup-surface.test.ts
#	extensions/talk-voice/index.test.ts
#	extensions/tlon/src/setup-surface.test.ts
#	extensions/zalo/src/setup-surface.test.ts
#	extensions/zalouser/src/setup-surface.test.ts
#	scripts/check-no-extension-test-core-imports.ts
#	test/helpers/extensions/discord-provider.test-support.ts
#	test/helpers/extensions/plugin-command.ts
#	test/helpers/extensions/setup-wizard.ts

(cherry picked from commit f2bd76c)

# Conflicts:
#	extensions/discord/src/shared.ts
#	extensions/feishu/src/directory.static.ts
#	extensions/imessage/src/shared.ts
#	extensions/shared/passive-monitor.ts
#	extensions/signal/src/shared.ts
#	extensions/telegram/src/shared.ts
#	extensions/whatsapp/src/shared.ts
#	extensions/zalo/src/channel.runtime.ts
#	src/agents/models-config.providers.moonshot.test.ts
#	src/auto-reply/reply/elevated-allowlist-matcher.ts
#	src/commands/auth-choice.test.ts

(cherry picked from commit 07d9f72)

# Conflicts:
#	docs/plugins/architecture.md
#	extensions/bluebubbles/src/secret-input.ts
#	extensions/chutes/onboard.ts
#	extensions/googlechat/src/monitor-access.ts
#	extensions/matrix/src/secret-input.ts
#	extensions/mattermost/src/secret-input.ts
#	extensions/nextcloud-talk/src/secret-input.ts
#	extensions/zalo/src/secret-input.ts
#	src/plugins/provider-onboarding-config.ts

(cherry picked from commit c245c8b)

(cherry picked from commit 6ebcd85)

# Conflicts:
#	extensions/amazon-bedrock/index.ts

(cherry picked from commit aa78a0c)

# Conflicts:
#	extensions/acpx/runtime-api.ts
#	extensions/google/runtime-api.ts
#	extensions/lobster/runtime-api.ts
#	extensions/matrix/runtime-api.ts
#	extensions/zai/runtime-api.ts
#	scripts/check-plugin-extension-import-boundary.mjs
#	test/plugin-extension-import-boundary.test.ts

(cherry picked from commit 62ddc9d)

# Conflicts:
#	extensions/chutes/index.ts
#	extensions/discord/src/config-schema.ts
#	extensions/discord/src/group-policy.ts
#	extensions/discord/src/monitor/agent-components-helpers.ts
#	extensions/discord/src/monitor/native-command-ui.ts
#	extensions/discord/src/runtime-api.ts
#	extensions/discord/src/setup-account-state.ts
#	extensions/feishu/runtime-api.ts
#	extensions/googlechat/runtime-api.ts
#	extensions/imessage/runtime-api.ts
#	extensions/imessage/src/channel.runtime.ts
#	extensions/imessage/src/config-schema.ts
#	extensions/irc/src/runtime-api.ts
#	extensions/line/runtime-api.ts
#	extensions/line/src/config-adapter.ts
#	extensions/line/src/group-policy.ts
#	extensions/matrix/src/actions.account-propagation.test.ts
#	extensions/matrix/src/actions.test.ts
#	extensions/matrix/src/channel.setup.test.ts
#	extensions/matrix/src/cli.test.ts
#	extensions/matrix/src/matrix/client/storage.test.ts
#	extensions/matrix/src/matrix/monitor/auto-join.test.ts
#	extensions/matrix/src/matrix/monitor/config.test.ts
#	extensions/matrix/src/matrix/monitor/handler.media-failure.test.ts
#	extensions/matrix/src/matrix/monitor/handler.thread-root-media.test.ts
#	extensions/matrix/src/matrix/monitor/legacy-crypto-restore.test.ts
#	extensions/matrix/src/matrix/thread-bindings-shared.ts
#	extensions/matrix/src/matrix/thread-bindings.test.ts
#	extensions/matrix/src/onboarding.resolve.test.ts
#	extensions/matrix/src/onboarding.test.ts
#	extensions/matrix/src/runtime-api.ts
#	extensions/mattermost/runtime-api.ts
#	extensions/mattermost/src/session-route.ts
#	extensions/minimax/oauth.ts
#	extensions/msteams/runtime-api.ts
#	extensions/nostr/runtime-api.ts
#	extensions/qwen-portal-auth/runtime-api.ts
#	extensions/signal/src/runtime-api.ts
#	extensions/slack/src/channel-actions.ts
#	extensions/slack/src/config-schema.ts
#	extensions/slack/src/group-policy.ts
#	extensions/slack/src/runtime-api.ts
#	extensions/tavily/src/config.ts
#	extensions/telegram/runtime-api.ts
#	extensions/telegram/src/bot-deps.ts
#	extensions/telegram/src/bot-handlers.buffers.ts
#	extensions/telegram/src/bot-handlers.runtime.ts
#	extensions/telegram/src/bot-native-commands.menu-test-support.ts
#	extensions/telegram/src/config-schema.ts
#	extensions/telegram/src/group-policy.ts
#	extensions/tlon/runtime-api.ts
#	extensions/voice-call/runtime-api.ts
#	extensions/whatsapp/api.ts
#	extensions/whatsapp/src/channel.directory.test.ts
#	extensions/whatsapp/src/config-schema.ts
#	extensions/whatsapp/src/runtime-api.ts
#	src/plugin-sdk/channel-actions.ts
#	src/plugin-sdk/extension-shared.ts
#	src/plugins/loader.git-path-regression.test.ts
#	src/plugins/loader.test.ts
#	src/plugins/runtime/runtime-discord-ops.runtime.ts
#	src/plugins/runtime/runtime-discord.ts
#	src/plugins/runtime/runtime-imessage.ts
#	src/plugins/runtime/runtime-matrix.ts
#	src/plugins/runtime/runtime-slack-ops.runtime.ts
#	src/plugins/runtime/runtime-telegram-ops.runtime.ts
#	src/plugins/runtime/runtime-telegram.ts

(cherry picked from commit 6e723df)

# Conflicts:
#	extensions/bluebubbles/src/group-policy.ts
#	extensions/google/media-understanding-provider.ts

(cherry picked from commit 77d0ff6)

# Conflicts:
#	src/channels/plugins/onboarding-types.ts
#	src/channels/plugins/onboarding/helpers.test.ts
#	src/channels/plugins/onboarding/helpers.ts
#	src/channels/plugins/setup-flow-helpers.test.ts
#	src/channels/plugins/setup-flow-helpers.ts
#	src/channels/plugins/setup-flow-types.ts
#	src/channels/plugins/setup-wizard-helpers.test.ts
#	src/channels/plugins/setup-wizard-helpers.ts
#	src/channels/plugins/setup-wizard-types.ts

(cherry picked from commit dc90d3b)

# Conflicts:
#	src/agents/pi-tools.read.ts
#	src/agents/pi-tools.read.workspace-root-guard.test.ts
#	src/infra/local-file-access.ts
#	src/infra/outbound/message-action-params.test.ts
#	src/media/web-media.ts

…law#42554)

* Models: gate custom provider keys by usable secret semantics

* Config: project runtime writes onto source snapshot

* Models: prevent stale apiKey preservation for marker-managed providers

* Runner: strip SecretRef marker headers from resolved models

* Secrets: scan active agent models.json path in audit

* Config: guard runtime-source projection for unrelated configs

* Extensions: fix onboarding type errors in CI

* Tests: align setup helper account-enabled expectation

* Secrets audit: harden models.json file reads

* fix: harden SecretRef custom/provider secret persistence (openclaw#42554) (thanks @joshavant)

(cherry picked from commit fbc6632)

# Conflicts:
#	src/agents/model-auth-label.test.ts
#	src/agents/model-auth-label.ts
#	src/agents/model-auth-markers.test.ts
#	src/agents/model-auth-markers.ts
#	src/agents/model-auth.test.ts
#	src/agents/models-config.fills-missing-provider-apikey-from-env-var.test.ts
#	src/agents/models-config.merge.test.ts
#	src/agents/models-config.merge.ts
#	src/agents/models-config.providers.normalize-keys.test.ts
#	src/agents/models-config.providers.ts
#	src/agents/models-config.runtime-source-snapshot.test.ts
#	src/agents/models-config.ts
#	src/agents/pi-embedded-runner/model.test.ts
#	src/agents/pi-embedded-runner/model.ts
#	src/auto-reply/reply/directive-handling.auth.test.ts
#	src/auto-reply/reply/directive-handling.auth.ts
#	src/commands/auth-choice.model-check.ts
#	src/commands/model-picker.ts
#	src/commands/models.list.e2e.test.ts
#	src/commands/models/list.auth-overview.test.ts
#	src/commands/models/list.auth-overview.ts
#	src/commands/models/list.probe.ts
#	src/commands/models/list.registry.ts
#	src/commands/models/list.status.test.ts
#	src/config/io.runtime-snapshot-write.test.ts
#	src/secrets/audit.test.ts
#	src/secrets/audit.ts
#	src/secrets/storage-scan.ts

(cherry picked from commit 218663c)

# Conflicts:
#	extensions/msteams/src/setup-surface.test.ts

…aw#52513) (thanks @CodeForgeNet)

(cherry picked from commit 339a672)

(cherry picked from commit 3547b5f)

These files existed at the fork point or were cherry-picked into src/
before the extensions-move. Upstream either moved them to extensions/
or deleted them entirely.

Deleted:
- src/telegram/ (4 test files — 2 duplicated in extensions/, 2 deleted upstream)
- src/whatsapp/ (4 files — all moved to extensions/whatsapp/src/)
- src/web/ (5 files — 3 deleted upstream, 2 moved to extensions/)

- imessage/signal channel.ts: add missing }) for buildAccountScopedAllowlistConfigEditor
- telegram channel.ts: restore hasTelegramExecApprovalDmRoute function body
- telegram bot.test.ts: fix dynamic import destructuring (import → const)
- zalo/zalouser channel.ts: fix return statement closure (}); → };)

- Replace 6 corrupted test files with upstream versions + rebrand
- Fix setup.gateway-config.ts: close truncated prompter.text() call,
  remove duplicate imports, replace upstream SecretInput refs with
  fork equivalents, add missing gateway-control-ui-origins.ts module
- Remaining: 2 syntax errors in src/plugins/loader.test.ts
  (unclosed try block — fixing exposes 7878 masked type errors
  from upstream test code that references types not in fork)

Remove 94 files from gutted subsystems that were re-introduced by
cherry-pick operations (-X theirs). Includes:
- Provider extensions (google, openai, openrouter, anthropic, amazon-bedrock)
- ACPX and diffs extensions
- pi-embedded-runner (old execution engine)
- model-auth system (provider authentication)
- models-config system (provider model configuration)
- memory subsystem (gutted per Middleware Boundary Principle)
- media-understanding subsystem
- context-engine
- auth-choice commands (depend on gutted model-auth)
- commands/models listing (depend on gutted model-auth)
- bundled-web-search-registry (imports gutted extensions)
- directive-handling auth/model (depend on gutted subsystems)

Rebrand OpenClaw references to RemoteClaw in files introduced or
modified by cherry-picks:
- OpenClawPluginToolContext → RemoteClawPluginToolContext
- OpenClawPluginToolFactory → RemoteClawPluginToolFactory
- OpenClawPluginCommandDefinition → RemoteClawPluginCommandDefinition
- OpenClawSchema → RemoteClawSchema
- resolvePreferredOpenClawTmpDir → resolvePreferredRemoteClawTmpDir
- resolveOpenClawUserDataDir → resolveRemoteClawUserDataDir
- stopOpenClawChrome → stopRemoteClawChrome
- loadOpenClawPlugins → loadRemoteClawPlugins
- openclaw/plugin-sdk → remoteclaw/plugin-sdk
- tmp-openclaw-dir → tmp-remoteclaw-dir
- types.openclaw → types.remoteclaw
- 33 files updated

Remove 646 duplicate identifier errors (TS2300) across 92 files.
Cherry-picks with -X theirs re-introduced import/export statements
that duplicated symbols already present in the fork's versions:
- Duplicate import statements (same symbol from different sources)
- Duplicate export re-exports
- Duplicate type declarations
- Duplicate interface fields

Delete 164 more files belonging to gutted provider subsystem that were
re-introduced by cherry-picks. These files import from deleted SDK
subpaths (media-runtime, agent-runtime, provider-models, provider-auth,
provider-onboard, lazy-runtime) or from @mariozechner packages.

Also:
- Restore 4 files from main that had gutted imports re-introduced
- Fix clawdbot/plugin-sdk → remoteclaw/plugin-sdk in mattermost
- Delete setup-core/setup-surface files depending on deleted SDK setup
- Delete action runtime files depending on @mariozechner/pi-agent-core

Remove 439 more files that were re-introduced by cherry-picks and belong
to gutted subsystems. These files import from deleted SDK subpaths
(config-runtime, infra-runtime, text-runtime, reply-runtime,
conversation-runtime, directory-runtime, channel-runtime, media-runtime)
or from other files that were previously deleted.

Includes:
- Provider extension files (byteplus, chutes, deepgram, fal, firecrawl,
  github-copilot, huggingface, kilocode, kimi-coding, minimax, mistral,
  modelstudio, moonshot, nvidia, ollama, opencode, qianfan, qwen,
  sglang, synthetic, together, venice, vercel-ai-gateway, vllm,
  volcengine, xai, xiaomi, zai)
- Discord/Slack/Telegram/WhatsApp action and setup files
- Plugin SDK provider files
- Wizard setup files
- Secret audit files

Delete all remaining files that were introduced by cherry-picks and have
TypeScript errors that cannot be resolved without recreating entire
gutted subsystems. These files import from:
- Non-existent SDK runtime subpaths (config-runtime, infra-runtime, etc.)
- Deleted extension files (send.js, bot.js, setup-core.js, etc.)
- Gutted provider infrastructure
- Plugin SDK internal modules that no longer exist

Restore files that were modified by cherry-picks in ways that broke
their imports. Cherry-picks brought upstream changes that reference
gutted provider subsystems, new SDK subpaths, and deleted modules.

Restoring from main preserves the fork's working state while discarding
the cherry-pick modifications that introduced errors. The legitimate
upstream changes in these files can be re-applied surgically later.

Categories restored:
- src/plugin-sdk/ (SDK interface, runtime, channel adapters)
- src/plugins/ (plugin system core, runtime, hooks, services)
- src/config/ (configuration schemas, types, migrations)
- src/agents/ (agent tools, paths, utilities)
- src/channels/ (channel plugin infrastructure)
- src/cli/, src/commands/ (CLI commands, setup, diagnostics)
- extensions/ (channel adapter implementations)
- src/browser/, src/gateway/, src/infra/, src/routing/, test/

Final cleanup pass:
- Delete 49 remaining cherry-pick files not on main with errors
- Restore 9 more cherry-pick-modified files from main
- Delete remaining cherry-pick extension files that import from
  deleted modules (secret-input, directory-cache, draft-stream, etc.)
- Restore extension files, src files to main versions

… references

Restore files that exist on main branch but were accidentally deleted
during cherry-pick cleanup. These files are needed by other main-branch
files:
- extensions/test-utils/ (test helpers used by extension tests)
- Various extension helper files (accounts, send, targets, etc.)
- Plugin SDK helper files (allowlist-resolution, setup)
- Test infrastructure files

Also deletes 4 remaining cherry-pick test files that reference
deleted modules (mentions.test, draft-stream.test, etc.)

…xport stubs

Cherry-picks from upstream's extensions-move PRs deleted 82 files from
src/ that our fork still needs (discord, slack, telegram, line, whatsapp,
imessage, web channel modules). Restored all from main branch.

Created 6 re-export stubs in extensions/ for files that the cherry-picks
introduced as new extension-local modules but which on our fork still
live in src/: directory-cache, group-keys, types, bot-access, accounts,
normalize-target.

Also restored 9 additional support files (onboarding-types, test-utils,
web/media, wizard types) that were deleted by the cherry-picks.

Result: 0 TypeScript errors (down from 514).