factory-factory 0.2.6 → 0.2.7

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

@@ -1,10 +1,10 @@
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { z } from 'zod';
+import { workspaceDataService } from '../../../backend/domains/workspace/index.js';
 import { isPathSafe } from '../../lib/file-helpers.js';
 import { getMergeBase, parseGitStatusOutput } from '../../lib/git-helpers.js';
 import { gitCommand } from '../../lib/shell.js';
-import { workspaceAccessor } from '../../resource_accessors/workspace.accessor.js';
 import { publicProcedure, router } from '../trpc.js';
 import { getWorkspaceWithProjectAndWorktreeOrThrow, getWorkspaceWithWorktree, } from './workspace-helpers.js';
 const loggerName = 'workspace-git-trpc';
@@ -43,7 +43,7 @@ export const workspaceGitRouter = router({
         .input(z.object({ workspaceId: z.string() }))
         .query(async ({ ctx, input }) => {
         const logger = getLogger(ctx);
-        const workspace = await workspaceAccessor.findByIdWithProject(input.workspaceId);
+        const workspace = await workspaceDataService.findByIdWithProject(input.workspaceId);
         if (!workspace) {
             throw new Error(`Workspace not found: ${input.workspaceId}`);
         }

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

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

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

@@ -1,13 +1,13 @@
 import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
+import { workspaceDataService } from '../../../backend/domains/workspace/index.js';
 import { checkIdeAvailable, openPathInIde } from '../../lib/ide-helpers.js';
-import { userSettingsAccessor } from '../../resource_accessors/user-settings.accessor.js';
-import { workspaceAccessor } from '../../resource_accessors/workspace.accessor.js';
+import { userSettingsQueryService } from '../../services/user-settings-query.service.js';
 import { publicProcedure, router } from '../trpc.js';
 export const workspaceIdeRouter = router({
     getAvailableIdes: publicProcedure.query(async () => {
         const ides = [];
-        const settings = await userSettingsAccessor.get();
+        const settings = await userSettingsQueryService.get();
         const cursorAvailable = await checkIdeAvailable('cursor');
         if (cursorAvailable) {
             ides.push({ id: 'cursor', name: 'Cursor' });
@@ -24,7 +24,7 @@ export const workspaceIdeRouter = router({
     openInIde: publicProcedure
         .input(z.object({ id: z.string(), ide: z.string().optional() }))
         .mutation(async ({ input }) => {
-        const workspace = await workspaceAccessor.findById(input.id);
+        const workspace = await workspaceDataService.findById(input.id);
         if (!workspace) {
             throw new TRPCError({
                 code: 'NOT_FOUND',
@@ -37,7 +37,7 @@ export const workspaceIdeRouter = router({
                 message: 'Workspace has no worktree path',
             });
         }
-        const settings = await userSettingsAccessor.get();
+        const settings = await userSettingsQueryService.get();
         const ideToUse = input.ide ?? settings.preferredIde;
         if (ideToUse === 'custom' && !settings.customIdeCommand) {
             throw new TRPCError({

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

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

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

@@ -1,7 +1,3 @@
-export declare function initializeWorkspaceWorktree(workspaceId: string, options?: {
-    branchName?: string;
-    useExistingBranch?: boolean;
-}): Promise<void>;
 export declare const workspaceInitRouter: import("@trpc/server").TRPCBuiltRouter<{
     ctx: import("../trpc.js").Context;
     meta: object;
@@ -18,7 +14,10 @@ export declare const workspaceInitRouter: import("@trpc/server").TRPCBuiltRouter
             initOutput: string | null;
             initStartedAt: Date | null;
             initCompletedAt: Date | null;
+            phase: import("../../../shared/workspace-init.js").WorkspaceInitPhase;
+            chatBanner: import("../../../shared/workspace-init.js").WorkspaceInitBanner | null;
             hasStartupScript: boolean;
+            hasWorktreePath: boolean;
         };
         meta: object;
     }>;
@@ -30,34 +29,41 @@ export declare const workspaceInitRouter: import("@trpc/server").TRPCBuiltRouter
         output: ({
             claudeSessions: {
                 name: string | null;
-                model: string;
+                workspaceId: string;
                 status: import("../../../../prisma/generated/enums.js").SessionStatus;
-                id: string;
-                claudeSessionId: string | null;
-                createdAt: Date;
                 updatedAt: Date;
-                workspaceId: string;
+                createdAt: Date;
+                id: string;
                 workflow: string;
+                model: string;
+                claudeSessionId: string | null;
                 claudeProjectPath: string | null;
                 claudeProcessPid: number | null;
             }[];
             terminalSessions: {
                 name: string | null;
+                workspaceId: string;
                 status: import("../../../../prisma/generated/enums.js").SessionStatus;
+                updatedAt: Date;
+                createdAt: Date;
                 id: string;
                 pid: number | null;
-                createdAt: Date;
-                updatedAt: Date;
-                workspaceId: string;
             }[];
         } & {
             name: string;
-            description: string | null;
+            prUrl: string | null;
             status: import("../../../../prisma/generated/enums.js").WorkspaceStatus;
+            updatedAt: Date;
+            createdAt: 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;
             worktreePath: string | null;
-            branchName: string | null;
             isAutoGeneratedBranch: boolean;
             creationSource: import("../../../../prisma/generated/enums.js").WorkspaceCreationSource;
             creationMetadata: import("@prisma/client/runtime/client").JsonValue | null;
@@ -72,15 +78,8 @@ 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;
-            createdAt: Date;
-            updatedAt: Date;
-            prNumber: number | null;
-            prState: import("../../../../prisma/generated/enums.js").PRState;
-            prReviewState: string | null;
-            prCiStatus: import("../../../../prisma/generated/enums.js").CIStatus;
             prUpdatedAt: Date | null;
             prCiFailedAt: Date | null;
             prCiLastNotifiedAt: 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":"AAuBA,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7D,OAAO,CAAC,IAAI,CAAC,CAEf;AAMD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgG9B,CAAC"}
+{"version":3,"file":"init.trpc.d.ts","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/init.trpc.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2G9B,CAAC"}

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

@@ -1,37 +1,37 @@
 import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
-import { workspaceAccessor } from '../../resource_accessors/workspace.accessor.js';
+import { startupScriptService } from '../../../backend/domains/run-script/index.js';
+import { getWorkspaceInitPolicy, workspaceDataService, workspaceStateMachine, worktreeLifecycleService, } from '../../../backend/domains/workspace/index.js';
+import { initializeWorkspaceWorktree } from '../../../backend/orchestration/index.js';
 import { createLogger } from '../../services/logger.service.js';
-import { startupScriptService } from '../../services/startup-script.service.js';
-import { workspaceStateMachine } from '../../services/workspace-state-machine.service.js';
-import { getWorkspaceInitMode, setWorkspaceInitMode, worktreeLifecycleService, } from '../../services/worktree-lifecycle.service.js';
 import { publicProcedure, router } from '../trpc.js';
 const logger = createLogger('workspace-init-trpc');
-export function initializeWorkspaceWorktree(workspaceId, options) {
-    return worktreeLifecycleService.initializeWorkspaceWorktree(workspaceId, options);
-}
 export const workspaceInitRouter = router({
     getInitStatus: publicProcedure.input(z.object({ id: z.string() })).query(async ({ input }) => {
-        const workspace = await workspaceAccessor.findByIdWithProject(input.id);
+        const workspace = await workspaceDataService.findByIdWithProject(input.id);
         if (!workspace) {
             throw new TRPCError({
                 code: 'NOT_FOUND',
                 message: `Workspace not found: ${input.id}`,
             });
         }
+        const initPolicy = getWorkspaceInitPolicy(workspace);
         return {
             status: workspace.status,
             initErrorMessage: workspace.initErrorMessage,
             initOutput: workspace.initOutput,
             initStartedAt: workspace.initStartedAt,
             initCompletedAt: workspace.initCompletedAt,
+            phase: initPolicy.phase,
+            chatBanner: initPolicy.banner,
             hasStartupScript: !!(workspace.project?.startupScriptCommand || workspace.project?.startupScriptPath),
+            hasWorktreePath: !!workspace.worktreePath,
         };
     }),
     retryInit: publicProcedure
         .input(z.object({ id: z.string(), useExistingBranch: z.boolean().optional() }))
         .mutation(async ({ input }) => {
-        const workspace = await workspaceAccessor.findByIdWithProject(input.id);
+        const workspace = await workspaceDataService.findByIdWithProject(input.id);
         if (!workspace?.project) {
             throw new TRPCError({
                 code: 'NOT_FOUND',
@@ -54,9 +54,9 @@ export const workspaceInitRouter = router({
                 });
             }
             const resumeMode = input.useExistingBranch ??
-                (await getWorkspaceInitMode(workspace.id, workspace.project.worktreeBasePath));
+                (await worktreeLifecycleService.getInitMode(workspace.id, workspace.project.worktreeBasePath));
             if (resumeMode !== undefined) {
-                await setWorkspaceInitMode(workspace.id, resumeMode, workspace.project.worktreeBasePath);
+                await worktreeLifecycleService.setInitMode(workspace.id, resumeMode, workspace.project.worktreeBasePath);
             }
             initializeWorkspaceWorktree(workspace.id, {
                 branchName: workspace.branchName ?? undefined,
@@ -66,7 +66,7 @@ export const workspaceInitRouter = router({
                     workspaceId: workspace.id,
                 });
             });
-            return workspaceAccessor.findById(input.id);
+            return workspaceDataService.findById(input.id);
         }
         const updatedWorkspace = await workspaceStateMachine.startProvisioning(input.id, {
             maxRetries,
@@ -78,7 +78,7 @@ export const workspaceInitRouter = router({
             });
         }
         await startupScriptService.runStartupScript({ ...workspace, ...updatedWorkspace }, workspace.project);
-        return workspaceAccessor.findById(input.id);
+        return workspaceDataService.findById(input.id);
     }),
 });
 //# sourceMappingURL=init.trpc.js.map

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/workspace-helpers.d.ts

@@ -1,35 +1,42 @@
-import { workspaceAccessor } from '../../resource_accessors/workspace.accessor.js';
+import { workspaceDataService } from '../../../backend/domains/workspace/index.js';
 export declare function getWorkspaceOrThrow(workspaceId: string): Promise<{
     claudeSessions: {
         name: string | null;
-        model: string;
+        workspaceId: string;
         status: import("../../../../prisma/generated/enums.js").SessionStatus;
-        id: string;
-        claudeSessionId: string | null;
-        createdAt: Date;
         updatedAt: Date;
-        workspaceId: string;
+        createdAt: Date;
+        id: string;
         workflow: string;
+        model: string;
+        claudeSessionId: string | null;
         claudeProjectPath: string | null;
         claudeProcessPid: number | null;
     }[];
     terminalSessions: {
         name: string | null;
+        workspaceId: string;
         status: import("../../../../prisma/generated/enums.js").SessionStatus;
+        updatedAt: Date;
+        createdAt: Date;
         id: string;
         pid: number | null;
-        createdAt: Date;
-        updatedAt: Date;
-        workspaceId: string;
     }[];
 } & {
     name: string;
-    description: string | null;
+    prUrl: string | null;
     status: import("../../../../prisma/generated/enums.js").WorkspaceStatus;
+    updatedAt: Date;
+    createdAt: 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;
     worktreePath: string | null;
-    branchName: string | null;
     isAutoGeneratedBranch: boolean;
     creationSource: import("../../../../prisma/generated/enums.js").WorkspaceCreationSource;
     creationMetadata: import("@prisma/client/runtime/client").JsonValue | null;
@@ -44,15 +51,8 @@ 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;
-    createdAt: Date;
-    updatedAt: Date;
-    prNumber: number | null;
-    prState: import("../../../../prisma/generated/enums.js").PRState;
-    prReviewState: string | null;
-    prCiStatus: import("../../../../prisma/generated/enums.js").CIStatus;
     prUpdatedAt: Date | null;
     prCiFailedAt: Date | null;
     prCiLastNotifiedAt: Date | null;
@@ -72,9 +72,9 @@ export declare function getWorkspaceOrThrow(workspaceId: string): Promise<{
 export declare function getWorkspaceWithProjectOrThrow(workspaceId: string): Promise<{
     project: {
         name: string;
-        id: string;
-        createdAt: Date;
         updatedAt: Date;
+        createdAt: Date;
+        id: string;
         slug: string;
         repoPath: string;
         worktreeBasePath: string;
@@ -88,12 +88,19 @@ export declare function getWorkspaceWithProjectOrThrow(workspaceId: string): Pro
     };
 } & {
     name: string;
-    description: string | null;
+    prUrl: string | null;
     status: import("../../../../prisma/generated/enums.js").WorkspaceStatus;
+    updatedAt: Date;
+    createdAt: 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;
     worktreePath: string | null;
-    branchName: string | null;
     isAutoGeneratedBranch: boolean;
     creationSource: import("../../../../prisma/generated/enums.js").WorkspaceCreationSource;
     creationMetadata: import("@prisma/client/runtime/client").JsonValue | null;
@@ -108,15 +115,8 @@ 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;
-    createdAt: Date;
-    updatedAt: Date;
-    prNumber: number | null;
-    prState: import("../../../../prisma/generated/enums.js").PRState;
-    prReviewState: string | null;
-    prCiStatus: import("../../../../prisma/generated/enums.js").CIStatus;
     prUpdatedAt: Date | null;
     prCiFailedAt: Date | null;
     prCiLastNotifiedAt: Date | null;
@@ -134,13 +134,13 @@ export declare function getWorkspaceWithProjectOrThrow(workspaceId: string): Pro
     stateComputedAt: Date | null;
 }>;
 export interface WorkspaceWithWorktree {
-    workspace: NonNullable<Awaited<ReturnType<typeof workspaceAccessor.findById>>>;
+    workspace: NonNullable<Awaited<ReturnType<typeof workspaceDataService.findById>>>;
     worktreePath: string;
 }
 export declare function getWorkspaceWithWorktree(workspaceId: string): Promise<WorkspaceWithWorktree | null>;
 export declare function getWorkspaceWithWorktreeOrThrow(workspaceId: string): Promise<WorkspaceWithWorktree>;
 export interface WorkspaceWithProjectAndWorktree {
-    workspace: NonNullable<Awaited<ReturnType<typeof workspaceAccessor.findByIdWithProject>>>;
+    workspace: NonNullable<Awaited<ReturnType<typeof workspaceDataService.findByIdWithProject>>>;
     worktreePath: string;
 }
 export declare function getWorkspaceWithProjectAndWorktreeOrThrow(workspaceId: string): Promise<WorkspaceWithProjectAndWorktree>;

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,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAOhF,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,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC/E,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,iBAAiB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAC1F,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,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAOnE,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"}

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

@@ -1,7 +1,7 @@
 import { TRPCError } from '@trpc/server';
-import { workspaceAccessor } from '../../resource_accessors/workspace.accessor.js';
+import { workspaceDataService } from '../../../backend/domains/workspace/index.js';
 export async function getWorkspaceOrThrow(workspaceId) {
-    const workspace = await workspaceAccessor.findById(workspaceId);
+    const workspace = await workspaceDataService.findById(workspaceId);
     if (!workspace) {
         throw new TRPCError({
             code: 'NOT_FOUND',
@@ -11,7 +11,7 @@ export async function getWorkspaceOrThrow(workspaceId) {
     return workspace;
 }
 export async function getWorkspaceWithProjectOrThrow(workspaceId) {
-    const workspace = await workspaceAccessor.findByIdWithProject(workspaceId);
+    const workspace = await workspaceDataService.findByIdWithProject(workspaceId);
     if (!workspace) {
         throw new TRPCError({
             code: 'NOT_FOUND',
@@ -38,7 +38,7 @@ export async function getWorkspaceWithWorktreeOrThrow(workspaceId) {
     return { workspace, worktreePath: workspace.worktreePath };
 }
 export async function getWorkspaceWithProjectAndWorktreeOrThrow(workspaceId) {
-    const workspace = await workspaceAccessor.findByIdWithProject(workspaceId);
+    const workspace = await workspaceDataService.findByIdWithProject(workspaceId);
     if (!workspace) {
         throw new TRPCError({
             code: 'NOT_FOUND',

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,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAOhF,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,WAAmB;IAC3D,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAChE,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,iBAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAC3E,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,iBAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAC3E,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;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAOnE,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"}