Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions config/scripts/ci-shard-timings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10072,19 +10072,19 @@
"src/renderer/src/lib/startup-draft-input-kind.test.ts": 639,
"src/renderer/src/lib/state-collection-byte-estimate.test.ts": 131,
"src/renderer/src/lib/structured-agent-launch-settlement.test.ts": 36,
"src/renderer/src/lib/structured-agent-session-launch-after-failure.test.ts": 661,
"src/renderer/src/lib/structured-agent-session-launch-close-race.test.ts": 917,
"src/renderer/src/lib/structured-agent-session-launch-create-message.test.ts": 1976,
"src/renderer/src/lib/structured-agent-session-launch-different-request.test.ts": 717,
"src/renderer/src/lib/structured-agent-session-launch-exited-owner.test.ts": 1120,
"src/renderer/src/lib/structured-agent-session-launch-join-delivery.test.ts": 788,
"src/renderer/src/lib/structured-agent-session-launch-options.test.ts": 945,
"src/renderer/src/lib/structured-agent-session-launch-probe-outage.test.ts": 1616,
"src/renderer/src/lib/structured-agent-session-launch-prompt-stop.test.ts": 666,
"src/renderer/src/lib/structured-agent-session-launch-prompt.test.ts": 620,
"src/renderer/src/lib/structured-agent-session-launch-resume-identity.test.ts": 702,
"src/renderer/src/lib/structured-agent-session-launch.test.ts": 929,
"src/renderer/src/lib/structured-agent-session-new-chat-own-launch.test.ts": 2253,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-after-failure.test.ts": 661,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-close-race.test.ts": 917,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.test.ts": 1976,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-different-request.test.ts": 717,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-exited-owner.test.ts": 1120,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-join-delivery.test.ts": 788,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.test.ts": 945,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-probe-outage.test.ts": 1616,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt-stop.test.ts": 666,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt.test.ts": 620,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-resume-identity.test.ts": 702,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test.ts": 929,
"src/renderer/src/lib/agent-session/launch/structured-agent-session-new-chat-own-launch.test.ts": 2253,
"src/renderer/src/lib/structured-chat-tab-index.test.ts": 30,
"src/renderer/src/lib/syntax-highlighting/incremental-syntax-tokenizer.test.ts": 440,
"src/renderer/src/lib/syntax-highlighting/syntax-highlight-scheduler.test.ts": 135,
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/app-shell/use-app-startup-hydration.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { restoreStructuredLaunchSurfaces } from '@/lib/structured-agent-session-launch-surface'
import { restoreStructuredLaunchSurfaces } from '@/lib/agent-session/launch/structured-agent-session-launch-surface'
import { useEffect, useRef } from 'react'
import { restoreLocalStructuredChatsAtStartup } from '@/runtime/local-structured-chats'
import { syncZoomCSSVar } from '@/lib/ui-zoom'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { structuredAgentLabel } from '@/lib/structured-agent-session-launch-label'
import { structuredAgentLabel } from '@/lib/agent-session/launch/structured-agent-session-launch-label'
import type { AgentType } from '../../../../shared/agent-status-types'
import { NativeChatEmptyState } from './NativeChatEmptyState'
import { NativeChatInstallHero } from './NativeChatInstallHero'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => f
vi.mock('@/runtime/runtime-rpc-client', () => ({
ensureRuntimeEnvironmentCompatible: async () => {}
}))
vi.mock('@/lib/structured-agent-session-launch-label', () => ({
vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-label', () => ({
structuredAgentLabel: () => 'Codex'
}))
vi.mock('@/runtime/structured-agent-session-client', () => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Play } from 'lucide-react'
import { Button } from '@/components/ui/button'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import { translate } from '@/i18n/i18n'
import { structuredAgentLabel } from '@/lib/structured-agent-session-launch-label'
import { structuredAgentLabel } from '@/lib/agent-session/launch/structured-agent-session-launch-label'
import { wslHostDistroForTarget } from '@/lib/wsl-host-account-owner'
import { useAppStore } from '@/store'
import type { AgentType } from '../../../../shared/agent-status-types'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// @vitest-environment happy-dom

