diff --git a/src/renderer/src/components/settings/CliAgentSkillSetup.tsx b/src/renderer/src/components/settings/CliAgentSkillSetup.tsx
new file mode 100644
index 00000000000..77573b712ee
--- /dev/null
+++ b/src/renderer/src/components/settings/CliAgentSkillSetup.tsx
@@ -0,0 +1,137 @@
+import { useCallback, useMemo } from 'react'
+import type { CliInstallStatus } from '../../../../shared/cli-install-types'
+import type { SkillDiscoveryTarget } from '../../../../shared/skills'
+import type { GlobalSettings } from '../../../../shared/types'
+import {
+  ORCA_CLI_SKILL_INSTALL_COMMAND,
+  ORCA_CLI_SKILL_NAME
+} from '@/lib/agent-feature-install-commands'
+import {
+  AGENT_SKILL_CLI_PREREQUISITE_NOTICE,
+  ensureOrcaCliAvailableForAgentSkillTerminal,
+  isOrcaCliAvailableOnPath
+} from '@/lib/agent-skill-cli-prerequisite'
+import {
+  GLOBAL_AGENT_SKILL_SOURCE_KINDS,
+  useInstalledAgentSkill
+} from '@/hooks/useInstalledAgentSkills'
+import { AgentSkillSetupPanel } from './AgentSkillSetupPanel'
+import {
+  buildSkillInstallCommandForRuntime,
+  CliSkillRuntimeControl,
+  ensureWslCliAvailableForAgentSkillTerminal,
+  getAgentSkillTerminalShellOverride,
+  getSelectedAgentRuntime,
+  getWslCliDistroRequest
+} from './CliSkillRuntimeSetup'
+import { Label } from '../ui/label'
+import { translate } from '@/i18n/i18n'
+
+type CliAgentSkillSetupProps = {
+  currentPlatform: string
+  settings: GlobalSettings
+  updateSettings: (updates: Partial<GlobalSettings>) => void
+  wslSupportedPlatform: boolean
+  wslAvailable: boolean
+  wslCapabilitiesLoading: boolean
+  onHostStatusChange: (nextStatus: CliInstallStatus) => void
+}
+
+export function CliAgentSkillSetup({
+  currentPlatform,
+  settings,
+  updateSettings,
+  wslSupportedPlatform,
+  wslAvailable,
+  wslCapabilitiesLoading,
+  onHostStatusChange
+}: CliAgentSkillSetupProps): React.JSX.Element {
+  const agentRuntime = useMemo(
+    () =>
+      getSelectedAgentRuntime(settings, wslSupportedPlatform, wslAvailable, wslCapabilitiesLoading),
+    [settings, wslAvailable, wslCapabilitiesLoading, wslSupportedPlatform]
+  )
+  const cliSkillDiscoveryTarget = useMemo<SkillDiscoveryTarget | undefined>(
+    () =>
+      agentRuntime.runtime === 'wsl'
+        ? { runtime: 'wsl', wslDistro: agentRuntime.wslDistro }
+        : undefined,
+    [agentRuntime.runtime, agentRuntime.wslDistro]
+  )
+  const {
+    installed: cliSkillDetected,
+    loading: cliSkillLoading,
+    error: cliSkillError,
+    refresh: refreshCliSkill
+  } = useInstalledAgentSkill(ORCA_CLI_SKILL_NAME, {
+    discoveryTarget: cliSkillDiscoveryTarget,
+    sourceKinds: GLOBAL_AGENT_SKILL_SOURCE_KINDS
+  })
+  const cliSkillInstallCommand = buildSkillInstallCommandForRuntime(
+    ORCA_CLI_SKILL_INSTALL_COMMAND,
+    agentRuntime
+  )
+  const cliSkillTerminalShellOverride = getAgentSkillTerminalShellOverride(
+    currentPlatform,
+    settings,
+    agentRuntime
+  )
+  const getCliSkillPrerequisiteStatus = useCallback(
+    () =>
+      agentRuntime.runtime === 'wsl'
+        ? window.api.cli.getWslInstallStatus(getWslCliDistroRequest(agentRuntime))
+        : window.api.cli.getInstallStatus(),
+    [agentRuntime]
+  )
+
+  return (
+    <div className="border-t border-border/60 pt-3">
+      <div className="space-y-0.5">
+        <Label>{translate('auto.components.settings.CliSection.04873eea3e', 'Agent skills')}</Label>
+        <p className="text-xs text-muted-foreground">
+          {translate(
+            'auto.components.settings.CliSection.36a6f919ba',
+            'Give agents Orca-aware workspace, terminal, and progress workflows.'
+          )}
+        </p>
+      </div>
+
+      <CliSkillRuntimeControl
+        runtime={agentRuntime}
+        updateSettings={updateSettings}
+        wslSupportedPlatform={wslSupportedPlatform}
+        wslAvailable={wslAvailable}
+        wslCapabilitiesLoading={wslCapabilitiesLoading}
+      />
+
+      <AgentSkillSetupPanel
+        className="mt-3"
+        variant="inline"
+        title={translate('auto.components.settings.CliSection.6053cf736c', 'CLI skill')}
+        description={translate(
+          'auto.components.settings.CliSection.e8012c03a1',
+          'Enables agents to use Orca workspace, terminal, and progress commands.'
+        )}
+        command={cliSkillInstallCommand}
+        terminalTitle="CLI skill setup"
+        terminalAriaLabel="CLI skill install terminal"
+        terminalWorktreeId={`settings-cli-skill-terminal-${agentRuntime.runtime}`}
+        terminalShellOverride={cliSkillTerminalShellOverride}
+        installed={cliSkillDetected}
+        loading={cliSkillLoading}
+        error={cliSkillError}
+        preInstallNotice={AGENT_SKILL_CLI_PREREQUISITE_NOTICE}
+        getPrerequisiteStatus={getCliSkillPrerequisiteStatus}
+        isPrerequisiteAvailable={isOrcaCliAvailableOnPath}
+        onBeforeOpenTerminal={async () => {
+          await (agentRuntime.runtime === 'wsl'
+            ? ensureWslCliAvailableForAgentSkillTerminal(agentRuntime)
+            : ensureOrcaCliAvailableForAgentSkillTerminal({
+                onStatusChange: onHostStatusChange
+              }))
+        }}
+        onRecheck={refreshCliSkill}
+      />
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/settings/CliSection.tsx b/src/renderer/src/components/settings/CliSection.tsx
index fd39dcc0d70..45aa8d3af78 100644
--- a/src/renderer/src/components/settings/CliSection.tsx
+++ b/src/renderer/src/components/settings/CliSection.tsx
@@ -1,22 +1,8 @@
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { FolderOpen, RefreshCw } from 'lucide-react'
 import { toast } from 'sonner'
 import type { CliInstallStatus } from '../../../../shared/cli-install-types'
-import type { SkillDiscoveryTarget } from '../../../../shared/skills'
 import type { GlobalSettings } from '../../../../shared/types'
-import {
-  ORCA_CLI_SKILL_INSTALL_COMMAND,
-  ORCA_CLI_SKILL_NAME
-} from '@/lib/agent-feature-install-commands'
-import {
-  AGENT_SKILL_CLI_PREREQUISITE_NOTICE,
-  ensureOrcaCliAvailableForAgentSkillTerminal,
-  isOrcaCliAvailableOnPath
-} from '@/lib/agent-skill-cli-prerequisite'
-import {
-  GLOBAL_AGENT_SKILL_SOURCE_KINDS,
-  useInstalledAgentSkill
-} from '@/hooks/useInstalledAgentSkills'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { Button } from '../ui/button'
 import {
@@ -29,15 +15,7 @@ import {
 } from '../ui/dialog'
 import { Label } from '../ui/label'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../ui/tooltip'
-import { AgentSkillSetupPanel } from './AgentSkillSetupPanel'
-import {
-  buildSkillInstallCommandForRuntime,
-  CliSkillRuntimeControl,
-  ensureWslCliAvailableForAgentSkillTerminal,
-  getAgentSkillTerminalShellOverride,
-  getSelectedAgentRuntime,
-  getWslCliDistroRequest
-} from './CliSkillRuntimeSetup'
+import { CliAgentSkillSetup } from './CliAgentSkillSetup'
 import { WslCliRegistration } from './WslCliRegistration'
 import { translate } from '@/i18n/i18n'
 
@@ -90,43 +68,6 @@ export function CliSection({
   const [dialogOpen, setDialogOpen] = useState(false)
   const [busyAction, setBusyAction] = useState<'install' | 'remove' | null>(null)
   const mountedRef = useMountedRef()
-  const agentRuntime = useMemo(
-    () =>
-      getSelectedAgentRuntime(settings, wslSupportedPlatform, wslAvailable, wslCapabilitiesLoading),
-    [settings, wslAvailable, wslCapabilitiesLoading, wslSupportedPlatform]
-  )
-  const cliSkillDiscoveryTarget = useMemo<SkillDiscoveryTarget | undefined>(
-    () =>
-      agentRuntime.runtime === 'wsl'
-        ? { runtime: 'wsl', wslDistro: agentRuntime.wslDistro }
-        : undefined,
-    [agentRuntime.runtime, agentRuntime.wslDistro]
-  )
-  const {
-    installed: cliSkillDetected,
-    loading: cliSkillLoading,
-    error: cliSkillError,
-    refresh: refreshCliSkill
-  } = useInstalledAgentSkill(ORCA_CLI_SKILL_NAME, {
-    discoveryTarget: cliSkillDiscoveryTarget,
-    sourceKinds: GLOBAL_AGENT_SKILL_SOURCE_KINDS
-  })
-  const cliSkillInstallCommand = buildSkillInstallCommandForRuntime(
-    ORCA_CLI_SKILL_INSTALL_COMMAND,
-    agentRuntime
-  )
-  const cliSkillTerminalShellOverride = getAgentSkillTerminalShellOverride(
-    currentPlatform,
-    settings,
-    agentRuntime
-  )
-  const getCliSkillPrerequisiteStatus = useCallback(
-    () =>
-      agentRuntime.runtime === 'wsl'
-        ? window.api.cli.getWslInstallStatus(getWslCliDistroRequest(agentRuntime))
-        : window.api.cli.getInstallStatus(),
-    [agentRuntime]
-  )
 
   const handleStatusChange = useCallback(
     (nextStatus: CliInstallStatus): void => {
@@ -357,56 +298,15 @@ export function CliSection({
         </div>
 
         {!isBrowserManaged ? (
-          <div className="border-t border-border/60 pt-3">
-            <div className="space-y-0.5">
-              <Label>
-                {translate('auto.components.settings.CliSection.04873eea3e', 'Agent skills')}
-              </Label>
-              <p className="text-xs text-muted-foreground">
-                {translate(
-                  'auto.components.settings.CliSection.36a6f919ba',
-                  'Give agents Orca-aware workspace, terminal, and progress workflows.'
-                )}
-              </p>
-            </div>
-
-            <CliSkillRuntimeControl
-              runtime={agentRuntime}
-              updateSettings={updateSettings}
-              wslSupportedPlatform={wslSupportedPlatform}
-              wslAvailable={wslAvailable}
-              wslCapabilitiesLoading={wslCapabilitiesLoading}
-            />
-
-            <AgentSkillSetupPanel
-              className="mt-3"
-              variant="inline"
-              title={translate('auto.components.settings.CliSection.6053cf736c', 'CLI skill')}
-              description={translate(
-                'auto.components.settings.CliSection.e8012c03a1',
-                'Enables agents to use Orca workspace, terminal, and progress commands.'
-              )}
-              command={cliSkillInstallCommand}
-              terminalTitle="CLI skill setup"
-              terminalAriaLabel="CLI skill install terminal"
-              terminalWorktreeId={`settings-cli-skill-terminal-${agentRuntime.runtime}`}
-              terminalShellOverride={cliSkillTerminalShellOverride}
-              installed={cliSkillDetected}
-              loading={cliSkillLoading}
-              error={cliSkillError}
-              preInstallNotice={AGENT_SKILL_CLI_PREREQUISITE_NOTICE}
-              getPrerequisiteStatus={getCliSkillPrerequisiteStatus}
-              isPrerequisiteAvailable={isOrcaCliAvailableOnPath}
-              onBeforeOpenTerminal={async () => {
-                await (agentRuntime.runtime === 'wsl'
-                  ? ensureWslCliAvailableForAgentSkillTerminal(agentRuntime)
-                  : ensureOrcaCliAvailableForAgentSkillTerminal({
-                      onStatusChange: handleStatusChange
-                    }))
-              }}
-              onRecheck={refreshCliSkill}
-            />
-          </div>
+          <CliAgentSkillSetup
+            currentPlatform={currentPlatform}
+            settings={settings}
+            updateSettings={updateSettings}
+            wslSupportedPlatform={wslSupportedPlatform}
+            wslAvailable={wslAvailable}
+            wslCapabilitiesLoading={wslCapabilitiesLoading}
+            onHostStatusChange={handleStatusChange}
+          />
         ) : null}
       </div>