@alpaca-editor/core 1.0.4135 → 1.0.4141

package/src/editor/ai/ContextInfoBar.tsx

@@ -14,7 +14,7 @@ import { getComponentById } from "../componentTreeHelper";
 import {
   AgentDetails,
   AgentMetadata,
-  updateAgentMetadata,
+  updateAgentContext,
 } from "../services/agentService";
 import { ItemDescriptor } from "../pageModel";
 
@@ -42,42 +42,29 @@ export function ContextInfoBar({
 
   const removeContextKey = useCallback(
     async (
-      key: "pages" | "componentIds" | "field" | "comment",
+      key: "pages" | "componentIds" | "components" | "field" | "comment",
       index?: number,
     ) => {
       if (!agent?.id) return;
       const current = agentMetadata || {};
-      // Exclude top-level context to avoid duplicate keys when spreading
-      const { context: _, ...currentWithoutContext } = current;
-      const next: AgentMetadata = {
-        ...currentWithoutContext,
-        additionalData: {
-          ...(current.additionalData || {}),
-          context: {
-            ...((current.additionalData &&
-              (current.additionalData as any).context) ||
-              {}),
-          },
-        },
-      } as AgentMetadata;
-
-      if (next.additionalData && (next.additionalData as any).context) {
-        const ctx = (next.additionalData as any).context;
-        if (key === "pages" && typeof index === "number" && ctx.pages) {
-          ctx.pages.splice(index, 1);
-          if (ctx.pages.length === 0) delete ctx.pages;
-        } else if (
-          key === "componentIds" &&
-          typeof index === "number" &&
-          ctx.componentIds
-        ) {
-          ctx.componentIds.splice(index, 1);
-          if (ctx.componentIds.length === 0) delete ctx.componentIds;
-        } else if (key === "field") {
-          delete ctx.field;
-        } else if (key === "comment") {
-          delete ctx.comment;
-        }
+      const next: AgentMetadata = { ...current };
+
+      if (key === "pages" && typeof index === "number" && next.pages) {
+        next.pages = [...next.pages];
+        next.pages.splice(index, 1);
+        if (next.pages.length === 0) delete next.pages;
+      } else if (
+        (key === "componentIds" || key === "components") &&
+        typeof index === "number" &&
+        next.components
+      ) {
+        next.components = [...next.components];
+        next.components.splice(index, 1);
+        if (next.components.length === 0) delete next.components;
+      } else if (key === "field") {
+        delete next.field;
+      } else if (key === "comment") {
+        delete next.comment;
       }
 
       try {
@@ -85,13 +72,13 @@ export function ContextInfoBar({
           setAgentMetadata(next);
           return;
         }
-        await updateAgentMetadata(agent.id, next);
+        await updateAgentContext(agent.id, next);
         setAgentMetadata(next);
         setAgent((prev) =>
-          prev ? { ...prev, metadata: JSON.stringify(next) } : prev,
+          prev ? { ...prev, agentContext: JSON.stringify(next) } : prev,
         );
       } catch (e) {
-        console.error("Failed to update agent metadata", e);
+        console.error("Failed to update agent context", e);
       }
     },
     [agent?.id, agent?.status, agentMetadata, setAgent, setAgentMetadata],
@@ -106,12 +93,11 @@ export function ContextInfoBar({
       language: item.language,
       version: item.version,
       name: editContext.contentEditorItem?.name,
-      path: agent?.itemPath,
+      path: undefined,
     };
 
     const current = agentMetadata || {};
-    const currentPages =
-      ((current.additionalData as any)?.context?.pages as Array<any>) || [];
+    const currentPages = current.pages || [];
 
     const existingPageIds = new Set(
       currentPages.map((p: any) => `${p.id}-${p.language}-${p.version}`),
@@ -125,33 +111,23 @@ export function ContextInfoBar({
       return;
     }
 
-    // Exclude top-level context to avoid duplicate keys when spreading
-    const { context: _, ...currentWithoutContext } = current;
     const next: AgentMetadata = {
-      ...currentWithoutContext,
-      additionalData: {
-        ...(current.additionalData || {}),
-        context: {
-          ...((current.additionalData &&
-            (current.additionalData as any).context) ||
-            {}),
-          pages: [...currentPages, pageToAdd],
-        },
-      },
-    } as AgentMetadata;
+      ...current,
+      pages: [...currentPages, pageToAdd],
+    };
 
     try {
       if (agent.status === "new") {
         setAgentMetadata(next);
         return;
       }
-      await updateAgentMetadata(agent.id, next);
+      await updateAgentContext(agent.id, next);
       setAgentMetadata(next);
       setAgent((prev) =>
-        prev ? { ...prev, metadata: JSON.stringify(next) } : prev,
+        prev ? { ...prev, agentContext: JSON.stringify(next) } : prev,
       );
     } catch (e) {
-      console.error("Failed to update agent metadata (add pages)", e);
+      console.error("Failed to update agent context (add pages)", e);
     }
   };
 
@@ -159,44 +135,47 @@ export function ContextInfoBar({
     if (!agent?.id || !editContext?.selection?.length) return;
 
     const current = agentMetadata || {};
-    const currentComponentIds =
-      ((current.additionalData as any)?.context?.componentIds as string[]) ||
-      [];
+    const currentComponents = current.components || [];
 
-    const existingIds = new Set(currentComponentIds);
+    const existingIds = new Set(currentComponents.map(c => c.componentId));
     const newComponentIds = editContext.selection.filter(
       (id) => !existingIds.has(id),
     );
 
     if (newComponentIds.length === 0) return;
 
-    // Exclude top-level context to avoid duplicate keys when spreading
-    const { context: _, ...currentWithoutContext } = current;
+    // Get page item descriptor from edit context
+    const pageItem = editContext.currentItemDescriptor ? {
+      id: editContext.currentItemDescriptor.id,
+      language: editContext.currentItemDescriptor.language,
+      version: editContext.currentItemDescriptor.version,
+      name: editContext.contentEditorItem?.name,
+      path: undefined,
+    } : undefined;
+
+    // Build new components with page info
+    const newComponents = newComponentIds.map(componentId => ({
+      componentId,
+      pageItem: pageItem!,
+    }));
+
     const next: AgentMetadata = {
-      ...currentWithoutContext,
-      additionalData: {
-        ...(current.additionalData || {}),
-        context: {
-          ...((current.additionalData &&
-            (current.additionalData as any).context) ||
-            {}),
-          componentIds: [...currentComponentIds, ...newComponentIds],
-        },
-      },
-    } as AgentMetadata;
+      ...current,
+      components: [...currentComponents, ...newComponents],
+    };
 
     try {
       if (agent.status === "new") {
         setAgentMetadata(next);
         return;
       }
-      await updateAgentMetadata(agent.id, next);
+      await updateAgentContext(agent.id, next);
       setAgentMetadata(next);
       setAgent((prev) =>
-        prev ? { ...prev, metadata: JSON.stringify(next) } : prev,
+        prev ? { ...prev, agentContext: JSON.stringify(next) } : prev,
       );
     } catch (e) {
-      console.error("Failed to update agent metadata (add components)", e);
+      console.error("Failed to update agent context (add components)", e);
     }
   };
 
@@ -204,41 +183,44 @@ export function ContextInfoBar({
     if (!agent?.id || !ids?.length) return;
 
     const current = agentMetadata || {};
-    const currentComponentIds =
-      ((current.additionalData as any)?.context?.componentIds as string[]) ||
-      [];
+    const currentComponents = current.components || [];
 
-    const existingIds = new Set(currentComponentIds);
+    const existingIds = new Set(currentComponents.map(c => c.componentId));
     const newComponentIds = ids.filter((id) => !!id && !existingIds.has(id));
     if (newComponentIds.length === 0) return;
 
-    // Exclude top-level context to avoid duplicate keys when spreading
-    const { context: _, ...currentWithoutContext } = current;
+    // Get page item descriptor from edit context
+    const pageItem = editContext?.currentItemDescriptor ? {
+      id: editContext.currentItemDescriptor.id,
+      language: editContext.currentItemDescriptor.language,
+      version: editContext.currentItemDescriptor.version,
+      name: editContext.contentEditorItem?.name,
+      path: undefined,
+    } : undefined;
+
+    // Build new components with page info
+    const newComponents = newComponentIds.map(componentId => ({
+      componentId,
+      pageItem: pageItem!,
+    }));
+
     const next: AgentMetadata = {
-      ...currentWithoutContext,
-      additionalData: {
-        ...(current.additionalData || {}),
-        context: {
-          ...((current.additionalData &&
-            (current.additionalData as any).context) ||
-            {}),
-          componentIds: [...currentComponentIds, ...newComponentIds],
-        },
-      },
-    } as AgentMetadata;
+      ...current,
+      components: [...currentComponents, ...newComponents],
+    };
 
     try {
       if (agent.status === "new") {
         setAgentMetadata(next);
         return;
       }
-      await updateAgentMetadata(agent.id, next);
+      await updateAgentContext(agent.id, next);
       setAgentMetadata(next);
       setAgent((prev) =>
-        prev ? { ...prev, metadata: JSON.stringify(next) } : prev,
+        prev ? { ...prev, agentContext: JSON.stringify(next) } : prev,
       );
     } catch (e) {
-      console.error("Failed to update agent metadata (add components)", e);
+      console.error("Failed to update agent context (add components)", e);
     }
   };
 
@@ -246,8 +228,7 @@ export function ContextInfoBar({
     if (!agent?.id || !items?.length) return;
 
     const current = agentMetadata || {};
-    const currentPages =
-      ((current.additionalData as any)?.context?.pages as Array<any>) || [];
+    const currentPages = current.pages || [];
 
     const existingPageIds = new Set(
       currentPages.map((p: any) => `${p.id}-${p.language}-${p.version}`),
@@ -279,33 +260,23 @@ export function ContextInfoBar({
 
     if (pagesToAdd.length === 0) return;
 
-    // Exclude top-level context to avoid duplicate keys when spreading
-    const { context: _, ...currentWithoutContext } = current;
     const next: AgentMetadata = {
-      ...currentWithoutContext,
-      additionalData: {
-        ...(current.additionalData || {}),
-        context: {
-          ...((current.additionalData &&
-            (current.additionalData as any).context) ||
-            {}),
-          pages: [...currentPages, ...pagesToAdd],
-        },
-      },
-    } as AgentMetadata;
+      ...current,
+      pages: [...currentPages, ...pagesToAdd],
+    };
 
     try {
       if (agent.status === "new") {
         setAgentMetadata(next);
         return;
       }
-      await updateAgentMetadata(agent.id, next);
+      await updateAgentContext(agent.id, next);
       setAgentMetadata(next);
       setAgent((prev) =>
-        prev ? { ...prev, metadata: JSON.stringify(next) } : prev,
+        prev ? { ...prev, agentContext: JSON.stringify(next) } : prev,
       );
     } catch (e) {
-      console.error("Failed to update agent metadata (add items/pages)", e);
+      console.error("Failed to update agent context (add items/pages)", e);
     }
   };
 
@@ -377,22 +348,10 @@ export function ContextInfoBar({
     }
   };
 
-  const ctx = (agentMetadata as any)?.additionalData?.context as
-    | {
-        pages?: Array<{
-          id: string;
-          language: string;
-          version: number;
-          path?: string;
-          name?: string;
-        }>;
-        componentIds?: string[];
-        field?: { fieldId: string; itemId: string; name?: string };
-      }
-    | undefined;
+  const ctx = agentMetadata;
 
   const hasContext =
-    ctx && (ctx.pages?.length || ctx.componentIds?.length || ctx.field);
+    ctx && (ctx.pages?.length || ctx.components?.length || ctx.componentIds?.length || ctx.field);
 
   const currentPageAlreadyAdded =
     editContext?.currentItemDescriptor &&
@@ -406,6 +365,7 @@ export function ContextInfoBar({
   const selectedComponentsAlreadyAdded =
     !!editContext?.selection?.length &&
     !!editContext.selection?.every((selectedId) =>
+      ctx?.components?.some(c => c.componentId === selectedId) || 
       ctx?.componentIds?.includes(selectedId),
     );
 
@@ -447,7 +407,7 @@ export function ContextInfoBar({
       const pageLabelName =
         page.name ||
         resolvedPageName ||
-        (agent?.itemPath ? agent.itemPath.split("/").pop() : undefined);
+        undefined;
       const pageLabel = `${pageLabelName || page.path || page.id} (${page.language}/${page.version})`;
       chips.push(
         <Chip
@@ -460,7 +420,35 @@ export function ContextInfoBar({
     });
   }
 
-  if (ctx?.componentIds && ctx.componentIds.length > 0) {
+  if (ctx?.components && ctx.components.length > 0) {
+    ctx.components.forEach((component, index) => {
+      const componentId = component.componentId;
+      let compLabel: string = componentId;
+      if (index === 0 && resolvedComponentName) {
+        compLabel = resolvedComponentName as string;
+      } else if (editContext?.page) {
+        try {
+          const comp = getComponentById(componentId, editContext.page);
+          compLabel = (comp?.name as string) || componentId;
+        } catch {}
+      }
+      
+      // Include page info in the label
+      const pageInfo = component.pageItem 
+        ? ` on ${component.pageItem.name || component.pageItem.path || component.pageItem.id}`
+        : '';
+      
+      chips.push(
+        <Chip
+          key={`component-${index}`}
+          icon={<Puzzle className="h-3 w-3 text-gray-500" strokeWidth={1} />}
+          label={`Component: ${compLabel}${pageInfo}`}
+          onRemove={() => removeContextKey("components", index)}
+        />,
+      );
+    });
+  } else if (ctx?.componentIds && ctx.componentIds.length > 0) {
+    // Legacy support for componentIds without page info
     ctx.componentIds.forEach((componentId, index) => {
       let compLabel: string = componentId as string;
       if (index === 0 && resolvedComponentName) {
@@ -504,12 +492,27 @@ export function ContextInfoBar({
     const pageLabelName =
       first.name ||
       resolvedPageName ||
-      (agent?.itemPath ? agent.itemPath.split("/").pop() : undefined);
+      undefined;
     const pageText = pageLabelName || first.path || first.id;
     const more = ctx.pages.length > 1 ? ` (+${ctx.pages.length - 1})` : "";
     summaryParts.push(`Item: ${pageText}${more}`);
   }
-  if (ctx?.componentIds && ctx.componentIds.length > 0) {
+  if (ctx?.components && ctx.components.length > 0) {
+    const firstComponent = ctx.components[0]!;
+    const firstId = firstComponent.componentId;
+    let compLabel: string = firstId;
+    if (resolvedComponentName) compLabel = resolvedComponentName as string;
+    else if (editContext?.page) {
+      try {
+        const comp = getComponentById(firstId, editContext.page);
+        compLabel = (comp?.name as string) || firstId;
+      } catch {}
+    }
+    const more =
+      ctx.components.length > 1 ? ` (+${ctx.components.length - 1})` : "";
+    summaryParts.push(`Component: ${compLabel}${more}`);
+  } else if (ctx?.componentIds && ctx.componentIds.length > 0) {
+    // Legacy support for componentIds
     const firstId = ctx.componentIds[0]!;
     let compLabel: string = firstId as string;
     if (resolvedComponentName) compLabel = resolvedComponentName as string;