Skip to content

Cherry-pick batch: Infrastructure fixes and improvements (1/4) (50 commits)#1979

Merged
alexey-pelykh merged 64 commits intomainfrom
staging/cherry-pick-1889
Mar 25, 2026
Merged

Cherry-pick batch: Infrastructure fixes and improvements (1/4) (50 commits)#1979
alexey-pelykh merged 64 commits intomainfrom
staging/cherry-pick-1889

Conversation

@alexey-pelykh
Copy link
Copy Markdown

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

  • Removed CHANGELOG.md (fork doesn't use it)
  • Fixed OpenClawConfig → RemoteClawConfig in 23 files
  • Fixed openclaw agentremoteclaw agent CLI reference
  • Removed upstream-only device-auth-store.test.ts (source module not in fork)
  • Restored fork plugins/types.ts (upstream version references gutted layers)

Closes #1889

🤖 Generated with Claude Code

steipete and others added 30 commits March 24, 2026 21:45
(cherry picked from commit 285b50c)
(cherry picked from commit 369032c)
(cherry picked from commit 4d16d13)
@alexey-pelykh alexey-pelykh enabled auto-merge (rebase) March 24, 2026 21:03
alexey-pelykh and others added 4 commits March 24, 2026 22:09
- 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
…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]>
auto-merge was automatically disabled March 25, 2026 08:23

Pull request was closed

@alexey-pelykh alexey-pelykh reopened this Mar 25, 2026
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]>
@alexey-pelykh alexey-pelykh force-pushed the staging/cherry-pick-1889 branch from a27e2be to 586410c Compare March 25, 2026 08:27
alexey-pelykh and others added 3 commits March 25, 2026 09:29
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]>
@alexey-pelykh alexey-pelykh force-pushed the staging/cherry-pick-1889 branch from b87e72e to 4f1342a Compare March 25, 2026 09:04
alexey-pelykh and others added 2 commits March 25, 2026 10:11
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]>
@alexey-pelykh alexey-pelykh merged commit ce4ee00 into main Mar 25, 2026
7 checks passed
@alexey-pelykh alexey-pelykh deleted the staging/cherry-pick-1889 branch March 25, 2026 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cherry-pick: Infrastructure fixes and improvements (1/4) (50 commits)

7 participants