forked from farhoodlabs/paperclip
Fix wrapped company issue prefix conflicts (#6423)
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies. > - Company creation is the first control-plane object operators create, and the generated issue prefix becomes part of task identity. > - The company service already retries when a generated issue prefix collides with the `companies_issue_prefix_idx` unique constraint. > - Drizzle 0.45.x wraps PostgreSQL errors in `DrizzleQueryError`, leaving the real `23505` constraint error on the `.cause` chain. > - The existing retry detector only inspected the top-level error, so wrapped prefix collisions surfaced as 500s instead of retrying. > - This pull request walks the error cause chain for the exact prefix constraint and verifies the retry path against embedded Postgres. > - The benefit is company creation no longer fails when generated prefixes collide under Drizzle 0.45.x wrappers. ## What Changed - Walk the error `.cause` chain when detecting `companies_issue_prefix_idx` unique violations, with a cycle guard and support for `constraint` / `constraint_name` fields. - Added an embedded Postgres regression test that seeds `ARO`, creates `Aron & Sharon`, and verifies the retry produces `AROA`. - Stabilized existing async tests touched by full verification: instance sidebar plugin rendering now waits for React Query results, and Tailscale-unavailable CLI tests explicitly hide host `tailscale` detection. ## Verification - `pnpm --filter @paperclipai/server exec vitest run src/__tests__/companies-service.test.ts` - `pnpm --filter @paperclipai/server exec vitest run src/__tests__/heartbeat-stale-queue-invalidation.test.ts` - `pnpm --filter @paperclipai/ui exec vitest run src/components/InstanceSidebar.test.tsx` - `pnpm --filter paperclipai exec vitest run src/__tests__/network-bind.test.ts src/__tests__/onboard.test.ts` - `pnpm test:run` - `pnpm -r typecheck` - `pnpm build` ## Risks - Low runtime risk: the retry behavior only expands detection for the existing exact company issue-prefix unique constraint. - The cause-chain walk is bounded by visited objects to avoid cycles. - The sidebar and CLI changes are test-only stabilization and do not change production behavior. > 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 coding agent in Codex desktop, with local shell/tool execution. ## 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] If this change affects the UI, I have included before/after screenshots (N/A: no UI behavior change) - [x] I have updated relevant documentation to reflect my changes (N/A: bug fix with no user-facing docs change) - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge Closes #6350
This commit is contained in:
@@ -2,6 +2,8 @@ import { describe, expect, it } from "vitest";
|
|||||||
import { resolveRuntimeBind, validateConfiguredBindMode } from "@paperclipai/shared";
|
import { resolveRuntimeBind, validateConfiguredBindMode } from "@paperclipai/shared";
|
||||||
import { buildPresetServerConfig } from "../config/server-bind.js";
|
import { buildPresetServerConfig } from "../config/server-bind.js";
|
||||||
|
|
||||||
|
const ORIGINAL_PATH = process.env.PATH;
|
||||||
|
|
||||||
describe("network bind helpers", () => {
|
describe("network bind helpers", () => {
|
||||||
it("rejects non-loopback bind modes in local_trusted", () => {
|
it("rejects non-loopback bind modes in local_trusted", () => {
|
||||||
expect(
|
expect(
|
||||||
@@ -50,13 +52,18 @@ describe("network bind helpers", () => {
|
|||||||
|
|
||||||
it("falls back to loopback when no tailscale address is available for tailnet presets", () => {
|
it("falls back to loopback when no tailscale address is available for tailnet presets", () => {
|
||||||
delete process.env.PAPERCLIP_TAILNET_BIND_HOST;
|
delete process.env.PAPERCLIP_TAILNET_BIND_HOST;
|
||||||
|
process.env.PATH = "";
|
||||||
|
|
||||||
const preset = buildPresetServerConfig("tailnet", {
|
try {
|
||||||
port: 3100,
|
const preset = buildPresetServerConfig("tailnet", {
|
||||||
allowedHostnames: [],
|
port: 3100,
|
||||||
serveUi: true,
|
allowedHostnames: [],
|
||||||
});
|
serveUi: true,
|
||||||
|
});
|
||||||
|
|
||||||
expect(preset.server.host).toBe("127.0.0.1");
|
expect(preset.server.host).toBe("127.0.0.1");
|
||||||
|
} finally {
|
||||||
|
process.env.PATH = ORIGINAL_PATH;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import type { PaperclipConfig } from "../config/schema.js";
|
|||||||
|
|
||||||
const ORIGINAL_ENV = { ...process.env };
|
const ORIGINAL_ENV = { ...process.env };
|
||||||
const ORIGINAL_CWD = process.cwd();
|
const ORIGINAL_CWD = process.cwd();
|
||||||
|
const ORIGINAL_PATH = process.env.PATH;
|
||||||
|
|
||||||
function createExistingConfigFixture() {
|
function createExistingConfigFixture() {
|
||||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "paperclip-onboard-"));
|
const root = fs.mkdtempSync(path.join(os.tmpdir(), "paperclip-onboard-"));
|
||||||
@@ -171,8 +172,13 @@ describe("onboard", () => {
|
|||||||
it("keeps tailnet quickstart on loopback until tailscale is available", async () => {
|
it("keeps tailnet quickstart on loopback until tailscale is available", async () => {
|
||||||
const configPath = createFreshConfigPath();
|
const configPath = createFreshConfigPath();
|
||||||
delete process.env.PAPERCLIP_TAILNET_BIND_HOST;
|
delete process.env.PAPERCLIP_TAILNET_BIND_HOST;
|
||||||
|
process.env.PATH = "";
|
||||||
|
|
||||||
await onboard({ config: configPath, yes: true, invokedByRun: true, bind: "tailnet" });
|
try {
|
||||||
|
await onboard({ config: configPath, yes: true, invokedByRun: true, bind: "tailnet" });
|
||||||
|
} finally {
|
||||||
|
process.env.PATH = ORIGINAL_PATH;
|
||||||
|
}
|
||||||
|
|
||||||
const raw = JSON.parse(fs.readFileSync(configPath, "utf8")) as PaperclipConfig;
|
const raw = JSON.parse(fs.readFileSync(configPath, "utf8")) as PaperclipConfig;
|
||||||
expect(raw.server.deploymentMode).toBe("authenticated");
|
expect(raw.server.deploymentMode).toBe("authenticated");
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
|
||||||
|
import { companies, createDb } from "@paperclipai/db";
|
||||||
|
import {
|
||||||
|
getEmbeddedPostgresTestSupport,
|
||||||
|
startEmbeddedPostgresTestDatabase,
|
||||||
|
} from "./helpers/embedded-postgres.js";
|
||||||
|
import { companyService } from "../services/companies.js";
|
||||||
|
|
||||||
|
const embeddedPostgresSupport = await getEmbeddedPostgresTestSupport();
|
||||||
|
const describeEmbeddedPostgres = embeddedPostgresSupport.supported ? describe : describe.skip;
|
||||||
|
|
||||||
|
if (!embeddedPostgresSupport.supported) {
|
||||||
|
console.warn(
|
||||||
|
`Skipping embedded Postgres company service tests on this host: ${embeddedPostgresSupport.reason ?? "unsupported environment"}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
describeEmbeddedPostgres("companyService", () => {
|
||||||
|
let db!: ReturnType<typeof createDb>;
|
||||||
|
let tempDb: Awaited<ReturnType<typeof startEmbeddedPostgresTestDatabase>> | null = null;
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
tempDb = await startEmbeddedPostgresTestDatabase("paperclip-company-service-");
|
||||||
|
db = createDb(tempDb.connectionString);
|
||||||
|
}, 20_000);
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await db.delete(companies);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await tempDb?.cleanup();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("retries generated issue prefixes when Drizzle wraps the unique constraint error", async () => {
|
||||||
|
await db.insert(companies).values({
|
||||||
|
name: "Aron Existing",
|
||||||
|
issuePrefix: "ARO",
|
||||||
|
});
|
||||||
|
|
||||||
|
const created = await companyService(db).create({
|
||||||
|
name: "Aron & Sharon",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(created.issuePrefix).toBe("AROA");
|
||||||
|
|
||||||
|
const rows = await db.select({ issuePrefix: companies.issuePrefix }).from(companies);
|
||||||
|
expect(rows.map((row) => row.issuePrefix).sort()).toEqual(["ARO", "AROA"]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -125,16 +125,18 @@ export function companyService(db: Db) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function isIssuePrefixConflict(error: unknown) {
|
function isIssuePrefixConflict(error: unknown) {
|
||||||
const constraint = typeof error === "object" && error !== null && "constraint" in error
|
const seen = new Set<unknown>();
|
||||||
? (error as { constraint?: string }).constraint
|
let current = error;
|
||||||
: typeof error === "object" && error !== null && "constraint_name" in error
|
while (typeof current === "object" && current !== null && !seen.has(current)) {
|
||||||
? (error as { constraint_name?: string }).constraint_name
|
seen.add(current);
|
||||||
: undefined;
|
const maybe = current as { code?: string; constraint?: string; constraint_name?: string; cause?: unknown };
|
||||||
return typeof error === "object"
|
const constraint = maybe.constraint ?? maybe.constraint_name;
|
||||||
&& error !== null
|
if (maybe.code === "23505" && constraint === "companies_issue_prefix_idx") {
|
||||||
&& "code" in error
|
return true;
|
||||||
&& (error as { code?: string }).code === "23505"
|
}
|
||||||
&& constraint === "companies_issue_prefix_idx";
|
current = maybe.cause;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function createCompanyWithUniquePrefix(data: typeof companies.$inferInsert) {
|
async function createCompanyWithUniquePrefix(data: typeof companies.$inferInsert) {
|
||||||
|
|||||||
@@ -223,9 +223,14 @@ describe("InstanceSidebar", () => {
|
|||||||
await flushReact();
|
await flushReact();
|
||||||
await findPluginLinks(container, 1);
|
await findPluginLinks(container, 1);
|
||||||
|
|
||||||
const topLevelLinks = Array.from(
|
await vi.waitFor(() => {
|
||||||
container.querySelectorAll<HTMLAnchorElement>('a[href^="/instance/settings/"]'),
|
const links = Array.from(
|
||||||
);
|
container.querySelectorAll<HTMLAnchorElement>('a[href^="/instance/settings/"]'),
|
||||||
|
);
|
||||||
|
expect(links.some((a) => a.getAttribute("href") === "/instance/settings/plugins/linear")).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
const topLevelLinks = Array.from(container.querySelectorAll<HTMLAnchorElement>('a[href^="/instance/settings/"]'));
|
||||||
const hrefs = topLevelLinks.map((a) => a.getAttribute("href"));
|
const hrefs = topLevelLinks.map((a) => a.getAttribute("href"));
|
||||||
|
|
||||||
const pluginsIndex = hrefs.indexOf("/instance/settings/plugins");
|
const pluginsIndex = hrefs.indexOf("/instance/settings/plugins");
|
||||||
@@ -266,6 +271,9 @@ describe("InstanceSidebar", () => {
|
|||||||
queryClient = rendered.queryClient;
|
queryClient = rendered.queryClient;
|
||||||
await flushReact();
|
await flushReact();
|
||||||
|
|
||||||
|
await vi.waitFor(() => {
|
||||||
|
expect(mockPluginsApi.list).toHaveBeenCalled();
|
||||||
|
});
|
||||||
const pluginLinks = Array.from(container.querySelectorAll('a[href^="/instance/settings/plugins/"]'));
|
const pluginLinks = Array.from(container.querySelectorAll('a[href^="/instance/settings/plugins/"]'));
|
||||||
expect(pluginLinks).toHaveLength(0);
|
expect(pluginLinks).toHaveLength(0);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user