factory-factory 0.3.5 → 0.3.7

package/dist/src/backend/interceptors/conversation-rename.interceptor.test.js

@@ -0,0 +1,116 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+const mockSetInterval = vi.hoisted(() => vi.fn());
+vi.stubGlobal('setInterval', mockSetInterval);
+const mockSessionService = vi.hoisted(() => ({
+    getSessionConversationHistory: vi.fn(),
+    isSessionRunning: vi.fn(),
+    sendSessionMessage: vi.fn(),
+}));
+const mockWorkspaceDataService = vi.hoisted(() => ({
+    findById: vi.fn(),
+}));
+const mockProjectManagementService = vi.hoisted(() => ({
+    findById: vi.fn(),
+}));
+const mockBuildBranchRenameInstruction = vi.hoisted(() => vi.fn());
+const mockCountUserMessages = vi.hoisted(() => vi.fn());
+const mockExtractKeyTopics = vi.hoisted(() => vi.fn());
+vi.mock('@/backend/domains/session/lifecycle/session.service', () => ({
+    sessionService: mockSessionService,
+}));
+vi.mock('@/backend/domains/workspace', () => ({
+    workspaceDataService: mockWorkspaceDataService,
+    projectManagementService: mockProjectManagementService,
+}));
+vi.mock('@/backend/prompts/branch-rename', () => ({
+    buildBranchRenameInstruction: (...args) => mockBuildBranchRenameInstruction(...args),
+}));
+vi.mock('@/backend/services/config.service', () => ({
+    configService: {
+        getBranchRenameMessageThreshold: () => 2,
+    },
+}));
+vi.mock('@/backend/utils/conversation-analyzer', () => ({
+    countUserMessages: (...args) => mockCountUserMessages(...args),
+    extractKeyTopics: (...args) => mockExtractKeyTopics(...args),
+}));
+vi.mock('@/backend/services/logger.service', () => ({
+    createLogger: () => ({
+        debug: vi.fn(),
+        info: vi.fn(),
+        warn: vi.fn(),
+        error: vi.fn(),
+    }),
+}));
+import { conversationRenameInterceptor } from './conversation-rename.interceptor.js';
+const context = {
+    sessionId: 'session-1',
+    workspaceId: 'workspace-1',
+    workingDir: '/tmp/worktree',
+    timestamp: new Date('2026-02-19T00:00:00.000Z'),
+};
+const event = {
+    toolUseId: 'tool-1',
+    toolName: 'Bash',
+    input: { command: 'echo hi' },
+};
+describe('conversationRenameInterceptor', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockWorkspaceDataService.findById.mockResolvedValue({
+            id: 'workspace-1',
+            projectId: 'project-1',
+            name: 'Workspace',
+            description: 'Desc',
+            isAutoGeneratedBranch: true,
+        });
+        mockSessionService.getSessionConversationHistory.mockResolvedValue([
+            { type: 'user', text: 'Please refactor this module' },
+        ]);
+        mockCountUserMessages.mockReturnValue(2);
+        mockExtractKeyTopics.mockReturnValue('refactor module tests');
+        mockProjectManagementService.findById.mockResolvedValue({
+            id: 'project-1',
+            githubOwner: 'purplefish-ai',
+        });
+        mockBuildBranchRenameInstruction.mockReturnValue('rename-branch-instruction');
+        mockSessionService.isSessionRunning.mockReturnValue(true);
+        mockSessionService.sendSessionMessage.mockResolvedValue(undefined);
+    });
+    it('sends rename instruction when threshold is reached', async () => {
+        await conversationRenameInterceptor.onToolComplete?.(event, context);
+        expect(mockBuildBranchRenameInstruction).toHaveBeenCalledWith({
+            branchPrefix: 'purplefish-ai',
+            workspaceName: 'Workspace',
+            workspaceDescription: 'Desc',
+            conversationSummary: 'refactor module tests',
+        });
+        expect(mockSessionService.sendSessionMessage).toHaveBeenCalledWith('session-1', 'rename-branch-instruction');
+    });
+    it('does not send instructions for non-auto-generated branches', async () => {
+        mockWorkspaceDataService.findById.mockResolvedValue({
+            id: 'workspace-1',
+            projectId: 'project-1',
+            name: 'Workspace',
+            isAutoGeneratedBranch: false,
+        });
+        await conversationRenameInterceptor.onToolComplete?.(event, {
+            ...context,
+            sessionId: 'session-2',
+        });
+        expect(mockSessionService.sendSessionMessage).not.toHaveBeenCalled();
+    });
+    it('skips sending when session is not running', async () => {
+        mockSessionService.isSessionRunning.mockReturnValue(false);
+        await conversationRenameInterceptor.onToolComplete?.(event, {
+            ...context,
+            sessionId: 'session-3',
+        });
+        expect(mockSessionService.sendSessionMessage).not.toHaveBeenCalled();
+    });
+    it('handles internal errors without throwing', async () => {
+        mockWorkspaceDataService.findById.mockRejectedValue(new Error('db unavailable'));
+        await expect(conversationRenameInterceptor.onToolComplete?.(event, { ...context, sessionId: 'session-4' })).resolves.toBeUndefined();
+    });
+});
+//# sourceMappingURL=conversation-rename.interceptor.test.js.map

