@open-mercato/core 0.6.1-develop.3291.1.6fad645fd0 → 0.6.1-develop.3306.1.9ad9ff2526

package/src/modules/catalog/ai-agents.ts

@@ -158,6 +158,10 @@ const PROMPT_SECTIONS: PromptSection[] = [
       'proactively offer the stats card at the start of an exploration',
       '("Want me to show a quick catalog overview?") — most operators',
       'find it useful before drilling in.',
+      '',
+      'If the operator asks what they can ask you, requests example questions,',
+      'or asks how you can help, answer directly from these instructions.',
+      'Do not call tools for capability / example-question prompts.',
     ].join('\n'),
   },
   {
@@ -244,6 +248,60 @@ function compilePromptTemplate(template: PromptTemplate): string {
     .join('\n\n')
 }
 
+function textFromMessageContent(content: unknown): string {
+  if (typeof content === 'string') return content
+  if (!Array.isArray(content)) return ''
+  return content
+    .map((part) => {
+      if (typeof part === 'string') return part
+      if (!part || typeof part !== 'object') return ''
+      const record = part as Record<string, unknown>
+      return typeof record.text === 'string' ? record.text : ''
+    })
+    .join(' ')
+}
+
+function latestUserTextFromPrepareStepState(state: unknown): string {
+  const messages = (state as { messages?: unknown })?.messages
+  if (!Array.isArray(messages)) return ''
+  for (let index = messages.length - 1; index >= 0; index -= 1) {
+    const message = messages[index]
+    if (!message || typeof message !== 'object') continue
+    const record = message as Record<string, unknown>
+    if (record.role !== 'user') continue
+    return textFromMessageContent(record.content)
+  }
+  return ''
+}
+
+function isCatalogMetaHelpPrompt(text: string): boolean {
+  const normalized = text.toLowerCase()
+  if (!normalized.trim()) return false
+  const asksForQuestionIdeas =
+    (normalized.includes('question') || normalized.includes('questions')) &&
+    (normalized.includes('could ask') ||
+      normalized.includes('can ask') ||
+      normalized.includes('ask you') ||
+      normalized.includes('suggest') ||
+      normalized.includes('examples'))
+  const asksForCapabilities =
+    normalized.includes('what can you do') ||
+    normalized.includes('how can you help') ||
+    normalized.includes('what should i ask') ||
+    normalized.includes('what can i ask')
+  return asksForQuestionIdeas || asksForCapabilities
+}
+
+function buildCatalogAssistantPrepareStep() {
+  return async function catalogAssistantPrepareStep(state: unknown) {
+    const latestUserText = latestUserTextFromPrepareStepState(state)
+    if (isCatalogMetaHelpPrompt(latestUserText)) {
+      return { activeTools: [] }
+    }
+    return undefined
+  }
+}
+
 async function resolvePageContext(
   input: AiAgentPageContextInput,
 ): Promise<string | null> {
@@ -269,8 +327,10 @@ const agent: AiAgentDefinition = {
   requiredFeatures: [...REQUIRED_FEATURES],
   readOnly: true,
   mutationPolicy: 'read-only',
-  defaultProvider: 'openai',
-  defaultModel: 'gpt-5-mini',
+  loop: {
+    maxSteps: 4,
+    prepareStep: buildCatalogAssistantPrepareStep() as NonNullable<AiAgentDefinition['loop']>['prepareStep'],
+  },
   keywords: ['catalog', 'products', 'categories', 'variants', 'prices', 'offers', 'media'],
   domain: 'catalog',
   dataCapabilities: {
@@ -463,8 +523,6 @@ const merchandisingAgent: AiAgentDefinition = {
   // the operator via the pending-action approval card. Per-tenant override
   // can downgrade to `read-only` to lock writes without a redeploy.
   mutationPolicy: 'confirm-required',
-  defaultProvider: 'openai',
-  defaultModel: 'gpt-5-mini',
   keywords: ['catalog', 'merchandising', 'products', 'attributes', 'pricing', 'copy'],
   domain: 'catalog',
   dataCapabilities: {

package/src/modules/catalog/backend/catalog/categories/[id]/edit/page.tsx

@@ -8,6 +8,7 @@ import { updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { createCrudFormError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 import { E } from '#generated/entities.ids.generated'
 import { CategorySelect } from '../../../../../components/categories/CategorySelect'
 import { CategorySlugFieldSync } from '../../../../../components/categories/CategorySlugFieldSync'
@@ -95,11 +96,7 @@ export default function EditCatalogCategoryPage({ params }: { params?: { id?: st
         const record = Array.isArray(result?.items) ? result.items?.[0] : null
         if (!record) throw new Error(t('catalog.categories.form.errors.notFound', 'Category not found'))
         if (cancelled) return
-        const customValues: Record<string, unknown> = {}
-        for (const [key, value] of Object.entries(record as Record<string, unknown>)) {
-          if (key.startsWith('cf_')) customValues[key] = value
-          else if (key.startsWith('cf:')) customValues[`cf_${key.slice(3)}`] = value
-        }
+        const customValues = extractCustomFieldEntries(record as Record<string, unknown>)
         setInitialValues({
           id: record.id,
           name: record.name,

package/src/modules/catalog/backend/catalog/products/MerchandisingAssistantSheet.tsx

@@ -31,8 +31,9 @@
  */
 
 import * as React from 'react'
-import { Boxes, ChevronDown, FileText, Package, PanelRightOpen, PenLine, Sparkles, Tags, TrendingUp } from 'lucide-react'
+import { Boxes, ChevronDown, FileText, Package, PanelRightOpen, PenLine, Tags, TrendingUp } from 'lucide-react'
 import { AiChat, type AiChatSuggestion, type AiChatContextItem } from '@open-mercato/ui/ai/AiChat'
+import { AiIcon } from '@open-mercato/ui/ai/AiIcon'
 import { useAiDock } from '@open-mercato/ui/ai/AiDock'
 import { useAiChatSessions } from '@open-mercato/ui/ai/AiChatSessions'
 import { ChatPaneTabs } from '@open-mercato/ui/ai/ChatPaneTabs'
@@ -249,7 +250,7 @@ function useMerchandisingAgents(): MerchandisingAgentsState {
           'catalog.merchandising_assistant.agents.merchandising.description',
           'Draft copy, normalize attributes, and propose price changes for the current selection.',
         ),
-        icon: <Sparkles className="size-4" />,
+        icon: <AiIcon className="size-4" />,
       },
     ],
     [t],
@@ -399,7 +400,7 @@ export function MerchandisingAssistantSheet({
             agents.length > 1 && 'rounded-r-none border-r-0',
           )}
         >
-          <Sparkles className="size-4" aria-hidden />
+          <AiIcon className="size-4" />
           <span>{labelText}</span>
           {hasSelection ? (
             <span

package/src/modules/catalog/backend/catalog/products/[id]/page.tsx

@@ -32,6 +32,7 @@ import { TagsInput } from "@open-mercato/ui/backend/inputs/TagsInput";
 import { Textarea } from "@open-mercato/ui/primitives/textarea";
 import { DataLoader } from "@open-mercato/ui/primitives/DataLoader";
 import { cn } from "@open-mercato/shared/lib/utils";
+import { extractCustomFieldEntries } from "@open-mercato/shared/lib/crud/custom-fields-client";
 import { Spinner } from "@open-mercato/ui/primitives/spinner";
 import {
   apiCall,
@@ -619,7 +620,7 @@ export default function EditCatalogProductPage({
           ? readProductConversionRows(conversionsRes.result?.items)
           : [];
         initialConversionsRef.current = conversionRows;
-        const { customValues } = extractCustomFields(record);
+        const customValues = extractCustomFieldEntries(record);
         const offers = readOfferSnapshots(record);
         offerSnapshotsRef.current = offers;
         const channelIds = extractChannelIds(offers);
@@ -2629,17 +2630,6 @@ function readOptionSchema(metadata: Record<string, any>): ProductOptionInput[] {
     .filter((entry): entry is ProductOptionInput => !!entry);
 }
 
-function extractCustomFields(record: Record<string, unknown>): {
-  customValues: Record<string, unknown>;
-} {
-  const customValues: Record<string, unknown> = {};
-  Object.entries(record).forEach(([key, value]) => {
-    if (key.startsWith("cf_")) customValues[key] = value;
-    else if (key.startsWith("cf:")) customValues[`cf_${key.slice(3)}`] = value;
-  });
-  return { customValues };
-}
-
 function normalizeIdList(value: unknown): string[] {
   const ids = Array.isArray(value)
     ? value

package/src/modules/catalog/backend/catalog/products/[productId]/variants/[variantId]/page.tsx

@@ -10,6 +10,7 @@ import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customF
 import { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 import { E } from '#generated/entities.ids.generated'
 import { SendObjectMessageDialog } from '@open-mercato/ui/backend/messages'
 import {
@@ -182,7 +183,7 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
           if (draft.priceId) priceIdMap[kindId] = draft.priceId
         })
         setExistingPriceIds(priceIdMap)
-        const customDefaults = extractCustomFieldValues(record)
+        const customDefaults = extractCustomFieldEntries(record)
         let loadedOptionDefinitions: OptionDefinition[] = []
         if (resolvedProductId) {
           const productRes = await apiCall<ProductResponse>(
@@ -631,15 +632,6 @@ async function loadVariantPrices(variantId: string, priceKinds: PriceKindSummary
   return drafts
 }
 
-function extractCustomFieldValues(record: Record<string, unknown>): Record<string, unknown> {
-  const customValues: Record<string, unknown> = {}
-  Object.entries(record).forEach(([key, value]) => {
-    if (key.startsWith('cf_')) customValues[key] = value
-    else if (key.startsWith('cf:')) customValues[`cf_${key.slice(3)}`] = value
-  })
-  return customValues
-}
-
 async function syncVariantPricesUpdate({
   priceKinds,
   priceDrafts,