mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-08 01:57:31 +01:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work. > - Plugin Runner owners manage a physical task through an environment lease. > - The existing replacement path can assign a new physical task to that same lease. > - A delayed old owner can then stop the replacement or mark it stopped. > - Cleanup must keep the original physical task identity across RPC and database writes. > - This pull request pins that identity and keeps cleanup available to the new owner. ## Linked Issues or Issue Description Refs #19134 and #19157. This fix is based on master and does not enable repeated stopped-source recovery. A search found no duplicate fix. **What happened?** The maintained `createOwnedSandbox` replacement path changes `providerLeaseId` on one lease. An old task owner uses that mutable lease for a later Stop. A stopped-state response already in flight can also update the new task's flags. **Expected behavior** The old owner must address its original task. Its late cleanup writes must not alter the replacement. The replacement's own owner must still stop and complete it. **Steps to reproduce** 1. Create a plugin task owner for a stopped task. 2. Replace that task through the existing describe/startup path on the same lease. 3. Resume an old checkpoint or a held old status response. 4. Observe a Stop for the replacement or an incorrect stopped flag before this fix. ## What Changed - Require each task owner to keep the physical ID returned by its description. Reject a rebind to a different task. - Carry the ID through the existing internal task context after startup ends. Reject a changed physical task before RPC dispatch. - Match the physical task in stopped-state, completion and credential-handoff writes. - Hold the exact lease row through the retained-session database update and local checkpoint save. - Cover the maintained replacement path with real PostgreSQL tests. Preserve positive cleanup for the replacement owner. Document this boundary. ## Verification - Both replacement regressions failed on unmodified master `10a7d039c8`: delayed old-owner Stop targeted the replacement, and a held old status response marked it stopped. - Six focused files passed 160 tests: task authority, task runtime, warm tasks, execution target, credential writeback and task owner. - Four selected executor factory cases passed. They cover task-only providers and the physical task binding after the startup context ends. - Runner TypeScript, plugin SDK and adapter-utils builds passed. Server TypeScript check passed. Diff and added-line secret scans passed. - All 15 setup-probe cases passed with the actual Runner and fake provider binaries. The first local attempt lacked cargo on PATH. A sandboxed native attempt timed out in seven process cases; the unchanged run with loopback permission passed all 15. A separate initial DB integration attempt was denied a loopback listener; its permission-correct run passed. - Review found three missed constructors in the existing SDK/Core lifecycle fixture. They now use the actual describe result. All four cases in that real PostgreSQL and worker RPC file passed. - The first GitHub attempt failed in the unchanged GitHub recovery pagination case in `chat-channels.integration.test.ts`: its zero-request assertion observed a configuration GET. That exact case passed locally without code or assertion changes. The one failed-job-only retry passed; the initial failure log is retained. - [GitHub workflow 42082587576](https://github.com/paperclipai/paperclip/actions/runs/42082587576) passed on its second attempt. All CI checks completed, and Snyk passed. Standard Greptile scored exact head `fb914d98b99e` 5/5 with no unresolved threads. The branch is mergeable and ready for review. ## Risks The task context change is internal. It adds no plugin wire field, schema or Runner mode. A stale owner now gets an error and cannot clean up a replacement. A new owner can still clean up that task. The retained checkpoint write holds one existing lease row during a bounded local file write. Repeated stopped-source incarnation admission, runtime pins and deployments are outside this change. ## Model Used OpenAI GPT-6.1 Sol (`gpt-6.1-sol`), high reasoning. Used repository tools, TypeScript and real PostgreSQL tests. ## 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 described the issue in-PR using the bug template - [x] I have not referenced internal or instance-local Paperclip issues or links - [x] My branch name describes the change - [x] I have run the focused tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation - [x] I have considered and documented risks - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no unresolved findings - [x] I will address reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
146 lines
11 KiB
TypeScript
146 lines
11 KiB
TypeScript
import { randomUUID } from "node:crypto";
|
|
import { mkdtemp, realpath, rm } from "node:fs/promises";
|
|
import { tmpdir } from "node:os";
|
|
import { join } from "node:path";
|
|
import { and, eq, sql } from "drizzle-orm";
|
|
import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
|
|
import { agents, companies, companyMemberships, createDb, environmentLeases, environments, heartbeatRuns, plugins } from "@paperclipai/db";
|
|
import { getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase } from "./helpers/embedded-postgres.js";
|
|
import { aiConnectionService } from "../services/ai-connections.js";
|
|
import { prepareManagedAiRuntime } from "../services/ai-connection-runtime.js";
|
|
import { registerPluginTaskCredentialHandoff, settlePluginTaskCredentialHandoff } from "../services/plugin-task-credential-writeback.js";
|
|
import { executeEnvironmentTask, settleDispatchedEnvironmentTask } from "../services/environment-task-runtime.js";
|
|
import { secretService } from "../services/secrets.js";
|
|
import type { PluginWorkerManager } from "../services/plugin-worker-manager.js";
|
|
|
|
vi.mock("../services/subscription-refresh.js", () => ({ refreshSubscriptionConnection: async () => {} }));
|
|
const support = await getEmbeddedPostgresTestSupport();
|
|
const suite = support.supported ? describe : describe.skip;
|
|
const auth = (token: string, year = 2020) => JSON.stringify({ tokens: { account_id: "fixture-account", access_token: "fixture-access", refresh_token: token }, last_refresh: `${year}-01-01T00:00:00Z` });
|
|
|
|
suite("durable plugin task credential handoff", () => {
|
|
let database: Awaited<ReturnType<typeof startEmbeddedPostgresTestDatabase>>, db: ReturnType<typeof createDb>, home: string;
|
|
beforeAll(async () => {
|
|
home = await realpath(await mkdtemp(join(tmpdir(), "plugin-task-secret-")));
|
|
vi.stubEnv("PAPERCLIP_HOME", home); vi.stubEnv("PAPERCLIP_INSTANCE_ID", "plugin-task-fixture");
|
|
database = await startEmbeddedPostgresTestDatabase("plugin-task-credential-"); db = createDb(database.connectionString);
|
|
}, 90_000);
|
|
afterAll(async () => { await database?.cleanup(); vi.unstubAllEnvs(); if (home) await rm(home, { recursive: true, force: true }); });
|
|
async function fixture(dispatched = true) {
|
|
const companyId = randomUUID(), agentId = randomUUID(), runId = randomUUID(), pluginId = randomUUID(), environmentId = randomUUID(), leaseId = randomUUID();
|
|
const owner = `fixture-${randomUUID()}`;
|
|
await db.insert(companies).values({ id: companyId, name: "Task credential fixture", issuePrefix: `C${companyId.slice(0, 6)}` });
|
|
await db.insert(agents).values({ id: agentId, companyId, name: "Fixture", adapterType: "paperclip_runner" });
|
|
await db.insert(companyMemberships).values({ companyId, principalId: owner, principalType: "user", status: "active", membershipRole: "member" });
|
|
const service = aiConnectionService(db);
|
|
await service.save(companyId, owner, { provider: "openai", method: "subscription", ownership: "personal", name: "Fixture Codex", loginSessionId: "fixture", agentIds: [], allAgents: true }, auth("fixture-original"));
|
|
const [selection] = await service.quotaAccounts(companyId, owner);
|
|
const managed = await prepareManagedAiRuntime(db, { companyId, agentId, responsibleUserId: owner, adapterType: "paperclip_runner",
|
|
binding: { mode: "responsible_user", provider: "openai", method: "subscription" }, config: { provider: "codex" } });
|
|
expect(managed.credentialWriteback).toBeDefined();
|
|
await db.insert(environments).values({ id: environmentId, name: `Fixture ${environmentId}`, driver: "plugin", status: "active", config: { pluginKey: pluginId, driverKey: "tasks", driverConfig: {} } });
|
|
await db.insert(plugins).values({ id: pluginId, pluginKey: pluginId, packageName: "fixture-tasks", version: "1.0.0", status: "ready", manifestJson: {
|
|
capabilities: ["environment.drivers.register"], environmentDrivers: [{ driverKey: "tasks", supportsTasks: true }],
|
|
} as never });
|
|
await db.insert(heartbeatRuns).values({ id: runId, companyId, agentId, invocationSource: "manual", status: "running" });
|
|
await db.insert(environmentLeases).values({ id: leaseId, companyId, environmentId, heartbeatRunId: runId, provider: `plugin:${pluginId}:tasks`, providerLeaseId: "fixture-task", status: "active",
|
|
metadata: { driver: "plugin", pluginId, driverKey: "tasks", runnerTaskLease: true, runnerTaskDispatched: dispatched, runnerTaskExecutionStopped: false } });
|
|
await registerPluginTaskCredentialHandoff(db, { companyId, leaseId }, managed.sessionIdentity, managed.credentialWriteback!);
|
|
// Recovery must not depend on the original controller or its private home.
|
|
await rm(managed.home!, { recursive: true, force: true });
|
|
const calls: string[] = [];
|
|
let failExport = false;
|
|
const workers = { getWorker: () => ({ supportedMethods: ["environmentTask"] }),
|
|
call: async (_plugin: string, _method: string, params: any) => {
|
|
calls.push(params.operation.kind);
|
|
expect(params.companyId).toBe(companyId); expect(params.taskId).toBe("fixture-task");
|
|
if (params.operation.kind === "status") return { kind: "status", taskId: "fixture-task", phase: "cancelled", executionStopped: true };
|
|
if (params.operation.kind === "credentials") {
|
|
expect(params.operation.accountIdentity).toBe(managed.sessionIdentity);
|
|
if (failExport) throw new Error("fixture export unavailable");
|
|
return { kind: "credentials", taskId: "fixture-task", credential: { type: "codex-auth-json", authJson: auth("fixture-refreshed", 2021) } };
|
|
}
|
|
return { kind: "accepted", taskId: "fixture-task" };
|
|
} } as unknown as PluginWorkerManager;
|
|
const lease = () => db.select().from(environmentLeases).where(and(eq(environmentLeases.id, leaseId), eq(environmentLeases.companyId, companyId))).then(rows => rows[0]!);
|
|
return { companyId, agentId, runId, environmentId, leaseId, owner, selection: selection!, managed, workers, calls, lease,
|
|
failExport(value: boolean) { failExport = value; }, credential: () => service.credential(selection!),
|
|
settle: () => settleDispatchedEnvironmentTask(db, workers, { companyId, id: leaseId }) };
|
|
}
|
|
it("persists refreshed credentials before completing a stopped task, after controller files disappear", async () => {
|
|
const f = await fixture();
|
|
expect(await f.settle()).toBe(true);
|
|
expect(await f.credential()).toBe(auth("fixture-refreshed", 2021));
|
|
expect(f.calls.indexOf("credentials")).toBeLessThan(f.calls.indexOf("complete"));
|
|
const saved = await f.lease();
|
|
expect(saved.metadata?.runnerTaskCredentialHandoff).toMatchObject({ state: "complete" });
|
|
expect(JSON.stringify(saved.metadata)).not.toContain("fixture-refreshed");
|
|
expect(JSON.stringify(saved.metadata)).not.toContain(f.managed.home!);
|
|
});
|
|
it("keeps a failed transfer pending and recovers through a fresh cleanup after run and environment deletion", async () => {
|
|
const f = await fixture(); f.failExport(true);
|
|
await expect(f.settle()).rejects.toThrow("termination is unconfirmed");
|
|
expect(f.calls).not.toContain("complete");
|
|
expect((await f.lease()).metadata?.runnerTaskCredentialHandoff).toMatchObject({ state: "pending" });
|
|
expect(await f.credential()).toBe(auth("fixture-original"));
|
|
await db.delete(heartbeatRuns).where(eq(heartbeatRuns.id, f.runId));
|
|
await db.delete(environments).where(eq(environments.id, f.environmentId));
|
|
f.failExport(false);
|
|
expect(await f.settle()).toBe(true);
|
|
expect(await f.credential()).toBe(auth("fixture-refreshed", 2021));
|
|
expect(f.calls.at(-1)).toBe("complete");
|
|
});
|
|
it("retains the Runner credential after a database save failure until a fresh receiver commits", async () => {
|
|
const f = await fixture();
|
|
await db.execute(sql.raw(`create function reject_runner_credential_save() returns trigger language plpgsql as $$ begin
|
|
if new.secret_id = '${f.managed.credentialWriteback!.secretId}'::uuid then raise exception 'fixture receiver save unavailable'; end if; return new; end $$;
|
|
create constraint trigger reject_runner_credential_save after insert on company_secret_versions
|
|
deferrable initially deferred for each row execute function reject_runner_credential_save();`));
|
|
try {
|
|
await expect(f.settle()).rejects.toThrow();
|
|
expect(f.calls).toContain("credentials");
|
|
expect(f.calls).not.toContain("complete");
|
|
expect(await f.credential()).toBe(auth("fixture-original"));
|
|
expect((await f.lease()).metadata?.runnerTaskCredentialHandoff).toMatchObject({ state: "pending" });
|
|
} finally { await db.execute(sql`drop trigger reject_runner_credential_save on company_secret_versions; drop function reject_runner_credential_save()`); }
|
|
const receiver = createDb(database.connectionString);
|
|
expect(await settleDispatchedEnvironmentTask(receiver, f.workers, { companyId: f.companyId, id: f.leaseId })).toBe(true);
|
|
expect(await f.credential()).toBe(auth("fixture-refreshed", 2021));
|
|
expect(f.calls.filter(call => call === "credentials")).toHaveLength(2);
|
|
expect(f.calls.at(-1)).toBe("complete");
|
|
expect((await f.lease()).metadata?.runnerTaskCredentialHandoff).toMatchObject({ state: "complete" });
|
|
});
|
|
it("does not overwrite an explicit account replacement", async () => {
|
|
const f = await fixture();
|
|
await secretService(db).rotate(f.managed.credentialWriteback!.secretId, { value: auth("fixture-reconnected", 2022) }, { userId: f.owner });
|
|
expect(await f.settle()).toBe(true);
|
|
expect(f.calls).not.toContain("credentials");
|
|
expect(await f.credential()).toBe(auth("fixture-reconnected", 2022));
|
|
});
|
|
it("allows concurrent cleanup to complete the same durable handoff", async () => {
|
|
const f = await fixture();
|
|
expect(await Promise.all([f.settle(), f.settle()])).toEqual([true, true]);
|
|
expect(await f.credential()).toBe(auth("fixture-refreshed", 2021));
|
|
expect((await f.lease()).metadata?.runnerTaskCredentialHandoff).toMatchObject({ state: "complete" });
|
|
});
|
|
it("does not mark a replacement task's identical credential handoff complete", async () => {
|
|
const f = await fixture(false), prior = await f.lease();
|
|
await db.update(environmentLeases).set({ providerLeaseId: "replacement-task" }).where(eq(environmentLeases.id, f.leaseId));
|
|
await expect(settlePluginTaskCredentialHandoff(db, { companyId: f.companyId, leaseId: f.leaseId, expectedTaskId: "fixture-task" },
|
|
prior.metadata!, async () => { throw new Error("Undispatched task must not export credentials"); })).rejects.toThrow("handoff changed");
|
|
expect((await f.lease()).metadata?.runnerTaskCredentialHandoff).toMatchObject({ state: "pending" });
|
|
});
|
|
|
|
it("retires an undispatched task without exporting credentials and blocks a late submit", async () => {
|
|
const f = await fixture(false);
|
|
expect(await f.settle()).toBe(false);
|
|
expect(f.calls).toEqual([]);
|
|
expect((await f.lease()).metadata?.runnerTaskCredentialHandoff).toMatchObject({ state: "complete" });
|
|
await expect(executeEnvironmentTask(db, f.workers, { companyId: f.companyId, leaseId: f.leaseId, operation: {
|
|
kind: "submit", projectIds: [], bootstrapTicket: "fixture-ticket", runner: { harness: "codex", protocolMin: 1, protocolMax: 3,
|
|
runnerId: "runner", leaseId: f.leaseId, runId: f.runId, sessionId: "session", turnId: "turn", itemId: "item" },
|
|
} })).rejects.toThrow("not active");
|
|
expect(f.calls).toEqual([]);
|
|
});
|
|
});
|