@porulle/core 0.10.8 → 0.13.0

package/src/modules/pricing/service.ts

@@ -1,5 +1,6 @@
-import { resolveOrgId } from "../../auth/org.js";
+import { resolveOrgIdForCommerce } from "../../auth/org.js";
 import type { Actor } from "../../auth/types.js";
+import type { CommerceConfig } from "../../config/types.js";
 import type { DatabaseAdapter } from "../../kernel/database/adapter.js";
 import type { PluginDb } from "../../kernel/database/plugin-types.js";
 import type { TxContext } from "../../kernel/database/tx-context.js";
@@ -33,6 +34,7 @@ interface PricingServiceDeps {
   repository: PricingRepository;
   catalogRepository: CatalogRepository;
   hooks: HookRegistry;
+  config: CommerceConfig;
   services: Record<string, unknown>;
   database: DatabaseAdapter;
 }
@@ -41,6 +43,7 @@ function hookContext(
   actor: Actor | null,
   services: Record<string, unknown>,
   database: DatabaseAdapter,
+  config: CommerceConfig,
   tx: unknown,
 ): HookContext {
   return createHookContext({
@@ -50,6 +53,7 @@ function hookContext(
     services,
     context: { moduleName: "pricing" },
     database: { db: database.db as PluginDb },
+    commerceConfig: config,
   });
 }
 
@@ -211,7 +215,7 @@ export class PricingService {
       );
     }
 
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
     const entity = await this.catalogRepo.findEntityById(input.entityId, ctx, orgId);
     if (!entity) {
       return Err(
@@ -224,6 +228,7 @@ export class PricingService {
       entityId: input.entityId,
       currency: normalizeCurrency(input.currency),
       amount: input.amount,
+      ...(input.compareAtAmount !== undefined ? { compareAtAmount: input.compareAtAmount } : {}),
       metadata: input.metadata ?? {},
       variantId: input.variantId ?? null,
       customerGroupId: input.customerGroupId ?? null,
@@ -252,8 +257,12 @@ export class PricingService {
 
     const record = existing
       ? (await this.repo.updatePrice(
-          existing.id,
-          { amount: priceData.amount, metadata: priceData.metadata },
+        existing.id,
+          {
+            amount: priceData.amount,
+            ...(priceData.compareAtAmount !== undefined ? { compareAtAmount: priceData.compareAtAmount } : {}),
+            metadata: priceData.metadata,
+          },
           ctx,
         )) ?? existing
       : await this.repo.createPrice(priceData, ctx);
@@ -262,10 +271,7 @@ export class PricingService {
       "pricing.afterCreate",
     ) as AfterHook<Price>[];
     const hctx = hookContext(
-      actor ?? ctx?.actor ?? null,
-      this.deps.services,
-      this.deps.database,
-      ctx?.tx ?? null,
+      actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null,
     );
     await runAfterHooks(afterHooks, null, record, "create", hctx);
 
@@ -296,7 +302,7 @@ export class PricingService {
       );
     }
 
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
 
     const modifierData: PriceModifierInsert = {
       organizationId: orgId,
@@ -322,10 +328,7 @@ export class PricingService {
       "pricing.afterCreate",
     ) as AfterHook<PriceModifier>[];
     const hctx = hookContext(
-      actor ?? ctx?.actor ?? null,
-      this.deps.services,
-      this.deps.database,
-      ctx?.tx ?? null,
+      actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null,
     );
     await runAfterHooks(afterHooks, null, modifier, "create", hctx);
 
@@ -337,7 +340,7 @@ export class PricingService {
     actor?: Actor | null,
     ctx?: TxContext,
   ): Promise<Result<PriceModifier[]>> {
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
     const rows = await this.repo.findModifiers(
       orgId,
       {
@@ -367,7 +370,7 @@ export class PricingService {
     actor?: Actor | null,
     ctx?: TxContext,
   ): Promise<Result<PriceModifier>> {
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
     const existing = await this.repo.findModifierById(orgId, id, ctx);
     if (!existing) {
       return Err(new CommerceNotFoundError("Price modifier not found."));
@@ -394,7 +397,7 @@ export class PricingService {
     actor?: Actor | null,
     ctx?: TxContext,
   ): Promise<Result<{ deleted: true }>> {
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
     const existing = await this.repo.findModifierById(orgId, id, ctx);
     if (!existing) {
       return Err(new CommerceNotFoundError("Price modifier not found."));
@@ -413,7 +416,7 @@ export class PricingService {
     actor?: Actor | null,
     ctx?: TxContext,
   ): Promise<Result<{ prices: Price[]; modifiers: PriceModifier[] }>> {
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
     // Get all prices for the entity if specified, or filter after retrieval
     let prices: Price[] = [];
     if (filter?.entityId) {
@@ -472,7 +475,7 @@ export class PricingService {
     actor?: Actor | null,
     ctx?: TxContext,
   ): Promise<Result<ResolvedPrice>> {
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
     const entity = await this.catalogRepo.findEntityById(input.entityId, ctx, orgId);
     if (!entity) {
       return Err(

package/src/modules/promotions/module.ts

@@ -1,3 +1,4 @@
+import type { CommerceConfig } from "../../config/types.js";
 import type { DrizzleDatabase } from "../../kernel/database/drizzle-db.js";
 import { defineModule } from "../../kernel/module/index.js";
 import type { CatalogServiceImpl } from "../catalog/service.js";
@@ -26,6 +27,7 @@ export const promotionsModule = defineModule<
       catalogRepository: deps.services.catalog.repository,
       ordersRepository: new OrdersRepository(deps.db.db as DrizzleDatabase),
       hooks: deps.hooks,
+      config: deps.config as CommerceConfig,
       services: deps.services,
       database: deps.db,
     }),

package/src/modules/promotions/service.ts

@@ -19,8 +19,9 @@ import type {
 } from "./repository/index.js";
 import type { CatalogRepository } from "../catalog/repository/index.js";
 import type { OrdersRepository } from "../orders/repository/index.js";
-import { resolveOrgId } from "../../auth/org.js";
+import { resolveOrgId, resolveOrgIdForCommerce } from "../../auth/org.js";
 import type { Actor } from "../../auth/types.js";
+import type { CommerceConfig } from "../../config/types.js";
 
 // PromotionType is derived from the zod enum (single source of truth) in
 // ./schemas.js; re-export it here for backwards-compatible imports.
@@ -35,6 +36,7 @@ interface PromotionServiceDeps {
   catalogRepository: CatalogRepository;
   ordersRepository: OrdersRepository;
   hooks: HookRegistry;
+  config: CommerceConfig;
   services: Record<string, unknown>;
   database: DatabaseAdapter;
 }
@@ -43,6 +45,7 @@ function hookContext(
   actor: Actor | null,
   services: Record<string, unknown>,
   database: DatabaseAdapter,
+  config: CommerceConfig,
   tx: unknown,
 ): HookContext {
   return createHookContext({
@@ -52,6 +55,7 @@ function hookContext(
     services,
     context: { moduleName: "promotions" },
     database: { db: database.db as PluginDb },
+    commerceConfig: config,
   });
 }
 
@@ -165,6 +169,16 @@ export class PromotionService {
     this.ordersRepo = deps.ordersRepository;
   }
 
+  private resolveEvaluationOrgId(
+    ctx: TxContext | undefined,
+    explicitOrgId?: string,
+  ): string {
+    if (explicitOrgId) {
+      return resolveOrgId(ctx?.actor ?? null, explicitOrgId);
+    }
+    return resolveOrgIdForCommerce(ctx?.actor ?? null, this.deps.config);
+  }
+
   async create(
     input: CreatePromotionInput,
     actor?: Actor | null,
@@ -189,7 +203,7 @@ export class PromotionService {
       );
     }
 
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
 
     if (input.code) {
       const normalized = input.code.trim().toUpperCase();
@@ -229,10 +243,7 @@ export class PromotionService {
       "promotions.afterCreate",
     ) as AfterHook<Promotion>[];
     const hctx = hookContext(
-      actor ?? ctx?.actor ?? null,
-      this.deps.services,
-      this.deps.database,
-      ctx?.tx ?? null,
+      actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null,
     );
     await runAfterHooks(afterHooks, null, promotion, "create", hctx);
 
@@ -253,7 +264,8 @@ export class PromotionService {
     const afterHooks = this.deps.hooks.resolve(
       "promotions.afterUpdate",
     ) as AfterHook<Promotion>[];
-    const hctx = hookContext(null, this.deps.services, this.deps.database, ctx?.tx ?? null);
+    // Actor-less by design; resolves to the deployment's declared organization.
+    const hctx = hookContext(null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null);
     await runAfterHooks(afterHooks, promotion, updated, "update", hctx);
 
     return Ok(updated);
@@ -331,10 +343,7 @@ export class PromotionService {
       "promotions.afterUpdate",
     ) as AfterHook<Promotion>[];
     const hctx = hookContext(
-      actor ?? ctx?.actor ?? null,
-      this.deps.services,
-      this.deps.database,
-      ctx?.tx ?? null,
+      actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null,
     );
     await runAfterHooks(afterHooks, existing, updated, "update", hctx);
 
@@ -346,7 +355,7 @@ export class PromotionService {
     actor?: Actor | null,
     ctx?: TxContext,
   ): Promise<Result<Promotion[]>> {
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
     const all = await this.repo.findAll(orgId, ctx);
     const now = new Date();
 
@@ -375,7 +384,7 @@ export class PromotionService {
     timestamp = new Date(),
     ctx?: TxContext,
   ): Promise<Result<Promotion[]>> {
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
     const active = await this.repo.findActive(orgId, ctx);
     // Further filter by timestamp in case repo returns slightly stale results
     const filtered = active.filter((p) => matchesWindow(p, timestamp));
@@ -388,7 +397,7 @@ export class PromotionService {
     ctx?: TxContext,
   ): Promise<Result<Promotion>> {
     const normalized = code.trim().toUpperCase();
-    const evalOrgId = resolveOrgId(ctx?.actor ?? null, context.orgId);
+    const evalOrgId = this.resolveEvaluationOrgId(ctx, context.orgId);
     const promotion = await this.repo.findByCode(evalOrgId, normalized, ctx);
     if (!promotion) {
       return Err(
@@ -434,7 +443,7 @@ export class PromotionService {
     ctx?: TxContext,
   ): Promise<Result<PromotionApplicationResult>> {
     const timestamp = context.timestamp ?? new Date();
-    const applyOrgId = resolveOrgId(ctx?.actor ?? null, context.orgId);
+    const applyOrgId = this.resolveEvaluationOrgId(ctx, context.orgId);
     const result: PromotionApplicationResult = {
       totalDiscount: 0,
       freeShipping: false,
@@ -580,7 +589,7 @@ export class PromotionService {
         return "First-order promotion requires authenticated customer.";
       }
       const orders = await this.ordersRepo.findByCustomerId(
-        resolveOrgId(ctx?.actor ?? null, context.orgId),
+        this.resolveEvaluationOrgId(ctx, context.orgId),
         context.customerId,
         ctx,
       );

package/src/modules/search/adapter.ts

@@ -2,22 +2,28 @@ import type { Result } from "../../kernel/result.js";
 
 export interface SearchDocument {
   id: string;
+  organizationId?: string;
   type: string;
   slug: string;
   title: string;
   description?: string;
   status?: string;
+  isVisible?: boolean;
   categories: string[];
   brands: string[];
   text: string;
+  attributes?: Record<string, string | string[]>;
   payload?: Record<string, unknown>;
 }
 
 export interface SearchFilters {
+  /** Server-supplied tenant constraint; REST callers cannot choose this value. */
+  organizationId?: string;
   type?: string;
   category?: string;
   brand?: string;
   status?: string;
+  attributes?: Record<string, string | string[]>;
 }
 
 export interface SearchQueryParams {
@@ -32,6 +38,8 @@ export interface SearchSuggestParams {
   prefix: string;
   type?: string;
   limit?: number;
+  /** Server-supplied tenant constraint; REST callers cannot choose this value. */
+  organizationId?: string;
 }
 
 export interface SearchHit {

package/src/modules/search/module.ts

@@ -16,6 +16,9 @@ export const searchModule = defineModule<Record<string, never>, SearchService, S
       const config = deps.config as CommerceConfig;
       return new SearchService({
         catalogRepository: deps.services.catalog.repository,
+        resolveEntityFieldDefinitions: deps.services.catalog.resolveEntityFieldDefinitions.bind(deps.services.catalog),
+        config,
+        ...(config.entities ? { entities: config.entities } : {}),
         ...(config.search?.adapter ? { adapter: config.search.adapter } : {}),
         ...(config.search?.defaultFacets
           ? { defaultFacets: config.search.defaultFacets }

package/src/modules/search/service.ts

@@ -1,7 +1,13 @@
-import { Ok, type Result } from "../../kernel/result.js";
-import { resolveOrgId } from "../../auth/org.js";
+import { Err, Ok, type Result } from "../../kernel/result.js";
+import { resolveOrgIdForCommerce } from "../../auth/org.js";
+import { OrgResolutionError } from "../../kernel/errors.js";
 import type { TxContext } from "../../kernel/database/tx-context.js";
-import type { CatalogRepository, SellableEntity } from "../catalog/repository/index.js";
+import type { CommerceConfig } from "../../config/types.js";
+import type {
+  CatalogRepository,
+  SellableCustomField,
+  SellableEntity,
+} from "../catalog/repository/index.js";
 import type {
   SearchAdapter,
   SearchDocument,
@@ -10,9 +16,14 @@ import type {
   SearchQueryResult,
   SearchSuggestParams,
 } from "./adapter.js";
+import type { EntityFieldDefinitionResolver } from "../catalog/service.js";
+import { canReadUnpublishedCatalog } from "../catalog/read-policy.js";
 
 interface SearchServiceDeps {
   catalogRepository: CatalogRepository;
+  config: CommerceConfig;
+  entities?: CommerceConfig["entities"];
+  resolveEntityFieldDefinitions?: EntityFieldDefinitionResolver;
   adapter?: SearchAdapter;
   defaultFacets?: string[];
 }
@@ -39,6 +50,19 @@ function includesAllTokens(haystack: string, tokens: string[]): boolean {
   return tokens.every((token) => lower.includes(token));
 }
 
+function customFieldValue(field: SellableCustomField): string | undefined {
+  if (field.textValue != null) return field.textValue;
+  if (field.numberValue != null) return String(field.numberValue);
+  if (field.booleanValue != null) return String(field.booleanValue);
+  if (field.dateValue != null) return field.dateValue.toISOString();
+  return undefined;
+}
+
+function attributeValues(value: string | string[] | undefined): string[] {
+  if (value == null) return [];
+  return Array.isArray(value) ? value : [value];
+}
+
 function scoreText(document: SearchDocument, tokens: string[]): number {
   if (tokens.length === 0) return 1;
 
@@ -109,16 +133,43 @@ export class SearchService {
     entity: SellableEntity,
     ctx?: TxContext,
   ): Promise<SearchDocument> {
-    const attributes =
+    const localizedAttributes =
       await this.deps.catalogRepository.findAttributesByEntityId(
         entity.id,
         ctx,
       );
-    const primary = attributes[0];
+    const primary = localizedAttributes[0];
     const title = primary?.title ?? entity.slug;
     const description = primary?.description;
     const categories = await this.entityCategories(entity.id, ctx);
     const brands = await this.entityBrands(entity.id, ctx);
+    const definitions = this.deps.resolveEntityFieldDefinitions
+      ? await this.deps.resolveEntityFieldDefinitions(entity.type, entity.organizationId, ctx)
+      : (this.deps.entities?.[entity.type]?.fields ?? []);
+    const filterableFields = new Set(
+      definitions
+        .filter((field) => field.filterable === true)
+        .map((field) => field.name),
+    );
+    const customFields = await this.deps.catalogRepository.findCustomFieldsByEntityId(
+      entity.id,
+      ctx,
+    );
+    const attributeValuesByName = new Map<string, string[]>();
+    for (const field of customFields) {
+      if (field.locale !== "en" || !filterableFields.has(field.fieldName)) continue;
+      const value = customFieldValue(field);
+      if (value == null) continue;
+      const values = attributeValuesByName.get(field.fieldName) ?? [];
+      if (!values.includes(value)) values.push(value);
+      attributeValuesByName.set(field.fieldName, values);
+    }
+    const attributes = Object.fromEntries(
+      [...attributeValuesByName.entries()].map(([name, values]) => [
+        name,
+        values.length === 1 ? values[0]! : values,
+      ]),
+    ) as Record<string, string | string[]>;
 
     const textParts: string[] = [
       entity.slug,
@@ -126,20 +177,23 @@ export class SearchService {
       description ?? "",
       ...categories,
       ...brands,
-      ...attributes.map((attr) => attr.title),
-      ...attributes.map((attr) => attr.description ?? ""),
+      ...localizedAttributes.map((attr) => attr.title),
+      ...localizedAttributes.map((attr) => attr.description ?? ""),
     ];
 
     return {
       id: entity.id,
+      organizationId: entity.organizationId,
       type: entity.type,
       slug: entity.slug,
       title,
       ...(description ? { description } : {}),
       status: entity.status,
+      isVisible: entity.isVisible,
       categories,
       brands,
       text: textParts.join(" ").trim(),
+      ...(Object.keys(attributes).length > 0 ? { attributes } : {}),
       payload: {
         metadata: entity.metadata ?? undefined,
       },
@@ -147,10 +201,18 @@ export class SearchService {
   }
 
   private async allDocuments(ctx?: TxContext): Promise<SearchDocument[]> {
-    const orgId = resolveOrgId(ctx?.actor ?? null);
+    const actor = ctx?.actor;
+    if (!actor) {
+      // Deliberate exception: this needs an authenticated actor, not merely a
+      // resolvable organization, because visibility scoping is decided from the
+      // actor's permissions. A declared deployment default would satisfy the
+      // organization but not that.
+      throw new OrgResolutionError("Organization could not be resolved for a search read.");
+    }
+    const orgId = resolveOrgIdForCommerce(actor, this.deps.config);
     const entities = await this.deps.catalogRepository.findEntities(
       orgId,
-      undefined,
+      canReadUnpublishedCatalog(actor) ? undefined : { status: "active", isVisible: true },
       ctx,
     );
     return Promise.all(
@@ -163,11 +225,17 @@ export class SearchService {
     filters: SearchFilters | undefined,
   ): boolean {
     if (!filters) return true;
+    if (filters.organizationId && document.organizationId !== filters.organizationId) return false;
     if (filters.type && document.type !== filters.type) return false;
     if (filters.status && document.status !== filters.status) return false;
     if (filters.category && !document.categories.includes(filters.category))
       return false;
     if (filters.brand && !document.brands.includes(filters.brand)) return false;
+    for (const [name, requested] of Object.entries(filters.attributes ?? {})) {
+      const actual = attributeValues(document.attributes?.[name]);
+      const expected = attributeValues(requested);
+      if (!expected.some((value) => actual.includes(value))) return false;
+    }
     return true;
   }
 
@@ -214,6 +282,26 @@ export class SearchService {
           }
         }
       }
+
+      const attributeName = facet.startsWith("attributes.")
+        ? facet.slice("attributes.".length)
+        : facet;
+      if (
+        attributeName !== "type" &&
+        attributeName !== "status" &&
+        attributeName !== "category" &&
+        attributeName !== "categories" &&
+        attributeName !== "brand" &&
+        attributeName !== "brands"
+      ) {
+        const values: Record<string, number> = {};
+        for (const document of documents) {
+          for (const value of new Set(attributeValues(document.attributes?.[attributeName]))) {
+            values[value] = (values[value] ?? 0) + 1;
+          }
+        }
+        if (Object.keys(values).length > 0) output[attributeName] = values;
+      }
     }
 
     return output;
@@ -244,18 +332,49 @@ export class SearchService {
     const safeQuery = (params.query ?? "").slice(0, 500);
 
     if (this.deps.adapter) {
-      return this.deps.adapter.search({
+      const actor = ctx?.actor ?? null;
+      // Deliberate exception: this needs an authenticated actor, not merely a
+      // resolvable organization, because visibility scoping is decided from the
+      // actor's permissions. A declared deployment default would satisfy the
+      // organization but not that.
+      if (!actor) return Err(new OrgResolutionError("Organization could not be resolved for a search read."));
+      const organizationId = resolveOrgIdForCommerce(actor, this.deps.config);
+      const result = await this.deps.adapter.search({
         ...params,
         query: safeQuery,
         page,
         limit,
+        filters: {
+          ...params.filters,
+          organizationId,
+          ...(!canReadUnpublishedCatalog(actor) ? { status: "active" } : {}),
+        },
+      });
+      if (!result.ok) return result;
+      const hits = result.value.hits.filter((hit) =>
+        hit.document.organizationId === organizationId &&
+        (canReadUnpublishedCatalog(actor) ||
+          (hit.document.status === "active" && hit.document.isVisible !== false)),
+      );
+      return Ok({
+        ...result.value,
+        hits,
+        total: hits.length,
+        facets: this.computeFacets(hits.map((hit) => hit.document), params.facets),
       });
     }
 
     // In-memory fallback: require a non-empty query to avoid loading all entities
     // (allDocuments triggers N+1 DB queries per entity — unsafe at scale)
     const tokens = tokenize(safeQuery);
-    if (tokens.length === 0 && !params.filters?.type && !params.filters?.category && !params.filters?.brand && !params.filters?.status) {
+    if (
+      tokens.length === 0 &&
+      !params.filters?.type &&
+      !params.filters?.category &&
+      !params.filters?.brand &&
+      !params.filters?.status &&
+      Object.keys(params.filters?.attributes ?? {}).length === 0
+    ) {
       return Ok({ hits: [], total: 0, page, limit, facets: {} });
     }
 
@@ -309,11 +428,22 @@ export class SearchService {
     if (prefix.length === 0) return Ok([]);
 
     if (this.deps.adapter) {
-      return this.deps.adapter.suggest({
+      const actor = ctx?.actor ?? null;
+      // Deliberate exception: this needs an authenticated actor, not merely a
+      // resolvable organization, because visibility scoping is decided from the
+      // actor's permissions. A declared deployment default would satisfy the
+      // organization but not that.
+      if (!actor) return Err(new OrgResolutionError("Organization could not be resolved for a search read."));
+      const organizationId = resolveOrgIdForCommerce(actor, this.deps.config);
+      const result = await this.deps.adapter.suggest({
         ...params,
         prefix,
         limit,
+        organizationId,
       });
+      if (!result.ok) return result;
+      const visibleTitles = new Set((await this.allDocuments(ctx)).map((document) => document.title));
+      return Ok(result.value.filter((title) => visibleTitles.has(title)));
     }
 
     // In-memory fallback: require prefix >= 2 chars to avoid loading all entities

package/src/modules/settings/module.ts

@@ -1,3 +1,4 @@
+import type { CommerceConfig } from "../../config/types.js";
 import type { DrizzleDatabase } from "../../kernel/database/drizzle-db.js";
 import { defineModule } from "../../kernel/module/index.js";
 import { SettingsRepository } from "./repository/index.js";
@@ -14,5 +15,6 @@ export const settingsModule = defineModule<
   service: (deps) =>
     new SettingsService({
       repository: new SettingsRepository(deps.db.db as DrizzleDatabase),
+      config: deps.config as CommerceConfig,
     }),
 });

package/src/modules/settings/service.ts

@@ -1,5 +1,6 @@
-import { resolveOrgId } from "../../auth/org.js";
+import { resolveOrgIdForCommerce } from "../../auth/org.js";
 import type { Actor } from "../../auth/types.js";
+import type { CommerceConfig } from "../../config/types.js";
 import type { TxContext } from "../../kernel/database/tx-context.js";
 import { CommerceValidationError } from "../../kernel/errors.js";
 import { Err, Ok, type Result } from "../../kernel/result.js";
@@ -9,6 +10,7 @@ const GROUP_NAME_RE = /^[a-z][a-z0-9_-]*$/;
 
 interface SettingsServiceDeps {
   repository: SettingsRepository;
+  config: CommerceConfig;
 }
 
 /**
@@ -20,9 +22,11 @@ interface SettingsServiceDeps {
  */
 export class SettingsService {
   private repository: SettingsRepository;
+  private config: CommerceConfig;
 
   constructor(deps: SettingsServiceDeps) {
     this.repository = deps.repository;
+    this.config = deps.config;
   }
 
   /** Runtime read for plugins/hooks. Unset groups read as `{}`. */
@@ -40,7 +44,7 @@ export class SettingsService {
     actor?: Actor | null,
     ctx?: TxContext,
   ): Promise<Result<Record<string, unknown>>> {
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.config);
     return Ok(await this.read(orgId, group, ctx));
   }
 
@@ -48,7 +52,7 @@ export class SettingsService {
     actor?: Actor | null,
     ctx?: TxContext,
   ): Promise<Result<Record<string, Record<string, unknown>>>> {
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.config);
     const rows = await this.repository.findAll(orgId, ctx);
     const all: Record<string, Record<string, unknown>> = {};
     for (const row of rows) all[row.group] = row.value;
@@ -69,7 +73,7 @@ export class SettingsService {
         ),
       );
     }
-    const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+    const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.config);
     const current = await this.read(orgId, group, ctx);
     const next: Record<string, unknown> = { ...current };
     for (const [key, value] of Object.entries(patch)) {