fix(onboard): recover portable Ollama lifecycle #8506
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| import fs from "node:fs"; | ||
| import os from "node:os"; | ||
| import path from "node:path"; | ||
|
|
||
| import { afterEach, describe, expect, it } from "vitest"; | ||
|
|
||
| import { | ||
| loadUserLocalOllamaOwnership, | ||
| recordUserLocalOllamaOwnership, | ||
| removeUserLocalOllamaOwnership, | ||
| userLocalOllamaOwnershipInternals, | ||
| } from "./ollama-user-local-runtime"; | ||
|
|
||
| const temporaryDirectories: string[] = []; | ||
|
|
||
| function createFixture(): { homeDir: string; stateDir: string; binPath: string } { | ||
| const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), "nemoclaw-ollama-owner-")); | ||
| temporaryDirectories.push(homeDir); | ||
| return { | ||
| homeDir, | ||
| stateDir: path.join(homeDir, ".nemoclaw"), | ||
| binPath: path.join(homeDir, ".local", "bin", "ollama"), | ||
| }; | ||
| } | ||
|
|
||
| afterEach(() => { | ||
| for (const directory of temporaryDirectories.splice(0)) { | ||
| fs.rmSync(directory, { force: true, recursive: true }); | ||
| } | ||
| }); | ||
|
|
||
| describe("user-local Ollama ownership receipt", () => { | ||
| it("records and reloads only the fixed NemoClaw user-local path (#8502)", () => { | ||
| const fixture = createFixture(); | ||
|
|
||
| recordUserLocalOllamaOwnership(fixture.binPath, fixture); | ||
|
|
||
| expect(loadUserLocalOllamaOwnership(fixture)).toBe(fixture.binPath); | ||
| const receipt = userLocalOllamaOwnershipInternals.receiptPath(fixture); | ||
| expect(fs.statSync(receipt).mode & 0o777).toBe(0o600); | ||
| }); | ||
|
|
||
| it("refuses to record an Ollama path outside the fixed user-local install (#8502)", () => { | ||
| const fixture = createFixture(); | ||
|
|
||
| expect(() => recordUserLocalOllamaOwnership("/usr/local/bin/ollama", fixture)).toThrow( | ||
| "unexpected user-local Ollama path", | ||
| ); | ||
| }); | ||
|
|
||
| it("rejects a receipt that redirects recovery to another executable (#8502)", () => { | ||
| const fixture = createFixture(); | ||
| const receipt = userLocalOllamaOwnershipInternals.receiptPath(fixture); | ||
| fs.mkdirSync(path.dirname(receipt), { recursive: true }); | ||
| fs.writeFileSync( | ||
| receipt, | ||
| `${JSON.stringify({ schemaVersion: 1, binPath: "/tmp/unrelated" })}\n`, | ||
| { mode: 0o600 }, | ||
| ); | ||
|
|
||
| expect(() => loadUserLocalOllamaOwnership(fixture)).toThrow("ownership receipt is invalid"); | ||
| }); | ||
|
|
||
| it("removes obsolete ownership after a system installation (#8502)", () => { | ||
| const fixture = createFixture(); | ||
| recordUserLocalOllamaOwnership(fixture.binPath, fixture); | ||
|
|
||
| removeUserLocalOllamaOwnership(fixture); | ||
|
|
||
| expect(loadUserLocalOllamaOwnership(fixture)).toBeNull(); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| // SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| import fs from "node:fs"; | ||
| import os from "node:os"; | ||
| import path from "node:path"; | ||
|
|
||
| import { openRegularFileNoFollow } from "../../adapters/fs/regular-file"; | ||
| import { OLLAMA_PORT } from "../../core/ports"; | ||
| import { ensureConfigDir } from "../../state/config-io"; | ||
|
|
||
| export { OLLAMA_PORT }; | ||
|
|
||
| const RECEIPT_DIRECTORY = "ollama"; | ||
| const RECEIPT_FILE = "user-local-ownership.json"; | ||
| const MAX_RECEIPT_BYTES = 1024; | ||
|
|
||
| interface UserLocalOllamaOwnershipReceipt { | ||
| schemaVersion: 1; | ||
| binPath: string; | ||
| } | ||
|
|
||
| export interface UserLocalOllamaOwnershipDeps { | ||
| homeDir?: string; | ||
| stateDir?: string; | ||
| } | ||
|
|
||
| function resolveHomeDir(deps: UserLocalOllamaOwnershipDeps): string { | ||
| return deps.homeDir ?? os.homedir(); | ||
| } | ||
|
|
||
| function resolveStateDir(deps: UserLocalOllamaOwnershipDeps): string { | ||
| return deps.stateDir ?? path.join(resolveHomeDir(deps), ".nemoclaw"); | ||
| } | ||
|
|
||
| function receiptPath(deps: UserLocalOllamaOwnershipDeps): string { | ||
| return path.join(resolveStateDir(deps), RECEIPT_DIRECTORY, RECEIPT_FILE); | ||
| } | ||
|
|
||
| function expectedBinPath(deps: UserLocalOllamaOwnershipDeps): string { | ||
| return path.join(resolveHomeDir(deps), ".local", "bin", "ollama"); | ||
| } | ||
|
|
||
| function parseReceipt( | ||
| value: unknown, | ||
| deps: UserLocalOllamaOwnershipDeps, | ||
| ): UserLocalOllamaOwnershipReceipt { | ||
| if (typeof value !== "object" || value === null || Array.isArray(value)) { | ||
| throw new Error("NemoClaw-managed user-local Ollama ownership receipt is malformed"); | ||
| } | ||
| const receipt = value as Record<string, unknown>; | ||
| if ( | ||
| Object.keys(receipt).sort().join(",") !== "binPath,schemaVersion" || | ||
| receipt.schemaVersion !== 1 || | ||
| receipt.binPath !== expectedBinPath(deps) | ||
| ) { | ||
| throw new Error("NemoClaw-managed user-local Ollama ownership receipt is invalid"); | ||
| } | ||
| return receipt as unknown as UserLocalOllamaOwnershipReceipt; | ||
| } | ||
|
|
||
| /** Record the fixed user-local binary only after NemoClaw starts it successfully. */ | ||
| export function recordUserLocalOllamaOwnership( | ||
| binPath: string, | ||
| deps: UserLocalOllamaOwnershipDeps = {}, | ||
| ): void { | ||
| if (binPath !== expectedBinPath(deps)) { | ||
| throw new Error("NemoClaw refused to record an unexpected user-local Ollama path"); | ||
| } | ||
| const target = receiptPath(deps); | ||
| ensureConfigDir(path.dirname(target)); | ||
| let file; | ||
| try { | ||
| file = openRegularFileNoFollow(target, { writable: true }); | ||
| } catch (error) { | ||
| if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error; | ||
| file = openRegularFileNoFollow(target, { create: true, mode: 0o600, writable: true }); | ||
| } | ||
| try { | ||
| const receipt: UserLocalOllamaOwnershipReceipt = { schemaVersion: 1, binPath }; | ||
| file.replaceUtf8(`${JSON.stringify(receipt, null, 2)}\n`, 0o600); | ||
| } finally { | ||
| file.close(); | ||
| } | ||
| } | ||
|
|
||
| /** Load the exact receipt-bound user-local path, or null when no receipt exists. */ | ||
| export function loadUserLocalOllamaOwnership( | ||
| deps: UserLocalOllamaOwnershipDeps = {}, | ||
| ): string | null { | ||
| let file; | ||
| try { | ||
| file = openRegularFileNoFollow(receiptPath(deps)); | ||
| } catch (error) { | ||
| if ((error as NodeJS.ErrnoException).code === "ENOENT") return null; | ||
| throw error; | ||
| } | ||
| try { | ||
| const receipt = parseReceipt(JSON.parse(file.readUtf8(MAX_RECEIPT_BYTES)), deps); | ||
| return receipt.binPath; | ||
| } catch (error) { | ||
| if (error instanceof SyntaxError) { | ||
| throw new Error("NemoClaw-managed user-local Ollama ownership receipt is malformed"); | ||
| } | ||
| throw error; | ||
| } finally { | ||
| file.close(); | ||
| } | ||
| } | ||
|
|
||
| /** Remove stale user-local ownership after a successful system installation. */ | ||
| export function removeUserLocalOllamaOwnership(deps: UserLocalOllamaOwnershipDeps = {}): void { | ||
| try { | ||
| fs.unlinkSync(receiptPath(deps)); | ||
| } catch (error) { | ||
| if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error; | ||
| } | ||
| } | ||
|
|
||
| export const userLocalOllamaOwnershipInternals = { receiptPath }; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Scope the automatic-start statement to the applicable flow.
Line 54 says that an ordinary user-local daemon needs a manual restart after reboot. The earlier unqualified statement says NemoClaw starts any installed stopped daemon. Scope that statement to installation or onboarding, or document the portable receipt-owned recovery exception there.
🤖 Prompt for AI Agents