ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-27 12:56:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(crabbox): restore cloud machine CPU and RAM (#130684)

Browse Source 
Preserve structured provider catalogs beyond the lifecycle log capture limit so the cloud machine picker shows CPU/RAM and all available classes again. Keep lifecycle output limits and machine selection unchanged.

Fixes #130660.
This commit is contained in:
Peter Steinberger
2026-08-26 21:42:56 -07:00
committed by GitHub
parent fb0e5bd6bb
commit d9506ff26e
2 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/crabbox/src/crabbox-worker-machine-options.ts
+5 -6
View File
@@ -1,7 +1,6 @@
import type { WorkerProvider } from "openclaw/plugin-sdk/plugin-entry";
import { asPositiveSafeInteger, isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
import type { CrabboxCommandRunner } from "./crabbox-worker-command.js";
import { runCrabboxCommand } from "./crabbox-worker-command.js";
import {
type CrabboxMachineShape,
listCrabboxMachineOptions,
@@ -55,11 +54,11 @@ export function createCrabboxMachineOptionsResolver(
const machineShapesByBinary = new Map<string, Promise<CrabboxMachineShapes>>();
const loadMachineShapes = async (binary: string): Promise<CrabboxMachineShapes> => {
try {
const result = await runCrabboxCommand({
action: "providers",
args: ["providers", "--json"],
binary,
runCommand: dependencies.runCommand,
// The full provider matrix exceeds the lifecycle command's 64 KiB log cap.
// Keep catalog JSON intact or every provider loses its machine shapes.
const result = await dependencies.runCommand([binary, "providers", "--json"], {
maxOutputBytes: 1024 * 1024,
killProcessTree: true,
timeoutMs: CRABBOX_MACHINE_CATALOG_TIMEOUT_MS,
});
if (result.termination !== "exit" || result.code !== 0) {
extensions/crabbox/src/crabbox-worker-provider.test.ts
+32 -17
View File
@@ -166,25 +166,34 @@ function hasLoneSurrogate(value: string): boolean {
}
describe("Crabbox worker provider", () => {
it("derives ordered machine classes and shapes while preserving configured defaults", async () => {
it("reads large machine catalogs while preserving shapes, order, and configured defaults", async () => {
const calls: string[][] = [];
const provider = providerWithRunner(async (argv) => {
const provider = providerWithRunner(async (argv, options) => {
calls.push(argv);
return commandResult({
stdout: JSON.stringify([
{
provider: "aws",
classes: [
{ class: "tiny", type: "c7a.2xlarge", vcpu: 8, memoryGb: 16 },
{ class: "small", type: "c7a.4xlarge", vcpu: 16, memoryGb: 32 },
{ class: "standard", type: "c7a.8xlarge", vcpu: 32, memoryGb: 64 },
{ class: "fast", type: "c7a.16xlarge", vcpu: 64, memoryGb: 128 },
{ class: "large", type: "c7a.24xlarge", vcpu: 96, memoryGb: 192 },
{ class: "beast", type: "c7a.48xlarge", vcpu: 192, memoryGb: 384 },
],
},
]),
});
return processRuntime.runCommandWithTimeout(
[process.execPath, "-e", "process.stdin.pipe(process.stdout)"],
{
...options,
input: JSON.stringify([
{
provider: "unrelated",
classCatalog: { metadata: "x".repeat(65_536) },
},
{
provider: "aws",
classes: [
{ class: "tiny", type: "c7a.2xlarge", vcpu: 8, memoryGb: 16 },
{ class: "small", type: "c7a.4xlarge", vcpu: 16, memoryGb: 32 },
{ class: "standard", type: "c7a.8xlarge", vcpu: 32, memoryGb: 64 },
{ class: "fast", type: "c7a.16xlarge", vcpu: 64, memoryGb: 128 },
{ class: "large", type: "c7a.24xlarge", vcpu: 96, memoryGb: 192 },
{ class: "beast", type: "c7a.48xlarge", vcpu: 192, memoryGb: 384 },
],
},
{ provider: "machine0", classCatalog: { disposition: "unmapped", profiles: [] } },
]),
},
);
});
expect(provider.supportedExecutionModes).toEqual(["worker-turn", "remote-exec"]);
expect(await provider.listMachineOptions?.(PROFILE)).toEqual([
@@ -215,6 +224,12 @@ describe("Crabbox worker provider", () => {
},
]);
await provider.listMachineOptions?.(PROFILE);
expect(await provider.listMachineOptions?.({ ...PROFILE, provider: "machine0" })).toEqual([
{ id: "standard", label: "Standard", default: true },
{ id: "fast", label: "Fast" },
{ id: "large", label: "Large" },
{ id: "beast", label: "Beast" },
]);
expect(calls.filter((argv) => argv[1] === "providers")).toHaveLength(1);
});