ake/paperclip
1
0
Fork 0
mirror of https://github.com/alkimake/paperclip.git synced 2026-06-14 01:50:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

fix(dev-runner): tighten worktree env bootstrap

Browse source
This commit is contained in:
Dotta 2026-04-11 08:35:53 -05:00
parent b6115424b1
commit a5aed931ab
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/dev-runner.ts
View file

@ -23,7 +23,7 @@ type BindMode = (typeof BIND_MODES)[number];
const worktreeEnvBootstrap = bootstrapDevRunnerWorktreeEnv(repoRoot, process.env); const worktreeEnvBootstrap = bootstrapDevRunnerWorktreeEnv(repoRoot, process.env);
if (worktreeEnvBootstrap.missingEnv) { if (worktreeEnvBootstrap.missingEnv) {
console.error( console.error(
`[paperclip] linked git worktree at ${repoRoot} is missing ${path.relative(repoRoot, worktreeEnvBootstrap.envPath ?? "")}. Run \`paperclipai worktree init\` in this worktree before \`pnpm dev\`.`, `[paperclip] linked git worktree at ${repoRoot} is missing ${path.relative(repoRoot, worktreeEnvBootstrap.envPath)}. Run \`paperclipai worktree init\` in this worktree before \`pnpm dev\`.`,
); );
process.exit(1); process.exit(1);
} }

2
server/src/__tests__/dev-runner-worktree.test.ts
View file

@ -42,6 +42,7 @@ describe("dev-runner worktree env bootstrap", () => {
"PAPERCLIP_INSTANCE_ID=feature-worktree", "PAPERCLIP_INSTANCE_ID=feature-worktree",
"PAPERCLIP_IN_WORKTREE=true", "PAPERCLIP_IN_WORKTREE=true",
"PAPERCLIP_WORKTREE_NAME=feature-worktree", "PAPERCLIP_WORKTREE_NAME=feature-worktree",
"PAPERCLIP_OPTIONAL= # comment-only value",
"", "",
].join("\n"), ].join("\n"),
"utf8", "utf8",
@ -59,6 +60,7 @@ describe("dev-runner worktree env bootstrap", () => {
expect(env.PAPERCLIP_HOME).toBe("/tmp/paperclip-worktrees"); expect(env.PAPERCLIP_HOME).toBe("/tmp/paperclip-worktrees");
expect(env.PAPERCLIP_INSTANCE_ID).toBe("already-set"); expect(env.PAPERCLIP_INSTANCE_ID).toBe("already-set");
expect(env.PAPERCLIP_IN_WORKTREE).toBe("true"); expect(env.PAPERCLIP_IN_WORKTREE).toBe("true");
expect(env.PAPERCLIP_OPTIONAL).toBe("");
}); });
it("reports uninitialized linked worktrees so dev runner can fail fast", () => { it("reports uninitialized linked worktrees so dev runner can fail fast", () => {

14
server/src/dev-runner-worktree.ts
View file

@ -17,6 +17,10 @@ function parseEnvFile(contents: string): Record<string, string> {
entries[key] = ""; entries[key] = "";
continue; continue;
} }
if (value.startsWith("#")) {
entries[key] = "";
continue;
}
if ( if (
(value.startsWith("\"") && value.endsWith("\"")) || (value.startsWith("\"") && value.endsWith("\"")) ||
@ -32,6 +36,11 @@ function parseEnvFile(contents: string): Record<string, string> {
return entries; return entries;
} }
type WorktreeEnvBootstrapResult =
| { envPath: null; missingEnv: false }
| { envPath: string; missingEnv: true }
| { envPath: string; missingEnv: false };
export function isLinkedGitWorktreeCheckout(rootDir: string): boolean { export function isLinkedGitWorktreeCheckout(rootDir: string): boolean {
const gitMetadataPath = path.join(rootDir, ".git"); const gitMetadataPath = path.join(rootDir, ".git");
if (!existsSync(gitMetadataPath)) return false; if (!existsSync(gitMetadataPath)) return false;
@ -49,10 +58,7 @@ export function resolveWorktreeEnvFilePath(rootDir: string): string {
export function bootstrapDevRunnerWorktreeEnv( export function bootstrapDevRunnerWorktreeEnv(
rootDir: string, rootDir: string,
env: NodeJS.ProcessEnv = process.env, env: NodeJS.ProcessEnv = process.env,
): { ): WorktreeEnvBootstrapResult {
envPath: string | null;
missingEnv: boolean;
} {
if (!isLinkedGitWorktreeCheckout(rootDir)) { if (!isLinkedGitWorktreeCheckout(rootDir)) {
return { return {
envPath: null, envPath: null,