@open-mercato/ai-assistant 0.10.1-develop.7601.1.e057b693a8 → 0.10.1-develop.7616.1.51a1f65492

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

@@ -5,6 +5,8 @@ import {
   resolveReadableEntityTypes
 } from "@open-mercato/shared/lib/search/entityAccess";
 import { defineAiTool } from "../lib/ai-tool-definition.js";
+import { resolveOrganizationScopeForRequest } from "@open-mercato/core/modules/directory/utils/organizationScope";
+import { resolveOrganizationScopeFilter } from "@open-mercato/core/modules/directory/utils/organizationScopeFilter";
 class SearchToolAuthorizationError extends Error {
   constructor(message) {
     super(message);
@@ -44,6 +46,24 @@ function authorizeEntityAccess(entityType, lookup, subject) {
     `[internal] Insufficient permissions for entity "${entityType}". Required: ${required.join(", ")}`
   );
 }
+async function resolveActorOrganizationScope(ctx) {
+  if (!ctx.userId) return { organizationId: void 0, organizationIds: void 0, denyAll: true };
+  const auth = {
+    sub: ctx.userId,
+    tenantId: ctx.tenantId,
+    orgId: ctx.organizationId,
+    isSuperAdmin: ctx.isSuperAdmin
+  };
+  const scope = await resolveOrganizationScopeForRequest({
+    container: ctx.container,
+    auth,
+    selectedId: ctx.organizationId
+  });
+  const scopeFilter = resolveOrganizationScopeFilter(scope, auth);
+  const denyAll = Array.isArray(scope.filterIds) && scope.filterIds.length === 0;
+  const organizationId = typeof scope.selectedId === "string" && scope.selectedId.trim().length > 0 ? scope.selectedId.trim() : void 0;
+  return { organizationId, organizationIds: scopeFilter.organizationIds, denyAll };
+}
 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)."),
@@ -100,9 +120,20 @@ const hybridSearchTool = defineAiTool({
         timing: { ms: Date.now() - started }
       };
     }
