factory-factory 0.4.0 → 0.4.1

package/dist/src/backend/trpc/workspace/init.trpc.d.ts

@@ -1,5 +1,6 @@
+import { type Context } from '../../../backend/trpc/trpc.js';
 export declare const workspaceInitRouter: import("@trpc/server").TRPCBuiltRouter<{
-    ctx: import("../../../backend/trpc/trpc.js").Context;
+    ctx: Context;
     meta: object;
     errorShape: import("@trpc/server").TRPCDefaultErrorShape;
     transformer: true;
@@ -29,14 +30,14 @@ export declare const workspaceInitRouter: import("@trpc/server").TRPCBuiltRouter
         output: ({
             agentSessions: {
                 name: string | null;
-                workspaceId: string;
-                status: import("../../../../prisma/generated/enums.js").SessionStatus;
-                createdAt: Date;
-                updatedAt: Date;
-                id: string;
                 model: string;
                 workflow: string;
                 provider: import("../../../../prisma/generated/enums.js").SessionProvider;
+                updatedAt: Date;
+                id: string;
+                status: import("../../../../prisma/generated/enums.js").SessionStatus;
+                createdAt: Date;
+                workspaceId: string;
                 providerSessionId: string | null;
                 providerProjectPath: string | null;
                 providerProcessPid: number | null;
@@ -44,28 +45,22 @@ export declare const workspaceInitRouter: import("@trpc/server").TRPCBuiltRouter
             }[];
             terminalSessions: {
                 name: string | null;
-                workspaceId: string;
-                status: import("../../../../prisma/generated/enums.js").SessionStatus;
-                createdAt: Date;
                 updatedAt: Date;
                 id: string;
+                status: import("../../../../prisma/generated/enums.js").SessionStatus;
+                createdAt: Date;
+                workspaceId: string;
                 pid: number | null;
             }[];
         } & {
             name: string;
-            prUrl: string | null;
-            status: import("../../../../prisma/generated/enums.js").WorkspaceStatus;
-            createdAt: Date;
             updatedAt: Date;
             id: string;
-            description: string | null;
-            prNumber: number | null;
-            prReviewState: string | null;
-            prState: import("../../../../prisma/generated/enums.js").PRState;
-            prCiStatus: import("../../../../prisma/generated/enums.js").CIStatus;
-            branchName: string | null;
             projectId: string;
+            description: string | null;
+            status: import("../../../../prisma/generated/enums.js").WorkspaceStatus;
             worktreePath: string | null;
+            branchName: string | null;
             isAutoGeneratedBranch: boolean;
             creationSource: import("../../../../prisma/generated/enums.js").WorkspaceCreationSource;
             creationMetadata: import("@prisma/client/runtime/client").JsonValue | null;
@@ -82,6 +77,7 @@ export declare const workspaceInitRouter: import("@trpc/server").TRPCBuiltRouter
             runScriptPort: number | null;
             runScriptStartedAt: Date | null;
             runScriptStatus: import("../../../../prisma/generated/enums.js").RunScriptStatus;
+            prUrl: string | null;
             githubIssueNumber: number | null;
             githubIssueUrl: string | null;
             linearIssueId: string | null;
@@ -89,7 +85,15 @@ export declare const workspaceInitRouter: import("@trpc/server").TRPCBuiltRouter
             linearIssueUrl: string | null;
             defaultSessionProvider: import("../../../../prisma/generated/enums.js").WorkspaceProviderSelection;
             ratchetSessionProvider: import("../../../../prisma/generated/enums.js").WorkspaceProviderSelection;
+            createdAt: Date;
+            prNumber: number | null;
+            prState: import("../../../../prisma/generated/enums.js").PRState;
+            prReviewState: string | null;
+            prCiStatus: import("../../../../prisma/generated/enums.js").CIStatus;
             prUpdatedAt: Date | null;
+            prDiscoveryLastCheckedAt: Date | null;
+            prDiscoveryRetryCount: number;
+            prDiscoveryNextCheckAt: Date | null;
             prCiFailedAt: Date | null;
             prCiLastNotifiedAt: Date | null;
             prReviewLastCheckedAt: Date | null;

package/dist/src/backend/trpc/workspace/init.trpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.trpc.d.ts","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/init.trpc.ts"],"names":[],"mappings":"AA4DA,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiH9B,CAAC"}
+{"version":3,"file":"init.trpc.d.ts","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/init.trpc.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,OAAO,EAAkD,MAAM,qBAAqB,CAAC;AA8CnG,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8H9B,CAAC"}

package/dist/src/backend/trpc/workspace/init.trpc.js

@@ -1,20 +1,18 @@
 import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
 import { toError } from '../../../backend/lib/error-utils.js';
-import { initializeWorkspaceWorktree, retryQueuedDispatchAfterWorkspaceReady, } from '../../../backend/orchestration/workspace-init.orchestrator.js';
-import { executeStartupScriptPipeline } from '../../../backend/orchestration/workspace-init-script-pipeline.js';
-import { FactoryConfigService } from '../../../backend/services/factory-config.service.js';
-import { createLogger } from '../../../backend/services/logger.service.js';
-import { getWorkspaceInitPolicy, workspaceDataService, workspaceStateMachine, worktreeLifecycleService, } from '../../../backend/services/workspace/index.js';
+import { getWorkspaceInitPolicy } from '../../../backend/services/workspace/index.js';
 import { publicProcedure, router, trustedLocalProcedure } from '../../../backend/trpc/trpc.js';
-const logger = createLogger('workspace-init-trpc');
+const getLogger = (ctx) => ctx.appContext.services.createLogger('workspace-init-trpc');
 function maxRetriesExceededError(maxRetries) {
     return new TRPCError({
         code: 'TOO_MANY_REQUESTS',
         message: `Maximum retry attempts (${maxRetries}) exceeded`,
     });
 }
-async function retryFailedWorkspaceWithExistingWorktree(workspace, maxRetries) {
+async function retryFailedWorkspaceWithExistingWorktree(ctx, workspace, maxRetries) {
+    const { initializeWorkspaceWorktree, workspaceStateMachine } = ctx.appContext.services;
+    const logger = getLogger(ctx);
     const updatedWorkspace = await workspaceStateMachine.startProvisioning(workspace.id, {
         maxRetries,
     });
@@ -31,7 +29,10 @@ async function retryFailedWorkspaceWithExistingWorktree(workspace, maxRetries) {
     });
 }
 export const workspaceInitRouter = router({
-    getInitStatus: publicProcedure.input(z.object({ id: z.string() })).query(async ({ input }) => {
+    getInitStatus: publicProcedure
+        .input(z.object({ id: z.string() }))
+        .query(async ({ ctx, input }) => {
+        const { workspaceDataService } = ctx.appContext.services;
         const workspace = await workspaceDataService.findByIdWithProject(input.id);
         if (!workspace) {
             throw new TRPCError({
@@ -54,7 +55,9 @@ export const workspaceInitRouter = router({
     }),
     retryInit: trustedLocalProcedure
         .input(z.object({ id: z.string(), useExistingBranch: z.boolean().optional() }))
-        .mutation(async ({ input }) => {
+        .mutation(async ({ ctx, input }) => {
+        const { executeStartupScriptPipeline, factoryConfigService, initializeWorkspaceWorktree, retryQueuedDispatchAfterWorkspaceReady, workspaceDataService, workspaceStateMachine, worktreeLifecycleService, } = ctx.appContext.services;
+        const logger = getLogger(ctx);
         const workspace = await workspaceDataService.findByIdWithProject(input.id);
         if (!workspace?.project) {
             throw new TRPCError({
@@ -92,7 +95,7 @@ export const workspaceInitRouter = router({
         }
         if (isRetryableFromReadyWarning) {
             const worktreePath = workspace.worktreePath;
-            const factoryConfig = await FactoryConfigService.readConfig(worktreePath);
+            const factoryConfig = await factoryConfigService.readConfig(worktreePath);
             const updatedWorkspace = await workspaceStateMachine.startProvisioningFromReady(workspace.id, maxRetries);
             if (!updatedWorkspace) {
                 throw maxRetriesExceededError(maxRetries);
@@ -106,7 +109,7 @@ export const workspaceInitRouter = router({
             await retryQueuedDispatchAfterWorkspaceReady(workspace.id, null);
             return workspaceDataService.findById(input.id);
         }
-        await retryFailedWorkspaceWithExistingWorktree(workspace, maxRetries);
+        await retryFailedWorkspaceWithExistingWorktree(ctx, workspace, maxRetries);
         return workspaceDataService.findById(input.id);
     }),
 });

package/dist/src/backend/trpc/workspace/init.trpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.trpc.js","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/init.trpc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.trpc.js","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/init.trpc.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/trpc/workspace/run-script.router.test.js

@@ -4,16 +4,6 @@ import { join } from 'node:path';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 const mockFindByIdWithProject = vi.hoisted(() => vi.fn());
 const mockWriteFactoryConfigAndSyncWorkspace = vi.hoisted(() => vi.fn());
-vi.mock('@/backend/services/workspace', () => ({
-    workspaceDataService: {
-        findByIdWithProject: (...args) => mockFindByIdWithProject(...args),
-    },
-}));
-vi.mock('@/backend/services/run-script-config-persistence.service', () => ({
-    runScriptConfigPersistenceService: {
-        writeFactoryConfigAndSyncWorkspace: (...args) => mockWriteFactoryConfigAndSyncWorkspace(...args),
-    },
-}));
 import { workspaceRunScriptRouter } from './run-script.trpc.js';
 function createCaller(runScriptService, requestTrust) {
     return workspaceRunScriptRouter.createCaller({
@@ -31,6 +21,12 @@ function createCaller(runScriptService, requestTrust) {
                     getRunScriptStatus: runScriptService?.getRunScriptStatus ??
                         (async () => ({ status: 'IDLE', workspaceId: 'default' })),
                 },
+                workspaceDataService: {
+                    findByIdWithProject: (...args) => mockFindByIdWithProject(...args),
+                },
+                runScriptConfigPersistenceService: {
+                    writeFactoryConfigAndSyncWorkspace: (...args) => mockWriteFactoryConfigAndSyncWorkspace(...args),
+                },
             },
         },
     });

package/dist/src/backend/trpc/workspace/run-script.router.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-script.router.test.js","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/run-script.router.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-script.router.test.js","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/run-script.router.test.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/trpc/workspace/run-script.trpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-script.trpc.d.ts","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/run-script.trpc.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgGnC,CAAC"}
+{"version":3,"file":"run-script.trpc.d.ts","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/run-script.trpc.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6FnC,CAAC"}

package/dist/src/backend/trpc/workspace/run-script.trpc.js

@@ -1,7 +1,5 @@
 import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
-import { runScriptConfigPersistenceService } from '../../../backend/services/run-script-config-persistence.service.js';
-import { workspaceDataService } from '../../../backend/services/workspace/index.js';
 import { publicProcedure, router, trustedLocalProcedure } from '../../../backend/trpc/trpc.js';
 import { FactoryConfigSchema } from '../../../shared/schemas/factory-config.schema.js';
 export const workspaceRunScriptRouter = router({
@@ -10,7 +8,8 @@ export const workspaceRunScriptRouter = router({
         workspaceId: z.string(),
         config: FactoryConfigSchema,
     }))
-        .mutation(async ({ input }) => {
+        .mutation(async ({ ctx, input }) => {
+        const { runScriptConfigPersistenceService, workspaceDataService, workspaceRunScriptService } = ctx.appContext.services;
         const workspace = await workspaceDataService.findByIdWithProject(input.workspaceId);
         if (!workspace) {
             throw new TRPCError({
@@ -30,7 +29,7 @@ export const workspaceRunScriptRouter = router({
                 worktreePath: workspace.worktreePath,
                 projectRepoPath: workspace.project?.repoPath,
                 config: input.config,
-                persistWorkspaceCommands: (id, commands) => workspaceDataService.setRunScriptCommands(id, commands.runScriptCommand, commands.runScriptPostRunCommand, commands.runScriptCleanupCommand),
+                persistWorkspaceCommands: (id, commands) => workspaceRunScriptService.setCommands(id, commands),
             });
             return { success: true };
         }

package/dist/src/backend/trpc/workspace/run-script.trpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-script.trpc.js","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/run-script.trpc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-script.trpc.js","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/run-script.trpc.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/trpc/workspace/workspace-helpers.d.ts

@@ -1,15 +1,16 @@
-import { workspaceDataService } from '../../../backend/services/workspace/index.js';
-export declare function getWorkspaceOrThrow(workspaceId: string): Promise<{
+import type { ApplicationServices } from '../../../backend/app-context.js';
+type WorkspaceDataService = Pick<ApplicationServices['workspaceDataService'], 'findById' | 'findByIdWithProject'>;
+export declare function getWorkspaceOrThrow(workspaceDataService: WorkspaceDataService, workspaceId: string): Promise<{
     agentSessions: {
         name: string | null;
-        workspaceId: string;
-        status: import("../../../../prisma/generated/enums.js").SessionStatus;
-        createdAt: Date;
-        updatedAt: Date;
-        id: string;
         model: string;
         workflow: string;
         provider: import("../../../../prisma/generated/enums.js").SessionProvider;
+        updatedAt: Date;
+        id: string;
+        status: import("../../../../prisma/generated/enums.js").SessionStatus;
+        createdAt: Date;
+        workspaceId: string;
         providerSessionId: string | null;
         providerProjectPath: string | null;
         providerProcessPid: number | null;
@@ -17,28 +18,22 @@ export declare function getWorkspaceOrThrow(workspaceId: string): Promise<{
     }[];
     terminalSessions: {
         name: string | null;
-        workspaceId: string;
-        status: import("../../../../prisma/generated/enums.js").SessionStatus;
-        createdAt: Date;
         updatedAt: Date;
         id: string;
+        status: import("../../../../prisma/generated/enums.js").SessionStatus;
+        createdAt: Date;
+        workspaceId: string;
         pid: number | null;
     }[];
 } & {
     name: string;
-    prUrl: string | null;
-    status: import("../../../../prisma/generated/enums.js").WorkspaceStatus;
-    createdAt: Date;
     updatedAt: Date;
     id: string;
-    description: string | null;
-    prNumber: number | null;
-    prReviewState: string | null;
-    prState: import("../../../../prisma/generated/enums.js").PRState;
-    prCiStatus: import("../../../../prisma/generated/enums.js").CIStatus;
-    branchName: string | null;
     projectId: string;
+    description: string | null;
+    status: import("../../../../prisma/generated/enums.js").WorkspaceStatus;
     worktreePath: string | null;
+    branchName: string | null;
     isAutoGeneratedBranch: boolean;
     creationSource: import("../../../../prisma/generated/enums.js").WorkspaceCreationSource;
     creationMetadata: import("@prisma/client/runtime/client").JsonValue | null;
@@ -55,6 +50,7 @@ export declare function getWorkspaceOrThrow(workspaceId: string): Promise<{
     runScriptPort: number | null;
     runScriptStartedAt: Date | null;
     runScriptStatus: import("../../../../prisma/generated/enums.js").RunScriptStatus;
+    prUrl: string | null;
     githubIssueNumber: number | null;
     githubIssueUrl: string | null;
     linearIssueId: string | null;
@@ -62,7 +58,15 @@ export declare function getWorkspaceOrThrow(workspaceId: string): Promise<{
     linearIssueUrl: string | null;
     defaultSessionProvider: import("../../../../prisma/generated/enums.js").WorkspaceProviderSelection;
     ratchetSessionProvider: import("../../../../prisma/generated/enums.js").WorkspaceProviderSelection;
+    createdAt: Date;
+    prNumber: number | null;
+    prState: import("../../../../prisma/generated/enums.js").PRState;
+    prReviewState: string | null;
+    prCiStatus: import("../../../../prisma/generated/enums.js").CIStatus;
     prUpdatedAt: Date | null;
+    prDiscoveryLastCheckedAt: Date | null;
+    prDiscoveryRetryCount: number;
+    prDiscoveryNextCheckAt: Date | null;
     prCiFailedAt: Date | null;
     prCiLastNotifiedAt: Date | null;
     prReviewLastCheckedAt: Date | null;
@@ -85,12 +89,12 @@ export declare function getWorkspaceOrThrow(workspaceId: string): Promise<{
     cachedKanbanColumn: import("../../../../prisma/generated/enums.js").KanbanColumn;
     stateComputedAt: Date | null;
 }>;
-export declare function getWorkspaceWithProjectOrThrow(workspaceId: string): Promise<{
+export declare function getWorkspaceWithProjectOrThrow(workspaceDataService: WorkspaceDataService, workspaceId: string): Promise<{
     project: {
         name: string;
-        createdAt: Date;
         updatedAt: Date;
         id: string;
+        createdAt: Date;
         slug: string;
         repoPath: string;
         worktreeBasePath: string;
@@ -106,19 +110,13 @@ export declare function getWorkspaceWithProjectOrThrow(workspaceId: string): Pro
     };
 } & {
     name: string;
-    prUrl: string | null;
-    status: import("../../../../prisma/generated/enums.js").WorkspaceStatus;
-    createdAt: Date;
     updatedAt: Date;
     id: string;
-    description: string | null;
-    prNumber: number | null;
-    prReviewState: string | null;
-    prState: import("../../../../prisma/generated/enums.js").PRState;
-    prCiStatus: import("../../../../prisma/generated/enums.js").CIStatus;
-    branchName: string | null;
     projectId: string;
+    description: string | null;
+    status: import("../../../../prisma/generated/enums.js").WorkspaceStatus;
     worktreePath: string | null;
+    branchName: string | null;
     isAutoGeneratedBranch: boolean;
     creationSource: import("../../../../prisma/generated/enums.js").WorkspaceCreationSource;
     creationMetadata: import("@prisma/client/runtime/client").JsonValue | null;
@@ -135,6 +133,7 @@ export declare function getWorkspaceWithProjectOrThrow(workspaceId: string): Pro
     runScriptPort: number | null;
     runScriptStartedAt: Date | null;
     runScriptStatus: import("../../../../prisma/generated/enums.js").RunScriptStatus;
+    prUrl: string | null;
     githubIssueNumber: number | null;
     githubIssueUrl: string | null;
     linearIssueId: string | null;
@@ -142,7 +141,15 @@ export declare function getWorkspaceWithProjectOrThrow(workspaceId: string): Pro
     linearIssueUrl: string | null;
     defaultSessionProvider: import("../../../../prisma/generated/enums.js").WorkspaceProviderSelection;
     ratchetSessionProvider: import("../../../../prisma/generated/enums.js").WorkspaceProviderSelection;
+    createdAt: Date;
+    prNumber: number | null;
+    prState: import("../../../../prisma/generated/enums.js").PRState;
+    prReviewState: string | null;
+    prCiStatus: import("../../../../prisma/generated/enums.js").CIStatus;
     prUpdatedAt: Date | null;
+    prDiscoveryLastCheckedAt: Date | null;
+    prDiscoveryRetryCount: number;
+    prDiscoveryNextCheckAt: Date | null;
     prCiFailedAt: Date | null;
     prCiLastNotifiedAt: Date | null;
     prReviewLastCheckedAt: Date | null;
@@ -166,14 +173,15 @@ export declare function getWorkspaceWithProjectOrThrow(workspaceId: string): Pro
     stateComputedAt: Date | null;
 }>;
 export interface WorkspaceWithWorktree {
-    workspace: NonNullable<Awaited<ReturnType<typeof workspaceDataService.findById>>>;
+    workspace: NonNullable<Awaited<ReturnType<WorkspaceDataService['findById']>>>;
     worktreePath: string;
 }
-export declare function getWorkspaceWithWorktree(workspaceId: string): Promise<WorkspaceWithWorktree | null>;
-export declare function getWorkspaceWithWorktreeOrThrow(workspaceId: string): Promise<WorkspaceWithWorktree>;
+export declare function getWorkspaceWithWorktree(workspaceDataService: WorkspaceDataService, workspaceId: string): Promise<WorkspaceWithWorktree | null>;
+export declare function getWorkspaceWithWorktreeOrThrow(workspaceDataService: WorkspaceDataService, workspaceId: string): Promise<WorkspaceWithWorktree>;
 export interface WorkspaceWithProjectAndWorktree {
-    workspace: NonNullable<Awaited<ReturnType<typeof workspaceDataService.findByIdWithProject>>>;
+    workspace: NonNullable<Awaited<ReturnType<WorkspaceDataService['findByIdWithProject']>>>;
     worktreePath: string;
 }
-export declare function getWorkspaceWithProjectAndWorktreeOrThrow(workspaceId: string): Promise<WorkspaceWithProjectAndWorktree>;
+export declare function getWorkspaceWithProjectAndWorktreeOrThrow(workspaceDataService: WorkspaceDataService, workspaceId: string): Promise<WorkspaceWithProjectAndWorktree>;
+export {};
 //# sourceMappingURL=workspace-helpers.d.ts.map

package/dist/src/backend/trpc/workspace/workspace-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-helpers.d.ts","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/workspace-helpers.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAOpE,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAS5D;AAOD,wBAAsB,8BAA8B,CAAC,WAAW,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GASvE;AAKD,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAClF,YAAY,EAAE,MAAM,CAAC;CACtB;AAQD,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAQvC;AAQD,wBAAsB,+BAA+B,CACnD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,CAAC,CAWhC;AAKD,MAAM,WAAW,+BAA+B;IAC9C,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAC7F,YAAY,EAAE,MAAM,CAAC;CACtB;AAQD,wBAAsB,yCAAyC,CAC7D,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,+BAA+B,CAAC,CAiB1C"}
+{"version":3,"file":"workspace-helpers.d.ts","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/workspace-helpers.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,KAAK,oBAAoB,GAAG,IAAI,CAC9B,mBAAmB,CAAC,sBAAsB,CAAC,EAC3C,UAAU,GAAG,qBAAqB,CACnC,CAAC;AAOF,wBAAsB,mBAAmB,CACvC,oBAAoB,EAAE,oBAAoB,EAC1C,WAAW,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAUpB;AAOD,wBAAsB,8BAA8B,CAClD,oBAAoB,EAAE,oBAAoB,EAC1C,WAAW,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAUpB;AAKD,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,YAAY,EAAE,MAAM,CAAC;CACtB;AAQD,wBAAsB,wBAAwB,CAC5C,oBAAoB,EAAE,oBAAoB,EAC1C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAQvC;AAQD,wBAAsB,+BAA+B,CACnD,oBAAoB,EAAE,oBAAoB,EAC1C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,CAAC,CAWhC;AAKD,MAAM,WAAW,+BAA+B;IAC9C,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;IACzF,YAAY,EAAE,MAAM,CAAC;CACtB;AAQD,wBAAsB,yCAAyC,CAC7D,oBAAoB,EAAE,oBAAoB,EAC1C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,+BAA+B,CAAC,CAiB1C"}

package/dist/src/backend/trpc/workspace/workspace-helpers.js

@@ -1,6 +1,5 @@
 import { TRPCError } from '@trpc/server';
-import { workspaceDataService } from '../../../backend/services/workspace/index.js';
-export async function getWorkspaceOrThrow(workspaceId) {
+export async function getWorkspaceOrThrow(workspaceDataService, workspaceId) {
     const workspace = await workspaceDataService.findById(workspaceId);
     if (!workspace) {
         throw new TRPCError({
@@ -10,7 +9,7 @@ export async function getWorkspaceOrThrow(workspaceId) {
     }
     return workspace;
 }
-export async function getWorkspaceWithProjectOrThrow(workspaceId) {
+export async function getWorkspaceWithProjectOrThrow(workspaceDataService, workspaceId) {
     const workspace = await workspaceDataService.findByIdWithProject(workspaceId);
     if (!workspace) {
         throw new TRPCError({
@@ -20,15 +19,15 @@ export async function getWorkspaceWithProjectOrThrow(workspaceId) {
     }
     return workspace;
 }
-export async function getWorkspaceWithWorktree(workspaceId) {
-    const workspace = await getWorkspaceOrThrow(workspaceId);
+export async function getWorkspaceWithWorktree(workspaceDataService, workspaceId) {
+    const workspace = await getWorkspaceOrThrow(workspaceDataService, workspaceId);
     if (!workspace.worktreePath) {
         return null;
     }
     return { workspace, worktreePath: workspace.worktreePath };
 }
-export async function getWorkspaceWithWorktreeOrThrow(workspaceId) {
-    const workspace = await getWorkspaceOrThrow(workspaceId);
+export async function getWorkspaceWithWorktreeOrThrow(workspaceDataService, workspaceId) {
+    const workspace = await getWorkspaceOrThrow(workspaceDataService, workspaceId);
     if (!workspace.worktreePath) {
         throw new TRPCError({
             code: 'BAD_REQUEST',
@@ -37,7 +36,7 @@ export async function getWorkspaceWithWorktreeOrThrow(workspaceId) {
     }
     return { workspace, worktreePath: workspace.worktreePath };
 }
-export async function getWorkspaceWithProjectAndWorktreeOrThrow(workspaceId) {
+export async function getWorkspaceWithProjectAndWorktreeOrThrow(workspaceDataService, workspaceId) {
     const workspace = await workspaceDataService.findByIdWithProject(workspaceId);
     if (!workspace) {
         throw new TRPCError({

package/dist/src/backend/trpc/workspace/workspace-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-helpers.js","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/workspace-helpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAOpE,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,WAAmB;IAC3D,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACnE,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,SAAS,CAAC;YAClB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,wBAAwB,WAAW,EAAE;SAC/C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,WAAmB;IACtE,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAC9E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,SAAS,CAAC;YAClB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,wBAAwB,WAAW,EAAE;SAC/C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAgBD,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,WAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAEzD,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,YAAY,EAAE,CAAC;AAC7D,CAAC;AAQD,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,WAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAEzD,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QAC5B,MAAM,IAAI,SAAS,CAAC;YAClB,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,gCAAgC;SAC1C,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,YAAY,EAAE,CAAC;AAC7D,CAAC;AAgBD,MAAM,CAAC,KAAK,UAAU,yCAAyC,CAC7D,WAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAC9E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,SAAS,CAAC;YAClB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,wBAAwB,WAAW,EAAE;SAC/C,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QAC5B,MAAM,IAAI,SAAS,CAAC;YAClB,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,gCAAgC;SAC1C,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,YAAY,EAAE,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"workspace-helpers.js","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/workspace-helpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAazC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,oBAA0C,EAC1C,WAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACnE,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,SAAS,CAAC;YAClB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,wBAAwB,WAAW,EAAE;SAC/C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,oBAA0C,EAC1C,WAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAC9E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,SAAS,CAAC;YAClB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,wBAAwB,WAAW,EAAE;SAC/C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAgBD,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,oBAA0C,EAC1C,WAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAE/E,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,YAAY,EAAE,CAAC;AAC7D,CAAC;AAQD,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,oBAA0C,EAC1C,WAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAE/E,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QAC5B,MAAM,IAAI,SAAS,CAAC;YAClB,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,gCAAgC;SAC1C,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,YAAY,EAAE,CAAC;AAC7D,CAAC;AAgBD,MAAM,CAAC,KAAK,UAAU,yCAAyC,CAC7D,oBAA0C,EAC1C,WAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAC9E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,SAAS,CAAC;YAClB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,wBAAwB,WAAW,EAAE;SAC/C,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QAC5B,MAAM,IAAI,SAAS,CAAC;YAClB,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,gCAAgC;SAC1C,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,YAAY,EAAE,CAAC;AAC7D,CAAC"}

package/dist/src/backend/trpc/workspace/workspace-helpers.test.js

@@ -1,12 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 const mockFindById = vi.hoisted(() => vi.fn());
 const mockFindByIdWithProject = vi.hoisted(() => vi.fn());
-vi.mock('@/backend/services/workspace', () => ({
-    workspaceDataService: {
-        findById: (...args) => mockFindById(...args),
-        findByIdWithProject: (...args) => mockFindByIdWithProject(...args),
-    },
-}));
+const workspaceDataService = {
+    findById: (...args) => mockFindById(...args),
+    findByIdWithProject: (...args) => mockFindByIdWithProject(...args),
+};
 import { getWorkspaceOrThrow, getWorkspaceWithProjectAndWorktreeOrThrow, getWorkspaceWithProjectOrThrow, getWorkspaceWithWorktree, getWorkspaceWithWorktreeOrThrow, } from './workspace-helpers.js';
 describe('workspace helpers', () => {
     beforeEach(() => {
@@ -14,8 +12,10 @@ describe('workspace helpers', () => {
     });
     it('returns workspace when found', async () => {
         mockFindById.mockResolvedValue({ id: 'w1', worktreePath: '/tmp/w1' });
-        await expect(getWorkspaceOrThrow('w1')).resolves.toMatchObject({ id: 'w1' });
-        await expect(getWorkspaceWithWorktree('w1')).resolves.toEqual({
+        await expect(getWorkspaceOrThrow(workspaceDataService, 'w1')).resolves.toMatchObject({
+            id: 'w1',
+        });
+        await expect(getWorkspaceWithWorktree(workspaceDataService, 'w1')).resolves.toEqual({
             workspace: expect.objectContaining({ id: 'w1' }),
             worktreePath: '/tmp/w1',
         });
@@ -23,18 +23,20 @@ describe('workspace helpers', () => {
     it('throws NOT_FOUND when workspace is missing', async () => {
         mockFindById.mockResolvedValue(null);
         mockFindByIdWithProject.mockResolvedValue(null);
-        await expect(getWorkspaceOrThrow('missing')).rejects.toMatchObject({ code: 'NOT_FOUND' });
-        await expect(getWorkspaceWithProjectOrThrow('missing')).rejects.toMatchObject({
+        await expect(getWorkspaceOrThrow(workspaceDataService, 'missing')).rejects.toMatchObject({
+            code: 'NOT_FOUND',
+        });
+        await expect(getWorkspaceWithProjectOrThrow(workspaceDataService, 'missing')).rejects.toMatchObject({
             code: 'NOT_FOUND',
         });
-        await expect(getWorkspaceWithProjectAndWorktreeOrThrow('missing')).rejects.toMatchObject({
+        await expect(getWorkspaceWithProjectAndWorktreeOrThrow(workspaceDataService, 'missing')).rejects.toMatchObject({
             code: 'NOT_FOUND',
         });
     });
     it('returns null for missing worktree and throws for required worktree', async () => {
         mockFindById.mockResolvedValue({ id: 'w1', worktreePath: null });
-        await expect(getWorkspaceWithWorktree('w1')).resolves.toBeNull();
-        await expect(getWorkspaceWithWorktreeOrThrow('w1')).rejects.toMatchObject({
+        await expect(getWorkspaceWithWorktree(workspaceDataService, 'w1')).resolves.toBeNull();
+        await expect(getWorkspaceWithWorktreeOrThrow(workspaceDataService, 'w1')).rejects.toMatchObject({
             code: 'BAD_REQUEST',
         });
     });
@@ -44,8 +46,8 @@ describe('workspace helpers', () => {
             worktreePath: '/tmp/w2',
             project: { id: 'p1' },
         });
-        await expect(getWorkspaceWithProjectOrThrow('w2')).resolves.toMatchObject({ id: 'w2' });
-        await expect(getWorkspaceWithProjectAndWorktreeOrThrow('w2')).resolves.toEqual({
+        await expect(getWorkspaceWithProjectOrThrow(workspaceDataService, 'w2')).resolves.toMatchObject({ id: 'w2' });
+        await expect(getWorkspaceWithProjectAndWorktreeOrThrow(workspaceDataService, 'w2')).resolves.toEqual({
             workspace: expect.objectContaining({ id: 'w2' }),
             worktreePath: '/tmp/w2',
         });

package/dist/src/backend/trpc/workspace/workspace-helpers.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-helpers.test.js","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/workspace-helpers.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-helpers.test.js","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/workspace-helpers.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9D,MAAM,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC/C,MAAM,uBAAuB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC1D,MAAM,oBAAoB,GAAG;IAC3B,QAAQ,EAAE,CAAC,GAAG,IAAqC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;IAC7E,mBAAmB,EAAE,CAAC,GAAG,IAAgD,EAAE,EAAE,CAC3E,uBAAuB,CAAC,GAAG,IAAI,CAAC;CACnC,CAAC;AAEF,OAAO,EACL,mBAAmB,EACnB,yCAAyC,EACzC,8BAA8B,EAC9B,wBAAwB,EACxB,+BAA+B,GAChC,MAAM,qBAAqB,CAAC;AAE7B,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,YAAY,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;QAEtE,MAAM,MAAM,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YACnF,EAAE,EAAE,IAAI;SACT,CAAC,CAAC;QACH,MAAM,MAAM,CAAC,wBAAwB,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;YAClF,SAAS,EAAE,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;YAChD,YAAY,EAAE,SAAS;SACxB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,YAAY,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrC,uBAAuB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAEhD,MAAM,MAAM,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;YACvF,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;QACH,MAAM,MAAM,CACV,8BAA8B,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAChE,CAAC,OAAO,CAAC,aAAa,CAAC;YACtB,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;QACH,MAAM,MAAM,CACV,yCAAyC,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAC3E,CAAC,OAAO,CAAC,aAAa,CAAC;YACtB,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,YAAY,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QAEjE,MAAM,MAAM,CAAC,wBAAwB,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACvF,MAAM,MAAM,CAAC,+BAA+B,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAC7F;YACE,IAAI,EAAE,aAAa;SACpB,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,uBAAuB,CAAC,iBAAiB,CAAC;YACxC,EAAE,EAAE,IAAI;YACR,YAAY,EAAE,SAAS;YACvB,OAAO,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACtB,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,8BAA8B,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAC7F,EAAE,EAAE,EAAE,IAAI,EAAE,CACb,CAAC;QACF,MAAM,MAAM,CACV,yCAAyC,CAAC,oBAAoB,EAAE,IAAI,CAAC,CACtE,CAAC,QAAQ,CAAC,OAAO,CAAC;YACjB,SAAS,EAAE,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;YAChD,YAAY,EAAE,SAAS;SACxB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}