Showing the changes to packages/core (2 of 19 files). Show all
Unified · Split
| @@ -2071,6 +2071,7 @@ export const createExecutor = <const TPlugins extends readonly AnyPlugin[] = rea · 2070 unmodified lines | ||
| 2071 | 2071 | |
| 2072 | 2072 | const result: ResolveToolsResult = yield* runtime.plugin |
| 2073 | 2073 | .resolveTools({ |
| 2074 | + ctx: runtime.ctx, | |
| 2074 | 2075 | integration: rowToIntegration(integrationRow), |
| 2075 | 2076 | config: decodeJsonColumn(integrationRow.config), |
| 2076 | 2077 | httpClientLayer: runtime.ctx.httpClientLayer, |
| @@ -3732,6 +3733,7 @@ export const createExecutor = <const TPlugins extends readonly AnyPlugin[] = rea · 1655 unmodified lines | ||
| 3732 | 3733 | items: (key) => providersItems(key), |
| 3733 | 3734 | }, |
| 3734 | 3735 | oauth, |
| 3736 | + execute: (address, args) => execute(address, args), | |
| 3735 | 3737 | transaction: <A, E>(effect: Effect.Effect<A, E>) => transaction(effect), |
| 3736 | 3738 | }; |
| 3737 | 3739 | |
| @@ -29,6 +29,7 @@ import type { · 28 unmodified lines | ||
| 29 | 29 | ProviderKey, |
| 30 | 30 | Subject, |
| 31 | 31 | Tenant, |
| 32 | + ToolAddress, | |
| 32 | 33 | } from "./ids"; |
| 33 | 34 | import type { IntegrationDetectionResult } from "./types"; |
| 34 | 35 | import type { |
| @@ -38,6 +39,7 @@ import type { · 3 unmodified lines | ||
| 38 | 39 | ElicitationResponse, |
| 39 | 40 | } from "./elicitation"; |
| 40 | 41 | import type { |
| 42 | + ExecuteError, | |
| 41 | 43 | ConnectionNotFoundError, |
| 42 | 44 | CredentialProviderNotRegisteredError, |
| 43 | 45 | IntegrationNotFoundError, |
| @@ -249,6 +251,12 @@ export interface PluginCtx<TStore = unknown> { · 205 unmodified lines | ||
| 249 | 251 | /** Shared OAuth service. */ |
| 250 | 252 | readonly oauth: OAuthService; |
| 251 | 253 | |
| 254 | + /** Invoke another catalog tool through the same executor request context: | |
| 255 | + * policy, approval, credential resolution, and plugin dispatch all stay in | |
| 256 | + * the core path. Intended for plugin sandboxes that expose higher-level | |
| 257 | + * virtual tools over existing integration tools. */ | |
| 258 | + readonly execute: (address: ToolAddress, args: unknown) => Effect.Effect<unknown, ExecuteError>; | |
| 259 | + | |
| 252 | 260 | /** Run `effect` inside a FumaDB transaction (atomic across plugin storage + |
| 253 | 261 | * core integration/tool writes). */ |
| 254 | 262 | readonly transaction: <A, E>(effect: Effect.Effect<A, E>) => Effect.Effect<A, E | StorageFailure>; |
| @@ -261,6 +269,7 @@ export interface PluginCtx<TStore = unknown> { · 6 unmodified lines | ||
| 261 | 269 | // --------------------------------------------------------------------------- |
| 262 | 270 | |
| 263 | 271 | export interface ResolveToolsInput<TStore = unknown> { |
| 272 | + readonly ctx?: PluginCtx<TStore>; | |
| 264 | 273 | /** The catalog record (public projection) whose connection is being resolved. */ |
| 265 | 274 | readonly integration: Integration; |
| 266 | 275 | /** The plugin's stored opaque config for that integration. */ |