Skip to content

Commit e35f260

Browse files
kylecarbskylecarbs
committed
Improve chat
1 parent aafef5a commit e35f260

File tree

5 files changed

+1831
-75
lines changed

5 files changed

+1831
-75
lines changed

‎coderd/chat.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,9 @@ func (api *API) postChatMessages(w http.ResponseWriter, r *http.Request) {
247247
Model: req.Model,
248248
Messages: messages,
249249
Tools: tools,
250-
SystemPrompt: `You are a chat assistant for Coder. You will attempt to resolve the user's
251-
request to the maximum utilization of your tools.
250+
SystemPrompt: `You are a chat assistant for Coder - an open-source platform for creating and managing cloud development environments on any infrastructure. You are expected to be precise, concise, and helpful.
252251
253-
Try your best to not ask the user for help - solve the task with your tools!`,
252+
You are running as an agent - please keep going until the user's query is completely resolved, before ending your turn and yielding back to the user. Only terminate your turn when you are sure that the problem is solved. Do NOT guess or make up an answer.`,
254253
})
255254
if err != nil {
256255
httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{

‎codersdk/toolsdk/toolsdk.go

Lines changed: 120 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ package toolsdk
22

33
import (
44
"archive/tar"
5+
"bytes"
56
"context"
67
"errors"
78
"io"
9+
"mime"
10+
"path/filepath"
11+
"strings"
812

913
"github.com/coder/coder/v2/codersdk"
1014
"github.com/coder/coder/v2/codersdk/agentsdk"
@@ -42,6 +46,8 @@ var (
4246
CreateTemplateVersion.Generic(),
4347
CreateTemplate.Generic(),
4448
GetTemplateVersionLogs.Generic(),
49+
GetTemplateVersion.Generic(),
50+
DownloadTarFile.Generic(),
4551
UpdateTemplateActiveVersion.Generic(),
4652
DeleteTemplate.Generic(),
4753
GetWorkspaceAgentLogs.Generic(),
@@ -85,7 +91,13 @@ var (
8591
Name: "coder_get_workspace",
8692
Description: `Get a workspace by ID.
8793
88-
This returns more data than list_workspaces to reduce token usage.`,
94+
This returns more data than list_workspaces to reduce token usage.
95+
96+
Workspace health is composed of infrastructure and agents.
97+
Infrastructure can be provisioned successfully, but the agent
98+
could fail to connect due to template misconfiguration or
99+
connection issues. To ensure a workspace is alive, eventually
100+
the agent should be in a connected state.`,
89101
Schema: aisdk.Schema{
90102
Properties: map[string]any{
91103
"workspace_id": map[string]any{
@@ -286,6 +298,10 @@ is provisioned correctly and the agent can connect to the control plane.
286298
"type": "string",
287299
"description": "The transition to perform. Must be one of: start, stop, delete",
288300
},
301+
"template_version_id": map[string]any{
302+
"type": "string",
303+
"description": "The template version ID to use for the workspace build. Workspaces do not update template versions automatically.",
304+
},
289305
},
290306
Required: []string{"workspace_id", "transition"},
291307
},
@@ -303,8 +319,16 @@ is provisioned correctly and the agent can connect to the control plane.
303319
if !ok {
304320
return codersdk.WorkspaceBuild{}, errors.New("transition must be a string")
305321
}
322+
var templateVersionID uuid.UUID
323+
if args["template_version_id"] != nil {
324+
templateVersionID, err = uuid.Parse(args["template_version_id"].(string))
325+
if err != nil {
326+
return codersdk.WorkspaceBuild{}, err
327+
}
328+
}
306329
return client.CreateWorkspaceBuild(ctx, workspaceID, codersdk.CreateWorkspaceBuildRequest{
307-
Transition: codersdk.WorkspaceTransition(rawTransition),
330+
Transition: codersdk.WorkspaceTransition(rawTransition),
331+
TemplateVersionID: templateVersionID,
308332
})
309333
},
310334
}
@@ -413,7 +437,7 @@ This resource provides the following fields:
413437
- init_script: The script to run on provisioned infrastructure to fetch and start the agent.
414438
- token: Set the environment variable CODER_AGENT_TOKEN to this value to authenticate the agent.
415439
416-
The agent MUST be installed and started using the init_script.
440+
The agent MUST be installed and started using the init_script. A utility like curl or wget to fetch the agent binary must exist in the provisioned infrastructure.
417441
418442
Expose terminal or HTTP applications running in a workspace with:
419443
@@ -533,13 +557,20 @@ resource "google_compute_instance" "dev" {
533557
auto_delete = false
534558
source = google_compute_disk.root.name
535559
}
560+
// In order to use google-instance-identity, a service account *must* be provided.
536561
service_account {
537562
email = data.google_compute_default_service_account.default.email
538563
scopes = ["cloud-platform"]
539564
}
565+
# ONLY FOR WINDOWS:
566+
# metadata = {
567+
# windows-startup-script-ps1 = coder_agent.main.init_script
568+
# }
540569
# The startup script runs as root with no $HOME environment set up, so instead of directly
541570
# running the agent init script, create a user (with a homedir, default shell and sudo
542571
# permissions) and execute the init script as that user.
572+
#
573+
# The agent MUST be started in here.
543574
metadata_startup_script = <<EOMETA
544575
#!/usr/bin/env sh
545576
set -eux
@@ -877,6 +908,35 @@ Useful for checking whether a workspace builds successfully or not.`,
877908
},
878909
}
879910

911+
GetTemplateVersion = Tool[codersdk.TemplateVersion]{
912+
Tool: aisdk.Tool{
913+
Name: "coder_get_template_version",
914+
Description: "Get a template version by ID.",
915+
Schema: aisdk.Schema{
916+
Properties: map[string]any{
917+
"template_version_id": map[string]any{
918+
"type": "string",
919+
},
920+
},
921+
},
922+
},
923+
Handler: func(ctx context.Context, args map[string]any) (codersdk.TemplateVersion, error) {
924+
client, err := clientFromContext(ctx)
925+
if err != nil {
926+
return codersdk.TemplateVersion{}, err
927+
}
928+
templateVersionID, err := uuid.Parse(args["template_version_id"].(string))
929+
if err != nil {
930+
return codersdk.TemplateVersion{}, err
931+
}
932+
templateVersion, err := client.TemplateVersion(ctx, templateVersionID)
933+
if err != nil {
934+
return codersdk.TemplateVersion{}, err
935+
}
936+
return templateVersion, nil
937+
},
938+
}
939+
880940
GetTemplateVersionLogs = Tool[[]string]{
881941
Tool: aisdk.Tool{
882942
Name: "coder_get_template_version_logs",
@@ -1012,6 +1072,63 @@ Useful for checking whether a workspace builds successfully or not.`,
10121072
},
10131073
}
10141074

1075+
DownloadTarFile = Tool[map[string]string]{
1076+
Tool: aisdk.Tool{
1077+
Name: "coder_download_tar_file",
1078+
Description: "Download a tar file and get key/value mapping of file names to file contents.",
1079+
Schema: aisdk.Schema{
1080+
Properties: map[string]any{
1081+
"file_id": map[string]any{
1082+
"type": "string",
1083+
},
1084+
},
1085+
},
1086+
},
1087+
Handler: func(ctx context.Context, args map[string]any) (map[string]string, error) {
1088+
client, err := clientFromContext(ctx)
1089+
if err != nil {
1090+
return nil, err
1091+
}
1092+
uploadID, err := uuid.Parse(args["file_id"].(string))
1093+
if err != nil {
1094+
return nil, err
1095+
}
1096+
download, contentType, err := client.Download(ctx, uploadID)
1097+
if err != nil {
1098+
return nil, err
1099+
}
1100+
1101+
if contentType != codersdk.ContentTypeTar {
1102+
return nil, errors.New("content type is not tar")
1103+
}
1104+
1105+
tarReader := tar.NewReader(bytes.NewReader(download))
1106+
files := make(map[string]string)
1107+
for {
1108+
header, err := tarReader.Next()
1109+
if err == io.EOF {
1110+
break
1111+
}
1112+
if err != nil {
1113+
return nil, err
1114+
}
1115+
// if the mime type is not text, skip it.
1116+
mimeType := mime.TypeByExtension(filepath.Ext(header.Name))
1117+
if mimeType != "" && !strings.HasPrefix(mimeType, "text/") {
1118+
files[header.Name] = `<content skipped because it's not text - mime type: ` + mimeType + `>`
1119+
continue
1120+
}
1121+
content, err := io.ReadAll(tarReader)
1122+
if err != nil {
1123+
return nil, err
1124+
}
1125+
files[header.Name] = string(content)
1126+
}
1127+
1128+
return files, nil
1129+
},
1130+
}
1131+
10151132
CreateTemplate = Tool[codersdk.Template]{
10161133
Tool: aisdk.Tool{
10171134
Name: "coder_create_template",

‎site/src/pages/ChatPage/ChatMessages.tsx

Lines changed: 38 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Paper, { PaperProps } from "@mui/material/Paper";
66
import TextField from "@mui/material/TextField";
77
import { getChatMessages, getChats } from "api/queries/chats";
88
import { CreateChatMessageRequest, ChatMessage } from "api/typesGenerated";
9-
import { FC, memo, useEffect, useRef, KeyboardEvent } from "react";
9+
import { FC, memo, useEffect, useRef, KeyboardEvent, useCallback } from "react";
1010
import { useQuery, useQueryClient } from "react-query";
1111
import { useLocation, useParams } from "react-router-dom";
1212
import { ChatLandingLocationState } from "./ChatLanding";
@@ -291,7 +291,7 @@ interface ChatViewProps {
291291
messages: Message[];
292292
input: string;
293293
handleInputChange: React.ChangeEventHandler<HTMLInputElement | HTMLTextAreaElement>;
294-
hhandleSubmit: (e?: React.FormEvent<HTMLFormElement>) => void;
294+
handleSubmit: (e?: React.FormEvent<HTMLFormElement>) => void;
295295
isLoading: boolean;
296296
chatID: string;
297297
}
@@ -300,7 +300,7 @@ const ChatView: FC<ChatViewProps> = ({
300300
messages,
301301
input,
302302
handleInputChange,
303-
hhandleSubmit,
303+
handleSubmit,
304304
isLoading,
305305
chatID
306306
}) => {
@@ -322,7 +322,7 @@ const ChatView: FC<ChatViewProps> = ({
322322
const handleKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
323323
if (event.key === 'Enter' && !event.shiftKey) {
324324
event.preventDefault();
325-
hhandleSubmit();
325+
handleSubmit();
326326
}
327327
};
328328

@@ -355,34 +355,6 @@ const ChatView: FC<ChatViewProps> = ({
355355
{messages.map((message, index) => (
356356
<MessageBubble key={`message-${index}`} message={message} />
357357
))}
358-
{isLoading && (
359-
<div
360-
css={{
361-
display: "flex",
362-
justifyContent: "flex-start",
363-
maxWidth: "80%",
364-
animation: `${fadeIn} 0.3s ease-out`,
365-
}}
366-
>
367-
<Paper
368-
elevation={1}
369-
css={{
370-
padding: theme.spacing(1.5, 2),
371-
fontSize: "0.95rem",
372-
backgroundColor: theme.palette.background.paper,
373-
borderRadius: "16px",
374-
borderBottomLeftRadius: "4px",
375-
width: "auto",
376-
display: "flex",
377-
alignItems: "center",
378-
gap: theme.spacing(1),
379-
animation: `${pulseAnimation} 1.5s ease-in-out infinite`,
380-
}}
381-
>
382-
<Loader size={20} /> Thinking...
383-
</Paper>
384-
</div>
385-
)}
386358
<div ref={messagesEndRef} />
387359
</div>
388360
</div>
@@ -400,7 +372,7 @@ const ChatView: FC<ChatViewProps> = ({
400372
>
401373
<Paper
402374
component="form"
403-
onSubmit={hhandleSubmit}
375+
onSubmit={handleSubmit}
404376
elevation={0}
405377
variant="outlined"
406378
css={{
@@ -481,10 +453,11 @@ export const ChatMessages: FC = () => {
481453
const {
482454
messages,
483455
input,
484-
handleInputChange,
456+
handleInputChange: originalHandleInputChange,
485457
handleSubmit: originalHandleSubmit,
486458
isLoading,
487-
setInput,
459+
setInput,
460+
setMessages,
488461
} = useChat({
489462
id: chatID,
490463
api: `/api/v2/chats/${chatID}/messages`,
@@ -502,22 +475,39 @@ export const ChatMessages: FC = () => {
502475
initialInput: transferedState?.message,
503476
initialMessages: messagesQuery.data as Message[] | undefined,
504477
});
505-
useEffect(() => {
506-
// console.log(transferedState?.message, input)
507-
if (transferedState?.message && input === transferedState?.message) {
508-
// handleSubmit();
509-
}
510-
}, [transferedState?.message])
511478

512-
const handleSubmit = (e?: React.FormEvent<HTMLFormElement>) => {
513-
if (e) e.preventDefault();
514-
if (!input.trim()) return;
515-
originalHandleSubmit();
516-
setInput('');
517-
};
479+
// Update messages from query data when it loads
480+
useEffect(() => {
481+
if (messagesQuery.data && messages.length === 0) {
482+
setMessages(messagesQuery.data as Message[]);
483+
}
484+
}, [messagesQuery.data, messages.length, setMessages]);
485+
486+
// Wrap handlers in useCallback
487+
const handleInputChange = useCallback(originalHandleInputChange, [originalHandleInputChange]);
488+
489+
const handleSubmitCallback = useCallback((e?: React.FormEvent<HTMLFormElement>) => {
490+
if (e) e.preventDefault();
491+
if (!input.trim()) return;
492+
originalHandleSubmit();
493+
setInput(''); // Clear input after submit
494+
}, [input, originalHandleSubmit, setInput]);
495+
496+
// Clear input and potentially submit on initial load with message
497+
useEffect(() => {
498+
if (transferedState?.message && input === transferedState.message) {
499+
// Prevent submitting if messages already exist (e.g., browser back/forward)
500+
if (messages.length === (messagesQuery.data?.length ?? 0)) {
501+
handleSubmitCallback(); // Use the correct callback name
502+
}
503+
// Clear the state to prevent re-submission on subsequent renders/navigation
504+
window.history.replaceState({}, document.title);
505+
}
506+
}, [transferedState?.message, input, handleSubmitCallback, messages.length, messagesQuery.data?.length]); // Use the correct callback name
518507

519508
useEffect(() => {
520509
if (transferedState?.message) {
510+
// Logic potentially related to transferedState can go here if needed,
521511
}
522512
}, [transferedState?.message]);
523513

@@ -536,7 +526,7 @@ export const ChatMessages: FC = () => {
536526
messages={messages}
537527
input={input}
538528
handleInputChange={handleInputChange}
539-
hhandleSubmit={handleSubmit}
529+
handleSubmit={handleSubmitCallback}
540530
isLoading={isLoading}
541531
/>
542532
);

0 commit comments

Comments
 (0)