mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-25 02:26:12 +02:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work. > - Cloud sets managed feature values for each tenant stack. > - Staging lets admins change experimental features. > - The staging exception also let old tenant false values override Cloud true values. > - This could disable required features such as isolated workspaces. > - This pull request keeps every Cloud-enabled feature on and rejects attempts to disable it. > - The same rule applies to staging, production, and managed stacks without a hostname. ## Linked Issues or Issue Description Refs: #16876 **What happened?** The staging override added in #16876 treats managed true values as editable defaults. A stored tenant false value can disable a feature that Cloud enables. Settings writes also accept attempts to disable Cloud-enabled features. **Expected behavior** If Cloud sets a feature to true, the tenant reads true and cannot turn it off. This applies to every managed stack. Staging can still change allowed experiments that Cloud has not enabled. **Steps to reproduce** 1. Set a managed staging primary hostname and enable isolated workspaces in `PAPERCLIP_MANAGED_CONFIG`. 2. Start with `enableIsolatedWorkspaces: false` in the tenant settings row. 3. Read `/api/instance/settings/experimental`. Before this fix, staging returns false. 4. Try to PATCH that flag to false. After this fix, the API returns 403 without saving, and reads return true with managed control metadata. **Paperclip version or commit** Reproduced against master at `cde944ed75648adfb569e86133adc8b118b55dd6`. ## What Changed - Keep managed true values in the staging read overlay. They override old tenant values and lock the existing UI controls. - Reject attempts to set any Cloud-enabled feature to false before writing settings. - Cover every managed feature in service tests across staging, production, and an absent hostname. Add real-service HTTP tests for isolation on staging and production. - Update operator documentation and the feature and access maps. ## Verification - Confirmed the new service regression fails before the fix: staging returns stored false, and writes can attempt to disable enabled flags. - Passed all six focused settings suites: 168 tests. Passed the final route and overlay suites after adding the HTTP regression: 109 tests. - Passed existing experimental settings UI tests: 54 tests. These cover the existing managed-control behavior. - Passed `node scripts/check-maps.mjs` and `git diff --check`. - Passed `pnpm -r typecheck` and `pnpm build`. The first typecheck used an install that did not honor locked versions and hit an unrelated `@pierre/diffs` API mismatch. Reinstalling from the lockfile resolved it; no lockfile changes are included. - Full CI passed on `f43136812a92ec838a24f0c423270e4fbd997c28`: 55 successful checks, one neutral review check, and two expected skips. This includes typecheck, build, general and serialized tests, runner checks, and E2E shards. [CI run](https://github.com/paperclipai/paperclip/actions/runs/39411907756). - The duplicate local `pnpm test:run` was stopped after the complete CI matrix passed. It is not counted as a completed local full-suite pass. - Greptile reviewed `f43136812a92ec838a24f0c423270e4fbd997c28`: 5/5 with no outstanding findings. The only finding on the first review was the repository rule against new code comments; those comments were removed. ## Risks - Staging users can no longer disable a feature that Cloud enables. This is the intended behavior. - Clients that send a stale full settings form containing false for a Cloud-enabled feature receive 403 and must reload. - No database migration is needed. Stored false values remain in the database, but cannot override an active Cloud true value. - Cloud-disabled staging experiments remain editable. Production restrictions and self-hosted settings remain unchanged. ## Model Used - OpenAI Codex, `gpt-6.1-sol`, with reasoning, repository tools, and test execution. The context window size is not exposed in this session. ## 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>
325 lines
15 KiB
TypeScript
325 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 = {
|
|
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);
|
|
});
|
|
});
|