package/dist/src/backend/interceptors/conversation-rename.interceptor.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-rename.interceptor.test.js","sourceRoot":"","sources":["../../../../src/backend/interceptors/conversation-rename.interceptor.test.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/interceptors/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/backend/interceptors/index.ts"],"names":[],"mappings":"AAeA,wBAAgB,oBAAoB,IAAI,IAAI,CAI3C;AAED,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,YAAY,EAAE,kBAAkB,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/backend/interceptors/index.ts"],"names":[],"mappings":"AAiBA,wBAAgB,oBAAoB,IAAI,IAAI,CAM3C;AAED,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,YAAY,EAAE,kBAAkB,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC"}

package/dist/src/backend/interceptors/index.js

@@ -1,10 +1,14 @@
 import { branchRenameInterceptor } from './branch-rename.interceptor.js';
 import { conversationRenameInterceptor } from './conversation-rename.interceptor.js';
 import { prDetectionInterceptor } from './pr-detection.interceptor.js';
+import { prePrRenameInterceptor } from './pre-pr-rename.interceptor.js';
+import { prePushRenameInterceptor } from './pre-push-rename.interceptor.js';
 import { interceptorRegistry } from './registry.js';
 export function registerInterceptors() {
     interceptorRegistry.register(branchRenameInterceptor);
     interceptorRegistry.register(conversationRenameInterceptor);
+    interceptorRegistry.register(prePushRenameInterceptor);
+    interceptorRegistry.register(prePrRenameInterceptor);
     interceptorRegistry.register(prDetectionInterceptor);
 }
 export { interceptorRegistry } from './registry.js';

package/dist/src/backend/interceptors/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/backend/interceptors/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAKjD,MAAM,UAAU,oBAAoB;IAClC,mBAAmB,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IACtD,mBAAmB,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;IAC5D,mBAAmB,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;AACvD,CAAC;AAED,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/backend/interceptors/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAKjD,MAAM,UAAU,oBAAoB;IAClC,mBAAmB,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IACtD,mBAAmB,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;IAC5D,mBAAmB,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IACvD,mBAAmB,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;IACrD,mBAAmB,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;AACvD,CAAC;AAED,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC"}

package/dist/src/backend/interceptors/pre-pr-rename.interceptor.d.ts

@@ -0,0 +1,5 @@
+import { generateBranchName } from './branch-rename.utils.js';
+import type { ToolInterceptor } from './types.js';
+export { generateBranchName };
+export declare const prePrRenameInterceptor: ToolInterceptor;
+//# sourceMappingURL=pre-pr-rename.interceptor.d.ts.map

package/dist/src/backend/interceptors/pre-pr-rename.interceptor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pre-pr-rename.interceptor.d.ts","sourceRoot":"","sources":["../../../../src/backend/interceptors/pre-pr-rename.interceptor.ts"],"names":[],"mappings":"AAWA,OAAO,EAA0B,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,KAAK,EAAiC,eAAe,EAAE,MAAM,SAAS,CAAC;AAgB9E,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAqI9B,eAAO,MAAM,sBAAsB,EAAE,eAuHpC,CAAC"}

package/dist/src/backend/interceptors/pre-pr-rename.interceptor.js

