fix(agent): isolate conversation workspaces
This commit is contained in:
@@ -1,5 +1,8 @@
|
||||
import { describe, expect, it } from "bun:test";
|
||||
import { type OpencodeClient } from "@opencode-ai/sdk/v2";
|
||||
import { mkdtemp, readdir, rm, stat } from "node:fs/promises";
|
||||
import { tmpdir } from "node:os";
|
||||
import { join, relative } from "node:path";
|
||||
|
||||
import { config } from "../../src/config.js";
|
||||
import { OpencodeRuntimeAdapter } from "../../src/runtime/opencode.js";
|
||||
@@ -87,6 +90,79 @@ describe("OpencodeRuntimeAdapter.ensureClient", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("OpencodeRuntimeAdapter.createSession", () => {
|
||||
it("creates a real chat session inside a dedicated conversation workspace", async () => {
|
||||
const workspaceRoot = await mkdtemp(join(tmpdir(), "tjwater-conversations-"));
|
||||
const calls: Array<Record<string, unknown>> = [];
|
||||
const client = {
|
||||
session: {
|
||||
create: async (input: Record<string, unknown>) => {
|
||||
calls.push(input);
|
||||
return {
|
||||
data: {
|
||||
id: "runtime-session-1",
|
||||
directory: input.directory,
|
||||
},
|
||||
};
|
||||
},
|
||||
},
|
||||
} as unknown as OpencodeClient;
|
||||
const runtime = Object.assign(Object.create(OpencodeRuntimeAdapter.prototype), {
|
||||
clientPromise: null,
|
||||
closeServer: null,
|
||||
ensureClient: async () => client,
|
||||
}) as OpencodeRuntimeAdapter;
|
||||
|
||||
try {
|
||||
const session = await runtime.createSession("chat", {
|
||||
conversationWorkspace: true,
|
||||
workspaceRoot,
|
||||
});
|
||||
const directory = String(calls[0]?.directory);
|
||||
|
||||
expect(relative(workspaceRoot, directory).startsWith("..")).toBe(false);
|
||||
const workspaceStat = await stat(directory);
|
||||
expect(workspaceStat.isDirectory()).toBe(true);
|
||||
expect(workspaceStat.mode & 0o777).toBe(0o700);
|
||||
expect(session.directory).toBe(directory);
|
||||
expect(calls[0]?.permission).toEqual([
|
||||
{ permission: "read", pattern: `${directory}/**`, action: "allow" },
|
||||
{ permission: "edit", pattern: `${directory}/**`, action: "ask" },
|
||||
]);
|
||||
} finally {
|
||||
await rm(workspaceRoot, { force: true, recursive: true });
|
||||
}
|
||||
});
|
||||
|
||||
it("removes an empty conversation workspace when session creation fails", async () => {
|
||||
const workspaceRoot = await mkdtemp(join(tmpdir(), "tjwater-conversations-"));
|
||||
const client = {
|
||||
session: {
|
||||
create: async () => {
|
||||
throw new Error("session creation failed");
|
||||
},
|
||||
},
|
||||
} as unknown as OpencodeClient;
|
||||
const runtime = Object.assign(Object.create(OpencodeRuntimeAdapter.prototype), {
|
||||
clientPromise: null,
|
||||
closeServer: null,
|
||||
ensureClient: async () => client,
|
||||
}) as OpencodeRuntimeAdapter;
|
||||
|
||||
try {
|
||||
await expect(
|
||||
runtime.createSession("chat", {
|
||||
conversationWorkspace: true,
|
||||
workspaceRoot,
|
||||
}),
|
||||
).rejects.toThrow("session creation failed");
|
||||
expect(await readdir(workspaceRoot)).toEqual([]);
|
||||
} finally {
|
||||
await rm(workspaceRoot, { force: true, recursive: true });
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
describe("OpencodeRuntimeAdapter.warmup", () => {
|
||||
it("initializes the project session and model tools before reporting ready", async () => {
|
||||
const calls: string[] = [];
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
import { describe, expect, it } from "bun:test";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import storeRenderRef, {
|
||||
resolveStoreRenderFilePath,
|
||||
} from "../../.opencode/tools/store_render_ref.js";
|
||||
|
||||
describe("internal OpenCode permissions", () => {
|
||||
it("keeps protected paths denied in every approval mode", async () => {
|
||||
@@ -23,8 +26,66 @@ describe("internal OpenCode permissions", () => {
|
||||
expect(edit?.["data/**"]).toBe("deny");
|
||||
expect(edit?.["**/logs/**"]).toBe("deny");
|
||||
expect(bash?.["*"]).toBe("ask");
|
||||
expect(bash?.["rm *"]).toBe("ask");
|
||||
expect(bash?.["rm -rf *"]).toBe("deny");
|
||||
expect(bash?.["rm -fr *"]).toBe("deny");
|
||||
expect(bash?.["rm -r -f *"]).toBe("deny");
|
||||
expect(bash?.["rm -f -r *"]).toBe("deny");
|
||||
expect(bash?.["rm --recursive --force *"]).toBe("deny");
|
||||
expect(bash?.["rm --force --recursive *"]).toBe("deny");
|
||||
expect(bash?.["*.env*"]).toBe("deny");
|
||||
expect(bash?.["*data/*"]).toBe("deny");
|
||||
expect(bash?.["*logs/*"]).toBe("deny");
|
||||
expect(bash?.["*data/*"]).toBeUndefined();
|
||||
expect(bash?.["*logs/*"]).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe("store_render_ref arguments", () => {
|
||||
it("accepts the observed camelCase alias without changing snake_case precedence", () => {
|
||||
expect(
|
||||
resolveStoreRenderFilePath({
|
||||
filePath: "/app/data/conversation-workspaces/chat-1/partition.json",
|
||||
}),
|
||||
).toBe("/app/data/conversation-workspaces/chat-1/partition.json");
|
||||
|
||||
expect(
|
||||
resolveStoreRenderFilePath({
|
||||
file_path: "/app/data/conversation-workspaces/chat-1/preferred.json",
|
||||
filePath: "/app/data/conversation-workspaces/chat-1/compatibility.json",
|
||||
}),
|
||||
).toBe("/app/data/conversation-workspaces/chat-1/preferred.json");
|
||||
});
|
||||
|
||||
it("forwards a camelCase compatibility argument as file_path", async () => {
|
||||
const originalFetch = globalThis.fetch;
|
||||
let requestBody: unknown;
|
||||
globalThis.fetch = (async (
|
||||
_input: RequestInfo | URL,
|
||||
init?: RequestInit,
|
||||
) => {
|
||||
requestBody = JSON.parse(String(init?.body));
|
||||
return new Response('{"render_ref":"res-test"}');
|
||||
}) as unknown as typeof fetch;
|
||||
|
||||
try {
|
||||
const definition = storeRenderRef as unknown as {
|
||||
args: Record<string, unknown>;
|
||||
execute: (args: unknown, context: unknown) => Promise<unknown>;
|
||||
};
|
||||
expect(definition.args.filePath).toBeDefined();
|
||||
await definition.execute(
|
||||
{
|
||||
reason: "regression test",
|
||||
filePath: "/app/data/conversation-workspaces/chat-1/partition.json",
|
||||
},
|
||||
{ sessionID: "session-test" } as never,
|
||||
);
|
||||
} finally {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
|
||||
expect(requestBody).toEqual({
|
||||
session_id: "session-test",
|
||||
file_path: "/app/data/conversation-workspaces/chat-1/partition.json",
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -19,6 +19,7 @@ describe("runtime session context", () => {
|
||||
projectKey: "project-1",
|
||||
sessionId: "runtime-session-1",
|
||||
traceId: "trace-1",
|
||||
workspaceDirectory: "/app/data/conversation-workspaces/chat-session-1",
|
||||
});
|
||||
|
||||
const runtimeContext = getRuntimeSessionContext("runtime-session-1");
|
||||
@@ -27,6 +28,9 @@ describe("runtime session context", () => {
|
||||
expect(runtimeContext?.clientSessionId).toBe("chat-session-1");
|
||||
expect(runtimeContext?.network).toBe("fengyang");
|
||||
expect(runtimeContext?.sessionId).toBe("runtime-session-1");
|
||||
expect(runtimeContext?.workspaceDirectory).toBe(
|
||||
"/app/data/conversation-workspaces/chat-session-1",
|
||||
);
|
||||
|
||||
removeRuntimeSessionContext("runtime-session-1");
|
||||
expect(getRuntimeSessionContext("runtime-session-1")).toBeNull();
|
||||
|
||||
Reference in New Issue
Block a user