diff --git a/app/edit/page.tsx b/app/edit/page.tsx
index 0249d0a1..0700d9de 100644
--- a/app/edit/page.tsx
+++ b/app/edit/page.tsx
@@ -2,10 +2,9 @@
 
 import { useEffect, useState, Suspense, useContext } from 'react';
 import { useSearchParams } from 'next/navigation';
-import Script from '@/components/script';
 import Configure from '@/components/edit/configure';
 import { EditContextProvider } from '@/contexts/edit';
-import { ScriptContextProvider } from '@/contexts/script';
+import { ChatContextProvider } from '@/contexts/chat';
 import New from '@/components/edit/new';
 import ScriptNav from '@/components/edit/scriptNav';
 import { NavContext } from '@/contexts/nav';
@@ -26,7 +25,7 @@ function EditFile() {
       <New className="w-1/2" setFile={setFile} />
     </div>
   ) : (
-    <ScriptContextProvider
+    <ChatContextProvider
       initialScript={file}
       initialScriptId={scriptId}
       enableThread={false}
@@ -38,18 +37,10 @@ function EditFile() {
           <div className="absolute left-6 top-6">
             <ScriptNav collapsed={collapsed} setCollapsed={setCollapsed} />
           </div>
-          <div
-            className={`h-full overflow-auto w-full border-r-2 dark:border-zinc-800 p-6 ${collapsed ? '' : 'xl:px-20'}`}
-          >
-            <Configure collapsed={collapsed} />
-          </div>
-          <Script
-            messagesHeight="h-[93%]"
-            className={`p-6 overflow-auto ${collapsed ? 'col-span-3 px-32' : ''}`}
-          />
+          <Configure collapsed={collapsed} />
         </div>
       </EditContextProvider>
-    </ScriptContextProvider>
+    </ChatContextProvider>
   );
 }
 
diff --git a/app/page.tsx b/app/page.tsx
index c7dc4fce..5eea633f 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -2,9 +2,9 @@
 
 import { useSearchParams } from 'next/navigation';
 import { Suspense, useContext, useEffect, useState } from 'react';
-import Script from '@/components/script';
+import Chat from '@/components/chat';
 import Threads from '@/components/threads';
-import { ScriptContextProvider } from '@/contexts/script';
+import { ChatContextProvider } from '@/contexts/chat';
 import { NavContext } from '@/contexts/nav';
 import { tildy } from '@/config/assistant';
 
