fix(sandbox): repair Shields removal regressions

src/lib/onboard/machine/handlers/sandbox-checkpoint-crash-recovery.test.ts

@@ -1004,7 +1004,7 @@ describe("sandbox crash-recovery replay (#5961, #6228)", () => {
 
     expect(calls.skipped).not.toHaveBeenCalledWith("sandbox", "my-assistant");
     expect(calls.createSandbox).toHaveBeenCalledTimes(1);
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({ recreate: true });
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({ recreate: true });
   });
 
   it.each([["build", defaultCreateFingerprint("v0.0.108")]] as const)(
@@ -1028,7 +1028,7 @@ describe("sandbox crash-recovery replay (#5961, #6228)", () => {
       });
 
       expect(calls.createSandbox).toHaveBeenCalledOnce();
-      expect(calls.createSandbox.mock.calls[0]?.at(-1)).toEqual(
+      expect(calls.createSandbox.mock.calls[0]?.at(-2)).toEqual(
         expect.objectContaining({ recreate: true }),
       );
       expect(calls.error).not.toHaveBeenCalled();

src/lib/onboard/machine/handlers/sandbox-create-intent-boundary.test.ts

@@ -67,7 +67,7 @@ describe("sandbox create intent machine boundary", () => {
         sandboxName: "same-sandbox",
         selectedMessagingChannels: ["telegram"],
       });
-      const createIntent = calls.createSandbox.mock.calls[0]?.at(-1) as unknown as {
+      const createIntent = calls.createSandbox.mock.calls[0]?.at(-2) as unknown as {
         resolved: unknown;
       };
       expect(createIntent).toMatchObject({
@@ -152,7 +152,7 @@ describe("sandbox create intent machine boundary", () => {
       sandboxName: "saved",
     });
 
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({
       resolved: {
         policy: { options: { additionalPresets: ["mcp-bridge-fake"] } },
       },
@@ -177,7 +177,7 @@ describe("sandbox create intent machine boundary", () => {
         sandboxName: "saved",
       });
 
-      const createIntent = calls.createSandbox.mock.calls[0]?.at(-1);
+      const createIntent = calls.createSandbox.mock.calls[0]?.at(-2);
       expect(createIntent).not.toHaveProperty("rebuildPolicyPresets");
       expect(createIntent).toMatchObject({
         resolved: { policy: { options: { additionalPresets: [] } } },
@@ -197,7 +197,7 @@ describe("sandbox create intent machine boundary", () => {
     });
 
     expect(calls.recordSkip).not.toHaveBeenCalled();
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({ recreate: true });
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({ recreate: true });
   });
 
   it("checkpoints a known sandbox name before an interrupted web-search prompt (#6743)", async () => {

src/lib/onboard/machine/handlers/sandbox-dcode-selection.test.ts

@@ -53,7 +53,7 @@ function dcodeOptions(
 }
 
 describe("handleSandboxState live DCode selection", () => {
-  it("carries durable observability intent in the sandbox create intent", async () => {
+  it("keeps observability in the create intent when the verified-create callback is absent (#10964)", async () => {
     const session = createSession({
       observabilityEnabled: true,
       observabilityRequestedExplicitly: true,
@@ -70,7 +70,7 @@ describe("handleSandboxState live DCode selection", () => {
       agent: { name: "langchain-deepagents-code" },
     });
 
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({
       resolved: expect.any(Object),
       recreate: false,
       toolDisclosure: "progressive",
@@ -80,6 +80,8 @@ describe("handleSandboxState live DCode selection", () => {
       dcodeAutoApprovalMode: "disabled",
       extraProviders: [],
     });
+    expect(calls.createSandbox.mock.calls[0]).toHaveLength(17);
+    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toBeUndefined();
   });
 
   it("carries authoritative thread opt-in in the create intent (#6478)", async () => {
@@ -92,7 +94,7 @@ describe("handleSandboxState live DCode selection", () => {
       requestedDcodeAutoApprovalMode: "thread-opt-in",
     });
 
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({
       dcodeAutoApprovalMode: "thread-opt-in",
     });
   });
@@ -121,7 +123,7 @@ describe("handleSandboxState live DCode selection", () => {
       requestedDcodeAutoApprovalMode: "thread-opt-in",
     });
 
-    expect(journal.completeCreate.mock.calls[0]?.at(-1)).toMatchObject({
+    expect(journal.completeCreate.mock.calls[0]?.at(-2)).toMatchObject({
       recreate: true,
       recreateTransaction: expect.any(Object),
       dcodeAutoApprovalMode: "thread-opt-in",
@@ -163,7 +165,7 @@ describe("handleSandboxState live DCode selection", () => {
       state: "sandbox",
       metadata: { repair: "recorded-sandbox-cleanup", sandboxName: "saved" },
     });
-    expect(journal.completeCreate.mock.calls[0]?.at(-1)).toMatchObject({
+    expect(journal.completeCreate.mock.calls[0]?.at(-2)).toMatchObject({
       recreate: true,
       recreateTransaction: expect.any(Object),
       dcodeAutoApprovalMode: "thread-opt-in",
@@ -209,7 +211,7 @@ describe("handleSandboxState live DCode selection", () => {
       "openai-completions",
       null,
     );
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toEqual({
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toEqual({
       resolved: expect.any(Object),
       recreate: true,
       toolDisclosure: "progressive",
@@ -232,7 +234,7 @@ describe("handleSandboxState live DCode selection", () => {
     await handleSandboxState(dcodeOptions(deps));
 
     expect(calls.removeSandbox).not.toHaveBeenCalled();
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toEqual({
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toEqual({
       resolved: expect.any(Object),
       recreate: true,
       toolDisclosure: "progressive",

src/lib/onboard/machine/handlers/sandbox-hermes-portable-endpoint-source.test.ts

@@ -50,7 +50,7 @@ describe("Hermes portable sandbox endpoint provenance", () => {
 
     expect(calls.skipped).not.toHaveBeenCalledWith("sandbox", "saved");
     expect(createSandbox).toHaveBeenCalledOnce();
-    expect(createSandbox.mock.calls[0]?.at(-1)).toMatchObject({ recreate: false });
+    expect(createSandbox.mock.calls[0]?.at(-2)).toMatchObject({ recreate: false });
     expect(calls.removeSandbox).not.toHaveBeenCalled();
     expect(calls.complete).toHaveBeenCalledWith(
       "sandbox",
@@ -70,7 +70,7 @@ describe("Hermes portable sandbox endpoint provenance", () => {
       hermesPortableLifecycle: true,
     });
 
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({ endpointSource: null });
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({ endpointSource: null });
     expect(calls.updateSandbox).toHaveBeenCalledWith(
       "my-assistant",
       expect.objectContaining({ endpointSource: null }),
@@ -88,6 +88,6 @@ describe("Hermes portable sandbox endpoint provenance", () => {
       hostLocalInferenceRouteOnly: false,
     });
 
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({ endpointSource: null });
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({ endpointSource: null });
   });
 });

src/lib/onboard/machine/handlers/sandbox-provider-effect-replay.test.ts

@@ -70,7 +70,7 @@ describe("handleSandboxState provider effect replay", () => {
     });
     const createSandbox = vi.fn(async (...args: unknown[]) => {
       events.push("sandbox-create");
-      const createIntent = args.at(-1) as {
+      const createIntent = args.at(-2) as {
         deferSandboxEffectsUntilIdentityVerification?: boolean;
       };
       expect(createIntent.deferSandboxEffectsUntilIdentityVerification).toBeUndefined();

src/lib/onboard/machine/handlers/sandbox-recreate-journal.test.ts

@@ -124,7 +124,7 @@ it("journals not-ready repair on the selected non-default gateway (#6492)", asyn
   });
 
   expect(createSandbox).toHaveBeenCalledOnce();
-  const createIntent = createSandbox.mock.calls[0]?.at(-1);
+  const createIntent = createSandbox.mock.calls[0]?.at(-2);
   expect(createIntent).toMatchObject({
     recreate: true,
     recreateTransaction: {
@@ -272,7 +272,7 @@ it("does not carry a recorded preset list through post-delete onboard resume", a
     liveIdentityFingerprint: null,
   };
   const createSandbox = vi.fn(async (...args: unknown[]) => {
-    const createIntent = args.at(-1);
+    const createIntent = args.at(-2);
     expect(createIntent).toMatchObject({
       recreate: true,
       recreateJournalTargetIntentFingerprint: targetIntentFingerprint,
@@ -441,7 +441,7 @@ it("removes the journaled source image after resuming a registered replacement",
   await handleSandboxState(options);
 
   expect(createSandbox).toHaveBeenCalledTimes(2);
-  expect(createSandbox.mock.calls[1]?.at(-1)).toMatchObject({
+  expect(createSandbox.mock.calls[1]?.at(-2)).toMatchObject({
     recreateTransaction: {
       id: journal?.id,
       targetGeneration: journal?.targetGeneration,
@@ -768,7 +768,7 @@ it("opens the lifecycle journal for a fresh route reservation before creation (#
   const createSandbox = vi.fn(async (...args: unknown[]) => {
     const transaction = session.checkpoint?.sandboxRecreate;
     expect(transaction).toBeDefined();
-    expect(args.at(-1)).toMatchObject({
+    expect(args.at(-2)).toMatchObject({
       recreate: true,
       recreateTransaction: {
         id: transaction?.id,

src/lib/onboard/machine/handlers/sandbox-recreate-resume.test.ts

@@ -84,6 +84,7 @@ describe("handleSandboxState resume recreation", () => {
         },
       },
       expect.objectContaining({ compatibleEndpointReasoning: "true", recreate: true }),
+      undefined,
     );
   });
 

src/lib/onboard/machine/handlers/sandbox-test-fixtures.ts

@@ -120,7 +120,7 @@ export function bindJournaledRecreate(
       const transaction = updateSession((current) => current).checkpoint?.sandboxRecreate;
       expect(transaction).toBeDefined();
       const ownedTransaction = transaction as CheckpointSandboxRecreateTransaction;
-      const createIntent = args.at(-1) as
+      const createIntent = args.at(-2) as
         | { recreate?: boolean; recreateTransaction?: { id?: string } }
         | undefined;
       expect(createIntent?.recreate).toBe(true);

src/lib/onboard/machine/handlers/sandbox.test.ts

@@ -87,6 +87,7 @@ describe("handleSandboxState", () => {
         endpointSource: null,
         extraProviders: [],
       },
+      undefined,
     );
     expect(calls.finalizeRouteReservation).not.toHaveBeenCalled();
     expect(calls.updateSandbox).toHaveBeenCalledWith(
@@ -133,7 +134,7 @@ describe("handleSandboxState", () => {
       hostLocalInferenceRouteOnly: true,
     });
 
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({ endpointSource: null });
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({ endpointSource: null });
   });
 
   it("records credential-provider bindings and the resource-profile decision in the checkpoint (#7022)", async () => {
@@ -234,7 +235,7 @@ describe("handleSandboxState", () => {
       authoritativeResumeConfig: true,
     });
 
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({});
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({});
   });
 
   it("does not persist an authoritative policy tier in sandbox create state", async () => {
@@ -247,7 +248,7 @@ describe("handleSandboxState", () => {
     });
 
     expect(calls.resolveCreateIntent.mock.calls[0]?.[0]).not.toHaveProperty("policyTier");
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).not.toHaveProperty("policyTier");
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).not.toHaveProperty("policyTier");
   });
 
   it("rejects observability for a selected non-DCode agent", async () => {
@@ -282,7 +283,7 @@ describe("handleSandboxState", () => {
       sandboxName: "saved",
     });
 
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({
       observabilityEnabled: true,
     });
     expect(session.observabilityEnabled).toBe(true);
@@ -359,7 +360,7 @@ describe("handleSandboxState", () => {
       requestedObservabilityEnabled: false,
     });
 
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({
       observabilityEnabled: false,
       observabilityRequestedExplicitly: true,
     });
@@ -417,7 +418,7 @@ describe("handleSandboxState", () => {
         requestedObservabilityEnabled: requested,
       });
 
-      expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({
+      expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({
         recreate: true,
         observabilityEnabled: requested,
       });
@@ -456,7 +457,7 @@ describe("handleSandboxState", () => {
         sandboxName: "saved",
       });
 
-      expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({
+      expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({
         recreate: true,
         observabilityEnabled: requested,
       });
@@ -514,7 +515,7 @@ describe("handleSandboxState", () => {
       requestedObservabilityEnabled: false,
     });
 
-    expect(calls.createSandbox.mock.calls[0]?.at(-1)).toMatchObject({
+    expect(calls.createSandbox.mock.calls[0]?.at(-2)).toMatchObject({
       recreate: true,
       observabilityEnabled: false,
     });
@@ -557,6 +558,7 @@ describe("handleSandboxState", () => {
         endpointSource: null,
         extraProviders: [],
       },
+      undefined,
     );
     expect(result.hermesToolGateways).toEqual(["nous-audio"]);
     expect(calls.note).toHaveBeenCalledWith(
@@ -845,6 +847,7 @@ describe("handleSandboxState", () => {
         endpointSource: null,
         extraProviders: [],
       },
+      undefined,
     );
   });
 
@@ -1019,6 +1022,7 @@ describe("handleSandboxState", () => {
           targetIntentFingerprint: expect.any(String),
         }),
       }),
+      undefined,
     );
     expect(result.webSearchConfigChanged).toBe(true);
   });
@@ -1152,6 +1156,7 @@ describe("handleSandboxState", () => {
           targetIntentFingerprint: expect.any(String),
         }),
       }),
+      undefined,
     );
     expect(result.webSearchConfig).toBeNull();
   });

src/lib/onboard/machine/handlers/sandbox.ts

@@ -2183,18 +2183,16 @@ class SandboxStateFlow<
                   }
                 : null,
               effectiveCreateIntent,
-              ...(activateVerifiedCredentialProviders
-                ? [
-                    async (
-                      verifiedContext: import("../../types").VerifiedSandboxCreateEffectsContext,
-                    ) => {
-                      state = await activateVerifiedCredentialProviders(
-                        state,
-                        verifiedContext.revalidateSandboxIdentity,
-                      );
-                    },
-                  ]
-                : []),
+              activateVerifiedCredentialProviders
+                ? async (
+                    verifiedContext: import("../../types").VerifiedSandboxCreateEffectsContext,
+                  ) => {
+                    state = await activateVerifiedCredentialProviders(
+                      state,
+                      verifiedContext.revalidateSandboxIdentity,
+                    );
+                  }
+                : undefined,
             ),
         );
       } catch (error) {

src/lib/onboard/sandbox-workload-rebuild.test.ts

@@ -370,20 +370,33 @@ describe("managed workload rebuild preflight", () => {
     }
   });
 
-  it("rejects a qualification revision that conflicts with durable authority (#9385)", async () => {
-    const prepare = vi.fn(async () => replacement("langchain-deepagents-code"));
+  it("uses the GitHub Actions qualification revision and retains the previous workload receipt during rebuild (#10970)", async () => {
+    const prepare = vi.fn(async () =>
+      replacement("openclaw", "linux/amd64", "c".repeat(40)),
+    );
     managedWorkloadRebuildDependencies.prepareSandboxWorkloadSource = prepare;
     vi.stubEnv("GITHUB_ACTIONS", "true");
     vi.stubEnv("E2E_MANAGED_IMAGE_REVISION", "c".repeat(40));
 
-    await expect(
-      prepareManagedWorkloadRebuildHandoff(entry("langchain-deepagents-code"), {
+    const handoff = await prepareManagedWorkloadRebuildHandoff(
+      entry("openclaw"),
+      {
         runtime: runtime(),
         provider: provider(),
         version: "0.0.100",
-      }),
-    ).rejects.toThrow("live qualification revision does not match the durable workload receipt");
-    expect(prepare).not.toHaveBeenCalled();
+      },
+    );
+
+    expect(handoff?.previousReceipt.sourceRevision).toBe("a".repeat(40));
+    expect(handoff?.replacement.source.contract.source.revision).toBe("c".repeat(40));
+    expect(prepare).toHaveBeenCalledExactlyOnceWith({
+      agentName: "openclaw",
+      legacyDockerfilePath: "managed-rebuild-must-not-stage-this-dockerfile",
+      runtime: runtime(),
+      version: "0.0.100",
+      policy: "require-managed",
+      catalogRevision: "c".repeat(40),
+    });
   });
 
   it("accepts an exact PR replacement catalog newer than durable authority (#9464)", async () => {