import type * as LaunchRegistry from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
import type * as LaunchOptions from '@/lib/agent-session/launch/structured-agent-session-launch-options'
import { cleanup, fireEvent, render, screen } from '@testing-library/react'

import { afterEach, expect, it, vi } from 'vitest'
Expand All @@ -22,12 +24,39 @@ vi.mock(
}
)

const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
(await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
const { mocks, moduleFactories, resetStructuredSessionMocks, launchModule } = await vi.hoisted(
async () => {
const setup = (
await import('./NativeChatStructuredSession.test-harness')
).createStructuredSessionMocks()
return {
...setup,
launchModule: setup.moduleFactories.structuredAgentSessionLaunch()
}
}
)

vi.mock('@/lib/structured-agent-session-launch', () =>
moduleFactories.structuredAgentSessionLaunch()
vi.mock('@/lib/agent-session/launch/structured-agent-session-launch', () => ({
retryStructuredAgentSessionLaunch: launchModule.retryStructuredAgentSessionLaunch,
relaunchFailedStructuredAgentSessionForMessage:
launchModule.relaunchFailedStructuredAgentSessionForMessage
}))
vi.mock(
'@/lib/agent-session/launch/structured-agent-session-launch-registry',
async (importOriginal) => ({
...(await importOriginal<typeof LaunchRegistry>()),
getStructuredAgentSessionLaunchLifecycle: launchModule.getStructuredAgentSessionLaunchLifecycle,
getStructuredAgentSessionLaunchResumes: launchModule.getStructuredAgentSessionLaunchResumes,
useStructuredAgentSessionLaunchLifecycle: launchModule.useStructuredAgentSessionLaunchLifecycle,
useStructuredAgentSessionLaunchFailure: launchModule.useStructuredAgentSessionLaunchFailure
})
)
vi.mock(
'@/lib/agent-session/launch/structured-agent-session-launch-options',
async (importOriginal) => ({
...(await importOriginal<typeof LaunchOptions>()),
useStructuredAgentSessionLaunchSelection: launchModule.useStructuredAgentSessionLaunchSelection
})
)
vi.mock('@/runtime/structured-agent-session-client', () =>
moduleFactories.structuredAgentSessionClient()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// @vitest-environment happy-dom

import type * as LaunchRegistry from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
import type * as LaunchOptions from '@/lib/agent-session/launch/structured-agent-session-launch-options'
import { cleanup, fireEvent, render, screen } from '@testing-library/react'
import { afterEach, describe, expect, it, vi } from 'vitest'
import { TooltipProvider } from '@/components/ui/tooltip'
Expand All @@ -8,12 +10,39 @@ import type {
AgentJournalThreadGoal
} from '../../../../shared/agent-session/journal/agent-session-journal-types'

const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
(await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
const { mocks, moduleFactories, resetStructuredSessionMocks, launchModule } = await vi.hoisted(
async () => {
const setup = (
await import('./NativeChatStructuredSession.test-harness')
).createStructuredSessionMocks()
return {
...setup,
launchModule: setup.moduleFactories.structuredAgentSessionLaunch()
}
}
)

vi.mock('@/lib/structured-agent-session-launch', () =>
moduleFactories.structuredAgentSessionLaunch()
vi.mock('@/lib/agent-session/launch/structured-agent-session-launch', () => ({
retryStructuredAgentSessionLaunch: launchModule.retryStructuredAgentSessionLaunch,
relaunchFailedStructuredAgentSessionForMessage:
launchModule.relaunchFailedStructuredAgentSessionForMessage
}))
vi.mock(
'@/lib/agent-session/launch/structured-agent-session-launch-registry',
async (importOriginal) => ({
...(await importOriginal<typeof LaunchRegistry>()),
getStructuredAgentSessionLaunchLifecycle: launchModule.getStructuredAgentSessionLaunchLifecycle,
getStructuredAgentSessionLaunchResumes: launchModule.getStructuredAgentSessionLaunchResumes,
useStructuredAgentSessionLaunchLifecycle: launchModule.useStructuredAgentSessionLaunchLifecycle,
useStructuredAgentSessionLaunchFailure: launchModule.useStructuredAgentSessionLaunchFailure
})
)
vi.mock(
'@/lib/agent-session/launch/structured-agent-session-launch-options',
async (importOriginal) => ({
...(await importOriginal<typeof LaunchOptions>()),
useStructuredAgentSessionLaunchSelection: launchModule.useStructuredAgentSessionLaunchSelection
})
)
vi.mock('@/runtime/structured-agent-session-client', () =>
moduleFactories.structuredAgentSessionClient()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,46 @@
// @vitest-environment happy-dom

import type * as LaunchRegistry from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
import type * as LaunchOptions from '@/lib/agent-session/launch/structured-agent-session-launch-options'
import { cleanup, render, screen } from '@testing-library/react'
import { afterEach, describe, expect, it, vi } from 'vitest'
import { TooltipProvider } from '@/components/ui/tooltip'
import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types'
import { NativeChatStructuredSession } from './NativeChatStructuredSession'

const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
(await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
const { mocks, moduleFactories, resetStructuredSessionMocks, launchModule } = await vi.hoisted(
async () => {
const setup = (
await import('./NativeChatStructuredSession.test-harness')
).createStructuredSessionMocks()
return {
...setup,
launchModule: setup.moduleFactories.structuredAgentSessionLaunch()
}
}
)

vi.mock('@/lib/structured-agent-session-launch', () =>
moduleFactories.structuredAgentSessionLaunch()
vi.mock('@/lib/agent-session/launch/structured-agent-session-launch', () => ({
retryStructuredAgentSessionLaunch: launchModule.retryStructuredAgentSessionLaunch,
relaunchFailedStructuredAgentSessionForMessage:
launchModule.relaunchFailedStructuredAgentSessionForMessage
}))
vi.mock(
'@/lib/agent-session/launch/structured-agent-session-launch-registry',
async (importOriginal) => ({
...(await importOriginal<typeof LaunchRegistry>()),
getStructuredAgentSessionLaunchLifecycle: launchModule.getStructuredAgentSessionLaunchLifecycle,
getStructuredAgentSessionLaunchResumes: launchModule.getStructuredAgentSessionLaunchResumes,
useStructuredAgentSessionLaunchLifecycle: launchModule.useStructuredAgentSessionLaunchLifecycle,
useStructuredAgentSessionLaunchFailure: launchModule.useStructuredAgentSessionLaunchFailure
})
)
vi.mock(
'@/lib/agent-session/launch/structured-agent-session-launch-options',
async (importOriginal) => ({
...(await importOriginal<typeof LaunchOptions>()),
useStructuredAgentSessionLaunchSelection: launchModule.useStructuredAgentSessionLaunchSelection
})
)
vi.mock('@/runtime/structured-agent-session-client', () =>
moduleFactories.structuredAgentSessionClient()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,51 @@
// @vitest-environment happy-dom

import type * as LaunchRegistry from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
import type * as LaunchOptions from '@/lib/agent-session/launch/structured-agent-session-launch-options'
import { cleanup, fireEvent, render, screen } from '@testing-library/react'
import { afterEach, describe, expect, it, vi } from 'vitest'
import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
import type { ManagedRuntimeInstallState } from '../../../../shared/managed-runtime-install'
import type { ManagedRuntimeInstallObservation } from '@/runtime/use-managed-runtime-install'

const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
(await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
const { mocks, moduleFactories, resetStructuredSessionMocks, launchModule } = await vi.hoisted(
async () => {
const setup = (
await import('./NativeChatStructuredSession.test-harness')
).createStructuredSessionMocks()
return {
...setup,
launchModule: setup.moduleFactories.structuredAgentSessionLaunch()
}
}
)
const install = vi.hoisted((): { observation: ManagedRuntimeInstallObservation } => ({
observation: { kind: 'inactive' }
}))

vi.mock('@/lib/structured-agent-session-launch', () =>
moduleFactories.structuredAgentSessionLaunch()
vi.mock('@/lib/agent-session/launch/structured-agent-session-launch', () => ({
retryStructuredAgentSessionLaunch: launchModule.retryStructuredAgentSessionLaunch,
relaunchFailedStructuredAgentSessionForMessage:
launchModule.relaunchFailedStructuredAgentSessionForMessage
}))
vi.mock(
'@/lib/agent-session/launch/structured-agent-session-launch-registry',
async (importOriginal) => ({
...(await importOriginal<typeof LaunchRegistry>()),
getStructuredAgentSessionLaunchLifecycle: launchModule.getStructuredAgentSessionLaunchLifecycle,
getStructuredAgentSessionLaunchResumes: launchModule.getStructuredAgentSessionLaunchResumes,
useStructuredAgentSessionLaunchLifecycle: launchModule.useStructuredAgentSessionLaunchLifecycle,
useStructuredAgentSessionLaunchFailure: launchModule.useStructuredAgentSessionLaunchFailure
})
)
vi.mock(
'@/lib/agent-session/launch/structured-agent-session-launch-options',
async (importOriginal) => ({
...(await importOriginal<typeof LaunchOptions>()),
useStructuredAgentSessionLaunchSelection: launchModule.useStructuredAgentSessionLaunchSelection
})
)
vi.mock('@/lib/structured-agent-session-launch-message', () =>
vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-message', () =>
moduleFactories.structuredAgentSessionLaunchMessage()
)
vi.mock('@/runtime/structured-agent-session-client', () =>
Expand All @@ -38,8 +67,8 @@ vi.mock('@/runtime/use-managed-runtime-install', () => ({

import { NativeChatStructuredSession } from './NativeChatStructuredSession'
import { agentSessionRefusalFailure } from '../../../../shared/agent-session/failures/agent-session-write-failure'
import { structuredLaunchFailure } from '@/lib/structured-agent-session-launch-failure'
import { StructuredAgentSessionCreateRefusalError } from '@/lib/structured-agent-session-launch-errors'
import { structuredLaunchFailure } from '@/lib/agent-session/launch/structured-agent-session-launch-failure'
import { StructuredAgentSessionCreateRefusalError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
import {
readNativeChatComposerDraft,
structuredAgentSessionDraftScopeKey,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,43 @@
// @vitest-environment happy-dom

import type * as LaunchRegistry from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
import type * as LaunchOptions from '@/lib/agent-session/launch/structured-agent-session-launch-options'
import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
import { afterEach, expect, it, vi } from 'vitest'

const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
(await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
const { mocks, moduleFactories, resetStructuredSessionMocks, launchModule } = await vi.hoisted(
async () => {
const setup = (
await import('./NativeChatStructuredSession.test-harness')
).createStructuredSessionMocks()
return {
...setup,
launchModule: setup.moduleFactories.structuredAgentSessionLaunch()
}
}
)

vi.mock('@/lib/structured-agent-session-launch', () =>
moduleFactories.structuredAgentSessionLaunch()
vi.mock('@/lib/agent-session/launch/structured-agent-session-launch', () => ({
retryStructuredAgentSessionLaunch: launchModule.retryStructuredAgentSessionLaunch,
relaunchFailedStructuredAgentSessionForMessage:
launchModule.relaunchFailedStructuredAgentSessionForMessage
}))
vi.mock(
'@/lib/agent-session/launch/structured-agent-session-launch-registry',
async (importOriginal) => ({
...(await importOriginal<typeof LaunchRegistry>()),
getStructuredAgentSessionLaunchLifecycle: launchModule.getStructuredAgentSessionLaunchLifecycle,
getStructuredAgentSessionLaunchResumes: launchModule.getStructuredAgentSessionLaunchResumes,
useStructuredAgentSessionLaunchLifecycle: launchModule.useStructuredAgentSessionLaunchLifecycle,
useStructuredAgentSessionLaunchFailure: launchModule.useStructuredAgentSessionLaunchFailure
})
)
vi.mock(
'@/lib/agent-session/launch/structured-agent-session-launch-options',
async (importOriginal) => ({
...(await importOriginal<typeof LaunchOptions>()),
useStructuredAgentSessionLaunchSelection: launchModule.useStructuredAgentSessionLaunchSelection
})
)
vi.mock('@/runtime/structured-agent-session-client', () =>
moduleFactories.structuredAgentSessionClient()
Expand Down
Loading
Loading