Update: support fork gitRepo stable/dev update flow

RedBeardEth · RedBeardEth · commit c33f0c301720 · 2026-03-03T12:31:45.000+11:00
diff --git a/scripts/install-openclaw-fork.sh b/scripts/install-openclaw-fork.sh
@@ -20,7 +20,7 @@ set -euo pipefail
 #   OPENCLAW_SPEC=<npm-install-spec>       # optional direct spec (e.g. file:/path, git+https://...)
 #   OPENCLAW_RELEASE_REPO=<github-url>     # repo URL for release tarballs (default: daydreamsai/openclaw-x402-router)
 #   OPENCLAW_REPO=https://github.com/<org>/<repo>.git  # for git+https:// fallback
-#   OPENCLAW_REF=<tag-or-commit>         # preferred (immutable)
+#   OPENCLAW_REF=<tag-or-commit>         # preferred (immutable); if omitted, resolves latest stable release tag
 #   OPENCLAW_BRANCH=<branch>             # fallback for development
 #   OPENCLAW_INSTALLER=npm|pnpm|auto
 #   OPENCLAW_BIN=openclaw|moltbot
@@ -51,6 +51,28 @@ set -euo pipefail
 
 OPENCLAW_SPEC="${OPENCLAW_SPEC:-}"
 OPENCLAW_REPO="${OPENCLAW_REPO:-https://github.com/daydreamsai/openclaw-x402-router.git}"
