This commit is contained in:
Timothy Jaeryang Baek committed 2026-08-13 22:01:15 -06:00
1 parent 256cce505b
commit 14e4d72d9a
8 files changed
+45 -16

No files matched your search

+13 -6
View File
@@ -502,13 +502,14 @@
return; return;
} }
await resolveChatMessageToolCall(localStorage.token, $chatId, messageId, callId, 'answer', { const res = await resolveChatMessageToolCall(localStorage.token, $chatId, messageId, callId, 'answer', {
answers, answers,
timed_out: timedOut timed_out: timedOut
}).catch(async (error) => { }).catch(async (error) => {
toast.error(`${error}`); toast.error(`${error}`);
await loadChat(); await loadChat();
}); });
onToolCallResolved(res);
}; };
const rejectPendingAskUser = async (messageId, callId) => { const rejectPendingAskUser = async (messageId, callId) => {
@@ -516,7 +517,7 @@
return; return;
} }
await resolveChatMessageToolCall( const res = await resolveChatMessageToolCall(
localStorage.token, localStorage.token,
$chatId, $chatId,
messageId, messageId,
@@ -526,6 +527,7 @@
toast.error(`${error}`); toast.error(`${error}`);
await loadChat(); await loadChat();
}); });
onToolCallResolved(res);
}; };
$: pendingAskUser = findPendingAskUser(history); $: pendingAskUser = findPendingAskUser(history);
@@ -658,6 +660,13 @@
} }
}; };
const onToolCallResolved = (res) => {
const newTaskIds = res?.task_ids ?? (res?.task_id ? [res.task_id] : []);
if (newTaskIds.length > 0) {
taskIds = [...(taskIds ?? []), ...newTaskIds];
}
};
let oldSelectedModelIds = ['']; let oldSelectedModelIds = [''];
$: if (!equal(selectedModelIds, oldSelectedModelIds)) { $: if (!equal(selectedModelIds, oldSelectedModelIds)) {
onSelectedModelIdsChange(); onSelectedModelIdsChange();
@@ -3568,10 +3577,7 @@
await handleOpenAIError(res.error, responseMessage); await handleOpenAIError(res.error, responseMessage);
} else { } else {
// Backend returns task_ids (multi-model) or task_id (single model) // Backend returns task_ids (multi-model) or task_id (single model)
const newTaskIds = res.task_ids ?? (res.task_id ? [res.task_id] : []); onToolCallResolved(res);
if (newTaskIds.length > 0) {
taskIds = [...(taskIds ?? []), ...newTaskIds];
}
// Backend returns chat_id for new chats — set store + URL. // Backend returns chat_id for new chats — set store + URL.
// Only update if the user hasn't navigated to a different chat // Only update if the user hasn't navigated to a different chat
@@ -4287,6 +4293,7 @@
{mergeResponses} {mergeResponses}
{chatActionHandler} {chatActionHandler}
{addMessages} {addMessages}
{onToolCallResolved}
allowDelete={!(generating || taskIds?.length)} allowDelete={!(generating || taskIds?.length)}
forkHandler={handleForkChat} forkHandler={handleForkChat}
topPadding={!embedded} topPadding={!embedded}
+2
View File
@@ -40,6 +40,7 @@
export let showMessage: Function = () => {}; export let showMessage: Function = () => {};
export let submitMessage: Function = () => {}; export let submitMessage: Function = () => {};
export let addMessages: Function = () => {}; export let addMessages: Function = () => {};
export let onToolCallResolved: Function = () => {};
export let forkHandler: Function | null = null; export let forkHandler: Function | null = null;
export let readOnly = false; export let readOnly = false;
@@ -555,6 +556,7 @@
{continueResponse} {continueResponse}
{mergeResponses} {mergeResponses}
{addMessages} {addMessages}
{onToolCallResolved}
{forkHandler} {forkHandler}
{allowDelete} {allowDelete}
{triggerScroll} {triggerScroll}
@@ -93,6 +93,7 @@
export let onSave = (e) => {}; export let onSave = (e) => {};
export let onSourceClick = (e) => {}; export let onSourceClick = (e) => {};
export let onTaskClick = (e) => {}; export let onTaskClick = (e) => {};
export let onToolCallResolved = (e) => {};
export let onSetInputText = (text) => {}; export let onSetInputText = (text) => {};
let contentContainerElement; let contentContainerElement;
@@ -299,6 +300,7 @@
{formatMessageContent} {formatMessageContent}
{onSourceClick} {onSourceClick}
{onTaskClick} {onTaskClick}
{onToolCallResolved}
{onSave} {onSave}
onUpdate={markdownUpdateHandler} onUpdate={markdownUpdateHandler}
onPreview={previewHandler} onPreview={previewHandler}
@@ -320,6 +322,7 @@
{sourceIds} {sourceIds}
{onSourceClick} {onSourceClick}
{onTaskClick} {onTaskClick}
{onToolCallResolved}
{onSave} {onSave}
onUpdate={markdownUpdateHandler} onUpdate={markdownUpdateHandler}
onPreview={previewHandler} onPreview={previewHandler}
@@ -340,6 +343,7 @@
{preview} {preview}
{compactPreview} {compactPreview}
{done} {done}
{onToolCallResolved}
/> />
</div> </div>
{/if} {/if}
@@ -54,6 +54,7 @@
export let onTaskClick: Function = () => {}; export let onTaskClick: Function = () => {};
export let onSourceClick: Function = () => {}; export let onSourceClick: Function = () => {};
export let onToolCallResolved: Function = () => {};
const headerComponent = (depth: number) => { const headerComponent = (depth: number) => {
return 'h' + depth; return 'h' + depth;
@@ -111,13 +112,14 @@
resolvingCallId = callId; resolvingCallId = callId;
try { try {
await resolveChatMessageToolCall( const res = await resolveChatMessageToolCall(
localStorage.token, localStorage.token,
chatId, chatId,
messageId, messageId,
callId, callId,
approved ? 'approve' : 'reject' approved ? 'approve' : 'reject'
); );
onToolCallResolved(res);
} catch (err) { } catch (err) {
toast.error(String(err)); toast.error(String(err));
} finally { } finally {
@@ -314,10 +316,11 @@
{preview} {preview}
{compactPreview} {compactPreview}
{editCodeBlock} {editCodeBlock}
{onTaskClick} {onTaskClick}
{sourceIds} {sourceIds}
{onSourceClick} {onSourceClick}
/> {onToolCallResolved}
/>
</blockquote> </blockquote>
{/if} {/if}
{:else if token.type === 'list'} {:else if token.type === 'list'}
@@ -39,6 +39,7 @@
export let mergeResponses; export let mergeResponses;
export let addMessages; export let addMessages;
export let onToolCallResolved: Function = () => {};
export let forkHandler: Function | null = null; export let forkHandler: Function | null = null;
export let triggerScroll; export let triggerScroll;
export let readOnly = false; export let readOnly = false;
@@ -107,6 +108,7 @@
{continueResponse} {continueResponse}
{regenerateResponse} {regenerateResponse}
{addMessages} {addMessages}
{onToolCallResolved}
{forkHandler} {forkHandler}
{readOnly} {readOnly}
{compactPreview} {compactPreview}
@@ -135,6 +137,7 @@
{mergeResponses} {mergeResponses}
{triggerScroll} {triggerScroll}
{addMessages} {addMessages}
{onToolCallResolved}
{forkHandler} {forkHandler}
{readOnly} {readOnly}
{compactPreview} {compactPreview}
@@ -48,6 +48,7 @@
export let mergeResponses: Function; export let mergeResponses: Function;
export let addMessages: Function; export let addMessages: Function;
export let onToolCallResolved: Function = () => {};
export let forkHandler: Function | null = null; export let forkHandler: Function | null = null;
export let triggerScroll: Function; export let triggerScroll: Function;
@@ -328,6 +329,7 @@
groupedMessageIds[selectedModelIdx].messageIds.length - 1; groupedMessageIds[selectedModelIdx].messageIds.length - 1;
}} }}
{addMessages} {addMessages}
{onToolCallResolved}
{forkHandler} {forkHandler}
{readOnly} {readOnly}
{compactPreview} {compactPreview}
@@ -391,6 +393,7 @@
groupedMessageIds[modelIdx].messageIds.length - 1; groupedMessageIds[modelIdx].messageIds.length - 1;
}} }}
{addMessages} {addMessages}
{onToolCallResolved}
{forkHandler} {forkHandler}
{readOnly} {readOnly}
{compactPreview} {compactPreview}
@@ -160,6 +160,7 @@
export let forkHandler: Function | null = null; export let forkHandler: Function | null = null;
export let addMessages: Function; export let addMessages: Function;
export let onToolCallResolved: Function = () => {};
export let isLastMessage = true; export let isLastMessage = true;
export let readOnly = false; export let readOnly = false;
@@ -835,6 +836,7 @@
onTaskClick={async (e) => { onTaskClick={async (e) => {
console.log(e); console.log(e);
}} }}
{onToolCallResolved}
onSourceClick={async (id) => { onSourceClick={async (id) => {
console.log(id); console.log(id);
@@ -33,6 +33,7 @@
export let onTaskClick: any = () => {}; export let onTaskClick: any = () => {};
export let onUpdate: any = () => {}; export let onUpdate: any = () => {};
export let onPreview: any = () => {}; export let onPreview: any = () => {};
export let onToolCallResolved: any = () => {};
const getDetailTitle = (detailToken: OutputDetailToken): any => detailToken.summary; const getDetailTitle = (detailToken: OutputDetailToken): any => detailToken.summary;
const getDetailAttributes = (detailToken: OutputDetailToken): any => detailToken.attributes; const getDetailAttributes = (detailToken: OutputDetailToken): any => detailToken.attributes;
@@ -45,13 +46,14 @@
resolvingCallId = callId; resolvingCallId = callId;
try { try {
await resolveChatMessageToolCall( const res = await resolveChatMessageToolCall(
localStorage.token, localStorage.token,
chatId, chatId,
messageId, messageId,
callId, callId,
approved ? 'approve' : 'reject' approved ? 'approve' : 'reject'
); );
onToolCallResolved(res);
} catch (err) { } catch (err) {
toast.error(String(err)); toast.error(String(err));
} finally { } finally {
@@ -85,6 +87,7 @@
{sourceIds} {sourceIds}
{onSourceClick} {onSourceClick}
{onTaskClick} {onTaskClick}
{onToolCallResolved}
{onSave} {onSave}
{onUpdate} {onUpdate}
{onPreview} {onPreview}
@@ -139,6 +142,7 @@
{preview} {preview}
{compactPreview} {compactPreview}
{editCodeBlock} {editCodeBlock}
{onToolCallResolved}
/> />
</div> </div>
</div> </div>
@@ -189,10 +193,11 @@
content={detailToken.text} content={detailToken.text}
{done} {done}
{save} {save}
{preview} {preview}
{compactPreview} {compactPreview}
{editCodeBlock} {editCodeBlock}
/> {onToolCallResolved}
/>
</div> </div>
</div> </div>
</Collapsible> </Collapsible>