diff --git a/.gitignore b/.gitignore index af99b39..7cea6a2 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,9 @@ workdir/* # Agent working directories agent-workdirs/ +# Agent-generated screenshots +.screenshots/ + # Logs *.log npm-debug.log* diff --git a/CLAUDE.md b/CLAUDE.md index 5f9f778..4bf881c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -24,7 +24,7 @@ Pre-implementation design docs are archived in `docs/archive/`. ## Key Rules -- **Database**: Never use raw SQL for schema initialization. Use `drizzle-kit generate` and the migration system. See [docs/database-migrations.md](docs/database-migrations.md). +- **Database migrations**: Edit `apps/server/db/schema.ts`, then run `npx drizzle-kit generate`. Multi-statement migrations need `--> statement-breakpoint` between statements. See [docs/database-migrations.md](docs/database-migrations.md). - **Logging**: Use `createModuleLogger()` from `apps/server/logger/index.ts`. Keep `console.log` for CLI user-facing output only. - **Hexagonal architecture**: Repository ports in `apps/server/db/repositories/*.ts`, Drizzle adapters in `apps/server/db/repositories/drizzle/*.ts`. All re-exported from `apps/server/db/index.ts`. - **tRPC context**: Optional repos accessed via `require*Repository()` helpers in `apps/server/trpc/routers/_helpers.ts`. diff --git a/apps/server/agent/cleanup-manager.ts b/apps/server/agent/cleanup-manager.ts index e35d406..17586ac 100644 --- a/apps/server/agent/cleanup-manager.ts +++ b/apps/server/agent/cleanup-manager.ts @@ -8,7 +8,7 @@ import { promisify } from 'node:util'; import { execFile } from 'node:child_process'; import { readFile, readdir, rm, cp, mkdir } from 'node:fs/promises'; -import { existsSync } from 'node:fs'; +import { existsSync, readdirSync } from 'node:fs'; import { join } from 'node:path'; import type { AgentRepository } from '../db/repositories/agent-repository.js'; import type { ProjectRepository } from '../db/repositories/project-repository.js'; @@ -49,10 +49,35 @@ export class CleanupManager { */ private resolveAgentCwd(worktreeId: string): string { const base = this.getAgentWorkdir(worktreeId); + + // Fast path: .cw/output exists at the base level + if (existsSync(join(base, '.cw', 'output'))) { + return base; + } + + // Standalone agents use a workspace/ subdirectory const workspaceSub = join(base, 'workspace'); - if (!existsSync(join(base, '.cw', 'output')) && existsSync(join(workspaceSub, '.cw'))) { + if (existsSync(join(workspaceSub, '.cw'))) { return workspaceSub; } + + // Initiative-based agents may have written .cw/ inside a project + // subdirectory (e.g. agent-workdirs//codewalk-district/.cw/). + // Probe immediate children for a .cw/output directory. + try { + const entries = readdirSync(base, { withFileTypes: true }); + for (const entry of entries) { + if (entry.isDirectory() && entry.name !== '.cw') { + const projectSub = join(base, entry.name); + if (existsSync(join(projectSub, '.cw', 'output'))) { + return projectSub; + } + } + } + } catch { + // base dir may not exist + } + return base; } diff --git a/apps/server/agent/file-io.test.ts b/apps/server/agent/file-io.test.ts index 20aec4d..396453f 100644 --- a/apps/server/agent/file-io.test.ts +++ b/apps/server/agent/file-io.test.ts @@ -68,6 +68,7 @@ describe('writeInputFiles', () => { name: 'Phase One', content: 'First phase', status: 'pending', + mergeBase: null, createdAt: new Date(), updatedAt: new Date(), } as Phase; diff --git a/apps/server/agent/file-io.ts b/apps/server/agent/file-io.ts index e6da8e1..84b9c3a 100644 --- a/apps/server/agent/file-io.ts +++ b/apps/server/agent/file-io.ts @@ -397,6 +397,34 @@ export async function readDecisionFiles(agentWorkdir: string): Promise { + const filePath = join(agentWorkdir, '.cw', 'output', 'comment-responses.json'); + try { + const raw = await readFile(filePath, 'utf-8'); + const parsed = JSON.parse(raw); + if (!Array.isArray(parsed)) return []; + return parsed + .filter((entry: unknown) => { + if (typeof entry !== 'object' || entry === null) return false; + const e = entry as Record; + return typeof e.commentId === 'string' && typeof e.body === 'string'; + }) + .map((entry: Record) => ({ + commentId: String(entry.commentId), + body: String(entry.body), + resolved: typeof entry.resolved === 'boolean' ? entry.resolved : undefined, + })); + } catch { + return []; + } +} + export async function readPageFiles(agentWorkdir: string): Promise { const dirPath = join(agentWorkdir, '.cw', 'output', 'pages'); return readFrontmatterDir(dirPath, (data, body, filename) => { diff --git a/apps/server/agent/manager.ts b/apps/server/agent/manager.ts index 3bde16a..d567fcc 100644 --- a/apps/server/agent/manager.ts +++ b/apps/server/agent/manager.ts @@ -27,6 +27,7 @@ import type { TaskRepository } from '../db/repositories/task-repository.js'; import type { PageRepository } from '../db/repositories/page-repository.js'; import type { LogChunkRepository } from '../db/repositories/log-chunk-repository.js'; import type { ChatSessionRepository } from '../db/repositories/chat-session-repository.js'; +import type { ReviewCommentRepository } from '../db/repositories/review-comment-repository.js'; import { generateUniqueAlias } from './alias.js'; import type { EventBus, @@ -42,7 +43,7 @@ import { getProvider } from './providers/registry.js'; import { createModuleLogger } from '../logger/index.js'; import { getProjectCloneDir } from '../git/project-clones.js'; import { join } from 'node:path'; -import { unlink, readFile, writeFile as writeFileAsync } from 'node:fs/promises'; +import { unlink, readFile, writeFile as writeFileAsync, mkdir } from 'node:fs/promises'; import { existsSync } from 'node:fs'; import type { AccountCredentialManager } from './credentials/types.js'; import { ProcessManager } from './process-manager.js'; @@ -84,11 +85,12 @@ export class MultiProviderAgentManager implements AgentManager { private debug: boolean = false, processManagerOverride?: ProcessManager, private chatSessionRepository?: ChatSessionRepository, + private reviewCommentRepository?: ReviewCommentRepository, ) { this.signalManager = new FileSystemSignalManager(); this.processManager = processManagerOverride ?? new ProcessManager(workspaceRoot, projectRepository); this.credentialHandler = new CredentialHandler(workspaceRoot, accountRepository, credentialManager); - this.outputHandler = new OutputHandler(repository, eventBus, changeSetRepository, phaseRepository, taskRepository, pageRepository, this.signalManager, chatSessionRepository); + this.outputHandler = new OutputHandler(repository, eventBus, changeSetRepository, phaseRepository, taskRepository, pageRepository, this.signalManager, chatSessionRepository, reviewCommentRepository); this.cleanupManager = new CleanupManager(workspaceRoot, repository, projectRepository, eventBus, debug, this.signalManager); this.lifecycleController = createLifecycleController({ repository, @@ -330,32 +332,10 @@ export class MultiProviderAgentManager implements AgentManager { await this.repository.update(agentId, { pid, outputFilePath }); - // Write spawn diagnostic file for post-execution verification - const diagnostic = { - timestamp: new Date().toISOString(), - agentId, - alias, - intendedCwd: finalCwd, - worktreeId: agent.worktreeId, - provider: providerName, - command, - args, - env: processEnv, - cwdExistsAtSpawn: existsSync(finalCwd), - initiativeId: initiativeId || null, - customCwdProvided: !!cwd, - accountId: accountId || null, - }; - - await writeFileAsync( - join(finalCwd, '.cw', 'spawn-diagnostic.json'), - JSON.stringify(diagnostic, null, 2), - 'utf-8' - ); - + // Register agent and start polling BEFORE non-critical I/O so that a + // diagnostic-write failure can never orphan a running process. const activeEntry: ActiveAgent = { agentId, pid, tailer, outputFilePath, agentCwd: finalCwd }; this.activeAgents.set(agentId, activeEntry); - log.info({ agentId, alias, pid, diagnosticWritten: true }, 'detached subprocess started with diagnostic'); // Emit spawned event if (this.eventBus) { @@ -375,6 +355,37 @@ export class MultiProviderAgentManager implements AgentManager { ); activeEntry.cancelPoll = cancel; + // Write spawn diagnostic file (non-fatal — .cw/ may not exist yet for + // agents spawned without inputContext, e.g. conflict-resolution agents) + try { + const diagnosticDir = join(finalCwd, '.cw'); + await mkdir(diagnosticDir, { recursive: true }); + const diagnostic = { + timestamp: new Date().toISOString(), + agentId, + alias, + intendedCwd: finalCwd, + worktreeId: agent.worktreeId, + provider: providerName, + command, + args, + env: processEnv, + cwdExistsAtSpawn: existsSync(finalCwd), + initiativeId: initiativeId || null, + customCwdProvided: !!cwd, + accountId: accountId || null, + }; + await writeFileAsync( + join(diagnosticDir, 'spawn-diagnostic.json'), + JSON.stringify(diagnostic, null, 2), + 'utf-8' + ); + } catch (err) { + log.warn({ agentId, alias, err: err instanceof Error ? err.message : String(err) }, 'failed to write spawn diagnostic'); + } + + log.info({ agentId, alias, pid }, 'detached subprocess started'); + return this.toAgentInfo(agent); } diff --git a/apps/server/agent/output-handler.ts b/apps/server/agent/output-handler.ts index 9c85b2c..28fdaf6 100644 --- a/apps/server/agent/output-handler.ts +++ b/apps/server/agent/output-handler.ts @@ -7,7 +7,7 @@ */ import { readFile } from 'node:fs/promises'; -import { existsSync } from 'node:fs'; +import { existsSync, readdirSync } from 'node:fs'; import { join } from 'node:path'; import type { AgentRepository } from '../db/repositories/agent-repository.js'; import type { ChangeSetRepository, CreateChangeSetEntryData } from '../db/repositories/change-set-repository.js'; @@ -15,6 +15,7 @@ import type { PhaseRepository } from '../db/repositories/phase-repository.js'; import type { TaskRepository } from '../db/repositories/task-repository.js'; import type { PageRepository } from '../db/repositories/page-repository.js'; import type { ChatSessionRepository } from '../db/repositories/chat-session-repository.js'; +import type { ReviewCommentRepository } from '../db/repositories/review-comment-repository.js'; import type { EventBus, AgentStoppedEvent, @@ -37,6 +38,7 @@ import { readDecisionFiles, readPageFiles, readFrontmatterFile, + readCommentResponses, } from './file-io.js'; import { getProvider } from './providers/registry.js'; import { markdownToTiptapJson } from './markdown-to-tiptap.js'; @@ -92,6 +94,7 @@ export class OutputHandler { private pageRepository?: PageRepository, private signalManager?: SignalManager, private chatSessionRepository?: ChatSessionRepository, + private reviewCommentRepository?: ReviewCommentRepository, ) {} /** @@ -230,10 +233,10 @@ export class OutputHandler { log.debug({ agentId }, 'detached agent completed'); - // Resolve actual agent working directory — standalone agents run in a - // "workspace/" subdirectory inside getAgentWorkdir, so prefer agentCwd - // recorded at spawn time when available. - const agentWorkdir = active?.agentCwd ?? getAgentWorkdir(agent.worktreeId); + // Resolve actual agent working directory. + // The recorded agentCwd may be the parent dir (agent-workdirs//) while + // the agent actually writes .cw/output/ inside a project subdirectory. + const agentWorkdir = this.resolveAgentWorkdir(active?.agentCwd ?? getAgentWorkdir(agent.worktreeId)); const outputDir = join(agentWorkdir, '.cw', 'output'); const expectedPwdFile = join(agentWorkdir, '.cw', 'expected-pwd.txt'); const diagnosticFile = join(agentWorkdir, '.cw', 'spawn-diagnostic.json'); @@ -851,6 +854,28 @@ export class OutputHandler { } } + // Process comment responses from agent (for review/execute tasks) + if (this.reviewCommentRepository) { + try { + const commentResponses = await readCommentResponses(agentWorkdir); + for (const resp of commentResponses) { + try { + await this.reviewCommentRepository.createReply(resp.commentId, resp.body, 'agent'); + if (resp.resolved) { + await this.reviewCommentRepository.resolve(resp.commentId); + } + } catch (err) { + log.warn({ agentId, commentId: resp.commentId, err: err instanceof Error ? err.message : String(err) }, 'failed to process comment response'); + } + } + if (commentResponses.length > 0) { + log.info({ agentId, count: commentResponses.length }, 'processed agent comment responses'); + } + } catch (err) { + log.warn({ agentId, err: err instanceof Error ? err.message : String(err) }, 'failed to read comment responses'); + } + } + const resultPayload: AgentResult = { success: true, message: resultMessage, @@ -1133,6 +1158,31 @@ export class OutputHandler { } } + /** + * Resolve the actual agent working directory. The recorded agentCwd may be + * the parent (agent-workdirs//) but .cw/output/ could be inside a + * project subdirectory (e.g. codewalk-district/.cw/output/). + */ + private resolveAgentWorkdir(base: string): string { + if (existsSync(join(base, '.cw', 'output'))) return base; + + // Standalone agents: workspace/ subdirectory + const workspaceSub = join(base, 'workspace'); + if (existsSync(join(workspaceSub, '.cw'))) return workspaceSub; + + // Initiative-based agents: probe project subdirectories + try { + for (const entry of readdirSync(base, { withFileTypes: true })) { + if (entry.isDirectory() && entry.name !== '.cw') { + const sub = join(base, entry.name); + if (existsSync(join(sub, '.cw', 'output'))) return sub; + } + } + } catch { /* base may not exist */ } + + return base; + } + private emitCrashed(agent: { id: string; name: string; taskId: string | null }, error: string): void { if (this.eventBus) { const event: AgentCrashedEvent = { diff --git a/apps/server/agent/prompts/conflict-resolution.ts b/apps/server/agent/prompts/conflict-resolution.ts new file mode 100644 index 0000000..bb33ab7 --- /dev/null +++ b/apps/server/agent/prompts/conflict-resolution.ts @@ -0,0 +1,77 @@ +/** + * Conflict resolution prompt — spawned when initiative branch has merge conflicts + * with the target branch. + */ + +import { + SIGNAL_FORMAT, + SESSION_STARTUP, + GIT_WORKFLOW, + CONTEXT_MANAGEMENT, +} from './shared.js'; + +export function buildConflictResolutionPrompt( + sourceBranch: string, + targetBranch: string, + conflicts: string[], +): string { + const conflictList = conflicts.map(f => `- \`${f}\``).join('\n'); + + return ` +You are a Conflict Resolution agent. Your job is to merge \`${targetBranch}\` into the initiative branch \`${sourceBranch}\` and resolve all merge conflicts. You are working on a temporary branch created from \`${sourceBranch}\`. After resolving conflicts and committing, you must advance the initiative branch pointer using \`git update-ref\`. + + + +**Source branch (initiative):** \`${sourceBranch}\` +**Target branch (default):** \`${targetBranch}\` + +**Conflicting files:** +${conflictList} + +${SIGNAL_FORMAT} +${SESSION_STARTUP} + + +Follow these steps in order: + +1. **Inspect divergence**: Run \`git log --oneline ${targetBranch}..${sourceBranch}\` and \`git log --oneline ${sourceBranch}..${targetBranch}\` to understand what each side changed. + +2. **Review conflicting files**: For each conflicting file, read both versions: + - \`git show ${sourceBranch}:\` + - \`git show ${targetBranch}:\` + +3. **Merge**: Run \`git merge ${targetBranch} --no-edit\`. This will produce conflict markers. + +4. **Resolve each file**: For each conflicting file: + - Read the file to see conflict markers (\`<<<<<<<\`, \`=======\`, \`>>>>>>>\`) + - Understand both sides' intent from step 1-2 + - Choose the correct resolution — keep both changes when they don't overlap, prefer the more complete version when they do + - If you genuinely cannot determine the correct resolution, signal "questions" explaining the ambiguity + +5. **Verify**: Run \`git diff --check\` to confirm no conflict markers remain. Run the test suite to confirm nothing is broken. + +6. **Commit**: Stage resolved files with \`git add \` (never \`git add .\`), then \`git commit --no-edit\` to complete the merge commit. + +7. **Update initiative branch**: Run \`git update-ref refs/heads/${sourceBranch} HEAD\` to advance the initiative branch to include the merge result. This is necessary because you are working on a temporary branch — this command propagates the merge commit to the actual initiative branch. + +8. **Signal done**: Write signal.json with status "done". + +${GIT_WORKFLOW} +${CONTEXT_MANAGEMENT} + + +- You are on a temporary branch created from ${sourceBranch}. You are merging ${targetBranch} INTO this branch — bringing it up to date, NOT the other way around. +- After committing the merge, you MUST run \`git update-ref refs/heads/${sourceBranch} HEAD\` to advance the initiative branch pointer. Without this step, the initiative branch will not reflect the merge. +- Do NOT force-push or rebase. A merge commit is the correct approach. +- If tests fail after resolution, fix the code — don't skip tests. +- If a conflict is genuinely ambiguous (e.g., both sides rewrote the same function differently), signal "questions" with the specific ambiguity and your proposed resolution. +`; +} + +export function buildConflictResolutionDescription( + sourceBranch: string, + targetBranch: string, + conflicts: string[], +): string { + return `Resolve ${conflicts.length} merge conflict(s) between ${sourceBranch} and ${targetBranch}: ${conflicts.join(', ')}`; +} diff --git a/apps/server/agent/prompts/detail.ts b/apps/server/agent/prompts/detail.ts index bb16a27..2b20e39 100644 --- a/apps/server/agent/prompts/detail.ts +++ b/apps/server/agent/prompts/detail.ts @@ -13,7 +13,7 @@ ${CODEBASE_EXPLORATION} Write one file per task to \`.cw/output/tasks/{id}.md\`: -- Frontmatter: \`title\`, \`category\` (execute|research|discuss|plan|detail|refine|verify|merge|review), \`type\` (auto|checkpoint:human-verify|checkpoint:decision|checkpoint:human-action), \`dependencies\` (list of task IDs that must complete before this task can start) +- Frontmatter: \`title\`, \`category\` (execute|research|discuss|plan|detail|refine|verify|merge|review), \`dependencies\` (list of task IDs that must complete before this task can start) - Body: Detailed task description @@ -92,14 +92,6 @@ Each task is handled by a separate agent that must load the full codebase contex Bundle related changes into one task. "Add user validation" + "Add user API route" + "Add user route tests" is ONE task ("Add user creation endpoint with validation and tests"), not three. - -- \`checkpoint:human-verify\`: Visual changes, migrations, API contracts -- \`checkpoint:decision\`: Architecture choices affecting multiple phases -- \`checkpoint:human-action\`: External setup (DNS, credentials, third-party config) - -~90% of tasks should be \`auto\`. - - - Read ALL \`context/tasks/\` files before generating output - Only create tasks for THIS phase (\`phase.md\`) diff --git a/apps/server/agent/prompts/execute.ts b/apps/server/agent/prompts/execute.ts index 03299af..92878bf 100644 --- a/apps/server/agent/prompts/execute.ts +++ b/apps/server/agent/prompts/execute.ts @@ -14,13 +14,26 @@ import { } from './shared.js'; export function buildExecutePrompt(taskDescription?: string): string { + const hasReviewComments = taskDescription?.includes('[comment:'); + const reviewCommentsSection = hasReviewComments + ? ` + +You are addressing review feedback. Each comment is tagged with [comment:ID]. +For EACH comment you address: +1. Fix the issue in code, OR explain why no change is needed. +2. Write \`.cw/output/comment-responses.json\`: + [{"commentId": "abc123", "body": "Fixed: added try-catch around token validation", "resolved": true}] +Set resolved:true when you fixed it, false when you're explaining why you didn't. +` + : ''; + const taskSection = taskDescription ? ` ${taskDescription} Read \`.cw/input/task.md\` for the full structured task with metadata, priority, and dependencies. -` +${reviewCommentsSection}` : ''; return ` diff --git a/apps/server/agent/prompts/index.ts b/apps/server/agent/prompts/index.ts index 7722872..2186994 100644 --- a/apps/server/agent/prompts/index.ts +++ b/apps/server/agent/prompts/index.ts @@ -15,3 +15,4 @@ export { buildChatPrompt } from './chat.js'; export type { ChatHistoryEntry } from './chat.js'; export { buildWorkspaceLayout } from './workspace.js'; export { buildPreviewInstructions } from './preview.js'; +export { buildConflictResolutionPrompt, buildConflictResolutionDescription } from './conflict-resolution.js'; diff --git a/apps/server/cli/extract.test.ts b/apps/server/cli/extract.test.ts new file mode 100644 index 0000000..64718ba --- /dev/null +++ b/apps/server/cli/extract.test.ts @@ -0,0 +1,90 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; + +// Mock the accounts module so the dynamic import is intercepted +vi.mock('../agent/accounts/index.js', () => ({ + extractCurrentClaudeAccount: vi.fn(), +})); + +import { extractCurrentClaudeAccount } from '../agent/accounts/index.js'; +const mockExtract = vi.mocked(extractCurrentClaudeAccount); + +import { createCli } from './index.js'; + +describe('cw account extract', () => { + beforeEach(() => { + vi.spyOn(console, 'log').mockImplementation(() => {}); + vi.spyOn(console, 'error').mockImplementation(() => {}); + vi.spyOn(process, 'exit').mockImplementation((_code?: string | number | null) => undefined as never); + }); + + afterEach(() => { + vi.restoreAllMocks(); + }); + + it('happy path — no email flag prints JSON to stdout', async () => { + mockExtract.mockResolvedValueOnce({ + email: 'user@example.com', + accountUuid: 'uuid-1', + configJson: { hasCompletedOnboarding: true }, + credentials: '{"claudeAiOauth":{"accessToken":"tok"}}', + }); + + const program = createCli(); + await program.parseAsync(['node', 'cw', 'account', 'extract']); + + expect(console.log).toHaveBeenCalledTimes(1); + const output = JSON.parse((console.log as ReturnType).mock.calls[0][0]); + expect(output.email).toBe('user@example.com'); + expect(output.configJson).toBe('{"hasCompletedOnboarding":true}'); + expect(output.credentials).toBe('{"claudeAiOauth":{"accessToken":"tok"}}'); + expect(process.exit).not.toHaveBeenCalled(); + }); + + it('happy path — matching email flag succeeds', async () => { + mockExtract.mockResolvedValueOnce({ + email: 'user@example.com', + accountUuid: 'uuid-1', + configJson: { hasCompletedOnboarding: true }, + credentials: '{"claudeAiOauth":{"accessToken":"tok"}}', + }); + + const program = createCli(); + await program.parseAsync(['node', 'cw', 'account', 'extract', '--email', 'user@example.com']); + + expect(console.log).toHaveBeenCalledTimes(1); + const output = JSON.parse((console.log as ReturnType).mock.calls[0][0]); + expect(output.email).toBe('user@example.com'); + expect(output.configJson).toBe('{"hasCompletedOnboarding":true}'); + expect(output.credentials).toBe('{"claudeAiOauth":{"accessToken":"tok"}}'); + expect(process.exit).not.toHaveBeenCalled(); + }); + + it('email mismatch prints error and exits with code 1', async () => { + mockExtract.mockResolvedValueOnce({ + email: 'other@example.com', + accountUuid: 'uuid-2', + configJson: { hasCompletedOnboarding: true }, + credentials: '{"claudeAiOauth":{"accessToken":"tok"}}', + }); + + const program = createCli(); + await program.parseAsync(['node', 'cw', 'account', 'extract', '--email', 'user@example.com']); + + expect(console.error).toHaveBeenCalledWith( + "Account 'user@example.com' not found (active account is 'other@example.com')" + ); + expect(process.exit).toHaveBeenCalledWith(1); + expect(console.log).not.toHaveBeenCalled(); + }); + + it('extractCurrentClaudeAccount throws prints error and exits with code 1', async () => { + mockExtract.mockRejectedValueOnce(new Error('No Claude account found')); + + const program = createCli(); + await program.parseAsync(['node', 'cw', 'account', 'extract']); + + expect(console.error).toHaveBeenCalledWith('Failed to extract account:', 'No Claude account found'); + expect(process.exit).toHaveBeenCalledWith(1); + expect(console.log).not.toHaveBeenCalled(); + }); +}); diff --git a/apps/server/cli/index.ts b/apps/server/cli/index.ts index 79213ab..007035c 100644 --- a/apps/server/cli/index.ts +++ b/apps/server/cli/index.ts @@ -1334,6 +1334,32 @@ export function createCli(serverHandler?: (port?: number) => Promise): Com } }); + // cw account extract + accountCommand + .command('extract') + .description('Extract current Claude credentials for use with the UI (does not require server)') + .option('--email ', 'Verify extracted account matches this email') + .action(async (options: { email?: string }) => { + try { + const { extractCurrentClaudeAccount } = await import('../agent/accounts/index.js'); + const extracted = await extractCurrentClaudeAccount(); + if (options.email && extracted.email !== options.email) { + console.error(`Account '${options.email}' not found (active account is '${extracted.email}')`); + process.exit(1); + return; + } + const output = { + email: extracted.email, + configJson: JSON.stringify(extracted.configJson), + credentials: extracted.credentials, + }; + console.log(JSON.stringify(output, null, 2)); + } catch (error) { + console.error('Failed to extract account:', (error as Error).message); + process.exit(1); + } + }); + // Preview command group const previewCommand = program .command('preview') diff --git a/apps/server/container.ts b/apps/server/container.ts index e72a7a3..5e6aefd 100644 --- a/apps/server/container.ts +++ b/apps/server/container.ts @@ -183,6 +183,7 @@ export async function createContainer(options?: ContainerOptions): Promise; findByAgentId(agentId: string): Promise; markReverted(id: string): Promise; + + /** + * Find applied changesets that have a 'create' entry for the given entity. + * Used to reconcile changeset status when entities are manually deleted. + */ + findAppliedByCreatedEntity(entityType: string, entityId: string): Promise; } diff --git a/apps/server/db/repositories/drizzle/change-set.ts b/apps/server/db/repositories/drizzle/change-set.ts index 0fc871a..19b8714 100644 --- a/apps/server/db/repositories/drizzle/change-set.ts +++ b/apps/server/db/repositories/drizzle/change-set.ts @@ -4,7 +4,7 @@ * Implements ChangeSetRepository interface using Drizzle ORM. */ -import { eq, desc, asc } from 'drizzle-orm'; +import { eq, desc, asc, and } from 'drizzle-orm'; import { nanoid } from 'nanoid'; import type { DrizzleDatabase } from '../../index.js'; import { changeSets, changeSetEntries, type ChangeSet } from '../../schema.js'; @@ -94,6 +94,32 @@ export class DrizzleChangeSetRepository implements ChangeSetRepository { .orderBy(desc(changeSets.createdAt)); } + async findAppliedByCreatedEntity(entityType: string, entityId: string): Promise { + // Find changeset entries matching the entity + const matchingEntries = await this.db + .select({ changeSetId: changeSetEntries.changeSetId }) + .from(changeSetEntries) + .where( + and( + eq(changeSetEntries.entityType, entityType as any), + eq(changeSetEntries.entityId, entityId), + eq(changeSetEntries.action, 'create'), + ), + ); + + const results: ChangeSetWithEntries[] = []; + const seen = new Set(); + for (const { changeSetId } of matchingEntries) { + if (seen.has(changeSetId)) continue; + seen.add(changeSetId); + const cs = await this.findByIdWithEntries(changeSetId); + if (cs && cs.status === 'applied') { + results.push(cs); + } + } + return results; + } + async markReverted(id: string): Promise { const [updated] = await this.db .update(changeSets) diff --git a/apps/server/db/repositories/drizzle/review-comment.ts b/apps/server/db/repositories/drizzle/review-comment.ts index 836c9d1..2ae3314 100644 --- a/apps/server/db/repositories/drizzle/review-comment.ts +++ b/apps/server/db/repositories/drizzle/review-comment.ts @@ -23,7 +23,43 @@ export class DrizzleReviewCommentRepository implements ReviewCommentRepository { lineNumber: data.lineNumber, lineType: data.lineType, body: data.body, - author: data.author ?? 'you', + author: data.author ?? 'user', + parentCommentId: data.parentCommentId ?? null, + resolved: false, + createdAt: now, + updatedAt: now, + }); + const rows = await this.db + .select() + .from(reviewComments) + .where(eq(reviewComments.id, id)) + .limit(1); + return rows[0]!; + } + + async createReply(parentCommentId: string, body: string, author?: string): Promise { + // Fetch parent comment to copy context fields + const parentRows = await this.db + .select() + .from(reviewComments) + .where(eq(reviewComments.id, parentCommentId)) + .limit(1); + const parent = parentRows[0]; + if (!parent) { + throw new Error(`Parent comment not found: ${parentCommentId}`); + } + + const now = new Date(); + const id = nanoid(); + await this.db.insert(reviewComments).values({ + id, + phaseId: parent.phaseId, + filePath: parent.filePath, + lineNumber: parent.lineNumber, + lineType: parent.lineType, + body, + author: author ?? 'user', + parentCommentId, resolved: false, createdAt: now, updatedAt: now, @@ -44,6 +80,19 @@ export class DrizzleReviewCommentRepository implements ReviewCommentRepository { .orderBy(asc(reviewComments.createdAt)); } + async update(id: string, body: string): Promise { + await this.db + .update(reviewComments) + .set({ body, updatedAt: new Date() }) + .where(eq(reviewComments.id, id)); + const rows = await this.db + .select() + .from(reviewComments) + .where(eq(reviewComments.id, id)) + .limit(1); + return rows[0] ?? null; + } + async resolve(id: string): Promise { await this.db .update(reviewComments) diff --git a/apps/server/db/repositories/drizzle/task.test.ts b/apps/server/db/repositories/drizzle/task.test.ts index 316027c..5f19065 100644 --- a/apps/server/db/repositories/drizzle/task.test.ts +++ b/apps/server/db/repositories/drizzle/task.test.ts @@ -71,13 +71,13 @@ describe('DrizzleTaskRepository', () => { it('should accept custom type and priority', async () => { const task = await taskRepo.create({ phaseId: testPhaseId, - name: 'Checkpoint Task', - type: 'checkpoint:human-verify', + name: 'High Priority Task', + type: 'auto', priority: 'high', order: 1, }); - expect(task.type).toBe('checkpoint:human-verify'); + expect(task.type).toBe('auto'); expect(task.priority).toBe('high'); }); }); diff --git a/apps/server/db/repositories/review-comment-repository.ts b/apps/server/db/repositories/review-comment-repository.ts index 50831bb..9ed7530 100644 --- a/apps/server/db/repositories/review-comment-repository.ts +++ b/apps/server/db/repositories/review-comment-repository.ts @@ -13,11 +13,14 @@ export interface CreateReviewCommentData { lineType: 'added' | 'removed' | 'context'; body: string; author?: string; + parentCommentId?: string; // for replies } export interface ReviewCommentRepository { create(data: CreateReviewCommentData): Promise; + createReply(parentCommentId: string, body: string, author?: string): Promise; findByPhaseId(phaseId: string): Promise; + update(id: string, body: string): Promise; resolve(id: string): Promise; unresolve(id: string): Promise; delete(id: string): Promise; diff --git a/apps/server/db/schema.ts b/apps/server/db/schema.ts index 1e371db..77d9073 100644 --- a/apps/server/db/schema.ts +++ b/apps/server/db/schema.ts @@ -55,6 +55,7 @@ export const phases = sqliteTable('phases', { status: text('status', { enum: ['pending', 'approved', 'in_progress', 'completed', 'blocked', 'pending_review'] }) .notNull() .default('pending'), + mergeBase: text('merge_base'), createdAt: integer('created_at', { mode: 'timestamp' }).notNull(), updatedAt: integer('updated_at', { mode: 'timestamp' }).notNull(), }); @@ -137,7 +138,7 @@ export const tasks = sqliteTable('tasks', { name: text('name').notNull(), description: text('description'), type: text('type', { - enum: ['auto', 'checkpoint:human-verify', 'checkpoint:decision', 'checkpoint:human-action'], + enum: ['auto'], }) .notNull() .default('auto'), @@ -616,11 +617,13 @@ export const reviewComments = sqliteTable('review_comments', { lineType: text('line_type', { enum: ['added', 'removed', 'context'] }).notNull(), body: text('body').notNull(), author: text('author').notNull().default('you'), + parentCommentId: text('parent_comment_id').references((): ReturnType => reviewComments.id, { onDelete: 'cascade' }), resolved: integer('resolved', { mode: 'boolean' }).notNull().default(false), createdAt: integer('created_at', { mode: 'timestamp' }).notNull(), updatedAt: integer('updated_at', { mode: 'timestamp' }).notNull(), }, (table) => [ index('review_comments_phase_id_idx').on(table.phaseId), + index('review_comments_parent_id_idx').on(table.parentCommentId), ]); export type ReviewComment = InferSelectModel; diff --git a/apps/server/dispatch/manager.ts b/apps/server/dispatch/manager.ts index b799e57..026be74 100644 --- a/apps/server/dispatch/manager.ts +++ b/apps/server/dispatch/manager.ts @@ -21,10 +21,13 @@ import type { AgentRepository } from '../db/repositories/agent-repository.js'; import type { InitiativeRepository } from '../db/repositories/initiative-repository.js'; import type { PhaseRepository } from '../db/repositories/phase-repository.js'; import type { PageRepository } from '../db/repositories/page-repository.js'; +import type { ProjectRepository } from '../db/repositories/project-repository.js'; import type { Task, Phase } from '../db/schema.js'; import type { PageForSerialization } from '../agent/content-serializer.js'; +import type { BranchManager } from '../git/branch-manager.js'; import type { DispatchManager, QueuedTask, DispatchResult } from './types.js'; import { phaseBranchName, taskBranchName, isPlanningCategory, generateInitiativeBranch } from '../git/branch-naming.js'; +import { ensureProjectClone } from '../git/project-clones.js'; import { buildExecutePrompt } from '../agent/prompts/index.js'; import { createModuleLogger } from '../logger/index.js'; @@ -68,12 +71,14 @@ export class DefaultDispatchManager implements DispatchManager { private phaseRepository?: PhaseRepository, private agentRepository?: AgentRepository, private pageRepository?: PageRepository, + private projectRepository?: ProjectRepository, + private branchManager?: BranchManager, + private workspaceRoot?: string, ) {} /** * Queue a task for dispatch. * Fetches task dependencies and adds to internal queue. - * Checkpoint tasks are queued but won't auto-dispatch. */ async queue(taskId: string): Promise { // Fetch task to verify it exists and get priority @@ -94,7 +99,7 @@ export class DefaultDispatchManager implements DispatchManager { this.taskQueue.set(taskId, queuedTask); - log.info({ taskId, priority: task.priority, isCheckpoint: this.isCheckpointTask(task) }, 'task queued'); + log.info({ taskId, priority: task.priority }, 'task queued'); // Emit TaskQueuedEvent const event: TaskQueuedEvent = { @@ -112,7 +117,6 @@ export class DefaultDispatchManager implements DispatchManager { /** * Get next dispatchable task. * Returns task with all dependencies complete, highest priority first. - * Checkpoint tasks are excluded (require human action). */ async getNextDispatchable(): Promise { const queuedTasks = Array.from(this.taskQueue.values()); @@ -121,7 +125,7 @@ export class DefaultDispatchManager implements DispatchManager { return null; } - // Filter to only tasks with all dependencies complete and not checkpoint tasks + // Filter to only tasks with all dependencies complete const readyTasks: QueuedTask[] = []; log.debug({ queueSize: queuedTasks.length }, 'evaluating dispatchable tasks'); @@ -133,14 +137,8 @@ export class DefaultDispatchManager implements DispatchManager { continue; } - // Check if this is a checkpoint task (requires human action) - const task = await this.taskRepository.findById(qt.taskId); - if (task && this.isCheckpointTask(task)) { - log.debug({ taskId: qt.taskId, type: task.type }, 'skipping checkpoint task'); - continue; - } - // Skip planning-category tasks (handled by architect flow) + const task = await this.taskRepository.findById(qt.taskId); if (task && isPlanningCategory(task.category)) { log.debug({ taskId: qt.taskId, category: task.category }, 'skipping planning-category task'); continue; @@ -237,6 +235,27 @@ export class DefaultDispatchManager implements DispatchManager { this.eventBus.emit(event); } + /** + * Retry a blocked task. + * Resets status to pending, clears block state, and re-queues for dispatch. + */ + async retryBlockedTask(taskId: string): Promise { + const task = await this.taskRepository.findById(taskId); + if (!task) throw new Error(`Task not found: ${taskId}`); + if (task.status !== 'blocked') throw new Error(`Task ${taskId} is not blocked (status: ${task.status})`); + + // Clear blocked state + this.blockedTasks.delete(taskId); + + // Reset DB status to pending + await this.taskRepository.update(taskId, { status: 'pending' }); + + log.info({ taskId }, 'retrying blocked task'); + + // Re-queue for dispatch + await this.queue(taskId); + } + /** * Dispatch next available task to an agent. */ @@ -311,6 +330,29 @@ export class DefaultDispatchManager implements DispatchManager { } catch { // Non-fatal: fall back to default branching } + + // Ensure branches exist in project clones before spawning worktrees + if (baseBranch && this.projectRepository && this.branchManager && this.workspaceRoot) { + try { + const initiative = await this.initiativeRepository.findById(task.initiativeId); + const initBranch = initiative?.branch; + if (initBranch) { + const projects = await this.projectRepository.findProjectsByInitiativeId(task.initiativeId); + for (const project of projects) { + const clonePath = await ensureProjectClone(project, this.workspaceRoot); + // Ensure initiative branch exists (from project defaultBranch) + await this.branchManager.ensureBranch(clonePath, initBranch, project.defaultBranch); + // Ensure phase branch exists (from initiative branch) + const phBranch = phaseBranchName(initBranch, (await this.phaseRepository?.findById(task.phaseId!))?.name ?? ''); + if (phBranch) { + await this.branchManager.ensureBranch(clonePath, phBranch, initBranch); + } + } + } + } catch (err) { + log.warn({ taskId: task.id, err }, 'failed to ensure branches for task dispatch'); + } + } } // Gather initiative context for the agent's input files @@ -428,14 +470,6 @@ export class DefaultDispatchManager implements DispatchManager { return true; } - /** - * Check if a task is a checkpoint task. - * Checkpoint tasks require human action and don't auto-dispatch. - */ - private isCheckpointTask(task: Task): boolean { - return task.type.startsWith('checkpoint:'); - } - /** * Store the completing agent's result summary on the task record. */ diff --git a/apps/server/dispatch/phase-manager.test.ts b/apps/server/dispatch/phase-manager.test.ts index 246e141..bd57241 100644 --- a/apps/server/dispatch/phase-manager.test.ts +++ b/apps/server/dispatch/phase-manager.test.ts @@ -50,6 +50,7 @@ function createMockDispatchManager(): DispatchManager { dispatchNext: vi.fn().mockResolvedValue({ success: false, reason: 'mock' }), completeTask: vi.fn(), blockTask: vi.fn(), + retryBlockedTask: vi.fn(), getQueueState: vi.fn().mockResolvedValue({ queued: [], ready: [], blocked: [] }), }; } diff --git a/apps/server/dispatch/types.ts b/apps/server/dispatch/types.ts index 6c86111..6478ce2 100644 --- a/apps/server/dispatch/types.ts +++ b/apps/server/dispatch/types.ts @@ -102,6 +102,14 @@ export interface DispatchManager { */ blockTask(taskId: string, reason: string): Promise; + /** + * Retry a blocked task. + * Resets status to pending, removes from blocked map, and re-queues for dispatch. + * + * @param taskId - ID of the blocked task to retry + */ + retryBlockedTask(taskId: string): Promise; + /** * Get current queue state. * Returns all queued tasks with their dispatch readiness. diff --git a/apps/server/drizzle/0031_add_phase_merge_base.sql b/apps/server/drizzle/0031_add_phase_merge_base.sql new file mode 100644 index 0000000..7771d38 --- /dev/null +++ b/apps/server/drizzle/0031_add_phase_merge_base.sql @@ -0,0 +1 @@ +ALTER TABLE phases ADD COLUMN merge_base TEXT; diff --git a/apps/server/drizzle/0032_add_comment_threading.sql b/apps/server/drizzle/0032_add_comment_threading.sql new file mode 100644 index 0000000..11afcd0 --- /dev/null +++ b/apps/server/drizzle/0032_add_comment_threading.sql @@ -0,0 +1,2 @@ +ALTER TABLE review_comments ADD COLUMN parent_comment_id TEXT REFERENCES review_comments(id) ON DELETE CASCADE;--> statement-breakpoint +CREATE INDEX review_comments_parent_id_idx ON review_comments(parent_comment_id); diff --git a/apps/server/drizzle/0033_drop_approval_columns.sql b/apps/server/drizzle/0033_drop_approval_columns.sql new file mode 100644 index 0000000..ea73e34 --- /dev/null +++ b/apps/server/drizzle/0033_drop_approval_columns.sql @@ -0,0 +1,5 @@ +-- Drop orphaned approval columns left behind by 0030_remove_task_approval. +-- These columns were removed from schema.ts but left in the DB because +-- 0030 assumed SQLite couldn't DROP COLUMN. SQLite 3.35+ supports it. +ALTER TABLE initiatives DROP COLUMN merge_requires_approval;--> statement-breakpoint +ALTER TABLE tasks DROP COLUMN requires_approval; diff --git a/apps/server/drizzle/meta/0032_snapshot.json b/apps/server/drizzle/meta/0032_snapshot.json new file mode 100644 index 0000000..28a0410 --- /dev/null +++ b/apps/server/drizzle/meta/0032_snapshot.json @@ -0,0 +1,1864 @@ +{ + "version": "6", + "dialect": "sqlite", + "id": "5fbe1151-1dfb-4b0c-a7fa-2177369543fd", + "prevId": "c0b6d7d3-c9da-440a-9fb8-9dd88df5672a", + "tables": { + "accounts": { + "name": "accounts", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "provider": { + "name": "provider", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'claude'" + }, + "config_json": { + "name": "config_json", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "credentials": { + "name": "credentials", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "is_exhausted": { + "name": "is_exhausted", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": false + }, + "exhausted_until": { + "name": "exhausted_until", + "type": "integer", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "last_used_at": { + "name": "last_used_at", + "type": "integer", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "updated_at": { + "name": "updated_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "agent_log_chunks": { + "name": "agent_log_chunks", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "agent_id": { + "name": "agent_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "agent_name": { + "name": "agent_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "session_number": { + "name": "session_number", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": 1 + }, + "content": { + "name": "content", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "agent_log_chunks_agent_id_idx": { + "name": "agent_log_chunks_agent_id_idx", + "columns": [ + "agent_id" + ], + "isUnique": false + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "agents": { + "name": "agents", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "task_id": { + "name": "task_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "initiative_id": { + "name": "initiative_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "session_id": { + "name": "session_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "worktree_id": { + "name": "worktree_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "provider": { + "name": "provider", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'claude'" + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "status": { + "name": "status", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'idle'" + }, + "mode": { + "name": "mode", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'execute'" + }, + "pid": { + "name": "pid", + "type": "integer", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "exit_code": { + "name": "exit_code", + "type": "integer", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "output_file_path": { + "name": "output_file_path", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "result": { + "name": "result", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "pending_questions": { + "name": "pending_questions", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "updated_at": { + "name": "updated_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "user_dismissed_at": { + "name": "user_dismissed_at", + "type": "integer", + "primaryKey": false, + "notNull": false, + "autoincrement": false + } + }, + "indexes": { + "agents_name_unique": { + "name": "agents_name_unique", + "columns": [ + "name" + ], + "isUnique": true + } + }, + "foreignKeys": { + "agents_task_id_tasks_id_fk": { + "name": "agents_task_id_tasks_id_fk", + "tableFrom": "agents", + "tableTo": "tasks", + "columnsFrom": [ + "task_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "agents_initiative_id_initiatives_id_fk": { + "name": "agents_initiative_id_initiatives_id_fk", + "tableFrom": "agents", + "tableTo": "initiatives", + "columnsFrom": [ + "initiative_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "agents_account_id_accounts_id_fk": { + "name": "agents_account_id_accounts_id_fk", + "tableFrom": "agents", + "tableTo": "accounts", + "columnsFrom": [ + "account_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "change_set_entries": { + "name": "change_set_entries", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "change_set_id": { + "name": "change_set_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "entity_type": { + "name": "entity_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "entity_id": { + "name": "entity_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "previous_state": { + "name": "previous_state", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "new_state": { + "name": "new_state", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "change_set_entries_change_set_id_idx": { + "name": "change_set_entries_change_set_id_idx", + "columns": [ + "change_set_id" + ], + "isUnique": false + } + }, + "foreignKeys": { + "change_set_entries_change_set_id_change_sets_id_fk": { + "name": "change_set_entries_change_set_id_change_sets_id_fk", + "tableFrom": "change_set_entries", + "tableTo": "change_sets", + "columnsFrom": [ + "change_set_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "change_sets": { + "name": "change_sets", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "agent_id": { + "name": "agent_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "agent_name": { + "name": "agent_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "initiative_id": { + "name": "initiative_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "mode": { + "name": "mode", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "summary": { + "name": "summary", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "status": { + "name": "status", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'applied'" + }, + "reverted_at": { + "name": "reverted_at", + "type": "integer", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "change_sets_initiative_id_idx": { + "name": "change_sets_initiative_id_idx", + "columns": [ + "initiative_id" + ], + "isUnique": false + } + }, + "foreignKeys": { + "change_sets_agent_id_agents_id_fk": { + "name": "change_sets_agent_id_agents_id_fk", + "tableFrom": "change_sets", + "tableTo": "agents", + "columnsFrom": [ + "agent_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "change_sets_initiative_id_initiatives_id_fk": { + "name": "change_sets_initiative_id_initiatives_id_fk", + "tableFrom": "change_sets", + "tableTo": "initiatives", + "columnsFrom": [ + "initiative_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "chat_messages": { + "name": "chat_messages", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "chat_session_id": { + "name": "chat_session_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "content": { + "name": "content", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "change_set_id": { + "name": "change_set_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "chat_messages_session_id_idx": { + "name": "chat_messages_session_id_idx", + "columns": [ + "chat_session_id" + ], + "isUnique": false + } + }, + "foreignKeys": { + "chat_messages_chat_session_id_chat_sessions_id_fk": { + "name": "chat_messages_chat_session_id_chat_sessions_id_fk", + "tableFrom": "chat_messages", + "tableTo": "chat_sessions", + "columnsFrom": [ + "chat_session_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "chat_messages_change_set_id_change_sets_id_fk": { + "name": "chat_messages_change_set_id_change_sets_id_fk", + "tableFrom": "chat_messages", + "tableTo": "change_sets", + "columnsFrom": [ + "change_set_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "chat_sessions": { + "name": "chat_sessions", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "target_type": { + "name": "target_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "target_id": { + "name": "target_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "initiative_id": { + "name": "initiative_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "agent_id": { + "name": "agent_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "status": { + "name": "status", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'active'" + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "updated_at": { + "name": "updated_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "chat_sessions_target_idx": { + "name": "chat_sessions_target_idx", + "columns": [ + "target_type", + "target_id" + ], + "isUnique": false + }, + "chat_sessions_initiative_id_idx": { + "name": "chat_sessions_initiative_id_idx", + "columns": [ + "initiative_id" + ], + "isUnique": false + } + }, + "foreignKeys": { + "chat_sessions_initiative_id_initiatives_id_fk": { + "name": "chat_sessions_initiative_id_initiatives_id_fk", + "tableFrom": "chat_sessions", + "tableTo": "initiatives", + "columnsFrom": [ + "initiative_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "chat_sessions_agent_id_agents_id_fk": { + "name": "chat_sessions_agent_id_agents_id_fk", + "tableFrom": "chat_sessions", + "tableTo": "agents", + "columnsFrom": [ + "agent_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "conversations": { + "name": "conversations", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "from_agent_id": { + "name": "from_agent_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "to_agent_id": { + "name": "to_agent_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "initiative_id": { + "name": "initiative_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "phase_id": { + "name": "phase_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "task_id": { + "name": "task_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "question": { + "name": "question", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "answer": { + "name": "answer", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "status": { + "name": "status", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'pending'" + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "updated_at": { + "name": "updated_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "conversations_to_agent_status_idx": { + "name": "conversations_to_agent_status_idx", + "columns": [ + "to_agent_id", + "status" + ], + "isUnique": false + }, + "conversations_from_agent_idx": { + "name": "conversations_from_agent_idx", + "columns": [ + "from_agent_id" + ], + "isUnique": false + } + }, + "foreignKeys": { + "conversations_from_agent_id_agents_id_fk": { + "name": "conversations_from_agent_id_agents_id_fk", + "tableFrom": "conversations", + "tableTo": "agents", + "columnsFrom": [ + "from_agent_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "conversations_to_agent_id_agents_id_fk": { + "name": "conversations_to_agent_id_agents_id_fk", + "tableFrom": "conversations", + "tableTo": "agents", + "columnsFrom": [ + "to_agent_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "conversations_initiative_id_initiatives_id_fk": { + "name": "conversations_initiative_id_initiatives_id_fk", + "tableFrom": "conversations", + "tableTo": "initiatives", + "columnsFrom": [ + "initiative_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "conversations_phase_id_phases_id_fk": { + "name": "conversations_phase_id_phases_id_fk", + "tableFrom": "conversations", + "tableTo": "phases", + "columnsFrom": [ + "phase_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "conversations_task_id_tasks_id_fk": { + "name": "conversations_task_id_tasks_id_fk", + "tableFrom": "conversations", + "tableTo": "tasks", + "columnsFrom": [ + "task_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "initiative_projects": { + "name": "initiative_projects", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "initiative_id": { + "name": "initiative_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "project_id": { + "name": "project_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "initiative_project_unique": { + "name": "initiative_project_unique", + "columns": [ + "initiative_id", + "project_id" + ], + "isUnique": true + } + }, + "foreignKeys": { + "initiative_projects_initiative_id_initiatives_id_fk": { + "name": "initiative_projects_initiative_id_initiatives_id_fk", + "tableFrom": "initiative_projects", + "tableTo": "initiatives", + "columnsFrom": [ + "initiative_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "initiative_projects_project_id_projects_id_fk": { + "name": "initiative_projects_project_id_projects_id_fk", + "tableFrom": "initiative_projects", + "tableTo": "projects", + "columnsFrom": [ + "project_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "initiatives": { + "name": "initiatives", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "status": { + "name": "status", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'active'" + }, + "branch": { + "name": "branch", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "execution_mode": { + "name": "execution_mode", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'review_per_phase'" + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "updated_at": { + "name": "updated_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "messages": { + "name": "messages", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "sender_type": { + "name": "sender_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "sender_id": { + "name": "sender_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "recipient_type": { + "name": "recipient_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "recipient_id": { + "name": "recipient_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "type": { + "name": "type", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'info'" + }, + "content": { + "name": "content", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "requires_response": { + "name": "requires_response", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": false + }, + "status": { + "name": "status", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'pending'" + }, + "parent_message_id": { + "name": "parent_message_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "updated_at": { + "name": "updated_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": {}, + "foreignKeys": { + "messages_sender_id_agents_id_fk": { + "name": "messages_sender_id_agents_id_fk", + "tableFrom": "messages", + "tableTo": "agents", + "columnsFrom": [ + "sender_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "messages_recipient_id_agents_id_fk": { + "name": "messages_recipient_id_agents_id_fk", + "tableFrom": "messages", + "tableTo": "agents", + "columnsFrom": [ + "recipient_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + }, + "messages_parent_message_id_messages_id_fk": { + "name": "messages_parent_message_id_messages_id_fk", + "tableFrom": "messages", + "tableTo": "messages", + "columnsFrom": [ + "parent_message_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "pages": { + "name": "pages", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "initiative_id": { + "name": "initiative_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "parent_page_id": { + "name": "parent_page_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "title": { + "name": "title", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "content": { + "name": "content", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "updated_at": { + "name": "updated_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": {}, + "foreignKeys": { + "pages_initiative_id_initiatives_id_fk": { + "name": "pages_initiative_id_initiatives_id_fk", + "tableFrom": "pages", + "tableTo": "initiatives", + "columnsFrom": [ + "initiative_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "pages_parent_page_id_pages_id_fk": { + "name": "pages_parent_page_id_pages_id_fk", + "tableFrom": "pages", + "tableTo": "pages", + "columnsFrom": [ + "parent_page_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "phase_dependencies": { + "name": "phase_dependencies", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "phase_id": { + "name": "phase_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "depends_on_phase_id": { + "name": "depends_on_phase_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": {}, + "foreignKeys": { + "phase_dependencies_phase_id_phases_id_fk": { + "name": "phase_dependencies_phase_id_phases_id_fk", + "tableFrom": "phase_dependencies", + "tableTo": "phases", + "columnsFrom": [ + "phase_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "phase_dependencies_depends_on_phase_id_phases_id_fk": { + "name": "phase_dependencies_depends_on_phase_id_phases_id_fk", + "tableFrom": "phase_dependencies", + "tableTo": "phases", + "columnsFrom": [ + "depends_on_phase_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "phases": { + "name": "phases", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "initiative_id": { + "name": "initiative_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "content": { + "name": "content", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "status": { + "name": "status", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'pending'" + }, + "merge_base": { + "name": "merge_base", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "updated_at": { + "name": "updated_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": {}, + "foreignKeys": { + "phases_initiative_id_initiatives_id_fk": { + "name": "phases_initiative_id_initiatives_id_fk", + "tableFrom": "phases", + "tableTo": "initiatives", + "columnsFrom": [ + "initiative_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "projects": { + "name": "projects", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "url": { + "name": "url", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "default_branch": { + "name": "default_branch", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'main'" + }, + "last_fetched_at": { + "name": "last_fetched_at", + "type": "integer", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "updated_at": { + "name": "updated_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "projects_name_unique": { + "name": "projects_name_unique", + "columns": [ + "name" + ], + "isUnique": true + }, + "projects_url_unique": { + "name": "projects_url_unique", + "columns": [ + "url" + ], + "isUnique": true + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "review_comments": { + "name": "review_comments", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "phase_id": { + "name": "phase_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "file_path": { + "name": "file_path", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "line_number": { + "name": "line_number", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "line_type": { + "name": "line_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "author": { + "name": "author", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'you'" + }, + "parent_comment_id": { + "name": "parent_comment_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "resolved": { + "name": "resolved", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "updated_at": { + "name": "updated_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "review_comments_phase_id_idx": { + "name": "review_comments_phase_id_idx", + "columns": [ + "phase_id" + ], + "isUnique": false + }, + "review_comments_parent_id_idx": { + "name": "review_comments_parent_id_idx", + "columns": [ + "parent_comment_id" + ], + "isUnique": false + } + }, + "foreignKeys": { + "review_comments_phase_id_phases_id_fk": { + "name": "review_comments_phase_id_phases_id_fk", + "tableFrom": "review_comments", + "tableTo": "phases", + "columnsFrom": [ + "phase_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "review_comments_parent_comment_id_review_comments_id_fk": { + "name": "review_comments_parent_comment_id_review_comments_id_fk", + "tableFrom": "review_comments", + "tableTo": "review_comments", + "columnsFrom": [ + "parent_comment_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "task_dependencies": { + "name": "task_dependencies", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "task_id": { + "name": "task_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "depends_on_task_id": { + "name": "depends_on_task_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": {}, + "foreignKeys": { + "task_dependencies_task_id_tasks_id_fk": { + "name": "task_dependencies_task_id_tasks_id_fk", + "tableFrom": "task_dependencies", + "tableTo": "tasks", + "columnsFrom": [ + "task_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "task_dependencies_depends_on_task_id_tasks_id_fk": { + "name": "task_dependencies_depends_on_task_id_tasks_id_fk", + "tableFrom": "task_dependencies", + "tableTo": "tasks", + "columnsFrom": [ + "depends_on_task_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + }, + "tasks": { + "name": "tasks", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "phase_id": { + "name": "phase_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "initiative_id": { + "name": "initiative_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "parent_task_id": { + "name": "parent_task_id", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "type": { + "name": "type", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'auto'" + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'execute'" + }, + "priority": { + "name": "priority", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'medium'" + }, + "status": { + "name": "status", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'pending'" + }, + "order": { + "name": "order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": 0 + }, + "summary": { + "name": "summary", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "created_at": { + "name": "created_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "updated_at": { + "name": "updated_at", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": {}, + "foreignKeys": { + "tasks_phase_id_phases_id_fk": { + "name": "tasks_phase_id_phases_id_fk", + "tableFrom": "tasks", + "tableTo": "phases", + "columnsFrom": [ + "phase_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "tasks_initiative_id_initiatives_id_fk": { + "name": "tasks_initiative_id_initiatives_id_fk", + "tableFrom": "tasks", + "tableTo": "initiatives", + "columnsFrom": [ + "initiative_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "tasks_parent_task_id_tasks_id_fk": { + "name": "tasks_parent_task_id_tasks_id_fk", + "tableFrom": "tasks", + "tableTo": "tasks", + "columnsFrom": [ + "parent_task_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "checkConstraints": {} + } + }, + "views": {}, + "enums": {}, + "_meta": { + "schemas": {}, + "tables": {}, + "columns": {} + }, + "internal": { + "indexes": {} + } +} diff --git a/apps/server/drizzle/meta/_journal.json b/apps/server/drizzle/meta/_journal.json index ac6687d..2c92726 100644 --- a/apps/server/drizzle/meta/_journal.json +++ b/apps/server/drizzle/meta/_journal.json @@ -218,6 +218,27 @@ "when": 1772150400000, "tag": "0030_remove_task_approval", "breakpoints": true + }, + { + "idx": 31, + "version": "6", + "when": 1772236800000, + "tag": "0031_add_phase_merge_base", + "breakpoints": true + }, + { + "idx": 32, + "version": "6", + "when": 1772323200000, + "tag": "0032_add_comment_threading", + "breakpoints": true + }, + { + "idx": 33, + "version": "6", + "when": 1772409600000, + "tag": "0033_drop_approval_columns", + "breakpoints": true } ] } \ No newline at end of file diff --git a/apps/server/events/index.ts b/apps/server/events/index.ts index e53920b..64a5e0e 100644 --- a/apps/server/events/index.ts +++ b/apps/server/events/index.ts @@ -52,6 +52,7 @@ export type { AccountCredentialsValidatedEvent, InitiativePendingReviewEvent, InitiativeReviewApprovedEvent, + InitiativeChangesRequestedEvent, DomainEventMap, DomainEventType, } from './types.js'; diff --git a/apps/server/events/types.ts b/apps/server/events/types.ts index 2c2009f..04162cf 100644 --- a/apps/server/events/types.ts +++ b/apps/server/events/types.ts @@ -591,6 +591,15 @@ export interface InitiativeReviewApprovedEvent extends DomainEvent { }; } +export interface InitiativeChangesRequestedEvent extends DomainEvent { + type: 'initiative:changes_requested'; + payload: { + initiativeId: string; + phaseId: string; + taskId: string; + }; +} + /** * Chat Session Events */ @@ -668,7 +677,8 @@ export type DomainEventMap = | ChatMessageCreatedEvent | ChatSessionClosedEvent | InitiativePendingReviewEvent - | InitiativeReviewApprovedEvent; + | InitiativeReviewApprovedEvent + | InitiativeChangesRequestedEvent; /** * Event type literal union for type checking diff --git a/apps/server/execution/orchestrator.test.ts b/apps/server/execution/orchestrator.test.ts new file mode 100644 index 0000000..fb52e13 --- /dev/null +++ b/apps/server/execution/orchestrator.test.ts @@ -0,0 +1,309 @@ +/** + * ExecutionOrchestrator Tests + * + * Tests phase completion transitions, especially when initiative has no branch. + */ + +import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { ExecutionOrchestrator } from './orchestrator.js'; +import type { BranchManager } from '../git/branch-manager.js'; +import type { PhaseRepository } from '../db/repositories/phase-repository.js'; +import type { TaskRepository } from '../db/repositories/task-repository.js'; +import type { InitiativeRepository } from '../db/repositories/initiative-repository.js'; +import type { ProjectRepository } from '../db/repositories/project-repository.js'; +import type { DispatchManager, PhaseDispatchManager } from '../dispatch/types.js'; +import type { ConflictResolutionService } from '../coordination/conflict-resolution-service.js'; +import type { EventBus, TaskCompletedEvent, DomainEvent } from '../events/types.js'; + +function createMockEventBus(): EventBus & { handlers: Map; emitted: DomainEvent[] } { + const handlers = new Map(); + const emitted: DomainEvent[] = []; + return { + handlers, + emitted, + emit: vi.fn((event: DomainEvent) => { + emitted.push(event); + const fns = handlers.get(event.type) ?? []; + for (const fn of fns) fn(event); + }), + on: vi.fn((type: string, handler: Function) => { + const fns = handlers.get(type) ?? []; + fns.push(handler); + handlers.set(type, fns); + }), + off: vi.fn(), + once: vi.fn(), + }; +} + +function createMocks() { + const branchManager: BranchManager = { + ensureBranch: vi.fn(), + mergeBranch: vi.fn().mockResolvedValue({ success: true, message: 'merged' }), + diffBranches: vi.fn().mockResolvedValue(''), + deleteBranch: vi.fn(), + branchExists: vi.fn().mockResolvedValue(true), + remoteBranchExists: vi.fn().mockResolvedValue(false), + listCommits: vi.fn().mockResolvedValue([]), + diffCommit: vi.fn().mockResolvedValue(''), + getMergeBase: vi.fn().mockResolvedValue('abc123'), + pushBranch: vi.fn(), + checkMergeability: vi.fn().mockResolvedValue({ mergeable: true }), + fetchRemote: vi.fn(), + fastForwardBranch: vi.fn(), + }; + + const phaseRepository = { + findById: vi.fn(), + findByInitiativeId: vi.fn().mockResolvedValue([]), + update: vi.fn().mockImplementation(async (id: string, data: any) => ({ id, ...data })), + create: vi.fn(), + } as unknown as PhaseRepository; + + const taskRepository = { + findById: vi.fn(), + findByPhaseId: vi.fn().mockResolvedValue([]), + findByInitiativeId: vi.fn().mockResolvedValue([]), + } as unknown as TaskRepository; + + const initiativeRepository = { + findById: vi.fn(), + findByStatus: vi.fn().mockResolvedValue([]), + update: vi.fn(), + } as unknown as InitiativeRepository; + + const projectRepository = { + findProjectsByInitiativeId: vi.fn().mockResolvedValue([]), + } as unknown as ProjectRepository; + + const phaseDispatchManager: PhaseDispatchManager = { + queuePhase: vi.fn(), + getNextDispatchablePhase: vi.fn().mockResolvedValue(null), + dispatchNextPhase: vi.fn().mockResolvedValue({ success: false, phaseId: '', reason: 'none' }), + completePhase: vi.fn(), + blockPhase: vi.fn(), + getPhaseQueueState: vi.fn().mockResolvedValue({ queued: [], ready: [], blocked: [] }), + }; + + const dispatchManager = { + queue: vi.fn(), + getNextDispatchable: vi.fn().mockResolvedValue(null), + dispatchNext: vi.fn().mockResolvedValue({ success: false, taskId: '' }), + completeTask: vi.fn(), + blockTask: vi.fn(), + retryBlockedTask: vi.fn(), + getQueueState: vi.fn().mockResolvedValue({ queued: [], ready: [], blocked: [] }), + } as unknown as DispatchManager; + + const conflictResolutionService: ConflictResolutionService = { + handleConflict: vi.fn(), + }; + + const eventBus = createMockEventBus(); + + return { + branchManager, + phaseRepository, + taskRepository, + initiativeRepository, + projectRepository, + phaseDispatchManager, + dispatchManager, + conflictResolutionService, + eventBus, + }; +} + +function createOrchestrator(mocks: ReturnType) { + const orchestrator = new ExecutionOrchestrator( + mocks.branchManager, + mocks.phaseRepository, + mocks.taskRepository, + mocks.initiativeRepository, + mocks.projectRepository, + mocks.phaseDispatchManager, + mocks.dispatchManager, + mocks.conflictResolutionService, + mocks.eventBus, + '/tmp/test-workspace', + ); + orchestrator.start(); + return orchestrator; +} + +function emitTaskCompleted(eventBus: ReturnType, taskId: string) { + const event: TaskCompletedEvent = { + type: 'task:completed', + timestamp: new Date(), + payload: { taskId, agentId: 'agent-1', success: true, message: 'done' }, + }; + eventBus.emit(event); +} + +describe('ExecutionOrchestrator', () => { + let mocks: ReturnType; + + beforeEach(() => { + mocks = createMocks(); + }); + + describe('phase completion when initiative has no branch', () => { + it('should transition phase to pending_review in review mode even without a branch', async () => { + const task = { + id: 'task-1', + phaseId: 'phase-1', + initiativeId: 'init-1', + category: 'execute', + status: 'completed', + }; + const phase = { id: 'phase-1', initiativeId: 'init-1', name: 'Phase 1', status: 'in_progress' }; + const initiative = { id: 'init-1', branch: null, executionMode: 'review_per_phase' }; + + vi.mocked(mocks.taskRepository.findById).mockResolvedValue(task as any); + vi.mocked(mocks.phaseRepository.findById).mockResolvedValue(phase as any); + vi.mocked(mocks.initiativeRepository.findById).mockResolvedValue(initiative as any); + vi.mocked(mocks.taskRepository.findByPhaseId).mockResolvedValue([task] as any); + + createOrchestrator(mocks); + + emitTaskCompleted(mocks.eventBus, 'task-1'); + + // Allow async handler to complete + await vi.waitFor(() => { + expect(mocks.phaseRepository.update).toHaveBeenCalledWith('phase-1', { status: 'pending_review' }); + }); + }); + + it('should complete phase in yolo mode even without a branch', async () => { + const task = { + id: 'task-1', + phaseId: 'phase-1', + initiativeId: 'init-1', + category: 'execute', + status: 'completed', + }; + const phase = { id: 'phase-1', initiativeId: 'init-1', name: 'Phase 1', status: 'in_progress' }; + const initiative = { id: 'init-1', branch: null, executionMode: 'yolo' }; + + vi.mocked(mocks.taskRepository.findById).mockResolvedValue(task as any); + vi.mocked(mocks.phaseRepository.findById).mockResolvedValue(phase as any); + vi.mocked(mocks.initiativeRepository.findById).mockResolvedValue(initiative as any); + vi.mocked(mocks.initiativeRepository.findByStatus).mockResolvedValue([]); + vi.mocked(mocks.taskRepository.findByPhaseId).mockResolvedValue([task] as any); + vi.mocked(mocks.phaseRepository.findByInitiativeId).mockResolvedValue([phase] as any); + + createOrchestrator(mocks); + + emitTaskCompleted(mocks.eventBus, 'task-1'); + + await vi.waitFor(() => { + expect(mocks.phaseDispatchManager.completePhase).toHaveBeenCalledWith('phase-1'); + }); + + // Should NOT have attempted any branch merges + expect(mocks.branchManager.mergeBranch).not.toHaveBeenCalled(); + }); + }); + + describe('phase completion when merge fails', () => { + it('should still check phase completion even if task merge throws', async () => { + const task = { + id: 'task-1', + phaseId: 'phase-1', + initiativeId: 'init-1', + category: 'execute', + status: 'completed', + }; + const phase = { id: 'phase-1', initiativeId: 'init-1', name: 'Phase 1', status: 'in_progress' }; + const initiative = { id: 'init-1', branch: 'cw/test', executionMode: 'review_per_phase' }; + const project = { id: 'proj-1', name: 'test', url: 'https://example.com', defaultBranch: 'main' }; + + vi.mocked(mocks.taskRepository.findById).mockResolvedValue(task as any); + vi.mocked(mocks.phaseRepository.findById).mockResolvedValue(phase as any); + vi.mocked(mocks.initiativeRepository.findById).mockResolvedValue(initiative as any); + vi.mocked(mocks.taskRepository.findByPhaseId).mockResolvedValue([task] as any); + vi.mocked(mocks.projectRepository.findProjectsByInitiativeId).mockResolvedValue([project] as any); + // Merge fails + vi.mocked(mocks.branchManager.mergeBranch).mockResolvedValue({ + success: false, + message: 'conflict', + conflicts: ['file.ts'], + }); + + createOrchestrator(mocks); + + emitTaskCompleted(mocks.eventBus, 'task-1'); + + // Phase should still transition despite merge failure + await vi.waitFor(() => { + expect(mocks.phaseRepository.update).toHaveBeenCalledWith('phase-1', { status: 'pending_review' }); + }); + }); + }); + + describe('phase completion with branch (normal flow)', () => { + it('should merge task branch and transition phase when all tasks done', async () => { + const task = { + id: 'task-1', + phaseId: 'phase-1', + initiativeId: 'init-1', + category: 'execute', + status: 'completed', + }; + const phase = { id: 'phase-1', initiativeId: 'init-1', name: 'Phase 1', status: 'in_progress' }; + const initiative = { id: 'init-1', branch: 'cw/test', executionMode: 'review_per_phase' }; + const project = { id: 'proj-1', name: 'test', url: 'https://example.com', defaultBranch: 'main' }; + + vi.mocked(mocks.taskRepository.findById).mockResolvedValue(task as any); + vi.mocked(mocks.phaseRepository.findById).mockResolvedValue(phase as any); + vi.mocked(mocks.initiativeRepository.findById).mockResolvedValue(initiative as any); + vi.mocked(mocks.taskRepository.findByPhaseId).mockResolvedValue([task] as any); + vi.mocked(mocks.projectRepository.findProjectsByInitiativeId).mockResolvedValue([project] as any); + vi.mocked(mocks.branchManager.branchExists).mockResolvedValue(true); + vi.mocked(mocks.branchManager.mergeBranch).mockResolvedValue({ success: true, message: 'ok' }); + + createOrchestrator(mocks); + + emitTaskCompleted(mocks.eventBus, 'task-1'); + + await vi.waitFor(() => { + expect(mocks.phaseRepository.update).toHaveBeenCalledWith('phase-1', { status: 'pending_review' }); + }); + }); + + it('should not transition phase when some tasks are still pending', async () => { + const task1 = { + id: 'task-1', + phaseId: 'phase-1', + initiativeId: 'init-1', + category: 'execute', + status: 'completed', + }; + const task2 = { + id: 'task-2', + phaseId: 'phase-1', + initiativeId: 'init-1', + category: 'execute', + status: 'pending', + }; + const phase = { id: 'phase-1', initiativeId: 'init-1', name: 'Phase 1', status: 'in_progress' }; + const initiative = { id: 'init-1', branch: 'cw/test', executionMode: 'review_per_phase' }; + + vi.mocked(mocks.taskRepository.findById).mockResolvedValue(task1 as any); + vi.mocked(mocks.phaseRepository.findById).mockResolvedValue(phase as any); + vi.mocked(mocks.initiativeRepository.findById).mockResolvedValue(initiative as any); + vi.mocked(mocks.taskRepository.findByPhaseId).mockResolvedValue([task1, task2] as any); + vi.mocked(mocks.projectRepository.findProjectsByInitiativeId).mockResolvedValue([]); + + createOrchestrator(mocks); + + emitTaskCompleted(mocks.eventBus, 'task-1'); + + // Give the async handler time to run + await new Promise((r) => setTimeout(r, 50)); + + expect(mocks.phaseRepository.update).not.toHaveBeenCalled(); + expect(mocks.phaseDispatchManager.completePhase).not.toHaveBeenCalled(); + }); + }); +}); diff --git a/apps/server/execution/orchestrator.ts b/apps/server/execution/orchestrator.ts index dfa0483..e29e5a4 100644 --- a/apps/server/execution/orchestrator.ts +++ b/apps/server/execution/orchestrator.ts @@ -11,7 +11,7 @@ * - Review per-phase: pause after each phase for diff review */ -import type { EventBus, TaskCompletedEvent, PhasePendingReviewEvent, PhaseChangesRequestedEvent, PhaseMergedEvent, TaskMergedEvent, PhaseQueuedEvent, AgentStoppedEvent, InitiativePendingReviewEvent, InitiativeReviewApprovedEvent } from '../events/index.js'; +import type { EventBus, TaskCompletedEvent, PhasePendingReviewEvent, PhaseChangesRequestedEvent, PhaseMergedEvent, TaskMergedEvent, PhaseQueuedEvent, AgentStoppedEvent, InitiativePendingReviewEvent, InitiativeReviewApprovedEvent, InitiativeChangesRequestedEvent } from '../events/index.js'; import type { BranchManager } from '../git/branch-manager.js'; import type { PhaseRepository } from '../db/repositories/phase-repository.js'; import type { TaskRepository } from '../db/repositories/task-repository.js'; @@ -66,6 +66,11 @@ export class ExecutionOrchestrator { }); }); + // Recover in-memory dispatch queues from DB state (survives server restarts) + this.recoverDispatchQueues().catch((err) => { + log.error({ err: err instanceof Error ? err.message : String(err) }, 'dispatch queue recovery failed'); + }); + log.info('execution orchestrator started'); } @@ -140,27 +145,29 @@ export class ExecutionOrchestrator { if (!task?.phaseId || !task.initiativeId) return; const initiative = await this.initiativeRepository.findById(task.initiativeId); - if (!initiative?.branch) return; - const phase = await this.phaseRepository.findById(task.phaseId); if (!phase) return; - // Skip merge/review tasks — they already work on the phase branch directly - if (task.category === 'merge' || task.category === 'review') return; + // Merge task branch into phase branch (only when branches exist) + if (initiative?.branch && task.category !== 'merge' && task.category !== 'review') { + try { + const initBranch = initiative.branch; + const phBranch = phaseBranchName(initBranch, phase.name); + const tBranch = taskBranchName(initBranch, task.id); - const initBranch = initiative.branch; - const phBranch = phaseBranchName(initBranch, phase.name); - const tBranch = taskBranchName(initBranch, task.id); + // Serialize merges per phase + const lock = this.phaseMergeLocks.get(task.phaseId) ?? Promise.resolve(); + const mergeOp = lock.then(async () => { + await this.mergeTaskIntoPhase(taskId, task.phaseId!, tBranch, phBranch); + }); + this.phaseMergeLocks.set(task.phaseId, mergeOp.catch(() => {})); + await mergeOp; + } catch (err) { + log.error({ taskId, err: err instanceof Error ? err.message : String(err) }, 'task merge failed, still checking phase completion'); + } + } - // Serialize merges per phase - const lock = this.phaseMergeLocks.get(task.phaseId) ?? Promise.resolve(); - const mergeOp = lock.then(async () => { - await this.mergeTaskIntoPhase(taskId, task.phaseId!, tBranch, phBranch); - }); - this.phaseMergeLocks.set(task.phaseId, mergeOp.catch(() => {})); - await mergeOp; - - // Check if all phase tasks are done + // Check if all phase tasks are done — always, regardless of branch/merge status const phaseTasks = await this.taskRepository.findByPhaseId(task.phaseId); const allDone = phaseTasks.every((t) => t.status === 'completed'); if (allDone) { @@ -228,12 +235,18 @@ export class ExecutionOrchestrator { if (!phase) return; const initiative = await this.initiativeRepository.findById(phase.initiativeId); - if (!initiative?.branch) return; + if (!initiative) return; if (initiative.executionMode === 'yolo') { - await this.mergePhaseIntoInitiative(phaseId); + // Merge phase branch into initiative branch (only when branches exist) + if (initiative.branch) { + await this.mergePhaseIntoInitiative(phaseId); + } await this.phaseDispatchManager.completePhase(phaseId); + // Re-queue approved phases (self-healing: survives server restarts that wipe in-memory queue) + await this.requeueApprovedPhases(phase.initiativeId); + // Check if this was the last phase — if so, trigger initiative review const dispatched = await this.phaseDispatchManager.dispatchNextPhase(); if (!dispatched.success) { @@ -270,6 +283,18 @@ export class ExecutionOrchestrator { const projects = await this.projectRepository.findProjectsByInitiativeId(phase.initiativeId); + // Store merge base before merging so we can reconstruct diffs for completed phases + for (const project of projects) { + const clonePath = await ensureProjectClone(project, this.workspaceRoot); + try { + const mergeBase = await this.branchManager.getMergeBase(clonePath, initBranch, phBranch); + await this.phaseRepository.update(phaseId, { mergeBase }); + break; // Only need one merge base (first project) + } catch { + // Phase branch may not exist in this project clone + } + } + for (const project of projects) { const clonePath = await ensureProjectClone(project, this.workspaceRoot); const result = await this.branchManager.mergeBranch(clonePath, phBranch, initBranch); @@ -305,6 +330,9 @@ export class ExecutionOrchestrator { await this.mergePhaseIntoInitiative(phaseId); await this.phaseDispatchManager.completePhase(phaseId); + // Re-queue approved phases (self-healing: survives server restarts that wipe in-memory queue) + await this.requeueApprovedPhases(phase.initiativeId); + // Check if this was the last phase — if so, trigger initiative review const dispatched = await this.phaseDispatchManager.dispatchNextPhase(); if (!dispatched.success) { @@ -321,7 +349,14 @@ export class ExecutionOrchestrator { */ async requestChangesOnPhase( phaseId: string, - unresolvedComments: Array<{ filePath: string; lineNumber: number; body: string }>, + unresolvedThreads: Array<{ + id: string; + filePath: string; + lineNumber: number; + body: string; + author: string; + replies: Array<{ id: string; body: string; author: string }>; + }>, summary?: string, ): Promise<{ taskId: string }> { const phase = await this.phaseRepository.findById(phaseId); @@ -333,16 +368,25 @@ export class ExecutionOrchestrator { const initiative = await this.initiativeRepository.findById(phase.initiativeId); if (!initiative) throw new Error(`Initiative not found: ${phase.initiativeId}`); - // Build revision task description from comments + summary + // Guard: don't create duplicate review tasks + const existingTasks = await this.taskRepository.findByPhaseId(phaseId); + const activeReview = existingTasks.find( + (t) => t.category === 'review' && (t.status === 'pending' || t.status === 'in_progress'), + ); + if (activeReview) { + return { taskId: activeReview.id }; + } + + // Build revision task description from threaded comments + summary const lines: string[] = []; if (summary) { lines.push(`## Summary\n\n${summary}\n`); } - if (unresolvedComments.length > 0) { + if (unresolvedThreads.length > 0) { lines.push('## Review Comments\n'); // Group comments by file - const byFile = new Map(); - for (const c of unresolvedComments) { + const byFile = new Map(); + for (const c of unresolvedThreads) { const arr = byFile.get(c.filePath) ?? []; arr.push(c); byFile.set(c.filePath, arr); @@ -350,9 +394,13 @@ export class ExecutionOrchestrator { for (const [filePath, fileComments] of byFile) { lines.push(`### ${filePath}\n`); for (const c of fileComments) { - lines.push(`- **Line ${c.lineNumber}**: ${c.body}`); + lines.push(`#### Line ${c.lineNumber} [comment:${c.id}]`); + lines.push(`**${c.author}**: ${c.body}`); + for (const r of c.replies) { + lines.push(`> **${r.author}**: ${r.body}`); + } + lines.push(''); } - lines.push(''); } } @@ -382,12 +430,12 @@ export class ExecutionOrchestrator { phaseId, initiativeId: phase.initiativeId, taskId: task.id, - commentCount: unresolvedComments.length, + commentCount: unresolvedThreads.length, }, }; this.eventBus.emit(event); - log.info({ phaseId, taskId: task.id, commentCount: unresolvedComments.length }, 'changes requested on phase'); + log.info({ phaseId, taskId: task.id, commentCount: unresolvedThreads.length }, 'changes requested on phase'); // Kick off dispatch this.scheduleDispatch(); @@ -395,6 +443,146 @@ export class ExecutionOrchestrator { return { taskId: task.id }; } + /** + * Request changes on an initiative that's pending review. + * Creates/reuses a "Finalization" phase and adds a review task to it. + */ + async requestChangesOnInitiative( + initiativeId: string, + summary: string, + ): Promise<{ taskId: string }> { + const initiative = await this.initiativeRepository.findById(initiativeId); + if (!initiative) throw new Error(`Initiative not found: ${initiativeId}`); + if (initiative.status !== 'pending_review') { + throw new Error(`Initiative ${initiativeId} is not pending review (status: ${initiative.status})`); + } + + // Find or create a "Finalization" phase + const phases = await this.phaseRepository.findByInitiativeId(initiativeId); + let finalizationPhase = phases.find((p) => p.name === 'Finalization'); + + if (!finalizationPhase) { + finalizationPhase = await this.phaseRepository.create({ + initiativeId, + name: 'Finalization', + status: 'in_progress', + }); + } else if (finalizationPhase.status === 'completed' || finalizationPhase.status === 'pending_review') { + await this.phaseRepository.update(finalizationPhase.id, { status: 'in_progress' as any }); + } + + // Guard: don't create duplicate review tasks + const existingTasks = await this.taskRepository.findByPhaseId(finalizationPhase.id); + const activeReview = existingTasks.find( + (t) => t.category === 'review' && (t.status === 'pending' || t.status === 'in_progress'), + ); + if (activeReview) { + // Still reset initiative to active + await this.initiativeRepository.update(initiativeId, { status: 'active' as any }); + this.scheduleDispatch(); + return { taskId: activeReview.id }; + } + + // Create review task + const task = await this.taskRepository.create({ + phaseId: finalizationPhase.id, + initiativeId, + name: `Address initiative review feedback`, + description: `## Summary\n\n${summary}`, + category: 'review', + priority: 'high', + }); + + // Reset initiative status to active + await this.initiativeRepository.update(initiativeId, { status: 'active' as any }); + + // Queue task for dispatch + await this.dispatchManager.queue(task.id); + + // Emit event + const event: InitiativeChangesRequestedEvent = { + type: 'initiative:changes_requested', + timestamp: new Date(), + payload: { + initiativeId, + phaseId: finalizationPhase.id, + taskId: task.id, + }, + }; + this.eventBus.emit(event); + + log.info({ initiativeId, phaseId: finalizationPhase.id, taskId: task.id }, 'changes requested on initiative'); + + this.scheduleDispatch(); + + return { taskId: task.id }; + } + + /** + * Re-queue approved phases for an initiative into the in-memory dispatch queue. + * Self-healing: ensures phases aren't lost if the server restarted since the + * initial queueAllPhases() call. + */ + private async requeueApprovedPhases(initiativeId: string): Promise { + const phases = await this.phaseRepository.findByInitiativeId(initiativeId); + for (const p of phases) { + if (p.status === 'approved') { + try { + await this.phaseDispatchManager.queuePhase(p.id); + log.info({ phaseId: p.id }, 're-queued approved phase'); + } catch { + // Already queued or status changed — safe to ignore + } + } + } + } + + /** + * Recover in-memory dispatch queues from DB state on server startup. + * Re-queues approved phases and pending tasks for in_progress phases. + */ + private async recoverDispatchQueues(): Promise { + const initiatives = await this.initiativeRepository.findByStatus('active'); + let phasesRecovered = 0; + let tasksRecovered = 0; + + for (const initiative of initiatives) { + const phases = await this.phaseRepository.findByInitiativeId(initiative.id); + + for (const phase of phases) { + // Re-queue approved phases into the phase dispatch queue + if (phase.status === 'approved') { + try { + await this.phaseDispatchManager.queuePhase(phase.id); + phasesRecovered++; + } catch { + // Already queued or status changed + } + } + + // Re-queue pending tasks for in_progress phases into the task dispatch queue + if (phase.status === 'in_progress') { + const tasks = await this.taskRepository.findByPhaseId(phase.id); + for (const task of tasks) { + if (task.status === 'pending') { + try { + await this.dispatchManager.queue(task.id); + tasksRecovered++; + } catch { + // Already queued or task issue + } + } + } + } + } + } + + if (phasesRecovered > 0 || tasksRecovered > 0) { + log.info({ phasesRecovered, tasksRecovered }, 'recovered dispatch queues from DB state'); + this.scheduleDispatch(); + } + } + /** * Check if all phases for an initiative are completed. * If so, set initiative to pending_review and emit event. @@ -449,7 +637,16 @@ export class ExecutionOrchestrator { continue; } + // Fetch remote so local branches are up-to-date before merge/push + await this.branchManager.fetchRemote(clonePath); + if (strategy === 'merge_and_push') { + // Fast-forward local defaultBranch to match origin before merging + try { + await this.branchManager.fastForwardBranch(clonePath, project.defaultBranch); + } catch (ffErr) { + log.warn({ project: project.name, err: (ffErr as Error).message }, 'fast-forward of default branch failed — attempting merge anyway'); + } const result = await this.branchManager.mergeBranch(clonePath, initiative.branch, project.defaultBranch); if (!result.success) { throw new Error(`Failed to merge ${initiative.branch} into ${project.defaultBranch} for project ${project.name}: ${result.message}`); diff --git a/apps/server/git/branch-manager.ts b/apps/server/git/branch-manager.ts index f5d9b54..ceb399c 100644 --- a/apps/server/git/branch-manager.ts +++ b/apps/server/git/branch-manager.ts @@ -6,7 +6,7 @@ * a worktree to be checked out. */ -import type { MergeResult, BranchCommit } from './types.js'; +import type { MergeResult, MergeabilityResult, BranchCommit } from './types.js'; export interface BranchManager { /** @@ -57,9 +57,35 @@ export interface BranchManager { */ diffCommit(repoPath: string, commitHash: string): Promise; + /** + * Get the merge base (common ancestor) of two branches. + * Returns the commit hash of the merge base. + */ + getMergeBase(repoPath: string, branch1: string, branch2: string): Promise; + /** * Push a branch to a remote. * Defaults to 'origin' if no remote specified. */ pushBranch(repoPath: string, branch: string, remote?: string): Promise; + + /** + * Dry-run merge check — determines if sourceBranch can be cleanly merged + * into targetBranch without actually performing the merge. + * Uses `git merge-tree --write-tree` (git 2.38+). + */ + checkMergeability(repoPath: string, sourceBranch: string, targetBranch: string): Promise; + + /** + * Fetch all refs from a remote. + * Defaults to 'origin' if no remote specified. + */ + fetchRemote(repoPath: string, remote?: string): Promise; + + /** + * Fast-forward a local branch to match its remote-tracking counterpart. + * No-op if already up to date. Throws if fast-forward is not possible + * (i.e. the branches have diverged). + */ + fastForwardBranch(repoPath: string, branch: string, remote?: string): Promise; } diff --git a/apps/server/git/index.ts b/apps/server/git/index.ts index 41bd3b0..f7b9351 100644 --- a/apps/server/git/index.ts +++ b/apps/server/git/index.ts @@ -13,7 +13,7 @@ export type { WorktreeManager } from './types.js'; // Domain types -export type { Worktree, WorktreeDiff, MergeResult } from './types.js'; +export type { Worktree, WorktreeDiff, MergeResult, MergeabilityResult } from './types.js'; // Adapters export { SimpleGitWorktreeManager } from './manager.js'; diff --git a/apps/server/git/manager.ts b/apps/server/git/manager.ts index 258bc46..f7d3c1b 100644 --- a/apps/server/git/manager.ts +++ b/apps/server/git/manager.ts @@ -61,16 +61,16 @@ export class SimpleGitWorktreeManager implements WorktreeManager { const worktreePath = path.join(this.worktreesDir, id); log.info({ id, branch, baseBranch }, 'creating worktree'); - // Create worktree with new branch - // git worktree add -b - await this.git.raw([ - 'worktree', - 'add', - '-b', - branch, - worktreePath, - baseBranch, - ]); + // Create worktree — reuse existing branch or create new one + const branchExists = await this.branchExists(branch); + if (branchExists) { + // Branch exists from a previous run — reset it to baseBranch and check it out + await this.git.raw(['branch', '-f', branch, baseBranch]); + await this.git.raw(['worktree', 'add', worktreePath, branch]); + } else { + // git worktree add -b + await this.git.raw(['worktree', 'add', '-b', branch, worktreePath, baseBranch]); + } const worktree: Worktree = { id, @@ -327,6 +327,18 @@ export class SimpleGitWorktreeManager implements WorktreeManager { return worktrees; } + /** + * Check if a local branch exists in the repository. + */ + private async branchExists(branch: string): Promise { + try { + await this.git.raw(['rev-parse', '--verify', `refs/heads/${branch}`]); + return true; + } catch { + return false; + } + } + /** * Parse the output of git diff --name-status. */ diff --git a/apps/server/git/simple-git-branch-manager.ts b/apps/server/git/simple-git-branch-manager.ts index bee747a..e686a6f 100644 --- a/apps/server/git/simple-git-branch-manager.ts +++ b/apps/server/git/simple-git-branch-manager.ts @@ -11,7 +11,7 @@ import { mkdtempSync, rmSync } from 'node:fs'; import { tmpdir } from 'node:os'; import { simpleGit } from 'simple-git'; import type { BranchManager } from './branch-manager.js'; -import type { MergeResult, BranchCommit } from './types.js'; +import type { MergeResult, MergeabilityResult, BranchCommit } from './types.js'; import { createModuleLogger } from '../logger/index.js'; const log = createModuleLogger('branch-manager'); @@ -31,19 +31,27 @@ export class SimpleGitBranchManager implements BranchManager { } async mergeBranch(repoPath: string, sourceBranch: string, targetBranch: string): Promise { - // Use an ephemeral worktree for merge safety + // Use an ephemeral worktree with a temp branch for merge safety. + // We can't check out targetBranch directly — it may already be checked out + // in the clone's main working tree or an agent worktree. const tmpPath = mkdtempSync(join(tmpdir(), 'cw-merge-')); const repoGit = simpleGit(repoPath); + const tempBranch = `cw-merge-${Date.now()}`; try { - // Create ephemeral worktree on target branch - await repoGit.raw(['worktree', 'add', tmpPath, targetBranch]); + // Create worktree with a temp branch starting at targetBranch's commit + await repoGit.raw(['worktree', 'add', '-b', tempBranch, tmpPath, targetBranch]); const wtGit = simpleGit(tmpPath); try { await wtGit.merge([sourceBranch, '--no-edit']); + // Update the real target branch ref to the merge result. + // update-ref bypasses the "branch is checked out" guard. + const mergeCommit = (await wtGit.revparse(['HEAD'])).trim(); + await repoGit.raw(['update-ref', `refs/heads/${targetBranch}`, mergeCommit]); + log.info({ repoPath, sourceBranch, targetBranch }, 'merge completed cleanly'); return { success: true, message: `Merged ${sourceBranch} into ${targetBranch}` }; } catch (mergeErr) { @@ -73,6 +81,10 @@ export class SimpleGitBranchManager implements BranchManager { try { rmSync(tmpPath, { recursive: true, force: true }); } catch { /* ignore */ } try { await repoGit.raw(['worktree', 'prune']); } catch { /* ignore */ } } + // Delete the temp branch + try { + await repoGit.raw(['branch', '-D', tempBranch]); + } catch { /* ignore — may already be cleaned up */ } } } @@ -141,9 +153,59 @@ export class SimpleGitBranchManager implements BranchManager { return git.diff([`${commitHash}~1`, commitHash]); } + async getMergeBase(repoPath: string, branch1: string, branch2: string): Promise { + const git = simpleGit(repoPath); + const result = await git.raw(['merge-base', branch1, branch2]); + return result.trim(); + } + async pushBranch(repoPath: string, branch: string, remote = 'origin'): Promise { const git = simpleGit(repoPath); await git.push(remote, branch); log.info({ repoPath, branch, remote }, 'branch pushed to remote'); } + + async checkMergeability(repoPath: string, sourceBranch: string, targetBranch: string): Promise { + const git = simpleGit(repoPath); + + // git merge-tree --write-tree outputs everything to stdout. + // simple-git's .raw() resolves with stdout even on exit code 1 (conflicts), + // so we parse the output text instead of relying on catch. + const output = await git.raw(['merge-tree', '--write-tree', targetBranch, sourceBranch]); + + // Parse conflict file names from "CONFLICT (content): Merge conflict in " + const conflictPattern = /CONFLICT \([^)]+\): (?:Merge conflict in|.* -> )(.+)/g; + const conflicts: string[] = []; + let match: RegExpExecArray | null; + while ((match = conflictPattern.exec(output)) !== null) { + conflicts.push(match[1].trim()); + } + + if (conflicts.length > 0) { + log.debug({ repoPath, sourceBranch, targetBranch, conflicts }, 'merge-tree check: conflicts'); + return { mergeable: false, conflicts }; + } + + // Fallback: check for any CONFLICT text we couldn't parse specifically + if (output.includes('CONFLICT')) { + log.debug({ repoPath, sourceBranch, targetBranch }, 'merge-tree check: unparsed conflicts'); + return { mergeable: false, conflicts: ['(unable to parse conflict details)'] }; + } + + log.debug({ repoPath, sourceBranch, targetBranch }, 'merge-tree check: clean'); + return { mergeable: true }; + } + + async fetchRemote(repoPath: string, remote = 'origin'): Promise { + const git = simpleGit(repoPath); + await git.fetch(remote); + log.info({ repoPath, remote }, 'fetched remote'); + } + + async fastForwardBranch(repoPath: string, branch: string, remote = 'origin'): Promise { + const git = simpleGit(repoPath); + const remoteBranch = `${remote}/${branch}`; + await git.raw(['merge', '--ff-only', remoteBranch, branch]); + log.info({ repoPath, branch, remoteBranch }, 'fast-forwarded branch'); + } } diff --git a/apps/server/git/types.ts b/apps/server/git/types.ts index 17d56ae..8471b75 100644 --- a/apps/server/git/types.ts +++ b/apps/server/git/types.ts @@ -58,6 +58,19 @@ export interface MergeResult { message: string; } +// ============================================================================= +// Mergeability Check +// ============================================================================= + +/** + * Result of a dry-run merge check. + * No side effects — only tells you whether the merge would succeed. + */ +export interface MergeabilityResult { + mergeable: boolean; + conflicts?: string[]; +} + // ============================================================================= // Branch Commit Info // ============================================================================= diff --git a/apps/server/preview/compose-generator.test.ts b/apps/server/preview/compose-generator.test.ts index 62448f0..234d62b 100644 --- a/apps/server/preview/compose-generator.test.ts +++ b/apps/server/preview/compose-generator.test.ts @@ -164,7 +164,8 @@ describe('generateGatewayCaddyfile', () => { const caddyfile = generateGatewayCaddyfile(previews, 9100); expect(caddyfile).toContain('auto_https off'); - expect(caddyfile).toContain('abc123.localhost:9100 {'); + expect(caddyfile).toContain('abc123.localhost:80 {'); + expect(caddyfile).toContain('handle /* {'); expect(caddyfile).toContain('reverse_proxy cw-preview-abc123-app:3000'); }); @@ -176,13 +177,14 @@ describe('generateGatewayCaddyfile', () => { ]); const caddyfile = generateGatewayCaddyfile(previews, 9100); + expect(caddyfile).toContain('abc123.localhost:80 {'); expect(caddyfile).toContain('handle_path /api/*'); expect(caddyfile).toContain('reverse_proxy cw-preview-abc123-backend:8080'); - expect(caddyfile).toContain('handle {'); + expect(caddyfile).toContain('handle /* {'); expect(caddyfile).toContain('reverse_proxy cw-preview-abc123-frontend:3000'); }); - it('generates multi-preview Caddyfile with separate subdomain blocks', () => { + it('generates separate subdomain blocks for each preview', () => { const previews = new Map(); previews.set('abc', [ { containerName: 'cw-preview-abc-app', port: 3000, route: '/' }, @@ -192,8 +194,8 @@ describe('generateGatewayCaddyfile', () => { ]); const caddyfile = generateGatewayCaddyfile(previews, 9100); - expect(caddyfile).toContain('abc.localhost:9100 {'); - expect(caddyfile).toContain('xyz.localhost:9100 {'); + expect(caddyfile).toContain('abc.localhost:80 {'); + expect(caddyfile).toContain('xyz.localhost:80 {'); expect(caddyfile).toContain('reverse_proxy cw-preview-abc-app:3000'); expect(caddyfile).toContain('reverse_proxy cw-preview-xyz-app:5000'); }); @@ -209,10 +211,10 @@ describe('generateGatewayCaddyfile', () => { const caddyfile = generateGatewayCaddyfile(previews, 9100); const apiAuthIdx = caddyfile.indexOf('/api/auth'); const apiIdx = caddyfile.indexOf('handle_path /api/*'); - const handleIdx = caddyfile.indexOf('handle {'); + const rootIdx = caddyfile.indexOf('handle /* {'); expect(apiAuthIdx).toBeLessThan(apiIdx); - expect(apiIdx).toBeLessThan(handleIdx); + expect(apiIdx).toBeLessThan(rootIdx); }); }); diff --git a/apps/server/preview/gateway.ts b/apps/server/preview/gateway.ts index 967921a..ed4ec96 100644 --- a/apps/server/preview/gateway.ts +++ b/apps/server/preview/gateway.ts @@ -2,7 +2,7 @@ * Gateway Manager * * Manages a single shared Caddy reverse proxy (the "gateway") that routes - * subdomain requests to per-preview compose stacks on a shared Docker network. + * subdomain-based requests to per-preview compose stacks on a shared Docker network. * * Architecture: * .cw-previews/gateway/ @@ -195,18 +195,20 @@ export class GatewayManager { /** * Generate a Caddyfile for the gateway from all active preview routes. * - * Each preview gets a subdomain block: `.localhost:` + * Uses subdomain-based routing: each preview gets its own `.localhost:80` block. + * Chrome/Firefox resolve `*.localhost` to 127.0.0.1 natively — no DNS setup needed. * Routes within a preview are sorted by specificity (longest path first). */ export function generateGatewayCaddyfile( previews: Map, - port: number, + _port: number, ): string { + // Caddy runs inside a container where Docker maps host:${port} → container:80. + // The Caddyfile must listen on the container-internal port (80), not the host port. const lines: string[] = [ '{', ' auto_https off', '}', - '', ]; for (const [previewId, routes] of previews) { @@ -217,11 +219,12 @@ export function generateGatewayCaddyfile( return b.route.length - a.route.length; }); - lines.push(`${previewId}.localhost:${port} {`); + lines.push(''); + lines.push(`${previewId}.localhost:80 {`); for (const route of sorted) { if (route.route === '/') { - lines.push(` handle {`); + lines.push(` handle /* {`); lines.push(` reverse_proxy ${route.containerName}:${route.port}`); lines.push(` }`); } else { @@ -233,8 +236,9 @@ export function generateGatewayCaddyfile( } lines.push('}'); - lines.push(''); } + lines.push(''); + return lines.join('\n'); } diff --git a/apps/server/preview/health-checker.ts b/apps/server/preview/health-checker.ts index 529cdf1..febe87b 100644 --- a/apps/server/preview/health-checker.ts +++ b/apps/server/preview/health-checker.ts @@ -1,7 +1,7 @@ /** * Health Checker * - * Polls service healthcheck endpoints through the gateway's subdomain routing + * Polls service healthcheck endpoints through the gateway's subdomain-based routing * to verify that preview services are ready. */ diff --git a/apps/server/preview/manager.test.ts b/apps/server/preview/manager.test.ts index 14dc0cd..4f60cfc 100644 --- a/apps/server/preview/manager.test.ts +++ b/apps/server/preview/manager.test.ts @@ -67,7 +67,7 @@ vi.mock('node:fs/promises', () => ({ })); vi.mock('nanoid', () => ({ - nanoid: vi.fn(() => 'abc123test'), + customAlphabet: vi.fn(() => vi.fn(() => 'abc123test')), })); import { PreviewManager } from './manager.js'; @@ -220,7 +220,7 @@ describe('PreviewManager', () => { expect(result.projectId).toBe('proj-1'); expect(result.branch).toBe('feature-x'); expect(result.gatewayPort).toBe(9100); - expect(result.url).toBe('http://abc123test.localhost:9100'); + expect(result.url).toBe('http://abc123test.localhost:9100/'); expect(result.mode).toBe('preview'); expect(result.status).toBe('running'); @@ -233,7 +233,7 @@ describe('PreviewManager', () => { expect(buildingEvent).toBeDefined(); expect(readyEvent).toBeDefined(); expect((readyEvent!.payload as Record).url).toBe( - 'http://abc123test.localhost:9100', + 'http://abc123test.localhost:9100/', ); }); @@ -472,7 +472,7 @@ describe('PreviewManager', () => { expect(previews).toHaveLength(2); expect(previews[0].id).toBe('aaa'); expect(previews[0].gatewayPort).toBe(9100); - expect(previews[0].url).toBe('http://aaa.localhost:9100'); + expect(previews[0].url).toBe('http://aaa.localhost:9100/'); expect(previews[0].mode).toBe('preview'); expect(previews[0].services).toHaveLength(1); expect(previews[1].id).toBe('bbb'); @@ -573,7 +573,7 @@ describe('PreviewManager', () => { expect(status!.status).toBe('running'); expect(status!.id).toBe('abc'); expect(status!.gatewayPort).toBe(9100); - expect(status!.url).toBe('http://abc.localhost:9100'); + expect(status!.url).toBe('http://abc.localhost:9100/'); expect(status!.mode).toBe('preview'); }); diff --git a/apps/server/preview/manager.ts b/apps/server/preview/manager.ts index 418e9ba..2b04cc3 100644 --- a/apps/server/preview/manager.ts +++ b/apps/server/preview/manager.ts @@ -8,7 +8,7 @@ import { join } from 'node:path'; import { mkdir, writeFile, rm } from 'node:fs/promises'; -import { nanoid } from 'nanoid'; +import { customAlphabet } from 'nanoid'; import type { ProjectRepository } from '../db/repositories/project-repository.js'; import type { PhaseRepository } from '../db/repositories/phase-repository.js'; import type { InitiativeRepository } from '../db/repositories/initiative-repository.js'; @@ -116,7 +116,8 @@ export class PreviewManager { ); // 4. Generate ID and prepare deploy dir - const id = nanoid(10); + const previewNanoid = customAlphabet('0123456789abcdefghijklmnopqrstuvwxyz', 10); + const id = previewNanoid(); const projectName = `${COMPOSE_PROJECT_PREFIX}${id}`; const deployDir = join(this.workspaceRoot, PREVIEWS_DIR, id); await mkdir(deployDir, { recursive: true }); @@ -238,7 +239,7 @@ export class PreviewManager { await this.runSeeds(projectName, config); // 11. Success - const url = `http://${id}.localhost:${gatewayPort}`; + const url = `http://${id}.localhost:${gatewayPort}/`; log.info({ id, url }, 'preview deployment ready'); this.eventBus.emit({ @@ -604,7 +605,7 @@ export class PreviewManager { projectId, branch, gatewayPort, - url: `http://${previewId}.localhost:${gatewayPort}`, + url: `http://${previewId}.localhost:${gatewayPort}/`, mode, status: 'running', services: [], diff --git a/apps/server/test/e2e/decompose-workflow.test.ts b/apps/server/test/e2e/decompose-workflow.test.ts index 8598945..6ff5fe6 100644 --- a/apps/server/test/e2e/decompose-workflow.test.ts +++ b/apps/server/test/e2e/decompose-workflow.test.ts @@ -143,7 +143,7 @@ describe('Detail Workflow E2E', () => { harness.setArchitectDetailComplete('detailer', [ { number: 1, name: 'Task 1', content: 'First task', type: 'auto', dependencies: [] }, { number: 2, name: 'Task 2', content: 'Second task', type: 'auto', dependencies: [1] }, - { number: 3, name: 'Verify', content: 'Verify all', type: 'checkpoint:human-verify', dependencies: [2] }, + { number: 3, name: 'Verify', content: 'Verify all', type: 'auto', dependencies: [2] }, ]); // Resume with all answers @@ -261,7 +261,7 @@ describe('Detail Workflow E2E', () => { tasks: [ { number: 1, name: 'Schema', description: 'Create tables', type: 'auto', dependencies: [] }, { number: 2, name: 'API', description: 'Create endpoints', type: 'auto', dependencies: [1] }, - { number: 3, name: 'Verify', description: 'Test flow', type: 'checkpoint:human-verify', dependencies: [2] }, + { number: 3, name: 'Verify', description: 'Test flow', type: 'auto', dependencies: [2] }, ], }); @@ -271,33 +271,31 @@ describe('Detail Workflow E2E', () => { expect(tasks[0].name).toBe('Schema'); expect(tasks[1].name).toBe('API'); expect(tasks[2].name).toBe('Verify'); - expect(tasks[2].type).toBe('checkpoint:human-verify'); + expect(tasks[2].type).toBe('auto'); }); - it('should handle all task types', async () => { + it('should create tasks with auto type', async () => { const initiative = await harness.createInitiative('Task Types Test'); const phases = await harness.createPhasesFromPlan(initiative.id, [ { name: 'Phase 1' }, ]); const detailTask = await harness.createDetailTask(phases[0].id, 'Mixed Tasks'); - // Create tasks with all types await harness.caller.createChildTasks({ parentTaskId: detailTask.id, tasks: [ { number: 1, name: 'Auto Task', description: 'Automated work', type: 'auto' }, - { number: 2, name: 'Human Verify', description: 'Visual check', type: 'checkpoint:human-verify', dependencies: [1] }, - { number: 3, name: 'Decision', description: 'Choose approach', type: 'checkpoint:decision', dependencies: [2] }, - { number: 4, name: 'Human Action', description: 'Manual step', type: 'checkpoint:human-action', dependencies: [3] }, + { number: 2, name: 'Second Task', description: 'More work', type: 'auto', dependencies: [1] }, + { number: 3, name: 'Third Task', description: 'Even more', type: 'auto', dependencies: [2] }, + { number: 4, name: 'Final Task', description: 'Last step', type: 'auto', dependencies: [3] }, ], }); const tasks = await harness.getChildTasks(detailTask.id); expect(tasks).toHaveLength(4); - expect(tasks[0].type).toBe('auto'); - expect(tasks[1].type).toBe('checkpoint:human-verify'); - expect(tasks[2].type).toBe('checkpoint:decision'); - expect(tasks[3].type).toBe('checkpoint:human-action'); + for (const task of tasks) { + expect(task.type).toBe('auto'); + } }); it('should create task dependencies', async () => { @@ -346,7 +344,7 @@ describe('Detail Workflow E2E', () => { { number: 1, name: 'Create user schema', content: 'Define User model', type: 'auto', dependencies: [] }, { number: 2, name: 'Implement JWT', content: 'Token generation', type: 'auto', dependencies: [1] }, { number: 3, name: 'Protected routes', content: 'Middleware', type: 'auto', dependencies: [2] }, - { number: 4, name: 'Verify auth', content: 'Test login flow', type: 'checkpoint:human-verify', dependencies: [3] }, + { number: 4, name: 'Verify auth', content: 'Test login flow', type: 'auto', dependencies: [3] }, ]); await harness.caller.spawnArchitectDetail({ @@ -367,7 +365,7 @@ describe('Detail Workflow E2E', () => { { number: 1, name: 'Create user schema', description: 'Define User model', type: 'auto', dependencies: [] }, { number: 2, name: 'Implement JWT', description: 'Token generation', type: 'auto', dependencies: [1] }, { number: 3, name: 'Protected routes', description: 'Middleware', type: 'auto', dependencies: [2] }, - { number: 4, name: 'Verify auth', description: 'Test login flow', type: 'checkpoint:human-verify', dependencies: [3] }, + { number: 4, name: 'Verify auth', description: 'Test login flow', type: 'auto', dependencies: [3] }, ], }); @@ -375,7 +373,7 @@ describe('Detail Workflow E2E', () => { const tasks = await harness.getChildTasks(detailTask.id); expect(tasks).toHaveLength(4); expect(tasks[0].name).toBe('Create user schema'); - expect(tasks[3].type).toBe('checkpoint:human-verify'); + expect(tasks[3].type).toBe('auto'); // Agent should be idle const finalAgent = await harness.caller.getAgent({ name: 'detailer' }); diff --git a/apps/server/trpc/router.test.ts b/apps/server/trpc/router.test.ts index c585ce5..2dfa4d1 100644 --- a/apps/server/trpc/router.test.ts +++ b/apps/server/trpc/router.test.ts @@ -14,6 +14,7 @@ import { } from './index.js'; import type { TRPCContext } from './context.js'; import type { EventBus } from '../events/types.js'; +import type { AccountRepository } from '../db/repositories/account-repository.js'; // Create caller factory for the app router const createCaller = createCallerFactory(appRouter); @@ -161,6 +162,79 @@ describe('tRPC Router', () => { }); }); + describe('addAccountByToken procedure', () => { + let mockRepo: AccountRepository; + + beforeEach(() => { + mockRepo = { + findByEmail: vi.fn(), + updateAccountAuth: vi.fn(), + create: vi.fn(), + } as unknown as AccountRepository; + vi.clearAllMocks(); + }); + + it('creates a new account and returns { upserted: false, account }', async () => { + const stubAccount = { id: 'new-id', email: 'user@example.com', provider: 'claude' }; + (mockRepo.findByEmail as ReturnType).mockResolvedValue(null); + (mockRepo.create as ReturnType).mockResolvedValue(stubAccount); + + const testCtx = createTestContext({ accountRepository: mockRepo }); + const testCaller = createCaller(testCtx); + const result = await testCaller.addAccountByToken({ email: 'user@example.com', token: 'my-token' }); + + expect(result).toEqual({ upserted: false, account: stubAccount }); + expect(mockRepo.create).toHaveBeenCalledWith({ + email: 'user@example.com', + provider: 'claude', + configJson: '{"hasCompletedOnboarding":true}', + credentials: '{"claudeAiOauth":{"accessToken":"my-token"}}', + }); + expect(mockRepo.updateAccountAuth).not.toHaveBeenCalled(); + }); + + it('updates existing account and returns { upserted: true, account }', async () => { + const existingAccount = { id: 'existing-id', email: 'user@example.com', provider: 'claude' }; + const updatedAccount = { id: 'existing-id', email: 'user@example.com', provider: 'claude', updated: true }; + (mockRepo.findByEmail as ReturnType).mockResolvedValue(existingAccount); + (mockRepo.updateAccountAuth as ReturnType).mockResolvedValue(updatedAccount); + + const testCtx = createTestContext({ accountRepository: mockRepo }); + const testCaller = createCaller(testCtx); + const result = await testCaller.addAccountByToken({ email: 'user@example.com', token: 'my-token' }); + + expect(result).toEqual({ upserted: true, account: updatedAccount }); + expect(mockRepo.updateAccountAuth).toHaveBeenCalledWith( + 'existing-id', + '{"hasCompletedOnboarding":true}', + '{"claudeAiOauth":{"accessToken":"my-token"}}', + ); + expect(mockRepo.create).not.toHaveBeenCalled(); + }); + + it('throws BAD_REQUEST when email is empty', async () => { + const testCtx = createTestContext({ accountRepository: mockRepo }); + const testCaller = createCaller(testCtx); + + await expect(testCaller.addAccountByToken({ email: '', provider: 'claude', token: 'tok' })) + .rejects.toMatchObject({ code: 'BAD_REQUEST' }); + expect(mockRepo.findByEmail).not.toHaveBeenCalled(); + expect(mockRepo.create).not.toHaveBeenCalled(); + expect(mockRepo.updateAccountAuth).not.toHaveBeenCalled(); + }); + + it('throws BAD_REQUEST when token is empty', async () => { + const testCtx = createTestContext({ accountRepository: mockRepo }); + const testCaller = createCaller(testCtx); + + await expect(testCaller.addAccountByToken({ email: 'user@example.com', provider: 'claude', token: '' })) + .rejects.toMatchObject({ code: 'BAD_REQUEST' }); + expect(mockRepo.findByEmail).not.toHaveBeenCalled(); + expect(mockRepo.create).not.toHaveBeenCalled(); + expect(mockRepo.updateAccountAuth).not.toHaveBeenCalled(); + }); + }); + describe('Zod schema validation', () => { it('healthResponseSchema should reject invalid status', () => { const invalid = { diff --git a/apps/server/trpc/routers/account.ts b/apps/server/trpc/routers/account.ts index 99c638d..b40a4db 100644 --- a/apps/server/trpc/routers/account.ts +++ b/apps/server/trpc/routers/account.ts @@ -72,5 +72,29 @@ export function accountProcedures(publicProcedure: ProcedureBuilder) { .query(() => { return listProviderNames(); }), + + addAccountByToken: publicProcedure + .input(z.object({ + email: z.string().min(1), + provider: z.string().default('claude'), + token: z.string().min(1), + })) + .mutation(async ({ ctx, input }) => { + const repo = requireAccountRepository(ctx); + const credentials = JSON.stringify({ claudeAiOauth: { accessToken: input.token } }); + const configJson = JSON.stringify({ hasCompletedOnboarding: true }); + const existing = await repo.findByEmail(input.email); + if (existing) { + const account = await repo.updateAccountAuth(existing.id, configJson, credentials); + return { upserted: true, account }; + } + const account = await repo.create({ + email: input.email, + provider: input.provider, + configJson, + credentials, + }); + return { upserted: false, account }; + }), }; } diff --git a/apps/server/trpc/routers/agent.ts b/apps/server/trpc/routers/agent.ts index 74fdc50..a0c3660 100644 --- a/apps/server/trpc/routers/agent.ts +++ b/apps/server/trpc/routers/agent.ts @@ -184,6 +184,27 @@ export function agentProcedures(publicProcedure: ProcedureBuilder) { return candidates[0] ?? null; }), + getActiveConflictAgent: publicProcedure + .input(z.object({ initiativeId: z.string().min(1) })) + .query(async ({ ctx, input }): Promise => { + const agentManager = requireAgentManager(ctx); + const allAgents = await agentManager.list(); + const candidates = allAgents + .filter( + (a) => + a.mode === 'execute' && + a.initiativeId === input.initiativeId && + a.name?.startsWith('conflict-') && + ['running', 'waiting_for_input', 'idle', 'crashed'].includes(a.status) && + !a.userDismissedAt, + ) + .sort( + (a, b) => + new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(), + ); + return candidates[0] ?? null; + }), + getAgentOutput: publicProcedure .input(agentIdentifierSchema) .query(async ({ ctx, input }): Promise => { diff --git a/apps/server/trpc/routers/change-set.ts b/apps/server/trpc/routers/change-set.ts index 344c7f3..111bf54 100644 --- a/apps/server/trpc/routers/change-set.ts +++ b/apps/server/trpc/routers/change-set.ts @@ -91,6 +91,9 @@ export function changeSetProcedures(publicProcedure: ProcedureBuilder) { } } + // Mark reverted FIRST to avoid ghost state if entity deletion fails partway + await repo.markReverted(input.id); + // Apply reverts in reverse entry order const reversedEntries = [...cs.entries].reverse(); for (const entry of reversedEntries) { @@ -159,8 +162,6 @@ export function changeSetProcedures(publicProcedure: ProcedureBuilder) { } } - await repo.markReverted(input.id); - ctx.eventBus.emit({ type: 'changeset:reverted' as const, timestamp: new Date(), diff --git a/apps/server/trpc/routers/dispatch.ts b/apps/server/trpc/routers/dispatch.ts index 13f4b0c..1a41dc5 100644 --- a/apps/server/trpc/routers/dispatch.ts +++ b/apps/server/trpc/routers/dispatch.ts @@ -35,5 +35,15 @@ export function dispatchProcedures(publicProcedure: ProcedureBuilder) { await dispatchManager.completeTask(input.taskId); return { success: true }; }), + + retryBlockedTask: publicProcedure + .input(z.object({ taskId: z.string().min(1) })) + .mutation(async ({ ctx, input }) => { + const dispatchManager = requireDispatchManager(ctx); + await dispatchManager.retryBlockedTask(input.taskId); + // Kick dispatch loop to pick up the re-queued task + await dispatchManager.dispatchNext(); + return { success: true }; + }), }; } diff --git a/apps/server/trpc/routers/initiative.ts b/apps/server/trpc/routers/initiative.ts index 4b8fb66..6b48b77 100644 --- a/apps/server/trpc/routers/initiative.ts +++ b/apps/server/trpc/routers/initiative.ts @@ -7,7 +7,7 @@ import { z } from 'zod'; import type { ProcedureBuilder } from '../trpc.js'; import { requireAgentManager, requireInitiativeRepository, requireProjectRepository, requireTaskRepository, requireBranchManager, requireExecutionOrchestrator } from './_helpers.js'; import { deriveInitiativeActivity } from './initiative-activity.js'; -import { buildRefinePrompt } from '../../agent/prompts/index.js'; +import { buildRefinePrompt, buildConflictResolutionPrompt, buildConflictResolutionDescription } from '../../agent/prompts/index.js'; import type { PageForSerialization } from '../../agent/content-serializer.js'; import { ensureProjectClone } from '../../git/project-clones.js'; @@ -335,5 +335,145 @@ export function initiativeProcedures(publicProcedure: ProcedureBuilder) { await orchestrator.approveInitiative(input.initiativeId, input.strategy); return { success: true }; }), + + requestInitiativeChanges: publicProcedure + .input(z.object({ + initiativeId: z.string().min(1), + summary: z.string().trim().min(1), + })) + .mutation(async ({ ctx, input }) => { + const orchestrator = requireExecutionOrchestrator(ctx); + const result = await orchestrator.requestChangesOnInitiative( + input.initiativeId, + input.summary, + ); + return { success: true, taskId: result.taskId }; + }), + + checkInitiativeMergeability: publicProcedure + .input(z.object({ initiativeId: z.string().min(1) })) + .query(async ({ ctx, input }) => { + const initiativeRepo = requireInitiativeRepository(ctx); + const projectRepo = requireProjectRepository(ctx); + const branchManager = requireBranchManager(ctx); + + const initiative = await initiativeRepo.findById(input.initiativeId); + if (!initiative) { + throw new TRPCError({ code: 'NOT_FOUND', message: `Initiative '${input.initiativeId}' not found` }); + } + if (!initiative.branch) { + throw new TRPCError({ code: 'BAD_REQUEST', message: 'Initiative has no branch configured' }); + } + + const projects = await projectRepo.findProjectsByInitiativeId(input.initiativeId); + const allConflicts: string[] = []; + let mergeable = true; + + for (const project of projects) { + const clonePath = await ensureProjectClone(project, ctx.workspaceRoot!); + const result = await branchManager.checkMergeability(clonePath, initiative.branch, project.defaultBranch); + if (!result.mergeable) { + mergeable = false; + if (result.conflicts) allConflicts.push(...result.conflicts); + } + } + + return { + mergeable, + conflictFiles: allConflicts, + targetBranch: projects[0]?.defaultBranch ?? 'main', + }; + }), + + spawnConflictResolutionAgent: publicProcedure + .input(z.object({ + initiativeId: z.string().min(1), + provider: z.string().optional(), + })) + .mutation(async ({ ctx, input }) => { + const agentManager = requireAgentManager(ctx); + const initiativeRepo = requireInitiativeRepository(ctx); + const projectRepo = requireProjectRepository(ctx); + const taskRepo = requireTaskRepository(ctx); + const branchManager = requireBranchManager(ctx); + + const initiative = await initiativeRepo.findById(input.initiativeId); + if (!initiative) { + throw new TRPCError({ code: 'NOT_FOUND', message: `Initiative '${input.initiativeId}' not found` }); + } + if (!initiative.branch) { + throw new TRPCError({ code: 'BAD_REQUEST', message: 'Initiative has no branch configured' }); + } + + const projects = await projectRepo.findProjectsByInitiativeId(input.initiativeId); + if (projects.length === 0) { + throw new TRPCError({ code: 'BAD_REQUEST', message: 'Initiative has no linked projects' }); + } + + // Auto-dismiss stale conflict agents + const allAgents = await agentManager.list(); + const staleAgents = allAgents.filter( + (a) => + a.mode === 'execute' && + a.initiativeId === input.initiativeId && + a.name?.startsWith('conflict-') && + ['crashed', 'idle'].includes(a.status) && + !a.userDismissedAt, + ); + for (const stale of staleAgents) { + await agentManager.dismiss(stale.id); + } + + // Reject if active conflict agent already running + const activeConflictAgents = allAgents.filter( + (a) => + a.mode === 'execute' && + a.initiativeId === input.initiativeId && + a.name?.startsWith('conflict-') && + ['running', 'waiting_for_input'].includes(a.status), + ); + if (activeConflictAgents.length > 0) { + throw new TRPCError({ + code: 'CONFLICT', + message: 'A conflict resolution agent is already running for this initiative', + }); + } + + // Re-check mergeability to get current conflict list + const project = projects[0]; + const clonePath = await ensureProjectClone(project, ctx.workspaceRoot!); + const mergeCheck = await branchManager.checkMergeability(clonePath, initiative.branch, project.defaultBranch); + if (mergeCheck.mergeable) { + throw new TRPCError({ code: 'BAD_REQUEST', message: 'No merge conflicts detected — merge is clean' }); + } + + const conflicts = mergeCheck.conflicts ?? []; + const targetBranch = project.defaultBranch; + + // Create task + const task = await taskRepo.create({ + initiativeId: input.initiativeId, + name: `Resolve conflicts: ${initiative.name}`, + description: buildConflictResolutionDescription(initiative.branch, targetBranch, conflicts), + category: 'merge', + status: 'in_progress', + }); + + // Spawn agent on a unique temp branch based off the initiative branch. + // Using initiative.branch directly as branchName would cause SimpleGitWorktreeManager.create() + // to run `git branch -f `, force-resetting the initiative branch. + const tempBranch = `${initiative.branch}-conflict-${Date.now()}`; + const prompt = buildConflictResolutionPrompt(initiative.branch, targetBranch, conflicts); + return agentManager.spawn({ + name: `conflict-${Date.now()}`, + taskId: task.id, + prompt, + mode: 'execute', + provider: input.provider, + initiativeId: input.initiativeId, + baseBranch: initiative.branch, + branchName: tempBranch, + }); + }), }; } diff --git a/apps/server/trpc/routers/phase-dispatch.ts b/apps/server/trpc/routers/phase-dispatch.ts index 3ccb0c8..4524390 100644 --- a/apps/server/trpc/routers/phase-dispatch.ts +++ b/apps/server/trpc/routers/phase-dispatch.ts @@ -53,7 +53,7 @@ export function phaseDispatchProcedures(publicProcedure: ProcedureBuilder) { number: z.number().int().positive(), name: z.string().min(1), description: z.string(), - type: z.enum(['auto', 'checkpoint:human-verify', 'checkpoint:decision', 'checkpoint:human-action']).default('auto'), + type: z.enum(['auto']).default('auto'), dependencies: z.array(z.number().int().positive()).optional(), })), })) diff --git a/apps/server/trpc/routers/phase.ts b/apps/server/trpc/routers/phase.ts index ba1e138..be59ef2 100644 --- a/apps/server/trpc/routers/phase.ts +++ b/apps/server/trpc/routers/phase.ts @@ -6,7 +6,7 @@ import { TRPCError } from '@trpc/server'; import { z } from 'zod'; import type { Phase } from '../../db/schema.js'; import type { ProcedureBuilder } from '../trpc.js'; -import { requirePhaseRepository, requireTaskRepository, requireBranchManager, requireInitiativeRepository, requireProjectRepository, requireExecutionOrchestrator, requireReviewCommentRepository } from './_helpers.js'; +import { requirePhaseRepository, requireTaskRepository, requireBranchManager, requireInitiativeRepository, requireProjectRepository, requireExecutionOrchestrator, requireReviewCommentRepository, requireChangeSetRepository } from './_helpers.js'; import { phaseBranchName } from '../../git/branch-naming.js'; import { ensureProjectClone } from '../../git/project-clones.js'; @@ -98,6 +98,29 @@ export function phaseProcedures(publicProcedure: ProcedureBuilder) { .mutation(async ({ ctx, input }) => { const repo = requirePhaseRepository(ctx); await repo.delete(input.id); + + // Reconcile any applied changesets that created this phase. + // If all created phases in a changeset are now deleted, mark it reverted. + if (ctx.changeSetRepository) { + try { + const csRepo = requireChangeSetRepository(ctx); + const affectedChangeSets = await csRepo.findAppliedByCreatedEntity('phase', input.id); + for (const cs of affectedChangeSets) { + const createdPhaseIds = cs.entries + .filter(e => e.entityType === 'phase' && e.action === 'create') + .map(e => e.entityId); + const survivingPhases = await Promise.all( + createdPhaseIds.map(id => repo.findById(id)), + ); + if (survivingPhases.every(p => p === null)) { + await csRepo.markReverted(cs.id); + } + } + } catch { + // Best-effort reconciliation — don't fail the delete + } + } + return { success: true }; }), @@ -196,8 +219,8 @@ export function phaseProcedures(publicProcedure: ProcedureBuilder) { if (!phase) { throw new TRPCError({ code: 'NOT_FOUND', message: `Phase '${input.phaseId}' not found` }); } - if (phase.status !== 'pending_review') { - throw new TRPCError({ code: 'BAD_REQUEST', message: `Phase is not pending review (status: ${phase.status})` }); + if (phase.status !== 'pending_review' && phase.status !== 'completed') { + throw new TRPCError({ code: 'BAD_REQUEST', message: `Phase is not reviewable (status: ${phase.status})` }); } const initiative = await initiativeRepo.findById(phase.initiativeId); @@ -207,13 +230,15 @@ export function phaseProcedures(publicProcedure: ProcedureBuilder) { const initBranch = initiative.branch; const phBranch = phaseBranchName(initBranch, phase.name); + // For completed phases, use stored merge base; for pending_review, use initiative branch + const diffBase = (phase.status === 'completed' && phase.mergeBase) ? phase.mergeBase : initBranch; const projects = await projectRepo.findProjectsByInitiativeId(phase.initiativeId); let rawDiff = ''; for (const project of projects) { const clonePath = await ensureProjectClone(project, ctx.workspaceRoot!); - const diff = await branchManager.diffBranches(clonePath, initBranch, phBranch); + const diff = await branchManager.diffBranches(clonePath, diffBase, phBranch); if (diff) { rawDiff += diff + '\n'; } @@ -247,8 +272,8 @@ export function phaseProcedures(publicProcedure: ProcedureBuilder) { if (!phase) { throw new TRPCError({ code: 'NOT_FOUND', message: `Phase '${input.phaseId}' not found` }); } - if (phase.status !== 'pending_review') { - throw new TRPCError({ code: 'BAD_REQUEST', message: `Phase is not pending review (status: ${phase.status})` }); + if (phase.status !== 'pending_review' && phase.status !== 'completed') { + throw new TRPCError({ code: 'BAD_REQUEST', message: `Phase is not reviewable (status: ${phase.status})` }); } const initiative = await initiativeRepo.findById(phase.initiativeId); @@ -258,13 +283,14 @@ export function phaseProcedures(publicProcedure: ProcedureBuilder) { const initBranch = initiative.branch; const phBranch = phaseBranchName(initBranch, phase.name); + const diffBase = (phase.status === 'completed' && phase.mergeBase) ? phase.mergeBase : initBranch; const projects = await projectRepo.findProjectsByInitiativeId(phase.initiativeId); const allCommits: Array<{ hash: string; shortHash: string; message: string; author: string; date: string; filesChanged: number; insertions: number; deletions: number }> = []; for (const project of projects) { const clonePath = await ensureProjectClone(project, ctx.workspaceRoot!); - const commits = await branchManager.listCommits(clonePath, initBranch, phBranch); + const commits = await branchManager.listCommits(clonePath, diffBase, phBranch); allCommits.push(...commits); } @@ -320,6 +346,20 @@ export function phaseProcedures(publicProcedure: ProcedureBuilder) { return repo.create(input); }), + updateReviewComment: publicProcedure + .input(z.object({ + id: z.string().min(1), + body: z.string().trim().min(1), + })) + .mutation(async ({ ctx, input }) => { + const repo = requireReviewCommentRepository(ctx); + const comment = await repo.update(input.id, input.body); + if (!comment) { + throw new TRPCError({ code: 'NOT_FOUND', message: `Review comment '${input.id}' not found` }); + } + return comment; + }), + resolveReviewComment: publicProcedure .input(z.object({ id: z.string().min(1) })) .mutation(async ({ ctx, input }) => { @@ -342,25 +382,54 @@ export function phaseProcedures(publicProcedure: ProcedureBuilder) { return comment; }), + replyToReviewComment: publicProcedure + .input(z.object({ + parentCommentId: z.string().min(1), + body: z.string().trim().min(1), + author: z.string().optional(), + })) + .mutation(async ({ ctx, input }) => { + const repo = requireReviewCommentRepository(ctx); + return repo.createReply(input.parentCommentId, input.body, input.author); + }), + requestPhaseChanges: publicProcedure .input(z.object({ phaseId: z.string().min(1), - summary: z.string().optional(), + summary: z.string().trim().min(1).optional(), })) .mutation(async ({ ctx, input }) => { const orchestrator = requireExecutionOrchestrator(ctx); const reviewCommentRepo = requireReviewCommentRepository(ctx); const allComments = await reviewCommentRepo.findByPhaseId(input.phaseId); - const unresolved = allComments - .filter((c: { resolved: boolean }) => !c.resolved) - .map((c: { filePath: string; lineNumber: number; body: string }) => ({ + // Build threaded structure: unresolved root comments with their replies + const rootComments = allComments.filter((c) => !c.parentCommentId); + const repliesByParent = new Map(); + for (const c of allComments) { + if (c.parentCommentId) { + const arr = repliesByParent.get(c.parentCommentId) ?? []; + arr.push(c); + repliesByParent.set(c.parentCommentId, arr); + } + } + + const unresolvedThreads = rootComments + .filter((c) => !c.resolved) + .map((c) => ({ + id: c.id, filePath: c.filePath, lineNumber: c.lineNumber, body: c.body, + author: c.author, + replies: (repliesByParent.get(c.id) ?? []).map((r) => ({ + id: r.id, + body: r.body, + author: r.author, + })), })); - if (unresolved.length === 0 && !input.summary) { + if (unresolvedThreads.length === 0 && !input.summary) { throw new TRPCError({ code: 'BAD_REQUEST', message: 'Add comments or a summary before requesting changes', @@ -369,7 +438,7 @@ export function phaseProcedures(publicProcedure: ProcedureBuilder) { const result = await orchestrator.requestChangesOnPhase( input.phaseId, - unresolved, + unresolvedThreads, input.summary, ); return { success: true, taskId: result.taskId }; diff --git a/apps/server/trpc/routers/task.ts b/apps/server/trpc/routers/task.ts index 48eedcc..44f0e95 100644 --- a/apps/server/trpc/routers/task.ts +++ b/apps/server/trpc/routers/task.ts @@ -10,6 +10,7 @@ import { requireInitiativeRepository, requirePhaseRepository, requireDispatchManager, + requireChangeSetRepository, } from './_helpers.js'; export function taskProcedures(publicProcedure: ProcedureBuilder) { @@ -49,6 +50,14 @@ export function taskProcedures(publicProcedure: ProcedureBuilder) { message: `Task '${input.id}' not found`, }); } + + // Route through dispatchManager when completing — emits task:completed + // event so the orchestrator can check phase completion and merge branches + if (input.status === 'completed' && ctx.dispatchManager) { + await ctx.dispatchManager.completeTask(input.id); + return (await taskRepository.findById(input.id))!; + } + return taskRepository.update(input.id, { status: input.status }); }), @@ -58,7 +67,7 @@ export function taskProcedures(publicProcedure: ProcedureBuilder) { name: z.string().min(1), description: z.string().optional(), category: z.enum(['execute', 'research', 'discuss', 'plan', 'detail', 'refine', 'verify', 'merge', 'review']).optional(), - type: z.enum(['auto', 'checkpoint:human-verify', 'checkpoint:decision', 'checkpoint:human-action']).optional(), + type: z.enum(['auto']).optional(), })) .mutation(async ({ ctx, input }) => { const taskRepository = requireTaskRepository(ctx); @@ -88,7 +97,7 @@ export function taskProcedures(publicProcedure: ProcedureBuilder) { name: z.string().min(1), description: z.string().optional(), category: z.enum(['execute', 'research', 'discuss', 'plan', 'detail', 'refine', 'verify', 'merge', 'review']).optional(), - type: z.enum(['auto', 'checkpoint:human-verify', 'checkpoint:decision', 'checkpoint:human-action']).optional(), + type: z.enum(['auto']).optional(), })) .mutation(async ({ ctx, input }) => { const taskRepository = requireTaskRepository(ctx); @@ -152,6 +161,29 @@ export function taskProcedures(publicProcedure: ProcedureBuilder) { .mutation(async ({ ctx, input }) => { const taskRepository = requireTaskRepository(ctx); await taskRepository.delete(input.id); + + // Reconcile any applied changesets that created this task. + // If all created tasks in a changeset are now deleted, mark it reverted. + if (ctx.changeSetRepository) { + try { + const csRepo = requireChangeSetRepository(ctx); + const affectedChangeSets = await csRepo.findAppliedByCreatedEntity('task', input.id); + for (const cs of affectedChangeSets) { + const createdTaskIds = cs.entries + .filter(e => e.entityType === 'task' && e.action === 'create') + .map(e => e.entityId); + const survivingTasks = await Promise.all( + createdTaskIds.map(id => taskRepository.findById(id)), + ); + if (survivingTasks.every(t => t === null)) { + await csRepo.markReverted(cs.id); + } + } + } catch { + // Best-effort reconciliation — don't fail the delete + } + } + return { success: true }; }), diff --git a/apps/server/trpc/subscriptions.ts b/apps/server/trpc/subscriptions.ts index 97cf38b..027e055 100644 --- a/apps/server/trpc/subscriptions.ts +++ b/apps/server/trpc/subscriptions.ts @@ -40,7 +40,6 @@ export const ALL_EVENT_TYPES: DomainEventType[] = [ 'agent:account_switched', 'agent:deleted', 'agent:waiting', - 'agent:output', 'task:queued', 'task:dispatched', 'task:completed', @@ -84,7 +83,6 @@ export const AGENT_EVENT_TYPES: DomainEventType[] = [ 'agent:account_switched', 'agent:deleted', 'agent:waiting', - 'agent:output', ]; /** diff --git a/apps/web/src/components/TaskRow.tsx b/apps/web/src/components/TaskRow.tsx index 2fdc909..bea31ff 100644 --- a/apps/web/src/components/TaskRow.tsx +++ b/apps/web/src/components/TaskRow.tsx @@ -12,7 +12,7 @@ export interface SerializedTask { parentTaskId: string | null; name: string; description: string | null; - type: "auto" | "checkpoint:human-verify" | "checkpoint:decision" | "checkpoint:human-action"; + type: "auto"; category: string; priority: "low" | "medium" | "high"; status: "pending" | "in_progress" | "completed" | "blocked"; diff --git a/apps/web/src/components/execution/PlanSection.tsx b/apps/web/src/components/execution/PlanSection.tsx index a79e3dc..fc24af4 100644 --- a/apps/web/src/components/execution/PlanSection.tsx +++ b/apps/web/src/components/execution/PlanSection.tsx @@ -27,6 +27,7 @@ export function PlanSection({ (a) => a.mode === "plan" && a.initiativeId === initiativeId && + !a.userDismissedAt && ["running", "waiting_for_input", "idle"].includes(a.status), ) .sort( diff --git a/apps/web/src/components/execution/TaskSlideOver.tsx b/apps/web/src/components/execution/TaskSlideOver.tsx index e2df6bf..ff9a4d3 100644 --- a/apps/web/src/components/execution/TaskSlideOver.tsx +++ b/apps/web/src/components/execution/TaskSlideOver.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useRef, useMemo } from "react"; import { motion, AnimatePresence } from "motion/react"; -import { X, Trash2, MessageCircle } from "lucide-react"; +import { X, Trash2, MessageCircle, RotateCw } from "lucide-react"; import type { ChatTarget } from "@/components/chat/ChatSlideOver"; import { Badge } from "@/components/ui/badge"; import { Button } from "@/components/ui/button"; @@ -20,6 +20,7 @@ interface TaskSlideOverProps { export function TaskSlideOver({ onOpenChat }: TaskSlideOverProps) { const { selectedEntry, setSelectedTaskId } = useExecutionContext(); const queueTaskMutation = trpc.queueTask.useMutation(); + const retryBlockedTaskMutation = trpc.retryBlockedTask.useMutation(); const deleteTaskMutation = trpc.deleteTask.useMutation(); const updateTaskMutation = trpc.updateTask.useMutation(); @@ -229,17 +230,32 @@ export function TaskSlideOver({ onOpenChat }: TaskSlideOverProps) { {/* Footer */}
- + {task.status === "blocked" ? ( + + ) : ( + + )} - ) : ( - - )} -
- -

