diff --git a/frontend/src/components/ai/AIChatComposerActions.tsx b/frontend/src/components/ai/AIChatComposerActions.tsx
new file mode 100644
index 0000000..14dc92f
--- /dev/null
+++ b/frontend/src/components/ai/AIChatComposerActions.tsx
@@ -0,0 +1,152 @@
+import React from 'react';
+import { Button, Tooltip } from 'antd';
+import { CodeOutlined, PictureOutlined, SendOutlined, StopOutlined, TableOutlined } from '@ant-design/icons';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+interface AIChatComposerActionsProps {
+  variant: 'legacy' | 'v2';
+  input: string;
+  draftImageCount: number;
+  sending: boolean;
+  darkMode: boolean;
+  textColor: string;
+  mutedColor: string;
+  overlayTheme: OverlayWorkbenchTheme;
+  fileInputRef: React.RefObject<HTMLInputElement>;
+  onImageUpload: React.ChangeEventHandler<HTMLInputElement>;
+  onOpenContext: () => void;
+  onOpenSlashMenu?: () => void;
+  onSend: () => void;
+  onStop: () => void;
+}
+
+const buttonIconStyle = { fontSize: 16 };
+
+const AIChatComposerActions: React.FC<AIChatComposerActionsProps> = ({
+  variant,
+  input,
+  draftImageCount,
+  sending,
+  darkMode,
+  textColor,
+  mutedColor,
+  overlayTheme,
+  fileInputRef,
+  onImageUpload,
+  onOpenContext,
+  onOpenSlashMenu,
+  onSend,
+  onStop,
+}) => {
+  const canSend = input.trim().length > 0 || draftImageCount > 0;
+  const isV2 = variant === 'v2';
+  const legacyIconButtonStyle: React.CSSProperties = {
+    color: overlayTheme.mutedText,
+    border: 'none',
+    background: 'transparent',
+    padding: '0 4px',
+    height: 26,
+  };
+  const v2IconButtonStyle: React.CSSProperties = {
+    color: overlayTheme.mutedText,
+    border: 'none',
+    background: 'transparent',
+  };
+
+  return (
+    <div
+      className={isV2 ? 'gn-v2-ai-input-actions' : undefined}
+      style={isV2 ? undefined : { display: 'flex', gap: 6, alignItems: 'center', flexShrink: 0 }}
+    >
+      <input
+        type="file"
+        accept="image/*"
+        multiple
+        ref={fileInputRef}
+        style={{ display: 'none' }}
+        onChange={onImageUpload}
+      />
+      <Tooltip title="上传图片/截图">
+        <Button
+          type="text"
+          icon={<PictureOutlined style={isV2 ? undefined : buttonIconStyle} />}
+          onClick={() => fileInputRef.current?.click()}
+          style={isV2 ? v2IconButtonStyle : legacyIconButtonStyle}
+          onMouseEnter={isV2 ? undefined : (event) => { event.currentTarget.style.color = textColor; }}
+          onMouseLeave={isV2 ? undefined : (event) => { event.currentTarget.style.color = overlayTheme.mutedText; }}
+        />
+      </Tooltip>
+      <Tooltip title="关联附带数据库表上下文">
+        <Button
+          type="text"
+          icon={<TableOutlined style={isV2 ? undefined : buttonIconStyle} />}
+          onClick={onOpenContext}
+          style={isV2 ? v2IconButtonStyle : legacyIconButtonStyle}
+          onMouseEnter={isV2 ? undefined : (event) => { event.currentTarget.style.color = textColor; }}
+          onMouseLeave={isV2 ? undefined : (event) => { event.currentTarget.style.color = overlayTheme.mutedText; }}
+        />
+      </Tooltip>
+      {isV2 && (
+        <Tooltip title="快捷命令">
+          <Button
+            type="text"
+            icon={<CodeOutlined />}
+            onClick={onOpenSlashMenu}
+            style={v2IconButtonStyle}
+          />
+        </Tooltip>
+      )}
+      {sending ? (
+        <button
+          type={isV2 ? 'button' : undefined}
+          className={isV2 ? 'ai-chat-send-btn ai-chat-stop-btn gn-v2-ai-send' : 'ai-chat-send-btn ai-chat-stop-btn'}
+          onClick={onStop}
+          title="停止生成"
+          style={isV2 ? undefined : {
+            background: 'rgba(255,77,79,0.1)',
+            color: '#ff4d4f',
+            border: '1px solid rgba(255,77,79,0.2)',
+            width: 26,
+            height: 26,
+            borderRadius: 6,
+            padding: 0,
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            cursor: 'pointer',
+            flexShrink: 0,
+          }}
+        >
+          {isV2 ? <StopOutlined /> : <div style={{ width: 10, height: 10, background: 'currentColor', borderRadius: 2 }} />}
+        </button>
+      ) : (
+        <button
+          type={isV2 ? 'button' : undefined}
+          className={isV2 ? 'ai-chat-send-btn gn-v2-ai-send' : 'ai-chat-send-btn'}
+          onClick={() => onSend()}
+          disabled={!canSend}
+          title="发送"
+          style={isV2 ? undefined : {
+            background: canSend ? overlayTheme.iconBg : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.04)'),
+            color: canSend ? overlayTheme.iconColor : mutedColor,
+            width: 26,
+            height: 26,
+            borderRadius: 6,
+            border: 'none',
+            padding: 0,
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            cursor: canSend ? 'pointer' : 'not-allowed',
+            flexShrink: 0,
+          }}
+        >
+          <SendOutlined />
+        </button>
+      )}
+    </div>
+  );
+};
+
+export default AIChatComposerActions;
diff --git a/frontend/src/components/ai/AIChatInput.notice.test.tsx b/frontend/src/components/ai/AIChatInput.notice.test.tsx
index f07b62f..f275b81 100644
--- a/frontend/src/components/ai/AIChatInput.notice.test.tsx
+++ b/frontend/src/components/ai/AIChatInput.notice.test.tsx
@@ -188,6 +188,15 @@ describe('AIChatInput notice layout', () => {
     expect(sendButton).not.toContain('disabled');
   });
 
