Skip to content

fix(onboard): avoid forcing plain BuildKit progress #6536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cv merged 3 commits into from
Jul 9, 2026
Merged

fix(onboard): avoid forcing plain BuildKit progress #6536

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffbee34
fix(onboard): format local BuildKit stage output
sandl99 Jul 9, 2026
798988e
fix(onboard): avoid parsing BuildKit progress
sandl99 Jul 9, 2026
31f9249
merge(main): sync PR #6536 with latest main
cv Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 57 additions & 3 deletions src/lib/onboard/sandbox-prebuild.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,8 @@ describe("sandbox BuildKit prebuild", () => {
it("uses the argv-based Docker helper and returns the local image on success", async () => {
const { buildCtx, createArgs, dockerfile } = createBuildContext();
const buildImage = vi.fn(async () => 0);
const resolvedBuildCtx = fs.realpathSync(buildCtx);
const resolvedDockerfile = fs.realpathSync(dockerfile);
const result = await prebuildSandboxImageIfEligible({
buildCtx,
buildId: BUILD_ID,
Expand All @@ -332,12 +334,13 @@ describe("sandbox BuildKit prebuild", () => {
"-t",
"nemoclaw-sandbox-local:alpha-1234567890",
"-f",
dockerfile,
buildCtx,
resolvedDockerfile,
resolvedBuildCtx,
],
expect.objectContaining({
env: expect.objectContaining({ DOCKER_BUILDKIT: "1" }),
stdio: "inherit",
onOutput: expect.any(Function),
stdio: "pipe",
}),
);
expect(result).toEqual({
Expand All @@ -346,6 +349,57 @@ describe("sandbox BuildKit prebuild", () => {
});
});

it("formats local BuildKit output as plain stage lines", async () => {
const { buildCtx, createArgs } = createBuildContext();
const buildImage = vi.fn(async (_args, options) => {
options.onOutput(
[
'#0 building with "default" instance using docker driver',
"#1 [internal] load build definition from Dockerfile",
"#1 transferring dockerfile: 95.23kB done",
'#1 WARN: SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "NEMOCLAW_PROVIDER_KEY") (line 819)',
"#1 DONE 0.0s",
"#2 [stage-2 1/61] FROM ghcr.io/nvidia/nemoclaw/sandbox-base@sha256:abc123",
"#2 CACHED",
"#67 [stage-2 52/61] RUN openclaw doctor --fix --non-interactive",
"#67 0.942 OPENCLAW",
"#67 DONE 5.8s",
"",
].join("\n"),
);
return 0;
});
const log = vi.fn();

await expect(
prebuildSandboxImageIfEligible({
buildCtx,
buildId: BUILD_ID,
origin: "generated",
createArgs,
sandboxName: "alpha",
dockerDriverGateway: true,
env: {},
buildImage,
log,
}),
).resolves.toMatchObject({
imageRef: "nemoclaw-sandbox-local:alpha-1234567890",
});

const lines = log.mock.calls.map((call) => call[0] as string);
expect(lines).toContain(" [internal] load build definition from Dockerfile");
expect(lines.some((line) => line.includes("WARN: SecretsUsedInArgOrEnv"))).toBe(true);
expect(lines).toContain(
" [stage-2 1/61] FROM ghcr.io/nvidia/nemoclaw/sandbox-base@sha256:abc123",
);
expect(lines).toContain(" [stage-2 52/61] RUN openclaw doctor --fix --non-interactive");
expect(lines.some((line) => line.includes("#0 building"))).toBe(false);
expect(lines.some((line) => line.includes("CACHED"))).toBe(false);
expect(lines.some((line) => line.includes("DONE"))).toBe(false);
expect(lines.some((line) => line.includes("OPENCLAW"))).toBe(false);
});

it.each([
["nonzero result", async () => 1],
["missing exit status", async () => null],
Expand Down
101 changes: 98 additions & 3 deletions src/lib/onboard/sandbox-prebuild.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ const DOCKER_ENV_NAMES = [
"DOCKER_CONTEXT",
"DOCKER_TLS_VERIFY",
] as const;
const BUILDKIT_STEP_RE = /^#(?<id>\d+)\s+(?<detail>\[[^\]]+\]\s+.+)$/;
const BUILDKIT_STATUS_RE = /^#(?<id>\d+)\s+(?<status>DONE|CACHED)\b/;
const BUILDKIT_STEP_OUTPUT_RE = /^#(?<id>\d+)\s+[\d.]+\s+/;
const BUILDKIT_WARNING_RE = /^#\d+\s+(?<warning>WARN:\s+.+)$/;
const BUILDKIT_ERROR_RE = /^#(?<id>\d+)\s+(?<error>ERROR:\s+.+)$/;
const MAX_FAILURE_OUTPUT_LINES = 80;

export interface SandboxPrebuildInput {
buildCtx: string;
Expand All @@ -34,7 +40,11 @@ export interface SandboxPrebuildInput {
env?: NodeJS.ProcessEnv;
buildImage?: (
args: readonly string[],
options: { env: NodeJS.ProcessEnv; stdio: "inherit" },
options: {
env: NodeJS.ProcessEnv;
onOutput: (chunk: Buffer | string) => void;
stdio: "pipe";
},
) => Promise<number | null>;
log?: (message: string) => void;
}
Expand Down Expand Up @@ -125,6 +135,77 @@ export function resolveSandboxPrebuildEnabled(
return !env.VITEST && env.NODE_ENV !== "test";
}

function trimDisplayLine(line: string): string {
const width = Math.max(60, Number(process.stdout.columns || 120));
const maxLen = Math.max(40, width - 4);
if (line.length <= maxLen) return line;
return `${line.slice(0, Math.max(0, maxLen - 3))}...`;
}

function createBuildKitStageLogger(log: (message: string) => void) {
const rawLines: string[] = [];
const printed = new Set<string>();
let pending = "";
let lastPrinted = "";

function print(line: string): void {
const display = trimDisplayLine(` ${line}`);
if (display === lastPrinted) return;
log(display);
lastPrinted = display;
}

function recordLine(rawLine: string): void {
const line = rawLine.replace(/\r/g, "").trimEnd();
if (!line) return;
rawLines.push(line);

const step = line.match(BUILDKIT_STEP_RE);
if (step?.groups) {
const key = `${step.groups.id}:${step.groups.detail}`;
if (!printed.has(key)) {
printed.add(key);
print(step.groups.detail);
}
return;
}

const warning = line.match(BUILDKIT_WARNING_RE);
if (warning?.groups) {
print(warning.groups.warning);
return;
}

const error = line.match(BUILDKIT_ERROR_RE);
if (error?.groups) {
print(error.groups.error);
return;
}

if (BUILDKIT_STATUS_RE.test(line) || BUILDKIT_STEP_OUTPUT_RE.test(line)) {
return;
}
}

return {
onOutput(chunk: Buffer | string): void {
pending += chunk.toString();
const lines = pending.split("\n");
pending = lines.pop() ?? "";
for (const line of lines) recordLine(line);
},
flush(): void {
if (!pending) return;
const line = pending;
pending = "";
recordLine(line);
},
failureTail(): string[] {
return rawLines.slice(-MAX_FAILURE_OUTPUT_LINES);
},
};
}

export function sandboxLocalImageRef(sandboxName: string, buildId: string): string {
const sanitize = (value: string) =>
value
Expand Down Expand Up @@ -189,13 +270,17 @@ export async function prebuildSandboxImageIfEligible(
input.buildImage ??
((args, options) =>
new Promise<number | null>((resolve, reject) => {
const child = dockerSpawn(args, { ...options, shell: false });
const { onOutput, ...spawnOptions } = options;
const child = dockerSpawn(args, { ...spawnOptions, shell: false });
child.stdout?.on("data", onOutput);
child.stderr?.on("data", onOutput);
child.once("error", reject);
child.once("close", resolve);
}));
log(" Building sandbox image with BuildKit (skips the slower in-gateway builder)...");

let status: number | null;
const buildOutput = createBuildKitStageLogger(log);
try {
status = await buildImage(
[
Expand All @@ -209,10 +294,13 @@ export async function prebuildSandboxImageIfEligible(
],
{
env: { ...dockerBuildSubprocessEnv(), DOCKER_BUILDKIT: "1" },
stdio: "inherit",
onOutput: buildOutput.onOutput,
stdio: "pipe",
},
);
buildOutput.flush();
} catch (error) {
buildOutput.flush();
const detail = error instanceof Error ? error.message : String(error);
log(` Local BuildKit build could not start (${detail}); using the gateway builder instead.`);
return { createArgs, imageRef: null };
Expand All @@ -221,6 +309,13 @@ export async function prebuildSandboxImageIfEligible(
if (status !== 0) {
const detail = status === null ? " without an exit status" : ` (exit ${status})`;
log(` Local BuildKit build failed${detail}; using the gateway builder instead.`);
const tail = buildOutput.failureTail();
if (tail.length > 0) {
log(" Local BuildKit output (last lines):");
for (const line of tail) {
log(trimDisplayLine(` ${line}`));
}
}
return { createArgs, imageRef: null };
}

Expand Down
Loading