- {comment.body} -

- + comment={comment} + replies={repliesByParent.get(comment.id) ?? []} + onResolve={onResolve} + onUnresolve={onUnresolve} + onReply={onReply} + onEdit={onEdit} + /> ))} ); } +function RootComment({ + comment, + replies, + onResolve, + onUnresolve, + onReply, + onEdit, +}: { + comment: ReviewComment; + replies: ReviewComment[]; + onResolve: (id: string) => void; + onUnresolve: (id: string) => void; + onReply?: (parentCommentId: string, body: string) => void; + onEdit?: (commentId: string, body: string) => void; +}) { + const [isReplying, setIsReplying] = useState(false); + const [editingId, setEditingId] = useState(null); + const replyRef = useRef(null); + const editRef = useRef(null); + + useEffect(() => { + if (isReplying) replyRef.current?.focus(); + }, [isReplying]); + + useEffect(() => { + if (editingId) editRef.current?.focus(); + }, [editingId]); + + const isEditingRoot = editingId === comment.id; + + return ( +
+ {/* Root comment */} +
+
+
+ {comment.author} + {formatTime(comment.createdAt)} + {comment.resolved && ( + + + Resolved + + )} +
+
+ {onEdit && comment.author !== "agent" && !comment.resolved && ( + + )} + {onReply && !comment.resolved && ( + + )} + {comment.resolved ? ( + + ) : ( + + )} +
+
+ {isEditingRoot ? ( + { + onEdit!(comment.id, body); + setEditingId(null); + }} + onCancel={() => setEditingId(null)} + placeholder="Edit comment..." + submitLabel="Save" + /> + ) : ( +

{comment.body}

+ )} +
+ + {/* Replies */} + {replies.length > 0 && ( +
+ {replies.map((reply) => ( +
+
+
+ + {reply.author} + + {formatTime(reply.createdAt)} +
+ {onEdit && reply.author !== "agent" && !comment.resolved && editingId !== reply.id && ( + + )} +
+ {editingId === reply.id ? ( + { + onEdit!(reply.id, body); + setEditingId(null); + }} + onCancel={() => setEditingId(null)} + placeholder="Edit reply..." + submitLabel="Save" + /> + ) : ( +

{reply.body}

+ )} +
+ ))} +
+ )} + + {/* Reply form */} + {isReplying && onReply && ( +
+ { + onReply(comment.id, body); + setIsReplying(false); + }} + onCancel={() => setIsReplying(false)} + placeholder="Write a reply..." + submitLabel="Reply" + /> +
+ )} +
+ ); +} + function formatTime(iso: string): string { const d = new Date(iso); return d.toLocaleTimeString(undefined, { hour: "2-digit", minute: "2-digit" }); diff --git a/apps/web/src/components/review/ConflictResolutionPanel.tsx b/apps/web/src/components/review/ConflictResolutionPanel.tsx new file mode 100644 index 0000000..f4d99fd --- /dev/null +++ b/apps/web/src/components/review/ConflictResolutionPanel.tsx @@ -0,0 +1,182 @@ +import { Loader2, AlertCircle, GitMerge, CheckCircle2, ChevronDown, ChevronRight, Terminal } from 'lucide-react'; +import { useState } from 'react'; +import { Button } from '@/components/ui/button'; +import { QuestionForm } from '@/components/QuestionForm'; +import { useConflictAgent } from '@/hooks/useConflictAgent'; + +interface ConflictResolutionPanelProps { + initiativeId: string; + conflicts: string[]; + onResolved: () => void; +} + +export function ConflictResolutionPanel({ initiativeId, conflicts, onResolved }: ConflictResolutionPanelProps) { + const { state, agent, questions, spawn, resume, stop, dismiss } = useConflictAgent(initiativeId); + const [showManual, setShowManual] = useState(false); + + if (state === 'none') { + return ( +
+
+ +
+

+ {conflicts.length} merge conflict{conflicts.length !== 1 ? 's' : ''} detected +

+
    + {conflicts.map((file) => ( +
  • {file}
    • + ))} +
+
+ + +
+ {spawn.error && ( +

{spawn.error.message}

+ )} + {showManual && ( +
+

+ In your project clone, run: +

+ 
+{`git checkout 
+git merge 
+# Resolve conflicts in each file
+git add 
+git commit --no-edit`}
+
+
+ )} +
+
+
+ ); + } + + if (state === 'running') { + return ( +
+
+
+ + Resolving merge conflicts... +
+ +
+
+ ); + } + + if (state === 'waiting' && questions) { + return ( +
+
+ +

Agent needs input

+
+ resume.mutate(answers)} + onCancel={() => {}} + onDismiss={() => stop.mutate()} + isSubmitting={resume.isPending} + isDismissing={stop.isPending} + /> +
+ ); + } + + if (state === 'completed') { + return ( +
+
+
+ + Conflicts resolved +
+
+ +
+
+
+ ); + } + + if (state === 'crashed') { + return ( +
+
+
+ + Conflict resolution agent crashed +
+
+ + +
+
+
+ ); + } + + return null; +} diff --git a/apps/web/src/components/review/DiffViewer.tsx b/apps/web/src/components/review/DiffViewer.tsx index 5cec6c5..5b9c1e2 100644 --- a/apps/web/src/components/review/DiffViewer.tsx +++ b/apps/web/src/components/review/DiffViewer.tsx @@ -12,6 +12,8 @@ interface DiffViewerProps { ) => void; onResolveComment: (commentId: string) => void; onUnresolveComment: (commentId: string) => void; + onReplyComment?: (parentCommentId: string, body: string) => void; + onEditComment?: (commentId: string, body: string) => void; viewedFiles?: Set; onToggleViewed?: (filePath: string) => void; onRegisterRef?: (filePath: string, el: HTMLDivElement | null) => void; @@ -23,6 +25,8 @@ export function DiffViewer({ onAddComment, onResolveComment, onUnresolveComment, + onReplyComment, + onEditComment, viewedFiles, onToggleViewed, onRegisterRef, @@ -37,6 +41,8 @@ export function DiffViewer({ onAddComment={onAddComment} onResolveComment={onResolveComment} onUnresolveComment={onUnresolveComment} + onReplyComment={onReplyComment} + onEditComment={onEditComment} isViewed={viewedFiles?.has(file.newPath) ?? false} onToggleViewed={() => onToggleViewed?.(file.newPath)} /> diff --git a/apps/web/src/components/review/FileCard.tsx b/apps/web/src/components/review/FileCard.tsx index a1180e3..d7056c8 100644 --- a/apps/web/src/components/review/FileCard.tsx +++ b/apps/web/src/components/review/FileCard.tsx @@ -52,6 +52,8 @@ interface FileCardProps { ) => void; onResolveComment: (commentId: string) => void; onUnresolveComment: (commentId: string) => void; + onReplyComment?: (parentCommentId: string, body: string) => void; + onEditComment?: (commentId: string, body: string) => void; isViewed?: boolean; onToggleViewed?: () => void; } @@ -62,6 +64,8 @@ export function FileCard({ onAddComment, onResolveComment, onUnresolveComment, + onReplyComment, + onEditComment, isViewed = false, onToggleViewed = () => {}, }: FileCardProps) { @@ -77,10 +81,11 @@ export function FileCard({ const tokenMap = useHighlightedFile(file.newPath, allLines); return ( -
+
{/* File header — sticky so it stays visible when scrolling */}
- {/* Right: action buttons */} + {/* Right: preview + action buttons */}
+ {previewState && }
+ {/* Conflict resolution panel */} + {mergeability && !mergeability.mergeable && ( + { + void mergeabilityQuery.refetch(); + void diffQuery.refetch(); + void commitsQuery.refetch(); + }} + /> + )} + {/* Main content */}
diff --git a/apps/web/src/components/review/LineWithComments.tsx b/apps/web/src/components/review/LineWithComments.tsx index ac4288f..c5b8d12 100644 --- a/apps/web/src/components/review/LineWithComments.tsx +++ b/apps/web/src/components/review/LineWithComments.tsx @@ -15,6 +15,8 @@ interface LineWithCommentsProps { onSubmitComment: (body: string) => void; onResolveComment: (commentId: string) => void; onUnresolveComment: (commentId: string) => void; + onReplyComment?: (parentCommentId: string, body: string) => void; + onEditComment?: (commentId: string, body: string) => void; /** Syntax-highlighted tokens for this line (if available) */ tokens?: TokenizedLine; } @@ -29,6 +31,8 @@ export function LineWithComments({ onSubmitComment, onResolveComment, onUnresolveComment, + onReplyComment, + onEditComment, tokens, }: LineWithCommentsProps) { const formRef = useRef(null); @@ -132,7 +136,7 @@ export function LineWithComments({ {/* Existing comments on this line */} {lineComments.length > 0 && ( - + !c.parentCommentId)?.id}> diff --git a/apps/web/src/components/review/PreviewControls.tsx b/apps/web/src/components/review/PreviewControls.tsx new file mode 100644 index 0000000..98a356a --- /dev/null +++ b/apps/web/src/components/review/PreviewControls.tsx @@ -0,0 +1,81 @@ +import { + ExternalLink, + Loader2, + Square, + CircleDot, + RotateCcw, +} from "lucide-react"; +import { Button } from "@/components/ui/button"; + +export interface PreviewState { + status: "idle" | "building" | "running" | "failed"; + url?: string; + onStart: () => void; + onStop: () => void; + isStarting: boolean; + isStopping: boolean; +} + +export function PreviewControls({ preview }: { preview: PreviewState }) { + if (preview.status === "building" || preview.isStarting) { + return ( +
+ + Building... +
+ ); + } + + if (preview.status === "running") { + return ( + + ); + } + + if (preview.status === "failed") { + return ( + + ); + } + + return ( + + ); +} diff --git a/apps/web/src/components/review/ReviewHeader.tsx b/apps/web/src/components/review/ReviewHeader.tsx index 0e069ff..a8225eb 100644 --- a/apps/web/src/components/review/ReviewHeader.tsx +++ b/apps/web/src/components/review/ReviewHeader.tsx @@ -6,11 +6,7 @@ import { FileCode, Plus, Minus, - ExternalLink, Loader2, - Square, - CircleDot, - RotateCcw, ArrowRight, Eye, AlertCircle, @@ -18,25 +14,21 @@ import { } from "lucide-react"; import { Button } from "@/components/ui/button"; import { Badge } from "@/components/ui/badge"; +import { PreviewControls } from "./PreviewControls"; +import type { PreviewState } from "./PreviewControls"; import type { FileDiff, ReviewStatus } from "./types"; interface PhaseOption { id: string; name: string; -} - -interface PreviewState { - status: "idle" | "building" | "running" | "failed"; - url?: string; - onStart: () => void; - onStop: () => void; - isStarting: boolean; - isStopping: boolean; + status: string; } interface ReviewHeaderProps { + ref?: React.Ref; phases: PhaseOption[]; activePhaseId: string | null; + isReadOnly?: boolean; onPhaseSelect: (id: string) => void; phaseName: string; sourceBranch: string; @@ -53,8 +45,10 @@ interface ReviewHeaderProps { } export function ReviewHeader({ + ref, phases, activePhaseId, + isReadOnly, onPhaseSelect, phaseName, sourceBranch, @@ -72,28 +66,38 @@ export function ReviewHeader({ const totalAdditions = files.reduce((s, f) => s + f.additions, 0); const totalDeletions = files.reduce((s, f) => s + f.deletions, 0); const [showConfirmation, setShowConfirmation] = useState(false); + const [showRequestConfirm, setShowRequestConfirm] = useState(false); const confirmRef = useRef(null); + const requestConfirmRef = useRef(null); - // Click-outside handler to dismiss confirmation + // Click-outside handler to dismiss confirmation dropdowns useEffect(() => { - if (!showConfirmation) return; + if (!showConfirmation && !showRequestConfirm) return; function handleClickOutside(e: MouseEvent) { if ( + showConfirmation && confirmRef.current && !confirmRef.current.contains(e.target as Node) ) { setShowConfirmation(false); } + if ( + showRequestConfirm && + requestConfirmRef.current && + !requestConfirmRef.current.contains(e.target as Node) + ) { + setShowRequestConfirm(false); + } } document.addEventListener("mousedown", handleClickOutside); return () => document.removeEventListener("mousedown", handleClickOutside); - }, [showConfirmation]); + }, [showConfirmation, showRequestConfirm]); const viewed = viewedCount ?? 0; const total = totalCount ?? 0; return ( -
+
{/* Phase selector row */} {phases.length > 1 && (
@@ -103,6 +107,12 @@ export function ReviewHeader({
{phases.map((phase) => { const isActive = phase.id === activePhaseId; + const isCompleted = phase.status === "completed"; + const dotColor = isActive + ? "bg-primary" + : isCompleted + ? "bg-status-success-dot" + : "bg-status-warning-dot"; return ( @@ -182,102 +190,151 @@ export function ReviewHeader({ {preview && } {/* Review status / actions */} - {status === "pending" && ( - <> - -
- - - {/* Merge confirmation dropdown */} - {showConfirmation && ( -
-

- Ready to merge? -

-
-
- - - 0 unresolved comments - -
-
- - - {viewed}/{total} files viewed - -
-
-
- - -
-
- )} -
- - )} - {status === "approved" && ( + {isReadOnly ? ( - Approved - - )} - {status === "changes_requested" && ( - - - Changes Requested + Merged + ) : ( + <> + {status === "pending" && ( + <> +
+ + + {showRequestConfirm && ( +
+

+ Request changes? +

+
+
+ + + {unresolvedCount} unresolved {unresolvedCount === 1 ? "comment" : "comments"} will be sent + +
+
+
+ + +
+
+ )} +
+
+ + + {/* Merge confirmation dropdown */} + {showConfirmation && ( +
+

+ Ready to merge? +

+
+
+ + + 0 unresolved comments + +
+
+ + + {viewed}/{total} files viewed + +
+
+
+ + +
+
+ )} +
+ + )} + {status === "approved" && ( + + + Approved + + )} + {status === "changes_requested" && ( + + + Changes Requested + + )} + )}
@@ -285,66 +342,3 @@ export function ReviewHeader({ ); } -function PreviewControls({ preview }: { preview: PreviewState }) { - if (preview.status === "building" || preview.isStarting) { - return ( -
- - Building... -
- ); - } - - if (preview.status === "running") { - return ( - - ); - } - - if (preview.status === "failed") { - return ( - - ); - } - - return ( - - ); -} diff --git a/apps/web/src/components/review/ReviewSidebar.tsx b/apps/web/src/components/review/ReviewSidebar.tsx index 3a5eb54..4e344d1 100644 --- a/apps/web/src/components/review/ReviewSidebar.tsx +++ b/apps/web/src/components/review/ReviewSidebar.tsx @@ -18,6 +18,7 @@ interface ReviewSidebarProps { files: FileDiff[]; comments: ReviewComment[]; onFileClick: (filePath: string) => void; + onCommentClick?: (commentId: string) => void; selectedCommit: string | null; activeFiles: FileDiff[]; commits: CommitInfo[]; @@ -29,6 +30,7 @@ export function ReviewSidebar({ files, comments, onFileClick, + onCommentClick, selectedCommit, activeFiles, commits, @@ -63,6 +65,7 @@ export function ReviewSidebar({ files={files} comments={comments} onFileClick={onFileClick} + onCommentClick={onCommentClick} selectedCommit={selectedCommit} activeFiles={activeFiles} viewedFiles={viewedFiles} @@ -172,6 +175,7 @@ function FilesView({ files, comments, onFileClick, + onCommentClick, selectedCommit, activeFiles, viewedFiles, @@ -179,12 +183,13 @@ function FilesView({ files: FileDiff[]; comments: ReviewComment[]; onFileClick: (filePath: string) => void; + onCommentClick?: (commentId: string) => void; selectedCommit: string | null; activeFiles: FileDiff[]; viewedFiles: Set; }) { - const unresolvedCount = comments.filter((c) => !c.resolved).length; - const resolvedCount = comments.filter((c) => c.resolved).length; + const unresolvedCount = comments.filter((c) => !c.resolved && !c.parentCommentId).length; + const resolvedCount = comments.filter((c) => c.resolved && !c.parentCommentId).length; const activeFilePaths = new Set(activeFiles.map((f) => f.newPath)); const directoryGroups = useMemo(() => groupFilesByDirectory(files), [files]); @@ -213,29 +218,66 @@ function FilesView({
)} - {/* Comment summary */} + {/* Discussions — individual threads */} {comments.length > 0 && (
-

- Discussions -

-
- - - {comments.length} +

+ Discussions + + {unresolvedCount > 0 && ( + + + {unresolvedCount} + + )} + {resolvedCount > 0 && ( + + + {resolvedCount} + + )} - {resolvedCount > 0 && ( - - - {resolvedCount} - - )} - {unresolvedCount > 0 && ( - - - {unresolvedCount} - - )} +

+
+ {comments + .filter((c) => !c.parentCommentId) + .map((thread) => { + const replyCount = comments.filter( + (c) => c.parentCommentId === thread.id, + ).length; + return ( + + ); + })}
)} @@ -263,7 +305,7 @@ function FilesView({
{group.files.map((file) => { const fileCommentCount = comments.filter( - (c) => c.filePath === file.newPath, + (c) => c.filePath === file.newPath && !c.parentCommentId, ).length; const isInView = activeFilePaths.has(file.newPath); const dimmed = selectedCommit && !isInView; diff --git a/apps/web/src/components/review/ReviewTab.tsx b/apps/web/src/components/review/ReviewTab.tsx index 6b6d85c..099f380 100644 --- a/apps/web/src/components/review/ReviewTab.tsx +++ b/apps/web/src/components/review/ReviewTab.tsx @@ -1,4 +1,4 @@ -import { useCallback, useMemo, useRef, useState } from "react"; +import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { toast } from "sonner"; import { Loader2 } from "lucide-react"; import { trpc } from "@/lib/trpc"; @@ -18,6 +18,18 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { const [selectedCommit, setSelectedCommit] = useState(null); const [viewedFiles, setViewedFiles] = useState>(new Set()); const fileRefs = useRef>(new Map()); + const headerRef = useRef(null); + const [headerHeight, setHeaderHeight] = useState(0); + + useEffect(() => { + const el = headerRef.current; + if (!el) return; + const ro = new ResizeObserver(([entry]) => { + setHeaderHeight(entry.borderBoxSize?.[0]?.blockSize ?? entry.target.getBoundingClientRect().height); + }); + ro.observe(el, { box: 'border-box' }); + return () => ro.disconnect(); + }, []); const toggleViewed = useCallback((filePath: string) => { setViewedFiles(prev => { @@ -45,14 +57,17 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { // Fetch phases for this initiative const phasesQuery = trpc.listPhases.useQuery({ initiativeId }); - const pendingReviewPhases = useMemo( - () => (phasesQuery.data ?? []).filter((p) => p.status === "pending_review"), + const reviewablePhases = useMemo( + () => (phasesQuery.data ?? []).filter((p) => p.status === "pending_review" || p.status === "completed"), [phasesQuery.data], ); - // Select first pending review phase + // Select first pending review phase, falling back to completed phases const [selectedPhaseId, setSelectedPhaseId] = useState(null); - const activePhaseId = selectedPhaseId ?? pendingReviewPhases[0]?.id ?? null; + const defaultPhaseId = reviewablePhases.find((p) => p.status === "pending_review")?.id ?? reviewablePhases[0]?.id ?? null; + const activePhaseId = selectedPhaseId ?? defaultPhaseId; + const activePhase = reviewablePhases.find((p) => p.id === activePhaseId); + const isActivePhaseCompleted = activePhase?.status === "completed"; // Fetch projects for this initiative (needed for preview) const projectsQuery = trpc.getInitiativeProjects.useQuery({ initiativeId }); @@ -78,18 +93,14 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { ); // Preview state - const previewsQuery = trpc.listPreviews.useQuery( - { initiativeId }, - ); + const previewsQuery = trpc.listPreviews.useQuery({ initiativeId }); const existingPreview = previewsQuery.data?.find( (p) => p.phaseId === activePhaseId || p.initiativeId === initiativeId, ); const [activePreviewId, setActivePreviewId] = useState(null); const previewStatusQuery = trpc.getPreviewStatus.useQuery( { previewId: activePreviewId ?? existingPreview?.id ?? "" }, - { - enabled: !!(activePreviewId ?? existingPreview?.id), - }, + { enabled: !!(activePreviewId ?? existingPreview?.id) }, ); const preview = previewStatusQuery.data ?? existingPreview; const sourceBranch = diffQuery.data?.sourceBranch ?? commitsQuery.data?.sourceBranch ?? ""; @@ -97,6 +108,7 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { const startPreview = trpc.startPreview.useMutation({ onSuccess: (data) => { setActivePreviewId(data.id); + previewsQuery.refetch(); toast.success(`Preview running at ${data.url}`); }, onError: (err) => toast.error(`Preview failed: ${err.message}`), @@ -113,15 +125,13 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { const previewState = firstProjectId && sourceBranch ? { - status: startPreview.isPending - ? ("building" as const) - : preview?.status === "running" - ? ("running" as const) - : preview?.status === "building" + status: preview?.status === "running" + ? ("running" as const) + : preview?.status === "failed" + ? ("failed" as const) + : (startPreview.isPending || preview?.status === "building") ? ("building" as const) - : preview?.status === "failed" - ? ("failed" as const) - : ("idle" as const), + : ("idle" as const), url: preview?.url ?? undefined, onStart: () => startPreview.mutate({ @@ -155,6 +165,7 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { author: c.author, createdAt: typeof c.createdAt === 'string' ? c.createdAt : String(c.createdAt), resolved: c.resolved, + parentCommentId: c.parentCommentId ?? null, })); }, [commentsQuery.data]); @@ -177,6 +188,20 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { }, }); + const replyToCommentMutation = trpc.replyToReviewComment.useMutation({ + onSuccess: () => { + utils.listReviewComments.invalidate({ phaseId: activePhaseId! }); + }, + onError: (err) => toast.error(`Failed to post reply: ${err.message}`), + }); + + const editCommentMutation = trpc.updateReviewComment.useMutation({ + onSuccess: () => { + utils.listReviewComments.invalidate({ phaseId: activePhaseId! }); + }, + onError: (err) => toast.error(`Failed to update comment: ${err.message}`), + }); + const approveMutation = trpc.approvePhaseReview.useMutation({ onSuccess: () => { setStatus("approved"); @@ -223,6 +248,14 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { unresolveCommentMutation.mutate({ id: commentId }); }, [unresolveCommentMutation]); + const handleReplyComment = useCallback((parentCommentId: string, body: string) => { + replyToCommentMutation.mutate({ parentCommentId, body }); + }, [replyToCommentMutation]); + + const handleEditComment = useCallback((commentId: string, body: string) => { + editCommentMutation.mutate({ id: commentId, body }); + }, [editCommentMutation]); + const handleApprove = useCallback(() => { if (!activePhaseId) return; approveMutation.mutate({ phaseId: activePhaseId }); @@ -239,9 +272,7 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { const handleRequestChanges = useCallback(() => { if (!activePhaseId) return; - const summary = window.prompt("Optional: describe what needs to change (leave blank for comments only)"); - if (summary === null) return; // cancelled - requestChangesMutation.mutate({ phaseId: activePhaseId, summary: summary || undefined }); + requestChangesMutation.mutate({ phaseId: activePhaseId }); }, [activePhaseId, requestChangesMutation]); const handleFileClick = useCallback((filePath: string) => { @@ -251,6 +282,16 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { } }, []); + const handleCommentClick = useCallback((commentId: string) => { + const el = document.querySelector(`[data-comment-id="${commentId}"]`); + if (el) { + el.scrollIntoView({ behavior: "instant", block: "center" }); + // Brief highlight flash + el.classList.add("ring-2", "ring-primary/50"); + setTimeout(() => el.classList.remove("ring-2", "ring-primary/50"), 1500); + } + }, []); + const handlePhaseSelect = useCallback((id: string) => { setSelectedPhaseId(id); setSelectedCommit(null); @@ -258,7 +299,18 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { setViewedFiles(new Set()); }, []); - const unresolvedCount = comments.filter((c) => !c.resolved).length; + const unresolvedCount = comments.filter((c) => !c.resolved && !c.parentCommentId).length; + + const activePhaseName = + diffQuery.data?.phaseName ?? + reviewablePhases.find((p) => p.id === activePhaseId)?.name ?? + "Phase"; + + // All files from the full branch diff (for sidebar file list) + const allFiles = useMemo(() => { + if (!diffQuery.data?.rawDiff) return []; + return parseUnifiedDiff(diffQuery.data.rawDiff); + }, [diffQuery.data?.rawDiff]); // Initiative-level review takes priority if (isInitiativePendingReview) { @@ -273,7 +325,7 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { ); } - if (pendingReviewPhases.length === 0) { + if (reviewablePhases.length === 0) { return (

No phases pending review

@@ -281,23 +333,17 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { ); } - const activePhaseName = - diffQuery.data?.phaseName ?? - pendingReviewPhases.find((p) => p.id === activePhaseId)?.name ?? - "Phase"; - - // All files from the full branch diff (for sidebar file list) - const allFiles = useMemo(() => { - if (!diffQuery.data?.rawDiff) return []; - return parseUnifiedDiff(diffQuery.data.rawDiff); - }, [diffQuery.data?.rawDiff]); - return ( -
+
{/* Header: phase selector + toolbar */} ({ id: p.id, name: p.name }))} + ref={headerRef} + phases={reviewablePhases.map((p) => ({ id: p.id, name: p.name, status: p.status }))} activePhaseId={activePhaseId} + isReadOnly={isActivePhaseCompleted} onPhaseSelect={handlePhaseSelect} phaseName={activePhaseName} sourceBranch={sourceBranch} @@ -314,14 +360,21 @@ export function ReviewTab({ initiativeId }: ReviewTabProps) { /> {/* Main content area — sidebar always rendered to preserve state */} -
- {/* Left: Sidebar — sticky so icon strip stays visible */} +
+ {/* Left: Sidebar — sticky to viewport, scrolls independently */}
-
+
['data']>; + +export interface UseConflictAgentResult { + agent: ConflictAgent | null; + state: ConflictAgentState; + questions: PendingQuestions | null; + spawn: { + mutate: (options: { initiativeId: string; provider?: string }) => void; + isPending: boolean; + error: Error | null; + }; + resume: { + mutate: (answers: Record) => void; + isPending: boolean; + error: Error | null; + }; + stop: { + mutate: () => void; + isPending: boolean; + }; + dismiss: () => void; + isLoading: boolean; + refresh: () => void; +} + +export function useConflictAgent(initiativeId: string): UseConflictAgentResult { + const utils = trpc.useUtils(); + + const agentQuery = trpc.getActiveConflictAgent.useQuery({ initiativeId }); + const agent = agentQuery.data ?? null; + + const state: ConflictAgentState = useMemo(() => { + if (!agent) return 'none'; + switch (agent.status) { + case 'running': + return 'running'; + case 'waiting_for_input': + return 'waiting'; + case 'idle': + return 'completed'; + case 'crashed': + return 'crashed'; + default: + return 'none'; + } + }, [agent]); + + const questionsQuery = trpc.getAgentQuestions.useQuery( + { id: agent?.id ?? '' }, + { enabled: state === 'waiting' && !!agent }, + ); + + const spawnMutation = trpc.spawnConflictResolutionAgent.useMutation({ + onMutate: async () => { + await utils.listAgents.cancel(); + await utils.getActiveConflictAgent.cancel({ initiativeId }); + + const previousAgents = utils.listAgents.getData(); + const previousConflictAgent = utils.getActiveConflictAgent.getData({ initiativeId }); + + const tempAgent = { + id: `temp-${Date.now()}`, + name: `conflict-${Date.now()}`, + mode: 'execute' as const, + status: 'running' as const, + initiativeId, + taskId: null, + phaseId: null, + provider: 'claude', + accountId: null, + instruction: null, + createdAt: new Date().toISOString(), + updatedAt: new Date().toISOString(), + userDismissedAt: null, + completedAt: null, + }; + + utils.listAgents.setData(undefined, (old = []) => [tempAgent, ...old]); + utils.getActiveConflictAgent.setData({ initiativeId }, tempAgent as any); + + return { previousAgents, previousConflictAgent }; + }, + onError: (_err, _variables, context) => { + if (context?.previousAgents) { + utils.listAgents.setData(undefined, context.previousAgents); + } + if (context?.previousConflictAgent !== undefined) { + utils.getActiveConflictAgent.setData({ initiativeId }, context.previousConflictAgent); + } + }, + onSettled: () => { + void utils.listAgents.invalidate(); + void utils.getActiveConflictAgent.invalidate({ initiativeId }); + }, + }); + + const resumeMutation = trpc.resumeAgent.useMutation({ + onSuccess: () => { + void utils.listAgents.invalidate(); + }, + }); + + const stopMutation = trpc.stopAgent.useMutation({ + onSuccess: () => { + void utils.listAgents.invalidate(); + void utils.listWaitingAgents.invalidate(); + }, + }); + + const dismissMutation = trpc.dismissAgent.useMutation({ + onMutate: async ({ id }) => { + await utils.listAgents.cancel(); + await utils.getActiveConflictAgent.cancel({ initiativeId }); + + const previousAgents = utils.listAgents.getData(); + const previousConflictAgent = utils.getActiveConflictAgent.getData({ initiativeId }); + + utils.listAgents.setData(undefined, (old = []) => old.filter(a => a.id !== id)); + utils.getActiveConflictAgent.setData({ initiativeId }, null); + + return { previousAgents, previousConflictAgent }; + }, + onError: (_err, _variables, context) => { + if (context?.previousAgents) { + utils.listAgents.setData(undefined, context.previousAgents); + } + if (context?.previousConflictAgent !== undefined) { + utils.getActiveConflictAgent.setData({ initiativeId }, context.previousConflictAgent); + } + }, + onSettled: () => { + void utils.listAgents.invalidate(); + void utils.getActiveConflictAgent.invalidate({ initiativeId }); + }, + }); + + const spawnMutateRef = useRef(spawnMutation.mutate); + spawnMutateRef.current = spawnMutation.mutate; + const agentRef = useRef(agent); + agentRef.current = agent; + const resumeMutateRef = useRef(resumeMutation.mutate); + resumeMutateRef.current = resumeMutation.mutate; + const stopMutateRef = useRef(stopMutation.mutate); + stopMutateRef.current = stopMutation.mutate; + const dismissMutateRef = useRef(dismissMutation.mutate); + dismissMutateRef.current = dismissMutation.mutate; + + const spawnFn = useCallback(({ initiativeId, provider }: { initiativeId: string; provider?: string }) => { + spawnMutateRef.current({ initiativeId, provider }); + }, []); + + const spawn = useMemo(() => ({ + mutate: spawnFn, + isPending: spawnMutation.isPending, + error: spawnMutation.error, + }), [spawnFn, spawnMutation.isPending, spawnMutation.error]); + + const resumeFn = useCallback((answers: Record) => { + const a = agentRef.current; + if (a) { + resumeMutateRef.current({ id: a.id, answers }); + } + }, []); + + const resume = useMemo(() => ({ + mutate: resumeFn, + isPending: resumeMutation.isPending, + error: resumeMutation.error, + }), [resumeFn, resumeMutation.isPending, resumeMutation.error]); + + const stopFn = useCallback(() => { + const a = agentRef.current; + if (a) { + stopMutateRef.current({ id: a.id }); + } + }, []); + + const stop = useMemo(() => ({ + mutate: stopFn, + isPending: stopMutation.isPending, + }), [stopFn, stopMutation.isPending]); + + const dismiss = useCallback(() => { + const a = agentRef.current; + if (a) { + dismissMutateRef.current({ id: a.id }); + } + }, []); + + const refresh = useCallback(() => { + void utils.getActiveConflictAgent.invalidate({ initiativeId }); + }, [utils, initiativeId]); + + const isLoading = agentQuery.isLoading || + (state === 'waiting' && questionsQuery.isLoading); + + return { + agent, + state, + questions: questionsQuery.data ?? null, + spawn, + resume, + stop, + dismiss, + isLoading, + refresh, + }; +} diff --git a/apps/web/src/lib/invalidation.ts b/apps/web/src/lib/invalidation.ts index 1ee739d..3cd6e1f 100644 --- a/apps/web/src/lib/invalidation.ts +++ b/apps/web/src/lib/invalidation.ts @@ -52,7 +52,7 @@ const INVALIDATION_MAP: Partial> = { // --- Phases --- createPhase: ["listPhases", "listInitiativePhaseDependencies"], - deletePhase: ["listPhases", "listInitiativeTasks", "listInitiativePhaseDependencies"], + deletePhase: ["listPhases", "listInitiativeTasks", "listInitiativePhaseDependencies", "listChangeSets"], updatePhase: ["listPhases", "getPhase"], approvePhase: ["listPhases", "listInitiativeTasks"], queuePhase: ["listPhases"], @@ -65,6 +65,8 @@ const INVALIDATION_MAP: Partial> = { createChildTasks: ["listTasks", "listInitiativeTasks", "listPhaseTasks"], queueTask: ["listTasks", "listInitiativeTasks", "listPhaseTasks"], + deleteTask: ["listTasks", "listInitiativeTasks", "listPhaseTasks", "listChangeSets"], + // --- Change Sets --- revertChangeSet: ["listPhases", "listPhaseTasks", "listInitiativeTasks", "listPages", "getPage", "listChangeSets", "getRootPage", "getChangeSet"], diff --git a/docs/agent.md b/docs/agent.md index 560ca1a..7083585 100644 --- a/docs/agent.md +++ b/docs/agent.md @@ -24,7 +24,7 @@ | `accounts/` | Account discovery, config dir setup, credential management, usage API | | `credentials/` | `AccountCredentialManager` — credential injection per account | | `lifecycle/` | `LifecycleController` — retry policy, signal recovery, missing signal instructions | -| `prompts/` | Mode-specific prompt builders (execute, discuss, plan, detail, refine, chat) + shared blocks (test integrity, deviation rules, git workflow, session startup, progress tracking) + inter-agent communication instructions | +| `prompts/` | Mode-specific prompt builders (execute, discuss, plan, detail, refine, chat, conflict-resolution) + shared blocks (test integrity, deviation rules, git workflow, session startup, progress tracking) + inter-agent communication instructions | ## Key Flows @@ -236,7 +236,7 @@ All prompts follow a consistent tag ordering: |------|------|--------------------| | **execute** | `execute.ts` | ``, ``, ``, `` | | **plan** | `plan.ts` | ``, ``, ``, ``, `` | -| **detail** | `detail.ts` | ``, ``, ``, ``, `` | +| **detail** | `detail.ts` | ``, ``, ``, `` | | **discuss** | `discuss.ts` | ``, ``, ``, ``, `` | | **refine** | `refine.ts` | ``, `` | | **chat** | `chat.ts` | ``, `` — iterative refinement loop, uses action field (create/update/delete) in output files, signals "questions" after each change to stay alive | diff --git a/docs/cli-config.md b/docs/cli-config.md index 1de3be7..7def20e 100644 --- a/docs/cli-config.md +++ b/docs/cli-config.md @@ -123,6 +123,7 @@ All three commands output JSON for programmatic agent consumption. | `list` | Show accounts with exhaustion status | | `remove ` | Remove account | | `refresh` | Clear expired exhaustion markers | +| `extract [--email ]` | Extract current Claude credentials as JSON (no server required) | ## Server Wiring diff --git a/docs/database-migrations.md b/docs/database-migrations.md index 5d149fe..603d49e 100644 --- a/docs/database-migrations.md +++ b/docs/database-migrations.md @@ -5,7 +5,7 @@ This project uses [drizzle-kit](https://orm.drizzle.team/kit-docs/overview) for ## Overview - **Schema definition:** `apps/server/db/schema.ts` (drizzle-orm table definitions) -- **Migration output:** `apps/server/drizzle/` directory (SQL files + meta journal) +- **Migration output:** `apps/server/drizzle/` directory (SQL files + `meta/_journal.json` + `meta/NNNN_snapshot.json`) - **Config:** `drizzle.config.ts` - **Runtime migrator:** `apps/server/db/ensure-schema.ts` (calls `drizzle-orm/better-sqlite3/migrator`) @@ -13,6 +13,8 @@ This project uses [drizzle-kit](https://orm.drizzle.team/kit-docs/overview) for On every server startup, `ensureSchema(db)` runs all pending migrations from the `apps/server/drizzle/` folder. Drizzle tracks applied migrations in a `__drizzle_migrations` table so only new migrations are applied. This is safe to call repeatedly. +The migrator discovers migrations via `apps/server/drizzle/meta/_journal.json` — **not** by scanning the filesystem. + ## Workflow ### Making schema changes @@ -23,7 +25,17 @@ On every server startup, `ensureSchema(db)` runs all pending migrations from the npx drizzle-kit generate ``` 3. Review the generated SQL in `apps/server/drizzle/NNNN_*.sql` -4. Commit the migration file along with your schema change +4. Verify multi-statement migrations use `--> statement-breakpoint` between statements (required by better-sqlite3 which only allows one statement per `prepare()` call) +5. Commit the migration file, snapshot, and journal update together + +### Important: statement breakpoints + +better-sqlite3 rejects SQL with multiple statements in a single `prepare()` call. Drizzle-kit splits on `--> statement-breakpoint`. If you hand-write or edit a migration with multiple statements, append `--> statement-breakpoint` to the end of each statement line (before the next statement): + +```sql +ALTER TABLE foo ADD COLUMN bar TEXT;--> statement-breakpoint +CREATE INDEX foo_bar_idx ON foo(bar); +``` ### Applying migrations @@ -31,20 +43,15 @@ Migrations are applied automatically on server startup. No manual step needed. For tests, the same `ensureSchema()` function is called on in-memory SQLite databases in `apps/server/db/repositories/drizzle/test-helpers.ts`. -### Checking migration status +## History -```bash -# See what drizzle-kit would generate (dry run) -npx drizzle-kit generate --dry-run - -# Open drizzle studio to inspect the database -npx drizzle-kit studio -``` +Migrations 0000–0007 were generated by `drizzle-kit generate`. Migrations 0008–0032 were hand-written (the snapshots fell out of sync). A schema-derived snapshot was restored at 0032, so `drizzle-kit generate` works normally from that point forward. ## Rules -- **Never hand-write migration SQL.** Always use `drizzle-kit generate` from the schema. +- **Use `drizzle-kit generate`** for new migrations. It reads schema.ts, diffs against the last snapshot, and generates both SQL + snapshot automatically. - **Never use raw CREATE TABLE statements** for schema initialization. The migration system handles this. - **Always commit migration files.** They are the source of truth for database evolution. - **Migration files are immutable.** Once committed, never edit them. Make a new migration instead. -- **Test with `npx vitest run`** after generating migrations to verify they work with in-memory databases. +- **Keep schema.ts in sync.** The schema file is the source of truth for TypeScript types; migrations are the source of truth for database DDL. Both must reflect the same structure. +- **Test with `npm test`** after generating migrations to verify they work with in-memory databases. diff --git a/docs/database.md b/docs/database.md index a32cac5..6afb841 100644 --- a/docs/database.md +++ b/docs/database.md @@ -29,7 +29,8 @@ All adapters use nanoid() for IDs, auto-manage timestamps, and use Drizzle's `.r | initiativeId | text FK → initiatives (cascade) | | | name | text NOT NULL | | | content | text nullable | Tiptap JSON | -| status | text enum | 'pending' \| 'approved' \| 'in_progress' \| 'completed' \| 'blocked' | +| status | text enum | 'pending' \| 'approved' \| 'in_progress' \| 'completed' \| 'blocked' \| 'pending_review' | +| mergeBase | text nullable | git merge-base hash stored before phase merge, enables diff reconstruction for completed phases | | createdAt, updatedAt | integer/timestamp | | ### phase_dependencies @@ -44,7 +45,7 @@ All adapters use nanoid() for IDs, auto-manage timestamps, and use Drizzle's `.r | parentTaskId | text nullable self-ref FK (cascade) | decomposition hierarchy | | name | text NOT NULL | | | description | text nullable | | -| type | text enum | 'auto' \| 'checkpoint:human-verify' \| 'checkpoint:decision' \| 'checkpoint:human-action' | +| type | text enum | 'auto' | | category | text enum | 'execute' \| 'research' \| 'discuss' \| 'plan' \| 'detail' \| 'refine' \| 'verify' \| 'merge' \| 'review' | | priority | text enum | 'low' \| 'medium' \| 'high' | | status | text enum | 'pending' \| 'in_progress' \| 'completed' \| 'blocked' | diff --git a/docs/dispatch-events.md b/docs/dispatch-events.md index 82456a8..5356b0e 100644 --- a/docs/dispatch-events.md +++ b/docs/dispatch-events.md @@ -11,7 +11,7 @@ - **Adapter**: `TypedEventBus` using Node.js `EventEmitter` - All events implement `BaseEvent { type, timestamp, payload }` -### Event Types (57) +### Event Types (58) | Category | Events | Count | |----------|--------|-------| @@ -27,7 +27,7 @@ | **Preview** | `preview:building`, `preview:ready`, `preview:stopped`, `preview:failed` | 4 | | **Conversation** | `conversation:created`, `conversation:answered` | 2 | `conversation:created` triggers auto-resume of idle target agents via `resumeForConversation()` | | **Chat** | `chat:message_created`, `chat:session_closed` | 2 | Chat session lifecycle events | -| **Initiative** | `initiative:pending_review`, `initiative:review_approved` | 2 | Initiative-level review gate events | +| **Initiative** | `initiative:pending_review`, `initiative:review_approved`, `initiative:changes_requested` | 3 | Initiative-level review gate events | | **Project** | `project:synced`, `project:sync_failed` | 2 | Remote sync results from `ProjectSyncManager` | | **Log** | `log:entry` | 1 | @@ -48,6 +48,7 @@ PhaseChangesRequestedEvent { phaseId, initiativeId, taskId, commentCount } AccountCredentialsRefreshedEvent { accountId, expiresAt, previousExpiresAt? } InitiativePendingReviewEvent { initiativeId, branch } InitiativeReviewApprovedEvent { initiativeId, branch, strategy: 'push_branch' | 'merge_and_push' } +InitiativeChangesRequestedEvent { initiativeId, phaseId, taskId } ``` ## Task Dispatch @@ -64,10 +65,10 @@ InitiativeReviewApprovedEvent { initiativeId, branch, strategy: 'push_branch' | 2. **Dispatch** — `dispatchNext()` finds highest-priority task with all deps complete 3. **Context gathering** — Before spawn, `dispatchNext()` gathers initiative context (initiative, phase, tasks, pages) and passes as `inputContext` to the agent. Agents receive `.cw/input/task.md`, `initiative.md`, `phase.md`, `context/tasks/`, `context/phases/`, and `pages/`. 4. **Priority order**: high > medium > low, then oldest first (FIFO within priority) -5. **Checkpoint skip** — Tasks with type starting with `checkpoint:` skip auto-dispatch -6. **Planning skip** — Planning-category tasks (research, discuss, plan, detail, refine) skip auto-dispatch — they use the architect flow +5. **Planning skip** — Planning-category tasks (research, discuss, plan, detail, refine) skip auto-dispatch — they use the architect flow 7. **Summary propagation** — `completeTask()` reads the completing agent's `result.message` and stores it on the task's `summary` column. Dependent tasks see this summary in `context/tasks/.md` frontmatter. 8. **Spawn failure** — If `agentManager.spawn()` throws, the task is blocked via `blockTask()` with the error message. The dispatch cycle continues instead of crashing. +9. **Retry blocked** — `retryBlockedTask(taskId)` resets a blocked task to pending and re-queues it. Exposed via tRPC `retryBlockedTask` mutation. The UI shows a Retry button in the task slide-over when status is `blocked`. ### DispatchManager Methods @@ -78,6 +79,7 @@ InitiativeReviewApprovedEvent { initiativeId, branch, strategy: 'push_branch' | | `getNextDispatchable()` | Get next task without dispatching | | `completeTask(taskId, agentId?)` | Complete task | | `blockTask(taskId, reason)` | Block task with reason | +| `retryBlockedTask(taskId)` | Reset blocked task to pending and re-queue | | `getQueueState()` | Return queued, ready, blocked tasks | ## Phase Dispatch @@ -111,7 +113,7 @@ InitiativeReviewApprovedEvent { initiativeId, branch, strategy: 'push_branch' | |-------|--------| | `phase:queued` | Dispatch ready phases → dispatch their tasks to idle agents | | `agent:stopped` | Re-dispatch queued tasks (freed agent slot) | -| `task:completed` | Merge task branch, then dispatch next queued task | +| `task:completed` | Merge task branch (if branch exists), check phase completion, dispatch next queued task | ### Coalesced Scheduling @@ -119,6 +121,8 @@ Multiple rapid events (e.g. several `phase:queued` from `queueAllPhases`) are co ### Execution Mode Behavior -- **YOLO**: phase completes → auto-merge → auto-dispatch next phase → auto-dispatch tasks +- **YOLO**: phase completes → auto-merge (if branch exists, skipped otherwise) → auto-dispatch next phase → auto-dispatch tasks - **review_per_phase**: phase completes → set `pending_review` → STOP. User approves → `approveAndMergePhase()` → merge → dispatch next phase → dispatch tasks -- **request-changes**: phase `pending_review` → user requests changes → creates revision task (category=`'review'`) → phase reset to `in_progress` → agent fixes → phase returns to `pending_review` +- **No branch**: Phase completion check runs regardless of branch existence. Merge steps are skipped; status transitions still fire. `updateTaskStatus` tRPC routes completions through `dispatchManager.completeTask()` to emit `task:completed`. +- **request-changes (phase)**: phase `pending_review` → user requests changes → creates revision task (category=`'review'`, dedup guard skips if active review exists) with threaded comments (`[comment:ID]` tags + reply threads) → phase reset to `in_progress` → agent reads comments, fixes code, writes `.cw/output/comment-responses.json` → OutputHandler creates reply comments and optionally resolves threads → phase returns to `pending_review` +- **request-changes (initiative)**: initiative `pending_review` → user requests changes → creates/reuses "Finalization" phase → creates review task → initiative reset to `active` → agent fixes → initiative returns to `pending_review` diff --git a/docs/frontend.md b/docs/frontend.md index 523bdbf..6488640 100644 --- a/docs/frontend.md +++ b/docs/frontend.md @@ -111,10 +111,12 @@ The initiative detail page has three tabs managed via local state (not URL param ### Review Components (`src/components/review/`) | Component | Purpose | |-----------|---------| -| `ReviewTab` | Review tab container — orchestrates header, diff, sidebar, and preview | +| `ReviewTab` | Review tab container — orchestrates header, diff, sidebar, and preview. Phase-level review has threaded inline comments (with reply support) + Request Changes; initiative-level review has Request Changes (summary prompt) + Push Branch / Merge & Push | | `ReviewHeader` | Consolidated toolbar: phase selector pills, branch info, stats, preview controls, approve/reject actions | -| `ReviewSidebar` | VSCode-style icon strip (Files/Commits views) with file list, comment counts, and commit navigation | -| `DiffViewer` | Unified diff renderer with inline comments | +| `ReviewSidebar` | VSCode-style icon strip (Files/Commits views) with file list, root-only comment counts, and commit navigation | +| `DiffViewer` | Unified diff renderer with threaded inline comments (root + reply threads) | +| `CommentThread` | Renders root comment with resolve/reopen + nested reply threads (agent replies styled with primary border). Inline reply form | +| `ConflictResolutionPanel` | Merge conflict detection + agent resolution in initiative review. Shows conflict files, spawns conflict agent, inline questions, re-check on completion | | `PreviewPanel` | Docker preview status: building/running/failed with start/stop (legacy, now integrated into ReviewHeader) | | `ProposalCard` | Individual proposal display | @@ -126,6 +128,7 @@ shadcn/ui components: badge (6 status variants + xs size), button, card, dialog, | Hook | Purpose | |------|---------| | `useRefineAgent` | Manages refine agent lifecycle for initiative | +| `useConflictAgent` | Manages conflict resolution agent lifecycle for initiative review | | `useDetailAgent` | Manages detail agent for phase planning | | `useAgentOutput` | Subscribes to live agent output stream | | `useChatSession` | Manages chat session for phase/task refinement | diff --git a/docs/git-process-logging.md b/docs/git-process-logging.md index 817dbfc..2e5d8c4 100644 --- a/docs/git-process-logging.md +++ b/docs/git-process-logging.md @@ -45,6 +45,9 @@ Worktrees stored in `.cw-worktrees/` subdirectory of the repo. Each agent gets a | `remoteBranchExists(repoPath, branch)` | Check remote tracking branches (`origin/`) | | `listCommits(repoPath, base, head)` | List commits head has that base doesn't (with stats) | | `diffCommit(repoPath, commitHash)` | Get unified diff for a single commit | +| `getMergeBase(repoPath, branch1, branch2)` | Get common ancestor commit hash | +| `pushBranch(repoPath, branch, remote?)` | Push branch to remote (default: 'origin') | +| `checkMergeability(repoPath, source, target)` | Dry-run merge check via `git merge-tree --write-tree` (git 2.38+). Returns `{ mergeable, conflicts? }` with no side effects | `remoteBranchExists` is used by `registerProject` and `updateProject` to validate that a project's default branch actually exists in the cloned repository before saving. diff --git a/docs/server-api.md b/docs/server-api.md index 2b69321..ec11000 100644 --- a/docs/server-api.md +++ b/docs/server-api.md @@ -64,6 +64,7 @@ Each procedure uses `require*Repository(ctx)` helpers that throw `TRPCError(INTE | getAgentQuestions | query | Pending questions | | getAgentOutput | query | Full output from DB log chunks | | getActiveRefineAgent | query | Active refine agent for initiative | +| getActiveConflictAgent | query | Active conflict resolution agent for initiative (name starts with `conflict-`) | | listWaitingAgents | query | Agents waiting for input | | onAgentOutput | subscription | Live raw JSONL output stream via EventBus | @@ -95,6 +96,9 @@ Each procedure uses `require*Repository(ctx)` helpers that throw `TRPCError(INTE | getInitiativeReviewCommits | query | Commits on initiative branch not on default branch | | getInitiativeCommitDiff | query | Single commit diff for initiative review | | approveInitiativeReview | mutation | Approve initiative review: `{initiativeId, strategy: 'push_branch' \| 'merge_and_push'}` | +| requestInitiativeChanges | mutation | Request changes on initiative: `{initiativeId, summary}` → creates review task in Finalization phase, resets initiative to active | +| checkInitiativeMergeability | query | Dry-run merge check: `{initiativeId}` → `{mergeable, conflictFiles[], targetBranch}` | +| spawnConflictResolutionAgent | mutation | Spawn agent to resolve merge conflicts: `{initiativeId, provider?}` → auto-dismisses stale conflict agents, creates merge task | ### Phases | Procedure | Type | Description | @@ -115,11 +119,12 @@ Each procedure uses `require*Repository(ctx)` helpers that throw `TRPCError(INTE | getPhaseReviewCommits | query | List commits between initiative and phase branch | | getCommitDiff | query | Diff for a single commit (by hash) in a phase | | approvePhaseReview | mutation | Approve and merge phase branch | -| requestPhaseChanges | mutation | Request changes: creates revision task from unresolved comments, resets phase to in_progress | -| listReviewComments | query | List review comments by phaseId | +| requestPhaseChanges | mutation | Request changes: creates revision task from unresolved threaded comments (with `[comment:ID]` tags and reply threads), resets phase to in_progress | +| listReviewComments | query | List review comments by phaseId (flat list including replies, frontend groups by parentCommentId) | | createReviewComment | mutation | Create inline review comment on diff | | resolveReviewComment | mutation | Mark review comment as resolved | | unresolveReviewComment | mutation | Mark review comment as unresolved | +| replyToReviewComment | mutation | Create a threaded reply to an existing review comment (copies parent's phaseId/filePath/lineNumber) | ### Phase Dispatch | Procedure | Type | Description | @@ -190,6 +195,7 @@ Each procedure uses `require*Repository(ctx)` helpers that throw `TRPCError(INTE | updateAccountAuth | mutation | Update credentials | | markAccountExhausted | mutation | Set exhaustion timer | | listProviderNames | query | Available provider names | +| addAccountByToken | mutation | Upsert account by email + raw OAuth token | ### Proposals | Procedure | Type | Description | @@ -204,13 +210,13 @@ Each procedure uses `require*Repository(ctx)` helpers that throw `TRPCError(INTE | Procedure | Type | Events | |-----------|------|--------| | onEvent | subscription | All event types | -| onAgentUpdate | subscription | agent:* events (8 types) | +| onAgentUpdate | subscription | agent:* events (7 types, excludes agent:output) | | onTaskUpdate | subscription | task:* + phase:* events (8 types) | | onPageUpdate | subscription | page:created/updated/deleted | | onPreviewUpdate | subscription | preview:building/ready/stopped/failed | | onConversationUpdate | subscription | conversation:created/answered | -Subscriptions use `eventBusIterable()` — queue-based async generator, max 1000 events, 30s heartbeat. +Subscriptions use `eventBusIterable()` — queue-based async generator, max 1000 events, 30s heartbeat. `agent:output` is excluded from all general subscriptions (it's high-frequency streaming data); use the dedicated `onAgentOutput` subscription instead. ## Coordination Module