@alpaca-editor/core 1.0.4149 → 1.0.4154

package/src/editor/ai/AgentCostDisplay.tsx

@@ -18,20 +18,24 @@ interface AgentCostDisplayProps {
     numInputTokens: number;
     numOutputTokens: number;
     numCachedTokens: number;
+    numCacheWriteTokens?: number;
     totalCost?: number;
     inputCost?: number;
     outputCost?: number;
     cachedCost?: number;
+    cacheWriteCost?: number;
   } | null;
   /** Cumulative token usage across all messages in the session */
   totalTokens?: {
     input: number;
     output: number;
     cached: number;
+    cacheWrite: number;
     totalCost: number;
     inputCost: number;
     outputCost: number;
     cachedCost: number;
+    cacheWriteCost: number;
   };
   /** Cost limit for the agent (in USD) */
   costLimit?: number | null;
@@ -73,17 +77,20 @@ export function AgentCostDisplay({
     inputTokens: number,
     outputTokens: number,
     cachedTokens: number,
+    cacheWriteTokens: number = 0,
   ) => {
     // Cached tokens are a subset of input tokens, not additional tokens
     const freshInputTokens = inputTokens - cachedTokens;
     const inputCost = (freshInputTokens / 1000000) * 3; // $3 per million tokens
     const outputCost = (outputTokens / 1000000) * 15; // $15 per million tokens
     const cachedCost = (cachedTokens / 1000000) * 0.3; // Cached tokens are typically much cheaper
+    const cacheWriteCost = (cacheWriteTokens / 1000000) * 3.75; // Cache write tokens cost more
     return {
       inputCost,
       outputCost,
       cachedCost,
-      totalCost: inputCost + outputCost + cachedCost,
+      cacheWriteCost,
+      totalCost: inputCost + outputCost + cachedCost + cacheWriteCost,
     };
   };
 
@@ -94,12 +101,14 @@ export function AgentCostDisplay({
           inputCost: response.inputCost ?? 0,
           outputCost: response.outputCost ?? 0,
           cachedCost: response.cachedCost ?? 0,
+          cacheWriteCost: response.cacheWriteCost ?? 0,
           totalCost: response.totalCost,
         }
       : calculateEstimatedCost(
           response.numInputTokens,
           response.numOutputTokens,
           response.numCachedTokens,
+          response.numCacheWriteTokens ?? 0,
         )
     : null;
 
@@ -122,9 +131,10 @@ export function AgentCostDisplay({
   }
 
   // Calculate percentage of limit used
-  const percentUsed = costLimit && costLimit > 0 
-    ? Math.min((displayTotalCost / costLimit) * 100, 100)
-    : null;
+  const percentUsed =
+    costLimit && costLimit > 0
+      ? Math.min((displayTotalCost / costLimit) * 100, 100)
+      : null;
 
   // Determine color based on usage
   const getColorClass = () => {
@@ -145,7 +155,9 @@ export function AgentCostDisplay({
             onClick={() => setShowCostPopover(!showCostPopover)}
           >
             Total Cost: {displayTotalCost.toFixed(2)} {currency}
-            {costLimit && costLimit > 0 && ` / ${costLimit.toFixed(2)} ${currency}`}
+            {costLimit &&
+              costLimit > 0 &&
+              ` / ${costLimit.toFixed(2)} ${currency}`}
           </div>
         </PopoverTrigger>
         <PopoverContent className="w-80 p-4" align="end" side="bottom">
@@ -168,7 +180,9 @@ export function AgentCostDisplay({
             {costLimit && costLimit > 0 && (
               <div className="rounded-md bg-gray-50 p-3">
                 <div className="mb-2 flex items-center justify-between text-xs">
-                  <span className="font-medium text-gray-700">Cost Limit Usage</span>
+                  <span className="font-medium text-gray-700">
+                    Cost Limit Usage
+                  </span>
                   <span className={`font-semibold ${getColorClass()}`}>
                     {percentUsed?.toFixed(1)}%
                   </span>
@@ -235,6 +249,19 @@ export function AgentCostDisplay({
                             </span>
                           </div>
                         )}
+
+                        {totalTokens.cacheWrite > 0 && (
+                          <div className="flex items-center justify-between">
+                            <span className="text-xs text-gray-500">
+                              Cache write tokens:
+                            </span>
+                            <span className="text-xs">
+                              {totalTokens.cacheWrite.toLocaleString()} (
+                              {(totalTokens.cacheWriteCost ?? 0).toFixed(2)}{" "}
+                              {currency})
+                            </span>
+                          </div>
+                        )}
                       </>
                     ) : (
                       response &&
@@ -272,6 +299,20 @@ export function AgentCostDisplay({
                             </div>
                           )}
 
+                          {response.numCacheWriteTokens &&
+                            response.numCacheWriteTokens > 0 && (
+                              <div className="flex items-center justify-between">
+                                <span className="text-xs text-gray-500">
+                                  Cache write tokens:
+                                </span>
+                                <span className="text-xs">
+                                  {response.numCacheWriteTokens.toLocaleString()}
+                                  ({currentCost.cacheWriteCost.toFixed(2)}{" "}
+                                  {currency})
+                                </span>
+                              </div>
+                            )}
+
                           <div className="mt-2 text-xs text-gray-400">
                             * Estimated costs based on typical Claude 3.5
                             pricing

package/src/editor/ai/AgentTerminal.tsx

@@ -343,8 +343,8 @@ const TodoListPanel = ({
     // 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;
+        const todoList = (agentMetadata as any)?.additionalData?.todoList;
+
         if (todoList?.items && Array.isArray(todoList.items)) {
           return todoList.items
             .map((item: any, idx: number) => ({
@@ -359,9 +359,14 @@ const TodoListPanel = ({
               sourceTitle: todoList.title,
             }))
             .filter((item: any) => item.text);
+        } else {
+          console.log(
+            "📋 No todo list found in metadata. AgentMetadata:",
+            agentMetadata,
+          );
         }
       } catch (e) {
-        // Fallback to extracting from messages
+        console.error("📋 Error extracting todos from metadata:", e);
       }
       return null;
     })();
@@ -575,9 +580,11 @@ const calculateTotalTokens = (messages: AgentChatMessage[]) => {
         input: acc.input + (message.inputTokens || 0),
         output: acc.output + (message.outputTokens || 0),
         cached: acc.cached + (message.cachedInputTokens || 0),
+        cacheWrite: acc.cacheWrite,
         inputCost: acc.inputCost + (message.inputTokenCost || 0),
         outputCost: acc.outputCost + (message.outputTokenCost || 0),
         cachedCost: acc.cachedCost + (message.cachedInputTokenCost || 0),
+        cacheWriteCost: acc.cacheWriteCost,
         totalCost: acc.totalCost + (message.totalCost || 0),
       };
     },
@@ -585,9 +592,11 @@ const calculateTotalTokens = (messages: AgentChatMessage[]) => {
       input: 0,
       output: 0,
       cached: 0,
+      cacheWrite: 0,
       inputCost: 0,
       outputCost: 0,
       cachedCost: 0,
+      cacheWriteCost: 0,
       totalCost: 0,
     },
   );
@@ -802,9 +811,11 @@ export function AgentTerminal({
     input: number;
     output: number;
     cached: number;
+    cacheWrite?: number;
     inputCost: number;
     outputCost: number;
     cachedCost: number;
+    cacheWriteCost?: number;
     totalCost: number;
     currency?: string;
   } | null>(null);
@@ -1050,9 +1061,11 @@ export function AgentTerminal({
           input: Number(data.totalInputTokens) || 0,
           output: Number(data.totalOutputTokens) || 0,
           cached: Number(data.totalCachedTokens) || 0,
+          cacheWrite: Number(data.totalCacheWriteTokens) || 0,
           inputCost: Number(data.totalInputTokenCost) || 0,
           outputCost: Number(data.totalOutputTokenCost) || 0,
           cachedCost: Number(data.totalCachedTokenCost) || 0,
+          cacheWriteCost: Number(data.totalCacheWriteTokenCost) || 0,
           totalCost: Number(data.totalCost) || 0,
           currency: data.currency || "USD",
         });
@@ -1261,9 +1274,11 @@ export function AgentTerminal({
           input: Number(data.totalInputTokens) || 0,
           output: Number(data.totalOutputTokens) || 0,
           cached: Number(data.totalCachedTokens) || 0,
+          cacheWrite: Number(data.totalCacheWriteTokens) || 0,
           inputCost: Number(data.totalInputTokenCost) || 0,
           outputCost: Number(data.totalOutputTokenCost) || 0,
           cachedCost: Number(data.totalCachedTokenCost) || 0,
+          cacheWriteCost: Number(data.totalCacheWriteTokenCost) || 0,
           totalCost: Number(data.totalCost) || 0,
           currency: data.currency || "USD",
         });
@@ -1402,7 +1417,10 @@ export function AgentTerminal({
 
               case "statusUpdate":
                 try {
-                  const kind = (message as any)?.data?.kind;
+                  // Check both 'kind' and 'state' for backward compatibility
+                  const kind =
+                    (message as any)?.data?.kind ||
+                    (message as any)?.data?.state;
                   if (kind === "streamOpen") {
                     setIsConnecting(false);
                     // Don't clear waiting state here - let it be cleared when first content arrives
@@ -1417,10 +1435,13 @@ export function AgentTerminal({
                         input: Number(totals.totalInputTokens) || 0,
                         output: Number(totals.totalOutputTokens) || 0,
                         cached: Number(totals.totalCachedInputTokens) || 0,
+                        cacheWrite: Number(totals.totalCacheWriteTokens) || 0,
                         inputCost: Number(totals.totalInputTokenCost) || 0,
                         outputCost: Number(totals.totalOutputTokenCost) || 0,
                         cachedCost:
                           Number(totals.totalCachedInputTokenCost) || 0,
+                        cacheWriteCost:
+                          Number(totals.totalCacheWriteTokenCost) || 0,
                         totalCost: totalCost,
                         currency: totals.currency,
                       });
@@ -1538,6 +1559,21 @@ export function AgentTerminal({
                         return prevAgent;
                       }
                     });
+                  } else if (kind === "cost_limit_reached") {
+                    // Cost limit has been reached - show banner and stop waiting
+                    const data = (message as any).data || {};
+                    const totalCost = Number(data.totalCost) || 0;
+                    if (agent?.costLimit) {
+                      setCostLimitExceeded({
+                        totalCost: totalCost,
+                        costLimit: agent.costLimit,
+                        initialCostLimit: agent.costLimit,
+                      });
+                    }
+                    setIsWaitingForResponse(false);
+                    setIsConnecting(false);
+                    shouldCreateNewMessage.current = false;
+                    break;
                   } else if (
                     kind === "toolApprovalGranted" ||
                     kind === "toolApprovalRejected"
@@ -1719,8 +1755,22 @@ export function AgentTerminal({
               case "contextUpdate":
                 // Update agent context when backend sends context update
                 try {
+                  console.log("📥 Received contextUpdate message:", message);
                   const updatedContext = message.data as AgentMetadata;
                   if (updatedContext) {
+                    console.log(
+                      "📝 Updating agent metadata with:",
+                      updatedContext,
+                    );
+
+                    // Check if there's a todo list in the context
+                    if (updatedContext.additionalData?.todoList) {
+                      console.log(
+                        "✅ Todo list found in context update:",
+                        updatedContext.additionalData.todoList,
+                      );
+                    }
+
                     // Update local metadata state
                     setAgentMetadata((prev) => ({
                       ...prev,
@@ -1736,13 +1786,14 @@ export function AgentTerminal({
                       };
                     });
 
-                    console.log(
-                      "✅ Context updated from backend:",
-                      updatedContext,
+                    console.log("✅ Context updated from backend successfully");
+                  } else {
+                    console.warn(
+                      "⚠️ Context update received but updatedContext is null/undefined",
                     );
                   }
                 } catch (err) {
-                  console.error("Error handling context update:", err);
+                  console.error("❌ Error handling context update:", err);
                 }
                 break;
 
@@ -3184,15 +3235,15 @@ export function AgentTerminal({
         <div className="mb-2 flex items-center gap-2">
           <AlertCircle className="h-4 w-4 text-amber-500" strokeWidth={1} />
           <span>
-            Cost limit exceeded. Spent ${totalCost.toFixed(4)} / $
-            {costLimit.toFixed(4)}.
+            Cost limit exceeded. Spent ${totalCost.toFixed(2)} / $
+            {costLimit.toFixed(2)}.
           </span>
         </div>
         <div className="flex gap-2">
           <button
             className="rounded border border-amber-300 bg-white px-2 py-1 hover:bg-amber-100"
             onClick={async () => {
-              if (!agent?.id) return;
+              if (!agent?.id || !editContext?.sessionId) return;
               try {
                 // Extend by initial cost limit amount
                 const result = await updateAgentCostLimit(agent.id, "extend");
@@ -3205,9 +3256,35 @@ export function AgentTerminal({
                 }
 
                 setCostLimitExceeded(null);
-                await connectToStream(agent);
+
+                // Resume agent execution with empty message
+                const request: StartAgentRequest = {
+                  agentId: agent.id,
+                  message: "",
+                  sessionId: editContext.sessionId,
+                  profileId: activeProfile?.id || profiles[0]?.id || "",
+                  profile: activeProfile?.name || profiles[0]?.name || "",
+                  model: selectedModelId,
+                  mode: mode as any,
+                  context: agentMetadata,
+                };
+
+                setIsWaitingForResponse(true);
+                isWaitingRef.current = true;
+                setShouldAutoScroll(true);
+
+                await startAgent(request);
+                await connectToStream();
               } catch (e) {
-                console.error("Failed to extend cost limit", e);
+                console.error(
+                  "Failed to extend cost limit and resume agent",
+                  e,
+                );
+                setError(
+                  e instanceof Error
+                    ? e.message
+                    : "Failed to extend cost limit and resume agent",
+                );
               }
             }}
           >
@@ -3589,9 +3666,11 @@ export function AgentTerminal({
                     input: liveTotals.input,
                     output: liveTotals.output,
                     cached: liveTotals.cached,
+                    cacheWrite: liveTotals.cacheWrite ?? 0,
                     inputCost: liveTotals.inputCost,
                     outputCost: liveTotals.outputCost,
                     cachedCost: liveTotals.cachedCost,
+                    cacheWriteCost: liveTotals.cacheWriteCost ?? 0,
                     totalCost: liveTotals.totalCost,
                   }
                 : totalTokens

package/src/editor/client/hooks/useSocketMessageHandler.ts

@@ -133,21 +133,21 @@ export function useSocketMessageHandler(deps: {
               version: 0,
             });
           }
-        } else {
-          await itemsRepository.refreshItems(
-            [message.payload.item],
-            message.payload.changes,
-          );
-          const changes = message?.payload?.changes;
-          const isPropertiesChange = changes?.properties !== false; // default true
-          if (
-            isPropertiesChange &&
-            message.payload.item.id === currentItemDescriptor?.id
-          ) {
-            await loadItemVersions();
-          }
+      } else {
+        await itemsRepository.refreshItems(
+          [message.payload.item],
+          message.payload.changes,
+        );
+        const changes = message?.payload?.changes;
+        const isVersionChange = changes?.versions === true;
+        if (
+          isVersionChange &&
+          message.payload.item.id === currentItemDescriptor?.id
+        ) {
+          await loadItemVersions();
         }
       }
+      }
 
       if (message.type === "item-version-added") {
         if (currentItemRef.current) {

package/src/editor/services/aiService.ts

@@ -13,20 +13,10 @@ export type AiModel = {
 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 "Read-Only" mode
-  readOnlyModeTools?: string[];
-  // Optional cost limit in USD, sourced from profile
-  costLimit?: number | null;
 };
 
 export async function loadAiProfiles(

package/src/revision.ts

@@ -1,2 +1,2 @@
-export const version = "1.0.4149";
-export const buildDate = "2025-10-07 09:38:14";
+export const version = "1.0.4154";
+export const buildDate = "2025-10-08 13:25:46";