tkmind/tkmind_go
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

chore: generalize extension request (#2213)

Browse Source
This commit is contained in:
Wendy Tang
2025-04-16 08:39:49 -07:00
committed by GitHub
parent 970147f8ad
commit 7e4cfcdaae
11 changed files with 84 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/desktop/src/components/ChatView.tsx
+10 -10
View File
@@ -27,7 +27,7 @@ import {
ToolRequestMessageContent,
ToolResponseMessageContent,
ToolConfirmationRequestMessageContent,
EnableExtensionRequestMessageContent,
ExtensionRequestMessageContent,
} from '../types/message';
export interface ChatType {
@@ -47,7 +47,7 @@ const isUserMessage = (message: Message): boolean => {
if (message.content.every((c) => c.type === 'toolConfirmationRequest')) {
return false;
}
if (message.content.every((c) => c.type === 'enableExtensionRequest')) {
if (message.content.every((c) => c.type === 'extensionRequest')) {
return false;
}
return true;
@@ -258,13 +258,13 @@ export default function ChatView({
return [content.id, toolCall];
}
});
const enableExtensionRequests = lastMessage.content
const extensionRequests = lastMessage.content
.filter(
(content): content is EnableExtensionRequestMessageContent =>
content.type === 'enableExtensionRequest'
(content): content is ExtensionRequestMessageContent =>
content.type === 'extensionRequest'
)
.map((content) => {
return [content.id, content.extensionName];
return [content.id, content.extensionCall];
});
if (toolRequests.length !== 0) {
@@ -298,7 +298,7 @@ export default function ChatView({
// do the same for enable extension requests
// leverages toolResponse to send the error notification
if (enableExtensionRequests.length !== 0) {
if (extensionRequests.length !== 0) {
let responseMessage: Message = {
role: 'user',
created: Date.now(),
@@ -306,7 +306,7 @@ export default function ChatView({
};
const notification = 'Interrupted by the user to make a correction';
// generate a response saying it was interrupted for each extension request
for (const [reqId, _] of enableExtensionRequests) {
for (const [reqId, _] of extensionRequests) {
const toolResponse: ToolResponseMessageContent = {
type: 'toolResponse',
id: reqId,
@@ -336,9 +336,9 @@ export default function ChatView({
(c) => c.type === 'toolConfirmationRequest'
);
const hasEnableExtension = message.content.every((c) => c.type === 'enableExtensionRequest');
const hasExtensionRequest = message.content.every((c) => c.type === 'extensionRequest');
// Keep the message if it has text content or tool confirmation or is not just tool responses
return hasTextContent || !hasOnlyToolResponses || hasToolConfirmation || hasEnableExtension;
return hasTextContent || !hasOnlyToolResponses || hasToolConfirmation || hasExtensionRequest;
}
return true;
ui/desktop/src/components/ExtensionConfirmation.tsx
+9 -4
View File
@@ -7,16 +7,20 @@ interface ExtensionConfirmationProps {
isClicked: boolean;
extensionConfirmationId: string;
extensionName: string;
toolName: string;
}
export default function ExtensionConfirmation({
isCancelledMessage,
isClicked,
extensionConfirmationId,
extensionName,
toolName,
}: ExtensionConfirmationProps) {
const [clicked, setClicked] = useState(isClicked);
const [status, setStatus] = useState('unknown');
const extensionAction = toolName.toLowerCase().includes('enable') ? 'enable' : 'disable';
const handleButtonClick = async (confirmed: boolean) => {
setClicked(true);
setStatus(confirmed ? 'approved' : 'denied');
@@ -38,12 +42,12 @@ export default function ExtensionConfirmation({
return isCancelledMessage ? (
<div className="goose-message-content bg-bgSubtle rounded-2xl px-4 py-2 text-textStandard">
Extension enablement is cancelled.
Extension {extensionAction} is cancelled.
</div>
) : (
<>
<div className="goose-message-content bg-bgSubtle rounded-2xl px-4 py-2 rounded-b-none text-textStandard">
Goose would like to enable the above extension. Allow?
Goose would like to {extensionAction} the following extension. Allow?
</div>
{clicked ? (
<div className="goose-message-tool bg-bgApp border border-borderSubtle dark:border-gray-700 rounded-b-2xl px-4 pt-4 pb-2 flex gap-4 mt-1">
@@ -75,7 +79,7 @@ export default function ExtensionConfirmation({
<span className="ml-2 text-textStandard">
{isClicked
? 'Extension enablement is not available'
: `${snakeToTitleCase(extensionName.includes('__') ? extensionName.split('__').pop() : extensionName)} is ${status}`}{' '}
: `${snakeToTitleCase(extensionName.includes('__') ? extensionName.split('__').pop() || extensionName : extensionName)} is ${status}`}{' '}
</span>
</div>
</div>
@@ -87,7 +91,8 @@ export default function ExtensionConfirmation({
}
onClick={() => handleButtonClick(true)}
>
Enable extension
{extensionAction.charAt(0).toUpperCase() + extensionAction.slice(1).toLowerCase()}{' '}
extension
</button>
<button
className={
ui/desktop/src/components/GooseMessage.tsx
+11 -10
View File
@@ -11,7 +11,7 @@ import {
getToolResponses,
getToolConfirmationContent,
createToolErrorResponseMessage,
getEnableExtensionContent,
getExtensionContent,
} from '../types/message';
import ToolCallConfirmation from './ToolCallConfirmation';
import MessageCopyLink from './MessageCopyLink';
@@ -54,8 +54,8 @@ export default function GooseMessage({
const toolConfirmationContent = getToolConfirmationContent(message);
const hasToolConfirmation = toolConfirmationContent !== undefined;
const enableExtensionContent = getEnableExtensionContent(message);
const hasEnableExtension = enableExtensionContent !== undefined;
const extensionContent = getExtensionContent(message);
const hasExtensionRequest = extensionContent !== undefined;
// Find tool responses that correspond to the tool requests in this message
const toolResponsesMap = useMemo(() => {
@@ -91,10 +91,10 @@ export default function GooseMessage({
createToolErrorResponseMessage(toolConfirmationContent.id, 'The tool call is cancelled.')
);
}
if (messageIndex == messageHistoryIndex - 1 && hasEnableExtension) {
if (messageIndex == messageHistoryIndex - 1 && hasExtensionRequest) {
appendMessage(
createToolErrorResponseMessage(
enableExtensionContent.id,
extensionContent.id,
'The extension enablement is cancelled.'
)
);
@@ -105,9 +105,9 @@ export default function GooseMessage({
hasToolConfirmation,
toolConfirmationContent,
appendMessage,
hasEnableExtension,
hasExtensionRequest,
// Only include enableExtensionContent if it exists
enableExtensionContent?.id,
extensionContent?.id,
]);
return (
@@ -157,12 +157,13 @@ export default function GooseMessage({
/>
)}
{hasEnableExtension && (
{hasExtensionRequest && (
<ExtensionConfirmation
isCancelledMessage={messageIndex == messageHistoryIndex - 1}
isClicked={messageIndex < messageHistoryIndex - 1}
extensionConfirmationId={enableExtensionContent.id}
extensionName={enableExtensionContent.extensionName}
extensionConfirmationId={extensionContent.id}
extensionName={extensionContent.extensionName}
toolName={extensionContent.toolName}
/>
)}
</div>
ui/desktop/src/types/message.ts
+16 -26
View File
@@ -68,35 +68,36 @@ export interface ToolConfirmationRequestMessageContent {
prompt?: string;
}
export interface EnableExtensionCall {
export interface ExtensionCall {
name: string;
arguments: Record<string, unknown>;
extensionName: string;
}
export interface EnableExtensionCallResult<T> {
export interface ExtensionCallResult<T> {
status: 'success' | 'error';
value?: T;
error?: string;
}
export interface EnableExtensionRequest {
export interface ExtensionRequest {
id: string;
extensionCall: EnableExtensionCallResult<EnableExtensionCall>;
extensionCall: ExtensionCallResult<ExtensionCall>;
}
export interface EnableExtensionConfirmationRequest {
export interface ExtensionConfirmationRequest {
id: string;
extensionName: string;
arguments: Record<string, unknown>;
prompt?: string;
}
export interface EnableExtensionRequestMessageContent {
type: 'enableExtensionRequest';
export interface ExtensionRequestMessageContent {
type: 'extensionRequest';
id: string;
extensionCall: EnableExtensionCallResult<EnableExtensionCall>;
extensionCall: ExtensionCallResult<ExtensionCall>;
extensionName: string;
toolName: string;
}
export type MessageContent =
@@ -105,7 +106,7 @@ export type MessageContent =
| ToolRequestMessageContent
| ToolResponseMessageContent
| ToolConfirmationRequestMessageContent
| EnableExtensionRequestMessageContent;
| ExtensionRequestMessageContent;
export interface Message {
id?: string;
@@ -219,12 +220,11 @@ export function getToolResponses(message: Message): ToolResponseMessageContent[]
);
}
export function getEnableExtensionRequests(
export function getExtensionRequests(
message: Message
): EnableExtensionRequestMessageContent[] {
): ExtensionRequestMessageContent[] {
return message.content.filter(
(content): content is EnableExtensionRequestMessageContent =>
content.type === 'enableExtensionRequest'
(content): content is ExtensionRequestMessageContent => content.type === 'extensionRequest'
);
}
@@ -237,10 +237,10 @@ export function getToolConfirmationContent(
);
}
export function getEnableExtensionContent(message: Message): EnableExtensionRequestMessageContent {
export function getExtensionContent(message: Message): ExtensionRequestMessageContent {
return message.content.find(
(content): content is EnableExtensionRequestMessageContent =>
content.type === 'enableExtensionRequest'
(content): content is ExtensionRequestMessageContent =>
content.type === 'extensionRequest'
);
}
@@ -253,13 +253,3 @@ export function hasCompletedToolCalls(message: Message): boolean {
// by looking through subsequent messages
return true;
}
export function hasCompletedEnableExtensionCalls(message: Message): boolean {
const extensionRequests = getEnableExtensionRequests(message);
if (extensionRequests.length === 0) return false;
// For now, we'll assume all extension calls are completed when this is checked
// In a real implementation, you'd need to check if all extension requests have responses
// by looking through subsequent messages
return true;
}