mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-23 00:53:38 +02:00
Deliver durable resource lifecycle events to plugins without polling (#16203)
## Thinking Path > - Paperclip manages AI agents and their work. > - Plugins keep external resources aligned with Paperclip projects and agents. > - The durable resource journal stores changes, but its plugin interface requires polling. > - Project deletion has no journal entry, so consumers must scan for missing projects. > - This PR delivers committed journal events through a native plugin callback and records deletion. > - Plugins can recover unfinished work without periodic change scans. ## Linked Issues or Issue Description Related: #15343 introduced the durable inbox. #15631 added required agent lifecycle participation. This change keeps both contracts and adds automatic delivery for the resource inbox. **What happened?** Plugins must schedule reads of the durable inbox. A deleted project has no durable deletion event. Consumers must scan saved bindings to detect its removal. **Expected behavior** Core should deliver committed resource events and replay unfinished work. Empty queues should have no polling timer. Project removal should leave a durable event. **Steps to reproduce** 1. Install a plugin that consumes project lifecycle events. 2. Create or update a project. The plugin must call `listLifecycle` to discover it. 3. Delete the project. The journal has no deletion entry. ## What Changed - Add `resourceLifecycle` to the manifest and `onResourceLifecycle` to the SDK. Require `events.subscribe` and a configured, enabled company scope. - Reuse transaction-aware work signals and the delivery coordinator. Wake after commit, on startup and plugin activation, and after configuration changes. - Acknowledge only a matching successful result. Retry unfinished or interrupted work. Retain deferred events without an idle retry timer. - Wake again after successful worker configuration application, and retain failed scans through idle drain (both Apex findings fixed). - Keep ordering per resource and deliver past failed or deferred resources. Keep the manual inbox methods for existing consumers. - Record project deletion in the removal transaction. Extend the journal constraint with a generated migration. ## Verification - Apex follow-up: 129 focused worker, delivery, coordinator, and application tests passed; server typecheck passed. Regression coverage verifies configuration-application races and failed scans across idle drain. - Focused lifecycle, transaction coordinator, manifest, and SDK dispatch suites: 105 tests passed, including single-connection saves, redacted failure diagnostics, wakeups retained during idle drain, and per-event retry deadlines. - Complete SDK suite plus delivery database tests: 128 tests passed. - Shared, database, and SDK typechecks passed. Direct server `tsc --noEmit` passed against rebuilt SDK declarations. - Full local `pnpm test:run` finished with 19,491 passed, 148 skipped, and 6 failed tests across 5 files (plus two suite setup errors). This run overlapped branch updates and is not final-head evidence: failures included missing Cargo, local Git default-branch assumptions, and stale in-process lifecycle modules. Final Apex-fix commit `75d028788` passed all CI gates, including the full test shards, and received Apex 5/5 with no unresolved comments. - `pnpm -r typecheck` and `pnpm build` were attempted. Both stopped because Cargo is unavailable locally. CI supplies the Rust toolchain. - Local installation used the repository's documented lockfile fallback because master has dependencies missing from its lockfile. No dependency changes are included here. ## Risks - Delivery is at least once. Plugins must re-read current state and make external effects idempotent. - Signals are process-local, like the other delivery queues. Startup recovers committed rows. Independent database writers or multiple active server processes require an explicit ownership and wake protocol. - Apply migration `0340_open_warlock.sql` before running code that records project deletion. Earlier deletions cannot be reconstructed. - Automatic delivery selects plugins with company configuration rows. `deferred` waits for a later startup, configuration change, or other work notification. - This does not replace required agent lifecycle participation or establish that external mounts are unused. ## Model Used OpenAI Codex (GPT-6), with tool-assisted code editing, code inspection, and test execution. ## 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 - [ ] 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>
This commit is contained in:
Nicky LeachandPaperclip authored and GitHub committed
1 parent
5a6d0d08a7
commit
db65a0863e
27 files changed
+1252
-145
No files matched your search
@@ -23,6 +23,7 @@ export const DELIVERY_QUEUES = {
|
||||
chatCompletion: "chat-completions",
|
||||
connection: "connection-continuations",
|
||||
question: "question-responses",
|
||||
pluginLifecycle: "plugin-resource-lifecycle",
|
||||
toolAction: "tool-action-receipts",
|
||||
} as const;
|
||||
export type DeliveryQueue = typeof DELIVERY_QUEUES[keyof typeof DELIVERY_QUEUES];
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
import { and, asc, eq, isNull, or } from "drizzle-orm";
|
||||
import { pluginCompanySettings, pluginConfig, plugins, type Db } from "@paperclipai/db";
|
||||
import { logger } from "../middleware/logger.js";
|
||||
import { pluginLifecycleInbox } from "./plugin-lifecycle-inbox.js";
|
||||
import { DELIVERY_QUEUES } from "./delivery-work-notifications.js";
|
||||
import type { createDeliveryWorkCoordinator } from "./delivery-work-coordinator.js";
|
||||
import type { PluginWorkerManager } from "./plugin-worker-manager.js";
|
||||
import type { PluginLifecycleManager } from "./plugin-lifecycle.js";
|
||||
|
||||
type Coordinator = ReturnType<typeof createDeliveryWorkCoordinator>;
|
||||
|
||||
/** The journal is the queue. Notifications only wake its single local dispatcher. */
|
||||
export function registerPluginLifecycleDelivery(
|
||||
coordinator: Coordinator,
|
||||
db: Db,
|
||||
manager: Pick<PluginWorkerManager, "call" | "isRunning" | "onConfigApplied">,
|
||||
lifecycle: Pick<PluginLifecycleManager, "on" | "off">,
|
||||
) {
|
||||
// Startup and every wake remain pending until an admitted run inspects the inbox.
|
||||
// The coordinator may reconcile signals while idle drain prevents dispatch.
|
||||
let pending = true;
|
||||
const retryAt = new Map<string, number>();
|
||||
const retryMs = 30_000;
|
||||
const delivery = coordinator.register(DELIVERY_QUEUES.pluginLifecycle, {
|
||||
retryMs,
|
||||
hasPending: async () => pending,
|
||||
onSettled: () => { pending = true; },
|
||||
nextRunAt() {
|
||||
if (!pending) return null;
|
||||
let next: number | null = null;
|
||||
for (const at of retryAt.values()) {
|
||||
// An expired deadline during idle drain must not schedule a busy loop.
|
||||
if (at > Date.now() && (next === null || at < next)) next = at;
|
||||
}
|
||||
return next;
|
||||
},
|
||||
async run(signal) {
|
||||
pending = false;
|
||||
try {
|
||||
for (const [key, at] of retryAt) if (at <= Date.now()) retryAt.delete(key);
|
||||
const configured = await db.select({ plugin: plugins, companyId: pluginConfig.companyId })
|
||||
.from(plugins).innerJoin(pluginConfig, eq(pluginConfig.pluginId, plugins.id))
|
||||
.where(eq(plugins.status, "ready"))
|
||||
.orderBy(asc(plugins.installOrder), asc(pluginConfig.companyId));
|
||||
for (const { plugin, companyId } of configured) {
|
||||
const types = plugin.manifestJson.resourceLifecycle;
|
||||
if (!types?.length || !plugin.manifestJson.capabilities.includes("events.subscribe")) continue;
|
||||
const [disabled] = await db.select({ id: pluginCompanySettings.id }).from(pluginCompanySettings)
|
||||
.where(and(eq(pluginCompanySettings.pluginId, plugin.id), eq(pluginCompanySettings.companyId, companyId), eq(pluginCompanySettings.enabled, false)));
|
||||
if (disabled) continue;
|
||||
const inbox = pluginLifecycleInbox(db, plugin.id);
|
||||
let afterId: string | undefined;
|
||||
// Visit independent resources past a failed or deferred head.
|
||||
for (;;) {
|
||||
if (signal.aborted) return;
|
||||
const events = await inbox.list(companyId, 100, afterId, types);
|
||||
for (const event of events) {
|
||||
if (signal.aborted) return;
|
||||
const retryKey = `${plugin.id}:${event.id}`;
|
||||
if (retryAt.has(retryKey)) { pending = true; continue; }
|
||||
if (!manager.isRunning(plugin.id)) { pending = true; break; }
|
||||
let stage = "eligibility";
|
||||
try {
|
||||
// Recheck enablement for each invocation; a disable during a batch must stop delivery.
|
||||
const [enabled] = await db.select({ manifest: plugins.manifestJson }).from(plugins)
|
||||
.leftJoin(pluginCompanySettings, and(eq(pluginCompanySettings.pluginId, plugins.id), eq(pluginCompanySettings.companyId, companyId)))
|
||||
.where(and(eq(plugins.id, plugin.id), eq(plugins.status, "ready"),
|
||||
or(isNull(pluginCompanySettings.enabled), eq(pluginCompanySettings.enabled, true))));
|
||||
if (!enabled?.manifest.resourceLifecycle?.includes(event.resourceType) || !enabled.manifest.capabilities.includes("events.subscribe")) break;
|
||||
stage = "callback";
|
||||
const result = await manager.call(plugin.id, "resourceLifecycle", event, 30_000);
|
||||
stage = "result";
|
||||
if (result?.eventId !== event.id || !["acknowledged", "retry", "deferred"].includes(result.status)) {
|
||||
throw new Error("Invalid resource lifecycle result");
|
||||
}
|
||||
if (signal.aborted) return;
|
||||
if (result.status === "acknowledged") {
|
||||
stage = "acknowledgment";
|
||||
await inbox.acknowledge(companyId, event.id);
|
||||
// An acknowledgment exposes the next event for this resource. Drain immediately.
|
||||
wake();
|
||||
} else if (result.status === "retry") {
|
||||
retryAt.set(retryKey, Date.now() + retryMs);
|
||||
pending = true;
|
||||
}
|
||||
} catch (error) {
|
||||
retryAt.set(retryKey, Date.now() + retryMs);
|
||||
// Provider error messages/data may contain secrets; retain only routing
|
||||
// identifiers, the failed stage, and the protocol's numeric error code.
|
||||
const code = (error as { code?: unknown } | null)?.code;
|
||||
logger.warn({ pluginId: plugin.id, companyId, eventId: event.id, stage,
|
||||
...(typeof code === "number" ? { rpcCode: code } : {}) }, "Resource lifecycle delivery failed; retry scheduled");
|
||||
// Failed RPCs and uncertain acknowledgments leave durable work for replay.
|
||||
pending = true;
|
||||
}
|
||||
}
|
||||
if (events.length < 100) break;
|
||||
afterId = events.at(-1)!.id;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
pending = true; // A failed scan must survive a retry skipped during idle drain.
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
});
|
||||
function wake() { pending = true; delivery.wake(); }
|
||||
const unsubscribeConfig = manager.onConfigApplied(wake);
|
||||
lifecycle.on("plugin.loaded", wake);
|
||||
lifecycle.on("plugin.enabled", wake);
|
||||
lifecycle.on("plugin.worker_started", wake);
|
||||
return {
|
||||
...delivery,
|
||||
wake,
|
||||
dispose() {
|
||||
unsubscribeConfig();
|
||||
lifecycle.off("plugin.loaded", wake);
|
||||
lifecycle.off("plugin.enabled", wake);
|
||||
lifecycle.off("plugin.worker_started", wake);
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
import { pluginCompanySettings, pluginLifecycleAcknowledgments, plugins, resourceLifecycleEvents, type Db } from "@paperclipai/db";
|
||||
import type { ResourceLifecycleEvent } from "@paperclipai/plugin-sdk";
|
||||
import { z } from "zod";
|
||||
import { and, asc, eq, gt, sql } from "drizzle-orm";
|
||||
import { and, asc, eq, gt, inArray, sql } from "drizzle-orm";
|
||||
import { badRequest, conflict, forbidden, notFound } from "../errors.js";
|
||||
|
||||
/** Durable pull delivery. Provider work stays outside tenant transactions. */
|
||||
/** Durable delivery inbox. Provider work stays outside tenant transactions. */
|
||||
export function pluginLifecycleInbox(db: Db, pluginId: string) {
|
||||
const unacknowledged = sql`NOT EXISTS (
|
||||
SELECT 1 FROM plugin_lifecycle_acknowledgments ack
|
||||
@@ -31,12 +31,12 @@ export function pluginLifecycleInbox(db: Db, pluginId: string) {
|
||||
}
|
||||
|
||||
return {
|
||||
async list(companyId: string, limit = 50, afterId?: string): Promise<ResourceLifecycleEvent[]> {
|
||||
async list(companyId: string, limit = 50, afterId?: string, resourceTypes?: ResourceLifecycleEvent["resourceType"][]): Promise<ResourceLifecycleEvent[]> {
|
||||
if (!Number.isInteger(limit) || limit < 1 || limit > 100) throw badRequest("limit must be an integer from 1 to 100");
|
||||
if (afterId !== undefined && (typeof afterId !== "string" || !/^[1-9]\d*$/.test(afterId) || !Number.isSafeInteger(Number(afterId)))) throw badRequest("Invalid lifecycle page id");
|
||||
await assertAvailable(db, companyId);
|
||||
const rows = await db.select().from(resourceLifecycleEvents)
|
||||
.where(and(eq(resourceLifecycleEvents.companyId, companyId), unacknowledged, firstForResource, afterId === undefined ? undefined : gt(resourceLifecycleEvents.id, Number(afterId))))
|
||||
.where(and(eq(resourceLifecycleEvents.companyId, companyId), unacknowledged, firstForResource, resourceTypes ? inArray(resourceLifecycleEvents.resourceType, resourceTypes) : undefined, afterId === undefined ? undefined : gt(resourceLifecycleEvents.id, Number(afterId))))
|
||||
.orderBy(asc(resourceLifecycleEvents.id)).limit(limit);
|
||||
return rows.map(row => ({ ...row, id: String(row.id), createdAt: row.createdAt.toISOString() })) as ResourceLifecycleEvent[];
|
||||
},
|
||||
|
||||
@@ -28,6 +28,7 @@ import type {
|
||||
PluginWebhookDeliveryStatus,
|
||||
} from "@paperclipai/shared";
|
||||
import { conflict, notFound } from "../errors.js";
|
||||
import { DELIVERY_QUEUES, notifyDeliveryWork } from "./delivery-work-notifications.js";
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Helpers
|
||||
@@ -65,8 +66,8 @@ export function pluginRegistryService(db: Db) {
|
||||
// Internal helpers
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
async function getById(id: string) {
|
||||
return db
|
||||
async function getById(id: string, database: Db = db) {
|
||||
return database
|
||||
.select()
|
||||
.from(plugins)
|
||||
.where(eq(plugins.id, id))
|
||||
@@ -323,37 +324,41 @@ export function pluginRegistryService(db: Db) {
|
||||
* otherwise a new row is inserted.
|
||||
*/
|
||||
upsertConfig: async (pluginId: string, companyId: string, input: UpsertPluginConfig) => {
|
||||
const plugin = await getById(pluginId);
|
||||
if (!plugin) throw notFound("Plugin not found");
|
||||
return db.transaction(async tx => {
|
||||
const db = tx as unknown as Db;
|
||||
await notifyDeliveryWork(db, DELIVERY_QUEUES.pluginLifecycle);
|
||||
const plugin = await getById(pluginId, db);
|
||||
if (!plugin) throw notFound("Plugin not found");
|
||||
|
||||
const existing = await db
|
||||
.select()
|
||||
.from(pluginConfig)
|
||||
.where(and(eq(pluginConfig.pluginId, pluginId), eq(pluginConfig.companyId, companyId)))
|
||||
.then((rows) => rows[0] ?? null);
|
||||
|
||||
if (existing) {
|
||||
return db
|
||||
.update(pluginConfig)
|
||||
.set({
|
||||
configJson: input.configJson,
|
||||
lastError: null,
|
||||
updatedAt: new Date(),
|
||||
})
|
||||
const existing = await db
|
||||
.select()
|
||||
.from(pluginConfig)
|
||||
.where(and(eq(pluginConfig.pluginId, pluginId), eq(pluginConfig.companyId, companyId)))
|
||||
.then((rows) => rows[0] ?? null);
|
||||
|
||||
if (existing) {
|
||||
return db
|
||||
.update(pluginConfig)
|
||||
.set({
|
||||
configJson: input.configJson,
|
||||
lastError: null,
|
||||
updatedAt: new Date(),
|
||||
})
|
||||
.where(and(eq(pluginConfig.pluginId, pluginId), eq(pluginConfig.companyId, companyId)))
|
||||
.returning()
|
||||
.then((rows) => rows[0]);
|
||||
}
|
||||
|
||||
return db
|
||||
.insert(pluginConfig)
|
||||
.values({
|
||||
pluginId,
|
||||
companyId,
|
||||
configJson: input.configJson,
|
||||
})
|
||||
.returning()
|
||||
.then((rows) => rows[0]);
|
||||
}
|
||||
|
||||
return db
|
||||
.insert(pluginConfig)
|
||||
.values({
|
||||
pluginId,
|
||||
companyId,
|
||||
configJson: input.configJson,
|
||||
})
|
||||
.returning()
|
||||
.then((rows) => rows[0]);
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -361,38 +366,42 @@ export function pluginRegistryService(db: Db) {
|
||||
* If no config row exists yet one is created with the supplied values.
|
||||
*/
|
||||
patchConfig: async (pluginId: string, companyId: string, input: PatchPluginConfig) => {
|
||||
const plugin = await getById(pluginId);
|
||||
if (!plugin) throw notFound("Plugin not found");
|
||||
return db.transaction(async tx => {
|
||||
const db = tx as unknown as Db;
|
||||
await notifyDeliveryWork(db, DELIVERY_QUEUES.pluginLifecycle);
|
||||
const plugin = await getById(pluginId, db);
|
||||
if (!plugin) throw notFound("Plugin not found");
|
||||
|
||||
const existing = await db
|
||||
.select()
|
||||
.from(pluginConfig)
|
||||
.where(and(eq(pluginConfig.pluginId, pluginId), eq(pluginConfig.companyId, companyId)))
|
||||
.then((rows) => rows[0] ?? null);
|
||||
|
||||
if (existing) {
|
||||
const merged = { ...existing.configJson, ...input.configJson };
|
||||
return db
|
||||
.update(pluginConfig)
|
||||
.set({
|
||||
configJson: merged,
|
||||
lastError: null,
|
||||
updatedAt: new Date(),
|
||||
})
|
||||
const existing = await db
|
||||
.select()
|
||||
.from(pluginConfig)
|
||||
.where(and(eq(pluginConfig.pluginId, pluginId), eq(pluginConfig.companyId, companyId)))
|
||||
.then((rows) => rows[0] ?? null);
|
||||
|
||||
if (existing) {
|
||||
const merged = { ...existing.configJson, ...input.configJson };
|
||||
return db
|
||||
.update(pluginConfig)
|
||||
.set({
|
||||
configJson: merged,
|
||||
lastError: null,
|
||||
updatedAt: new Date(),
|
||||
})
|
||||
.where(and(eq(pluginConfig.pluginId, pluginId), eq(pluginConfig.companyId, companyId)))
|
||||
.returning()
|
||||
.then((rows) => rows[0]);
|
||||
}
|
||||
|
||||
return db
|
||||
.insert(pluginConfig)
|
||||
.values({
|
||||
pluginId,
|
||||
companyId,
|
||||
configJson: input.configJson,
|
||||
})
|
||||
.returning()
|
||||
.then((rows) => rows[0]);
|
||||
}
|
||||
|
||||
return db
|
||||
.insert(pluginConfig)
|
||||
.values({
|
||||
pluginId,
|
||||
companyId,
|
||||
configJson: input.configJson,
|
||||
})
|
||||
.returning()
|
||||
.then((rows) => rows[0]);
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -439,43 +448,47 @@ export function pluginRegistryService(db: Db) {
|
||||
companyId: string,
|
||||
input: { enabled?: boolean; settingsJson: Record<string, unknown>; lastError?: string | null },
|
||||
): Promise<PluginCompanySettings> => {
|
||||
const plugin = await getById(pluginId);
|
||||
if (!plugin) throw notFound("Plugin not found");
|
||||
return db.transaction(async tx => {
|
||||
const db = tx as unknown as Db;
|
||||
await notifyDeliveryWork(db, DELIVERY_QUEUES.pluginLifecycle);
|
||||
const plugin = await getById(pluginId, db);
|
||||
if (!plugin) throw notFound("Plugin not found");
|
||||
|
||||
const existing = await db
|
||||
.select()
|
||||
.from(pluginCompanySettings)
|
||||
.where(and(
|
||||
eq(pluginCompanySettings.pluginId, pluginId),
|
||||
eq(pluginCompanySettings.companyId, companyId),
|
||||
))
|
||||
.then((rows) => rows[0] ?? null);
|
||||
const existing = await db
|
||||
.select()
|
||||
.from(pluginCompanySettings)
|
||||
.where(and(
|
||||
eq(pluginCompanySettings.pluginId, pluginId),
|
||||
eq(pluginCompanySettings.companyId, companyId),
|
||||
))
|
||||
.then((rows) => rows[0] ?? null);
|
||||
|
||||
if (existing) {
|
||||
return db
|
||||
.update(pluginCompanySettings)
|
||||
.set({
|
||||
enabled: input.enabled ?? existing.enabled,
|
||||
settingsJson: input.settingsJson,
|
||||
lastError: input.lastError ?? null,
|
||||
updatedAt: new Date(),
|
||||
})
|
||||
.where(eq(pluginCompanySettings.id, existing.id))
|
||||
.returning()
|
||||
.then((rows) => rows[0]) as Promise<PluginCompanySettings>;
|
||||
}
|
||||
|
||||
if (existing) {
|
||||
return db
|
||||
.update(pluginCompanySettings)
|
||||
.set({
|
||||
enabled: input.enabled ?? existing.enabled,
|
||||
.insert(pluginCompanySettings)
|
||||
.values({
|
||||
pluginId,
|
||||
companyId,
|
||||
enabled: input.enabled ?? true,
|
||||
settingsJson: input.settingsJson,
|
||||
lastError: input.lastError ?? null,
|
||||
updatedAt: new Date(),
|
||||
})
|
||||
.where(eq(pluginCompanySettings.id, existing.id))
|
||||
.returning()
|
||||
.then((rows) => rows[0]) as Promise<PluginCompanySettings>;
|
||||
}
|
||||
|
||||
return db
|
||||
.insert(pluginCompanySettings)
|
||||
.values({
|
||||
pluginId,
|
||||
companyId,
|
||||
enabled: input.enabled ?? true,
|
||||
settingsJson: input.settingsJson,
|
||||
lastError: input.lastError ?? null,
|
||||
})
|
||||
.returning()
|
||||
.then((rows) => rows[0]) as Promise<PluginCompanySettings>;
|
||||
});
|
||||
},
|
||||
|
||||
// ----- Entities -------------------------------------------------------
|
||||
|
||||
@@ -796,6 +796,8 @@ export interface WorkerDiagnostics {
|
||||
* for starting/stopping all workers and routing RPC calls.
|
||||
*/
|
||||
export interface PluginWorkerManager {
|
||||
/** Subscribe after a worker successfully applies live company configuration. */
|
||||
onConfigApplied(listener: () => void): () => void;
|
||||
inspectIdleSleep?(hold: { ownerId: string; expiresAt: number }): Promise<{
|
||||
backgroundWork: "none" | "present" | "unknown"; pluginIds: string[];
|
||||
}>;
|
||||
@@ -3726,6 +3728,7 @@ export function createPluginWorkerManager(
|
||||
): PluginWorkerManager {
|
||||
const log = logger.child({ service: "plugin-worker-manager" });
|
||||
const workers = new Map<string, PluginWorkerHandle>();
|
||||
const configApplied = new Set<() => void>();
|
||||
/** Per-plugin startup locks to prevent concurrent spawn races. */
|
||||
const startupLocks = new Map<string, Promise<PluginWorkerHandle>>();
|
||||
// The one shared, process-scoped aggregate route-slot controller. The manager
|
||||
@@ -3736,6 +3739,10 @@ export function createPluginWorkerManager(
|
||||
);
|
||||
|
||||
return {
|
||||
onConfigApplied(listener) {
|
||||
configApplied.add(listener);
|
||||
return () => { configApplied.delete(listener); };
|
||||
},
|
||||
async inspectIdleSleep(hold) {
|
||||
if (startupLocks.size) return { backgroundWork: "unknown", pluginIds: [] };
|
||||
const snapshot = [...workers.entries()];
|
||||
@@ -3872,7 +3879,14 @@ export function createPluginWorkerManager(
|
||||
new Error(`No worker registered for plugin "${pluginId}"`),
|
||||
);
|
||||
}
|
||||
return handle.call(method, params, timeoutMs, executeLogSink);
|
||||
const result = handle.call(method, params, timeoutMs, executeLogSink);
|
||||
if (method === "configChanged") void result.then(() => {
|
||||
for (const listener of configApplied) {
|
||||
try { listener(); }
|
||||
catch { log.warn({ pluginId }, "Plugin configuration listener failed"); }
|
||||
}
|
||||
}, () => {});
|
||||
return result;
|
||||
},
|
||||
|
||||
openLoginPtySession(pluginId: string, input: LoginPtyOpenInput) {
|
||||
|
||||
@@ -1073,6 +1073,7 @@ export function projectService(db: Db, options: { captureWorkspaceUpdates?: bool
|
||||
if (retained) throw conflict("This project still supplies access policy for retained task workspaces. Archive the project or explicitly clean up its workspaces before deleting it.");
|
||||
const workspaces = await tx.select().from(projectWorkspaces).where(eq(projectWorkspaces.projectId, id)).for("update");
|
||||
for (const workspace of workspaces) await preserveConfiguredProjectWorkspaceRootProvenance(tx, workspace);
|
||||
await recordProjectLifecycleEvent(tx as unknown as Db, project.companyId, id, "delete");
|
||||
const [row] = await tx.delete(projects).where(eq(projects.id, id)).returning();
|
||||
return row ? { ...row, urlKey: deriveProjectUrlKey(row.name, row.id) } : null;
|
||||
}),
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { resourceLifecycleEvents, type Db } from "@paperclipai/db";
|
||||
import { sql } from "drizzle-orm";
|
||||
import { DELIVERY_QUEUES, notifyDeliveryWork } from "./delivery-work-notifications.js";
|
||||
|
||||
/** Call inside the transaction that creates the resource or approves the hire. */
|
||||
export async function recordResourceCreationEvent(
|
||||
@@ -8,6 +9,7 @@ export async function recordResourceCreationEvent(
|
||||
resourceType: "agent" | "project",
|
||||
resourceId: string,
|
||||
): Promise<void> {
|
||||
await notifyDeliveryWork(db, DELIVERY_QUEUES.pluginLifecycle);
|
||||
await db.insert(resourceLifecycleEvents).values({ companyId, resourceType, resourceId, action: "create" }).onConflictDoNothing({
|
||||
target: [resourceLifecycleEvents.companyId, resourceLifecycleEvents.resourceType, resourceLifecycleEvents.resourceId],
|
||||
where: sql`${resourceLifecycleEvents.action} = 'create'`,
|
||||
@@ -21,10 +23,12 @@ export async function recordAgentStatusEvent(db: Db, companyId: string, agentId:
|
||||
: after === "paused" ? "pause"
|
||||
: before === "paused" && ["active", "idle", "running", "error"].includes(after) ? "resume" : null;
|
||||
if (!action) return;
|
||||
await notifyDeliveryWork(db, DELIVERY_QUEUES.pluginLifecycle);
|
||||
await db.insert(resourceLifecycleEvents).values({ companyId, resourceType: "agent", resourceId: agentId, action });
|
||||
}
|
||||
|
||||
/** Call while holding the project row lock, in the mutation transaction. */
|
||||
export async function recordProjectLifecycleEvent(db: Db, companyId: string, projectId: string, action: "update" | "archive" = "update"): Promise<void> {
|
||||
export async function recordProjectLifecycleEvent(db: Db, companyId: string, projectId: string, action: "update" | "archive" | "delete" = "update"): Promise<void> {
|
||||
await notifyDeliveryWork(db, DELIVERY_QUEUES.pluginLifecycle);
|
||||
await db.insert(resourceLifecycleEvents).values({ companyId, resourceType: "project", resourceId: projectId, action });
|
||||
}
|
||||
Reference in new issue
Block a user