b9a80dcf22
## Thinking Path > - Paperclip is the control plane for autonomous AI companies. > - V1 needs to stay local-first while also supporting shared, authenticated deployments. > - Human operators need real identities, company membership, invite flows, profile surfaces, and company-scoped access controls. > - Agents and operators also need the existing issue, inbox, workspace, approval, and plugin flows to keep working under those authenticated boundaries. > - This branch accumulated the multi-user implementation, follow-up QA fixes, workspace/runtime refinements, invite UX improvements, release-branch conflict resolution, and review hardening. > - This pull request consolidates that branch onto the current `master` branch as a single reviewable PR. > - The benefit is a complete multi-user implementation path with tests and docs carried forward without dropping existing branch work. ## What Changed - Added authenticated human-user access surfaces: auth/session routes, company user directory, profile settings, company access/member management, join requests, and invite management. - Added invite creation, invite landing, onboarding, logo/branding, invite grants, deduped join requests, and authenticated multi-user E2E coverage. - Tightened company-scoped and instance-admin authorization across board, plugin, adapter, access, issue, and workspace routes. - Added profile-image URL validation hardening, avatar preservation on name-only profile updates, and join-request uniqueness migration cleanup for pending human requests. - Added an atomic member role/status/grants update path so Company Access saves no longer leave partially updated permissions. - Improved issue chat, inbox, assignee identity rendering, sidebar/account/company navigation, workspace routing, and execution workspace reuse behavior for multi-user operation. - Added and updated server/UI tests covering auth, invites, membership, issue workspace inheritance, plugin authz, inbox/chat behavior, and multi-user flows. - Merged current `public-gh/master` into this branch, resolved all conflicts, and verified no `pnpm-lock.yaml` change is included in this PR diff. ## Verification - `pnpm exec vitest run server/src/__tests__/issues-service.test.ts ui/src/components/IssueChatThread.test.tsx ui/src/pages/Inbox.test.tsx` - `pnpm run preflight:workspace-links && pnpm exec vitest run server/src/__tests__/plugin-routes-authz.test.ts` - `pnpm exec vitest run server/src/__tests__/plugin-routes-authz.test.ts server/src/__tests__/workspace-runtime-service-authz.test.ts server/src/__tests__/access-validators.test.ts` - `pnpm exec vitest run server/src/__tests__/authz-company-access.test.ts server/src/__tests__/routines-routes.test.ts server/src/__tests__/sidebar-preferences-routes.test.ts server/src/__tests__/approval-routes-idempotency.test.ts server/src/__tests__/openclaw-invite-prompt-route.test.ts server/src/__tests__/agent-cross-tenant-authz-routes.test.ts server/src/__tests__/routines-e2e.test.ts` - `pnpm exec vitest run server/src/__tests__/auth-routes.test.ts ui/src/pages/CompanyAccess.test.tsx` - `pnpm --filter @paperclipai/shared typecheck && pnpm --filter @paperclipai/db typecheck && pnpm --filter @paperclipai/server typecheck` - `pnpm --filter @paperclipai/shared typecheck && pnpm --filter @paperclipai/server typecheck` - `pnpm --filter @paperclipai/ui typecheck` - `pnpm db:generate` - `npx playwright test --config tests/e2e/playwright.config.ts --list` - Confirmed branch has no uncommitted changes and is `0` commits behind `public-gh/master` before PR creation. - Confirmed no `pnpm-lock.yaml` change is staged or present in the PR diff. ## Risks - High review surface area: this PR contains the accumulated multi-user branch plus follow-up fixes, so reviewers should focus especially on company-boundary enforcement and authenticated-vs-local deployment behavior. - UI behavior changed across invites, inbox, issue chat, access settings, and sidebar navigation; no browser screenshots are included in this branch-consolidation PR. - Plugin install, upgrade, and lifecycle/config mutations now require instance-admin access, which is intentional but may change expectations for non-admin board users. - A join-request dedupe migration rejects duplicate pending human requests before creating unique indexes; deployments with unusual historical duplicates should review the migration behavior. - Company member role/status/grant saves now use a new combined endpoint; older separate endpoints remain for compatibility. - Full production build was not run locally in this heartbeat; CI should cover the full matrix. ## Model Used - OpenAI Codex coding agent, GPT-5-based model, CLI/tool-use environment. Exact deployed model identifier and context window were not exposed by the runtime. ## 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 run tests locally and they pass - [x] I have added or updated tests where applicable - [x] If this change affects the UI, I have included before/after screenshots - [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 Note on screenshots: this is a branch-consolidation PR for an already-developed multi-user branch, and no browser screenshots were captured during this heartbeat. --------- Co-authored-by: dotta <dotta@example.com> Co-authored-by: Paperclip <noreply@paperclip.ing> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
476 lines
15 KiB
TypeScript
476 lines
15 KiB
TypeScript
import fs from "node:fs";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import type { PaperclipConfig } from "@paperclipai/shared";
|
|
import { resolvePaperclipConfigPath, resolvePaperclipEnvPath } from "./paths.js";
|
|
|
|
function nonEmpty(value: string | null | undefined): string | null {
|
|
return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
|
|
}
|
|
|
|
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 sanitizeWorktreeInstanceId(rawValue: string): string {
|
|
const trimmed = rawValue.trim().toLowerCase();
|
|
const normalized = trimmed
|
|
.replace(/[^a-z0-9_-]+/g, "-")
|
|
.replace(/-+/g, "-")
|
|
.replace(/^[-_]+|[-_]+$/g, "");
|
|
return normalized || "worktree";
|
|
}
|
|
|
|
function isLoopbackHost(hostname: string): boolean {
|
|
const value = hostname.trim().toLowerCase();
|
|
return value === "127.0.0.1" || value === "localhost" || value === "::1";
|
|
}
|
|
|
|
function rewriteLocalUrlPort(rawUrl: string | undefined, port: number): string | undefined {
|
|
if (!rawUrl) return undefined;
|
|
try {
|
|
const parsed = new URL(rawUrl);
|
|
if (!isLoopbackHost(parsed.hostname)) return rawUrl;
|
|
parsed.port = String(port);
|
|
return parsed.toString();
|
|
} catch {
|
|
return rawUrl;
|
|
}
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
if (
|
|
(value.startsWith("\"") && value.endsWith("\"")) ||
|
|
(value.startsWith("'") && value.endsWith("'"))
|
|
) {
|
|
entries[key] = value.slice(1, -1);
|
|
continue;
|
|
}
|
|
|
|
entries[key] = value.replace(/\s+#.*$/, "").trim();
|
|
}
|
|
|
|
return entries;
|
|
}
|
|
|
|
function readEnvEntries(envPath: string): Record<string, string> {
|
|
if (!fs.existsSync(envPath)) return {};
|
|
return parseEnvFile(fs.readFileSync(envPath, "utf8"));
|
|
}
|
|
|
|
function formatEnvEntries(entries: Record<string, string>): string {
|
|
return [
|
|
"# Paperclip environment variables",
|
|
"# Generated by Paperclip worktree repair",
|
|
...Object.entries(entries).map(([key, value]) => `${key}=${JSON.stringify(value)}`),
|
|
"",
|
|
].join("\n");
|
|
}
|
|
|
|
function isPathInside(candidatePath: string, rootPath: string): boolean {
|
|
const candidate = path.resolve(candidatePath);
|
|
const root = path.resolve(rootPath);
|
|
return candidate === root || candidate.startsWith(`${root}${path.sep}`);
|
|
}
|
|
|
|
type WorktreeRuntimeContext = {
|
|
configPath: string;
|
|
envPath: string;
|
|
worktreeName: string;
|
|
instanceId: string;
|
|
homeDir: string;
|
|
instanceRoot: string;
|
|
contextPath: string;
|
|
embeddedPostgresDataDir: string;
|
|
backupDir: string;
|
|
logDir: string;
|
|
storageDir: string;
|
|
secretsKeyFilePath: string;
|
|
};
|
|
|
|
function resolveWorktreeRuntimeContext(
|
|
env: NodeJS.ProcessEnv,
|
|
overrideConfigPath?: string,
|
|
): WorktreeRuntimeContext | null {
|
|
if (env.PAPERCLIP_IN_WORKTREE !== "true") return null;
|
|
|
|
const configPath = resolvePaperclipConfigPath(overrideConfigPath);
|
|
const envPath = resolvePaperclipEnvPath(configPath);
|
|
const persistedEnv = readEnvEntries(envPath);
|
|
const worktreeRoot = path.resolve(path.dirname(configPath), "..");
|
|
const worktreeName =
|
|
nonEmpty(persistedEnv.PAPERCLIP_WORKTREE_NAME) ??
|
|
nonEmpty(env.PAPERCLIP_WORKTREE_NAME) ??
|
|
path.basename(worktreeRoot);
|
|
const instanceId =
|
|
nonEmpty(persistedEnv.PAPERCLIP_INSTANCE_ID) ??
|
|
nonEmpty(env.PAPERCLIP_INSTANCE_ID) ??
|
|
sanitizeWorktreeInstanceId(worktreeName);
|
|
const homeDir = resolveHomeAwarePath(
|
|
nonEmpty(persistedEnv.PAPERCLIP_HOME) ??
|
|
nonEmpty(env.PAPERCLIP_HOME) ??
|
|
nonEmpty(env.PAPERCLIP_WORKTREES_DIR) ??
|
|
"~/.paperclip-worktrees",
|
|
);
|
|
const instanceRoot = path.resolve(homeDir, "instances", instanceId);
|
|
|
|
return {
|
|
configPath,
|
|
envPath,
|
|
worktreeName,
|
|
instanceId,
|
|
homeDir,
|
|
instanceRoot,
|
|
contextPath: path.resolve(homeDir, "context.json"),
|
|
embeddedPostgresDataDir: path.resolve(instanceRoot, "db"),
|
|
backupDir: path.resolve(instanceRoot, "data", "backups"),
|
|
logDir: path.resolve(instanceRoot, "logs"),
|
|
storageDir: path.resolve(instanceRoot, "data", "storage"),
|
|
secretsKeyFilePath: path.resolve(instanceRoot, "secrets", "master.key"),
|
|
};
|
|
}
|
|
|
|
function writeConfigFile(configPath: string, config: PaperclipConfig): void {
|
|
fs.mkdirSync(path.dirname(configPath), { recursive: true });
|
|
fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n", { mode: 0o600 });
|
|
}
|
|
|
|
function resolveRepoManagedWorktreesRoot(worktreeRoot: string): string | null {
|
|
const normalized = path.resolve(worktreeRoot);
|
|
const marker = `${path.sep}.paperclip${path.sep}worktrees${path.sep}`;
|
|
const index = normalized.indexOf(marker);
|
|
if (index === -1) return null;
|
|
const repoRoot = normalized.slice(0, index);
|
|
return path.resolve(repoRoot, ".paperclip", "worktrees");
|
|
}
|
|
|
|
function collectSiblingWorktreePorts(context: WorktreeRuntimeContext): {
|
|
serverPorts: Set<number>;
|
|
databasePorts: Set<number>;
|
|
} {
|
|
const serverPorts = new Set<number>();
|
|
const databasePorts = new Set<number>();
|
|
const siblingConfigPaths = new Set<string>();
|
|
const instancesDir = path.resolve(context.homeDir, "instances");
|
|
if (fs.existsSync(instancesDir)) {
|
|
for (const entry of fs.readdirSync(instancesDir, { withFileTypes: true })) {
|
|
if (!entry.isDirectory() || entry.name === context.instanceId) continue;
|
|
|
|
const siblingConfigPath = path.resolve(instancesDir, entry.name, "config.json");
|
|
if (fs.existsSync(siblingConfigPath)) {
|
|
siblingConfigPaths.add(siblingConfigPath);
|
|
}
|
|
}
|
|
}
|
|
|
|
const repoManagedWorktreesRoot = resolveRepoManagedWorktreesRoot(path.dirname(context.configPath));
|
|
if (repoManagedWorktreesRoot && fs.existsSync(repoManagedWorktreesRoot)) {
|
|
for (const entry of fs.readdirSync(repoManagedWorktreesRoot, { withFileTypes: true })) {
|
|
if (!entry.isDirectory()) continue;
|
|
|
|
const siblingConfigPath = path.resolve(repoManagedWorktreesRoot, entry.name, ".paperclip", "config.json");
|
|
if (path.resolve(siblingConfigPath) === path.resolve(context.configPath)) continue;
|
|
if (fs.existsSync(siblingConfigPath)) {
|
|
siblingConfigPaths.add(siblingConfigPath);
|
|
}
|
|
}
|
|
}
|
|
|
|
for (const siblingConfigPath of siblingConfigPaths) {
|
|
try {
|
|
const siblingConfig = JSON.parse(fs.readFileSync(siblingConfigPath, "utf8")) as PaperclipConfig;
|
|
if (Number.isInteger(siblingConfig.server.port) && siblingConfig.server.port > 0) {
|
|
serverPorts.add(siblingConfig.server.port);
|
|
}
|
|
if (
|
|
siblingConfig.database.mode === "embedded-postgres" &&
|
|
Number.isInteger(siblingConfig.database.embeddedPostgresPort) &&
|
|
siblingConfig.database.embeddedPostgresPort > 0
|
|
) {
|
|
databasePorts.add(siblingConfig.database.embeddedPostgresPort);
|
|
}
|
|
} catch {
|
|
// Ignore sibling configs that are missing or malformed.
|
|
}
|
|
}
|
|
|
|
return { serverPorts, databasePorts };
|
|
}
|
|
|
|
function findNextUnclaimedPort(preferredPort: number, claimedPorts: Set<number>): number {
|
|
let port = Math.max(1, Math.trunc(preferredPort));
|
|
while (claimedPorts.has(port)) {
|
|
port += 1;
|
|
}
|
|
return port;
|
|
}
|
|
|
|
function buildIsolatedWorktreeConfig(
|
|
config: PaperclipConfig,
|
|
context: WorktreeRuntimeContext,
|
|
portOverrides?: {
|
|
serverPort?: number;
|
|
databasePort?: number;
|
|
},
|
|
): PaperclipConfig {
|
|
const serverPort = portOverrides?.serverPort ?? config.server.port;
|
|
const databasePort =
|
|
config.database.mode === "embedded-postgres"
|
|
? portOverrides?.databasePort ?? config.database.embeddedPostgresPort
|
|
: undefined;
|
|
const nextConfig: PaperclipConfig = {
|
|
...config,
|
|
database: {
|
|
...config.database,
|
|
...(config.database.mode === "embedded-postgres"
|
|
? {
|
|
embeddedPostgresDataDir: context.embeddedPostgresDataDir,
|
|
embeddedPostgresPort: databasePort ?? config.database.embeddedPostgresPort,
|
|
backup: {
|
|
...config.database.backup,
|
|
dir: context.backupDir,
|
|
},
|
|
}
|
|
: {}),
|
|
},
|
|
server: {
|
|
...config.server,
|
|
port: serverPort,
|
|
},
|
|
logging: {
|
|
...config.logging,
|
|
logDir: context.logDir,
|
|
},
|
|
storage: {
|
|
...config.storage,
|
|
localDisk: {
|
|
...config.storage.localDisk,
|
|
baseDir: context.storageDir,
|
|
},
|
|
},
|
|
secrets: {
|
|
...config.secrets,
|
|
localEncrypted: {
|
|
...config.secrets.localEncrypted,
|
|
keyFilePath: context.secretsKeyFilePath,
|
|
},
|
|
},
|
|
};
|
|
|
|
if (config.auth.baseUrlMode === "explicit" && config.auth.publicBaseUrl) {
|
|
nextConfig.auth = {
|
|
...config.auth,
|
|
publicBaseUrl: rewriteLocalUrlPort(config.auth.publicBaseUrl, serverPort),
|
|
};
|
|
}
|
|
|
|
return nextConfig;
|
|
}
|
|
|
|
function needsWorktreeConfigRepair(
|
|
config: PaperclipConfig,
|
|
context: WorktreeRuntimeContext,
|
|
): boolean {
|
|
if (config.database.mode === "embedded-postgres") {
|
|
if (!isPathInside(config.database.embeddedPostgresDataDir, context.instanceRoot)) {
|
|
return true;
|
|
}
|
|
if (!isPathInside(config.database.backup.dir, context.instanceRoot)) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
if (!isPathInside(config.logging.logDir, context.instanceRoot)) {
|
|
return true;
|
|
}
|
|
if (!isPathInside(config.storage.localDisk.baseDir, context.instanceRoot)) {
|
|
return true;
|
|
}
|
|
if (!isPathInside(config.secrets.localEncrypted.keyFilePath, context.instanceRoot)) {
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
export function applyRuntimePortSelectionToConfig(
|
|
config: PaperclipConfig,
|
|
input: {
|
|
serverPort: number;
|
|
databasePort?: number | null;
|
|
allowServerPortWrite?: boolean;
|
|
allowDatabasePortWrite?: boolean;
|
|
},
|
|
): { config: PaperclipConfig; changed: boolean } {
|
|
let changed = false;
|
|
let nextConfig = config;
|
|
|
|
if (input.allowServerPortWrite !== false && config.server.port !== input.serverPort) {
|
|
nextConfig = {
|
|
...nextConfig,
|
|
server: {
|
|
...nextConfig.server,
|
|
port: input.serverPort,
|
|
},
|
|
};
|
|
changed = true;
|
|
}
|
|
|
|
if (
|
|
input.allowDatabasePortWrite !== false &&
|
|
nextConfig.database.mode === "embedded-postgres" &&
|
|
typeof input.databasePort === "number" &&
|
|
nextConfig.database.embeddedPostgresPort !== input.databasePort
|
|
) {
|
|
nextConfig = {
|
|
...nextConfig,
|
|
database: {
|
|
...nextConfig.database,
|
|
embeddedPostgresPort: input.databasePort,
|
|
},
|
|
};
|
|
changed = true;
|
|
}
|
|
|
|
if (nextConfig.auth.baseUrlMode === "explicit" && nextConfig.auth.publicBaseUrl) {
|
|
const rewritten = rewriteLocalUrlPort(nextConfig.auth.publicBaseUrl, input.serverPort);
|
|
if (rewritten && rewritten !== nextConfig.auth.publicBaseUrl) {
|
|
nextConfig = {
|
|
...nextConfig,
|
|
auth: {
|
|
...nextConfig.auth,
|
|
publicBaseUrl: rewritten,
|
|
},
|
|
};
|
|
changed = true;
|
|
}
|
|
}
|
|
|
|
return { config: nextConfig, changed };
|
|
}
|
|
|
|
export function maybeRepairLegacyWorktreeConfigAndEnvFiles(): {
|
|
repairedConfig: boolean;
|
|
repairedEnv: boolean;
|
|
} {
|
|
const context = resolveWorktreeRuntimeContext(process.env);
|
|
if (!context) {
|
|
return { repairedConfig: false, repairedEnv: false };
|
|
}
|
|
|
|
process.env.PAPERCLIP_HOME = context.homeDir;
|
|
process.env.PAPERCLIP_INSTANCE_ID = context.instanceId;
|
|
process.env.PAPERCLIP_CONFIG = context.configPath;
|
|
process.env.PAPERCLIP_CONTEXT = context.contextPath;
|
|
process.env.PAPERCLIP_WORKTREE_NAME = context.worktreeName;
|
|
|
|
let repairedConfig = false;
|
|
if (fs.existsSync(context.configPath)) {
|
|
try {
|
|
const parsed = JSON.parse(fs.readFileSync(context.configPath, "utf8")) as PaperclipConfig;
|
|
const siblingPorts = collectSiblingWorktreePorts(context);
|
|
const hasSiblingPortCollision =
|
|
siblingPorts.serverPorts.has(parsed.server.port) ||
|
|
(parsed.database.mode === "embedded-postgres" &&
|
|
siblingPorts.databasePorts.has(parsed.database.embeddedPostgresPort));
|
|
|
|
if (needsWorktreeConfigRepair(parsed, context) || hasSiblingPortCollision) {
|
|
const selectedServerPort = findNextUnclaimedPort(
|
|
parsed.server.port === 3100 ? 3101 : parsed.server.port,
|
|
siblingPorts.serverPorts,
|
|
);
|
|
const selectedDatabasePort =
|
|
parsed.database.mode === "embedded-postgres"
|
|
? findNextUnclaimedPort(
|
|
parsed.database.embeddedPostgresPort === 54329
|
|
? 54330
|
|
: parsed.database.embeddedPostgresPort,
|
|
new Set([...siblingPorts.databasePorts, selectedServerPort]),
|
|
)
|
|
: undefined;
|
|
|
|
writeConfigFile(
|
|
context.configPath,
|
|
buildIsolatedWorktreeConfig(parsed, context, {
|
|
serverPort: selectedServerPort,
|
|
databasePort: selectedDatabasePort,
|
|
}),
|
|
);
|
|
repairedConfig = true;
|
|
}
|
|
} catch {
|
|
// Leave invalid configs to the normal startup validation path.
|
|
}
|
|
}
|
|
|
|
const existingEnvEntries = readEnvEntries(context.envPath);
|
|
const desiredEnvEntries: Record<string, string> = {
|
|
...existingEnvEntries,
|
|
PAPERCLIP_HOME: context.homeDir,
|
|
PAPERCLIP_INSTANCE_ID: context.instanceId,
|
|
PAPERCLIP_CONFIG: context.configPath,
|
|
PAPERCLIP_CONTEXT: context.contextPath,
|
|
PAPERCLIP_IN_WORKTREE: "true",
|
|
PAPERCLIP_WORKTREE_NAME: context.worktreeName,
|
|
};
|
|
|
|
const repairedEnv = Object.entries(desiredEnvEntries).some(
|
|
([key, value]) => existingEnvEntries[key] !== value,
|
|
);
|
|
|
|
if (repairedEnv) {
|
|
fs.mkdirSync(path.dirname(context.envPath), { recursive: true });
|
|
fs.writeFileSync(context.envPath, formatEnvEntries(desiredEnvEntries), { mode: 0o600 });
|
|
}
|
|
|
|
return { repairedConfig, repairedEnv };
|
|
}
|
|
|
|
export function maybePersistWorktreeRuntimePorts(input: {
|
|
serverPort: number;
|
|
databasePort?: number | null;
|
|
}): void {
|
|
const context = resolveWorktreeRuntimeContext(process.env);
|
|
if (!context || !fs.existsSync(context.configPath)) return;
|
|
|
|
let fileConfig: PaperclipConfig;
|
|
try {
|
|
fileConfig = JSON.parse(fs.readFileSync(context.configPath, "utf8")) as PaperclipConfig;
|
|
} catch {
|
|
return;
|
|
}
|
|
|
|
const { config, changed } = applyRuntimePortSelectionToConfig(fileConfig, {
|
|
serverPort: input.serverPort,
|
|
databasePort: input.databasePort,
|
|
allowServerPortWrite: !nonEmpty(process.env.PORT),
|
|
allowDatabasePortWrite: !nonEmpty(process.env.DATABASE_URL),
|
|
});
|
|
|
|
if (changed) {
|
|
writeConfigFile(context.configPath, config);
|
|
}
|
|
}
|