@bevel-software/platform-core-backend 0.32.0 → 0.34.0

package/src/modules/plugins/__tests__/plugins.tools.test.ts

@@ -13,6 +13,8 @@ import { GUIDE_FIRST_SENTENCE } from '../../tool-registry/guide-first.js';
 import { registerPluginsTools, CREATE_PLUGIN, myPluginDef, myPluginDescription } from '../plugins.tools.js';
 import { createPluginCreationRoutes } from '../plugins.routes.js';
 import { PluginProvisionError } from '../plugin-provision.service.js';
+import type { IAgentScopeResolver } from '../../agent-scope/index.js';
+import { agentFile, agentScopeOver, inMemoryKb } from '../../agent-scope/__tests__/in-memory-kb.js';
 
 /**
  * The plugin tools are DESCRIPTIONS of the app's own creation endpoints.
@@ -200,7 +202,12 @@ describe('the creation endpoints behind the key-or-session gate', () => {
 
   const externalApiKeyService = {
     looksLikeExternalApiKey: (t: string) => typeof t === 'string' && t.startsWith('bevel_'),
-    verifyAndLoadToken: async (t: string) => (t === 'bevel_alice' ? { user: ALICE, tokenId: 'tok-a' } : null),
+    verifyAndLoadToken: async (t: string) =>
+      t === 'bevel_alice'
+        ? { user: ALICE, tokenId: 'tok-a' }
+        : t === 'bevel_alice_agent'
+          ? { user: ALICE, tokenId: 'tok-b', agentPath: 'Agents/plugin-maker.agent' }
+          : null,
   } as never;
   const authService = {
     getUserById: async (id: string) => (id === ALICE.id ? ALICE : null),
@@ -211,7 +218,7 @@ describe('the creation endpoints behind the key-or-session gate', () => {
     },
   } as never;
 
-  async function start(): Promise<string> {
+  async function start(agentScope?: Pick<IAgentScopeResolver, 'resolve'>): Promise<string> {
     const internalToken = new InternalTokenService({ secret: 'test-secret' });
     const app = express();
     app.use(express.json());
@@ -224,6 +231,7 @@ describe('the creation endpoints behind the key-or-session gate', () => {
       }),
       createPluginCreationRoutes({ ensurePersonalPlugin, createPlugin } as never, async (req) =>
         req.userId ? ((await (authService as { getUserById(id: string): Promise<unknown> }).getUserById(req.userId)) as never) : null,
+        agentScope,
       ),
     );
     httpServer = await new Promise<HttpServer>((r) => {
@@ -302,4 +310,32 @@ describe('the creation endpoints behind the key-or-session gate', () => {
     );
     expect(createPlugin).not.toHaveBeenCalled();
   });
+
+  it("refuses a connection made as an .agent that does not list the tool, by name, before anything is provisioned", async () => {
+    // The agent lists `my_plugin` only. These routes are not hosted by
+    // `toolHandler`, so they make its connection-scope check themselves.
+    const kb = inMemoryKb(
+      { 'Agents/plugin-maker.agent': agentFile('name: Plugin maker\nplatformTools: [my_plugin]') },
+      { reader: ALICE.email },
+    );
+    const base = await start(agentScopeOver(kb));
+    const refused = await post(base, '/api/plugins', { name: 'GTM' }, 'bevel_alice_agent');
+    expect(refused.status).toBe(403);
+    expect(await refused.json()).toEqual({
+      error: expect.stringContaining('The tool "create_plugin" is not available to this connection'),
+      code: 'not_available_to_connection',
+    });
+    expect(createPlugin).not.toHaveBeenCalled();
+
+    // The tool it lists is served; a key made as Everything and a session are untouched.
+    expect((await post(base, '/api/plugins/personal', {}, 'bevel_alice_agent')).status).toBe(200);
+    expect((await post(base, '/api/plugins', { name: 'Ops' }, 'bevel_alice')).status).toBe(201);
+    expect((await post(base, '/api/plugins', { name: 'Fin' }, 'session-alice')).status).toBe(201);
+  });
+
+  it('a narrowed connection with no scope resolver wired loads nothing, never Everything', async () => {
+    const base = await start();
+    expect((await post(base, '/api/plugins/personal', {}, 'bevel_alice_agent')).status).toBe(403);
+    expect(ensurePersonalPlugin).not.toHaveBeenCalled();
+  });
 });

package/src/modules/plugins/compile/compile-marketplace.ts

@@ -11,8 +11,8 @@ import {
 import { BUNDLE_FILE as BUNDLE_MANIFEST_FILE } from '../discovery/bundle-dialect/bundle.source.js';
 import type { ITreeWalker } from '../../../shared/fs.contract.js';
 import { containsVariableReference } from '../../../shared/variable-refs.js';
-import { judgeMcpServerEntry } from '../../tool-manuals/mcp-json-discovery.js';
-import type { SkillSummary } from '../../skills/skills.contract.js';
+import { judgeMcpServerEntry } from '../../tool-manuals/index.js';
+import type { SkillSummary } from '../../skills/index.js';
 import type { LinkMembership } from '../plugin-links.js';
 import type { DiscoveredPlugin } from '../discovery/plugin-source.js';
 

package/src/modules/plugins/compile/marketplace-compiler.service.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
-import type { WorkspaceService } from '../../workspace/workspace.service.js';
-import type { IAccessControl } from '../../access/access-control.interface.js';
-import type { ISkillService } from '../../skills/skills.contract.js';
+import type { WorkspaceService } from '../../workspace/index.js';
+import type { IAccessControl } from '../../access/index.js';
+import type { ISkillService } from '../../skills/index.js';
 import type { KbContext } from '../../../shared/kb-context.js';
 import type { PluginLinkIndex } from '../plugin-links.js';
 import type { PluginSource } from '../discovery/plugin-source.js';

package/src/modules/plugins/discovery/bundle-dialect/registry.ts

@@ -18,7 +18,7 @@ import {
   judgeMcpServerEntry,
   type PortableHttpEntry,
   type PortableStdioEntry,
-} from '../../../tool-manuals/mcp-json-discovery.js';
+} from '../../../tool-manuals/index.js';
 
 export interface RegistryServer {
   /** The registry's own key: what a profile lists, unique across the file. */

