@alpaca-editor/core 1.0.4132 → 1.0.4134

package/src/editor/ai/ToolCallDisplay.tsx

@@ -77,7 +77,7 @@ const getToolIcon = (toolName: string) => {
 // Types for tool calls - supporting both AI and Agent formats
 export type ApprovalInfo = {
   summary: string;
-  riskLevel?: 'low' | 'medium' | 'high';
+  riskLevel?: "low" | "medium" | "high";
 };
 
 export interface BaseToolCall {
@@ -116,7 +116,6 @@ interface ToolCallDisplayProps {
   messageId: string;
 }
 
-
 // Helper function to normalize tool calls to a common format
 const normalizeToolCall = (
   toolCall: BaseToolCall | AgentToolCall,
@@ -308,237 +307,223 @@ export function ToolCallDisplay({
         const toolResult = toolCall.function?.result;
         const popoverKey = `${messageId}-${toolIndex}`;
         const isAgentToolCall = "isCompleted" in originalToolCall;
-        
+
         // Get approval information to check if tool call is pending approval
-        const approvalInfo = originalToolCall.requiresApproval || toolCall.requiresApproval;
-        
+        const approvalInfo =
+          originalToolCall.requiresApproval || toolCall.requiresApproval;
+
         const isCompleted = isAgentToolCall
           ? originalToolCall.isCompleted
           : !!(toolResult || toolCall.function?.error) && !approvalInfo;
-        
+
         // Use the approval info from the backend
         const finalApprovalInfo = approvalInfo;
-        
+
         // Check if this tool call has been approved/rejected (look for status indicators in function name)
         // The AgentTerminal adds " (approved)" or " (rejected)" or " (pending approval)" to the functionName field
-        const originalFunctionName = ("functionName" in originalToolCall ? originalToolCall.functionName : toolCall?.function?.name) || '';
-        const isApproved = originalFunctionName.includes('(approved)');
-        const isRejected = originalFunctionName.includes('(rejected)');
-        const isPending = originalFunctionName.includes('(pending approval)');
+        const originalFunctionName =
+          ("functionName" in originalToolCall
+            ? originalToolCall.functionName
+            : toolCall?.function?.name) || "";
+        const isApproved = originalFunctionName.includes("(approved)");
+        const isRejected = originalFunctionName.includes("(rejected)");
+        const isPending = originalFunctionName.includes("(pending approval)");
         // Treat only approved/rejected as final; pending should still show buttons
         const hasApprovalStatus = isApproved || isRejected;
-        
-        console.log("🔍 Approval status check:", {
-          toolCallId: toolCall.id,
-          originalFunctionName,
-          displayName: toolCall?.displayName,
-          functionName: toolCall?.function?.name,
-          isApproved,
-          isRejected,
-          hasApprovalStatus
-        });
-
-        // Debug: Check what we're receiving
-        console.log("🔍 Approval debug:", {
-          toolIndex,
-          functionName: toolCall?.function?.name,
-          originalRequiresApproval: originalToolCall.requiresApproval,
-          normalizedRequiresApproval: toolCall.requiresApproval,
-          approvalInfo,
-          approvalInfoType: typeof approvalInfo,
-          isCompleted,
-          hasApprovalStatus,
-          finalApprovalInfo,
-          shouldShowApprovalUI: !isCompleted && finalApprovalInfo && !hasApprovalStatus,
-          toolResult: toolCall.function?.result,
-          toolError: toolCall.function?.error,
-        });
-
-        // Debug: Check if agent ID is available
-        if (finalApprovalInfo) {
-          console.log("🔍 Agent ID check:", {
-            currentAgentId: (window as any)?.currentAgentId,
-            messageId,
-            toolCallId: toolCall.id,
-            hasAgentId: !!(window as any)?.currentAgentId,
-            windowKeys: Object.keys(window).filter(k => k.includes('agent') || k.includes('Agent'))
-          });
-        }
 
+        // Debug logging removed for performance
 
         return (
           <div key={toolIndex}>
-          <Popover
-            enableIframeClickDetection={false}
-            open={openPopovers[popoverKey] || false}
-            onOpenChange={(open) => {
-              setOpenPopovers((prev) => ({
-                ...prev,
-                [popoverKey]: open,
-              }));
-            }}
-          >
-            <PopoverTrigger asChild>
-              <div className="flex items-center gap-2 text-xs text-gray-500">
-                {isCompleted ? (
-                  <div
-                    className={`flex items-center ${toolCall.function?.error ? "text-red-500" : ""}`}
-                  >
-                    {getToolIcon(toolCall?.function?.name || "")}
-                  </div>
-                ) : finalApprovalInfo && !hasApprovalStatus ? (
-                  <div className="flex items-center text-amber-600">
-                    {getToolIcon(toolCall?.function?.name || "")}
-                  </div>
-                ) : finished ? (
-                  <div className="flex items-center opacity-50">
-                    {getToolIcon(toolCall?.function?.name || "")}
-                  </div>
-                ) : (
-                  <Spinner size="xs" />
-                )}
-                <div className="inline-flex items-center gap-2">
-                  <span
-                    className={`${toolCall.function?.error ? "text-red-500" : "hover:text-gray-700"} cursor-pointer`}
-                  >
-                    {/* Show clean function name without approval suffix */}
-                    {(originalFunctionName || toolCall?.function?.name || "tool call")
-                      .replace(' (approved)', '')
-                      .replace(' (rejected)', '')
-                      .replace(' (pending approval)', '')}
-                    {toolCall.function?.error && " (error)"}
-                    {finalApprovalInfo && isApproved && (
-                      <span className="ml-2 text-xs text-green-600 font-medium">
-                        ✓ Approved
-                      </span>
-                    )}
-                    {finalApprovalInfo && isRejected && (
-                      <span className="ml-2 text-xs text-red-600 font-medium">
-                        ✗ Rejected
-                      </span>
-                    )}
-                    {finalApprovalInfo && isPending && (
-                      <span className="ml-2 text-xs text-amber-600 font-medium">
-                        ⏸ Pending approval
-                      </span>
-                    )}
-                  </span>
-                </div>
-              </div>
-            </PopoverTrigger>
-            <PopoverContent
-              className="w-[450px] p-0"
-              align="start"
-              side="bottom"
-              sideOffset={8}
-              onMouseDown={(e) => e.stopPropagation()}
-              onClick={(e) => e.stopPropagation()}
+            <Popover
+              enableIframeClickDetection={false}
+              open={openPopovers[popoverKey] || false}
+              onOpenChange={(open) => {
+                setOpenPopovers((prev) => ({
+                  ...prev,
+                  [popoverKey]: open,
+                }));
+              }}
             >
-              <ToolCallPopover
-                toolCall={toolCall}
-                result={toolResult}
-                onClose={() => {
-                  setOpenPopovers((prev) => ({
-                    ...prev,
-                    [popoverKey]: false,
-                  }));
-                }}
-              />
-            </PopoverContent>
-          </Popover>
-          {!isCompleted && finalApprovalInfo && !hasApprovalStatus && (
-            <div className="border rounded mt-2">
-              <div className="p-3 border-b bg-amber-50">
-                <div className="flex items-start gap-2">
-                  <div className={`w-2 h-2 rounded-full mt-1.5 ${
-                    finalApprovalInfo.riskLevel === 'high' ? 'bg-red-500' :
-                    finalApprovalInfo.riskLevel === 'medium' ? 'bg-amber-500' :
-                    'bg-green-500'
-                  }`} />
-                  <div>
-                    <div className="text-xs font-medium text-gray-900 mb-1">
-                      Action requires approval
+              <PopoverTrigger asChild>
+                <div className="flex items-center gap-2 text-xs text-gray-500">
+                  {isCompleted ? (
+                    <div
+                      className={`flex items-center ${toolCall.function?.error ? "text-red-500" : ""}`}
+                    >
+                      {getToolIcon(toolCall?.function?.name || "")}
+                    </div>
+                  ) : finalApprovalInfo && !hasApprovalStatus ? (
+                    <div className="flex items-center text-amber-600">
+                      {getToolIcon(toolCall?.function?.name || "")}
                     </div>
-                    <div className="text-xs text-gray-700">
-                      {finalApprovalInfo.summary}
+                  ) : finished ? (
+                    <div className="flex items-center opacity-50">
+                      {getToolIcon(toolCall?.function?.name || "")}
                     </div>
-                    {finalApprovalInfo.riskLevel && (
-                      <div className={`text-xs mt-1 font-medium ${
-                        finalApprovalInfo.riskLevel === 'high' ? 'text-red-600' :
-                        finalApprovalInfo.riskLevel === 'medium' ? 'text-amber-600' :
-                        'text-green-600'
-                      }`}>
-                        Risk level: {finalApprovalInfo.riskLevel}
+                  ) : (
+                    <Spinner size="xs" />
+                  )}
+                  <div className="inline-flex items-center gap-2">
+                    <span
+                      className={`${toolCall.function?.error ? "text-red-500" : "hover:text-gray-700"} cursor-pointer`}
+                    >
+                      {/* Show clean function name without approval suffix */}
+                      {(
+                        originalFunctionName ||
+                        toolCall?.function?.name ||
+                        "tool call"
+                      )
+                        .replace(" (approved)", "")
+                        .replace(" (rejected)", "")
+                        .replace(" (pending approval)", "")}
+                      {toolCall.function?.error && " (error)"}
+                      {finalApprovalInfo && isApproved && (
+                        <span className="ml-2 text-xs font-medium text-green-600">
+                          ✓ Approved
+                        </span>
+                      )}
+                      {finalApprovalInfo && isRejected && (
+                        <span className="ml-2 text-xs font-medium text-red-600">
+                          ✗ Rejected
+                        </span>
+                      )}
+                      {finalApprovalInfo && isPending && (
+                        <span className="ml-2 text-xs font-medium text-amber-600">
+                          ⏸ Pending approval
+                        </span>
+                      )}
+                    </span>
+                  </div>
+                </div>
+              </PopoverTrigger>
+              <PopoverContent
+                className="w-[450px] p-0"
+                align="start"
+                side="bottom"
+                sideOffset={8}
+                onMouseDown={(e) => e.stopPropagation()}
+                onClick={(e) => e.stopPropagation()}
+              >
+                <ToolCallPopover
+                  toolCall={toolCall}
+                  result={toolResult}
+                  onClose={() => {
+                    setOpenPopovers((prev) => ({
+                      ...prev,
+                      [popoverKey]: false,
+                    }));
+                  }}
+                />
+              </PopoverContent>
+            </Popover>
+            {!isCompleted && finalApprovalInfo && !hasApprovalStatus && (
+              <div className="mt-2 rounded border">
+                <div className="border-b bg-amber-50 p-3">
+                  <div className="flex items-start gap-2">
+                    <div
+                      className={`mt-1.5 h-2 w-2 rounded-full ${
+                        finalApprovalInfo.riskLevel === "high"
+                          ? "bg-red-500"
+                          : finalApprovalInfo.riskLevel === "medium"
+                            ? "bg-amber-500"
+                            : "bg-green-500"
+                      }`}
+                    />
+                    <div>
+                      <div className="mb-1 text-xs font-medium text-gray-900">
+                        Action requires approval
+                      </div>
+                      <div className="text-xs text-gray-700">
+                        {finalApprovalInfo.summary}
                       </div>
-                    )}
+                      {finalApprovalInfo.riskLevel && (
+                        <div
+                          className={`mt-1 text-xs font-medium ${
+                            finalApprovalInfo.riskLevel === "high"
+                              ? "text-red-600"
+                              : finalApprovalInfo.riskLevel === "medium"
+                                ? "text-amber-600"
+                                : "text-green-600"
+                          }`}
+                        >
+                          Risk level: {finalApprovalInfo.riskLevel}
+                        </div>
+                      )}
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div className="flex items-center justify-end gap-2 p-2">
-                <Button
-                  size="sm"
-                  variant="secondary"
-                  onClick={async () => {
-                    console.log("🚫 Rejecting tool call:", {
-                      agentId: (window as any)?.currentAgentId,
-                      messageId: messageId,
-                      toolCallId: toolCall.id,
-                    });
-                    try {
-                      const result = await rejectToolCall({
+                <div className="flex items-center justify-end gap-2 p-2">
+                  <Button
+                    size="sm"
+                    variant="secondary"
+                    onClick={async () => {
+                      console.log("🚫 Rejecting tool call:", {
                         agentId: (window as any)?.currentAgentId,
                         messageId: messageId,
                         toolCallId: toolCall.id,
                       });
-                      console.log("✅ Reject successful:", result);
-                      const ev = new CustomEvent('agent:toolApprovalResolved', {
-                        detail: {
+                      try {
+                        const result = await rejectToolCall({
+                          agentId: (window as any)?.currentAgentId,
                           messageId: messageId,
                           toolCallId: toolCall.id,
-                          approved: false,
-                        },
-                      } as any);
-                      window.dispatchEvent(ev);
-                    } catch (error) {
-                      console.error("❌ Reject failed:", error);
-                    }
-                  }}
-                >
-                  Reject
-                </Button>
-                <Button
-                  size="sm"
-                  onClick={async () => {
-                    console.log("✅ Approving tool call:", {
-                      agentId: (window as any)?.currentAgentId,
-                      messageId: messageId,
-                      toolCallId: toolCall.id,
-                    });
-                    try {
-                      const result = await approveToolCall({
+                        });
+                        console.log("✅ Reject successful:", result);
+                        const ev = new CustomEvent(
+                          "agent:toolApprovalResolved",
+                          {
+                            detail: {
+                              messageId: messageId,
+                              toolCallId: toolCall.id,
+                              approved: false,
+                            },
+                          } as any,
+                        );
+                        window.dispatchEvent(ev);
+                      } catch (error) {
+                        console.error("❌ Reject failed:", error);
+                      }
+                    }}
+                  >
+                    Reject
+                  </Button>
+                  <Button
+                    size="sm"
+                    onClick={async () => {
+                      console.log("✅ Approving tool call:", {
                         agentId: (window as any)?.currentAgentId,
                         messageId: messageId,
                         toolCallId: toolCall.id,
                       });
-                      console.log("✅ Approve successful:", result);
-                      const ev = new CustomEvent('agent:toolApprovalResolved', {
-                        detail: {
+                      try {
+                        const result = await approveToolCall({
+                          agentId: (window as any)?.currentAgentId,
                           messageId: messageId,
                           toolCallId: toolCall.id,
-                          approved: true,
-                        },
-                      } as any);
-                      window.dispatchEvent(ev);
-                    } catch (error) {
-                      console.error("❌ Approve failed:", error);
-                    }
-                  }}
-                >
-                  Approve
-                </Button>
+                        });
+                        console.log("✅ Approve successful:", result);
+                        const ev = new CustomEvent(
+                          "agent:toolApprovalResolved",
+                          {
+                            detail: {
+                              messageId: messageId,
+                              toolCallId: toolCall.id,
+                              approved: true,
+                            },
+                          } as any,
+                        );
+                        window.dispatchEvent(ev);
+                      } catch (error) {
+                        console.error("❌ Approve failed:", error);
+                      }
+                    }}
+                  >
+                    Approve
+                  </Button>
+                </div>
               </div>
-            </div>
-          )}
+            )}
           </div>
         );
       })}

package/src/editor/field-types/richtext/components/ReactSlate.tsx

@@ -75,7 +75,7 @@ const ToolbarButtonWrapper: React.FC<{
   });
 
   return (
-    <ToolbarButton icon={icon} active={isActive} onMouseDown={onMouseDown} />
+    <ToolbarButton icon={icon} active={isActive} onMouseDown={onMouseDown} type={`${option.type}-${option.id}`} />
   );
 });
 
@@ -492,7 +492,6 @@ export const ReactSlate = forwardRef<any, ReactSlateProps>((props, ref) => {
                   <div
                     key={`subgroup-${subGroupIndex}`}
                     className="toolbar-button-group"
-                    data-testid="toolbar-button-group"
                   >
                     {subGroup.map((option) => {
                       const optionObj = getOption(option);
@@ -938,26 +937,26 @@ export const ReactSlate = forwardRef<any, ReactSlateProps>((props, ref) => {
         {!readOnly && showControls && (
           <div className="mb-4 flex flex-col gap-2">
             {toolbarStructure.map(([rowIndex, rowGroups], mapIndex) => (
-              <div 
-                key={`row-${rowIndex}`} 
-                className="toolbar-row"
-                data-testid={`rte-toolbar-row-${rowGroups[0]?.options?.[0]?.id || 'unknown'}`} 
-              >
-                {rowGroups.map((group) =>
-                  renderToolbarGroup(group, parseInt(rowIndex)),
-                )}
-                {/* Add strip formatting button to the last row */}
-                {mapIndex === toolbarStructure.length - 1 && (
-                  <div className="toolbar-button-group">
-                    <ToolbarButton
-                      icon="✗"
-                      active={false}
-                      onMouseDown={handleStripFormattingClick}
-                      type={rowGroups[0]?.options?.[0]?.id || 'unknown'}
-                    />
-                  </div>
-                )}
-              </div>
+                <div 
+                  key={`row-${rowIndex}`} 
+                  className="toolbar-row"
+                  data-testid={`rte-toolbar-row-${rowGroups[0]?.options?.[0]?.id || 'unknown'}`} 
+                >
+                  {rowGroups.map((group) =>
+                    renderToolbarGroup(group, parseInt(rowIndex)),
+                  )}
+                  {/* Add strip formatting button to the last row */}
+                  {mapIndex === toolbarStructure.length - 1 && (
+                    <div className="toolbar-button-group">
+                      <ToolbarButton
+                        icon="✗"
+                        active={false}
+                        onMouseDown={handleStripFormattingClick}
+                        type="strip-formatting"
+                      />
+                    </div>
+                  )}
+                </div>
             ))}
             {/* Fallback: if no toolbar structure exists, create a row for strip formatting */}
             {toolbarStructure.length === 0 && (
@@ -967,7 +966,7 @@ export const ReactSlate = forwardRef<any, ReactSlateProps>((props, ref) => {
                     icon="✗"
                     active={false}
                     onMouseDown={handleStripFormattingClick}
-                    type={"strip-formatting"}
+                    type="strip-formatting"
                   />
                 </div>
               </div>

package/src/editor/field-types/richtext/components/ToolbarButton.tsx

@@ -15,7 +15,7 @@ export const ToolbarButton: React.FC<ToolbarButtonProps> = ({
         active && "active bg-white",
       )}
       onMouseDown={onMouseDown}
-      data-testid={`toolbar-button-${type || "unknown"}`}
+      data-testid={`rte-toolbar-button-${type || "unknown"}`}
     >
       {icon}
     </button>

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.4132";
-export const buildDate = "2025-10-01 09:31:16";
+export const version = "1.0.4134";
+export const buildDate = "2025-10-02 00:59:02";