mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-24 10:13:11 +02:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work. > - MCP task subscriptions and Dot mailboxes notify external clients when work changes. > - Their delivery workers queried SQL every two seconds, including when no work existed. > - Those queries prevent idle databases from becoming quiet across many hosted instances. > - Existing activity, mailbox, subscription, and delivery records already preserve the work. > - This pull request uses committed-write signals and saved retry deadlines to drive delivery. > - Idle subscriptions become quiet while startup, retry, drain, and shutdown recovery remain supported. ## Linked Issues or Issue Description Related sleep migrations: #15625, #17000, #17008. Searched open PRs and issues for MCP event sleep/polling work; no duplicate found. **What happened?** Each public MCP and Dot event service started a two-second interval. It checked settings, scanned subscriptions, created delivery receipts, cleaned expired records, and attempted delivery even without changes. **Expected behavior** An empty or subscribed-but-idle service produces no recurring SQL or network traffic. Committed events trigger prompt delivery. Only unfinished work retains a retry deadline. **Steps to reproduce** Configure a public MCP origin and start the server. Observe recurring settings queries with MCP disabled, or subscription/queue queries with it enabled. No incoming task changes are required. **Paperclip version or commit** Initially inspected master at `8b4ab65b1c3d863d282752e83307943720a5c85c`; rebased onto `c2daf906d9` after master advanced. The only conflict was overlapping imports in the heartbeat queue; both were preserved. ## What Changed - Register separate MCP and Dot workers with the existing delivery coordinator. Remove both unconditional intervals. - Notify from committed activity, comment, mailbox, subscription, and experimental-settings writes. Centralize comment insertion in one small helper so normal callers do not manage recovery state. - Preserve outer transaction ownership, uncertainty reconciliation, and requests deferred during drain or standby. - Restore delivery retry/abandoned-claim deadlines on startup. Scan subscriptions in pages of 20; drain full source and delivery batches without another external event. Scope subscription refreshes to their subscription or shared Dot binding, issue activity to its task, comment discovery to its company, and mailbox/assignment changes to their binding. Retry deadlines do not rescan unchanged sources. - Run expired-record cleanup opportunistically. Preserve on-use expiry checks and the existing one-time automatic Dot challenge behavior. - Add real PostgreSQL lifecycle coverage and guarded external test database options for existing MCP/Dot integrations. Document producers and the supported writer model. ## Verification - Final head `e54fb34485921016ef988f7df9cca173a9ebdfc8`: all CI checks passed (55 successful checks/statuses, one neutral review, two intentionally skipped Storybook checks). Mergeable with no unresolved review threads. Greptile: 5/5 on this exact commit; security scan passed. - All 284 affected tests passed in one local run after rebasing: 16 real-PostgreSQL lifecycle tests, 24 coordinator/scheduler/standby tests, 84 public MCP tests, 54 Dot runner tests, and 106 interaction-service tests. - Server TypeScript passed after refreshing generated Runner/plugin SDK dependencies from master. Full workspace typecheck and build passed before the rebase; final CI repeated typecheck and build successfully on the rebased head. - Coverage includes SQL/network quiet with configuration and history, committed writes, outer commit/rollback, drain/standby, retry restoration, reenable/unsubscribe, concurrent writes, shutdown, source/delivery/subscription batch boundaries, Dot challenges and reconnects, native broker fences, comment discovery, and company-isolated scans. - CI exposed an existing lock-order test whose insert proxy missed nested transactions and waited indefinitely. The fixture now observes nested inserts, preserves the lock assertion, and fails explicitly if interception is missed. The complete 106-test interaction suite and the formerly hanging CI shard pass. The warm-standby/settings test doubles were also updated for the new coordinator/transaction boundaries. - Earlier fixture failures (required timestamps, cleanup, external database selection, async waits) were corrected. One existing OAuth first-poll timing assertion and one E2E company-cleanup race passed on single reruns; the final full CI run passed without a rerun. No OAuth or company-deletion behavior was changed. - The local full `pnpm test:run` attempt could not initialize embedded PostgreSQL after five attempts. It was stopped; affected integrations were verified with separate disposable PostgreSQL 17 databases, and final CI supplied the full-suite result. Embedded-only local skips are not counted as passes. ## Risks - Notifications use one live server/database scope. Independent SQL writers and separate live replicas do not trigger these process-local workers. Startup recovers durable state; continuous multi-writer discovery needs a notification/ingress contract. - Idle physical cleanup waits for startup or another enabled sweep. Subscription and authorization expiry remain enforced on use. - Existing delivery claims, retry bounds, signatures, and receipt deduplication remain in place. No new tables or migrations. - Host sleep-safety checks remain conservative. MCP/Dot retry deadlines are not yet covered by Paperclip Cloud's scheduled-wake contract. This proves worker quiet, not deployed host suspension or fleet savings. ## Model Used OpenAI Codex (GPT-6), with reasoning, local code execution, and tool use. The runtime does not expose a more specific model version or context-window size. ## 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 searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
326 lines
15 KiB
TypeScript
326 lines
15 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
import type { Db } from "@paperclipai/db";
|
|
import { INSTANCE_FEATURE_CATALOG } from "@paperclipai/shared";
|
|
import {
|
|
applyManagedExperimentalOverlay,
|
|
instanceSettingsService,
|
|
normalizeExperimentalSettings,
|
|
} from "../services/instance-settings.js";
|
|
import { parseManagedConfigEnv } from "../services/managed-config.js";
|
|
import { evaluateExecutionAllowlist } from "../services/execution-allowlist.js";
|
|
|
|
const MANAGED_RAW = JSON.stringify({
|
|
v: 1,
|
|
mode: "cloud",
|
|
catalogVersion: "2026.720.0",
|
|
// enableApps is retained only for compatibility and must be ignored;
|
|
// enableStatusCards remains a live managed feature.
|
|
features: { enableApps: false, enableStatusCards: true },
|
|
plugins: { autoInstall: [] },
|
|
});
|
|
|
|
function managedEnv(raw: string | undefined = MANAGED_RAW) {
|
|
return { PAPERCLIP_MANAGED_CONFIG: raw };
|
|
}
|
|
|
|
/**
|
|
* Minimal stand-in for the drizzle query chains instanceSettingsService uses.
|
|
* Captures every `update().set()` payload so tests can assert what would be
|
|
* persisted.
|
|
*/
|
|
function stubDb(row: Record<string, unknown>) {
|
|
const persistedSets: Array<Record<string, unknown>> = [];
|
|
const db = {
|
|
transaction: (fn: (tx: Db) => Promise<unknown>) => fn(db),
|
|
select: () => ({ from: () => ({ where: () => Promise.resolve([row]) }) }),
|
|
insert: () => {
|
|
throw new Error("unexpected insert in test");
|
|
},
|
|
update: () => ({
|
|
set: (values: Record<string, unknown>) => {
|
|
persistedSets.push(values);
|
|
return { where: () => ({ returning: () => Promise.resolve([{ ...row, ...values }]) }) };
|
|
},
|
|
}),
|
|
} as unknown as Db;
|
|
return { db, persistedSets };
|
|
}
|
|
|
|
function settingsRow(experimental: Record<string, unknown>) {
|
|
return {
|
|
id: "row-1",
|
|
singletonKey: "default",
|
|
defaultEnvironmentId: null,
|
|
general: {},
|
|
experimental,
|
|
createdAt: new Date("2026-06-20T00:00:00.000Z"),
|
|
updatedAt: new Date("2026-06-20T00:00:00.000Z"),
|
|
};
|
|
}
|
|
|
|
describe("applyManagedExperimentalOverlay", () => {
|
|
it("is the identity with no managed config (self-hosted)", () => {
|
|
const experimental = normalizeExperimentalSettings({ enableApps: true });
|
|
const result = applyManagedExperimentalOverlay(experimental, null);
|
|
expect(result.experimental).toEqual(experimental);
|
|
expect(result.managedKeys).toEqual({});
|
|
});
|
|
|
|
it("ignores the retired Apps flag while overlaying live managed values", () => {
|
|
const config = parseManagedConfigEnv(managedEnv())!;
|
|
const stored = normalizeExperimentalSettings({ enableApps: true });
|
|
const { experimental, managedKeys } = applyManagedExperimentalOverlay(stored, config);
|
|
|
|
expect(experimental.enableApps).toBe(true);
|
|
// managed overlay > schema default
|
|
expect(experimental.enableStatusCards).toBe(true);
|
|
// unmanaged keys keep their stored/default values
|
|
expect(experimental.enableCases).toBe(false);
|
|
expect(managedKeys).toEqual({
|
|
enableStatusCards: { managed: true, managedBy: "paperclip-cloud" },
|
|
});
|
|
// input is not mutated
|
|
expect(stored.enableApps).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("instanceSettingsService managed overlay", () => {
|
|
it.each(["team.staging.paperclip.app", "team.paperclip.app", undefined])(
|
|
"enforces every Cloud-enabled flag over old tenant values on %s",
|
|
async (primaryHost) => {
|
|
const features = Object.fromEntries(Object.entries(INSTANCE_FEATURE_CATALOG)
|
|
.filter(([, entry]) => entry.tier === "managed")
|
|
.map(([key]) => [key, true]));
|
|
const stored = Object.fromEntries(Object.keys(features).map((key) => [key, false]));
|
|
const { db, persistedSets } = stubDb(settingsRow(stored));
|
|
const runtimeEnv = {
|
|
PAPERCLIP_PRIMARY_HOST: primaryHost,
|
|
...managedEnv(JSON.stringify({
|
|
v: 1, mode: "cloud", catalogVersion: "test",
|
|
features, plugins: { autoInstall: [] },
|
|
})),
|
|
};
|
|
const service = instanceSettingsService(db, { runtimeEnv });
|
|
expect(await service.getExperimental()).toMatchObject(features);
|
|
expect((await service.get()).experimental).toMatchObject(features);
|
|
expect((await service.getExperimental()).managedKeys).toMatchObject(
|
|
Object.fromEntries(Object.keys(features)
|
|
.filter((key) => key !== "enableApps" && key !== "enableMcpAggregators")
|
|
.map((key) => [key, { managed: true, managedBy: "paperclip-cloud" }])),
|
|
);
|
|
for (const key of Object.keys(features)) {
|
|
await expect(service.updateExperimental({ [key]: false })).rejects.toMatchObject({
|
|
status: 403,
|
|
details: { code: "settings_operator_managed" },
|
|
});
|
|
}
|
|
expect(persistedSets).toHaveLength(0);
|
|
expect(await instanceSettingsService(db, { runtimeEnv }).getExperimental()).toMatchObject(features);
|
|
},
|
|
);
|
|
|
|
it("keeps sandbox policy enforced on staging after a tenant tries to disable it", async () => {
|
|
const row = settingsRow({ enableManagedSandboxOnly: false });
|
|
const { db, persistedSets } = stubDb(row);
|
|
const runtimeEnv = {
|
|
PAPERCLIP_PRIMARY_HOST: "team.staging.paperclip.app",
|
|
...managedEnv(JSON.stringify({
|
|
v: 1, mode: "cloud", catalogVersion: "test",
|
|
features: { enableManagedSandboxOnly: true }, plugins: { autoInstall: [] },
|
|
})),
|
|
};
|
|
const service = instanceSettingsService(db, { runtimeEnv });
|
|
await expect(service.updateExperimental({ enableManagedSandboxOnly: false })).rejects.toMatchObject({ status: 403 });
|
|
expect(persistedSets).toHaveLength(0);
|
|
const restored = await instanceSettingsService(db, { runtimeEnv }).getExperimental();
|
|
for (const experimental of [await service.getExperimental(), restored]) {
|
|
expect(experimental).toMatchObject({
|
|
enableManagedSandboxOnly: true,
|
|
managedKeys: { enableManagedSandboxOnly: { managed: true, managedBy: "paperclip-cloud" } },
|
|
});
|
|
expect(evaluateExecutionAllowlist(
|
|
{ managedSandboxOnly: experimental.enableManagedSandboxOnly },
|
|
{ driver: "local", provider: null },
|
|
)).toMatchObject({ allowed: false, deniedDriver: "local" });
|
|
}
|
|
});
|
|
|
|
it("lets staging override disabled defaults while keeping Cloud-enabled features managed", async () => {
|
|
const row = settingsRow({});
|
|
const { db, persistedSets } = stubDb(row);
|
|
const runtimeEnv = {
|
|
...managedEnv(JSON.stringify({
|
|
v: 1, mode: "cloud", catalogVersion: "test",
|
|
features: { enableStatusCards: true, enableChatConnectors: false, enableNativeRunner: true },
|
|
plugins: { autoInstall: [] },
|
|
})),
|
|
PAPERCLIP_PRIMARY_HOST: "team.staging.paperclip.app",
|
|
};
|
|
const service = instanceSettingsService(db, { runtimeEnv });
|
|
const managedKeys = {
|
|
enableStatusCards: { managed: true, managedBy: "paperclip-cloud" },
|
|
enableNativeRunner: { managed: true, managedBy: "paperclip-cloud" },
|
|
};
|
|
expect(await service.getExperimental()).toMatchObject({
|
|
enableStatusCards: true, enableChatConnectors: false, enableNativeRunner: true, managedKeys,
|
|
});
|
|
expect(persistedSets).toHaveLength(0);
|
|
|
|
for (const enabled of [true, false]) {
|
|
const updated = await service.updateExperimental({ enableChatConnectors: enabled });
|
|
Object.assign(row, persistedSets.at(-1));
|
|
const expected = {
|
|
enableStatusCards: true, enableChatConnectors: enabled, enableNativeRunner: true, managedKeys,
|
|
};
|
|
expect(updated.experimental).toMatchObject(expected);
|
|
const restored = instanceSettingsService(db, { runtimeEnv });
|
|
expect(await restored.getExperimental()).toMatchObject(expected);
|
|
expect((await restored.get()).experimental).toMatchObject(expected);
|
|
expect(row.experimental).not.toHaveProperty("managedKeys");
|
|
expect(row.experimental).not.toHaveProperty("enableStatusCards");
|
|
}
|
|
expect((await service.updateExperimental({ enableNativeRunner: true })).experimental.enableNativeRunner).toBe(true);
|
|
|
|
const changedDefaults = instanceSettingsService(db, { runtimeEnv: {
|
|
...runtimeEnv,
|
|
PAPERCLIP_MANAGED_CONFIG: JSON.stringify({
|
|
v: 1, mode: "cloud", catalogVersion: "test",
|
|
features: { enableStatusCards: false, enableChatConnectors: true, enableNativeRunner: true },
|
|
plugins: { autoInstall: [] },
|
|
}),
|
|
} });
|
|
expect(await changedDefaults.getExperimental()).toMatchObject({
|
|
enableStatusCards: false, enableChatConnectors: true, enableNativeRunner: true,
|
|
});
|
|
|
|
const production = instanceSettingsService(db, { runtimeEnv: { ...runtimeEnv, PAPERCLIP_PRIMARY_HOST: "team.paperclip.app" } });
|
|
expect(await production.getExperimental()).toMatchObject({
|
|
enableChatConnectors: false, enableNativeRunner: true,
|
|
managedKeys: { enableChatConnectors: { managed: true }, enableNativeRunner: { managed: true } },
|
|
});
|
|
});
|
|
|
|
it("preserves Cloud owner access policy on staging", async () => {
|
|
const { db } = stubDb(settingsRow({ enableOwnerInstanceAdmin: false }));
|
|
const service = instanceSettingsService(db, { runtimeEnv: {
|
|
PAPERCLIP_PRIMARY_HOST: "team.staging.paperclip.app",
|
|
...managedEnv(JSON.stringify({
|
|
v: 1, mode: "cloud", catalogVersion: "test",
|
|
features: { enableOwnerInstanceAdmin: true }, plugins: { autoInstall: [] },
|
|
})),
|
|
} });
|
|
expect(await service.getExperimental()).toMatchObject({
|
|
enableOwnerInstanceAdmin: true,
|
|
managedKeys: { enableOwnerInstanceAdmin: { managed: true, managedBy: "paperclip-cloud" } },
|
|
});
|
|
await expect(service.updateExperimental({ enableOwnerInstanceAdmin: false })).rejects.toMatchObject({ status: 403 });
|
|
});
|
|
|
|
it.each([{}, { enableMcpAggregators: false }])("keeps aggregators on with legacy stored and managed values: %j", async (stored) => {
|
|
const { db } = stubDb(settingsRow({ ...stored, enableChatConnectors: true }));
|
|
const service = instanceSettingsService(db, { runtimeEnv: managedEnv(JSON.stringify({
|
|
v: 1, mode: "cloud", catalogVersion: "legacy", features: { enableMcpAggregators: false }, plugins: { autoInstall: [] },
|
|
})) });
|
|
expect(await service.getExperimental()).toMatchObject({ enableMcpAggregators: true, enableChatConnectors: true, managedKeys: {} });
|
|
expect(await service.updateExperimental({ enableMcpAggregators: false })).toMatchObject({ experimental: { enableMcpAggregators: true, enableChatConnectors: true } });
|
|
});
|
|
|
|
it("persists chat connector opt-in and reads it back after service reconstruction", async () => {
|
|
const row = settingsRow({});
|
|
const { db, persistedSets } = stubDb(row);
|
|
const service = instanceSettingsService(db, { runtimeEnv: {} });
|
|
expect((await service.getExperimental()).enableChatConnectors).toBe(false);
|
|
for (const enabled of [true, false]) {
|
|
const updated = await service.updateExperimental({ enableChatConnectors: enabled });
|
|
Object.assign(row, persistedSets.at(-1));
|
|
expect(updated.experimental.enableChatConnectors).toBe(enabled);
|
|
const restored = await instanceSettingsService(db, { runtimeEnv: {} }).getExperimental();
|
|
expect(restored).toMatchObject({ enableApps: true, enableChatConnectors: enabled });
|
|
}
|
|
});
|
|
|
|
it("overlays the managed chat connector gate without changing stored data", async () => {
|
|
const { db, persistedSets } = stubDb(settingsRow({ enableChatConnectors: true }));
|
|
const service = instanceSettingsService(db, { runtimeEnv: managedEnv(JSON.stringify({
|
|
v: 1, mode: "cloud", catalogVersion: "test", features: { enableChatConnectors: false }, plugins: { autoInstall: [] },
|
|
})) });
|
|
expect(await service.getExperimental()).toMatchObject({
|
|
enableChatConnectors: false,
|
|
managedKeys: { enableChatConnectors: { managed: true, managedBy: "paperclip-cloud" } },
|
|
});
|
|
expect(persistedSets).toHaveLength(0);
|
|
});
|
|
it("fails closed at construction on a malformed managed config", () => {
|
|
const { db } = stubDb(settingsRow({}));
|
|
expect(() => instanceSettingsService(db, { runtimeEnv: managedEnv("{bad") })).toThrow(
|
|
/PAPERCLIP_MANAGED_CONFIG is not valid JSON/,
|
|
);
|
|
});
|
|
|
|
it("overlays managed values on getExperimental and exposes managedKeys", async () => {
|
|
const { db } = stubDb(settingsRow({ enableApps: true }));
|
|
const svc = instanceSettingsService(db, { runtimeEnv: managedEnv() });
|
|
|
|
const experimental = await svc.getExperimental();
|
|
expect(experimental.enableApps).toBe(true);
|
|
expect(experimental.enableStatusCards).toBe(true);
|
|
expect(experimental.managedKeys).toEqual({
|
|
enableStatusCards: { managed: true, managedBy: "paperclip-cloud" },
|
|
});
|
|
});
|
|
|
|
it("overlays managed values on get()", async () => {
|
|
const { db } = stubDb(settingsRow({ enableApps: true }));
|
|
const svc = instanceSettingsService(db, { runtimeEnv: managedEnv() });
|
|
|
|
const settings = await svc.get();
|
|
expect(settings.experimental.enableApps).toBe(true);
|
|
expect(settings.experimental.managedKeys?.enableApps).toBeUndefined();
|
|
});
|
|
|
|
it("leaves the self-hosted read path unchanged (no managedKeys field)", async () => {
|
|
const { db } = stubDb(settingsRow({ enableApps: true }));
|
|
const svc = instanceSettingsService(db, { runtimeEnv: {} });
|
|
|
|
const experimental = await svc.getExperimental();
|
|
expect(experimental.enableApps).toBe(true);
|
|
expect(Object.prototype.hasOwnProperty.call(experimental, "managedKeys")).toBe(false);
|
|
expect(experimental).toEqual(normalizeExperimentalSettings({ enableApps: true }));
|
|
|
|
const settings = await svc.get();
|
|
expect(Object.prototype.hasOwnProperty.call(settings.experimental, "managedKeys")).toBe(false);
|
|
});
|
|
|
|
it("never persists the overlay: updates write stored values, responses show managed ones", async () => {
|
|
const { db, persistedSets } = stubDb(settingsRow({ enableApps: true }));
|
|
const svc = instanceSettingsService(db, { runtimeEnv: managedEnv() });
|
|
|
|
const updated = await svc.updateExperimental({ enableCases: true });
|
|
|
|
expect(persistedSets).toHaveLength(1);
|
|
const persisted = persistedSets[0]!.experimental as Record<string, unknown>;
|
|
// The retired compatibility key normalizes on, independent of the
|
|
// managed document's historical value.
|
|
expect(persisted.enableApps).toBe(true);
|
|
// The overlay-added value is not written.
|
|
expect(persisted.enableStatusCards).toBe(false);
|
|
expect(persisted.enableCases).toBe(true);
|
|
expect(persisted).not.toHaveProperty("managedKeys");
|
|
|
|
// The response still reflects the overlay.
|
|
expect(updated.experimental.enableApps).toBe(true);
|
|
expect(updated.experimental.enableStatusCards).toBe(true);
|
|
expect(updated.experimental.managedKeys?.enableApps).toBeUndefined();
|
|
});
|
|
|
|
it("does not let managed metadata leak into self-hosted writes", async () => {
|
|
const { db, persistedSets } = stubDb(settingsRow({}));
|
|
const svc = instanceSettingsService(db, { runtimeEnv: {} });
|
|
|
|
const updated = await svc.updateExperimental({ enableCases: true });
|
|
expect(persistedSets).toHaveLength(1);
|
|
expect(persistedSets[0]!.experimental).not.toHaveProperty("managedKeys");
|
|
expect(Object.prototype.hasOwnProperty.call(updated.experimental, "managedKeys")).toBe(false);
|
|
});
|
|
});
|