mirror of
https://github.com/stablyai/orca.git
synced 2026-11-18 20:06:10 +00:00
Merge main for compatibility validation
This commit is contained in:
@@ -1115,12 +1115,12 @@ jobs:
|
||||
src/main/browser/client-pages/renderer/browser-client-page-renderer-lifecycle.electron.test.ts
|
||||
src/main/persistence/profile-state/profile-state-writer-stall.electron.test.ts
|
||||
src/main/browser/cookies/browser-google-cookie-clear.electron.test.ts
|
||||
src/main/browser/guest-lifecycle/popups/popup-origin-chrome.electron.test.ts
|
||||
src/main/browser/guest-lifecycle/popups/presentation/popup-origin-chrome.electron.test.ts
|
||||
src/main/browser/guest-lifecycle/navigation/browser-link-materialization.electron.test.ts
|
||||
src/main/browser/guest-lifecycle/popups/browser-popup-compatibility.electron.test.ts
|
||||
src/main/browser/guest-lifecycle/popups/browser-popup-adapter-compatibility.electron.test.ts
|
||||
src/main/browser/guest-lifecycle/popups/browser-popup-native-compatibility.electron.test.ts
|
||||
src/main/browser/guest-lifecycle/popups/browser-popup-background-compatibility.electron.test.ts
|
||||
src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-compatibility.electron.test.ts
|
||||
src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-adapter-compatibility.electron.test.ts
|
||||
src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-native-compatibility.electron.test.ts
|
||||
src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-background-compatibility.electron.test.ts
|
||||
src/main/browser/extensions/api-runtime/browser-extension-api.electron.test.ts
|
||||
src/main/browser/extensions/profile-storage/browser-extension-persistence.electron.test.ts
|
||||
src/main/browser/extensions/profile-sessions/browser-extension-lifecycle.electron.test.ts
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
import { generateKeyPairSync } from 'node:crypto'
|
||||
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import { loadPushConfig } from './config.js'
|
||||
|
||||
function apnsKeyPem(): string {
|
||||
return generateKeyPairSync('ec', {
|
||||
namedCurve: 'P-256',
|
||||
privateKeyEncoding: { type: 'pkcs8', format: 'pem' },
|
||||
publicKeyEncoding: { type: 'spki', format: 'pem' }
|
||||
}).privateKey
|
||||
}
|
||||
|
||||
const MINIMAL = {
|
||||
ORCA_PUSH_PUBLIC_URL: 'https://push.onorca.dev',
|
||||
ORCA_PUSH_FCM_PROJECT_ID: 'onorca-cloud'
|
||||
}
|
||||
|
||||
describe('push gateway config', () => {
|
||||
|
||||
|
||||
|
||||
|
||||
it('requires an explicit FCM project instead of silently targeting production', () => {
|
||||
expect(() => loadPushConfig({ ...MINIMAL, ORCA_PUSH_FCM_PROJECT_ID: undefined })).toThrow()
|
||||
expect(() => loadPushConfig({ ...MINIMAL, ORCA_PUSH_FCM_PROJECT_ID: ' ' })).toThrow()
|
||||
})
|
||||
|
||||
it('refuses a partial APNs credential', () => {
|
||||
expect(() => loadPushConfig({ ...MINIMAL, ORCA_PUSH_APNS_KEY: apnsKeyPem() })).toThrow(
|
||||
'configured together'
|
||||
)
|
||||
expect(() =>
|
||||
loadPushConfig({
|
||||
...MINIMAL,
|
||||
ORCA_PUSH_APNS_KEY: 'not-a-pem',
|
||||
ORCA_PUSH_APNS_KEY_ID: 'ABCDE12345',
|
||||
ORCA_PUSH_APPLE_TEAM_ID: 'TEAM123456'
|
||||
})
|
||||
).toThrow('PEM text')
|
||||
})
|
||||
|
||||
it('requires a canonical HTTPS origin outside loopback', () => {
|
||||
expect(() =>
|
||||
loadPushConfig({ ...MINIMAL, ORCA_PUSH_PUBLIC_URL: 'https://push.onorca.dev/v1' })
|
||||
).toThrow('must be an origin')
|
||||
expect(() =>
|
||||
loadPushConfig({ ...MINIMAL, ORCA_PUSH_PUBLIC_URL: 'http://push.onorca.dev' })
|
||||
).toThrow('must use HTTPS')
|
||||
expect(
|
||||
loadPushConfig({ ...MINIMAL, ORCA_PUSH_PUBLIC_URL: 'http://localhost:8080' }).publicUrl
|
||||
).toBe('http://localhost:8080')
|
||||
})
|
||||
|
||||
|
||||
})
|
||||
@@ -148,24 +148,4 @@ describe('push device registry store', () => {
|
||||
(await devices.upsert({ ...androidDevice('device-0'), hostFingerprint: OTHER })).ok
|
||||
).toBe(true)
|
||||
})
|
||||
|
||||
|
||||
|
||||
it('separates the same device id registered against two hosts', async () => {
|
||||
const first = await upsertOk({
|
||||
hostFingerprint: OWNER,
|
||||
deviceId: 'shared-device',
|
||||
platform: 'ios',
|
||||
token: 'a'.repeat(64),
|
||||
apnsEnvironment: 'sandbox'
|
||||
})
|
||||
const second = await upsertOk({
|
||||
hostFingerprint: OTHER,
|
||||
deviceId: 'shared-device',
|
||||
platform: 'ios',
|
||||
token: 'c'.repeat(64),
|
||||
apnsEnvironment: 'sandbox'
|
||||
})
|
||||
expect(first).not.toBe(second)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { createHash } from 'node:crypto'
|
||||
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import { FcmClient, type FcmRequest, type FcmResponse } from './fcm-client.js'
|
||||
import { buildPushDelivery } from './push-delivery-message.js'
|
||||
@@ -53,30 +53,6 @@ function client(response: FcmResponse) {
|
||||
describe('fcm client', () => {
|
||||
|
||||
|
||||
it('carries every data value as a string and omits a null agent state', async () => {
|
||||
const { fake, client: fcm } = client({ status: 200, body: '{}' })
|
||||
await fcm.send(delivery(null), { token: TOKEN })
|
||||
const message = JSON.parse(fake.requests[0]!.body) as {
|
||||
message: {
|
||||
android: Record<string, unknown>
|
||||
data: Record<string, string>
|
||||
}
|
||||
}
|
||||
expect(Object.values(message.message.data).every((value) => typeof value === 'string')).toBe(
|
||||
true
|
||||
)
|
||||
expect(message.message.data.agentState).toBeUndefined()
|
||||
const tag = createHash('sha256')
|
||||
.update(JSON.stringify([HOST, 'note-1']))
|
||||
.digest('hex')
|
||||
expect(message.message.data.coalescedCount).toBeUndefined()
|
||||
expect(message.message.data.tag).toBe(tag)
|
||||
expect(message.message.android).not.toHaveProperty('collapse_key')
|
||||
expect(message.message).not.toHaveProperty('notification')
|
||||
expect(message.message.data).not.toHaveProperty('body')
|
||||
})
|
||||
|
||||
|
||||
|
||||
it('marks an invalid-argument that names the token dead, and others an error', async () => {
|
||||
const named = client({
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
import { expect, it, vi } from 'vitest'
|
||||
import { createPushReadiness } from './push-readiness.js'
|
||||
import type { PushDatabase } from './push-database.js'
|
||||
|
||||
it('shares a slow check and caches failures before retrying', async () => {
|
||||
let clock = 0
|
||||
let reject!: (error: Error) => void
|
||||
const query = vi.fn(
|
||||
() =>
|
||||
new Promise<never>((_, fail) => {
|
||||
reject = fail
|
||||
})
|
||||
)
|
||||
const ready = createPushReadiness({ query } as unknown as PushDatabase, { now: () => clock })
|
||||
const checks = Array.from({ length: 100 }, () => ready())
|
||||
expect(query).toHaveBeenCalledTimes(1)
|
||||
reject(new Error('offline'))
|
||||
expect(await Promise.all(checks)).toEqual(Array(100).fill(false))
|
||||
expect(await ready()).toBe(false)
|
||||
expect(query).toHaveBeenCalledTimes(1)
|
||||
clock = 10_000
|
||||
const retry = ready()
|
||||
expect(query).toHaveBeenCalledTimes(2)
|
||||
reject(new Error('offline'))
|
||||
expect(await retry).toBe(false)
|
||||
})
|
||||
@@ -148,7 +148,6 @@
|
||||
2 test-no-polling-loop:tests/e2e/worktree-card-downward-drag.spec.ts
|
||||
1 test-no-real-time-wait:mobile/src/terminal/terminal-webview-tap-routing.test.ts
|
||||
1 test-no-real-time-wait:src/main/agent-hooks/installation/scripts/posix-hook-json-stdin-reader.test.ts
|
||||
3 test-no-real-time-wait:src/main/agent-hooks/server/testing/transcripts/server-transcript-result-retry.test.ts
|
||||
2 test-no-real-time-wait:src/main/agent-hooks/server/testing/http/server-transport-interference.test.ts
|
||||
1 test-no-real-time-wait:src/main/agent-hooks/server/testing/main-agent/server-turn-ended-at.test.ts
|
||||
1 test-no-real-time-wait:src/main/agent-hooks/server/testing/main-agent/server-turn-started-at.test.ts
|
||||
@@ -159,10 +158,10 @@
|
||||
1 test-no-real-time-wait:src/main/antigravity/windows-hook-payload-delivery.test.ts
|
||||
1 test-no-real-time-wait:src/main/browser/cdp/input/guest-focused-frame-route.test.ts
|
||||
3 test-no-real-time-wait:src/main/browser/cookies/browser-cookie-import-concurrency.test.ts
|
||||
2 test-no-real-time-wait:src/main/browser/guest-lifecycle/popups/browser-popup-compatibility.electron.test.ts
|
||||
1 test-no-real-time-wait:src/main/browser/guest-lifecycle/popups/browser-popup-native-compatibility.electron.test.ts
|
||||
1 test-no-real-time-wait:src/main/browser/identity/browser-session-ua-wire-identity-cross-context.electron.test.ts
|
||||
1 test-no-real-time-wait:src/main/browser/identity/browser-session-ua-wire-identity.electron.test.ts
|
||||
2 test-no-real-time-wait:src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-compatibility.electron.test.ts
|
||||
1 test-no-real-time-wait:src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-native-compatibility.electron.test.ts
|
||||
1 test-no-real-time-wait:src/main/browser/identity/wire-probes/browser-session-ua-wire-identity-cross-context.electron.test.ts
|
||||
1 test-no-real-time-wait:src/main/browser/identity/wire-probes/browser-session-ua-wire-identity.electron.test.ts
|
||||
1 test-no-real-time-wait:src/main/browser/network/tunnels/execution-route-socket-duplex.test.ts
|
||||
1 test-no-real-time-wait:src/main/browser/network/tunnels/remote-browser-socks-server.test.ts
|
||||
1 test-no-real-time-wait:src/main/claude-accounts/claude-login-session.test.ts
|
||||
@@ -710,7 +709,7 @@
|
||||
1 test-timeout-needs-reason:src/main/antigravity/posix-hook-invocation.test.ts
|
||||
2 test-timeout-needs-reason:src/main/antigravity/windows-hook-json-post.test.ts
|
||||
3 test-timeout-needs-reason:src/main/antigravity/windows-hook-payload-delivery.test.ts
|
||||
1 test-timeout-needs-reason:src/main/browser/agent-browser/agent-browser-bridge-raw-process.test.ts
|
||||
1 test-timeout-needs-reason:src/main/browser/agent-browser/helper-process/agent-browser-bridge-raw-process.test.ts
|
||||
1 test-timeout-needs-reason:src/main/browser/client-pages/renderer/browser-client-page-renderer-lifecycle.electron.test.ts
|
||||
2 test-timeout-needs-reason:src/main/browser/cookies/browser-cookie-import-partition-reland.electron.test.ts
|
||||
1 test-timeout-needs-reason:src/main/browser/cookies/browser-cookie-import-partition-rollback.electron.test.ts
|
||||
@@ -718,8 +717,8 @@
|
||||
1 test-timeout-needs-reason:src/main/browser/cookies/browser-cookie-import-partition.electron.test.ts
|
||||
1 test-timeout-needs-reason:src/main/browser/cookies/browser-cookie-import-validated-partition.electron.test.ts
|
||||
1 test-timeout-needs-reason:src/main/browser/guest-lifecycle/find/browser-find-frame-traversal.electron.test.ts
|
||||
1 test-timeout-needs-reason:src/main/browser/identity/browser-session-ua-wire-identity-cross-context.electron.test.ts
|
||||
2 test-timeout-needs-reason:src/main/browser/identity/browser-session-ua-wire-identity.electron.test.ts
|
||||
1 test-timeout-needs-reason:src/main/browser/identity/wire-probes/browser-session-ua-wire-identity-cross-context.electron.test.ts
|
||||
2 test-timeout-needs-reason:src/main/browser/identity/wire-probes/browser-session-ua-wire-identity.electron.test.ts
|
||||
3 test-timeout-needs-reason:src/main/claude-usage/scanner-incremental-reader.test.ts
|
||||
1 test-timeout-needs-reason:src/main/claude/claude-agent-sdk-exit-proof.test.ts
|
||||
1 test-timeout-needs-reason:src/main/claude/claude-background-run-isolation-real-cli.test.ts
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
4 src/renderer/src/components/settings/runtime-environments/catalog/RuntimeEnvironmentsPane.tsx
|
||||
1 src/renderer/src/components/settings/runtime-environments/catalog/use-runtime-environment-mutation-actions.ts
|
||||
1 src/renderer/src/components/settings/setup-guide/SettingsSetupGuidePane.tsx
|
||||
2 src/renderer/src/components/settings/setup-guide/settings-setup-guide-progress.ts
|
||||
1 src/renderer/src/components/settings/setup-guide/settings-setup-guide-progress.ts
|
||||
1 src/renderer/src/components/settings/shortcuts/ShortcutsPane.tsx
|
||||
3 src/renderer/src/components/settings/skills/linear/LinearAgentSkillPane.tsx
|
||||
2 src/renderer/src/components/settings/tasks/TasksPane.tsx
|
||||
|
||||
@@ -35,10 +35,10 @@
|
||||
7 src/main/bitbucket/credential-store.ts
|
||||
1 src/main/browser-passwords/browser-password-chromium-import.ts
|
||||
2 src/main/browser-passwords/browser-password-vault-file.ts
|
||||
2 src/main/browser/agent-browser/agent-browser-bridge-process.ts
|
||||
2 src/main/browser/agent-browser/agent-browser-dependency-binary.ts
|
||||
2 src/main/browser/agent-browser/agent-browser-process-environment.ts
|
||||
1 src/main/browser/agent-browser/agent-browser-session-reset.ts
|
||||
2 src/main/browser/agent-browser/helper-process/agent-browser-binary.ts
|
||||
2 src/main/browser/agent-browser/helper-process/agent-browser-dependency-binary.ts
|
||||
2 src/main/browser/agent-browser/helper-process/agent-browser-process-environment.ts
|
||||
1 src/main/browser/agent-browser/session-lifecycle/agent-browser-session-reset.ts
|
||||
2 src/main/browser/client-hosts/file-transfers/browser-client-download-relay.ts
|
||||
1 src/main/browser/client-hosts/file-transfers/browser-client-upload-staging.ts
|
||||
2 src/main/browser/client-hosts/leases/browser-host-client-identity.ts
|
||||
@@ -62,16 +62,16 @@
|
||||
8 src/main/browser/extensions/profile-storage/browser-extension-profile-document-store.ts
|
||||
4 src/main/browser/extensions/profile-storage/browser-extension-profile-state-store.ts
|
||||
3 src/main/browser/extensions/profile-storage/browser-extension-retired-profile-storage.ts
|
||||
1 src/main/browser/guest-lifecycle/popups/browser-popup-background-cdp-probe.ts
|
||||
2 src/main/browser/guest-lifecycle/popups/popup-identity-electron-probe.ts
|
||||
1 src/main/browser/identity/browser-identity-mode-record.ts
|
||||
2 src/main/browser/identity/browser-identity-mode-store.ts
|
||||
1 src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-background-cdp-probe.ts
|
||||
2 src/main/browser/electron-fixtures/popup-identity-electron-probe.ts
|
||||
1 src/main/browser/identity/mode/browser-identity-mode-record.ts
|
||||
2 src/main/browser/identity/mode/browser-identity-mode-store.ts
|
||||
2 src/main/browser/network/egress/browser-route-egress-electron-launch.ts
|
||||
4 src/main/browser/network/execution-routes/wsl-browser-network-relay-launch.ts
|
||||
5 src/main/browser/routing/partitions/browser-route-partition-binding-file.ts
|
||||
3 src/main/browser/routing/partitions/browser-route-partition-binding-store.ts
|
||||
4 src/main/browser/routing/partitions/browser-route-partition-pending-deletes.ts
|
||||
4 src/main/browser/sessions/browser-session-meta-store.ts
|
||||
4 src/main/browser/sessions/profiles/browser-session-meta-store.ts
|
||||
2 src/main/browser/site-settings/browser-profile-site-store.ts
|
||||
7 src/main/claude-accounts/claude-account-folder.ts
|
||||
1 src/main/claude-accounts/claude-observed-config-dirs.ts
|
||||
@@ -478,7 +478,6 @@
|
||||
5 src/main/runtime/mobile-cloud-relay/relay-region-preference.ts
|
||||
2 src/main/runtime/mobile-cloud-relay/relay-revoke-outbox.ts
|
||||
1 src/main/runtime/orchestration/db/runtime-orchestration-database-access.ts
|
||||
1 src/main/runtime/push/notifications/mobile-notification-dismissal-store.ts
|
||||
2 src/main/runtime/push/push-unregister-outbox.ts
|
||||
2 src/main/runtime/rpc/methods/mobile-delivery/bundled-mobile-web-bundle.ts
|
||||
1 src/main/runtime/rpc/server/network-source-policy-store.ts
|
||||
@@ -502,6 +501,8 @@
|
||||
1 src/main/speech/stt-worker-model-config.ts
|
||||
2 src/main/speech/stt-worker-paths.ts
|
||||
2 src/main/sqlite/harden-database-files.ts
|
||||
1 src/main/sqlite/keyed-json-row-cache.ts
|
||||
5 src/main/sqlite/legacy-json-source.ts
|
||||
1 src/main/sqlite/sync-database.ts
|
||||
2 src/main/sqlite/versioned-cache-database.ts
|
||||
1 src/main/ssh/authentication/ssh-auth-resolution.ts
|
||||
|
||||
@@ -23,5 +23,6 @@ tests/e2e/capture-opencode-tui-repro.mjs src/cli/cmd/tui/ui/spinner
|
||||
tests/e2e/cross-version-wire/released-chat-writers.ts src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.ts
|
||||
# Released source trees retain this actual registry; the current registry is checked first.
|
||||
tests/e2e/cross-version-wire/release-module-locations.ts src/main/runtime/rpc/methods/index.ts
|
||||
tests/e2e/cross-version-wire/release-module-locations.ts src/renderer/src/runtime/remote-runtime-terminal-multiplexer.ts
|
||||
# Release tags with flat skill owners need the restored harness beside that actual source.
|
||||
.github/workflows/release-cut.yml src/main/skills/skill-provider-runtime-roots.test.ts
|
||||
|
||||
@@ -13,10 +13,10 @@ src/main/ai-vault/scan-service/session-scanner-service-client.ts
|
||||
src/main/ai-vault/scan-service/session-scanner-service-spawn.ts
|
||||
src/main/window/desktop-integration/app-icon.ts
|
||||
src/main/automations/precheck-runner.ts
|
||||
src/main/browser/agent-browser/agent-browser-bridge-execution.ts
|
||||
src/main/browser/agent-browser/agent-browser-bridge-raw-process.ts
|
||||
src/main/browser/agent-browser/agent-browser-bridge-state.ts
|
||||
src/main/browser/agent-browser/agent-browser-bridge-types.ts
|
||||
src/main/browser/agent-browser/helper-process/agent-browser-bridge-execution.ts
|
||||
src/main/browser/agent-browser/helper-process/agent-browser-bridge-raw-process.ts
|
||||
src/main/browser/agent-browser/session-routing/agent-browser-bridge-state.ts
|
||||
src/main/browser/agent-browser/session-lifecycle/agent-browser-session-state.ts
|
||||
src/main/browser/network/egress/browser-route-egress-electron-launch.ts
|
||||
src/main/codex-accounts/legacy-wsl-runtime-auth-drain-recovery-script-harness.ts
|
||||
src/main/codex-accounts/legacy-wsl-runtime-auth-drain-script-harness.ts
|
||||
|
||||
@@ -4449,18 +4449,18 @@
|
||||
"commands": [
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/browser/client-pages/orca-runtime-browser.test.ts src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-browser-tabs.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/document-preview/doc-preview-grant-registry.test.ts src/main/browser/document-preview/doc-preview-file-reader.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/main/browser/document-preview/doc-preview-failure-notice.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/lib/doc-preview-grants.test.ts src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/sessions/browser-session-partition-policies.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/sessions/browser-session-partition-policies.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/sessions/partition-policies/browser-session-partition-policies.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/sessions/partition-policies/browser-session-partition-policies.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx src/shared/document-preview/doc-preview-scheme.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/main/ipc/browser/browser.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/guest-lifecycle/manager/browser-manager-annotation-bridge.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/guest-lifecycle/manager/browser-manager-annotation-bridge.test.ts src/main/browser/backends/offscreen-browser-backend-lifecycle.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/guest-lifecycle/manager/viewport/browser-manager-annotation-bridge.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/guest-lifecycle/manager/viewport/browser-manager-annotation-bridge.test.ts src/main/browser/backends/offscreen-browser-backend-lifecycle.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/link-actions/LinkActionPopover.test.tsx src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/guest-lifecycle/manager/browser-manager-annotation-bridge.test.ts src/main/browser/backends/offscreen-browser-backend-lifecycle.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/main/browser/guest-lifecycle/manager/viewport/browser-manager-annotation-bridge.test.ts src/main/browser/backends/offscreen-browser-backend-lifecycle.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
|
||||
"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts src/renderer/src/lib/workspace-doc-address-input.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
|
||||
"SKIP_BUILD=1 ORCA_E2E_WEB_CLIENT=1 ORCA_E2E_FORCE_HEADFUL=1 pnpm exec playwright test tests/e2e/paired-preview-address-bar-convergence.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1 --reporter=list",
|
||||
"SKIP_BUILD=1 ORCA_E2E_WEB_CLIENT=1 ORCA_E2E_FORCE_HEADFUL=1 pnpm exec playwright test tests/e2e/paired-remote-html-preview-local-render.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1 --reporter=line",
|
||||
@@ -4478,11 +4478,11 @@
|
||||
"src/renderer/src/store/slices/browser/browser.test.ts",
|
||||
"src/main/browser/document-preview/doc-preview-grant-registry.test.ts",
|
||||
"src/main/browser/document-preview/doc-preview-file-reader.test.ts",
|
||||
"src/main/browser/sessions/browser-session-partition-policies.test.ts",
|
||||
"src/main/browser/sessions/partition-policies/browser-session-partition-policies.test.ts",
|
||||
"src/main/browser/document-preview/doc-preview-guest-policy.test.ts",
|
||||
"src/main/browser/document-preview/doc-preview-failure-notice.test.ts",
|
||||
"src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts",
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-annotation-bridge.test.ts",
|
||||
"src/main/browser/guest-lifecycle/manager/viewport/browser-manager-annotation-bridge.test.ts",
|
||||
"src/main/browser/backends/offscreen-browser-backend-lifecycle.test.ts",
|
||||
"src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts",
|
||||
"src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts",
|
||||
|
||||
@@ -899,18 +899,18 @@
|
||||
"src/main/bitbucket/repository-ref.test.ts": 426,
|
||||
"src/main/bitbucket/status-no-decrypt.test.ts": 256,
|
||||
"src/main/updater/browser-sidecar-owner.test.ts": 53,
|
||||
"src/main/browser/agent-browser/agent-browser-action-effects.test.ts": 487,
|
||||
"src/main/browser/agent-browser/agent-browser-bridge-host-revocation.test.ts": 1017,
|
||||
"src/main/browser/agent-browser/agent-browser-bridge-javascript-dialog.test.ts": 358,
|
||||
"src/main/browser/agent-browser/agent-browser-bridge-keypress-input.test.ts": 752,
|
||||
"src/main/browser/agent-browser/agent-browser-bridge-navigation.test.ts": 588,
|
||||
"src/main/browser/agent-browser/agent-browser-bridge-raw-process-retention.test.ts": 1027,
|
||||
"src/main/browser/agent-browser/agent-browser-bridge-raw-process.test.ts": 1179,
|
||||
"src/main/browser/agent-browser/agent-browser-bridge-tab-routing.test.ts": 441,
|
||||
"src/main/browser/agent-browser/agent-browser-orphan-sweep.test.ts": 59,
|
||||
"src/main/browser/agent-browser/observation/agent-browser-action-effects.test.ts": 487,
|
||||
"src/main/browser/agent-browser/command-queue/agent-browser-bridge-host-revocation.test.ts": 1017,
|
||||
"src/main/browser/agent-browser/command-queue/agent-browser-bridge-javascript-dialog.test.ts": 358,
|
||||
"src/main/browser/agent-browser/commands/agent-browser-bridge-keypress-input.test.ts": 752,
|
||||
"src/main/browser/agent-browser/commands/agent-browser-bridge-navigation.test.ts": 588,
|
||||
"src/main/browser/agent-browser/helper-process/agent-browser-bridge-raw-process-retention.test.ts": 1027,
|
||||
"src/main/browser/agent-browser/helper-process/agent-browser-bridge-raw-process.test.ts": 1179,
|
||||
"src/main/browser/agent-browser/session-routing/agent-browser-bridge-tab-routing.test.ts": 441,
|
||||
"src/main/browser/agent-browser/session-lifecycle/agent-browser-orphan-sweep.test.ts": 59,
|
||||
"src/main/browser/cdp/input/agent-input-focus-guard.test.ts": 54,
|
||||
"src/main/browser/cdp/input/agent-input-injection.test.ts": 299,
|
||||
"src/main/browser/guest-lifecycle/browser-agent-activity.test.ts": 128,
|
||||
"src/main/browser/guest-lifecycle/page-activity/browser-agent-activity.test.ts": 128,
|
||||
"src/main/browser/certificate-trust/browser-certificate-trust-controller.test.ts": 496,
|
||||
"src/main/browser/client-hosts/file-transfers/browser-client-download-relay.test.ts": 124,
|
||||
"src/main/browser/client-hosts/file-transfers/browser-client-download-routing.test.ts": 124,
|
||||
@@ -940,34 +940,34 @@
|
||||
"src/main/browser/guest-lifecycle/find/browser-find-frame-traversal.electron.test.ts": 1807,
|
||||
"src/main/browser/cookies/browser-google-cookie-clear-target.test.ts": 6235,
|
||||
"src/main/browser/element-grab/browser-grab-payload.test.ts": 55,
|
||||
"src/main/browser/guest-lifecycle/browser-guest-devtools-dock.test.ts": 57,
|
||||
"src/main/browser/guest-lifecycle/input/browser-guest-shortcut-plugin-frame.test.ts": 280,
|
||||
"src/main/browser/guest-lifecycle/input/browser-guest-shortcut-precedence.test.ts": 411,
|
||||
"src/main/browser/guest-lifecycle/devtools/browser-guest-devtools-dock.test.ts": 57,
|
||||
"src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-plugin-frame.test.ts": 280,
|
||||
"src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-precedence.test.ts": 411,
|
||||
"src/main/browser/guest-lifecycle/input/browser-guest-target-url.test.ts": 50,
|
||||
"src/main/browser/guest-lifecycle/input/browser-guest-wheel-zoom-scroll.test.ts": 45,
|
||||
"src/main/browser/client-hosts/leases/browser-host-client-identity.test.ts": 97,
|
||||
"src/main/browser/guest-lifecycle/prompts/browser-http-auth-prompt.test.ts": 74,
|
||||
"src/main/browser/identity/browser-identity-mode-store.test.ts": 95,
|
||||
"src/main/browser/identity/mode/browser-identity-mode-store.test.ts": 95,
|
||||
"src/main/browser/guest-lifecycle/prompts/browser-javascript-dialogs.test.ts": 54,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-annotation-bridge.test.ts": 603,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-auth-user-agent.test.ts": 555,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-client-hosted-downloads.test.ts": 670,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-destroyed-guest-downloads.test.ts": 589,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-destroyed-guest.test.ts": 633,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-devtools-retirement.test.ts": 551,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-downloads.test.ts": 592,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-grab-capture.test.ts": 516,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-grab-mode.test.ts": 567,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-grab-selection.test.ts": 584,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-guest-unload.test.ts": 534,
|
||||
"src/main/browser/guest-lifecycle/manager/viewport/browser-manager-annotation-bridge.test.ts": 603,
|
||||
"src/main/browser/guest-lifecycle/manager/navigation/browser-manager-auth-user-agent.test.ts": 555,
|
||||
"src/main/browser/guest-lifecycle/manager/downloads/browser-manager-client-hosted-downloads.test.ts": 670,
|
||||
"src/main/browser/guest-lifecycle/manager/downloads/browser-manager-destroyed-guest-downloads.test.ts": 589,
|
||||
"src/main/browser/guest-lifecycle/manager/registration/browser-manager-destroyed-guest.test.ts": 633,
|
||||
"src/main/browser/guest-lifecycle/manager/devtools/browser-manager-devtools-retirement.test.ts": 551,
|
||||
"src/main/browser/guest-lifecycle/manager/downloads/browser-manager-downloads.test.ts": 592,
|
||||
"src/main/browser/guest-lifecycle/manager/grab/browser-manager-grab-capture.test.ts": 516,
|
||||
"src/main/browser/guest-lifecycle/manager/grab/browser-manager-grab-mode.test.ts": 567,
|
||||
"src/main/browser/guest-lifecycle/manager/grab/browser-manager-grab-selection.test.ts": 584,
|
||||
"src/main/browser/guest-lifecycle/manager/registration/browser-manager-guest-unload.test.ts": 534,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-guest-visibility.test.ts": 543,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-load-failure-replay.test.ts": 549,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-page-prompt-routing.test.ts": 560,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-popup-child.test.ts": 503,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-popup-routing.test.ts": 575,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-tab-identity.test.ts": 619,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-viewport-override.test.ts": 597,
|
||||
"src/main/browser/guest-lifecycle/manager/browser-manager-viewport-ownership.test.ts": 550,
|
||||
"src/main/browser/guest-lifecycle/manager/navigation/browser-manager-load-failure-replay.test.ts": 549,
|
||||
"src/main/browser/guest-lifecycle/manager/registration/browser-manager-page-prompt-routing.test.ts": 560,
|
||||
"src/main/browser/guest-lifecycle/manager/popups/browser-manager-popup-child.test.ts": 503,
|
||||
"src/main/browser/guest-lifecycle/manager/popups/browser-manager-popup-routing.test.ts": 575,
|
||||
"src/main/browser/guest-lifecycle/manager/viewport/browser-manager-tab-identity.test.ts": 619,
|
||||
"src/main/browser/guest-lifecycle/manager/viewport/browser-manager-viewport-override.test.ts": 597,
|
||||
"src/main/browser/guest-lifecycle/manager/viewport/browser-manager-viewport-ownership.test.ts": 550,
|
||||
"src/main/browser/network/execution-routes/browser-network-deferred-socket.test.ts": 101,
|
||||
"src/main/browser/network/execution-routes/browser-network-execution-route.test.ts": 272,
|
||||
"src/main/browser/network/tunnels/browser-network-tunnel-client.test.ts": 127,
|
||||
@@ -981,7 +981,7 @@
|
||||
"src/main/browser/guest-lifecycle/popups/browser-page-initiated-tab-budget.test.ts": 43,
|
||||
"src/main/browser/routing/input-ownership/browser-page-input-credit.test.ts": 50,
|
||||
"src/main/browser/guest-lifecycle/prompts/browser-page-prompts.test.ts": 74,
|
||||
"src/main/browser/guest-lifecycle/popups/browser-popup-native-window.test.ts": 109,
|
||||
"src/main/browser/guest-lifecycle/popups/presentation/browser-popup-native-window.test.ts": 109,
|
||||
"src/main/browser/identity/browser-process-user-agent.test.ts": 45,
|
||||
"src/main/browser/routing/guest-authority/browser-route-guest-popups.test.ts": 306,
|
||||
"src/main/browser/routing/partitions/browser-route-identity.test.ts": 47,
|
||||
@@ -1003,18 +1003,18 @@
|
||||
"src/main/browser/cdp/screencast/browser-screencast-stream.test.ts": 223,
|
||||
"src/main/browser/cookies/staging/browser-session-cookie-staging.scoped.test.ts": 3741,
|
||||
"src/main/browser/cookies/staging/browser-session-cookie-staging.test.ts": 308,
|
||||
"src/main/browser/sessions/browser-session-meta-store.test.ts": 43,
|
||||
"src/main/browser/sessions/browser-session-partition-policies.test.ts": 979,
|
||||
"src/main/browser/sessions/browser-session-partition-proxy-install.test.ts": 477,
|
||||
"src/main/browser/sessions/browser-session-proxy.test.ts": 857,
|
||||
"src/main/browser/sessions/browser-session-registry-identity.persistence.test.ts": 603,
|
||||
"src/main/browser/sessions/browser-session-registry-startup-metadata.test.ts": 478,
|
||||
"src/main/browser/sessions/browser-session-registry.test.ts": 883,
|
||||
"src/main/browser/identity/browser-session-ua-wire-identity-cross-context.electron.test.ts": 7167,
|
||||
"src/main/browser/identity/browser-session-ua-wire-identity.electron.test.ts": 8280,
|
||||
"src/main/browser/sessions/browser-session-user-agent-migration-inspection.test.ts": 229,
|
||||
"src/main/browser/site-settings/browser-site-display-controller.test.ts": 95,
|
||||
"src/main/browser/site-settings/browser-site-permission-prompt.test.ts": 338,
|
||||
"src/main/browser/sessions/profiles/browser-session-meta-store.test.ts": 43,
|
||||
"src/main/browser/sessions/partition-policies/browser-session-partition-policies.test.ts": 979,
|
||||
"src/main/browser/sessions/partition-policies/browser-session-partition-proxy-install.test.ts": 477,
|
||||
"src/main/browser/sessions/proxy/browser-session-proxy.test.ts": 857,
|
||||
"src/main/browser/sessions/profiles/browser-session-registry-identity.persistence.test.ts": 603,
|
||||
"src/main/browser/sessions/profiles/browser-session-registry-startup-metadata.test.ts": 478,
|
||||
"src/main/browser/sessions/profiles/browser-session-registry.test.ts": 883,
|
||||
"src/main/browser/identity/wire-probes/browser-session-ua-wire-identity-cross-context.electron.test.ts": 7167,
|
||||
"src/main/browser/identity/wire-probes/browser-session-ua-wire-identity.electron.test.ts": 8280,
|
||||
"src/main/browser/identity/mode/browser-retired-profile-identity-inspection.test.ts": 229,
|
||||
"src/main/browser/site-settings/display/browser-site-display-controller.test.ts": 95,
|
||||
"src/main/browser/site-settings/permissions/browser-site-permission-prompt.test.ts": 338,
|
||||
"src/main/browser/cdp/input/browser-text-insertion.test.ts": 51,
|
||||
"src/main/browser/webauthn/browser-webauthn-account-picker.test.ts": 78,
|
||||
"src/main/browser/webauthn/browser-webauthn-profile-delete.test.ts": 358,
|
||||
@@ -1134,7 +1134,7 @@
|
||||
"src/main/browser/client-hosts/lifecycle/paired-runtime-browser-host-command-admission.test.ts": 213,
|
||||
"src/main/browser/client-hosts/leases/paired-runtime-browser-host-lease.test.ts": 973,
|
||||
"src/main/browser/network/execution-routes/paired-runtime-browser-network-route.test.ts": 1150,
|
||||
"src/main/browser/guest-lifecycle/popups/popup-identity-electron-probe.test.ts": 144,
|
||||
"src/main/browser/electron-fixtures/popup-identity-electron-probe.test.ts": 144,
|
||||
"src/main/browser/network/tunnels/remote-browser-socks-buffering.test.ts": 384,
|
||||
"src/main/browser/network/tunnels/remote-browser-socks-server.test.ts": 309,
|
||||
"src/main/browser/cdp/snapshots/snapshot-engine.test.ts": 48,
|
||||
|
||||
@@ -49,14 +49,14 @@ export const UNIT_EXCLUDE = [
|
||||
'tests/e2e/relay-region-correction.unit.test.ts',
|
||||
'src/main/browser/cookies/browser-google-cookie-clear.electron.test.ts',
|
||||
// Electron probes with in-process deadlines; the package job runs them serially.
|
||||
'src/main/browser/guest-lifecycle/popups/popup-origin-chrome.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/presentation/popup-origin-chrome.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/navigation/browser-link-materialization.electron.test.ts',
|
||||
'src/main/browser/client-pages/renderer/browser-client-page-renderer-lifecycle.electron.test.ts',
|
||||
'src/main/persistence/profile-state/profile-state-writer-stall.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-adapter-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-native-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-background-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-adapter-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-native-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-background-compatibility.electron.test.ts',
|
||||
'src/main/browser/extensions/api-runtime/browser-extension-api.electron.test.ts',
|
||||
'src/main/browser/extensions/profile-storage/browser-extension-persistence.electron.test.ts',
|
||||
'src/main/browser/extensions/profile-sessions/browser-extension-lifecycle.electron.test.ts',
|
||||
|
||||
+70
-26
@@ -3,7 +3,7 @@ import { execFileSync } from 'node:child_process'
|
||||
import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
|
||||
import { createRequire } from 'node:module'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { dirname, join, resolve } from 'node:path'
|
||||
import { dirname, join, posix, relative as relativePath, resolve } from 'node:path'
|
||||
import { performance } from 'node:perf_hooks'
|
||||
|
||||
const root = resolve(import.meta.dirname, '../../../..')
|
||||
@@ -12,7 +12,7 @@ const require = createRequire(join(root, 'package.json'))
|
||||
const { build } = require('esbuild')
|
||||
const relative = 'src/main/browser/browser-session-registry.ts'
|
||||
const historicalTarget = join(root, relative)
|
||||
const currentRelative = 'src/main/browser/sessions/browser-session-registry.ts'
|
||||
const currentRelative = 'src/main/browser/sessions/profiles/browser-session-registry.ts'
|
||||
const target = join(root, currentRelative)
|
||||
const scratch = mkdtempSync(join(tmpdir(), 'orca-browser-meta-bench-'))
|
||||
const previousSource = execFileSync('git', ['show', `${baseline}:${relative}`], {
|
||||
@@ -56,23 +56,56 @@ const stubs = new Map([
|
||||
'export function attachBrowserExtensionsToProfileSession(profile,ids){globalThis.__metaBench.assignments.push([profile.id,ids])}'
|
||||
]
|
||||
])
|
||||
const baselineFiles = new Set(
|
||||
execFileSync('git', ['ls-tree', '-r', '--name-only', baseline], {
|
||||
cwd: root,
|
||||
encoding: 'utf8',
|
||||
maxBuffer: 32 * 1024 * 1024
|
||||
})
|
||||
.trim()
|
||||
.split('\n')
|
||||
)
|
||||
function baselineDependency(importer, specifier) {
|
||||
const owner =
|
||||
importer === historicalTarget ? relative : relativePath(root, importer).split('\\').join('/')
|
||||
const candidate = posix.normalize(posix.join(posix.dirname(owner), specifier))
|
||||
const found = [
|
||||
candidate,
|
||||
`${candidate}.ts`,
|
||||
`${candidate}.tsx`,
|
||||
`${candidate}.js`,
|
||||
`${candidate}/index.ts`
|
||||
].find((file) => baselineFiles.has(file))
|
||||
if (!found) {
|
||||
throw new Error(`Missing actual baseline dependency: ${baseline}:${owner} -> ${specifier}`)
|
||||
}
|
||||
return join(root, found)
|
||||
}
|
||||
const registryByVersion = {}
|
||||
try {
|
||||
for (const [version, source] of Object.entries(sources)) {
|
||||
const sourceTarget = version === 'before' ? historicalTarget : target
|
||||
const currentStubSpecifiers = new Map([
|
||||
['./browser-session-cookie-staging', '../cookies/staging/browser-session-cookie-staging'],
|
||||
['./browser-session-route-policies', '../routing/sessions/browser-session-route-policies'],
|
||||
['./browser-session-cookie-staging', '../../cookies/staging/browser-session-cookie-staging'],
|
||||
[
|
||||
'./browser-session-partition-policies',
|
||||
'../partition-policies/browser-session-partition-policies'
|
||||
],
|
||||
['./browser-session-route-policies', '../../routing/sessions/browser-session-route-policies'],
|
||||
['./browser-session-profile-retirement', './browser-session-profile-retirement'],
|
||||
[
|
||||
'../persistence/loading-store/user-data-path',
|
||||
'../../persistence/loading-store/user-data-path'
|
||||
'../../../persistence/loading-store/user-data-path'
|
||||
],
|
||||
['./browser-identity-mode-store', '../identity/browser-identity-mode-store'],
|
||||
['./browser-site-permission-store', '../site-settings/browser-site-permission-store'],
|
||||
['./browser-site-display-store', '../site-settings/browser-site-display-store'],
|
||||
['./browser-identity-mode-store', '../../identity/mode/browser-identity-mode-store'],
|
||||
[
|
||||
'./browser-site-permission-store',
|
||||
'../../site-settings/permissions/browser-site-permission-store'
|
||||
],
|
||||
['./browser-site-display-store', '../../site-settings/display/browser-site-display-store'],
|
||||
[
|
||||
'./extensions/browser-extension-session-loader',
|
||||
'../extensions/profile-sessions/browser-extension-session-loader'
|
||||
'../../extensions/profile-sessions/browser-extension-session-loader'
|
||||
]
|
||||
])
|
||||
const versionStubs = new Map(
|
||||
@@ -81,16 +114,12 @@ try {
|
||||
body
|
||||
])
|
||||
)
|
||||
const historicalDependencies = new Map([
|
||||
[
|
||||
'./browser-session-meta-store',
|
||||
join(root, 'src/main/browser/sessions/browser-session-meta-store.ts')
|
||||
],
|
||||
[
|
||||
'./browser-session-persisted-profile-validation',
|
||||
join(root, 'src/main/browser/sessions/browser-session-persisted-profile-validation.ts')
|
||||
]
|
||||
])
|
||||
if (version === 'after') {
|
||||
versionStubs.set(
|
||||
'./browser-profile-owned-stores',
|
||||
'export function forgetBrowserProfileOwnedStores(){return true}'
|
||||
)
|
||||
}
|
||||
const output = join(scratch, `${version}.cjs`)
|
||||
await build({
|
||||
stdin: {
|
||||
@@ -111,20 +140,35 @@ try {
|
||||
if (args.importer === sourceTarget && versionStubs.has(args.path)) {
|
||||
return { path: args.path, namespace: 'startup-stub' }
|
||||
}
|
||||
if (
|
||||
version === 'before' &&
|
||||
args.importer === sourceTarget &&
|
||||
historicalDependencies.has(args.path)
|
||||
) {
|
||||
return { path: historicalDependencies.get(args.path) }
|
||||
}
|
||||
if (
|
||||
args.path === 'node:fs' &&
|
||||
args.importer.endsWith('/browser-session-meta-store.ts')
|
||||
) {
|
||||
return { path: 'fs-probe', namespace: 'startup-stub' }
|
||||
}
|
||||
if (
|
||||
version === 'before' &&
|
||||
args.path.startsWith('.') &&
|
||||
(args.importer === sourceTarget || args.namespace === 'startup-baseline')
|
||||
) {
|
||||
return {
|
||||
path: baselineDependency(args.importer, args.path),
|
||||
namespace: 'startup-baseline'
|
||||
}
|
||||
}
|
||||
})
|
||||
builder.onLoad({ filter: /.*/, namespace: 'startup-baseline' }, (args) => ({
|
||||
contents: execFileSync(
|
||||
'git',
|
||||
['show', `${baseline}:${relativePath(root, args.path).split('\\').join('/')}`],
|
||||
{
|
||||
cwd: root,
|
||||
encoding: 'utf8'
|
||||
}
|
||||
),
|
||||
loader: args.path.endsWith('.tsx') ? 'tsx' : 'ts',
|
||||
resolveDir: dirname(args.path)
|
||||
}))
|
||||
builder.onLoad({ filter: /.*/, namespace: 'startup-stub' }, (args) => ({
|
||||
contents:
|
||||
args.path === 'fs-probe'
|
||||
|
||||
@@ -123,12 +123,12 @@ const NODE_RUNTIME_INCLUDE = [
|
||||
'src/main/browser/cookies/sources/browser-cookie-import-undecryptable.test.ts',
|
||||
'src/main/browser/cookies/sources/browser-cookie-source-partition.test.ts',
|
||||
// Playwright's CDP transport needs Node's WebSocket implementation.
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-adapter-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/popup-origin-chrome.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-adapter-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/presentation/popup-origin-chrome.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/navigation/browser-link-materialization.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-native-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-background-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-native-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-background-compatibility.electron.test.ts',
|
||||
'src/main/ai-vault/scanners/devin/session-scanner-devin-db.test.ts',
|
||||
'src/shared/workspace-session/workspace-session-salvage.test.ts',
|
||||
'src/main/git/repo-detection.test.ts',
|
||||
|
||||
@@ -126,14 +126,14 @@ export const WINDOWS_PACKAGE_PREFIXES = [
|
||||
export const LINUX_PACKAGE_TESTS = [
|
||||
'src/main/browser/cookies/browser-google-cookie-clear.electron.test.ts',
|
||||
'config/scripts/desktop-distribution/runtime-verification/packaged-repository-input-exclusion.test.mjs',
|
||||
'src/main/browser/guest-lifecycle/popups/popup-origin-chrome.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/presentation/popup-origin-chrome.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/navigation/browser-link-materialization.electron.test.ts',
|
||||
'src/main/browser/client-pages/renderer/browser-client-page-renderer-lifecycle.electron.test.ts',
|
||||
'src/main/persistence/profile-state/profile-state-writer-stall.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-adapter-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-native-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/browser-popup-background-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-adapter-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-native-compatibility.electron.test.ts',
|
||||
'src/main/browser/guest-lifecycle/popups/compatibility/browser-popup-background-compatibility.electron.test.ts',
|
||||
'src/main/browser/extensions/api-runtime/browser-extension-api.electron.test.ts',
|
||||
'src/main/browser/extensions/profile-storage/browser-extension-persistence.electron.test.ts',
|
||||
'src/main/browser/extensions/profile-sessions/browser-extension-lifecycle.electron.test.ts',
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,101 @@
|
||||
WITH
|
||||
supporting_versions AS (
|
||||
SELECT DISTINCT toString(properties.app_version) AS v
|
||||
FROM events
|
||||
WHERE event IN ('first_agent_interaction', 'meaningful_activity_day')
|
||||
AND timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
),
|
||||
opted_out AS (
|
||||
SELECT distinct_id AS uid
|
||||
FROM events
|
||||
WHERE event = 'telemetry_opted_out'
|
||||
AND timestamp >= toDateTime('2026-10-09 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
GROUP BY uid
|
||||
),
|
||||
anchors AS (
|
||||
SELECT
|
||||
distinct_id AS uid,
|
||||
min(timestamp) AS anchor_at,
|
||||
formatDateTime(min(timestamp), '%Y-%m-%d') AS cohort_day,
|
||||
argMin(coalesce(toString(properties.platform), 'unknown'), timestamp) AS platform,
|
||||
argMin(toString(properties.app_version), timestamp) AS anchor_version
|
||||
FROM events
|
||||
WHERE event = 'onboarding_started'
|
||||
AND properties.cohort = 'fresh_install'
|
||||
AND timestamp >= toDateTime('2026-10-09 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
GROUP BY uid
|
||||
),
|
||||
cohort AS (
|
||||
SELECT uid, anchor_at, cohort_day, platform
|
||||
FROM anchors
|
||||
WHERE anchor_at >= toDateTime('2026-11-08 00:00:00')
|
||||
AND anchor_version IN (SELECT v FROM supporting_versions)
|
||||
AND uid NOT IN (SELECT uid FROM opted_out)
|
||||
),
|
||||
mature AS (
|
||||
SELECT uid, anchor_at, platform FROM cohort
|
||||
WHERE anchor_at <= now() - INTERVAL 1455 MINUTE
|
||||
),
|
||||
surface AS (
|
||||
SELECT m.uid AS uid, 1 AS has_surface, min(e.timestamp) AS surface_at
|
||||
FROM events e
|
||||
INNER JOIN mature m ON m.uid = e.distinct_id
|
||||
WHERE e.timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
AND e.timestamp >= m.anchor_at
|
||||
AND e.timestamp < m.anchor_at + INTERVAL 24 HOUR
|
||||
AND e.properties.orca_channel IS NOT NULL
|
||||
AND (
|
||||
e.event = 'workspace_created'
|
||||
OR (e.event = 'add_repo_setup_step_action'
|
||||
AND toString(e.properties.action) IN ('open_existing', 'open_primary', 'create_worktree'))
|
||||
OR (e.event = 'add_repo_default_checkout_handoff'
|
||||
AND toString(e.properties.result) = 'opened_default_checkout')
|
||||
OR (e.event = 'repo_added' AND toString(e.properties.is_git_repo) = 'false')
|
||||
)
|
||||
GROUP BY m.uid
|
||||
),
|
||||
interaction AS (
|
||||
SELECT
|
||||
distinct_id AS uid,
|
||||
1 AS has_interaction,
|
||||
min(timestamp) AS fai_at,
|
||||
argMin(coalesce(toString(properties.install_cohort), 'unknown'), timestamp) AS fai_cohort,
|
||||
argMin(coalesce(toString(properties.source), 'unknown'), timestamp) AS fai_source
|
||||
FROM events
|
||||
WHERE event = 'first_agent_interaction'
|
||||
AND timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
GROUP BY uid
|
||||
),
|
||||
per_install AS (
|
||||
SELECT
|
||||
m.platform AS platform,
|
||||
s.has_surface = 1 AS surface_24h,
|
||||
i.has_interaction = 1 AND i.fai_cohort = 'fresh'
|
||||
AND i.fai_at >= m.anchor_at AND i.fai_at < m.anchor_at + INTERVAL 24 HOUR AS interaction_24h,
|
||||
i.has_interaction = 1 AND i.fai_cohort = 'fresh' AND s.has_surface = 1
|
||||
AND i.fai_at >= s.surface_at AND i.fai_at < m.anchor_at + INTERVAL 24 HOUR AS interaction_after_surface_24h,
|
||||
i.has_interaction = 1 AND i.fai_cohort != 'fresh' AS install_cohort_mismatch,
|
||||
if(interaction_24h, i.fai_source, 'none') AS first_source
|
||||
FROM mature m
|
||||
LEFT JOIN surface s ON s.uid = m.uid
|
||||
LEFT JOIN interaction i ON i.uid = m.uid
|
||||
)
|
||||
SELECT
|
||||
if(grouping(platform) = 1, 'all', platform) AS platform_group,
|
||||
count() AS fresh_starters_complete_24h,
|
||||
countIf(surface_24h) AS workspace_available_24h,
|
||||
round(100.0 * workspace_available_24h / nullIf(fresh_starters_complete_24h, 0), 1) AS workspace_available_pct,
|
||||
countIf(interaction_24h) AS first_interaction_24h,
|
||||
round(100.0 * first_interaction_24h / nullIf(fresh_starters_complete_24h, 0), 1) AS first_interaction_pct,
|
||||
countIf(interaction_24h AND first_source IN ('orca_send', 'native_chat', 'mobile_chat')) AS first_interaction_attributed_24h,
|
||||
countIf(interaction_24h AND first_source = 'unattributed_prompt') AS first_interaction_unattributed_24h,
|
||||
countIf(interaction_24h AND first_source NOT IN ('orca_send', 'native_chat', 'mobile_chat', 'unattributed_prompt')) AS first_interaction_unknown_source_24h,
|
||||
countIf(interaction_after_surface_24h) AS interaction_after_workspace_24h,
|
||||
countIf(install_cohort_mismatch) AS install_cohort_mismatch
|
||||
FROM per_install
|
||||
GROUP BY ROLLUP(platform)
|
||||
ORDER BY platform_group
|
||||
@@ -0,0 +1,101 @@
|
||||
WITH
|
||||
supporting_versions AS (
|
||||
SELECT DISTINCT toString(properties.app_version) AS v
|
||||
FROM events
|
||||
WHERE event IN ('first_agent_interaction', 'meaningful_activity_day')
|
||||
AND timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
),
|
||||
opted_out AS (
|
||||
SELECT distinct_id AS uid
|
||||
FROM events
|
||||
WHERE event = 'telemetry_opted_out'
|
||||
AND timestamp >= toDateTime('2026-10-09 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
GROUP BY uid
|
||||
),
|
||||
anchors AS (
|
||||
SELECT
|
||||
distinct_id AS uid,
|
||||
min(timestamp) AS anchor_at,
|
||||
formatDateTime(min(timestamp), '%Y-%m-%d') AS cohort_day,
|
||||
argMin(coalesce(toString(properties.platform), 'unknown'), timestamp) AS platform,
|
||||
argMin(toString(properties.app_version), timestamp) AS anchor_version
|
||||
FROM events
|
||||
WHERE event = 'onboarding_started'
|
||||
AND properties.cohort = 'fresh_install'
|
||||
AND timestamp >= toDateTime('2026-10-09 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
GROUP BY uid
|
||||
),
|
||||
cohort AS (
|
||||
SELECT uid, anchor_at, cohort_day, platform
|
||||
FROM anchors
|
||||
WHERE anchor_at >= toDateTime('2026-11-08 00:00:00')
|
||||
AND anchor_version IN (SELECT v FROM supporting_versions)
|
||||
AND uid NOT IN (SELECT uid FROM opted_out)
|
||||
),
|
||||
mature AS (
|
||||
SELECT uid, anchor_at, platform FROM cohort
|
||||
WHERE anchor_at <= now() - INTERVAL 10095 MINUTE
|
||||
),
|
||||
surface AS (
|
||||
SELECT m.uid AS uid, 1 AS has_surface, min(e.timestamp) AS surface_at
|
||||
FROM events e
|
||||
INNER JOIN mature m ON m.uid = e.distinct_id
|
||||
WHERE e.timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
AND e.timestamp >= m.anchor_at
|
||||
AND e.timestamp < m.anchor_at + INTERVAL 168 HOUR
|
||||
AND e.properties.orca_channel IS NOT NULL
|
||||
AND (
|
||||
e.event = 'workspace_created'
|
||||
OR (e.event = 'add_repo_setup_step_action'
|
||||
AND toString(e.properties.action) IN ('open_existing', 'open_primary', 'create_worktree'))
|
||||
OR (e.event = 'add_repo_default_checkout_handoff'
|
||||
AND toString(e.properties.result) = 'opened_default_checkout')
|
||||
OR (e.event = 'repo_added' AND toString(e.properties.is_git_repo) = 'false')
|
||||
)
|
||||
GROUP BY m.uid
|
||||
),
|
||||
interaction AS (
|
||||
SELECT
|
||||
distinct_id AS uid,
|
||||
1 AS has_interaction,
|
||||
min(timestamp) AS fai_at,
|
||||
argMin(coalesce(toString(properties.install_cohort), 'unknown'), timestamp) AS fai_cohort,
|
||||
argMin(coalesce(toString(properties.source), 'unknown'), timestamp) AS fai_source
|
||||
FROM events
|
||||
WHERE event = 'first_agent_interaction'
|
||||
AND timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
GROUP BY uid
|
||||
),
|
||||
per_install AS (
|
||||
SELECT
|
||||
m.platform AS platform,
|
||||
s.has_surface = 1 AS surface_7d,
|
||||
i.has_interaction = 1 AND i.fai_cohort = 'fresh'
|
||||
AND i.fai_at >= m.anchor_at AND i.fai_at < m.anchor_at + INTERVAL 168 HOUR AS interaction_7d,
|
||||
i.has_interaction = 1 AND i.fai_cohort = 'fresh' AND s.has_surface = 1
|
||||
AND i.fai_at >= s.surface_at AND i.fai_at < m.anchor_at + INTERVAL 168 HOUR AS interaction_after_surface_7d,
|
||||
i.has_interaction = 1 AND i.fai_cohort != 'fresh' AS install_cohort_mismatch,
|
||||
if(interaction_7d, i.fai_source, 'none') AS first_source
|
||||
FROM mature m
|
||||
LEFT JOIN surface s ON s.uid = m.uid
|
||||
LEFT JOIN interaction i ON i.uid = m.uid
|
||||
)
|
||||
SELECT
|
||||
if(grouping(platform) = 1, 'all', platform) AS platform_group,
|
||||
count() AS fresh_starters_complete_7d,
|
||||
countIf(surface_7d) AS workspace_available_7d,
|
||||
round(100.0 * workspace_available_7d / nullIf(fresh_starters_complete_7d, 0), 1) AS workspace_available_pct,
|
||||
countIf(interaction_7d) AS first_interaction_7d,
|
||||
round(100.0 * first_interaction_7d / nullIf(fresh_starters_complete_7d, 0), 1) AS first_interaction_pct,
|
||||
countIf(interaction_7d AND first_source IN ('orca_send', 'native_chat', 'mobile_chat')) AS first_interaction_attributed_7d,
|
||||
countIf(interaction_7d AND first_source = 'unattributed_prompt') AS first_interaction_unattributed_7d,
|
||||
countIf(interaction_7d AND first_source NOT IN ('orca_send', 'native_chat', 'mobile_chat', 'unattributed_prompt')) AS first_interaction_unknown_source_7d,
|
||||
countIf(interaction_after_surface_7d) AS interaction_after_workspace_7d,
|
||||
countIf(install_cohort_mismatch) AS install_cohort_mismatch
|
||||
FROM per_install
|
||||
GROUP BY ROLLUP(platform)
|
||||
ORDER BY platform_group
|
||||
@@ -0,0 +1,21 @@
|
||||
SELECT
|
||||
event,
|
||||
min(timestamp) AS first_seen_utc,
|
||||
argMin(toString(properties.app_version), timestamp) AS first_seen_version,
|
||||
argMin(toString(properties.orca_channel), timestamp) AS first_seen_channel,
|
||||
uniq(toString(properties.app_version)) AS versions,
|
||||
count() AS events,
|
||||
uniq(distinct_id) AS installs,
|
||||
count() - uniq(tuple(distinct_id, if(event = 'meaningful_activity_day', formatDateTime(timestamp, '%Y-%m-%d'), ''))) AS duplicate_events,
|
||||
countIf(properties.sample_rate IS NOT NULL) AS events_with_sample_rate,
|
||||
countIf(if(event = 'first_agent_interaction', properties.source, properties.trigger) IS NULL) AS missing_source_or_trigger,
|
||||
countIf(properties.install_cohort IS NULL) AS missing_install_cohort,
|
||||
groupUniqArray(toString(if(event = 'first_agent_interaction', properties.source, properties.trigger))) AS source_or_trigger_values,
|
||||
groupUniqArray(toString(properties.agent_kind)) AS agent_kind_values,
|
||||
groupUniqArray(toString(properties.install_cohort)) AS install_cohort_values,
|
||||
groupUniqArray(coalesce(toString(properties.platform), 'unknown')) AS platforms
|
||||
FROM events
|
||||
WHERE event IN ('first_agent_interaction', 'meaningful_activity_day')
|
||||
AND timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
GROUP BY event
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
SELECT
|
||||
formatDateTime(timestamp, '%Y-%m-%d') AS day,
|
||||
uniqIf(distinct_id, event = 'meaningful_activity_day') AS meaningful_installs,
|
||||
uniqIf(distinct_id, event = 'meaningful_activity_day' AND toString(properties.install_cohort) = 'fresh') AS meaningful_fresh_installs,
|
||||
uniqIf(distinct_id, event = 'app_opened' AND toString(properties.app_version) IN (
|
||||
SELECT DISTINCT toString(properties.app_version) FROM events
|
||||
WHERE event = 'meaningful_activity_day' AND timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
)) AS launched_installs_on_supporting_builds
|
||||
FROM events
|
||||
WHERE event IN ('meaningful_activity_day', 'app_opened')
|
||||
AND timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
AND timestamp < toDateTime(formatDateTime(now(), '%Y-%m-%d 00:00:00'))
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
GROUP BY day
|
||||
ORDER BY day
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
WITH
|
||||
supporting_versions AS (
|
||||
SELECT DISTINCT toString(properties.app_version) AS v
|
||||
FROM events
|
||||
WHERE event IN ('first_agent_interaction', 'meaningful_activity_day')
|
||||
AND timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
),
|
||||
anchors AS (
|
||||
SELECT
|
||||
distinct_id AS uid,
|
||||
min(timestamp) AS anchor_at,
|
||||
formatDateTime(min(timestamp), '%Y-%m-%d') AS cohort_day,
|
||||
argMin(coalesce(toString(properties.platform), 'unknown'), timestamp) AS platform,
|
||||
argMin(toString(properties.app_version), timestamp) AS anchor_version
|
||||
FROM events
|
||||
WHERE event = 'onboarding_started'
|
||||
AND properties.cohort = 'fresh_install'
|
||||
AND timestamp >= toDateTime('2026-10-09 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
GROUP BY uid
|
||||
)
|
||||
SELECT
|
||||
cohort_day,
|
||||
platform,
|
||||
count() AS fresh_anchors,
|
||||
countIf(anchor_version IN (SELECT v FROM supporting_versions)) AS on_supporting_build,
|
||||
round(100.0 * on_supporting_build / nullIf(fresh_anchors, 0), 1) AS supporting_pct
|
||||
FROM anchors
|
||||
WHERE anchor_at >= toDateTime('2026-11-01 00:00:00')
|
||||
GROUP BY cohort_day, platform
|
||||
ORDER BY cohort_day, platform
|
||||
+93
@@ -0,0 +1,93 @@
|
||||
WITH
|
||||
supporting_versions AS (
|
||||
SELECT DISTINCT toString(properties.app_version) AS v
|
||||
FROM events
|
||||
WHERE event IN ('first_agent_interaction', 'meaningful_activity_day')
|
||||
AND timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
),
|
||||
opted_out AS (
|
||||
SELECT distinct_id AS uid
|
||||
FROM events
|
||||
WHERE event = 'telemetry_opted_out'
|
||||
AND timestamp >= toDateTime('2026-10-09 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
GROUP BY uid
|
||||
),
|
||||
anchors AS (
|
||||
SELECT
|
||||
distinct_id AS uid,
|
||||
min(timestamp) AS anchor_at,
|
||||
formatDateTime(min(timestamp), '%Y-%m-%d') AS cohort_day,
|
||||
argMin(coalesce(toString(properties.platform), 'unknown'), timestamp) AS platform,
|
||||
argMin(toString(properties.app_version), timestamp) AS anchor_version
|
||||
FROM events
|
||||
WHERE event = 'onboarding_started'
|
||||
AND properties.cohort = 'fresh_install'
|
||||
AND timestamp >= toDateTime('2026-10-09 00:00:00')
|
||||
AND properties.install_id IS NOT NULL AND properties.orca_channel IS NOT NULL
|
||||
GROUP BY uid
|
||||
),
|
||||
cohort AS (
|
||||
SELECT uid, anchor_at, cohort_day, platform
|
||||
FROM anchors
|
||||
WHERE anchor_at >= toDateTime('2026-11-08 00:00:00')
|
||||
AND anchor_version IN (SELECT v FROM supporting_versions)
|
||||
AND uid NOT IN (SELECT uid FROM opted_out)
|
||||
),
|
||||
last_complete AS (
|
||||
SELECT formatDateTime(now() - INTERVAL 1455 MINUTE, '%Y-%m-%d') AS day
|
||||
),
|
||||
activity_days AS (
|
||||
SELECT
|
||||
c.uid AS uid,
|
||||
dateDiff('day', toDate(c.cohort_day), toDate(formatDateTime(e.timestamp, '%Y-%m-%d'))) AS day_n,
|
||||
countIf(e.event = 'meaningful_activity_day') > 0 AS meaningful,
|
||||
countIf(e.event = 'app_opened') > 0 AS launched
|
||||
FROM events e
|
||||
INNER JOIN cohort c ON c.uid = e.distinct_id
|
||||
WHERE e.event IN ('meaningful_activity_day', 'app_opened')
|
||||
AND e.timestamp >= toDateTime('2026-11-08 00:00:00')
|
||||
AND e.timestamp > c.anchor_at
|
||||
AND e.properties.orca_channel IS NOT NULL
|
||||
GROUP BY uid, day_n
|
||||
),
|
||||
per_install AS (
|
||||
SELECT
|
||||
c.uid AS uid,
|
||||
c.platform AS platform,
|
||||
dateDiff('day', toDate(c.cohort_day), toDate((SELECT day FROM last_complete))) AS mature_days,
|
||||
countIf(d.day_n = 1 AND d.meaningful) > 0 AS m_d1,
|
||||
countIf(d.day_n BETWEEN 1 AND 3 AND d.meaningful) > 0 AS m_d3,
|
||||
countIf(d.day_n BETWEEN 1 AND 7 AND d.meaningful) > 0 AS m_d7,
|
||||
countIf(d.day_n BETWEEN 8 AND 14 AND d.meaningful) > 0 AS m_w2,
|
||||
countIf(d.day_n BETWEEN 24 AND 30 AND d.meaningful) > 0 AS m_d30w,
|
||||
countIf(d.day_n = 1 AND d.launched) > 0 AS l_d1,
|
||||
countIf(d.day_n BETWEEN 1 AND 3 AND d.launched) > 0 AS l_d3,
|
||||
countIf(d.day_n BETWEEN 1 AND 7 AND d.launched) > 0 AS l_d7,
|
||||
countIf(d.day_n BETWEEN 8 AND 14 AND d.launched) > 0 AS l_w2,
|
||||
countIf(d.day_n BETWEEN 24 AND 30 AND d.launched) > 0 AS l_d30w
|
||||
FROM cohort c
|
||||
LEFT JOIN activity_days d ON d.uid = c.uid
|
||||
GROUP BY c.uid, c.cohort_day, c.platform
|
||||
)
|
||||
SELECT
|
||||
platform_group,
|
||||
['D1 (day 1)', 'D3 (days 1-3)', 'D7 (days 1-7)', '2-week (days 8-14)', '30-day (days 24-30)'][wi] AS window_label,
|
||||
[1, 3, 7, 14, 30][wi] AS window_end_day,
|
||||
countIf(mature_days >= [1, 3, 7, 14, 30][wi]) AS eligible_installs,
|
||||
countIf(mature_days >= [1, 3, 7, 14, 30][wi] AND meaningful_flags[wi]) AS meaningful_returned,
|
||||
round(100.0 * meaningful_returned / nullIf(eligible_installs, 0), 1) AS meaningful_pct,
|
||||
countIf(mature_days >= [1, 3, 7, 14, 30][wi] AND launch_flags[wi]) AS launch_returned,
|
||||
round(100.0 * launch_returned / nullIf(eligible_installs, 0), 1) AS launch_pct
|
||||
FROM (
|
||||
SELECT
|
||||
arrayJoin([platform, 'all']) AS platform_group,
|
||||
arrayJoin([1, 2, 3, 4, 5]) AS wi,
|
||||
mature_days,
|
||||
[m_d1, m_d3, m_d7, m_w2, m_d30w] AS meaningful_flags,
|
||||
[l_d1, l_d3, l_d7, l_w2, l_d30w] AS launch_flags
|
||||
FROM per_install
|
||||
)
|
||||
GROUP BY platform_group, wi
|
||||
ORDER BY wi, platform_group
|
||||
@@ -303,6 +303,12 @@
|
||||
"uncommittedFiles_other": "{{count}} uncommitted"
|
||||
},
|
||||
"failure": {
|
||||
"forkOriginalMissing": "{{agent}} could not find this response in the original chat. Open it and fork from there.",
|
||||
"forkOriginalUnavailable": "{{agent}} cannot fork this response in the original chat. Open it and fork from there.",
|
||||
"forkOriginalMissingNamed": "{{agent}} could not find this response in \"{{detail}}\". Open that chat and fork from there.",
|
||||
"forkOriginalUnavailableNamed": "{{agent}} cannot fork this response in \"{{detail}}\". Open that chat and fork from there.",
|
||||
"forkOriginalLatestOnly": "{{agent}} can only fork the latest response in the original chat. Open that chat and fork its latest response once it has finished.",
|
||||
"forkOriginalLatestOnlyNamed": "{{agent}} can only fork the latest response in \"{{detail}}\". Open that chat and fork its latest response once it has finished.",
|
||||
"pluginInputRequired": "{{agent}} stopped because the \"{{plugin}}\" plugin is waiting for input in a terminal pane. Disable the plugin for chat sessions, or run the task in a {{agent}} terminal."
|
||||
},
|
||||
"fileReader": {
|
||||
|
||||
@@ -2543,6 +2543,12 @@
|
||||
"fallback": "Worktree"
|
||||
},
|
||||
"failure": {
|
||||
"forkOriginalMissing": "{{agent}} could not find this response in the original chat. Open it and fork from there.",
|
||||
"forkOriginalUnavailable": "{{agent}} cannot fork this response in the original chat. Open it and fork from there.",
|
||||
"forkOriginalMissingNamed": "{{agent}} could not find this response in \"{{detail}}\". Open that chat and fork from there.",
|
||||
"forkOriginalUnavailableNamed": "{{agent}} cannot fork this response in \"{{detail}}\". Open that chat and fork from there.",
|
||||
"forkOriginalLatestOnly": "{{agent}} can only fork the latest response in the original chat. Open that chat and fork its latest response once it has finished.",
|
||||
"forkOriginalLatestOnlyNamed": "{{agent}} can only fork the latest response in \"{{detail}}\". Open that chat and fork its latest response once it has finished.",
|
||||
"backgroundTasksRunning": "Background tasks are still running.",
|
||||
"waitForBackgroundTasks": "Wait for the background tasks to finish.",
|
||||
"agentStarting": "The agent is still starting.",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useCallback, useLayoutEffect, useMemo, useRef } from 'react'
|
||||
import type { AgentSessionHandleProvider } from '../../../src/shared/agent-session/lifecycle/agent-session-provider-handle'
|
||||
import { useHostProtocolGates } from '../components/host-protocol-gates-context'
|
||||
import type { TuiAgent } from '../../../src/shared/agent-launch/catalog/tui-agent'
|
||||
import type { StructuredAgentSessionForkSource } from '../../../src/shared/agent-session/structured-agent-session-create'
|
||||
import { MobileNativeChatForkedFromContext } from './mobile-native-chat-notice-context'
|
||||
import { forkMobileStructuredChat } from './mobile-structured-chat-fork'
|
||||
@@ -19,19 +20,21 @@ export function MobileNativeChatForkProvider({
|
||||
children: React.ReactNode
|
||||
}): React.JSX.Element {
|
||||
const { client, nativeChatController: chat, openNativeSession, worktreeId } = controller
|
||||
const { statusPending } = useHostProtocolGates()
|
||||
// The controller is rebuilt each render; a fork reads its session state at the press.
|
||||
const latestController = useRef(controller)
|
||||
useLayoutEffect(() => {
|
||||
latestController.current = controller
|
||||
})
|
||||
const createFork = useCallback(
|
||||
(agent: AgentSessionHandleProvider, forkFrom: StructuredAgentSessionForkSource) =>
|
||||
(agent: TuiAgent, forkFrom: StructuredAgentSessionForkSource) =>
|
||||
forkMobileStructuredChat(latestController.current, agent, forkFrom),
|
||||
[]
|
||||
)
|
||||
const fork = useMobileNativeChatFork({
|
||||
client,
|
||||
hostCapabilities: controller.hostCapabilities,
|
||||
hostStatusPending: statusPending || controller.connState !== 'connected',
|
||||
agent: chat.nativeChatAgent,
|
||||
sessionId: resolveMobileNativeChatSessionId(controller.activeSessionTab),
|
||||
messages: chat.nativeChatSession.messages,
|
||||
|
||||
@@ -10,6 +10,42 @@ import { SEND_FAILURE_COPY } from './agent-session-send-failure-copy'
|
||||
|
||||
const COPY: Record<AgentSessionFailureCopyId, (values: AgentSessionFailureCopyValues) => string> = {
|
||||
...START_FAILURE_COPY,
|
||||
forkOriginalMissing: (values) =>
|
||||
translate(
|
||||
'session.failure.forkOriginalMissing',
|
||||
AGENT_SESSION_FAILURE_COPY.forkOriginalMissing,
|
||||
values
|
||||
),
|
||||
forkOriginalUnavailable: (values) =>
|
||||
translate(
|
||||
'session.failure.forkOriginalUnavailable',
|
||||
AGENT_SESSION_FAILURE_COPY.forkOriginalUnavailable,
|
||||
values
|
||||
),
|
||||
forkOriginalMissingNamed: (values) =>
|
||||
translate(
|
||||
'session.failure.forkOriginalMissingNamed',
|
||||
AGENT_SESSION_FAILURE_COPY.forkOriginalMissingNamed,
|
||||
values
|
||||
),
|
||||
forkOriginalUnavailableNamed: (values) =>
|
||||
translate(
|
||||
'session.failure.forkOriginalUnavailableNamed',
|
||||
AGENT_SESSION_FAILURE_COPY.forkOriginalUnavailableNamed,
|
||||
values
|
||||
),
|
||||
forkOriginalLatestOnly: (values) =>
|
||||
translate(
|
||||
'session.failure.forkOriginalLatestOnly',
|
||||
AGENT_SESSION_FAILURE_COPY.forkOriginalLatestOnly,
|
||||
values
|
||||
),
|
||||
forkOriginalLatestOnlyNamed: (values) =>
|
||||
translate(
|
||||
'session.failure.forkOriginalLatestOnlyNamed',
|
||||
AGENT_SESSION_FAILURE_COPY.forkOriginalLatestOnlyNamed,
|
||||
values
|
||||
),
|
||||
pluginInputRequired: (values) =>
|
||||
translate(
|
||||
'session.failure.pluginInputRequired',
|
||||
|
||||
@@ -122,3 +122,31 @@ describe('mobile structured agent-session launch', () => {
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
it('settles a proven missing-original fork refusal but keeps a lost earlier attempt unknown', async () => {
|
||||
const refusal = {
|
||||
ok: true,
|
||||
result: {
|
||||
ok: false,
|
||||
refusal: {
|
||||
code: 'agent_session_identity_required',
|
||||
details: { reason: 'recordMissing' },
|
||||
createAttemptRefusedBeforeCommit: true,
|
||||
message: 'Source chat unavailable'
|
||||
}
|
||||
}
|
||||
}
|
||||
const client = clientReturning({ ok: true, result: { supported: true } }, refusal)
|
||||
const forkFrom = { sessionId: 'copied-chat', throughItemId: 'legacy:opencode:source:reply-1' }
|
||||
expect(
|
||||
(await createMobileStructuredAgentSession(client, 'workspace-1', 'opencode', forkFrom)).kind
|
||||
).toBe('failed')
|
||||
const lost = clientReturning({ ok: true, result: { supported: true } }, refusal)
|
||||
lost.sendRequest
|
||||
.mockImplementationOnce(async () => ({ ok: true, result: { supported: true } }))
|
||||
.mockRejectedValueOnce(markRpcDeliveryUnknown(new Error('reply lost')))
|
||||
.mockResolvedValueOnce(refusal)
|
||||
expect(
|
||||
(await createMobileStructuredAgentSession(lost, 'workspace-1', 'opencode', forkFrom)).kind
|
||||
).toBe('unknown')
|
||||
})
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
import type { AgentSessionHandleProvider } from '../../../src/shared/agent-session/lifecycle/agent-session-provider-handle'
|
||||
import { agentSessionForkSourceFailureWords } from '../../../src/shared/agent-session/failures/agent-session-failure-copy'
|
||||
import { sayMobileAgentSessionFailure } from './agent-session-failure-copy'
|
||||
import type { TuiAgent } from '../../../src/shared/agent-launch/catalog/tui-agent'
|
||||
import type {
|
||||
AgentSessionAttachResult,
|
||||
AgentSessionMutationResult
|
||||
} from '../../../src/shared/agent-session/agent-session-wire'
|
||||
import { isDefinitiveAgentSessionCreateRefusal } from '../../../src/shared/agent-session/failures/agent-session-definitive-refusal'
|
||||
import {
|
||||
isDefinitiveAgentSessionCreateRefusal,
|
||||
isAgentSessionForkSourceAdmissionRefusal
|
||||
} from '../../../src/shared/agent-session/failures/agent-session-definitive-refusal'
|
||||
import {
|
||||
createStructuredAgentSessionId,
|
||||
structuredAgentSessionCreateParams,
|
||||
@@ -38,7 +43,7 @@ export type MobileStructuredAgentLaunchResult =
|
||||
| { kind: 'unknown'; message: string }
|
||||
|
||||
function createParamsFor(
|
||||
agent: AgentSessionHandleProvider,
|
||||
agent: TuiAgent,
|
||||
worktree: string,
|
||||
forkFrom: StructuredAgentSessionForkSource | undefined,
|
||||
tabPlacement: StructuredAgentSessionCreateParams['tabPlacement']
|
||||
@@ -53,25 +58,22 @@ function createParamsFor(
|
||||
})
|
||||
}
|
||||
|
||||
function unknownCreateResult(
|
||||
agent: AgentSessionHandleProvider,
|
||||
error: unknown
|
||||
): MobileStructuredAgentLaunchResult {
|
||||
function unknownCreateResult(agent: TuiAgent, error: unknown): MobileStructuredAgentLaunchResult {
|
||||
const message = error instanceof Error ? error.message.trim() : ''
|
||||
return { kind: 'unknown', message: message || unconfirmedMessage(agent) }
|
||||
}
|
||||
|
||||
function unconfirmedMessage(agent: AgentSessionHandleProvider): string {
|
||||
function unconfirmedMessage(agent: TuiAgent): string {
|
||||
return `The ${TUI_AGENT_DISPLAY_NAMES[agent]} chat result could not be confirmed.`
|
||||
}
|
||||
|
||||
function failedMessage(agent: AgentSessionHandleProvider): string {
|
||||
function failedMessage(agent: TuiAgent): string {
|
||||
return `Could not open ${TUI_AGENT_DISPLAY_NAMES[agent]} chat.`
|
||||
}
|
||||
|
||||
// Only definitive refusal permits failure/fallback; uncertain creates may already own a session and must not create a sibling.
|
||||
function classifyCreateRefusal(
|
||||
agent: AgentSessionHandleProvider,
|
||||
agent: TuiAgent,
|
||||
code: string,
|
||||
message: string
|
||||
): MobileStructuredAgentLaunchResult {
|
||||
@@ -84,7 +86,7 @@ function classifyCreateRefusal(
|
||||
export async function createMobileStructuredAgentSession(
|
||||
client: RpcClient,
|
||||
worktreeId: string,
|
||||
agent: AgentSessionHandleProvider,
|
||||
agent: TuiAgent,
|
||||
/** Sent only to a host advertising forks. */
|
||||
forkFrom?: StructuredAgentSessionForkSource,
|
||||
/** Sent only to a host advertising create placement; the replay keeps it. */
|
||||
@@ -132,12 +134,14 @@ export async function createMobileStructuredAgentSession(
|
||||
const params = createParamsFor(agent, worktree, forkFrom, tabPlacement)
|
||||
rememberMobileCreatedStructuredSession(params.envelope.sessionId, worktree)
|
||||
let response
|
||||
let priorCreateOutcomeUnknown = false
|
||||
try {
|
||||
response = await structuredAgentSessionCreate.request(client, params, {
|
||||
timeoutMs: 15_000,
|
||||
budgetSpansConnect: true
|
||||
})
|
||||
} catch {
|
||||
priorCreateOutcomeUnknown = true
|
||||
// Replay the durable envelope once so a lost acknowledgement cannot create a sibling.
|
||||
try {
|
||||
response = await structuredAgentSessionCreate.request(client, params, {
|
||||
@@ -179,6 +183,22 @@ export async function createMobileStructuredAgentSession(
|
||||
) {
|
||||
return unknownCreateResult(agent, new Error(unconfirmedMessage(agent)))
|
||||
}
|
||||
if (
|
||||
forkFrom &&
|
||||
!priorCreateOutcomeUnknown &&
|
||||
result.refusal.createAttemptRefusedBeforeCommit === true &&
|
||||
isAgentSessionForkSourceAdmissionRefusal(result.refusal)
|
||||
) {
|
||||
return {
|
||||
kind: 'failed',
|
||||
message:
|
||||
agentSessionForkSourceFailureWords(
|
||||
result.refusal.message,
|
||||
TUI_AGENT_DISPLAY_NAMES[agent],
|
||||
sayMobileAgentSessionFailure
|
||||
) ?? result.refusal.message
|
||||
}
|
||||
}
|
||||
return classifyCreateRefusal(agent, result.refusal.code, result.refusal.message)
|
||||
}
|
||||
if (
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { translate } from '../i18n/mobile-i18n'
|
||||
import { triggerError } from '../platform/haptics'
|
||||
import { TUI_AGENT_DISPLAY_NAMES } from '../../../src/shared/agent-launch/catalog/tui-agent-display-names'
|
||||
import type { AgentSessionHandleProvider } from '../../../src/shared/agent-session/lifecycle/agent-session-provider-handle'
|
||||
import type { TuiAgent } from '../../../src/shared/agent-launch/catalog/tui-agent'
|
||||
import type {
|
||||
StructuredAgentSessionCreateParams,
|
||||
StructuredAgentSessionForkSource
|
||||
@@ -48,7 +48,7 @@ export function mobileChatForkTabPlacement(
|
||||
* Resolves once the outcome is known, so the caller's action stays disabled until then. */
|
||||
export async function forkMobileStructuredChat(
|
||||
scope: ForkScope,
|
||||
agent: AgentSessionHandleProvider,
|
||||
agent: TuiAgent,
|
||||
forkFrom: StructuredAgentSessionForkSource
|
||||
): Promise<void> {
|
||||
const agentName = TUI_AGENT_DISPLAY_NAMES[agent]
|
||||
|
||||
@@ -0,0 +1,217 @@
|
||||
import { createElement } from 'react'
|
||||
import { act, create, type ReactTestRenderer } from 'react-test-renderer'
|
||||
import { afterEach, expect, it, vi } from 'vitest'
|
||||
import {
|
||||
AGENT_SESSION_CREATE_FORK_RUNTIME_CAPABILITY,
|
||||
AGENT_SESSION_CREATE_FORK_ORIGINAL_RUNTIME_CAPABILITY
|
||||
} from '../../../../src/shared/agent-session/agent-session-create-capabilities'
|
||||
import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
|
||||
import type { AgentJournalRenderItem } from '../../../../src/shared/agent-session/journal/agent-session-journal-types'
|
||||
import type { NativeChatMessage } from '../../../../src/shared/native-chat/native-chat-types'
|
||||
import { useMobileNativeChatFork, type MobileNativeChatFork } from './use-mobile-native-chat-fork'
|
||||
|
||||
const renderers: ReactTestRenderer[] = []
|
||||
|
||||
afterEach(() => {
|
||||
act(() => renderers.forEach((renderer) => renderer.unmount()))
|
||||
renderers.length = 0
|
||||
})
|
||||
|
||||
/** A connection whose agent-list reads fail as scripted (true = fails), as when the socket drops. */
|
||||
function connection(failures: number | readonly boolean[]) {
|
||||
const listeners = new Set<(state: 'connected' | 'reconnecting') => void>()
|
||||
const script =
|
||||
typeof failures === 'number' ? Array.from({ length: failures }, () => true) : [...failures]
|
||||
let generation = 1
|
||||
const sendRequest = vi.fn(async () => {
|
||||
if (script.shift() === true) {
|
||||
throw new Error('Connection interrupted')
|
||||
}
|
||||
return {
|
||||
ok: true,
|
||||
result: { agents: [{ agent: 'claude', capabilities: { fork: 'checkpoint' } }] }
|
||||
}
|
||||
})
|
||||
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the hook reads only sendRequest, onStateChange and getGeneration from its client.
|
||||
const client = {
|
||||
sendRequest,
|
||||
getGeneration: () => generation,
|
||||
onStateChange: (listener: (state: 'connected' | 'reconnecting') => void) => {
|
||||
listeners.add(listener)
|
||||
return () => listeners.delete(listener)
|
||||
}
|
||||
} as unknown as RpcClient
|
||||
const reconnect = () => listeners.forEach((listener) => listener('connected'))
|
||||
const migrate = () => {
|
||||
generation++
|
||||
reconnect()
|
||||
}
|
||||
return { client, sendRequest, reconnect, migrate }
|
||||
}
|
||||
|
||||
const reply: AgentJournalRenderItem = {
|
||||
itemId: 'reply',
|
||||
sequence: 1,
|
||||
revision: 1,
|
||||
observedAt: 1,
|
||||
body: { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'ok' }] }
|
||||
}
|
||||
const message: NativeChatMessage = {
|
||||
id: 'reply',
|
||||
role: 'assistant',
|
||||
blocks: [{ type: 'text', text: 'ok' }],
|
||||
timestamp: 1,
|
||||
source: 'transcript',
|
||||
journalPosition: { sequence: 1, index: 0 }
|
||||
}
|
||||
const FORK_HOST = [AGENT_SESSION_CREATE_FORK_RUNTIME_CAPABILITY]
|
||||
let latest: MobileNativeChatFork | null = null
|
||||
|
||||
async function settle(): Promise<void> {
|
||||
await act(async () => {
|
||||
await Promise.resolve()
|
||||
await Promise.resolve()
|
||||
await Promise.resolve()
|
||||
})
|
||||
}
|
||||
|
||||
it('offers an inherited OpenCode tip after the child advances and submits its displayed key', async () => {
|
||||
let renderer!: ReactTestRenderer
|
||||
const { client, sendRequest } = connection(0)
|
||||
sendRequest.mockResolvedValue({
|
||||
ok: true,
|
||||
result: { agents: [{ agent: 'opencode', capabilities: { fork: 'tip' } }] }
|
||||
})
|
||||
const createFork = vi.fn(async () => {})
|
||||
const copied = {
|
||||
...message,
|
||||
id: 'legacy:opencode:source:reply-1',
|
||||
journalPosition: { sequence: 5, index: 0 }
|
||||
}
|
||||
const copiedPrompt: NativeChatMessage = {
|
||||
...message,
|
||||
id: 'legacy:opencode:source:user-1',
|
||||
role: 'user',
|
||||
journalPosition: { sequence: 4, index: 0 }
|
||||
}
|
||||
const ownPrompt: NativeChatMessage = {
|
||||
...message,
|
||||
id: 'legacy:opencode:child:user-2',
|
||||
role: 'user',
|
||||
journalPosition: { sequence: 7, index: 0 }
|
||||
}
|
||||
const own = {
|
||||
...message,
|
||||
id: 'legacy:opencode:child:reply-2',
|
||||
journalPosition: { sequence: 8, index: 0 }
|
||||
}
|
||||
const olderPrompt: NativeChatMessage = {
|
||||
...copiedPrompt,
|
||||
id: 'legacy:opencode:source:user-0',
|
||||
journalPosition: { sequence: 1, index: 0 }
|
||||
}
|
||||
const older = {
|
||||
...copied,
|
||||
id: 'legacy:opencode:source:reply-0',
|
||||
journalPosition: { sequence: 2, index: 0 }
|
||||
}
|
||||
function ForkProbe({
|
||||
hostCapabilities,
|
||||
hostStatusPending = false
|
||||
}: {
|
||||
hostCapabilities: readonly string[]
|
||||
hostStatusPending?: boolean
|
||||
}) {
|
||||
latest = useMobileNativeChatFork({
|
||||
client,
|
||||
hostCapabilities,
|
||||
hostStatusPending,
|
||||
agent: 'opencode',
|
||||
sessionId: 'child',
|
||||
messages: [olderPrompt, older, copiedPrompt, copied, ownPrompt, own],
|
||||
turnJournal: {
|
||||
items: [
|
||||
{
|
||||
...reply,
|
||||
itemId: olderPrompt.id,
|
||||
sequence: 1,
|
||||
body: { kind: 'message', role: 'user', blocks: [] }
|
||||
},
|
||||
{ ...reply, itemId: older.id, sequence: 2 },
|
||||
{
|
||||
...reply,
|
||||
itemId: copiedPrompt.id,
|
||||
sequence: 4,
|
||||
body: { kind: 'message', role: 'user', blocks: copiedPrompt.blocks }
|
||||
},
|
||||
{ ...reply, itemId: copied.id, sequence: 5 },
|
||||
{
|
||||
...reply,
|
||||
itemId: 'orca:forked-from',
|
||||
sequence: 6,
|
||||
body: { kind: 'status', presentation: 'forked-from', text: 'Forked from source' }
|
||||
},
|
||||
{
|
||||
...reply,
|
||||
itemId: ownPrompt.id,
|
||||
sequence: 7,
|
||||
body: { kind: 'message', role: 'user', blocks: ownPrompt.blocks }
|
||||
},
|
||||
{ ...reply, itemId: own.id, sequence: 8 }
|
||||
],
|
||||
submissions: []
|
||||
},
|
||||
agentWorking: false,
|
||||
sessionForkSupport: 'supported',
|
||||
createFork
|
||||
})
|
||||
return null
|
||||
}
|
||||
await act(async () => {
|
||||
renderer = create(createElement(ForkProbe, { hostCapabilities: FORK_HOST }))
|
||||
renderers.push(renderer)
|
||||
})
|
||||
await settle()
|
||||
expect(latest?.offerFor(copied)).toBe('reserved')
|
||||
expect(latest?.offerFor(older)).toBe('reserved')
|
||||
expect(latest?.offerFor(own)).toBe('available')
|
||||
await act(async () => {
|
||||
renderer.update(
|
||||
createElement(ForkProbe, {
|
||||
hostCapabilities: [...FORK_HOST, AGENT_SESSION_CREATE_FORK_ORIGINAL_RUNTIME_CAPABILITY]
|
||||
})
|
||||
)
|
||||
})
|
||||
expect(latest?.offerFor(copied)).toBe('available')
|
||||
expect(latest?.offerFor(older)).toBe('available')
|
||||
await act(async () => {
|
||||
renderer.update(
|
||||
createElement(ForkProbe, {
|
||||
hostCapabilities: [...FORK_HOST, AGENT_SESSION_CREATE_FORK_ORIGINAL_RUNTIME_CAPABILITY],
|
||||
hostStatusPending: true
|
||||
})
|
||||
)
|
||||
})
|
||||
expect(latest?.offerFor(copied)).toBe('reserved')
|
||||
expect(latest?.offerFor(own)).toBe('available')
|
||||
await act(async () => {
|
||||
renderer.update(
|
||||
createElement(ForkProbe, {
|
||||
hostCapabilities: [...FORK_HOST, AGENT_SESSION_CREATE_FORK_ORIGINAL_RUNTIME_CAPABILITY],
|
||||
hostStatusPending: false
|
||||
})
|
||||
)
|
||||
})
|
||||
expect(latest?.offerFor(copied)).toBe('available')
|
||||
await act(async () => {
|
||||
latest?.fork(copied)
|
||||
})
|
||||
expect(createFork).toHaveBeenCalledWith('opencode', {
|
||||
sessionId: 'child',
|
||||
throughItemId: 'legacy:opencode:source:reply-1'
|
||||
})
|
||||
await act(async () => {
|
||||
renderer.update(createElement(ForkProbe, { hostCapabilities: FORK_HOST }))
|
||||
})
|
||||
expect(latest?.offerFor(copied)).toBe('reserved')
|
||||
})
|
||||
@@ -13,16 +13,17 @@ import {
|
||||
type AgentSessionRegisteredAgent
|
||||
} from '../../../../src/shared/agent-session/agent-session-registered-agents'
|
||||
import type { AgentSessionOptionsResult } from '../../../../src/shared/agent-session/options/agent-session-options-result'
|
||||
import { AGENT_SESSION_CREATE_FORK_RUNTIME_CAPABILITY } from '../../../../src/shared/agent-session/agent-session-create-capabilities'
|
||||
import { latestAgentSessionContextClearSequence } from '../../../../src/shared/agent-session/agent-session-context-clear'
|
||||
import {
|
||||
isAgentSessionHandleProvider,
|
||||
type AgentSessionHandleProvider
|
||||
} from '../../../../src/shared/agent-session/lifecycle/agent-session-provider-handle'
|
||||
AGENT_SESSION_CREATE_FORK_RUNTIME_CAPABILITY,
|
||||
AGENT_SESSION_CREATE_FORK_ORIGINAL_RUNTIME_CAPABILITY
|
||||
} from '../../../../src/shared/agent-session/agent-session-create-capabilities'
|
||||
import { latestAgentSessionContextClearSequence } from '../../../../src/shared/agent-session/agent-session-context-clear'
|
||||
import { isTuiAgent } from '../../../../src/shared/agent-launch/catalog/tui-agent-config'
|
||||
import type { TuiAgent } from '../../../../src/shared/agent-launch/catalog/tui-agent'
|
||||
import type { StructuredAgentSessionForkSource } from '../../../../src/shared/agent-session/structured-agent-session-create'
|
||||
import type { StructuredAgentSessionHostCapabilityState } from '../../../../src/shared/agent-session/structured-agent-session-host-capability'
|
||||
import {
|
||||
nativeChatForkableItemIds,
|
||||
nativeChatForkInventory,
|
||||
nativeChatForkSupport,
|
||||
nativeChatRowOffersFork
|
||||
} from '../../../../src/shared/native-chat/native-chat-fork-offer'
|
||||
@@ -155,6 +156,7 @@ function useRegisteredAgent(
|
||||
export function useMobileNativeChatFork(input: {
|
||||
client: RpcClient | null
|
||||
hostCapabilities: readonly string[] | undefined
|
||||
hostStatusPending: boolean
|
||||
agent: string | null
|
||||
sessionId: string | null
|
||||
messages: readonly NativeChatMessage[]
|
||||
@@ -162,20 +164,23 @@ export function useMobileNativeChatFork(input: {
|
||||
agentWorking: boolean
|
||||
/** The chat's options read on its installed agent; the host's own discovery owns it. */
|
||||
sessionForkSupport: AgentSessionOptionsResult['forkSupport']
|
||||
createFork: (
|
||||
agent: AgentSessionHandleProvider,
|
||||
forkFrom: StructuredAgentSessionForkSource
|
||||
) => Promise<void>
|
||||
createFork: (agent: TuiAgent, forkFrom: StructuredAgentSessionForkSource) => Promise<void>
|
||||
}): MobileNativeChatFork {
|
||||
const host: StructuredAgentSessionHostCapabilityState = !input.hostCapabilities
|
||||
? 'unknown'
|
||||
: input.hostCapabilities.includes(AGENT_SESSION_CREATE_FORK_RUNTIME_CAPABILITY)
|
||||
? 'supported'
|
||||
: 'unsupported'
|
||||
const inheritedOriginal: StructuredAgentSessionHostCapabilityState =
|
||||
!input.hostCapabilities || input.hostStatusPending
|
||||
? 'unknown'
|
||||
: input.hostCapabilities.includes(AGENT_SESSION_CREATE_FORK_ORIGINAL_RUNTIME_CAPABILITY)
|
||||
? 'supported'
|
||||
: 'unsupported'
|
||||
const registered = useRegisteredAgent(input.client, host, input.agent)
|
||||
const support = useMemo(
|
||||
() => nativeChatForkSupport(host, registered, input.sessionForkSupport),
|
||||
[host, registered, input.sessionForkSupport]
|
||||
() => nativeChatForkSupport(host, registered, input.sessionForkSupport, inheritedOriginal),
|
||||
[host, registered, input.sessionForkSupport, inheritedOriginal]
|
||||
)
|
||||
const { messages, turnJournal, agentWorking, sessionId, agent, createFork } = input
|
||||
const turns = useMemo(() => {
|
||||
@@ -191,8 +196,8 @@ export function useMobileNativeChatFork(input: {
|
||||
}, [messages, turnJournal])
|
||||
const contextFloorSequence = latestAgentSessionContextClearSequence(turnJournal?.items ?? [])
|
||||
// The sheet's row is a display projection; only one naming the agent's own message forks.
|
||||
const forkableItemIds = useMemo(
|
||||
() => nativeChatForkableItemIds(turnJournal?.items ?? []),
|
||||
const { forkableItemIds, inheritedThroughSequence } = useMemo(
|
||||
() => nativeChatForkInventory(turnJournal?.items ?? []),
|
||||
[turnJournal]
|
||||
)
|
||||
// Reserved at the press, before any await, so a second press never starts a second fork.
|
||||
@@ -206,7 +211,7 @@ export function useMobileNativeChatFork(input: {
|
||||
const turnKey = turns.keyById.get(message.id)
|
||||
const offered =
|
||||
!!sessionId &&
|
||||
isAgentSessionHandleProvider(agent ?? '') &&
|
||||
isTuiAgent(agent ?? '') &&
|
||||
nativeChatRowOffersFork(
|
||||
{
|
||||
message,
|
||||
@@ -214,7 +219,7 @@ export function useMobileNativeChatFork(input: {
|
||||
turnWorking: agentWorking && (turnKey === undefined || turnKey === turns.liveTurnKey),
|
||||
inLatestTurn: turnKey !== undefined && turnKey === turns.latestTurnKey
|
||||
},
|
||||
{ support, contextFloorSequence, forkableItemIds }
|
||||
{ support, contextFloorSequence, forkableItemIds, inheritedThroughSequence }
|
||||
)
|
||||
return !offered
|
||||
? 'reserved'
|
||||
@@ -222,7 +227,17 @@ export function useMobileNativeChatFork(input: {
|
||||
? 'disabled'
|
||||
: 'available'
|
||||
},
|
||||
[agent, agentWorking, contextFloorSequence, forkableItemIds, pending, sessionId, support, turns]
|
||||
[
|
||||
agent,
|
||||
agentWorking,
|
||||
contextFloorSequence,
|
||||
forkableItemIds,
|
||||
inheritedThroughSequence,
|
||||
pending,
|
||||
sessionId,
|
||||
support,
|
||||
turns
|
||||
]
|
||||
)
|
||||
const fork = useCallback(
|
||||
(message: NativeChatMessage) => {
|
||||
@@ -231,7 +246,7 @@ export function useMobileNativeChatFork(input: {
|
||||
offerFor(message) !== 'available' ||
|
||||
!sessionId ||
|
||||
!agent ||
|
||||
!isAgentSessionHandleProvider(agent)
|
||||
!isTuiAgent(agent)
|
||||
) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -290,6 +290,20 @@ environmentRecipes:
|
||||
fresh recipe JSON because the pairing may have changed. `destroy` may be omitted only with
|
||||
`destroy: none`. The legacy keys `command` and `cleanup` still map to `create` and `destroy`.
|
||||
|
||||
Steps have no time limit by default. Set `timeoutSeconds` on the recipe to give them one, either
|
||||
one number for every step or a map with any of `create`, `suspend`, `resume`, and `destroy`; values
|
||||
are whole seconds from 1 to 86400. When a step runs past its limit, Orca stops the whole process
|
||||
tree and reports a timeout. An invalid value is reported and the steps stay unlimited.
|
||||
|
||||
```yaml
|
||||
timeoutSeconds:
|
||||
create: 1800 # slow image builds
|
||||
destroy: 120
|
||||
```
|
||||
|
||||
A timed-out `create` may still have started a VM, so make `create` idempotent per
|
||||
`ORCA_VM_INSTANCE_ID` or have it record the resource before slow work starts.
|
||||
|
||||
The base result, which is what Orca-server mode prints:
|
||||
|
||||
```json
|
||||
|
||||
@@ -2074,6 +2074,20 @@ const ORCA_PER_WORKSPACE_ENV_MARKDOWN = [
|
||||
"fresh recipe JSON because the pairing may have changed. `destroy` may be omitted only with",
|
||||
"`destroy: none`. The legacy keys `command` and `cleanup` still map to `create` and `destroy`.",
|
||||
"",
|
||||
"Steps have no time limit by default. Set `timeoutSeconds` on the recipe to give them one, either",
|
||||
"one number for every step or a map with any of `create`, `suspend`, `resume`, and `destroy`; values",
|
||||
"are whole seconds from 1 to 86400. When a step runs past its limit, Orca stops the whole process",
|
||||
"tree and reports a timeout. An invalid value is reported and the steps stay unlimited.",
|
||||
"",
|
||||
"```yaml",
|
||||
"timeoutSeconds:",
|
||||
" create: 1800 # slow image builds",
|
||||
" destroy: 120",
|
||||
"```",
|
||||
"",
|
||||
"A timed-out `create` may still have started a VM, so make `create` idempotent per",
|
||||
"`ORCA_VM_INSTANCE_ID` or have it record the resource before slow work starts.",
|
||||
"",
|
||||
"The base result, which is what Orca-server mode prints:",
|
||||
"",
|
||||
"```json",
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { renderOrchestrationArgv, type OrchestrationAgentView } from './agent-view'
|
||||
import type { WorkerListRunScope } from './worker-list-run-scope'
|
||||
import { isActionableOrchestrationFleetAttention } from '../../../shared/orchestration/fleet/orchestration-fleet-attention'
|
||||
import { formatPrCommentRelativeTime } from '../../../shared/source-control/review-comments/pr-comment-time'
|
||||
|
||||
type WorkerProjection = {
|
||||
runId?: string
|
||||
@@ -9,7 +10,8 @@ type WorkerProjection = {
|
||||
host: { id: string }
|
||||
workspace?: { id: string } | null
|
||||
stage: { activity: string }
|
||||
liveness: { verdict: string }
|
||||
liveness: { verdict: string; detail?: string }
|
||||
evidence?: { lastObservedAt: number | null }
|
||||
nextAction: { argv: string[] }
|
||||
attention?: { categories: string[] }
|
||||
resource?: { terminalState?: string | null } | null
|
||||
@@ -49,6 +51,8 @@ type WorkerShowFields = {
|
||||
state: string
|
||||
stage: string
|
||||
liveness?: string
|
||||
activity?: string
|
||||
lastActivity?: string
|
||||
terminal?: string
|
||||
terminalState?: string
|
||||
workspace?: string
|
||||
@@ -69,7 +73,9 @@ export const WORKER_SHOW_VIEW: OrchestrationAgentView<WorkerShowResult, WorkerSh
|
||||
followUpOf: value.dispatch?.followUpOf ?? undefined,
|
||||
state: value.worker.state,
|
||||
stage: value.worker.stage,
|
||||
liveness: value.projection?.liveness.verdict,
|
||||
liveness: livenessField(value.projection),
|
||||
activity: knownActivity(value.projection),
|
||||
lastActivity: lastActivity(value.projection),
|
||||
terminal:
|
||||
value.worker.agentTerminalHandle ?? value.terminalResource?.terminalHandle ?? undefined,
|
||||
// The projection's accounting state matches worker-list; releaseState is the raw column.
|
||||
@@ -212,3 +218,24 @@ function actionableAttention(
|
||||
function nonEmpty<T>(values: T[] | undefined): T[] | undefined {
|
||||
return values && values.length > 0 ? values : undefined
|
||||
}
|
||||
|
||||
/** Name what could not be verified, so a lost host never reads like a stuck worker. */
|
||||
function livenessField(projection: WorkerProjection | null | undefined): string | undefined {
|
||||
const liveness = projection?.liveness
|
||||
return liveness?.detail ? `${liveness.verdict} (${liveness.detail})` : liveness?.verdict
|
||||
}
|
||||
|
||||
/** Only a live worker's activity is known; a finished turn is an idle agent, not finished work. */
|
||||
function knownActivity(projection: WorkerProjection | null | undefined): string | undefined {
|
||||
if (projection?.liveness.verdict !== 'live' || projection.stage.activity === 'unknown') {
|
||||
return undefined
|
||||
}
|
||||
return projection.stage.activity === 'done' ? 'idle' : projection.stage.activity
|
||||
}
|
||||
|
||||
function lastActivity(projection: WorkerProjection | null | undefined): string | undefined {
|
||||
const at = projection?.evidence?.lastObservedAt
|
||||
return knownActivity(projection) && typeof at === 'number'
|
||||
? formatPrCommentRelativeTime(new Date(at).toISOString(), Date.now())
|
||||
: undefined
|
||||
}
|
||||
|
||||
-200
@@ -1,200 +0,0 @@
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { _internals } from '../../agent-hook-server'
|
||||
import { buildBody } from '../server.test-fixtures'
|
||||
|
||||
const { getCohortAtEmitMock, trackMock } = vi.hoisted(() => ({
|
||||
getCohortAtEmitMock: vi.fn(),
|
||||
trackMock: vi.fn()
|
||||
}))
|
||||
|
||||
vi.mock('../../../../telemetry/client', () => ({
|
||||
track: trackMock
|
||||
}))
|
||||
|
||||
vi.mock('../../../../telemetry/cohort-classifier', () => ({
|
||||
getCohortAtEmit: getCohortAtEmitMock
|
||||
}))
|
||||
|
||||
beforeEach(() => {
|
||||
_internals.resetCachesForTests()
|
||||
trackMock.mockReset()
|
||||
getCohortAtEmitMock.mockReset()
|
||||
getCohortAtEmitMock.mockReturnValue({ nth_repo_added: 2 })
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks()
|
||||
})
|
||||
|
||||
describe('Codex hook normalization', () => {
|
||||
it('tracks nested subagents with their role, model, and lifecycle state', () => {
|
||||
const root = _internals.normalizeHookPayload(
|
||||
'codex',
|
||||
buildBody({
|
||||
hook_event_name: 'UserPromptSubmit',
|
||||
prompt: 'Coordinate the review',
|
||||
model: 'gpt-5.4'
|
||||
}),
|
||||
'production'
|
||||
)
|
||||
expect(root?.payload.model).toBe('gpt-5.4')
|
||||
|
||||
const started = _internals.normalizeHookPayload(
|
||||
'codex',
|
||||
buildBody({
|
||||
hook_event_name: 'SubagentStart',
|
||||
session_id: 'child-session',
|
||||
agent_id: 'child-session',
|
||||
agent_type: 'reviewer',
|
||||
model: 'gpt-5.4-mini'
|
||||
}),
|
||||
'production'
|
||||
)
|
||||
expect(started?.providerSession).toBeUndefined()
|
||||
expect(started?.payload).toMatchObject({
|
||||
state: 'working',
|
||||
prompt: 'Coordinate the review',
|
||||
model: 'gpt-5.4',
|
||||
subagents: [
|
||||
{
|
||||
id: 'child-session',
|
||||
agentType: 'reviewer',
|
||||
model: 'gpt-5.4-mini',
|
||||
state: 'working'
|
||||
}
|
||||
]
|
||||
})
|
||||
|
||||
const waiting = _internals.normalizeHookPayload(
|
||||
'codex',
|
||||
buildBody({
|
||||
hook_event_name: 'PermissionRequest',
|
||||
agent_id: 'child-session',
|
||||
agent_type: 'reviewer',
|
||||
model: 'gpt-5.4-mini',
|
||||
tool_name: 'exec_command',
|
||||
tool_input: { cmd: 'git fetch' }
|
||||
}),
|
||||
'production'
|
||||
)
|
||||
expect(waiting?.payload.state).toBe('waiting')
|
||||
expect(waiting?.payload.subagents?.[0].state).toBe('waiting')
|
||||
|
||||
const workingAgain = _internals.normalizeHookPayload(
|
||||
'codex',
|
||||
buildBody({
|
||||
hook_event_name: 'PreToolUse',
|
||||
agent_id: 'child-session',
|
||||
agent_type: 'reviewer',
|
||||
model: 'gpt-5.4-mini',
|
||||
tool_name: 'exec_command',
|
||||
tool_input: { cmd: 'git fetch' }
|
||||
}),
|
||||
'production'
|
||||
)
|
||||
expect(workingAgain?.payload.state).toBe('working')
|
||||
expect(workingAgain?.payload.subagents?.[0].state).toBe('working')
|
||||
|
||||
const rootStop = _internals.normalizeHookPayload(
|
||||
'codex',
|
||||
buildBody({ hook_event_name: 'Stop', model: 'gpt-5.4' }),
|
||||
'production'
|
||||
)
|
||||
expect(rootStop?.payload.state).toBe('done')
|
||||
expect(rootStop?.payload.subagents).toBeUndefined()
|
||||
|
||||
const resumedChild = _internals.normalizeHookPayload(
|
||||
'codex',
|
||||
buildBody({
|
||||
hook_event_name: 'PreToolUse',
|
||||
agent_id: 'child-session',
|
||||
agent_type: 'reviewer',
|
||||
model: 'gpt-5.4-mini',
|
||||
tool_name: 'exec_command',
|
||||
tool_input: { cmd: 'pnpm test' }
|
||||
}),
|
||||
'production'
|
||||
)
|
||||
expect(resumedChild?.payload.state).toBe('working')
|
||||
expect(resumedChild?.payload.subagents?.[0]).toMatchObject({
|
||||
id: 'child-session',
|
||||
state: 'working'
|
||||
})
|
||||
|
||||
const stopped = _internals.normalizeHookPayload(
|
||||
'codex',
|
||||
buildBody({ hook_event_name: 'SubagentStop', agent_id: 'child-session' }),
|
||||
'production'
|
||||
)
|
||||
expect(stopped?.payload.state).toBe('done')
|
||||
expect(stopped?.payload.subagents).toBeUndefined()
|
||||
})
|
||||
})
|
||||
|
||||
describe.each(['opencode', 'opencode2'] as const)('%s hook normalization', (source) => {
|
||||
it.each([
|
||||
['UnknownError', 'failure', undefined],
|
||||
['MessageAbortedError', 'cancellation', true]
|
||||
])('retains the reported root outcome for %s', (errorName, outcome, interrupted) => {
|
||||
const result = _internals.normalizeHookPayload(
|
||||
source,
|
||||
buildBody({
|
||||
hook_event_name: 'SessionIdle',
|
||||
root_state: 'done',
|
||||
root_turn_error_name: errorName
|
||||
}),
|
||||
'production'
|
||||
)
|
||||
expect(result?.payload.mainAgent).toMatchObject({ state: 'done', outcome })
|
||||
expect(result?.payload.interrupted).toBe(interrupted)
|
||||
})
|
||||
|
||||
it('does not infer an outcome for an older plugin', () => {
|
||||
const result = _internals.normalizeHookPayload(
|
||||
source,
|
||||
buildBody({ hook_event_name: 'SessionIdle' }),
|
||||
'production'
|
||||
)
|
||||
expect(result?.payload.mainAgent).toBeUndefined()
|
||||
})
|
||||
|
||||
it('keeps a root failure beside still-working child work', () => {
|
||||
const result = _internals.normalizeHookPayload(
|
||||
source,
|
||||
buildBody({
|
||||
hook_event_name: 'SessionBusy',
|
||||
root_state: 'done',
|
||||
root_turn_error_name: 'api'
|
||||
}),
|
||||
'production'
|
||||
)
|
||||
expect(result?.payload.state).toBe('working')
|
||||
expect(result?.payload.mainAgent).toMatchObject({ state: 'done', outcome: 'failure' })
|
||||
})
|
||||
|
||||
it('caps oversized MessagePart text from stale (pre-throttle) plugin builds', () => {
|
||||
// Older plugins resend full replies on each update; cap per-event work.
|
||||
const assistant = _internals.normalizeHookPayload(
|
||||
source,
|
||||
buildBody({
|
||||
hook_event_name: 'MessagePart',
|
||||
role: 'assistant',
|
||||
text: 'a'.repeat(500_000)
|
||||
}),
|
||||
'production'
|
||||
)
|
||||
expect(assistant?.payload.lastAssistantMessage?.length).toBe(8_000)
|
||||
|
||||
const user = _internals.normalizeHookPayload(
|
||||
source,
|
||||
buildBody({
|
||||
hook_event_name: 'MessagePart',
|
||||
role: 'user',
|
||||
text: 'u'.repeat(500_000),
|
||||
messageID: 'msg-cap'
|
||||
}),
|
||||
'production'
|
||||
)
|
||||
expect(user?.payload.prompt?.length).toBe(200)
|
||||
})
|
||||
})
|
||||
-174
@@ -1,174 +0,0 @@
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
import { AgentHookServer, _internals } from '../../agent-hook-server'
|
||||
import { buildBody } from '../server.test-fixtures'
|
||||
|
||||
const { getCohortAtEmitMock, trackMock } = vi.hoisted(() => ({
|
||||
getCohortAtEmitMock: vi.fn(),
|
||||
trackMock: vi.fn()
|
||||
}))
|
||||
|
||||
vi.mock('../../../../telemetry/client', () => ({
|
||||
track: trackMock
|
||||
}))
|
||||
|
||||
vi.mock('../../../../telemetry/cohort-classifier', () => ({
|
||||
getCohortAtEmit: getCohortAtEmitMock
|
||||
}))
|
||||
|
||||
beforeEach(() => {
|
||||
_internals.resetCachesForTests()
|
||||
trackMock.mockReset()
|
||||
getCohortAtEmitMock.mockReset()
|
||||
getCohortAtEmitMock.mockReturnValue({ nth_repo_added: 2 })
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks()
|
||||
})
|
||||
|
||||
describe('Copilot hook normalization', () => {
|
||||
it('updates Copilot Stop with final transcript text after a non-blocking retry', async () => {
|
||||
const server = new AgentHookServer()
|
||||
const tmpDir = mkdtempSync(join(tmpdir(), 'orca-copilot-transcript-retry-'))
|
||||
const transcriptPath = join(tmpDir, 'events.jsonl')
|
||||
writeFileSync(transcriptPath, '')
|
||||
await server.start({ env: 'production' })
|
||||
try {
|
||||
const env = server.buildPtyEnv()
|
||||
const listener = vi.fn()
|
||||
server.setListener(listener)
|
||||
|
||||
await fetch(`http://127.0.0.1:${env.ORCA_AGENT_HOOK_PORT}/hook/copilot`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-Orca-Agent-Hook-Token': env.ORCA_AGENT_HOOK_TOKEN
|
||||
},
|
||||
body: JSON.stringify(
|
||||
buildBody({
|
||||
hook_event_name: 'PostToolUse',
|
||||
tool_result: { text_result_for_llm: 'stale tool output' }
|
||||
})
|
||||
)
|
||||
})
|
||||
const response = await fetch(`http://127.0.0.1:${env.ORCA_AGENT_HOOK_PORT}/hook/copilot`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-Orca-Agent-Hook-Token': env.ORCA_AGENT_HOOK_TOKEN
|
||||
},
|
||||
body: JSON.stringify(
|
||||
buildBody({ hook_event_name: 'Stop', transcript_path: transcriptPath })
|
||||
)
|
||||
})
|
||||
|
||||
expect(response.status).toBe(204)
|
||||
await fetch(`http://127.0.0.1:${env.ORCA_AGENT_HOOK_PORT}/hook/copilot`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-Orca-Agent-Hook-Token': env.ORCA_AGENT_HOOK_TOKEN
|
||||
},
|
||||
body: JSON.stringify(buildBody({ hook_event_name: 'SessionEnd', reason: 'complete' }))
|
||||
})
|
||||
expect(listener).toHaveBeenLastCalledWith(
|
||||
expect.objectContaining({
|
||||
payload: expect.objectContaining({
|
||||
state: 'done',
|
||||
lastAssistantMessage: undefined
|
||||
})
|
||||
})
|
||||
)
|
||||
|
||||
// Let the first 50ms retry miss so continuation across SessionEnd is proven.
|
||||
await new Promise((resolve) => setTimeout(resolve, 70))
|
||||
writeFileSync(
|
||||
transcriptPath,
|
||||
`${JSON.stringify({
|
||||
type: 'assistant.message',
|
||||
data: { content: 'Done after transcript flush.' }
|
||||
})}\n`
|
||||
)
|
||||
await new Promise((resolve) => setTimeout(resolve, 120))
|
||||
|
||||
expect(listener).toHaveBeenLastCalledWith(
|
||||
expect.objectContaining({
|
||||
payload: expect.objectContaining({
|
||||
state: 'done',
|
||||
lastAssistantMessage: 'Done after transcript flush.'
|
||||
})
|
||||
})
|
||||
)
|
||||
} finally {
|
||||
server.stop()
|
||||
rmSync(tmpDir, { recursive: true, force: true })
|
||||
}
|
||||
})
|
||||
|
||||
it('updates Grok Stop with final chat-history text after a non-blocking retry', async () => {
|
||||
const server = new AgentHookServer()
|
||||
const tmpDir = mkdtempSync(join(tmpdir(), 'orca-grok-chat-history-retry-'))
|
||||
const sessionId = '019e37f4-5135-7b63-a4ab-6d13aa6bf528'
|
||||
const cwd = join(tmpDir, 'workspace')
|
||||
const sessionDir = join(tmpDir, '.grok', 'sessions', encodeURIComponent(cwd), sessionId)
|
||||
mkdirSync(sessionDir, { recursive: true })
|
||||
writeFileSync(join(sessionDir, 'chat_history.jsonl'), '')
|
||||
vi.stubEnv('HOME', tmpDir)
|
||||
vi.stubEnv('USERPROFILE', tmpDir)
|
||||
await server.start({ env: 'production' })
|
||||
try {
|
||||
const env = server.buildPtyEnv()
|
||||
const listener = vi.fn()
|
||||
server.setListener(listener)
|
||||
|
||||
await fetch(`http://127.0.0.1:${env.ORCA_AGENT_HOOK_PORT}/hook/grok`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-Orca-Agent-Hook-Token': env.ORCA_AGENT_HOOK_TOKEN
|
||||
},
|
||||
body: JSON.stringify(buildBody({ hookEventName: 'user_prompt_submit', prompt: 'hihi' }))
|
||||
})
|
||||
const response = await fetch(`http://127.0.0.1:${env.ORCA_AGENT_HOOK_PORT}/hook/grok`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-Orca-Agent-Hook-Token': env.ORCA_AGENT_HOOK_TOKEN
|
||||
},
|
||||
body: JSON.stringify(buildBody({ hookEventName: 'Stop', sessionId, cwd }))
|
||||
})
|
||||
|
||||
expect(response.status).toBe(204)
|
||||
expect(listener).toHaveBeenLastCalledWith(
|
||||
expect.objectContaining({
|
||||
payload: expect.objectContaining({
|
||||
state: 'done',
|
||||
lastAssistantMessage: undefined
|
||||
})
|
||||
})
|
||||
)
|
||||
|
||||
writeFileSync(
|
||||
join(sessionDir, 'chat_history.jsonl'),
|
||||
`${JSON.stringify({ type: 'assistant', content: 'Hi! How can I help you today?' })}\n`
|
||||
)
|
||||
await new Promise((resolve) => setTimeout(resolve, 120))
|
||||
|
||||
expect(listener).toHaveBeenLastCalledWith(
|
||||
expect.objectContaining({
|
||||
payload: expect.objectContaining({
|
||||
state: 'done',
|
||||
lastAssistantMessage: 'Hi! How can I help you today?'
|
||||
})
|
||||
})
|
||||
)
|
||||
} finally {
|
||||
server.stop()
|
||||
vi.unstubAllEnvs()
|
||||
rmSync(tmpDir, { recursive: true, force: true })
|
||||
}
|
||||
})
|
||||
})
|
||||
@@ -1,37 +0,0 @@
|
||||
import { afterEach, beforeEach, expect, it, vi } from 'vitest'
|
||||
|
||||
const { scanAiVaultSessionsInService } = vi.hoisted(() => ({
|
||||
scanAiVaultSessionsInService: vi.fn()
|
||||
}))
|
||||
|
||||
vi.mock('./scan-service/session-scanner-service-spawn', async (importOriginal) => ({
|
||||
...(await importOriginal<object>()),
|
||||
scanAiVaultSessionsInService
|
||||
}))
|
||||
|
||||
import { listAiVaultSessions, resetAiVaultSessionListCacheForTests } from './cached-session-list'
|
||||
|
||||
beforeEach(() => {
|
||||
vi.spyOn(process, 'platform', 'get').mockReturnValue('darwin')
|
||||
resetAiVaultSessionListCacheForTests()
|
||||
scanAiVaultSessionsInService.mockResolvedValue({ sessions: [], issues: [], scannedAt: 'scan' })
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
resetAiVaultSessionListCacheForTests()
|
||||
vi.restoreAllMocks()
|
||||
scanAiVaultSessionsInService.mockReset()
|
||||
})
|
||||
|
||||
it('answers a scope-only request from a cached full list for the same paths, never the reverse', async () => {
|
||||
const scopePaths = ['/repo/app']
|
||||
|
||||
await listAiVaultSessions({ scopePaths })
|
||||
await listAiVaultSessions({ scopePaths, scopeOnly: true })
|
||||
expect(scanAiVaultSessionsInService).toHaveBeenCalledTimes(1)
|
||||
|
||||
resetAiVaultSessionListCacheForTests()
|
||||
await listAiVaultSessions({ scopePaths, scopeOnly: true })
|
||||
await listAiVaultSessions({ scopePaths })
|
||||
expect(scanAiVaultSessionsInService).toHaveBeenCalledTimes(3)
|
||||
})
|
||||
@@ -16,6 +16,7 @@ import { antigravityBrowserHelperWorks } from './antigravity-browser-helper'
|
||||
import { AcpLaunchGate } from '../acp/launch/acp-launch-gate'
|
||||
import { ANTIGRAVITY_ACP_HOME } from '../../shared/antigravity-session-origin'
|
||||
import { ANTIGRAVITY_CHAT_HOME_FOLDER } from './antigravity-chat-home'
|
||||
import { antigravityUserHome, linkAntigravityUserSkills } from './antigravity-chat-user-skills'
|
||||
|
||||
type SignInOwner = Pick<AcpAgentConnection, 'close' | 'onExit' | 'exited'>
|
||||
const retained = new ProviderAcquisitionStarts<SignInOwner>()
|
||||
@@ -85,6 +86,7 @@ export const antigravityChatAccount = {
|
||||
)
|
||||
}
|
||||
await folder.prepare?.(env)
|
||||
await linkAntigravityUserSkills(home, antigravityUserHome(env))
|
||||
const path = join(home, ANTIGRAVITY_ACP_HOME, 'settings.json')
|
||||
const projection = {
|
||||
auth: { type: auth.method },
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
import type * as FsPromises from 'node:fs/promises'
|
||||
import { mkdir, mkdtemp, readFile, readlink, rm, rmdir, symlink, writeFile } from 'node:fs/promises'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
import { afterEach, beforeEach, expect, it, vi } from 'vitest'
|
||||
import { linkAntigravityUserSkills } from './antigravity-chat-user-skills'
|
||||
|
||||
const fsCalls = vi.hoisted(() => ({ count: 0 }))
|
||||
vi.mock('node:fs/promises', async (importOriginal) => {
|
||||
const real = await importOriginal<typeof FsPromises>()
|
||||
const counted =
|
||||
<A extends unknown[], R>(fn: (...args: A) => Promise<R>) =>
|
||||
(...args: A) => {
|
||||
fsCalls.count++
|
||||
return fn(...args)
|
||||
}
|
||||
return { ...real, lstat: counted(real.lstat), rmdir: vi.fn(real.rmdir) }
|
||||
})
|
||||
|
||||
let root: string
|
||||
let chatHome: string
|
||||
let userHome: string
|
||||
|
||||
beforeEach(async () => {
|
||||
root = await mkdtemp(join(tmpdir(), 'agy-user-skills-'))
|
||||
chatHome = join(root, 'antigravity-chat')
|
||||
userHome = join(root, 'home')
|
||||
await mkdir(join(userHome, '.gemini', 'config', 'skills', 'orca-cli'), { recursive: true })
|
||||
await writeFile(join(userHome, '.gemini', 'config', 'skills', 'orca-cli', 'SKILL.md'), 'skill')
|
||||
})
|
||||
|
||||
afterEach(async () => {
|
||||
vi.mocked(rmdir).mockRestore()
|
||||
await rm(root, { recursive: true, force: true })
|
||||
})
|
||||
|
||||
it('replaces the empty placeholder with a link to the user skills', async () => {
|
||||
await mkdir(join(chatHome, 'config', 'skills'), { recursive: true })
|
||||
|
||||
await linkAntigravityUserSkills(chatHome, userHome)
|
||||
|
||||
const linked = join(chatHome, 'config', 'skills', 'orca-cli', 'SKILL.md')
|
||||
expect(await readFile(linked, 'utf8')).toBe('skill')
|
||||
// No ~/.gemini/antigravity-cli/skills, so nothing is linked there.
|
||||
await expect(readlink(join(chatHome, 'antigravity-cli', 'skills'))).rejects.toThrow()
|
||||
})
|
||||
|
||||
it('removes a link whose target is gone', async () => {
|
||||
const link = join(chatHome, 'antigravity-cli', 'skills')
|
||||
const target = join(userHome, '.gemini', 'antigravity-cli', 'skills')
|
||||
await mkdir(join(chatHome, 'antigravity-cli'), { recursive: true })
|
||||
await mkdir(target, { recursive: true })
|
||||
// Windows creates directory links without extra rights only as junctions, to a target that exists.
|
||||
await symlink(target, link, process.platform === 'win32' ? 'junction' : 'dir')
|
||||
await rm(target, { recursive: true })
|
||||
|
||||
await linkAntigravityUserSkills(chatHome, userHome)
|
||||
|
||||
await expect(readlink(link)).rejects.toThrow()
|
||||
})
|
||||
|
||||
it('lets one launch finish linking before another starts on the same chat home', async () => {
|
||||
const realRmdir = vi.mocked(rmdir).getMockImplementation()!
|
||||
await mkdir(join(chatHome, 'config', 'skills'), { recursive: true })
|
||||
let release!: () => void
|
||||
const held = new Promise<void>((resolve) => (release = resolve))
|
||||
let first!: () => void
|
||||
const firstRemoving = new Promise<void>((resolve) => (first = resolve))
|
||||
vi.mocked(rmdir).mockImplementationOnce(async (path) => {
|
||||
first()
|
||||
await held
|
||||
return realRmdir(path)
|
||||
})
|
||||
const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
|
||||
|
||||
const one = linkAntigravityUserSkills(chatHome, userHome)
|
||||
await firstRemoving
|
||||
const before = fsCalls.count
|
||||
const two = linkAntigravityUserSkills(chatHome, userHome)
|
||||
// A second launch that started at once would already have looked at the folder.
|
||||
expect(fsCalls.count).toBe(before)
|
||||
release()
|
||||
await Promise.all([one, two])
|
||||
|
||||
expect(warn).not.toHaveBeenCalled()
|
||||
const linked = join(chatHome, 'config', 'skills', 'orca-cli', 'SKILL.md')
|
||||
expect(await readFile(linked, 'utf8')).toBe('skill')
|
||||
warn.mockRestore()
|
||||
})
|
||||
@@ -0,0 +1,119 @@
|
||||
import { lstat, mkdir, readlink, rmdir, stat, symlink, unlink } from 'node:fs/promises'
|
||||
import { homedir } from 'node:os'
|
||||
import { dirname, join, resolve } from 'node:path'
|
||||
|
||||
// The server reads user-wide skills from these folders under GEMINI_HOME.
|
||||
const SKILL_FOLDERS = [
|
||||
['config', 'skills'],
|
||||
['antigravity-cli', 'skills']
|
||||
] as const
|
||||
|
||||
/** The home the server's Python `expanduser` resolves, where `~/.gemini` lives. */
|
||||
export function antigravityUserHome(
|
||||
env: Readonly<Record<string, string | undefined>>,
|
||||
platform: NodeJS.Platform = process.platform
|
||||
): string {
|
||||
if (platform === 'win32') {
|
||||
if (env.USERPROFILE) {
|
||||
return env.USERPROFILE
|
||||
}
|
||||
return env.HOMEDRIVE && env.HOMEPATH ? `${env.HOMEDRIVE}${env.HOMEPATH}` : homedir()
|
||||
}
|
||||
return env.HOME || homedir()
|
||||
}
|
||||
|
||||
// One chat home is linked by one launch at a time; another launch waits and then finds the links.
|
||||
const linking = new Map<string, Promise<void>>()
|
||||
|
||||
/** The chat's private GEMINI_HOME isolates its sign-in; link its skill folders to `~/.gemini`'s
|
||||
* so skills installed for Antigravity reach the chat. Never fails the launch. */
|
||||
export function linkAntigravityUserSkills(
|
||||
chatHome: string,
|
||||
userHome: string,
|
||||
platform: NodeJS.Platform = process.platform
|
||||
): Promise<void> {
|
||||
const run = (linking.get(chatHome) ?? Promise.resolve()).then(() =>
|
||||
linkSkillFolders(chatHome, userHome, platform)
|
||||
)
|
||||
linking.set(chatHome, run)
|
||||
void run.then(() => {
|
||||
if (linking.get(chatHome) === run) {
|
||||
linking.delete(chatHome)
|
||||
}
|
||||
})
|
||||
return run
|
||||
}
|
||||
|
||||
async function linkSkillFolders(
|
||||
chatHome: string,
|
||||
userHome: string,
|
||||
platform: NodeJS.Platform
|
||||
): Promise<void> {
|
||||
for (const segments of SKILL_FOLDERS) {
|
||||
const link = join(chatHome, ...segments)
|
||||
const target = join(userHome, '.gemini', ...segments)
|
||||
await linkSkillFolder(link, target, platform).catch((error: unknown) => {
|
||||
console.warn('[antigravity] user skills not linked into the chat home:', link, error)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
async function linkSkillFolder(
|
||||
link: string,
|
||||
target: string,
|
||||
platform: NodeJS.Platform
|
||||
): Promise<void> {
|
||||
const entry = await lstat(link).catch(ignoreMissing)
|
||||
// An unreadable target changes nothing; only a missing one removes the link.
|
||||
const targetExists = await stat(target).then(
|
||||
(found) => found.isDirectory(),
|
||||
(error: unknown) => ignoreMissing(error) ?? false
|
||||
)
|
||||
if (entry?.isSymbolicLink()) {
|
||||
if (targetExists && (await linksTo(link, target, platform))) {
|
||||
return
|
||||
}
|
||||
// The harness creates this folder itself, and its mkdir fails on a dangling link.
|
||||
await unlink(link)
|
||||
} else if (entry) {
|
||||
if (!targetExists || !entry.isDirectory()) {
|
||||
return
|
||||
}
|
||||
// An empty folder is the harness's placeholder; rmdir refuses one with content, which stays.
|
||||
await rmdir(link)
|
||||
}
|
||||
if (!targetExists) {
|
||||
return
|
||||
}
|
||||
await mkdir(dirname(link), { recursive: true, mode: 0o700 })
|
||||
await symlink(target, link, platform === 'win32' ? 'junction' : 'dir').catch(
|
||||
async (error: unknown) => {
|
||||
if (await linksTo(link, target, platform).catch(() => false)) {
|
||||
return
|
||||
}
|
||||
// A running chat's harness may have recreated its placeholder meanwhile.
|
||||
if ((await lstat(link)).isDirectory()) {
|
||||
await rmdir(link)
|
||||
await symlink(target, link, platform === 'win32' ? 'junction' : 'dir')
|
||||
return
|
||||
}
|
||||
throw error
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
async function linksTo(link: string, target: string, platform: NodeJS.Platform): Promise<boolean> {
|
||||
const linked = resolve(dirname(link), await readlink(link))
|
||||
return platform === 'win32' ? linked.toLowerCase() === target.toLowerCase() : linked === target
|
||||
}
|
||||
|
||||
function ignoreMissing(error: unknown): undefined {
|
||||
if (
|
||||
error instanceof Error &&
|
||||
'code' in error &&
|
||||
(error.code === 'ENOENT' || error.code === 'ENOTDIR')
|
||||
) {
|
||||
return undefined
|
||||
}
|
||||
throw error
|
||||
}
|
||||
@@ -6,7 +6,7 @@ import { DatabaseSync } from 'node:sqlite'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import type * as DetectionModule from '../browser/cookies/sources/browser-cookie-source-profiles'
|
||||
import type * as SnapshotModule from '../browser/cookies/chromium/chromium-cookie-snapshot'
|
||||
import type { EncryptionKeyResult } from '../browser/cookies/sources/browser-cookie-sqlite'
|
||||
import type { EncryptionKeyResult } from '../browser/cookies/sources/chromium-encryption-key-contract'
|
||||
|
||||
type FixtureState = {
|
||||
root: string
|
||||
|
||||
@@ -12,7 +12,7 @@ import {
|
||||
type ChromiumBrowserDef
|
||||
} from '../browser/cookies/sources/browser-cookie-source-profiles'
|
||||
import { getEncryptionKey } from '../browser/cookies/sources/browser-cookie-key'
|
||||
import type { EncryptionKeyResult } from '../browser/cookies/sources/browser-cookie-sqlite'
|
||||
import type { EncryptionKeyResult } from '../browser/cookies/sources/chromium-encryption-key-contract'
|
||||
import { createChromiumCookieSnapshot } from '../browser/cookies/chromium/chromium-cookie-snapshot'
|
||||
import type { BrowserPasswordImportRow } from './browser-password-import-merge'
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ vi.mock('electron', () => ({
|
||||
on: (channel: string, handler: (...args: unknown[]) => void) => handlers.set(channel, handler)
|
||||
}
|
||||
}))
|
||||
vi.mock('../browser/browser-manager', () => ({
|
||||
vi.mock('../browser/guest-lifecycle/manager/browser-manager', () => ({
|
||||
browserManager: {
|
||||
getRendererContextForGuest: () => ({ browserPageId: 'page', renderer }),
|
||||
getGuestWebContentsId: () => 411
|
||||
|
||||
@@ -16,7 +16,7 @@ import {
|
||||
type BrowserPasswordGuestFieldFocused,
|
||||
type BrowserPasswordSuggestion
|
||||
} from '../../shared/browser-passwords-types'
|
||||
import { browserManager } from '../browser/browser-manager'
|
||||
import { browserManager } from '../browser/guest-lifecycle/manager/browser-manager'
|
||||
import { BrowserPasswordLoginTracker } from './browser-password-login-tracker'
|
||||
import { toBrowserPasswordOrigin } from './browser-password-origin'
|
||||
import {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { WebContents } from 'electron'
|
||||
import type { BrowserPasswordFieldFocusEvent } from '../../shared/browser-passwords-types'
|
||||
import { isAgentInjectingInput } from '../browser/cdp/input/agent-input-injection'
|
||||
import { browserManager } from '../browser/browser-manager'
|
||||
import { browserManager } from '../browser/guest-lifecycle/manager/browser-manager'
|
||||
import { browserPasswordVaultForGuest as vaultForGuest } from './browser-password-vault-access'
|
||||
import { BROWSER_PASSWORDS_RENDERER_EVENTS } from './browser-password-save-prompts'
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import type { BrowserPasswordGuestCapture } from '../../shared/browser-passwords
|
||||
import { BrowserPasswordStore } from './browser-password-store'
|
||||
|
||||
const send = vi.fn()
|
||||
vi.mock('../browser/browser-manager', () => ({
|
||||
vi.mock('../browser/guest-lifecycle/manager/browser-manager', () => ({
|
||||
browserManager: {
|
||||
getRendererContextForGuest: () => ({
|
||||
browserPageId: 'page-1',
|
||||
|
||||
@@ -3,7 +3,7 @@ import type {
|
||||
BrowserPasswordSavePrompt,
|
||||
BrowserPasswordSavePromptResponse
|
||||
} from '../../shared/browser-passwords-types'
|
||||
import { browserManager } from '../browser/browser-manager'
|
||||
import { browserManager } from '../browser/guest-lifecycle/manager/browser-manager'
|
||||
import type { BrowserPasswordSucceededLogin } from './browser-password-login-tracker'
|
||||
import { decideBrowserPasswordSave } from './browser-password-save-decision'
|
||||
import type { BrowserPasswordStore } from './browser-password-store'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { session, type Session, type WebContents } from 'electron'
|
||||
import { browserSessionRegistry } from '../browser/sessions/browser-session-registry'
|
||||
import { browserSessionRegistry } from '../browser/sessions/profiles/browser-session-registry'
|
||||
import { localSshBrowserProfileIdForSession } from '../browser/routing/local-host-partitions/local-ssh-browser-partitions'
|
||||
import type { BrowserPasswordStore } from './browser-password-store'
|
||||
import { getBrowserPasswordVault } from './browser-password-vaults'
|
||||
|
||||
@@ -1,190 +0,0 @@
|
||||
import { app } from 'electron'
|
||||
import { existsSync } from 'node:fs'
|
||||
import { join } from 'node:path'
|
||||
import { platform, arch } from 'node:os'
|
||||
import type { WebContents } from 'electron'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from './agent-browser-orphan-sweep'
|
||||
import { EMBEDDED_NAVIGATION_TIMEOUT_MS } from './agent-browser-bridge-types'
|
||||
import { ensureDependencyBinaryExecutable } from './agent-browser-dependency-binary'
|
||||
import { isAgentBrowserStaleRefError } from './agent-browser-batch-command'
|
||||
|
||||
export function agentBrowserNativeName(): string {
|
||||
const ext = process.platform === 'win32' ? '.exe' : ''
|
||||
return `agent-browser-${platform()}-${arch()}${ext}`
|
||||
}
|
||||
|
||||
export function resolveAgentBrowserBinary(): string {
|
||||
// resourcesPath preserves the case-sensitive macOS Resources path.
|
||||
const bundledResourcesPath =
|
||||
process.resourcesPath ??
|
||||
(process.platform === 'darwin'
|
||||
? join(app.getPath('exe'), '..', '..', 'Resources')
|
||||
: join(app.getPath('exe'), '..', 'resources'))
|
||||
const bundled = join(bundledResourcesPath, agentBrowserNativeName())
|
||||
if (existsSync(bundled)) {
|
||||
return bundled
|
||||
}
|
||||
|
||||
// Bundling makes __dirname unreliable for locating development dependencies.
|
||||
const nmBin = join(
|
||||
app.getAppPath(),
|
||||
'node_modules',
|
||||
'agent-browser',
|
||||
'bin',
|
||||
agentBrowserNativeName()
|
||||
)
|
||||
if (existsSync(nmBin)) {
|
||||
ensureDependencyBinaryExecutable(nmBin)
|
||||
return nmBin
|
||||
}
|
||||
|
||||
return 'agent-browser'
|
||||
}
|
||||
|
||||
export function parseShellArgs(input: string): string[] {
|
||||
const args: string[] = []
|
||||
let current = ''
|
||||
let inDouble = false
|
||||
let inSingle = false
|
||||
|
||||
for (let i = 0; i < input.length; i++) {
|
||||
const ch = input[i]
|
||||
if (ch === '"' && !inSingle) {
|
||||
inDouble = !inDouble
|
||||
} else if (ch === "'" && !inDouble) {
|
||||
inSingle = !inSingle
|
||||
} else if (ch === ' ' && !inDouble && !inSingle) {
|
||||
if (current) {
|
||||
args.push(current)
|
||||
current = ''
|
||||
}
|
||||
} else {
|
||||
current += ch
|
||||
}
|
||||
}
|
||||
if (current) {
|
||||
args.push(current)
|
||||
}
|
||||
return args
|
||||
}
|
||||
|
||||
export function stripAgentBrowserTargetArgs(args: string[]): string[] {
|
||||
const stripped: string[] = []
|
||||
for (let index = 0; index < args.length; index++) {
|
||||
const arg = args[index]
|
||||
if (arg === '--cdp' || arg === '--session') {
|
||||
index++
|
||||
continue
|
||||
}
|
||||
if (arg.startsWith('--cdp=') || arg.startsWith('--session=')) {
|
||||
continue
|
||||
}
|
||||
stripped.push(arg)
|
||||
}
|
||||
return stripped
|
||||
}
|
||||
|
||||
// Stale refs need a distinct code so agents can retry with a fresh snapshot.
|
||||
export function classifyErrorCode(message: string): string {
|
||||
if (isAgentBrowserStaleRefError(message)) {
|
||||
return 'browser_stale_ref'
|
||||
}
|
||||
return 'browser_error'
|
||||
}
|
||||
|
||||
export function isAbortedNavigationError(error: unknown): boolean {
|
||||
if (!error || typeof error !== 'object') {
|
||||
return false
|
||||
}
|
||||
const { code, errno } = error as { code?: unknown; errno?: unknown }
|
||||
return code === 'ERR_ABORTED' || errno === -3
|
||||
}
|
||||
|
||||
export function isWebContentsLoading(wc: WebContents): boolean {
|
||||
try {
|
||||
return wc.isLoading()
|
||||
} catch {
|
||||
// The caller rechecks authoritative page registration after waiting.
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
export function isLoadingMainFrame(wc: WebContents): boolean {
|
||||
try {
|
||||
return wc.isLoadingMainFrame()
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
export function waitForAbortedNavigationReplacement(
|
||||
wc: WebContents,
|
||||
browserPageId: string,
|
||||
timeoutMs: number
|
||||
): Promise<void> {
|
||||
if (!isWebContentsLoading(wc)) {
|
||||
return Promise.resolve()
|
||||
}
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
let settled = false
|
||||
let timeout: ReturnType<typeof setTimeout> | null = null
|
||||
const finish = (error?: BrowserError): void => {
|
||||
if (settled) {
|
||||
return
|
||||
}
|
||||
settled = true
|
||||
wc.removeListener('did-stop-loading', onDidStopLoading)
|
||||
wc.removeListener('destroyed', onDestroyed)
|
||||
if (timeout) {
|
||||
clearTimeout(timeout)
|
||||
}
|
||||
if (error) {
|
||||
reject(error)
|
||||
} else {
|
||||
resolve()
|
||||
}
|
||||
}
|
||||
const onDidStopLoading = (): void => finish()
|
||||
const onDestroyed = (): void => finish()
|
||||
|
||||
wc.on('did-stop-loading', onDidStopLoading)
|
||||
wc.on('destroyed', onDestroyed)
|
||||
timeout = setTimeout(
|
||||
() =>
|
||||
finish(
|
||||
new BrowserError(
|
||||
'browser_error',
|
||||
`Failed to navigate browser page ${browserPageId}: Browser navigation timed out after ${EMBEDDED_NAVIGATION_TIMEOUT_MS}ms`
|
||||
)
|
||||
),
|
||||
timeoutMs
|
||||
)
|
||||
timeout.unref?.()
|
||||
|
||||
// Loading may finish between loadURL rejection and listener attachment.
|
||||
if (!isWebContentsLoading(wc)) {
|
||||
finish()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
export function isTabClosedTransportError(message: string): boolean {
|
||||
return /session destroyed while command|session destroyed while commands|connection refused|cdp discovery methods failed|websocket connect failed/i.test(
|
||||
message
|
||||
)
|
||||
}
|
||||
|
||||
/** agent-browser's handshake error when Orca's CDP proxy refuses its endpoint (wrong or missing token). */
|
||||
export function isCdpProxyRejectedError(message: string): boolean {
|
||||
return /websocket connect failed\b.*\b40[34]\b/i.test(message)
|
||||
}
|
||||
|
||||
export function pageUnavailableMessageForSession(sessionName: string): string {
|
||||
const prefix = ORCA_TAB_SESSION_PREFIX
|
||||
const browserPageId = sessionName.startsWith(prefix) ? sessionName.slice(prefix.length) : null
|
||||
return browserPageId
|
||||
? `Browser page ${browserPageId} is no longer available`
|
||||
: 'Browser tab is no longer available'
|
||||
}
|
||||
@@ -1,307 +0,0 @@
|
||||
import type {
|
||||
BrowserCookieGetResult,
|
||||
BrowserCookieSetResult,
|
||||
BrowserCookieDeleteResult,
|
||||
BrowserCookie,
|
||||
BrowserViewportResult,
|
||||
BrowserGeolocationResult,
|
||||
BrowserInterceptEnableResult,
|
||||
BrowserInterceptDisableResult,
|
||||
BrowserCaptureStartResult,
|
||||
BrowserCaptureStopResult,
|
||||
BrowserConsoleResult,
|
||||
BrowserNetworkLogResult
|
||||
} from '../../../shared/runtime-browser-contracts'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { parseShellArgs, stripAgentBrowserTargetArgs } from './agent-browser-bridge-process'
|
||||
import { AgentBrowserBridgeInteractionCommands } from './agent-browser-bridge-interaction-commands'
|
||||
import { sendGuestCdpCommand } from '../cdp/debugger/guest-cdp-command'
|
||||
import {
|
||||
toBrowserConsoleResult,
|
||||
toBrowserNetworkLogResult,
|
||||
type AgentBrowserConsoleOutput,
|
||||
type AgentBrowserNetworkOutput
|
||||
} from './agent-browser-log-entries'
|
||||
import { touchEmulationParams } from '../cdp/input/guest-touch-emulation'
|
||||
|
||||
export abstract class AgentBrowserBridgeStateCommands extends AgentBrowserBridgeInteractionCommands {
|
||||
async cookieGet(
|
||||
_url?: string,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserCookieGetResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
return (await this.execAgentBrowser(sessionName, [
|
||||
'cookies',
|
||||
'get'
|
||||
])) as BrowserCookieGetResult
|
||||
})
|
||||
}
|
||||
|
||||
async cookieSet(
|
||||
cookie: Partial<BrowserCookie>,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserCookieSetResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const args = ['cookies', 'set', cookie.name ?? '', cookie.value ?? '']
|
||||
if (cookie.domain) {
|
||||
args.push('--domain', cookie.domain)
|
||||
}
|
||||
if (cookie.path) {
|
||||
args.push('--path', cookie.path)
|
||||
}
|
||||
if (cookie.secure) {
|
||||
args.push('--secure')
|
||||
}
|
||||
if (cookie.httpOnly) {
|
||||
args.push('--httpOnly')
|
||||
}
|
||||
if (cookie.sameSite) {
|
||||
args.push('--sameSite', cookie.sameSite)
|
||||
}
|
||||
if (cookie.expires != null) {
|
||||
args.push('--expires', String(cookie.expires))
|
||||
}
|
||||
return (await this.execAgentBrowser(sessionName, args)) as BrowserCookieSetResult
|
||||
})
|
||||
}
|
||||
|
||||
async cookieDelete(
|
||||
name?: string,
|
||||
domain?: string,
|
||||
_url?: string,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserCookieDeleteResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const args = ['cookies', 'clear']
|
||||
if (name) {
|
||||
args.push('--name', name)
|
||||
}
|
||||
if (domain) {
|
||||
args.push('--domain', domain)
|
||||
}
|
||||
return (await this.execAgentBrowser(sessionName, args)) as BrowserCookieDeleteResult
|
||||
})
|
||||
}
|
||||
|
||||
async setViewport(
|
||||
width: number,
|
||||
height: number,
|
||||
scale = 1,
|
||||
mobile = false,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserViewportResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (_sessionName, target) => {
|
||||
const wc = this.getWebContents(target.webContentsId)
|
||||
if (!wc) {
|
||||
throw new BrowserError('browser_tab_not_found', 'Tab is no longer available')
|
||||
}
|
||||
const dbg = wc.debugger
|
||||
if (!dbg.isAttached()) {
|
||||
throw new BrowserError('browser_error', 'Debugger not attached')
|
||||
}
|
||||
|
||||
// agent-browser lacks a mobile viewport flag; apply Orca's emulation through CDP.
|
||||
await sendGuestCdpCommand(wc, 'Emulation.setDeviceMetricsOverride', {
|
||||
width,
|
||||
height,
|
||||
deviceScaleFactor: scale,
|
||||
mobile
|
||||
})
|
||||
await sendGuestCdpCommand(
|
||||
wc,
|
||||
'Emulation.setTouchEmulationEnabled',
|
||||
touchEmulationParams(mobile)
|
||||
)
|
||||
// Metrics-only resize can leave the compositor at its old size and crop remote screencasts.
|
||||
await sendGuestCdpCommand(wc, 'Emulation.setVisibleSize', { width, height }).catch(() => {})
|
||||
this.browserManager.showAgentViewportInPane(target.webContentsId, {
|
||||
width,
|
||||
height,
|
||||
deviceScaleFactor: scale,
|
||||
mobile
|
||||
})
|
||||
|
||||
return {
|
||||
width,
|
||||
height,
|
||||
deviceScaleFactor: scale,
|
||||
mobile
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
async setGeolocation(
|
||||
lat: number,
|
||||
lon: number,
|
||||
_accuracy?: number,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserGeolocationResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
return (await this.execAgentBrowser(sessionName, [
|
||||
'set',
|
||||
'geo',
|
||||
String(lat),
|
||||
String(lon)
|
||||
])) as BrowserGeolocationResult
|
||||
})
|
||||
}
|
||||
|
||||
async interceptEnable(
|
||||
patterns?: string[],
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserInterceptEnableResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const urlPattern = patterns?.[0] ?? '**/*'
|
||||
const args = ['network', 'route', urlPattern]
|
||||
const result = (await this.execAgentBrowser(
|
||||
sessionName,
|
||||
args
|
||||
)) as BrowserInterceptEnableResult
|
||||
const session = this.sessions.get(sessionName)
|
||||
if (session) {
|
||||
this.pendingInterceptRestore.delete(sessionName)
|
||||
session.activeInterceptPatterns = patterns ?? ['*']
|
||||
}
|
||||
return result
|
||||
})
|
||||
}
|
||||
|
||||
async interceptDisable(
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserInterceptDisableResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const result = (await this.execAgentBrowser(sessionName, [
|
||||
'network',
|
||||
'unroute'
|
||||
])) as BrowserInterceptDisableResult
|
||||
const session = this.sessions.get(sessionName)
|
||||
if (session) {
|
||||
this.pendingInterceptRestore.delete(sessionName)
|
||||
session.activeInterceptPatterns = []
|
||||
}
|
||||
return result
|
||||
})
|
||||
}
|
||||
|
||||
async interceptList(
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<{ requests: unknown[] }> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
return (await this.execAgentBrowser(sessionName, ['network', 'requests'])) as {
|
||||
requests: unknown[]
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// TODO: Per-request continue/block requires agent-browser support.
|
||||
|
||||
async captureStart(
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserCaptureStartResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const result = (await this.execAgentBrowser(sessionName, [
|
||||
'network',
|
||||
'har',
|
||||
'start'
|
||||
])) as BrowserCaptureStartResult
|
||||
const session = this.sessions.get(sessionName)
|
||||
if (session) {
|
||||
session.activeCapture = true
|
||||
}
|
||||
return result
|
||||
})
|
||||
}
|
||||
|
||||
async captureStop(
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserCaptureStopResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const result = (await this.execAgentBrowser(sessionName, [
|
||||
'network',
|
||||
'har',
|
||||
'stop'
|
||||
])) as BrowserCaptureStopResult
|
||||
const session = this.sessions.get(sessionName)
|
||||
if (session) {
|
||||
session.activeCapture = false
|
||||
}
|
||||
return result
|
||||
})
|
||||
}
|
||||
|
||||
async consoleLog(
|
||||
limit?: number,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserConsoleResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: agent-browser's `console --json` data has this shape.
|
||||
const output = (await this.execAgentBrowser(sessionName, [
|
||||
'console'
|
||||
])) as AgentBrowserConsoleOutput
|
||||
return toBrowserConsoleResult(output, limit)
|
||||
})
|
||||
}
|
||||
|
||||
async networkLog(
|
||||
limit?: number,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserNetworkLogResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: agent-browser's `network requests --json` data has this shape.
|
||||
const output = (await this.execAgentBrowser(sessionName, [
|
||||
'network',
|
||||
'requests'
|
||||
])) as AgentBrowserNetworkOutput
|
||||
return toBrowserNetworkLogResult(output, limit)
|
||||
})
|
||||
}
|
||||
|
||||
async exec(command: string, worktreeId?: string, browserPageId?: string): Promise<unknown> {
|
||||
// Passthrough arguments must not override Orca's selected page or CDP proxy.
|
||||
const args = stripAgentBrowserTargetArgs(parseShellArgs(command.trim()))
|
||||
return this.enqueueTargetedCommand(
|
||||
worktreeId,
|
||||
browserPageId,
|
||||
async (sessionName) => await this.execAgentBrowser(sessionName, args, { cliArgv: true }),
|
||||
{ elements: passthroughElementArgs(args) }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Commands whose first operand is an element, where agent-browser reads a bare `e2` as a ref.
|
||||
const ELEMENT_FIRST_COMMANDS = new Set([
|
||||
'click',
|
||||
'dblclick',
|
||||
'hover',
|
||||
'focus',
|
||||
'check',
|
||||
'uncheck',
|
||||
'fill',
|
||||
'type',
|
||||
'select',
|
||||
'scrollintoview',
|
||||
'upload',
|
||||
'highlight',
|
||||
'download',
|
||||
'drag'
|
||||
])
|
||||
|
||||
// Free text such as `keyboard type e2` is not a ref; explicit `@e2`/`ref=e2` are refs anywhere.
|
||||
function passthroughElementArgs([command, ...operands]: string[]): string[] {
|
||||
const explicit = operands.filter((arg) => arg.startsWith('@') || arg.startsWith('ref='))
|
||||
return command && ELEMENT_FIRST_COMMANDS.has(command) && operands[0]
|
||||
? [operands[0], ...explicit]
|
||||
: explicit
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
import type { ChildProcess } from 'node:child_process'
|
||||
import type { CdpWsProxy } from '../cdp/transport/cdp-ws-proxy'
|
||||
import type { BrowserError } from '../browser-error'
|
||||
|
||||
// Exceed agent-browser's internal navigation (30s) and default wait (25s) timeouts.
|
||||
export const EXEC_TIMEOUT_MS = 90_000
|
||||
export const CONSECUTIVE_TIMEOUT_LIMIT = 3
|
||||
export const STALE_SESSION_CLOSE_TIMEOUT_MS = 3_000
|
||||
export const AGENT_BROWSER_EXIT_DRAIN_MS = 500
|
||||
// Cleanup must finish within the 20s quit barrier.
|
||||
export const AGENT_BROWSER_CLEANUP_TIMEOUT_MS = 5_000
|
||||
export const AGENT_BROWSER_CLEANUP_CONCURRENCY = 4
|
||||
export const EMBEDDED_NAVIGATION_TIMEOUT_MS = 30_000
|
||||
export const AGENT_DOWNLOAD_START_TIMEOUT_MS = 10_000
|
||||
// Counted from the request, so the reply beats the CLI's 60s timeout; the download keeps going after.
|
||||
export const AGENT_DOWNLOAD_REPLY_DEADLINE_MS = 50_000
|
||||
export const AGENT_BROWSER_TEXT_ARGUMENT_MAX_BYTES = 8 * 1024
|
||||
export const AGENT_BROWSER_CLIPBOARD_WRITE_MAX_BYTES = AGENT_BROWSER_TEXT_ARGUMENT_MAX_BYTES
|
||||
|
||||
export type SessionState = {
|
||||
proxy: CdpWsProxy
|
||||
cdpEndpoint: string
|
||||
initialized: boolean
|
||||
consecutiveTimeouts: number
|
||||
// Restore these routes after a session restart.
|
||||
activeInterceptPatterns: string[]
|
||||
activeCapture: boolean
|
||||
// Detect idle daemon retirement from the gap between commands.
|
||||
lastCommandAt: number
|
||||
// Revalidate after queue delay, when the tab may have disappeared.
|
||||
webContentsId: number
|
||||
activeProcess: ChildProcess | null
|
||||
// agent-browser keeps the `snapshot --delta` baseline in this session's daemon.
|
||||
hasDeltaBaseline?: boolean
|
||||
}
|
||||
|
||||
export type QueuedCommand = {
|
||||
execute: () => Promise<unknown>
|
||||
resolve: (value: unknown) => void
|
||||
reject: (reason: unknown) => void
|
||||
}
|
||||
|
||||
export type ResolvedBrowserCommandTarget = {
|
||||
browserPageId: string
|
||||
webContentsId: number
|
||||
}
|
||||
|
||||
export type AgentBrowserCleanupOptions = {
|
||||
closeTimeoutMs?: number
|
||||
/** Preserve queued commands for the replacement session. */
|
||||
keepQueuedCommands?: boolean
|
||||
}
|
||||
|
||||
export type AgentBrowserExecOptions = {
|
||||
envOverrides?: NodeJS.ProcessEnv
|
||||
timeoutMs?: number
|
||||
timeoutError?: BrowserError
|
||||
/** The caller owns stdin, so the command goes as argv; only for Orca-authored tokens. */
|
||||
stdinText?: string
|
||||
/** Send tokens as argv so global options apply; only for Orca-authored or raw CLI tokens. */
|
||||
cliArgv?: boolean
|
||||
}
|
||||
|
||||
export type EnqueueTargetedCommandOptions = {
|
||||
ensureSession?: boolean
|
||||
/** Page actions report what they caused when an agent runs them. */
|
||||
reportEffects?: boolean
|
||||
// Text mutations must not fall back to a global tab from another worktree.
|
||||
requireScopedTarget?: boolean
|
||||
// Element arguments that may be snapshot refs.
|
||||
elements?: readonly (string | undefined)[]
|
||||
}
|
||||
|
||||
export type AgentBrowserBridgeOptions = {
|
||||
onTabsChanged?: (worktreeId?: string) => void
|
||||
}
|
||||
@@ -1,3 +1,310 @@
|
||||
import { AgentBrowserBridgeStateCommands } from './agent-browser-bridge-state-commands'
|
||||
import type {
|
||||
BrowserCookieGetResult,
|
||||
BrowserCookieSetResult,
|
||||
BrowserCookieDeleteResult,
|
||||
BrowserCookie,
|
||||
BrowserViewportResult,
|
||||
BrowserGeolocationResult,
|
||||
BrowserInterceptEnableResult,
|
||||
BrowserInterceptDisableResult,
|
||||
BrowserCaptureStartResult,
|
||||
BrowserCaptureStopResult,
|
||||
BrowserConsoleResult,
|
||||
BrowserNetworkLogResult
|
||||
} from '../../../shared/runtime-browser-contracts'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import {
|
||||
parseShellArgs,
|
||||
stripAgentBrowserTargetArgs
|
||||
} from './protocol/agent-browser-passthrough-arguments'
|
||||
import { AgentBrowserBridgeInteractionCommands } from './commands/agent-browser-bridge-interaction-commands'
|
||||
import { sendGuestCdpCommand } from '../cdp/debugger/guest-cdp-command'
|
||||
import {
|
||||
toBrowserConsoleResult,
|
||||
toBrowserNetworkLogResult,
|
||||
type AgentBrowserConsoleOutput,
|
||||
type AgentBrowserNetworkOutput
|
||||
} from './observation/agent-browser-log-entries'
|
||||
import { touchEmulationParams } from '../cdp/input/guest-touch-emulation'
|
||||
|
||||
export class AgentBrowserBridge extends AgentBrowserBridgeStateCommands {}
|
||||
export class AgentBrowserBridge extends AgentBrowserBridgeInteractionCommands {
|
||||
async cookieGet(
|
||||
_url?: string,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserCookieGetResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
return (await this.execAgentBrowser(sessionName, [
|
||||
'cookies',
|
||||
'get'
|
||||
])) as BrowserCookieGetResult
|
||||
})
|
||||
}
|
||||
|
||||
async cookieSet(
|
||||
cookie: Partial<BrowserCookie>,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserCookieSetResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const args = ['cookies', 'set', cookie.name ?? '', cookie.value ?? '']
|
||||
if (cookie.domain) {
|
||||
args.push('--domain', cookie.domain)
|
||||
}
|
||||
if (cookie.path) {
|
||||
args.push('--path', cookie.path)
|
||||
}
|
||||
if (cookie.secure) {
|
||||
args.push('--secure')
|
||||
}
|
||||
if (cookie.httpOnly) {
|
||||
args.push('--httpOnly')
|
||||
}
|
||||
if (cookie.sameSite) {
|
||||
args.push('--sameSite', cookie.sameSite)
|
||||
}
|
||||
if (cookie.expires != null) {
|
||||
args.push('--expires', String(cookie.expires))
|
||||
}
|
||||
return (await this.execAgentBrowser(sessionName, args)) as BrowserCookieSetResult
|
||||
})
|
||||
}
|
||||
|
||||
async cookieDelete(
|
||||
name?: string,
|
||||
domain?: string,
|
||||
_url?: string,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserCookieDeleteResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const args = ['cookies', 'clear']
|
||||
if (name) {
|
||||
args.push('--name', name)
|
||||
}
|
||||
if (domain) {
|
||||
args.push('--domain', domain)
|
||||
}
|
||||
return (await this.execAgentBrowser(sessionName, args)) as BrowserCookieDeleteResult
|
||||
})
|
||||
}
|
||||
|
||||
async setViewport(
|
||||
width: number,
|
||||
height: number,
|
||||
scale = 1,
|
||||
mobile = false,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserViewportResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (_sessionName, target) => {
|
||||
const wc = this.getWebContents(target.webContentsId)
|
||||
if (!wc) {
|
||||
throw new BrowserError('browser_tab_not_found', 'Tab is no longer available')
|
||||
}
|
||||
const dbg = wc.debugger
|
||||
if (!dbg.isAttached()) {
|
||||
throw new BrowserError('browser_error', 'Debugger not attached')
|
||||
}
|
||||
|
||||
// agent-browser lacks a mobile viewport flag; apply Orca's emulation through CDP.
|
||||
await sendGuestCdpCommand(wc, 'Emulation.setDeviceMetricsOverride', {
|
||||
width,
|
||||
height,
|
||||
deviceScaleFactor: scale,
|
||||
mobile
|
||||
})
|
||||
await sendGuestCdpCommand(
|
||||
wc,
|
||||
'Emulation.setTouchEmulationEnabled',
|
||||
touchEmulationParams(mobile)
|
||||
)
|
||||
// Metrics-only resize can leave the compositor at its old size and crop remote screencasts.
|
||||
await sendGuestCdpCommand(wc, 'Emulation.setVisibleSize', { width, height }).catch(() => {})
|
||||
this.browserManager.showAgentViewportInPane(target.webContentsId, {
|
||||
width,
|
||||
height,
|
||||
deviceScaleFactor: scale,
|
||||
mobile
|
||||
})
|
||||
|
||||
return {
|
||||
width,
|
||||
height,
|
||||
deviceScaleFactor: scale,
|
||||
mobile
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
async setGeolocation(
|
||||
lat: number,
|
||||
lon: number,
|
||||
_accuracy?: number,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserGeolocationResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
return (await this.execAgentBrowser(sessionName, [
|
||||
'set',
|
||||
'geo',
|
||||
String(lat),
|
||||
String(lon)
|
||||
])) as BrowserGeolocationResult
|
||||
})
|
||||
}
|
||||
|
||||
async interceptEnable(
|
||||
patterns?: string[],
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserInterceptEnableResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const urlPattern = patterns?.[0] ?? '**/*'
|
||||
const args = ['network', 'route', urlPattern]
|
||||
const result = (await this.execAgentBrowser(
|
||||
sessionName,
|
||||
args
|
||||
)) as BrowserInterceptEnableResult
|
||||
const session = this.sessions.get(sessionName)
|
||||
if (session) {
|
||||
this.pendingInterceptRestore.delete(sessionName)
|
||||
session.activeInterceptPatterns = patterns ?? ['*']
|
||||
}
|
||||
return result
|
||||
})
|
||||
}
|
||||
|
||||
async interceptDisable(
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserInterceptDisableResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const result = (await this.execAgentBrowser(sessionName, [
|
||||
'network',
|
||||
'unroute'
|
||||
])) as BrowserInterceptDisableResult
|
||||
const session = this.sessions.get(sessionName)
|
||||
if (session) {
|
||||
this.pendingInterceptRestore.delete(sessionName)
|
||||
session.activeInterceptPatterns = []
|
||||
}
|
||||
return result
|
||||
})
|
||||
}
|
||||
|
||||
async interceptList(
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<{ requests: unknown[] }> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
return (await this.execAgentBrowser(sessionName, ['network', 'requests'])) as {
|
||||
requests: unknown[]
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// TODO: Per-request continue/block requires agent-browser support.
|
||||
|
||||
async captureStart(
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserCaptureStartResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const result = (await this.execAgentBrowser(sessionName, [
|
||||
'network',
|
||||
'har',
|
||||
'start'
|
||||
])) as BrowserCaptureStartResult
|
||||
const session = this.sessions.get(sessionName)
|
||||
if (session) {
|
||||
session.activeCapture = true
|
||||
}
|
||||
return result
|
||||
})
|
||||
}
|
||||
|
||||
async captureStop(
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserCaptureStopResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
const result = (await this.execAgentBrowser(sessionName, [
|
||||
'network',
|
||||
'har',
|
||||
'stop'
|
||||
])) as BrowserCaptureStopResult
|
||||
const session = this.sessions.get(sessionName)
|
||||
if (session) {
|
||||
session.activeCapture = false
|
||||
}
|
||||
return result
|
||||
})
|
||||
}
|
||||
|
||||
async consoleLog(
|
||||
limit?: number,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserConsoleResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: agent-browser's `console --json` data has this shape.
|
||||
const output = (await this.execAgentBrowser(sessionName, [
|
||||
'console'
|
||||
])) as AgentBrowserConsoleOutput
|
||||
return toBrowserConsoleResult(output, limit)
|
||||
})
|
||||
}
|
||||
|
||||
async networkLog(
|
||||
limit?: number,
|
||||
worktreeId?: string,
|
||||
browserPageId?: string
|
||||
): Promise<BrowserNetworkLogResult> {
|
||||
return this.enqueueTargetedCommand(worktreeId, browserPageId, async (sessionName) => {
|
||||
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: agent-browser's `network requests --json` data has this shape.
|
||||
const output = (await this.execAgentBrowser(sessionName, [
|
||||
'network',
|
||||
'requests'
|
||||
])) as AgentBrowserNetworkOutput
|
||||
return toBrowserNetworkLogResult(output, limit)
|
||||
})
|
||||
}
|
||||
|
||||
async exec(command: string, worktreeId?: string, browserPageId?: string): Promise<unknown> {
|
||||
// Passthrough arguments must not override Orca's selected page or CDP proxy.
|
||||
const args = stripAgentBrowserTargetArgs(parseShellArgs(command.trim()))
|
||||
return this.enqueueTargetedCommand(
|
||||
worktreeId,
|
||||
browserPageId,
|
||||
async (sessionName) => await this.execAgentBrowser(sessionName, args, { cliArgv: true }),
|
||||
{ elements: passthroughElementArgs(args) }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Commands whose first operand is an element, where agent-browser reads a bare `e2` as a ref.
|
||||
const ELEMENT_FIRST_COMMANDS = new Set([
|
||||
'click',
|
||||
'dblclick',
|
||||
'hover',
|
||||
'focus',
|
||||
'check',
|
||||
'uncheck',
|
||||
'fill',
|
||||
'type',
|
||||
'select',
|
||||
'scrollintoview',
|
||||
'upload',
|
||||
'highlight',
|
||||
'download',
|
||||
'drag'
|
||||
])
|
||||
|
||||
// Free text such as `keyboard type e2` is not a ref; explicit `@e2`/`ref=e2` are refs anywhere.
|
||||
function passthroughElementArgs([command, ...operands]: string[]): string[] {
|
||||
const explicit = operands.filter((arg) => arg.startsWith('@') || arg.startsWith('ref='))
|
||||
return command && ELEMENT_FIRST_COMMANDS.has(command) && operands[0]
|
||||
? [operands[0], ...explicit]
|
||||
: explicit
|
||||
}
|
||||
|
||||
+5
-5
@@ -1,8 +1,8 @@
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { AgentBrowserBridgeShutdown } from './agent-browser-bridge-shutdown'
|
||||
import type { ResolvedBrowserCommandTarget } from './agent-browser-bridge-types'
|
||||
import { assertRemoteCliPageAccess } from '../routing/input-ownership/remote-cli-page-admission'
|
||||
import type { ActionEffectsHost } from './agent-browser-action-effects'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import { AgentBrowserBridgeShutdown } from '../session-lifecycle/agent-browser-bridge-shutdown'
|
||||
import type { ResolvedBrowserCommandTarget } from '../session-routing/agent-browser-command-target'
|
||||
import { assertRemoteCliPageAccess } from '../../routing/input-ownership/remote-cli-page-admission'
|
||||
import type { ActionEffectsHost } from '../observation/agent-browser-action-effects'
|
||||
|
||||
const EFFECTS_SNAPSHOT_TIMEOUT_MS = 5_000
|
||||
|
||||
+16
-14
@@ -1,4 +1,19 @@
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { runInRemoteCliBrowserScope } from '../../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { runWithRequestedPageUrl } from '../../cdp/input/browser-expected-page-url'
|
||||
import { AgentBrowserBridge } from '../agent-browser-bridge'
|
||||
import {
|
||||
answerAgentBrowserCommands,
|
||||
mockBrowserManager,
|
||||
mockWebContents,
|
||||
overrideBridgeWebContentsLookup,
|
||||
resetAgentBrowserBridgeMocks
|
||||
} from '../testing/agent-browser-bridge-test-harness'
|
||||
import type {
|
||||
ExecFileCallback,
|
||||
MockWebContents
|
||||
} from '../testing/agent-browser-bridge-test-harness'
|
||||
import type { BrowserManager } from '../../guest-lifecycle/manager/browser-manager'
|
||||
|
||||
const { execFileMock, webContentsFromIdMock, existsSyncMock, readFileSyncMock, stdinWrites } =
|
||||
vi.hoisted(() => ({
|
||||
@@ -35,20 +50,7 @@ const { CdpWsProxyMock } = vi.hoisted(() => {
|
||||
})
|
||||
return { CdpWsProxyMock: Object.assign(MockClass, { instances }) }
|
||||
})
|
||||
vi.mock('../cdp/transport/cdp-ws-proxy', () => ({ CdpWsProxy: CdpWsProxyMock }))
|
||||
import { runInRemoteCliBrowserScope } from '../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { runWithRequestedPageUrl } from '../cdp/input/browser-expected-page-url'
|
||||
import { AgentBrowserBridge } from './agent-browser-bridge'
|
||||
import {
|
||||
answerAgentBrowserCommands,
|
||||
mockBrowserManager,
|
||||
mockWebContents,
|
||||
overrideBridgeWebContentsLookup,
|
||||
resetAgentBrowserBridgeMocks,
|
||||
type ExecFileCallback,
|
||||
type MockWebContents
|
||||
} from './agent-browser-bridge-test-harness'
|
||||
import type { BrowserManager } from '../browser-manager'
|
||||
vi.mock('../../cdp/transport/cdp-ws-proxy', () => ({ CdpWsProxy: CdpWsProxyMock }))
|
||||
|
||||
overrideBridgeWebContentsLookup(AgentBrowserBridge.prototype, webContentsFromIdMock)
|
||||
|
||||
+4
-4
@@ -36,16 +36,16 @@ const { CdpWsProxyMock } = vi.hoisted(() => {
|
||||
})
|
||||
return { CdpWsProxyMock: Object.assign(MockClass, { instances }) }
|
||||
})
|
||||
vi.mock('../cdp/transport/cdp-ws-proxy', () => ({ CdpWsProxy: CdpWsProxyMock }))
|
||||
vi.mock('../../cdp/transport/cdp-ws-proxy', () => ({ CdpWsProxy: CdpWsProxyMock }))
|
||||
|
||||
import { AgentBrowserBridge } from './agent-browser-bridge'
|
||||
import { runInRemoteCliBrowserScope } from '../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { AgentBrowserBridge } from '../agent-browser-bridge'
|
||||
import { runInRemoteCliBrowserScope } from '../../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import {
|
||||
mockBrowserManager,
|
||||
mockWebContents,
|
||||
overrideBridgeWebContentsLookup,
|
||||
resetAgentBrowserBridgeMocks
|
||||
} from './agent-browser-bridge-test-harness'
|
||||
} from '../testing/agent-browser-bridge-test-harness'
|
||||
|
||||
overrideBridgeWebContentsLookup(AgentBrowserBridge.prototype, webContentsFromIdMock)
|
||||
|
||||
+5
-5
@@ -33,16 +33,16 @@ const { CdpWsProxyMock } = vi.hoisted(() => {
|
||||
})
|
||||
return { CdpWsProxyMock: Object.assign(MockClass, { instances }) }
|
||||
})
|
||||
vi.mock('../cdp/transport/cdp-ws-proxy', () => ({ CdpWsProxy: CdpWsProxyMock }))
|
||||
vi.mock('../../cdp/transport/cdp-ws-proxy', () => ({ CdpWsProxy: CdpWsProxyMock }))
|
||||
|
||||
import { AgentBrowserBridge } from './agent-browser-bridge'
|
||||
import { installBrowserJavaScriptDialogs } from '../guest-lifecycle/prompts/browser-javascript-dialogs'
|
||||
import { runInRemoteCliBrowserScope } from '../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { AgentBrowserBridge } from '../agent-browser-bridge'
|
||||
import { installBrowserJavaScriptDialogs } from '../../guest-lifecycle/prompts/browser-javascript-dialogs'
|
||||
import { runInRemoteCliBrowserScope } from '../../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import {
|
||||
mockBrowserManager,
|
||||
overrideBridgeWebContentsLookup,
|
||||
resetAgentBrowserBridgeMocks
|
||||
} from './agent-browser-bridge-test-harness'
|
||||
} from '../testing/agent-browser-bridge-test-harness'
|
||||
|
||||
overrideBridgeWebContentsLookup(AgentBrowserBridge.prototype, webContentsFromIdMock)
|
||||
|
||||
+13
-15
@@ -1,17 +1,15 @@
|
||||
import type { BrowserTabSwitchResult } from '../../../shared/runtime-browser-contracts'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import type { BrowserTabSwitchResult } from '../../../../shared/runtime-browser-contracts'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import { AgentBrowserBridgeActionEffects } from './agent-browser-bridge-action-effects'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from './agent-browser-orphan-sweep'
|
||||
import type {
|
||||
EnqueueTargetedCommandOptions,
|
||||
ResolvedBrowserCommandTarget
|
||||
} from './agent-browser-bridge-types'
|
||||
import { runWithRemoteCliPageAdmission } from '../routing/input-ownership/remote-cli-page-admission'
|
||||
import { runWithActionEffects } from './agent-browser-action-effects'
|
||||
import { getRequestedPageUrl, runExpectingPageUrl } from '../cdp/input/browser-expected-page-url'
|
||||
import { AGENT_BROWSER_CLEANUP_TIMEOUT_MS } from './agent-browser-bridge-types'
|
||||
import { releaseHeldPageInput } from '../cdp/input/guest-direct-key-input'
|
||||
import { onBrowserJavaScriptDialogOpened } from '../guest-lifecycle/prompts/browser-javascript-dialogs'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from '../session-lifecycle/agent-browser-session-name'
|
||||
import type { EnqueueTargetedCommandOptions } from './agent-browser-queued-command'
|
||||
import type { ResolvedBrowserCommandTarget } from '../session-routing/agent-browser-command-target'
|
||||
import { runWithRemoteCliPageAdmission } from '../../routing/input-ownership/remote-cli-page-admission'
|
||||
import { runWithActionEffects } from '../observation/agent-browser-action-effects'
|
||||
import { getRequestedPageUrl, runExpectingPageUrl } from '../../cdp/input/browser-expected-page-url'
|
||||
import { AGENT_BROWSER_CLEANUP_TIMEOUT_MS } from '../session-lifecycle/agent-browser-cleanup-options'
|
||||
import { releaseHeldPageInput } from '../../cdp/input/guest-direct-key-input'
|
||||
import { onBrowserJavaScriptDialogOpened } from '../../guest-lifecycle/prompts/browser-javascript-dialogs'
|
||||
import {
|
||||
assertNoJavaScriptDialog,
|
||||
dialogAnswerHint,
|
||||
@@ -21,8 +19,8 @@ import {
|
||||
captureRemoteCliBrowserRevocation,
|
||||
captureRemoteCliBrowserScope,
|
||||
runOutsideRemoteCliBrowserScope
|
||||
} from '../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { getActiveRpcCaller } from '../../runtime/rpc/rpc-active-caller'
|
||||
} from '../../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { getActiveRpcCaller } from '../../../runtime/rpc/rpc-active-caller'
|
||||
|
||||
export abstract class AgentBrowserBridgeQueue extends AgentBrowserBridgeActionEffects {
|
||||
// Serialize tab switches behind commands targeting the current tab.
|
||||
+3
-3
@@ -1,6 +1,6 @@
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { getBrowserJavaScriptDialog } from '../guest-lifecycle/prompts/browser-javascript-dialogs'
|
||||
import type { BrowserJavaScriptDialog } from '../../../shared/browser-javascript-dialog'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import { getBrowserJavaScriptDialog } from '../../guest-lifecycle/prompts/browser-javascript-dialogs'
|
||||
import type { BrowserJavaScriptDialog } from '../../../../shared/browser-javascript-dialog'
|
||||
|
||||
const DIALOG_MESSAGE_QUOTE_MAX_CHARS = 500
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
export type QueuedCommand = {
|
||||
execute: () => Promise<unknown>
|
||||
resolve: (value: unknown) => void
|
||||
reject: (reason: unknown) => void
|
||||
}
|
||||
|
||||
export type EnqueueTargetedCommandOptions = {
|
||||
ensureSession?: boolean
|
||||
/** Page actions report what they caused when an agent runs them. */
|
||||
reportEffects?: boolean
|
||||
// Text mutations must not fall back to a global tab from another worktree.
|
||||
requireScopedTarget?: boolean
|
||||
// Element arguments that may be snapshot refs.
|
||||
elements?: readonly (string | undefined)[]
|
||||
}
|
||||
+14
-11
@@ -1,27 +1,30 @@
|
||||
import type { BrowserScreenshotOptions } from '../../../shared/rpc-contract/browser-observation-params'
|
||||
import type { BrowserScreenshotOptions } from '../../../../shared/rpc-contract/browser-observation-params'
|
||||
import { z } from 'zod'
|
||||
import { app, nativeImage, type WebContents } from 'electron'
|
||||
import type {
|
||||
BrowserScreenshotResult,
|
||||
BrowserEvalResult
|
||||
} from '../../../shared/runtime-browser-contracts'
|
||||
import { BrowserError } from '../browser-error'
|
||||
} from '../../../../shared/runtime-browser-contracts'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import {
|
||||
captureFullPageScreenshot,
|
||||
SCREENSHOT_TIMEOUT_MS,
|
||||
withTimeout
|
||||
} from '../cdp/commands/cdp-screenshot'
|
||||
} from '../../cdp/commands/cdp-screenshot'
|
||||
import {
|
||||
agentBrowserScreenshotArgs,
|
||||
readAgentBrowserScreenshot
|
||||
} from './agent-browser-screenshot-arguments'
|
||||
import { readRasterImageDimensions } from '../../../shared/file-preview/raster-image-dimensions'
|
||||
import { acquireElectronDebugger } from '../cdp/debugger/electron-debugger-lease'
|
||||
import { sendGuestCdpCommand } from '../cdp/debugger/guest-cdp-command'
|
||||
} from '../observation/agent-browser-screenshot-arguments'
|
||||
import { readRasterImageDimensions } from '../../../../shared/file-preview/raster-image-dimensions'
|
||||
import { acquireElectronDebugger } from '../../cdp/debugger/electron-debugger-lease'
|
||||
import { sendGuestCdpCommand } from '../../cdp/debugger/guest-cdp-command'
|
||||
import { AgentBrowserBridgeUtilityCommands } from './agent-browser-bridge-page-commands'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from './agent-browser-orphan-sweep'
|
||||
import { captureRemoteCliBrowserWorkBound } from '../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { throwIfSignalAborted, waitForPromiseWithSignal } from '../../../shared/abort-signal-reason'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from '../session-lifecycle/agent-browser-session-name'
|
||||
import { captureRemoteCliBrowserWorkBound } from '../../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import {
|
||||
throwIfSignalAborted,
|
||||
waitForPromiseWithSignal
|
||||
} from '../../../../shared/abort-signal-reason'
|
||||
|
||||
export abstract class AgentBrowserBridgeCaptureCommands extends AgentBrowserBridgeUtilityCommands {
|
||||
async screenshot(
|
||||
+12
-12
@@ -1,23 +1,23 @@
|
||||
import type { BrowserSnapshotOptions } from '../../../shared/rpc-contract/browser-observation-params'
|
||||
import type { BrowserSnapshotOptions } from '../../../../shared/rpc-contract/browser-observation-params'
|
||||
import type {
|
||||
BrowserSnapshotResult,
|
||||
BrowserClickResult,
|
||||
BrowserGotoResult,
|
||||
BrowserFillResult
|
||||
} from '../../../shared/runtime-browser-contracts'
|
||||
import { assertClipboardTextWriteWithinLimitWithYield } from '../../../shared/clipboard-text'
|
||||
import { normalizeBrowserNavigationUrl } from '../../../shared/browser-url'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from './agent-browser-orphan-sweep'
|
||||
import { FILL_ELEMENT_FUNCTION } from '../cdp/input/browser-element-functions'
|
||||
import { EMBEDDED_NAVIGATION_TIMEOUT_MS } from './agent-browser-bridge-types'
|
||||
} from '../../../../shared/runtime-browser-contracts'
|
||||
import { assertClipboardTextWriteWithinLimitWithYield } from '../../../../shared/clipboard-text'
|
||||
import { normalizeBrowserNavigationUrl } from '../../../../shared/browser-url'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from '../session-lifecycle/agent-browser-session-name'
|
||||
import { FILL_ELEMENT_FUNCTION } from '../../cdp/input/browser-element-functions'
|
||||
import {
|
||||
EMBEDDED_NAVIGATION_TIMEOUT_MS,
|
||||
isAbortedNavigationError,
|
||||
waitForAbortedNavigationReplacement
|
||||
} from './agent-browser-bridge-process'
|
||||
import { AgentBrowserBridgeQueue } from './agent-browser-bridge-queue'
|
||||
import { assertRemoteCliPageAccess } from '../routing/input-ownership/remote-cli-page-admission'
|
||||
import { agentBrowserSnapshotArgs } from './agent-browser-snapshot-arguments'
|
||||
} from './agent-browser-navigation-settle'
|
||||
import { AgentBrowserBridgeQueue } from '../command-queue/agent-browser-bridge-queue'
|
||||
import { assertRemoteCliPageAccess } from '../../routing/input-ownership/remote-cli-page-admission'
|
||||
import { agentBrowserSnapshotArgs } from '../protocol/agent-browser-snapshot-arguments'
|
||||
|
||||
export abstract class AgentBrowserBridgeCoreCommands extends AgentBrowserBridgeQueue {
|
||||
async snapshot(
|
||||
+6
-6
@@ -1,10 +1,10 @@
|
||||
import type { WebContents } from 'electron'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import type { CapturedElement } from '../cdp/commands/cdp-element-capture'
|
||||
import { assertExpectedPageUrlForStep } from '../cdp/input/browser-expected-page-url'
|
||||
import { sendGuestCdpCommand } from '../cdp/debugger/guest-cdp-command'
|
||||
import { readRecord, readString } from '../cdp/input/guest-frame-input-sessions'
|
||||
import { AgentBrowserBridgeExecution } from './agent-browser-bridge-execution'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import type { CapturedElement } from '../../cdp/commands/cdp-element-capture'
|
||||
import { assertExpectedPageUrlForStep } from '../../cdp/input/browser-expected-page-url'
|
||||
import { sendGuestCdpCommand } from '../../cdp/debugger/guest-cdp-command'
|
||||
import { readRecord, readString } from '../../cdp/input/guest-frame-input-sessions'
|
||||
import { AgentBrowserBridgeExecution } from '../helper-process/agent-browser-bridge-execution'
|
||||
|
||||
export type CapturedTarget = { wc: WebContents; captured: CapturedElement }
|
||||
|
||||
+5
-5
@@ -1,12 +1,12 @@
|
||||
import type {
|
||||
BrowserSelectResult,
|
||||
BrowserScrollResult
|
||||
} from '../../../shared/runtime-browser-contracts'
|
||||
import { assertClipboardTextWriteWithinLimitWithYield } from '../../../shared/clipboard-text'
|
||||
import { iterateBrowserTextInsertionChunks } from '../../../shared/browser-text-insertion-chunks'
|
||||
import { AGENT_BROWSER_TEXT_ARGUMENT_MAX_BYTES } from './agent-browser-bridge-types'
|
||||
} from '../../../../shared/runtime-browser-contracts'
|
||||
import { assertClipboardTextWriteWithinLimitWithYield } from '../../../../shared/clipboard-text'
|
||||
import { iterateBrowserTextInsertionChunks } from '../../../../shared/browser-text-insertion-chunks'
|
||||
import { AGENT_BROWSER_TEXT_ARGUMENT_MAX_BYTES } from '../protocol/agent-browser-text-argument-budget'
|
||||
import { AgentBrowserBridgeCoreCommands } from './agent-browser-bridge-core-commands'
|
||||
import { SELECT_OPTION_TARGET_FUNCTION } from '../cdp/input/browser-element-functions'
|
||||
import { SELECT_OPTION_TARGET_FUNCTION } from '../../cdp/input/browser-element-functions'
|
||||
|
||||
export abstract class AgentBrowserBridgeInputCommands extends AgentBrowserBridgeCoreCommands {
|
||||
async select(
|
||||
+10
-10
@@ -8,25 +8,25 @@ import type {
|
||||
BrowserClearResult,
|
||||
BrowserSelectAllResult,
|
||||
BrowserPdfResult
|
||||
} from '../../../shared/runtime-browser-contracts'
|
||||
import { BrowserError } from '../browser-error'
|
||||
} from '../../../../shared/runtime-browser-contracts'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import {
|
||||
FILE_INPUT_FRAME_URL_FUNCTION,
|
||||
FILE_UPLOAD_TARGET_FUNCTION,
|
||||
FILL_ELEMENT_FUNCTION,
|
||||
SELECT_ALL_ELEMENT_FUNCTION
|
||||
} from '../cdp/input/browser-element-functions'
|
||||
import { assertUploadFilesExist } from '../cdp/input/browser-upload-files'
|
||||
} from '../../cdp/input/browser-element-functions'
|
||||
import { assertUploadFilesExist } from '../../cdp/input/browser-upload-files'
|
||||
import type { WebContents } from 'electron'
|
||||
import type { CapturedElement } from '../cdp/commands/cdp-element-capture'
|
||||
import { interceptFileChooser, type OpenedFileChooser } from '../cdp/input/guest-file-chooser'
|
||||
import { readRecord, readString } from '../cdp/input/guest-frame-input-sessions'
|
||||
import type { CapturedElement } from '../../cdp/commands/cdp-element-capture'
|
||||
import { interceptFileChooser, type OpenedFileChooser } from '../../cdp/input/guest-file-chooser'
|
||||
import { readRecord, readString } from '../../cdp/input/guest-frame-input-sessions'
|
||||
import {
|
||||
agentBrowserWaitArguments,
|
||||
type AgentBrowserWaitOptions
|
||||
} from './agent-browser-wait-arguments'
|
||||
import { parseCdpKeyEvent } from '../cdp/input/cdp-keyboard-us-layout'
|
||||
import { readRemoteCliAdmittedPage } from '../routing/input-ownership/remote-cli-page-admission'
|
||||
} from '../protocol/agent-browser-wait-arguments'
|
||||
import { parseCdpKeyEvent } from '../../cdp/input/cdp-keyboard-us-layout'
|
||||
import { readRemoteCliAdmittedPage } from '../../routing/input-ownership/remote-cli-page-admission'
|
||||
import { AgentBrowserBridgeKeyCommands } from './agent-browser-bridge-key-commands'
|
||||
|
||||
export abstract class AgentBrowserBridgeInteractionCommands extends AgentBrowserBridgeKeyCommands {
|
||||
+12
-12
@@ -1,24 +1,24 @@
|
||||
import type {
|
||||
BrowserKeypressResult,
|
||||
BrowserTypeResult
|
||||
} from '../../../shared/runtime-browser-contracts'
|
||||
import { assertClipboardTextWriteWithinLimitWithYield } from '../../../shared/clipboard-text'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { acquireElectronDebugger } from '../cdp/debugger/electron-debugger-lease'
|
||||
} from '../../../../shared/runtime-browser-contracts'
|
||||
import { assertClipboardTextWriteWithinLimitWithYield } from '../../../../shared/clipboard-text'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import { acquireElectronDebugger } from '../../cdp/debugger/electron-debugger-lease'
|
||||
import {
|
||||
parseCdpKeyEvent,
|
||||
imeFallbackKeyEvent,
|
||||
typedInputSteps,
|
||||
type TypedInputStep
|
||||
} from '../cdp/input/cdp-keyboard-us-layout'
|
||||
import type { ResolvedBrowserCommandTarget } from './agent-browser-bridge-types'
|
||||
} from '../../cdp/input/cdp-keyboard-us-layout'
|
||||
import type { ResolvedBrowserCommandTarget } from '../session-routing/agent-browser-command-target'
|
||||
import {
|
||||
dispatchPageKeyEvents,
|
||||
routePageTextInsertion,
|
||||
type GuestCdpSender
|
||||
} from '../cdp/input/guest-direct-key-input'
|
||||
import { assertExpectedPageUrlForStep } from '../cdp/input/browser-expected-page-url'
|
||||
import { sendGuestCdpCommand } from '../cdp/debugger/guest-cdp-command'
|
||||
routePageTextInsertion
|
||||
} from '../../cdp/input/guest-direct-key-input'
|
||||
import type { GuestSessionCdpSender } from '../../cdp/input/guest-frame-input-sessions'
|
||||
import { assertExpectedPageUrlForStep } from '../../cdp/input/browser-expected-page-url'
|
||||
import { sendGuestCdpCommand } from '../../cdp/debugger/guest-cdp-command'
|
||||
import { AgentBrowserBridgeCaptureCommands } from './agent-browser-bridge-capture-commands'
|
||||
|
||||
// Bounds the events a typed run holds and how long it keeps the main loop busy.
|
||||
@@ -76,7 +76,7 @@ export abstract class AgentBrowserBridgeKeyCommands extends AgentBrowserBridgeCa
|
||||
try {
|
||||
releaseDebugger = acquireElectronDebugger(wc).release
|
||||
await this.waitForPagePaint(wc, target.webContentsId)
|
||||
const send: GuestCdpSender = (method, params, sessionId) =>
|
||||
const send: GuestSessionCdpSender = (method, params, sessionId) =>
|
||||
sendGuestCdpCommand(wc, method, params, sessionId)
|
||||
const guardFocus = (): Promise<() => void> =>
|
||||
this.browserManager.guardUserFocusForAgentInput(target.webContentsId)
|
||||
+3
-3
@@ -42,11 +42,11 @@ const { CdpWsProxyMock } = vi.hoisted(() => {
|
||||
return { CdpWsProxyMock: Object.assign(MockClass, { instances }) }
|
||||
})
|
||||
|
||||
vi.mock('../cdp/transport/cdp-ws-proxy', () => ({
|
||||
vi.mock('../../cdp/transport/cdp-ws-proxy', () => ({
|
||||
CdpWsProxy: CdpWsProxyMock
|
||||
}))
|
||||
|
||||
import { AgentBrowserBridge } from './agent-browser-bridge'
|
||||
import { AgentBrowserBridge } from '../agent-browser-bridge'
|
||||
import {
|
||||
createSucceedWith,
|
||||
mockBrowserManager,
|
||||
@@ -54,7 +54,7 @@ import {
|
||||
overrideBridgeWebContentsLookup,
|
||||
resetAgentBrowserBridgeMocks,
|
||||
type MockWebContents
|
||||
} from './agent-browser-bridge-test-harness'
|
||||
} from '../testing/agent-browser-bridge-test-harness'
|
||||
|
||||
overrideBridgeWebContentsLookup(AgentBrowserBridge.prototype, webContentsFromIdMock)
|
||||
|
||||
+9
-9
@@ -1,18 +1,18 @@
|
||||
import type { BrowserMouseModifier } from '../cdp/input/cdp-pointer-targets'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import type { BrowserMouseModifier } from '../../cdp/input/cdp-pointer-targets'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import {
|
||||
normalizeCdpMouseButton,
|
||||
cdpPointerButtonMask,
|
||||
cdpMouseModifierMask,
|
||||
resolveMobileTouchClickPoint
|
||||
} from '../cdp/input/cdp-pointer-targets'
|
||||
import { acquireElectronDebugger } from '../cdp/debugger/electron-debugger-lease'
|
||||
import { assertExpectedPageUrlForStep } from '../cdp/input/browser-expected-page-url'
|
||||
import { sendGuestCdpCommand } from '../cdp/debugger/guest-cdp-command'
|
||||
import { touchEmulationParams } from '../cdp/input/guest-touch-emulation'
|
||||
import { assertRemoteCliBrowserAccess } from '../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
} from '../../cdp/input/cdp-pointer-targets'
|
||||
import { acquireElectronDebugger } from '../../cdp/debugger/electron-debugger-lease'
|
||||
import { assertExpectedPageUrlForStep } from '../../cdp/input/browser-expected-page-url'
|
||||
import { sendGuestCdpCommand } from '../../cdp/debugger/guest-cdp-command'
|
||||
import { touchEmulationParams } from '../../cdp/input/guest-touch-emulation'
|
||||
import { assertRemoteCliBrowserAccess } from '../../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { AgentBrowserBridgePointerCommands } from './agent-browser-bridge-pointer-commands'
|
||||
import { agentBrowserSetMediaArguments } from './agent-browser-set-media-arguments'
|
||||
import { agentBrowserSetMediaArguments } from '../protocol/agent-browser-set-media-arguments'
|
||||
|
||||
export abstract class AgentBrowserBridgeMouseCommands extends AgentBrowserBridgePointerCommands {
|
||||
async mouseClick(
|
||||
+7
-7
@@ -1,4 +1,4 @@
|
||||
import type * as BrowserErrorTypes from '../browser-error'
|
||||
import type * as BrowserErrorTypes from '../../browser-error'
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
|
||||
const { execFileMock, webContentsFromIdMock, existsSyncMock, readFileSyncMock, stdinWrites } =
|
||||
@@ -40,10 +40,10 @@ const { CdpWsProxyMock } = vi.hoisted(() => {
|
||||
return { CdpWsProxyMock: Object.assign(MockClass, { instances }) }
|
||||
})
|
||||
|
||||
vi.mock('../cdp/transport/cdp-ws-proxy', () => ({
|
||||
vi.mock('../../cdp/transport/cdp-ws-proxy', () => ({
|
||||
CdpWsProxy: CdpWsProxyMock
|
||||
}))
|
||||
vi.mock('../browser-error', () => ({
|
||||
vi.mock('../../browser-error', () => ({
|
||||
BrowserError: class BrowserError extends Error {
|
||||
code: string
|
||||
constructor(code: string, message: string) {
|
||||
@@ -53,18 +53,18 @@ vi.mock('../browser-error', () => ({
|
||||
}
|
||||
}))
|
||||
|
||||
vi.mock('../cdp/commands/cdp-bridge', async () => {
|
||||
const { BrowserError } = await vi.importMock<typeof BrowserErrorTypes>('../browser-error')
|
||||
vi.mock('../../cdp/commands/cdp-bridge', async () => {
|
||||
const { BrowserError } = await vi.importMock<typeof BrowserErrorTypes>('../../browser-error')
|
||||
return { BrowserError }
|
||||
})
|
||||
|
||||
import { AgentBrowserBridge } from './agent-browser-bridge'
|
||||
import { AgentBrowserBridge } from '../agent-browser-bridge'
|
||||
import {
|
||||
mockBrowserManager,
|
||||
mockWebContents,
|
||||
overrideBridgeWebContentsLookup,
|
||||
resetAgentBrowserBridgeMocks
|
||||
} from './agent-browser-bridge-test-harness'
|
||||
} from '../testing/agent-browser-bridge-test-harness'
|
||||
|
||||
overrideBridgeWebContentsLookup(AgentBrowserBridge.prototype, webContentsFromIdMock)
|
||||
|
||||
+16
-12
@@ -1,24 +1,23 @@
|
||||
import { mkdir } from 'node:fs/promises'
|
||||
import path from 'node:path'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { assertClipboardTextWriteWithinLimitWithYield } from '../../../shared/clipboard-text'
|
||||
import { withTimeout } from '../../../shared/promise-timeout-fallback'
|
||||
import {
|
||||
AGENT_BROWSER_CLIPBOARD_WRITE_MAX_BYTES,
|
||||
AGENT_DOWNLOAD_REPLY_DEADLINE_MS,
|
||||
AGENT_DOWNLOAD_START_TIMEOUT_MS
|
||||
} from './agent-browser-bridge-types'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import { assertClipboardTextWriteWithinLimitWithYield } from '../../../../shared/clipboard-text'
|
||||
import { withTimeout } from '../../../../shared/promise-timeout-fallback'
|
||||
import { AGENT_BROWSER_CLIPBOARD_WRITE_MAX_BYTES } from '../protocol/agent-browser-text-argument-budget'
|
||||
import type {
|
||||
BrowserBackResult,
|
||||
BrowserReloadResult
|
||||
} from '../../../shared/runtime-browser-contracts'
|
||||
} from '../../../../shared/runtime-browser-contracts'
|
||||
import { AgentBrowserBridgeMouseCommands } from './agent-browser-bridge-mouse-commands'
|
||||
import {
|
||||
answerBrowserJavaScriptDialog,
|
||||
getBrowserJavaScriptDialog
|
||||
} from '../guest-lifecycle/prompts/browser-javascript-dialogs'
|
||||
import { captureRemoteCliBrowserRevocation } from '../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { ExpectedPageUrlGuard, getRequestedPageUrl } from '../cdp/input/browser-expected-page-url'
|
||||
} from '../../guest-lifecycle/prompts/browser-javascript-dialogs'
|
||||
import { captureRemoteCliBrowserRevocation } from '../../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import {
|
||||
ExpectedPageUrlGuard,
|
||||
getRequestedPageUrl
|
||||
} from '../../cdp/input/browser-expected-page-url'
|
||||
|
||||
/** Keep JSON results stable across CLI payload versions. */
|
||||
export type BrowserDialogAnswer = { accepted: boolean; browserPageId?: string; checkedUrl?: string }
|
||||
@@ -248,3 +247,8 @@ export abstract class AgentBrowserBridgeUtilityCommands extends AgentBrowserBrid
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
export const AGENT_DOWNLOAD_START_TIMEOUT_MS = 10_000
|
||||
|
||||
// Counted from the request, so the reply beats the CLI's 60s timeout; the download keeps going after.
|
||||
export const AGENT_DOWNLOAD_REPLY_DEADLINE_MS = 50_000
|
||||
+10
-10
@@ -1,6 +1,6 @@
|
||||
import type { ResolvedBrowserCommandTarget } from './agent-browser-bridge-types'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { normalizeCdpPointerButton } from '../cdp/input/cdp-pointer-targets'
|
||||
import type { ResolvedBrowserCommandTarget } from '../session-routing/agent-browser-command-target'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import { normalizeCdpPointerButton } from '../../cdp/input/cdp-pointer-targets'
|
||||
import {
|
||||
assertFinitePointerValues,
|
||||
cdpPointerStateFor,
|
||||
@@ -8,14 +8,14 @@ import {
|
||||
releaseCdpPointerButton,
|
||||
resolveCdpPointerReleaseButton,
|
||||
type CdpPointerState
|
||||
} from '../cdp/input/cdp-pointer-input'
|
||||
import { acquireElectronDebugger } from '../cdp/debugger/electron-debugger-lease'
|
||||
import { assertExpectedPageUrlForStep } from '../cdp/input/browser-expected-page-url'
|
||||
import { sendGuestCdpCommand } from '../cdp/debugger/guest-cdp-command'
|
||||
} from '../../cdp/input/cdp-pointer-input'
|
||||
import { acquireElectronDebugger } from '../../cdp/debugger/electron-debugger-lease'
|
||||
import { assertExpectedPageUrlForStep } from '../../cdp/input/browser-expected-page-url'
|
||||
import { sendGuestCdpCommand } from '../../cdp/debugger/guest-cdp-command'
|
||||
import { AgentBrowserBridgeInputCommands } from './agent-browser-bridge-input-commands'
|
||||
import { isEmbeddedGuest } from '../cdp/input/guest-direct-key-input'
|
||||
import { enablePageFocusEmulation } from '../cdp/input/agent-input-focus-guard'
|
||||
import { waitForGuestFirstPaint } from '../cdp/debugger/guest-first-paint'
|
||||
import { isEmbeddedGuest } from '../../cdp/input/guest-direct-key-input'
|
||||
import { enablePageFocusEmulation } from '../../cdp/input/agent-input-focus-guard'
|
||||
import { waitForGuestFirstPaint } from '../../cdp/debugger/guest-first-paint'
|
||||
|
||||
type CdpPointerEventParams = {
|
||||
type: 'mouseMoved' | 'mousePressed' | 'mouseReleased' | 'mouseWheel'
|
||||
@@ -0,0 +1,81 @@
|
||||
import type { WebContents } from 'electron'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
|
||||
export function isAbortedNavigationError(error: unknown): boolean {
|
||||
if (!error || typeof error !== 'object') {
|
||||
return false
|
||||
}
|
||||
const { code, errno } = error as { code?: unknown; errno?: unknown }
|
||||
return code === 'ERR_ABORTED' || errno === -3
|
||||
}
|
||||
|
||||
export function isWebContentsLoading(wc: WebContents): boolean {
|
||||
try {
|
||||
return wc.isLoading()
|
||||
} catch {
|
||||
// The caller rechecks authoritative page registration after waiting.
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
export function isLoadingMainFrame(wc: WebContents): boolean {
|
||||
try {
|
||||
return wc.isLoadingMainFrame()
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
export function waitForAbortedNavigationReplacement(
|
||||
wc: WebContents,
|
||||
browserPageId: string,
|
||||
timeoutMs: number
|
||||
): Promise<void> {
|
||||
if (!isWebContentsLoading(wc)) {
|
||||
return Promise.resolve()
|
||||
}
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
let settled = false
|
||||
let timeout: ReturnType<typeof setTimeout> | null = null
|
||||
const finish = (error?: BrowserError): void => {
|
||||
if (settled) {
|
||||
return
|
||||
}
|
||||
settled = true
|
||||
wc.removeListener('did-stop-loading', onDidStopLoading)
|
||||
wc.removeListener('destroyed', onDestroyed)
|
||||
if (timeout) {
|
||||
clearTimeout(timeout)
|
||||
}
|
||||
if (error) {
|
||||
reject(error)
|
||||
} else {
|
||||
resolve()
|
||||
}
|
||||
}
|
||||
const onDidStopLoading = (): void => finish()
|
||||
const onDestroyed = (): void => finish()
|
||||
|
||||
wc.on('did-stop-loading', onDidStopLoading)
|
||||
wc.on('destroyed', onDestroyed)
|
||||
timeout = setTimeout(
|
||||
() =>
|
||||
finish(
|
||||
new BrowserError(
|
||||
'browser_error',
|
||||
`Failed to navigate browser page ${browserPageId}: Browser navigation timed out after ${EMBEDDED_NAVIGATION_TIMEOUT_MS}ms`
|
||||
)
|
||||
),
|
||||
timeoutMs
|
||||
)
|
||||
timeout.unref?.()
|
||||
|
||||
// Loading may finish between loadURL rejection and listener attachment.
|
||||
if (!isWebContentsLoading(wc)) {
|
||||
finish()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
export const EMBEDDED_NAVIGATION_TIMEOUT_MS = 30_000
|
||||
@@ -0,0 +1,38 @@
|
||||
import { platform, arch } from 'node:os'
|
||||
import { app } from 'electron'
|
||||
import { existsSync } from 'node:fs'
|
||||
import { join } from 'node:path'
|
||||
import { ensureDependencyBinaryExecutable } from './agent-browser-dependency-binary'
|
||||
|
||||
export function agentBrowserNativeName(): string {
|
||||
const ext = process.platform === 'win32' ? '.exe' : ''
|
||||
return `agent-browser-${platform()}-${arch()}${ext}`
|
||||
}
|
||||
|
||||
export function resolveAgentBrowserBinary(): string {
|
||||
// resourcesPath preserves the case-sensitive macOS Resources path.
|
||||
const bundledResourcesPath =
|
||||
process.resourcesPath ??
|
||||
(process.platform === 'darwin'
|
||||
? join(app.getPath('exe'), '..', '..', 'Resources')
|
||||
: join(app.getPath('exe'), '..', 'resources'))
|
||||
const bundled = join(bundledResourcesPath, agentBrowserNativeName())
|
||||
if (existsSync(bundled)) {
|
||||
return bundled
|
||||
}
|
||||
|
||||
// Bundling makes __dirname unreliable for locating development dependencies.
|
||||
const nmBin = join(
|
||||
app.getAppPath(),
|
||||
'node_modules',
|
||||
'agent-browser',
|
||||
'bin',
|
||||
agentBrowserNativeName()
|
||||
)
|
||||
if (existsSync(nmBin)) {
|
||||
ensureDependencyBinaryExecutable(nmBin)
|
||||
return nmBin
|
||||
}
|
||||
|
||||
return 'agent-browser'
|
||||
}
|
||||
+7
-7
@@ -1,4 +1,4 @@
|
||||
import type * as BrowserErrorTypes from '../browser-error'
|
||||
import type * as BrowserErrorTypes from '../../browser-error'
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
|
||||
const { execFileMock, webContentsFromIdMock, existsSyncMock, readFileSyncMock, stdinWrites } =
|
||||
@@ -44,10 +44,10 @@ const { CdpWsProxyMock, proxyStops } = vi.hoisted(() => {
|
||||
return { CdpWsProxyMock: Object.assign(MockClass, { instances }), proxyStops }
|
||||
})
|
||||
|
||||
vi.mock('../cdp/transport/cdp-ws-proxy', () => ({
|
||||
vi.mock('../../cdp/transport/cdp-ws-proxy', () => ({
|
||||
CdpWsProxy: CdpWsProxyMock
|
||||
}))
|
||||
vi.mock('../browser-error', () => ({
|
||||
vi.mock('../../browser-error', () => ({
|
||||
BrowserError: class BrowserError extends Error {
|
||||
code: string
|
||||
constructor(code: string, message: string) {
|
||||
@@ -57,18 +57,18 @@ vi.mock('../browser-error', () => ({
|
||||
}
|
||||
}))
|
||||
|
||||
vi.mock('../cdp/commands/cdp-bridge', async () => {
|
||||
const { BrowserError } = await vi.importMock<typeof BrowserErrorTypes>('../browser-error')
|
||||
vi.mock('../../cdp/commands/cdp-bridge', async () => {
|
||||
const { BrowserError } = await vi.importMock<typeof BrowserErrorTypes>('../../browser-error')
|
||||
return { BrowserError }
|
||||
})
|
||||
|
||||
import { AgentBrowserBridge } from './agent-browser-bridge'
|
||||
import { AgentBrowserBridge } from '../agent-browser-bridge'
|
||||
import {
|
||||
mockBrowserManager,
|
||||
overrideBridgeWebContentsLookup,
|
||||
resetAgentBrowserBridgeMocks,
|
||||
succeedRecordingAgentBrowserSpawns
|
||||
} from './agent-browser-bridge-test-harness'
|
||||
} from '../testing/agent-browser-bridge-test-harness'
|
||||
|
||||
overrideBridgeWebContentsLookup(AgentBrowserBridge.prototype, webContentsFromIdMock)
|
||||
|
||||
+16
-15
@@ -1,30 +1,29 @@
|
||||
import { execFile } from 'node:child_process'
|
||||
import type { WebContents } from 'electron'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import {
|
||||
isCdpProxyRejectedError,
|
||||
isTabClosedTransportError,
|
||||
pageUnavailableMessageForSession
|
||||
} from './agent-browser-bridge-process'
|
||||
import { translateResult } from './agent-browser-bridge-result'
|
||||
} from './agent-browser-command-errors'
|
||||
import { translateResult } from '../protocol/agent-browser-bridge-result'
|
||||
import {
|
||||
AGENT_BROWSER_BATCH_ARGS,
|
||||
agentBrowserBatchInput,
|
||||
agentBrowserResultMintsRefs
|
||||
} from './agent-browser-batch-command'
|
||||
import { AgentBrowserBridgeTabs } from './agent-browser-bridge-tabs'
|
||||
import { assertRemoteCliBrowserAccess } from '../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { assertExpectedPageUrlForStep } from '../cdp/input/browser-expected-page-url'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from './agent-browser-orphan-sweep'
|
||||
import { canSkipAgentBrowserSessionReset } from './agent-browser-session-reset'
|
||||
} from '../protocol/agent-browser-batch-command'
|
||||
import { AgentBrowserBridgeTabs } from '../session-routing/agent-browser-bridge-tabs'
|
||||
import { assertRemoteCliBrowserAccess } from '../../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { assertExpectedPageUrlForStep } from '../../cdp/input/browser-expected-page-url'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from '../session-lifecycle/agent-browser-session-name'
|
||||
import { canSkipAgentBrowserSessionReset } from '../session-lifecycle/agent-browser-session-reset'
|
||||
import {
|
||||
AGENT_BROWSER_CLEANUP_TIMEOUT_MS,
|
||||
STALE_SESSION_CLOSE_TIMEOUT_MS,
|
||||
type AgentBrowserCleanupOptions,
|
||||
type AgentBrowserExecOptions,
|
||||
type SessionState,
|
||||
type ResolvedBrowserCommandTarget
|
||||
} from './agent-browser-bridge-types'
|
||||
type AgentBrowserCleanupOptions
|
||||
} from '../session-lifecycle/agent-browser-cleanup-options'
|
||||
import type { AgentBrowserExecOptions } from './agent-browser-exec-options'
|
||||
import type { SessionState } from '../session-lifecycle/agent-browser-session-state'
|
||||
import type { ResolvedBrowserCommandTarget } from '../session-routing/agent-browser-command-target'
|
||||
|
||||
// These act on an element with no pointer input, so the agent cursor is shown on it first.
|
||||
const ELEMENT_COMMANDS_WITHOUT_POINTER = new Set(['check', 'uncheck', 'select', 'focus'])
|
||||
@@ -291,3 +290,5 @@ export abstract class AgentBrowserBridgeExecution extends AgentBrowserBridgeTabs
|
||||
return !this.getWebContents(targetWebContentsId)
|
||||
}
|
||||
}
|
||||
|
||||
export const STALE_SESSION_CLOSE_TIMEOUT_MS = 3_000
|
||||
+2
-2
@@ -19,8 +19,8 @@ vi.mock('node:child_process', async (importOriginal) => {
|
||||
return { ...actual, execFile: vi.fn(actual.execFile) }
|
||||
})
|
||||
|
||||
import { AgentBrowserBridge } from './agent-browser-bridge'
|
||||
import { mockBrowserManager } from './agent-browser-bridge-test-harness'
|
||||
import { AgentBrowserBridge } from '../agent-browser-bridge'
|
||||
import { mockBrowserManager } from '../testing/agent-browser-bridge-test-harness'
|
||||
|
||||
let bridge: AgentBrowserBridge
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@ vi.mock('electron', () => ({
|
||||
}
|
||||
}))
|
||||
|
||||
import { AgentBrowserBridge } from './agent-browser-bridge'
|
||||
import { mockBrowserManager } from './agent-browser-bridge-test-harness'
|
||||
import { AgentBrowserBridge } from '../agent-browser-bridge'
|
||||
import { mockBrowserManager } from '../testing/agent-browser-bridge-test-harness'
|
||||
|
||||
const PAYLOAD_BYTES = 5 * 1024 * 1024
|
||||
|
||||
+12
-10
@@ -1,14 +1,9 @@
|
||||
import { execFile, type ChildProcess } from 'node:child_process'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { classifyErrorCode } from './agent-browser-bridge-process'
|
||||
import { parseAgentBrowserJsonOutput } from './agent-browser-batch-command'
|
||||
import { AgentBrowserBridgeElementCalls } from './agent-browser-bridge-element-calls'
|
||||
import {
|
||||
AGENT_BROWSER_EXIT_DRAIN_MS,
|
||||
CONSECUTIVE_TIMEOUT_LIMIT,
|
||||
EXEC_TIMEOUT_MS,
|
||||
type AgentBrowserExecOptions
|
||||
} from './agent-browser-bridge-types'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import { classifyErrorCode } from './agent-browser-command-errors'
|
||||
import { parseAgentBrowserJsonOutput } from '../protocol/agent-browser-batch-command'
|
||||
import { AgentBrowserBridgeElementCalls } from '../commands/agent-browser-bridge-element-calls'
|
||||
import type { AgentBrowserExecOptions } from './agent-browser-exec-options'
|
||||
|
||||
export abstract class AgentBrowserBridgeRawProcess extends AgentBrowserBridgeElementCalls {
|
||||
protected abstract destroySession(
|
||||
@@ -118,3 +113,10 @@ export abstract class AgentBrowserBridgeRawProcess extends AgentBrowserBridgeEle
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Exceed agent-browser's internal navigation (30s) and default wait (25s) timeouts.
|
||||
export const EXEC_TIMEOUT_MS = 90_000
|
||||
|
||||
export const CONSECUTIVE_TIMEOUT_LIMIT = 3
|
||||
|
||||
export const AGENT_BROWSER_EXIT_DRAIN_MS = 500
|
||||
@@ -0,0 +1,29 @@
|
||||
import { isAgentBrowserStaleRefError } from '../protocol/agent-browser-batch-command'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from '../session-lifecycle/agent-browser-session-name'
|
||||
|
||||
// Stale refs need a distinct code so agents can retry with a fresh snapshot.
|
||||
export function classifyErrorCode(message: string): string {
|
||||
if (isAgentBrowserStaleRefError(message)) {
|
||||
return 'browser_stale_ref'
|
||||
}
|
||||
return 'browser_error'
|
||||
}
|
||||
|
||||
export function isTabClosedTransportError(message: string): boolean {
|
||||
return /session destroyed while command|session destroyed while commands|connection refused|cdp discovery methods failed|websocket connect failed/i.test(
|
||||
message
|
||||
)
|
||||
}
|
||||
|
||||
/** agent-browser's handshake error when Orca's CDP proxy refuses its endpoint (wrong or missing token). */
|
||||
export function isCdpProxyRejectedError(message: string): boolean {
|
||||
return /websocket connect failed\b.*\b40[34]\b/i.test(message)
|
||||
}
|
||||
|
||||
export function pageUnavailableMessageForSession(sessionName: string): string {
|
||||
const prefix = ORCA_TAB_SESSION_PREFIX
|
||||
const browserPageId = sessionName.startsWith(prefix) ? sessionName.slice(prefix.length) : null
|
||||
return browserPageId
|
||||
? `Browser page ${browserPageId} is no longer available`
|
||||
: 'Browser tab is no longer available'
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
import type { BrowserError } from '../../browser-error'
|
||||
|
||||
export type AgentBrowserExecOptions = {
|
||||
envOverrides?: NodeJS.ProcessEnv
|
||||
timeoutMs?: number
|
||||
timeoutError?: BrowserError
|
||||
/** The caller owns stdin, so the command goes as argv; only for Orca-authored tokens. */
|
||||
stdinText?: string
|
||||
/** Send tokens as argv so global options apply; only for Orca-authored or raw CLI tokens. */
|
||||
cliArgv?: boolean
|
||||
}
|
||||
+3
-3
@@ -2,10 +2,10 @@ import { EventEmitter } from 'node:events'
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import type { WebContents } from 'electron'
|
||||
import { runWithActionEffects, type ActionEffectsHost } from './agent-browser-action-effects'
|
||||
import type { BrowserPageEvent } from '../guest-lifecycle/browser-page-events'
|
||||
import { readBrowserActionEffects } from '../../../shared/browser-action-effects'
|
||||
import type { BrowserPageEvent } from '../../guest-lifecycle/page-activity/browser-page-events'
|
||||
import { readBrowserActionEffects } from '../../../../shared/browser-action-effects'
|
||||
|
||||
vi.mock('../routing/input-ownership/remote-cli-page-admission', () => ({
|
||||
vi.mock('../../routing/input-ownership/remote-cli-page-admission', () => ({
|
||||
readRemoteCliAdmittedPage: (_id: number, read: () => Promise<unknown>) => read()
|
||||
}))
|
||||
|
||||
+6
-6
@@ -1,12 +1,12 @@
|
||||
import { setTimeout as delay } from 'node:timers/promises'
|
||||
import type { WebContents } from 'electron'
|
||||
import type { BrowserActionEffects } from '../../../shared/runtime-browser-contracts'
|
||||
import { isRecord } from '../../../shared/agent-status/child-work/agent-status-child-work-value-guards'
|
||||
import { withTimeout } from '../../../shared/promise-timeout-fallback'
|
||||
import type { BrowserPageEvent } from '../guest-lifecycle/browser-page-events'
|
||||
import { readRemoteCliAdmittedPage } from '../routing/input-ownership/remote-cli-page-admission'
|
||||
import type { BrowserActionEffects } from '../../../../shared/runtime-browser-contracts'
|
||||
import { isRecord } from '../../../../shared/agent-status/child-work/agent-status-child-work-value-guards'
|
||||
import { withTimeout } from '../../../../shared/promise-timeout-fallback'
|
||||
import type { BrowserPageEvent } from '../../guest-lifecycle/page-activity/browser-page-events'
|
||||
import { readRemoteCliAdmittedPage } from '../../routing/input-ownership/remote-cli-page-admission'
|
||||
import { readPageChange } from './agent-browser-snapshot-delta'
|
||||
import { isLoadingMainFrame } from './agent-browser-bridge-process'
|
||||
import { isLoadingMainFrame } from '../commands/agent-browser-navigation-settle'
|
||||
|
||||
// Settle like ChatGPT's browser: wait for a started navigation, then for a short DOM-quiet window.
|
||||
const NAVIGATION_START_GRACE_MS = 50
|
||||
+1
-1
@@ -3,7 +3,7 @@ import type {
|
||||
BrowserConsoleResult,
|
||||
BrowserNetworkEntry,
|
||||
BrowserNetworkLogResult
|
||||
} from '../../../shared/runtime-browser-contracts'
|
||||
} from '../../../../shared/runtime-browser-contracts'
|
||||
|
||||
// Shapes agent-browser prints for `console --json` and `network requests --json` (0.27 and 0.41).
|
||||
export type AgentBrowserConsoleOutput = { messages: { type: string; text: string }[] }
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
import type { BrowserScreenshotOptions } from '../../../shared/rpc-contract/browser-observation-params'
|
||||
import type { BrowserScreenshotOptions } from '../../../../shared/rpc-contract/browser-observation-params'
|
||||
import { randomUUID } from 'node:crypto'
|
||||
import { readFile, rm } from 'node:fs/promises'
|
||||
import { join } from 'node:path'
|
||||
@@ -6,8 +6,8 @@ import { z } from 'zod'
|
||||
import type {
|
||||
BrowserScreenshotAnnotation,
|
||||
BrowserScreenshotResult
|
||||
} from '../../../shared/runtime-browser-contracts'
|
||||
import { BrowserError } from '../browser-error'
|
||||
} from '../../../../shared/runtime-browser-contracts'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
|
||||
const Annotation: z.ZodType<BrowserScreenshotAnnotation> = z.object({
|
||||
ref: z.string(),
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
import type { BrowserActionEffects } from '../../../shared/runtime-browser-contracts'
|
||||
import { isRecord } from '../../../shared/agent-status/child-work/agent-status-child-work-value-guards'
|
||||
import type { BrowserActionEffects } from '../../../../shared/runtime-browser-contracts'
|
||||
import { isRecord } from '../../../../shared/agent-status/child-work/agent-status-child-work-value-guards'
|
||||
|
||||
// Results travel to remote clients with a 768 KB budget; agents read them in their context.
|
||||
const PAGE_CHARS = 6_000
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import { classifyErrorCode } from './agent-browser-bridge-process'
|
||||
import { classifyErrorCode } from '../helper-process/agent-browser-command-errors'
|
||||
import {
|
||||
parseAgentBrowserJsonOutput,
|
||||
type AgentBrowserEnvelope
|
||||
@@ -0,0 +1,42 @@
|
||||
export function parseShellArgs(input: string): string[] {
|
||||
const args: string[] = []
|
||||
let current = ''
|
||||
let inDouble = false
|
||||
let inSingle = false
|
||||
|
||||
for (let i = 0; i < input.length; i++) {
|
||||
const ch = input[i]
|
||||
if (ch === '"' && !inSingle) {
|
||||
inDouble = !inDouble
|
||||
} else if (ch === "'" && !inDouble) {
|
||||
inSingle = !inSingle
|
||||
} else if (ch === ' ' && !inDouble && !inSingle) {
|
||||
if (current) {
|
||||
args.push(current)
|
||||
current = ''
|
||||
}
|
||||
} else {
|
||||
current += ch
|
||||
}
|
||||
}
|
||||
if (current) {
|
||||
args.push(current)
|
||||
}
|
||||
return args
|
||||
}
|
||||
|
||||
export function stripAgentBrowserTargetArgs(args: string[]): string[] {
|
||||
const stripped: string[] = []
|
||||
for (let index = 0; index < args.length; index++) {
|
||||
const arg = args[index]
|
||||
if (arg === '--cdp' || arg === '--session') {
|
||||
index++
|
||||
continue
|
||||
}
|
||||
if (arg.startsWith('--cdp=') || arg.startsWith('--session=')) {
|
||||
continue
|
||||
}
|
||||
stripped.push(arg)
|
||||
}
|
||||
return stripped
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
|
||||
// Why: agent-browser's `set media` matches the bare tokens dark/light/reduced-motion
|
||||
// anywhere in its args and silently ignores everything else, so map Orca's values here.
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import type { BrowserSnapshotOptions } from '../../../shared/rpc-contract/browser-observation-params'
|
||||
import type { BrowserSnapshotOptions } from '../../../../shared/rpc-contract/browser-observation-params'
|
||||
|
||||
export function agentBrowserSnapshotArgs(options: BrowserSnapshotOptions): string[] {
|
||||
const args = ['snapshot']
|
||||
@@ -0,0 +1,3 @@
|
||||
export const AGENT_BROWSER_TEXT_ARGUMENT_MAX_BYTES = 8 * 1024
|
||||
|
||||
export const AGENT_BROWSER_CLIPBOARD_WRITE_MAX_BYTES = AGENT_BROWSER_TEXT_ARGUMENT_MAX_BYTES
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import { BROWSER_WAIT_DEFAULT_TIMEOUT_MS } from '../../../shared/browser-wait-timeout'
|
||||
import { BROWSER_WAIT_DEFAULT_TIMEOUT_MS } from '../../../../shared/browser-wait-timeout'
|
||||
|
||||
// Lets agent-browser report its own wait timeout before Orca kills the process.
|
||||
const WAIT_PROCESS_TIMEOUT_GRACE_MS = 5_000
|
||||
+7
-7
@@ -1,11 +1,11 @@
|
||||
import { CdpWsProxy } from '../cdp/transport/cdp-ws-proxy'
|
||||
import { BrowserError } from '../browser-error'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from './agent-browser-orphan-sweep'
|
||||
import { AgentBrowserBridgeRawProcess } from './agent-browser-bridge-raw-process'
|
||||
import type { AgentBrowserCleanupOptions } from './agent-browser-bridge-types'
|
||||
import { AGENT_BROWSER_CLEANUP_TIMEOUT_MS } from './agent-browser-bridge-types'
|
||||
import { CdpWsProxy } from '../../cdp/transport/cdp-ws-proxy'
|
||||
import { BrowserError } from '../../browser-error'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from './agent-browser-session-name'
|
||||
import { AgentBrowserBridgeRawProcess } from '../helper-process/agent-browser-bridge-raw-process'
|
||||
import type { AgentBrowserCleanupOptions } from './agent-browser-cleanup-options'
|
||||
import { AGENT_BROWSER_CLEANUP_TIMEOUT_MS } from './agent-browser-cleanup-options'
|
||||
import { waitForAgentBrowserSessionExit } from './agent-browser-session-reset'
|
||||
import { runOutsideRemoteCliBrowserScope } from '../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
import { runOutsideRemoteCliBrowserScope } from '../../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
|
||||
|
||||
export abstract class AgentBrowserBridgeLifecycle extends AgentBrowserBridgeRawProcess {
|
||||
async onTabClosed(webContentsId: number): Promise<void> {
|
||||
+4
-5
@@ -1,10 +1,7 @@
|
||||
import { mapSettledWithConcurrency } from '../../../shared/map-with-concurrency'
|
||||
import { mapSettledWithConcurrency } from '../../../../shared/map-with-concurrency'
|
||||
import { sweepOrphanedAgentBrowserSessions } from './agent-browser-orphan-sweep'
|
||||
import { AgentBrowserBridgeLifecycle } from './agent-browser-bridge-lifecycle'
|
||||
import {
|
||||
AGENT_BROWSER_CLEANUP_CONCURRENCY,
|
||||
type AgentBrowserCleanupOptions
|
||||
} from './agent-browser-bridge-types'
|
||||
import type { AgentBrowserCleanupOptions } from './agent-browser-cleanup-options'
|
||||
|
||||
export abstract class AgentBrowserBridgeShutdown extends AgentBrowserBridgeLifecycle {
|
||||
async sweepOrphanedSessions(): Promise<string[]> {
|
||||
@@ -33,3 +30,5 @@ export abstract class AgentBrowserBridgeShutdown extends AgentBrowserBridgeLifec
|
||||
this.pendingInterceptRestore.clear()
|
||||
}
|
||||
}
|
||||
|
||||
export const AGENT_BROWSER_CLEANUP_CONCURRENCY = 4
|
||||
@@ -0,0 +1,8 @@
|
||||
// Cleanup must finish within the 20s quit barrier.
|
||||
export const AGENT_BROWSER_CLEANUP_TIMEOUT_MS = 5_000
|
||||
|
||||
export type AgentBrowserCleanupOptions = {
|
||||
closeTimeoutMs?: number
|
||||
/** Preserve queued commands for the replacement session. */
|
||||
keepQueuedCommands?: boolean
|
||||
}
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
import { runProcess } from '@orca/process-host'
|
||||
|
||||
export const ORCA_TAB_SESSION_PREFIX = 'orca-tab-'
|
||||
import { ORCA_TAB_SESSION_PREFIX } from './agent-browser-session-name'
|
||||
|
||||
const SWEEP_TIMEOUT_MS = 5_000
|
||||
const SWEEP_MAX_OUTPUT_BYTES = 256 * 1024
|
||||
@@ -0,0 +1 @@
|
||||
export const ORCA_TAB_SESSION_PREFIX = 'orca-tab-'
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user