Skip to content

The open-source app everyone uses to manage agents at work

Clean up opencode rebase and stabilize runtime test

dotta8ae4c0e765a5
diff --git a/packages/adapters/opencode-local/src/server/execute.ts b/packages/adapters/opencode-local/src/server/execute.ts
index 7651578fc8..2a7dae5aa0 100644
--- a/packages/adapters/opencode-local/src/server/execute.ts
+++ b/packages/adapters/opencode-local/src/server/execute.ts
@@ -226,8 +226,6 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
`[paperclip] OpenCode session "${runtimeSessionId}" was saved for cwd "${runtimeSessionCwd}" and will not be resumed in "${cwd}".\n`,
);
}
-
-<<<<<<< HEAD
const instructionsFilePath = asString(config.instructionsFilePath, "").trim();
const resolvedInstructionsFilePath = instructionsFilePath
? path.resolve(cwd, instructionsFilePath)
diff --git a/server/src/__tests__/workspace-runtime.test.ts b/server/src/__tests__/workspace-runtime.test.ts
index a04e5302e0..911010f57f 100644
--- a/server/src/__tests__/workspace-runtime.test.ts
+++ b/server/src/__tests__/workspace-runtime.test.ts
@@ -562,7 +562,9 @@ describe("realizeExecutionWorkspace", () => {
}
}, 15_000);
- it("provisions worktree-local pnpm node_modules instead of reusing base-repo links", async () => {
+ it(
+ "provisions worktree-local pnpm node_modules instead of reusing base-repo links",
+ async () => {
const repoRoot = await createTempRepo();
await fs.mkdir(path.join(repoRoot, "scripts"), { recursive: true });
await fs.mkdir(path.join(repoRoot, "packages", "shared"), { recursive: true });
@@ -660,7 +662,9 @@ describe("realizeExecutionWorkspace", () => {
await expect(fs.realpath(path.join(repoRoot, "server", "node_modules", "@repo", "shared"))).resolves.toBe(
await fs.realpath(path.join(repoRoot, "packages", "shared")),
);
- });
+ },
+ 15_000,
+ );
it("records worktree setup and provision operations when a recorder is provided", async () => {
const repoRoot = await createTempRepo();