mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-16 02:40:39 +09:00
Some checks failed
Docker / build-and-push (push) Failing after 3m41s
Refresh Lockfile / refresh (push) Failing after 5m12s
Release / verify_canary (push) Failing after 10m53s
Release / verify_stable (push) Has been skipped
Release / publish_canary (push) Has been skipped
Release / preview_stable (push) Has been skipped
Release / publish_stable (push) Has been skipped
Fixes #2391 Fixes #3394 Fixes #4094 Fixes #5501 Fixes #5916 Fixes #6215 Fixes #6514 ## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies > - Plugins extend the platform by registering agent-callable tools backed by long-running worker processes > - `PluginToolDispatcher` is the boundary between the HTTP `/api/plugins/tools/execute` route and `PluginWorkerManager`, which owns those worker processes > - `PluginWorkerManager` keys live workers by the plugin's **database UUID**, but `plugin-loader` was registering tools using only `pluginKey` — so every tool call did `workerManager.isRunning(pluginKey)` and always got `false` > - As a result, every `POST /api/plugins/tools/execute` against a tool-exposing plugin returned 502 `worker for plugin X is not running`, even though the worker process was alive (hit in production by `vexion.council-chat`; `mem0-sync` would be next) > - This pull request threads the DB UUID through the dispatcher → registry hop and hardens the contract so omitting the UUID is a compile-time error, not a silent fallback > - The benefit is plugin tool execution actually works for any plugin declaring `manifest.tools[]`, and the type system prevents the same bug from recurring ## What Changed - `server/src/services/plugin-loader.ts` — pass in-scope `pluginId` (DB UUID) as the third argument to `toolDispatcher.registerPluginTools`. Single-line root fix. - `server/src/services/plugin-tool-dispatcher.ts` — `registerPluginTools` now takes `pluginDbId: string` (required, was optional). JSDoc updated to document the worker-routing contract and why the optional signature masked the bug. - `server/src/services/plugin-tool-registry.ts` — `registerPlugin` throws on missing/empty `pluginDbId` so any new call site that forgets the UUID fails immediately rather than silently falling back to `pluginKey`. - `server/src/__tests__/plugin-tool-dispatcher-pluginDbId.test.ts` — new focused regression suite covering the activation path, disable→enable lifecycle, worker re-spawn, and the empty-UUID guard. ## Verification - `pnpm vitest run server/src/__tests__/plugin-tool-dispatcher-pluginDbId.test.ts` — 6/6 passing. - `pnpm vitest run server/src/__tests__/plugin-database.test.ts server/src/__tests__/plugin-routes-authz.test.ts server/src/__tests__/plugin-lifecycle-restart.test.ts` — 48/48 passing on the merge commit. - `pnpm --filter @paperclipai/server typecheck` — no new errors introduced by these files. - Manual repro path: 1. Install a plugin that declares `manifest.tools[]` and uses `runWorker`. 2. Confirm status `ready` and a live worker (`paperclipai plugin diagnostics <key>`). 3. `POST /api/plugins/tools/execute` with `{ tool: "<pluginKey>:<toolName>", parameters, runContext }`. 4. Pre-fix: HTTP 502, `worker for plugin <key> is not running`. Post-fix: tool dispatches normally. ## Risks - Low risk. The signature tightening (`pluginDbId?` → `pluginDbId`) is a back-compatible behavioral fix at the only production call site (`plugin-loader`), which already had the UUID in scope. - Test/recovery paths that previously omitted the UUID must now supply it; the new error message identifies the missing arg explicitly. - No database migration, no API/schema change, no plugin-author-facing change. - The merge commit pulls master into the PR branch additively (no rebase); reviewers can read the fix commits independently of the merge. ## Model Used - Provider/model: Anthropic Claude (Opus 4.7, `claude-opus-4-7`) for the additive merge-conflict resolution, PR description rewrite, and Greptile follow-up; original fix authored by [@Ramon-nassa](https://github.com/Ramon-nassa). - Capabilities used: tool use (file edit, shell, GitHub CLI), extended thinking off, no code execution by the model. ## 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 run tests locally and they pass - [x] I have added or updated tests where applicable - [ ] If this change affects the UI, I have included before/after screenshots (N/A — server-only change) - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge --- ## Original Summary (preserved from contributor) `plugin-loader` activates plugins and calls ```ts toolDispatcher.registerPluginTools(pluginKey, manifest) ``` with only two args. `PluginToolDispatcher.registerPluginTools` forwards them to `registry.registerPlugin(pluginKey, manifest)`. The registry falls back `pluginDbId ?? pluginKey`, but `PluginWorkerManager` keys live workers by the DB UUID — so the downstream ```ts workerManager.isRunning(pluginKey) // always false ``` causes every `POST /api/plugins/tools/execute` to fail with `worker for plugin X is not running`, even when the worker process is alive and healthy. **This hits every plugin that exposes tools** (we hit it in `vexion.council-chat`; `mem0-sync` would too). Reported-by: Vexion / Ramon Nassar (vexion.council-chat plugin, MO-068). --------- Co-authored-by: ramon nassar <ramon@tabs.co> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: Devin Foley <devin@devinfoley.com> Co-authored-by: Paperclip <noreply@paperclip.ing>
455 lines
15 KiB
TypeScript
455 lines
15 KiB
TypeScript
/**
|
|
* PluginToolDispatcher — orchestrates plugin tool discovery, lifecycle
|
|
* integration, and execution routing for the agent service.
|
|
*
|
|
* This service sits between the agent service and the lower-level
|
|
* `PluginToolRegistry` + `PluginWorkerManager`, providing a clean API that:
|
|
*
|
|
* - Discovers tools from loaded plugin manifests and registers them
|
|
* in the tool registry.
|
|
* - Hooks into `PluginLifecycleManager` events to automatically register
|
|
* and unregister tools when plugins are enabled or disabled.
|
|
* - Exposes the tool list in an agent-friendly format (with namespaced
|
|
* names, descriptions, parameter schemas).
|
|
* - Routes `executeTool` calls to the correct plugin worker and returns
|
|
* structured results.
|
|
* - Validates tool parameters against declared schemas before dispatch.
|
|
*
|
|
* The dispatcher is created once at server startup and shared across
|
|
* the application.
|
|
*
|
|
* @see PLUGIN_SPEC.md §11 — Agent Tools
|
|
* @see PLUGIN_SPEC.md §13.10 — `executeTool`
|
|
*/
|
|
|
|
import type { Db } from "@paperclipai/db";
|
|
import type {
|
|
PaperclipPluginManifestV1,
|
|
PluginRecord,
|
|
} from "@paperclipai/shared";
|
|
import type { ToolRunContext, ToolResult } from "@paperclipai/plugin-sdk";
|
|
import type { PluginWorkerManager } from "./plugin-worker-manager.js";
|
|
import type { PluginLifecycleManager } from "./plugin-lifecycle.js";
|
|
import {
|
|
createPluginToolRegistry,
|
|
type PluginToolRegistry,
|
|
type RegisteredTool,
|
|
type ToolListFilter,
|
|
type ToolExecutionResult,
|
|
} from "./plugin-tool-registry.js";
|
|
import { pluginRegistryService } from "./plugin-registry.js";
|
|
import { logger } from "../middleware/logger.js";
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Types
|
|
// ---------------------------------------------------------------------------
|
|
|
|
/**
|
|
* An agent-facing tool descriptor — the shape returned when agents
|
|
* query for available tools.
|
|
*
|
|
* This is intentionally simpler than `RegisteredTool`, exposing only
|
|
* what agents need to decide whether and how to call a tool.
|
|
*/
|
|
export interface AgentToolDescriptor {
|
|
/** Fully namespaced tool name (e.g. `"acme.linear:search-issues"`). */
|
|
name: string;
|
|
/** Human-readable display name. */
|
|
displayName: string;
|
|
/** Description for the agent — explains when and how to use this tool. */
|
|
description: string;
|
|
/** JSON Schema describing the tool's input parameters. */
|
|
parametersSchema: Record<string, unknown>;
|
|
/** The plugin that provides this tool. */
|
|
pluginId: string;
|
|
}
|
|
|
|
/**
|
|
* Options for creating the plugin tool dispatcher.
|
|
*/
|
|
export interface PluginToolDispatcherOptions {
|
|
/** The worker manager used to dispatch RPC calls to plugin workers. */
|
|
workerManager?: PluginWorkerManager;
|
|
/** The lifecycle manager to listen for plugin state changes. */
|
|
lifecycleManager?: PluginLifecycleManager;
|
|
/** Database connection for looking up plugin records. */
|
|
db?: Db;
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// PluginToolDispatcher interface
|
|
// ---------------------------------------------------------------------------
|
|
|
|
/**
|
|
* The plugin tool dispatcher — the primary integration point between the
|
|
* agent service and the plugin tool system.
|
|
*
|
|
* Agents use this service to:
|
|
* 1. List all available tools (for prompt construction / tool choice)
|
|
* 2. Execute a specific tool by its namespaced name
|
|
*
|
|
* The dispatcher handles lifecycle management internally — when a plugin
|
|
* is loaded or unloaded, its tools are automatically registered or removed.
|
|
*/
|
|
export interface PluginToolDispatcher {
|
|
/**
|
|
* Initialize the dispatcher — load tools from all currently-ready plugins
|
|
* and start listening for lifecycle events.
|
|
*
|
|
* Must be called once at server startup after the lifecycle manager
|
|
* and worker manager are ready.
|
|
*/
|
|
initialize(): Promise<void>;
|
|
|
|
/**
|
|
* Tear down the dispatcher — unregister lifecycle event listeners
|
|
* and clear all tool registrations.
|
|
*
|
|
* Called during server shutdown.
|
|
*/
|
|
teardown(): void;
|
|
|
|
/**
|
|
* List all available tools for agents, optionally filtered.
|
|
*
|
|
* Returns tool descriptors in an agent-friendly format.
|
|
*
|
|
* @param filter - Optional filter criteria
|
|
* @returns Array of agent tool descriptors
|
|
*/
|
|
listToolsForAgent(filter?: ToolListFilter): AgentToolDescriptor[];
|
|
|
|
/**
|
|
* Look up a tool by its namespaced name.
|
|
*
|
|
* @param namespacedName - e.g. `"acme.linear:search-issues"`
|
|
* @returns The registered tool, or `null` if not found
|
|
*/
|
|
getTool(namespacedName: string): RegisteredTool | null;
|
|
|
|
/**
|
|
* Execute a tool by its namespaced name, routing to the correct
|
|
* plugin worker.
|
|
*
|
|
* @param namespacedName - Fully qualified tool name
|
|
* @param parameters - Input parameters matching the tool's schema
|
|
* @param runContext - Agent run context
|
|
* @returns The execution result with routing metadata
|
|
* @throws {Error} if the tool is not found, the worker is not running,
|
|
* or the tool execution fails
|
|
*/
|
|
executeTool(
|
|
namespacedName: string,
|
|
parameters: unknown,
|
|
runContext: ToolRunContext,
|
|
): Promise<ToolExecutionResult>;
|
|
|
|
/**
|
|
* Register all tools from a plugin manifest.
|
|
*
|
|
* This is called automatically when a plugin transitions to `ready`.
|
|
* Can also be called manually for testing or recovery scenarios.
|
|
*
|
|
* @param pluginKey - The plugin's namespaced key (e.g. `acme.linear`).
|
|
* Used as the lookup key for tool registration.
|
|
* @param manifest - The plugin manifest containing tool declarations.
|
|
* @param pluginDbId - The plugin's database UUID. Required:
|
|
* `workerManager` keys running workers by DB UUID, not by pluginKey, so
|
|
* without this `workerManager.isRunning(...)` always returns false and
|
|
* every tool dispatch fails with `worker for plugin X is not running`.
|
|
*/
|
|
registerPluginTools(
|
|
pluginKey: string,
|
|
manifest: PaperclipPluginManifestV1,
|
|
pluginDbId: string,
|
|
): void;
|
|
|
|
/**
|
|
* Unregister all tools for a plugin.
|
|
*
|
|
* Called automatically when a plugin is disabled or unloaded.
|
|
*
|
|
* @param pluginId - The plugin to unregister
|
|
*/
|
|
unregisterPluginTools(pluginId: string): void;
|
|
|
|
/**
|
|
* Get the total number of registered tools, optionally scoped to a plugin.
|
|
*
|
|
* @param pluginId - If provided, count only this plugin's tools
|
|
*/
|
|
toolCount(pluginId?: string): number;
|
|
|
|
/**
|
|
* Access the underlying tool registry for advanced operations.
|
|
*
|
|
* This escape hatch exists for internal use (e.g. diagnostics).
|
|
* Prefer the dispatcher's own methods for normal operations.
|
|
*/
|
|
getRegistry(): PluginToolRegistry;
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Factory: createPluginToolDispatcher
|
|
// ---------------------------------------------------------------------------
|
|
|
|
/**
|
|
* Create a new `PluginToolDispatcher`.
|
|
*
|
|
* The dispatcher:
|
|
* 1. Creates and owns a `PluginToolRegistry` backed by the given worker manager.
|
|
* 2. Listens for lifecycle events (plugin.enabled, plugin.disabled, plugin.unloaded)
|
|
* to automatically register and unregister tools.
|
|
* 3. On `initialize()`, loads tools from all currently-ready plugins via the DB.
|
|
*
|
|
* @param options - Configuration options
|
|
*
|
|
* @example
|
|
* ```ts
|
|
* // At server startup
|
|
* const dispatcher = createPluginToolDispatcher({
|
|
* workerManager,
|
|
* lifecycleManager,
|
|
* db,
|
|
* });
|
|
* await dispatcher.initialize();
|
|
*
|
|
* // In agent service — list tools for prompt construction
|
|
* const tools = dispatcher.listToolsForAgent();
|
|
*
|
|
* // In agent service — execute a tool
|
|
* const result = await dispatcher.executeTool(
|
|
* "acme.linear:search-issues",
|
|
* { query: "auth bug" },
|
|
* { agentId: "a-1", runId: "r-1", companyId: "c-1", projectId: "p-1" },
|
|
* );
|
|
* ```
|
|
*/
|
|
export function createPluginToolDispatcher(
|
|
options: PluginToolDispatcherOptions = {},
|
|
): PluginToolDispatcher {
|
|
const { workerManager, lifecycleManager, db } = options;
|
|
const log = logger.child({ service: "plugin-tool-dispatcher" });
|
|
|
|
// Create the underlying tool registry, backed by the worker manager
|
|
const registry = createPluginToolRegistry(workerManager);
|
|
|
|
// Track lifecycle event listeners so we can remove them on teardown
|
|
let enabledListener: ((payload: { pluginId: string; pluginKey: string }) => void) | null = null;
|
|
let disabledListener: ((payload: { pluginId: string; pluginKey: string; reason?: string }) => void) | null = null;
|
|
let unloadedListener: ((payload: { pluginId: string; pluginKey: string; removeData: boolean }) => void) | null = null;
|
|
|
|
let initialized = false;
|
|
|
|
// -----------------------------------------------------------------------
|
|
// Internal helpers
|
|
// -----------------------------------------------------------------------
|
|
|
|
/**
|
|
* Attempt to register tools for a plugin by looking up its manifest
|
|
* from the DB. No-ops gracefully if the plugin or manifest is missing.
|
|
*/
|
|
async function registerFromDb(pluginId: string): Promise<void> {
|
|
if (!db) {
|
|
log.warn(
|
|
{ pluginId },
|
|
"cannot register tools from DB — no database connection configured",
|
|
);
|
|
return;
|
|
}
|
|
|
|
const pluginRegistry = pluginRegistryService(db);
|
|
const plugin = await pluginRegistry.getById(pluginId) as PluginRecord | null;
|
|
|
|
if (!plugin) {
|
|
log.warn({ pluginId }, "plugin not found in registry, cannot register tools");
|
|
return;
|
|
}
|
|
|
|
const manifest = plugin.manifestJson;
|
|
if (!manifest) {
|
|
log.warn({ pluginId }, "plugin has no manifest, cannot register tools");
|
|
return;
|
|
}
|
|
|
|
registry.registerPlugin(plugin.pluginKey, manifest, plugin.id);
|
|
}
|
|
|
|
/**
|
|
* Convert a `RegisteredTool` to an `AgentToolDescriptor`.
|
|
*/
|
|
function toAgentDescriptor(tool: RegisteredTool): AgentToolDescriptor {
|
|
return {
|
|
name: tool.namespacedName,
|
|
displayName: tool.displayName,
|
|
description: tool.description,
|
|
parametersSchema: tool.parametersSchema,
|
|
pluginId: tool.pluginDbId,
|
|
};
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
// Lifecycle event handlers
|
|
// -----------------------------------------------------------------------
|
|
|
|
function handlePluginEnabled(payload: { pluginId: string; pluginKey: string }): void {
|
|
log.debug({ pluginId: payload.pluginId, pluginKey: payload.pluginKey }, "plugin enabled — registering tools");
|
|
// Async registration from DB — we fire-and-forget since the lifecycle
|
|
// event handler must be synchronous. Any errors are logged.
|
|
void registerFromDb(payload.pluginId).catch((err) => {
|
|
log.error(
|
|
{ pluginId: payload.pluginId, err: err instanceof Error ? err.message : String(err) },
|
|
"failed to register tools after plugin enabled",
|
|
);
|
|
});
|
|
}
|
|
|
|
function handlePluginDisabled(payload: { pluginId: string; pluginKey: string; reason?: string }): void {
|
|
log.debug({ pluginId: payload.pluginId, pluginKey: payload.pluginKey }, "plugin disabled — unregistering tools");
|
|
registry.unregisterPlugin(payload.pluginKey);
|
|
}
|
|
|
|
function handlePluginUnloaded(payload: { pluginId: string; pluginKey: string; removeData: boolean }): void {
|
|
log.debug({ pluginId: payload.pluginId, pluginKey: payload.pluginKey }, "plugin unloaded — unregistering tools");
|
|
registry.unregisterPlugin(payload.pluginKey);
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
// Public API
|
|
// -----------------------------------------------------------------------
|
|
|
|
return {
|
|
async initialize(): Promise<void> {
|
|
if (initialized) {
|
|
log.warn("dispatcher already initialized, skipping");
|
|
return;
|
|
}
|
|
|
|
log.info("initializing plugin tool dispatcher");
|
|
|
|
// Step 1: Load tools from all currently-ready plugins
|
|
if (db) {
|
|
const pluginRegistry = pluginRegistryService(db);
|
|
const readyPlugins = await pluginRegistry.listByStatus("ready") as PluginRecord[];
|
|
|
|
let totalTools = 0;
|
|
for (const plugin of readyPlugins) {
|
|
const manifest = plugin.manifestJson;
|
|
if (manifest?.tools && manifest.tools.length > 0) {
|
|
registry.registerPlugin(plugin.pluginKey, manifest, plugin.id);
|
|
totalTools += manifest.tools.length;
|
|
}
|
|
}
|
|
|
|
log.info(
|
|
{ readyPlugins: readyPlugins.length, registeredTools: totalTools },
|
|
"loaded tools from ready plugins",
|
|
);
|
|
}
|
|
|
|
// Step 2: Subscribe to lifecycle events for dynamic updates
|
|
if (lifecycleManager) {
|
|
enabledListener = handlePluginEnabled;
|
|
disabledListener = handlePluginDisabled;
|
|
unloadedListener = handlePluginUnloaded;
|
|
|
|
lifecycleManager.on("plugin.enabled", enabledListener);
|
|
lifecycleManager.on("plugin.disabled", disabledListener);
|
|
lifecycleManager.on("plugin.unloaded", unloadedListener);
|
|
|
|
log.debug("subscribed to lifecycle events");
|
|
} else {
|
|
log.warn("no lifecycle manager provided — tools will not auto-update on plugin state changes");
|
|
}
|
|
|
|
initialized = true;
|
|
log.info(
|
|
{ totalTools: registry.toolCount() },
|
|
"plugin tool dispatcher initialized",
|
|
);
|
|
},
|
|
|
|
teardown(): void {
|
|
if (!initialized) return;
|
|
|
|
// Unsubscribe from lifecycle events
|
|
if (lifecycleManager) {
|
|
if (enabledListener) lifecycleManager.off("plugin.enabled", enabledListener);
|
|
if (disabledListener) lifecycleManager.off("plugin.disabled", disabledListener);
|
|
if (unloadedListener) lifecycleManager.off("plugin.unloaded", unloadedListener);
|
|
|
|
enabledListener = null;
|
|
disabledListener = null;
|
|
unloadedListener = null;
|
|
}
|
|
|
|
// Note: we do NOT clear the registry here because teardown may be
|
|
// called during graceful shutdown where in-flight tool calls should
|
|
// still be able to resolve their tool entries.
|
|
|
|
initialized = false;
|
|
log.info("plugin tool dispatcher torn down");
|
|
},
|
|
|
|
listToolsForAgent(filter?: ToolListFilter): AgentToolDescriptor[] {
|
|
return registry.listTools(filter).map(toAgentDescriptor);
|
|
},
|
|
|
|
getTool(namespacedName: string): RegisteredTool | null {
|
|
return registry.getTool(namespacedName);
|
|
},
|
|
|
|
async executeTool(
|
|
namespacedName: string,
|
|
parameters: unknown,
|
|
runContext: ToolRunContext,
|
|
): Promise<ToolExecutionResult> {
|
|
log.debug(
|
|
{
|
|
tool: namespacedName,
|
|
agentId: runContext.agentId,
|
|
runId: runContext.runId,
|
|
},
|
|
"dispatching tool execution",
|
|
);
|
|
|
|
const result = await registry.executeTool(
|
|
namespacedName,
|
|
parameters,
|
|
runContext,
|
|
);
|
|
|
|
log.debug(
|
|
{
|
|
tool: namespacedName,
|
|
pluginId: result.pluginId,
|
|
hasContent: !!result.result.content,
|
|
hasError: !!result.result.error,
|
|
},
|
|
"tool execution completed",
|
|
);
|
|
|
|
return result;
|
|
},
|
|
|
|
registerPluginTools(
|
|
pluginKey: string,
|
|
manifest: PaperclipPluginManifestV1,
|
|
pluginDbId: string,
|
|
): void {
|
|
registry.registerPlugin(pluginKey, manifest, pluginDbId);
|
|
},
|
|
|
|
unregisterPluginTools(pluginId: string): void {
|
|
registry.unregisterPlugin(pluginId);
|
|
},
|
|
|
|
toolCount(pluginId?: string): number {
|
|
return registry.toolCount(pluginId);
|
|
},
|
|
|
|
getRegistry(): PluginToolRegistry {
|
|
return registry;
|
|
},
|
|
};
|
|
}
|