fix: stop unknown-root git services · openclaw/openclaw@400b3e0

Recent Commits to openclaw:main

shakkernerd · 2026-06-11 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -2877,6 +2877,34 @@ describe("update-cli", () => {`
`2877`	`2877`	`expect(updateCall?.beforeGitMutation).toEqual(expect.any(Function));`
`2878`	`2878`	`});`
`2879`	`2879`
	`2880`	`+it("stops a running managed git gateway when wrapper commands hide the service root", async () => {`
	`2881`	`+const wrapperPath = path.join(`
	`2882`	`+createCaseDir("openclaw-update-wrapper-service"),`
	`2883`	`+"gateway-wrapper",`
	`2884`	`+);`
	`2885`	`+serviceReadCommand.mockResolvedValue({`
	`2886`	`+programArguments: [wrapperPath, "gateway", "run"],`
	`2887`	`+environment: {`
	`2888`	`+OPENCLAW_SERVICE_MARKER: "openclaw",`
	`2889`	`+OPENCLAW_SERVICE_KIND: "gateway",`
	`2890`	`+},`
	`2891`	`+});`
	`2892`	`+serviceLoaded.mockResolvedValue(true);`
	`2893`	`+serviceReadRuntime.mockResolvedValue({`
	`2894`	`+status: "running",`
	`2895`	`+pid: 4242,`
	`2896`	`+state: "running",`
	`2897`	`+});`
	`2898`	`+mockGitUpdateAfterMutation();`
	`2899`	`+`
	`2900`	`+await updateCommand({ yes: true });`
	`2901`	`+`
	`2902`	`+expect(serviceStop).toHaveBeenCalledTimes(1);`
	`2903`	`+expect(runGatewayUpdate).toHaveBeenCalledTimes(1);`
	`2904`	`+expect(prepareRestartScript).toHaveBeenCalled();`
	`2905`	`+expect(runDaemonRestart).not.toHaveBeenCalled();`
	`2906`	`+});`
	`2907`	`+`
`2880`	`2908`	`it("fails managed git restart when the gateway responds but the service stays stopped", async () => {`
`2881`	`2909`	`const serviceEntrypoint = path.join(process.cwd(), "dist", "index.js");`
`2882`	`2910`	`serviceReadCommand.mockResolvedValue({`

Original file line number	Diff line number	Diff line change
`@@ -926,7 +926,8 @@ async function maybeStopManagedServiceBeforeMutableUpdate(params: {`
`926`	`926`
`927`	`927`	`if (`
`928`	`928`	`params.updateInstallKind === "git" &&`
`929`		`-!(await gatewayServiceCommandUsesRoot({ root: params.root, command: serviceState.command }))`
	`929`	`+(await gatewayServiceCommandUsesRoot({ root: params.root, command: serviceState.command })) ===`
	`930`	`+false`
`930`	`931`	`) {`
`931`	`932`	`if (!params.jsonMode) {`
`932`	`933`	`defaultRuntime.log(`
`@@ -1459,10 +1460,10 @@ async function gatewayServiceCommandUsesRoot(params: {`
`1459`	`1460`	`root: string \| undefined;`
`1460`	`1461`	`env?: NodeJS.ProcessEnv;`
`1461`	`1462`	`command?: GatewayServiceCommandConfig \| null;`
`1462`		`-}): Promise<boolean> {`
	`1463`	`+}): Promise<boolean \| null> {`
`1463`	`1464`	`const expectedRoot = normalizeOptionalString(params.root);`
`1464`	`1465`	`if (!expectedRoot) {`
`1465`		`-return false;`
	`1466`	`+return null;`
`1466`	`1467`	`}`
`1467`	`1468`	`const command =`
`1468`	`1469`	`params.command === undefined`
`@@ -1473,7 +1474,7 @@ async function gatewayServiceCommandUsesRoot(params: {`
`1473`	`1474`	`const layout = await summarizeGatewayServiceLayout(command);`
`1474`	`1475`	`const serviceRoot = layout?.packageRoot;`
`1475`	`1476`	`if (!serviceRoot) {`
`1476`		`-return false;`
	`1477`	`+return null;`
`1477`	`1478`	`}`
`1478`	`1479`	`const [expectedRootReal, serviceRootReal] = await Promise.all([`
`1479`	`1480`	`tryRealpathOrResolve(expectedRoot),`
`@@ -2242,10 +2243,10 @@ async function maybeRestartService(params: {`
`2242`	`2243`	`});`
`2243`	`2244`	`if (`
`2244`	`2245`	`updatedInstallRestartNeedsServiceRootProof &&`
`2245`		`-!(await gatewayServiceCommandUsesRoot({`
	`2246`	`+(await gatewayServiceCommandUsesRoot({`
`2246`	`2247`	`root: params.result.root,`
`2247`	`2248`	`env: params.serviceEnv,`
`2248`		`-}))`
	`2249`	`+})) !== true`
`2249`	`2250`	`) {`
`2250`	`2251`	`if (!params.opts.json) {`
`2251`	`2252`	`defaultRuntime.log(`
`@@ -3820,7 +3821,7 @@ async function updateCommandInternal(opts: UpdateCommandOptions): Promise<void>`
`3820`	`3821`	`serviceState.installed &&`
`3821`	`3822`	`serviceState.loaded &&`
`3822`	`3823`	`preManagedServiceStop?.stopped !== true &&`
`3823`		`-serviceMatchesUpdateRoot !== true;`
	`3824`	`+serviceMatchesUpdateRoot === false;`
`3824`	`3825`	`if (`
`3825`	`3826`	`shouldPrepareUpdatedInstallRestart({`
`3826`	`3827`	`updateMode: resultWithPostUpdate.mode,`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main