mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-21 10:52:06 +01:00
## Thinking Path > - Paperclip manages agent work and preserves its execution state. > - A server replacement must retain every workspace that depends on the old server disk. > - Runner task environments can own their workspace outside the Core server. > - These environments save an adapter-managed workspace with a runnerTaskWorkspaceOwner binding. > - Readiness and maintenance treated that provider path as a Core filesystem dependency. > - This change validates the saved owner and shares that classification between both paths. > - Local, malformed, and foreign workspace bindings still block enrollment. ## Linked Issues or Issue Description Related enrollment safeguards: #18835. A GitHub search found no duplicate fix for this provider-owned class. **What happened?** Volume-free readiness returned workspaces_require_migration for an adapter-managed Runner workspace owned by a plugin task environment. Maintenance also selected it and failed with workspace_provider_unsupported. The provider owned the path, which did not exist on the Core server. **Expected behavior** A valid provider-owned workspace does not require migration from the Core server disk. Ordinary local workspaces and invalid ownership bindings remain blockers. **Steps to reproduce** 1. Run a paperclip_runner agent in a plugin task environment. 2. Retain its adapter-managed workspace and complete runnerTaskWorkspaceOwner binding. 3. Read startup eligibility for volume-free enrollment. 4. Observe the workspace blocker before this fix. 5. Run workspace maintenance and observe workspace_provider_unsupported for the same row. **Paperclip version or commit** Reproduced on353945c86d. The regression also fails on the branch basea3b34a9d88. **Deployment mode** Docker with external PostgreSQL. Local regression coverage uses disposable PostgreSQL. ## What Changed - Share one metadata predicate between startup eligibility and offline workspace migration selection. - Validate a complete saved owner against a same-company paperclip_runner agent and a plugin environment with matching nonempty keys. Per-run environment overrides remain supported. - Keep ordinary local workspaces and invalid ownership bindings in the migration set. - Add real PostgreSQL coverage for provider-owned readiness, zero-import maintenance selection, unchanged retained rows, and local/foreign/malformed ownership controls. ## Verification - Readiness RED: the provider-owned fixture failed with workspaces_require_migration on unchanged source. - Maintenance RED: the provider-owned fixture failed with workspace_provider_unsupported before the shared selector was applied. - GREEN: 29 selected tests passed across three files. This covers 8 eligibility/configuration tests and 21 migration/offline-admission cases, including eleven invalid/local owner controls inside the eligibility test. The affected migration file has 207 cases; broad coverage remains with required CI. - Commands: `pnpm exec vitest run server/src/__tests__/ephemeral-server-data.test.ts server/src/__tests__/ephemeral-server-contract.test.ts` plus focused selections in `server/src/services/remote-workspace-migration.test.ts` for provider ownership, offline admission, local imports, interrupted-batch resume, and unresolved workspace semantics. - Server layered typecheck passed after the final source change. - Final head `2fb98dbc664da14e6f60d812e1e10877b2b7f00a`: [required CI](https://github.com/paperclipai/paperclip/actions/runs/42920262773) completed with 55 successful checks, 1 neutral review, and 4 intended skips. Greptile and Paperclip Review both rated this head 5/5. No unresolved review threads remain. - No hosted data migration or metadata rewrite was performed. ## Risks - This changes a readiness classification. Incomplete, foreign, non-Runner, or mismatched environment bindings remain conservative blockers. - The check validates saved ownership through current database bindings. It does not inspect provider files or grant execution authority. - Existing saved rows retain their shape. No migration or archive format changes are required. ## Model Used OpenAI Codex, GPT-6 family, with reasoning, repository tools, code editing, and real PostgreSQL tests. The host does not expose the exact model ID 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>
28 lines
1.7 KiB
TypeScript
28 lines
1.7 KiB
TypeScript
import { and, eq, isNotNull, notExists, sql } from "drizzle-orm";
|
|
import { agents, environments, executionWorkspaces, type Db } from "@paperclipai/db";
|
|
|
|
export function localWorkspaceDependencyWhere(db: Pick<Db, "select">) {
|
|
const taskOwner = sql`${executionWorkspaces.metadata}->'runnerTaskWorkspaceOwner'`;
|
|
const pluginTaskWorkspace = db.select({ id: agents.id }).from(agents).innerJoin(environments,
|
|
sql`${environments.id}::text = ${taskOwner}->>'environmentId'`).where(and(
|
|
eq(executionWorkspaces.providerType, "adapter_managed"),
|
|
eq(agents.companyId, executionWorkspaces.companyId), eq(agents.adapterType, "paperclip_runner"),
|
|
sql`${agents.id}::text = ${taskOwner}->>'agentId'`, eq(environments.driver, "plugin"),
|
|
sql`jsonb_typeof(${taskOwner}) = 'object'`,
|
|
sql`jsonb_typeof(${taskOwner}->'agentId') = 'string'`,
|
|
sql`jsonb_typeof(${taskOwner}->'environmentId') = 'string'`,
|
|
sql`jsonb_typeof(${taskOwner}->'pluginKey') = 'string'`,
|
|
sql`jsonb_typeof(${taskOwner}->'driverKey') = 'string'`,
|
|
sql`jsonb_typeof(${environments.config}->'pluginKey') = 'string'`,
|
|
sql`jsonb_typeof(${environments.config}->'driverKey') = 'string'`,
|
|
sql`btrim(${taskOwner}->>'pluginKey') <> ''`, sql`btrim(${taskOwner}->>'driverKey') <> ''`,
|
|
sql`${environments.config}->>'pluginKey' = ${taskOwner}->>'pluginKey'`,
|
|
sql`${environments.config}->>'driverKey' = ${taskOwner}->>'driverKey'`,
|
|
));
|
|
return and(
|
|
isNotNull(executionWorkspaces.cwd), sql`${executionWorkspaces.providerType} <> 'plugin'`,
|
|
sql`coalesce(${executionWorkspaces.metadata}->'remoteWorkspace'->>'schema', '') <> 'paperclip.remote-workspace.v1'`,
|
|
notExists(pluginTaskWorkspace),
|
|
);
|
|
}
|