fix: harden update dev switch and refresh changelog

src/cli/update-cli/shared.ts

@@ -2,7 +2,6 @@ import { spawnSync } from "node:child_process";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { resolveStateDir } from "../../config/paths.js";
 import { resolveOpenClawPackageRoot } from "../../infra/openclaw-root.js";
 import { readPackageName, readPackageVersion } from "../../infra/package-json.js";
 import { normalizePackageTagInput } from "../../infra/package-tag.js";
@@ -11,6 +10,7 @@ import { parseSemver } from "../../infra/runtime-guard.js";
 import { fetchNpmTagVersion } from "../../infra/update-check.js";
 import {
   canResolveRegistryVersionForPackageTarget,
+  createGlobalInstallEnv,
   detectGlobalInstallManagerByPresence,
   detectGlobalInstallManagerForRoot,
   type CommandRunner,
@@ -121,7 +121,7 @@ export function resolveGitInstallDir(): string {
 }
 
 function resolveDefaultGitDir(): string {
-  return resolveStateDir(process.env, os.homedir);
+  return path.join(os.homedir(), "openclaw");
 }
 
 export function resolveNodeRunner(): string {
@@ -192,12 +192,15 @@ export async function ensureGitCheckout(params: {
   dir: string;
   timeoutMs: number;
   progress?: UpdateStepProgress;
+  env?: NodeJS.ProcessEnv;
 }): Promise<UpdateStepResult | null> {
+  const gitEnv = params.env ?? (await createGlobalInstallEnv());
   const dirExists = await pathExists(params.dir);
   if (!dirExists) {
     return await runUpdateStep({
       name: "git clone",
       argv: ["git", "clone", OPENCLAW_REPO_URL, params.dir],
+      env: gitEnv,
       timeoutMs: params.timeoutMs,
       progress: params.progress,
     });
@@ -215,6 +218,7 @@ export async function ensureGitCheckout(params: {
       name: "git clone",
       argv: ["git", "clone", OPENCLAW_REPO_URL, params.dir],
       cwd: params.dir,
+      env: gitEnv,
       timeoutMs: params.timeoutMs,
       progress: params.progress,
     });

src/cli/update-cli/update-command.ts

@@ -385,10 +385,12 @@ async function runGitUpdate(params: {
 }): Promise<UpdateRunResult> {
   const updateRoot = params.switchToGit ? resolveGitInstallDir() : params.root;
   const effectiveTimeout = params.timeoutMs ?? 20 * 60_000;
+  const installEnv = await createGlobalInstallEnv();
 
   const cloneStep = params.switchToGit
     ? await ensureGitCheckout({
         dir: updateRoot,
+        env: installEnv,
         timeoutMs: effectiveTimeout,
         progress: params.progress,
       })
@@ -429,7 +431,7 @@ async function runGitUpdate(params: {
       name: "global install",
       argv: globalInstallArgs(manager, updateRoot),
       cwd: updateRoot,
-      env: await createGlobalInstallEnv(),
+      env: installEnv,
       timeoutMs: effectiveTimeout,
       progress: params.progress,
     });
@@ -859,20 +861,6 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
     );
   }
 
-  if (requestedChannel && configSnapshot.valid) {
-    const next = {
-      ...configSnapshot.config,
-      update: {
-        ...configSnapshot.config.update,
-        channel: requestedChannel,
-      },
-    };
-    await writeConfigFile(next);
-    if (!opts.json) {
-      defaultRuntime.log(theme.muted(`Update channel set to ${requestedChannel}.`));
-    }
-  }
-
   const showProgress = !opts.json && process.stdout.isTTY;
   if (!opts.json) {
     defaultRuntime.log(theme.heading("Updating OpenClaw..."));
@@ -956,10 +944,31 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
     return;
   }
 
+  let postUpdateConfigSnapshot = configSnapshot;
+  if (requestedChannel && configSnapshot.valid && requestedChannel !== storedChannel) {
+    const next = {
+      ...configSnapshot.config,
+      update: {
+        ...configSnapshot.config.update,
+        channel: requestedChannel,
+      },
+    };
+    await writeConfigFile(next);
+    postUpdateConfigSnapshot = {
+      ...configSnapshot,
+      parsed: next,
+      resolved: next,
+      config: next,
+    };
+    if (!opts.json) {
+      defaultRuntime.log(theme.muted(`Update channel set to ${requestedChannel}.`));
+    }
+  }
+
   await updatePluginsAfterCoreUpdate({
     root,
     channel,
-    configSnapshot,
+    configSnapshot: postUpdateConfigSnapshot,
     opts,
   });