Skip to content

armgit / orca

Public Imported from GitHub
0

Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.

Revert "Warn macOS 12 users about upcoming support changes" (#36209)

Neil8f2e24f89389
diff --git a/src/main/ipc/app.ts b/src/main/ipc/app.ts
index 00b55d0fd6e..dbfe1049ac5 100644
--- a/src/main/ipc/app.ts
+++ b/src/main/ipc/app.ts
@@ -37,7 +37,6 @@ import { registerMacKeyboardLayoutChangeNotifications } from './macos-keyboard-l
import { isProfileStateSaveDelayed } from '../startup/profile-state-save-delay'
import { readCommandStdout, readKeyboardInputSourceId } from './macos-keyboard-input-source'
import { getWindowsAdministratorStatus } from '../windows/windows-administrator-status'
-import { getMacosUpgradeSupport } from '../macos-12-support-notice/upgrade-support'
import type { ReconnectFactsFor } from '../persistence/window-save-view'
@@ -146,7 +145,6 @@ export function registerAppHandlers(store: Store, options: RegisterAppHandlersOp
return detection
})
ipcMain.handle('app:getWindowsAdministratorStatus', getWindowsAdministratorStatus)
- ipcMain.handle('app:getMacosUpgradeSupport', getMacosUpgradeSupport)
ipcMain.handle('app:getFeatureWallAssetBaseUrl', (): string => getFeatureWallAssetBaseUrl())
diff --git a/src/main/macos-12-support-notice/README.md b/src/main/macos-12-support-notice/README.md
deleted file mode 100644
index 18e4ebf2dda..00000000000
--- a/src/main/macos-12-support-notice/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Temporary macOS 12 support notice
-
-The desktop checks upgrade support before recommending a path. Apple Silicon (including Rosetta) supports macOS 13. Intel Macs are checked against Apple's Ventura model boundaries using a cached, one-second `sysctl hw.model` probe. An unavailable or unrecognized model stays undecided; the dialog then offers Apple's guide.
-
-## Remove after the transition
-
-Delete these feature folders:
-
-- `src/main/macos-12-support-notice/`: local probe, Intel compatibility data, and tests.
-- `src/shared/macos-12-support-notice/`: IPC result type and local-client audience rule.
-- `src/renderer/src/components/feature-tips/macos-12-support-notice/`: dialog, probe lifecycle, and fixtures.
-
-Remove the `getMacosUpgradeSupport` IPC/preload/web API wiring, the `macos-12-support` feature tip and its startup/modal gates, and the `macosSupport` localization namespace. Keep persisted unknown tip IDs safely ignored by the existing normalizer.
-
-## Sources for compatibility and explanation copy
-
-- [Apple's macOS Ventura models](https://support.apple.com/en-us/102861).
-- [Electron 44](https://www.electronjs.org/blog/electron-44-0): Chromium drops macOS 12; Electron 44+ requires macOS 13.
-- [Electron 45](https://www.electronjs.org/blog/electron-45-0): macOS cold-launch improvements, reduced native API and IPC overhead, and async secure-storage migration.
-- [Electron's breaking changes](https://www.electronjs.org/docs/latest/breaking-changes): the macOS notification migration to UNNotification began in Electron 42. The dialog describes ongoing integration with current notification and Keychain APIs, without claiming those APIs first arrived in 45.
diff --git a/src/main/macos-12-support-notice/upgrade-support.test.ts b/src/main/macos-12-support-notice/upgrade-support.test.ts
deleted file mode 100644
index a14d277c5bf..00000000000
--- a/src/main/macos-12-support-notice/upgrade-support.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const { runProcess, app, system } = vi.hoisted(() => ({
- runProcess: vi.fn(),
- app: { runningUnderARM64Translation: false },
- system: { release: '21.6.0' }
-}))
-
-vi.mock('@orca/process-host', () => ({ runProcess }))
-vi.mock('electron', () => ({ app }))
-vi.mock('node:os', () => ({ release: () => system.release }))
-
-describe('local macOS upgrade probe', () => {
- beforeEach(() => {
- vi.resetModules()
- vi.clearAllMocks()
- vi.spyOn(process, 'platform', 'get').mockReturnValue('darwin')
- vi.spyOn(process, 'arch', 'get').mockReturnValue('x64')
- app.runningUnderARM64Translation = false
- system.release = '21.6.0'
- })
-
- afterEach(() => vi.restoreAllMocks())
-
- it('coalesces model reads and recommends Linux only for a known unsupported Intel model', async () => {
- runProcess.mockResolvedValue({ code: 0, stdout: 'MacBookPro13,3\n' })
- const { getMacosUpgradeSupport } = await import('./upgrade-support')
- const results = await Promise.all([getMacosUpgradeSupport(), getMacosUpgradeSupport()])
- expect(results).toEqual([
- { macos13: 'unsupported', modelIdentifier: 'MacBookPro13,3' },
- { macos13: 'unsupported', modelIdentifier: 'MacBookPro13,3' }
- ])
- expect(runProcess).toHaveBeenCalledOnce()
- })
-
- it('recognizes Apple Silicon even when Orca runs as x64 under Rosetta', async () => {
- app.runningUnderARM64Translation = true
- const { getMacosUpgradeSupport } = await import('./upgrade-support')
- expect(await getMacosUpgradeSupport()).toEqual({ macos13: 'supported', modelIdentifier: null })
- expect(runProcess).not.toHaveBeenCalled()
- })
-
- it('falls back to checking compatibility when the bounded model probe fails', async () => {
- runProcess.mockRejectedValue(new Error('sysctl unavailable'))
- const { getMacosUpgradeSupport } = await import('./upgrade-support')
- expect(await getMacosUpgradeSupport()).toEqual({ macos13: 'unknown', modelIdentifier: null })
- })
-
- it('never probes other platforms or newer macOS releases', async () => {
- const platform = vi.spyOn(process, 'platform', 'get').mockReturnValue('linux')
- const { getMacosUpgradeSupport } = await import('./upgrade-support')
- expect(await getMacosUpgradeSupport()).toBeNull()
- platform.mockReturnValue('darwin')
- system.release = '22.0.0'
- expect(await getMacosUpgradeSupport()).toBeNull()
- expect(runProcess).not.toHaveBeenCalled()
- })
-})
diff --git a/src/main/macos-12-support-notice/upgrade-support.ts b/src/main/macos-12-support-notice/upgrade-support.ts
deleted file mode 100644
index c7037e71270..00000000000
--- a/src/main/macos-12-support-notice/upgrade-support.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { release } from 'node:os'
-import { app } from 'electron'
-import { runProcess } from '@orca/process-host'
-import type { MacosUpgradeSupport } from '../../shared/macos-12-support-notice/upgrade-support'
-import { getIntelMacos13Support } from './ventura-intel-models'
-
-let support: Promise<MacosUpgradeSupport> | undefined
-
-export function getMacosUpgradeSupport(): Promise<MacosUpgradeSupport | null> {
- if (process.platform !== 'darwin' || !release().startsWith('21.')) {
- return Promise.resolve(null)
- }
- if (process.arch === 'arm64' || app.runningUnderARM64Translation) {
- return Promise.resolve({ macos13: 'supported', modelIdentifier: null })
- }
- return (support ??= readIntelModel().catch(() => ({
- macos13: 'unknown',
- modelIdentifier: null
- })))
-}
-
-async function readIntelModel(): Promise<MacosUpgradeSupport> {
- const result = await runProcess({
- program: '/usr/sbin/sysctl',
- args: ['-n', 'hw.model'],
- timeoutMs: 1_000,
- maxOutputBytes: 128
- })
- const modelIdentifier =
- result.code === 0 && !result.timedOut && !result.outputTruncated
- ? result.stdout.trim() || null
- : null
- return {
- macos13: modelIdentifier ? getIntelMacos13Support(modelIdentifier) : 'unknown',
- modelIdentifier
- }
-}
diff --git a/src/main/macos-12-support-notice/ventura-intel-models.test.ts b/src/main/macos-12-support-notice/ventura-intel-models.test.ts
deleted file mode 100644
index b466fdfb5a4..00000000000
--- a/src/main/macos-12-support-notice/ventura-intel-models.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { getIntelMacos13Support } from './ventura-intel-models'
-
-describe('Ventura hardware compatibility', () => {
- it.each([
- ['MacBook9,1', 'unsupported'],
- ['MacBook10,1', 'supported'],
- ['MacBookAir7,2', 'unsupported'],
- ['MacBookAir8,1', 'supported'],
- ['MacBookPro13,3', 'unsupported'],
- ['MacBookPro14,1', 'supported'],
- ['MacBookPro16,4', 'supported'],
- ['Macmini7,1', 'unsupported'],
- ['Macmini8,1', 'supported'],
- ['iMac17,1', 'unsupported'],
- ['iMac18,1', 'supported'],
- ['iMac20,2', 'supported'],
- ['iMacPro1,1', 'supported'],
- ['MacPro6,1', 'unsupported'],
- ['MacPro7,1', 'supported'],
- ['VirtualMac2,1', 'unknown'],
- ['MacBookPro99,1', 'unknown'],
- ['', 'unknown']
- ])('uses Apple’s Ventura model boundary for %s', (model, expected) => {
- expect(getIntelMacos13Support(model)).toBe(expected)
- })
-})
diff --git a/src/main/macos-12-support-notice/ventura-intel-models.ts b/src/main/macos-12-support-notice/ventura-intel-models.ts
deleted file mode 100644
index 198efef7eb4..00000000000
--- a/src/main/macos-12-support-notice/ventura-intel-models.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { MacosUpgradeSupport } from '../../shared/macos-12-support-notice/upgrade-support'
-
-// Ventura's Intel model boundaries: https://support.apple.com/en-us/102861.
-const VENTURA_INTEL_MODELS = {
- MacBook: [10, 10],
- MacBookAir: [8, 9],
- MacBookPro: [14, 16],
- Macmini: [8, 8],
- iMac: [18, 20],
- iMacPro: [1, 1],
- MacPro: [7, 7]
-} as const
-
-export function getIntelMacos13Support(modelIdentifier: string): MacosUpgradeSupport['macos13'] {
- const match =
- /^(MacBookAir|MacBookPro|MacBook|Macmini|iMacPro|iMac|MacPro)([1-9]\d*),[1-9]\d*$/u.exec(
- modelIdentifier
- )
- if (!match) {
- return 'unknown'
- }
- const family = match[1]
- const limits = Object.entries(VENTURA_INTEL_MODELS).find(([name]) => name === family)?.[1]
- if (!limits) {
- return 'unknown'
- }
- const major = Number(match[2])
- if (major < limits[0]) {
- return 'unsupported'
- }
- return major <= limits[1] ? 'supported' : 'unknown'
-}
diff --git a/src/main/startup/dev-education-suppression.test.ts b/src/main/startup/dev-education-suppression.test.ts
index e59f4a8f2da..7d1cac489bd 100644
--- a/src/main/startup/dev-education-suppression.test.ts
+++ b/src/main/startup/dev-education-suppression.test.ts
@@ -135,7 +135,6 @@ describe('suppressDevEducationForStore', () => {
})
expect(state.ui.featureTipsSeenIds).toEqual([
'voice-dictation',
- 'macos-12-support',
'native-chat-upgrade',
'agent-session-search',
'orca-cli',
diff --git a/src/preload/api/app-api.ts b/src/preload/api/app-api.ts
index 631265e9487..44ea62e936b 100644
--- a/src/preload/api/app-api.ts
+++ b/src/preload/api/app-api.ts
@@ -13,11 +13,8 @@ import type { FloatingTerminalCwdRequest } from '../../shared/ui-chrome-types'
import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
import type { KeyboardLayoutSnapshot } from '../../shared/keyboard-layout-snapshot'
import type { KeyboardLayoutChangeEvent } from '../../shared/keyboard-layout-events'
-import type { MacosUpgradeSupport } from '../../shared/macos-12-support-notice/upgrade-support'
export type AppApi = {
- /** Local desktop only; optional for older clients and unavailable outside macOS 12. */
- getMacosUpgradeSupport?: () => Promise<MacosUpgradeSupport | null>
getSystemLanguageDetection?: (
browserPreferences?: readonly string[]
) => Promise<UiLanguageDetection | null>
diff --git a/src/preload/api/app-bridge.ts b/src/preload/api/app-bridge.ts
index f8a5c74eb85..391383e6871 100644
--- a/src/preload/api/app-bridge.ts
+++ b/src/preload/api/app-bridge.ts
@@ -13,7 +13,6 @@ import { awaitBeforeUnloadCheckpoint, startupDiagnosticsEnabled } from '../prelo
import type { PreloadApi } from '../api-types'
export const appApi = {
- getMacosUpgradeSupport: () => ipcRenderer.invoke('app:getMacosUpgradeSupport'),
getSystemLanguageDetection: (browserPreferences?: readonly string[]) =>
ipcRenderer.invoke('app:getSystemLanguageDetection', browserPreferences),
isProfileStateSaveDelayed: (): Promise<boolean> =>
diff --git a/src/renderer/src/app-shell/use-onboarding-and-feature-tips.ts b/src/renderer/src/app-shell/use-onboarding-and-feature-tips.ts
index a3a09170a85..59383d7eca5 100644
--- a/src/renderer/src/app-shell/use-onboarding-and-feature-tips.ts
+++ b/src/renderer/src/app-shell/use-onboarding-and-feature-tips.ts
@@ -14,7 +14,6 @@ import { useAppStore } from '../store'
import { isWebClientLocation } from '../lib/web-client-location'
import type { OnboardingState } from '../../../shared/onboarding-state-types'
import { isInNativeChatUpgradeTipAudience } from '../../../shared/native-chat/native-chat-upgrade-tip-audience'
-import { isMacos12SupportNoticeEligible } from '../../../shared/macos-12-support-notice/upgrade-support'
export type OnboardingGate = ReturnType<typeof useOnboardingAndFeatureTips>
@@ -120,10 +119,6 @@ export function useOnboardingAndFeatureTips() {
useEffect(() => {
const featureTipsDecision = getFeatureTipsAppOpenDecision({
- macos12SupportNoticeEligible: isMacos12SupportNoticeEligible(
- window.api.platform.get(),
- isWebClientLocation()
- ),
activeModal,
cliInstalled: featureTipCliInstalled,
featureTipsSeenIds,
diff --git a/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx b/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx
index c1e0dbbdbb1..ba3910918cf 100644
--- a/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx
+++ b/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx
@@ -25,8 +25,6 @@ import { NativeChatUpgradeTipDialog } from './NativeChatUpgradeTipDialog'
import { SessionSearchTipDialog } from './SessionSearchTipDialog'
import { useSessionSearchTipSetup } from './use-session-search-tip-setup'
import { VoiceDictationTipDialog } from './VoiceDictationTipDialog'
-import { MacosSupportNoticeTip } from './macos-12-support-notice/MacosSupportNoticeTip'
-import { isMacos12SupportNoticeEligible } from '../../../../shared/macos-12-support-notice/upgrade-support'
export default function FeatureTipsModal(): JSX.Element | null {
const activeModal = useAppStore((s) => s.activeModal)
@@ -49,10 +47,6 @@ export default function FeatureTipsModal(): JSX.Element | null {
const [skillTerminalOpen, setSkillTerminalOpen] = useState(false)
const isOpen = activeModal === 'feature-tips'
const currentTip = getFeatureTipForModal({
- macos12SupportNoticeEligible: isMacos12SupportNoticeEligible(
- window.api.platform.get(),
- isWebClientLocation()
- ),
cliInstalled: true,
modalData,
seenTipIds,
@@ -146,8 +140,6 @@ export default function FeatureTipsModal(): JSX.Element | null {
markFeatureTipsSeen([currentTip.id])
}
switch (currentTip.action) {
- case 'review-macos-support':
- break
case 'learn-native-chat-upgrade': {
if (settings?.experimentalNativeChat !== true) {
setPrimaryBusy(true)
@@ -293,10 +285,6 @@ export default function FeatureTipsModal(): JSX.Element | null {
return null
}
- if (currentTip.action === 'review-macos-support') {
- return <MacosSupportNoticeTip open={isOpen} onOpenChange={handleOpenChange} />
- }
-
if (currentTip.action === 'setup-cli') {
return (
<CliSetupTipDialog
diff --git a/src/renderer/src/components/feature-tips/feature-tip-modal-state.test.ts b/src/renderer/src/components/feature-tips/feature-tip-modal-state.test.ts
index 30e211fee4d..1106d4bef7d 100644
--- a/src/renderer/src/components/feature-tips/feature-tip-modal-state.test.ts
+++ b/src/renderer/src/components/feature-tips/feature-tip-modal-state.test.ts
@@ -18,22 +18,6 @@ function makeSettings(
}
describe('feature tip modal state', () => {
- it('keeps a shown Monterey notice mounted, but refuses it outside the local audience', () => {
- const input = {
- cliInstalled: true,
- modalData: { tipId: 'macos-12-support' },
- seenTipIds: ['macos-12-support'] as const,
- inNativeChatUpgradeTipAudience: false,
- featureInteractions: {},
- settings: makeSettings(),
- webClient: false,
- macos12SupportNoticeEligible: true
- }
- expect(getFeatureTipForModal(input)?.id).toBe('macos-12-support')
- expect(getFeatureTipForModal({ ...input, macos12SupportNoticeEligible: false })).toBeNull()
- expect(getFeatureTipForModal({ ...input, webClient: true })).toBeNull()
- })
-
it('keeps rendering the opened tip after app open has marked it seen', () => {
const tip = getFeatureTipForModal({
cliInstalled: false,
diff --git a/src/renderer/src/components/feature-tips/feature-tip-modal-state.ts b/src/renderer/src/components/feature-tips/feature-tip-modal-state.ts
index 857c0c1a1b2..f41d6b6ccd9 100644
--- a/src/renderer/src/components/feature-tips/feature-tip-modal-state.ts
+++ b/src/renderer/src/components/feature-tips/feature-tip-modal-state.ts
@@ -8,7 +8,6 @@ import {
import { getPendingFeatureTips, type FeatureTipSettings } from './feature-tip-startup-gate'
export function getFeatureTipForModal(args: {
- macos12SupportNoticeEligible?: boolean
cliInstalled: boolean
modalData: Record<string, unknown>
seenTipIds: readonly FeatureTipId[]
@@ -20,12 +19,6 @@ export function getFeatureTipForModal(args: {
const modalTipId = isFeatureTipId(args.modalData.tipId) ? args.modalData.tipId : null
const inNativeChatUpgradeTipAudience = args.inNativeChatUpgradeTipAudience === true
if (modalTipId) {
- if (
- modalTipId === 'macos-12-support' &&
- (!args.macos12SupportNoticeEligible || args.webClient)
- ) {
- return null
- }
// Why: no opener, even one naming the tip, may show it outside main's recorded audience.
if (modalTipId === 'native-chat-upgrade' && !inNativeChatUpgradeTipAudience) {
return null
diff --git a/src/renderer/src/components/feature-tips/feature-tip-startup-gate.test.ts b/src/renderer/src/components/feature-tips/feature-tip-startup-gate.test.ts
index 88bb9c51eb8..89765dd4e30 100644
--- a/src/renderer/src/components/feature-tips/feature-tip-startup-gate.test.ts
+++ b/src/renderer/src/components/feature-tips/feature-tip-startup-gate.test.ts
@@ -52,37 +52,6 @@ function makeCliStatus(overrides: Partial<CliInstallStatus> = {}): CliInstallSta
}
describe('feature tip startup gate', () => {
- it('prioritizes the Monterey notice once and keeps it out of browser clients', () => {
- const input = {
- activeModal: 'none',
- cliInstalled: false,
- featureTipsSeenIds: [],
- featureInteractions: {},
- onboarding: existingUserOnboarding,
- persistedUIReady: true,
- inNativeChatUpgradeTipAudience: true,
- promptedThisSession: false,
- settings: makeSettings(),
- suppressedByOnboardingThisSession: false,
- webClient: false,
- macos12SupportNoticeEligible: true
- }
- expect(getFeatureTipsAppOpenDecision(input)).toEqual({
- kind: 'open',
- tipId: 'macos-12-support'
- })
- expect(
- getFeatureTipsAppOpenDecision({ ...input, featureTipsSeenIds: ['macos-12-support'] })
- ).toEqual({
- kind: 'open',
- tipId: 'native-chat-upgrade'
- })
- expect(getFeatureTipsAppOpenDecision({ ...input, webClient: true })).toEqual({
- kind: 'open',
- tipId: 'native-chat-upgrade'
- })
- })
-
it('opens the CLI feature tip first for an existing user on app open', () => {
expect(
getFeatureTipsAppOpenDecision({
diff --git a/src/renderer/src/components/feature-tips/feature-tip-startup-gate.ts b/src/renderer/src/components/feature-tips/feature-tip-startup-gate.ts
index c3c207aed24..3504f27c80f 100644
--- a/src/renderer/src/components/feature-tips/feature-tip-startup-gate.ts
+++ b/src/renderer/src/components/feature-tips/feature-tip-startup-gate.ts
@@ -37,7 +37,6 @@ export function isSessionSearchFeatureTipCompleted(
/** Unseen tips whose feature the user has not already set up, in display order. */
export function getPendingFeatureTips(args: {
- macos12SupportNoticeEligible?: boolean
seenTipIds: readonly FeatureTipId[]
cliInstalled: boolean
featureInteractions: FeatureInteractionState
@@ -48,7 +47,6 @@ export function getPendingFeatureTips(args: {
return getOrderedUnseenFeatureTips({
seenTipIds: new Set(args.seenTipIds),
completedTipIds: getCompletedFeatureTipIds({
- macos12SupportNoticeEligible: !args.webClient && args.macos12SupportNoticeEligible === true,
cliInstalled: args.cliInstalled,
voiceDictationEnabled: args.settings?.voice?.enabled === true,
sessionSearchTipCompleted: isSessionSearchFeatureTipCompleted(args.settings, args.webClient),
@@ -59,7 +57,6 @@ export function getPendingFeatureTips(args: {
}
export function getFeatureTipsAppOpenDecision(args: {
- macos12SupportNoticeEligible?: boolean
activeModal: string
cliInstalled: boolean | null
featureTipsSeenIds: readonly FeatureTipId[]
@@ -92,7 +89,6 @@ export function getFeatureTipsAppOpenDecision(args: {
}
const nextTip = getPendingFeatureTips({
- macos12SupportNoticeEligible: args.macos12SupportNoticeEligible,
seenTipIds: args.featureTipsSeenIds,
cliInstalled: args.cliInstalled,
featureInteractions: args.featureInteractions,
diff --git a/src/renderer/src/components/feature-tips/macos-12-support-notice/MacosSupportNoticeDialog.fixture.tsx b/src/renderer/src/components/feature-tips/macos-12-support-notice/MacosSupportNoticeDialog.fixture.tsx
deleted file mode 100644
index d39df30e9a7..00000000000
--- a/src/renderer/src/components/feature-tips/macos-12-support-notice/MacosSupportNoticeDialog.fixture.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { defineFixture } from '../../../component-fixtures/component-fixture'
-import { MacosSupportNoticeDialog } from './MacosSupportNoticeDialog'
-import FeatureTipsModal from '../FeatureTipsModal'
-
-export const upgrade = defineFixture({
- width: 720,
- render: () => (
- <MacosSupportNoticeDialog
- open
- support={{ macos13: 'supported', modelIdentifier: null }}
- onOpenChange={() => {}}
- onOpenUrl={() => {}}
- />
- )
-})
-
-export const omarchy = defineFixture({
- width: 720,
- render: () => (
- <MacosSupportNoticeDialog
- open
- support={{ macos13: 'unsupported', modelIdentifier: 'MacBookPro13,3' }}
- onOpenChange={() => {}}
- onOpenUrl={() => {}}
- />
- )
-})
-
-export const unknown = defineFixture({
- width: 390,
- render: () => (
- <MacosSupportNoticeDialog open support={null} onOpenChange={() => {}} onOpenUrl={() => {}} />
- )
-})
-
-export const connected = defineFixture({
- store: {
- activeModal: 'feature-tips',
- modalData: { tipId: 'macos-12-support', source: 'app_open' },
- featureTipsSeenIds: ['macos-12-support']
- },
- setup: () => {
- const platform = window.api.platform.get()
- window.api.platform.get = () => ({ ...platform, platform: 'darwin', osRelease: '12.7.6' })
- window.api.app.getMacosUpgradeSupport = () =>
- Promise.resolve({ macos13: 'unsupported', modelIdentifier: 'MacBookPro13,3' })
- window.api.shell.openUrl = (url) => {
- document.documentElement.dataset.macosGuideUrl = url
- return Promise.resolve()
- }
- },
- render: () => <FeatureTipsModal />
-})
-
-export const connectedUpgrade = defineFixture({
- ...connected,
- setup: () => {
- connected.setup?.()
- window.api.app.getMacosUpgradeSupport = () =>
- Promise.resolve({ macos13: 'supported', modelIdentifier: null })
- }
-})
-
-export const connectedOlderClient = defineFixture({
- ...connected,
- setup: () => {
- connected.setup?.()
- delete window.api.app.getMacosUpgradeSupport
- }
-})
diff --git a/src/renderer/src/components/feature-tips/macos-12-support-notice/MacosSupportNoticeDialog.tsx b/src/renderer/src/components/feature-tips/macos-12-support-notice/MacosSupportNoticeDialog.tsx
deleted file mode 100644
index b8a3c824930..00000000000
--- a/src/renderer/src/components/feature-tips/macos-12-support-notice/MacosSupportNoticeDialog.tsx
+++ /dev/null
@@ -1,164 +0,0 @@
-import { useRef, type JSX, type MouseEvent } from 'react'
-import { ArrowUpRight, ChevronDown } from 'lucide-react'
-import type { MacosUpgradeSupport } from '../../../../../shared/macos-12-support-notice/upgrade-support'
-import { Button } from '@/components/ui/button'
-import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'
-import {
- Dialog,
- DialogContent,
- DialogDescription,
- DialogFooter,
- DialogHeader,
- DialogTitle
-} from '@/components/ui/dialog'
-import { translate } from '@/i18n/i18n'
-
-export const MACOS_UPDATE_GUIDE_URL = 'https://support.apple.com/en-us/108382'
-export const MACOS_COMPATIBILITY_URL = 'https://support.apple.com/en-us/102861'
-export const OMARCHY_MAC_GUIDE_URL = 'https://omarchy.org/manual/mac-support/'
-
-export function MacosSupportNoticeDialog({
- open,
- onOpenChange,
- support,
- onOpenUrl
-}: {
- open: boolean
- onOpenChange: (open: boolean) => void
- support: MacosUpgradeSupport | null | undefined
- onOpenUrl: (url: string, event: MouseEvent<HTMLButtonElement>) => void
-}): JSX.Element {
- const primaryButtonRef = useRef<HTMLButtonElement>(null)
- const checking = support === undefined
- const canUpgrade = support?.macos13 === 'supported'
- const cannotUpgrade = support?.macos13 === 'unsupported'
- const primaryUrl = canUpgrade
- ? MACOS_UPDATE_GUIDE_URL
- : cannotUpgrade
- ? OMARCHY_MAC_GUIDE_URL
- : MACOS_COMPATIBILITY_URL
-
- return (
- <Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent
- scrollable
- onOpenAutoFocus={(event) => {
- if (!checking) {
- event.preventDefault()
- primaryButtonRef.current?.focus({ preventScroll: true })
- }
- }}
- >
- <DialogHeader>
- <DialogTitle size="display">
- {translate('macosSupport.title', 'A heads-up for your Mac')}
- </DialogTitle>
- <DialogDescription>
- {translate(
- 'macosSupport.description',
- 'A future version of Orca will require macOS 13 or later.'
- )}
- </DialogDescription>
- </DialogHeader>
-
- <div className="space-y-2" aria-live="polite" aria-busy={checking}>
- <p className="text-sm leading-relaxed">
- {checking
- ? translate('macosSupport.checking', 'Checking whether this Mac can upgrade…')
- : canUpgrade
- ? translate(
- 'macosSupport.upgradeDescription',
- 'Your Mac can upgrade. Update macOS to keep receiving Orca updates.'
- )
- : cannotUpgrade
- ? translate(
- 'macosSupport.omarchyDescription',
- 'Apple doesn’t support macOS 13 on this Mac. Orca also runs on Omarchy, a Linux desktop.'
- )
- : translate(
- 'macosSupport.unknownDescription',
- 'We couldn’t confirm an upgrade for this Mac. Apple’s compatibility guide can help.'
- )}
- </p>
- {cannotUpgrade ? (
- <p className="text-xs text-muted-foreground">
- {translate(
- 'macosSupport.omarchyBackup',
- 'Installing Omarchy replaces macOS. Back up your files first.'
- )}
- </p>
- ) : null}
- </div>
-
- <Collapsible>
- <CollapsibleTrigger variant="row">
- {translate('macosSupport.whyTitle', 'Why is this changing?')}
- <ChevronDown
- className="size-4 shrink-0 text-muted-foreground group-data-[state=open]:rotate-180"
- aria-hidden
- />
- </CollapsibleTrigger>
- <CollapsibleContent>
- <div className="space-y-3 pt-2 text-sm leading-relaxed">
- <p>
- {translate(
- 'macosSupport.whyIntro',
- 'We’re updating Electron, the foundation Orca runs on, to bring:'
- )}
- </p>
- <ul className="list-disc space-y-2 pl-4">
- <li>
- {translate(
- 'macosSupport.whySecurity',
- 'Ongoing security fixes from Electron and Chromium.'
- )}
- </li>
- <li>
- {translate(
- 'macosSupport.whyPerformance',
- 'Faster startup and more efficient native API calls.'
- )}
- </li>
- <li>
- {translate(
- 'macosSupport.whySystemApis',
- 'Support for current macOS notification APIs and secure Keychain storage.'
- )}
- </li>
- </ul>
- <p>
- {translate(
- 'macosSupport.whyRequirement',
- 'That newer foundation requires macOS 13 or later.'
- )}
- </p>
- </div>
- </CollapsibleContent>
- </Collapsible>
-
- <p className="text-xs text-muted-foreground">
- {translate('macosSupport.stillWorks', 'This Orca version will keep working for now.')}
- </p>
- <DialogFooter>
- <Button variant="ghost" onClick={() => onOpenChange(false)}>
- {translate('macosSupport.dismiss', 'Got it')}
- </Button>
- <Button
- ref={primaryButtonRef}
- disabled={checking}
- onClick={(event) => onOpenUrl(primaryUrl, event)}
- >
- {checking
- ? translate('macosSupport.checkingAction', 'Checking your Mac…')
- : canUpgrade
- ? translate('macosSupport.updateAction', 'How to update macOS')
- : cannotUpgrade
- ? translate('macosSupport.omarchyAction', 'Explore Omarchy')
- : translate('macosSupport.checkAction', 'Check compatibility')}
- {!checking ? <ArrowUpRight className="size-4" aria-hidden /> : null}
- </Button>
- </DialogFooter>
- </DialogContent>
- </Dialog>
- )
-}
diff --git a/src/renderer/src/components/feature-tips/macos-12-support-notice/MacosSupportNoticeTip.tsx b/src/renderer/src/components/feature-tips/macos-12-support-notice/MacosSupportNoticeTip.tsx
deleted file mode 100644
index 9616cb9970e..00000000000
--- a/src/renderer/src/components/feature-tips/macos-12-support-notice/MacosSupportNoticeTip.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { useEffect, useState, type JSX } from 'react'
-import type { MacosUpgradeSupport } from '../../../../../shared/macos-12-support-notice/upgrade-support'
-import { openAppHttpLink } from '@/lib/app-http-link-open'
-import { MacosSupportNoticeDialog } from './MacosSupportNoticeDialog'
-
-export function MacosSupportNoticeTip({
- open,
- onOpenChange
-}: {
- open: boolean
- onOpenChange: (open: boolean) => void
-}): JSX.Element {
- const [support, setSupport] = useState<MacosUpgradeSupport | null>()
-
- useEffect(() => {
- let cancelled = false
- void Promise.resolve(window.api.app.getMacosUpgradeSupport?.())
- .then((result) => {
- if (!cancelled) {
- setSupport(result ?? null)
- }
- })
- .catch(() => {
- if (!cancelled) {
- setSupport(null)
- }
- })
- return () => {
- cancelled = true
- }
- }, [])
-
- return (
- <MacosSupportNoticeDialog
- open={open}
- onOpenChange={onOpenChange}
- support={support}
- onOpenUrl={(url, event) => {
- onOpenChange(false)
- openAppHttpLink(url, { event })
- }}
- />
- )
-}
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 816f86bbefa..782d9f94ed8 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -23141,26 +23141,5 @@
"needsPermission": "Agent needs permission",
"statusStale": "Agent status is stale"
}
- },
- "macosSupport": {
- "title": "A heads-up for your Mac",
- "description": "A future version of Orca will require macOS 13 or later.",
- "checking": "Checking whether this Mac can upgrade…",
- "upgradeDescription": "Your Mac can upgrade. Update macOS to keep receiving Orca updates.",
- "omarchyDescription": "Apple doesn’t support macOS 13 on this Mac. Orca also runs on Omarchy, a Linux desktop.",
- "unknownDescription": "We couldn’t confirm an upgrade for this Mac. Apple’s compatibility guide can help.",
- "omarchyBackup": "Installing Omarchy replaces macOS. Back up your files first.",
- "whyTitle": "Why is this changing?",
- "whyIntro": "We’re updating Electron, the foundation Orca runs on, to bring:",
- "whySecurity": "Ongoing security fixes from Electron and Chromium.",
- "whyPerformance": "Faster startup and more efficient native API calls.",
- "whySystemApis": "Support for current macOS notification APIs and secure Keychain storage.",
- "whyRequirement": "That newer foundation requires macOS 13 or later.",
- "stillWorks": "This Orca version will keep working for now.",
- "dismiss": "Got it",
- "checkingAction": "Checking your Mac…",
- "updateAction": "How to update macOS",
- "omarchyAction": "Explore Omarchy",
- "checkAction": "Check compatibility"
}
}
diff --git a/src/renderer/src/web/preload-api/web-app-api.ts b/src/renderer/src/web/preload-api/web-app-api.ts
index 994fb4de414..f0a351c5a86 100644
--- a/src/renderer/src/web/preload-api/web-app-api.ts
+++ b/src/renderer/src/web/preload-api/web-app-api.ts
@@ -12,7 +12,6 @@ export function createWebAppApi(): Partial<PreloadApi> {
isProfileStateSaveDelayed: () => Promise.resolve(false),
onProfileStateSaveDelayChanged: () => () => undefined,
getWindowsAdministratorStatus: () => Promise.resolve(null),
- getMacosUpgradeSupport: () => Promise.resolve(null),
restartAsAdministrator: () =>
Promise.reject(new Error('Administrator restart requires the Windows desktop app.')),
getIdentity: () =>
diff --git a/src/shared/feature-tips.test.ts b/src/shared/feature-tips.test.ts
index 80ccbd35705..ed479db848e 100644
--- a/src/shared/feature-tips.test.ts
+++ b/src/shared/feature-tips.test.ts
@@ -11,7 +11,6 @@ describe('feature tips', () => {
const tips = getOrderedUnseenFeatureTips({ seenTipIds: new Set<FeatureTipId>() })
expect(tips.map((tip) => tip.id)).toEqual([
- 'macos-12-support',
'native-chat-upgrade',
'agent-session-search',
'orca-cli',
@@ -41,7 +40,6 @@ describe('feature tips', () => {
it('skips tips the user has already seen', () => {
const tips = getOrderedUnseenFeatureTips({
seenTipIds: new Set<FeatureTipId>([
- 'macos-12-support',
'native-chat-upgrade',
'voice-dictation',
'orca-cli',
diff --git a/src/shared/feature-tips.ts b/src/shared/feature-tips.ts
index 3088e5c3e21..e5f0c645ea3 100644
--- a/src/shared/feature-tips.ts
+++ b/src/shared/feature-tips.ts
@@ -5,7 +5,6 @@ import {
} from './feature-interactions'
export type FeatureTipId =
- | 'macos-12-support'
| 'native-chat-upgrade'
| 'voice-dictation'
| 'orca-cli'
@@ -15,7 +14,6 @@ export type FeatureTipId =
export type FeatureTipPriority = 'new' | 'unseen'
export type FeatureTipAction =
- | 'review-macos-support'
| 'learn-native-chat-upgrade'
| 'enable-voice'
| 'setup-cli'
@@ -34,7 +32,6 @@ export type FeatureTip = {
}
export type CompletedFeatureTipState = {
- macos12SupportNoticeEligible?: boolean
cliInstalled: boolean
voiceDictationEnabled: boolean
/** Search is on, or this client cannot turn it on. */
@@ -45,17 +42,6 @@ export type CompletedFeatureTipState = {
}
export const FEATURE_TIPS = [
- {
- id: 'macos-12-support',
- priority: 'new',
- eyebrow: 'Compatibility',
- title: 'A heads-up for your Mac',
- description:
- 'Orca will soon require macOS 13 or later. You can keep using this version for now.',
- action: 'review-macos-support',
- ctaLabel: 'Review your options',
- completedByFeatureInteractions: []
- },
{
// Show the upgrade tip first for its audience’s first launch.
id: 'native-chat-upgrade',
@@ -135,9 +121,6 @@ export function normalizeFeatureTipIds(value: unknown): FeatureTipId[] {
export function getCompletedFeatureTipIds(state: CompletedFeatureTipState): Set<FeatureTipId> {
const completedIds = new Set<FeatureTipId>()
- if (!state.macos12SupportNoticeEligible) {
- completedIds.add('macos-12-support')
- }
if (state.cliInstalled) {
completedIds.add('orca-cli')
}
diff --git a/src/shared/macos-12-support-notice/upgrade-support.test.ts b/src/shared/macos-12-support-notice/upgrade-support.test.ts
deleted file mode 100644
index fedcadfee36..00000000000
--- a/src/shared/macos-12-support-notice/upgrade-support.test.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { isMacos12SupportNoticeEligible } from './upgrade-support'
-
-describe('macOS support notice', () => {
- it.each([
- ['darwin', '12.7.6', false, true],
- ['darwin', '12.7.6', true, false],
- ['darwin', '13.0', false, false],
- ['darwin', '21.6.0', false, false],
- ['darwin', '', false, false],
- ['linux', '12.0', false, false],
- ['win32', '12.0', false, false]
- ])('targets local Monterey only: %s %s web=%s', (platform, osRelease, webClient, eligible) => {
- expect(isMacos12SupportNoticeEligible({ platform, osRelease }, webClient)).toBe(eligible)
- })
-})
diff --git a/src/shared/macos-12-support-notice/upgrade-support.ts b/src/shared/macos-12-support-notice/upgrade-support.ts
deleted file mode 100644
index 7cef692dfa7..00000000000
--- a/src/shared/macos-12-support-notice/upgrade-support.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export type MacosUpgradeSupport = {
- macos13: 'supported' | 'unsupported' | 'unknown'
- modelIdentifier: string | null
-}
-
-export function isMacos12SupportNoticeEligible(
- platform: { platform: string; osRelease: string },
- webClient: boolean
-): boolean {
- // The preload exposes getSystemVersion(), not the Darwin kernel release.
- return !webClient && platform.platform === 'darwin' && /^12(?:\.|$)/u.test(platform.osRelease)
-}