mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-02 16:58:52 +01:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work. > - Agents use installed skills and exact version pins during execution. > - Managed skills still depended on mutable directories on the web server. > - A replacement server could lose acknowledged edits or remove an unassigned skill whose directory was absent. > - This pull request makes immutable versions the authority for managed content and installed repository reads. > - The server can rebuild delivery files from durable content after replacement. > - This establishes skills readiness for ephemeral web servers. General server draining and workspace recovery remain separate work. ## Linked Issues or Issue Description **Subsystem affected** Skills services, shared contracts, database receipts, Skill Studio, and runtime delivery. **Problem or motivation** A fresh web server must discover, read, edit, and deliver protected installed skills using the same database, object storage, secrets, and supported application artifacts. It must not need its predecessor's files or process memory. **Proposed solution** Use `managed` ownership with a null source locator. Read installed content by immutable version. Prepare packages before a short publication transaction. Persist execution selections before materialization. Recover exact pinned runtime assets and reject deletion while active or recovering pins exist. **Alternatives considered** Reconstructing a mutable installed directory preserves the old source-of-truth ambiguity. Permanent dual writes create two competing authorities. This change uses one managed model after a bounded legacy conversion. **Roadmap alignment** This improves the existing Skills Manager, Studio, version history, and Cloud execution capabilities. The maintainer supplied the implementation contract. This does not add a separate skills product or deploy fleet changes. Related work: #18082 supplies immutable package storage. #17273 addresses edits outside the API for linked local skills; this PR keeps that source category separate. #2648 is a closed earlier ephemeral-filesystem proposal. ## What Changed - Add managed ownership and focused content publication and execution materialization modules. Keep the archive format and package storage tables. - Publish managed create, save, delete, fork, rename, restore, and catalog content with version checks. Add durable create receipts. Preserve file-save receipt responses. - Return file version identities. Keep Studio drafts after a conflict and provide an explicit reload action. A delayed reload cannot overwrite newer typing or navigation. - Persist exact runtime selections, including empty selections. Rebuild pinned assets and verify their admitted digests on a replacement server. - Preserve source access on forks and disconnected copies. Keep the existing workspace policy category for managed skills. - Add bounded conversion, eligibility, and independent verification phases. Load persisted Cloud configuration in the standalone CLI without seeding or changing it. Reject partial current versions against installed inventories; recover only complete saved content or the exact source. Document storage migration blockers and the compatible rollback floor. - Add separate-process PostgreSQL/S3 qualification and update domain, retention, policy, and UI regressions. - Pass the plugin worker manager into Studio execution, admit restricted `skill_test` mode through native Runner contracts, and preserve admitted scope across native and REST tools. Native tests cannot create ordinary tasks, browse company data, or use external tools. - Select the exact durable Studio revision even when unassigned or Beta skills is off. Persist Studio output and audit atomically with native task completion, preserving the result on replay. ## Verification - Final revision `13e8af480b88ba6fea5737bac4bd81104d604792` passed full CI: all 49 workflow jobs completed successfully ([run 41127396098](https://github.com/paperclipai/paperclip/actions/runs/41127396098)). This includes typecheck, test suites, Runner checks, browser checks and build. Greptile review 15 is 5/5 on that same revision, with zero unresolved threads. The PR is ready for review. - Local workspace typecheck and build passed after integrating master. Focused checks passed: 33 execution/completion cases, 52 Runner HTTP cases, 16 managed-content cases, 17 Studio cases, the new real-process CLI regression, map checks and UI token gates. The CLI regression proves inspection does not seed missing Cloud configuration. Server typecheck passed after that fix. - The independent-process PostgreSQL/S3 matrix passed through normal HTTP skill routes. It covers A → B → C replacement, lost commit responses, upload crashes, concurrent saves, binary contents and executable delivery. Metadata listing and warm selected delivery retain zero object downloads. Local timing measurements are recorded; they do not establish hosted latency. - Hosted A → B → C passed on the owned disposable test tenant with external Postgres, S3 and a real remote Paperclip Computer. Predecessor temporary homes were absent. C read and executed B's acknowledged managed save. New runs used repository v1 while v2 was installed. Hashes matched an independently checked exact upstream commit. - Compatible image rollback to `6518b323` passed. Studio retained the unassigned fork's C save. A fresh remote run executed the newer managed content and historical repository pin. The actual shell event confirmed expected hashes, stdout, exit 0 and mode 0555. - Runtime candidate `9200e3fcb4` deployed successfully ([Cloud run 41124147876](https://github.com/paperclipai/paperclip-cloud/actions/runs/41124147876)). The final Studio test delivered only the unassigned fork's exact v3, executed its script and persisted a successful output snapshot. Independent command-event inspection confirmed all three hashes, stdout, exit 0 and mode 0555. All 14 installations were version-backed. Independent verification checked all 25 versions: 23 remote objects, two bundled database snapshots, zero blockers. - The deployed image is `9200e3fcb4`. Later master integration, the client-only delayed-reload draft guard and the CLI bootstrap have separate automated proof. The CLI bootstrap was also exercised against the tenant's stored configuration and storage through the same read-only services. This PR does not claim that the deployed image is the final PR revision. - Live Studio checks exposed worker wiring, admission, access scope, exact selection and completion-publication gaps. They are fixed. Failed attempts remain in the evidence. The full local suite exceeded 80 minutes under host contention and was stopped. Later combined/isolated local attempts also timed out; they are not counted as passes. Full CI covers the integrated suites. Earlier CI found an obsolete restart-scope fixture, which was corrected and passed all 52 HTTP cases. - Reproduction and migration: [`doc/skill-ephemeral-web-servers.md`](doc/skill-ephemeral-web-servers.md). Source revisions, deployments, versions, run IDs, hashes and failure history: [`doc/plans/2026-10-30-ephemeral-web-skills.md`](doc/plans/2026-10-30-ephemeral-web-skills.md). ## Risks - Legacy conversion requires stopped admission and retired filesystem-authoritative writers. Pre-conversion binaries are not supported rollback targets afterward. - Cloud readiness requires remote object storage. Local provider receipts and provider mismatches remain blockers until objects are copied and verified. - Linked local sources retain filesystem semantics and are outside the cloud guarantee. - Cold reads still fetch the existing archive format. Warm runtime preparation retains the verified-cache path. - Bundled reconciliation preserves an installed head. Existing release snapshots remain selectable. An older server must not replace a newer head with its shipped files. - No production volumes, fleet defaults, or general deployment coordination change in this PR. ## Model Used OpenAI Codex, GPT-6 family, with reasoning, repository tools, code execution, and browser use. The exact backend model ID and context-window size are not exposed in this session. No subagents were used. ## 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>
211 lines
11 KiB
TypeScript
211 lines
11 KiB
TypeScript
import { skillPackageStore, skillVersionMetadataColumns } from "./skill-package-store.js";
|
|
import { AsyncLocalStorage } from "node:async_hooks";
|
|
import { randomUUID } from "node:crypto";
|
|
import { constants, promises as fs } from "node:fs";
|
|
import path from "node:path";
|
|
import { and, eq, sql } from "drizzle-orm";
|
|
import { companySkillVersions, heartbeatRuns,
|
|
nativeRunFinalizations, environmentLeases, withDedicatedDbConnection, type Db } from "@paperclipai/db";
|
|
import { resolvePaperclipInstanceRoot } from "../home-paths.js";
|
|
import { assertSkillSnapshotPath } from "./skill-snapshot.js";
|
|
import { repositorySkillFrontmatter } from "./skill-repository-package.js";
|
|
import type { CompanySkillVersionFileInventoryEntry } from "@paperclipai/shared";
|
|
import { noteSkillVersionCacheChange } from "./skill-version-retention-notifications.js";
|
|
import { parseNativeExecutionInput } from "../vendor/paperclip-runner/index.js";
|
|
import { beginRunPhase } from "./execution-preparation-timing.js";
|
|
|
|
export const SKILL_VERSION_CACHE_IDLE_MS = 60 * 60 * 1000;
|
|
const locks = new AsyncLocalStorage<Array<{ db: Db; companyId: string }>>();
|
|
const uuid = /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i;
|
|
export class SkillCacheBusy extends Error {}
|
|
/** Hold through publication AND durable run pinning, not just file creation. */
|
|
export async function withSkillVersionCacheLock<T>(db: Db, companyId: string, action: () => Promise<T>, tryOnly = false): Promise<T> {
|
|
const held = locks.getStore() ?? [];
|
|
if (held.some(lock => lock.db === db && lock.companyId === companyId)) return action();
|
|
// Preparation uses the ordinary pool for version/pin writes. Borrowing a pool
|
|
// connection for this lock would deadlock installations with a one-slot pool.
|
|
const acquired = beginRunPhase("skills.cache.acquire");
|
|
return withDedicatedDbConnection(db, connection => connection.transaction(async tx => {
|
|
const key = `skill_version_cache:${companyId}`;
|
|
if (tryOnly) {
|
|
const rows = await tx.execute<{ acquired: boolean }>(sql`select pg_try_advisory_xact_lock(hashtextextended(${key}, 0)) as acquired`);
|
|
if (!rows[0]?.acquired) throw new SkillCacheBusy();
|
|
} else await tx.execute(sql`select pg_advisory_xact_lock(hashtextextended(${key}, 0))`);
|
|
acquired();
|
|
return locks.run([...held, { db, companyId }], action);
|
|
})).catch(error => {
|
|
acquired(true);
|
|
throw error;
|
|
});
|
|
}
|
|
|
|
export function skillVersionCachePaths(companyId: string, skillId: string, versionId: string) {
|
|
if (![companyId, skillId, versionId].every(value => uuid.test(value))) throw new Error("Invalid skill cache identity");
|
|
const root = path.join(resolvePaperclipInstanceRoot(), "skills", companyId);
|
|
return {
|
|
root,
|
|
directory: path.join(root, "__versions__", skillId, versionId),
|
|
access: path.join(root, "__version_access__", skillId, `${versionId}.json`),
|
|
};
|
|
}
|
|
|
|
/** Never traverse a symlink below the configured instance root. */
|
|
export async function ensureSkillCacheDirectory(directory: string, create = false) {
|
|
const root = path.resolve(resolvePaperclipInstanceRoot());
|
|
const relative = path.relative(root, directory);
|
|
if (!relative || relative.startsWith("..") || path.isAbsolute(relative)) throw new Error("Skill cache escaped instance root");
|
|
if (create) await fs.mkdir(root, { recursive: true });
|
|
let cursor = root;
|
|
for (const part of relative.split(path.sep)) {
|
|
cursor = path.join(cursor, part);
|
|
if (create) await fs.mkdir(cursor).catch((error: NodeJS.ErrnoException) => {
|
|
if (error.code !== "EEXIST") throw error;
|
|
});
|
|
const stat = await fs.lstat(cursor);
|
|
if (!stat.isDirectory() || stat.isSymbolicLink()) throw new Error("Unsafe skill cache directory");
|
|
}
|
|
}
|
|
|
|
export async function touchSkillVersionCache(companyId: string, skillId: string, versionId: string, now = Date.now()) {
|
|
const { access, directory } = skillVersionCachePaths(companyId, skillId, versionId);
|
|
await ensureSkillCacheDirectory(path.dirname(access), true);
|
|
const temporary = `${access}.${randomUUID()}.tmp`;
|
|
try {
|
|
await fs.writeFile(temporary, JSON.stringify({ version: 1, lastUsedAt: now }), { flag: "wx", mode: 0o600 });
|
|
await fs.rename(temporary, access);
|
|
noteSkillVersionCacheChange(directory, { source: "access", occurredAt: now });
|
|
} finally { await fs.rm(temporary, { force: true }); }
|
|
}
|
|
|
|
export async function lastUsedAt(filename: string): Promise<number | null> {
|
|
try {
|
|
await ensureSkillCacheDirectory(path.dirname(filename));
|
|
const file = await fs.open(filename, constants.O_RDONLY | constants.O_NOFOLLOW);
|
|
try {
|
|
const stat = await file.stat();
|
|
if (!stat.isFile() || stat.size > 256) return null;
|
|
const value = JSON.parse(await file.readFile("utf8"));
|
|
return value.version === 1 && Number.isSafeInteger(value.lastUsedAt) && value.lastUsedAt > 0 ? value.lastUsedAt : null;
|
|
} finally { await file.close(); }
|
|
} catch (error) {
|
|
if (error instanceof SyntaxError || ["ENOENT", "ELOOP"].includes((error as NodeJS.ErrnoException).code ?? "")) return null;
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
export function skillRunNeedsFilesSql() {
|
|
return sql`(
|
|
${heartbeatRuns.status} not in ('succeeded', 'failed', 'timed_out', 'cancelled', 'interrupted')
|
|
or ${heartbeatRuns.finishedAt} is null
|
|
or ${heartbeatRuns.controllerLeaseExpiresAt} > now()
|
|
or exists (select 1 from ${nativeRunFinalizations} f
|
|
where f.company_id = ${heartbeatRuns.companyId} and f.run_id = ${heartbeatRuns.id}
|
|
and (f.phase <> 'committed' or f.lease_owner is not null or f.recovery_state is not null))
|
|
or exists (select 1 from ${environmentLeases} l
|
|
where l.company_id = ${heartbeatRuns.companyId} and l.heartbeat_run_id = ${heartbeatRuns.id}
|
|
and (l.status = 'pending_cleanup' or l.cleanup_status = 'failed'
|
|
or l.metadata ? 'nativeWorkspaceExportResume'
|
|
or (l.released_at is null and not coalesce(l.status = 'retained'
|
|
and l.lease_policy = 'reuse_by_environment' and l.cleanup_status = 'success', false))))
|
|
)`;
|
|
}
|
|
|
|
// A terminal run can still own provider execution or recovery. Only fully settled
|
|
// runs release their pins; resume preparation reacquires the same cache lock.
|
|
export async function protectedVersions(db: Db, companyId: string): Promise<{ versions: Set<string> | null; leaseDeadlines: Map<string, number> }> {
|
|
const rows = await db.select({
|
|
id: heartbeatRuns.id, agentId: heartbeatRuns.agentId, nativeIssueId: heartbeatRuns.nativeIssueId,
|
|
leaseDeadline: sql<number | null>`case when ${heartbeatRuns.status} in ('succeeded', 'failed', 'timed_out', 'cancelled', 'interrupted')
|
|
and ${heartbeatRuns.finishedAt} is not null and ${heartbeatRuns.controllerLeaseExpiresAt} > now()
|
|
then extract(epoch from ${heartbeatRuns.controllerLeaseExpiresAt}) * 1000 end`,
|
|
pins: sql<unknown>`${heartbeatRuns.contextSnapshot}->'skillVersions'`,
|
|
// Avoid loading large execution inputs for runs with the modern pin map.
|
|
legacyInput: sql<unknown>`case when ${heartbeatRuns.runtimeMode} = 'native'
|
|
and not coalesce(${heartbeatRuns.contextSnapshot} ? 'skillVersions', false)
|
|
then ${heartbeatRuns.runnerProfileJson}->'nativeExecutionInput' end`,
|
|
})
|
|
.from(heartbeatRuns).where(and(eq(heartbeatRuns.companyId, companyId), skillRunNeedsFilesSql()));
|
|
const versions = new Set<string>();
|
|
const leaseDeadlines = new Map<string, number>();
|
|
const unknown = () => ({ versions: null, leaseDeadlines });
|
|
for (const { pins, legacyInput, id, agentId, nativeIssueId, leaseDeadline } of rows) {
|
|
const add = (version: string) => {
|
|
versions.add(version);
|
|
if (leaseDeadline !== null) leaseDeadlines.set(version, Math.min(leaseDeadlines.get(version) ?? Infinity, Number(leaseDeadline)));
|
|
};
|
|
if (legacyInput != null) {
|
|
// Older native runs captured the complete selection in their immutable
|
|
// execution input before contextSnapshot.skillVersions was introduced.
|
|
// Use the recovery parser (including digest validation) and the exact run
|
|
// binding. Never repair a malformed modern pin map with a different source.
|
|
try {
|
|
const input = parseNativeExecutionInput(legacyInput);
|
|
if (!("runtimeContext" in input) || input.binding.companyId !== companyId
|
|
|| input.binding.runId !== id || input.binding.agentId !== agentId
|
|
|| input.binding.issueId !== nativeIssueId) return unknown();
|
|
for (const skill of input.runtimeContext.skills) {
|
|
if (skill.versionId === null) return unknown();
|
|
if (!uuid.test(skill.versionId)) return unknown();
|
|
add(skill.versionId);
|
|
}
|
|
continue;
|
|
} catch { return unknown(); }
|
|
}
|
|
// Legacy/incomplete preparation is not proof that no skill is in use.
|
|
if (!pins || typeof pins !== "object" || Array.isArray(pins)) return unknown();
|
|
for (const version of Object.values(pins)) {
|
|
if (typeof version !== "string" || !uuid.test(version)) return unknown();
|
|
add(version);
|
|
}
|
|
}
|
|
return { versions, leaseDeadlines };
|
|
}
|
|
|
|
function validateInventory(inventory: CompanySkillVersionFileInventoryEntry[]) {
|
|
const seen = new Set<string>();
|
|
for (const file of inventory) {
|
|
assertSkillSnapshotPath(file.path);
|
|
if (seen.has(file.path) || typeof file.content !== "string") return false;
|
|
seen.add(file.path);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
export async function hasRestorableSnapshot(db: Db, companyId: string, versionId: string) {
|
|
const [version] = await db.select(skillVersionMetadataColumns).from(companySkillVersions).where(and(
|
|
eq(companySkillVersions.companyId, companyId), eq(companySkillVersions.id, versionId)));
|
|
if (!version) return false;
|
|
const packageId = version.repositorySnapshotId ?? version.packageSnapshotId;
|
|
const store = skillPackageStore(db);
|
|
if (packageId) {
|
|
if (version.repositorySnapshotId && !version.repositorySkillPath) return false;
|
|
const manifest = await store.manifest(companyId, packageId);
|
|
const entrypoint = version.repositorySkillPath ?? version.packageFileMap?.find(file => file.path === "SKILL.md")?.sourcePath ?? "SKILL.md";
|
|
const entry = manifest.files.find(file => file.path === entrypoint);
|
|
if (!entry) return false;
|
|
// Git packages intentionally permit byte eviction. Their immutable recipe,
|
|
// not a network probe during cleanup, is the restoration contract.
|
|
if ((await store.descriptor(companyId, packageId)).restorable) return true;
|
|
if (version.repositorySnapshotId && entry.encoding === "base64") return false;
|
|
// Validate original frontmatter inside the same isolated storage verification,
|
|
// outside the preparation lock and without rebuilding the shared cache.
|
|
return store.verifyDurable(companyId, packageId, undefined, version.repositorySnapshotId
|
|
? async root => Boolean(repositorySkillFrontmatter(await fs.readFile(path.join(root, entrypoint), "utf8"))) : undefined);
|
|
}
|
|
const files = await store.versionFiles(version);
|
|
return validateInventory(files) && files.some(file => file.path === "SKILL.md");
|
|
}
|
|
|
|
// Counts allocated bytes without following links, matching what df can reclaim.
|
|
export async function allocatedBytes(directory: string, shouldContinue: () => boolean = () => true): Promise<number> {
|
|
if (!shouldContinue()) throw new Error("Skill cache scan stopped");
|
|
const stat = await fs.lstat(directory);
|
|
if (stat.isSymbolicLink() || (!stat.isDirectory() && !stat.isFile())) throw new Error("Unsafe skill cache entry");
|
|
let bytes = stat.blocks * 512;
|
|
if (stat.isDirectory()) {
|
|
for (const entry of await fs.readdir(directory)) bytes += await allocatedBytes(path.join(directory, entry), shouldContinue);
|
|
}
|
|
return bytes;
|
|
}
|
|
|