fix(crabbox): default macos aws runs on demand

vincentkoc · vincentkoc · commit ad71a998ff94 · 2026-05-24T19:31:19.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ Docs: https://docs.openclaw.ai
 - Crabbox: let the wrapper find a sibling Crabbox checkout from linked Git worktrees so Codex worktrees can run remote gates without a PATH shim.
 - Scripts: tolerate the standard `--` option separator in shared script flag parsing so perf/test helpers accept package-manager argument forwarding.
 - Tests: preserve `--` passthrough arguments in live-media, live-shard, and extension batch harnesses so Vitest filters are not misread or silently ignored.
+- Crabbox: default AWS macOS runner requests to on-demand capacity so EC2 Mac proof commands do not fail on the unsupported Spot market default.
 - Tests: run upgrade-survivor config recipe commands through the Windows npm shim so native Windows package walks keep baseline config coverage.
 - Image tool: use bundled Anthropic media limits when resolving image compression policy without provider-runtime hooks.
 - Tests: fail the kitchen-sink RPC Docker walk when gateway RSS sampling is unavailable instead of silently disabling the per-process memory guard.
diff --git a/scripts/crabbox-wrapper.mjs b/scripts/crabbox-wrapper.mjs
@@ -387,6 +387,31 @@ function hasOption(commandArgs, name) {
   return false;
 }
 