package/src/modules/plugins/index.ts

@@ -19,7 +19,7 @@ export {
   type JoinRequestStatus,
   type JoinRequestStore,
 } from './join-request-records.store.js';
-export { PluginLinkIndex, type LinkMembership, type PluginLinks } from './plugin-links.js';
+export { PluginLinkIndex, type IPluginLinkIndex, type LinkMembership, type PluginLinks } from './plugin-links.js';
 export { PluginLinksService, PluginLinkError } from './plugin-links.service.js';
 export { PluginRenameService, PluginRenameError, renamePluginPrincipalInText } from './plugin-rename.service.js';
 export { compileMarketplace, type VirtualTree, type CompileInput, type MarketplaceOptions } from './compile/compile-marketplace.js';
@@ -39,3 +39,5 @@ export type {
   ResolvedPrincipals,
   ResolvedReaders,
 } from './plugins.contract.js';
+// Reached by other modules; exported here so they stop importing the files.
+export { BUNDLE_FILE } from './discovery/bundle-dialect/bundle.source.js';

package/src/modules/plugins/join-proposals.ts

@@ -5,8 +5,8 @@ import {
   parseOwnAccessEntries,
   type ParsedEntry,
   type Verb,
-} from '../access-model/access-grammar.js';
-import type { TargetKind } from '../access/access-mutation.service.js';
+} from '../access-model/index.js';
+import type { TargetKind } from '../access/index.js';
 
 /**
  * What a join branch is PROPOSING, relative to the default branch.

package/src/modules/plugins/join-request-jobs.service.ts

@@ -5,12 +5,12 @@ import {
   type IWorkflowService,
 } from '@bevel-software/platform-shared';
 import { DrizzleQueryError } from 'drizzle-orm';
-import { spliceGrant } from '../access-model/access-splice.js';
-import { sanitizeError } from '../workflow/sanitize-error.js';
+import { spliceGrant } from '../access-model/index.js';
+import { sanitizeError } from '../workflow/index.js';
 import { logger } from '../../shared/logging.js';
 import { printable } from '../../shared/printable.js';
 import type { KbContext } from '../../shared/kb-context.js';
-import type { WorkspaceService } from '../workspace/workspace.service.js';
+import type { WorkspaceService } from '../workspace/index.js';
 import type {
   ClaimedJoinRequest,
   JoinRequestRecord,

package/src/modules/plugins/join-request-records.store.ts

@@ -1,7 +1,7 @@
 import { and, eq, inArray, isNotNull, sql } from 'drizzle-orm';
 import type { ChangeRequestState } from '@bevel-software/platform-shared';
-import type { Database } from '../database/connection.js';
-import { changeRequests, pluginJoinRequests } from '../database/schema.js';
+import type { Database } from '../database/index.js';
+import { changeRequests, pluginJoinRequests } from '../database/index.js';
 
 /**
  * A join request as the platform recorded it — the durable "this person

package/src/modules/plugins/join-requests.service.ts

@@ -4,18 +4,18 @@ import {
   type ChangeRequest,
   type IWorkflowService,
 } from '@bevel-software/platform-shared';
-import { type WorkspaceService } from '../workspace/workspace.service.js';
+import { type WorkspaceService } from '../workspace/index.js';
 import { logger } from '../../shared/logging.js';
 
 const log = logger('plugins');
 import type { KbContext } from '../../shared/kb-context.js';
-import type { IAccessControl } from '../access/access-control.interface.js';
+import type { IAccessControl } from '../access/index.js';
 import {
   rulesFileFor,
   type AccessRequestTarget,
   type IAccessRequestLifecycle,
-} from '../access/access-requests.contract.js';
-import type { Verb } from '../access-model/access-grammar.js';
+} from '../access/index.js';
+import type { Verb } from '../access-model/index.js';
 import { pendingProposals, type JoinProposal } from './join-proposals.js';
 
 /** One open join change request, with what it still proposes. */

