mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-14 01:50:39 +09:00
Clean up opencode rebase and stabilize runtime test
Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
parent
22af797ca3
commit
8ae4c0e765
2 changed files with 6 additions and 4 deletions
|
|
@ -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`,
|
`[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 instructionsFilePath = asString(config.instructionsFilePath, "").trim();
|
||||||
const resolvedInstructionsFilePath = instructionsFilePath
|
const resolvedInstructionsFilePath = instructionsFilePath
|
||||||
? path.resolve(cwd, instructionsFilePath)
|
? path.resolve(cwd, instructionsFilePath)
|
||||||
|
|
|
||||||
|
|
@ -562,7 +562,9 @@ describe("realizeExecutionWorkspace", () => {
|
||||||
}
|
}
|
||||||
}, 15_000);
|
}, 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();
|
const repoRoot = await createTempRepo();
|
||||||
await fs.mkdir(path.join(repoRoot, "scripts"), { recursive: true });
|
await fs.mkdir(path.join(repoRoot, "scripts"), { recursive: true });
|
||||||
await fs.mkdir(path.join(repoRoot, "packages", "shared"), { 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 expect(fs.realpath(path.join(repoRoot, "server", "node_modules", "@repo", "shared"))).resolves.toBe(
|
||||||
await fs.realpath(path.join(repoRoot, "packages", "shared")),
|
await fs.realpath(path.join(repoRoot, "packages", "shared")),
|
||||||
);
|
);
|
||||||
});
|
},
|
||||||
|
15_000,
|
||||||
|
);
|
||||||
|
|
||||||
it("records worktree setup and provision operations when a recorder is provided", async () => {
|
it("records worktree setup and provision operations when a recorder is provided", async () => {
|
||||||
const repoRoot = await createTempRepo();
|
const repoRoot = await createTempRepo();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue