From f310fab397c094cd3ed402d0abfca831b6ae6988 Mon Sep 17 00:00:00 2001
From: 7418 <7418@openclaw.ai>
Date: Sat, 7 Feb 2026 00:18:52 +0800
Subject: [PATCH] fix: scroll bouncing during streaming and skills/cwd
 awareness

1. Change StickToBottom resize mode from "smooth" to "instant" to
   prevent scroll position bouncing when new streaming content
   arrives faster than the smooth animation completes.

2. Use SDK's preset append mode for system prompts instead of
   replacing Claude Code's default prompt. This preserves Claude
   Code's built-in awareness of skills (.claude/commands/), working
   directory context, and other default behaviors.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/components/ai-elements/conversation.tsx | 2 +-
 src/lib/claude-client.ts                    | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/ai-elements/conversation.tsx b/src/components/ai-elements/conversation.tsx
index 2769028..e01a06e 100644
--- a/src/components/ai-elements/conversation.tsx
+++ b/src/components/ai-elements/conversation.tsx
@@ -14,7 +14,7 @@ export const Conversation = ({ className, ...props }: ConversationProps) => (
   <StickToBottom
     className={cn("relative flex-1 overflow-y-hidden", className)}
     initial="smooth"
-    resize="smooth"
+    resize="instant"
     role="log"
     {...props}
   />
diff --git a/src/lib/claude-client.ts b/src/lib/claude-client.ts
index 09b4d95..3ad0be4 100644
--- a/src/lib/claude-client.ts
+++ b/src/lib/claude-client.ts
@@ -166,7 +166,13 @@ export function streamClaude(options: ClaudeStreamOptions): ReadableStream<strin
         }
 
         if (systemPrompt) {
-          queryOptions.systemPrompt = systemPrompt;
+          // Use preset append mode to keep Claude Code's default system prompt
+          // (which includes skills, working directory awareness, etc.)
+          queryOptions.systemPrompt = {
+            type: 'preset',
+            preset: 'claude_code',
+            append: systemPrompt,
+          };
         }
 
         if (mcpServers && Object.keys(mcpServers).length > 0) {