From 445ebbc0021e359615de811f3eac5c9698738a70 Mon Sep 17 00:00:00 2001
From: lofyer <lofyer@gmail.com>
Date: Fri, 14 Aug 2026 01:12:39 +0800
Subject: [PATCH] fix: open the selected channel settings

---
 src/renderer/src/App.test.tsx                 |  7 +++++
 src/renderer/src/App.tsx                      | 20 +++++++++++--
 .../src/ChannelSettingsSection.test.tsx       | 29 +++++++++++++++++++
 src/renderer/src/ChannelSettingsSection.tsx   |  4 ++-
 src/renderer/src/SettingsPanel.tsx            | 14 +++++++--
 5 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/App.test.tsx b/src/renderer/src/App.test.tsx
index da55b47..cc5043e 100644
--- a/src/renderer/src/App.test.tsx
+++ b/src/renderer/src/App.test.tsx
@@ -2709,6 +2709,13 @@ describe('App', () => {
       ])
     )
     expect(screen.getAllByText('尚无远程会话').length).toBeGreaterThan(0)
+
+    fireEvent.click(screen.getByRole('button', { name: '打开设置' }))
+
+    const channelSettingsTab = await screen.findByRole('tab', {
+      name: '消息通道'
+    })
+    expect(channelSettingsTab).toHaveAttribute('aria-selected', 'true')
   })
 
   it('shows client-created remote conversations without obsolete approval copy', async () => {
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index ff44dd5..6a6682f 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -89,6 +89,7 @@ import type {
   ConversationToolActivity,
   ProjectCreateInput,
   InteractiveWorkMode,
+  ProjectChannel,
   WorkspaceChanges
 } from '../../shared/assistant-contracts'
 import {
@@ -132,6 +133,7 @@ import {
   type SidebarArtifact
 } from './RightAssistantSidebar'
 import { SettingsPanel } from './SettingsPanel'
+import type { SettingsCategoryId } from './settings-categories'
 import goodbuddyDarkIcon from './assets/goodbuddy-dark.png'
 import goodbuddyLightIcon from './assets/goodbuddy-light.png'
 import {
@@ -1448,6 +1450,10 @@ function App(): React.JSX.Element {
     Record<string, BrowserLiveState>
   >({})
   const [view, setView] = useState<WorkspaceView>('chat')
+  const [settingsInitialCategory, setSettingsInitialCategory] =
+    useState<SettingsCategoryId>()
+  const [settingsInitialChannel, setSettingsInitialChannel] =
+    useState<ProjectChannel>()
   const [magicNotesEnabled, setMagicNotesEnabled] = useState(false)
   const [searchQuery, setSearchQuery] = useState('')
   const [conversationActionsId, setConversationActionsId] = useState('')
@@ -5204,7 +5210,11 @@ function App(): React.JSX.Element {
                 action={
                   <button
                     className="secondary-button"
-                    onClick={() => setView('settings')}
+                    onClick={() => {
+                      setSettingsInitialCategory('channels')
+                      setSettingsInitialChannel(activeProject.channel)
+                      setView('settings')
+                    }}
                     type="button"
                   >
                     {t('chat.remote.openSettings')}
@@ -6773,10 +6783,16 @@ function App(): React.JSX.Element {
           <SettingsPanel
             appearanceTheme={appearanceTheme}
             heartbeats={assistantHeartbeats}
+            initialCategory={settingsInitialCategory}
+            initialChannel={settingsInitialChannel}
             magicNotesEnabled={magicNotesEnabled}
             onAppearanceThemeChange={setAppearanceTheme}
             onClearLocalData={clearLocalData}
-            onClose={() => setView('chat')}
+            onClose={() => {
+              setSettingsInitialCategory(undefined)
+              setSettingsInitialChannel(undefined)
+              setView('chat')
+            }}
             onCreateHeartbeat={createHeartbeat}
             onExpertsChanged={(experts) => {
               setAssistantExperts(experts)
diff --git a/src/renderer/src/ChannelSettingsSection.test.tsx b/src/renderer/src/ChannelSettingsSection.test.tsx
index d4d9e09..674dd21 100644
--- a/src/renderer/src/ChannelSettingsSection.test.tsx
+++ b/src/renderer/src/ChannelSettingsSection.test.tsx
@@ -616,6 +616,35 @@ describe('ChannelSettingsSection', () => {
     ).toBeInTheDocument()
   })
 
+  it('opens the requested channel configuration', async () => {
+    Object.defineProperty(window, 'goodbuddy', {
+      configurable: true,
+      value: {
+        channels: {
+          ...bindingApi(),
+          getSnapshot: vi.fn(async () => snapshot),
+          apply: vi.fn(),
+          testConnection: vi.fn()
+        },
+        projects: {
+          list: vi.fn(async () => projects),
+          update: vi.fn()
+        },
+        settings: settingsApi()
+      } as unknown as DesktopApi
+    })
+
+    render(<ChannelSettingsSection initialChannel="wecom" />)
+
+    expect(
+      await screen.findByRole('tab', { name: '企业微信' })
+    ).toHaveAttribute('aria-selected', 'true')
+    expect(screen.getByRole('tabpanel')).toHaveAttribute(
+      'aria-labelledby',
+      'channel-settings-tab-wecom'
+    )
+  })
+
   it('renders English channel copy while preserving project data', async () => {
     Object.defineProperty(window, 'goodbuddy', {
       configurable: true,
diff --git a/src/renderer/src/ChannelSettingsSection.tsx b/src/renderer/src/ChannelSettingsSection.tsx
index 056ecf7..6caac57 100644
--- a/src/renderer/src/ChannelSettingsSection.tsx
+++ b/src/renderer/src/ChannelSettingsSection.tsx
@@ -972,8 +972,10 @@ function WeixinChannelEditor({
 }
 
 export function ChannelSettingsSection({
+  initialChannel = 'weixin',
   onNotify = () => undefined
 }: {
+  initialChannel?: ProjectChannel
   onNotify?: (notification: AppNotificationInput) => void
 }): React.JSX.Element {
   const { t } = useTranslation('integrations')
@@ -999,7 +1001,7 @@ export function ChannelSettingsSection({
   const [bindingOpen, setBindingOpen] = useState(false)
   const [bindingError, setBindingError] = useState<string>()
   const [activeChannel, setActiveChannel] =
-    useState<ProjectChannel>('weixin')
+    useState<ProjectChannel>(initialChannel)
   const [drafts, setDrafts] = useState<
     Record<CredentialChannel, ChannelDraft>
   >({
diff --git a/src/renderer/src/SettingsPanel.tsx b/src/renderer/src/SettingsPanel.tsx
index 79481bd..517f23a 100644
--- a/src/renderer/src/SettingsPanel.tsx
+++ b/src/renderer/src/SettingsPanel.tsx
@@ -14,7 +14,8 @@ import { useTranslation } from 'react-i18next'
 import type {
   AssistantExpert,
   AssistantHeartbeatConfig,
-  HeartbeatCreateInput
+  HeartbeatCreateInput,
+  ProjectChannel
 } from '../../shared/assistant-contracts'
 import type {
   AgentRuntimeDetection,
@@ -70,6 +71,8 @@ const settingsTabs = settingsCategoryList.map(({ id }) => id)
 type SettingsPanelProps = {
   open: boolean
   presentation?: 'modal' | 'page'
+  initialCategory?: SettingsCategoryId
+  initialChannel?: ProjectChannel
   onClose: () => void
   onSaved: (settings: RuntimeSettings) => void
   onNotify?: (notification: AppNotificationInput) => void
@@ -351,6 +354,8 @@ function RuntimeConfigCard({
 export function SettingsPanel({
   open,
   presentation = 'modal',
+  initialCategory,
+  initialChannel,
   onClose,
   onSaved,
   onNotify = () => {},
@@ -461,7 +466,7 @@ export function SettingsPanel({
   const [detection, setDetection] = useState<AgentRuntimeDetection>()
   const [detecting, setDetecting] = useState(false)
   const [activeTab, setActiveTab] =
-    useState<SettingsCategoryId>('runtime')
+    useState<SettingsCategoryId>(initialCategory ?? 'runtime')
   const [modelType, setModelType] = useState<ModelType>('llm')
   const [speechModelDraftId, setSpeechModelDraftId] = useState<
     string | null | undefined
@@ -2610,7 +2615,10 @@ export function SettingsPanel({
             </div>
           )}
           {activeTab === 'channels' && (
-            <ChannelSettingsSection onNotify={onNotify} />
+            <ChannelSettingsSection
+              initialChannel={initialChannel}
+              onNotify={onNotify}
+            />
           )}
           {activeTab === 'roles' && (
             <>