+  it('keeps v2 composer action controls available after rendering the input', () => {
+    const markup = renderAIChatInput({ input: 'select 1' });
+
+    expect(markup).toContain('gn-v2-ai-input-actions');
+    expect(markup).toContain('aria-label="picture"');
+    expect(markup).toContain('aria-label="table"');
+    expect(markup).toContain('aria-label="code"');
+  });
+
   it('keeps the legacy composer free of v2-only layout classes by default', () => {
     const markup = renderAIChatInput({ isV2Ui: false, input: 'select 1' });
 
diff --git a/frontend/src/components/ai/AIChatInput.tsx b/frontend/src/components/ai/AIChatInput.tsx
index 763e376..49d1f0a 100644
--- a/frontend/src/components/ai/AIChatInput.tsx
+++ b/frontend/src/components/ai/AIChatInput.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { Input, Tooltip, Button } from 'antd';
-import { CodeOutlined, DatabaseOutlined, SendOutlined, StopOutlined, TableOutlined, PictureOutlined } from '@ant-design/icons';
+import { Input, Tooltip } from 'antd';
+import { DatabaseOutlined } from '@ant-design/icons';
 import { useStore } from '../../store';
 import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
 import type { AIComposerNotice, AIComposerNoticeAction } from '../../utils/aiComposerNotice';
@@ -11,6 +11,7 @@ import AIContextSelectorModal from './AIContextSelectorModal';
 import AISlashCommandMenu from './AISlashCommandMenu';
 import AIChatComposerNotice from './AIChatComposerNotice';
 import AIChatComposerStatus from './AIChatComposerStatus';
+import AIChatComposerActions from './AIChatComposerActions';
 import AIChatAttachmentStrip from './AIChatAttachmentStrip';
 import AIChatContextPreview from './AIChatContextPreview';
 import AIChatProviderModelSelect from './AIChatProviderModelSelect';
@@ -241,66 +242,21 @@ export const AIChatInput: React.FC<AIChatInputProps> = ({
                             )}
                         </div>
 
-                        <div style={{ display: 'flex', gap: 6, alignItems: 'center', flexShrink: 0 }}>
-                            <input
-                                type="file"
-                                accept="image/*"
-                                multiple
-                                ref={fileInputRef}
-                                style={{ display: 'none' }}
-                                onChange={handleImageUpload}
-                            />
-                            <Tooltip title="上传图片/截图">
-                                <Button
-                                    type="text"
-                                    icon={<PictureOutlined style={{ fontSize: 16 }} />}
-                                    onClick={() => fileInputRef.current?.click()}
-                                    style={{ color: overlayTheme.mutedText, border: 'none', background: 'transparent', padding: '0 4px', height: 26 }}
-                                    onMouseEnter={e => e.currentTarget.style.color = textColor}
-                                    onMouseLeave={e => e.currentTarget.style.color = overlayTheme.mutedText}
-                                />
-                            </Tooltip>
-                            <Tooltip title="关联附带数据库表上下文">
-                                <Button
-                                    type="text"
-                                    icon={<TableOutlined style={{ fontSize: 16 }} />}
-                                    onClick={handleOpenContext}
-                                    style={{ color: overlayTheme.mutedText, border: 'none', background: 'transparent', padding: '0 4px', height: 26 }}
-                                    onMouseEnter={e => e.currentTarget.style.color = textColor}
-                                    onMouseLeave={e => e.currentTarget.style.color = overlayTheme.mutedText}
-                                />
-                            </Tooltip>
-                            {sending ? (
-                                <button
-                                    className="ai-chat-send-btn ai-chat-stop-btn"
-                                    onClick={onStop}
-                                    title="停止生成"
-                                    style={{
-                                        background: 'rgba(255,77,79,0.1)',
-                                        color: '#ff4d4f', border: '1px solid rgba(255,77,79,0.2)',
-                                        width: 26, height: 26, borderRadius: 6, padding: 0,
-                                        display: 'flex', alignItems: 'center', justifyContent: 'center', cursor: 'pointer', flexShrink: 0
-                                    }}
-                                >
-                                    <div style={{ width: 10, height: 10, background: 'currentColor', borderRadius: 2 }} />
-                                </button>
-                            ) : (
-                                <button
-                                    className="ai-chat-send-btn"
-                                    onClick={() => onSend()}
-                                    disabled={!input.trim() && draftImages.length === 0}
-                                    title="发送"
-                                    style={{
-                                        background: (input.trim() || draftImages.length > 0) ? overlayTheme.iconBg : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.04)'),
-                                        color: (input.trim() || draftImages.length > 0) ? overlayTheme.iconColor : mutedColor,
-                                        width: 26, height: 26, borderRadius: 6, border: 'none', padding: 0,
-                                        display: 'flex', alignItems: 'center', justifyContent: 'center', cursor: (input.trim() || draftImages.length > 0) ? 'pointer' : 'not-allowed', flexShrink: 0
-                                    }}
-                                >
-                                    <SendOutlined />
-                                </button>
-                            )}
-                        </div>
+                        <AIChatComposerActions
+                            variant="legacy"
+                            input={input}
+                            draftImageCount={draftImages.length}
+                            sending={sending}
+                            darkMode={darkMode}
+                            textColor={textColor}
+                            mutedColor={mutedColor}
+                            overlayTheme={overlayTheme}
+                            fileInputRef={fileInputRef}
+                            onImageUpload={handleImageUpload}
+                            onOpenContext={handleOpenContext}
+                            onSend={onSend}
+                            onStop={onStop}
+                        />
                     </div>
                 </div>
 
@@ -394,60 +350,22 @@ export const AIChatInput: React.FC<AIChatInputProps> = ({
                             autoSize={{ minRows: 1, maxRows: 8 }}
                             style={{ color: textColor, width: '100%', padding: 0, resize: 'none' }}
                         />
-                        <div className="gn-v2-ai-input-actions">
-                            <input
-                                type="file"
-                                accept="image/*"
-                                multiple
-                                ref={fileInputRef}
-                                style={{ display: 'none' }}
-                                onChange={handleImageUpload}
-                            />
-                            <Tooltip title="上传图片/截图">
-                                <Button
-                                    type="text"
-                                    icon={<PictureOutlined />}
-                                    onClick={() => fileInputRef.current?.click()}
-                                    style={{ color: overlayTheme.mutedText, border: 'none', background: 'transparent' }}
-                                />
-                            </Tooltip>
-                            <Tooltip title="关联附带数据库表上下文">
-                                <Button
-                                    type="text"
-                                    icon={<TableOutlined />}
-                                    onClick={handleOpenContext}
-                                    style={{ color: overlayTheme.mutedText, border: 'none', background: 'transparent' }}
-                                />
-                            </Tooltip>
-                            <Tooltip title="快捷命令">
-                                <Button
-                                    type="text"
-                                    icon={<CodeOutlined />}
-                                    onClick={handleOpenSlashMenu}
-                                    style={{ color: overlayTheme.mutedText, border: 'none', background: 'transparent' }}
-                                />
-                            </Tooltip>
-                            {sending ? (
-                                <button
-                                    type="button"
-                                    className="ai-chat-send-btn ai-chat-stop-btn gn-v2-ai-send"
-                                    onClick={onStop}
-                                    title="停止生成"
-                                >
-                                    <StopOutlined />
-                                </button>
-                            ) : (
-                                <button
-                                    type="button"
-                                    className="ai-chat-send-btn gn-v2-ai-send"
-                                    onClick={() => onSend()}
-                                    disabled={!input.trim() && draftImages.length === 0}
-                                    title="发送"
-                                >
-                                    <SendOutlined />
-                                </button>
-                            )}
-                        </div>
+                        <AIChatComposerActions
+                            variant="v2"
+                            input={input}
+                            draftImageCount={draftImages.length}
+                            sending={sending}
+                            darkMode={darkMode}
+                            textColor={textColor}
+                            mutedColor={mutedColor}
+                            overlayTheme={overlayTheme}
+                            fileInputRef={fileInputRef}
+                            onImageUpload={handleImageUpload}
+                            onOpenContext={handleOpenContext}
+                            onOpenSlashMenu={handleOpenSlashMenu}
+                            onSend={onSend}
+                            onStop={onStop}
+                        />
                     </div>
                 </div>
                 <div className="gn-v2-ai-model-bar">