factory-factory 0.2.8 → 0.3.0

package/dist/src/backend/trpc/admin.trpc.d.ts

@@ -1,4 +1,3 @@
-import { SessionStatus } from '../../../prisma/generated/client.js';
 import { type Context } from './trpc.js';
 export interface ParsedLogEntry {
     level: string;
@@ -17,7 +16,7 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
         input: void;
         output: {
             backendPort: number | null;
-            environment: "production" | "development" | "test";
+            environment: "development" | "production" | "test";
             version: string;
         };
         meta: object;
@@ -26,7 +25,7 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
         input: void;
         output: {
             apiUsage: import("../services/rate-limiter.service.js").ApiUsageStats;
-            environment: "production" | "development" | "test";
+            environment: "development" | "production" | "test";
             features: {
                 authentication: boolean;
                 metrics: boolean;
@@ -89,13 +88,13 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
         input: {
             forceRefresh?: boolean | undefined;
         } | undefined;
-        output: import("../../backend/services/index.js").CLIHealthStatus;
+        output: import("../orchestration/cli-health.service.js").CLIHealthStatus;
         meta: object;
     }>;
     getActiveProcesses: import("@trpc/server").TRPCQueryProcedure<{
         input: void;
         output: {
-            claude: {
+            agent: {
                 sessionId: string;
                 workspaceId: string;
                 workspaceName: string;
@@ -105,7 +104,7 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                 workflow: string;
                 model: string;
                 pid: number | null;
-                status: SessionStatus;
+                status: import("../../../prisma/generated/client.js").SessionStatus;
                 inMemory: boolean;
                 memoryStatus: string | null;
                 createdAt: Date;
@@ -129,7 +128,7 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                 memoryBytes: number | null;
             }[];
             summary: {
-                totalClaude: number;
+                totalAgent: number;
                 totalTerminal: number;
                 total: number;
             };
@@ -152,7 +151,7 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
             meta: {
                 exportedAt: string;
                 version: string;
-                schemaVersion: 2;
+                schemaVersion: 3;
             };
             data: {
                 projects: {
@@ -179,6 +178,9 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                     status: "READY" | "FAILED" | "NEW" | "PROVISIONING" | "ARCHIVED";
                     worktreePath: string | null;
                     branchName: string | null;
+                    isAutoGeneratedBranch: boolean;
+                    creationSource: "MANUAL" | "RESUME_BRANCH" | "GITHUB_ISSUE";
+                    creationMetadata: unknown;
                     initErrorMessage: string | null;
                     initOutput: string | null;
                     initStartedAt: string | null;
@@ -189,10 +191,12 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                     runScriptPid: number | null;
                     runScriptPort: number | null;
                     runScriptStartedAt: string | null;
-                    runScriptStatus: "COMPLETED" | "IDLE" | "STARTING" | "RUNNING" | "STOPPING" | "FAILED" | "PAUSED";
+                    runScriptStatus: "COMPLETED" | "IDLE" | "STARTING" | "RUNNING" | "STOPPING" | "FAILED";
                     prUrl: string | null;
                     githubIssueNumber: number | null;
                     githubIssueUrl: string | null;
+                    defaultSessionProvider: "WORKSPACE_DEFAULT" | "CLAUDE" | "CODEX";
+                    ratchetSessionProvider: "WORKSPACE_DEFAULT" | "CLAUDE" | "CODEX";
                     prNumber: number | null;
                     prState: "APPROVED" | "CHANGES_REQUESTED" | "OPEN" | "CLOSED" | "MERGED" | "NONE" | "DRAFT";
                     prReviewState: string | null;
@@ -200,11 +204,6 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                     prUpdatedAt: string | null;
                     prCiFailedAt: string | null;
                     prCiLastNotifiedAt: string | null;
-                    hasHadSessions: boolean;
-                    cachedKanbanColumn: "WORKING" | "WAITING" | "DONE";
-                    stateComputedAt: string | null;
-                    createdAt: string;
-                    updatedAt: string;
                     prReviewLastCheckedAt: string | null;
                     prReviewLastCommentId: string | null;
                     ratchetEnabled: boolean;
@@ -214,22 +213,26 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                     ratchetActiveSessionId: string | null;
                     ratchetLastCiRunId: string | null;
                     ratchetLastNotifiedState: "MERGED" | "IDLE" | "CI_RUNNING" | "CI_FAILED" | "REVIEW_PENDING" | "READY" | null;
-                    isAutoGeneratedBranch?: boolean | undefined;
-                    creationSource?: "MANUAL" | "RESUME_BRANCH" | "GITHUB_ISSUE" | undefined;
-                    creationMetadata?: unknown;
+                    hasHadSessions: boolean;
+                    cachedKanbanColumn: "WORKING" | "WAITING" | "DONE";
+                    stateComputedAt: string | null;
+                    createdAt: string;
+                    updatedAt: string;
                 }[];
-                claudeSessions: {
+                agentSessions: {
                     id: string;
                     workspaceId: string;
                     name: string | null;
                     workflow: string;
                     model: string;
                     status: "COMPLETED" | "IDLE" | "RUNNING" | "FAILED" | "PAUSED";
-                    claudeSessionId: string | null;
-                    claudeProcessPid: number | null;
+                    provider: "CLAUDE" | "CODEX";
+                    providerSessionId: string | null;
+                    providerProjectPath: string | null;
+                    providerProcessPid: number | null;
+                    providerMetadata: unknown;
                     createdAt: string;
                     updatedAt: string;
-                    claudeProjectPath?: string | null | undefined;
                 }[];
                 terminalSessions: {
                     id: string;
@@ -246,15 +249,7 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                     playSoundOnComplete: boolean;
                     notificationSoundPath: string | null;
                     ratchetEnabled: boolean;
-                    ratchetAutoFixCi?: boolean | undefined;
-                    ratchetAutoFixReviews?: boolean | undefined;
-                    ratchetAutoFixConflicts?: boolean | undefined;
-                    ratchetAutoMerge?: boolean | undefined;
-                    ratchetAllowedReviewers?: unknown;
-                    autoFixCiIssues?: boolean | undefined;
-                    autoFixPrReviewComments?: boolean | undefined;
-                    prReviewFixAllowedUsers?: string[] | null | undefined;
-                    prReviewFixPrompt?: string | null | undefined;
+                    defaultSessionProvider: "CLAUDE" | "CODEX";
                 } | null;
             };
         };
@@ -265,101 +260,7 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
             meta: {
                 exportedAt: string;
                 version: string;
-                schemaVersion: 1;
-            };
-            data: {
-                projects: {
-                    id: string;
-                    name: string;
-                    slug: string;
-                    repoPath: string;
-                    worktreeBasePath: string;
-                    defaultBranch: string;
-                    githubOwner: string | null;
-                    githubRepo: string | null;
-                    isArchived: boolean;
-                    startupScriptCommand: string | null;
-                    startupScriptPath: string | null;
-                    startupScriptTimeout: number;
-                    createdAt: string;
-                    updatedAt: string;
-                }[];
-                workspaces: {
-                    id: string;
-                    projectId: string;
-                    name: string;
-                    description: string | null;
-                    status: "READY" | "FAILED" | "NEW" | "PROVISIONING" | "ARCHIVED";
-                    worktreePath: string | null;
-                    branchName: string | null;
-                    initErrorMessage: string | null;
-                    initOutput: string | null;
-                    initStartedAt: string | null;
-                    initCompletedAt: string | null;
-                    initRetryCount: number;
-                    runScriptCommand: string | null;
-                    runScriptCleanupCommand: string | null;
-                    runScriptPid: number | null;
-                    runScriptPort: number | null;
-                    runScriptStartedAt: string | null;
-                    runScriptStatus: "COMPLETED" | "IDLE" | "STARTING" | "RUNNING" | "STOPPING" | "FAILED" | "PAUSED";
-                    prUrl: string | null;
-                    githubIssueNumber: number | null;
-                    githubIssueUrl: string | null;
-                    prNumber: number | null;
-                    prState: "APPROVED" | "CHANGES_REQUESTED" | "OPEN" | "CLOSED" | "MERGED" | "NONE" | "DRAFT";
-                    prReviewState: string | null;
-                    prCiStatus: "PENDING" | "SUCCESS" | "FAILURE" | "UNKNOWN";
-                    prUpdatedAt: string | null;
-                    prCiFailedAt: string | null;
-                    prCiLastNotifiedAt: string | null;
-                    hasHadSessions: boolean;
-                    cachedKanbanColumn: "WORKING" | "WAITING" | "DONE";
-                    stateComputedAt: string | null;
-                    createdAt: string;
-                    updatedAt: string;
-                    isAutoGeneratedBranch?: boolean | undefined;
-                    creationSource?: "MANUAL" | "RESUME_BRANCH" | "GITHUB_ISSUE" | undefined;
-                    creationMetadata?: unknown;
-                }[];
-                claudeSessions: {
-                    id: string;
-                    workspaceId: string;
-                    name: string | null;
-                    workflow: string;
-                    model: string;
-                    status: "COMPLETED" | "IDLE" | "RUNNING" | "FAILED" | "PAUSED";
-                    claudeSessionId: string | null;
-                    claudeProcessPid: number | null;
-                    createdAt: string;
-                    updatedAt: string;
-                    claudeProjectPath?: string | null | undefined;
-                }[];
-                terminalSessions: {
-                    id: string;
-                    workspaceId: string;
-                    name: string | null;
-                    status: "COMPLETED" | "IDLE" | "RUNNING" | "FAILED" | "PAUSED";
-                    pid: number | null;
-                    createdAt: string;
-                    updatedAt: string;
-                }[];
-                userSettings: {
-                    preferredIde: string;
-                    customIdeCommand: string | null;
-                    playSoundOnComplete: boolean;
-                    notificationSoundPath: string | null;
-                    autoFixCiIssues?: boolean | undefined;
-                    autoFixPrReviewComments?: boolean | undefined;
-                    prReviewFixAllowedUsers?: string[] | null | undefined;
-                    prReviewFixPrompt?: string | null | undefined;
-                } | null;
-            };
-        } | {
-            meta: {
-                exportedAt: string;
-                version: string;
-                schemaVersion: 2;
+                schemaVersion: 3;
             };
             data: {
                 projects: {
@@ -386,6 +287,9 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                     status: "READY" | "FAILED" | "NEW" | "PROVISIONING" | "ARCHIVED";
                     worktreePath: string | null;
                     branchName: string | null;
+                    isAutoGeneratedBranch: boolean;
+                    creationSource: "MANUAL" | "RESUME_BRANCH" | "GITHUB_ISSUE";
+                    creationMetadata: unknown;
                     initErrorMessage: string | null;
                     initOutput: string | null;
                     initStartedAt: string | null;
@@ -396,10 +300,12 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                     runScriptPid: number | null;
                     runScriptPort: number | null;
                     runScriptStartedAt: string | null;
-                    runScriptStatus: "COMPLETED" | "IDLE" | "STARTING" | "RUNNING" | "STOPPING" | "FAILED" | "PAUSED";
+                    runScriptStatus: "COMPLETED" | "IDLE" | "STARTING" | "RUNNING" | "STOPPING" | "FAILED";
                     prUrl: string | null;
                     githubIssueNumber: number | null;
                     githubIssueUrl: string | null;
+                    defaultSessionProvider: "WORKSPACE_DEFAULT" | "CLAUDE" | "CODEX";
+                    ratchetSessionProvider: "WORKSPACE_DEFAULT" | "CLAUDE" | "CODEX";
                     prNumber: number | null;
                     prState: "APPROVED" | "CHANGES_REQUESTED" | "OPEN" | "CLOSED" | "MERGED" | "NONE" | "DRAFT";
                     prReviewState: string | null;
@@ -407,11 +313,6 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                     prUpdatedAt: string | null;
                     prCiFailedAt: string | null;
                     prCiLastNotifiedAt: string | null;
-                    hasHadSessions: boolean;
-                    cachedKanbanColumn: "WORKING" | "WAITING" | "DONE";
-                    stateComputedAt: string | null;
-                    createdAt: string;
-                    updatedAt: string;
                     prReviewLastCheckedAt: string | null;
                     prReviewLastCommentId: string | null;
                     ratchetEnabled: boolean;
@@ -421,22 +322,26 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                     ratchetActiveSessionId: string | null;
                     ratchetLastCiRunId: string | null;
                     ratchetLastNotifiedState: "MERGED" | "IDLE" | "CI_RUNNING" | "CI_FAILED" | "REVIEW_PENDING" | "READY" | null;
-                    isAutoGeneratedBranch?: boolean | undefined;
-                    creationSource?: "MANUAL" | "RESUME_BRANCH" | "GITHUB_ISSUE" | undefined;
-                    creationMetadata?: unknown;
+                    hasHadSessions: boolean;
+                    cachedKanbanColumn: "WORKING" | "WAITING" | "DONE";
+                    stateComputedAt: string | null;
+                    createdAt: string;
+                    updatedAt: string;
                 }[];
-                claudeSessions: {
+                agentSessions: {
                     id: string;
                     workspaceId: string;
                     name: string | null;
                     workflow: string;
                     model: string;
                     status: "COMPLETED" | "IDLE" | "RUNNING" | "FAILED" | "PAUSED";
-                    claudeSessionId: string | null;
-                    claudeProcessPid: number | null;
+                    provider: "CLAUDE" | "CODEX";
+                    providerSessionId: string | null;
+                    providerProjectPath: string | null;
+                    providerProcessPid: number | null;
+                    providerMetadata: unknown;
                     createdAt: string;
                     updatedAt: string;
-                    claudeProjectPath?: string | null | undefined;
                 }[];
                 terminalSessions: {
                     id: string;
@@ -453,21 +358,13 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
                     playSoundOnComplete: boolean;
                     notificationSoundPath: string | null;
                     ratchetEnabled: boolean;
-                    ratchetAutoFixCi?: boolean | undefined;
-                    ratchetAutoFixReviews?: boolean | undefined;
-                    ratchetAutoFixConflicts?: boolean | undefined;
-                    ratchetAutoMerge?: boolean | undefined;
-                    ratchetAllowedReviewers?: unknown;
-                    autoFixCiIssues?: boolean | undefined;
-                    autoFixPrReviewComments?: boolean | undefined;
-                    prReviewFixAllowedUsers?: string[] | null | undefined;
-                    prReviewFixPrompt?: string | null | undefined;
+                    defaultSessionProvider: "CLAUDE" | "CODEX";
                 } | null;
             };
         };
         output: {
             success: boolean;
-            results: import("../../backend/services/index.js").ImportResults;
+            results: import("../../backend/orchestration/data-backup.service.js").ImportResults;
         };
         meta: object;
     }>;
@@ -492,7 +389,7 @@ export declare const adminRouter: import("@trpc/server").TRPCBuiltRouter<{
         output: string;
         meta: object;
     }>;
-    stopClaudeSession: import("@trpc/server").TRPCMutationProcedure<{
+    stopSession: import("@trpc/server").TRPCMutationProcedure<{
         input: {
             sessionId: string;
         };

package/dist/src/backend/trpc/admin.trpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.trpc.d.ts","sourceRoot":"","sources":["../../../../src/backend/trpc/admin.trpc.ts"],"names":[],"mappings":"AASA,OAAO,EAAoB,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAQrE,OAAO,EAAE,KAAK,OAAO,EAA2B,MAAM,QAAQ,CAAC;AAM/D,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAqCD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqZtB,CAAC"}
+{"version":3,"file":"admin.trpc.d.ts","sourceRoot":"","sources":["../../../../src/backend/trpc/admin.trpc.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,KAAK,OAAO,EAA2B,MAAM,QAAQ,CAAC;AAM/D,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAyFD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BA6KI,MAAM,GAAG,IAAI;6BACZ,MAAM,GAAG,IAAI;4BACd,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwMvC,CAAC"}

package/dist/src/backend/trpc/admin.trpc.js

@@ -1,17 +1,23 @@
 import { createReadStream } from 'node:fs';
 import { open, stat } from 'node:fs/promises';
 import { createInterface } from 'node:readline';
-import { SessionStatus } from '../../../prisma/generated/client.js';
+import { SessionStatus } from '@factory-factory/core';
 import { z } from 'zod';
-import { sessionDataService } from '../../backend/domains/session/index.js';
+import { acpRuntimeManager, sessionDataService } from '../../backend/domains/session/index.js';
 import { workspaceDataService } from '../../backend/domains/workspace/index.js';
-import { dataBackupService } from '../../backend/services/index.js';
-import { decisionLogQueryService } from '../../backend/services/decision-log-query.service.js';
+import { dataBackupService } from '../../backend/orchestration/data-backup.service.js';
+import { decisionLogQueryService } from '../../backend/orchestration/decision-log-query.service.js';
 import { getLogFilePath } from '../../backend/services/logger.service.js';
 import { exportDataSchema } from '../../shared/schemas/export-data.schema.js';
 import { publicProcedure, router } from './trpc.js';
 const loggerName = 'admin-trpc';
 const getLogger = (ctx) => ctx.appContext.services.createLogger(loggerName);
+const RawLogEntrySchema = z.object({
+    level: z.string(),
+    timestamp: z.string().optional(),
+    message: z.string().optional(),
+    context: z.record(z.string(), z.unknown()).optional(),
+});
 function matchesTimestamp(timestamp, filter) {
     if (!(timestamp && (filter.sinceMs || filter.untilMs))) {
         return true;
@@ -31,13 +37,49 @@ function matchesLogFilter(entry, filter) {
     }
     if (filter.search) {
         const msg = entry.message?.toLowerCase() ?? '';
-        const comp = entry.context?.component;
+        const comp = typeof entry.context?.component === 'string' ? entry.context.component : undefined;
         if (!(msg.includes(filter.search) || comp?.toLowerCase().includes(filter.search))) {
             return false;
         }
     }
     return true;
 }
+function toParsedLogEntry(entry) {
+    return {
+        level: entry.level,
+        timestamp: entry.timestamp ?? '',
+        message: entry.message ?? '',
+        component: typeof entry.context?.component === 'string' ? entry.context.component : '',
+        context: entry.context ?? {},
+    };
+}
+async function readFilteredLogEntries(filePath, filter) {
+    const filtered = [];
+    const rl = createInterface({
+        input: createReadStream(filePath, 'utf-8'),
+        crlfDelay: Number.POSITIVE_INFINITY,
+    });
+    for await (const line of rl) {
+        if (!line) {
+            continue;
+        }
+        try {
+            const rawEntry = JSON.parse(line);
+            const parsedEntry = RawLogEntrySchema.safeParse(rawEntry);
+            if (!parsedEntry.success) {
+                continue;
+            }
+            const entry = parsedEntry.data;
+            if (!matchesLogFilter(entry, filter)) {
+                continue;
+            }
+            filtered.push(toParsedLogEntry(entry));
+        }
+        catch {
+        }
+    }
+    return filtered;
+}
 export const adminRouter = router({
     getServerInfo: publicProcedure.query(({ ctx }) => {
         const { configService, serverInstanceService } = ctx.appContext.services;
@@ -122,22 +164,22 @@ export const adminRouter = router({
         return cliHealthService.checkHealth(input?.forceRefresh ?? false);
     }),
     getActiveProcesses: publicProcedure.query(async ({ ctx }) => {
-        const { sessionService, terminalService } = ctx.appContext.services;
+        const { terminalService } = ctx.appContext.services;
         const logger = getLogger(ctx);
-        const activeClaudeProcesses = sessionService.getAllActiveProcesses();
+        const activeAcpProcesses = acpRuntimeManager.getAllActiveProcesses();
         const activeTerminals = terminalService.getAllTerminals();
-        const claudeSessionsWithPid = await sessionDataService.findClaudeSessionsWithPid();
+        const agentSessionsWithPid = await sessionDataService.findAgentSessionsWithPid();
         const terminalSessionsWithPid = await sessionDataService.findTerminalSessionsWithPid();
         const workspaceIds = new Set([
-            ...claudeSessionsWithPid.map((s) => s.workspaceId),
+            ...agentSessionsWithPid.map((s) => s.workspaceId),
             ...terminalSessionsWithPid.map((s) => s.workspaceId),
             ...activeTerminals.map((t) => t.workspaceId),
         ]);
         const workspaces = await workspaceDataService.findByIdsWithProject(Array.from(workspaceIds));
         const workspaceMap = new Map(workspaces.map((w) => [w.id, w]));
-        const dbSessionIds = new Set(claudeSessionsWithPid.map((s) => s.id));
-        const claudeProcesses = claudeSessionsWithPid.map((session) => {
-            const memProcess = activeClaudeProcesses.find((p) => p.sessionId === session.id);
+        const dbSessionIds = new Set(agentSessionsWithPid.map((s) => s.id));
+        const agentProcesses = agentSessionsWithPid.map((session) => {
+            const memProcess = activeAcpProcesses.find((p) => p.sessionId === session.id);
             const workspace = workspaceMap.get(session.workspaceId);
             return {
                 sessionId: session.id,
@@ -148,31 +190,25 @@ export const adminRouter = router({
                 name: session.name,
                 workflow: session.workflow,
                 model: session.model,
-                pid: session.claudeProcessPid,
+                pid: session.providerProcessPid,
                 status: session.status,
                 inMemory: !!memProcess,
                 memoryStatus: memProcess?.status ?? null,
                 createdAt: session.createdAt,
                 updatedAt: session.updatedAt,
-                cpuPercent: memProcess?.resourceUsage?.cpu ?? null,
-                memoryBytes: memProcess?.resourceUsage?.memory ?? null,
-                idleTimeMs: memProcess?.idleTimeMs ?? null,
+                cpuPercent: null,
+                memoryBytes: null,
+                idleTimeMs: null,
             };
         });
-        for (const memProcess of activeClaudeProcesses) {
+        for (const memProcess of activeAcpProcesses) {
             if (!dbSessionIds.has(memProcess.sessionId)) {
-                logger.warn('Found in-memory Claude process without DB record', {
+                logger.warn('Found in-memory ACP process without DB record', {
                     sessionId: memProcess.sessionId,
                     pid: memProcess.pid,
                     status: memProcess.status,
                 });
-                const statusMap = {
-                    starting: SessionStatus.RUNNING,
-                    ready: SessionStatus.IDLE,
-                    running: SessionStatus.RUNNING,
-                    exited: SessionStatus.COMPLETED,
-                };
-                claudeProcesses.push({
+                agentProcesses.push({
                     sessionId: memProcess.sessionId,
                     workspaceId: 'unknown',
                     workspaceName: 'Unknown (orphan)',
@@ -182,14 +218,14 @@ export const adminRouter = router({
                     workflow: 'unknown',
                     model: 'unknown',
                     pid: memProcess.pid ?? null,
-                    status: statusMap[memProcess.status] ?? SessionStatus.RUNNING,
+                    status: memProcess.isRunning ? SessionStatus.RUNNING : SessionStatus.COMPLETED,
                     inMemory: true,
                     memoryStatus: memProcess.status,
                     createdAt: new Date(),
                     updatedAt: new Date(),
-                    cpuPercent: memProcess.resourceUsage?.cpu ?? null,
-                    memoryBytes: memProcess.resourceUsage?.memory ?? null,
-                    idleTimeMs: memProcess.idleTimeMs ?? null,
+                    cpuPercent: null,
+                    memoryBytes: null,
+                    idleTimeMs: null,
                 });
             }
         }
@@ -212,12 +248,12 @@ export const adminRouter = router({
             };
         });
         return {
-            claude: claudeProcesses,
+            agent: agentProcesses,
             terminal: terminalProcesses,
             summary: {
-                totalClaude: claudeProcesses.length,
+                totalAgent: agentProcesses.length,
                 totalTerminal: terminalProcesses.length,
-                total: claudeProcesses.length + terminalProcesses.length,
+                total: agentProcesses.length + terminalProcesses.length,
             },
         };
     }),
@@ -261,32 +297,9 @@ export const adminRouter = router({
             sinceMs: input.since ? new Date(input.since).getTime() : null,
             untilMs: input.until ? new Date(input.until).getTime() : null,
         };
-        const filtered = [];
+        let filtered;
         try {
-            const rl = createInterface({
-                input: createReadStream(filePath, 'utf-8'),
-                crlfDelay: Number.POSITIVE_INFINITY,
-            });
-            for await (const line of rl) {
-                if (!line) {
-                    continue;
-                }
-                try {
-                    const entry = JSON.parse(line);
-                    if (!matchesLogFilter(entry, filter)) {
-                        continue;
-                    }
-                    filtered.push({
-                        level: entry.level,
-                        timestamp: entry.timestamp,
-                        message: entry.message,
-                        component: entry.context?.component ?? '',
-                        context: entry.context ?? {},
-                    });
-                }
-                catch {
-                }
-            }
+            filtered = await readFilteredLogEntries(filePath, filter);
         }
         catch {
             return { entries: [], total: 0, filePath };
@@ -322,17 +335,17 @@ export const adminRouter = router({
             return '';
         }
     }),
-    stopClaudeSession: publicProcedure
+    stopSession: publicProcedure
         .input(z.object({ sessionId: z.string() }))
         .mutation(async ({ ctx, input }) => {
         const { sessionService } = ctx.appContext.services;
         const logger = getLogger(ctx);
         const wasRunning = sessionService.isSessionRunning(input.sessionId);
-        logger.info('Admin stopping Claude session', {
+        logger.info('Admin stopping session', {
             sessionId: input.sessionId,
             wasRunning,
         });
-        await sessionService.stopClaudeSession(input.sessionId);
+        await sessionService.stopSession(input.sessionId);
         return {
             wasRunning,
         };