diff --git a/src/web-ui/src/infrastructure/config/components/SessionConfig.tsx b/src/web-ui/src/infrastructure/config/components/SessionConfig.tsx
index 934428e3ad..18a712e493 100644
--- a/src/web-ui/src/infrastructure/config/components/SessionConfig.tsx
+++ b/src/web-ui/src/infrastructure/config/components/SessionConfig.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { FolderOpen, RefreshCw, ChevronDown, Plus, Trash2, Check } from 'lucide-react';
+import { FolderOpen, RefreshCw, ChevronDown } from 'lucide-react';
 import {
   Switch,
   NumberInput,
@@ -17,14 +17,6 @@ import {
 } from '@/component-library';
 import { ConfigPageHeader, ConfigPageLayout, ConfigPageContent, ConfigPageSection, ConfigPageRow } from './common';
 import { aiExperienceConfigService, type AIExperienceSettings } from '../services/AIExperienceConfigService';
-import {
-  DEFAULT_AGENT_COMPANION_PET,
-  deleteAgentCompanionPetPackage,
-  importAgentCompanionPetPackage,
-  listAgentCompanionPets,
-  releaseAgentCompanionPetPreviewBlobs,
-  type AgentCompanionPetPackage,
-} from '../services/AgentCompanionPetService';
 import { configManager } from '../services/ConfigManager';
 import { systemAPI } from '@/infrastructure/api/service-api/SystemAPI';
 import { useNotification, notificationService } from '@/shared/notification-system';
@@ -36,7 +28,6 @@ import {
   DEFAULT_LANGUAGE_TEMPLATES,
 } from '../types';
 import { ModelSelectionRadio } from './ModelSelectionRadio';
-import { ChatInputPixelPet } from '@/flow_chat/components/ChatInputPixelPet';
 import {workspaceAPI} from "@/infrastructure";
 import { createLogger } from '@/shared/utils/logger';
 import './AIFeaturesConfig.scss';
@@ -79,11 +70,6 @@ const SessionSettingsPanels: React.FC<SessionSettingsPanelsProps> = ({ variant }
   // ── Session config state ─────────────────────────────────────────────────
   const [isLoading, setIsLoading] = useState(true);
   const [settings, setSettings] = useState<AIExperienceSettings | null>(null);
-  const [companionPets, setCompanionPets] = useState<AgentCompanionPetPackage[]>([]);
-  const [companionPetsLoading, setCompanionPetsLoading] = useState(false);
-  const [companionPetImporting, setCompanionPetImporting] = useState(false);
-  const [companionPetDeletingPath, setCompanionPetDeletingPath] = useState<string | null>(null);
-  const [companionPetListExpanded, setCompanionPetListExpanded] = useState(false);
   const [models, setModels] = useState<AIModelConfig[]>([]);
   const [funcAgentModels, setFuncAgentModels] = useState<Record<string, string>>({});
   const [skipToolConfirmation, setSkipToolConfirmation] = useState(true);
@@ -159,7 +145,6 @@ const SessionSettingsPanels: React.FC<SessionSettingsPanelsProps> = ({ variant }
         confirmTimeout,
         debugConfigData,
         browserControlPreferredBrowser,
-        loadedCompanionPets,
       ] = await Promise.all([
         aiExperienceConfigService.getSettingsAsync(),
         configManager.getConfig<AIModelConfig[]>('ai.models') || [],
@@ -169,11 +154,9 @@ const SessionSettingsPanels: React.FC<SessionSettingsPanelsProps> = ({ variant }
         configManager.getConfig<number | null>('ai.tool_confirmation_timeout_secs'),
         configManager.getConfig<DebugModeConfig>('ai.debug_mode_config'),
         configManager.getConfig<string>('ai.browser_control_preferred_browser'),
-        listAgentCompanionPets(),
       ]);
 
       setSettings(loadedSettings);
-      setCompanionPets(loadedCompanionPets);
       setModels(allModels as AIModelConfig[]);
       setFuncAgentModels(funcAgentModelsData as Record<string, string>);
       setSkipToolConfirmation(skipConfirm ?? true);
@@ -214,113 +197,6 @@ const SessionSettingsPanels: React.FC<SessionSettingsPanelsProps> = ({ variant }
     }
   };
 
-  const handleRefreshCompanionPets = async () => {
-    setCompanionPetsLoading(true);
-    try {
-      setCompanionPets(await listAgentCompanionPets());
-    } finally {
-      setCompanionPetsLoading(false);
-    }
-  };
-
-  const handleImportCompanionPet = async () => {
-    if (!IS_TAURI_DESKTOP) return;
-    setCompanionPetImporting(true);
-    try {
-      const selected = null;
-      if (!selected || Array.isArray(selected)) return;
-      const imported = await importAgentCompanionPetPackage(selected);
-      const refreshed = await listAgentCompanionPets();
-      setCompanionPets(refreshed);
-      await updateSetting('agent_companion_pet', {
-        id: imported.id,
-        displayName: imported.displayName,
-        description: imported.description,
-        source: imported.source,
-        packagePath: imported.packagePath,
-        spritesheetPath: imported.spritesheetPath,
-        spritesheetMimeType: imported.spritesheetMimeType,
-      });
-    } catch (error) {
-      log.error('Failed to import Agent companion pet', error);
-      notification.error(t('features.agentCompanion.importFailed'));
-    } finally {
-      setCompanionPetImporting(false);
-    }
-  };
-
-  const handleDeleteCompanionPet = async (event: React.MouseEvent, pet: AgentCompanionPetPackage) => {
-    event.preventDefault();
-    event.stopPropagation();
-    if (!IS_TAURI_DESKTOP || pet.source !== 'user' || !settings) return;
-    const confirmed = null;
-    if (!confirmed) return;
-    setCompanionPetDeletingPath(pet.packagePath);
-    try {
-      await deleteAgentCompanionPetPackage(pet.packagePath);
-      releaseAgentCompanionPetPreviewBlobs(pet.packagePath, pet.spritesheetPath);
-      const refreshed = await listAgentCompanionPets();
-      setCompanionPets(refreshed);
-      if (settings.agent_companion_pet?.packagePath === pet.packagePath) {
-        const next = { ...settings, agent_companion_pet: DEFAULT_AGENT_COMPANION_PET };
-        setSettings(next);
-        await aiExperienceConfigService.saveSettings(next);
-      }
-      notification.success(t('features.agentCompanion.deleteSuccess'));
-    } catch (error) {
-      log.error('Failed to delete Agent companion pet', error);
-      notification.error(t('features.agentCompanion.deleteFailed'));
-    } finally {
-      setCompanionPetDeletingPath(null);
-    }
-  };
-
-  const companionPetOptions: SelectOption[] = companionPets.map(pet => ({
-    value: pet.packagePath,
-    label: pet.displayName,
-    description: pet.description ?? undefined,
-    group: pet.source === 'preset'
-      ? t('features.agentCompanion.groupPreset')
-      : t('features.agentCompanion.groupImported'),
-  }));
-
-  const companionDisplayModeOptions: SelectOption[] = [
-    {
-      value: 'desktop',
-      label: t('features.agentCompanion.displayDesktop'),
-      description: t('features.agentCompanion.displayDesktopDesc'),
-    },
-    {
-      value: 'input',
-      label: t('features.agentCompanion.displayInput'),
-      description: t('features.agentCompanion.displayInputDesc'),
-    },
-  ];
-
-  const selectedCompanionPetPackage = settings?.agent_companion_pet
-    ? companionPets.find(pet => pet.packagePath === settings.agent_companion_pet?.packagePath) ?? null
-    : null;
-  const selectedCompanionPet = selectedCompanionPetPackage ?? settings?.agent_companion_pet ?? DEFAULT_AGENT_COMPANION_PET;
-  const selectedCompanionPetValue = selectedCompanionPet.packagePath;
-  const selectedCompanionPetOption = companionPetOptions.find(option => option.value === selectedCompanionPetValue)
-    ?? companionPetOptions[0];
-
-  const handleCompanionPetChange = async (value: string | number | (string | number)[]) => {
-    const selectedValue = String(Array.isArray(value) ? value[0] : value);
-    const pet = companionPets.find(item => item.packagePath === selectedValue);
-    if (!pet) return;
-    await updateSetting('agent_companion_pet', {
-      id: pet.id,
-      displayName: pet.displayName,
-      description: pet.description,
-      source: pet.source,
-      packagePath: pet.packagePath,
-      spritesheetPath: pet.spritesheetPath,
-      spritesheetMimeType: pet.spritesheetMimeType,
-    });
-    setCompanionPetListExpanded(false);
-  };
-
   const getModelName = useCallback((modelId: string | null | undefined): string | undefined => {
     if (!modelId) return undefined;
     return models.find(m => m.id === modelId)?.name;
@@ -677,193 +553,6 @@ const SessionSettingsPanels: React.FC<SessionSettingsPanelsProps> = ({ variant }
           </ConfigPageRow>
         </ConfigPageSection>
 
-        {/* ── Agent companion (collapsed input) ─────────────────── */}
-        <ConfigPageSection
-          title={t('features.agentCompanion.title')}
-          description={t('features.agentCompanion.subtitle')}
-        >
-          <ConfigPageRow label={t('features.agentCompanion.enable')} align="center">
-            <div className="bitfun-func-agent-config__row-control">
-              <Switch
-                checked={settings.enable_agent_companion}
-                onChange={(e) => updateSetting('enable_agent_companion', e.target.checked)}
-                size="small"
-              />
-            </div>
-          </ConfigPageRow>
-          <ConfigPageRow
-            label={t('features.agentCompanion.displayModeLabel')}
-            description={t('features.agentCompanion.displayModeDescription')}
-            align="center"
-          >
-            <Select
-              className="bitfun-func-agent-config__pet-select"
-              size="small"
-              options={companionDisplayModeOptions}
-              value={settings.agent_companion_display_mode}
-              onChange={(value) => {
-                const selectedValue = String(Array.isArray(value) ? value[0] : value);
-                void updateSetting(
-                  'agent_companion_display_mode',
-                  selectedValue === 'desktop' ? 'desktop' : 'input',
-                );
-              }}
-            />
-          </ConfigPageRow>
-          <ConfigPageRow
-            label={(
-              <span className="bitfun-func-agent-config__pet-row-heading">
-                <span className="bitfun-func-agent-config__pet-row-copy">
-                  <span className="bitfun-func-agent-config__pet-row-title">
-                    {t('features.agentCompanion.petLabel')}
-                  </span>
-                  <span className="bitfun-func-agent-config__pet-row-description">
-                    {t('features.agentCompanion.petDescription')}
-                  </span>
-                </span>
-                <span className="bitfun-func-agent-config__pet-actions">
-                  <IconButton
-                    type="button"
-                    size="small"
-                    variant="ghost"
-                    onClick={() => void handleRefreshCompanionPets()}
-                    disabled={companionPetsLoading}
-                    aria-label={t('features.agentCompanion.refresh')}
-                    tooltip={t('features.agentCompanion.refresh')}
-                  >
-                    <RefreshCw size={14} />
-                  </IconButton>
-                  <Button
-                    size="small"
-                    variant="secondary"
-                    onClick={() => void handleImportCompanionPet()}
-                    disabled={!IS_TAURI_DESKTOP || companionPetImporting}
-                    title={t('features.agentCompanion.importHint')}
-                  >
-                    <Plus size={14} />
-                    {companionPetImporting ? t('features.agentCompanion.importing') : t('features.agentCompanion.import')}
-                  </Button>
-                </span>
-              </span>
-            )}
-            align="start"
-            multiline
-            className="bitfun-func-agent-config__pet-row"
-          >
-            <div className="bitfun-func-agent-config__pet-picker">
-              <div className="bitfun-func-agent-config__pet-chooser">
-                <button
-                  type="button"
-                  className="bitfun-func-agent-config__pet-expand-button"
-                  aria-expanded={companionPetListExpanded}
-                  aria-controls="bitfun-companion-pet-list"
-                  onClick={() => setCompanionPetListExpanded((expanded) => !expanded)}
-                >
-                  <span className="bitfun-func-agent-config__pet-expand-current">
-                    <span className="bitfun-func-agent-config__pet-select-thumb" aria-hidden>
-                      {selectedCompanionPetPackage ? (
-                        <span
-                          className="bitfun-func-agent-config__pet-preview-sprite"
-                          style={{ '--bitfun-pet-preview-src': `url("${selectedCompanionPetPackage.previewSrc}")` } as React.CSSProperties}
-                        />
-                      ) : (
-                        <ChatInputPixelPet mood="rest" pet={selectedCompanionPet} className="bitfun-func-agent-config__pet-select-panda" />
-                      )}
-                    </span>
-                    <span className="bitfun-func-agent-config__pet-select-value">
-                      {selectedCompanionPetOption?.label ?? t('features.agentCompanion.petPlaceholder')}
-                    </span>
-                  </span>
-                  <ChevronDown
-                    size={14}
-                    className={companionPetListExpanded ? 'bitfun-func-agent-config__pet-expand-chevron--open' : undefined}
-                  />
-                </button>
-                {companionPetListExpanded && (
-                  <div
-                    id="bitfun-companion-pet-list"
-                    className="bitfun-func-agent-config__pet-list"
-                    role="radiogroup"
-                    aria-label={t('features.agentCompanion.petLabel')}
-                  >
-                    {companionPetOptions.map((option, index) => {
-                      const pet = companionPets.find(item => item.packagePath === option.value);
-                      const isUserPet = pet?.source === 'user';
-                      const isDeleting = !!pet && companionPetDeletingPath === pet.packagePath;
-                      const isSelected = option.value === selectedCompanionPetValue;
-                      const showGroup = option.group && option.group !== companionPetOptions[index - 1]?.group;
-                      return (
-                        <React.Fragment key={String(option.value)}>
-                          {showGroup && (
-                            <div className="bitfun-func-agent-config__pet-list-group">
-                              {option.group}
-                            </div>
-                          )}
-                          <div
-                            className={`bitfun-func-agent-config__pet-select-option${isSelected ? ' bitfun-func-agent-config__pet-select-option--selected' : ''}`}
-                            role="radio"
-                            tabIndex={0}
-                            aria-checked={isSelected}
-                            onClick={() => void handleCompanionPetChange(option.value)}
-                            onKeyDown={(event) => {
-                              if (event.key === 'Enter' || event.key === ' ') {
-                                event.preventDefault();
-                                void handleCompanionPetChange(option.value);
-                              }
-                            }}
-                          >
-                            <div className="bitfun-func-agent-config__pet-select-option-main">
-                              <span className="bitfun-func-agent-config__pet-select-thumb" aria-hidden>
-                                {pet ? (
-                                  <span
-                                    className="bitfun-func-agent-config__pet-preview-sprite"
-                                    style={{ '--bitfun-pet-preview-src': `url("${pet.previewSrc}")` } as React.CSSProperties}
-                                  />
-                                ) : (
-                                  <ChatInputPixelPet
-                                    mood="rest"
-                                    pet={DEFAULT_AGENT_COMPANION_PET}
-                                    className="bitfun-func-agent-config__pet-select-panda"
-                                  />
-                                )}
-                              </span>
-                              <span className="bitfun-func-agent-config__pet-select-text">
-                                <span className="bitfun-func-agent-config__pet-select-label">{option.label}</span>
-                                {option.description && (
-                                  <span className="bitfun-func-agent-config__pet-select-description">{option.description}</span>
-                                )}
-                              </span>
-                            </div>
-                            <div className={`bitfun-func-agent-config__pet-select-actions${isUserPet && IS_TAURI_DESKTOP && pet ? ' bitfun-func-agent-config__pet-select-actions--deletable' : ''}`}>
-                              {isSelected && (
-                                <Check className="bitfun-func-agent-config__pet-select-check" size={14} aria-hidden />
-                              )}
-                              {isUserPet && IS_TAURI_DESKTOP && pet && (
-                                <IconButton
-                                  type="button"
-                                  size="small"
-                                  variant="danger"
-                                  className="bitfun-func-agent-config__pet-select-delete"
-                                  disabled={isDeleting}
-                                  aria-label={t('features.agentCompanion.delete')}
-                                  tooltip={t('features.agentCompanion.delete')}
-                                  onClick={(e) => void handleDeleteCompanionPet(e, pet)}
-                                >
-                                  <Trash2 size={14} />
-                                </IconButton>
-                              )}
-                            </div>
-                          </div>
-                        </React.Fragment>
-                      );
-                    })}
-                  </div>
-                )}
-              </div>
-            </div>
-          </ConfigPageRow>
-        </ConfigPageSection>
-
           </>
         ) : null}
 
diff --git a/src/web-ui/src/locales/en-US/settings/session-config.json b/src/web-ui/src/locales/en-US/settings/session-config.json
index 7183571917..5833e55230 100644
--- a/src/web-ui/src/locales/en-US/settings/session-config.json
+++ b/src/web-ui/src/locales/en-US/settings/session-config.json
@@ -1,7 +1,7 @@
 {
   "personalizationPage": {
     "title": "Personalization",
-    "subtitle": "Auto session title and Agent companion"
+    "subtitle": "Auto session title"
   },
   "permissionsPage": {
     "title": "Permission management",
@@ -13,33 +13,6 @@
       "subtitle": "AI automatically generates concise titles for new conversations",
       "warning": "Session title will use first 20 characters of user message"
     },
-    "agentCompanion": {
-      "title": "Agent companion",
-      "subtitle": "Control where the BitFun companion appears.",
-      "enable": "Show Agent companion",
-      "displayModeLabel": "Display location",
-      "displayModeDescription": "Show the companion inside the input, or as a floating desktop pet outside the app.",
-      "displayInput": "Inside input",
-      "displayInputDesc": "Show it when the chat input is collapsed.",
-      "displayDesktop": "Floating desktop pet",
-      "displayDesktopDesc": "Show a borderless always-on-top mini window outside the app. Drag to move it.",
-      "petLabel": "Companion appearance",
-      "petDescription": "Choose a preset, or import a Petdex zip downloaded from petdex.crafter.run.",
-      "petPlaceholder": "Choose companion appearance",
-      "groupPreset": "Presets",
-      "groupImported": "Imported",
-      "import": "Import",
-      "importing": "Importing",
-      "importHint": "Download an appearance zip from https://petdex.crafter.run/zh, then import it here.",
-      "importDialogTitle": "Choose Petdex appearance zip",
-      "importFailed": "Failed to import Agent companion appearance",
-      "delete": "Remove imported appearance",
-      "deleteConfirmTitle": "Remove appearance",
-      "deleteConfirmBody": "Delete this imported companion from your device? This cannot be undone.",
-      "deleteSuccess": "Imported appearance removed",
-      "deleteFailed": "Failed to remove imported appearance",
-      "refresh": "Refresh appearances"
-    },
     "workspaceSearch": {
       "title": "Accelerated workspace search",
       "subtitle": "Use flashgrep-backed indexed search for local workspaces. When off, BitFun falls back to legacy search.",
diff --git a/src/web-ui/src/locales/zh-CN/settings/session-config.json b/src/web-ui/src/locales/zh-CN/settings/session-config.json
index 450969e345..4ccf04da4b 100644
--- a/src/web-ui/src/locales/zh-CN/settings/session-config.json
+++ b/src/web-ui/src/locales/zh-CN/settings/session-config.json
@@ -1,7 +1,7 @@
 {
   "personalizationPage": {
     "title": "个性化",
-    "subtitle": "会话标题自动生成、Agent 伙伴"
+    "subtitle": "会话标题自动生成"
   },
   "permissionsPage": {
     "title": "权限管理",
@@ -13,33 +13,6 @@
       "subtitle": "新对话时 AI 自动生成简洁标题",
       "warning": "会话标题将使用用户消息的前 20 个字符"
     },
-    "agentCompanion": {
-      "title": "Agent 伙伴",
-      "subtitle": "控制 BitFun 伙伴的显示方式。",
-      "enable": "显示 Agent 伙伴",
-      "displayModeLabel": "显示位置",
-      "displayModeDescription": "选择伙伴显示在输入框内，还是作为软件外的悬浮桌面宠物。",
-      "displayInput": "输入框内",
-      "displayInputDesc": "在会话输入框收起时显示。",
-      "displayDesktop": "悬浮桌面宠物",
-      "displayDesktopDesc": "在软件外显示为置顶的无边框小窗口，可拖动。",
-      "petLabel": "伙伴形象",
-      "petDescription": "选择预置形象，或导入从 petdex.crafter.run 下载的 Petdex zip。",
-      "petPlaceholder": "选择伙伴形象",
-      "groupPreset": "预置",
-      "groupImported": "已导入",
-      "import": "导入",
-      "importing": "导入中",
-      "importHint": "可以去 https://petdex.crafter.run/zh 下载形象 zip 后导入。",
-      "importDialogTitle": "选择 Petdex 形象 zip",
-      "importFailed": "导入 Agent 伙伴形象失败",
-      "delete": "删除已导入形象",
-      "deleteConfirmTitle": "删除形象",
-      "deleteConfirmBody": "从本机删除该已导入的伙伴形象？此操作不可恢复。",
-      "deleteSuccess": "已删除导入的形象",
-      "deleteFailed": "删除导入形象失败",
-      "refresh": "刷新形象列表"
-    },
     "workspaceSearch": {
       "title": "加速工作区搜索",
       "subtitle": "为本地工作区启用基于 flashgrep 的索引搜索。关闭后 BitFun 会回退到原有搜索。",
diff --git a/src/web-ui/src/locales/zh-TW/settings/session-config.json b/src/web-ui/src/locales/zh-TW/settings/session-config.json
index de5fa7f394..07c847ca66 100644
--- a/src/web-ui/src/locales/zh-TW/settings/session-config.json
+++ b/src/web-ui/src/locales/zh-TW/settings/session-config.json
@@ -1,7 +1,7 @@
 {
   "personalizationPage": {
     "title": "個性化",
-    "subtitle": "會話標題自動生成、Agent 夥伴"
+    "subtitle": "會話標題自動生成"
   },
   "permissionsPage": {
     "title": "權限管理",
@@ -13,33 +13,6 @@
       "subtitle": "新對話時 AI 自動生成簡潔標題",
       "warning": "會話標題將使用用戶消息的前 20 個字符"
     },
-    "agentCompanion": {
-      "title": "Agent 夥伴",
-      "subtitle": "控制 BitFun 夥伴的顯示方式。",
-      "enable": "顯示 Agent 夥伴",
-      "displayModeLabel": "顯示位置",
-      "displayModeDescription": "選擇夥伴顯示在輸入框內，還是作為軟體外的懸浮桌面寵物。",
-      "displayInput": "輸入框內",
-      "displayInputDesc": "在會話輸入框收起時顯示。",
-      "displayDesktop": "懸浮桌面寵物",
-      "displayDesktopDesc": "在軟體外顯示為置頂的無邊框小視窗，可拖動。",
-      "petLabel": "夥伴形象",
-      "petDescription": "選擇預置形象，或匯入從 petdex.crafter.run 下載的 Petdex zip。",
-      "petPlaceholder": "選擇夥伴形象",
-      "groupPreset": "預置",
-      "groupImported": "已匯入",
-      "import": "匯入",
-      "importing": "匯入中",
-      "importHint": "可以去 https://petdex.crafter.run/zh 下載形象 zip 後匯入。",
-      "importDialogTitle": "選擇 Petdex 形象 zip",
-      "importFailed": "匯入 Agent 夥伴形象失敗",
-      "delete": "刪除已匯入形象",
-      "deleteConfirmTitle": "刪除形象",
-      "deleteConfirmBody": "從本機刪除此已匯入的夥伴形象？此操作無法復原。",
-      "deleteSuccess": "已刪除匯入的形象",
-      "deleteFailed": "刪除匯入形象失敗",
-      "refresh": "重新整理形象列表"
-    },
     "workspaceSearch": {
       "title": "加速工作區搜尋",
       "subtitle": "為本地工作區啟用基於 flashgrep 的索引搜尋。關閉後 BitFun 會回退到原有搜尋。",