@@ -21,7 +21,7 @@ function RunFile() {
   useEffect(() => setCurrent('/'), []);
 
   return (
-    <ScriptContextProvider
+    <ChatContextProvider
       initialScript={script}
       initialScriptId={scriptId}
       enableThread={true}
@@ -34,12 +34,12 @@ function RunFile() {
           <div className="w-full h-full flex pb-10">
             <Threads />
             <div className="mx-auto w-[75%] 2xl:w-[55%] 3xl:[w-50%]">
-              <Script enableThreads showAssistantName className="px-4 pb-10" />
+              <Chat showAssistantName className="px-4 pb-10" />
             </div>
           </div>
         </div>
       </section>
-    </ScriptContextProvider>
+    </ChatContextProvider>
   );
 }
 
diff --git a/components/script.tsx b/components/chat.tsx
similarity index 84%
rename from components/script.tsx
rename to components/chat.tsx
index c10fee24..a9eedacf 100644
--- a/components/script.tsx
+++ b/components/chat.tsx
@@ -1,28 +1,33 @@
 'use client';
 
 import { useContext, useEffect, useState, useRef, useCallback } from 'react';
-import Messages, { MessageType } from '@/components/script/messages';
-import ChatBar from '@/components/script/chatBar';
-import ToolForm from '@/components/script/form';
+import Messages, { MessageType } from '@/components/chat/messages';
+import ChatBar from '@/components/chat/chatBar';
+import ToolForm from '@/components/chat/form';
 import Loading from '@/components/loading';
 import { Button } from '@nextui-org/react';
 import { getWorkspaceDir } from '@/actions/workspace';
 import { getGatewayUrl } from '@/actions/gateway';
-import { ScriptContext } from '@/contexts/script';
+import { ChatContext } from '@/contexts/chat';
 import AssistantNotFound from '@/components/assistant-not-found';
 import { generateThreadName, renameThread } from '@/actions/threads';
 
 interface ScriptProps {
   className?: string;
   messagesHeight?: string;
-  enableThreads?: boolean;
   showAssistantName?: boolean;
+  inputPlaceholder?: string;
+  disableInput?: boolean;
+  disableCommands?: boolean;
 }
 
-const Script: React.FC<ScriptProps> = ({
+const Chat: React.FC<ScriptProps> = ({
   className,
   messagesHeight = 'h-full',
   showAssistantName,
+  inputPlaceholder,
+  disableInput = false,
+  disableCommands = false,
 }) => {
   const inputRef = useRef<HTMLInputElement>(null);
   const [inputValue, _setInputValue] = useState<string>('');
@@ -45,7 +50,7 @@ const Script: React.FC<ScriptProps> = ({
     notFound,
     restartScript,
     fetchThreads,
-  } = useContext(ScriptContext);
+  } = useContext(ChatContext);
 
   useEffect(() => {
     if (inputRef.current) {
@@ -140,7 +145,12 @@ const Script: React.FC<ScriptProps> = ({
                 {tool.chat ? 'Start chat' : 'Run script'}
               </Button>
             ) : (
-              <ChatBar disabled={!running} onMessageSent={handleMessageSent} />
+              <ChatBar
+                disableInput={disableInput || !running}
+                disableCommands={disableCommands}
+                inputPlaceholder={inputPlaceholder}
+                onMessageSent={handleMessageSent}
+              />
             )}
           </div>
         </>
@@ -153,4 +163,4 @@ const Script: React.FC<ScriptProps> = ({
   );
 };
 
-export default Script;
+export default Chat;
diff --git a/components/script/chatBar.tsx b/components/chat/chatBar.tsx
similarity index 80%
rename from components/script/chatBar.tsx
rename to components/chat/chatBar.tsx
index e905e7d8..b6251e28 100644
--- a/components/script/chatBar.tsx
+++ b/components/chat/chatBar.tsx
@@ -5,17 +5,24 @@ import { IoMdSend } from 'react-icons/io';
 import { Spinner } from '@nextui-org/react';
 import { FaBackward } from 'react-icons/fa';
 import { Button, Textarea } from '@nextui-org/react';
-import Commands from '@/components/script/chatBar/commands';
+import Commands from '@/components/chat/chatBar/commands';
 import { GoKebabHorizontal, GoSquareFill } from 'react-icons/go';
-import { ScriptContext } from '@/contexts/script';
-import { MessageType } from '@/components/script/messages';
+import { ChatContext } from '@/contexts/chat';
+import { MessageType } from '@/components/chat/messages';
 
 interface ChatBarProps {
-  disabled?: boolean;
+  disableInput?: boolean;
+  disableCommands?: boolean;
+  inputPlaceholder?: string;
   onMessageSent: (message: string) => void;
 }
 
-const ChatBar = ({ disabled = false, onMessageSent }: ChatBarProps) => {
+const ChatBar = ({
+  disableInput = false,
+  disableCommands = false,
+  inputPlaceholder,
+  onMessageSent,
+}: ChatBarProps) => {
   const [inputValue, setInputValue] = useState('');
   const [commandsOpen, setCommandsOpen] = useState(false);
   const [locked, setLocked] = useState(false);
@@ -27,7 +34,7 @@ const ChatBar = ({ disabled = false, onMessageSent }: ChatBarProps) => {
     setShowForm,
     messages,
     setMessages,
-  } = useContext(ScriptContext);
+  } = useContext(ChatContext);
   const [userMessages, setUserMessages] = useState<string[]>([]);
   const [_userMessagesIndex, setUserMessagesIndex] = useState(-1);
 
@@ -70,7 +77,7 @@ const ChatBar = ({ disabled = false, onMessageSent }: ChatBarProps) => {
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     // if the user started the message with /, we assume they are trying to run a command
     // so we don't update the input value and instead open the command modal
-    setCommandsOpen(event.target.value.startsWith('/'));
+    if (!disableCommands) setCommandsOpen(event.target.value.startsWith('/'));
     setInputValue(event.target.value);
   };
 
@@ -97,18 +104,20 @@ const ChatBar = ({ disabled = false, onMessageSent }: ChatBarProps) => {
 
   return (
     <div className="flex px-4 space-x-2 sw-full">
-      <Button
-        isIconOnly
-        startContent={<GoKebabHorizontal />}
-        radius="full"
-        className="text-lg"
-        color="primary"
-        onPress={() => {
-          if (disabled) return;
-          setCommandsOpen(true);
-        }}
-        onBlur={() => setTimeout(() => setCommandsOpen(false), 300)} // super hacky but it does work
-      />
+      {!disableCommands && (
+        <Button
+          isIconOnly
+          startContent={<GoKebabHorizontal />}
+          radius="full"
+          className="text-lg"
+          color="primary"
+          onPress={() => {
+            if (disableInput) return;
+            setCommandsOpen(true);
+          }}
+          onBlur={() => setTimeout(() => setCommandsOpen(false), 300)} // super hacky but it does work
+        />
+      )}
       <div className="w-full relative">
         <Commands
           text={inputValue}
@@ -118,10 +127,12 @@ const ChatBar = ({ disabled = false, onMessageSent }: ChatBarProps) => {
         >
           <Textarea
             color="primary"
-            isDisabled={disabled}
+            isDisabled={disableInput}
             id="chatInput"
             autoComplete="off"
-            placeholder="Start chatting or type / for more options "
+            placeholder={
+              inputPlaceholder || 'Start chatting or type / for more options'
+            }
             value={inputValue}
             radius="full"
             minRows={1}
@@ -171,16 +182,17 @@ const ChatBar = ({ disabled = false, onMessageSent }: ChatBarProps) => {
           startContent={<GoSquareFill className="mr-[1px] text-xl" />}
           isIconOnly
           radius="full"
-          isDisabled={disabled}
+          isDisabled={disableInput}
           className="text-lg"
           onPress={interrupt}
         />
       ) : (
         <>
-          {disabled ? (
+          {disableInput && !disableCommands ? (
             <Spinner />
           ) : (
             <Button
+              disabled={!disableInput}
               startContent={<IoMdSend />}
               isIconOnly
               isDisabled={!inputValue}
diff --git a/components/script/chatBar/commands.tsx b/components/chat/chatBar/commands.tsx
similarity index 97%
rename from components/script/chatBar/commands.tsx
rename to components/chat/chatBar/commands.tsx
index 9e8272dd..74843ebe 100644
--- a/components/script/chatBar/commands.tsx
+++ b/components/chat/chatBar/commands.tsx
@@ -9,10 +9,10 @@ import {
   GoTools,
 } from 'react-icons/go';
 import { PiToolbox } from 'react-icons/pi';
-import { ScriptContext } from '@/contexts/script';
-import Upload from '@/components/script/chatBar/upload';
-import ToolCatalog from '@/components/script/chatBar/toolCatalog';
-import { MessageType } from '@/components/script/messages';
+import { ChatContext } from '@/contexts/chat';
+import Upload from '@/components/chat/chatBar/upload';
+import ToolCatalog from '@/components/chat/chatBar/toolCatalog';
+import { MessageType } from '@/components/chat/messages';
 import { useFilePicker } from 'use-file-picker';
 import { uploadFile } from '@/actions/upload';
 import { ingest } from '@/actions/knowledge/knowledge';
@@ -105,7 +105,7 @@ export default function Commands({
     setTool,
     workspace,
     selectedThreadId,
-  } = useContext(ScriptContext);
+  } = useContext(ChatContext);
   const { openFilePicker, filesContent, loading, plainFiles } = useFilePicker(
     {}
   );
diff --git a/components/script/chatBar/toolCatalog.tsx b/components/chat/chatBar/toolCatalog.tsx
similarity index 100%
rename from components/script/chatBar/toolCatalog.tsx
rename to components/chat/chatBar/toolCatalog.tsx
diff --git a/components/script/chatBar/upload.tsx b/components/chat/chatBar/upload.tsx
similarity index 95%
rename from components/script/chatBar/upload.tsx
rename to components/chat/chatBar/upload.tsx
index 0e0160e7..e484afab 100644
--- a/components/script/chatBar/upload.tsx
+++ b/components/chat/chatBar/upload.tsx
@@ -3,8 +3,8 @@ import { GoUpload, GoFile, GoX } from 'react-icons/go';
 import Files from './upload/files';
 import { uploadFile, lsFiles } from '@/actions/upload';
 import { Dirent } from 'fs';
-import Workspace from '@/components/script/chatBar/upload/workspace';
-import { ScriptContext } from '@/contexts/script';
+import Workspace from '@/components/chat/chatBar/upload/workspace';
+import { ChatContext } from '@/contexts/chat';
 import {
   Modal,
   ModalContent,
@@ -24,7 +24,7 @@ const UploadModal = ({ isOpen, setIsOpen }: UploadModalProps) => {
   const [selectedFile, setSelectedFile] = useState<File | null>(null);
   const [files, setFiles] = useState<Dirent[]>([]);
   const selectedFileRef = useRef(selectedFile);
-  const { workspace, restartScript } = useContext(ScriptContext);
+  const { workspace, restartScript } = useContext(ChatContext);
 
   useEffect(() => {
     selectedFileRef.current = selectedFile;
diff --git a/components/script/chatBar/upload/files.tsx b/components/chat/chatBar/upload/files.tsx
similarity index 95%
rename from components/script/chatBar/upload/files.tsx
rename to components/chat/chatBar/upload/files.tsx
index 1cc6fc67..ebd7d465 100644
--- a/components/script/chatBar/upload/files.tsx
+++ b/components/chat/chatBar/upload/files.tsx
@@ -11,7 +11,7 @@ import {
 } from '@nextui-org/react';
 import { deleteFile, lsFiles } from '@/actions/upload';
 import { Dirent } from 'fs';
-import { ScriptContext } from '@/contexts/script';
+import { ChatContext } from '@/contexts/chat';
 import path from 'path';
 
 interface FilesProps {
@@ -21,7 +21,7 @@ interface FilesProps {
 
 const Files: React.FC<FilesProps> = ({ files, setFiles }) => {
   useEffect(() => fetchFiles(), []);
-  const { workspace } = useContext(ScriptContext);
+  const { workspace } = useContext(ChatContext);
 
   const fetchFiles = useCallback(() => {
     lsFiles(workspace)
diff --git a/components/script/chatBar/upload/workspace.tsx b/components/chat/chatBar/upload/workspace.tsx
similarity index 94%
rename from components/script/chatBar/upload/workspace.tsx
rename to components/chat/chatBar/upload/workspace.tsx
index 437b56f6..f35d7665 100644
--- a/components/script/chatBar/upload/workspace.tsx
+++ b/components/chat/chatBar/upload/workspace.tsx
@@ -1,5 +1,5 @@
 import { useState, useCallback, useContext, useEffect } from 'react';
-import { ScriptContext } from '@/contexts/script';
+import { ChatContext } from '@/contexts/chat';
 import {
   Modal,
   ModalContent,
@@ -17,8 +17,7 @@ interface WorkspaceProps {
 
 const Workspace = ({ onRestart }: WorkspaceProps) => {
   const [isOpen, setIsOpen] = useState(false);
-  const { workspace, setWorkspace, selectedThreadId } =
-    useContext(ScriptContext);
+  const { workspace, setWorkspace, selectedThreadId } = useContext(ChatContext);
   const [workspaceInput, setWorkspaceInput] = useState<string>('');
 
   useEffect(() => {
diff --git a/components/script/form.tsx b/components/chat/form.tsx
similarity index 100%
rename from components/script/form.tsx
rename to components/chat/form.tsx
diff --git a/components/script/messages.tsx b/components/chat/messages.tsx
similarity index 100%
rename from components/script/messages.tsx
rename to components/chat/messages.tsx
diff --git a/components/script/messages/calls.tsx b/components/chat/messages/calls.tsx
similarity index 100%
rename from components/script/messages/calls.tsx
rename to components/chat/messages/calls.tsx
diff --git a/components/script/messages/calls/stackTrace.tsx b/components/chat/messages/calls/stackTrace.tsx
similarity index 100%
rename from components/script/messages/calls/stackTrace.tsx
rename to components/chat/messages/calls/stackTrace.tsx
diff --git a/components/script/messages/confirmForm.tsx b/components/chat/messages/confirmForm.tsx
similarity index 100%
rename from components/script/messages/confirmForm.tsx
rename to components/chat/messages/confirmForm.tsx
diff --git a/components/script/messages/promptForm.tsx b/components/chat/messages/promptForm.tsx
similarity index 100%
rename from components/script/messages/promptForm.tsx
rename to components/chat/messages/promptForm.tsx
diff --git a/components/script/useChatSocket.tsx b/components/chat/useChatSocket.tsx
similarity index 100%
rename from components/script/useChatSocket.tsx
rename to components/chat/useChatSocket.tsx
diff --git a/components/edit/configure.tsx b/components/edit/configure.tsx
index 76d57d2f..15e4573f 100644
--- a/components/edit/configure.tsx
+++ b/components/edit/configure.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useContext } from 'react';
+import { useCallback, useContext, useState } from 'react';
 import RemoteImports from '@/components/edit/configure/imports';
 import Loading from '@/components/loading';
 import Models from '@/components/edit/configure/models';
@@ -20,14 +20,16 @@ import {
 import { PiToolboxBold } from 'react-icons/pi';
 import AssistantNotFound from '@/components/assistant-not-found';
 import { useRouter } from 'next/navigation';
+import { ChatContext } from '@/contexts/chat';
+import Chat from '@/components/chat';
 
 interface ConfigureProps {
   collapsed?: boolean;
-  className?: string;
 }
 
 const Configure: React.FC<ConfigureProps> = ({ collapsed }) => {
   const router = useRouter();
+
   const {
     root,
     setRoot,
@@ -41,6 +43,9 @@ const Configure: React.FC<ConfigureProps> = ({ collapsed }) => {
     dependencies,
     setDependencies,
   } = useContext(EditContext);
+  const { restartScript } = useContext(ChatContext);
+
+  const [updated, setUpdated] = useState<boolean>(false);
 
   const abbreviate = (name: string) => {
     const words = name.split(/(?=[A-Z])|[\s_-]/);
@@ -51,10 +56,15 @@ const Configure: React.FC<ConfigureProps> = ({ collapsed }) => {
   const setRootTools = useCallback(
     (newTools: string[]) => {
       setRoot({ ...root, tools: newTools });
+      setUpdated(true);
     },
     [root]
   );
 
+  const placeholderName = (): string => {
+    return root.name && root.name.length > 0 ? root.name : 'your assistant';
+  };
+
   if (loading)
     return <Loading>{`Loading your assistant's details...`}</Loading>;
 
@@ -62,135 +72,179 @@ const Configure: React.FC<ConfigureProps> = ({ collapsed }) => {
 
   return (
     <>
-      <div className="flex flex-col w-full justify-center items-center space-y-2 mb-6 mt-10">
-        <Tooltip
-          content={root.name || 'Unnamed Assistant'}
-          placement="bottom"
-          closeDelay={0.5}
-        >
-          <Avatar
-            showFallback
-            name={abbreviate(root.name || 'Unnamed Assistant')}
-            className="w-[40px] cursor-default"
-            classNames={{
-              base: 'bg-white p-6 text-sm border dark:border-none dark:bg-zinc-900',
-              name: 'text-lg text-default-600',
-            }}
-          />
-        </Tooltip>
-      </div>
-      <div className="px-2 flex flex-col space-y-4 mb-6">
-        <div className="relative">
-          <div className="absolute top-3 right-0 z-40">
-            <Visibility visibility={visibility} setVisibility={setVisibility} />
+      <div
+        className={`h-full overflow-auto w-full border-r-2 dark:border-zinc-800 p-6 ${collapsed ? '' : 'xl:px-20'}`}
+      >
+        <div className="flex flex-col w-full justify-center items-center space-y-2 mb-6 mt-10">
+          <Tooltip
+            content={root.name || 'Unnamed Assistant'}
+            placement="bottom"
+            closeDelay={0.5}
+          >
+            <Avatar
+              showFallback
+              name={abbreviate(root.name || 'Unnamed Assistant')}
+              className="w-[40px] cursor-default"
+              classNames={{
+                base: 'bg-white p-6 text-sm border dark:border-none dark:bg-zinc-900',
+                name: 'text-lg text-default-600',
+              }}
+            />
+          </Tooltip>
+        </div>
+        <div className="px-2 flex flex-col space-y-4 mb-6">
+          <div className="relative">
+            <div className="absolute top-3 right-0 z-40">
+              <Visibility
+                visibility={visibility}
+                setVisibility={setVisibility}
+              />
+            </div>
+            <Input
+              color="primary"
+              variant="bordered"
+              label="Name"
+              placeholder="Give your assistant a name..."
+              defaultValue={root.name}
+              onChange={(e) => setRoot({ ...root, name: e.target.value })}
+            />
           </div>
           <Input
             color="primary"
+            fullWidth
             variant="bordered"
-            label="Name"
-            placeholder="Give your assistant a name..."
-            defaultValue={root.name}
-            onChange={(e) => setRoot({ ...root, name: e.target.value })}
+            label="Description"
+            placeholder="Describe what your assistant does..."
+            defaultValue={root.description}
+            onChange={(e) => setRoot({ ...root, description: e.target.value })}
           />
-        </div>
-        <Input
-          color="primary"
-          fullWidth
-          variant="bordered"
-          label="Description"
-          placeholder="Describe what your assistant does..."
-          defaultValue={root.description}
-          onChange={(e) => setRoot({ ...root, description: e.target.value })}
-        />
-        <Textarea
-          color="primary"
-          fullWidth
-          maxRows={50}
-          variant="bordered"
-          label="Instructions"
-          placeholder="Give your assistant instructions on how to behave..."
-          defaultValue={root.instructions}
-          onChange={(e) => setRoot({ ...root, instructions: e.target.value })}
-        />
-        <Accordion isCompact fullWidth selectionMode="multiple">
-          <AccordionItem
-            aria-label="dynamic-instructions"
-            title={<h1>Dynamic Instructions</h1>}
-            startContent={<LuCircuitBoard />}
-            classNames={{ content: collapsed ? 'pt-6 pb-10' : 'p-10 pt-6' }}
-          >
-            <div className="flex bg-primary-50 rounded-xl p-4 mb-4 text-tiny italic text-primary-500 items-center space-x-4">
-              <GoLightBulb
-                className={`inline mb-1 text-sm ${collapsed ? 'w-[200px] ' : 'w-fit'} `}
+          <Textarea
+            color="primary"
+            fullWidth
+            maxRows={50}
+            variant="bordered"
+            label="Instructions"
+            placeholder="Give your assistant instructions on how to behave..."
+            defaultValue={root.instructions}
+            onChange={(e) => {
+              setRoot({ ...root, instructions: e.target.value });
+              setUpdated(true);
+            }}
+          />
+          <Accordion isCompact fullWidth selectionMode="multiple">
+            <AccordionItem
+              aria-label="dynamic-instructions"
+              title={<h1>Dynamic Instructions</h1>}
+              startContent={<LuCircuitBoard />}
+              classNames={{ content: collapsed ? 'pt-6 pb-10' : 'p-10 pt-6' }}
+            >
+              <div className="flex bg-primary-50 rounded-xl p-4 mb-4 text-tiny italic text-primary-500 items-center space-x-4">
+                <GoLightBulb
+                  className={`inline mb-1 text-sm ${collapsed ? 'w-[200px] ' : 'w-fit'} `}
+                />
+                <p>
+                  Augment your instructions with code that can pull information
+                  from local or remote systems.
+                </p>
+              </div>
+              <Code
+                code={dynamicInstructions}
+                onChange={(value: string) => {
+                  setDynamicInstructions(value);
+                  setUpdated(true);
+                }}
+                dependencies={
+                  dependencies.find((d) => d.forTool === 'dynamic-instructions')
+                    ?.content || ''
+                }
+                onDependenciesChange={(code, type) => {
+                  setDependencies([
+                    ...dependencies.filter(
+                      (d) => d.forTool !== 'dynamic-instructions'
+                    ),
+                    {
+                      forTool: 'dynamic-instructions',
+                      content: code,
+                      type: type,
+                    },
+                  ]);
+                  setUpdated(true);
+                }}
               />
-              <p>
-                Augment your instructions with code that can pull information
-                from local or remote systems.
-              </p>
-            </div>
-            <Code
-              code={dynamicInstructions}
-              onChange={setDynamicInstructions}
-              dependencies={
-                dependencies.find((d) => d.forTool === 'dynamic-instructions')
-                  ?.content || ''
-              }
-              onDependenciesChange={(code, type) =>
-                setDependencies([
-                  ...dependencies.filter(
-                    (d) => d.forTool !== 'dynamic-instructions'
-                  ),
-                  {
-                    forTool: 'dynamic-instructions',
-                    content: code,
-                    type: type,
-                  },
-                ])
-              }
-            />
-            {/* <div className="my-4"/>
-                        <Code label="Dependencies" code={'// package.json'} onChange={(code) => {}} /> */}
-          </AccordionItem>
-          <AccordionItem
-            aria-label="remote-tools"
-            title={<h1>Tools</h1>}
-            startContent={<PiToolboxBold />}
-            classNames={{ content: collapsed ? 'pt-6 pb-10' : 'p-10 pt-6' }}
-          >
-            <RemoteImports
-              tools={root.tools}
-              setTools={setRootTools}
-              collapsed={collapsed}
-            />
-          </AccordionItem>
-          <AccordionItem
-            aria-label="advanced"
-            title={<h1>Advanced</h1>}
-            startContent={<HiCog />}
-            classNames={{
-              content: collapsed
-                ? 'py-6 pt-10 h-[500px]'
-                : 'p-10 pt-6 h-[500px]',
+            </AccordionItem>
+            <AccordionItem
+              aria-label="remote-tools"
+              title={<h1>Tools</h1>}
+              startContent={<PiToolboxBold />}
+              classNames={{ content: collapsed ? 'pt-6 pb-10' : 'p-10 pt-6' }}
+            >
+              <RemoteImports
+                tools={root.tools}
+                setTools={setRootTools}
+                collapsed={collapsed}
+              />
+            </AccordionItem>
+            <AccordionItem
+              aria-label="advanced"
+              title={<h1>Advanced</h1>}
+              startContent={<HiCog />}
+              classNames={{
+                content: collapsed
+                  ? 'py-6 pt-10 h-[500px]'
+                  : 'p-10 pt-6 h-[500px]',
+              }}
+            >
+              <Models
+                options={models}
+                defaultValue={root.modelName}
+                onChange={(model) => {
+                  setRoot({ ...root, modelName: model });
+                  if (root.modelName != model) setUpdated(true);
+                }}
+              />
+            </AccordionItem>
+          </Accordion>
+        </div>
+        <div className="w-full justify-end items-center px-2 flex gap-2 mb-6">
+          <Button
+            color="primary"
+            onClick={() => {
+              router.push('/build');
             }}
           >
-            <Models
-              options={models}
-              defaultValue={root.modelName}
-              onChange={(model) => setRoot({ ...root, modelName: model })}
-            />
-          </AccordionItem>
-        </Accordion>
-      </div>
-      <div className="w-full justify-end px-2 flex space-y-4 mb-6">
-        <Button
-          color="primary"
-          onClick={() => {
-            router.push('/build');
-          }}
-        >
-          Finish
-        </Button>
+            Back
+          </Button>
+
+          <span className="relative inline-flex">
+            <Button
+              color="primary"
+              onClick={() => {
+                restartScript();
+                setUpdated(false);
+              }}
+            >
+              Refresh Chat
+            </Button>
+            {updated && (
+              <span className="absolute flex h-3 w-3 top-0 right-0 -mt-1 -mr-1">
+                <span className="animate-ping-thrice absolute inline-flex h-full w-full rounded-full bg-warning-400 opacity-75"></span>
+                <span className="relative inline-flex rounded-full h-2 w-2 bg-warning-500 m-auto"></span>
+              </span>
+            )}
+          </span>
+        </div>
       </div>
+      <Chat
+        messagesHeight="h-[93%]"
+        className={`p-6 overflow-auto ${collapsed ? 'col-span-3 px-32' : ''}`}
+        disableInput={updated}
+        disableCommands={true}
+        inputPlaceholder={
+          !updated
+            ? `Chat with ${placeholderName()}`
+            : `Click "Refresh Chat" to chat with the updated version of ${placeholderName()}`
+        }
+      />
     </>
   );
 };
diff --git a/components/edit/configure/customTool.tsx b/components/edit/configure/customTool.tsx
index 6b0a93d0..ba0737e5 100644
--- a/components/edit/configure/customTool.tsx
+++ b/components/edit/configure/customTool.tsx
@@ -3,7 +3,7 @@ import { Tool, Property } from '@gptscript-ai/gptscript';
 import Params from '@/components/edit/configure/params';
 import Models from '@/components/edit/configure/models';
 import Imports from '@/components/edit/configure/imports';
-import Script from '@/components/script';
+import Chat from '@/components/chat';
 import Code from '@/components/edit/configure/code';
 import {
   Textarea,
@@ -23,7 +23,7 @@ import {
 import { EditContext } from '@/contexts/edit';
 import { GoCode, GoPencil, GoTools, GoTrash } from 'react-icons/go';
 import { LuWrench, LuMessageSquare } from 'react-icons/lu';
-import { ScriptContextProvider } from '@/contexts/script';
+import { ChatContextProvider } from '@/contexts/chat';
 import { HiCog } from 'react-icons/hi2';
 import PropTypes from 'prop-types';
 
@@ -379,14 +379,14 @@ const CustomTool: React.FC<ConfigureProps> = ({ tool }) => {
                 </div>
               </div>
               <div className="h-full overflow-y-auto">
-                <ScriptContextProvider
+                <ChatContextProvider
                   initialScript={scriptPath}
                   enableThread={false}
                   initialSubTool={customTool.name}
                   initialScriptId={`${scriptId}`}
                 >
-                  <Script messagesHeight="h-[93%]" />
-                </ScriptContextProvider>
+                  <Chat messagesHeight="h-[93%]" />
+                </ChatContextProvider>
               </div>
             </ModalBody>
           </ModalContent>
diff --git a/components/threads.tsx b/components/threads.tsx
index 16076d97..82f68a4f 100644
--- a/components/threads.tsx
+++ b/components/threads.tsx
@@ -3,7 +3,7 @@ import New from './threads/new';
 import Menu from './threads/menu';
 import { Button, Divider, Tooltip } from '@nextui-org/react';
 import { GoSidebarExpand, GoSidebarCollapse } from 'react-icons/go';
-import { ScriptContext } from '@/contexts/script';
+import { ChatContext } from '@/contexts/chat';
 
 interface ThreadsProps {
   className?: string;
@@ -18,7 +18,7 @@ const Threads: React.FC<ThreadsProps> = () => {
     setScriptId,
     selectedThreadId,
     setSelectedThreadId,
-  } = useContext(ScriptContext);
+  } = useContext(ChatContext);
 
   const [isCollapsed, setIsCollapsed] = useState(false);
 
diff --git a/components/threads/menu.tsx b/components/threads/menu.tsx
index c51eab00..43db9d46 100644
--- a/components/threads/menu.tsx
+++ b/components/threads/menu.tsx
@@ -15,7 +15,7 @@ import {
 } from '@nextui-org/react';
 import { deleteThread, renameThread, Thread } from '@/actions/threads';
 import { GoPencil, GoTrash, GoKebabHorizontal } from 'react-icons/go';
-import { ScriptContext } from '@/contexts/script';
+import { ChatContext } from '@/contexts/chat';
 import { Input } from '@nextui-org/input';
 
 interface NewThreadProps {
@@ -26,7 +26,7 @@ interface NewThreadProps {
 const NewThread = ({ className, thread }: NewThreadProps) => {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
   const { isOpen, onOpen, onClose } = useDisclosure();
-  const { setThreads } = useContext(ScriptContext);
+  const { setThreads } = useContext(ChatContext);
   const [threadNameInput, setThreadNameInput] = useState('');
 
   const handleDeleteThread = () => {
diff --git a/components/threads/new.tsx b/components/threads/new.tsx
index 15064cee..7e40d70d 100644
--- a/components/threads/new.tsx
+++ b/components/threads/new.tsx
@@ -8,7 +8,7 @@ import {
 } from '@nextui-org/react';
 import { createThread, Thread } from '@/actions/threads';
 import { useEffect, useState, useContext } from 'react';
-import { ScriptContext } from '@/contexts/script';
+import { ChatContext } from '@/contexts/chat';
 import { GoPlus } from 'react-icons/go';
 import { getScripts, Script } from '@/actions/me/scripts';
 import { setWorkspaceDir } from '@/actions/workspace';
@@ -24,7 +24,7 @@ const NewThread = ({ className }: NewThreadProps) => {
   const [isOpen, setIsOpen] = useState(false);
   const { me } = useContext(AuthContext);
   const { setThread, setSelectedThreadId, setScript, setThreads, setScriptId } =
-    useContext(ScriptContext);
+    useContext(ChatContext);
 
   const fetchScripts = async () => {
     setScripts([]);
diff --git a/contexts/script.tsx b/contexts/chat.tsx
similarity index 95%
rename from contexts/script.tsx
rename to contexts/chat.tsx
index 792c190d..94539709 100644
--- a/contexts/script.tsx
+++ b/contexts/chat.tsx
@@ -1,6 +1,6 @@
 import { createContext, useState, useEffect, useCallback, useRef } from 'react';
-import useChatSocket from '@/components/script/useChatSocket';
-import { Message } from '@/components/script/messages';
+import useChatSocket from '@/components/chat/useChatSocket';
+import { Message } from '@/components/chat/messages';
 import { Block, Tool, ToolDef } from '@gptscript-ai/gptscript';
 import { Socket } from 'socket.io-client';
 import { getThreads, getThread, Thread, createThread } from '@/actions/threads';
@@ -9,7 +9,7 @@ import { rootTool } from '@/actions/gptscript';
 import debounce from 'lodash/debounce';
 import { getWorkspaceDir } from '@/actions/workspace';
 
-interface ScriptContextProps {
+interface ChatContextProps {
   children: React.ReactNode;
   initialScript: string;
   initialSubTool?: string;
@@ -17,7 +17,7 @@ interface ScriptContextProps {
   enableThread?: boolean;
 }
 
-interface ScriptContextState {
+interface ChatContextState {
   script: string;
   scriptId?: string;
   scriptDisplayName?: string;
@@ -67,10 +67,8 @@ interface ScriptContextState {
 
 const defaultScriptName = `Tildy`;
 
-const ScriptContext = createContext<ScriptContextState>(
-  {} as ScriptContextState
-);
-const ScriptContextProvider: React.FC<ScriptContextProps> = ({
+const ChatContext = createContext<ChatContextState>({} as ChatContextState);
+const ChatContextProvider: React.FC<ChatContextProps> = ({
   children,
   initialScript,
   initialSubTool,
@@ -311,7 +309,7 @@ const ScriptContextProvider: React.FC<ScriptContextProps> = ({
   );
 
   return (
-    <ScriptContext.Provider
+    <ChatContext.Provider
       value={{
         scriptContent,
         scriptDisplayName,
@@ -360,8 +358,8 @@ const ScriptContextProvider: React.FC<ScriptContextProps> = ({
       }}
     >
       {children}
-    </ScriptContext.Provider>
+    </ChatContext.Provider>
   );
 };
 
-export { ScriptContext, ScriptContextProvider };
+export { ChatContext, ChatContextProvider };
diff --git a/tailwind.config.js b/tailwind.config.js
index 679ac66b..09793532 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -8,7 +8,18 @@ module.exports = {
     './node_modules/@nextui-org/theme/dist/**/*.{js,ts,jsx,tsx}',
   ],
   theme: {
-    extend: {},
+    extend: {
+      keyframes: {
+        'ping-thrice': {
+          '0%': { transform: 'scale(1)', opacity: '1' },
+          '75%': { transform: 'scale(2)', opacity: '0' },
+          '100%': { transform: 'scale(2)', opacity: '0' },
+        },
+      },
+      animation: {
+        'ping-thrice': 'ping-thrice 1.5s cubic-bezier(0, 0, 0.2, 1) 3 forwards',
+      },
+    },
   },
   darkMode: 'class',
   plugins: [nextui(), require('@tailwindcss/typography')],