package/src/modules/plugins/plugin-links.service.ts

@@ -10,14 +10,14 @@ import {
   withLinkedSkillRoots,
   type AuthUser,
 } from '@bevel-software/platform-shared';
-import type { WorkspaceService } from '../workspace/workspace.service.js';
+import type { WorkspaceService } from '../workspace/index.js';
 import { isAbsence } from '../../shared/fs.contract.js';
-import type { IAccessControl } from '../access/access-control.interface.js';
-import { AccessMutationService, accessMdPathForFolder } from '../access/access-mutation.service.js';
-import { pluginPrincipalKey } from '../access-model/access-grammar.js';
-import type { Principal } from '../access-model/access-splice.js';
-import { WorkspaceMutex } from '../kb-fs/mutex.js';
-import type { ISkillService } from '../skills/skills.contract.js';
+import type { IAccessControl, IAccessMutation } from '../access/index.js';
+import { accessMdPathForFolder } from '../access/index.js';
+import { pluginPrincipalKey } from '../access-model/index.js';
+import type { Principal } from '../access-model/index.js';
+import { WorkspaceMutex } from '../kb-fs/index.js';
+import type { ISkillService } from '../skills/index.js';
 import { logger } from '../../shared/logging.js';
 import type { ProvisionCommitDriver } from './plugin-provision.service.js';
 import type { PluginLinkIndex } from './plugin-links.js';
