mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-16 02:40:39 +09:00
[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>
This commit is contained in:
Dotta
GitHub
parent
96f0279e08
commit
ece8a51e22
38 changed files with 1715 additions and 134 deletions
|
|
@ -2721,6 +2721,83 @@ export function accessRoutes(
|
|||
return { token, created, normalizedAgentMessage };
|
||||
}
|
||||
|
||||
async function approveHumanJoinRequestFromInvite(input: {
|
||||
req: Request;
|
||||
invite: typeof invites.$inferSelect;
|
||||
joinRequest: typeof joinRequests.$inferSelect;
|
||||
companyId: string;
|
||||
}) {
|
||||
if (input.joinRequest.requestType !== "human") {
|
||||
throw badRequest("Only human join requests can be approved through a human invite");
|
||||
}
|
||||
if (!input.joinRequest.requestingUserId) {
|
||||
throw conflict("Join request missing user identity");
|
||||
}
|
||||
|
||||
const membershipRole = resolveHumanInviteRole(
|
||||
input.invite.defaultsPayload as Record<string, unknown> | null,
|
||||
);
|
||||
await access.ensureMembership(
|
||||
input.companyId,
|
||||
"user",
|
||||
input.joinRequest.requestingUserId,
|
||||
membershipRole,
|
||||
"active",
|
||||
);
|
||||
const grants = humanJoinGrantsFromDefaults(
|
||||
input.invite.defaultsPayload as Record<string, unknown> | null,
|
||||
membershipRole,
|
||||
);
|
||||
await access.setPrincipalGrants(
|
||||
input.companyId,
|
||||
"user",
|
||||
input.joinRequest.requestingUserId,
|
||||
grants,
|
||||
input.invite.invitedByUserId ?? null,
|
||||
);
|
||||
|
||||
if (input.joinRequest.status === "approved") {
|
||||
return input.joinRequest;
|
||||
}
|
||||
|
||||
const approvedAt = new Date();
|
||||
const approvedByUserId =
|
||||
input.invite.invitedByUserId ?? (isLocalImplicit(input.req) ? "local-board" : null);
|
||||
const approved = await db
|
||||
.update(joinRequests)
|
||||
.set({
|
||||
status: "approved",
|
||||
approvedByUserId,
|
||||
approvedAt,
|
||||
updatedAt: approvedAt,
|
||||
})
|
||||
.where(eq(joinRequests.id, input.joinRequest.id))
|
||||
.returning()
|
||||
.then((rows) => rows[0] ?? null);
|
||||
|
||||
await logActivity(db, {
|
||||
companyId: input.companyId,
|
||||
actorType: "user",
|
||||
actorId: approvedByUserId ?? "board",
|
||||
action: "join.approved",
|
||||
entityType: "join_request",
|
||||
entityId: input.joinRequest.id,
|
||||
details: {
|
||||
requestType: "human",
|
||||
inviteId: input.invite.id,
|
||||
source: "human_invite_accept",
|
||||
},
|
||||
});
|
||||
|
||||
return approved ?? {
|
||||
...input.joinRequest,
|
||||
status: "approved",
|
||||
approvedByUserId,
|
||||
approvedAt,
|
||||
updatedAt: approvedAt,
|
||||
};
|
||||
}
|
||||
|
||||
async function getInviteCompanyBranding(
|
||||
companyId: string | null,
|
||||
inviteToken: string | null = null,
|
||||
|
|
@ -3255,9 +3332,26 @@ export function accessRoutes(
|
|||
}
|
||||
}
|
||||
|
||||
const actorEmail =
|
||||
requestType === "human" ? await resolveActorEmail(db, req) : null;
|
||||
const actorRequestingUserId =
|
||||
requestType === "human"
|
||||
? req.actor.userId ?? "local-board"
|
||||
: null;
|
||||
const canReplayHumanInviteAccept =
|
||||
inviteAlreadyAccepted &&
|
||||
requestType === "human" &&
|
||||
existingJoinRequestForInvite?.requestType === "human" &&
|
||||
Boolean(
|
||||
findReusableHumanJoinRequest([existingJoinRequestForInvite], {
|
||||
requestingUserId: actorRequestingUserId,
|
||||
requestEmailSnapshot: actorEmail,
|
||||
})
|
||||
);
|
||||
const adapterType = req.body.adapterType ?? null;
|
||||
if (
|
||||
inviteAlreadyAccepted &&
|
||||
!canReplayHumanInviteAccept &&
|
||||
!canReplayOpenClawGatewayInviteAccept({
|
||||
requestType,
|
||||
adapterType,
|
||||
|
|
@ -3336,8 +3430,6 @@ export function accessRoutes(
|
|||
? new Date(Date.now() + 7 * 24 * 60 * 60 * 1000)
|
||||
: null;
|
||||
|
||||
const actorEmail =
|
||||
requestType === "human" ? await resolveActorEmail(db, req) : null;
|
||||
const existingHumanJoinRequest =
|
||||
requestType === "human"
|
||||
? findReusableHumanJoinRequest(
|
||||
|
|
@ -3352,12 +3444,12 @@ export function accessRoutes(
|
|||
)
|
||||
.orderBy(desc(joinRequests.createdAt)),
|
||||
{
|
||||
requestingUserId: req.actor.userId ?? "local-board",
|
||||
requestingUserId: actorRequestingUserId,
|
||||
requestEmailSnapshot: actorEmail
|
||||
}
|
||||
)
|
||||
: null;
|
||||
const created = !inviteAlreadyAccepted
|
||||
let created = !inviteAlreadyAccepted
|
||||
? existingHumanJoinRequest
|
||||
? await db.transaction(async (tx) => {
|
||||
await tx
|
||||
|
|
@ -3566,6 +3658,15 @@ export function accessRoutes(
|
|||
}
|
||||
});
|
||||
|
||||
if (requestType === "human") {
|
||||
created = await approveHumanJoinRequestFromInvite({
|
||||
req,
|
||||
invite,
|
||||
joinRequest: created,
|
||||
companyId,
|
||||
});
|
||||
}
|
||||
|
||||
const response = toJoinRequestResponse(created);
|
||||
if (claimSecret) {
|
||||
const companyBranding = await getInviteCompanyBranding(invite.companyId);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue