Merge origin/main into fix/managed-hermes-state-volume-9358

Author: ericksoa

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

@@ -396,7 +396,7 @@ describe("reconcileReusedSandboxMessaging", () => {
     const result = reconcileReusedSandboxMessaging(
       structuredClone(plan),
       { name: "openclaw" },
-      { clearPlanEnv },
+      { clearPlanEnv, note: vi.fn(), writePlanToEnv: vi.fn() },
       plan,
     );
 
@@ -417,7 +417,7 @@ describe("reconcileReusedSandboxMessaging", () => {
     const result = reconcileReusedSandboxMessaging(
       structuredClone(plan),
       { name: "openclaw" },
-      { clearPlanEnv: vi.fn() },
+      { clearPlanEnv: vi.fn(), note: vi.fn(), writePlanToEnv: vi.fn() },
       plan,
     );
 
@@ -432,7 +432,7 @@ describe("reconcileReusedSandboxMessaging", () => {
     const result = reconcileReusedSandboxMessaging(
       structuredClone(plan),
       { name: "openclaw" },
-      { clearPlanEnv: vi.fn() },
+      { clearPlanEnv: vi.fn(), note: vi.fn(), writePlanToEnv: vi.fn() },
       plan,
     );
 
@@ -693,6 +693,9 @@ describe("reconcileSandboxMessaging plan authority", () => {
     // input; a channel the environment no longer configures must not re-enter
     // the selection, or its egress preset is re-applied.
     expect(deps.setupMessagingChannels).not.toHaveBeenCalled();
+    expect(deps.note).toHaveBeenCalledWith(expect.stringContaining("No host inputs configure discord"));
+    expect(deps.clearPlanEnv).toHaveBeenCalledOnce();
+    expect(deps.writePlanToEnv).not.toHaveBeenCalled();
     expect(result).toEqual({ plan: null, selectedChannels: [] });
   });
 

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

@@ -373,6 +373,7 @@ async function selectionFromMessagingSetup<Agent>(
   );
 }
 
+/** Reconcile checkpoint channels against current host inputs before reuse. */
 function selectionFromRecordedChannels<Agent>(
   recordedChannels: string[],
   envPlan: SandboxMessagingPlan | null,
@@ -386,7 +387,7 @@ function selectionFromRecordedChannels<Agent>(
   if (envPlan) selection = selectionFromReusablePlan(envPlan, options.agent, false, options.deps);
   else if (registryPlan)
     selection = selectionFromReusablePlan(registryPlan, options.agent, true, options.deps);
-  selection = filterUnconfiguredHostChannelsFromSelection(selection, options.agent);
+  selection = filterUnconfiguredHostChannelsFromSelection(selection, options.agent, options.deps);
   if (selection.selectedChannels.length > 0) {
     options.deps.note(
       `  [non-interactive] Reusing messaging channel configuration: ${selection.selectedChannels.join(", ")}`,

test/post-merge-docs.test.ts

@@ -11,7 +11,7 @@ import YAML from "yaml";
 
 import { validatePostMergeDocsWorkflowBoundary } from "../tools/post-merge-docs/contract.mts";
 import { publishDocumentation, type Request } from "../tools/post-merge-docs/publish.mts";
-import { executePostMergeDocs } from "../tools/post-merge-docs/run.mts";
+import { configurePostMergeDocs, executePostMergeDocs } from "../tools/post-merge-docs/run.mts";
 import type { OpenShellTools } from "../tools/openshell-agent/runtime.mts";
 
 const directories: string[] = [];
@@ -182,6 +182,7 @@ function runnerFixture(phase: "author" | "review") {
       GITHUB_REPOSITORY: repository,
       GITHUB_SHA: mainSha,
       HOME: root,
+      OPENSHELL_GATEWAY_ENDPOINT: "http://127.0.0.1:8080",
       PI_IMAGE: "image",
       POST_MERGE_DOCS_ARTIFACT_DIR: path.join(root, "artifact"),
       POST_MERGE_DOCS_CANDIDATE_DIR: candidate,
@@ -190,6 +191,7 @@ function runnerFixture(phase: "author" | "review") {
       POST_MERGE_DOCS_WORKDIR: path.join(root, "work"),
       RANGE_START_SHA: mainSha,
       RANGE_START_TAG: "v1.0.0",
+      RUNNER_TEMP: path.join(root, "runner-temp"),
       SANDBOX_NAME: `docs-${phase}`,
       TRUSTED_CHECKOUT: source,
     },
@@ -203,13 +205,19 @@ function runnerTools(
   const { env, root } = input;
   const sandbox = path.join(root, "sandbox");
   const output = path.join(root, "work/output");
-  const state = { deleted: false };
+  const state = {
+    agentArgs: [] as readonly string[],
+    createArgs: [] as readonly string[],
+    deleted: false,
+  };
   const handlers: Record<string, (args: readonly string[]) => unknown> = {
-    create: () => {
+    create: (args) => {
+      state.createArgs = args;
       fs.cpSync(path.join(root, "work/repo"), sandbox, { recursive: true });
       expect(git(sandbox, ["rev-parse", "HEAD"])).toBe(env.GITHUB_SHA);
     },
-    agent: () => {
+    agent: (args) => {
+      state.agentArgs = args;
       const agents = {
         author: () => fs.writeFileSync(path.join(sandbox, "docs/guide.mdx"), "authored\n"),
         review: () =>
@@ -329,18 +337,71 @@ describe("post-merge documentation publisher", () => {
 });
 
 describe("post-merge documentation runner", () => {
+  it("enables bind mounts before creating a reviewer sandbox", async () => {
+    const input = runnerFixture("review");
+    const responses = new Map([["which", "/trusted/bin/openshell-sandbox"]]);
+    const tools: OpenShellTools = {
+      run: vi.fn((command) => responses.get(command) ?? ""),
+      start: vi.fn(),
+      wait: async () => undefined,
+    };
+    await configurePostMergeDocs(input.env, tools);
+    const config = fs.readFileSync(
+      path.join(input.root, "runner-temp/openshell-gateway/gateway.toml"),
+      "utf8",
+    );
+    expect(config).toContain("enable_bind_mounts = true");
+  });
+
   it("authors from the triggering SHA without exposing host credentials", () => {
     const input = runnerFixture("author");
     const { state, tools } = runnerTools(input);
     executePostMergeDocs(input.env, tools);
     expect(fs.readFileSync(path.join(input.root, "artifact/docs.patch"), "utf8")).toContain(
       "+authored",
     );
+    expect(state.createArgs.filter((argument) => argument === "--upload")).toHaveLength(3);
+    expect(state.createArgs).not.toContain("--driver-config-json");
+    expect(state.agentArgs.join("\n")).not.toContain("GIT_DIR=");
     expect(state.deleted).toBe(true);
   });
   it("records the exact independent approval", () => {
     const input = runnerFixture("review");
-    executePostMergeDocs(input.env, runnerTools(input).tools);
+    const { state, tools } = runnerTools(input);
+    executePostMergeDocs(input.env, tools);
+    const driverConfigIndex = state.createArgs.indexOf("--driver-config-json");
+    expect(JSON.parse(state.createArgs[driverConfigIndex + 1] as string)).toEqual({
+      docker: {
+        mounts: [
+          {
+            read_only: true,
+            source: path.join(input.root, "work/repo"),
+            target: "/sandbox/repo",
+            type: "bind",
+          },
+          {
+            read_only: true,
+            source: path.join(input.root, "config"),
+            target: "/sandbox/config",
+            type: "bind",
+          },
+        ],
+      },
+    });
+    expect(state.createArgs).not.toContain("--upload");
+    expect(state.createArgs.slice(-6)).toEqual([
+      "--",
+      "/usr/bin/git",
+      "--git-dir=/sandbox/repo/.git",
+      "--work-tree=/sandbox/repo",
+      "status",
+      "--short",
+    ]);
+    expect(state.agentArgs).toEqual(
+      expect.arrayContaining(["GIT_DIR=/sandbox/repo/.git", "GIT_WORK_TREE=/sandbox/repo"]),
+    );
+    expect(fs.statSync(path.join(input.root, "config")).mode & 0o777).toBe(0o755);
+    expect(fs.statSync(path.join(input.root, "config/task.txt")).mode & 0o777).toBe(0o444);
     expect(
       JSON.parse(fs.readFileSync(path.join(input.root, "artifact/review.json"), "utf8")),
     ).toEqual({

tools/post-merge-docs/run.mts

@@ -164,8 +164,15 @@ function prepare(env: NodeJS.ProcessEnv): void {
   const config = required(env.POST_MERGE_DOCS_CONFIG_DIR, "POST_MERGE_DOCS_CONFIG_DIR");
   fs.mkdirSync(output, { mode: 0o700 });
   reset(config);
-  write(path.join(config, "models.json"), resolverModelConfiguration());
-  write(path.join(config, "task.txt"), `${prompt(env, current)}\n`);
+  const models = path.join(config, "models.json");
+  const task = path.join(config, "task.txt");
+  write(models, resolverModelConfiguration());
+  write(task, `${prompt(env, current)}\n`);
+  if (current === "review") {
+    fs.chmodSync(config, 0o755);
+    fs.chmodSync(models, 0o444);
+    fs.chmodSync(task, 0o444);
+  }
 }
 
 function agentCommand(current: Phase): string[] {
@@ -188,36 +195,69 @@ function agentCommand(current: Phase): string[] {
 function create(env: NodeJS.ProcessEnv, tools: OpenShellTools): void {
   const current = phase(env);
   const work = required(env.POST_MERGE_DOCS_WORKDIR, "POST_MERGE_DOCS_WORKDIR");
+  const config = required(env.POST_MERGE_DOCS_CONFIG_DIR, "POST_MERGE_DOCS_CONFIG_DIR");
+  const review = current === "review";
   const policy =
     current === "author"
       ? "pr-merge-conflict-fixer/policy.yaml"
       : "post-merge-docs/review-policy.yaml";
   createOpenShellSandbox(
     env,
     {
-      command: ["/usr/bin/git", "-C", "/sandbox/repo", "status", "--short"],
+      command: review
+        ? [
+            "/usr/bin/git",
+            "--git-dir=/sandbox/repo/.git",
+            "--work-tree=/sandbox/repo",
+            "status",
+            "--short",
+          ]
+        : ["/usr/bin/git", "-C", "/sandbox/repo", "status", "--short"],
       image: required(env.PI_IMAGE, "PI_IMAGE"),
       name: required(env.SANDBOX_NAME, "SANDBOX_NAME"),
       policyPath: path.join(required(env.TRUSTED_CHECKOUT, "TRUSTED_CHECKOUT"), "tools", policy),
-      uploads: [
-        { destination: "/sandbox", source: path.join(work, "repo") },
-        {
-          destination: "/sandbox",
-          source: required(env.POST_MERGE_DOCS_CONFIG_DIR, "POST_MERGE_DOCS_CONFIG_DIR"),
-        },
-        { destination: "/sandbox", source: path.join(work, "output") },
-      ],
+      driverConfig: review
+        ? {
+            docker: {
+              mounts: [
+                {
+                  read_only: true,
+                  source: path.join(work, "repo"),
+                  target: "/sandbox/repo",
+                  type: "bind",
+                },
+                {
+                  read_only: true,
+                  source: config,
+                  target: "/sandbox/config",
+                  type: "bind",
+                },
+              ],
+            },
+          }
+        : undefined,
+      uploads: review
+        ? []
+        : [
+            { destination: "/sandbox", source: path.join(work, "repo") },
+            { destination: "/sandbox", source: config },
+            { destination: "/sandbox", source: path.join(work, "output") },
+          ],
     },
     tools,
   );
 }
 
 function run(env: NodeJS.ProcessEnv, tools: OpenShellTools): void {
+  const current = phase(env);
   execOpenShellSandbox(
     env,
     {
-      command: agentCommand(phase(env)),
+      command: agentCommand(current),
       environment: {
+        ...(current === "review"
+          ? { GIT_DIR: "/sandbox/repo/.git", GIT_WORK_TREE: "/sandbox/repo" }
+          : {}),
         HOME: "/sandbox/output",
         PI_CODING_AGENT_DIR: "/sandbox/config",
         PI_OFFLINE: "1",
@@ -311,14 +351,26 @@ export function executePostMergeDocs(
   }
 }
 
+export function configurePostMergeDocs(
+  env: NodeJS.ProcessEnv,
+  tools: OpenShellTools = defaultOpenShellTools,
+): Promise<void> {
+  return configureOpenShellInference(
+    env,
+    {
+      enableBindMounts: true,
+      gatewayId: "post-merge-docs",
+      modelId: RESOLVER_MODEL_ID,
+      providerName: "docs",
+    },
+    tools,
+  );
+}
+
 async function main(): Promise<void> {
   switch (required(process.argv[2], "command")) {
     case "configure":
-      await configureOpenShellInference(process.env, {
-        gatewayId: "post-merge-docs",
-        modelId: RESOLVER_MODEL_ID,
-        providerName: "docs",
-      });
+      await configurePostMergeDocs(process.env);
       return;
     case "execute":
       executePostMergeDocs(process.env);