@@ -119,12 +119,13 @@ export class PluginLinkError extends Error {
  */
 export class PluginLinksService {
   private readonly locks = new WorkspaceMutex();
-  private readonly mutation: AccessMutationService;
 
   constructor(
     private readonly workspaceService: WorkspaceService,
     private readonly commits: ProvisionCommitDriver,
     private readonly accessControl: IAccessControl,
+    /** Grants and revokes the links' tokens; the composition root owns the implementation. */
+    private readonly mutation: IAccessMutation,
     private readonly skillService: ISkillService,
     private readonly links: PluginLinkIndex,
     private readonly kb: KbContext,
@@ -132,9 +133,7 @@ export class PluginLinksService {
       emit(event: { kind: 'fs-tree-changed'; workspaceId: string; branch: string }): void;
     },
     private readonly onChanged?: () => void,
-  ) {
-    this.mutation = new AccessMutationService(workspaceService, accessControl, kb.kbDirName);
-  }
+  ) {}
 
   private get kbDirName(): string {
     return this.kb.kbDirName;

package/src/modules/plugins/plugin-links.ts

@@ -3,12 +3,12 @@ import { logger } from '../../shared/logging.js';
 
 const log = logger('plugins');
 import { pluginManifestName, skillUnderRoot } from '@bevel-software/platform-shared';
-import type { WorkspaceService } from '../workspace/workspace.service.js';
+import type { WorkspaceService } from '../workspace/index.js';
 import type { KbContext } from '../../shared/kb-context.js';
-import type { IAccessControl } from '../access/access-control.interface.js';
-import type { ISkillService } from '../skills/skills.contract.js';
+import type { IAccessControl } from '../access/index.js';
+import type { ISkillService } from '../skills/index.js';
 import { TtlCache } from '../../shared/ttl-cache.js';
-import { canonicalRoleName, pluginPrincipalKey } from '../access-model/access-grammar.js';
+import { canonicalRoleName, pluginPrincipalKey } from '../access-model/index.js';
 import type { PluginMembership } from './plugins.contract.js';
 import type { PluginSource } from './discovery/plugin-source.js';
 
@@ -58,10 +58,27 @@ export const LINK_GRANT_VERBS = ['read', 'write'] as const;
 export interface LinkMembership {
   /** skill path → every plugin that holds it, inline or by link. */
   bySkill: Map<string, PluginMembership[]>;
-  /** plugin folder → its links. Every plugin folder appears, linked or not. */
+  /**
+   * plugin identity (`PluginLinks.name`) → its links. Every plugin appears,
+   * linked or not. A name and a folder may differ, so a repository path is
+   * read from the value's `folder`, never from the key.
+   */
   byPlugin: Map<string, PluginLinks>;
 }
 
+/**
+ * What a reader of the link index asks it — the contract a consumer outside
+ * this module (a distribution's agent-scope resolver, through
+ * `CorePorts.agentScope`) is written against. Dropping the cache is the
+ * index owner's affair, not a reader's, so it is not here.
+ */
+export interface IPluginLinkIndex {
+  /** Every plugin's links and every skill's memberships, from the released catalog. */
+  membership(): Promise<LinkMembership>;
+  /** The memberships of one skill (empty when it is in no plugin). */
+  pluginsOf(skillPath: string): Promise<PluginMembership[]>;
+}
+
 /**
  * The link index: which shared skills each plugin links, and — the other way
  * round — which plugins each skill belongs to, whether by sitting inside the
@@ -88,7 +105,7 @@ export interface LinkMembership {
  * subscriber that drops the plugin index, so a link committed on the default
  * branch shows within one round-trip.
  */
-export class PluginLinkIndex {
+export class PluginLinkIndex implements IPluginLinkIndex {
   private readonly cache: TtlCache<LinkMembership>;
 
   constructor(

package/src/modules/plugins/plugin-provision.service.ts

@@ -51,11 +51,10 @@ import {
   type AuthUser,
 } from '@bevel-software/platform-shared';
 import type { KbContext } from '../../shared/kb-context.js';
-import type { WorkspaceService } from '../workspace/workspace.service.js';
-import type { IAccessControl } from '../access/access-control.interface.js';
-import { creatorPrincipal } from '../access-model/creator.js';
-import { spliceGrant } from '../access-model/access-splice.js';
-import { WorkspaceMutex } from '../kb-fs/mutex.js';
+import type { WorkspaceService } from '../workspace/index.js';
+import type { IAccessControl } from '../access/index.js';
+import { creatorPrincipal, spliceGrant } from '../access-model/index.js';
+import { WorkspaceMutex } from '../kb-fs/index.js';
 
 /** Commit machinery the provision rides — the pending-commit pipeline, run inline. */
 export interface ProvisionCommitDriver {

package/src/modules/plugins/plugin-rename.service.ts

@@ -10,14 +10,14 @@ import {
 import type { AuthUser } from '@bevel-software/platform-shared';
 import { PushNeedsAgentResolutionError } from '../../shared/domain-errors.js';
 import type { ITreeWalker, WalkListener } from '../../shared/fs.contract.js';
-import type { IAccessControl } from '../access/access-control.interface.js';
+import type { IAccessControl } from '../access/index.js';
 import {
   PLUGIN_TOKEN_PREFIX,
   canonicalPluginToken,
   hasAccessFrontmatterExtension,
   parsePluginPrincipalKey,
-} from '../access-model/access-grammar.js';
-import type { WorkspaceService } from '../workspace/workspace.service.js';
+} from '../access-model/index.js';
+import type { WorkspaceService } from '../workspace/index.js';
 import type { KbContext } from '../../shared/kb-context.js';
 import type { PluginSource } from './discovery/plugin-source.js';
 

package/src/modules/plugins/plugins.contract.ts

@@ -33,7 +33,7 @@
  * change requests; only the UI dresses them up.
  */
 
-export type { PluginMembership } from '../skills/skills.contract.js';
+export type { PluginMembership } from '../skills/index.js';
 
 /** Access-rule principals as the resolver hands them back. */
 export interface ResolvedPrincipals {

package/src/modules/plugins/plugins.routes.ts

@@ -2,7 +2,7 @@ import express from 'express';
 import { logger } from '../../shared/logging.js';
 
 const log = logger('plugins');
-import '../auth/auth.middleware.js'; // Express Request.userId / userEmail augmentation
+import '../auth/index.js'; // Express Request.userId / userEmail augmentation
 import {
   joinBranchFor,
   type AuthUser,
@@ -10,17 +10,19 @@ import {
   type ChangeRequestState,
   type IWorkflowService,
 } from '@bevel-software/platform-shared';
-import type { IAccessControl } from '../access/access-control.interface.js';
+import type { IAccessControl } from '../access/index.js';
 import { WorkflowDomainError } from '../../shared/domain-errors.js';
 import { domainErrorBody } from '../../shared/http-errors.js';
 import { pluginFolderBelowRoot } from './plugins.service.js';
 import type { KbContext } from '../../shared/kb-context.js';
 import { PluginProvisionError, type PluginProvisionService } from './plugin-provision.service.js';
-import { argumentsRefusal } from '../tool-helpers/route-argument-check.js';
+import { argumentsRefusal } from '../tool-helpers/index.js';
+import { resolveConnectionScope, type IAgentScopeResolver } from '../agent-scope/index.js';
+import '../tool-auth/index.js'; // Express Request.toolAuth augmentation
 import { PluginLinkError, type PluginLinksService } from './plugin-links.service.js';
 import { PluginRenameError, type PluginRenameService } from './plugin-rename.service.js';
 import type { JoinRequestsService } from './join-requests.service.js';
-import { folderTarget } from '../access/access-requests.contract.js';
+import { folderTarget } from '../access/index.js';
 import type { PluginJoinRequestJobs } from './join-request-jobs.service.js';
 import type { JoinRequestRecord } from './join-request-records.store.js';
 import type {
@@ -83,6 +85,29 @@ function refuseMismatchedArguments(req: express.Request, res: express.Response):
   return true;
 }
 
+/**
+ * Answer the connection-scope refusal when the caller's connection was made
+ * as an agent configuration that does not list `toolName`; `true` when it answered.
+ * These routes ARE the `create_plugin` and `my_plugin` tools but are not
+ * hosted by `toolHandler`, so they ask the one policy it asks —
+ * `ConnectionScope.platformToolRefusal` — and answer what it answers. A
+ * session, or a key made as Everything, carries no `agentPath` and is never
+ * refused.
+ */
+async function refuseOutsideConnectionScope(
+  req: express.Request,
+  res: express.Response,
+  user: AuthUser,
+  toolName: string,
+  agentScope: Pick<IAgentScopeResolver, 'resolve'> | undefined,
+): Promise<boolean> {
+  const scope = await resolveConnectionScope(agentScope, user.email, req.toolAuth?.agentPath);
+  const refusal = scope.platformToolRefusal(toolName);
+  if (!refusal) return false;
+  res.status(403).json(refusal);
+  return true;
+}
+
 /**
  * The two doors through which plugin folders come to exist — ONE
  * implementation each, for the app and for agents alike:
@@ -106,6 +131,8 @@ function refuseMismatchedArguments(req: express.Request, res: express.Response):
 export function createPluginCreationRoutes(
   provision: Pick<PluginProvisionService, 'createPlugin' | 'ensurePersonalPlugin'>,
   resolveUser: (req: express.Request) => Promise<AuthUser | null>,
+  /** Resolves a connection's agent choice to its scope; absent, a narrowed connection loads nothing. */
+  agentScope?: Pick<IAgentScopeResolver, 'resolve'>,
 ): express.Router {
   const router = express.Router();
 
@@ -117,8 +144,10 @@ export function createPluginCreationRoutes(
     }
     // These two routes ARE the `create_plugin` and `my_plugin` tools, so an
     // agent's call is checked against what those tools declare, exactly as a
-    // route-hosted tool's is in `toolHandler`: a call that does not match is
-    // refused before anything is provisioned.
+    // route-hosted tool's is in `toolHandler`: a call that does not match, or
+    // a connection whose agent does not list the tool, is refused before
+    // anything is provisioned.
+    if (await refuseOutsideConnectionScope(req, res, user, 'create_plugin', agentScope)) return;
     if (refuseMismatchedArguments(req, res)) return;
     // `req.body` is undefined when no JSON body was sent at all — that is a
     // 400, not a destructuring crash.
@@ -155,8 +184,10 @@ export function createPluginCreationRoutes(
     }
     // These two routes ARE the `create_plugin` and `my_plugin` tools, so an
     // agent's call is checked against what those tools declare, exactly as a
-    // route-hosted tool's is in `toolHandler`: a call that does not match is
-    // refused before anything is provisioned.
+    // route-hosted tool's is in `toolHandler`: a call that does not match, or
+    // a connection whose agent does not list the tool, is refused before
+    // anything is provisioned.
+    if (await refuseOutsideConnectionScope(req, res, user, 'my_plugin', agentScope)) return;
     if (refuseMismatchedArguments(req, res)) return;
     try {
       res.json(await provision.ensurePersonalPlugin(user));

package/src/modules/plugins/plugins.service.ts

@@ -3,13 +3,13 @@ import { logger } from '../../shared/logging.js';
 
 const log = logger('plugins');
 import path from 'node:path';
-import { isPrivateAccessMd } from '../access-model/access-grammar.js';
+import { isPrivateAccessMd } from '../access-model/index.js';
 import { isAbsence } from '../../shared/fs.contract.js';
-import type { WorkspaceService } from '../workspace/workspace.service.js';
+import type { WorkspaceService } from '../workspace/index.js';
 import type { KbContext } from '../../shared/kb-context.js';
-import type { IAccessControl } from '../access/access-control.interface.js';
-import type { ISkillService } from '../skills/skills.contract.js';
-import type { IToolManualService } from '../tool-manuals/tool-manuals.contract.js';
+import type { IAccessControl } from '../access/index.js';
+import type { ISkillService } from '../skills/index.js';
+import type { IToolManualService } from '../tool-manuals/index.js';
 import { TtlCache } from '../../shared/ttl-cache.js';
 import type { PluginCatalogEntry, IPluginIndexService } from './plugins.contract.js';
 import type { PluginLinkIndex } from './plugin-links.js';

package/src/modules/plugins/plugins.tools.ts

@@ -1,7 +1,7 @@
 import { resolveKbLayout, type KbLayout } from '@bevel-software/platform-shared';
 import type { KbContext } from '../../shared/kb-context.js';
-import type { IToolRegistry, UtcpTool } from '../tool-registry/tool.contract.js';
-import { toolDef } from '../tool-helpers/tool-def.js';
+import type { IToolRegistry, UtcpTool } from '../tool-registry/index.js';
+import { toolDef } from '../tool-helpers/index.js';
 
 /**
  * The two plugin tools an agent has, both surfaces — DESCRIPTIONS of the
@@ -112,7 +112,7 @@ export function myPluginDef(layout: KbLayout): UtcpTool {
     inputs: { type: 'object', properties: {}, additionalProperties: false },
     outputs: PROVISIONED_OUTPUT,
     // `write`: both make folders and commit — a read-scoped caller's manual
-    // must not advertise them (see `isWriteTool` in the manual routes).
+    // must not advertise them (see `declaresWrite` in `tool.contract.ts`).
     tags: ['plugins', 'skills', 'write'],
   });
 }
@@ -143,6 +143,6 @@ export const CREATE_PLUGIN: UtcpTool = toolDef({
   },
   outputs: PROVISIONED_OUTPUT,
   // `write`: both make folders and commit — a read-scoped caller's manual
-  // must not advertise them (see `isWriteTool` in the manual routes).
+  // must not advertise them (see `declaresWrite` in `tool.contract.ts`).
   tags: ['plugins', 'skills', 'write'],
 });

package/src/modules/plugins/teams.routes.ts

@@ -8,10 +8,10 @@ import {
   pluginOfPath,
   type KbLayout,
 } from '@bevel-software/platform-shared';
-import type { IAccessControl } from '../access/access-control.interface.js';
+import type { IAccessControl } from '../access/index.js';
 import type { KbContext } from '../../shared/kb-context.js';
-import type { ISkillService } from '../skills/skills.contract.js';
-import type { IToolManualService } from '../tool-manuals/tool-manuals.contract.js';
+import type { ISkillService } from '../skills/index.js';
+import type { IToolManualService } from '../tool-manuals/index.js';
 import type { IPluginIndexService, PluginCatalogEntry } from './plugins.contract.js';
 
 /**

package/src/modules/secrets-vault/__tests__/connect-pending.route.test.ts

@@ -3,6 +3,7 @@ import express from 'express';
 import { afterEach, describe, expect, it } from 'vitest';
 import { createSecretsVaultRoutes } from '../secrets-vault.routes.js';
 import { testKbContext } from '../../../__tests__/kb-context.js';
+import { ConnectionScope } from '../../agent-scope/index.js';
 
 /**
  * The aggregated `/connect/pending` surface: everything standing between the
@@ -336,6 +337,118 @@ describe('GET /api/connect/pending — readability', () => {
   });
 });
 
+describe('GET /api/connect/pending — narrowed to the agent the connection is made as', () => {
+  /**
+   * The consent step's "Connect as" choice: a connection made as an `.agent`
+   * file loads only the connectors the file lists, so the page that asks for
+   * sign-ins and keys lists only those. Two readable tools, one of which the
+   * agent loads; the agent is answered by a stub resolver over the REAL
+   * `ConnectionScope`, the one answer every agent surface asks.
+   */
+  const AGENT = { path: 'Agents/ops.agent', name: 'ops' };
+  const resolver = {
+    resolve: async (_email: string | undefined, agentPath: string | null | undefined) => {
+      if (!agentPath) return ConnectionScope.everything();
+      if (agentPath === AGENT.path) {
+        return ConnectionScope.narrowed(AGENT, { skills: [], connectors: ['Tools/weather.tool'], platformTools: null }, 'fp');
+      }
+      return ConnectionScope.gone(agentPath);
+    },
+  };
+  const twoTools = {
+    listAccessible: async () => [
+      {
+        slug: 'weather',
+        name: 'weather',
+        path: 'Tools/weather.tool',
+        type: 'http' as const,
+        variables: [{ name: 'API_KEY', scope: 'user' as const, label: null }],
+      },
+      {
+        slug: 'notion',
+        name: 'notion',
+        path: 'Tools/notion.tool',
+        type: 'mcp' as const,
+        variables: [
+          {
+            name: 'MCP_OAUTH',
+            scope: 'user' as const,
+            label: 'notion sign-in',
+            oauth: { authorizationUrl: 'https://a.example/auth', tokenUrl: 'https://a.example/token', clientId: 'cid' },
+          },
+        ],
+      },
+    ],
+  } as unknown as Parameters<typeof createSecretsVaultRoutes>[0]['toolManualService'];
+  const vault = {
+    statusFor: async (_u: string, keys: string[]) =>
+      keys.map((key) => ({
+        key,
+        adminConfigured: key === 'notion_MCP_OAUTH',
+        adminKind: key === 'notion_MCP_OAUTH' ? ('oauth' as const) : null,
+        userConfigured: false,
+        userKind: null,
+      })),
+    // A sign-in registered directly on the Secrets page: nobody's connector.
+    list: async () => [
+      { id: 's-own', key: 'MY_TOKEN', kind: 'oauth' as const, label: 'Mine', authorized: false, createdAt: new Date(), updatedAt: new Date() },
+    ],
+  } as unknown as Parameters<typeof createSecretsVaultRoutes>[0]['secretsVault'];
+
+  async function pendingAs(agent: string | null, withResolver = true) {
+    const app = express();
+    app.use(express.json());
+    app.use((req, _res, next) => {
+      req.userId = 'u1';
+      req.userEmail = 'a@x.com';
+      next();
+    });
+    app.use(
+      '/api',
+      createSecretsVaultRoutes({
+        kb: testKbContext(),
+        secretsVault: vault,
+        toolManualService: twoTools,
+        accessControl,
+        ...(withResolver ? { agents: resolver } : {}),
+        connectionProbe: {
+          probe: async () => ({ status: 'unverifiable' as const, detail: null, checkedAt: new Date() }),
+        },
+        stateSecret: 'test-secret',
+        publicBackendUrl: 'http://localhost:3000',
+        publicFrontendUrl: 'http://localhost:5173',
+      }),
+    );
+    httpServer = await new Promise<HttpServer>((resolve) => {
+      const s = app.listen(0, () => resolve(s));
+    });
+    const port = (httpServer.address() as { port: number }).port;
+    const query = agent === null ? '' : `?agent=${encodeURIComponent(agent)}`;
+    const res = await fetch(`http://127.0.0.1:${port}/api/connect/pending${query}`);
+    expect(res.status).toBe(200);
+    const body = (await res.json()) as PendingBody & { toolOAuth: { slug: string }[] };
+    return { tools: body.tools.map((t) => t.slug), signIns: body.toolOAuth.map((o) => o.slug), standalone: body.oauth.map((o) => o.id) };
+  }
+
+  it('lists everything without a choice, as before', async () => {
+    expect(await pendingAs(null)).toEqual({ tools: ['weather'], signIns: ['notion'], standalone: ['s-own'] });
+  });
+
+  it('lists only the connectors the agent loads, and no standalone sign-in', async () => {
+    expect(await pendingAs(AGENT.path)).toEqual({ tools: ['weather'], signIns: [], standalone: [] });
+  });
+
+  it('lists nothing for an agent the person cannot use: a narrowing that cannot be read is never Everything', async () => {
+    expect(await pendingAs('Agents/gone.agent')).toEqual({ tools: [], signIns: [], standalone: [] });
+    // …and the same with no resolver wired at all.
+    expect(await pendingAs(AGENT.path, false)).toEqual({ tools: [], signIns: [], standalone: [] });
+  });
+
+  it('reads an empty or blank choice as Everything', async () => {
+    expect(await pendingAs('  ')).toEqual({ tools: ['weather'], signIns: ['notion'], standalone: ['s-own'] });
+  });
+});
+
 describe('GET /api/connect/pending — OAuth scope coverage', () => {
   // A tool with an OAuth-backed var that now requires two scopes.
   const oauthTool = {

package/src/modules/secrets-vault/db-secrets-vault.service.ts

@@ -3,8 +3,8 @@ import { logger } from '../../shared/logging.js';
 
 const log = logger('vault');
 import { and, desc, eq, inArray, isNull, like, or } from 'drizzle-orm';
-import type { Database } from '../database/connection.js';
-import { secrets } from '../database/schema.js';
+import type { Database } from '../database/index.js';
+import { secrets } from '../database/index.js';
 import { TokenCrypto } from '../../shared/token-crypto.js';
 import { assertSafeFetchUrl } from '../../shared/ssrf.js';
 import {