+    const orgScope = await resolveActorOrganizationScope(ctx);
+    if (orgScope.denyAll) {
+      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,
+      organizationId: orgScope.organizationId,
+      organizationIds: orgScope.organizationIds,
       limit,
       strategies: input.strategies,
       entityTypes: readableEntityTypes
@@ -146,10 +177,19 @@ const getRecordContextTool = defineAiTool({
       lookup = resolveSearchIndexer(ctx);
       authorizeEntityAccess(input.entityId, lookup, subject);
     }
+    const orgScope = await resolveActorOrganizationScope(ctx);
+    if (orgScope.denyAll) {
+      return {
+        found: false,
+        entityId: input.entityId,
+        recordId: input.recordId
+      };
+    }
     const service = ctx.container.resolve("searchService");
     const rawResults = await service.search(input.recordId, {
       tenantId: ctx.tenantId,
-      organizationId: ctx.organizationId,
+      organizationId: orgScope.organizationId,
+      organizationIds: orgScope.organizationIds,
       limit: 5,
       entityTypes: [input.entityId]
     });

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 {\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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",
+  "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'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'\nimport type { AuthContext } from '@open-mercato/shared/lib/auth/server'\nimport type { AwilixContainer } from 'awilix'\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\n/**\n * Resolve the actor's allowed-organization scope the same way the HTTP search\n * route does, so this tool pack can never return results outside a\n * restricted user's organization allowlist \u2014 even when their current\n * organization is null. Mirrors packages/search/.../api/search/route.ts.\n *\n * `organizationId` is the re-validated selection (`scope.selectedId`), not the\n * raw `ctx.organizationId` \u2014 `SearchOptions.organizationId` takes precedence\n * over `organizationIds` in `normalizeOrganizationFilter`, so passing the\n * unvalidated context value through would let a stale/out-of-allowlist\n * selection bypass the allowlist below.\n */\nasync function resolveActorOrganizationScope(ctx: McpToolContext): Promise<{\n  organizationId: string | undefined\n  organizationIds: string[] | undefined\n  denyAll: boolean\n}> {\n  if (!ctx.userId) return { organizationId: undefined, organizationIds: undefined, denyAll: true }\n  const auth: AuthContext = {\n    sub: ctx.userId,\n    tenantId: ctx.tenantId,\n    orgId: ctx.organizationId,\n    isSuperAdmin: ctx.isSuperAdmin,\n  }\n  const scope = await resolveOrganizationScopeForRequest({\n    container: ctx.container as unknown as AwilixContainer,\n    auth,\n    selectedId: ctx.organizationId,\n  })\n  const scopeFilter = resolveOrganizationScopeFilter(scope, auth)\n  const denyAll = Array.isArray(scope.filterIds) && scope.filterIds.length === 0\n  const organizationId = typeof scope.selectedId === 'string' && scope.selectedId.trim().length > 0\n    ? scope.selectedId.trim()\n    : undefined\n  return { organizationId, organizationIds: scopeFilter.organizationIds, denyAll }\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 orgScope = await resolveActorOrganizationScope(ctx)\n    if (orgScope.denyAll) {\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: orgScope.organizationId,\n      organizationIds: orgScope.organizationIds,\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 orgScope = await resolveActorOrganizationScope(ctx)\n    if (orgScope.denyAll) {\n      return {\n        found: false as const,\n        entityId: input.entityId,\n        recordId: input.recordId,\n      }\n    }\n\n    const service = ctx.container.resolve<SearchServiceLike>('searchService')\n    const rawResults = await service.search(input.recordId, {\n      tenantId: ctx.tenantId,\n      organizationId: orgScope.organizationId,\n      organizationIds: orgScope.organizationIds,\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.10.1-develop.7601.1.e057b693a8",
+  "version": "0.10.1-develop.7616.1.51a1f65492",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -100,16 +100,16 @@
     "zod-to-json-schema": "^3.25.2"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.10.1-develop.7601.1.e057b693a8",
-    "@open-mercato/ui": "0.10.1-develop.7601.1.e057b693a8",
+    "@open-mercato/shared": "0.10.1-develop.7616.1.51a1f65492",
+    "@open-mercato/ui": "0.10.1-develop.7616.1.51a1f65492",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "zod": ">=3.23.0"
   },
   "devDependencies": {
-    "@open-mercato/cli": "0.10.1-develop.7601.1.e057b693a8",
-    "@open-mercato/shared": "0.10.1-develop.7601.1.e057b693a8",
-    "@open-mercato/ui": "0.10.1-develop.7601.1.e057b693a8",
+    "@open-mercato/cli": "0.10.1-develop.7616.1.51a1f65492",
+    "@open-mercato/shared": "0.10.1-develop.7616.1.51a1f65492",
+    "@open-mercato/ui": "0.10.1-develop.7616.1.51a1f65492",
     "@types/react": "^19.2.18",
     "@types/react-dom": "^19.2.5",
     "react": "19.2.8",

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

@@ -42,6 +42,37 @@ function makeCtx(overrides: Partial<ToolContext> = {}): ToolContext {
   }
 }
 
+/**
+ * Builds a `container.resolve` DI mock that resolves `em`/`rbacService` so
+ * `resolveActorOrganizationScope` (issue #7808) runs the real
+ * `resolveOrganizationScopeForRequest` path instead of its no-DI fallback —
+ * needed for tests that assert the actual allowed-organization allowlist is
+ * enforced. `aclOrganizations: null` means unrestricted (same as the
+ * pre-#7808 single-current-org behavior); an array is the restricted
+ * allowlist; `[]` means explicitly denied.
+ */
+function makeOrgScopeResolver(options: {
+  aclOrganizations: string[] | null
+  isSuperAdmin?: boolean
+  knownOrgIds?: string[]
+}) {
+  const em = {
+    find: jest.fn(async (_entity: unknown, filter: { id?: { $in: string[] } }) => {
+      const ids = filter?.id?.$in ?? []
+      const known = new Set(options.knownOrgIds ?? ['org-1', 'org-2', 'org-3'])
+      return ids.filter((id) => known.has(id)).map((id) => ({ id, descendantIds: [] }))
+    }),
+  }
+  const rbacService = {
+    loadAcl: jest.fn(async () => ({
+      isSuperAdmin: options.isSuperAdmin ?? false,
+      features: [],
+      organizations: options.aclOrganizations,
+    })),
+  }
+  return { em, rbacService }
+}
+
 function makeSearchService(results: unknown[]): {
   service: { search: (query: string, options: Record<string, unknown>) => Promise<unknown[]> }
   calls: SearchCall[]
@@ -224,6 +255,8 @@ describe('search.hybrid_search', () => {
     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)
+    // Regression (#7808): superadmins must stay unfiltered — no organizationIds restriction.
+    expect(calls[0].options.organizationIds).toBeUndefined()
   })
 })
 
@@ -385,6 +418,139 @@ describe('search.get_record_context', () => {
   })
 })
 
