Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import type { DriverInstanceMcpGrantRecord } from "../driver-instance/mcp-grants
import { createRuntimeActionToken } from "../runtime-boot-token";
import type { RuntimeActionTokenBindings } from "../runtime-boot-token";
import { buildModelConnection } from "./runtime-model-connection.builder";
import { listAdditionalDirectories } from "./runtime-sandbox-provisioning.paths";
import { listProvisioningDirectories } from "./runtime-sandbox-provisioning.paths";

interface RuntimeActionUrlContext {
bindings: RuntimeExecutionSpecBindings;
Expand Down Expand Up @@ -202,7 +202,12 @@ export async function buildExecutionSpec(
provider: input.profile.provider,
providerOptions: input.profile.providerOptions,
session: {
additionalDirectories: listAdditionalDirectories(input.profile),
// Host cache and native HOME are provisioned separately; they are not
// optional directories requested from the OpenCode ACP provider.
additionalDirectories:
input.profile.runtimeId === "acp-fallback"
? []
: listProvisioningDirectories(input.profile),
context: {
sandboxSessionId: input.profile.session.sandboxSessionId,
homePath: input.profile.session.homePath,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { DriverProfileConfig } from "../../domain/driver-snapshot";
import type { ExecutionSessionHandle } from "../sandbox-handles";
import {
getParentDirectory,
listAdditionalDirectories,
listProvisioningDirectories,
} from "./runtime-sandbox-provisioning.paths";

async function sha256(value: string): Promise<string> {
Expand All @@ -18,7 +18,7 @@ export async function ensureProvisioningDirectories(
session: ExecutionSessionHandle,
profile: DriverProfileConfig,
): Promise<void> {
const directories = listAdditionalDirectories(profile);
const directories = listProvisioningDirectories(profile);
const result = await session.exec(
`mkdir -p ${directories.map((directory) => quoteShellArg(directory)).join(" ")}`,
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function getParentDirectory(path: string): string {
return `/${parts.slice(0, -1).join("/")}`;
}

export function listAdditionalDirectories(profile: DriverProfileConfig): string[] {
export function listProvisioningDirectories(profile: DriverProfileConfig): string[] {
return [
...new Set([
SANDBOX_CACHE_PATH,
Expand Down
16 changes: 16 additions & 0 deletions apps/api/tests/api-driver-boundary.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,22 @@ const artifactPaths = {
};

describe("API to driver boundary", () => {
test("OpenCode provisioning does not request unsupported ACP additional directories", async () => {
const profile = createDriverProfile();
const execution = await buildExecutionSpec(bindings, {
builtInTools: [],
driverInstanceId: API_DRIVER_BOUNDARY_IDS.driverInstance,
profile: { ...profile, runtimeId: "acp-fallback" },
requestUrl: "https://api.example.com/",
resolvedMcpServers: [],
resolvedSkills: [],
resolvedSkillCatalog: [],
});
expect(execution.session.additionalDirectories).toEqual([]);
expect(execution.session.cwd).toBe(profile.session.sessionOrganizationPath);
expect(execution.session.context.homePath).toBe(profile.session.homePath);
});

test.each(["cattle", "pet"] as const)(
"requires a committed native checkpoint even when the boot input retains a historical %s label",
async (kind) => {
Expand Down
Loading