@open-mercato/ai-assistant 0.6.8-develop.7049.1.b41427429a → 0.6.8-develop.7051.1.2e20648fd5

package/dist/modules/ai_assistant/ai-tools/search-pack.js

@@ -1,5 +1,49 @@
 import { z } from "zod";
+import {
+  canReadSearchEntity,
+  filterSearchResultsByEntityAccess,
+  resolveReadableEntityTypes
+} from "@open-mercato/shared/lib/search/entityAccess";
 import { defineAiTool } from "../lib/ai-tool-definition.js";
+class SearchToolAuthorizationError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "SearchToolAuthorizationError";
+  }
+}
+function resolveSearchIndexer(ctx) {
+  try {
+    const indexer = ctx.container.resolve("searchIndexer");
+    if (indexer && typeof indexer.getEntityConfig === "function" && typeof indexer.getAllEntityConfigs === "function") {
+      return indexer;
+    }
+  } catch {
+  }
+  throw new SearchToolAuthorizationError("[internal] Search entity registry unavailable");
+}
+function authorizeEntityAccess(entityType, lookup, subject) {
+  if (subject.isSuperAdmin) return;
+  let denial;
+  const allowed = canReadSearchEntity(entityType, lookup, subject, {
+    onDeny: (_, reason) => {
+      denial = reason;
+    }
+  });
+  if (allowed) return;
+  if (denial === "unconfigured") {
+    throw new SearchToolAuthorizationError(`[internal] Entity type "${entityType}" is not configured for search`);
+  }
+  if (denial === "no-acl-features") {
+    throw new SearchToolAuthorizationError(
+      `[internal] Entity type "${entityType}" does not declare aclFeatures; access denied`
+    );
+  }
+  const config = lookup.getEntityConfig(entityType);
+  const required = config?.aclFeatures ?? [];
+  throw new SearchToolAuthorizationError(
+    `[internal] Insufficient permissions for entity "${entityType}". Required: ${required.join(", ")}`
+  );
+}
 const hybridSearchInput = z.object({
   q: z.string().min(1).describe("Search query text."),
   limit: z.number().int().min(1).max(100).optional().describe("Maximum results (default 20, max 100)."),
@@ -21,13 +65,49 @@ const hybridSearchTool = defineAiTool({
     const service = ctx.container.resolve("searchService");
     const limit = input.limit ?? 20;
     const started = Date.now();
-    const results = await service.search(input.q, {
+    const subject = {
+      grantedFeatures: ctx.userFeatures,
+      isSuperAdmin: ctx.isSuperAdmin
+    };
+    if (ctx.isSuperAdmin) {
+      const results2 = await service.search(input.q, {
+        tenantId: ctx.tenantId,
+        organizationId: ctx.organizationId,
+        limit,
+        strategies: input.strategies,
+        entityTypes: input.entityTypes
+      });
+      const timingMs2 = Date.now() - started;
+      const strategiesUsed2 = Array.from(
+        new Set(results2.map((result) => result.source).filter((id) => typeof id === "string"))
+      );
+      return {
+        query: input.q,
+        totalResults: results2.length,
+        results: results2,
+        strategiesUsed: strategiesUsed2,
+        timing: { ms: timingMs2 }
+      };
+    }
+    const lookup = resolveSearchIndexer(ctx);
+    const readableEntityTypes = resolveReadableEntityTypes(lookup, subject, input.entityTypes);
+    if (readableEntityTypes && readableEntityTypes.length === 0) {
+      return {
+        query: input.q,
+        totalResults: 0,
+        results: [],
+        strategiesUsed: [],
+        timing: { ms: Date.now() - started }
+      };
+    }
+    const rawResults = await service.search(input.q, {
       tenantId: ctx.tenantId,
       organizationId: ctx.organizationId,
       limit,
       strategies: input.strategies,
-      entityTypes: input.entityTypes
+      entityTypes: readableEntityTypes
     });
+    const results = filterSearchResultsByEntityAccess(rawResults, lookup, subject);
     const timingMs = Date.now() - started;
     const strategiesUsed = Array.from(
       new Set(results.map((result) => result.source).filter((id) => typeof id === "string"))
@@ -57,13 +137,23 @@ const getRecordContextTool = defineAiTool({
       throw new Error("Tenant context is required for search.get_record_context");
     }
     const input = getRecordContextInput.parse(rawInput);
+    const subject = {
+      grantedFeatures: ctx.userFeatures,
+      isSuperAdmin: ctx.isSuperAdmin
+    };
+    let lookup;
+    if (!ctx.isSuperAdmin) {
+      lookup = resolveSearchIndexer(ctx);
+      authorizeEntityAccess(input.entityId, lookup, subject);
+    }
     const service = ctx.container.resolve("searchService");
-    const results = await service.search(input.recordId, {
+    const rawResults = await service.search(input.recordId, {
       tenantId: ctx.tenantId,
       organizationId: ctx.organizationId,
       limit: 5,
       entityTypes: [input.entityId]
     });
+    const results = lookup ? filterSearchResultsByEntityAccess(rawResults, lookup, subject) : rawResults;
     const match = results.find((result) => result.recordId === input.recordId);
     if (!match) {
       return {

package/dist/modules/ai_assistant/ai-tools/search-pack.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/ai_assistant/ai-tools/search-pack.ts"],
-  "sourcesContent": ["/**\n * General-purpose `search.*` tool pack (Phase 1 WS-C, Step 3.8).\n *\n * These tools are discovered by the generator alongside any other module\n * `ai-tools.ts`; they expose the existing `@open-mercato/search` runtime to\n * agents that whitelist them via `allowedTools`.\n */\nimport { z } from 'zod'\nimport type { SearchOptions, SearchResult, SearchStrategyId } from '@open-mercato/shared/modules/search'\nimport { defineAiTool } from '../lib/ai-tool-definition'\nimport type { AiToolDefinition } from '../lib/types'\n\ntype SearchServiceLike = {\n  search: (query: string, options: SearchOptions) => Promise<SearchResult[]>\n}\n\nconst hybridSearchInput = z.object({\n  q: z.string().min(1).describe('Search query text.'),\n  limit: z\n    .number()\n    .int()\n    .min(1)\n    .max(100)\n    .optional()\n    .describe('Maximum results (default 20, max 100).'),\n  strategies: z\n    .array(z.enum(['fulltext', 'vector', 'tokens']))\n    .optional()\n    .describe('Subset of strategies to run; defaults to the module defaults.'),\n  entityTypes: z\n    .array(z.string())\n    .optional()\n    .describe('Filter to specific entity ids (e.g. \"catalog:product\").'),\n})\n\nconst hybridSearchTool = defineAiTool({\n  name: 'search.hybrid_search',\n  displayName: 'Hybrid search',\n  description:\n    'Run a global fulltext + vector + token search across enabled entities for the current tenant/organization.',\n  inputSchema: hybridSearchInput,\n  requiredFeatures: ['search.view'],\n  tags: ['read', 'search'],\n  handler: async (rawInput, ctx) => {\n    if (!ctx.tenantId) {\n      throw new Error('Tenant context is required for search.hybrid_search')\n    }\n    const input = hybridSearchInput.parse(rawInput)\n    const service = ctx.container.resolve<SearchServiceLike>('searchService')\n    const limit = input.limit ?? 20\n    const started = Date.now()\n    const results = await service.search(input.q, {\n      tenantId: ctx.tenantId,\n      organizationId: ctx.organizationId,\n      limit,\n      strategies: input.strategies as SearchStrategyId[] | undefined,\n      entityTypes: input.entityTypes,\n    })\n    const timingMs = Date.now() - started\n    const strategiesUsed = Array.from(\n      new Set(results.map((result) => result.source).filter((id): id is SearchStrategyId => typeof id === 'string')),\n    )\n    return {\n      query: input.q,\n      totalResults: results.length,\n      results,\n      strategiesUsed,\n      timing: { ms: timingMs },\n    }\n  },\n})\n\nconst getRecordContextInput = z.object({\n  entityId: z.string().min(1).describe('Entity identifier (e.g. \"customers:customer_person_profile\").'),\n  recordId: z.string().min(1).describe('Record primary key (UUID).'),\n})\n\nconst getRecordContextTool = defineAiTool({\n  name: 'search.get_record_context',\n  displayName: 'Get record context',\n  description:\n    'Resolve presenter, links, and URL for a specific record by re-querying the search index. Returns { found: false } when no hit matches the recordId.',\n  inputSchema: getRecordContextInput,\n  requiredFeatures: ['search.view'],\n  tags: ['read', 'search'],\n  handler: async (rawInput, ctx) => {\n    if (!ctx.tenantId) {\n      throw new Error('Tenant context is required for search.get_record_context')\n    }\n    const input = getRecordContextInput.parse(rawInput)\n    const service = ctx.container.resolve<SearchServiceLike>('searchService')\n    const results = await service.search(input.recordId, {\n      tenantId: ctx.tenantId,\n      organizationId: ctx.organizationId,\n      limit: 5,\n      entityTypes: [input.entityId],\n    })\n    const match = results.find((result) => result.recordId === input.recordId)\n    if (!match) {\n      return {\n        found: false as const,\n        entityId: input.entityId,\n        recordId: input.recordId,\n      }\n    }\n    return {\n      found: true as const,\n      entityId: match.entityId,\n      recordId: match.recordId,\n      presenter: match.presenter,\n      url: match.url,\n      links: match.links,\n      metadata: match.metadata,\n      source: match.source,\n      score: match.score,\n    }\n  },\n})\n\nexport const searchAiTools: AiToolDefinition<any, any>[] = [hybridSearchTool, getRecordContextTool]\n\nexport default searchAiTools\n"],
-  "mappings": "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",
-  "names": []
+  "sourcesContent": ["/**\n * General-purpose `search.*` tool pack (Phase 1 WS-C, Step 3.8).\n *\n * These tools are discovered by the generator alongside any other module\n * `ai-tools.ts`; they expose the existing `@open-mercato/search` runtime to\n * agents that whitelist them via `allowedTools`.\n */\nimport { z } from 'zod'\nimport type { SearchOptions, SearchResult, SearchStrategyId } from '@open-mercato/shared/modules/search'\nimport {\n  canReadSearchEntity,\n  filterSearchResultsByEntityAccess,\n  resolveReadableEntityTypes,\n  type SearchEntityAccessSubject,\n  type SearchEntityConfigLookup,\n  type SearchEntityDenyReason,\n} from '@open-mercato/shared/lib/search/entityAccess'\nimport { defineAiTool } from '../lib/ai-tool-definition'\nimport type { AiToolDefinition, McpToolContext } from '../lib/types'\n\ntype SearchServiceLike = {\n  search: (query: string, options: SearchOptions) => Promise<SearchResult[]>\n}\n\nclass SearchToolAuthorizationError extends Error {\n  constructor(message: string) {\n    super(message)\n    this.name = 'SearchToolAuthorizationError'\n  }\n}\n\nfunction resolveSearchIndexer(ctx: McpToolContext): SearchEntityConfigLookup {\n  try {\n    const indexer = ctx.container.resolve('searchIndexer') as SearchEntityConfigLookup | undefined\n    if (indexer && typeof indexer.getEntityConfig === 'function' && typeof indexer.getAllEntityConfigs === 'function') {\n      return indexer\n    }\n  } catch {\n    // fall through to throw\n  }\n  throw new SearchToolAuthorizationError('[internal] Search entity registry unavailable')\n}\n\nfunction authorizeEntityAccess(\n  entityType: string,\n  lookup: SearchEntityConfigLookup,\n  subject: SearchEntityAccessSubject,\n): void {\n  if (subject.isSuperAdmin) return\n  let denial: SearchEntityDenyReason | undefined\n  const allowed = canReadSearchEntity(entityType, lookup, subject, {\n    onDeny: (_, reason) => {\n      denial = reason\n    },\n  })\n  if (allowed) return\n  if (denial === 'unconfigured') {\n    throw new SearchToolAuthorizationError(`[internal] Entity type \"${entityType}\" is not configured for search`)\n  }\n  if (denial === 'no-acl-features') {\n    throw new SearchToolAuthorizationError(\n      `[internal] Entity type \"${entityType}\" does not declare aclFeatures; access denied`,\n    )\n  }\n  const config = lookup.getEntityConfig(entityType)\n  const required = config?.aclFeatures ?? []\n  throw new SearchToolAuthorizationError(\n    `[internal] Insufficient permissions for entity \"${entityType}\". Required: ${required.join(', ')}`,\n  )\n}\n\nconst hybridSearchInput = z.object({\n  q: z.string().min(1).describe('Search query text.'),\n  limit: z\n    .number()\n    .int()\n    .min(1)\n    .max(100)\n    .optional()\n    .describe('Maximum results (default 20, max 100).'),\n  strategies: z\n    .array(z.enum(['fulltext', 'vector', 'tokens']))\n    .optional()\n    .describe('Subset of strategies to run; defaults to the module defaults.'),\n  entityTypes: z\n    .array(z.string())\n    .optional()\n    .describe('Filter to specific entity ids (e.g. \"catalog:product\").'),\n})\n\nconst hybridSearchTool = defineAiTool({\n  name: 'search.hybrid_search',\n  displayName: 'Hybrid search',\n  description:\n    'Run a global fulltext + vector + token search across enabled entities for the current tenant/organization.',\n  inputSchema: hybridSearchInput,\n  requiredFeatures: ['search.view'],\n  tags: ['read', 'search'],\n  handler: async (rawInput, ctx) => {\n    if (!ctx.tenantId) {\n      throw new Error('Tenant context is required for search.hybrid_search')\n    }\n    const input = hybridSearchInput.parse(rawInput)\n    const service = ctx.container.resolve<SearchServiceLike>('searchService')\n    const limit = input.limit ?? 20\n    const started = Date.now()\n    const subject: SearchEntityAccessSubject = {\n      grantedFeatures: ctx.userFeatures,\n      isSuperAdmin: ctx.isSuperAdmin,\n    }\n\n    if (ctx.isSuperAdmin) {\n      const results = await service.search(input.q, {\n        tenantId: ctx.tenantId,\n        organizationId: ctx.organizationId,\n        limit,\n        strategies: input.strategies as SearchStrategyId[] | undefined,\n        entityTypes: input.entityTypes,\n      })\n      const timingMs = Date.now() - started\n      const strategiesUsed = Array.from(\n        new Set(results.map((result) => result.source).filter((id): id is SearchStrategyId => typeof id === 'string')),\n      )\n      return {\n        query: input.q,\n        totalResults: results.length,\n        results,\n        strategiesUsed,\n        timing: { ms: timingMs },\n      }\n    }\n\n    const lookup = resolveSearchIndexer(ctx)\n    const readableEntityTypes = resolveReadableEntityTypes(lookup, subject, input.entityTypes)\n    if (readableEntityTypes && readableEntityTypes.length === 0) {\n      return {\n        query: input.q,\n        totalResults: 0,\n        results: [],\n        strategiesUsed: [],\n        timing: { ms: Date.now() - started },\n      }\n    }\n\n    const rawResults = await service.search(input.q, {\n      tenantId: ctx.tenantId,\n      organizationId: ctx.organizationId,\n      limit,\n      strategies: input.strategies as SearchStrategyId[] | undefined,\n      entityTypes: readableEntityTypes,\n    })\n    const results = filterSearchResultsByEntityAccess(rawResults, lookup, subject)\n    const timingMs = Date.now() - started\n    const strategiesUsed = Array.from(\n      new Set(results.map((result) => result.source).filter((id): id is SearchStrategyId => typeof id === 'string')),\n    )\n    return {\n      query: input.q,\n      totalResults: results.length,\n      results,\n      strategiesUsed,\n      timing: { ms: timingMs },\n    }\n  },\n})\n\nconst getRecordContextInput = z.object({\n  entityId: z.string().min(1).describe('Entity identifier (e.g. \"customers:customer_person_profile\").'),\n  recordId: z.string().min(1).describe('Record primary key (UUID).'),\n})\n\nconst getRecordContextTool = defineAiTool({\n  name: 'search.get_record_context',\n  displayName: 'Get record context',\n  description:\n    'Resolve presenter, links, and URL for a specific record by re-querying the search index. Returns { found: false } when no hit matches the recordId.',\n  inputSchema: getRecordContextInput,\n  requiredFeatures: ['search.view'],\n  tags: ['read', 'search'],\n  handler: async (rawInput, ctx) => {\n    if (!ctx.tenantId) {\n      throw new Error('Tenant context is required for search.get_record_context')\n    }\n    const input = getRecordContextInput.parse(rawInput)\n    const subject: SearchEntityAccessSubject = {\n      grantedFeatures: ctx.userFeatures,\n      isSuperAdmin: ctx.isSuperAdmin,\n    }\n\n    let lookup: SearchEntityConfigLookup | undefined\n    if (!ctx.isSuperAdmin) {\n      lookup = resolveSearchIndexer(ctx)\n      authorizeEntityAccess(input.entityId, lookup, subject)\n    }\n\n    const service = ctx.container.resolve<SearchServiceLike>('searchService')\n    const rawResults = await service.search(input.recordId, {\n      tenantId: ctx.tenantId,\n      organizationId: ctx.organizationId,\n      limit: 5,\n      entityTypes: [input.entityId],\n    })\n    const results = lookup ? filterSearchResultsByEntityAccess(rawResults, lookup, subject) : rawResults\n    const match = results.find((result) => result.recordId === input.recordId)\n    if (!match) {\n      return {\n        found: false as const,\n        entityId: input.entityId,\n        recordId: input.recordId,\n      }\n    }\n    return {\n      found: true as const,\n      entityId: match.entityId,\n      recordId: match.recordId,\n      presenter: match.presenter,\n      url: match.url,\n      links: match.links,\n      metadata: match.metadata,\n      source: match.source,\n      score: match.score,\n    }\n  },\n})\n\nexport const searchAiTools: AiToolDefinition<any, any>[] = [hybridSearchTool, getRecordContextTool]\n\nexport default searchAiTools\n"],
+  "mappings": "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",
+  "names": ["results", "timingMs", "strategiesUsed"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/ai-assistant",
-  "version": "0.6.8-develop.7049.1.b41427429a",
+  "version": "0.6.8-develop.7051.1.2e20648fd5",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -99,16 +99,16 @@
     "zod-to-json-schema": "^3.25.2"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.8-develop.7049.1.b41427429a",
-    "@open-mercato/ui": "0.6.8-develop.7049.1.b41427429a",
+    "@open-mercato/shared": "0.6.8-develop.7051.1.2e20648fd5",
+    "@open-mercato/ui": "0.6.8-develop.7051.1.2e20648fd5",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "zod": ">=3.23.0"
   },
   "devDependencies": {
-    "@open-mercato/cli": "0.6.8-develop.7049.1.b41427429a",
-    "@open-mercato/shared": "0.6.8-develop.7049.1.b41427429a",
-    "@open-mercato/ui": "0.6.8-develop.7049.1.b41427429a",
+    "@open-mercato/cli": "0.6.8-develop.7051.1.2e20648fd5",
+    "@open-mercato/shared": "0.6.8-develop.7051.1.2e20648fd5",
+    "@open-mercato/ui": "0.6.8-develop.7051.1.2e20648fd5",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
     "react": "19.2.8",

package/src/modules/ai_assistant/__tests__/integration/ws-c-tool-pack-coverage.test.ts

@@ -156,10 +156,15 @@ describe('WS-C integration — tool-pack coverage', () => {
 
     it('propagates tenantId + organizationId to the search service call', async () => {
       const searchMock = jest.fn().mockResolvedValue([])
+      const searchIndexerMock = {
+        getEntityConfig: (entityId: string) => ({ entityId, aclFeatures: ['ai_assistant.view'], enabled: true } as any),
+        getAllEntityConfigs: () => [{ entityId: 'test:entity', aclFeatures: ['ai_assistant.view'], enabled: true } as any],
+      }
       const ctx = makeCtx({
         container: {
           resolve: (name: string) => {
             if (name === 'searchService') return { search: searchMock }
+            if (name === 'searchIndexer') return searchIndexerMock
             throw new Error(`Unknown registration: ${name}`)
           },
         },

package/src/modules/ai_assistant/ai-tools/__tests__/search-pack.test.ts

@@ -2,7 +2,8 @@
  * Step 3.8 — `search.*` tool pack unit tests.
  *
  * Covers `search.hybrid_search` happy path and `search.get_record_context`
- * happy / miss / tenant isolation.
+ * happy / miss / tenant isolation, plus per-entity ACL enforcement for
+ * issue #5211 (legacy pack must not leak records the caller cannot view).
  */
 import searchAiTools from '../search-pack'
 
@@ -57,6 +58,19 @@ function makeSearchService(results: unknown[]): {
   }
 }
 
+function makeLookup(configs: Array<{ entityId: string; aclFeatures?: string[]; enabled?: boolean }>) {
+  const map = new Map(configs.map((c) => [c.entityId, c]))
+  return {
+    getEntityConfig: (entityId: string) => map.get(entityId) as any,
+    getAllEntityConfigs: () => configs as any,
+  }
+}
+
+function permissiveLookup(entityIds: string[] = ['catalog:product']) {
+  const configs = entityIds.map((id) => ({ entityId: id, aclFeatures: ['search.view'], enabled: true }))
+  return makeLookup(configs)
+}
+
 describe('search.hybrid_search', () => {
   const tool = findTool('search.hybrid_search')
 
@@ -71,8 +85,10 @@ describe('search.hybrid_search', () => {
       },
     ])
     const ctx = makeCtx()
+    const lookup = permissiveLookup(['catalog:product'])
     ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
       if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
       throw new Error(`unexpected resolve ${name}`)
     })
     const result = (await tool.handler(
@@ -95,7 +111,12 @@ describe('search.hybrid_search', () => {
   it('defaults limit to 20 when omitted', async () => {
     const { service, calls } = makeSearchService([])
     const ctx = makeCtx()
-    ;(ctx.container.resolve as jest.Mock).mockReturnValue(service)
+    const lookup = permissiveLookup(['catalog:product'])
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      return undefined
+    })
     await tool.handler({ q: 'hello' }, ctx as any)
     expect(calls[0].options.limit).toBe(20)
   })
@@ -105,6 +126,105 @@ describe('search.hybrid_search', () => {
     ;(ctx.container.resolve as jest.Mock).mockReturnValue({ search: jest.fn() })
     await expect(tool.handler({ q: 'x' }, ctx as any)).rejects.toThrow(/Tenant context/)
   })
+
+  it('withholds results for entity types the caller cannot view', async () => {
+    const lookup = makeLookup([
+      { entityId: 'customers:customer_person_profile', aclFeatures: ['customers.people.view'], enabled: true },
+      { entityId: 'catalog:catalog_product', aclFeatures: ['catalog.products.view'], enabled: true },
+    ])
+    const { service, calls } = makeSearchService([
+      { entityId: 'customers:customer_person_profile', recordId: 'p1', score: 0.9, source: 'fulltext', presenter: { title: 'Person' } },
+      { entityId: 'catalog:catalog_product', recordId: 'c1', score: 0.8, source: 'fulltext', presenter: { title: 'Product' } },
+    ])
+    const ctx = makeCtx({ userFeatures: ['search.view', 'customers.people.view'] })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected resolve ${name}`)
+    })
+    const result = (await tool.handler({ q: 'test' }, ctx as any)) as Record<string, unknown>
+    // Should have narrowed entityTypes to only readable type
+    expect((calls[0].options as any).entityTypes).toEqual(['customers:customer_person_profile'])
+    // Defense in depth: results filtered to only readable
+    expect(result.totalResults).toBe(1)
+    expect((result.results as any[])[0].entityId).toBe('customers:customer_person_profile')
+  })
+
+  it('short-circuits without calling search when no entity type is readable for an explicit request', async () => {
+    const lookup = makeLookup([
+      { entityId: 'catalog:catalog_product', aclFeatures: ['catalog.products.view'], enabled: true },
+    ])
+    const { service, calls } = makeSearchService([
+      { entityId: 'catalog:catalog_product', recordId: 'c1', score: 0.8, source: 'fulltext' },
+    ])
+    const ctx = makeCtx({ userFeatures: ['search.view'] })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected ${name}`)
+    })
+    const result = (await tool.handler({ q: 'test', entityTypes: ['catalog:catalog_product'] }, ctx as any)) as Record<string, unknown>
+    expect(calls).toHaveLength(0)
+    expect(result.totalResults).toBe(0)
+    expect(result.results).toEqual([])
+  })
+
+  it('intersects an explicitly requested mixed set with the readable set', async () => {
+    const lookup = makeLookup([
+      { entityId: 'customers:customer_person_profile', aclFeatures: ['customers.people.view'], enabled: true },
+      { entityId: 'catalog:catalog_product', aclFeatures: ['catalog.products.view'], enabled: true },
+      { entityId: 'secret:thing', aclFeatures: ['secret.view'], enabled: true },
+    ])
+    const { service, calls } = makeSearchService([
+      { entityId: 'customers:customer_person_profile', recordId: 'p1', score: 0.9, source: 'fulltext' },
+      { entityId: 'catalog:catalog_product', recordId: 'c1', score: 0.8, source: 'fulltext' },
+    ])
+    const ctx = makeCtx({ userFeatures: ['search.view', 'customers.people.view'] })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected ${name}`)
+    })
+    await tool.handler({ q: 'test', entityTypes: ['customers:customer_person_profile', 'catalog:catalog_product', 'secret:thing'] }, ctx as any)
+    expect((calls[0].options as any).entityTypes).toEqual(['customers:customer_person_profile'])
+  })
+
+  it('drops results a strategy returned for an unreadable entity type (defense in depth)', async () => {
+    const lookup = makeLookup([
+      { entityId: 'customers:customer_person_profile', aclFeatures: ['customers.people.view'], enabled: true },
+      { entityId: 'secret:thing', aclFeatures: ['secret.view'], enabled: true },
+    ])
+    const { service } = makeSearchService([
+      { entityId: 'customers:customer_person_profile', recordId: 'p1', score: 0.9, source: 'fulltext' },
+      { entityId: 'secret:thing', recordId: 's1', score: 0.8, source: 'fulltext' },
+    ])
+    const ctx = makeCtx({ userFeatures: ['search.view', 'customers.people.view'] })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected ${name}`)
+    })
+    const result = (await tool.handler({ q: 'test' }, ctx as any)) as Record<string, unknown>
+    expect((result.results as any[]).every((r: any) => r.entityId === 'customers:customer_person_profile')).toBe(true)
+  })
+
+  it('allows a superadmin to see all requested entity types', async () => {
+    const lookup = makeLookup([
+      { entityId: 'secret:thing', aclFeatures: ['secret.view'], enabled: true },
+    ])
+    const { service, calls } = makeSearchService([
+      { entityId: 'secret:thing', recordId: 's1', score: 0.8, source: 'fulltext' },
+    ])
+    const ctx = makeCtx({ userFeatures: [], isSuperAdmin: true })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected ${name}`)
+    })
+    const result = (await tool.handler({ q: 'test', entityTypes: ['secret:thing'] }, ctx as any)) as Record<string, unknown>
+    expect(calls[0].options.entityTypes).toEqual(['secret:thing'])
+    expect(result.totalResults).toBe(1)
+  })
 })
 
 describe('search.get_record_context', () => {
@@ -125,7 +245,12 @@ describe('search.get_record_context', () => {
       match,
     ])
     const ctx = makeCtx()
-    ;(ctx.container.resolve as jest.Mock).mockReturnValue(service)
+    const lookup = permissiveLookup(['catalog:product'])
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected ${name}`)
+    })
     const result = (await tool.handler(
       { entityId: 'catalog:product', recordId: 'rec-42' },
       ctx as any,
@@ -149,7 +274,12 @@ describe('search.get_record_context', () => {
       { entityId: 'catalog:product', recordId: 'other', score: 0.2, source: 'fulltext' },
     ])
     const ctx = makeCtx()
-    ;(ctx.container.resolve as jest.Mock).mockReturnValue(service)
+    const lookup = permissiveLookup(['catalog:product'])
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected ${name}`)
+    })
     const result = (await tool.handler(
       { entityId: 'catalog:product', recordId: 'missing' },
       ctx as any,
@@ -161,7 +291,12 @@ describe('search.get_record_context', () => {
   it('passes the caller tenant/org and never leaks another tenant', async () => {
     const { service, calls } = makeSearchService([])
     const ctx = makeCtx({ tenantId: 'tenant-A', organizationId: 'org-A' })
-    ;(ctx.container.resolve as jest.Mock).mockReturnValue(service)
+    const lookup = permissiveLookup(['x:y'])
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected ${name}`)
+    })
     await tool.handler({ entityId: 'x:y', recordId: 'z' }, ctx as any)
     expect(calls[0].options).toMatchObject({
       tenantId: 'tenant-A',
@@ -177,6 +312,77 @@ describe('search.get_record_context', () => {
       tool.handler({ entityId: 'x:y', recordId: 'z' }, ctx as any),
     ).rejects.toThrow(/Tenant context/)
   })
+
+  it('rejects an explicitly requested unauthorized entity type', async () => {
+    const lookup = makeLookup([
+      { entityId: 'customers:customer_person_profile', aclFeatures: ['customers.people.view'], enabled: true },
+    ])
+    const { service } = makeSearchService([])
+    const ctx = makeCtx({ userFeatures: ['search.view'] })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected ${name}`)
+    })
+    await expect(
+      tool.handler({ entityId: 'customers:customer_person_profile', recordId: 'rec-1' }, ctx as any),
+    ).rejects.toThrow(/Insufficient permissions/)
+  })
+
+  it('allows an authorized caller to retrieve record context', async () => {
+    const lookup = makeLookup([
+      { entityId: 'customers:customer_person_profile', aclFeatures: ['customers.people.view'], enabled: true },
+    ])
+    const { service } = makeSearchService([
+      { entityId: 'customers:customer_person_profile', recordId: 'rec-1', score: 1, source: 'fulltext', presenter: { title: 'Person' }, url: '/backend/customers/people/rec-1', links: [] },
+    ])
+    const ctx = makeCtx({ userFeatures: ['search.view', 'customers.people.view'] })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected ${name}`)
+    })
+    const result = (await tool.handler({ entityId: 'customers:customer_person_profile', recordId: 'rec-1' }, ctx as any)) as Record<string, unknown>
+    expect(result.found).toBe(true)
+    expect((result as any).presenter.title).toBe('Person')
+  })
+
+  it('filters stray results a strategy returned for an unreadable entity (defense in depth)', async () => {
+    const lookup = makeLookup([
+      { entityId: 'customers:customer_person_profile', aclFeatures: ['customers.people.view'], enabled: true },
+      { entityId: 'secret:thing', aclFeatures: ['secret.view'], enabled: true },
+    ])
+    // User can read person, but strategy returns secret thing for same recordId
+    const { service } = makeSearchService([
+      { entityId: 'secret:thing', recordId: 'rec-1', score: 1, source: 'fulltext', presenter: { title: 'Secret' } },
+    ])
+    const ctx = makeCtx({ userFeatures: ['search.view', 'customers.people.view'] })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected ${name}`)
+    })
+    // Requesting person, but backend returned secret – should be filtered to not found
+    const result = (await tool.handler({ entityId: 'customers:customer_person_profile', recordId: 'rec-1' }, ctx as any)) as Record<string, unknown>
+    expect(result.found).toBe(false)
+  })
+
+  it('allows a superadmin to retrieve any record context', async () => {
+    const lookup = makeLookup([
+      { entityId: 'secret:thing', aclFeatures: ['secret.view'], enabled: true },
+    ])
+    const { service } = makeSearchService([
+      { entityId: 'secret:thing', recordId: 'rec-1', score: 1, source: 'fulltext', presenter: { title: 'Secret' }, url: '/x', links: [] },
+    ])
+    const ctx = makeCtx({ userFeatures: [], isSuperAdmin: true })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      throw new Error(`unexpected ${name}`)
+    })
+    const result = (await tool.handler({ entityId: 'secret:thing', recordId: 'rec-1' }, ctx as any)) as Record<string, unknown>
+    expect(result.found).toBe(true)
+  })
 })
 
 describe('search-pack tool surface', () => {

package/src/modules/ai_assistant/ai-tools/search-pack.ts

@@ -7,13 +7,68 @@
  */
 import { z } from 'zod'
 import type { SearchOptions, SearchResult, SearchStrategyId } from '@open-mercato/shared/modules/search'
+import {
+  canReadSearchEntity,
+  filterSearchResultsByEntityAccess,
+  resolveReadableEntityTypes,
+  type SearchEntityAccessSubject,
+  type SearchEntityConfigLookup,
+  type SearchEntityDenyReason,
+} from '@open-mercato/shared/lib/search/entityAccess'
 import { defineAiTool } from '../lib/ai-tool-definition'
-import type { AiToolDefinition } from '../lib/types'
+import type { AiToolDefinition, McpToolContext } from '../lib/types'
 
 type SearchServiceLike = {
   search: (query: string, options: SearchOptions) => Promise<SearchResult[]>
 }
 
+class SearchToolAuthorizationError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = 'SearchToolAuthorizationError'
+  }
+}
+
+function resolveSearchIndexer(ctx: McpToolContext): SearchEntityConfigLookup {
+  try {
+    const indexer = ctx.container.resolve('searchIndexer') as SearchEntityConfigLookup | undefined
+    if (indexer && typeof indexer.getEntityConfig === 'function' && typeof indexer.getAllEntityConfigs === 'function') {
+      return indexer
+    }
+  } catch {
+    // fall through to throw
+  }
+  throw new SearchToolAuthorizationError('[internal] Search entity registry unavailable')
+}
+
+function authorizeEntityAccess(
+  entityType: string,
+  lookup: SearchEntityConfigLookup,
+  subject: SearchEntityAccessSubject,
+): void {
+  if (subject.isSuperAdmin) return
+  let denial: SearchEntityDenyReason | undefined
+  const allowed = canReadSearchEntity(entityType, lookup, subject, {
+    onDeny: (_, reason) => {
+      denial = reason
+    },
+  })
+  if (allowed) return
+  if (denial === 'unconfigured') {
+    throw new SearchToolAuthorizationError(`[internal] Entity type "${entityType}" is not configured for search`)
+  }
+  if (denial === 'no-acl-features') {
+    throw new SearchToolAuthorizationError(
+      `[internal] Entity type "${entityType}" does not declare aclFeatures; access denied`,
+    )
+  }
+  const config = lookup.getEntityConfig(entityType)
+  const required = config?.aclFeatures ?? []
+  throw new SearchToolAuthorizationError(
+    `[internal] Insufficient permissions for entity "${entityType}". Required: ${required.join(', ')}`,
+  )
+}
+
 const hybridSearchInput = z.object({
   q: z.string().min(1).describe('Search query text.'),
   limit: z
@@ -49,13 +104,52 @@ const hybridSearchTool = defineAiTool({
     const service = ctx.container.resolve<SearchServiceLike>('searchService')
     const limit = input.limit ?? 20
     const started = Date.now()
-    const results = await service.search(input.q, {
+    const subject: SearchEntityAccessSubject = {
+      grantedFeatures: ctx.userFeatures,
+      isSuperAdmin: ctx.isSuperAdmin,
+    }
+
+    if (ctx.isSuperAdmin) {
+      const results = await service.search(input.q, {
+        tenantId: ctx.tenantId,
+        organizationId: ctx.organizationId,
+        limit,
+        strategies: input.strategies as SearchStrategyId[] | undefined,
+        entityTypes: input.entityTypes,
+      })
+      const timingMs = Date.now() - started
+      const strategiesUsed = Array.from(
+        new Set(results.map((result) => result.source).filter((id): id is SearchStrategyId => typeof id === 'string')),
+      )
+      return {
+        query: input.q,
+        totalResults: results.length,
+        results,
+        strategiesUsed,
+        timing: { ms: timingMs },
+      }
+    }
+
+    const lookup = resolveSearchIndexer(ctx)
+    const readableEntityTypes = resolveReadableEntityTypes(lookup, subject, input.entityTypes)
+    if (readableEntityTypes && readableEntityTypes.length === 0) {
+      return {
+        query: input.q,
+        totalResults: 0,
+        results: [],
+        strategiesUsed: [],
+        timing: { ms: Date.now() - started },
+      }
+    }
+
+    const rawResults = await service.search(input.q, {
       tenantId: ctx.tenantId,
       organizationId: ctx.organizationId,
       limit,
       strategies: input.strategies as SearchStrategyId[] | undefined,
-      entityTypes: input.entityTypes,
+      entityTypes: readableEntityTypes,
     })
+    const results = filterSearchResultsByEntityAccess(rawResults, lookup, subject)
     const timingMs = Date.now() - started
     const strategiesUsed = Array.from(
       new Set(results.map((result) => result.source).filter((id): id is SearchStrategyId => typeof id === 'string')),
@@ -88,13 +182,25 @@ const getRecordContextTool = defineAiTool({
       throw new Error('Tenant context is required for search.get_record_context')
     }
     const input = getRecordContextInput.parse(rawInput)
+    const subject: SearchEntityAccessSubject = {
+      grantedFeatures: ctx.userFeatures,
+      isSuperAdmin: ctx.isSuperAdmin,
+    }
+
+    let lookup: SearchEntityConfigLookup | undefined
+    if (!ctx.isSuperAdmin) {
+      lookup = resolveSearchIndexer(ctx)
+      authorizeEntityAccess(input.entityId, lookup, subject)
+    }
+
     const service = ctx.container.resolve<SearchServiceLike>('searchService')
-    const results = await service.search(input.recordId, {
+    const rawResults = await service.search(input.recordId, {
       tenantId: ctx.tenantId,
       organizationId: ctx.organizationId,
       limit: 5,
       entityTypes: [input.entityId],
     })
+    const results = lookup ? filterSearchResultsByEntityAccess(rawResults, lookup, subject) : rawResults
     const match = results.find((result) => result.recordId === input.recordId)
     if (!match) {
       return {