惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

博客园 - 三生石上(FineUI控件)
S
SegmentFault 最新的问题
Jina AI
Jina AI
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
IT之家
IT之家
美团技术团队
V
Visual Studio Blog
人人都是产品经理
人人都是产品经理
博客园 - 叶小钗
有赞技术团队
有赞技术团队
GbyAI
GbyAI
宝玉的分享
宝玉的分享
腾讯CDC
M
MIT News - Artificial intelligence
博客园 - 【当耐特】
Google DeepMind News
Google DeepMind News
月光博客
月光博客
MyScale Blog
MyScale Blog
Last Week in AI
Last Week in AI
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
博客园 - 司徒正美
Recent Announcements
Recent Announcements
MongoDB | Blog
MongoDB | Blog

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(update): harden post-core finalize (service-env strip...
masatohoshin · 2026-06-18 · via Recent Commits to openclaw:main

@@ -17,6 +17,7 @@

1717

// and `runPostCorePluginConvergence`). Finalization never restarts, so the RPC

1818

// handler keeps ownership of the gateway restart.

1919

import path from "node:path";

20+

import { GATEWAY_SERVICE_RUNTIME_PID_ENV } from "../daemon/constants.js";

2021

import { resolveGatewayInstallEntrypoint } from "../daemon/gateway-entrypoint.js";

2122

import { runCommandWithTimeout } from "../process/exec.js";

2223

import { resolveStableNodePath } from "./stable-node-path.js";

@@ -25,6 +26,22 @@ import type { UpdateRunResult } from "./update-runner.js";

25262627

const DEFAULT_FINALIZE_TIMEOUT_MS = 30 * 60_000;

272829+

// Strip the running gateway's service identity from the finalizer child so it is

30+

// not mistaken for the managed service process (matches the CLI post-core spawn).

31+

function buildFinalizeEnv(

32+

baseEnv: NodeJS.ProcessEnv,

33+

compatHostVersion?: string,

34+

): NodeJS.ProcessEnv {

35+

const env: NodeJS.ProcessEnv = { ...baseEnv };

36+

delete env.OPENCLAW_SERVICE_MARKER;

37+

delete env.OPENCLAW_SERVICE_KIND;

38+

delete env[GATEWAY_SERVICE_RUNTIME_PID_ENV];

39+

if (compatHostVersion) {

40+

env.OPENCLAW_COMPATIBILITY_HOST_VERSION = compatHostVersion;

41+

}

42+

return env;

43+

}

44+2845

export type PostCoreFinalizeOutcome =

2946

| { status: "skipped"; reason: "not-git-update" | "entrypoint-missing" }

3047

| { status: "ok"; entrypoint: string }

@@ -50,6 +67,25 @@ const defaultFinalizeSpawner: PostCoreFinalizeSpawner = async ({ argv, cwd, time

5067

return { code: res.code, ...(res.stderr ? { stderr: res.stderr } : {}) };

5168

};

526970+

function normalizeOptionalString(value: string | null | undefined): string | undefined {

71+

const trimmed = value?.trim();

72+

return trimmed ? trimmed : undefined;

73+

}

74+75+

// A no-op git update (same SHA and version) has nothing new to converge against,

76+

// so skip finalize to avoid an unnecessary doctor/convergence run. Mirrors the

77+

// CLI's `shouldResumePostCoreUpdateInFreshProcess` git resume gate.

78+

function gitCoreChanged(result: UpdateRunResult): boolean {

79+

const beforeSha = normalizeOptionalString(result.before?.sha);

80+

const afterSha = normalizeOptionalString(result.after?.sha);

81+

if (beforeSha && afterSha && beforeSha !== afterSha) {

82+

return true;

83+

}

84+

const beforeVersion = normalizeOptionalString(result.before?.version);

85+

const afterVersion = normalizeOptionalString(result.after?.version);

86+

return Boolean(beforeVersion && afterVersion && beforeVersion !== afterVersion);

87+

}

88+5389

// Only git/source updates routed through `runGatewayUpdate` defer-and-drop

5490

// plugin convergence. Package-manager/global installs already converge because

5591

// the RPC routes them through `startManagedServiceUpdateHandoff`, which

@@ -61,7 +97,8 @@ function isGitUpdateNeedingFinalize(

6197

result.status === "ok" &&

6298

result.mode === "git" &&

6399

typeof result.root === "string" &&

64-

result.root.length > 0

100+

result.root.length > 0 &&

101+

gitCoreChanged(result)

65102

);

66103

}

67104

@@ -123,10 +160,7 @@ export async function runPostCoreFinalizeAfterGatewayUpdate(params: {

123160

// Pin the finalizer's host-compat resolution to the just-installed core

124161

// version so plugins reconcile against the new core, not the running process.

125162

const compatHostVersion = result.after?.version ?? undefined;

126-

const baseEnv = params.env ?? process.env;

127-

const env: NodeJS.ProcessEnv = compatHostVersion

128-

? { ...baseEnv, OPENCLAW_COMPATIBILITY_HOST_VERSION: compatHostVersion }

129-

: { ...baseEnv };

163+

const env = buildFinalizeEnv(params.env ?? process.env, compatHostVersion);

130164131165

try {

132166

const spawnResult = await spawnFinalize({