mirror of
https://github.com/stablyai/orca.git
synced 2026-11-16 19:07:41 +00:00
refactor: organize shared lifecycle and runtime owners (#42792)
This commit is contained in:
@@ -19,7 +19,7 @@ on:
|
||||
- 'src/main/providers/shell-launch/macos/tcc-login-shell*'
|
||||
- 'src/shared/process-observation/tables/process-table-snapshot*'
|
||||
- 'src/shared/process-observation/darwin/darwin-process-table-capture*'
|
||||
- 'src/shared/update-status-types.ts'
|
||||
- 'src/shared/updater/update-status-types.ts'
|
||||
- 'pnpm-lock.yaml'
|
||||
workflow_dispatch:
|
||||
|
||||
|
||||
@@ -575,8 +575,8 @@
|
||||
5 src/shared/agent-hook-listener/transport/endpoint-publication.ts
|
||||
4 src/shared/agent-launch/startup/omp-fresh-config.ts
|
||||
2 src/shared/desktop-distribution/appimage/appimage-cache-identity.ts
|
||||
2 src/shared/bundled-web-client-manifest.ts
|
||||
3 src/shared/bundled-web-client-root.ts
|
||||
2 src/shared/web-client/bundled-web-client-manifest.ts
|
||||
3 src/shared/web-client/bundled-web-client-root.ts
|
||||
5 src/shared/shell/command-resolution/cli-fs-reads.ts
|
||||
3 src/shared/shell/launch/cli-runtime-pairing-inputs.ts
|
||||
9 src/shared/agent-hook-listener/providers/codex/codex-rollout-jsonl-cursor.ts
|
||||
|
||||
@@ -70,7 +70,11 @@ export function hashedAsset(bytes, extension) {
|
||||
}
|
||||
}
|
||||
|
||||
function readIntegerConstant(source, name, file = 'src/shared/protocol-version.ts') {
|
||||
function readIntegerConstant(
|
||||
source,
|
||||
name,
|
||||
file = 'src/shared/remote-runtime/protocol/protocol-version.ts'
|
||||
) {
|
||||
const match = new RegExp(`export const ${name} = (\\d+)`).exec(source)
|
||||
if (!match) {
|
||||
throw new Error(`[mobile-web-bundle-manifest] ${name} not found in ${file}`)
|
||||
@@ -80,7 +84,10 @@ function readIntegerConstant(source, name, file = 'src/shared/protocol-version.t
|
||||
|
||||
// Parse TS protocol source: packaging runs bare Node before build outputs exist.
|
||||
export async function readProtocolWindow() {
|
||||
const source = await readFile(join(projectDir, 'src', 'shared', 'protocol-version.ts'), 'utf8')
|
||||
const source = await readFile(
|
||||
join(projectDir, 'src', 'shared', 'remote-runtime', 'protocol', 'protocol-version.ts'),
|
||||
'utf8'
|
||||
)
|
||||
return {
|
||||
runtimeProtocolVersion: readIntegerConstant(source, 'RUNTIME_PROTOCOL_VERSION'),
|
||||
minCompatibleRuntimeProtocolVersion: readIntegerConstant(
|
||||
|
||||
@@ -4,7 +4,7 @@ import { DatabaseSync } from 'node:sqlite'
|
||||
import { tmpdir } from 'node:os'
|
||||
import path from 'node:path'
|
||||
import { afterEach, describe, expect, it } from 'vitest'
|
||||
import { createDefaultLocalOrcaProfile } from '../../../../src/shared/orca-profiles'
|
||||
import { createDefaultLocalOrcaProfile } from '../../../../src/shared/orca-profiles/orca-profiles'
|
||||
import { seedDevProfile } from './dev-profile-seed.mjs'
|
||||
|
||||
const roots = []
|
||||
|
||||
@@ -2,7 +2,10 @@ import process from 'node:process'
|
||||
import { homedir, tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
import { afterAll, beforeEach } from 'vitest'
|
||||
import { setAppEnvironment, type AppEnvironment } from '../../../../src/shared/app-environment'
|
||||
import {
|
||||
setAppEnvironment,
|
||||
type AppEnvironment
|
||||
} from '../../../../src/shared/app-lifecycle/app-environment'
|
||||
import { setSecretStore } from '../../../../src/shared/secure-storage/secret-store'
|
||||
|
||||
// The harness owns its directory even when a suite replaces the fs module.
|
||||
|
||||
@@ -207,13 +207,13 @@ const CROSS_VERSION_WIRE_PREFIXES = [
|
||||
'config/scripts/check-runtime-launcher-protocol-ratchet',
|
||||
'config/scripts/daemon-protocol/admission/check-runtime-launcher-protocol-ratchet',
|
||||
'src/main/daemon/protocol/daemon-protocol-version.ts',
|
||||
'src/shared/protocol-version',
|
||||
'src/shared/remote-runtime/protocol/protocol-version',
|
||||
'src/shared/terminal/stream/terminal-stream-protocol',
|
||||
'src/shared/browser/client-hosting/browser-client-host-protocol',
|
||||
'src/shared/browser/network/tunnels/browser-network-tunnel-protocol',
|
||||
// Both released/current WebSocket transports must accept web upgrade marker (cross-version-web-upgrade-marker).
|
||||
'src/main/runtime/rpc/transports/websocket/ws-transport.ts',
|
||||
'src/shared/web-origin-security.ts',
|
||||
'src/shared/remote-runtime/pairing/web-origin-security.ts',
|
||||
'src/shared/browser/client-hosting/browser-client-host-placement',
|
||||
'src/shared/agent-launch/contracts/agent-launch-intent',
|
||||
'src/shared/rpc-contract/agent-launch/agent-launch-params',
|
||||
@@ -294,7 +294,7 @@ const CROSS_VERSION_WIRE_PREFIXES = [
|
||||
'src/shared/agent-launch/choices/structured-native-chat-launch-route.ts',
|
||||
'src/renderer/src/lib/agent-session/launch/routing/agent-launch-routing.ts',
|
||||
'src/renderer/src/runtime/rpc/targets/paired-host-client-capabilities.ts',
|
||||
'src/shared/electron-remote-runtime-client-capabilities.ts',
|
||||
'src/shared/remote-runtime/protocol/electron-remote-runtime-client-capabilities.ts',
|
||||
'src/shared/remote-runtime/remote-runtime-client-capabilities.ts',
|
||||
// An older app opening a newer orchestration database (orchestration-delivery-downgrade).
|
||||
'src/main/runtime/orchestration/db/',
|
||||
|
||||
+1
-1
@@ -232,7 +232,7 @@ Mobile and desktop talk over a versioned protocol. Because mobile updates lag de
|
||||
|
||||
Constants live in two files (Metro can't resolve outside `mobile/`):
|
||||
|
||||
- `src/shared/protocol-version.ts` — `DESKTOP_PROTOCOL_VERSION`, `MIN_COMPATIBLE_MOBILE_VERSION`
|
||||
- `src/shared/remote-runtime/protocol/protocol-version.ts` — `DESKTOP_PROTOCOL_VERSION`, `MIN_COMPATIBLE_MOBILE_VERSION`
|
||||
- `mobile/src/transport/connection/protocol-version.ts` — `MOBILE_PROTOCOL_VERSION`, `MIN_COMPATIBLE_DESKTOP_VERSION`
|
||||
|
||||
Today all four are set so `evaluateCompat` always returns `{ kind: 'ok' }` — nothing blocks. The wire format is in place to flip a switch when needed.
|
||||
|
||||
@@ -2,7 +2,7 @@ import { structuredAgentSessionTabId } from '../../src/shared/agent-session/view
|
||||
import {
|
||||
DESKTOP_PROTOCOL_VERSION,
|
||||
MIN_COMPATIBLE_MOBILE_VERSION
|
||||
} from '../../src/shared/protocol-version'
|
||||
} from '../../src/shared/remote-runtime/protocol/protocol-version'
|
||||
import type { RuntimeMobileSessionTabsResult } from '../../src/shared/remote-runtime/session-graph/runtime-session-contracts'
|
||||
import type {
|
||||
RuntimeWorktreeAgentRow,
|
||||
|
||||
@@ -2,7 +2,7 @@ import type { WebSocket } from 'ws'
|
||||
import {
|
||||
DESKTOP_PROTOCOL_VERSION,
|
||||
MIN_COMPATIBLE_MOBILE_VERSION
|
||||
} from '../../src/shared/protocol-version'
|
||||
} from '../../src/shared/remote-runtime/protocol/protocol-version'
|
||||
import {
|
||||
applyTerminalQuickCommandMutation,
|
||||
type TerminalQuickCommandMutation
|
||||
|
||||
@@ -2,7 +2,7 @@ import {
|
||||
compareAppVersions,
|
||||
isPrereleaseAppVersion,
|
||||
isValidAppVersion
|
||||
} from '../../../src/shared/app-version'
|
||||
} from '../../../src/shared/app-lifecycle/identity/app-version'
|
||||
|
||||
export type AppUpdateCheckResult =
|
||||
| { kind: 'available'; version: string; url: string }
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { z } from 'zod'
|
||||
import { compareAppVersions } from '../../../src/shared/app-version'
|
||||
import { compareAppVersions } from '../../../src/shared/app-lifecycle/identity/app-version'
|
||||
import type { AppUpdateCheckResult, AppUpdateSource } from './app-update-source'
|
||||
import { isNewerReleaseVersion } from './app-update-source'
|
||||
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
|
||||
import '../../../../src/shared/protocol-version'
|
||||
|
||||
import { loadMobileAgentLaunchContext, newTabAgentOptionsFrom } from './mobile-new-tab-agent-loader'
|
||||
|
||||
async function loadOptions(
|
||||
args: Parameters<typeof loadMobileAgentLaunchContext>[0]
|
||||
): Promise<unknown[]> {
|
||||
const context = await loadMobileAgentLaunchContext(args)
|
||||
return newTabAgentOptionsFrom(context.settings, context.detectedAgents)
|
||||
}
|
||||
|
||||
function createClient(
|
||||
handler: (method: string, params?: unknown) => Promise<unknown>
|
||||
): RpcClient & { sendRequest: ReturnType<typeof vi.fn> } {
|
||||
return {
|
||||
sendRequest: vi.fn(handler),
|
||||
subscribe: vi.fn(() => () => {})
|
||||
} as unknown as RpcClient & { sendRequest: ReturnType<typeof vi.fn> }
|
||||
}
|
||||
|
||||
describe('mobile new-tab agent loading', () => {
|
||||
it('does not fall back to probing locally when an older host refuses the folder catalog', async () => {
|
||||
const client = createClient(async (method) => {
|
||||
if (method === 'settings.get') {
|
||||
return { ok: true, result: { settings: {} } }
|
||||
}
|
||||
return { ok: false, error: { code: 'method_not_found', message: 'Unknown method' } }
|
||||
})
|
||||
await expect(loadOptions({ client, worktreeId: 'folder:fw-1' })).rejects.toThrow(
|
||||
'Unknown method'
|
||||
)
|
||||
expect(client.sendRequest.mock.calls.some(([method]) => method.startsWith('preflight.'))).toBe(
|
||||
false
|
||||
)
|
||||
})
|
||||
})
|
||||
@@ -1,5 +1,5 @@
|
||||
import { getRepoIdFromWorktreeId } from '../../../../src/shared/worktree/id'
|
||||
import '../../../../src/shared/protocol-version'
|
||||
import '../../../../src/shared/remote-runtime/protocol/protocol-version'
|
||||
import {
|
||||
PREFLIGHT_OTHER_RUNTIME_REFUSAL_RUNTIME_CAPABILITY,
|
||||
WORKSPACE_ON_OTHER_RUNTIME
|
||||
|
||||
@@ -3,7 +3,7 @@ import { startRuntimeCapabilityProbe } from '../../transport/connection/runtime-
|
||||
import { supportsMobileQuickCommands } from '../../terminal/quick-commands/quick-commands'
|
||||
import { terminalQuickCommandAgentPromptMaxLength } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-prompt-limit'
|
||||
import { MOBILE_AI_VAULT_CAPABILITY } from '../../agent-history/agent-history-capability'
|
||||
import '../../../../src/shared/protocol-version'
|
||||
import '../../../../src/shared/remote-runtime/protocol/protocol-version'
|
||||
import { TERMINAL_QUERY_REPLY_INPUT_RUNTIME_CAPABILITY } from '../../../../src/shared/terminal/runtime-policy/terminal-runtime-capabilities'
|
||||
import { PROGRAM_STATUS_RUNTIME_CAPABILITY } from '../../../../src/shared/program-status/protocol'
|
||||
import { structuredAgentSessionHostSupport } from '../native-chat/agent-session/mobile-structured-agent-session-host-support'
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
|
||||
import type { SendRequestOptions } from '../../../transport/rpc/unvalidated-rpc-request-port'
|
||||
import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../src/shared/github/repositories/repository-identity'
|
||||
import { hasReachedAppVersion } from '../../../../../src/shared/app-version'
|
||||
import { hasReachedAppVersion } from '../../../../../src/shared/app-lifecycle/identity/app-version'
|
||||
import {
|
||||
GITHUB_EXACT_OPERATION_UNSUPPORTED,
|
||||
matchesGitHubWorkItemTarget,
|
||||
|
||||
@@ -6,7 +6,7 @@ import {
|
||||
supportsTerminalAgentQuickCommand
|
||||
} from '../../../../src/shared/terminal/quick-commands/terminal-quick-commands'
|
||||
import '../../../../src/shared/terminal/quick-commands/terminal-quick-command-prompt-limit'
|
||||
import '../../../../src/shared/protocol-version'
|
||||
import '../../../../src/shared/remote-runtime/protocol/protocol-version'
|
||||
import { TERMINAL_QUICK_COMMANDS_RUNTIME_CAPABILITY } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-capabilities'
|
||||
import { TUI_AGENT_DISPLAY_NAMES as MOBILE_TUI_AGENT_LABELS } from '../../../../src/shared/agent-launch/catalog/tui-agent-display-names'
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ import {
|
||||
} from '../../../session/tabs/pending-session-selection'
|
||||
import { releaseTerminalCreateLock } from './terminal-create-lock'
|
||||
import { placeCreatedSessionTab } from '../../../../../src/shared/session-tab-placement'
|
||||
import '../../../../../src/shared/protocol-version'
|
||||
import '../../../../../src/shared/remote-runtime/protocol/protocol-version'
|
||||
import { SESSION_TABS_SPLIT_GROUP_PLACEMENT_RUNTIME_CAPABILITY } from '../../../../../src/shared/remote-runtime/protocol/session-tabs-runtime-capabilities'
|
||||
|
||||
export function useMobileSessionTerminalCreateActions(scope: MobileSessionAttachmentsModel) {
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
|
||||
} from '../../../../src/shared/agent-session/agent-session-runtime-capabilities'
|
||||
import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../../src/shared/agent-session/requests/agent-session-current-requests-capability'
|
||||
import '../../../../src/shared/protocol-version'
|
||||
import '../../../../src/shared/remote-runtime/protocol/protocol-version'
|
||||
import {
|
||||
AGENT_STATUS_RESTORED_UNCONFIRMED_RUNTIME_CAPABILITY,
|
||||
SESSION_TABS_SPLIT_GROUP_PLACEMENT_RUNTIME_CAPABILITY
|
||||
|
||||
@@ -4,7 +4,7 @@ import type * as fs from 'node:fs'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { createDefaultLocalOrcaProfile } from '../../shared/orca-profiles'
|
||||
import { createDefaultLocalOrcaProfile } from '../../shared/orca-profiles/orca-profiles'
|
||||
import {
|
||||
getOrcaProfileDataFile,
|
||||
getOrcaProfileStateDatabaseFile
|
||||
|
||||
@@ -7,7 +7,7 @@ import type { RuntimeClient } from '../runtime/client'
|
||||
import type { RuntimeRpcSuccess } from '../../shared/remote-runtime/rpc/runtime-rpc-envelope'
|
||||
import { getDefaultUserDataPath } from '../runtime/profile/metadata'
|
||||
import type { AgentHookInstallStatus } from '../../shared/agent-hook-listener/configuration/agent-hook-types'
|
||||
import { DEFAULT_LOCAL_ORCA_PROFILE_ID } from '../../shared/orca-profiles'
|
||||
import { DEFAULT_LOCAL_ORCA_PROFILE_ID } from '../../shared/orca-profiles/orca-profiles'
|
||||
import type { GlobalSettings } from '../../shared/global-settings-types'
|
||||
import type { ProfileStateOfflineLocation } from '../../main/persistence/profile-state/offline-access/profile-state-offline-settings'
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ import {
|
||||
openProfileStateDatabase,
|
||||
openProfileStateDatabaseReadOnly
|
||||
} from '../../main/persistence/profile-state/database/profile-state-database'
|
||||
import { profileStateDatabaseFile } from '../../shared/profile-state-storage-paths'
|
||||
import { profileStateDatabaseFile } from '../../shared/orca-profiles/profile-state-storage-paths'
|
||||
import {
|
||||
exportProfileStateJson,
|
||||
importProfileStateJson
|
||||
|
||||
@@ -17,7 +17,7 @@ import {
|
||||
type ProfileStateExportsResult,
|
||||
type ProfileStateRollbackResult,
|
||||
type ProfileStateRecoverySelector
|
||||
} from '../../shared/profile-state-recovery-command'
|
||||
} from '../../shared/orca-profiles/profile-state-recovery-command'
|
||||
import {
|
||||
canLaunchProfileStateRecovery,
|
||||
launchProfileStateRecovery
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { existsSync } from 'node:fs'
|
||||
import { dirname, join } from 'node:path'
|
||||
import { runProcessSync } from '@orca/process-host'
|
||||
import { ELECTRON_NO_SANDBOX_REQUEST_ENV } from '../../../shared/electron-no-sandbox-request'
|
||||
import { ELECTRON_NO_SANDBOX_REQUEST_ENV } from '../../../shared/app-lifecycle/launch/electron-no-sandbox-request'
|
||||
|
||||
const USER_NAMESPACE_PROBE_TIMEOUT_MS = 2_000
|
||||
|
||||
|
||||
@@ -1,84 +0,0 @@
|
||||
import '../../shared/remote-runtime/host-store/environment-store-worker-test-fixture'
|
||||
import type * as nodeFs from 'node:fs'
|
||||
import { mkdtempSync, rmSync } from 'node:fs'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
import { afterEach, expect, it, vi } from 'vitest'
|
||||
import { RuntimeClient } from './client'
|
||||
import { addEnvironmentFromPairingCode } from './pairing/environments'
|
||||
import { encodePairingOffer } from '../../shared/remote-runtime/pairing/pairing'
|
||||
import { RUNTIME_PROTOCOL_VERSION } from '../../shared/protocol-version'
|
||||
|
||||
const mocks = vi.hoisted(() => {
|
||||
const state: { unownedPath: string | null } = { unownedPath: null }
|
||||
return { remote: vi.fn(), remotePreflight: vi.fn(), state }
|
||||
})
|
||||
|
||||
vi.mock('./connection/websocket-transport', () => ({
|
||||
sendWebSocketRequest: mocks.remote,
|
||||
sendWebSocketRequestWithStatusPreflight: mocks.remotePreflight
|
||||
}))
|
||||
|
||||
// A profile directory owned by another account refuses chmod even though it stays readable.
|
||||
vi.mock('node:fs', async (importOriginal) => {
|
||||
const actual = await importOriginal<typeof nodeFs>()
|
||||
const chmodSync: typeof actual.chmodSync = (path, mode) => {
|
||||
if (path === mocks.state.unownedPath) {
|
||||
throw Object.assign(new Error(`EPERM: operation not permitted, chmod '${path}'`), {
|
||||
code: 'EPERM'
|
||||
})
|
||||
}
|
||||
actual.chmodSync(path, mode)
|
||||
}
|
||||
return { ...actual, default: { ...actual, chmodSync }, chmodSync }
|
||||
})
|
||||
|
||||
const roots: string[] = []
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks()
|
||||
mocks.state.unownedPath = null
|
||||
for (const root of roots.splice(0)) {
|
||||
rmSync(root, { recursive: true, force: true })
|
||||
}
|
||||
})
|
||||
|
||||
function success(result: unknown) {
|
||||
return { id: 'request-1', ok: true, result, _meta: { runtimeId: 'runtime-remote' } }
|
||||
}
|
||||
|
||||
// Windows hardens the profile through ACLs, not chmod, so this EPERM cannot be injected there.
|
||||
const posixIt = process.platform === 'win32' ? it.skip : it
|
||||
|
||||
posixIt('returns remote replies when the saved environment store cannot be updated', async () => {
|
||||
const root = mkdtempSync(join(tmpdir(), 'cli-env-usage-'))
|
||||
roots.push(root)
|
||||
const pairingCode = encodePairingOffer({
|
||||
v: 2,
|
||||
endpoint: 'ws://127.0.0.1:6768',
|
||||
deviceToken: 'fixture-token',
|
||||
publicKeyB64: Buffer.from(new Uint8Array(32).fill(1)).toString('base64'),
|
||||
scope: 'runtime'
|
||||
})
|
||||
await addEnvironmentFromPairingCode(root, { name: 'workstation', pairingCode })
|
||||
mocks.state.unownedPath = root
|
||||
vi.spyOn(console, 'warn').mockImplementation(() => {})
|
||||
mocks.remote.mockResolvedValue(success({ server: 'remote' }))
|
||||
mocks.remotePreflight.mockImplementation(
|
||||
async (_connection, _method, _params, _timeoutMs, validateStatus) => {
|
||||
validateStatus(
|
||||
success({
|
||||
runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
|
||||
minCompatibleRuntimeClientVersion: RUNTIME_PROTOCOL_VERSION
|
||||
})
|
||||
)
|
||||
return success({ worktrees: [] })
|
||||
}
|
||||
)
|
||||
const client = new RuntimeClient(root, 5_000, null, 'workstation')
|
||||
|
||||
// Last-used bookkeeping is best effort; it must not fail a command whose reply already arrived.
|
||||
await expect(client.call('status.get')).resolves.toMatchObject({ result: { server: 'remote' } })
|
||||
await expect(client.call('worktree.list')).resolves.toMatchObject({ result: { worktrees: [] } })
|
||||
// Proves the store write really failed, so the replies above survived it rather than skipped it.
|
||||
})
|
||||
@@ -4,7 +4,7 @@ import { mkdtempSync, writeFileSync } from 'node:fs'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import '../../shared/protocol-version'
|
||||
import '../../shared/remote-runtime/protocol/protocol-version'
|
||||
import '../orchestration/recovery/orchestration-mutation-recovery'
|
||||
import { reportCliError } from '../output/cli-error'
|
||||
import { RuntimeClient } from './client'
|
||||
|
||||
@@ -4,7 +4,7 @@ import { tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
import { createServer, type Socket } from 'node:net'
|
||||
import { afterEach, describe, expect, it, onTestFinished, vi } from 'vitest'
|
||||
import '../../shared/protocol-version'
|
||||
import '../../shared/remote-runtime/protocol/protocol-version'
|
||||
import { RuntimeClient } from './client'
|
||||
import { launchOrcaApp } from './launch'
|
||||
import '../output/cli-error'
|
||||
|
||||
@@ -16,7 +16,7 @@ import { openLocalOrca } from './app-launch/open-local-orca'
|
||||
import { getDefaultUserDataPath, readMetadata } from './profile/metadata'
|
||||
import { getCliStatus, getOfflineRuntimeAdmission } from './status/status'
|
||||
import type { OfflineRuntimeAdmission } from './status/status'
|
||||
import { projectRemoteAppStatus } from '../../shared/cli-app-status-projection'
|
||||
import { projectRemoteAppStatus } from '../../shared/remote-runtime/session-graph/cli-app-status-projection'
|
||||
import { sendRequest } from './connection/transport'
|
||||
import { attachMutationRecovery, isRequestUnsent } from './connection/client-error-recovery'
|
||||
import { RuntimeClientError, RuntimeRpcFailureError } from './connection/types'
|
||||
|
||||
@@ -6,7 +6,7 @@ import {
|
||||
import {
|
||||
MIN_COMPATIBLE_RUNTIME_SERVER_VERSION,
|
||||
RUNTIME_PROTOCOL_VERSION
|
||||
} from '../../../shared/protocol-version'
|
||||
} from '../../../shared/remote-runtime/protocol/protocol-version'
|
||||
import type {
|
||||
RuntimeRequestSelection,
|
||||
RuntimeOrchestrationEnvelope,
|
||||
|
||||
@@ -10,8 +10,8 @@ import {
|
||||
pinServeUserDataPath,
|
||||
resolveLaunchUserDataPath
|
||||
} from './profile/launch-user-data-path'
|
||||
import { foregroundServeIsolatedProfileSwitches } from '../../shared/electron-isolated-profile-switches'
|
||||
import { headlessServeOzonePlatformSwitches } from '../../shared/headless-serve-ozone-platform'
|
||||
import { foregroundServeIsolatedProfileSwitches } from '../../shared/app-lifecycle/launch/electron-isolated-profile-switches'
|
||||
import { headlessServeOzonePlatformSwitches } from '../../shared/app-lifecycle/launch/headless-serve-ozone-platform'
|
||||
import { getMacAppBundlePath } from './serve/updates/mac-app-update-bundle'
|
||||
import { getPlatformUserDataPath } from './profile/metadata'
|
||||
import { isSameUserDataPath } from '../../shared/remote-runtime/serve-supervisor/serve-user-data-path'
|
||||
@@ -21,7 +21,7 @@ import {
|
||||
superviseForegroundServe
|
||||
} from './serve/updates/serve-update-supervisor'
|
||||
import { RuntimeClientError } from './connection/types'
|
||||
import { BACKGROUND_OPEN_ARG } from '../../shared/background-open-argv'
|
||||
import { BACKGROUND_OPEN_ARG } from '../../shared/app-lifecycle/launch/background-open-argv'
|
||||
import {
|
||||
getExecutableAppArgs,
|
||||
resolveAppRoot,
|
||||
@@ -32,7 +32,7 @@ import {
|
||||
SERVE_RUNTIME_ELECTRON,
|
||||
SERVE_RUNTIME_ENV
|
||||
} from '../../shared/remote-runtime/serve-supervisor/orcad-local-serve-selection'
|
||||
import { findBundledWebClientRoot } from '../../shared/bundled-web-client-root'
|
||||
import { findBundledWebClientRoot } from '../../shared/web-client/bundled-web-client-root'
|
||||
import { resolveLocalServeRuntime, serveWithOrcad } from './serve/startup/serve-orcad-launch'
|
||||
import { findAppSpeechRecognizerDir } from './app-launch/serve-speech-recognizer'
|
||||
import {
|
||||
|
||||
@@ -4,7 +4,7 @@ import { createServer, type Socket } from 'node:net'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { setAppEnvironment } from '../../shared/app-environment'
|
||||
import { setAppEnvironment } from '../../shared/app-lifecycle/app-environment'
|
||||
import type * as ProcessHost from '@orca/process-host'
|
||||
import { main } from '../index'
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { resolve } from 'node:path'
|
||||
import { ELECTRON_NO_SANDBOX_REQUEST_ENV } from '../../shared/electron-no-sandbox-request'
|
||||
import { ELECTRON_NO_SANDBOX_REQUEST_ENV } from '../../shared/app-lifecycle/launch/electron-no-sandbox-request'
|
||||
import { needsElectronNoSandbox } from './app-launch/electron-sandbox-switch'
|
||||
import { serverOnlyServeMessage } from './app-launch/serve-app-launcher'
|
||||
import { SERVE_SUPERVISOR_APP_ROOT_ENV } from './serve/supervision/serve-supervisor-relocation'
|
||||
|
||||
@@ -6,7 +6,7 @@ import {
|
||||
profileStateRecoveryResponseSchema,
|
||||
type ProfileStateRecoveryRequest,
|
||||
type ProfileStateRollbackResult
|
||||
} from '../../../shared/profile-state-recovery-command'
|
||||
} from '../../../shared/orca-profiles/profile-state-recovery-command'
|
||||
import {
|
||||
getExecutableAppArgs,
|
||||
resolveAppRoot,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { runProcessSync } from '@orca/process-host'
|
||||
import type { RuntimeMetadata } from '../../../../shared/remote-runtime/bootstrap/runtime-bootstrap'
|
||||
import type { RuntimeRpcFailure } from '../../../../shared/remote-runtime/rpc/runtime-rpc-envelope'
|
||||
import { SINGLE_INSTANCE_ALREADY_RUNNING_EXIT_CODE } from '../../../../shared/single-instance-exit-code'
|
||||
import { SINGLE_INSTANCE_ALREADY_RUNNING_EXIT_CODE } from '../../../../shared/app-lifecycle/launch/single-instance-exit-code'
|
||||
import {
|
||||
clearServeAbortPark,
|
||||
isServeAbortParkActive,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { SINGLE_INSTANCE_ALREADY_RUNNING_EXIT_CODE } from '../../../../shared/single-instance-exit-code'
|
||||
import { SINGLE_INSTANCE_ALREADY_RUNNING_EXIT_CODE } from '../../../../shared/app-lifecycle/launch/single-instance-exit-code'
|
||||
import { ORCAD_EXIT_TERMINALS_NOT_DURABLE } from '../../../../shared/remote-runtime/serve-supervisor/serve-supervised-terminal-durability'
|
||||
import { orcadStaleLockReclaimCommand } from '../../../../shared/remote-runtime/orcad-lifecycle/orcad-stale-lock-reclaim'
|
||||
import {
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
import {
|
||||
QUIT_RENDERER_ACK_TIMEOUT_MS,
|
||||
WILL_QUIT_TEARDOWN_DEADLINE_MS
|
||||
} from '../../../../shared/quit-teardown-deadline'
|
||||
} from '../../../../shared/app-lifecycle/shutdown/quit-teardown-deadline'
|
||||
import { serveSignalExitError } from '../startup/serve-signal-exit-diagnostic'
|
||||
import { waitForMacBundleVersion } from './mac-app-update-bundle'
|
||||
import {
|
||||
|
||||
@@ -9,7 +9,7 @@ import {
|
||||
} from '../../../shared/remote-runtime/bootstrap/runtime-bootstrap'
|
||||
import { tryReadMetadata } from '../profile/metadata'
|
||||
import { sendRequest } from '../connection/transport'
|
||||
import { resolveDesktopWindowStatus } from '../../../shared/cli-app-status-projection'
|
||||
import { resolveDesktopWindowStatus } from '../../../shared/remote-runtime/session-graph/cli-app-status-projection'
|
||||
import { RuntimeClientError, RuntimeRpcFailureError } from '../connection/types'
|
||||
import type {
|
||||
RuntimeRpcResponse,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { RuntimeTerminalSend } from '../../shared/terminal/runtime/runtime-terminal-send-contract'
|
||||
import '../../shared/protocol-version'
|
||||
import '../../shared/remote-runtime/protocol/protocol-version'
|
||||
import { TERMINAL_PROMPT_DELIVERY_RUNTIME_CAPABILITY } from '../../shared/terminal/runtime-policy/terminal-runtime-capabilities'
|
||||
import type { CommandHandler } from '../dispatch/dispatch'
|
||||
import { formatTerminalSend, terminalSendWarnings } from './terminal-format'
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import { RuntimeClient } from '../runtime/client'
|
||||
import type { CliStatusResult } from '../../shared/remote-runtime/session-graph/runtime-session-contracts'
|
||||
import '../../shared/protocol-version'
|
||||
import '../../shared/remote-runtime/protocol/protocol-version'
|
||||
import { TERMINAL_PROMPT_DELIVERY_RUNTIME_CAPABILITY } from '../../shared/terminal/runtime-policy/terminal-runtime-capabilities'
|
||||
import { TERMINAL_HANDLERS } from './terminal'
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ import {
|
||||
isSupportedWindowsShellOverride,
|
||||
listSupportedWindowsShellOverrides
|
||||
} from '../../shared/shell/launch/windows-terminal-shell'
|
||||
import '../../shared/protocol-version'
|
||||
import '../../shared/remote-runtime/protocol/protocol-version'
|
||||
import {
|
||||
TERMINAL_CREATE_SHELL_SELECTION_RUNTIME_CAPABILITY,
|
||||
TERMINAL_SPLIT_RETRY_RUNTIME_CAPABILITY
|
||||
|
||||
@@ -5,7 +5,7 @@ import { OPENCODE_ACP_DIALECT } from '../acp-dialects/opencode-dialect'
|
||||
import { directoryAccountBinding } from './acp-account-binding'
|
||||
import { openCodeAcpAccountBinding } from '../../opencode/accounts/opencode-structured-account-home'
|
||||
import { scrubOpenCodeAcpEnvironment } from '../../opencode/acp/opencode-acp-environment'
|
||||
import { compareAppVersions } from '../../../shared/app-version'
|
||||
import { compareAppVersions } from '../../../shared/app-lifecycle/identity/app-version'
|
||||
import { readGrokModelCatalog } from '../acp-dialects/grok-model-catalog'
|
||||
import {
|
||||
OPENCODE_MODEL_LISTING_ARGS,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// ACP has no standard skill delivery; use each agent's per-process configuration.
|
||||
|
||||
import { hasReachedAppVersion } from '../../../shared/app-version'
|
||||
import { hasReachedAppVersion } from '../../../shared/app-lifecycle/identity/app-version'
|
||||
import type { NativeChatVisualsSkillLocation } from '../../native-chat/conversation-files/native-chat-visuals-skill-location'
|
||||
|
||||
export type AcpVisualsSkillInput = {
|
||||
|
||||
@@ -5,7 +5,7 @@ import {
|
||||
} from '../../../shared/agent-session/failures/agent-session-failure'
|
||||
import type { AgentSessionExecutionOptions } from '../../../shared/agent-session/options/protocol/agent-session-execution-options'
|
||||
import { AgentSessionOptionRejectedError } from '../../native-chat/agent-session-wire/options/structured-agent-session-option-error'
|
||||
import { compareAppVersions } from '../../../shared/app-version'
|
||||
import { compareAppVersions } from '../../../shared/app-lifecycle/identity/app-version'
|
||||
import { AcpAgentError } from '../transport/acp-errors'
|
||||
import { AcpModelCommandRefusedError } from './acp-model-command'
|
||||
import type { AcpStructuredSession } from '../session/acp-structured-session-contract'
|
||||
|
||||
@@ -5,7 +5,7 @@ import type {
|
||||
AgentLaunchModeReason,
|
||||
AgentLaunchModeReceipt
|
||||
} from '../../shared/agent-launch/contracts/agent-launch-intent'
|
||||
import { RUNTIME_CAPABILITIES } from '../../shared/protocol-version'
|
||||
import { RUNTIME_CAPABILITIES } from '../../shared/remote-runtime/protocol/protocol-version'
|
||||
import { STRUCTURED_AGENT_RUNTIME_METADATA } from '../runtime/agent-session/installation/structured-agent-runtime-metadata'
|
||||
import {
|
||||
nativeChatPreferenceFor,
|
||||
|
||||
@@ -2,7 +2,10 @@ import {
|
||||
assertStructuredAgentResolutionCurrent,
|
||||
type StructuredAgentResolutionOperation
|
||||
} from '../../native-chat/agent-launch/structured-agent-command-resolution'
|
||||
import { compareAppVersions, parseCliVersion } from '../../../shared/app-version'
|
||||
import {
|
||||
compareAppVersions,
|
||||
parseCliVersion
|
||||
} from '../../../shared/app-lifecycle/identity/app-version'
|
||||
import { runProcess } from '@orca/process-host'
|
||||
import type { ProcessSpec } from '@orca/process-host/process-spec'
|
||||
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ const mocks = vi.hoisted(() => ({
|
||||
bundles: vi.fn((platform: string) => [`C:/relay/${platform}`])
|
||||
}))
|
||||
vi.mock('node:fs', () => ({ existsSync: mocks.exists }))
|
||||
vi.mock('../../../../../shared/app-environment', () => ({
|
||||
vi.mock('../../../../../shared/app-lifecycle/app-environment', () => ({
|
||||
getAppEnvironment: () => ({
|
||||
getAppPath: () => 'C:/app',
|
||||
getPath: () => 'C:/profile'
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
import { randomBytes } from 'node:crypto'
|
||||
import { existsSync } from 'node:fs'
|
||||
import { basename, join } from 'node:path'
|
||||
import { getAppEnvironment } from '../../../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../../../shared/app-lifecycle/app-environment'
|
||||
import { waitForPromiseWithSignal } from '../../../../../shared/concurrency/abort-signal-reason'
|
||||
import type { ServerTarget } from '../../../../../shared/node-runtime/node-runtime-pin'
|
||||
import { OPENCODE_SQLITE_READER_FILENAME } from '../../../../../shared/remote-runtime/orcad-distribution/remote-bundle-artifacts'
|
||||
|
||||
@@ -10,7 +10,10 @@ import {
|
||||
type AgentSessionAccountHome
|
||||
} from '../../shared/agent-session/lifecycle/accounts/agent-session-account-home'
|
||||
import { ANTIGRAVITY_ACP_HOME } from '../../shared/agent-session/lifecycle/provider-handles/antigravity-session-origin'
|
||||
import { compareAppVersions, isValidAppVersion } from '../../shared/app-version'
|
||||
import {
|
||||
compareAppVersions,
|
||||
isValidAppVersion
|
||||
} from '../../shared/app-lifecycle/identity/app-version'
|
||||
import { initializeAntigravityAcp } from './antigravity-acp-runtime-probe'
|
||||
import {
|
||||
createAntigravityHostCredentialBackend,
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
import { expect, it, vi } from 'vitest'
|
||||
import { join } from 'node:path'
|
||||
import {
|
||||
getAntigravityAccountService,
|
||||
setAntigravityNativeCredentialChangeListener
|
||||
} from './native-account-host'
|
||||
import { createAntigravityHostCredentialBackend } from './native-credential-backend'
|
||||
import { createEncryptedAntigravityAccountStore } from './native-account-store'
|
||||
import { credential, harness, refreshedWithoutIdToken } from './native-account-test-fixtures'
|
||||
import { parseAntigravityWindowsSnapshot } from './native-windows-token-decode'
|
||||
import './native-wsl-credentials'
|
||||
|
||||
void process.platform
|
||||
|
||||
vi.mock('./native-credential-backend', () => ({ createAntigravityHostCredentialBackend: vi.fn() }))
|
||||
vi.mock('./native-account-store', () => ({ createEncryptedAntigravityAccountStore: vi.fn() }))
|
||||
vi.mock('./native-wsl-credentials', () => ({ createAntigravityWslCredentialBackend: vi.fn() }))
|
||||
vi.mock('../wsl/discovery/wsl-default-distro', () => ({
|
||||
resolveWslDefaultDistro: async () => 'Ubuntu'
|
||||
}))
|
||||
vi.mock('../../shared/app-environment', () => ({
|
||||
getAppEnvironment: () => ({ getPath: () => '/task/home' })
|
||||
}))
|
||||
|
||||
it('reports new credentials and verified account switches, but not baseline reads or sign-out', async () => {
|
||||
const h = harness()
|
||||
const parse = vi.fn(parseAntigravityWindowsSnapshot)
|
||||
h.backend.parse = parse
|
||||
vi.mocked(createAntigravityHostCredentialBackend).mockReturnValue(h.backend)
|
||||
vi.mocked(createEncryptedAntigravityAccountStore).mockReturnValue(h.store)
|
||||
const changed = vi.fn()
|
||||
setAntigravityNativeCredentialChangeListener(changed)
|
||||
const service = await getAntigravityAccountService({ runtime: 'host' })
|
||||
expect(createEncryptedAntigravityAccountStore).toHaveBeenCalledWith(
|
||||
join('/task/home', 'antigravity-accounts', 'vault'),
|
||||
parse
|
||||
)
|
||||
expect(await getAntigravityAccountService({ runtime: 'host' })).toBe(service)
|
||||
expect(createAntigravityHostCredentialBackend).toHaveBeenCalledTimes(1)
|
||||
|
||||
const a = (await service.addCurrentAccount()).activeAccountId!
|
||||
await service.listAccounts()
|
||||
expect(changed).not.toHaveBeenCalled()
|
||||
|
||||
h.setNative(null)
|
||||
await service.listAccounts()
|
||||
expect(changed).not.toHaveBeenCalled()
|
||||
|
||||
h.setNative(credential('b'))
|
||||
await service.addCurrentAccount()
|
||||
expect(changed).toHaveBeenCalledTimes(1)
|
||||
await service.selectAccount(a)
|
||||
expect(parse).toHaveBeenCalledWith(credential('a'))
|
||||
expect(changed).toHaveBeenCalledTimes(2)
|
||||
await service.listAccounts()
|
||||
expect(changed).toHaveBeenCalledTimes(2)
|
||||
|
||||
// Signing in again to the same account issues a new grant, which must clear a sign-in hold.
|
||||
h.setNative(credential('a', 2))
|
||||
await service.listAccounts()
|
||||
expect(changed).toHaveBeenCalledTimes(3)
|
||||
|
||||
h.setNative(refreshedWithoutIdToken(3, 'refresh-2'))
|
||||
await service.listAccounts()
|
||||
expect(changed).toHaveBeenCalledTimes(3)
|
||||
})
|
||||
@@ -1,5 +1,5 @@
|
||||
import { join } from 'node:path'
|
||||
import { getAppEnvironment } from '../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../shared/app-lifecycle/app-environment'
|
||||
import type { AntigravityAccountTarget } from '../../shared/agent-accounts/antigravity/antigravity-account-types'
|
||||
import { createEncryptedAntigravityAccountStore } from './native-account-store'
|
||||
import type { AntigravityNativeCredential } from './native-credential-codec'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { existsSync } from 'node:fs'
|
||||
import { resolve } from 'node:path'
|
||||
import { getAppEnvironment } from '../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../shared/app-lifecycle/app-environment'
|
||||
import { recognizeAgentProcessFromCommandLine } from '../../shared/agent-status/process/agent-process-recognition'
|
||||
import { isAntigravityFileStorageHost } from './native-credential-backend'
|
||||
import { createEncryptedAntigravityAccountStore } from './native-account-store'
|
||||
|
||||
@@ -8,7 +8,7 @@ vi.mock('electron', () => ({
|
||||
safeStorage: { isEncryptionAvailable: () => false }
|
||||
}))
|
||||
|
||||
import type { OrcaProfileCloudSummary } from '../../shared/orca-profiles'
|
||||
import type { OrcaProfileCloudSummary } from '../../shared/orca-profiles/orca-profiles'
|
||||
import { ensureActiveOrcaProfile } from '../orca-profiles/profile-index-store'
|
||||
import {
|
||||
linkOrcaProfileToCloud,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getAppEnvironment } from '../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../shared/app-lifecycle/app-environment'
|
||||
import type { Automation } from '../../../shared/automations/automation-definition'
|
||||
import type { SshTarget } from '../../../shared/remote-runtime/ssh/ssh-types'
|
||||
import type { Store } from '../../persistence/loading-store/store'
|
||||
|
||||
@@ -5,7 +5,7 @@ import {
|
||||
BACKEND_CAPABILITIES
|
||||
} from '../../shared/backend/backend-service-contract'
|
||||
import { BackendPortRpc } from '../../shared/backend/backend-port-rpc'
|
||||
import { setAppEnvironment } from '../../shared/app-environment'
|
||||
import { setAppEnvironment } from '../../shared/app-lifecycle/app-environment'
|
||||
import { agentTokenUsageSchema } from '../../shared/telemetry/schemas/telemetry-agent-token-usage-schema'
|
||||
import { backendMessagePort, type BackendNativePort } from './backend-message-port'
|
||||
import { createDesktopBackendEnvironment } from './node-service-environment'
|
||||
|
||||
@@ -4,7 +4,7 @@ import type { BackendCoreProfileShutdown } from './core-profile-shutdown'
|
||||
import { prepareBackendDaemon } from './core-daemon-startup'
|
||||
import { prepareWorktreeRemovalsForStore } from '../workspaces/removal/worktree-removal-records-load'
|
||||
import { worktreeRemovalLifetime } from '../workspaces/removal/worktree-removal-lifetime'
|
||||
import { getAppEnvironment } from '../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../shared/app-lifecycle/app-environment'
|
||||
import {
|
||||
describeOrcadBindExposure,
|
||||
resolveOrcadBindHost
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getAppEnvironment } from '../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../shared/app-lifecycle/app-environment'
|
||||
import { startOrcadWithHost } from '../orcad/host-lifecycle/orcad-lifecycle'
|
||||
import type { OrcadHandle, OrcadOptions } from '../orcad/serve-startup/orcad-start-contract'
|
||||
import { activateBackendServices } from './service-composition'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { AppEnvironment } from '../../shared/app-environment'
|
||||
import type { AppEnvironment } from '../../shared/app-lifecycle/app-environment'
|
||||
import type { BackendBootstrap } from '../../shared/backend/backend-service-contract'
|
||||
|
||||
export function createDesktopBackendEnvironment(config: BackendBootstrap) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getOrcaProfileBrowserSessionPartition } from '../../../../shared/orca-profiles'
|
||||
import { getOrcaProfileBrowserSessionPartition } from '../../../../shared/orca-profiles/orca-profiles'
|
||||
import type { BrowserSessionProfile } from '../../../../shared/browser/workspaces/browser-workspace-types'
|
||||
|
||||
const BROWSER_SESSION_PROFILE_ID_RE =
|
||||
|
||||
@@ -68,7 +68,7 @@ import {
|
||||
import { setBrowserNetworkProxySettingsResolver } from '../proxy/browser-session-proxy'
|
||||
import { handleElectronProxyLogin } from '../../../network/electron-proxy-credentials'
|
||||
import { applyProxySettingsToSession } from '../../../network/proxy-settings'
|
||||
import { DEFAULT_LOCAL_ORCA_PROFILE_ID } from '../../../../shared/orca-profiles'
|
||||
import { DEFAULT_LOCAL_ORCA_PROFILE_ID } from '../../../../shared/orca-profiles/orca-profiles'
|
||||
|
||||
describe('BrowserSessionRegistry', () => {
|
||||
let profileDirectory: string
|
||||
@@ -149,25 +149,6 @@ describe('BrowserSessionRegistry', () => {
|
||||
expect(navigate).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('rejects and rolls back a runtime profile when its proxy cannot be applied', async () => {
|
||||
const before = browserSessionRegistry.listProfiles().length
|
||||
const proxySession = sessionFromPartitionMock()
|
||||
proxySession.setProxy.mockRejectedValue(new Error('proxy unavailable'))
|
||||
sessionFromPartitionMock.mockReturnValue(proxySession)
|
||||
setBrowserNetworkProxySettingsResolver(() => ({
|
||||
httpProxyUrl: 'socks5://127.0.0.1:1080',
|
||||
httpProxyBypassRules: ''
|
||||
}))
|
||||
|
||||
await expect(browserSessionRegistry.createProfile('isolated', 'Proxy Failure')).rejects.toThrow(
|
||||
'proxy unavailable'
|
||||
)
|
||||
|
||||
expect(browserSessionRegistry.listProfiles()).toHaveLength(before)
|
||||
expect(proxySession.setPermissionRequestHandler).toHaveBeenLastCalledWith(null)
|
||||
expect(proxySession.setPermissionCheckHandler).toHaveBeenLastCalledWith(null)
|
||||
})
|
||||
|
||||
it('retires credentials when profile creation and proxy rollback both fail', async () => {
|
||||
const proxySession = sessionFromPartitionMock()
|
||||
proxySession.setProxy
|
||||
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
DEFAULT_LOCAL_ORCA_PROFILE_ID,
|
||||
getOrcaProfileBrowserDefaultPartition,
|
||||
getOrcaProfileBrowserSessionPartition
|
||||
} from '../../../../shared/orca-profiles'
|
||||
} from '../../../../shared/orca-profiles/orca-profiles'
|
||||
import type {
|
||||
BrowserSessionProfile,
|
||||
BrowserSessionProfileScope
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { existsSync } from 'node:fs'
|
||||
import { lstat, readFile } from 'node:fs/promises'
|
||||
import { join, posix } from 'node:path'
|
||||
import { getAppEnvironment } from '../../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../../shared/app-lifecycle/app-environment'
|
||||
import {
|
||||
CLAUDE_INJECTED_CONFIG_DIR_ENV,
|
||||
CLAUDE_PROFILE_POINTER_ENV,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { join } from 'node:path'
|
||||
import { getAppEnvironment } from '../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../shared/app-lifecycle/app-environment'
|
||||
import { toWindowsWslPath } from '../../shared/file-access/wsl-paths'
|
||||
import { resolveLocalAccountRuntimeTarget } from '../../shared/agent-accounts/local-account-runtime'
|
||||
import type { Store } from '../persistence/loading-store/store'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { homedir } from 'node:os'
|
||||
import { join, resolve } from 'node:path'
|
||||
import { getAppEnvironment } from '../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../shared/app-lifecycle/app-environment'
|
||||
import type { GlobalSettings } from '../../../shared/global-settings-types'
|
||||
import { isAgentStatusHooksEnabledForAgent } from '../../../shared/agent-hook-listener/configuration/agent-status-hooks-setting'
|
||||
import { getAgentLaunchExecutableName } from '../../../shared/agent-launch/startup/agent-command-line-intent'
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
import { hasReachedAppVersion, isValidAppVersion } from '../../../shared/app-version'
|
||||
import {
|
||||
hasReachedAppVersion,
|
||||
isValidAppVersion
|
||||
} from '../../../shared/app-lifecycle/identity/app-version'
|
||||
import { runProcess } from '@orca/process-host'
|
||||
import path from 'node:path'
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { rmSync } from 'node:fs'
|
||||
import { getAppEnvironment } from '../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../shared/app-lifecycle/app-environment'
|
||||
import {
|
||||
listClaudeProfileHomes,
|
||||
listClaudeProfileHomesAsync
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { mkdir, unlink } from 'node:fs/promises'
|
||||
import { dirname } from 'node:path'
|
||||
import type { CliInstallStatus } from '../../shared/cli-install-types'
|
||||
import type { CliInstallStatus } from '../../shared/cli/cli-install-types'
|
||||
import {
|
||||
pruneAppImageExtractedRoots,
|
||||
removeAppImageInstalledPayloads
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { CliInstallStatus } from '../../../shared/cli-install-types'
|
||||
import type { CliInstallStatus } from '../../../shared/cli/cli-install-types'
|
||||
import { CliCommandInstallation } from '../installation/cli-command-installation'
|
||||
import { isWindowsUserPathPermissionError } from '../installation/cli-install-errors'
|
||||
import { samePathEntry, splitPathEntries } from './cli-install-path-format'
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { createHash, randomUUID } from 'node:crypto'
|
||||
import { lstat, mkdir, readdir, readFile, readlink, rename, rmdir, stat } from 'node:fs/promises'
|
||||
import { basename, dirname, join } from 'node:path'
|
||||
import type { CliInstallStatus } from '../../../shared/cli-install-types'
|
||||
import type { CliInstallStatus } from '../../../shared/cli/cli-install-types'
|
||||
import { isPermissionError } from '../../filesystem/permission-errors'
|
||||
import { isMissingError } from './cli-install-errors'
|
||||
import { quotePosixShellDoubleQuotedApostrophe } from '../../../shared/shell/launch/shell-argument-quoting'
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { existsSync } from 'node:fs'
|
||||
import { lstat, readFile, readlink } from 'node:fs/promises'
|
||||
import { basename, dirname, resolve } from 'node:path'
|
||||
import type { CliInstallMethod, CliInstallStatus } from '../../../shared/cli-install-types'
|
||||
import type { CliInstallMethod, CliInstallStatus } from '../../../shared/cli/cli-install-types'
|
||||
import { isAppImageExtractedLauncherPath } from '../appimage/appimage-extracted-root'
|
||||
import { DEV_COMMAND_NAME, DEV_LAUNCHER_DIR } from './cli-install-constants'
|
||||
import {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { link, readlink, rmdir, symlink, unlink, writeFile } from 'node:fs/promises'
|
||||
import { basename, dirname, join, resolve } from 'node:path'
|
||||
import type { CliInstallStatus } from '../../../shared/cli-install-types'
|
||||
import type { CliInstallStatus } from '../../../shared/cli/cli-install-types'
|
||||
import {
|
||||
ensureAppImageExtractedRoot,
|
||||
isAppImageExtractedLauncherPath,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { existsSync } from 'node:fs'
|
||||
import { homedir } from 'node:os'
|
||||
import { basename, dirname, join } from 'node:path'
|
||||
import { getAppEnvironment } from '../../../shared/app-environment'
|
||||
import type { CliInstallStatus } from '../../../shared/cli-install-types'
|
||||
import { getAppEnvironment } from '../../../shared/app-lifecycle/app-environment'
|
||||
import type { CliInstallStatus } from '../../../shared/cli/cli-install-types'
|
||||
import {
|
||||
hasAppImagePathEnvironment,
|
||||
resolveAppImageRuntimeIdentity
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { CliInstallMethod } from '../../../shared/cli-install-types'
|
||||
import type { CliInstallMethod } from '../../../shared/cli/cli-install-types'
|
||||
import type { WindowsUserPathReadResult } from '../command-paths/windows-user-path-registry'
|
||||
|
||||
export type CliInstallerOptions = {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// PTY and structured children must reach this app's CLI regardless of global registration.
|
||||
import { delimiter, dirname, join } from 'node:path'
|
||||
import { getAppEnvironment, hasAppEnvironment } from '../../../shared/app-environment'
|
||||
import { getAppEnvironment, hasAppEnvironment } from '../../../shared/app-lifecycle/app-environment'
|
||||
import { readInheritedPath } from '../../ipc/pty/host-env/path'
|
||||
import { resolvePathEnvKey } from '../../pty/environment/windows-path-segment-merge'
|
||||
import { ensureLinuxTerminalOrcaCliShimDir } from './linux-terminal-orca-cli-shim'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { CliInstallStatus } from '../../../shared/cli-install-types'
|
||||
import type { CliInstallStatus } from '../../../shared/cli/cli-install-types'
|
||||
import { getDefaultWslDistro } from '../../wsl/discovery/distro-catalog'
|
||||
import { runWslProcess } from '../../wsl/execution/wsl-runner'
|
||||
import { describeWslProcessFailure } from '../../wsl/execution/wsl-process-failure'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { CliInstallStatus } from '../../../shared/cli-install-types'
|
||||
import type { CliInstallStatus } from '../../../shared/cli/cli-install-types'
|
||||
import {
|
||||
buildManagedLegacyRemoveCommand,
|
||||
buildRegistrationLockPrelude,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { CliInstallState, CliInstallStatus } from '../../../shared/cli-install-types'
|
||||
import type { CliInstallState, CliInstallStatus } from '../../../shared/cli/cli-install-types'
|
||||
import { listWslDistrosAsync } from '../../wsl/discovery/distro-catalog'
|
||||
import {
|
||||
deferUntilWslDistroRunning,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { CliInstallStatus } from '../../../shared/cli-install-types'
|
||||
import type { CliInstallStatus } from '../../../shared/cli/cli-install-types'
|
||||
import { getBridgePathFromCommandPath, getPosixDirname } from './wsl-cli-scripts'
|
||||
import { quotePosixShellDoubleQuotedApostrophe } from '../../../shared/shell/launch/shell-argument-quoting'
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { createHash } from 'node:crypto'
|
||||
import { existsSync } from 'node:fs'
|
||||
import { join } from 'node:path'
|
||||
import { getAppEnvironment } from '../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../shared/app-lifecycle/app-environment'
|
||||
import { windowsPowerShellPath } from '@orca/process-host/windows-system-binary'
|
||||
import { writeShellWrapperFiles } from '../../pty/shell-startup/shell-wrapper-file-writer'
|
||||
import {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
|
||||
import { join, resolve } from 'node:path'
|
||||
import { getAppEnvironment } from '../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../shared/app-lifecycle/app-environment'
|
||||
import { buildPosixStdoutFence } from '../../../shared/shell/launch/posix-stdout-fence'
|
||||
import { quotePosixShell } from '../../../shared/shell/launch/shell-argument-quoting'
|
||||
import { parseWslUncPath, toWindowsWslPath } from '../../../shared/file-access/wsl-paths'
|
||||
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
symlinkSync,
|
||||
unlinkSync
|
||||
} from 'node:fs'
|
||||
import { getAppEnvironment } from '../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../shared/app-lifecycle/app-environment'
|
||||
import { dirname, isAbsolute, join, resolve } from 'node:path'
|
||||
import {
|
||||
getOrcaManagedCodexHomePath,
|
||||
|
||||
@@ -24,7 +24,7 @@ vi.mock('node:fs', async (importOriginal) => ({
|
||||
existsSync: existsSyncMock
|
||||
}))
|
||||
|
||||
vi.mock('../../../shared/app-environment', () => ({
|
||||
vi.mock('../../../shared/app-lifecycle/app-environment', () => ({
|
||||
hasAppEnvironment: () => appEnvironment.current !== null,
|
||||
getAppEnvironment: () => appEnvironment.current
|
||||
}))
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { hostname } from 'node:os'
|
||||
import { getAppEnvironment } from '../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../shared/app-lifecycle/app-environment'
|
||||
import { admitConnectorAgent, CONNECTOR_AGENTS } from '../external-conversations/connector-agents'
|
||||
import { runtimeConversationHost } from '../external-conversations/external-conversation-seam'
|
||||
import { getOrcaCloudAuthConfig } from '../orca-profiles/cloud-auth/profile-cloud-auth-config'
|
||||
|
||||
@@ -5,7 +5,7 @@ import type {
|
||||
DaemonProcessGoneReason,
|
||||
DaemonProcessPresentReason,
|
||||
DaemonProcessUnknownReason
|
||||
} from '../../../../shared/daemon-audit-eligibility'
|
||||
} from '../../../../shared/terminal/daemon/daemon-audit-eligibility'
|
||||
|
||||
export const WINDOWS_CREATION_TIME_TOLERANCE_MS = 10_000
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ import { createServer, type Server, type Socket } from 'node:net'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { dirname, join } from 'node:path'
|
||||
import { afterEach, describe, expect, it } from 'vitest'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-environment'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-lifecycle/app-environment'
|
||||
import { DaemonClient } from '../../../transport/client/daemon-client'
|
||||
import { checkDaemonHealthWithCoverage } from '../../../health/daemon-health'
|
||||
import { createOutOfProcessLauncher } from '../../../launch/daemon-out-of-process-launcher'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { ForkFallbackValue } from '../../../../shared/daemon-tcc-denial-capture'
|
||||
import type { ForkFallbackValue } from '../../../../shared/terminal/daemon/daemon-tcc-denial-capture'
|
||||
|
||||
export type MacDaemonForkReason = Exclude<ForkFallbackValue, 'none' | 'unknown'>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { writeFile } from 'node:fs/promises'
|
||||
import { join } from 'node:path'
|
||||
import { setTimeout as delay } from 'node:timers/promises'
|
||||
import { getAppEnvironment } from '../../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../../shared/app-lifecycle/app-environment'
|
||||
import { LOCAL_BUILD_COMPATIBILITY_CONTRACT } from '../../../../shared/remote-runtime/orcad-distribution/local-build-compatibility-contract'
|
||||
import { NODE_RUNTIME_DARWIN_MINIMUM_OS } from '../../../../shared/node-runtime/node-runtime-pin'
|
||||
import { runProcess } from '@orca/process-host'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { lstat } from 'node:fs/promises'
|
||||
import { getAppEnvironment } from '../../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../../shared/app-lifecycle/app-environment'
|
||||
import { captureDescendantSnapshot } from '../../../pty/process-retirement/pty-descendant-termination'
|
||||
import {
|
||||
endpointIsProvenDead,
|
||||
|
||||
@@ -43,7 +43,7 @@ vi.mock('node:timers/promises', async (importOriginal) => {
|
||||
}
|
||||
})
|
||||
vi.mock('@orca/process-host', () => ({ runProcess: runProcessMock }))
|
||||
vi.mock('../../../../../shared/app-environment', () => ({
|
||||
vi.mock('../../../../../shared/app-lifecycle/app-environment', () => ({
|
||||
hasAppEnvironment: () => true,
|
||||
getAppEnvironment: () => ({
|
||||
getAppPath: () => '/Applications/Orca.app/Contents/Resources/app.asar',
|
||||
@@ -71,7 +71,6 @@ vi.mock('../../../transport/client/daemon-client', () => ({
|
||||
import { launchMacDaemonFromStableBundle } from '../macos-daemon-launchd'
|
||||
import { macDaemonJobLabel } from '../macos-daemon-job-label'
|
||||
import type { DaemonChildSpawnOptions } from '../../../launch/daemon-launched-child-spawn'
|
||||
import { PROTOCOL_VERSION } from '../../../protocol/daemon-protocol-version'
|
||||
|
||||
const ok: ProcessResult = { code: 0, signal: null, stdout: '', stderr: '', timedOut: false }
|
||||
const running = { ...ok, stdout: 'gui/501/x = {\n\tstate = running\n}\n' }
|
||||
@@ -247,23 +246,6 @@ it('launches the copied helper on plain Node and leaves no inherited credentials
|
||||
expect(await exists(copyDir)).toBe(true)
|
||||
})
|
||||
|
||||
it.each([
|
||||
['running', running],
|
||||
['unverifiable', { ...ok, code: 1, stderr: 'Operation not permitted' }]
|
||||
])('never starts beside an earlier job that reads %s', async (_state, print) => {
|
||||
launchctl.print = [print]
|
||||
// Keep retirement inside its budget so bootstrap and readiness still fit.
|
||||
const error = await launchFailure(Date.now() + 20_000)
|
||||
expect(error).toBeInstanceOf(Error)
|
||||
expect(launchctlCalls('bootstrap')).toHaveLength(0)
|
||||
expect(launchctlCalls('bootout')).toHaveLength(0)
|
||||
expect(recoverMock).toHaveBeenCalledExactlyOnceWith(
|
||||
state.root,
|
||||
options.runtimeDir,
|
||||
PROTOCOL_VERSION
|
||||
)
|
||||
})
|
||||
|
||||
it.each([
|
||||
['declined', async () => false],
|
||||
[
|
||||
@@ -313,13 +295,3 @@ it('waits out a silent job that is still running and never forks beside it', asy
|
||||
expect(launchctlCalls('bootout')).toHaveLength(0)
|
||||
expect(await exists(copyDir)).toBe(true)
|
||||
})
|
||||
|
||||
it('reports a failure too late for the fork to fit the startup gate instead of forking', async () => {
|
||||
materializeMock.mockImplementation(async () => {
|
||||
vi.spyOn(Date, 'now').mockReturnValue(deadline + 1)
|
||||
throw new Error('Could not copy the macOS terminal host')
|
||||
})
|
||||
const deadline = Date.now() + 25_000
|
||||
const error = await launchFailure(deadline)
|
||||
expect(error).toHaveProperty('message', 'Could not copy the macOS terminal host')
|
||||
})
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { createHash, randomBytes } from 'node:crypto'
|
||||
import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync } from 'node:fs'
|
||||
import { join, win32 as winPath } from 'node:path'
|
||||
import { getAppEnvironment } from '../../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../../shared/app-lifecycle/app-environment'
|
||||
import {
|
||||
buildDaemonHostManifest,
|
||||
daemonHostFitsPathBudget,
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:
|
||||
import os from 'node:os'
|
||||
import { dirname, join } from 'node:path'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-environment'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-lifecycle/app-environment'
|
||||
import { daemonHostStagingName } from '../daemon-host-reclaim'
|
||||
import { buildInstallFixture } from './daemon-host-relocation.test-fixture'
|
||||
import {
|
||||
|
||||
@@ -2,7 +2,7 @@ import { cpSync, existsSync, mkdtempSync, rmSync } from 'node:fs'
|
||||
import os from 'node:os'
|
||||
import { dirname, join } from 'node:path'
|
||||
import { afterEach, beforeEach, describe, expect, it } from 'vitest'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-environment'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-lifecycle/app-environment'
|
||||
import { buildInstallFixture } from './daemon-host-relocation.test-fixture'
|
||||
import { getRelocatedDaemonHost, materializeRelocatedDaemonHost } from '../daemon-host-relocation'
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import { mkdtempSync, readFileSync, rmSync, statSync, utimesSync, writeFileSync
|
||||
import os from 'node:os'
|
||||
import { dirname, join } from 'node:path'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-environment'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-lifecycle/app-environment'
|
||||
import { resetDaemonHostFileHashCacheForTests } from '../daemon-host-file-hash-cache'
|
||||
import { buildInstallFixture } from './daemon-host-relocation.test-fixture'
|
||||
import { getRelocatedDaemonHost, materializeRelocatedDaemonHost } from '../daemon-host-relocation'
|
||||
|
||||
@@ -12,7 +12,7 @@ import os from 'node:os'
|
||||
import { dirname, join } from 'node:path'
|
||||
import { runProcessSync } from '@orca/process-host'
|
||||
import { afterEach, beforeEach, describe, expect, it } from 'vitest'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-environment'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-lifecycle/app-environment'
|
||||
import { buildInstallFixture } from './daemon-host-relocation.test-fixture'
|
||||
import {
|
||||
getDaemonHostRootDir,
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync
|
||||
import os from 'node:os'
|
||||
import { dirname, join } from 'node:path'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-environment'
|
||||
import { setAppEnvironment } from '../../../../../shared/app-lifecycle/app-environment'
|
||||
import { daemonHostStagingName } from '../daemon-host-reclaim'
|
||||
import { buildInstallFixture } from './daemon-host-relocation.test-fixture'
|
||||
import {
|
||||
|
||||
@@ -13,7 +13,10 @@ import os from 'node:os'
|
||||
import { dirname, join } from 'node:path'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import { setAppEnvironment, type AppEnvironment } from '../../../../../shared/app-environment'
|
||||
import {
|
||||
setAppEnvironment,
|
||||
type AppEnvironment
|
||||
} from '../../../../../shared/app-lifecycle/app-environment'
|
||||
|
||||
const hostApp = {
|
||||
isPackaged: true,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { stat } from 'node:fs'
|
||||
import { performance } from 'node:perf_hooks'
|
||||
import type { DaemonAsyncIoHealth } from '../../../shared/daemon-async-io-health'
|
||||
import type { DaemonAsyncIoHealth } from '../../../shared/terminal/daemon/daemon-async-io-health'
|
||||
|
||||
const DAEMON_ASYNC_IO_TIMEOUT_MS = 5_000
|
||||
const HEALTH_CACHE_MS = 30_000
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { existsSync } from 'node:fs'
|
||||
import { connect } from 'node:net'
|
||||
import { join } from 'node:path'
|
||||
import { getAppEnvironment } from '../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../shared/app-lifecycle/app-environment'
|
||||
import { ensurePrivateDir } from '../endpoint/publication/daemon-private-file-modes'
|
||||
import { scheduleTerminalHistoryPermissionRepair } from '../history/storage/terminal-history-permission-repair'
|
||||
import { getDaemonLogFilePath } from '../../observability/logs-directory'
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { forkProcess, type ForkSpec } from '@orca/process-host/fork-process'
|
||||
import { spawnProcess } from '@orca/process-host'
|
||||
import type { ChildProcess } from 'node:child_process'
|
||||
import { getAppEnvironment } from '../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../shared/app-lifecycle/app-environment'
|
||||
import { removeChromiumDisabledSessionBus } from '../../pty/shell-startup/chromium-session-bus-env'
|
||||
import { hostMallocTunablesDaemonEnv } from '../../memory/host-malloc-tunables'
|
||||
import {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { randomUUID } from 'node:crypto'
|
||||
import { getAppEnvironment } from '../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../shared/app-lifecycle/app-environment'
|
||||
import { childProcessHasExited } from '@orca/process-host/process-tree-termination'
|
||||
import type { DaemonReplaceReason } from '../../../shared/telemetry/daemon-lifecycle-telemetry'
|
||||
import { DaemonClient } from '../transport/client/daemon-client'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getAppEnvironment } from '../../../shared/app-environment'
|
||||
import { getAppEnvironment } from '../../../shared/app-lifecycle/app-environment'
|
||||
import type { DaemonReplaceReason } from '../../../shared/telemetry/daemon-lifecycle-telemetry'
|
||||
import { migrateLegacyDaemonScope } from '../process-scopes/daemon-cgroup-scope'
|
||||
import { isDaemonStaleForCurrentBundle } from './daemon-bundle-staleness'
|
||||
|
||||
@@ -50,7 +50,7 @@ export async function buildDaemonLauncherDriver(
|
||||
): Promise<void> {
|
||||
await build({
|
||||
stdin: {
|
||||
contents: `\n import { mkdirSync } from 'node:fs'\n import { join } from 'node:path'\n import { createOutOfProcessLauncher } from './src/main/daemon/launch/daemon-out-of-process-launcher'\n import { getDaemonSocketPath, getDaemonTokenPath } from './src/main/daemon/launch/daemon-spawner'\n import { setAppEnvironment } from './src/shared/app-environment'\n const [userData, appPath, version] = process.argv.slice(2)\n setAppEnvironment({\n getPath: () => userData, getAppPath: () => appPath, getVersion: () => version,\n isPackaged: () => true, onWillQuit() {}, exit: code => process.exit(code),\n getAppMetrics: () => []\n })\n const runtimeDir = join(userData, 'daemon')\n mkdirSync(runtimeDir, { recursive: true, mode: 0o700 })\n createOutOfProcessLauncher(runtimeDir)(getDaemonSocketPath(runtimeDir), getDaemonTokenPath(runtimeDir))\n .then(handle => {\n console.log(JSON.stringify({ adopted: handle.adopted === true, mode: handle.mode ?? null }))\n process.stdin.on('end', () => process.exit(0))\n process.stdin.resume()\n })\n .catch(error => { console.error(error); process.exit(1) })\n `,
|
||||
contents: `\n import { mkdirSync } from 'node:fs'\n import { join } from 'node:path'\n import { createOutOfProcessLauncher } from './src/main/daemon/launch/daemon-out-of-process-launcher'\n import { getDaemonSocketPath, getDaemonTokenPath } from './src/main/daemon/launch/daemon-spawner'\n import { setAppEnvironment } from './src/shared/app-lifecycle/app-environment'\n const [userData, appPath, version] = process.argv.slice(2)\n setAppEnvironment({\n getPath: () => userData, getAppPath: () => appPath, getVersion: () => version,\n isPackaged: () => true, onWillQuit() {}, exit: code => process.exit(code),\n getAppMetrics: () => []\n })\n const runtimeDir = join(userData, 'daemon')\n mkdirSync(runtimeDir, { recursive: true, mode: 0o700 })\n createOutOfProcessLauncher(runtimeDir)(getDaemonSocketPath(runtimeDir), getDaemonTokenPath(runtimeDir))\n .then(handle => {\n console.log(JSON.stringify({ adopted: handle.adopted === true, mode: handle.mode ?? null }))\n process.stdin.on('end', () => process.exit(0))\n process.stdin.resume()\n })\n .catch(error => { console.error(error); process.exit(1) })\n `,
|
||||
resolveDir: process.cwd(),
|
||||
loader: 'ts'
|
||||
},
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user