@@ -0,0 +1,211 @@
+import { projectManagementService, workspaceDataService } from '../../backend/domains/workspace/index.js';
+import { gitCommand } from '../../backend/lib/shell.js';
+import { createLogger } from '../../backend/services/logger.service.js';
+import { extractMatchingCommand, generateBranchName } from './branch-rename.utils.js';
+const logger = createLogger('pre-pr-rename');
+const GH_PR_CREATE_REGEX = /\bgh\s+pr\s+create\b/;
+const MAX_REMOTE_CLEANUP_CANDIDATES = 1000;
+const renamedWorkspaces = new Set();
+const remoteCleanupCandidates = new Map();
+export { generateBranchName };
+function setRemoteCleanupCandidate(toolUseId, candidate) {
+    if (remoteCleanupCandidates.has(toolUseId)) {
+        remoteCleanupCandidates.delete(toolUseId);
+    }
+    while (remoteCleanupCandidates.size >= MAX_REMOTE_CLEANUP_CANDIDATES) {
+        const oldestToolUseId = remoteCleanupCandidates.keys().next().value;
+        if (!oldestToolUseId) {
+            break;
+        }
+        remoteCleanupCandidates.delete(oldestToolUseId);
+    }
+    remoteCleanupCandidates.set(toolUseId, candidate);
+}
+function parseRemoteName(upstreamRef) {
+    const slashIndex = upstreamRef.indexOf('/');
+    if (slashIndex <= 0) {
+        return undefined;
+    }
+    return upstreamRef.slice(0, slashIndex);
+}
+function normalizeRemoteBranchName(branchName, remoteName) {
+    const remotePrefix = `${remoteName}/`;
+    if (branchName.startsWith(remotePrefix)) {
+        return branchName.slice(remotePrefix.length);
+    }
+    const fullRefPrefix = `refs/remotes/${remoteName}/`;
+    if (branchName.startsWith(fullRefPrefix)) {
+        return branchName.slice(fullRefPrefix.length);
+    }
+    return branchName;
+}
+async function getRefCommit(ref, workingDir) {
+    const result = await gitCommand(['rev-parse', '--verify', '--quiet', ref], workingDir);
+    if (result.code !== 0) {
+        return undefined;
+    }
+    const commit = result.stdout.trim();
+    return commit || undefined;
+}
+async function cleanupSupersededRemoteBranch(context) {
+    if (context.oldBranchName === context.newBranchName) {
+        return;
+    }
+    const headResult = await gitCommand(['rev-parse', 'HEAD'], context.workingDir);
+    if (headResult.code !== 0) {
+        logger.warn('Skipping remote branch cleanup; failed to resolve HEAD', {
+            workspaceId: context.workspaceId,
+            stderr: headResult.stderr,
+        });
+        return;
+    }
+    const headCommit = headResult.stdout.trim();
+    if (!headCommit) {
+        return;
+    }
+    const upstreamResult = await gitCommand(['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{upstream}'], context.workingDir);
+    if (upstreamResult.code !== 0) {
+        return;
+    }
+    const upstreamRef = upstreamResult.stdout.trim();
+    const remoteName = parseRemoteName(upstreamRef);
+    if (!remoteName) {
+        return;
+    }
+    const oldRemoteBranchName = normalizeRemoteBranchName(context.oldBranchName, remoteName);
+    const newRemoteBranchName = normalizeRemoteBranchName(context.newBranchName, remoteName);
+    if (!(oldRemoteBranchName && newRemoteBranchName)) {
+        return;
+    }
+    if (oldRemoteBranchName === newRemoteBranchName) {
+        return;
+    }
+    const oldRemoteRef = `refs/remotes/${remoteName}/${oldRemoteBranchName}`;
+    const newRemoteRef = `refs/remotes/${remoteName}/${newRemoteBranchName}`;
+    const oldRemoteCommit = await getRefCommit(oldRemoteRef, context.workingDir);
+    const newRemoteCommit = await getRefCommit(newRemoteRef, context.workingDir);
+    if (!(oldRemoteCommit && newRemoteCommit)) {
+        return;
+    }
+    if (oldRemoteCommit !== headCommit || newRemoteCommit !== headCommit) {
+        return;
+    }
+    const deleteResult = await gitCommand(['push', remoteName, '--delete', oldRemoteBranchName], context.workingDir);
+    if (deleteResult.code !== 0) {
+        logger.warn('Failed to delete superseded remote branch', {
+            workspaceId: context.workspaceId,
+            oldBranchName: context.oldBranchName,
+            remoteName,
+            stderr: deleteResult.stderr,
+        });
+        return;
+    }
+    logger.info('Deleted superseded remote branch after pre-PR rename', {
+        workspaceId: context.workspaceId,
+        oldBranchName: context.oldBranchName,
+        newBranchName: context.newBranchName,
+        remoteName,
+    });
+}
+export const prePrRenameInterceptor = {
+    name: 'pre-pr-rename',
+    tools: '*',
+    async onToolStart(event, context) {
+        let renameCompleted = false;
+        try {
+            const command = extractMatchingCommand(event, GH_PR_CREATE_REGEX, logger);
+            if (!command) {
+                return;
+            }
+            if (renamedWorkspaces.has(context.workspaceId)) {
+                return;
+            }
+            const workspace = await workspaceDataService.findById(context.workspaceId);
+            if (!workspace) {
+                return;
+            }
+            if (!workspace.isAutoGeneratedBranch) {
+                return;
+            }
+            const oldBranchName = workspace.branchName ?? '';
+            logger.info('Detected gh pr create with auto-generated branch, renaming', {
+                workspaceId: context.workspaceId,
+                currentBranch: oldBranchName,
+            });
+            renamedWorkspaces.add(context.workspaceId);
+            const project = await projectManagementService.findById(workspace.projectId);
+            const newBranchName = generateBranchName({
+                branchPrefix: project?.githubOwner ?? '',
+                workspaceName: workspace.name,
+            });
+            if (!newBranchName) {
+                logger.warn('Could not generate branch name from workspace context', {
+                    workspaceId: context.workspaceId,
+                    workspaceName: workspace.name,
+                });
+                renamedWorkspaces.delete(context.workspaceId);
+                return;
+            }
+            if (newBranchName === oldBranchName) {
+                await workspaceDataService.clearAutoGeneratedBranch(context.workspaceId);
+                return;
+            }
+            const result = await gitCommand(['branch', '-m', newBranchName], context.workingDir);
+            if (result.code !== 0) {
+                logger.warn('Failed to rename branch before PR creation', {
+                    workspaceId: context.workspaceId,
+                    newBranchName,
+                    stderr: result.stderr,
+                });
+                renamedWorkspaces.delete(context.workspaceId);
+                return;
+            }
+            await workspaceDataService.setBranchName(context.workspaceId, newBranchName);
+            await workspaceDataService.clearAutoGeneratedBranch(context.workspaceId);
+            renameCompleted = true;
+            if (oldBranchName) {
+                setRemoteCleanupCandidate(event.toolUseId, {
+                    oldBranchName,
+                    newBranchName,
+                    workspaceId: context.workspaceId,
+                    workingDir: context.workingDir,
+                });
+            }
+            logger.info('Renamed branch before PR creation', {
+                workspaceId: context.workspaceId,
+                oldBranch: oldBranchName,
+                newBranch: newBranchName,
+            });
+        }
+        catch (error) {
+            if (!renameCompleted) {
+                renamedWorkspaces.delete(context.workspaceId);
+            }
+            logger.error('Error in pre-PR rename interceptor', {
+                workspaceId: context.workspaceId,
+                error,
+            });
+        }
+    },
+    async onToolComplete(event) {
+        const candidate = remoteCleanupCandidates.get(event.toolUseId);
+        if (!candidate) {
+            return;
+        }
+        remoteCleanupCandidates.delete(event.toolUseId);
+        if (event.output?.isError) {
+            return;
+        }
+        try {
+            await cleanupSupersededRemoteBranch(candidate);
+        }
+        catch (error) {
+            logger.error('Error cleaning up superseded remote branch', {
+                workspaceId: candidate.workspaceId,
+                toolUseId: event.toolUseId,
+                error,
+            });
+        }
+    },
+};
+//# sourceMappingURL=pre-pr-rename.interceptor.js.map

package/dist/src/backend/interceptors/pre-pr-rename.interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pre-pr-rename.interceptor.js","sourceRoot":"","sources":["../../../../src/backend/interceptors/pre-pr-rename.interceptor.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/interceptors/pre-pr-rename.interceptor.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=pre-pr-rename.interceptor.test.d.ts.map

package/dist/src/backend/interceptors/pre-pr-rename.interceptor.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pre-pr-rename.interceptor.test.d.ts","sourceRoot":"","sources":["../../../../src/backend/interceptors/pre-pr-rename.interceptor.test.ts"],"names":[],"mappings":""}