@alpaca-editor/core 1.0.4133 → 1.0.4134

package/src/editor/ai/AgentTerminal.tsx

@@ -88,10 +88,116 @@ interface TodoItem {
   text: string;
   done?: boolean;
   note?: string;
-  messageId: string;
+  messageId?: string;
   sourceTitle?: string;
 }
 
+// Helper to extract todos from potentially incomplete JSON during streaming
+const extractPartialTodos = (jsonText: string): any[] => {
+  // First try to parse complete JSON
+  try {
+    const parsed = JSON.parse(jsonText);
+    return Array.isArray(parsed) ? parsed : parsed?.items || [];
+  } catch (e) {
+    // If JSON is incomplete, try to extract whatever todo items we can find
+    const items: any[] = [];
+
+    // Look for individual todo objects in the partial JSON
+    // Match patterns like: { "text": "...", "done": false, "note": "..." }
+    // Handle various field orderings (text can be anywhere in the object)
+    const textPattern = /"text"\s*:\s*"([^"]+)"/g;
+    const textMatches: Array<{ text: string; startIdx: number }> = [];
+    let textMatch;
+    while ((textMatch = textPattern.exec(jsonText)) !== null) {
+      if (textMatch[1]) {
+        textMatches.push({
+          text: textMatch[1],
+          startIdx: textMatch.index,
+        });
+      }
+    }
+
+    // For each text field found, try to find the enclosing object
+    for (const { text, startIdx } of textMatches) {
+      // Find the opening brace before this text field
+      let openBrace = -1;
+      for (let i = startIdx - 1; i >= 0; i--) {
+        if (jsonText[i] === "{") {
+          openBrace = i;
+          break;
+        }
+        if (jsonText[i] === "}") break; // Hit another object's end
+      }
+
+      if (openBrace === -1) continue;
+
+      // Find the closing brace after this text field
+      let closeBrace = -1;
+      let depth = 0;
+      for (let i = openBrace; i < jsonText.length; i++) {
+        if (jsonText[i] === "{") depth++;
+        if (jsonText[i] === "}") {
+          depth--;
+          if (depth === 0) {
+            closeBrace = i;
+            break;
+          }
+        }
+      }
+
+      // Extract the object and try to parse it
+      const objStr =
+        closeBrace !== -1
+          ? jsonText.substring(openBrace, closeBrace + 1)
+          : jsonText.substring(openBrace) + "}"; // Try to close incomplete object
+
+      try {
+        const obj = JSON.parse(objStr);
+        if (obj.text) {
+          items.push({
+            text: obj.text,
+            done: obj.done === true,
+            note: obj.note || undefined,
+          });
+        }
+      } catch (e) {
+        // Skip malformed objects
+      }
+    }
+
+    // Also try to extract from partial objects at the end
+    // Look for the last opening brace and try to parse up to where we have valid content
+    const lines = jsonText.split("\n");
+    for (let i = lines.length - 1; i >= 0; i--) {
+      const partialJson = lines.slice(0, i + 1).join("\n");
+      // Try to close any open braces/brackets
+      let testJson = partialJson;
+      const openBraces = (testJson.match(/\{/g) || []).length;
+      const closeBraces = (testJson.match(/\}/g) || []).length;
+      const openBrackets = (testJson.match(/\[/g) || []).length;
+      const closeBrackets = (testJson.match(/\]/g) || []).length;
+
+      // Add missing closing characters
+      testJson += "]".repeat(openBrackets - closeBrackets);
+      testJson += "}".repeat(openBraces - closeBraces);
+
+      try {
+        const parsed = JSON.parse(testJson);
+        const partialItems = Array.isArray(parsed)
+          ? parsed
+          : parsed?.items || [];
+        if (partialItems.length > items.length) {
+          return partialItems;
+        }
+      } catch (e) {
+        continue;
+      }
+    }
+
+    return items;
+  }
+};
+
 const extractTodosFromMessages = (messages: AgentChatMessage[]): TodoItem[] => {
   const todos: TodoItem[] = [];
   const fencedTodoToken = "```todo_list";
@@ -126,12 +232,20 @@ const extractTodosFromMessages = (messages: AgentChatMessage[]): TodoItem[] => {
 
       try {
         let jsonText = "";
+        let isComplete = true;
+
         if (isFenced) {
           const afterToken = todoStart + fencedTodoToken.length;
           const closePos = content.indexOf("```", afterToken);
-          if (closePos === -1) break;
-          jsonText = content.slice(afterToken, closePos).trim();
-          cursor = closePos + 3;
+          if (closePos === -1) {
+            // Incomplete fenced block - extract what we have so far
+            jsonText = content.slice(afterToken).trim();
+            isComplete = false;
+            cursor = content.length; // Process till end
+          } else {
+            jsonText = content.slice(afterToken, closePos).trim();
+            cursor = closePos + 3;
+          }
         } else {
           const afterToken = todoStart + plainTodoToken.length;
           const braceStart = content.indexOf("{", afterToken);
@@ -149,24 +263,56 @@ const extractTodosFromMessages = (messages: AgentChatMessage[]): TodoItem[] => {
               }
             }
           }
-          if (braceEnd === -1) break;
-          jsonText = content.slice(braceStart, braceEnd + 1).trim();
-          cursor = braceEnd + 1;
+
+          if (braceEnd === -1) {
+            // Incomplete JSON - extract what we have
+            jsonText = content.slice(braceStart).trim();
+            isComplete = false;
+            cursor = content.length;
+          } else {
+            jsonText = content.slice(braceStart, braceEnd + 1).trim();
+            cursor = braceEnd + 1;
+          }
         }
 
-        const parsed = JSON.parse(jsonText);
-        const todoItems = Array.isArray(parsed) ? parsed : parsed?.items || [];
-        const title = Array.isArray(parsed) ? undefined : parsed?.title;
+        // Use the partial extraction helper for incomplete JSON
+        const todoItems = isComplete
+          ? (() => {
+              try {
+                const parsed = JSON.parse(jsonText);
+                return Array.isArray(parsed) ? parsed : parsed?.items || [];
+              } catch (e) {
+                return [];
+              }
+            })()
+          : extractPartialTodos(jsonText);
+
+        const title = (() => {
+          try {
+            const parsed = JSON.parse(jsonText);
+            return Array.isArray(parsed) ? undefined : parsed?.title;
+          } catch (e) {
+            return undefined;
+          }
+        })();
 
         todoItems.forEach((item: any) => {
           if (!item) return;
           const text =
-            item.text || item.label || String(item.task || item.title || "");
+            item.text ||
+            item.content ||
+            item.label ||
+            String(item.task || item.title || "");
           if (!text) return;
           todos.push({
             id: item.id,
             text,
-            done: !!(item.done ?? item.completed ?? item.checked),
+            done: !!(
+              item.done ??
+              item.completed ??
+              item.checked ??
+              item.status === "completed"
+            ),
             note: item.note || item.description,
             messageId: message.id,
             sourceTitle: title,
@@ -183,22 +329,101 @@ const extractTodosFromMessages = (messages: AgentChatMessage[]): TodoItem[] => {
 };
 
 // TodoListPanel component
-const TodoListPanel = ({ messages }: { messages: AgentChatMessage[] }) => {
+const TodoListPanel = ({
+  messages,
+  agentMetadata,
+}: {
+  messages: AgentChatMessage[];
+  agentMetadata: AgentMetadata | null;
+}) => {
   const [isExpanded, setIsExpanded] = useState(true);
-  const todos = useMemo(() => extractTodosFromMessages(messages), [messages]);
 
-  // Check if there's an active streaming message with todo content
+  const todos = useMemo(() => {
+    // First try to get todos from agent metadata (real-time updates)
+    const metadataTodos = (() => {
+      try {
+        const context = (agentMetadata as any)?.additionalData?.context;
+        const todoList = context?.todoList;
+        if (todoList?.items && Array.isArray(todoList.items)) {
+          return todoList.items
+            .map((item: any, idx: number) => ({
+              id: item.id || `metadata-${idx}`,
+              text:
+                item.text ||
+                item.label ||
+                String(item.task || item.title || ""),
+              done: !!(item.done ?? item.completed ?? item.checked),
+              note: item.note || item.description,
+              messageId: undefined,
+              sourceTitle: todoList.title,
+            }))
+            .filter((item: any) => item.text);
+        }
+      } catch (e) {
+        // Fallback to extracting from messages
+      }
+      return null;
+    })();
+
+    // If we have metadata todos, use them; otherwise extract from messages
+    if (metadataTodos && metadataTodos.length > 0) {
+      return metadataTodos;
+    }
+
+    return extractTodosFromMessages(messages);
+  }, [messages, agentMetadata]);
+
+  // Check if there's an active streaming message with incomplete todo content
   const isUpdating = useMemo(() => {
     return messages.some((msg) => {
       if (msg.role !== "assistant" || msg.isCompleted) return false;
       const content = msg.content || "";
-      return content.includes("```todo_list") || content.includes("todo_list");
+
+      // Check for incomplete fenced todo blocks
+      const fencedStart = content.indexOf("```todo_list");
+      if (fencedStart !== -1) {
+        const afterStart = fencedStart + "```todo_list".length;
+        const closePos = content.indexOf("```", afterStart);
+        if (closePos === -1) {
+          // Incomplete fenced block
+          return true;
+        }
+      }
+
+      // Check for incomplete plain todo blocks
+      const plainStart = content.indexOf("todo_list");
+      if (plainStart !== -1 && plainStart !== fencedStart) {
+        const before = plainStart > 0 ? content[plainStart - 1] : "\n";
+        if (before === "\n" || before === "\r" || plainStart === 0) {
+          const braceStart = content.indexOf("{", plainStart);
+          if (braceStart !== -1) {
+            let depth = 0;
+            let braceEnd = -1;
+            for (let i = braceStart; i < content.length; i++) {
+              if (content[i] === "{") depth++;
+              if (content[i] === "}") {
+                depth--;
+                if (depth === 0) {
+                  braceEnd = i;
+                  break;
+                }
+              }
+            }
+            if (braceEnd === -1) {
+              // Incomplete plain block
+              return true;
+            }
+          }
+        }
+      }
+
+      return false;
     });
   }, [messages]);
 
   if (todos.length === 0 && !isUpdating) return null;
 
-  const completedCount = todos.filter((t) => t.done).length;
+  const completedCount = todos.filter((t: TodoItem) => t.done).length;
   const totalCount = todos.length;
 
   return (
@@ -229,66 +454,69 @@ const TodoListPanel = ({ messages }: { messages: AgentChatMessage[] }) => {
       </button>
       {isExpanded && (
         <div className="max-h-64 overflow-y-auto px-4 pb-3">
-          {isUpdating && todos.length === 0 ? (
-            <div className="flex items-center justify-center gap-2 py-4 text-xs text-gray-500">
-              <Loader2 className="h-4 w-4 animate-spin" strokeWidth={1} />
-              <span>Loading todo list...</span>
-            </div>
-          ) : (
-            <>
-              <div className="space-y-1.5">
-                {todos.map((todo, idx) => (
-                  <div
-                    key={todo.id || `${todo.messageId}-${idx}`}
-                    className="flex items-start gap-2 rounded bg-white p-2 text-xs"
-                  >
-                    <div className="flex-shrink-0 pt-0.5">
-                      {todo.done ? (
-                        <div className="flex h-4 w-4 items-center justify-center rounded border-2 border-green-500 bg-green-500">
-                          <svg
-                            className="h-3 w-3 text-white"
-                            fill="none"
-                            strokeWidth={2}
-                            stroke="currentColor"
-                            viewBox="0 0 24 24"
-                          >
-                            <path
-                              strokeLinecap="round"
-                              strokeLinejoin="round"
-                              d="M5 13l4 4L19 7"
-                            />
-                          </svg>
-                        </div>
-                      ) : (
-                        <div className="h-4 w-4 rounded border-2 border-gray-300" />
-                      )}
-                    </div>
-                    <div className="min-w-0 flex-1">
-                      <div
-                        className={`${
-                          todo.done
-                            ? "text-gray-500 line-through"
-                            : "text-gray-900"
-                        }`}
-                      >
-                        {todo.text}
+          {todos.length > 0 && (
+            <div className="space-y-1.5">
+              {todos.map((todo: TodoItem, idx: number) => (
+                <div
+                  key={todo.id || `${todo.messageId}-${idx}`}
+                  className="flex items-start gap-2 rounded bg-white p-2 text-xs"
+                >
+                  <div className="flex-shrink-0 pt-0.5">
+                    {todo.done ? (
+                      <div className="flex h-4 w-4 items-center justify-center rounded border-2 border-green-500 bg-green-500">
+                        <svg
+                          className="h-3 w-3 text-white"
+                          fill="none"
+                          strokeWidth={2}
+                          stroke="currentColor"
+                          viewBox="0 0 24 24"
+                        >
+                          <path
+                            strokeLinecap="round"
+                            strokeLinejoin="round"
+                            d="M5 13l4 4L19 7"
+                          />
+                        </svg>
                       </div>
-                      {todo.note && (
-                        <div className="mt-0.5 text-xs text-gray-500">
-                          {todo.note}
-                        </div>
-                      )}
+                    ) : (
+                      <div className="h-4 w-4 rounded border-2 border-gray-300" />
+                    )}
+                  </div>
+                  <div className="min-w-0 flex-1">
+                    <div
+                      className={`${
+                        todo.done
+                          ? "text-gray-500 line-through"
+                          : "text-gray-900"
+                      }`}
+                    >
+                      {todo.text}
                     </div>
+                    {todo.note && (
+                      <div className="mt-0.5 text-xs text-gray-500">
+                        {todo.note}
+                      </div>
+                    )}
                   </div>
-                ))}
-              </div>
-              {isUpdating && todos.length > 0 && (
-                <div className="mt-2 flex items-center gap-2 rounded bg-blue-50 px-3 py-2 text-xs text-blue-700">
-                  <Loader2 className="h-3 w-3 animate-spin" strokeWidth={1} />
-                  <span>Updating todo list...</span>
                 </div>
-              )}
-            </>
+              ))}
+            </div>
+          )}
+          {isUpdating && (
+            <div
+              className={`flex items-center gap-2 rounded px-3 py-2 text-xs ${
+                todos.length > 0
+                  ? "mt-2 bg-blue-50 text-blue-700"
+                  : "justify-center bg-white text-gray-500"
+              }`}
+            >
+              <Loader2 className="h-3 w-3 animate-spin" strokeWidth={1} />
+              <span>
+                {todos.length > 0
+                  ? "Updating todo list..."
+                  : "Loading todo list..."}
+              </span>
+            </div>
           )}
         </div>
       )}
@@ -423,7 +651,7 @@ export function AgentTerminal({
   const [messages, setMessages] = useState<AgentChatMessage[]>([]);
   const [prompt, setPrompt] = useState("");
   const [inputPlaceholder, setInputPlaceholder] = useState<string>(
-    "Type your message... (Enter to send, Ctrl+Enter for new line)",
+    "Type your message... (Enter to send, Shift+Enter or Ctrl+Enter for new line)",
   );
   const [isLoading, setIsLoading] = useState(false);
   const [isConnecting, setIsConnecting] = useState(false);
@@ -552,6 +780,18 @@ export function AgentTerminal({
     initialCostLimit: number;
   } | null>(null);
 
+  // Live running totals from backend status updates (tokenUsage)
+  const [liveTotals, setLiveTotals] = useState<{
+    input: number;
+    output: number;
+    cached: number;
+    inputCost: number;
+    outputCost: number;
+    cachedCost: number;
+    totalCost: number;
+    currency?: string;
+  } | null>(null);
+
   // Flag to track when we should create a new message
   const shouldCreateNewMessage = useRef(false);
 
@@ -1102,6 +1342,26 @@ export function AgentTerminal({
               case "statusUpdate":
                 try {
                   const kind = (message as any)?.data?.kind;
+                  // Live token usage totals update from backend
+                  if (kind === "tokenUsage") {
+                    const totals = (message as any)?.data?.totals;
+                    if (totals) {
+                      setLiveTotals({
+                        input: Number(totals.totalInputTokens) || 0,
+                        output: Number(totals.totalOutputTokens) || 0,
+                        cached: Number(totals.totalCachedInputTokens) || 0,
+                        inputCost: Number(totals.totalInputTokenCost) || 0,
+                        outputCost: Number(totals.totalOutputTokenCost) || 0,
+                        cachedCost:
+                          Number(totals.totalCachedInputTokenCost) || 0,
+                        totalCost: Number(totals.totalCost) || 0,
+                        currency: totals.currency,
+                      });
+                      // Force a re-render to update cost display immediately
+                      setMessages((prev) => [...prev]);
+                    }
+                    break;
+                  }
                   if (kind === "toolApprovalsRequired") {
                     const data = (message as any).data || {};
                     const msgId: string | undefined = data.messageId;
@@ -1313,6 +1573,25 @@ export function AgentTerminal({
                             (updatedMessage.inputTokens || 0) +
                             (updatedMessage.outputTokens || 0);
 
+                          // Update cost data if provided in the completed event
+                          if (data.inputTokenCost !== undefined) {
+                            updatedMessage.inputTokenCost = data.inputTokenCost;
+                          }
+                          if (data.outputTokenCost !== undefined) {
+                            updatedMessage.outputTokenCost =
+                              data.outputTokenCost;
+                          }
+                          if (
+                            data.cachedInputTokenCost !== undefined ||
+                            data.cachedTokenCost !== undefined
+                          ) {
+                            updatedMessage.cachedInputTokenCost =
+                              data.cachedInputTokenCost ?? data.cachedTokenCost;
+                          }
+                          if (data.totalCost !== undefined) {
+                            updatedMessage.totalCost = data.totalCost;
+                          }
+
                           // Handle content that might only be sent in the completed event
                           if (data.deltaContent && data.deltaContent.trim()) {
                             if (!data.isIncremental) {
@@ -2069,7 +2348,14 @@ export function AgentTerminal({
   };
 
   const handleKeyPress = (e: React.KeyboardEvent) => {
-    if (e.key === "Enter" && !e.ctrlKey && !e.metaKey) {
+    // Submit only on plain Enter (no Ctrl/Meta/Shift/Alt)
+    if (
+      e.key === "Enter" &&
+      !e.ctrlKey &&
+      !e.metaKey &&
+      !e.shiftKey &&
+      !e.altKey
+    ) {
       e.preventDefault();
       handleSubmit();
     }
@@ -2944,7 +3230,7 @@ export function AgentTerminal({
       {renderContextInfoBar()}
 
       {/* Todo List Panel */}
-      <TodoListPanel messages={messages} />
+      <TodoListPanel messages={messages} agentMetadata={agentMetadata} />
 
       {/* Input */}
       <div className="border-t border-gray-200 p-4">
@@ -3172,7 +3458,21 @@ export function AgentTerminal({
           </div>
         </div>
         <div className="mt-1 flex items-center gap-2 text-[10px] text-gray-500">
-          <AgentCostDisplay totalTokens={totalTokens} />
+          <AgentCostDisplay
+            totalTokens={
+              liveTotals
+                ? {
+                    input: liveTotals.input,
+                    output: liveTotals.output,
+                    cached: liveTotals.cached,
+                    inputCost: liveTotals.inputCost,
+                    outputCost: liveTotals.outputCost,
+                    cachedCost: liveTotals.cachedCost,
+                    totalCost: liveTotals.totalCost,
+                  }
+                : totalTokens
+            }
+          />
           {(() => {
             try {
               const s = (window as any).__agentContextWindowStatus;

package/src/editor/services/aiService.ts

@@ -14,12 +14,15 @@ export type AiProfile = {
   id: string;
   name: string;
   instructions: string;
+  managedTodoInstructions?: string;
   defaultModelId: string | null; // Guid as string, nullable
   models: AiModel[]; // Array of model objects with id and name
   prompts: { prompt: string; title: string }[];
   errorMessage?: string;
   // Whether a new agent should be seeded with current item/selection/field
   includeEditorContextOnCreate?: boolean;
+  // When true, the agent should run in managed TODO list mode.
+  managedTodoMode?: boolean;
   // Tools that are allowed when the user switches to "Ask" mode
   askModeTools?: string[];
   // Optional cost limit in USD, sourced from profile

package/src/revision.ts

@@ -1,2 +1,2 @@
-export const version = "1.0.4133";
-export const buildDate = "2025-10-01 12:31:38";
+export const version = "1.0.4134";
+export const buildDate = "2025-10-02 00:59:02";