@opengeni/api-router 3.1.3-canary.38890816741001 → 3.2.2

package/dist/integrations/external-vault-providers.d.ts

@@ -0,0 +1,29 @@
+import type { Settings } from "@opengeni/config";
+import type { ExternalVaultProviderFactories } from "@opengeni/core";
+import { type PinnedFetchOptions } from "@opengeni/network";
+import type { KeeperRuntimeOptions } from "@opengeni/vaults-keeper";
+/** Test seams only; production passes nothing. */
+export type NativeExternalVaultOptions = {
+    keeper?: Pick<KeeperRuntimeOptions, "queryFunction" | "fetchFile" | "sdk">;
+    /** Applies when this call creates the pool for its CLI path. */
+    protonpass?: {
+        stateRoot?: string;
+        hostEnv?: Readonly<Record<string, string | undefined>>;
+    };
+};
+/**
+ * Native external vault adapters that run inside this server: Keeper Secrets
+ * Manager always, Proton Pass only when the operator installed `pass-cli`
+ * (`OPENGENI_PROTON_PASS_CLI_PATH`). Both packages load through `import()`
+ * on first use (packages/vaults-keeper/test/import-guard.test.ts). Keep this
+ * file identical to apps/worker/src/external-vault-providers.ts.
+ */
+export declare function createNativeExternalVaultFactories(settings: Settings, options?: NativeExternalVaultOptions): ExternalVaultProviderFactories;
+/** Logs out every pooled Proton Pass CLI session and wipes its state (graceful shutdown). */
+export declare function closeNativeExternalVaultProviders(): Promise<void>;
+/**
+ * The fetch every Keeper request and file download uses: DNS-pinned and
+ * policy-checked (no private or special-use targets). The adapter adds
+ * HTTPS-only, no redirects, deadlines, size bounds and the caller's abort.
+ */
+export declare function nativeKeeperFetch(settings: Settings, pinned?: Pick<PinnedFetchOptions, "dnsLookup" | "fetchImpl" | "agentFactory">): (input: string | URL, init: RequestInit) => Promise<Response>;

package/dist/interaction-secrets-vault.d.ts

@@ -7,7 +7,7 @@ import type { VaultProviderRegistry } from "@opengeni/vaults";
 import { type BrowserPasskeyCredentialMaterial } from "@opengeni/contracts";
 import { type VaultService } from "@opengeni/core";
 import { type Database } from "@opengeni/db";
