2026-04-11 08:17:16 -05:00
|
|
|
import { existsSync, lstatSync, readFileSync } from "node:fs";
|
[codex] Bundle local branch fixes from PAP-10032 (#6604)
## Thinking Path
> - Paperclip orchestrates AI agents for zero-human companies.
> - This branch accumulated multiple already-tested control-plane,
adapter runtime, invite, workspace, plugin, and UI quality fixes on the
primary Paperclip checkout.
> - `origin/master` advanced while those commits were still local, so
the branch needed to be preserved and reconciled before review.
> - Splitting the branch commit-by-commit against the new base produced
overlapping conflicts with recently merged upstream PRs.
> - This pull request keeps the remaining branch as one standalone PR
because the final diff is 38 files after removing screenshot artifacts,
under Greptile's 100-file cap, and can be merged independently after
review.
> - The benefit is that none of the local work is lost, the branch is
now based on current `origin/master`, and reviewers can evaluate the
reconciled changes in one place.
## What Changed
- Merged the local accumulated branch with current `origin/master` and
resolved the invite-flow overlaps from the newer upstream companies
query helper.
- Preserved the local fixes for invite existing-member behavior, invite
link copy fallback, reusable workspace selection, worktree auth, static
SPA fallback, markdown wrapping, plugin slot registration, cloud
upstream UX/server polish, project sorting, and related tests.
- Removed screenshot artifacts from the PR per review request.
- Kept the PR under the requested file limit: 38 files changed, with no
`pnpm-lock.yaml` or `.github/workflows/*` changes.
## Verification
- `NODE_ENV=test pnpm exec vitest run
ui/src/pages/CompanyInvites.test.tsx ui/src/pages/InviteLanding.test.tsx
ui/src/pages/Projects.test.tsx ui/src/plugins/slots.test.ts
ui/src/components/MarkdownBody.test.tsx
server/src/__tests__/invite-accept-existing-member.test.ts
server/src/__tests__/static-index-html.test.ts
server/src/__tests__/execution-workspaces-service.test.ts
server/src/__tests__/better-auth.test.ts
server/src/__tests__/worktree-config.test.ts`
- `NODE_ENV=test pnpm --filter @paperclipai/ui typecheck`
- `NODE_ENV=test pnpm --filter @paperclipai/server typecheck`
- Confirmed `git diff --name-only origin/master...HEAD | wc -l` is `38`.
- Confirmed no PR diff entries match `pnpm-lock.yaml`,
`.github/workflows/*`, or `screenshots/*`.
## Risks
- Medium review risk because this is a bundled rescue PR rather than
several narrow feature PRs.
- Invite flow and company cache behavior overlapped with newer upstream
changes; the merge resolution intentionally keeps the shared
`companiesListQueryOptions` helper while preserving local
existing-member invite behavior.
- Visual review evidence is no longer attached in-repo because
screenshots were removed from this PR per review request.
> For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and
discuss it in `#dev` before opening the PR. Feature PRs that overlap
with planned core work may need to be redirected — check the roadmap
first. See `CONTRIBUTING.md`.
## Model Used
- OpenAI Codex, GPT-5-based coding agent, with repository tool access,
terminal execution, and git/GitHub CLI operations.
## Checklist
- [x] I have included a thinking path that traces from project context
to this change
- [x] I have specified the model used (with version and capability
details)
- [x] I have checked ROADMAP.md and confirmed this PR does not duplicate
planned core work
- [x] I have run tests locally and they pass
- [x] I have added or updated tests where applicable
- [x] UI screenshots were intentionally removed from this PR per review
request
- [x] I have updated relevant documentation to reflect my changes
- [x] I have considered and documented any risks above
- [x] I will address all Greptile and reviewer comments before
requesting merge
---------
Co-authored-by: Paperclip <noreply@paperclip.ing>
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: CodexCoder <codexcoder@paperclip.local>
2026-05-25 07:25:26 -05:00
|
|
|
import os from "node:os";
|
2026-04-11 08:17:16 -05:00
|
|
|
import path from "node:path";
|
|
|
|
|
|
|
|
|
|
function parseEnvFile(contents: string): Record<string, string> {
|
|
|
|
|
const entries: Record<string, string> = {};
|
|
|
|
|
|
|
|
|
|
for (const rawLine of contents.split(/\r?\n/)) {
|
|
|
|
|
const line = rawLine.trim();
|
|
|
|
|
if (!line || line.startsWith("#")) continue;
|
|
|
|
|
|
|
|
|
|
const match = rawLine.match(/^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)\s*$/);
|
|
|
|
|
if (!match) continue;
|
|
|
|
|
|
|
|
|
|
const [, key, rawValue] = match;
|
|
|
|
|
const value = rawValue.trim();
|
|
|
|
|
if (!value) {
|
|
|
|
|
entries[key] = "";
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2026-04-11 08:35:53 -05:00
|
|
|
if (value.startsWith("#")) {
|
|
|
|
|
entries[key] = "";
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2026-04-11 08:17:16 -05:00
|
|
|
|
|
|
|
|
if (
|
|
|
|
|
(value.startsWith("\"") && value.endsWith("\"")) ||
|
|
|
|
|
(value.startsWith("'") && value.endsWith("'"))
|
|
|
|
|
) {
|
|
|
|
|
entries[key] = value.slice(1, -1);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entries[key] = value.replace(/\s+#.*$/, "").trim();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return entries;
|
|
|
|
|
}
|
|
|
|
|
|
2026-04-11 08:35:53 -05:00
|
|
|
type WorktreeEnvBootstrapResult =
|
|
|
|
|
| { envPath: null; missingEnv: false }
|
|
|
|
|
| { envPath: string; missingEnv: true }
|
|
|
|
|
| { envPath: string; missingEnv: false };
|
|
|
|
|
|
2026-04-11 08:17:16 -05:00
|
|
|
export function isLinkedGitWorktreeCheckout(rootDir: string): boolean {
|
|
|
|
|
const gitMetadataPath = path.join(rootDir, ".git");
|
|
|
|
|
if (!existsSync(gitMetadataPath)) return false;
|
|
|
|
|
|
|
|
|
|
const stat = lstatSync(gitMetadataPath);
|
|
|
|
|
if (!stat.isFile()) return false;
|
|
|
|
|
|
|
|
|
|
return readFileSync(gitMetadataPath, "utf8").trimStart().startsWith("gitdir:");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export function resolveWorktreeEnvFilePath(rootDir: string): string {
|
|
|
|
|
return path.resolve(rootDir, ".paperclip", ".env");
|
|
|
|
|
}
|
|
|
|
|
|
[codex] Bundle local branch fixes from PAP-10032 (#6604)
## Thinking Path
> - Paperclip orchestrates AI agents for zero-human companies.
> - This branch accumulated multiple already-tested control-plane,
adapter runtime, invite, workspace, plugin, and UI quality fixes on the
primary Paperclip checkout.
> - `origin/master` advanced while those commits were still local, so
the branch needed to be preserved and reconciled before review.
> - Splitting the branch commit-by-commit against the new base produced
overlapping conflicts with recently merged upstream PRs.
> - This pull request keeps the remaining branch as one standalone PR
because the final diff is 38 files after removing screenshot artifacts,
under Greptile's 100-file cap, and can be merged independently after
review.
> - The benefit is that none of the local work is lost, the branch is
now based on current `origin/master`, and reviewers can evaluate the
reconciled changes in one place.
## What Changed
- Merged the local accumulated branch with current `origin/master` and
resolved the invite-flow overlaps from the newer upstream companies
query helper.
- Preserved the local fixes for invite existing-member behavior, invite
link copy fallback, reusable workspace selection, worktree auth, static
SPA fallback, markdown wrapping, plugin slot registration, cloud
upstream UX/server polish, project sorting, and related tests.
- Removed screenshot artifacts from the PR per review request.
- Kept the PR under the requested file limit: 38 files changed, with no
`pnpm-lock.yaml` or `.github/workflows/*` changes.
## Verification
- `NODE_ENV=test pnpm exec vitest run
ui/src/pages/CompanyInvites.test.tsx ui/src/pages/InviteLanding.test.tsx
ui/src/pages/Projects.test.tsx ui/src/plugins/slots.test.ts
ui/src/components/MarkdownBody.test.tsx
server/src/__tests__/invite-accept-existing-member.test.ts
server/src/__tests__/static-index-html.test.ts
server/src/__tests__/execution-workspaces-service.test.ts
server/src/__tests__/better-auth.test.ts
server/src/__tests__/worktree-config.test.ts`
- `NODE_ENV=test pnpm --filter @paperclipai/ui typecheck`
- `NODE_ENV=test pnpm --filter @paperclipai/server typecheck`
- Confirmed `git diff --name-only origin/master...HEAD | wc -l` is `38`.
- Confirmed no PR diff entries match `pnpm-lock.yaml`,
`.github/workflows/*`, or `screenshots/*`.
## Risks
- Medium review risk because this is a bundled rescue PR rather than
several narrow feature PRs.
- Invite flow and company cache behavior overlapped with newer upstream
changes; the merge resolution intentionally keeps the shared
`companiesListQueryOptions` helper while preserving local
existing-member invite behavior.
- Visual review evidence is no longer attached in-repo because
screenshots were removed from this PR per review request.
> For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and
discuss it in `#dev` before opening the PR. Feature PRs that overlap
with planned core work may need to be redirected — check the roadmap
first. See `CONTRIBUTING.md`.
## Model Used
- OpenAI Codex, GPT-5-based coding agent, with repository tool access,
terminal execution, and git/GitHub CLI operations.
## Checklist
- [x] I have included a thinking path that traces from project context
to this change
- [x] I have specified the model used (with version and capability
details)
- [x] I have checked ROADMAP.md and confirmed this PR does not duplicate
planned core work
- [x] I have run tests locally and they pass
- [x] I have added or updated tests where applicable
- [x] UI screenshots were intentionally removed from this PR per review
request
- [x] I have updated relevant documentation to reflect my changes
- [x] I have considered and documented any risks above
- [x] I will address all Greptile and reviewer comments before
requesting merge
---------
Co-authored-by: Paperclip <noreply@paperclip.ing>
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: CodexCoder <codexcoder@paperclip.local>
2026-05-25 07:25:26 -05:00
|
|
|
function expandHomePrefix(value: string): string {
|
|
|
|
|
if (value === "~") return os.homedir();
|
|
|
|
|
if (value.startsWith("~/")) return path.resolve(os.homedir(), value.slice(2));
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function resolveHomeAwarePath(value: string): string {
|
|
|
|
|
return path.resolve(expandHomePrefix(value));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function resolveDefaultWorktreeHome(env: NodeJS.ProcessEnv): string {
|
|
|
|
|
return path.resolve(expandHomePrefix(env.PAPERCLIP_WORKTREES_DIR?.trim() || "~/.paperclip-worktrees"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function repairStaleMigratedWorktreeEnvEntries(
|
|
|
|
|
rootDir: string,
|
|
|
|
|
entries: Record<string, string>,
|
|
|
|
|
env: NodeJS.ProcessEnv,
|
|
|
|
|
): Record<string, string> {
|
|
|
|
|
const localConfigPath = path.resolve(rootDir, ".paperclip", "config.json");
|
|
|
|
|
const configuredPath = entries.PAPERCLIP_CONFIG?.trim();
|
|
|
|
|
if (!configuredPath) return entries;
|
|
|
|
|
|
|
|
|
|
const resolvedConfiguredPath = resolveHomeAwarePath(configuredPath);
|
|
|
|
|
const staleConfigPath =
|
|
|
|
|
resolvedConfiguredPath !== localConfigPath &&
|
|
|
|
|
!existsSync(resolvedConfiguredPath) &&
|
|
|
|
|
existsSync(localConfigPath);
|
|
|
|
|
if (!staleConfigPath) return entries;
|
|
|
|
|
|
|
|
|
|
const homeDir = resolveDefaultWorktreeHome(env);
|
|
|
|
|
return {
|
|
|
|
|
...entries,
|
|
|
|
|
PAPERCLIP_HOME: homeDir,
|
|
|
|
|
PAPERCLIP_CONFIG: localConfigPath,
|
|
|
|
|
PAPERCLIP_CONTEXT: path.resolve(homeDir, "context.json"),
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
2026-04-11 08:17:16 -05:00
|
|
|
export function bootstrapDevRunnerWorktreeEnv(
|
|
|
|
|
rootDir: string,
|
|
|
|
|
env: NodeJS.ProcessEnv = process.env,
|
2026-04-11 08:35:53 -05:00
|
|
|
): WorktreeEnvBootstrapResult {
|
2026-04-11 08:17:16 -05:00
|
|
|
if (!isLinkedGitWorktreeCheckout(rootDir)) {
|
|
|
|
|
return {
|
|
|
|
|
envPath: null,
|
|
|
|
|
missingEnv: false,
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const envPath = resolveWorktreeEnvFilePath(rootDir);
|
|
|
|
|
if (!existsSync(envPath)) {
|
|
|
|
|
return {
|
|
|
|
|
envPath,
|
|
|
|
|
missingEnv: true,
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
[codex] Bundle local branch fixes from PAP-10032 (#6604)
## Thinking Path
> - Paperclip orchestrates AI agents for zero-human companies.
> - This branch accumulated multiple already-tested control-plane,
adapter runtime, invite, workspace, plugin, and UI quality fixes on the
primary Paperclip checkout.
> - `origin/master` advanced while those commits were still local, so
the branch needed to be preserved and reconciled before review.
> - Splitting the branch commit-by-commit against the new base produced
overlapping conflicts with recently merged upstream PRs.
> - This pull request keeps the remaining branch as one standalone PR
because the final diff is 38 files after removing screenshot artifacts,
under Greptile's 100-file cap, and can be merged independently after
review.
> - The benefit is that none of the local work is lost, the branch is
now based on current `origin/master`, and reviewers can evaluate the
reconciled changes in one place.
## What Changed
- Merged the local accumulated branch with current `origin/master` and
resolved the invite-flow overlaps from the newer upstream companies
query helper.
- Preserved the local fixes for invite existing-member behavior, invite
link copy fallback, reusable workspace selection, worktree auth, static
SPA fallback, markdown wrapping, plugin slot registration, cloud
upstream UX/server polish, project sorting, and related tests.
- Removed screenshot artifacts from the PR per review request.
- Kept the PR under the requested file limit: 38 files changed, with no
`pnpm-lock.yaml` or `.github/workflows/*` changes.
## Verification
- `NODE_ENV=test pnpm exec vitest run
ui/src/pages/CompanyInvites.test.tsx ui/src/pages/InviteLanding.test.tsx
ui/src/pages/Projects.test.tsx ui/src/plugins/slots.test.ts
ui/src/components/MarkdownBody.test.tsx
server/src/__tests__/invite-accept-existing-member.test.ts
server/src/__tests__/static-index-html.test.ts
server/src/__tests__/execution-workspaces-service.test.ts
server/src/__tests__/better-auth.test.ts
server/src/__tests__/worktree-config.test.ts`
- `NODE_ENV=test pnpm --filter @paperclipai/ui typecheck`
- `NODE_ENV=test pnpm --filter @paperclipai/server typecheck`
- Confirmed `git diff --name-only origin/master...HEAD | wc -l` is `38`.
- Confirmed no PR diff entries match `pnpm-lock.yaml`,
`.github/workflows/*`, or `screenshots/*`.
## Risks
- Medium review risk because this is a bundled rescue PR rather than
several narrow feature PRs.
- Invite flow and company cache behavior overlapped with newer upstream
changes; the merge resolution intentionally keeps the shared
`companiesListQueryOptions` helper while preserving local
existing-member invite behavior.
- Visual review evidence is no longer attached in-repo because
screenshots were removed from this PR per review request.
> For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and
discuss it in `#dev` before opening the PR. Feature PRs that overlap
with planned core work may need to be redirected — check the roadmap
first. See `CONTRIBUTING.md`.
## Model Used
- OpenAI Codex, GPT-5-based coding agent, with repository tool access,
terminal execution, and git/GitHub CLI operations.
## Checklist
- [x] I have included a thinking path that traces from project context
to this change
- [x] I have specified the model used (with version and capability
details)
- [x] I have checked ROADMAP.md and confirmed this PR does not duplicate
planned core work
- [x] I have run tests locally and they pass
- [x] I have added or updated tests where applicable
- [x] UI screenshots were intentionally removed from this PR per review
request
- [x] I have updated relevant documentation to reflect my changes
- [x] I have considered and documented any risks above
- [x] I will address all Greptile and reviewer comments before
requesting merge
---------
Co-authored-by: Paperclip <noreply@paperclip.ing>
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: CodexCoder <codexcoder@paperclip.local>
2026-05-25 07:25:26 -05:00
|
|
|
const entries = repairStaleMigratedWorktreeEnvEntries(
|
|
|
|
|
rootDir,
|
|
|
|
|
parseEnvFile(readFileSync(envPath, "utf8")),
|
|
|
|
|
env,
|
|
|
|
|
);
|
2026-04-11 08:17:16 -05:00
|
|
|
for (const [key, value] of Object.entries(entries)) {
|
|
|
|
|
if (typeof env[key] === "string" && env[key]!.trim().length > 0) continue;
|
|
|
|
|
env[key] = value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
|
envPath,
|
|
|
|
|
missingEnv: false,
|
|
|
|
|
};
|
|
|
|
|
}
|