+function commandOptionEnd(commandArgs) {
+  if (commandArgs[0] === "run") {
+    return runCommandBounds(commandArgs).optionEnd;
+  }
+  const delimiter = commandArgs.indexOf("--");
+  return delimiter >= 0 ? delimiter : commandArgs.length;
+}
+
+function ensureAwsMacOnDemandMarket(commandArgs, providerName) {
+  if (
+    !["run", "warmup"].includes(commandArgs[0]) ||
+    providerName !== "aws" ||
+    optionValue(commandArgs, "--target") !== "macos" ||
+    hasOption(commandArgs, "--market") ||
+    hasOption(commandArgs, "--id")
+  ) {
+    return commandArgs;
+  }
+
+  const optionEnd = commandOptionEnd(commandArgs);
+  const normalizedArgs = [...commandArgs];
+  normalizedArgs.splice(optionEnd, 0, "--market", "on-demand");
+  return normalizedArgs;
+}
+
 const localPathRunOptions = new Set([
   "capture-stderr",
   "capture-stdout",
@@ -669,6 +694,7 @@ const providers = parseProvidersFromHelp(help.text);
 const displayBinary = binary === "crabbox" ? "crabbox" : relative(repoRoot, binary);
 const provider = selectedProvider(args);
 const commandProviderValue = commandProvider(args);
+const normalizedArgs = ensureAwsMacOnDemandMarket(args, provider);
 
 console.error(
   `[crabbox] bin=${displayBinary} version=${version.text || "unknown"} provider=${provider || "unknown"} providers=${providers.join(",") || "unknown"}`,
@@ -712,8 +738,8 @@ if (provider === "blacksmith-testbox") {
 let childCwd = repoRoot;
 let cleanupChildCwd = () => {};
 let cleanupDone = false;
-if (shouldUseFullCheckoutForCleanSparseRemoteSync(args, provider)) {
-  const runWords = runCommandArgs(args);
+if (shouldUseFullCheckoutForCleanSparseRemoteSync(normalizedArgs, provider)) {
+  const runWords = runCommandArgs(normalizedArgs);
   const changedGateBase =
     isChangedGateCommand(runWords) && !headInRemoteRefs() ? mergeBaseForChangedGate() : "";
   const checkout = prepareFullCheckoutForSync({ changedGateBase });
@@ -737,9 +763,9 @@ function cleanupOnce() {
   cleanupChildCwd();
 }
 
-const runtimeEntrypoint = commandRuntimeEntrypoint(runCommandArgs(args));
-if (args[0] === "run" && provider === "aws" && runtimeEntrypoint) {
-  const id = optionValue(args, "--id");
+const runtimeEntrypoint = commandRuntimeEntrypoint(runCommandArgs(normalizedArgs));
+if (normalizedArgs[0] === "run" && provider === "aws" && runtimeEntrypoint) {
+  const id = optionValue(normalizedArgs, "--id");
   const hydrate = id
     ? `pnpm crabbox:hydrate -- --id ${id}`
     : "pnpm crabbox:warmup, then pnpm crabbox:hydrate -- --id <id>";
@@ -752,7 +778,7 @@ const childEnv = { ...process.env };
 if (
   isLocalContainerProvider(provider) &&
   !childEnv.CRABBOX_LOCAL_CONTAINER_DOCKER_SOCKET &&
-  !hasOption(args, "--local-container-docker-socket")
+  !hasOption(normalizedArgs, "--local-container-docker-socket")
 ) {
   childEnv.CRABBOX_LOCAL_CONTAINER_DOCKER_SOCKET = "1";
   console.error(
@@ -763,15 +789,15 @@ if (
   isLocalContainerProvider(provider) &&
   process.platform !== "win32" &&
   !childEnv.CRABBOX_LOCAL_CONTAINER_WORK_ROOT &&
-  !hasOption(args, "--local-container-work-root")
+  !hasOption(normalizedArgs, "--local-container-work-root")
 ) {
   childEnv.CRABBOX_LOCAL_CONTAINER_WORK_ROOT = "/tmp/openclaw-crabbox-docker-work";
   console.error(
     "[crabbox] provider=docker using short host-visible work root for OpenClaw Docker tests",
   );
 }
 
-const childArgs = childCwd === repoRoot ? args : absolutizeLocalRunPaths(args);
+const childArgs = childCwd === repoRoot ? normalizedArgs : absolutizeLocalRunPaths(normalizedArgs);
 const childInvocation = spawnInvocation(binary, childArgs, childEnv, process.platform);
 const child = spawn(childInvocation.command, childInvocation.args, {
   cwd: childCwd,
diff --git a/test/scripts/crabbox-wrapper.test.ts b/test/scripts/crabbox-wrapper.test.ts
@@ -112,6 +112,93 @@ describe("scripts/crabbox-wrapper", () => {
     expect(result.stdout).toContain('"local-container"');
   });
 
+  it("defaults AWS macOS runs to on-demand capacity", () => {
+    const result = runWrapper(
+      "provider: hetzner, aws, local-container, blacksmith-testbox, or cloudflare\n",
+      ["run", "--provider", "aws", "--target", "macos", "--", "echo ok"],
+    );
+
+    expect(result.status).toBe(0);
+    expect(parseFakeCrabboxOutput(result).args).toEqual([
+      "run",
+      "--provider",
+      "aws",
+      "--target",
+      "macos",
+      "--market",
+      "on-demand",
+      "--",
+      "echo ok",
+    ]);
+  });
+
+  it("defaults AWS macOS warmups to on-demand capacity", () => {
+    const result = runWrapper(
+      "provider: hetzner, aws, local-container, blacksmith-testbox, or cloudflare\n",
+      ["warmup", "--provider", "aws", "--target", "macos"],
+    );
+
+    expect(result.status).toBe(0);
+    expect(parseFakeCrabboxOutput(result).args).toEqual([
+      "warmup",
+      "--provider",
+      "aws",
+      "--target",
+      "macos",
+      "--market",
+      "on-demand",
+    ]);
+  });
+
+  it("does not override explicit AWS macOS market or lease selections", () => {
+    const helpText = "provider: hetzner, aws, local-container, blacksmith-testbox, or cloudflare\n";
+    const explicitMarket = runWrapper(helpText, [
+      "run",
+      "--provider",
+      "aws",
+      "--target=macos",
+      "--market",
+      "spot",
+      "--",
+      "echo ok",
+    ]);
+    const existingLease = runWrapper(helpText, [
+      "run",
+      "--provider",
+      "aws",
+      "--target",
+      "macos",
+      "--id",
+      "cbx_existing",
+      "--",
+      "echo ok",
+    ]);
+
+    expect(explicitMarket.status).toBe(0);
+    expect(parseFakeCrabboxOutput(explicitMarket).args).toEqual([
+      "run",
+      "--provider",
+      "aws",
+      "--target=macos",
+      "--market",
+      "spot",
+      "--",
+      "echo ok",
+    ]);
+    expect(existingLease.status).toBe(0);
+    expect(parseFakeCrabboxOutput(existingLease).args).toEqual([
+      "run",
+      "--provider",
+      "aws",
+      "--target",
+      "macos",
+      "--id",
+      "cbx_existing",
+      "--",
+      "echo ok",
+    ]);
+  });
+
   it("finds a Crabbox checkout next to the Git common dir in linked worktrees", () => {
     const fakeWorkspaceParent = mkdtempSync(path.join(tmpdir(), "openclaw-linked-worktree-"));
     tempDirs.push(fakeWorkspaceParent);