-import type { InteractionSecretsPort } from "./interaction-secrets.js";
+import type { AttemptSecretPrincipal, InteractionSecretsPort } from "./interaction-secrets.js";
 export declare function passkeyItemName(credential: BrowserPasskeyCredentialMaterial): string;
 export declare function createVaultInteractionSecretsPort(deps: {
     db: Database;
@@ -16,5 +16,5 @@ export declare function createVaultInteractionSecretsPort(deps: {
     /** Defaults to a service over the same database and key. */
     vaultService?: VaultService;
     /** Connected vaults (1Password, host) for a workspace's acting subject. */
-    providersFor?: (workspaceId: string, subjectId: string | null) => VaultProviderRegistry;
+    providersFor?: (workspaceId: string, subjectId: string | null, principal?: AttemptSecretPrincipal) => VaultProviderRegistry;
 }): InteractionSecretsPort;

package/dist/mcp/action-descriptions.d.ts

@@ -1,4 +1,4 @@
 import type { ActionCatalogEntry } from "./action-catalog-types.js";
-/** Actions that must carry a description (subscription and model settings). */
+/** Actions that must carry a description (subscriptions, models and vault connections). */
 export declare const DESCRIBED_ACTION_PATH: RegExp;
 export declare function actionDescription(entry: Pick<ActionCatalogEntry, "method" | "path">): string | undefined;

package/dist/routes/vault-providers.d.ts

@@ -1,7 +1,7 @@
 import type { Hono } from "hono";
-import { type ApiRouteDeps, type OnePasswordConnectionMetadata, type OnePasswordVaultProviderFactory } from "@opengeni/core";
+import { type ApiRouteDeps, type OnePasswordConnectionMetadata, type OnePasswordVaultProviderFactory, type ExternalVaultProviderFactories } from "@opengeni/core";
 import { type VaultDbContext } from "@opengeni/db";
-import { type VaultProvider, type VaultProviderRegistry } from "@opengeni/vaults";
+import { type VaultProvider, type VaultProviderRegistry, type VaultProviderAuthority } from "@opengeni/vaults";
 export declare function onePasswordFactoryFor(deps: ApiRouteDeps): OnePasswordVaultProviderFactory;
 /**
  * The 1Password provider for a stored connection the caller can see, plus its
@@ -23,7 +23,9 @@ export declare function onePasswordProviderForConnection(deps: ApiRouteDeps, inp
 export declare function vaultProviderRegistryFor(deps: ApiRouteDeps, input: {
     workspaceId: string;
     subjectId: string | null;
+    executionContext?: Pick<VaultProviderAuthority, "sessionId" | "turnId" | "attemptId" | "siteId">;
 }): VaultProviderRegistry;
+export declare function externalVaultFactoriesFor(deps: ApiRouteDeps): ExternalVaultProviderFactories;
 export type LinkedVaultLookup = (input: {
     workspaceId: string;
     connectionId: string;

package/dist/shutdown.d.ts

@@ -0,0 +1,14 @@
+type ShutdownSignal = "SIGINT" | "SIGTERM";
+type ShutdownProcess = {
+    on(signal: ShutdownSignal, handler: () => void): unknown;
+    off(signal: ShutdownSignal, handler: () => void): unknown;
+    exit(code: number): void;
+};
+/** Standalone process boundary; embedded hosts keep owning their explicit close(). */
+export declare function installApiShutdownHandlers(input: {
+    close: () => Promise<void>;
+    process?: ShutdownProcess;
+    timeoutMs?: number;
+    onFailure?: () => void;
+}): () => void;
+export {};

package/dist/workspace-tool-gateway-secrets.d.ts

@@ -23,5 +23,5 @@ export declare function workspaceGatewaySecretArguments(input: {
     settings: Settings;
     grant: AccessGrant;
     /** Connected vaults (1Password, host) for the resolved acting subject. */
-    providersForSubject?: ((subjectId: string | null) => VaultProviderRegistry) | undefined;
+    providersForSubject?: ((subjectId: string | null, site?: SiteSecretContext | null) => VaultProviderRegistry) | undefined;
 }): ToolGatewayArgumentResolver;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/api-router",
-  "version": "3.1.3-canary.38890816741001",
+  "version": "3.2.2",
   "description": "Opengeni HTTP surface: the Hono adapter/router (createApp), routes, MCP HTTP transport, and HTTP access adapters over @opengeni/core. An engine-distribution surface — its runtime closure includes engine-internal packages.",
   "license": "Apache-2.0",
   "repository": {
@@ -42,29 +42,32 @@
     "@aws-sdk/client-s3": "^3.1044.0",
     "@aws-sdk/s3-request-presigner": "^3.1044.0",
     "@hono/zod-validator": "^0.7.6",
+    "@keeper-security/secrets-manager-core": "17.6.0",
     "@llamaindex/liteparse": "2.14.2",
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@opengeni/agent-proto": "3.1.3-canary.38890816741001",
-    "@opengeni/artifact-tool": "3.1.3-canary.38890816741001",
-    "@opengeni/capabilities": "3.1.3-canary.38890816741001",
-    "@opengeni/codemode": "3.1.3-canary.38890816741001",
-    "@opengeni/codex": "3.1.3-canary.38890816741001",
-    "@opengeni/config": "3.1.3-canary.38890816741001",
-    "@opengeni/contracts": "3.1.3-canary.38890816741001",
-    "@opengeni/core": "3.1.3-canary.38890816741001",
-    "@opengeni/db": "3.1.3-canary.38890816741001",
-    "@opengeni/documents": "3.1.3-canary.38890816741001",
-    "@opengeni/events": "3.1.3-canary.38890816741001",
-    "@opengeni/github": "3.1.3-canary.38890816741001",
-    "@opengeni/interaction": "3.1.3-canary.38890816741001",
-    "@opengeni/network": "3.1.3-canary.38890816741001",
-    "@opengeni/observability": "3.1.3-canary.38890816741001",
-    "@opengeni/runtime": "3.1.3-canary.38890816741001",
-    "@opengeni/storage": "3.1.3-canary.38890816741001",
-    "@opengeni/tool-gateway": "3.1.3-canary.38890816741001",
-    "@opengeni/vaults": "3.1.3-canary.38890816741001",
-    "@opengeni/vaults-onepassword": "3.1.3-canary.38890816741001",
-    "@opengeni/xai-subscription": "3.1.3-canary.38890816741001",
+    "@opengeni/agent-proto": "3.2.2",
+    "@opengeni/artifact-tool": "3.2.2",
+    "@opengeni/capabilities": "3.2.2",
+    "@opengeni/codemode": "3.2.2",
+    "@opengeni/codex": "3.2.2",
+    "@opengeni/config": "3.2.2",
+    "@opengeni/contracts": "3.2.2",
+    "@opengeni/core": "3.2.2",
+    "@opengeni/db": "3.2.2",
+    "@opengeni/documents": "3.2.2",
+    "@opengeni/events": "3.2.2",
+    "@opengeni/github": "3.2.2",
+    "@opengeni/interaction": "3.2.2",
+    "@opengeni/network": "3.2.2",
+    "@opengeni/observability": "3.2.2",
+    "@opengeni/runtime": "3.2.2",
+    "@opengeni/storage": "3.2.2",
+    "@opengeni/tool-gateway": "3.2.2",
+    "@opengeni/vaults": "3.2.2",
+    "@opengeni/vaults-keeper": "3.2.2",
+    "@opengeni/vaults-onepassword": "3.2.2",
+    "@opengeni/vaults-protonpass": "3.2.2",
+    "@opengeni/xai-subscription": "3.2.2",
     "@temporalio/client": "^1.17.0",
     "ajv": "^8.20.0",
     "better-auth": "^1.6.14",

package/src/app.ts

@@ -2200,8 +2200,20 @@ export function createAppComposition(deps: AppDependencies): {
   const interactionSecrets = createVaultInteractionSecretsPort({
     db: routeDeps.db,
     encryptionKey: environmentsEncryptionKeyBytes(routeDeps.settings) ?? null,
-    providersFor: (workspaceId, subjectId) =>
-      vaultProviderRegistryFor(routeDeps, { workspaceId, subjectId }),
+    providersFor: (workspaceId, subjectId, principal) =>
+      vaultProviderRegistryFor(routeDeps, {
+        workspaceId,
+        subjectId,
+        ...(principal
+          ? {
+              executionContext: {
+                sessionId: principal.sessionId,
+                turnId: principal.turnId,
+                attemptId: principal.attemptId,
+              },
+            }
+          : {}),
+      }),
   });
   registerBrowserSessionRoutes(app, routeDeps, { interactionSecrets });
   registerComputerSessionRoutes(app, routeDeps, { interactionSecrets });

package/src/index.ts

@@ -52,6 +52,7 @@ import { createAutomaticAgentUpdater } from "./sandbox/agent-update";
 import { startSlackInteractionPump } from "./integrations/slack-interactions";
 import { startMemorySlackPublicationPump } from "./memory-slack-delivery";
 import { startTemporalScheduleCleanupPump } from "./temporal-schedule-cleanup";
+import { closeNativeExternalVaultProviders } from "./integrations/external-vault-providers";
 import { startScheduledTaskLifecyclePump } from "./scheduled-task-lifecycle";
 import { createTemporalScheduleSynchronizer } from "./temporal-schedule-sync";
 import { startNativePushDispatchPump } from "./native-push-dispatch";
@@ -73,6 +74,7 @@ import {
   type StandaloneEditableArtifactApplication,
 } from "./editable-artifact-production";
 import { installApiFatalProcessBoundary } from "./fatal-process-boundary";
+import { installApiShutdownHandlers } from "./shutdown";
 
 /**
  * A REJECT_DUPLICATE start collides on the deterministic workflowId when the
@@ -590,6 +592,8 @@ export async function startApi(
     server,
     close: async () => {
       server.stop(true);
+      // Start private CLI session cleanup even if another service's drain stalls.
+      const vaultProvidersClosed = closeNativeExternalVaultProviders().catch(() => undefined);
       metricsServer?.stop(true);
       stopSlackInteractionPump?.();
       await stopMemorySlackPublicationPump();
@@ -602,6 +606,7 @@ export async function startApi(
       // Write queued presence before the database pool closes.
       await routeDeps.userPresence?.close().catch(() => undefined);
       await Promise.allSettled([
+        vaultProvidersClosed,
         Promise.resolve(editableArtifactComposition?.close()),
         authCalloutResponder?.close(),
         bus.close(),
@@ -618,7 +623,14 @@ if (import.meta.main) {
     const settings = getSettings();
     const observability = createObservability(settings, { component: "api" });
     fatalBoundary.attachObservability(observability);
-    await startApi({ settings, observability });
+    const api = await startApi({ settings, observability });
+    installApiShutdownHandlers({
+      close: api.close,
+      onFailure: () =>
+        observability.warn("Opengeni API shutdown did not finish cleanly", {
+          errorCode: "api_shutdown_failed",
+        }),
+    });
     fatalBoundary.markRunning();
   } catch (error) {
     await fatalBoundary.reportStartupFailure(error);

package/src/integrations/external-vault-providers.ts

@@ -0,0 +1,136 @@
+import type { Settings } from "@opengeni/config";
+import type {
+  ExternalVaultProviderFactories,
+  ExternalVaultProviderFactory,
+  StoredVaultProviderCredentials,
+} from "@opengeni/core";
+import { pinnedFetch, type PinnedFetchOptions } from "@opengeni/network";
+import { VaultProviderError } from "@opengeni/vaults";
+import type { KeeperRuntimeOptions } from "@opengeni/vaults-keeper";
+import type { ProtonPassProviderPool } from "@opengeni/vaults-protonpass";
+
+/** Test seams only; production passes nothing. */
+export type NativeExternalVaultOptions = {
+  keeper?: Pick<KeeperRuntimeOptions, "queryFunction" | "fetchFile" | "sdk">;
+  /** Applies when this call creates the pool for its CLI path. */
+  protonpass?: { stateRoot?: string; hostEnv?: Readonly<Record<string, string | undefined>> };
+};
+
+/**
+ * Native external vault adapters that run inside this server: Keeper Secrets
+ * Manager always, Proton Pass only when the operator installed `pass-cli`
+ * (`OPENGENI_PROTON_PASS_CLI_PATH`). Both packages load through `import()`
+ * on first use (packages/vaults-keeper/test/import-guard.test.ts). Keep this
+ * file identical to apps/worker/src/external-vault-providers.ts.
+ */
+export function createNativeExternalVaultFactories(
+  settings: Settings,
+  options: NativeExternalVaultOptions = {},
+): ExternalVaultProviderFactories {
+  const factories: ExternalVaultProviderFactories = {
+    keeper: keeperFactory(settings, options.keeper ?? {}),
+  };
+  const cliPath = settings.protonPassCliPath;
+  if (cliPath) factories.protonpass = protonPassFactory(cliPath, options.protonpass ?? {});
+  return factories;
+}
+
+/** Logs out every pooled Proton Pass CLI session and wipes its state (graceful shutdown). */
+export async function closeNativeExternalVaultProviders(): Promise<void> {
+  const pools = [...protonPools.values()];
+  protonPools.clear();
+  await Promise.all(pools.map(async (pool) => (await pool.catch(() => null))?.close()));
+}
+
+function mismatch(): never {
+  throw new VaultProviderError(
+    "provider_unavailable",
+    "The configured adapter does not match this connection.",
+  );
+}
+
+/**
+ * The fetch every Keeper request and file download uses: DNS-pinned and
+ * policy-checked (no private or special-use targets). The adapter adds
+ * HTTPS-only, no redirects, deadlines, size bounds and the caller's abort.
+ */
+export function nativeKeeperFetch(
+  settings: Settings,
+  pinned: Pick<PinnedFetchOptions, "dnsLookup" | "fetchImpl" | "agentFactory"> = {},
+) {
+  return (input: string | URL, init: RequestInit) =>
+    pinnedFetch(input, init, settings, {
+      ...pinned,
+      label: "Keeper Secrets Manager",
+      requireHttpsOutsideLocalTest: true,
+    });
+}
+
+function keeperFactory(
+  settings: Settings,
+  seams: NonNullable<NativeExternalVaultOptions["keeper"]>,
+): ExternalVaultProviderFactory {
+  const fetch = nativeKeeperFetch(settings);
+  return async (input) => {
+    const credentials = input.credentials;
+    if (credentials.provider !== "keeper") mismatch();
+    const persist = input.persistCredentials;
+    const { openKeeperConnection } = await import("@opengeni/vaults-keeper");
+    const opened = await openKeeperConnection({
+      credentials:
+        "oneTimeToken" in credentials
+          ? {
+              oneTimeToken: credentials.oneTimeToken,
+              ...(credentials.hostname ? { hostname: credentials.hostname } : {}),
+            }
+          : { configuration: credentials.configuration },
+      // Without it openKeeperConnection refuses: a redeemed token or rotated
+      // key must never live only in memory.
+      ...(persist
+        ? {
+            persistConfiguration: (configuration: Record<string, string>) =>
+              persist({ provider: "keeper", configuration }),
+          }
+        : {}),
+      ...(input.operations ? { operations: input.operations } : {}),
+      // Cancels a pending bootstrap; a stored configuration opens without a request.
+      ...(input.signal ? { signal: input.signal } : {}),
+      fetch,
+      ...seams,
+    });
+    const stored: StoredVaultProviderCredentials = {
+      provider: "keeper",
+      configuration: opened.configuration,
+    };
+    return { provider: opened.provider, credentials: stored };
+  };
+}
+
+/** One pool per CLI path per process, so repeated factory creation never leaks sessions. */
+const protonPools = new Map<string, Promise<ProtonPassProviderPool>>();
+
+function protonPassFactory(
+  binaryPath: string,
+  seams: NonNullable<NativeExternalVaultOptions["protonpass"]>,
+): ExternalVaultProviderFactory {
+  return async (input) => {
+    const credentials = input.credentials;
+    if (credentials.provider !== "protonpass") mismatch();
+    let pool = protonPools.get(binaryPath);
+    if (!pool) {
+      pool = import("@opengeni/vaults-protonpass").then(({ createProtonPassProviderPool }) =>
+        createProtonPassProviderPool({ ...seams, binaryPath }),
+      );
+      protonPools.set(binaryPath, pool);
+      pool.catch(() => protonPools.delete(binaryPath));
+    }
+    // Sessions are scoped to the connection, so two connections never share
+    // CLI state even with the same token. Without a connection id (a setup
+    // probe) the provider gets an isolated session of its own.
+    const provider = (await pool).provider(credentials.token, {
+      ...(input.connectionId === undefined ? {} : { connectionId: input.connectionId }),
+      ...(input.operations ? { operations: input.operations } : {}),
+    });
+    return { provider, credentials: { provider: "protonpass", token: credentials.token } };
+  };
+}

package/src/interaction-secrets-vault.ts

@@ -59,7 +59,11 @@ export function createVaultInteractionSecretsPort(deps: {
   /** Defaults to a service over the same database and key. */
   vaultService?: VaultService;
   /** Connected vaults (1Password, host) for a workspace's acting subject. */
-  providersFor?: (workspaceId: string, subjectId: string | null) => VaultProviderRegistry;
+  providersFor?: (
+    workspaceId: string,
+    subjectId: string | null,
+    principal?: AttemptSecretPrincipal,
+  ) => VaultProviderRegistry;
 }): InteractionSecretsPort {
   const encryptionKey = deps.encryptionKey;
   let service = deps.vaultService ?? null;
@@ -203,7 +207,7 @@ export function createVaultInteractionSecretsPort(deps: {
         ...(providersFor
           ? {
               providersForSubject: (subjectId: string | null) =>
-                providersFor(principal.workspaceId, subjectId),
+                providersFor(principal.workspaceId, subjectId, principal),
             }
           : {}),
       });