windmill-components 1.677.1 → 1.687.0

package/package/components/UserOffboardingModal.svelte

@@ -0,0 +1,238 @@
+<script lang="ts">import { Alert, Button } from './common';
+import { fade } from 'svelte/transition';
+import { classNames } from '../utils';
+import { AlertTriangle, CornerDownLeft, Loader2 } from 'lucide-svelte';
+import { UserService, FolderService } from '../gen';
+import { workspaceStore } from '../stores';
+import { sendUserToast } from '../toast';
+import Toggle from './Toggle.svelte';
+import OffboardWorkspaceSection from './OffboardWorkspaceSection.svelte';
+import { countPaths } from './offboarding-utils';
+let { open = $bindable(), username, reassignOnly = false, onClose, onComplete } = $props();
+let preview = $state(undefined);
+let loading = $state(false);
+let submitting = $state(false);
+let conflicts = $state([]);
+let doReassign = $state(true);
+let targetKind = $state('user');
+let selectedUser = $state(undefined);
+let selectedFolder = $state(undefined);
+let selectedOperator = $state(undefined);
+let deleteUser = $state(true);
+$effect(() => {
+    deleteUser = !reassignOnly;
+});
+let users = $state([]);
+let folders = $state([]);
+let ownedCount = $derived(preview ? countPaths(preview.owned) : 0);
+let onBehalfCount = $derived(preview ? countPaths(preview.executing_on_behalf) : 0);
+let hasItems = $derived(ownedCount > 0 || onBehalfCount > 0);
+let reassignTo = $derived(targetKind === 'user'
+    ? selectedUser
+        ? `u/${selectedUser}`
+        : undefined
+    : selectedFolder
+        ? `f/${selectedFolder}`
+        : undefined);
+let canSubmit = $derived(!doReassign || !hasItems || (reassignTo != null && selectedOperator != null));
+$effect(() => {
+    if (open) {
+        doReassign = true;
+        targetKind = 'user';
+        selectedUser = undefined;
+        selectedFolder = undefined;
+        selectedOperator = undefined;
+        conflicts = [];
+        loadPreview();
+    }
+});
+async function loadPreview() {
+    loading = true;
+    conflicts = [];
+    try {
+        const workspace = $workspaceStore ?? '';
+        const [previewResult, usernamesList, foldersList] = await Promise.all([
+            UserService.offboardPreview({ workspace, username }),
+            UserService.listUsernames({ workspace }),
+            FolderService.listFolders({ workspace })
+        ]);
+        preview = previewResult;
+        users = usernamesList.filter((u) => u !== username).map((u) => ({ label: u, value: u }));
+        folders = foldersList.map((f) => ({ label: f.name, value: f.name }));
+    }
+    catch (e) {
+        sendUserToast('Failed to load offboard preview', true);
+        onClose();
+    }
+    finally {
+        loading = false;
+    }
+}
+async function submit() {
+    submitting = true;
+    conflicts = [];
+    try {
+        if (!doReassign || !hasItems) {
+            await UserService.deleteUser({ workspace: $workspaceStore ?? '', username });
+            sendUserToast(`User ${username} removed`);
+            onComplete();
+            return;
+        }
+        if (!reassignTo)
+            return;
+        const result = await UserService.offboardWorkspaceUser({
+            workspace: $workspaceStore ?? '',
+            username,
+            requestBody: {
+                reassign_to: reassignTo,
+                new_on_behalf_of_user: selectedOperator,
+                delete_user: deleteUser
+            }
+        });
+        if (result.conflicts && result.conflicts.length > 0) {
+            conflicts = result.conflicts;
+        }
+        else {
+            sendUserToast(deleteUser
+                ? `User ${username} offboarded successfully`
+                : `Items reassigned from ${username} successfully`);
+            onComplete();
+        }
+    }
+    catch (e) {
+        sendUserToast(`Offboarding failed: ${e}`, true);
+    }
+    finally {
+        submitting = false;
+    }
+}
+function fadeFast(node) {
+    return fade(node, { duration: 100 });
+}
+</script>
+
+{#if open}
+	<div transition:fadeFast|local class="fixed top-0 bottom-0 left-0 right-0 z-[5000]" role="dialog">
+		<div
+			class={classNames(
+				'fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity',
+				'ease-out duration-300 opacity-100'
+			)}
+		></div>
+
+		<div class="fixed inset-0 z-10 overflow-y-auto">
+			<div class="flex min-h-full items-center justify-center p-4">
+				<div
+					class="relative transform overflow-hidden rounded-lg bg-surface px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg sm:p-6 max-h-[80vh] overflow-y-auto"
+				>
+					<div class="flex">
+						<div
+							class="flex h-12 w-12 items-center justify-center rounded-full bg-red-100 dark:bg-red-800/50"
+						>
+							<AlertTriangle class="text-red-500 dark:text-red-400" />
+						</div>
+						<div class="ml-4 text-left flex-1">
+							<h3 class="text-lg font-medium text-primary">
+								{reassignOnly ? 'Reassign user items' : 'Offboard user'}
+							</h3>
+							<p class="text-sm text-secondary mt-1">
+								{reassignOnly
+									? `Reassign items owned by ${username}`
+									: `Remove ${username} and reassign their items`}
+							</p>
+						</div>
+					</div>
+
+					{#if loading}
+						<div class="flex items-center justify-center py-8">
+							<Loader2 class="animate-spin" size={24} />
+							<span class="ml-2 text-sm text-secondary">Loading preview...</span>
+						</div>
+					{:else if preview}
+						<div class="mt-4 space-y-3">
+							{#if hasItems}
+								{#if !reassignOnly}
+									<Toggle
+										bind:checked={doReassign}
+										size="xs"
+										options={{ right: 'Reassign items before removing' }}
+									/>
+								{/if}
+
+								{#if doReassign}
+									<OffboardWorkspaceSection
+										{preview}
+										{username}
+										{deleteUser}
+										bind:targetKind
+										bind:selectedUser
+										bind:selectedFolder
+										bind:selectedOperator
+										{users}
+										{folders}
+									/>
+								{:else}
+									<Alert type="warning" title="Items will not be reassigned">
+										<p class="text-xs">
+											All items owned by {username} ({ownedCount} owned, {onBehalfCount} running on behalf)
+											will be left as-is. Triggers and runnables may stop working if the user is removed.
+										</p>
+									</Alert>
+								{/if}
+							{:else}
+								<p class="text-sm text-secondary">
+									This user has no items to reassign in this workspace.
+								</p>
+							{/if}
+
+							{#if conflicts.length > 0}
+								<Alert type="error" title="Path conflicts detected">
+									<p class="text-xs mb-1"
+										>These items already exist at the target. Rename or delete them, or choose a
+										different user/folder.</p
+									>
+									<ul class="text-xs list-disc list-inside max-h-32 overflow-y-auto">
+										{#each conflicts as conflict}
+											<li>{conflict}</li>
+										{/each}
+									</ul>
+								</Alert>
+							{/if}
+						</div>
+					{/if}
+
+					<div class="flex items-center space-x-2 flex-row-reverse space-x-reverse mt-4">
+						{#if hasItems || deleteUser}
+							<Button
+								disabled={submitting || !canSubmit}
+								onclick={submit}
+								variant="accent"
+								size="sm"
+								destructive
+								shortCut={{ Icon: CornerDownLeft, hide: false, withoutModifier: true }}
+							>
+								{#if submitting}
+									<Loader2 class="animate-spin" />
+								{/if}
+								<span class="min-w-20">
+									{deleteUser ? 'Offboard' : 'Reassign'}
+								</span>
+							</Button>
+						{:else if !loading}
+							<Button onclick={onClose} variant="accent" size="sm">Close</Button>
+						{/if}
+						<Button
+							disabled={submitting}
+							onclick={onClose}
+							variant="default"
+							size="sm"
+							shortCut={{ key: 'Esc', hide: false, withoutModifier: true }}
+						>
+							Cancel
+						</Button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+{/if}

package/package/components/UserOffboardingModal.svelte.d.ts

@@ -0,0 +1,10 @@
+type Props = {
+    open: boolean;
+    username: string;
+    reassignOnly?: boolean;
+    onClose: () => void;
+    onComplete: () => void;
+};
+declare const UserOffboardingModal: import("svelte").Component<Props, {}, "open">;
+type UserOffboardingModal = ReturnType<typeof UserOffboardingModal>;
+export default UserOffboardingModal;

package/package/components/WorkspaceDeployLayout.svelte

@@ -24,7 +24,7 @@ let hasSelectableItems = $derived(selectableItems.length > 0);
 		<!-- Select all row -->
 		<div class="px-4 py-2 flex items-center justify-between">
 			<div
-				class="flex items-center gap-2 text-secondary text-sm"
+				class="flex items-center gap-2 text-secondary text-xs"
 				class:opacity-50={!hasSelectableItems}
 			>
 				<input
@@ -94,13 +94,13 @@ let hasSelectableItems = $derived(selectableItems.length > 0);
 		</div>
 	{:else}
 		<div class="flex items-center justify-center h-full">
-			<div class="text-gray-500">{emptyMessage}</div>
+			<div class="text-hint text-xs">{emptyMessage}</div>
 		</div>
 	{/if}
 
 	<!-- Footer -->
 	{#if footer}
-		<div class="p-4 bg-surface">
+		<div class="pt-4">
 			{@render footer()}
 		</div>
 	{/if}

package/package/components/WorkspaceDeployLayout.svelte.d.ts

@@ -17,6 +17,7 @@ interface Props {
     }>;
     allSelected?: boolean;
     emptyMessage?: string;
+    children?: Snippet;
     header?: Snippet;
     alerts?: Snippet;
     itemSummary?: Snippet<[DeployableItem]>;

package/package/components/apps/editor/inlineScriptsPanel/InlineScriptRunnableByPath.svelte

@@ -39,7 +39,8 @@ const dispatch = createEventDispatcher();
 async function refreshScript(runnable) {
     hubFlowPreview = undefined;
     try {
-        let { schema } = await getScriptByPath(runnable.path);
+        const loaded = await getScriptByPath(runnable.path);
+        const schema = loaded.schema ?? emptySchema();
         if (!deepEqual(runnable.schema, schema)) {
             runnable.schema = schema;
             if (!runnable.schema.order) {
@@ -80,7 +81,8 @@ async function refreshFlow(runnable) {
             }
             return;
         }
-        const { schema } = (await loadSchema($workspaceStore ?? '', runnable.path, 'flow')) ?? emptySchema();
+        const loaded = await loadSchema($workspaceStore ?? '', runnable.path, 'flow');
+        const schema = loaded?.schema ?? emptySchema();
         if (!deepEqual(runnable.schema, schema)) {
             runnable.schema = schema;
             if (!runnable.schema.order) {

package/package/components/apps/editor/settingsPanel/mainInput/RunnableSelector.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">import { Button, Drawer, DrawerContent, Tab, Tabs } from '../../../../common';
 import PickHubScript from '../../../../flows/pickers/PickHubScript.svelte';
+import PickHubFlow from '../../../../flows/pickers/PickHubFlow.svelte';
 import { Building, Globe2, MousePointer, Plus } from 'lucide-svelte';
 import InlineScriptList from './InlineScriptList.svelte';
 import WorkspaceScriptList from './WorkspaceScriptList.svelte';
@@ -47,6 +48,14 @@ async function pickHubScript(path) {
         fields: selection.fields
     });
 }
+async function pickHubFlow(item) {
+    const path = `hub/flows/${item.flow_id}`;
+    const selection = buildPathRunnableSelection(path, 'flow', await loadSchemaFromTriggerable(path, 'flow'), defaultUserInput, rawApps);
+    dispatch('pick', {
+        runnable: selection.runnable,
+        fields: selection.fields
+    });
+}
 function pickInlineScript(name) {
     const unusedInlineScriptIndex = unusedInlineScripts?.findIndex((script) => script.name === name);
     const unusedInlineScript = unusedInlineScripts?.[unusedInlineScriptIndex];
@@ -89,6 +98,7 @@ function createScript() {
 					{#if !onlyFlow}
 						<Tab value="hubscripts" label="Hub Scripts" icon={Globe2} />
 					{/if}
+					<Tab value="hubflows" label="Hub Flows" icon={Globe2} />
 				</Tabs>
 				<div class="my-2"></div>
 				<div class="flex flex-col gap-y-16">
@@ -106,6 +116,8 @@ function createScript() {
 							<WorkspaceFlowList on:pick={(e) => pickFlow(e.detail)} />
 						{:else if tab == 'hubscripts'}
 							<PickHubScript bind:filter on:pick={(e) => pickHubScript(e.detail.path)} />
+						{:else if tab == 'hubflows'}
+							<PickHubFlow bind:filter on:pick={(e) => pickHubFlow(e.detail)} />
 						{/if}
 					</div>
 				</div>

package/package/components/assets/AssetsDropdownButton.svelte

@@ -28,7 +28,7 @@ $effect(() => {
         }
     }
 });
-let datatables = resource([], () => WorkspaceService.listDataTables({ workspace: $workspaceStore ?? '' }));
+let datatables = resource([], () => WorkspaceService.listDataTables({ workspace: $workspaceStore ?? '' }).then((d) => d.map((d) => d.name)));
 let ducklakes = resource([], () => WorkspaceService.listDucklakes({ workspace: $workspaceStore ?? '' }));
 $effect(() => {
     assets;

package/package/components/common/confirmationModal/ConfirmationModal.svelte

@@ -52,7 +52,7 @@ const Icon = $derived(theme[type].Icon ?? AlertTriangle);
 {#if open}
 	<div
 		transition:fadeFast|local
-		class={'fixed top-0 bottom-0 left-0 right-0 z-[5000]'}
+		class={'fixed top-0 bottom-0 left-0 right-0 z-[9999]'}
 		role="dialog"
 		{id}
 	>

package/package/components/common/table/AppRow.svelte

@@ -8,7 +8,7 @@ import Button from '../button/Button.svelte';
 import Row from './Row.svelte';
 import DraftBadge from '../../DraftBadge.svelte';
 import Badge from '../badge/Badge.svelte';
-import { ExternalLink, Eye, File, FileJson, FolderOpen, GitFork, ChevronUpSquare, History, Pen, Share, Trash, Copy } from 'lucide-svelte';
+import { ExternalLink, Eye, File, FileJson, FolderOpen, GitFork, ChevronUpSquare, History, Pen, Shield, Trash, Copy } from 'lucide-svelte';
 import { goto as gotoUrl } from '$app/navigation';
 import { page } from '$app/state';
 import { DELETE, copyToClipboard } from '../../../utils';
@@ -192,8 +192,8 @@ async function loadAppJson() {
 						hide: $userStore?.operator
 					},
 					{
-						displayName: canWrite ? 'Share' : 'See Permissions',
-						icon: Share,
+						displayName: 'Permissions',
+						icon: Shield,
 						action: () => {
 							shareModal.openDrawer && shareModal.openDrawer(path, 'app')
 						},

package/package/components/common/table/FlowRow.svelte

@@ -13,7 +13,7 @@ import DraftBadge from '../../DraftBadge.svelte';
 import { sendUserToast } from '../../../toast';
 import { DELETE, copyToClipboard, isOwner } from '../../../utils';
 import { isDeployable } from '../../../utils_deployable';
-import { Pen, GitFork, Trash, List, FolderOpen, ChevronUpSquare, Calendar, Share, Archive, Copy, Eye, HistoryIcon } from 'lucide-svelte';
+import { Pen, GitFork, Trash, List, FolderOpen, ChevronUpSquare, Calendar, Shield, Archive, Copy, Eye, HistoryIcon } from 'lucide-svelte';
 import FlowHistory from '../../flows/FlowHistory.svelte';
 import { getDeployUiSettings } from '../../home/deploy_ui';
 import { isRuleActive } from '../../../workspaceProtectionRules.svelte';
@@ -229,8 +229,8 @@ let flowHistory = $state(undefined);
 						hide: $userStore?.operator
 					},
 					{
-						displayName: owner ? 'Share' : 'See Permissions',
-						icon: Share,
+						displayName: 'Permissions',
+						icon: Shield,
 						action: () => {
 							shareModal.openDrawer && shareModal.openDrawer(path, 'flow')
 						},

package/package/components/common/table/RawAppRow.svelte

@@ -4,7 +4,7 @@ import SharedBadge from '../../SharedBadge.svelte';
 import {} from '../../../gen';
 import { workspaceStore } from '../../../stores';
 import Row from './Row.svelte';
-import { Globe, Share } from 'lucide-svelte';
+import { Globe, Shield } from 'lucide-svelte';
 import { isDeployable } from '../../../utils_deployable';
 import { getDeployUiSettings } from '../../home/deploy_ui';
 let { app, marked, shareModal, deploymentDrawer, depth = 0, menuOpen = $bindable(false) } = $props();
@@ -26,7 +26,7 @@ let { app, marked, shareModal, deploymentDrawer, depth = 0, menuOpen = $bindable
 	{#snippet actions()}
 		<Dropdown
 			items={async () => {
-				let { path, canWrite } = app
+				let { path } = app
 
 				return [
 					...(isDeployable('app', path, await getDeployUiSettings())
@@ -41,8 +41,8 @@ let { app, marked, shareModal, deploymentDrawer, depth = 0, menuOpen = $bindable
 							]
 						: []),
 					{
-						displayName: canWrite ? 'Share' : 'See Permissions',
-						icon: Share,
+						displayName: 'Permissions',
+						icon: Shield,
 						action: () => {
 							shareModal.openDrawer && shareModal.openDrawer(path, 'raw_app')
 						}

package/package/components/common/table/Row.svelte

@@ -6,7 +6,11 @@ import { twMerge } from 'tailwind-merge';
 import { goto } from '../../../navigation';
 import { triggerableByAI } from '../../../actions/triggerableByAI.svelte';
 let { marked, selected = false, disabled = false, canFavorite = true, isSelectable = false, alignWithSelectable = false, errorHandlerMuted = false, aiId = undefined, aiDescription = undefined, kind = 'script', triggerKind = undefined, summary = undefined, path, href = undefined, workspaceId, depth = 0, badges, actions, customSummary, onSelect = () => { } } = $props();
-let displayPath = (untrack(() => depth) === 0 ? untrack(() => path) : untrack(() => path)?.split('/')?.slice(-1)?.[0]) ?? '';
+let displayPath = (untrack(() => depth) === 0
+    ? untrack(() => path)
+    : untrack(() => path)
+        ?.split('/')
+        ?.slice(-1)?.[0]) ?? '';
 </script>
 
 {#if href}
@@ -84,7 +88,7 @@ let displayPath = (untrack(() => depth) === 0 ? untrack(() => path) : untrack(()
 				{!summary || summary.length == 0 ? displayPath : summary}
 			{/if}
 		</div>
-		<div class="text-hint text-3xs truncate text-left font-normal">
+		<div class="text-hint text-3xs truncate text-left font-normal" title={path}>
 			{path}
 		</div>
 	</div>

package/package/components/common/table/ScriptRow.svelte

@@ -14,7 +14,7 @@ import { sendUserToast } from '../../../toast';
 import { capitalize, copyToClipboard, DELETE, isOwner } from '../../../utils';
 import { isDeployable } from '../../../utils_deployable';
 import { LanguageIcon } from '../languageIcons';
-import { Archive, Calendar, Code, Copy, Eye, FolderOpen, ChevronUpSquare, GitFork, List, Pen, Share, Trash, History, Globe2, FileText } from 'lucide-svelte';
+import { Archive, Calendar, Code, Copy, Eye, FolderOpen, ChevronUpSquare, GitFork, List, Pen, Shield, Trash, History, Globe2, FileText } from 'lucide-svelte';
 import ScriptVersionHistory from '../../ScriptVersionHistory.svelte';
 import WacExportDrawer from '../../scripts/WacExportDrawer.svelte';
 import { Drawer, DrawerContent } from '..';
@@ -96,6 +96,14 @@ let wacExportDrawer = $state(undefined);
 				<Badge small color="indigo" baseClass="border border-indigo-200">wac</Badge>
 			</Popover>
 		{/if}
+		{#if script.auto_kind === 'test'}
+			<Popover notClickable>
+				{#snippet text()}
+					CI test script
+				{/snippet}
+				<Badge small color="yellow" baseClass="border">CI test</Badge>
+			</Popover>
+		{/if}
 		{#if script.kind !== 'script'}
 			<Badge color="blue" baseClass="border"
 				>{script.kind === 'failure' ? 'Error handler' : capitalize(script.kind)}</Badge
@@ -287,8 +295,8 @@ let wacExportDrawer = $state(undefined);
 						hide: $userStore?.operator
 					},
 					{
-						displayName: owner ? 'Share' : 'See Permissions',
-						icon: Share,
+						displayName: 'Permissions',
+						icon: Shield,
 						action: () => {
 							shareModal.openDrawer && shareModal.openDrawer(script.path, 'script')
 						},

package/package/components/copilot/chat/AIChatManager.svelte.js

@@ -359,7 +359,7 @@ class AIChatManager {
                         return prepareScriptUserMessage(pendingPrompt, this.contextManager.getSelectedContext());
                     }
                     else if (this.mode === AIMode.FLOW) {
-                        return prepareFlowUserMessage(pendingPrompt, this.flowAiChatHelpers.getFlowAndSelectedId());
+                        return prepareFlowUserMessage(pendingPrompt, this.flowAiChatHelpers.getFlowAndSelectedId(), [], this.flowAiChatHelpers.inlineScriptSession);
                     }
                     else if (this.mode === AIMode.NAVIGATOR) {
                         return prepareNavigatorUserMessage(pendingPrompt);
@@ -528,7 +528,7 @@ class AIChatManager {
             };
             switch (this.mode) {
                 case AIMode.FLOW:
-                    userMessage = prepareFlowUserMessage(oldInstructions, this.flowAiChatHelpers.getFlowAndSelectedId(), oldSelectedContext);
+                    userMessage = prepareFlowUserMessage(oldInstructions, this.flowAiChatHelpers.getFlowAndSelectedId(), oldSelectedContext, this.flowAiChatHelpers.inlineScriptSession);
                     break;
                 case AIMode.NAVIGATOR:
                     userMessage = prepareNavigatorUserMessage(oldInstructions);

package/package/components/copilot/chat/anthropic.d.ts

@@ -5,6 +5,11 @@ import type { MessageParam, TextBlockParam, ToolUnion } from '@anthropic-ai/sdk/
 import type { MessageStream } from '@anthropic-ai/sdk/lib/MessageStream';
 import type { AIProviderModel } from '../../../gen';
 import { type Tool, type ToolCallbacks } from './shared';
+import { type ChatTokenUsage } from './tokenUsage';
+interface ParsedCompletionResult {
+    shouldContinue: boolean;
+    tokenUsage: ChatTokenUsage;
+}
 export declare function getAnthropicCompletion(messages: ChatCompletionMessageParam[], abortController: AbortController, tools?: OpenAI.Chat.Completions.ChatCompletionFunctionTool[], options?: {
     forceModelProvider?: AIProviderModel;
     anthropicClient?: Anthropic;
@@ -14,9 +19,10 @@ export declare function parseAnthropicCompletion(completion: MessageStream, call
     onMessageEnd: () => void;
 }, messages: ChatCompletionMessageParam[], addedMessages: ChatCompletionMessageParam[], tools: Tool<any>[], helpers: any, abortController?: AbortController, options?: {
     workspace?: string;
-}): Promise<boolean>;
+}): Promise<ParsedCompletionResult>;
 export declare function convertOpenAIToAnthropicMessages(messages: ChatCompletionMessageParam[]): {
     system: TextBlockParam[] | undefined;
     messages: MessageParam[];
 };
 export declare function convertOpenAIToolsToAnthropic(tools?: OpenAI.Chat.Completions.ChatCompletionFunctionTool[]): ToolUnion[] | undefined;
+export {};

package/package/components/copilot/chat/anthropic.js

@@ -2,6 +2,7 @@ import { OpenAI } from 'openai';
 import Anthropic from '@anthropic-ai/sdk';
 import { getProviderAndCompletionConfig, workspaceAIClients } from '../lib';
 import { processToolCall } from './shared';
+import { anthropicUsageToChatTokenUsage } from './tokenUsage';
 export async function getAnthropicCompletion(messages, abortController, tools, options) {
     const { provider, config } = getProviderAndCompletionConfig({
         messages,
@@ -147,6 +148,8 @@ export async function parseAnthropicCompletion(completion, callbacks, messages,
     if (error) {
         throw error;
     }
+    const finalMessage = await completion.finalMessage();
+    const tokenUsage = anthropicUsageToChatTokenUsage(finalMessage.usage);
     // Process tool calls if any
     if (toolCallsToProcess.length > 0) {
         const assistantWithTools = {
@@ -167,9 +170,9 @@ export async function parseAnthropicCompletion(completion, callbacks, messages,
             messages.push(messageToAdd);
             addedMessages.push(messageToAdd);
         }
-        return true; // Continue the conversation loop
+        return { shouldContinue: true, tokenUsage };
     }
-    return false; // End the conversation
+    return { shouldContinue: false, tokenUsage };
 }
 export function convertOpenAIToAnthropicMessages(messages) {
     let system;