@alpaca-editor/core 1.0.4013 → 1.0.4015

package/src/editor/ai/AiTerminal.tsx

@@ -8,10 +8,13 @@ import { Terminal } from "../Terminal";
 import { useEditContext } from "../client/editContext";
 import { Dropdown } from "primereact/dropdown";
 
-import Cookies from "universal-cookie";
 import { WizardIcon } from "../ui/Icons";
 import { AiResponseMessage } from "./AiResponseMessage";
-import { AiProfile, loadAiProfiles } from "../services/aiService";
+import {
+  AiProfile,
+  loadAiProfiles,
+  executePrompt,
+} from "../services/aiService";
 import { EditOperation } from "../../types";
 import { SimpleIconButton } from "../ui/SimpleIconButton";
 import { Settings } from "lucide-react";
@@ -35,7 +38,7 @@ export type ToolCall = {
 };
 
 export type Message = {
-  id: number;
+  id: string; // Changed from number to string for UUID support
   content: string;
   formattedContent?: string;
   name: string;
@@ -53,6 +56,7 @@ export type AiContext = {
 export type AiTerminalOptions = {
   initialPrompt?: string;
   hiddenSystemPrompt?: string;
+  initialMessages?: Message[];
 };
 
 export function AiTerminal({
@@ -71,7 +75,7 @@ export function AiTerminal({
 
   if (!editContext) return null;
 
-  const [messages, setMessages] = useState<Message[]>([]);
+  const [messages, setMessages] = useState<Message[]>(options?.initialMessages || []);
   const [response, setResponse] = useState<Response>();
   const [model, setModel] = useState<string>();
   const [prompt, setPrompt] = useState("");
@@ -81,7 +85,7 @@ export function AiTerminal({
   const [agentId] = useState<string>(() => crypto.randomUUID());
   const selection = editContext.selection;
   const terminalRef = useRef<{ submit: () => void }>(null);
-  const [responseMessages, setResponseMessages] = useState<Message[]>([]);
+  const [responseMessages, setResponseMessages] = useState<Message[]>(options?.initialMessages || []);
   const [showSettings, setShowSettings] = useState(false);
   const settingsRef = useRef<HTMLDivElement>(null);
 
@@ -120,6 +124,91 @@ export function AiTerminal({
     messagesRef.current = responseMessages;
   }, [responseMessages]);
 
+  // State for initial messages to pass to Terminal
+  type TerminalMessage = {text: React.ReactNode, type: "command" | "response"};
+  const [initialTerminalMessages, setInitialTerminalMessages] = useState<TerminalMessage[] | undefined>(undefined);
+
+  // Effect to set up initial messages for display  
+  useEffect(() => {
+    if (options?.initialMessages && options.initialMessages.length > 0) {
+      console.log("AiTerminal: Loading initial messages", options.initialMessages);
+      
+      // Format the initial messages for display
+      const formattedMessages = options.initialMessages.map((message) => {
+        const formattedContent = message.content
+          ?.trim()
+          ?.replaceAll("\n", "<br>")
+          ?.replace(/\*\*(.*?)\*\*/g, "<b>$1</b>") || "";
+
+        return {
+          ...message,
+          content: message.content || "",
+          formattedContent: formattedContent,
+          tool_calls: message.tool_calls || [],
+        };
+      });
+
+      console.log("AiTerminal: Formatted messages", formattedMessages);
+
+      // Update the internal message states
+      setMessages(formattedMessages);
+      setResponseMessages(formattedMessages);
+      
+      // Create a response object for internal state
+      const initialResponse: Response = {
+        messages: formattedMessages,
+        editOperations: [],
+        numInputTokens: 0,
+        numOutputTokens: 0,
+        numCachedTokens: 0,
+        state: "loaded"
+      };
+      
+      console.log("AiTerminal: Setting response", initialResponse);
+      setResponse(initialResponse);
+      
+      // Create individual Terminal messages for each conversation message
+      const terminalMessages: TerminalMessage[] = [];
+      
+      formattedMessages.forEach((message) => {
+        if (message.role === "user") {
+          // User messages appear as commands
+          terminalMessages.push({
+            type: "command",
+            text: message.content
+          });
+        } else if (message.role === "assistant") {
+          // Assistant messages appear as responses
+          terminalMessages.push({
+            type: "response",
+            text: (
+              <div
+                dangerouslySetInnerHTML={{
+                  __html: message.formattedContent || message.content || "",
+                }}
+              />
+            )
+          });
+        }
+        // Add tool calls if present
+        if (message.tool_calls && message.tool_calls.length > 0) {
+          message.tool_calls.forEach((toolCall) => {
+            terminalMessages.push({
+              type: "response",
+              text: (
+                <div className="text-xs text-gray-400">
+                  🔧 {toolCall.displayName}
+                </div>
+              )
+            });
+          });
+        }
+      });
+      
+      setInitialTerminalMessages(terminalMessages);
+    }
+  }, [options?.initialMessages]);
+
   // Handle click outside for settings popover
   useEffect(() => {
     function handleClickOutside(event: MouseEvent) {
@@ -150,13 +239,13 @@ export function AiTerminal({
     if (updatedMessages && Array.isArray(updatedMessages)) {
       const formattedMessages = updatedMessages.map((message) => {
         const formattedContent = message.content
-          .trim()
-          .replaceAll("\n", "<br>")
-          ?.replace(/\*\*(.*?)\*\*/g, "<b>$1</b>");
+          ?.trim()
+          ?.replaceAll("\n", "<br>")
+          ?.replace(/\*\*(.*?)\*\*/g, "<b>$1</b>") || "";
 
         return {
           ...message,
-          content: message.content,
+          content: message.content || "",
           formattedContent: formattedContent,
           tool_calls: message.tool_calls || [],
         };
@@ -192,7 +281,7 @@ export function AiTerminal({
     callback: (text: React.ReactNode, finished: boolean) => void,
   ) {
     const userMessage = {
-      id: Date.now(), // Add unique id
+      id: crypto.randomUUID(), // Add unique id
       content: text,
       role: "user",
       name: "user",
@@ -214,7 +303,7 @@ export function AiTerminal({
               role: "system",
               name: "system",
               content: options.hiddenSystemPrompt,
-              id: 0, // System message id
+              id: crypto.randomUUID(), // Use UUID instead of hardcoded 0
               toolCalls: [],
             },
           ]
@@ -223,72 +312,21 @@ export function AiTerminal({
     ];
 
     const response = await executePrompt(
-      activeProfile.id,
       messages,
-      selection,
-      editContext!.sessionId,
-      model,
-      selectedText,
       context,
-      agentId,
+      {
+        profileId: activeProfile.id,
+        selection,
+        selectedText,
+        model,
+        sessionId: editContext!.sessionId,
+        agentId,
+        addSelectedComponents: true,
+      },
+      undefined,
       (response: any) => {
         setResponse(response);
         handleResponse(response, callback, false);
-        // if (response.editOperations.length) {
-        //   if (!editContext) return;
-
-        //   const newOps = response.editOperations.slice(lastOpIndex);
-
-        //   if (newOps.length === 0) return;
-
-        //   const isEditTextFieldOp = (op: EditOperation) => {
-        //     if (op.type !== "edit-field") return false;
-        //     const editFieldOp = op as EditFieldOperation;
-        //     return (
-        //       editFieldOp.fieldType &&
-        //       editFieldOp.fieldType.indexOf("text") !== -1
-        //     );
-        //   };
-
-        //   const isEditTextField = isEditTextFieldOp(newOps[newOps.length - 1]);
-
-        //   if (isEditTextField) lastOpIndex = response.editOperations.length - 1;
-        //   else lastOpIndex = response.editOperations.length;
-
-        //   newOps.forEach((op: EditOperation) => {
-        //     if (isEditTextFieldOp(op)) {
-        //       const editFieldOp = op as EditFieldOperation;
-
-        //       if (editFieldOp.itemId) {
-        //         const fieldDescriptor = {
-        //           item: {
-        //             ...editFieldOp.mainItem,
-        //             id: editFieldOp.itemId,
-        //           },
-        //           fieldId: editFieldOp.fieldId,
-        //         };
-        //         editContext.itemsRepository.updateFieldValue(
-        //           fieldDescriptor,
-        //           editFieldOp.user ?? { name: "unknown", ai: false },
-        //           false,
-        //           editFieldOp.value,
-        //         );
-
-        //         editContext.select([editFieldOp.itemId]);
-        //         editContext.setScrollIntoView(editFieldOp.itemId);
-
-        //         editContext?.setFocusedField(fieldDescriptor, false);
-        //       }
-        //     } else {
-        //       const addOp = op as AddComponentOperation;
-        //       if (op.type === "add-component" && addOp.componentId) {
-        //         const newComponentId = addOp.componentId;
-        //         editContext.select([newComponentId]);
-        //         editContext.setScrollIntoView(newComponentId);
-        //       }
-        //     }
-        //   });
-        // }
       },
     );
 
@@ -320,7 +358,7 @@ export function AiTerminal({
 
   return (
     <div
-      className="relative flex h-full flex-1 flex-col pl-1.5"
+      className="relative flex h-full flex-1 flex-col"
       data-testid="ai-terminal"
     >
       <div className="relative flex-1">
@@ -332,7 +370,9 @@ export function AiTerminal({
               setMessages([]);
               setResponseMessages([]);
               setResponse(undefined);
+              setInitialTerminalMessages(undefined);
             }}
+            initialMessages={initialTerminalMessages}
             infobar={
               response?.numInputTokens && (
                 <div
@@ -448,103 +488,3 @@ export function AiTerminal({
     </div>
   );
 }
-
-async function executePrompt(
-  profileId: string,
-  messages: Message[],
-  selection: string[],
-  session: string | null,
-  model: string | null,
-  selectedText: string | null,
-  context: AiContext,
-  agentId: string,
-  callback: (response: any) => void,
-): Promise<Response | null> {
-  const response = await fetch(context.endpoint, {
-    method: "POST",
-    body: JSON.stringify({
-      ...context.promptData,
-      profileId,
-      messages,
-      selection,
-      addSelectedComponents: true,
-      selectedText,
-      model,
-      sessionId: session,
-      agentId,
-    }),
-    credentials: "include",
-    headers: {
-      "Content-Type": "application/json",
-      Cookie: new Cookies().getAll(),
-    },
-  });
-
-  if (!response.ok) {
-    const text = await response.text();
-    return {
-      messages: [
-        {
-          content: "There was an error processing your request: " + text,
-          id: 0,
-          name: "assistant",
-          role: "assistant",
-        },
-      ],
-      editOperations: [],
-      numInputTokens: 0,
-      numOutputTokens: 0,
-      numCachedTokens: 0,
-      state: "error",
-    };
-  }
-
-  if (!response?.body) return null;
-
-  const reader = response.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = "";
-
-  let result = null;
-
-  while (true) {
-    const { done, value } = await reader.read();
-
-    if (done) {
-      break;
-    }
-
-    buffer += decoder.decode(value, { stream: true }); // 'stream: true' ensures that any incomplete multi-byte characters aren't malformed.
-
-    // Split the buffer by newline and keep the last partial line for the next iteration.
-    const lines = buffer.split("\n");
-
-    if (lines.length > 0) {
-      buffer = lines.pop() || ""; // Incomplete line (if any) is kept for the next iteration.
-
-      for (let line of lines) {
-        if (line.trim() === "") continue; // Skip empty lines if any.
-
-        try {
-          const jsonData = JSON.parse(line);
-          callback(jsonData);
-          result = jsonData;
-        } catch (e) {
-          console.error("Error parsing line:" + line, e);
-        }
-      }
-    }
-  }
-
-  // If there's any remaining content in the buffer after processing all chunks, try to process it.
-  if (buffer.trim() !== "") {
-    try {
-      const jsonData = JSON.parse(buffer);
-      result = jsonData;
-    } catch (e) {
-      console.error("Error parsing the final buffer content:", e);
-    }
-  }
-
-  return result;
-}

package/src/editor/ai/GhostWriter.tsx_

@@ -267,16 +267,16 @@ export function GhostWriter() {
 
             role: "user",
             name: "user",
+            id: Date.now(),
           },
         ],
-        editContext,
-        createEditorAiContext,
+        { editContext, createAiContext: createEditorAiContext },
         {
           addAllContent: true,
           profile: "ghostwriter",
+          model: "gpt-4.1",
         },
         undefined,
-        "gpt-4.1",
         handleAiResponse,
       );
 

package/src/editor/media-selector/AiImageSearch.tsx

@@ -61,10 +61,10 @@ export function AiImageSearch({
                 "Reply with search terms only!",
               name: "user",
               role: "user",
+              id: crypto.randomUUID(), // Use proper UUID instead of Date.now()
             },
           ],
-          editContext,
-          createEditorAiContext,
+          { editContext, createAiContext: createEditorAiContext },
           { allowedFunctions: ["get-content"], addContextContent: true },
           { signal: abortController.signal },
         );

package/src/editor/media-selector/AiImageSearchPrompt.tsx

@@ -44,10 +44,10 @@ export function AiImageSearchPrompt({
                 "Reply with search terms only!",
               name: "user",
               role: "user",
+              id: crypto.randomUUID(), // Use proper UUID instead of Date.now()
             },
           ],
-          editContext,
-          createEditorAiContext,
+          { editContext, createAiContext: createEditorAiContext },
           { allowedFunctions: ["get-content"], addContextContent: true },
           { signal: abortController.signal },
         );

package/src/editor/page-editor-chrome/useInlineAICompletion.tsx

@@ -350,11 +350,13 @@ ONLY provide the completion text (what comes after the user's text), never repea
         name: "system",
         role: "system",
         content: systemPrompt,
+        id: crypto.randomUUID(), // Use proper UUID instead of Date.now()
       },
       {
         name: "user",
         role: "user",
         content: `Complete this text. ONLY provide the completion (do not repeat my text): ${contentUpToCursor}`,
+        id: crypto.randomUUID(), // Use proper UUID instead of Date.now()
       },
     ];
 
@@ -365,8 +367,7 @@ ONLY provide the completion text (what comes after the user's text), never repea
     try {
       const result = await executePrompt(
         messages,
-        editContext,
-        () => ({
+        {
           endpoint: "/alpaca/editor/ai/complete",
           promptData: {
             itemid: itemId,
@@ -376,10 +377,9 @@ ONLY provide the completion text (what comes after the user's text), never repea
             fieldname: fieldName,
             content: contentUpToCursor,
           },
-        }),
-        {},
+        },
+        { model: "gpt-4.1-nano" },
         { signal },
-        "gpt-4.1-nano",
       );
 
       return result;

package/src/editor/services/agentService.ts

@@ -0,0 +1,83 @@
+import { get } from "./serviceHelper";
+
+export interface AgentChat {
+  id: string;
+  name: string;
+  sessionId: string;
+  userId: string;
+  userDisplayName: string;
+  itemId: string;
+  itemPath: string;
+  language: string;
+  version: number;
+  profileId?: string;
+  profileName: string;
+  model: string;
+  status: "active" | "completed" | "error" | "abandoned";
+  createdDate: string;
+  updatedDate: string;
+  lastMessageDate?: string;
+  totalTokensUsed: number;
+  totalInputTokens: number;
+  totalOutputTokens: number;
+  messageCount: number;
+  metadata?: string;
+  messages?: AgentChatMessage[];
+}
+
+export interface AgentChatMessage {
+  id: string;
+  agentId: string;
+  messageIndex: number;
+  role: string;
+  content: string;
+  name: string;
+  toolCallId?: string;
+  functionName?: string;
+  functionArguments?: string;
+  functionResult?: any;
+  functionError?: string;
+  isCompleted: boolean;
+  model?: string;
+  tokensUsed: number;
+  inputTokens: number;
+  outputTokens: number;
+  responseTimeMs?: number;
+  createdDate: string;
+  editOperations?: any[];
+  longRunningTaskIds?: string[];
+  metadata?: string;
+}
+
+/**
+ * Gets all agents for the current user
+ */
+export async function getAgents(
+  status?: "active" | "completed" | "error" | "abandoned",
+  limit = 100
+) {
+  const url = `/alpaca/editor/ai/GetAgents${status ? `?status=${status}` : ""}${limit ? `${status ? "&" : "?"}limit=${limit}` : ""}`;
+  const response = await get<AgentChat[]>(url);
+  return response;
+}
+
+/**
+ * Gets a specific agent with its messages
+ */
+export async function getAgent(agentId: string) {
+  const url = `/alpaca/editor/ai/GetAgent?agentId=${agentId}`;
+  const response = await get<AgentChat>(url);
+  return response;
+}
+
+/**
+ * Gets chat history for the current user
+ */
+export async function getChatHistory(
+  status?: "active" | "completed" | "error" | "abandoned",
+  limit = 50
+) {
+  const url = `/alpaca/editor/ai/GetChatHistory${status ? `?status=${status}` : ""}${limit ? `${status ? "&" : "?"}limit=${limit}` : ""}`;
+  const response = await get<AgentChat[]>(url);
+  return response;
+}