diff --git a/apps/studio/src/lib/editor/engine/chat/context.ts b/apps/studio/src/lib/editor/engine/chat/context.ts
index 8a755ae43..9be3acea4 100644
--- a/apps/studio/src/lib/editor/engine/chat/context.ts
+++ b/apps/studio/src/lib/editor/engine/chat/context.ts
@@ -7,6 +7,7 @@ import {
     type HighlightMessageContext,
     type ImageMessageContext,
     type ProjectMessageContext,
+    type TerminalMessageContext,
 } from '@onlook/models/chat';
 import type { DomElement } from '@onlook/models/element';
 import type { ParsedError } from '@onlook/utility';
@@ -44,7 +45,14 @@ export class ChatContext {
         const fileContext = await this.getFileContext(fileNames);
         const imageContext = await this.getImageContext();
         const projectContext = await this.getProjectContext();
-        const context = [...fileContext, ...highlightedContext, ...imageContext, ...projectContext];
+        const terminalContext = await this.getTerminalContext();
+        const context = [
+            ...fileContext,
+            ...highlightedContext,
+            ...imageContext,
+            ...projectContext,
+            ...terminalContext,
+        ];
         return context;
     }
 
@@ -72,6 +80,13 @@ export class ChatContext {
         return fileContext;
     }
 
+    private async getTerminalContext(): Promise<TerminalMessageContext[]> {
+        const terminalContext = this.context.filter(
+            (context) => context.type === MessageContextType.TERMINAL,
+        );
+        return terminalContext;
+    }
+
     private async getHighlightedContext(
         selected: DomElement[],
         fileNames: Set<string>,
@@ -111,6 +126,26 @@ export class ChatContext {
         this.context = [];
     }
 
+    async addTerminalContext() {
+        const terminalContent = await this.getTerminalContent();
+        if (terminalContent) {
+            this.context = this.context.filter((ctx) => ctx.type !== MessageContextType.TERMINAL);
+            this.context.push(terminalContent);
+        }
+    }
+
+    async getTerminalContent(): Promise<TerminalMessageContext | null> {
+        const output = await this.editorEngine.getTerminalOutput();
+        if (!output) {
+            return null;
+        }
+        return {
+            type: MessageContextType.TERMINAL,
+            content: output,
+            displayName: 'Terminal',
+        };
+    }
+
     async addScreenshotContext() {
         const screenshot = await this.getScreenshotContext();
         if (screenshot) {
diff --git a/apps/studio/src/lib/editor/engine/index.ts b/apps/studio/src/lib/editor/engine/index.ts
index 617d06822..6dfa70cfc 100644
--- a/apps/studio/src/lib/editor/engine/index.ts
+++ b/apps/studio/src/lib/editor/engine/index.ts
@@ -350,6 +350,18 @@ export class EditorEngine {
         };
     }
 
+    async getTerminalOutput(): Promise<string | null> {
+        try {
+            if (!this.projectsManager.runner) {
+                return null;
+            }
+            const history = await this.projectsManager.runner.getHistory();
+            return history || null;
+        } catch (error) {
+            console.error('Failed to get terminal output:', error);
+            return null;
+        }
+    }
     canDeleteWindow() {
         return this.canvas.frames.length > 1;
     }
diff --git a/apps/studio/src/routes/editor/EditPanel/ChatTab/ChatInput.tsx b/apps/studio/src/routes/editor/EditPanel/ChatTab/ChatInput.tsx
index 7b632be68..5645d4dae 100644
--- a/apps/studio/src/routes/editor/EditPanel/ChatTab/ChatInput.tsx
+++ b/apps/studio/src/routes/editor/EditPanel/ChatTab/ChatInput.tsx
@@ -420,6 +420,33 @@ export const ChatInput = observer(() => {
                             </TooltipContent>
                         </TooltipPortal>
                     </Tooltip>
+                    <Tooltip>
+                        <TooltipTrigger asChild>
+                            <Button
+                                variant={'ghost'}
+                                size={'icon'}
+                                className="w-9 h-9 text-foreground-tertiary group hover:bg-transparent"
+                                onClick={() => {
+                                    editorEngine.chat.context.addTerminalContext();
+                                }}
+                                disabled={disabled}
+                            >
+                                <Icons.Terminal
+                                    className={cn(
+                                        'w-5 h-5',
+                                        disabled
+                                            ? 'text-foreground-tertiary'
+                                            : 'group-hover:text-foreground',
+                                    )}
+                                />
+                            </Button>
+                        </TooltipTrigger>
+                        <TooltipPortal>
+                            <TooltipContent side="top" sideOffset={5}>
+                                {disabled ? 'Select an element to start' : 'Add terminal output'}
+                            </TooltipContent>
+                        </TooltipPortal>
+                    </Tooltip>
                     <Button
                         variant={'outline'}
                         className="w-fit h-fit py-0.5 px-2.5 text-foreground-tertiary hidden"
diff --git a/apps/studio/src/routes/editor/EditPanel/ChatTab/ContextPills/helpers.tsx b/apps/studio/src/routes/editor/EditPanel/ChatTab/ContextPills/helpers.tsx
index 8a3ba0fd0..1969d82a7 100644
--- a/apps/studio/src/routes/editor/EditPanel/ChatTab/ContextPills/helpers.tsx
+++ b/apps/studio/src/routes/editor/EditPanel/ChatTab/ContextPills/helpers.tsx
@@ -35,6 +35,9 @@ export function getContextIcon(context: ChatMessageContext) {
         case MessageContextType.PROJECT:
             icon = Icons.Cube;
             break;
+        case MessageContextType.TERMINAL:
+            icon = Icons.Terminal;
+            break;
         default:
             assertNever(context);
     }
diff --git a/packages/models/src/chat/message/context.ts b/packages/models/src/chat/message/context.ts
index 868bda821..4a6764d0c 100644
--- a/packages/models/src/chat/message/context.ts
+++ b/packages/models/src/chat/message/context.ts
@@ -4,6 +4,7 @@ export enum MessageContextType {
     IMAGE = 'image',
     ERROR = 'error',
     PROJECT = 'project',
+    TERMINAL = 'terminal',
 }
 
 type BaseMessageContext = {
@@ -38,9 +39,16 @@ export type ProjectMessageContext = BaseMessageContext & {
     path: string;
 };
 
+export type TerminalMessageContext = BaseMessageContext & {
+    type: MessageContextType.TERMINAL;
+    content: string;
+    displayName: string;
+};
+
 export type ChatMessageContext =
     | FileMessageContext
     | HighlightMessageContext
     | ImageMessageContext
     | ErrorMessageContext
-    | ProjectMessageContext;
+    | ProjectMessageContext
+    | TerminalMessageContext;