Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion components/script/messages/promptForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,18 @@ const PromptForm = ({
const onSubmitForm = () => {
setSubmitted(true);
onSubmit({ id: frame.id, responses: getValues() });
if (frame.metadata && frame.metadata.authURL) {
open(frame.metadata.authURL);
}
};

let buttonText = noFields ? 'OK' : 'Submit';
let includeHiddenInput = false;
if (noFields && frame.metadata && frame.metadata.authURL) {
buttonText = 'Click here to sign in';
includeHiddenInput = true;
}

return (
<form onSubmit={handleSubmit(onSubmitForm)} className="mx-4">
{frame.fields.map(
Expand All @@ -40,6 +50,14 @@ const PromptForm = ({
/>
)
)}
{includeHiddenInput && (
<Input
type="text"
className="hidden"
{...register('handled')}
value={'true'}
/>
)}
<Button
startContent={<GoCheckCircle />}
type="submit"
Expand All @@ -48,7 +66,7 @@ const PromptForm = ({
color="primary"
isDisabled={submitted}
>
{noFields ? 'OK' : submitted ? 'Submitted' : 'Submit'}
{submitted ? 'Submitted' : buttonText}
</Button>
</form>
);
Expand Down
13 changes: 11 additions & 2 deletions components/script/useChatSocket.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,23 @@ const useChatSocket = (isEmpty?: boolean) => {
if (latestAgentMessageIndex.current !== -1) {
// Update the message content
updatedMessages[latestAgentMessageIndex.current].message =
frame.message;
frame.metadata &&
frame.metadata.authURL &&
frame.metadata.toolDisplayName
? `${frame.metadata.toolDisplayName} requires authentication`
: frame.message;
updatedMessages[latestAgentMessageIndex.current].component = form;
updatedMessages[latestAgentMessageIndex.current].calls = state;
} else {
// If there are no previous messages, create a new message
updatedMessages.push({
type: MessageType.Agent,
message: frame.message,
message:
frame.metadata &&
frame.metadata.authURL &&
frame.metadata.toolDisplayName
? `${frame.metadata.toolDisplayName} requires authentication`
: frame.message,
component: form,
calls: state,
});
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"main": "electron/main.mjs",
"dependencies": {
"@gptscript-ai/gptscript": "^0.9.5-rc3",
"@gptscript-ai/gptscript": "github:gptscript-ai/node-gptscript#de914911013bf9da02046906b88a5613dce508e1",
"@monaco-editor/react": "^4.6.0",
"@nextui-org/button": "2.0.32",
"@nextui-org/code": "2.0.28",
Expand Down
4 changes: 3 additions & 1 deletion server/app.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ const mount = async (
tools: state.tools || [],
});
}
} catch (e) {}
} catch (e) {
console.error('Error loading state:', e);
}

// Start the script
let runningScript = null;
Expand Down