Cherry-pick batch: Infrastructure fixes and improvements (1/4) (50 commits)#1979
Merged
alexey-pelykh merged 64 commits intomainfrom Mar 25, 2026
Merged
Cherry-pick batch: Infrastructure fixes and improvements (1/4) (50 commits)#1979alexey-pelykh merged 64 commits intomainfrom
alexey-pelykh merged 64 commits intomainfrom
Conversation
(cherry picked from commit 0386dcb)
(cherry picked from commit 03d0762)
(cherry picked from commit 04081d3)
(cherry picked from commit 045a879)
(cherry picked from commit 0643c0d)
(cherry picked from commit 0790030)
(cherry picked from commit 0836bf8)
(cherry picked from commit 0bf930b)
(cherry picked from commit 0ece383)
(cherry picked from commit 0f48556)
(cherry picked from commit 0146345)
(cherry picked from commit 03f18ec)
(cherry picked from commit 060f3e5)
(cherry picked from commit 09fd72b)
(cherry picked from commit 0ca1b18)
(cherry picked from commit 0db1c31)
(cherry picked from commit 1822db9)
(cherry picked from commit 226c1be)
(cherry picked from commit 285b50c)
(cherry picked from commit 369032c)
(cherry picked from commit 3850ea1)
(cherry picked from commit 487e188)
(cherry picked from commit 4d16d13)
(cherry picked from commit 4f78d85)
(cherry picked from commit 50c4e89)
(cherry picked from commit 5e417b4)
(cherry picked from commit 604203c)
(cherry picked from commit 639f78d)
(cherry picked from commit 6ad2f79)
(cherry picked from commit 8a226ff)
- Restore loader.ts, loader.test.ts (fork uses remoteclaw/plugin-sdk paths) - Restore marketplace.ts (upstream temp dir naming) - Restore google-gemini-cli-auth.ts (fork RemoteClawPluginApi) - Restore tts.test.ts (upstream references gutted pi-ai) - Fix machine-name.ts default to remoteclaw
…moteClawPluginApi
…atibility Restore files that reference fork-specific APIs from fork-sync-base. Remove new upstream-only files that depend on gutted infrastructure.
- Restore channel-resolution.ts (needed by channel-selection.ts, rename loadOpenClawPlugins → loadRemoteClawPlugins) - Restore targets.test-helpers.ts (needed by targets.shared-test.ts, adapt ChannelMessagingAdapter to fork interface) - Fix unused import lint errors in bonjour.ts (CiaoService, Responder) - Rename openclaw→remoteclaw in test fixtures: update-runner, bonjour, install-package-dir, install, dm-access, archive - Update exec-assertions to match upstream npm install flag changes - Fix telegram network test and media fetch helpers Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Adapt temp dir prefixes, CLI paths, and service names in cherry-picked tests to match fork production code. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
a27e2be to
586410c
Compare
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
…W_HOME) The cherry-pick changed REMOTECLAW_HOME → OPENCLAW_HOME in home-dir.ts, causing all REMOTECLAW_HOME-dependent tests to fail (utils, config, paths, cron store, profile, etc). Also fix openclaw naming in home-dir.test.ts, marketplace.test.ts, and update-command.ts env var list. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
- exec-allowlist-pattern.ts: ? glob must not cross path separators ([^/] not .), POSIX normalization must preserve case (no toLowerCase) - state-migrations.state-dir.test.ts: adapt to fork's gutted stub (autoMigrateLegacyStateDir is a no-op, always returns empty result) - config/test-helpers.ts, state-dir-dotenv.ts: OPENCLAW_STATE_DIR → REMOTECLAW_STATE_DIR Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
b87e72e to
4f1342a
Compare
These test files import plugins/provider-runtime.js which was never cherry-picked into the fork. The production module doesn't exist, making these tests guaranteed failures. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
- archive.ts: add staged extraction for tar to match zip symlink security - bonjour.test.ts: use REMOTECLAW_MDNS_HOSTNAME, fix watchdog timing - channel-selection.test.ts: use importOriginal to include getChannelPlugin - message-action-runner.test-helpers.ts: add agents config for workspace - outbound.test.ts: adapt Telegram/Mattermost session key expectations - targets.ts: use resolveOutboundChannelPlugin for registry fallback - update-runner.test.ts: rename openclaw→remoteclaw, use @next default channel, skip 12 upstream-only git-based update tests Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick batch from upstream
Issue: #1889
Commits: 50 cherry-picked from openclaw/openclaw (10 clean, 40 partial with conflict resolution)
See issue for commit list.
Post-pick fixes
openclaw agent→remoteclaw agentCLI referencedevice-auth-store.test.ts(source module not in fork)plugins/types.ts(upstream version references gutted layers)Closes #1889
🤖 Generated with Claude Code