+describe('org-allowlist enforcement (issue #7808)', () => {
+  const hybridTool = findTool('search.hybrid_search')
+  const recordContextTool = findTool('search.get_record_context')
+
+  it('hybrid_search scopes a restricted user with no current org to their organization allowlist', async () => {
+    const lookup = permissiveLookup(['catalog:product'])
+    const { service, calls } = makeSearchService([
+      { entityId: 'catalog:product', recordId: 'c1', score: 0.8, source: 'fulltext' },
+    ])
+    const { em, rbacService } = makeOrgScopeResolver({ aclOrganizations: ['org-2', 'org-3'] })
+    const ctx = makeCtx({ organizationId: null })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      if (name === 'em') return em
+      if (name === 'rbacService') return rbacService
+      throw new Error(`unexpected ${name}`)
+    })
+    const result = (await hybridTool.handler({ q: 'widget' }, ctx as any)) as Record<string, unknown>
+    expect(calls).toHaveLength(1)
+    expect(calls[0].options.organizationIds).toEqual(['org-2', 'org-3'])
+    expect(result.totalResults).toBe(1)
+  })
+
+  it('hybrid_search denies a restricted user whose allowlist is explicitly empty, without calling search', async () => {
+    const lookup = permissiveLookup(['catalog:product'])
+    const { service, calls } = makeSearchService([
+      { entityId: 'catalog:product', recordId: 'c1', score: 0.8, source: 'fulltext' },
+    ])
+    const { em, rbacService } = makeOrgScopeResolver({ aclOrganizations: [] })
+    const ctx = makeCtx({ organizationId: null })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      if (name === 'em') return em
+      if (name === 'rbacService') return rbacService
+      throw new Error(`unexpected ${name}`)
+    })
+    const result = (await hybridTool.handler({ q: 'widget' }, ctx as any)) as Record<string, unknown>
+    expect(calls).toHaveLength(0)
+    expect(result.totalResults).toBe(0)
+    expect(result.results).toEqual([])
+  })
+
+  it('hybrid_search leaves a superadmin unfiltered regardless of the ACL allowlist', async () => {
+    const lookup = permissiveLookup(['catalog:product'])
+    const { service, calls } = makeSearchService([
+      { entityId: 'catalog:product', recordId: 'c1', score: 0.8, source: 'fulltext' },
+    ])
+    const { em, rbacService } = makeOrgScopeResolver({ aclOrganizations: [], isSuperAdmin: true })
+    const ctx = makeCtx({ organizationId: null, isSuperAdmin: true, userFeatures: [] })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      if (name === 'em') return em
+      if (name === 'rbacService') return rbacService
+      throw new Error(`unexpected ${name}`)
+    })
+    const result = (await hybridTool.handler({ q: 'widget' }, ctx as any)) as Record<string, unknown>
+    expect(calls).toHaveLength(1)
+    expect(calls[0].options.organizationIds).toBeUndefined()
+    expect(result.totalResults).toBe(1)
+  })
+
+  it('get_record_context scopes a restricted user with no current org to their organization allowlist', async () => {
+    const lookup = permissiveLookup(['catalog:product'])
+    const { service, calls } = makeSearchService([
+      { entityId: 'catalog:product', recordId: 'rec-42', score: 1, source: 'fulltext', presenter: { title: 'Widget' } },
+    ])
+    const { em, rbacService } = makeOrgScopeResolver({ aclOrganizations: ['org-2', 'org-3'] })
+    const ctx = makeCtx({ organizationId: null })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      if (name === 'em') return em
+      if (name === 'rbacService') return rbacService
+      throw new Error(`unexpected ${name}`)
+    })
+    const result = (await recordContextTool.handler(
+      { entityId: 'catalog:product', recordId: 'rec-42' },
+      ctx as any,
+    )) as Record<string, unknown>
+    expect(calls).toHaveLength(1)
+    expect(calls[0].options.organizationIds).toEqual(['org-2', 'org-3'])
+    expect(result.found).toBe(true)
+  })
+
+  it('get_record_context denies a restricted user whose allowlist is explicitly empty, without calling search', async () => {
+    const lookup = permissiveLookup(['catalog:product'])
+    const { service, calls } = makeSearchService([
+      { entityId: 'catalog:product', recordId: 'rec-42', score: 1, source: 'fulltext' },
+    ])
+    const { em, rbacService } = makeOrgScopeResolver({ aclOrganizations: [] })
+    const ctx = makeCtx({ organizationId: null })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      if (name === 'em') return em
+      if (name === 'rbacService') return rbacService
+      throw new Error(`unexpected ${name}`)
+    })
+    const result = (await recordContextTool.handler(
+      { entityId: 'catalog:product', recordId: 'rec-42' },
+      ctx as any,
+    )) as Record<string, unknown>
+    expect(calls).toHaveLength(0)
+    expect(result.found).toBe(false)
+  })
+
+  it('get_record_context leaves a superadmin unfiltered regardless of the ACL allowlist', async () => {
+    const lookup = permissiveLookup(['catalog:product'])
+    const { service, calls } = makeSearchService([
+      { entityId: 'catalog:product', recordId: 'rec-42', score: 1, source: 'fulltext', presenter: { title: 'Widget' } },
+    ])
+    const { em, rbacService } = makeOrgScopeResolver({ aclOrganizations: [], isSuperAdmin: true })
+    const ctx = makeCtx({ organizationId: null, isSuperAdmin: true, userFeatures: [] })
+    ;(ctx.container.resolve as jest.Mock).mockImplementation((name: string) => {
+      if (name === 'searchService') return service
+      if (name === 'searchIndexer') return lookup
+      if (name === 'em') return em
+      if (name === 'rbacService') return rbacService
+      throw new Error(`unexpected ${name}`)
+    })
+    const result = (await recordContextTool.handler(
+      { entityId: 'catalog:product', recordId: 'rec-42' },
+      ctx as any,
+    )) as Record<string, unknown>
+    expect(calls).toHaveLength(1)
+    expect(calls[0].options.organizationIds).toBeUndefined()
+    expect(result.found).toBe(true)
+  })
+})
+
 describe('search-pack tool surface', () => {
   it('exports exactly the expected tool names and shapes', () => {
     const names = searchAiTools.map((tool) => tool.name)

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

@@ -17,6 +17,10 @@ import {
 } from '@open-mercato/shared/lib/search/entityAccess'
 import { defineAiTool } from '../lib/ai-tool-definition'
 import type { AiToolDefinition, McpToolContext } from '../lib/types'
+import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
+import { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
+import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
+import type { AwilixContainer } from 'awilix'
 
 type SearchServiceLike = {
   search: (query: string, options: SearchOptions) => Promise<SearchResult[]>
@@ -69,6 +73,43 @@ function authorizeEntityAccess(
   )
 }
 
+/**
+ * Resolve the actor's allowed-organization scope the same way the HTTP search
+ * route does, so this tool pack can never return results outside a
+ * restricted user's organization allowlist — even when their current
+ * organization is null. Mirrors packages/search/.../api/search/route.ts.
+ *
+ * `organizationId` is the re-validated selection (`scope.selectedId`), not the
+ * raw `ctx.organizationId` — `SearchOptions.organizationId` takes precedence
+ * over `organizationIds` in `normalizeOrganizationFilter`, so passing the
+ * unvalidated context value through would let a stale/out-of-allowlist
+ * selection bypass the allowlist below.
+ */
+async function resolveActorOrganizationScope(ctx: McpToolContext): Promise<{
+  organizationId: string | undefined
+  organizationIds: string[] | undefined
+  denyAll: boolean
+}> {
+  if (!ctx.userId) return { organizationId: undefined, organizationIds: undefined, denyAll: true }
+  const auth: AuthContext = {
+    sub: ctx.userId,
+    tenantId: ctx.tenantId,
+    orgId: ctx.organizationId,
+    isSuperAdmin: ctx.isSuperAdmin,
+  }
+  const scope = await resolveOrganizationScopeForRequest({
+    container: ctx.container as unknown as AwilixContainer,
+    auth,
+    selectedId: ctx.organizationId,
+  })
+  const scopeFilter = resolveOrganizationScopeFilter(scope, auth)
+  const denyAll = Array.isArray(scope.filterIds) && scope.filterIds.length === 0
+  const organizationId = typeof scope.selectedId === 'string' && scope.selectedId.trim().length > 0
+    ? scope.selectedId.trim()
+    : undefined
+  return { organizationId, organizationIds: scopeFilter.organizationIds, denyAll }
+}
+
 const hybridSearchInput = z.object({
   q: z.string().min(1).describe('Search query text.'),
   limit: z
@@ -142,9 +183,21 @@ const hybridSearchTool = defineAiTool({
       }
     }
 
+    const orgScope = await resolveActorOrganizationScope(ctx)
+    if (orgScope.denyAll) {
+      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,
+      organizationId: orgScope.organizationId,
+      organizationIds: orgScope.organizationIds,
       limit,
       strategies: input.strategies as SearchStrategyId[] | undefined,
       entityTypes: readableEntityTypes,
@@ -193,10 +246,20 @@ const getRecordContextTool = defineAiTool({
       authorizeEntityAccess(input.entityId, lookup, subject)
     }
 
+    const orgScope = await resolveActorOrganizationScope(ctx)
+    if (orgScope.denyAll) {
+      return {
+        found: false as const,
+        entityId: input.entityId,
+        recordId: input.recordId,
+      }
+    }
+
     const service = ctx.container.resolve<SearchServiceLike>('searchService')
     const rawResults = await service.search(input.recordId, {
       tenantId: ctx.tenantId,
-      organizationId: ctx.organizationId,
+      organizationId: orgScope.organizationId,
+      organizationIds: orgScope.organizationIds,
       limit: 5,
       entityTypes: [input.entityId],
     })