+OPENCLAW_RELEASE_REPO="${OPENCLAW_RELEASE_REPO:-https://github.com/daydreamsai/openclaw-x402-router}"
+normalize_openclaw_release_slug() {
+  local slug="${OPENCLAW_RELEASE_REPO%.git}"
+  slug="${slug#https://github.com/}"
+  slug="${slug#http://github.com/}"
+  slug="${slug#git@github.com:}"
+  slug="${slug#github.com/}"
+  slug="${slug#/}"
+  printf '%s\n' "$slug"
+}
+
+resolve_latest_openclaw_release_tag() {
+  local slug
+  slug="$(normalize_openclaw_release_slug)"
+  if [[ -z "$slug" || "$slug" != */* ]]; then
+    return 1
+  fi
+  curl -fsSL -H "Accept: application/vnd.github+json" \
+    "https://api.github.com/repos/${slug}/releases/latest" \
+    | sed -n 's/.*"tag_name"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' \
+    | head -n 1
+}
 OPENCLAW_REF="${OPENCLAW_REF:-}"
 OPENCLAW_BRANCH="${OPENCLAW_BRANCH:-}"
 OPENCLAW_INSTALLER="${OPENCLAW_INSTALLER:-npm}"
@@ -63,10 +85,6 @@ OPENCLAW_SKILLS_DIR="${OPENCLAW_SKILLS_DIR:-$HOME/.openclaw/skills}"
 OPENCLAW_LUCID_SDK_SKILL_URL="${OPENCLAW_LUCID_SDK_SKILL_URL:-https://raw.githubusercontent.com/daydreamsai/skills-market/main/plugins/lucid-agents-sdk/skills/SKILL.md}"
 OPENCLAW_XGATE_ROUTER_SKILL_URL="${OPENCLAW_XGATE_ROUTER_SKILL_URL:-https://ai.xgate.run/SKILL.md}"
 
-if [[ -z "$OPENCLAW_SPEC" && -z "$OPENCLAW_REF" && -z "$OPENCLAW_BRANCH" ]]; then
-  OPENCLAW_REF="v2026.2.25.daydreams.1"
-fi
-
 if [[ -n "$OPENCLAW_SPEC" && ( -n "$OPENCLAW_REF" || -n "$OPENCLAW_BRANCH" ) ]]; then
   echo "ERROR: set OPENCLAW_SPEC or OPENCLAW_REF/OPENCLAW_BRANCH, not both" >&2
   exit 1
@@ -586,8 +604,6 @@ echo "  Phase 2: OpenClaw Gateway Install"
 echo "============================================"
 echo ""
 
-OPENCLAW_RELEASE_REPO="${OPENCLAW_RELEASE_REPO:-https://github.com/daydreamsai/openclaw-x402-router}"
-
 resolve_release_tarball_url() {
   local tag="$1"
   local repo_url="${OPENCLAW_RELEASE_REPO%.git}"
@@ -599,6 +615,16 @@ resolve_release_tarball_url() {
   return 1
 }
 
+if [[ -z "$OPENCLAW_SPEC" && -z "$OPENCLAW_REF" && -z "$OPENCLAW_BRANCH" ]]; then
+  OPENCLAW_REF="$(resolve_latest_openclaw_release_tag || true)"
+  if [[ -z "$OPENCLAW_REF" ]]; then
+    echo "ERROR: could not determine latest stable release tag from ${OPENCLAW_RELEASE_REPO}" >&2
+    echo "Set OPENCLAW_REF=<tag> explicitly and retry." >&2
+    exit 1
+  fi
+  echo "==> Resolved latest stable release tag: ${OPENCLAW_REF}"
+fi
+
 if [[ -n "$OPENCLAW_SPEC" ]]; then
   SPEC="$OPENCLAW_SPEC"
   REF_KIND="spec"
@@ -766,6 +792,21 @@ echo "==> Installed CLI: ${CLI_BIN_NAME} (${CLI_BIN_PATH})"
 INSTALLED_VERSION="$("$CLI_BIN_PATH" --version 2>/dev/null || true)"
 echo "==> Installed version: ${INSTALLED_VERSION:-unknown}"
 
+echo "==> Configuring fork-aware update defaults..."
+if "$CLI_BIN_PATH" config set update.channel stable >/dev/null 2>&1; then
+  echo "==> Set update.channel=stable"
+else
+  echo "WARNING: failed to set update.channel=stable; run manually:" >&2
+  echo "  $CLI_BIN_PATH config set update.channel stable" >&2
+fi
+
+if "$CLI_BIN_PATH" config set update.gitRepo "$OPENCLAW_REPO" >/dev/null 2>&1; then
+  echo "==> Set update.gitRepo=${OPENCLAW_REPO}"
+else
+  echo "WARNING: failed to set update.gitRepo; run manually:" >&2
+  echo "  $CLI_BIN_PATH config set update.gitRepo \"$OPENCLAW_REPO\"" >&2
+fi
+
 install_remote_skill() {
   local skill_name="$1"
   local skill_url="$2"
diff --git a/src/cli/update-cli.test.ts b/src/cli/update-cli.test.ts
@@ -476,6 +476,52 @@ describe("update-cli", () => {
     expect(call?.tag).toBe("latest");
   });
 
+  it("uses configured update.gitRepo when switching package installs to dev", async () => {
+    const tempDir = createCaseDir("openclaw-update-git-dir");
+    await withEnvAsync({ OPENCLAW_GIT_DIR: tempDir }, async () => {
+      mockPackageInstallStatus(createCaseDir("openclaw-update"));
+      vi.mocked(readConfigFileSnapshot).mockResolvedValue({
+        ...baseSnapshot,
+        config: {
+          update: {
+            gitRepo: "https://github.com/daydreamsai/openclaw-x402-router.git",
+          },
+        } as OpenClawConfig,
+      });
+
+      await updateCommand({ channel: "dev", yes: true });
+
+      expect(runCommandWithTimeout).toHaveBeenCalledWith(
+        ["git", "clone", "https://github.com/daydreamsai/openclaw-x402-router.git", tempDir],
+        expect.objectContaining({ timeoutMs: expect.any(Number) }),
+      );
+    });
+  });
+
+  it("uses git stable-tag flow when update.gitRepo and update.channel=stable are configured", async () => {
+    const tempDir = createCaseDir("openclaw-update-git-stable-dir");
+    await withEnvAsync({ OPENCLAW_GIT_DIR: tempDir }, async () => {
+      mockPackageInstallStatus(createCaseDir("openclaw-update"));
+      vi.mocked(readConfigFileSnapshot).mockResolvedValue({
+        ...baseSnapshot,
+        config: {
+          update: {
+            channel: "stable",
+            gitRepo: "https://github.com/daydreamsai/openclaw-x402-router.git",
+          },
+        } as OpenClawConfig,
+      });
+
+      await updateCommand({ yes: true });
+
+      expect(runCommandWithTimeout).toHaveBeenCalledWith(
+        ["git", "clone", "https://github.com/daydreamsai/openclaw-x402-router.git", tempDir],
+        expect.objectContaining({ timeoutMs: expect.any(Number) }),
+      );
+      expectUpdateCallChannel("stable");
+    });
+  });
+
   it("honors --tag override", async () => {
     const tempDir = createCaseDir("openclaw-update");
 
diff --git a/src/cli/update-cli/shared.ts b/src/cli/update-cli/shared.ts
@@ -57,6 +57,37 @@ const MAX_LOG_CHARS = 8000;
 export const DEFAULT_PACKAGE_NAME = "openclaw";
 const CORE_PACKAGE_NAMES = new Set([DEFAULT_PACKAGE_NAME]);
 
+export type UpdateGitRepoSource = "default" | "config" | "env";
+
+export type ResolvedUpdateGitRepo = {
+  url: string;
+  source: UpdateGitRepoSource;
+};
+
+function normalizeGitRepoUrl(value?: string | null): string | null {
+  if (!value) {
+    return null;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+export function resolveUpdateGitRepo(configuredRepo?: string | null): ResolvedUpdateGitRepo {
+  const envOverride =
+    normalizeGitRepoUrl(process.env.OPENCLAW_UPDATE_GIT_REPO) ??
+    normalizeGitRepoUrl(process.env.OPENCLAW_REPO);
+  if (envOverride) {
+    return { url: envOverride, source: "env" };
+  }
+
+  const configRepo = normalizeGitRepoUrl(configuredRepo);
+  if (configRepo) {
+    return { url: configRepo, source: "config" };
+  }
+
+  return { url: OPENCLAW_REPO_URL, source: "default" };
+}
+
 export function normalizeTag(value?: string | null): string | null {
   if (!value) {
     return null;
@@ -198,12 +229,15 @@ export async function ensureGitCheckout(params: {
   dir: string;
   timeoutMs: number;
   progress?: UpdateStepProgress;
+  repoUrl?: string;
+  enforceRepo?: boolean;
 }): Promise<UpdateStepResult | null> {
+  const repoUrl = normalizeGitRepoUrl(params.repoUrl) ?? OPENCLAW_REPO_URL;
   const dirExists = await pathExists(params.dir);
   if (!dirExists) {
     return await runUpdateStep({
       name: "git clone",
-      argv: ["git", "clone", OPENCLAW_REPO_URL, params.dir],
+      argv: ["git", "clone", repoUrl, params.dir],
       timeoutMs: params.timeoutMs,
       progress: params.progress,
     });
@@ -219,7 +253,7 @@ export async function ensureGitCheckout(params: {
 
     return await runUpdateStep({
       name: "git clone",
-      argv: ["git", "clone", OPENCLAW_REPO_URL, params.dir],
+      argv: ["git", "clone", repoUrl, params.dir],
       cwd: params.dir,
       timeoutMs: params.timeoutMs,
       progress: params.progress,
@@ -230,6 +264,29 @@ export async function ensureGitCheckout(params: {
     throw new Error(`OPENCLAW_GIT_DIR does not look like a core checkout: ${params.dir}.`);
   }
 
+  if (params.enforceRepo) {
+    const originRes = await runCommandWithTimeout(
+      ["git", "-C", params.dir, "remote", "get-url", "origin"],
+      {
+        cwd: params.dir,
+        timeoutMs: params.timeoutMs,
+      },
+    ).catch(() => null);
+
+    const currentOrigin = originRes?.code === 0 ? originRes.stdout.trim() : null;
+    if (currentOrigin !== repoUrl) {
+      return await runUpdateStep({
+        name: currentOrigin ? "git remote set-url origin" : "git remote add origin",
+        argv: currentOrigin
+          ? ["git", "-C", params.dir, "remote", "set-url", "origin", repoUrl]
+          : ["git", "-C", params.dir, "remote", "add", "origin", repoUrl],
+        cwd: params.dir,
+        timeoutMs: params.timeoutMs,
+        progress: params.progress,
+      });
+    }
+  }
+
   return null;
 }
 
diff --git a/src/cli/update-cli/update-command.ts b/src/cli/update-cli/update-command.ts
@@ -57,6 +57,7 @@ import {
   resolveGlobalManager,
   resolveNodeRunner,
   resolveTargetVersion,
+  resolveUpdateGitRepo,
   resolveUpdateRoot,
   runUpdateStep,
   tryWriteCompletionCache,
@@ -323,6 +324,8 @@ async function runPackageInstallUpdate(params: {
 async function runGitUpdate(params: {
   root: string;
   switchToGit: boolean;
+  gitRepoUrl: string;
+  enforceGitRepo: boolean;
   installKind: "git" | "package" | "unknown";
   timeoutMs: number | undefined;
   startedAt: number;
@@ -336,21 +339,24 @@ async function runGitUpdate(params: {
   const updateRoot = params.switchToGit ? resolveGitInstallDir() : params.root;
   const effectiveTimeout = params.timeoutMs ?? 20 * 60_000;
 
-  const cloneStep = params.switchToGit
-    ? await ensureGitCheckout({
-        dir: updateRoot,
-        timeoutMs: effectiveTimeout,
-        progress: params.progress,
-      })
-    : null;
-
-  if (cloneStep && cloneStep.exitCode !== 0) {
+  const checkoutStep =
+    params.switchToGit || params.enforceGitRepo
+      ? await ensureGitCheckout({
+          dir: updateRoot,
+          timeoutMs: effectiveTimeout,
+          progress: params.progress,
+          repoUrl: params.gitRepoUrl,
+          enforceRepo: params.enforceGitRepo,
+        })
+      : null;
+
+  if (checkoutStep && checkoutStep.exitCode !== 0) {
     const result: UpdateRunResult = {
       status: "error",
       mode: "git",
       root: updateRoot,
-      reason: cloneStep.name,
-      steps: [cloneStep],
+      reason: checkoutStep.name,
+      steps: [checkoutStep],
       durationMs: Date.now() - params.startedAt,
     };
     params.stop();
@@ -367,7 +373,7 @@ async function runGitUpdate(params: {
     channel: params.channel,
     tag: params.tag,
   });
-  const steps = [...(cloneStep ? [cloneStep] : []), ...updateResult.steps];
+  const steps = [...(checkoutStep ? [checkoutStep] : []), ...updateResult.steps];
 
   if (params.switchToGit && updateResult.status === "ok") {
     const manager = await resolveGlobalManager({
@@ -661,10 +667,18 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
     return;
   }
 
+  const gitRepo = resolveUpdateGitRepo(
+    configSnapshot.valid ? configSnapshot.config.update?.gitRepo : undefined,
+  );
+  const preferGitRepo = gitRepo.source !== "default";
+
   const installKind = updateStatus.installKind;
-  const switchToGit = requestedChannel === "dev" && installKind !== "git";
+  const switchToGit = installKind !== "git" && (requestedChannel === "dev" || preferGitRepo);
   const switchToPackage =
-    requestedChannel !== null && requestedChannel !== "dev" && installKind === "git";
+    requestedChannel !== null &&
+    requestedChannel !== "dev" &&
+    installKind === "git" &&
+    !preferGitRepo;
   const updateInstallKind = switchToGit ? "git" : switchToPackage ? "package" : installKind;
   const defaultChannel =
     updateInstallKind === "git" ? DEFAULT_GIT_CHANNEL : DEFAULT_PACKAGE_CHANNEL;
@@ -711,11 +725,16 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
       actions.push(`Persist update.channel=${requestedChannel} in config`);
     }
     if (switchToGit) {
-      actions.push("Switch install mode from package to git checkout (dev channel)");
+      actions.push(
+        `Switch install mode from package to git checkout (channel ${channel}, repo ${gitRepo.url})`,
+      );
     } else if (switchToPackage) {
       actions.push(`Switch install mode from git to package manager (${mode})`);
     } else if (updateInstallKind === "git") {
       actions.push(`Run git update flow on channel ${channel} (fetch/rebase/build/doctor)`);
+      if (gitRepo.source !== "default") {
+        actions.push(`Ensure git origin matches configured repo (${gitRepo.url})`);
+      }
     } else {
       actions.push(`Run global package manager update with spec openclaw@${tag}`);
     }
@@ -842,6 +861,8 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
     : await runGitUpdate({
         root,
         switchToGit,
+        gitRepoUrl: gitRepo.url,
+        enforceGitRepo: gitRepo.source !== "default",
         installKind,
         timeoutMs,
         startedAt,
diff --git a/src/config/schema.help.ts b/src/config/schema.help.ts
@@ -48,6 +48,8 @@ export const FIELD_HELP: Record<string, string> = {
   update:
     "Update-channel and startup-check behavior for keeping OpenClaw runtime versions current. Use conservative channels in production and more experimental channels only in controlled environments.",
   "update.channel": 'Update channel for git + npm installs ("stable", "beta", or "dev").',
+  "update.gitRepo":
+    "Optional git repository URL to use for update checkouts. Set this for forks so update does not clone upstream OpenClaw by default.",
   "update.checkOnStart": "Check for npm updates when the gateway starts (default: true).",
   "update.auto.enabled": "Enable background auto-update for package installs (default: false).",
   "update.auto.stableDelayHours":
diff --git a/src/config/schema.labels.ts b/src/config/schema.labels.ts
@@ -27,6 +27,7 @@ export const FIELD_LABELS: Record<string, string> = {
   "logging.redactPatterns": "Custom Redaction Patterns",
   update: "Updates",
   "update.channel": "Update Channel",
+  "update.gitRepo": "Update Git Repository",
   "update.checkOnStart": "Update Check on Start",
   "update.auto.enabled": "Auto Update Enabled",
   "update.auto.stableDelayHours": "Auto Update Stable Delay (hours)",
diff --git a/src/config/types.openclaw.ts b/src/config/types.openclaw.ts
@@ -64,6 +64,8 @@ export type OpenClawConfig = {
   update?: {
     /** Update channel for git + npm installs ("stable", "beta", or "dev"). */
     channel?: "stable" | "beta" | "dev";
+    /** Optional git repository URL used for update checkouts. */
+    gitRepo?: string;
     /** Check for updates on gateway start (npm installs only). */
     checkOnStart?: boolean;
     /** Core auto-update policy for package installs. */
diff --git a/src/config/zod-schema.ts b/src/config/zod-schema.ts
@@ -225,6 +225,7 @@ export const OpenClawSchema = z
     update: z
       .object({
         channel: z.union([z.literal("stable"), z.literal("beta"), z.literal("dev")]).optional(),
+        gitRepo: z.string().optional(),
         checkOnStart: z.boolean().optional(),
         auto: z
           .object({
