diff --git a/apps/server/src/fork/fyi/FyiRuntimeLayer.test.ts b/apps/server/src/fork/fyi/FyiRuntimeLayer.test.ts index a54e5ab1d59dc..c802c01940407 100644 --- a/apps/server/src/fork/fyi/FyiRuntimeLayer.test.ts +++ b/apps/server/src/fork/fyi/FyiRuntimeLayer.test.ts @@ -39,6 +39,7 @@ import * as Orchestrator from "../../orchestration-v2/Orchestrator.ts"; import * as ProjectionStore from "../../orchestration-v2/ProjectionStore.ts"; import * as ProjectStore from "../../orchestration-v2/ProjectStore.ts"; import * as ProviderSessionManager from "../../orchestration-v2/ProviderSessionManager.ts"; +import { layerNoTaskFolders } from "../../orchestration-v2/ProviderTurnStartService.testkit.ts"; import * as RuntimeLayer from "../../orchestration-v2/runtimeLayer.ts"; import * as ThreadCommandExecutor from "../../orchestration-v2/ThreadCommandExecutor.ts"; import * as SqlitePersistence from "../../persistence/Sqlite.ts"; @@ -129,6 +130,7 @@ const layerTest = Layer.mergeAll( createWorktree: () => Effect.succeed({} as never), }), ), + Layer.provide(layerNoTaskFolders), Layer.provide( Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone, diff --git a/apps/server/src/fork/generalRoleParity.test.ts b/apps/server/src/fork/generalRoleParity.test.ts index 16d2f870d33c1..7abb7963aeca1 100644 --- a/apps/server/src/fork/generalRoleParity.test.ts +++ b/apps/server/src/fork/generalRoleParity.test.ts @@ -91,6 +91,7 @@ import * as ServerSettings from "../serverSettings.ts"; import { SourceControlRepositoryService } from "../sourceControl/SourceControlRepositoryService.ts"; import * as GitVcsDriver from "../vcs/GitVcsDriver.ts"; import { VcsStatusBroadcaster } from "../vcs/VcsStatusBroadcaster.ts"; +import { TaskFolders } from "../workspace/TaskFolders.ts"; const projectId = ProjectId.make("project:general-role-parity"); const environmentId = EnvironmentId.make("environment:general-role-parity"); @@ -726,6 +727,7 @@ const toolHandlerServices = Layer.mergeAll( Layer.mock(ThreadIssueService)({}), Layer.mock(ThreadLaunchService.ThreadLaunchService)({}), McpToolAccessTestkit.liveThreadsLayer, + Layer.mock(TaskFolders)({}), Layer.mock(ThreadSearch)({}), Layer.mock(VcsStatusBroadcaster)({}), ).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))); diff --git a/apps/server/src/fork/subThreads/SubThreads.test.ts b/apps/server/src/fork/subThreads/SubThreads.test.ts index 88f82b4cb88fa..4799fc1bb607e 100644 --- a/apps/server/src/fork/subThreads/SubThreads.test.ts +++ b/apps/server/src/fork/subThreads/SubThreads.test.ts @@ -64,6 +64,7 @@ const layerFor = (calls: Queue.Queue) => faviconPath: null, projectIcon: null, scripts: [], + trackedFolders: [], pinnedAt: null, archivedAt: null, createdAt: "2026-01-01T00:00:00.000Z", diff --git a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts index dddee5117f704..e3e81f35add76 100644 --- a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts @@ -1164,11 +1164,7 @@ const openSessionWithRunningCommand = Effect.fn("openSessionWithRunningCommand") }, withProcess: (_stop, task) => task, defaultModel: Effect.undefined, -<<<<<<< origin/main - profileDirectory: detachedChildProfile ?? unusedProfileDirectory, - }); -======= - ...(profileDirectory === undefined ? {} : { profileDirectory }), + profileDirectory: profileDirectory ?? unusedProfileDirectory, }; const adapter = options === undefined @@ -1177,6 +1173,7 @@ const openSessionWithRunningCommand = Effect.fn("openSessionWithRunningCommand") instanceId, flavor: makeAntigravityAcpAdapterFlavor({ ...adapterOptions, + digest: yield* Digest.Digest, random: crypto, fileSystem: yield* FileSystem.FileSystem, path, @@ -1190,7 +1187,6 @@ const openSessionWithRunningCommand = Effect.fn("openSessionWithRunningCommand") onDeferredFinalizeScheduled: (debounce) => Queue.offer(scheduledFinalizes, debounce), }, }); ->>>>>>> upstream/main const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({ runtimeMode: "full-access", interactionMode: "default", diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index bd682ff6c1349..0abaed8938fa1 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -380,7 +380,6 @@ describe("ClaudeAdapterV2 runtime query policy", () => { assert.isUndefined(options.extraArgs?.["dangerously-skip-permissions"]); }); -<<<<<<< origin/main it("loads a session-local plugin configured by the hosting T3 instance", () => { const options = ClaudeAdapterV2.makeClaudeQueryOptions({ modelSelection: CLAUDE_TEST_MODEL_SELECTION, @@ -392,10 +391,7 @@ describe("ClaudeAdapterV2 runtime query policy", () => { assert.deepEqual(options.plugins, [{ type: "local", path: "/path/to/whiteboard" }]); }); - it("passes every --add-dir and --plugin-dir launch directory to Claude", () => { -======= it("passes the thread's other folders and every --add-dir and --plugin-dir launch directory to Claude", () => { ->>>>>>> upstream/main const options = ClaudeAdapterV2.makeClaudeQueryOptions({ modelSelection: CLAUDE_TEST_MODEL_SELECTION, nativeThreadId: "native-add-dir", diff --git a/apps/server/src/orchestration-v2/CheckpointCaptureService.ts b/apps/server/src/orchestration-v2/CheckpointCaptureService.ts index b34352ec8a237..eacc37ee9cd18 100644 --- a/apps/server/src/orchestration-v2/CheckpointCaptureService.ts +++ b/apps/server/src/orchestration-v2/CheckpointCaptureService.ts @@ -207,11 +207,9 @@ export const layer: Layer.Layer< ); // Omit delegatedCompletion to preserve cohort writes made after capture loaded the run. const { delegatedCompletion: _delegatedCompletion, ...runWithoutDelegatedCompletion } = run; -<<<<<<< origin/main const commandId = CommandId.make( `command:effect:checkpoint.capture:${run.activeAttemptId ?? run.id}`, -======= - const commandId = CommandId.make(`command:effect:checkpoint.capture:${run.id}`); + ); const checkpointEvent = (payload: OrchestrationV2Checkpoint) => Effect.map(ids.allocate.event({ threadId: input.threadId, commandId }), (id) => ({ id, @@ -245,7 +243,6 @@ export const layer: Layer.Layer< yield* checkpointEvent(capture.checkpoint), ]; }), ->>>>>>> upstream/main ); yield* eventSink.commitCommand({ commandId, diff --git a/apps/server/src/orchestration-v2/CheckpointRollbackService.test.ts b/apps/server/src/orchestration-v2/CheckpointRollbackService.test.ts index 73981f4d2abc5..29dca0ac683cc 100644 --- a/apps/server/src/orchestration-v2/CheckpointRollbackService.test.ts +++ b/apps/server/src/orchestration-v2/CheckpointRollbackService.test.ts @@ -54,15 +54,11 @@ const layerCheckpointRollbackService = CheckpointRollbackService.layer.pipe( Layer.provide( Layer.mergeAll( NodeServices.layer, -<<<<<<< origin/main + layerNoTaskFolders, Layer.mock(ServerConfig.ServerConfig)({ worktreesDir: "/synthetic-worktrees", worktreeCheckoutCacheDir: "/synthetic-caches/worktree-checkouts", } as never), -======= - layerNoTaskFolders, - Layer.mock(ServerConfig.ServerConfig)({ worktreesDir: "/synthetic-worktrees" } as never), ->>>>>>> upstream/main ServerSettings.layerTest(), Layer.mock(GitWorkflow.GitWorkflowService)({}), Layer.mock(ProjectStore.ProjectStoreV2)({ get: () => Effect.succeed(unrelatedProject) }), @@ -241,15 +237,11 @@ it.effect.each([ Layer.mergeAll( ThreadCommandExecutor.layer, NodeServices.layer, -<<<<<<< origin/main + layerNoTaskFolders, Layer.mock(ServerConfig.ServerConfig)({ worktreesDir, worktreeCheckoutCacheDir: "/synthetic-caches/worktree-checkouts", } as never), -======= - layerNoTaskFolders, - Layer.mock(ServerConfig.ServerConfig)({ worktreesDir } as never), ->>>>>>> upstream/main ServerSettings.layerTest(), Layer.mock(ProjectStore.ProjectStoreV2)({ get: (id) => { diff --git a/apps/server/src/orchestration-v2/SteeringCompletion.integration.test.ts b/apps/server/src/orchestration-v2/SteeringCompletion.integration.test.ts index 46750ba00caa9..bbe1d84f40fa1 100644 --- a/apps/server/src/orchestration-v2/SteeringCompletion.integration.test.ts +++ b/apps/server/src/orchestration-v2/SteeringCompletion.integration.test.ts @@ -1365,7 +1365,6 @@ it.effect("restarts the turn for an image when native steering takes text only", }), ); -<<<<<<< origin/main it.effect.each(["completed", "interrupted"] as const)( "checkpoints a run that a steer restarted after its first answer was checkpointed (restart %s)", (restartEnd) => @@ -1485,46 +1484,12 @@ it.effect.each(["completed", "interrupted"] as const)( }), ); -it.effect("starts a steer that missed the turn on the saved next-turn selection", () => - Effect.gen(function* () { - const { events, started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness( - "steering-selection-follow-up", - ); - yield* Effect.gen(function* () { - const orchestrator = yield* Orchestrator.OrchestratorV2; - const worker = yield* EffectWorker.OrchestrationEffectWorkerV2; - const threadId = yield* startFirstTurn; - const first = started[0]!; - yield* orchestrator.dispatch({ - type: "message.dispatch", - commandId: CommandId.make("steer"), - threadId, - messageId: MessageId.make("message:steer"), - text: "late steer", - attachments: [], - modelSelection: composerSelection, - dispatchMode: { type: "steer_active", targetRunId: first.runId }, - createdBy: "user", - creationSource: "web", - }); - const settled = yield* orchestrator.streamDomainEvents.pipe( - Stream.filter( - (event) => - event.type === "run.updated" && - event.payload.id === first.runId && - event.payload.status === "waiting", - ), - Stream.take(1), - Stream.runDrain, - Effect.forkScoped, -======= it.effect.each(["complete", "stop-before-end"] as const)( "starts a steer that missed the turn in its place on the saved next-turn selection: %s", (timing) => Effect.gen(function* () { const { events, started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness( `steering-selection-follow-up-${timing}`, ->>>>>>> upstream/main ); yield* Effect.gen(function* () { const orchestrator = yield* Orchestrator.OrchestratorV2; diff --git a/apps/server/src/orchestration-v2/runtimeLayer.ts b/apps/server/src/orchestration-v2/runtimeLayer.ts index 03bc47a705e70..b3f5547228bf3 100644 --- a/apps/server/src/orchestration-v2/runtimeLayer.ts +++ b/apps/server/src/orchestration-v2/runtimeLayer.ts @@ -61,17 +61,14 @@ import * as ThreadForkService from "./ThreadForkService.ts"; import * as TurnItemPositionStore from "./TurnItemPositionStore.ts"; import * as ScheduledTaskService from "../scheduledTasks/ScheduledTaskService.ts"; import * as SecretRequests from "../secrets/SecretRequests.ts"; -<<<<<<< origin/main import * as DisplayModeWrap from "../fork/displayModeWrap/DisplayModeWrap.ts"; import * as FyiDelivery from "../fork/fyi/FyiDelivery.ts"; import * as FyiWakeWorker from "../fork/fyi/FyiWakeWorker.ts"; import * as ThreadDashboard from "../fork/threadDashboard/ThreadDashboard.ts"; import * as UserView from "../fork/userView/UserView.ts"; import * as SubThreads from "../fork/subThreads/SubThreads.ts"; -======= import * as WorkspaceFolders from "../workspace/WorkspaceFolders.ts"; import * as TaskFolderStore from "../workspace/TaskFolderStore.ts"; ->>>>>>> upstream/main export const layerEventInfrastructure = Layer.mergeAll( OrchestrationEventStore.layer, diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json index 8b652d807e5a6..99ee9f1c10f34 100644 --- a/apps/server/src/provider/agentContextBudget.json +++ b/apps/server/src/provider/agentContextBudget.json @@ -1,11 +1,5 @@ { -<<<<<<< origin/main "claudeSystemAppendBytes": 5945, "codexAdditionalContextBytes": 7339, - "mcpToolListJsonBytes": 63920 -======= - "claudeSystemAppendBytes": 6245, - "codexAdditionalContextBytes": 7639, - "mcpToolListJsonBytes": 59052 ->>>>>>> upstream/main + "mcpToolListJsonBytes": 64573 } diff --git a/apps/server/src/storageCleanup.ts b/apps/server/src/storageCleanup.ts index 216e9049a31ec..25c5c7a7d0297 100644 --- a/apps/server/src/storageCleanup.ts +++ b/apps/server/src/storageCleanup.ts @@ -337,11 +337,8 @@ const make = Effect.gen(function* () { const terminals = yield* TerminalManager.TerminalManager; const fs = yield* FileSystem.FileSystem; const path = yield* Path.Path; -<<<<<<< origin/main const homeCacheDir = yield* homeCheckoutCacheDir; -======= const taskFolders = yield* TaskFolders.TaskFolders; ->>>>>>> upstream/main const liveTerminals = new Map>(); const orphanSizes = new Map(); const noteTerminal = (terminal: TerminalSummary) => { diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx index 311c45c4d2590..acde0756bdb72 100644 --- a/apps/web/src/components/ChatView.tsx +++ b/apps/web/src/components/ChatView.tsx @@ -1001,27 +1001,11 @@ export default function ChatView(props: ChatViewProps) { threadId: parentSubagentThreadRef.threadId, title: parentSubagentThread?.title ?? gt("Parent thread"), }; -<<<<<<< origin/main - const threadError = isServerThread - ? (localServerError ?? (subThreadDraft === null ? serverRuntime?.lastError : null) ?? null) - : localDraftError; - const threadErrorBannerKey = getThreadErrorBannerKey( - routeThreadKey, - threadError, - threadErrorIsServerRuntime({ - isServerThread, - localServerError, - runtimeError: serverRuntime?.lastError ?? null, - }) - ? (serverRuntime?.lastErrorSource ?? null) - : null, - ); -======= const { threadError, sessionDismissal: threadErrorSessionDismissal } = resolveThreadErrorBanner({ isServerThread, localServerError, localDraftError, - runtimeError: serverRuntime?.lastError ?? null, + runtimeError: subThreadDraft === null ? (serverRuntime?.lastError ?? null) : null, runtimeErrorSource: serverRuntime?.lastErrorSource ?? null, }); const threadErrorBannerKey = @@ -1032,7 +1016,6 @@ export default function ChatView(props: ChatViewProps) { threadErrorSessionDismissal.error, threadErrorSessionDismissal.source, ); ->>>>>>> upstream/main const visibleThreadError = shouldShowThreadErrorBanner( routeThreadKey, threadError, @@ -1731,13 +1714,9 @@ export default function ChatView(props: ChatViewProps) { const threadShownView = useThreadShownView(routeThreadDetailRef); // A paged history window cannot identify the first loaded run as the thread start. const threadStartCheckpointAvailable = -<<<<<<< origin/main !serverThreadHistory.hasMoreHistory && !threadShownView && - findRevertCheckpoint(serverProjection?.checkpoints ?? [], 0) !== undefined; -======= - !serverThreadHistory.hasMoreHistory && findRevertCheckpoint(serverProjection, 0) !== undefined; ->>>>>>> upstream/main + findRevertCheckpoint(serverProjection, 0) !== undefined; const workspaceMutationId = deriveWorkspaceMutationId( serverVisibleTurnItems, @@ -3411,7 +3390,6 @@ export default function ChatView(props: ChatViewProps) { return embedded ? null : ; } -<<<<<<< origin/main const renderRightPanelSurface = (surface: RightPanelSurface, visible: boolean) => activeThreadRef ? ( ) : null; -======= - const rightPanelContent = activeThreadRef ? ( - 1 - ? addPullRequestsSurfaceStable - : undefined, - }} - issuesSupported={serverConfig?.environment.capabilities.issues === true} - files={{ - projectId: activeProject?.id, - projectName: activeProject?.title ?? null, - workspaceRoot: activeWorkspaceRoot, - availableEditors, - pendingSurfaceIds: pendingFileSurfaceIds, - onOpenFile: openFileSurfaceStable, - onPendingChange: handleFilePendingChangeStable, - }} - /> - ) : null; ->>>>>>> upstream/main const panelToggleControlProps = { terminalAvailable: activeProject !== null, terminalOpen: terminalUiState.terminalOpen, @@ -4321,25 +4244,16 @@ export default function ChatView(props: ChatViewProps) { /> ) : null} -<<<<<<< origin/main {subThreadDraft === null ? ( ) : null} -======= - ->>>>>>> upstream/main {embedded ? null : } {subThreadDraft === null ? : null} diff --git a/apps/web/src/components/settings/SettingsSidebarNav.tsx b/apps/web/src/components/settings/SettingsSidebarNav.tsx index a2505cdfa4fc6..39cd2a402e151 100644 --- a/apps/web/src/components/settings/SettingsSidebarNav.tsx +++ b/apps/web/src/components/settings/SettingsSidebarNav.tsx @@ -149,11 +149,7 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) { const [compactSearchOpen, setCompactSearchOpen] = useState(false); const [activeResultIndex, setActiveResultIndex] = useState(0); const searchableItems = useAvailableSettingsSearchItems(); -<<<<<<< origin/main - const navGroups = useForkSettingsNavGroups(SETTINGS_NAV_GROUPS); -======= - const navGroups = settingsNavGroups(useHasSecretProvidersEnvironment()); ->>>>>>> upstream/main + const navGroups = useForkSettingsNavGroups(settingsNavGroups(useHasSecretProvidersEnvironment())); const results = searchSettings(query, searchableItems, m); const isSearching = query.trim().length > 0; const hasResults = results.length > 0; diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts index 9dfb52721b389..02db48959aa9e 100644 --- a/apps/web/src/components/settings/settingsSearch.ts +++ b/apps/web/src/components/settings/settingsSearch.ts @@ -96,12 +96,9 @@ export interface SettingsSearchAvailability { /** An environment without a provider allow-list, which hides text generators. */ readonly hasTextGeneratorsEnvironment?: boolean; readonly hasPrimaryEnvironment?: boolean; -<<<<<<< origin/main + readonly hasSecretProvidersEnvironment?: boolean; /** A whiteboard board host, the only place the right panel's menu settings exist. */ readonly hasRightPanelMenu?: boolean; -======= - readonly hasSecretProvidersEnvironment?: boolean; ->>>>>>> upstream/main } export const SETTINGS_SECTION_LABELS: Readonly> = { @@ -1703,14 +1700,10 @@ export function filterAvailableSettingsSearchItems( (!item.peerLinksOnly || availability.hasPeerLinkHost === true) && (!item.fastWorktreeCheckoutOnly || availability.hasFastWorktreeCheckoutEnvironment === true) && -<<<<<<< origin/main (!item.reflinkWorktreesOnly || availability.hasReflinkWorktreesEnvironment === true) && (!item.textGeneratorsOnly || availability.hasTextGeneratorsEnvironment === true) && + (!item.secretProvidersOnly || availability.hasSecretProvidersEnvironment === true) && (!item.rightPanelMenuOnly || availability.hasRightPanelMenu === true), -======= - (!item.textGeneratorsOnly || availability.hasTextGeneratorsEnvironment === true) && - (!item.secretProvidersOnly || availability.hasSecretProvidersEnvironment === true), ->>>>>>> upstream/main ); } diff --git a/apps/web/src/components/settings/useAvailableSettingsSearchItems.ts b/apps/web/src/components/settings/useAvailableSettingsSearchItems.ts index 6cdf3e01ef1bc..d9aaa32be74cf 100644 --- a/apps/web/src/components/settings/useAvailableSettingsSearchItems.ts +++ b/apps/web/src/components/settings/useAvailableSettingsSearchItems.ts @@ -94,10 +94,7 @@ export function useAvailableSettingsSearchItems() { hasReflinkWorktreesEnvironment, hasTextGeneratorsEnvironment, hasPrimaryEnvironment: primaryEnvironmentId !== null, -<<<<<<< origin/main - hasRightPanelMenu, -======= hasSecretProvidersEnvironment, ->>>>>>> upstream/main + hasRightPanelMenu, }); } diff --git a/packages/shared/src/fork/usageSourceLabel.test.ts b/packages/shared/src/fork/usageSourceLabel.test.ts new file mode 100644 index 0000000000000..0f5e9357c3b54 --- /dev/null +++ b/packages/shared/src/fork/usageSourceLabel.test.ts @@ -0,0 +1,42 @@ +import { EnvironmentId, ProviderDriverKind, UsageLimitSourceId } from "@t3tools/contracts"; +import { describe, expect, it } from "vite-plus/test"; + +import { collectLimitNotices } from "../usageLimitsCopy.ts"; + +describe("usage source account labels", () => { + it("names a failed hub account's notice by its label, as its row", () => { + const failed = (id: string, workspaceId: string, label: string) => ({ + id, + driver: ProviderDriverKind.make("codex"), + email: "a@example.com", + label, + workspaceId, + usageLimits: { + checkedAt: "2026-09-03T11:00:00.000Z", + windows: [], + unavailable: { reason: "probeFailed" as const, message: "HTTP 429." }, + }, + }); + const input = new Map([ + [ + EnvironmentId.make("env-a"), + { + entry: { target: { label: "Laptop" } }, + serverConfig: { + providers: [], + usageLimitSources: [ + { + id: UsageLimitSourceId.make("hub"), + kind: "cliproxy" as const, + label: "hub", + checkedAt: "2026-09-03T11:00:00.000Z", + accounts: [failed("work", "ws-1", "Work"), failed("home", "ws-2", "Home")], + }, + ], + }, + }, + ], + ]); + expect(collectLimitNotices(input)).toEqual(["hub · Work: HTTP 429.", "hub · Home: HTTP 429."]); + }); +}); diff --git a/packages/shared/src/usageLimits.ts b/packages/shared/src/usageLimits.ts index 4a2d3cbd2858b..972b7c5f80f01 100644 --- a/packages/shared/src/usageLimits.ts +++ b/packages/shared/src/usageLimits.ts @@ -437,9 +437,8 @@ export function collectLimitAccounts(presentations: LimitPresentations): readonl // A resolved account already has an identity; its public key must stay distinct from others'. const hub = resolved ? `${environmentId}:${source.id}` : hubIdentity(environmentId, source); const key = `${hub}:${account.id}${account.workspaceId ? `:${account.workspaceId}` : ""}`; -<<<<<<< origin/main merge( - resolved ?? key, + hubRowKey(resolveKey, environmentId, source, account), { key, driver: account.driver, @@ -463,29 +462,6 @@ export function collectLimitAccounts(presentations: LimitPresentations): readonl }, account.label !== undefined, ); -======= - merge(hubRowKey(resolveKey, environmentId, source, account), { - key, - driver: account.driver, - displayName: account.email ? null : hubAccountName(account), - email: account.email, - plan: account.plan, - accentColor: undefined, - environments: [], - sourceLabel, - redeem: account.usageLimits.resetCredits?.nextCreditId - ? { - environmentId, - input: { - sourceId: source.id, - accountId: account.id, - creditId: account.usageLimits.resetCredits.nextCreditId, - }, - } - : null, - limits: account.usageLimits, - }); ->>>>>>> upstream/main } } } @@ -518,7 +494,7 @@ export function unshownFailedHubAccounts( for (const account of source.accounts) { if (account.usageLimits.unavailable?.reason !== "probeFailed") continue; if (shownRows.has(hubRowKey(resolveKey, environmentId, source, account))) continue; - failed.set(account, account.email ?? hubAccountName(account)); + failed.set(account, account.label ?? account.email ?? hubAccountName(account)); } } }