+
)}
diff --git a/src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts b/src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts
index 29ef6bd9fca..63b7803d944 100644
--- a/src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts
+++ b/src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts
@@ -1,5 +1,4 @@
import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { CliInstallStatus } from '../../../../shared/cli-install-types'
import type {
ComputerUsePermissionSetupResult,
ComputerUsePermissionStatusResult
@@ -19,7 +18,6 @@ import {
import {
DEFAULT_ONBOARDING_FEATURE_SETUP_SELECTION,
buildOnboardingFeatureSetupClipboardText,
- createOnboardingFeatureSetupDeps,
onboardingFeatureSetupRunTelemetry,
onboardingFeatureSetupTelemetryFeature,
onboardingFeatureSetupTelemetrySelection,
@@ -39,21 +37,6 @@ const ORCHESTRATION_ONLY_SKILL_INSTALL_COMMAND = buildAgentFeatureSkillInstallCo
ORCHESTRATION_SKILL_NAME
])
-const INSTALLED_CLI_STATUS: CliInstallStatus = {
- platform: 'darwin',
- commandName: 'orca',
- commandPath: '/usr/local/bin/orca',
- pathDirectory: '/usr/local/bin',
- pathConfigured: true,
- launcherPath: '/Applications/Orca.app/Contents/MacOS/Orca',
- installMethod: 'symlink',
- supported: true,
- state: 'installed',
- currentTarget: '/Applications/Orca.app/Contents/MacOS/Orca',
- unsupportedReason: null,
- detail: null
-}
-
const GRANTED_COMPUTER_USE_STATUS: ComputerUsePermissionStatusResult = {
platform: 'darwin',
helperAppPath: '/Applications/Orca Computer Use.app',
@@ -82,9 +65,6 @@ function createDeps(
return {
storage,
clipboardWrites,
- getCliStatus: vi.fn(async () => INSTALLED_CLI_STATUS),
- showCliRegistrationPrompt: vi.fn(async () => undefined),
- installCli: vi.fn(async () => INSTALLED_CLI_STATUS),
writeClipboardText: vi.fn(async (text: string) => {
clipboardWrites.push(text)
}),
@@ -101,6 +81,11 @@ function createDeps(
}
}
+const WSL_RUNTIME_CONTEXT = {
+ agentRuntime: { runtime: 'wsl' as const, wslDistro: 'Ubuntu', label: 'WSL Ubuntu' },
+ installDisabledReason: null
+}
+
describe('onboarding feature setup runner', () => {
afterEach(() => {
vi.unstubAllGlobals()
@@ -156,29 +141,6 @@ describe('onboarding feature setup runner', () => {
).toBeUndefined()
})
- it('uses the WSL CLI APIs for the selected distro', async () => {
- const getInstallStatus = vi.fn()
- const install = vi.fn()
- const getWslInstallStatus = vi.fn(async () => INSTALLED_CLI_STATUS)
- const installWsl = vi.fn(async () => INSTALLED_CLI_STATUS)
- vi.stubGlobal('window', {
- api: { cli: { getInstallStatus, install, getWslInstallStatus, installWsl } }
- })
- const deps = createOnboardingFeatureSetupDeps({
- runtime: 'wsl',
- wslDistro: 'Ubuntu',
- label: 'WSL Ubuntu'
- })
-
- await deps.getCliStatus()
- await deps.installCli()
-
- expect(getWslInstallStatus).toHaveBeenCalledWith({ distro: 'Ubuntu' })
- expect(installWsl).toHaveBeenCalledWith({ distro: 'Ubuntu' })
- expect(getInstallStatus).not.toHaveBeenCalled()
- expect(install).not.toHaveBeenCalled()
- })
-
it('keeps the runner on the host when the selected WSL runtime needs repair', async () => {
const deps = createDeps()
@@ -213,7 +175,6 @@ describe('onboarding feature setup runner', () => {
expect(
onboardingFeatureSetupRunTelemetry(selection, {
selectedIds: ['browserUse', 'orchestration', 'linearTickets'],
- cliTouched: true,
skillCommandsCopied: false,
skillInstallCommand: ORCHESTRATION_ONLY_SKILL_INSTALL_COMMAND,
computerUsePermissionsOpened: false,
@@ -225,7 +186,7 @@ describe('onboarding feature setup runner', () => {
linear_tickets: true,
orchestration: true,
selected_count: 2,
- cli_touched: true,
+ cli_touched: false,
skill_commands_copied: false,
skill_install_command_prepared: true,
computer_use_permissions_opened: false,
@@ -255,15 +216,11 @@ describe('onboarding feature setup runner', () => {
expect(result).toEqual({
selectedIds: ['browserUse', 'computerUse', 'orchestration', 'linearTickets'],
- cliTouched: false,
skillCommandsCopied: true,
skillInstallCommand: ALL_SKILL_INSTALL_COMMAND,
computerUsePermissionsOpened: true,
warnings: []
})
- expect(deps.getCliStatus).toHaveBeenCalledTimes(1)
- expect(deps.showCliRegistrationPrompt).not.toHaveBeenCalled()
- expect(deps.installCli).not.toHaveBeenCalled()
expect(deps.getComputerUsePermissionStatus).toHaveBeenCalledTimes(1)
expect(deps.openComputerUsePermissionSetup).toHaveBeenCalledTimes(1)
expect(deps.storage.get(BROWSER_USE_ENABLED_STORAGE_KEY)).toBe('1')
@@ -273,6 +230,16 @@ describe('onboarding feature setup runner', () => {
expect(deps.clipboardWrites).toEqual([ALL_SKILL_INSTALL_COMMAND])
})
+ it('installs WSL skills without checking or changing CLI registration', async () => {
+ const deps = createDeps()
+ const result = await runOnboardingFeatureSetup(
+ { browserUse: false, computerUse: false, orchestration: true, linearTickets: false },
+ deps,
+ WSL_RUNTIME_CONTEXT
+ )
+ expect(result.skillInstallCommand).toBe(ORCHESTRATION_ONLY_SKILL_INSTALL_COMMAND)
+ })
+
it('keeps invasive Browser Use and Computer Use setup untouched when only Orchestration is selected', async () => {
const deps = createDeps()
const selection: OnboardingFeatureSetupSelection = {
@@ -288,9 +255,6 @@ describe('onboarding feature setup runner', () => {
expect(result.skillCommandsCopied).toBe(true)
expect(result.skillInstallCommand).toBe(ORCHESTRATION_ONLY_SKILL_INSTALL_COMMAND)
expect(result.computerUsePermissionsOpened).toBe(false)
- expect(deps.getCliStatus).toHaveBeenCalledTimes(1)
- expect(deps.showCliRegistrationPrompt).not.toHaveBeenCalled()
- expect(deps.installCli).not.toHaveBeenCalled()
expect(deps.getComputerUsePermissionStatus).not.toHaveBeenCalled()
expect(deps.openComputerUsePermissionSetup).not.toHaveBeenCalled()
expect(deps.storage.get(BROWSER_USE_ENABLED_STORAGE_KEY)).toBe('0')
@@ -308,7 +272,6 @@ describe('onboarding feature setup runner', () => {
expect(result).toEqual({
selectedIds: [],
- cliTouched: false,
skillCommandsCopied: false,
skillInstallCommand: null,
computerUsePermissionsOpened: false,
@@ -316,8 +279,6 @@ describe('onboarding feature setup runner', () => {
})
expect(deps.storage.get(BROWSER_USE_ENABLED_STORAGE_KEY)).toBe('0')
expect(deps.storage.get(ORCHESTRATION_ENABLED_STORAGE_KEY)).toBe('0')
- expect(deps.getCliStatus).not.toHaveBeenCalled()
- expect(deps.showCliRegistrationPrompt).not.toHaveBeenCalled()
expect(deps.getComputerUsePermissionStatus).not.toHaveBeenCalled()
expect(deps.clipboardWrites).toEqual([])
})
@@ -377,52 +338,4 @@ describe('onboarding feature setup runner', () => {
message: 'Orca Computer Use.app was not found'
})
})
-
- it('shows CLI registration context before installing a missing CLI during onboarding', async () => {
- const staleStatus: CliInstallStatus = {
- ...INSTALLED_CLI_STATUS,
- state: 'stale',
- currentTarget: '/tmp/other-orca',
- detail: '/usr/local/bin/orca points to a different launcher.'
- }
- const showCliRegistrationPrompt = vi.fn(async () => undefined)
- const installCli = vi.fn(async () => INSTALLED_CLI_STATUS)
- const deps = createDeps({
- getCliStatus: vi.fn(async () => staleStatus),
- showCliRegistrationPrompt,
- installCli
- })
-
- const result = await runOnboardingFeatureSetup(
- { browserUse: true, computerUse: false, orchestration: false, linearTickets: false },
- deps
- )
-
- expect(result.cliTouched).toBe(true)
- expect(showCliRegistrationPrompt).toHaveBeenCalledTimes(1)
- expect(installCli).toHaveBeenCalledTimes(1)
- expect(showCliRegistrationPrompt.mock.invocationCallOrder[0]).toBeLessThan(
- installCli.mock.invocationCallOrder[0]
- )
- })
-
- it('warns without changing PATH when the Windows registry read is unknown', async () => {
- const unknownStatus: CliInstallStatus = {
- ...INSTALLED_CLI_STATUS,
- platform: 'win32',
- pathConfigured: null,
- detail: 'Orca could not read the Windows user PATH registry value.'
- }
- const deps = createDeps({ getCliStatus: vi.fn(async () => unknownStatus) })
-
- const result = await runOnboardingFeatureSetup(
- { browserUse: true, computerUse: false, orchestration: false, linearTickets: false },
- deps
- )
-
- expect(result.cliTouched).toBe(false)
- expect(result.warnings).toContainEqual({ featureId: 'cli', message: unknownStatus.detail })
- expect(deps.showCliRegistrationPrompt).not.toHaveBeenCalled()
- expect(deps.installCli).not.toHaveBeenCalled()
- })
})
diff --git a/src/renderer/src/components/onboarding/onboarding-feature-setup.ts b/src/renderer/src/components/onboarding/onboarding-feature-setup.ts
index c5d22985e02..d1cbd940fef 100644
--- a/src/renderer/src/components/onboarding/onboarding-feature-setup.ts
+++ b/src/renderer/src/components/onboarding/onboarding-feature-setup.ts
@@ -1,4 +1,3 @@
-import type { CliInstallStatus } from '../../../../shared/cli-install-types'
import type {
ComputerUsePermissionSetupResult,
ComputerUsePermissionStatusResult
@@ -12,13 +11,9 @@ import {
} from '@/lib/agent-feature-install-commands'
import { BROWSER_USE_ENABLED_STORAGE_KEY } from '@/lib/browser-use-setup-state'
import { e2eConfig } from '@/lib/e2e-config'
-import { showOrcaCliRegistrationPromptToast } from '@/lib/agent-skill-cli-prerequisite'
import type { ProjectAgentSkillRuntime } from '@/lib/project-skill-runtime'
import type { OnboardingFeatureSetupRuntimeContext } from './onboarding-feature-setup-runtime'
-import {
- buildSkillCommandForRuntime,
- getWslCliDistroRequest
-} from '../settings/CliSkillRuntimeSetup'
+import { buildSkillCommandForRuntime } from '../settings/CliSkillRuntimeSetup'
import {
ORCHESTRATION_ENABLED_STORAGE_KEY,
ORCHESTRATION_SETUP_DISMISSED_STORAGE_KEY,
@@ -72,13 +67,12 @@ const FEATURE_TELEMETRY_IDS: Record<
}
export type OnboardingFeatureSetupWarning = {
- featureId: OnboardingFeatureSetupId | 'cli' | 'skills'
+ featureId: OnboardingFeatureSetupId | 'skills'
message: string
}
export type OnboardingFeatureSetupResult = {
selectedIds: OnboardingFeatureSetupId[]
- cliTouched: boolean
skillCommandsCopied: boolean
skillInstallCommand: string | null
computerUsePermissionsOpened: boolean
@@ -86,9 +80,6 @@ export type OnboardingFeatureSetupResult = {
}
export type OnboardingFeatureSetupDeps = {
- getCliStatus: () => Promise
- showCliRegistrationPrompt?: () => Promise
- installCli: () => Promise
writeClipboardText: (text: string) => Promise
getComputerUsePermissionStatus: () => Promise
openComputerUsePermissionSetup: () => Promise
@@ -161,7 +152,7 @@ export function onboardingFeatureSetupRunTelemetry(
): EventProps<'onboarding_feature_setup_run'> {
return {
...onboardingFeatureSetupTelemetrySelection(selection),
- cli_touched: result.cliTouched,
+ cli_touched: false,
skill_commands_copied: result.skillCommandsCopied,
skill_install_command_prepared: result.skillInstallCommand !== null,
computer_use_permissions_opened: result.computerUsePermissionsOpened,
@@ -169,26 +160,13 @@ export function onboardingFeatureSetupRunTelemetry(
}
}
-export function createOnboardingFeatureSetupDeps(
- agentRuntime?: ProjectAgentSkillRuntime
-): OnboardingFeatureSetupDeps {
+export function createOnboardingFeatureSetupDeps(): OnboardingFeatureSetupDeps {
const e2eDeps = getE2EOnboardingFeatureSetupDeps()
if (e2eDeps) {
return e2eDeps
}
- // Register `orca` on the same PATH used by the skill install (#12103).
- const wslDistroRequest =
- agentRuntime?.runtime === 'wsl' ? getWslCliDistroRequest(agentRuntime) : undefined
- const isWsl = agentRuntime?.runtime === 'wsl'
return {
- getCliStatus: () =>
- isWsl
- ? window.api.cli.getWslInstallStatus(wslDistroRequest)
- : window.api.cli.getInstallStatus(),
- showCliRegistrationPrompt: showOrcaCliRegistrationPromptToast,
- installCli: () =>
- isWsl ? window.api.cli.installWsl(wslDistroRequest) : window.api.cli.install(),
writeClipboardText: (text) => window.api.ui.writeClipboardText(text),
getComputerUsePermissionStatus: () => window.api.computerUsePermissions.getStatus(),
openComputerUsePermissionSetup: () => window.api.computerUsePermissions.openSetup(),
@@ -216,10 +194,9 @@ export async function runOnboardingFeatureSetup(
const agentRuntime = runtimeContext?.installDisabledReason
? undefined
: runtimeContext?.agentRuntime
- const deps = explicitDeps ?? createOnboardingFeatureSetupDeps(agentRuntime)
+ const deps = explicitDeps ?? createOnboardingFeatureSetupDeps()
const selectedIds = selectedOnboardingFeatureSetupIds(selection)
const warnings: OnboardingFeatureSetupWarning[] = []
- let cliTouched = false
let skillCommandsCopied = false
const skillInstallCommand = buildOnboardingFeatureSetupSkillCommand(selection)
let computerUsePermissionsOpened = false
@@ -234,7 +211,6 @@ export async function runOnboardingFeatureSetup(
if (selectedIds.length === 0) {
return {
selectedIds,
- cliTouched,
skillCommandsCopied,
skillInstallCommand,
computerUsePermissionsOpened,
@@ -242,36 +218,6 @@ export async function runOnboardingFeatureSetup(
}
}
- try {
- const status = await deps.getCliStatus()
- if (!status.supported) {
- warnings.push({
- featureId: 'cli',
- message: status.detail ?? 'Orca CLI registration is not available on this platform.'
- })
- } else if (status.pathConfigured === null) {
- // Why: an unknown registry read cannot safely drive a PATH read-modify-write.
- warnings.push({
- featureId: 'cli',
- message: status.detail ?? 'Orca could not check your Windows user PATH.'
- })
- } else if (status.state !== 'installed' || status.pathConfigured === false) {
- await deps.showCliRegistrationPrompt?.()
- const next = await deps.installCli()
- cliTouched = true
- if (next.state !== 'installed') {
- warnings.push({
- featureId: 'cli',
- message: next.detail ?? 'Orca CLI registration needs attention.'
- })
- } else if (next.pathConfigured !== true && next.detail) {
- warnings.push({ featureId: 'cli', message: next.detail })
- }
- }
- } catch (error) {
- warnings.push({ featureId: 'cli', message: formatFeatureSetupError(error) })
- }
-
if (selection.computerUse) {
try {
const status = await deps.getComputerUsePermissionStatus()
@@ -306,7 +252,6 @@ export async function runOnboardingFeatureSetup(
return {
selectedIds,
- cliTouched,
skillCommandsCopied,
skillInstallCommand,
computerUsePermissionsOpened,
diff --git a/src/renderer/src/components/settings/BrowserUseCliStep.tsx b/src/renderer/src/components/settings/BrowserUseCliStep.tsx
deleted file mode 100644
index 62474b3c2ae..00000000000
--- a/src/renderer/src/components/settings/BrowserUseCliStep.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import type { CliInstallStatus } from '../../../../shared/cli-install-types'
-import { Button } from '../ui/button'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../ui/tooltip'
-import { SearchableSetting } from './SearchableSetting'
-import { StepBadge } from './SetupStepBadge'
-import { getBrowserUsePaneSearchEntries } from './browser-use-search'
-import { translate } from '@/i18n/i18n'
-
-type BrowserUseCliStepProps = {
- cliStatus: CliInstallStatus | null
- cliEnabled: boolean
- cliLoading: boolean
- cliBusy: boolean
- cliSupported: boolean
- cliPathNeedsAttention: boolean
- onEnableCli: () => void
-}
-
-export function BrowserUseCliStep({
- cliStatus,
- cliEnabled,
- cliLoading,
- cliBusy,
- cliSupported,
- cliPathNeedsAttention,
- onEnableCli
-}: BrowserUseCliStepProps): React.JSX.Element {
- return (
-
-
-
-
-
- {translate('auto.components.settings.BrowserUsePane.c6065d205d', 'Enable Orca CLI')}
-
-
- {translate(
- 'auto.components.settings.BrowserUsePane.9fca1f7f5d',
- 'Registers the Orca CLI command so agents can orchestrate the browser from their shell.'
- )}
-
- {cliStatus?.commandPath && cliEnabled ? (
-
- {translate('auto.components.settings.BrowserUsePane.e9f3f3b488', 'Installed at')}{' '}
- {cliStatus.commandPath}
-
- ) : null}
- {cliPathNeedsAttention && cliStatus?.detail ? (
-
{cliStatus.detail}
- ) : null}
-
-
-
-
-
- void onEnableCli()}
- >
- {cliBusy
- ? translate(
- 'auto.components.settings.BrowserUsePane.8b3054dac7',
- 'Registering...'
- )
- : cliEnabled
- ? translate('auto.components.settings.BrowserUsePane.0289434ed6', 'Enabled')
- : cliPathNeedsAttention
- ? translate(
- 'auto.components.settings.BrowserUsePane.ad8cb0ee22',
- 'Fix PATH'
- )
- : translate('auto.components.settings.BrowserUsePane.de9b2f32f3', 'Enable')}
-
-
-
- {!cliSupported && !cliLoading && cliStatus?.detail ? (
-
- {cliStatus.detail}
-
- ) : null}
-
-
-
- )
-}
diff --git a/src/renderer/src/components/settings/BrowserUseCookieImportStep.tsx b/src/renderer/src/components/settings/BrowserUseCookieImportStep.tsx
index d7525d2b0dc..50e40c0d658 100644
--- a/src/renderer/src/components/settings/BrowserUseCookieImportStep.tsx
+++ b/src/renderer/src/components/settings/BrowserUseCookieImportStep.tsx
@@ -25,7 +25,7 @@ import { translate } from '@/i18n/i18n'
type BrowserUseCookieImportStepProps = {
cookiesImported: boolean
isImportingDefault: boolean
- step3Blocked: boolean
+ disabled: boolean
sourceLabel: string | null
onConfigureMoreBrowsers?: () => void
}
@@ -33,7 +33,7 @@ type BrowserUseCookieImportStepProps = {
export function BrowserUseCookieImportStep({
cookiesImported,
isImportingDefault,
- step3Blocked,
+ disabled,
sourceLabel,
onConfigureMoreBrowsers
}: BrowserUseCookieImportStepProps): React.JSX.Element {
@@ -95,15 +95,12 @@ export function BrowserUseCookieImportStep({
'auto.components.settings.BrowserUsePane.af8c83ed61',
'Import cookies from Chrome, Edge, or other browsers so agents can reuse your logins.'
)}
- keywords={getBrowserUsePaneSearchEntries()[2].keywords}
- className={cn(
- 'rounded-xl border border-border/60 bg-card/50 p-4',
- step3Blocked && 'opacity-60'
- )}
+ keywords={getBrowserUsePaneSearchEntries()[1].keywords}
+ className={cn('rounded-xl border border-border/60 bg-card/50 p-4', disabled && 'opacity-60')}
>
diff --git a/src/renderer/src/components/settings/BrowserUsePane.tsx b/src/renderer/src/components/settings/BrowserUsePane.tsx
index 73564a22d4e..517a79afbb2 100644
--- a/src/renderer/src/components/settings/BrowserUsePane.tsx
+++ b/src/renderer/src/components/settings/BrowserUsePane.tsx
@@ -1,23 +1,15 @@
-import { useCallback, useEffect, useState } from 'react'
-import { toast } from 'sonner'
-import type { CliInstallStatus } from '../../../../shared/cli-install-types'
+import { useEffect, useState } from 'react'
import {
ORCA_CLI_SKILL_INSTALL_COMMAND,
ORCA_CLI_SKILL_NAME,
ORCA_CLI_SKILL_UPDATE_COMMAND
} from '@/lib/agent-feature-install-commands'
-import {
- AGENT_SKILL_CLI_PREREQUISITE_NOTICE,
- ensureOrcaCliAvailableForAgentSkillTerminal,
- isOrcaCliAvailableOnPath
-} from '@/lib/agent-skill-cli-prerequisite'
import { BROWSER_USE_ENABLED_STORAGE_KEY } from '@/lib/browser-use-setup-state'
import {
GLOBAL_AGENT_SKILL_SOURCE_KINDS,
useInstalledAgentSkill
} from '@/hooks/useInstalledAgentSkills'
import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime'
-import { useMountedRef } from '@/hooks/useMountedRef'
import { cn } from '@/lib/utils'
import { useAppStore } from '../../store'
import { BROWSER_FAMILY_LABELS } from '../../../../shared/constants'
@@ -28,13 +20,8 @@ import { BrowserUseExamples } from './BrowserUseExamples'
import { BrowserUseComputerUseNotice } from './BrowserUseComputerUseNotice'
import { BrowserUseEnableSwitch } from './BrowserUseEnableSwitch'
import { BrowserUseSkillStep } from './BrowserUseSkillStep'
-import { BrowserUseCliStep } from './BrowserUseCliStep'
import { BrowserUseCookieImportStep } from './BrowserUseCookieImportStep'
-import {
- buildSkillCommandForRuntime,
- ensureWslCliAvailableForAgentSkillTerminal,
- getWslCliDistroRequest
-} from './CliSkillRuntimeSetup'
+import { buildSkillCommandForRuntime } from './CliSkillRuntimeSetup'
import { translate } from '@/i18n/i18n'
type BrowserUseSetupProps = {
@@ -51,10 +38,6 @@ export function BrowserUseSetup({
const fetchBrowserSessionProfiles = useAppStore((s) => s.fetchBrowserSessionProfiles)
const browserSessionImportState = useAppStore((s) => s.browserSessionImportState)
- const [cliStatus, setCliStatus] = useState
(null)
- const [cliLoading, setCliLoading] = useState(true)
- const [cliBusy, setCliBusy] = useState(false)
- const mountedRef = useMountedRef()
const activeSkillRuntime = useActiveProjectSkillRuntime()
const browserUseInstallCommand = !activeSkillRuntime.installDisabledReason
? buildSkillCommandForRuntime(ORCA_CLI_SKILL_INSTALL_COMMAND, activeSkillRuntime.agentRuntime)
@@ -63,15 +46,6 @@ export function BrowserUseSetup({
? buildSkillCommandForRuntime(ORCA_CLI_SKILL_UPDATE_COMMAND, activeSkillRuntime.agentRuntime)
: ORCA_CLI_SKILL_UPDATE_COMMAND
- const handleCliStatusChange = useCallback(
- (nextStatus: CliInstallStatus | null): void => {
- if (mountedRef.current) {
- setCliStatus(nextStatus)
- }
- },
- [mountedRef]
- )
-
const [browserUseEnabled, setBrowserUseEnabled] = useState(() => {
return localStorage.getItem(BROWSER_USE_ENABLED_STORAGE_KEY) === '1'
})
@@ -84,54 +58,16 @@ export function BrowserUseSetup({
}
}
- const refreshCli = useCallback(async (): Promise => {
- setCliLoading(true)
- try {
- if (activeSkillRuntime.installDisabledReason) {
- handleCliStatusChange(null)
- return
- }
- const nextStatus =
- activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? await window.api.cli.getWslInstallStatus(
- getWslCliDistroRequest(activeSkillRuntime.agentRuntime)
- )
- : await window.api.cli.getInstallStatus()
- handleCliStatusChange(nextStatus)
- } catch (error) {
- if (mountedRef.current) {
- toast.error(
- error instanceof Error
- ? error.message
- : translate(
- 'auto.components.settings.BrowserUsePane.180a9abf3a',
- 'Failed to load CLI status.'
- )
- )
- }
- } finally {
- if (mountedRef.current) {
- setCliLoading(false)
- }
- }
- }, [activeSkillRuntime, handleCliStatusChange, mountedRef])
-
useEffect(() => {
if (!browserUseEnabled) {
return
}
- void refreshCli()
void fetchBrowserSessionProfiles()
- }, [browserUseEnabled, fetchBrowserSessionProfiles, refreshCli])
+ }, [browserUseEnabled, fetchBrowserSessionProfiles])
const defaultProfile = browserSessionProfiles.find((p) => p.id === 'default')
const cookiesImported = !!defaultProfile?.source
- const cliEnabled = isOrcaCliAvailableOnPath(cliStatus)
- const cliPathNeedsAttention =
- cliStatus?.state === 'installed' && cliStatus.pathConfigured === false
- const cliSupported = cliStatus?.supported ?? false
-
const {
installed: skillDetected,
loading: skillLoading,
@@ -143,47 +79,18 @@ export function BrowserUseSetup({
sourceKinds: GLOBAL_AGENT_SKILL_SOURCE_KINDS
})
- const handleEnableCli = async (): Promise => {
- if (activeSkillRuntime.installDisabledReason) {
- return
- }
- setCliBusy(true)
- try {
- const next =
- activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? await ensureWslCliAvailableForAgentSkillTerminal(activeSkillRuntime.agentRuntime)
- : await ensureOrcaCliAvailableForAgentSkillTerminal({
- onStatusChange: handleCliStatusChange
- })
- if (activeSkillRuntime.agentRuntime?.runtime === 'wsl') {
- handleCliStatusChange(next)
- }
- if (mountedRef.current && isOrcaCliAvailableOnPath(next)) {
- toast.success(
- translate(
- 'auto.components.settings.BrowserUsePane.721aee31b4',
- 'Registered the Orca CLI in PATH.'
- )
- )
- }
- } finally {
- if (mountedRef.current) {
- setCliBusy(false)
- }
- }
- }
-
const isImportingDefault =
browserSessionImportState?.profileId === 'default' &&
browserSessionImportState.status === 'importing'
- const showStep1 = matchesSettingsSearch(searchQuery, [getBrowserUsePaneSearchEntries()[0]])
- const showStep2 = matchesSettingsSearch(searchQuery, [getBrowserUsePaneSearchEntries()[1]])
- const showStep3 = matchesSettingsSearch(searchQuery, [getBrowserUsePaneSearchEntries()[2]])
- const completedCount = [cliEnabled, skillDetected, cookiesImported].filter(Boolean).length
- const step2Blocked =
- Boolean(activeSkillRuntime.installDisabledReason) || (!cliEnabled && !skillDetected)
- const step3Blocked = !cookiesImported && (!cliEnabled || !skillDetected)
+ const showSkillStep = matchesSettingsSearch(searchQuery, [getBrowserUsePaneSearchEntries()[0]])
+ const showCookieImportStep = matchesSettingsSearch(searchQuery, [
+ getBrowserUsePaneSearchEntries()[1]
+ ])
+ const steps = [skillDetected, cookiesImported]
+ const completedCount = steps.filter(Boolean).length
+ const skillDisabled = Boolean(activeSkillRuntime.installDisabledReason)
+ const cookieImportDisabled = !cookiesImported && !skillDetected
const sourceLabel = defaultProfile?.source
? `${BROWSER_FAMILY_LABELS[defaultProfile.source.browserFamily] ?? defaultProfile.source.browserFamily}${defaultProfile.source.profileName ? ` (${defaultProfile.source.profileName})` : ''}`
@@ -220,20 +127,20 @@ export function BrowserUseSetup({
{translate(
- 'auto.components.settings.BrowserUsePane.702488a5f7',
- 'Let coding agents drive this browser with your logins. Finish the three steps below.'
+ 'auto.components.settings.BrowserUsePane.finishSteps',
+ 'Let coding agents drive this browser with your logins. Finish the steps below.'
)}
- {completedCount}/3
+ {completedCount}/{steps.length}
) : null}
- {showStep1 ? (
-
void handleEnableCli()}
- />
- ) : null}
-
- {showStep2 ? (
+ {showSkillStep ? (
- activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? window.api.cli.getWslInstallStatus(
- getWslCliDistroRequest(activeSkillRuntime.agentRuntime)
- )
- : window.api.cli.getInstallStatus()
- }
- onBeforeOpenTerminal={async () => {
+ onBeforeOpenTerminal={() => {
useAppStore.getState().recordFeatureInteraction('agent-browser-setup')
- await (activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? ensureWslCliAvailableForAgentSkillTerminal(activeSkillRuntime.agentRuntime)
- : ensureOrcaCliAvailableForAgentSkillTerminal({
- onStatusChange: handleCliStatusChange
- }))
}}
onRecheck={refreshSkill}
/>
) : null}
- {showStep3 ? (
+ {showCookieImportStep ? (
>>
onBeforeOpenTerminal?: () => void | Promise
onRecheck: () => void | Promise
}
@@ -28,8 +25,6 @@ export function BrowserUseSkillStep({
disabled = false,
terminalShellOverride,
terminalRuntime,
- preInstallNotice,
- getPrerequisiteStatus,
onBeforeOpenTerminal,
onRecheck
}: Props): React.JSX.Element {
@@ -55,9 +50,7 @@ export function BrowserUseSkillStep({
loading={skillLoading}
error={skillError}
installDisabled={disabled}
- leading={
- onBeforeOpenTerminal: () => Promise
- },
- useInstalledAgentSkill: vi.fn()
-}))
+type CapturedPanelProps = {
+ command: string
+ installedCommand: string
+ terminalRuntime?: { runtime: 'host' | 'wsl'; wslDistro?: string | null; label: string }
+ freshnessSkillName?: string
+ getPrerequisiteStatus?: () => Promise
+ onBeforeOpenTerminal?: () => Promise
+}
+
+const capturedPanel = vi.hoisted(
+ (): {
+ canUseLocalSkillFreshness: boolean
+ props: CapturedPanelProps | null
+ useInstalledAgentSkill: ReturnType
+ } => ({
+ canUseLocalSkillFreshness: true,
+ props: null,
+ useInstalledAgentSkill: vi.fn()
+ })
+)
const toastError = vi.hoisted(() => vi.fn())
vi.mock('sonner', () => ({ toast: { error: toastError, success: vi.fn() } }))
@@ -52,13 +60,7 @@ afterEach(() => {
})
vi.mock('./AgentSkillSetupPanel', () => ({
- AgentSkillSetupPanel: function AgentSkillSetupPanel(props: {
- command: string
- installedCommand: string
- freshnessSkillName?: string
- getPrerequisiteStatus: () => Promise
- onBeforeOpenTerminal: () => Promise
- }) {
+ AgentSkillSetupPanel: function AgentSkillSetupPanel(props: CapturedPanelProps) {
capturedPanel.props = props
return
}
@@ -101,7 +103,7 @@ describe('CliSection project runtime defaults', () => {
expect(capturedPanel.props?.freshnessSkillName).toBeUndefined()
})
- it('passes the default project WSL distro to CLI skill prerequisite checks', async () => {
+ it('targets the default project WSL distro without registering the CLI', async () => {
const getWslInstallStatus = vi
.fn()
.mockResolvedValue({ supported: true, state: 'installed', pathConfigured: true })
@@ -130,9 +132,6 @@ describe('CliSection project runtime defaults', () => {
/>
)
- await capturedPanel.props?.getPrerequisiteStatus()
- await capturedPanel.props?.onBeforeOpenTerminal()
-
expect(capturedPanel.useInstalledAgentSkill).toHaveBeenCalledWith(
'orca-cli',
expect.objectContaining({
@@ -147,8 +146,9 @@ describe('CliSection project runtime defaults', () => {
wslDistro: 'Ubuntu',
label: 'WSL Ubuntu'
})
- expect(getWslInstallStatus).toHaveBeenCalledWith({ distro: 'Ubuntu' })
- expect(getWslInstallStatus).toHaveBeenCalledTimes(2)
+ expect(capturedPanel.props?.getPrerequisiteStatus).toBeUndefined()
+ expect(capturedPanel.props?.onBeforeOpenTerminal).toBeUndefined()
+ expect(getWslInstallStatus).not.toHaveBeenCalled()
})
it('renders an inline unknown PATH state without offering a mutation', async () => {
diff --git a/src/renderer/src/components/settings/CliSection.tsx b/src/renderer/src/components/settings/CliSection.tsx
index 85a738860a4..8f6b5c85152 100644
--- a/src/renderer/src/components/settings/CliSection.tsx
+++ b/src/renderer/src/components/settings/CliSection.tsx
@@ -8,11 +8,6 @@ import {
ORCA_CLI_SKILL_NAME,
ORCA_CLI_SKILL_UPDATE_COMMAND
} 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
@@ -26,11 +21,9 @@ import { AgentSkillSetupPanel } from './AgentSkillSetupPanel'
import { CliRegistrationDialog } from './CliRegistrationDialog'
import {
buildSkillCommandForRuntime,
- ensureWslCliAvailableForAgentSkillTerminal,
getAgentSkillTerminalShellOverride,
getSelectedAgentRuntime,
- getSkillDiscoveryTargetForRuntime,
- getWslCliDistroRequest
+ getSkillDiscoveryTargetForRuntime
} from './CliSkillRuntimeSetup'
import { WslCliRegistration } from './WslCliRegistration'
import { useCliRegistrationActions } from './use-cli-registration-actions'
@@ -115,14 +108,6 @@ export function CliSection({
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 => {
if (mountedRef.current) {
@@ -185,8 +170,8 @@ export function CliSection({
{translate(
- 'auto.components.settings.CliSection.6930feda9e',
- 'Use Orca from your terminal to open the app, manage worktrees, and interact with Orca terminals.'
+ 'auto.components.settings.CliSection.outsideOrcaDescription',
+ 'Orca terminals already have `orca`. Turn this on to use `orca` from other terminals outside Orca.'
)}
@@ -350,16 +335,6 @@ export function CliSection({
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}
freshnessSkillName={cliSkillFreshnessName}
/>
diff --git a/src/renderer/src/components/settings/ComputerUseSkillSetupPanel.tsx b/src/renderer/src/components/settings/ComputerUseSkillSetupPanel.tsx
index 9acfddd23bc..ba2f4458842 100644
--- a/src/renderer/src/components/settings/ComputerUseSkillSetupPanel.tsx
+++ b/src/renderer/src/components/settings/ComputerUseSkillSetupPanel.tsx
@@ -4,10 +4,6 @@ import {
COMPUTER_USE_SKILL_NAME,
COMPUTER_USE_SKILL_UPDATE_COMMAND
} from '@/lib/agent-feature-install-commands'
-import {
- AGENT_SKILL_CLI_PREREQUISITE_NOTICE,
- ensureOrcaCliAvailableForAgentSkillTerminal
-} from '@/lib/agent-skill-cli-prerequisite'
import {
GLOBAL_AGENT_SKILL_SOURCE_KINDS,
useInstalledAgentSkill
@@ -15,11 +11,7 @@ import {
import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime'
import { useAppStore } from '@/store'
import { AgentSkillSetupPanel } from './AgentSkillSetupPanel'
-import {
- buildSkillCommandForRuntime,
- ensureWslCliAvailableForAgentSkillTerminal,
- getWslCliDistroRequest
-} from './CliSkillRuntimeSetup'
+import { buildSkillCommandForRuntime } from './CliSkillRuntimeSetup'
import { translate } from '@/i18n/i18n'
export function ComputerUseSkillSetupPanel(): React.JSX.Element {
@@ -65,19 +57,8 @@ export function ComputerUseSkillSetupPanel(): React.JSX.Element {
error={activeSkillRuntime.installDisabledReason ?? computerUseSkillError}
installDisabled={Boolean(activeSkillRuntime.installDisabledReason)}
icon={
}
- preInstallNotice={AGENT_SKILL_CLI_PREREQUISITE_NOTICE}
- getPrerequisiteStatus={() =>
- activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? window.api.cli.getWslInstallStatus(
- getWslCliDistroRequest(activeSkillRuntime.agentRuntime)
- )
- : window.api.cli.getInstallStatus()
- }
- onBeforeOpenTerminal={async () => {
+ onBeforeOpenTerminal={() => {
useAppStore.getState().recordFeatureInteraction('computer-use-setup')
- await (activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? ensureWslCliAvailableForAgentSkillTerminal(activeSkillRuntime.agentRuntime)
- : ensureOrcaCliAvailableForAgentSkillTerminal())
}}
onRecheck={refreshComputerUseSkill}
freshnessSkillName={
diff --git a/src/renderer/src/components/settings/EphemeralVmsPane.tsx b/src/renderer/src/components/settings/EphemeralVmsPane.tsx
index 7b0086ae78b..5814478eeb5 100644
--- a/src/renderer/src/components/settings/EphemeralVmsPane.tsx
+++ b/src/renderer/src/components/settings/EphemeralVmsPane.tsx
@@ -8,10 +8,6 @@ import { Button } from '../ui/button'
import { AgentSkillSetupPanel } from './AgentSkillSetupPanel'
import { EphemeralVmRecipeRow } from './EphemeralVmRecipeRow'
import { translate } from '@/i18n/i18n'
-import {
- AGENT_SKILL_CLI_PREREQUISITE_NOTICE,
- ensureOrcaCliAvailableForAgentSkillTerminal
-} from '@/lib/agent-skill-cli-prerequisite'
import {
EPHEMERAL_VMS_SKILL_INSTALL_COMMAND,
EPHEMERAL_VMS_SKILL_NAME,
@@ -22,11 +18,7 @@ import {
useInstalledAgentSkill
} from '@/hooks/useInstalledAgentSkills'
import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime'
-import {
- buildSkillCommandForRuntime,
- ensureWslCliAvailableForAgentSkillTerminal,
- getWslCliDistroRequest
-} from './CliSkillRuntimeSetup'
+import { buildSkillCommandForRuntime } from './CliSkillRuntimeSetup'
type RecipeCatalogEntry = Awaited<
ReturnType
@@ -187,19 +179,6 @@ export function EphemeralVmsPane(): React.JSX.Element {
error={activeSkillRuntime.installDisabledReason ?? skillError}
installDisabled={Boolean(activeSkillRuntime.installDisabledReason)}
icon={
+ } => ({
+ canUseLocalSkillFreshness: true,
+ freshnessSkillName: undefined,
+ panelProps: {}
+ })
+)
vi.mock('@/hooks/useActiveProjectSkillRuntime', () => ({
useActiveProjectSkillRuntime: () => ({
@@ -16,30 +23,25 @@ vi.mock('@/hooks/useActiveProjectSkillRuntime', () => ({
vi.mock('../emulator-pane/use-mobile-emulator-agent-setup-state', () => ({
useMobileEmulatorAgentSetupState: () => ({
- cliActionLabel: 'Enable',
- cliBusy: false,
- cliEnabled: true,
- cliInstallStatus: null,
- cliLoading: false,
cliSkillError: null,
cliSkillInstalled: true,
cliSkillLoading: false,
- cliSupported: true,
- completedCount: 2,
- handleEnableCli: vi.fn(),
+ recheckSetup: vi.fn(),
refreshCliSkill: vi.fn(),
- step2Blocked: false
+ setupComplete: true,
+ setupRechecking: false,
+ statusReady: true
})
}))
vi.mock('./AgentSkillSetupPanel', () => ({
- AgentSkillSetupPanel: ({ freshnessSkillName }: { freshnessSkillName?: string }) => {
- mocks.freshnessSkillName = freshnessSkillName
+ AgentSkillSetupPanel: (props: Record & { freshnessSkillName?: string }) => {
+ mocks.freshnessSkillName = props.freshnessSkillName
+ mocks.panelProps = props
return null
}
}))
-vi.mock('./SetupStepBadge', () => ({ StepBadge: () => null }))
vi.mock('./MobileEmulatorExamples', () => ({ MobileEmulatorExamples: () => null }))
describe('MobileEmulatorAgentControlRow freshness authority', () => {
@@ -56,4 +58,11 @@ describe('MobileEmulatorAgentControlRow freshness authority', () => {
renderToStaticMarkup( => {
- await setup.handleEnableCli()
- }
-
return (
@@ -55,98 +43,10 @@ export function MobileEmulatorAgentControlRow(): React.JSX.Element {
)}
-
- {setup.completedCount}/2
-
-
-
-
-
- {translate(
- 'auto.components.settings.MobileEmulatorAgentControlRow.4f2205f3b6',
- 'Enable Orca CLI'
- )}
-
-
- {translate(
- 'auto.components.settings.MobileEmulatorAgentControlRow.2fef055608',
- 'Registers the Orca CLI command so agents can control the active emulator from their shell.'
- )}
-
- {setup.cliInstallStatus?.commandPath && setup.cliEnabled ? (
-
- {translate(
- 'auto.components.settings.MobileEmulatorAgentControlRow.aaf62a3dd2',
- 'Installed at'
- )}{' '}
-
- {setup.cliInstallStatus.commandPath}
-
-
- ) : null}
- {!setup.cliEnabled && setup.cliInstallStatus?.detail ? (
-
{setup.cliInstallStatus.detail}
- ) : null}
- {setup.cliBusy ? (
-
- {translate(
- 'auto.components.settings.MobileEmulatorAgentControlRow.3d34423e88',
- 'Registering the Orca CLI'
- )}{' '}
- {setup.cliInstallStatus?.commandPath ? (
-
- {setup.cliInstallStatus.commandPath}
-
- ) : null}{' '}
- {translate(
- 'auto.components.settings.MobileEmulatorAgentControlRow.3be27641c9',
- 'so emulator commands can run from agent shells.'
- )}
-
- ) : null}
-
-
-
-
-
- void handleEnableCli()}
- >
- {setup.cliLoading || setup.cliBusy ? (
-
-
-
- {!setup.cliSupported && !setup.cliLoading && setup.cliInstallStatus?.detail ? (
-
- {setup.cliInstallStatus.detail}
-
- ) : null}
-
-
-
-
-
+
}
- preInstallNotice={AGENT_SKILL_CLI_PREREQUISITE_NOTICE}
- openingHint={translate(
- 'auto.components.settings.MobileEmulatorAgentControlRow.3941719a56',
- 'Checking Orca CLI before opening skill setup.'
- )}
- onBeforeOpenTerminal={async () => {
- await ensureOrcaCliAvailableForAgentSkillTerminal()
- }}
onRecheck={setup.refreshCliSkill}
freshnessSkillName={
activeSkillRuntime.canUseLocalSkillFreshness ? ORCA_CLI_SKILL_NAME : undefined
diff --git a/src/renderer/src/components/settings/OrchestrationPane.tsx b/src/renderer/src/components/settings/OrchestrationPane.tsx
index e3230f4cf86..ef3df303166 100644
--- a/src/renderer/src/components/settings/OrchestrationPane.tsx
+++ b/src/renderer/src/components/settings/OrchestrationPane.tsx
@@ -2,10 +2,6 @@ import { useState } from 'react'
import { ArrowRightLeft, GitBranch, ListChecks, Workflow, type LucideIcon } from 'lucide-react'
import { ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-install-commands'
import type { SkillUsageExample } from '@/lib/skill-usage-example'
-import {
- AGENT_SKILL_CLI_PREREQUISITE_NOTICE,
- ensureOrcaCliAvailableForAgentSkillTerminal
-} from '@/lib/agent-skill-cli-prerequisite'
import {
ORCHESTRATION_SKILL_INSTALL_COMMAND,
ORCHESTRATION_SKILL_UPDATE_COMMAND
@@ -21,11 +17,7 @@ import { matchesSettingsSearch } from './settings-search'
import { useAppStore } from '../../store'
import { getOrchestrationPaneSearchEntries } from './orchestration-search'
import { AgentSkillSetupPanel } from './AgentSkillSetupPanel'
-import {
- buildSkillCommandForRuntime,
- ensureWslCliAvailableForAgentSkillTerminal,
- getWslCliDistroRequest
-} from './CliSkillRuntimeSetup'
+import { buildSkillCommandForRuntime } from './CliSkillRuntimeSetup'
import { OrchestrationSkillAgentCoverage } from './OrchestrationSkillAgentCoverage'
import { SkillUsageExamplesSection } from './SkillUsageExamplesSection'
import { OrchestrationSkillPromptDialog } from './OrchestrationSkillPromptDialog'
@@ -132,19 +124,8 @@ export function OrchestrationPane({
error={activeSkillRuntime.installDisabledReason ?? orchestrationSkillError}
installDisabled={Boolean(activeSkillRuntime.installDisabledReason)}
icon={
}
- preInstallNotice={AGENT_SKILL_CLI_PREREQUISITE_NOTICE}
- getPrerequisiteStatus={() =>
- activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? window.api.cli.getWslInstallStatus(
- getWslCliDistroRequest(activeSkillRuntime.agentRuntime)
- )
- : window.api.cli.getInstallStatus()
- }
- onBeforeOpenTerminal={async () => {
+ onBeforeOpenTerminal={() => {
useAppStore.getState().recordFeatureInteraction('agent-orchestration-setup')
- await (activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? ensureWslCliAvailableForAgentSkillTerminal(activeSkillRuntime.agentRuntime)
- : ensureOrcaCliAvailableForAgentSkillTerminal())
}}
actionHint={
// Installed updates stay on the primary panel so there is only one update path.
diff --git a/src/renderer/src/components/settings/OrchestrationSetupCard.tsx b/src/renderer/src/components/settings/OrchestrationSetupCard.tsx
index 39e01a59683..9ca5be26fdb 100644
--- a/src/renderer/src/components/settings/OrchestrationSetupCard.tsx
+++ b/src/renderer/src/components/settings/OrchestrationSetupCard.tsx
@@ -1,8 +1,4 @@
import type { JSX } from 'react'
-import {
- AGENT_SKILL_CLI_PREREQUISITE_NOTICE,
- ensureOrcaCliAvailableForAgentSkillTerminal
-} from '@/lib/agent-skill-cli-prerequisite'
import {
ORCHESTRATION_SKILL_INSTALL_COMMAND,
ORCHESTRATION_SKILL_UPDATE_COMMAND
@@ -11,11 +7,7 @@ import { ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-install-commands'
import type { InstalledAgentSkillState } from '@/hooks/useInstalledAgentSkills'
import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime'
import { AgentSkillSetupPanel } from './AgentSkillSetupPanel'
-import {
- buildSkillCommandForRuntime,
- ensureWslCliAvailableForAgentSkillTerminal,
- getWslCliDistroRequest
-} from './CliSkillRuntimeSetup'
+import { buildSkillCommandForRuntime } from './CliSkillRuntimeSetup'
import { useAppStore } from '@/store'
import { translate } from '@/i18n/i18n'
@@ -62,19 +54,8 @@ export function OrchestrationSetupCard(props: {
error={activeSkillRuntime.installDisabledReason ?? skill.error}
installDisabled={Boolean(activeSkillRuntime.installDisabledReason)}
terminalHeightPx={terminalHeightPx}
- preInstallNotice={AGENT_SKILL_CLI_PREREQUISITE_NOTICE}
- getPrerequisiteStatus={() =>
- activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? window.api.cli.getWslInstallStatus(
- getWslCliDistroRequest(activeSkillRuntime.agentRuntime)
- )
- : window.api.cli.getInstallStatus()
- }
- onBeforeOpenTerminal={async () => {
+ onBeforeOpenTerminal={() => {
useAppStore.getState().recordFeatureInteraction('agent-orchestration-setup')
- await (activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? ensureWslCliAvailableForAgentSkillTerminal(activeSkillRuntime.agentRuntime)
- : ensureOrcaCliAvailableForAgentSkillTerminal())
}}
onRecheck={skill.refresh}
freshnessSkillName={
diff --git a/src/renderer/src/components/settings/TaskSourceLinearSetup.tsx b/src/renderer/src/components/settings/TaskSourceLinearSetup.tsx
index 8b349db4959..9d439086555 100644
--- a/src/renderer/src/components/settings/TaskSourceLinearSetup.tsx
+++ b/src/renderer/src/components/settings/TaskSourceLinearSetup.tsx
@@ -142,9 +142,6 @@ export function TaskSourceLinearSetup({
loading={skillSetup.skillLoading}
error={skillSetup.error}
installDisabled={skillSetup.installDisabled}
- preInstallNotice={skillSetup.preInstallNotice}
- getPrerequisiteStatus={skillSetup.getPrerequisiteStatus}
- onBeforeOpenTerminal={skillSetup.onBeforeOpenTerminal}
onRecheck={skillSetup.refreshSkill}
freshnessSkillName={skillSetup.freshnessSkillName}
/>
diff --git a/src/renderer/src/components/settings/browser-use-search.ts b/src/renderer/src/components/settings/browser-use-search.ts
index ee48211ac0c..c065960b736 100644
--- a/src/renderer/src/components/settings/browser-use-search.ts
+++ b/src/renderer/src/components/settings/browser-use-search.ts
@@ -3,29 +3,6 @@ import { translateSearchKeyword } from './settings-search-keywords'
import { createLocalizedCatalog } from '@/i18n/localized-catalog'
export const getBrowserUsePaneSearchEntries = createLocalizedCatalog(() => [
- {
- title: translate('auto.components.settings.browser.use.search.50f0860e18', 'Enable Orca CLI'),
- description: translate(
- 'auto.components.settings.browser.use.search.890ddf943d',
- 'Register the Orca CLI so agents can drive the browser.'
- ),
- keywords: [
- ...translateSearchKeyword(
- 'auto.components.settings.browser.use.search.ba4eb53b72',
- 'browser use'
- ),
- ...translateSearchKeyword('auto.components.settings.browser.use.search.85fab5e12c', 'cli'),
- ...translateSearchKeyword('auto.components.settings.browser.use.search.ff05cbc344', 'orca'),
- ...translateSearchKeyword('auto.components.settings.browser.use.search.30c74aaa1f', 'path'),
- ...translateSearchKeyword(
- 'auto.components.settings.browser.use.search.3ffafc9b95',
- 'command'
- ),
- ...translateSearchKeyword('auto.components.settings.browser.use.search.7e0dcb257a', 'shell'),
- ...translateSearchKeyword('auto.components.settings.browser.use.search.034c5e8d7f', 'enable'),
- ...translateSearchKeyword('auto.components.settings.browser.use.search.e56c7b55c9', 'setup')
- ]
- },
{
title: translate(
'auto.components.settings.browser.use.search.a1414dcefb',
diff --git a/src/renderer/src/components/settings/use-linear-agent-skill-setup.ts b/src/renderer/src/components/settings/use-linear-agent-skill-setup.ts
index f3a32534fe4..59f18dfe4cd 100644
--- a/src/renderer/src/components/settings/use-linear-agent-skill-setup.ts
+++ b/src/renderer/src/components/settings/use-linear-agent-skill-setup.ts
@@ -1,8 +1,4 @@
-import { useCallback, useMemo } from 'react'
-import {
- AGENT_SKILL_CLI_PREREQUISITE_NOTICE,
- ensureOrcaCliAvailableForAgentSkillTerminal
-} from '@/lib/agent-skill-cli-prerequisite'
+import { useMemo } from 'react'
import {
LINEAR_AGENT_SKILL_NAMES,
ORCA_LINEAR_SKILL_INSTALL_COMMAND
@@ -13,12 +9,7 @@ import {
useInstalledAgentSkillNames
} from '@/hooks/useInstalledAgentSkills'
import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime'
-import {
- buildSkillCommandForRuntime,
- ensureWslCliAvailableForAgentSkillTerminal,
- getWslCliDistroRequest,
- type LocalAgentRuntime
-} from './CliSkillRuntimeSetup'
+import { buildSkillCommandForRuntime, type LocalAgentRuntime } from './CliSkillRuntimeSetup'
// Shared install/update wiring for Task Sources + Linear settings.
export function useLinearAgentSkillSetup(): {
@@ -36,10 +27,7 @@ export function useLinearAgentSkillSetup(): {
error: string | null
terminalShellOverride: string | undefined
terminalRuntime: LocalAgentRuntime | undefined
- preInstallNotice: string
refreshSkill: () => Promise
- getPrerequisiteStatus: () => Promise>>
- onBeforeOpenTerminal: () => Promise
} {
const activeSkillRuntime = useActiveProjectSkillRuntime()
const {
@@ -76,22 +64,6 @@ export function useLinearAgentSkillSetup(): {
? updateTarget.skillName
: undefined
- const getPrerequisiteStatus = useCallback(
- () =>
- activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? window.api.cli.getWslInstallStatus(
- getWslCliDistroRequest(activeSkillRuntime.agentRuntime)
- )
- : window.api.cli.getInstallStatus(),
- [activeSkillRuntime.agentRuntime]
- )
-
- const onBeforeOpenTerminal = useCallback(async () => {
- await (activeSkillRuntime.agentRuntime?.runtime === 'wsl'
- ? ensureWslCliAvailableForAgentSkillTerminal(activeSkillRuntime.agentRuntime)
- : ensureOrcaCliAvailableForAgentSkillTerminal())
- }, [activeSkillRuntime.agentRuntime])
-
const installDisabled = Boolean(activeSkillRuntime.installDisabledReason)
return {
@@ -106,9 +78,6 @@ export function useLinearAgentSkillSetup(): {
error: activeSkillRuntime.installDisabledReason ?? skillError,
terminalShellOverride: activeSkillRuntime.terminalShellOverride,
terminalRuntime: activeSkillRuntime.agentRuntime,
- preInstallNotice: AGENT_SKILL_CLI_PREREQUISITE_NOTICE,
- refreshSkill,
- getPrerequisiteStatus,
- onBeforeOpenTerminal
+ refreshSkill
}
}
diff --git a/src/renderer/src/components/setup-guide/SetupGuideModal.tsx b/src/renderer/src/components/setup-guide/SetupGuideModal.tsx
index 79d11b7b23c..b8f4f5b044f 100644
--- a/src/renderer/src/components/setup-guide/SetupGuideModal.tsx
+++ b/src/renderer/src/components/setup-guide/SetupGuideModal.tsx
@@ -1,5 +1,4 @@
import { useCallback, useEffect, useMemo, useState, type JSX } from 'react'
-import { EyeOff } from 'lucide-react'
import {
FEATURE_WALL_SETUP_STEP_IDS,
getFirstIncompleteFeatureWallSetupStepId,
@@ -14,10 +13,8 @@ import {
DialogTitle
} from '@/components/ui/dialog'
import { Button } from '@/components/ui/button'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import { useAppStore } from '@/store'
import { FeatureWallSetupChecklist } from '../feature-wall/FeatureWallSetupChecklist'
-import { SetupGuideProgressRing } from './SetupGuideProgressRing'
import { useSetupGuideProgress } from './use-setup-guide-progress'
import { useSetupGuideOpenCloseTelemetry } from './use-setup-guide-telemetry'
import { translate } from '@/i18n/i18n'
@@ -141,44 +138,24 @@ function SetupGuideModalContent({
className="grid h-[min(780px,calc(100vh-2rem))] w-[min(1080px,calc(100vw-2rem))] max-w-none grid-rows-[auto_minmax(0,1fr)] gap-0 p-0 sm:max-w-none"
tabIndex={-1}
>
-
-
-
-
-
-
- {translate(
- 'auto.components.setup.guide.SetupGuideModal.28cf59fcb4',
- 'This will hide the checklist from the sidebar'
- )}
-
-
+ {/* Why: labeled so it can't be mistaken for close; hidden below sm, where the header
+ centers the title under it (the sidebar entry keeps its own hide control). */}
+
+ {translate(
+ 'auto.components.setup.guide.SetupGuideModal.f3b5ffb2a6',
+ 'Hide checklist from sidebar'
+ )}
+
-
-
- {translate(
- 'auto.components.setup.guide.SetupGuideModal.48a9e5ef2d',
- 'Getting started'
- )}
-
-
+
+ {translate('auto.components.setup.guide.SetupGuideModal.48a9e5ef2d', 'Getting started')}
+
{translate(
'auto.components.setup.guide.SetupGuideModal.3598a3ca0c',
diff --git a/src/renderer/src/components/sidebar/LinearAgentSkillSetupDialog.tsx b/src/renderer/src/components/sidebar/LinearAgentSkillSetupDialog.tsx
index 3e4749f0f3b..a7b79c9b29f 100644
--- a/src/renderer/src/components/sidebar/LinearAgentSkillSetupDialog.tsx
+++ b/src/renderer/src/components/sidebar/LinearAgentSkillSetupDialog.tsx
@@ -12,10 +12,6 @@ import {
DialogHeader,
DialogTitle
} from '@/components/ui/dialog'
-import {
- AGENT_SKILL_CLI_PREREQUISITE_NOTICE,
- isOrcaCliAvailableOnPath
-} from '@/lib/agent-skill-cli-prerequisite'
import { translate } from '@/i18n/i18n'
type AgentSkillSetupPanelProps = ComponentProps
@@ -32,8 +28,6 @@ type LinearAgentSkillSetupDialogProps = {
installed: boolean
loading: boolean
error: string | null
- getPrerequisiteStatus?: AgentSkillSetupPanelProps['getPrerequisiteStatus']
- onBeforeOpenTerminal: AgentSkillSetupPanelProps['onBeforeOpenTerminal']
onRecheck: AgentSkillSetupPanelProps['onRecheck']
onOpenChange: (open: boolean) => void
onDismissPermanently: () => void
@@ -52,8 +46,6 @@ export function LinearAgentSkillSetupDialog({
installed,
loading,
error,
- getPrerequisiteStatus,
- onBeforeOpenTerminal,
onRecheck,
onOpenChange,
onDismissPermanently,
@@ -144,16 +136,12 @@ export function LinearAgentSkillSetupDialog({
loading={loading}
error={error}
installLabel={translate(
- 'auto.components.sidebar.LinearAgentSkillSetupPrompt.install',
- 'Install CLI & Skill'
+ 'auto.components.skills.SkillInstallDialog.39acb9e8f4',
+ 'Install skill'
)}
// Why: Install is this modal's sole CTA, so make it the filled primary —
// matching the other setup surfaces (filled primary + muted dismiss).
installVariant="default"
- preInstallNotice={AGENT_SKILL_CLI_PREREQUISITE_NOTICE}
- getPrerequisiteStatus={getPrerequisiteStatus}
- isPrerequisiteAvailable={isOrcaCliAvailableOnPath}
- onBeforeOpenTerminal={onBeforeOpenTerminal}
onRecheck={onRecheck}
/>
{/* Why: permanent opt-out as a quiet EyeOff icon next to the × — matching
diff --git a/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.reminder-toast.test.tsx b/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.reminder-toast.test.tsx
index 40d6e6259ac..603493b80c6 100644
--- a/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.reminder-toast.test.tsx
+++ b/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.reminder-toast.test.tsx
@@ -3,7 +3,6 @@
import { act, type ComponentProps, type ReactNode } from 'react'
import { createRoot, type Root } from 'react-dom/client'
import { toast } from 'sonner'
-import type { CliInstallStatus } from '../../../../shared/cli-install-types'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { LINEAR_AGENT_SKILL_NAMES } from '@/lib/agent-feature-install-commands'
import {
@@ -18,6 +17,19 @@ import { getExistingLinearAgentSkillSetupReminderState } from './linear-agent-sk
const HOST_DISMISS_STORAGE_KEY = 'orca.linearTicketsSkill.setupDismissed.host'
+const wslFedoraProps = {
+ linked: true,
+ remote: false,
+ surface: 'modal',
+ currentPlatform: 'win32',
+ settings: {
+ localAgentRuntime: 'wsl',
+ localAgentWslDistro: 'Fedora',
+ terminalWindowsShell: 'wsl.exe',
+ activeRuntimeEnvironmentId: null
+ }
+} satisfies ComponentProps
+
const mocks = vi.hoisted(() => ({
skillState: {
installed: false,
@@ -29,8 +41,6 @@ const mocks = vi.hoisted(() => ({
useInstalledAgentSkillNames: vi.fn(),
getCliStatus: vi.fn(),
getWslCliStatus: vi.fn(),
- ensureCli: vi.fn(async () => null as CliInstallStatus | null),
- ensureWslCli: vi.fn(async () => null as CliInstallStatus | null),
toastDismiss: vi.fn(),
toastWarning: vi.fn(() => 'linear-setup-toast-id'),
panelProps: [] as Record[]
@@ -48,13 +58,6 @@ vi.mock('@/hooks/useInstalledAgentSkills', async (importOriginal) => ({
useInstalledAgentSkillNames: mocks.useInstalledAgentSkillNames
}))
-vi.mock('@/lib/agent-skill-cli-prerequisite', () => ({
- AGENT_SKILL_CLI_PREREQUISITE_NOTICE: 'CLI registration notice',
- ensureOrcaCliAvailableForAgentSkillTerminal: mocks.ensureCli,
- isOrcaCliAvailableOnPath: (status: CliInstallStatus | null | undefined) =>
- status?.state === 'installed' && status.pathConfigured
-}))
-
vi.mock('../settings/CliSkillRuntimeSetup', () => ({
buildSkillCommandForRuntime: (
command: string,
@@ -62,12 +65,7 @@ vi.mock('../settings/CliSkillRuntimeSetup', () => ({
) =>
runtime.runtime === 'wsl'
? `wsl.exe${runtime.wslDistro ? ` -d '${runtime.wslDistro}'` : ''} --exec bash -lc '${command}'`
- : command,
- ensureWslCliAvailableForAgentSkillTerminal: mocks.ensureWslCli,
- getWslCliDistroRequest: (runtime?: { runtime: string; wslDistro?: string | null }) =>
- runtime?.runtime === 'wsl' && runtime.wslDistro?.trim()
- ? { distro: runtime.wslDistro.trim() }
- : undefined
+ : command
}))
vi.mock('../settings/AgentSkillSetupPanel', () => ({
@@ -78,7 +76,14 @@ vi.mock('../settings/AgentSkillSetupPanel', () => ({
{String(props.title)}
{String(props.description)}
{String(props.command)}
- void (props.onBeforeOpenTerminal as () => void)()}>
+ {
+ if (typeof props.onBeforeOpenTerminal === 'function') {
+ void props.onBeforeOpenTerminal()
+ }
+ }}
+ >
Mock install
void (props.onRecheck as () => void)()}>
@@ -92,24 +97,6 @@ vi.mock('../settings/AgentSkillSetupPanel', () => ({
let root: Root | null = null
let container: HTMLDivElement | null = null
-function cliStatus(overrides: Partial): CliInstallStatus {
- return {
- platform: 'darwin',
- commandName: 'orca',
- commandPath: '/usr/local/bin/orca',
- pathDirectory: '/usr/local/bin',
- pathConfigured: true,
- launcherPath: '/Applications/Orca.app/Contents/MacOS/Orca',
- installMethod: 'symlink',
- supported: true,
- state: 'installed',
- currentTarget: '/Applications/Orca.app/Contents/MacOS/Orca',
- unsupportedReason: null,
- detail: null,
- ...overrides
- }
-}
-
async function renderPrompt(
props: ComponentProps
): Promise {
@@ -173,15 +160,7 @@ describe('LinearAgentSkillSetupPrompt reminder toast', () => {
mocks.useInstalledAgentSkillNames.mockReset()
mocks.useInstalledAgentSkillNames.mockReturnValue(mocks.skillState)
mocks.getCliStatus.mockReset()
- mocks.getCliStatus.mockResolvedValue(
- cliStatus({ state: 'not_installed', pathConfigured: false })
- )
mocks.getWslCliStatus.mockReset()
- mocks.getWslCliStatus.mockResolvedValue(
- cliStatus({ state: 'not_installed', pathConfigured: false })
- )
- mocks.ensureCli.mockClear()
- mocks.ensureWslCli.mockClear()
mocks.toastDismiss.mockClear()
mocks.toastWarning.mockClear()
mocks.toastWarning.mockReturnValue('linear-setup-toast-id')
@@ -217,12 +196,15 @@ describe('LinearAgentSkillSetupPrompt reminder toast', () => {
expect(document.body.textContent).not.toContain(
'Enable agents to read and edit the attached Linear ticket.'
)
+ // Why: host terminals already have the bundled CLI, so host reminders name only the skill.
+ expect(mocks.getCliStatus).not.toHaveBeenCalled()
+ expect(mocks.getWslCliStatus).not.toHaveBeenCalled()
expect(toast.warning).toHaveBeenCalledWith(
- 'Orca CLI and Linear skill are missing',
+ 'Linear skill is missing',
expect.objectContaining({
id: 'linear-agent-skill-setup-orca.linearTicketsSkill.setupDismissed.host',
description:
- 'Install the Orca CLI and the Linear skill to enable your agents to read and edit Linear tasks.',
+ 'Install the Linear skill to enable your agents to read and edit Linear tasks through the Orca CLI.',
action: {
label: 'Set up',
onClick: expect.any(Function)
@@ -231,17 +213,11 @@ describe('LinearAgentSkillSetupPrompt reminder toast', () => {
)
})
- it('does not repeat the Orca CLI in CLI-only reminder toast copy', async () => {
+ it('does not remind WSL users about CLI registration when skills are installed', async () => {
mocks.skillState.installed = true
- await snoozeInitialModal({ linked: true, remote: false, surface: 'modal' })
- await renderPrompt({ linked: true, remote: false, surface: 'modal' })
-
- expect(toast.warning).toHaveBeenCalledWith(
- 'Orca CLI is missing',
- expect.objectContaining({
- description: 'Install the Orca CLI to enable your agents to read and edit Linear tasks.'
- })
- )
+ await renderPrompt(wslFedoraProps)
+ expect(toast.warning).not.toHaveBeenCalled()
+ expect(mocks.getWslCliStatus).not.toHaveBeenCalled()
})
it('keeps remote setup nuance in reminder toast copy', async () => {
@@ -249,35 +225,23 @@ describe('LinearAgentSkillSetupPrompt reminder toast', () => {
await renderPrompt({ linked: true, remote: true, surface: 'modal' })
expect(toast.warning).toHaveBeenCalledWith(
- 'Orca CLI and Linear skill are missing',
+ 'Linear skill is missing',
expect.objectContaining({
description:
- 'Install the Orca CLI and the Linear skill to enable your agents to read and edit Linear tasks. Remote agent environments may need their own setup.'
+ 'Install the Linear skill to enable your agents to read and edit Linear tasks through the Orca CLI. Remote agent environments may need their own setup.'
})
)
})
it('keeps WSL target nuance in reminder toast copy', async () => {
- const wslProps = {
- linked: true,
- remote: false,
- surface: 'modal',
- currentPlatform: 'win32',
- settings: {
- localAgentRuntime: 'wsl',
- localAgentWslDistro: 'Fedora',
- terminalWindowsShell: 'wsl.exe',
- activeRuntimeEnvironmentId: null
- }
- } satisfies ComponentProps
- await snoozeInitialModal(wslProps)
- await renderPrompt(wslProps)
+ await snoozeInitialModal(wslFedoraProps)
+ await renderPrompt(wslFedoraProps)
expect(toast.warning).toHaveBeenCalledWith(
- 'Orca CLI and Linear skill are missing',
+ 'Linear skill is missing',
expect.objectContaining({
description:
- 'Install the Orca CLI and the Linear skill to enable your agents to read and edit Linear tasks. This setup runs in the selected WSL agent runtime.'
+ 'Install the Linear skill to enable your agents to read and edit Linear tasks through the Orca CLI. This setup runs in the selected WSL agent runtime.'
})
)
})
diff --git a/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.test.tsx b/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.test.tsx
index 89c12b11a81..55001ebae7d 100644
--- a/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.test.tsx
+++ b/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.test.tsx
@@ -2,7 +2,6 @@
import { act, type ComponentProps, type ReactNode } from 'react'
import { createRoot, type Root } from 'react-dom/client'
-import type { CliInstallStatus } from '../../../../shared/cli-install-types'
import type { ProjectExecutionRuntimeResolution } from '../../../../shared/project-execution-runtime'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { LINEAR_AGENT_SKILL_NAMES } from '@/lib/agent-feature-install-commands'
@@ -10,6 +9,7 @@ import {
LinearAgentSkillSetupPrompt,
_linearAgentSkillSetupPromptInternalsForTests
} from './LinearAgentSkillSetupPrompt'
+import type { LinearAgentSkillPromptSettings } from './linear-agent-skill-runtime'
const HOST_DISMISS_STORAGE_KEY = 'orca.linearTicketsSkill.setupDismissed.host'
const FEDORA_DISMISS_STORAGE_KEY = 'orca.linearTicketsSkill.setupDismissed.wsl.Fedora'
@@ -48,8 +48,6 @@ const mocks = vi.hoisted(() => ({
useInstalledAgentSkillNames: vi.fn(),
getCliStatus: vi.fn(),
getWslCliStatus: vi.fn(),
- ensureCli: vi.fn(async () => null as CliInstallStatus | null),
- ensureWslCli: vi.fn(async () => null as CliInstallStatus | null),
panelProps: [] as Record[]
}))
@@ -58,23 +56,11 @@ vi.mock('@/hooks/useInstalledAgentSkills', async (importOriginal) => ({
useInstalledAgentSkillNames: mocks.useInstalledAgentSkillNames
}))
-vi.mock('@/lib/agent-skill-cli-prerequisite', () => ({
- AGENT_SKILL_CLI_PREREQUISITE_NOTICE: 'CLI registration notice',
- ensureOrcaCliAvailableForAgentSkillTerminal: mocks.ensureCli,
- isOrcaCliAvailableOnPath: (status: CliInstallStatus | null | undefined) =>
- status?.state === 'installed' && status.pathConfigured
-}))
-
vi.mock('../settings/CliSkillRuntimeSetup', () => ({
buildSkillCommandForRuntime: (
command: string,
_runtime: { runtime: string; wslDistro?: string | null }
- ) => command,
- ensureWslCliAvailableForAgentSkillTerminal: mocks.ensureWslCli,
- getWslCliDistroRequest: (runtime?: { runtime: string; wslDistro?: string | null }) =>
- runtime?.runtime === 'wsl' && runtime.wslDistro?.trim()
- ? { distro: runtime.wslDistro.trim() }
- : undefined
+ ) => command
}))
vi.mock('../settings/AgentSkillSetupPanel', () => ({
@@ -85,7 +71,14 @@ vi.mock('../settings/AgentSkillSetupPanel', () => ({
{String(props.title)}
{String(props.description)}
{String(props.command)}
- void (props.onBeforeOpenTerminal as () => void)()}>
+ {
+ if (typeof props.onBeforeOpenTerminal === 'function') {
+ void props.onBeforeOpenTerminal()
+ }
+ }}
+ >
Mock install
({
}
}))
+function wslSettings(distro: string): LinearAgentSkillPromptSettings {
+ return {
+ localAgentRuntime: 'wsl',
+ localAgentWslDistro: distro,
+ terminalWindowsShell: 'wsl.exe',
+ activeRuntimeEnvironmentId: null
+ }
+}
+
+function wslPromptProps(
+ distro: string,
+ surface: 'inline' | 'modal' = 'inline'
+): ComponentProps {
+ return {
+ linked: true,
+ remote: false,
+ surface,
+ currentPlatform: 'win32',
+ settings: wslSettings(distro)
+ }
+}
+
+function expectNoCliStatusQuery(): void {
+ expect(mocks.getCliStatus).not.toHaveBeenCalled()
+ expect(mocks.getWslCliStatus).not.toHaveBeenCalled()
+}
+
let root: Root | null = null
let container: HTMLDivElement | null = null
@@ -117,24 +137,6 @@ function installLocalStorageShim(): void {
})
}
-function cliStatus(overrides: Partial): CliInstallStatus {
- return {
- platform: 'darwin',
- commandName: 'orca',
- commandPath: '/usr/local/bin/orca',
- pathDirectory: '/usr/local/bin',
- pathConfigured: true,
- launcherPath: '/Applications/Orca.app/Contents/MacOS/Orca',
- installMethod: 'symlink',
- supported: true,
- state: 'installed',
- currentTarget: '/Applications/Orca.app/Contents/MacOS/Orca',
- unsupportedReason: null,
- detail: null,
- ...overrides
- }
-}
-
async function renderPrompt(
props: ComponentProps
): Promise {
@@ -186,7 +188,6 @@ async function settleRender(): Promise {
async function showSuccessfulModalRecheck(): Promise {
await renderPrompt({ linked: true, remote: false, surface: 'modal' })
- mocks.getCliStatus.mockResolvedValue(cliStatus({}))
mocks.skillState.refresh.mockImplementationOnce(async () => {
mocks.skillState.installed = true
})
@@ -204,15 +205,7 @@ describe('LinearAgentSkillSetupPrompt', () => {
mocks.useInstalledAgentSkillNames.mockReset()
mocks.useInstalledAgentSkillNames.mockReturnValue(mocks.skillState)
mocks.getCliStatus.mockReset()
- mocks.getCliStatus.mockResolvedValue(
- cliStatus({ state: 'not_installed', pathConfigured: false })
- )
mocks.getWslCliStatus.mockReset()
- mocks.getWslCliStatus.mockResolvedValue(
- cliStatus({ state: 'not_installed', pathConfigured: false })
- )
- mocks.ensureCli.mockClear()
- mocks.ensureWslCli.mockClear()
mocks.panelProps.length = 0
installLocalStorageShim()
window.localStorage.clear()
@@ -235,12 +228,14 @@ describe('LinearAgentSkillSetupPrompt', () => {
Reflect.deleteProperty(window, 'api')
})
- it('shows a compact setup prompt when a linked Linear worktree is missing CLI or skill setup', async () => {
+ it('shows a compact host setup prompt about only the skill when it is missing', async () => {
const rendered = await renderPrompt({ linked: true, remote: false })
expect(rendered.textContent).toContain('Set up Linear agent skill')
- expect(rendered.textContent).toContain('Orca CLI and Linear agent skill are missing')
+ expect(rendered.textContent).toContain('Linear agent skill is missing.')
+ expect(rendered.textContent).not.toContain('Orca CLI')
expect(rendered.textContent).toContain('Install it for host agent handoffs')
+ expectNoCliStatusQuery()
expect(mocks.useInstalledAgentSkillNames).toHaveBeenCalledWith(
LINEAR_AGENT_SKILL_NAMES,
expect.objectContaining({ enabled: true, sourceKinds: ['home'] })
@@ -248,7 +243,6 @@ describe('LinearAgentSkillSetupPrompt', () => {
})
it('hides when the prompt is not linked or both prerequisites are ready', async () => {
- mocks.getCliStatus.mockResolvedValue(cliStatus({}))
mocks.skillState.installed = true
const unlinked = await renderPrompt({ linked: false, remote: false })
@@ -260,6 +254,25 @@ describe('LinearAgentSkillSetupPrompt', () => {
expect(ready.textContent).not.toContain('Set up Linear agent skill')
})
+ it.each([false, true])(
+ 'treats installed skills as ready without registration (WSL: %s)',
+ async (managedWsl) => {
+ const props = managedWsl ? wslPromptProps('Fedora') : { linked: true, remote: false }
+ mocks.skillState.installed = true
+
+ const inline = await renderPrompt(props)
+ expect(inline.textContent).not.toContain('Set up Linear agent skill')
+
+ await unmountPrompt()
+
+ await renderPrompt({ ...props, surface: 'modal' })
+ expect(document.body.textContent).not.toContain(
+ 'Enable agents to read and edit the attached Linear ticket.'
+ )
+ expectNoCliStatusQuery()
+ }
+ )
+
it('persists host dismissal forever for the host setup target', async () => {
const rendered = await renderPrompt({ linked: true, remote: false })
@@ -287,8 +300,7 @@ describe('LinearAgentSkillSetupPrompt', () => {
})
expect(rendered.textContent).toContain('remote agent environments may need separate setup')
- expect(mocks.getCliStatus).toHaveBeenCalled()
- expect(mocks.getWslCliStatus).not.toHaveBeenCalled()
+ expectNoCliStatusQuery()
expect(mocks.useInstalledAgentSkillNames).toHaveBeenCalledWith(
LINEAR_AGENT_SKILL_NAMES,
expect.objectContaining({
@@ -308,21 +320,16 @@ describe('LinearAgentSkillSetupPrompt', () => {
expect(rendered.textContent).not.toContain('Set up Linear agent skill')
})
- it('uses WSL discovery, status, command, and prerequisite setup together', async () => {
+ it('uses WSL skill discovery and commands without CLI registration', async () => {
const rendered = await renderPrompt({
linked: true,
remote: false,
currentPlatform: 'win32',
- settings: {
- localAgentRuntime: 'wsl',
- localAgentWslDistro: 'Fedora',
- terminalWindowsShell: 'wsl.exe',
- activeRuntimeEnvironmentId: null
- }
+ settings: wslSettings('Fedora')
})
expect(mocks.getCliStatus).not.toHaveBeenCalled()
- expect(mocks.getWslCliStatus).toHaveBeenCalledWith({ distro: 'Fedora' })
+ expect(mocks.getWslCliStatus).not.toHaveBeenCalled()
expect(mocks.useInstalledAgentSkillNames).toHaveBeenCalledWith(
LINEAR_AGENT_SKILL_NAMES,
expect.objectContaining({
@@ -331,6 +338,7 @@ describe('LinearAgentSkillSetupPrompt', () => {
sourceKinds: ['home']
})
)
+ expect(rendered.textContent).toContain('Linear agent skill is missing.')
expect(rendered.textContent).toContain('Install it for WSL agent handoffs')
const setupButton = Array.from(rendered.querySelectorAll('button')).find(
@@ -346,14 +354,11 @@ describe('LinearAgentSkillSetupPrompt', () => {
expect.objectContaining({
installedCommand: 'npx skills update orca-linear --global',
terminalShellOverride: 'powershell.exe',
- terminalRuntime: expect.objectContaining({ runtime: 'wsl', wslDistro: 'Fedora' }),
- getPrerequisiteStatus: expect.any(Function)
+ terminalRuntime: expect.objectContaining({ runtime: 'wsl', wslDistro: 'Fedora' })
})
)
- const getPrerequisiteStatus = mocks.panelProps.at(-1)?.getPrerequisiteStatus
- expect(getPrerequisiteStatus).toEqual(expect.any(Function))
- await (getPrerequisiteStatus as () => Promise)()
- expect(mocks.getWslCliStatus).toHaveBeenLastCalledWith({ distro: 'Fedora' })
+ expect(mocks.panelProps.at(-1)?.getPrerequisiteStatus).toBeUndefined()
+ expect(mocks.panelProps.at(-1)?.preInstallNotice).toBeUndefined()
const installButton = Array.from(document.body.querySelectorAll('button')).find(
(button) => button.textContent === 'Mock install'
@@ -361,11 +366,6 @@ describe('LinearAgentSkillSetupPrompt', () => {
await act(async () => {
installButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
})
-
- expect(mocks.ensureWslCli).toHaveBeenCalledWith(
- expect.objectContaining({ runtime: 'wsl', wslDistro: 'Fedora' })
- )
- expect(mocks.ensureCli).not.toHaveBeenCalled()
})
it('persists WSL dismissal by selected distro', async () => {
@@ -373,12 +373,7 @@ describe('LinearAgentSkillSetupPrompt', () => {
linked: true,
remote: false,
currentPlatform: 'win32',
- settings: {
- localAgentRuntime: 'wsl',
- localAgentWslDistro: 'Fedora',
- terminalWindowsShell: 'wsl.exe',
- activeRuntimeEnvironmentId: null
- }
+ settings: wslSettings('Fedora')
})
await act(async () => {
@@ -404,7 +399,7 @@ describe('LinearAgentSkillSetupPrompt', () => {
}
})
- expect(mocks.getWslCliStatus).toHaveBeenCalledWith(undefined)
+ expect(mocks.getWslCliStatus).not.toHaveBeenCalled()
})
it('keeps stale terminal WSL settings on host when project runtime is absent', async () => {
@@ -418,8 +413,8 @@ describe('LinearAgentSkillSetupPrompt', () => {
}
})
- expect(mocks.getCliStatus).toHaveBeenCalled()
- expect(mocks.getWslCliStatus).not.toHaveBeenCalled()
+ expect(container?.textContent).toContain('Install it for host agent handoffs')
+ expectNoCliStatusQuery()
})
it('keeps the prompt usable and loads the lazy setup dialog only when requested', async () => {
@@ -445,9 +440,9 @@ describe('LinearAgentSkillSetupPrompt', () => {
installButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
})
- expect(mocks.ensureCli).toHaveBeenCalledWith(
- expect.objectContaining({ onStatusChange: expect.any(Function) })
- )
+ expect(mocks.panelProps.at(-1)?.preInstallNotice).toBeUndefined()
+ expect(mocks.panelProps.at(-1)?.getPrerequisiteStatus).toBeUndefined()
+ expectNoCliStatusQuery()
})
it('auto-opens as a modal-only prompt and treats the × close as a casual snooze', async () => {
@@ -457,16 +452,12 @@ describe('LinearAgentSkillSetupPrompt', () => {
expect(document.body.textContent).toContain(
'Enable agents to read and edit the attached Linear ticket.'
)
- expect(document.body.textContent).toContain('Orca CLI and Linear agent skill are missing.')
+ expect(document.body.textContent).toContain('Linear agent skill is missing.')
expect(document.body.textContent).toContain('Mock install')
// Why: the permanent opt-out is an EyeOff icon (no visible text); the casual
// dismiss is the dialog ×. Neither "Not now" nor any dismiss label shows as text.
expect(document.body.textContent).not.toContain('Not now')
- expect(mocks.panelProps.at(-1)).toEqual(
- expect.objectContaining({
- preInstallNotice: 'CLI registration notice'
- })
- )
+ expect(mocks.panelProps.at(-1)?.preInstallNotice).toBeUndefined()
// Why: the × must snooze for the session, not persist a permanent dismissal.
const closeButton = Array.from(document.body.querySelectorAll('button')).find(
@@ -512,9 +503,6 @@ describe('LinearAgentSkillSetupPrompt', () => {
container?.remove()
container = null
- mocks.getCliStatus.mockResolvedValue(
- cliStatus({ state: 'not_installed', pathConfigured: false })
- )
mocks.skillState.installed = false
await renderPrompt({ linked: true, remote: false, surface: 'modal' })
@@ -540,9 +528,6 @@ describe('LinearAgentSkillSetupPrompt', () => {
container?.remove()
container = null
- mocks.getCliStatus.mockResolvedValue(
- cliStatus({ state: 'not_installed', pathConfigured: false })
- )
mocks.skillState.installed = false
await renderPrompt({ linked: true, remote: false, surface: 'modal' })
@@ -581,7 +566,6 @@ describe('LinearAgentSkillSetupPrompt', () => {
it('still removes the inline prompt after an inline Re-check succeeds', async () => {
const rendered = await renderPrompt({ linked: true, remote: false })
- mocks.getCliStatus.mockResolvedValue(cliStatus({}))
mocks.skillState.refresh.mockImplementationOnce(async () => {
mocks.skillState.installed = true
})
@@ -592,15 +576,16 @@ describe('LinearAgentSkillSetupPrompt', () => {
await act(async () => {
recheckButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
})
- await settleRender()
+ // Why: the real skill hook re-renders on refresh; this mock only mutates a shared object.
+ await updatePrompt({ linked: true, remote: false })
+ expect(mocks.skillState.refresh).toHaveBeenCalled()
expect(rendered.textContent).not.toContain('Set up Linear agent skill')
+ expectNoCliStatusQuery()
})
it('keeps the missing setup modal visible after a partial Re-check', async () => {
- await renderPrompt({ linked: true, remote: false, surface: 'modal' })
-
- mocks.getCliStatus.mockResolvedValue(cliStatus({}))
+ await renderPrompt(wslPromptProps('Fedora', 'modal'))
await act(async () => {
findBodyButton('Re-check')?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
@@ -615,215 +600,64 @@ describe('LinearAgentSkillSetupPrompt', () => {
})
it('keeps the modal mounted and the Re-check action loading during a slow modal check', async () => {
- await renderPrompt({ linked: true, remote: false, surface: 'modal' })
-
- let resolveCliStatus: (status: CliInstallStatus) => void = () => {}
+ const props = wslPromptProps('Fedora', 'modal')
+ await renderPrompt(props)
let resolveSkillRefresh: () => void = () => {}
- mocks.getCliStatus.mockReturnValue(
- new Promise((resolve) => {
- resolveCliStatus = resolve
- })
- )
- mocks.skillState.refresh.mockReturnValue(
- new Promise((resolve) => {
+ mocks.skillState.refresh.mockImplementation(() => {
+ mocks.skillState.loading = true
+ return new Promise((resolve) => {
resolveSkillRefresh = resolve
})
- )
+ })
await act(async () => {
findBodyButton('Re-check')?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
})
-
+ await updatePrompt(props)
expect(document.body.textContent).toContain(
'Enable agents to read and edit the attached Linear ticket.'
)
expect(mocks.panelProps.at(-1)).toEqual(expect.objectContaining({ loading: true }))
- resolveCliStatus(cliStatus({}))
mocks.skillState.installed = true
+ mocks.skillState.loading = false
resolveSkillRefresh()
- await settleRender()
+ await updatePrompt(props)
+ expect(document.body.textContent).toContain('Linear ticket access is ready')
})
- it('ignores stale CLI success after the runtime context changes during Re-check', async () => {
- await renderPrompt({
- linked: true,
- remote: false,
- surface: 'modal',
- currentPlatform: 'win32',
- settings: {
- localAgentRuntime: 'wsl',
- localAgentWslDistro: 'Fedora',
- terminalWindowsShell: 'wsl.exe',
- activeRuntimeEnvironmentId: null
- }
- })
-
- let resolveWslStatus: (status: CliInstallStatus) => void = () => {}
- mocks.getWslCliStatus.mockReturnValueOnce(
- new Promise((resolve) => {
- resolveWslStatus = resolve
+ it('does not keep a new runtime disabled while the previous skill refresh is pending', async () => {
+ await renderPrompt(wslPromptProps('Fedora', 'modal'))
+ let finishRefresh: () => void = () => {}
+ mocks.skillState.refresh.mockImplementation(() => {
+ mocks.skillState.loading = true
+ return new Promise((resolve) => {
+ finishRefresh = resolve
})
- )
- mocks.skillState.refresh.mockReturnValueOnce(Promise.resolve())
-
+ })
await act(async () => {
findBodyButton('Re-check')?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
})
+ expect(mocks.panelProps.at(-1)).toEqual(expect.objectContaining({ loading: true }))
- mocks.getCliStatus.mockResolvedValue(
- cliStatus({ state: 'not_installed', pathConfigured: false })
- )
- mocks.skillState.installed = true
- await updatePrompt({
- linked: true,
- remote: false,
- surface: 'modal',
- currentPlatform: 'win32',
- settings: {
- localAgentRuntime: 'host',
- terminalWindowsShell: 'powershell.exe',
- activeRuntimeEnvironmentId: null
- }
- })
-
- resolveWslStatus(cliStatus({}))
+ // The skill hook owns loading for the new target, independently of the old request.
+ mocks.skillState.loading = false
+ await updatePrompt(wslPromptProps('Ubuntu', 'modal'))
+ expect(mocks.panelProps.at(-1)).toEqual(expect.objectContaining({ loading: false }))
+ finishRefresh()
await settleRender()
-
- expect(document.body.textContent).toContain(
- 'Enable agents to read and edit the attached Linear ticket.'
- )
- expect(document.body.textContent).toContain('Orca CLI is missing.')
expect(document.body.textContent).not.toContain('Linear ticket access is ready')
})
- it('ignores stale prerequisite CLI status callbacks after the runtime context changes', async () => {
- let reportHostCliStatus: ((status: CliInstallStatus) => void) | null = null
- mocks.ensureCli.mockImplementationOnce(
- async (options?: { onStatusChange?: (status: CliInstallStatus) => void }) => {
- reportHostCliStatus = options?.onStatusChange ?? null
- return null
- }
- )
- await renderPrompt({ linked: true, remote: false, surface: 'modal' })
-
- await act(async () => {
- findBodyButton('Mock install')?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
- })
-
- mocks.getWslCliStatus.mockResolvedValue(
- cliStatus({ state: 'not_installed', pathConfigured: false })
- )
- mocks.skillState.installed = true
- await updatePrompt({
- linked: true,
- remote: false,
- surface: 'modal',
- currentPlatform: 'win32',
- settings: {
- localAgentRuntime: 'wsl',
- localAgentWslDistro: 'Fedora',
- terminalWindowsShell: 'wsl.exe',
- activeRuntimeEnvironmentId: null
- }
- })
-
- await act(async () => {
- reportHostCliStatus?.(cliStatus({}))
- })
- await settleRender()
-
- expect(document.body.textContent).toContain(
- 'Enable agents to read and edit the attached Linear ticket.'
- )
- expect(document.body.textContent).toContain('Orca CLI is missing.')
- expect(document.body.textContent).not.toContain('Linear ticket access is ready')
- })
-
- it('accepts same-context prerequisite CLI status callbacks after a newer Re-check', async () => {
- let reportHostCliStatus: ((status: CliInstallStatus) => void) | null = null
- let resolveEnsureCli: () => void = () => {}
- mocks.ensureCli.mockImplementationOnce(
- async (options?: { onStatusChange?: (status: CliInstallStatus) => void }) => {
- reportHostCliStatus = options?.onStatusChange ?? null
- await new Promise((resolve) => {
- resolveEnsureCli = resolve
- })
- return null
- }
- )
- await renderPrompt({ linked: true, remote: false, surface: 'modal' })
-
- await act(async () => {
- findBodyButton('Mock install')?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
- })
-
- mocks.getCliStatus.mockResolvedValue(
- cliStatus({ state: 'not_installed', pathConfigured: false })
- )
- await act(async () => {
- findBodyButton('Re-check')?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
- })
- await settleRender()
-
- await act(async () => {
- reportHostCliStatus?.(cliStatus({}))
- resolveEnsureCli()
- })
- await settleRender()
-
- expect(document.body.textContent).toContain(
- 'Enable agents to read and edit the attached Linear ticket.'
- )
- expect(document.body.textContent).toContain('Linear agent skill is missing.')
- expect(document.body.textContent).not.toContain('Orca CLI is missing.')
- })
-
- it('ignores older same-context CLI refreshes that finish after a newer Re-check', async () => {
- const rendered = await renderPrompt({ linked: true, remote: false })
- const recheckButton = Array.from(rendered.querySelectorAll('button')).find(
- (button) => button.textContent === 'Re-check'
- )
- let resolveOlderCliStatus: (status: CliInstallStatus) => void = () => {}
- mocks.getCliStatus.mockReturnValueOnce(
- new Promise((resolve) => {
- resolveOlderCliStatus = resolve
- })
- )
- mocks.getCliStatus.mockResolvedValue(cliStatus({}))
- mocks.skillState.refresh.mockImplementation(async () => {
- mocks.skillState.installed = true
- })
-
- await act(async () => {
- recheckButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
- recheckButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
- })
- await settleRender()
-
- expect(rendered.textContent).not.toContain('Set up Linear agent skill')
-
- resolveOlderCliStatus(cliStatus({ state: 'not_installed', pathConfigured: false }))
- await settleRender()
-
- expect(rendered.textContent).not.toContain('Set up Linear agent skill')
- })
-
it('uses WSL-specific success copy for a selected WSL runtime', async () => {
await renderPrompt({
linked: true,
remote: false,
surface: 'modal',
currentPlatform: 'win32',
- settings: {
- localAgentRuntime: 'wsl',
- localAgentWslDistro: 'Fedora',
- terminalWindowsShell: 'wsl.exe',
- activeRuntimeEnvironmentId: null
- }
+ settings: wslSettings('Fedora')
})
- mocks.getWslCliStatus.mockResolvedValue(cliStatus({}))
mocks.skillState.refresh.mockImplementationOnce(async () => {
mocks.skillState.installed = true
})
@@ -844,12 +678,7 @@ describe('LinearAgentSkillSetupPrompt', () => {
remote: false,
currentPlatform: 'win32',
projectRuntime: projectHostRuntime,
- settings: {
- localAgentRuntime: 'wsl',
- localAgentWslDistro: 'Fedora',
- terminalWindowsShell: 'wsl.exe',
- activeRuntimeEnvironmentId: null
- }
+ settings: wslSettings('Fedora')
})
expect(mocks.useInstalledAgentSkillNames).toHaveBeenLastCalledWith(
@@ -858,11 +687,10 @@ describe('LinearAgentSkillSetupPrompt', () => {
discoveryTarget: { projectRuntime: projectHostRuntime }
})
)
- expect(mocks.getCliStatus).toHaveBeenCalled()
- expect(mocks.getWslCliStatus).not.toHaveBeenCalled()
+ expectNoCliStatusQuery()
})
- it('uses selected project WSL runtime for skill discovery and CLI status', async () => {
+ it('uses selected project WSL runtime for skill discovery without checking CLI status', async () => {
const rendered = await renderPrompt({
linked: true,
remote: false,
@@ -881,7 +709,7 @@ describe('LinearAgentSkillSetupPrompt', () => {
discoveryTarget: { projectRuntime: projectWslRuntime }
})
)
- expect(mocks.getWslCliStatus).toHaveBeenCalledWith({ distro: 'Ubuntu' })
+ expect(mocks.getWslCliStatus).not.toHaveBeenCalled()
expect(mocks.getCliStatus).not.toHaveBeenCalled()
await act(async () => {
Array.from(rendered.querySelectorAll('button'))
@@ -898,7 +726,6 @@ describe('LinearAgentSkillSetupPrompt', () => {
it('uses remote-safe success copy for remote workspaces', async () => {
await renderPrompt({ linked: true, remote: true, surface: 'modal' })
- mocks.getCliStatus.mockResolvedValue(cliStatus({}))
mocks.skillState.refresh.mockImplementationOnce(async () => {
mocks.skillState.installed = true
})
diff --git a/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.tsx b/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.tsx
index 4ef5f3f94f8..ced331fb147 100644
--- a/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.tsx
+++ b/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.tsx
@@ -1,6 +1,5 @@
-import { Suspense, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { Suspense, useCallback, useEffect, useMemo, useState } from 'react'
import { RefreshCw, TicketCheck, X } from 'lucide-react'
-import type { CliInstallStatus } from '../../../../shared/cli-install-types'
import type { ProjectExecutionRuntimeResolution } from '../../../../shared/project-execution-runtime'
import { Button } from '@/components/ui/button'
import {
@@ -12,17 +11,9 @@ import {
ORCA_LINEAR_SKILL_INSTALL_COMMAND
} from '@/lib/agent-feature-install-commands'
import { getLinearAgentSkillUpdateCommand } from '@/lib/linear-agent-skill-update-command'
-import {
- ensureOrcaCliAvailableForAgentSkillTerminal,
- isOrcaCliAvailableOnPath
-} from '@/lib/agent-skill-cli-prerequisite'
import { lazyWithRetry } from '@/lib/lazy-with-retry'
import { cn } from '@/lib/utils'
-import {
- buildSkillCommandForRuntime,
- ensureWslCliAvailableForAgentSkillTerminal,
- getWslCliDistroRequest
-} from '../settings/CliSkillRuntimeSetup'
+import { buildSkillCommandForRuntime } from '../settings/CliSkillRuntimeSetup'
import {
getLinearAgentSkillSetupInlineRuntimeCopy,
getLinearAgentSkillSetupMissingLabel,
@@ -79,8 +70,6 @@ export function LinearAgentSkillSetupPrompt({
currentPlatform = getCurrentPlatform(),
className
}: LinearAgentSkillSetupPromptProps): React.JSX.Element | null {
- const [cliStatus, setCliStatus] = useState(null)
- const [cliLoading, setCliLoading] = useState(linked)
const [setupDialogOpen, setSetupDialogOpen] = useState(false)
const [setupCheckResult, setSetupCheckResult] = useState('idle')
const [activeSetupCheckIdentity, setActiveSetupCheckIdentity] = useState(null)
@@ -98,9 +87,6 @@ export function LinearAgentSkillSetupPrompt({
}),
[agentRuntime, projectRuntime, remote, settings?.activeRuntimeEnvironmentId]
)
- const currentSetupCheckIdentityRef = useRef(setupCheckIdentity)
- const cliRefreshGenerationRef = useRef(0)
- currentSetupCheckIdentityRef.current = setupCheckIdentity
const skillDiscoveryTarget = useMemo(
() => getLinearPromptSkillDiscoveryTarget(agentRuntime, projectRuntime),
[agentRuntime, projectRuntime]
@@ -138,57 +124,8 @@ export function LinearAgentSkillSetupPrompt({
settings,
agentRuntime
)
- const writeCliStatusIfCurrent = useCallback(
- (requestIdentity: string, requestGeneration: number, write: () => void): void => {
- if (
- requestGeneration === cliRefreshGenerationRef.current &&
- currentSetupCheckIdentityRef.current === requestIdentity
- ) {
- write()
- }
- },
- []
- )
-
- const writeCliStatusForIdentity = useCallback((requestIdentity: string, write: () => void) => {
- if (currentSetupCheckIdentityRef.current === requestIdentity) {
- write()
- }
- }, [])
-
- const refreshCliStatus = useCallback(async (): Promise => {
- const requestIdentity = setupCheckIdentity
- const requestGeneration = ++cliRefreshGenerationRef.current
- const writeIfCurrent = (write: () => void): void => {
- writeCliStatusIfCurrent(requestIdentity, requestGeneration, write)
- }
- if (!linked) {
- writeIfCurrent(() => {
- setCliStatus(null)
- setCliLoading(false)
- })
- return
- }
- setCliLoading(true)
- try {
- const nextStatus = await (agentRuntime.runtime === 'wsl'
- ? window.api.cli.getWslInstallStatus(getWslCliDistroRequest(agentRuntime))
- : window.api.cli.getInstallStatus())
- writeIfCurrent(() => setCliStatus(nextStatus))
- } catch {
- writeIfCurrent(() => setCliStatus(null))
- } finally {
- writeIfCurrent(() => setCliLoading(false))
- }
- }, [agentRuntime, linked, setupCheckIdentity, writeCliStatusIfCurrent])
-
- useEffect(() => {
- void refreshCliStatus()
- }, [refreshCliStatus])
-
- const cliAvailable = isOrcaCliAvailableOnPath(cliStatus)
- const setupReady = linked && !cliLoading && !skill.loading && cliAvailable && skill.installed
- const missingSetup = linked && !localDismissed && !cliLoading && !skill.loading && !setupReady
+ const setupReady = linked && !skill.loading && skill.installed
+ const missingSetup = linked && !localDismissed && !skill.loading && !setupReady
const explicitCheckMatchesContext = activeSetupCheckIdentity === setupCheckIdentity
const showCheckingModal =
surface === 'modal' &&
@@ -211,8 +148,7 @@ export function LinearAgentSkillSetupPrompt({
setActiveSetupCheckIdentity(null)
return
}
- // Why: refreshes update CLI and skill state independently, so success is
- // promoted only after the current render observes both ready for this target.
+ // Wait until the refreshed skill state is ready for this target.
if (setupCheckResult === 'checking' && setupReady) {
setSetupCheckResult('ready')
return
@@ -252,16 +188,11 @@ export function LinearAgentSkillSetupPrompt({
setSetupDialogOpen(false)
}
- const missingLabel = getLinearAgentSkillSetupMissingLabel(cliAvailable, skill.installed)
+ const missingLabel = getLinearAgentSkillSetupMissingLabel()
- const toastTitle = getLinearAgentSkillSetupToastTitle(cliAvailable, skill.installed)
+ const toastTitle = getLinearAgentSkillSetupToastTitle()
- const toastDescription = getLinearAgentSkillSetupToastDescription(
- cliAvailable,
- skill.installed,
- remote,
- agentRuntime
- )
+ const toastDescription = getLinearAgentSkillSetupToastDescription(remote, agentRuntime)
const openSetupDialog = useCallback(() => setSetupDialogOpen(true), [])
useLinearAgentSkillSetupReminderToast({
@@ -294,38 +225,15 @@ export function LinearAgentSkillSetupPrompt({
terminalShellOverride={terminalShellOverride}
terminalRuntime={agentRuntime}
installed={skill.installed}
- loading={showCheckingModal || cliLoading || skill.loading}
+ loading={showCheckingModal || skill.loading}
error={skill.error}
- getPrerequisiteStatus={
- agentRuntime.runtime === 'wsl'
- ? () => window.api.cli.getWslInstallStatus(getWslCliDistroRequest(agentRuntime))
- : undefined
- }
- onBeforeOpenTerminal={async () => {
- const requestIdentity = setupCheckIdentity
- const writeIfCurrent = (write: () => void): void => {
- writeCliStatusForIdentity(requestIdentity, write)
- }
- const nextStatus =
- agentRuntime.runtime === 'wsl'
- ? await ensureWslCliAvailableForAgentSkillTerminal(agentRuntime)
- : await ensureOrcaCliAvailableForAgentSkillTerminal({
- onStatusChange: (nextCliStatus) => {
- writeIfCurrent(() => setCliStatus(nextCliStatus))
- }
- })
- if (agentRuntime.runtime === 'wsl') {
- writeIfCurrent(() => setCliStatus(nextStatus))
- }
- }}
onRecheck={async () => {
if (surface === 'modal') {
setActiveSetupCheckIdentity(setupCheckIdentity)
setSetupCheckResult('checking')
- await Promise.all([refreshCliStatus(), skill.refresh()])
+ await skill.refresh()
return
}
- await refreshCliStatus()
await skill.refresh()
}}
onOpenChange={(open) => {
@@ -399,7 +307,6 @@ export function LinearAgentSkillSetupPrompt({
size="xs"
className="gap-1"
onClick={() => {
- void refreshCliStatus()
void skill.refresh()
}}
>
diff --git a/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.update-command.test.tsx b/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.update-command.test.tsx
index b0e35056ccf..ae22cad425c 100644
--- a/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.update-command.test.tsx
+++ b/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.update-command.test.tsx
@@ -3,7 +3,7 @@
import { join } from 'node:path'
import { act, type ComponentProps, type ReactNode } from 'react'
import { createRoot, type Root } from 'react-dom/client'
-import type { CliInstallStatus } from '../../../../shared/cli-install-types'
+import type { ProjectExecutionRuntimeResolution } from '../../../../shared/project-execution-runtime'
import type { DiscoveredSkill } from '../../../../shared/skills'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import {
@@ -21,6 +21,7 @@ const mocks = vi.hoisted(() => ({
},
useInstalledAgentSkillNames: vi.fn(),
getCliStatus: vi.fn(),
+ getWslCliStatus: vi.fn(),
panelProps: [] as Record[]
}))
@@ -29,17 +30,8 @@ vi.mock('@/hooks/useInstalledAgentSkills', async (importOriginal) => ({
useInstalledAgentSkillNames: mocks.useInstalledAgentSkillNames
}))
-vi.mock('@/lib/agent-skill-cli-prerequisite', () => ({
- AGENT_SKILL_CLI_PREREQUISITE_NOTICE: 'CLI registration notice',
- ensureOrcaCliAvailableForAgentSkillTerminal: vi.fn(async () => null),
- isOrcaCliAvailableOnPath: (status: CliInstallStatus | null | undefined) =>
- status?.state === 'installed' && status.pathConfigured
-}))
-
vi.mock('../settings/CliSkillRuntimeSetup', () => ({
- buildSkillCommandForRuntime: (command: string) => command,
- ensureWslCliAvailableForAgentSkillTerminal: vi.fn(async () => null),
- getWslCliDistroRequest: () => undefined
+ buildSkillCommandForRuntime: (command: string) => command
}))
vi.mock('../settings/AgentSkillSetupPanel', () => ({
@@ -49,26 +41,23 @@ vi.mock('../settings/AgentSkillSetupPanel', () => ({
}
}))
-let root: Root | null = null
-let container: HTMLDivElement | null = null
-
-function cliStatus(): CliInstallStatus {
- return {
- platform: 'darwin',
- commandName: 'orca',
- commandPath: null,
- pathDirectory: null,
- pathConfigured: false,
- launcherPath: '/Applications/Orca.app/Contents/MacOS/Orca',
- installMethod: null,
- supported: true,
- state: 'not_installed',
- currentTarget: null,
- unsupportedReason: null,
- detail: null
+// Why: host terminals need no CLI registration, so an installed skill only still
+// shows the prompt (and its update command) on a WSL runtime with the CLI missing.
+const projectWslRuntime: ProjectExecutionRuntimeResolution = {
+ status: 'resolved',
+ runtime: {
+ kind: 'wsl',
+ hostPlatform: 'wsl',
+ projectId: 'repo-1',
+ distro: 'Ubuntu',
+ reason: 'project-override',
+ cacheKey: 'repo-1:wsl:Ubuntu'
}
}
+let root: Root | null = null
+let container: HTMLDivElement | null = null
+
function discoveredSkill(overrides: Partial): DiscoveredSkill {
return {
id: 'skill-1',
@@ -103,7 +92,14 @@ async function renderPrompt(
root = createRoot(container)
await act(async () => {
root?.render(
-