Auto-merge upstream openclaw/openclaw

Author: friuns2

CHANGELOG.md

@@ -4,9 +4,14 @@ Docs: https://docs.openclaw.ai
 
 ## Unreleased
 
+### Changes
+
+- iOS: pin release versioning to an explicit CalVer in `apps/ios/version.json`, keep TestFlight iteration on the same short version until maintainers intentionally promote the next gateway version, and add the documented `pnpm ios:version:pin -- --from-gateway` workflow for release trains. (#63001) Thanks @ngutman.
+
 ### Fixes
 
 - Slack/media: preserve bearer auth across same-origin `files.slack.com` redirects while still stripping it on cross-origin Slack CDN hops, so `url_private_download` image attachments load again. (#62960) Thanks @vincentkoc.
+- Control UI: guard stale session-history reloads during fast session switches so the selected session and rendered transcript stay in sync. (#62975) Thanks @scoootscooob.
 
 ## 2026.4.8
 
@@ -121,6 +126,7 @@ Docs: https://docs.openclaw.ai
 - Agents/model resolution: let explicit `openai-codex/gpt-5.4` selection prefer provider runtime metadata when it reports a larger context window, keeping configured Codex runs aligned with the live provider limits. (#62694) Thanks @ruclaw7.
 - Agents/model resolution: keep explicit-model runtime comparisons on the configured workspace plugin registry, so workspace-installed providers do not silently fall back to stale explicit metadata during runtime model lookup.
 - Providers/Z.AI: default onboarding and endpoint detection to GLM-5.1 instead of GLM-5. (#61998) Thanks @serg0x.
+- Reply execution: prefer the active runtime snapshot over stale queued reply config during embedded reply and follow-up execution so SecretRef-backed reply turns stop crashing after secrets have already resolved. (#62693) Thanks @mbelinky.
 
 ## 2026.4.5
 

apps/ios/CHANGELOG.md

@@ -0,0 +1,13 @@
+# OpenClaw iOS Changelog
+
+## Unreleased
+
+### Added
+
+### Changed
+
+### Fixed
+
+## 2026.4.6 - 2026-04-06
+
+First App Store release of OpenClaw for iPhone. Pair with your OpenClaw Gateway to use chat, voice, sharing, and device actions from iOS.

apps/ios/Config/Version.xcconfig

@@ -1,8 +1,9 @@
 // Shared iOS version defaults.
-// Generated overrides live in build/Version.xcconfig (git-ignored).
+// Source of truth: apps/ios/version.json
+// Generated by scripts/ios-sync-versioning.ts.
 
-OPENCLAW_GATEWAY_VERSION = 2026.4.9
-OPENCLAW_MARKETING_VERSION = 2026.4.9
-OPENCLAW_BUILD_VERSION = 2026040901
+OPENCLAW_IOS_VERSION = 2026.4.6
+OPENCLAW_MARKETING_VERSION = 2026.4.6
+OPENCLAW_BUILD_VERSION = 1
 
 #include? "../build/Version.xcconfig"

apps/ios/README.md

@@ -64,10 +64,14 @@ Release behavior:
 - Beta release uses canonical `ai.openclaw.client*` bundle IDs through a temporary generated xcconfig in `apps/ios/build/BetaRelease.xcconfig`.
 - Beta release also switches the app to `OpenClawPushTransport=relay`, `OpenClawPushDistribution=official`, and `OpenClawPushAPNsEnvironment=production`.
 - 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.4.1-beta.1` becomes:
-  - `CFBundleShortVersionString = 2026.4.1`
-  - `CFBundleVersion = next TestFlight build number for 2026.4.1`
+- `apps/ios/version.json` is the pinned iOS release version source.
+- `apps/ios/CHANGELOG.md` is the iOS-only changelog and release-note source.
+- The pinned iOS version must use CalVer like `2026.4.10`.
+- That pinned value becomes:
+  - `CFBundleShortVersionString = 2026.4.10`
+  - `CFBundleVersion = next TestFlight build number for 2026.4.10`
+- Changing the root gateway version does not change the iOS app version until you explicitly pin from the gateway.
+- See `apps/ios/VERSIONING.md` for the full workflow.
 
 Required env for beta builds:
 
@@ -120,25 +124,74 @@ This should create `apps/ios/fastlane/.env` with the non-secret ASC variables wh
 export OPENCLAW_PUSH_RELAY_BASE_URL=https://relay.example.com
 ```
 
-4. Upload the beta:
+4. If you are starting a brand-new production release train, pin iOS to the current gateway version first:
+
+```bash
+pnpm ios:version:pin -- --from-gateway
+```
+
+5. Upload the beta:
 
 ```bash
 pnpm ios:beta
 ```
 
-5. Expected behavior:
-   - Fastlane reads `package.json.version`
+6. Expected behavior:
+   - Fastlane reads `apps/ios/version.json`
+   - verifies synced iOS versioning artifacts
    - resolves the next TestFlight build number for that short version
    - generates `apps/ios/build/BetaRelease.xcconfig`
    - archives `OpenClaw`
    - uploads the IPA to TestFlight
 
-6. Expected outputs after a successful run:
+7. Expected outputs after a successful run:
    - `apps/ios/build/beta/OpenClaw-<version>.ipa`
    - `apps/ios/build/beta/OpenClaw-<version>.app.dSYM.zip`
    - Fastlane log line like `Uploaded iOS beta: version=<version> short=<short> build=<build>`
 
-7. If this is a fresh clone on a maintainer machine that already works elsewhere, it is OK to copy the non-secret `apps/ios/fastlane/.env` from another trusted local clone on the same Mac. The Keychain-backed private key remains machine-local and is not stored in the repo.
+8. If this is a fresh clone on a maintainer machine that already works elsewhere, it is OK to copy the non-secret `apps/ios/fastlane/.env` from another trusted local clone on the same Mac. The Keychain-backed private key remains machine-local and is not stored in the repo.
+
+## iOS Versioning Workflow
+
+- Pinned iOS release version: `apps/ios/version.json`
+- iOS-only changelog: `apps/ios/CHANGELOG.md`
+- Generated checked-in artifacts:
+  - `apps/ios/Config/Version.xcconfig`
+  - `apps/ios/fastlane/metadata/en-US/release_notes.txt`
+- Useful commands:
+
+```bash
+pnpm ios:version
+pnpm ios:version:check
+pnpm ios:version:sync
+pnpm ios:version:pin -- --from-gateway
+pnpm ios:version:pin -- --version 2026.4.10
+```
+
+Recommended flow:
+
+### TestFlight iteration on an existing train
+
+1. Keep `apps/ios/version.json` pinned to the current train version.
+2. Update `apps/ios/CHANGELOG.md`, usually under `## Unreleased` while iterating.
+3. Run `pnpm ios:version:sync` after changelog changes.
+4. Upload more TestFlight builds with `pnpm ios:beta`.
+5. Let Fastlane bump only the numeric build number.
+
+### Starting the next production release train
+
+1. Pin iOS to the current gateway version:
+
+```bash
+pnpm ios:version:pin -- --from-gateway
+```
+
+2. Update `apps/ios/CHANGELOG.md` for the new release as needed.
+3. Run `pnpm ios:version:sync`.
+4. Submit the first TestFlight build for that newly pinned version.
+5. Keep iterating on that same version until the release candidate is ready.
+
+See `apps/ios/VERSIONING.md` for the detailed spec.
 
 ## APNs Expectations For Local/Manual Builds
 

apps/ios/Sources/Device/DeviceInfoHelper.swift

@@ -50,9 +50,11 @@ enum DeviceInfoHelper {
         return trimmed.isEmpty ? "unknown" : trimmed
     }
 
-    /// App marketing version only, e.g. "2026.2.0" or "dev".
+    /// Canonical app version when present, otherwise the Apple marketing version.
     static func appVersion() -> String {
-        Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "dev"
+        (Bundle.main.infoDictionary?["OpenClawCanonicalVersion"] as? String)
+            ?? (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String)
+            ?? "dev"
     }
 
     /// App build string, e.g. "123" or "".

apps/ios/Sources/Info.plist

@@ -24,6 +24,8 @@
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>$(OPENCLAW_MARKETING_VERSION)</string>
+	<key>OpenClawCanonicalVersion</key>
+	<string>$(OPENCLAW_IOS_VERSION)</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

apps/ios/VERSIONING.md

@@ -0,0 +1,150 @@
+# OpenClaw iOS Versioning
+
+OpenClaw iOS uses a **pinned CalVer release version** instead of reading the current gateway version automatically on every build.
+
+## Goals
+
+- keep TestFlight submissions on one stable app version while iterating
+- change only `CFBundleVersion` during normal TestFlight iteration
+- promote the iOS release version to the current gateway version only when a maintainer chooses to do that
+- keep Apple bundle fields valid for App Store Connect
+- generate App Store release notes from an iOS-owned changelog
+
+## Version model
+
+The pinned iOS release version lives in `apps/ios/version.json`.
+
+Supported pinned format:
+
+- `YYYY.M.D`
+
+Examples:
+
+- `2026.4.6`
+- `2026.4.10`
+
+The root gateway version in `package.json` may still be one of:
+
+- `YYYY.M.D`
+- `YYYY.M.D-beta.N`
+- `YYYY.M.D-N`
+
+When you pin iOS from the gateway version, the iOS tooling strips the gateway suffix and keeps only the base CalVer.
+
+Examples:
+
+- gateway `2026.4.10` -> iOS `2026.4.10`
+- gateway `2026.4.10-beta.3` -> iOS `2026.4.10`
+- gateway `2026.4.10-2` -> iOS `2026.4.10`
+
+## Apple bundle mapping
+
+Pinned iOS version `2026.4.10` maps to:
+
+- `CFBundleShortVersionString = 2026.4.10`
+- `CFBundleVersion = numeric build number only`
+
+`CFBundleShortVersionString` stays fixed for a TestFlight train until you intentionally pin a newer iOS release version.
+
+## Source of truth and generated files
+
+### Source files
+
+- `apps/ios/version.json`
+  - pinned iOS release version
+- `apps/ios/CHANGELOG.md`
+  - iOS-only changelog and release-note source
+- `apps/ios/VERSIONING.md`
+  - workflow and constraints
+
+### Generated or derived files
+
+- `apps/ios/Config/Version.xcconfig`
+  - checked-in defaults derived from `apps/ios/version.json`
+- `apps/ios/fastlane/metadata/en-US/release_notes.txt`
+  - generated from `apps/ios/CHANGELOG.md`
+- `apps/ios/build/Version.xcconfig`
+  - local gitignored build override generated per build or beta prep
+
+## Tooling surfaces
+
+### Version parsing and sync tooling
+
+- `scripts/lib/ios-version.ts`
+  - validates pinned iOS CalVer
+  - normalizes gateway version -> pinned iOS CalVer
+  - renders checked-in xcconfig and release notes
+- `scripts/ios-version.ts`
+  - CLI for JSON, shell, or single-field version reads
+- `scripts/ios-sync-versioning.ts`
+  - syncs checked-in derived files from the pinned iOS version
+- `scripts/ios-pin-version.ts`
+  - explicitly pins iOS to a chosen release version or the current gateway version
+
+### Build and beta flow
+
+- `scripts/ios-write-version-xcconfig.sh`
+  - reads the pinned iOS version
+  - writes the local numeric build override file in `apps/ios/build/Version.xcconfig`
+- `scripts/ios-beta-prepare.sh`
+  - prepares beta signing and bundle settings against the pinned iOS version
+- `apps/ios/fastlane/Fastfile`
+  - resolves version metadata from the pinned iOS helper
+  - increments TestFlight build numbers for the pinned short version
+
+## Release-note resolution order
+
+When generating `apps/ios/fastlane/metadata/en-US/release_notes.txt`, the tooling reads the first available changelog section in this order:
+
+1. exact pinned version, for example `## 2026.4.10`
+2. `## Unreleased`
+
+Recommended workflow:
+
+- while iterating on a TestFlight train, keep pending notes under `## Unreleased`
+- before the production release, move or copy the final notes under `## <pinned version>` and run sync again
+
+## Common commands
+
+```bash
+pnpm ios:version
+pnpm ios:version:check
+pnpm ios:version:sync
+pnpm ios:version:pin -- --from-gateway
+pnpm ios:version:pin -- --version 2026.4.10
+```
+
+## Normal TestFlight iteration workflow
+
+1. keep `apps/ios/version.json` pinned to the current TestFlight train version
+2. update `apps/ios/CHANGELOG.md` under `## Unreleased` while iterating
+3. upload more betas with the usual flow
+4. let Fastlane increment only `CFBundleVersion`
+
+This keeps the TestFlight version stable while review is in flight.
+
+## New release promotion workflow
+
+When you want the next production iOS release to align with the current gateway release:
+
+1. pin iOS from the root gateway version:
+
+```bash
+pnpm ios:version:pin -- --from-gateway
+```
+
+2. review the generated changes in:
+   - `apps/ios/version.json`
+   - `apps/ios/Config/Version.xcconfig`
+   - `apps/ios/fastlane/metadata/en-US/release_notes.txt`
+3. update `apps/ios/CHANGELOG.md` for the new release if needed
+4. run `pnpm ios:version:sync` again if the changelog changed
+5. submit the first TestFlight build for that newly pinned version
+6. keep iterating only by build number until the release candidate is ready
+7. release that reviewed TestFlight build to production
+
+## Important invariant
+
+Fastlane and Xcode should consume only the pinned iOS version from `apps/ios/version.json`.
+
+Changing `package.json.version` alone must not change the iOS app version until a maintainer explicitly runs the pin step.