diff --git a/frontend/app/aipanel/aipanelinput.tsx b/frontend/app/aipanel/aipanelinput.tsx
index 0dad5e4d5..6eb8aff63 100644
--- a/frontend/app/aipanel/aipanelinput.tsx
+++ b/frontend/app/aipanel/aipanelinput.tsx
@@ -17,6 +17,7 @@ interface AIPanelInputProps {
 export interface AIPanelInputRef {
     focus: () => void;
     resize: () => void;
+    scrollToBottom: () => void;
 }
 
 export const AIPanelInput = memo(({ onSubmit, status, model }: AIPanelInputProps) => {
@@ -43,6 +44,12 @@ export const AIPanelInput = memo(({ onSubmit, status, model }: AIPanelInputProps
                     textareaRef.current?.focus();
                 },
                 resize: resizeTextarea,
+                scrollToBottom: () => {
+                    const textarea = textareaRef.current;
+                    if (textarea) {
+                        textarea.scrollTop = textarea.scrollHeight;
+                    }
+                },
             },
         };
         model.registerInputRef(inputRefObject);
diff --git a/frontend/app/aipanel/waveai-model.tsx b/frontend/app/aipanel/waveai-model.tsx
index 258bdf9de..7af0914e8 100644
--- a/frontend/app/aipanel/waveai-model.tsx
+++ b/frontend/app/aipanel/waveai-model.tsx
@@ -301,7 +301,7 @@ export class WaveAIModel {
         return input != null && input.trim().length > 0;
     }
 
-    appendText(text: string, newLine?: boolean) {
+    appendText(text: string, newLine?: boolean, opts?: { scrollToBottom?: boolean }) {
         const currentInput = globalStore.get(this.inputAtom);
         let newInput = currentInput;
 
@@ -317,6 +317,10 @@ export class WaveAIModel {
 
         newInput += text;
         globalStore.set(this.inputAtom, newInput);
+
+        if (opts?.scrollToBottom && this.inputRef?.current) {
+            setTimeout(() => this.inputRef.current.scrollToBottom(), 10);
+        }
     }
 
     setModel(model: string) {
diff --git a/frontend/builder/builder-buildpanel.tsx b/frontend/builder/builder-buildpanel.tsx
index 1ce2dc7ac..59f0a8815 100644
--- a/frontend/builder/builder-buildpanel.tsx
+++ b/frontend/builder/builder-buildpanel.tsx
@@ -82,7 +82,24 @@ const BuilderBuildPanel = memo(() => {
         BuilderAppPanelModel.getInstance().restartBuilder();
     }, []);
 
-    const filteredLines = showDebug ? outputLines : outputLines.filter((line) => !line.startsWith("[debug]") && line.trim().length > 0);
+    const handleSendToAI = useCallback(() => {
+        const currentShowDebug = globalStore.get(model.showDebug);
+        const currentOutputLines = globalStore.get(model.outputLines);
+        const filtered = currentShowDebug
+            ? currentOutputLines
+            : currentOutputLines.filter((line) => !line.startsWith("[debug]") && line.trim().length > 0);
+
+        const linesToSend = filtered.slice(-200);
+        const text = linesToSend.join("\n");
+        const aiModel = WaveAIModel.getInstance();
+        const formattedText = `from builder output:\n\`\`\`\n${text}\n\`\`\`\n`;
+        aiModel.appendText(formattedText, true, { scrollToBottom: true });
+        aiModel.focusInput();
+    }, [model]);
+
+    const filteredLines = showDebug
+        ? outputLines
+        : outputLines.filter((line) => !line.startsWith("[debug]") && line.trim().length > 0);
 
     return (
         <div className="w-full h-full flex flex-col bg-black rounded-br-2">
@@ -98,6 +115,12 @@ const BuilderBuildPanel = memo(() => {
                         />
                         Debug
                     </label>
+                    <button
+                        className="px-3 py-1 text-sm font-medium rounded transition-colors bg-accent/80 text-white hover:bg-accent cursor-pointer"
+                        onClick={handleSendToAI}
+                    >
+                        Send Output to AI
+                    </button>
                     <button
                         className="px-3 py-1 text-sm font-medium rounded transition-colors bg-accent/80 text-white hover:bg-accent cursor-pointer"
                         onClick={handleRestart}
diff --git a/frontend/builder/tabs/builder-configdatatab.tsx b/frontend/builder/tabs/builder-configdatatab.tsx
index 51a641ddd..cd0c75f6f 100644
--- a/frontend/builder/tabs/builder-configdatatab.tsx
+++ b/frontend/builder/tabs/builder-configdatatab.tsx
@@ -69,6 +69,7 @@ const BuilderConfigDataTab = memo(() => {
     const model = BuilderAppPanelModel.getInstance();
     const builderStatus = useAtomValue(model.builderStatusAtom);
     const builderId = useAtomValue(atoms.builderId);
+    const activeTab = useAtomValue(model.activeTab);
     const [state, setState] = useState<ConfigDataState>({
         config: null,
         data: null,
@@ -144,9 +145,9 @@ const BuilderConfigDataTab = memo(() => {
     }, [state.data]);
 
     useEffect(() => {
-        if (isRunning) {
+        if (activeTab === "configdata" && isRunning) {
             fetchData();
-        } else {
+        } else if (!isRunning) {
             setState({
                 config: null,
                 data: null,
@@ -154,7 +155,7 @@ const BuilderConfigDataTab = memo(() => {
                 isLoading: false,
             });
         }
-    }, [isRunning, fetchData]);
+    }, [activeTab, isRunning, fetchData]);
 
     if (!isRunning) {
         return <NotRunningView />;
diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts
index 71cb98225..8b80fe62a 100644
--- a/frontend/types/gotypes.d.ts
+++ b/frontend/types/gotypes.d.ts
@@ -1220,6 +1220,8 @@ declare global {
         "count:views"?: {[key: string]: number};
         "waveai:apitype"?: string;
         "waveai:model"?: string;
+        "waveai:chatid"?: string;
+        "waveai:stepnum"?: number;
         "waveai:inputtokens"?: number;
         "waveai:outputtokens"?: number;
         "waveai:nativewebsearchcount"?: number;
diff --git a/pkg/aiusechat/anthropic/anthropic-convertmessage.go b/pkg/aiusechat/anthropic/anthropic-convertmessage.go
index f49ef3f2f..0daf9f99b 100644
--- a/pkg/aiusechat/anthropic/anthropic-convertmessage.go
+++ b/pkg/aiusechat/anthropic/anthropic-convertmessage.go
@@ -72,18 +72,32 @@ func buildAnthropicHTTPRequest(ctx context.Context, msgs []anthropicInputMessage
 		}
 	}
 
-	// inject chatOpts.AppGoFile as a "text" block at the END of the LAST "user" message found (append to Content)
-	if chatOpts.AppGoFile != "" {
+	// inject chatOpts.PlatformInfo, AppStaticFiles, and AppGoFile as "text" blocks at the END of the LAST "user" message found (append to Content)
+	if chatOpts.PlatformInfo != "" || chatOpts.AppStaticFiles != "" || chatOpts.AppGoFile != "" {
 		// Find the last "user" message
 		for i := len(convertedMsgs) - 1; i >= 0; i-- {
 			if convertedMsgs[i].Role == "user" {
-				// Create a text block with the AppGoFile content wrapped in XML tag
-				appGoFileBlock := anthropicMessageContentBlock{
-					Type: "text",
-					Text: "<CurrentAppGoFile>\n" + chatOpts.AppGoFile + "\n</CurrentAppGoFile>",
+				if chatOpts.PlatformInfo != "" {
+					platformInfoBlock := anthropicMessageContentBlock{
+						Type: "text",
+						Text: "<PlatformInfo>\n" + chatOpts.PlatformInfo + "\n</PlatformInfo>",
+					}
+					convertedMsgs[i].Content = append(convertedMsgs[i].Content, platformInfoBlock)
+				}
+				if chatOpts.AppStaticFiles != "" {
+					appStaticFilesBlock := anthropicMessageContentBlock{
+						Type: "text",
+						Text: "<CurrentAppStaticFiles>\n" + chatOpts.AppStaticFiles + "\n</CurrentAppStaticFiles>",
+					}
+					convertedMsgs[i].Content = append(convertedMsgs[i].Content, appStaticFilesBlock)
+				}
+				if chatOpts.AppGoFile != "" {
+					appGoFileBlock := anthropicMessageContentBlock{
+						Type: "text",
+						Text: "<CurrentAppGoFile>\n" + chatOpts.AppGoFile + "\n</CurrentAppGoFile>",
+					}
+					convertedMsgs[i].Content = append(convertedMsgs[i].Content, appGoFileBlock)
 				}
-				// Append to the Content of this message
-				convertedMsgs[i].Content = append(convertedMsgs[i].Content, appGoFileBlock)
 				break
 			}
 		}
diff --git a/pkg/aiusechat/openai/openai-convertmessage.go b/pkg/aiusechat/openai/openai-convertmessage.go
index 83cfc7770..156c63588 100644
--- a/pkg/aiusechat/openai/openai-convertmessage.go
+++ b/pkg/aiusechat/openai/openai-convertmessage.go
@@ -218,6 +218,9 @@ func buildOpenAIHTTPRequest(ctx context.Context, inputs []any, chatOpts uctypes.
 	if chatOpts.TabState != "" {
 		appendToLastUserMessage(inputs, chatOpts.TabState)
 	}
+	if chatOpts.PlatformInfo != "" {
+		appendToLastUserMessage(inputs, "<PlatformInfo>\n"+chatOpts.PlatformInfo+"\n</PlatformInfo>")
+	}
 	if chatOpts.AppStaticFiles != "" {
 		appendToLastUserMessage(inputs, "<CurrentAppStaticFiles>\n"+chatOpts.AppStaticFiles+"\n</CurrentAppStaticFiles>")
 	}
diff --git a/pkg/aiusechat/uctypes/usechat-types.go b/pkg/aiusechat/uctypes/usechat-types.go
index fc825fbdc..4154ceacf 100644
--- a/pkg/aiusechat/uctypes/usechat-types.go
+++ b/pkg/aiusechat/uctypes/usechat-types.go
@@ -449,7 +449,7 @@ type WaveChatOpts struct {
 	Tools                []ToolDefinition
 	SystemPrompt         []string
 	TabStateGenerator    func() (string, []ToolDefinition, string, error)
-	BuilderAppGenerator  func() (string, string, error)
+	BuilderAppGenerator  func() (string, string, string, error)
 	WidgetAccess         bool
 	RegisterToolApproval func(string)
 	AllowNativeWebSearch bool
@@ -462,6 +462,7 @@ type WaveChatOpts struct {
 	TabId          string
 	AppGoFile      string
 	AppStaticFiles string
+	PlatformInfo   string
 }
 
 func (opts *WaveChatOpts) GetToolDefinition(toolName string) *ToolDefinition {
diff --git a/pkg/aiusechat/usechat.go b/pkg/aiusechat/usechat.go
index 5263ad28f..e5866bcaf 100644
--- a/pkg/aiusechat/usechat.go
+++ b/pkg/aiusechat/usechat.go
@@ -11,6 +11,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"os/user"
 	"strings"
 	"sync"
 	"time"
@@ -411,10 +412,11 @@ func RunAIChat(ctx context.Context, sseHandler *sse.SSEHandlerCh, backend UseCha
 			}
 		}
 		if chatOpts.BuilderAppGenerator != nil {
-			appGoFile, appStaticFiles, appErr := chatOpts.BuilderAppGenerator()
+			appGoFile, appStaticFiles, platformInfo, appErr := chatOpts.BuilderAppGenerator()
 			if appErr == nil {
 				chatOpts.AppGoFile = appGoFile
 				chatOpts.AppStaticFiles = appStaticFiles
+				chatOpts.PlatformInfo = platformInfo
 			}
 		}
 		stopReason, rtnMessage, err := runAIChatStep(ctx, sseHandler, backend, chatOpts, cont)
@@ -689,7 +691,7 @@ func WaveAIPostMessageHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if req.BuilderAppId != "" {
-		chatOpts.BuilderAppGenerator = func() (string, string, error) {
+		chatOpts.BuilderAppGenerator = func() (string, string, string, error) {
 			return generateBuilderAppData(req.BuilderAppId)
 		}
 	}
@@ -830,7 +832,7 @@ type StaticFileInfo struct {
 	ModifiedTime string `json:"modified_time"`
 }
 
-func generateBuilderAppData(appId string) (string, string, error) {
+func generateBuilderAppData(appId string) (string, string, string, error) {
 	appGoFile := ""
 	fileData, err := waveappstore.ReadAppFile(appId, "app.go")
 	if err == nil {
@@ -860,5 +862,12 @@ func generateBuilderAppData(appId string) (string, string, error) {
 		}
 	}
 
-	return appGoFile, staticFilesJSON, nil
+	platformInfo := wavebase.GetSystemSummary()
+	if currentUser, userErr := user.Current(); userErr == nil && currentUser.Username != "" {
+		platformInfo = fmt.Sprintf("Local Machine: %s, User: %s", platformInfo, currentUser.Username)
+	} else {
+		platformInfo = fmt.Sprintf("Local Machine: %s", platformInfo)
+	}
+
+	return appGoFile, staticFilesJSON, platformInfo, nil
 }
diff --git a/pkg/buildercontroller/buildercontroller.go b/pkg/buildercontroller/buildercontroller.go
index 543352867..fd12898e8 100644
--- a/pkg/buildercontroller/buildercontroller.go
+++ b/pkg/buildercontroller/buildercontroller.go
@@ -261,6 +261,19 @@ func (bc *BuilderController) buildAndRun(ctx context.Context, appId string, buil
 		return
 	}
 
+	process, err := bc.runBuilderApp(ctx, appId, cachePath, builderEnv)
+	if err != nil {
+		bc.handleBuildError(fmt.Errorf("failed to run app: %w", err), resultCh)
+		return
+	}
+
+	bc.lock.Lock()
+	bc.process = process
+	bc.setStatus_nolock(BuilderStatus_Running, process.Port, 0, "")
+	bc.lock.Unlock()
+
+	time.Sleep(1 * time.Second)
+
 	if resultCh != nil {
 		buildOutput := ""
 		if bc.outputBuffer != nil {
@@ -276,17 +289,6 @@ func (bc *BuilderController) buildAndRun(ctx context.Context, appId string, buil
 		}
 	}
 
-	process, err := bc.runBuilderApp(ctx, appId, cachePath, builderEnv)
-	if err != nil {
-		bc.handleBuildError(fmt.Errorf("failed to run app: %w", err), resultCh)
-		return
-	}
-
-	bc.lock.Lock()
-	bc.process = process
-	bc.setStatus_nolock(BuilderStatus_Running, process.Port, 0, "")
-	bc.lock.Unlock()
-
 	go func() {
 		<-process.WaitCh
 		bc.lock.Lock()