factory-factory 0.1.5 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "factory-factory",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "description": "Workspace-based coding environment for running multiple Claude Code sessions in parallel",
   "private": false,
   "license": "MIT",
@@ -41,6 +41,7 @@
   "scripts": {
     "dev": "node scripts/ensure-native-modules.mjs node && tsx src/cli/index.ts serve --dev",
     "build": "tsc -p tsconfig.backend.json && tsc-alias -p tsconfig.backend.json --resolve-full-paths && cp -r prompts dist/ && vite build",
+    "build:storybook": "storybook build",
     "start": "node scripts/ensure-native-modules.mjs node && tsx src/cli/index.ts serve",
     "test": "vitest run",
     "test:watch": "vitest",
@@ -64,6 +65,9 @@
     "knip": "knip --include files,dependencies,unlisted"
   },
   "dependencies": {
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@hookform/resolvers": "^5.2.2",
     "@prisma/adapter-better-sqlite3": "^7.3.0",
     "@prisma/client": "^7.3.0",
@@ -126,10 +130,12 @@
     "react-dom": "^19.2.4",
     "react-hook-form": "^7.71.1",
     "react-markdown": "^10.1.0",
-    "react-resizable-panels": "^4.5.7",
+    "react-resizable-panels": "^4.5.9",
     "react-router": "^7.13.0",
     "react-syntax-highlighter": "^16.1.0",
     "recharts": "3.7.0",
+    "rehype-raw": "^7.0.0",
+    "rehype-sanitize": "^6.0.0",
     "remark-gfm": "^4.0.1",
     "sonner": "^2.0.7",
     "superjson": "^2.2.6",
@@ -146,9 +152,13 @@
     ]
   },
   "pnpm": {
+    "publicHoistPattern": [
+      "@types/*"
+    ],
     "onlyBuiltDependencies": [
       "@prisma/engines",
       "better-sqlite3",
+      "electron",
       "esbuild",
       "node-pty",
       "prisma",
@@ -156,6 +166,7 @@
       "sharp"
     ],
     "overrides": {
+      "@isaacs/brace-expansion": ">=5.0.1",
       "braces": ">=3.0.3",
       "micromatch": ">=4.0.8",
       "tar": ">=7.5.0",
@@ -169,37 +180,37 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.3.13",
-    "@electron/rebuild": "^4.0.2",
-    "@storybook/addon-a11y": "10.2.3",
-    "@storybook/addon-docs": "10.2.3",
+    "@electron/rebuild": "^4.0.3",
+    "@storybook/addon-a11y": "10.2.4",
+    "@storybook/addon-docs": "10.2.4",
     "@storybook/addon-mcp": "^0.2.2",
-    "@storybook/addon-themes": "10.2.3",
-    "@storybook/react": "10.2.3",
-    "@storybook/react-vite": "10.2.3",
+    "@storybook/addon-themes": "10.2.4",
+    "@storybook/react": "10.2.4",
+    "@storybook/react-vite": "10.2.4",
     "@tailwindcss/vite": "^4.1.18",
     "@types/better-sqlite3": "^7.6.13",
     "@types/express": "^5.0.6",
-    "@types/node": "^25.1.0",
+    "@types/node": "^25.2.0",
     "@types/pidusage": "^2.0.5",
     "@types/react": "^19.2.10",
     "@types/react-dom": "^19.2.3",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/supertest": "^6.0.3",
     "@types/ws": "^8.18.1",
-    "@vitejs/plugin-react": "^5.1.2",
+    "@vitejs/plugin-react": "^5.1.3",
     "@vitest/coverage-v8": "^4.0.18",
     "autoprefixer": "^10.4.24",
-    "concurrently": "^9.1.0",
+    "concurrently": "^9.2.1",
     "dependency-cruiser": "^17.3.7",
     "electron": "^40.1.0",
     "electron-builder": "^26.7.0",
     "husky": "^9.1.7",
-    "knip": "^5.82.1",
+    "knip": "^5.83.0",
     "lint-staged": "^16.2.7",
     "next-themes": "^0.4.6",
     "postcss": "^8.5.6",
     "prisma": "^7.3.0",
-    "storybook": "10.2.3",
+    "storybook": "10.2.4",
     "supertest": "^7.2.2",
     "tailwindcss": "^4.1.18",
     "tsc-alias": "^1.8.16",

package/prisma/migrations/20260202150527_add_notification_sound_path/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "UserSettings" ADD COLUMN "notificationSoundPath" TEXT;

package/prisma/migrations/20260202172937_add_auto_fix_ci_issues_setting/migration.sql

@@ -0,0 +1,21 @@
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_UserSettings" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "userId" TEXT NOT NULL DEFAULT 'default',
+    "preferredIde" TEXT NOT NULL DEFAULT 'cursor',
+    "customIdeCommand" TEXT,
+    "notificationSoundPath" TEXT,
+    "playSoundOnComplete" BOOLEAN NOT NULL DEFAULT true,
+    "autoFixCiIssues" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+INSERT INTO "new_UserSettings" ("createdAt", "customIdeCommand", "id", "notificationSoundPath", "preferredIde", "updatedAt", "userId") SELECT "createdAt", "customIdeCommand", "id", "notificationSoundPath", "preferredIde", "updatedAt", "userId" FROM "UserSettings";
+DROP TABLE "UserSettings";
+ALTER TABLE "new_UserSettings" RENAME TO "UserSettings";
+CREATE UNIQUE INDEX "UserSettings_userId_key" ON "UserSettings"("userId");
+CREATE INDEX "UserSettings_userId_idx" ON "UserSettings"("userId");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/prisma/migrations/20260203120000_add_cached_slash_commands/migration.sql

@@ -0,0 +1,20 @@
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_UserSettings" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "userId" TEXT NOT NULL DEFAULT 'default',
+    "preferredIde" TEXT NOT NULL DEFAULT 'cursor',
+    "customIdeCommand" TEXT,
+    "playSoundOnComplete" BOOLEAN NOT NULL DEFAULT true,
+    "cachedSlashCommands" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+INSERT INTO "new_UserSettings" ("createdAt", "customIdeCommand", "id", "playSoundOnComplete", "preferredIde", "updatedAt", "userId") SELECT "createdAt", "customIdeCommand", "id", "playSoundOnComplete", "preferredIde", "updatedAt", "userId" FROM "UserSettings";
+DROP TABLE "UserSettings";
+ALTER TABLE "new_UserSettings" RENAME TO "UserSettings";
+CREATE UNIQUE INDEX "UserSettings_userId_key" ON "UserSettings"("userId");
+CREATE INDEX "UserSettings_userId_idx" ON "UserSettings"("userId");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/prisma/migrations/20260203190000_add_workspace_order/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "UserSettings" ADD COLUMN "workspaceOrder" TEXT;

package/prisma/migrations/20260204000000_add_init_output/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Workspace" ADD COLUMN "initOutput" TEXT;

package/prisma/migrations/20260204180116_watch_prs/migration.sql

@@ -0,0 +1,90 @@
+/*
+  Warnings:
+
+  - You are about to alter the column `cachedSlashCommands` on the `UserSettings` table. The data in that column could be lost. The data in that column will be cast from `String` to `Json`.
+  - You are about to alter the column `workspaceOrder` on the `UserSettings` table. The data in that column could be lost. The data in that column will be cast from `String` to `Json`.
+
+*/
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_UserSettings" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "userId" TEXT NOT NULL DEFAULT 'default',
+    "preferredIde" TEXT NOT NULL DEFAULT 'cursor',
+    "customIdeCommand" TEXT,
+    "playSoundOnComplete" BOOLEAN NOT NULL DEFAULT true,
+    "notificationSoundPath" TEXT,
+    "workspaceOrder" JSONB,
+    "cachedSlashCommands" JSONB,
+    "autoFixCiIssues" BOOLEAN NOT NULL DEFAULT false,
+    "autoFixPrReviewComments" BOOLEAN NOT NULL DEFAULT false,
+    "prReviewFixAllowedUsers" JSONB,
+    "prReviewFixPrompt" TEXT,
+    "ratchetEnabled" BOOLEAN NOT NULL DEFAULT false,
+    "ratchetAutoFixCi" BOOLEAN NOT NULL DEFAULT true,
+    "ratchetAutoFixConflicts" BOOLEAN NOT NULL DEFAULT true,
+    "ratchetAutoFixReviews" BOOLEAN NOT NULL DEFAULT true,
+    "ratchetAutoMerge" BOOLEAN NOT NULL DEFAULT false,
+    "ratchetAllowedReviewers" JSONB,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+INSERT INTO "new_UserSettings" ("cachedSlashCommands", "createdAt", "customIdeCommand", "id", "playSoundOnComplete", "preferredIde", "updatedAt", "userId", "workspaceOrder") SELECT "cachedSlashCommands", "createdAt", "customIdeCommand", "id", "playSoundOnComplete", "preferredIde", "updatedAt", "userId", "workspaceOrder" FROM "UserSettings";
+DROP TABLE "UserSettings";
+ALTER TABLE "new_UserSettings" RENAME TO "UserSettings";
+CREATE UNIQUE INDEX "UserSettings_userId_key" ON "UserSettings"("userId");
+CREATE INDEX "UserSettings_userId_idx" ON "UserSettings"("userId");
+CREATE TABLE "new_Workspace" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "projectId" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "description" TEXT,
+    "status" TEXT NOT NULL DEFAULT 'NEW',
+    "worktreePath" TEXT,
+    "branchName" TEXT,
+    "initErrorMessage" TEXT,
+    "initOutput" TEXT,
+    "initStartedAt" DATETIME,
+    "initCompletedAt" DATETIME,
+    "initRetryCount" INTEGER NOT NULL DEFAULT 0,
+    "runScriptCommand" TEXT,
+    "runScriptCleanupCommand" TEXT,
+    "runScriptPid" INTEGER,
+    "runScriptPort" INTEGER,
+    "runScriptStartedAt" DATETIME,
+    "runScriptStatus" TEXT NOT NULL DEFAULT 'IDLE',
+    "prUrl" TEXT,
+    "githubIssueNumber" INTEGER,
+    "githubIssueUrl" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "prNumber" INTEGER,
+    "prState" TEXT NOT NULL DEFAULT 'NONE',
+    "prReviewState" TEXT,
+    "prCiStatus" TEXT NOT NULL DEFAULT 'UNKNOWN',
+    "prUpdatedAt" DATETIME,
+    "prCiFailedAt" DATETIME,
+    "prCiLastNotifiedAt" DATETIME,
+    "prReviewLastCheckedAt" DATETIME,
+    "prReviewLastCommentId" TEXT,
+    "ratchetState" TEXT NOT NULL DEFAULT 'IDLE',
+    "ratchetLastCheckedAt" DATETIME,
+    "ratchetActiveSessionId" TEXT,
+    "ratchetLastCiRunId" TEXT,
+    "ratchetLastNotifiedState" TEXT,
+    "hasHadSessions" BOOLEAN NOT NULL DEFAULT false,
+    "cachedKanbanColumn" TEXT NOT NULL DEFAULT 'BACKLOG',
+    "stateComputedAt" DATETIME,
+    CONSTRAINT "Workspace_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_Workspace" ("branchName", "cachedKanbanColumn", "createdAt", "description", "githubIssueNumber", "githubIssueUrl", "hasHadSessions", "id", "initCompletedAt", "initErrorMessage", "initOutput", "initRetryCount", "initStartedAt", "name", "prCiFailedAt", "prCiLastNotifiedAt", "prCiStatus", "prNumber", "prReviewState", "prState", "prUpdatedAt", "prUrl", "projectId", "runScriptCleanupCommand", "runScriptCommand", "runScriptPid", "runScriptPort", "runScriptStartedAt", "runScriptStatus", "stateComputedAt", "status", "updatedAt", "worktreePath") SELECT "branchName", "cachedKanbanColumn", "createdAt", "description", "githubIssueNumber", "githubIssueUrl", "hasHadSessions", "id", "initCompletedAt", "initErrorMessage", "initOutput", "initRetryCount", "initStartedAt", "name", "prCiFailedAt", "prCiLastNotifiedAt", "prCiStatus", "prNumber", "prReviewState", "prState", "prUpdatedAt", "prUrl", "projectId", "runScriptCleanupCommand", "runScriptCommand", "runScriptPid", "runScriptPort", "runScriptStartedAt", "runScriptStatus", "stateComputedAt", "status", "updatedAt", "worktreePath" FROM "Workspace";
+DROP TABLE "Workspace";
+ALTER TABLE "new_Workspace" RENAME TO "Workspace";
+CREATE INDEX "Workspace_projectId_idx" ON "Workspace"("projectId");
+CREATE INDEX "Workspace_status_idx" ON "Workspace"("status");
+CREATE INDEX "Workspace_cachedKanbanColumn_idx" ON "Workspace"("cachedKanbanColumn");
+CREATE INDEX "Workspace_projectId_status_idx" ON "Workspace"("projectId", "status");
+CREATE INDEX "Workspace_projectId_cachedKanbanColumn_idx" ON "Workspace"("projectId", "cachedKanbanColumn");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/prisma/migrations/20260204200000_simplify_kanban_columns/migration.sql

@@ -0,0 +1,72 @@
+-- Simplify KanbanColumn enum from 7 values to 3: WORKING, WAITING, DONE
+-- Migration strategy:
+-- - BACKLOG, IN_PROGRESS -> WORKING (initializing or actively working)
+-- - PR_OPEN, WAITING, APPROVED -> WAITING (idle, waiting for input)
+-- - MERGED, DONE -> DONE (completed)
+
+-- Step 1: Update existing cachedKanbanColumn values to new enum values
+UPDATE "Workspace"
+SET "cachedKanbanColumn" = CASE
+  WHEN "cachedKanbanColumn" IN ('BACKLOG', 'IN_PROGRESS') THEN 'WORKING'
+  WHEN "cachedKanbanColumn" IN ('PR_OPEN', 'WAITING', 'APPROVED') THEN 'WAITING'
+  WHEN "cachedKanbanColumn" IN ('MERGED', 'DONE') THEN 'DONE'
+  ELSE 'WAITING'
+END;
+
+-- Step 2: Recreate table with new default value (WAITING instead of BACKLOG)
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Workspace" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "projectId" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "description" TEXT,
+    "status" TEXT NOT NULL DEFAULT 'NEW',
+    "worktreePath" TEXT,
+    "branchName" TEXT,
+    "initErrorMessage" TEXT,
+    "initOutput" TEXT,
+    "initStartedAt" DATETIME,
+    "initCompletedAt" DATETIME,
+    "initRetryCount" INTEGER NOT NULL DEFAULT 0,
+    "runScriptCommand" TEXT,
+    "runScriptCleanupCommand" TEXT,
+    "runScriptPid" INTEGER,
+    "runScriptPort" INTEGER,
+    "runScriptStartedAt" DATETIME,
+    "runScriptStatus" TEXT NOT NULL DEFAULT 'IDLE',
+    "prUrl" TEXT,
+    "githubIssueNumber" INTEGER,
+    "githubIssueUrl" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "prNumber" INTEGER,
+    "prState" TEXT NOT NULL DEFAULT 'NONE',
+    "prReviewState" TEXT,
+    "prCiStatus" TEXT NOT NULL DEFAULT 'UNKNOWN',
+    "prUpdatedAt" DATETIME,
+    "prCiFailedAt" DATETIME,
+    "prCiLastNotifiedAt" DATETIME,
+    "prReviewLastCheckedAt" DATETIME,
+    "prReviewLastCommentId" TEXT,
+    "ratchetState" TEXT NOT NULL DEFAULT 'IDLE',
+    "ratchetLastCheckedAt" DATETIME,
+    "ratchetActiveSessionId" TEXT,
+    "ratchetLastCiRunId" TEXT,
+    "ratchetLastNotifiedState" TEXT,
+    "hasHadSessions" BOOLEAN NOT NULL DEFAULT false,
+    "cachedKanbanColumn" TEXT NOT NULL DEFAULT 'WAITING',
+    "stateComputedAt" DATETIME,
+    CONSTRAINT "Workspace_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_Workspace" ("branchName", "cachedKanbanColumn", "createdAt", "description", "githubIssueNumber", "githubIssueUrl", "hasHadSessions", "id", "initCompletedAt", "initErrorMessage", "initOutput", "initRetryCount", "initStartedAt", "name", "prCiFailedAt", "prCiLastNotifiedAt", "prCiStatus", "prNumber", "prReviewLastCheckedAt", "prReviewLastCommentId", "prReviewState", "prState", "prUpdatedAt", "prUrl", "projectId", "ratchetActiveSessionId", "ratchetLastCheckedAt", "ratchetLastCiRunId", "ratchetLastNotifiedState", "ratchetState", "runScriptCleanupCommand", "runScriptCommand", "runScriptPid", "runScriptPort", "runScriptStartedAt", "runScriptStatus", "stateComputedAt", "status", "updatedAt", "worktreePath") SELECT "branchName", "cachedKanbanColumn", "createdAt", "description", "githubIssueNumber", "githubIssueUrl", "hasHadSessions", "id", "initCompletedAt", "initErrorMessage", "initOutput", "initRetryCount", "initStartedAt", "name", "prCiFailedAt", "prCiLastNotifiedAt", "prCiStatus", "prNumber", "prReviewLastCheckedAt", "prReviewLastCommentId", "prReviewState", "prState", "prUpdatedAt", "prUrl", "projectId", "ratchetActiveSessionId", "ratchetLastCheckedAt", "ratchetLastCiRunId", "ratchetLastNotifiedState", "ratchetState", "runScriptCleanupCommand", "runScriptCommand", "runScriptPid", "runScriptPort", "runScriptStartedAt", "runScriptStatus", "stateComputedAt", "status", "updatedAt", "worktreePath" FROM "Workspace";
+DROP TABLE "Workspace";
+ALTER TABLE "new_Workspace" RENAME TO "Workspace";
+CREATE INDEX "Workspace_projectId_idx" ON "Workspace"("projectId");
+CREATE INDEX "Workspace_status_idx" ON "Workspace"("status");
+CREATE INDEX "Workspace_cachedKanbanColumn_idx" ON "Workspace"("cachedKanbanColumn");
+CREATE INDEX "Workspace_projectId_status_idx" ON "Workspace"("projectId", "status");
+CREATE INDEX "Workspace_projectId_cachedKanbanColumn_idx" ON "Workspace"("projectId", "cachedKanbanColumn");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/prisma/migrations/20260204210000_add_workspace_ratchet_enabled/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Workspace" ADD COLUMN "ratchetEnabled" BOOLEAN NOT NULL DEFAULT true;

package/prisma/migrations/20260205000000_add_is_auto_generated_branch/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Workspace" ADD COLUMN "isAutoGeneratedBranch" BOOLEAN NOT NULL DEFAULT false;

package/prisma/migrations/20260205012721_add_ratchet_last_push_at/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Workspace" ADD COLUMN "ratchetLastPushAt" DATETIME;

package/prisma/schema.prisma

@@ -46,15 +46,21 @@ enum CIStatus {
 }
 
 enum KanbanColumn {
-  BACKLOG
-  IN_PROGRESS
+  WORKING
   WAITING
-  PR_OPEN
-  APPROVED
-  MERGED
   DONE
 }
 
+enum RatchetState {
+  IDLE              // No PR or ratchet not active for this workspace
+  CI_RUNNING        // CI checks in progress
+  CI_FAILED         // CI checks failed
+  MERGE_CONFLICT    // Has merge conflicts with base branch
+  REVIEW_PENDING    // Has unaddressed review comments
+  READY             // Ready to merge (CI green, no conflicts, no pending reviews)
+  MERGED            // PR has been merged
+}
+
 
 // Models
 model Project {
@@ -104,9 +110,11 @@ model Workspace {
   status              WorkspaceStatus   @default(NEW)
   worktreePath        String?
   branchName          String?
+  isAutoGeneratedBranch Boolean         @default(false)  // True if branch was auto-generated at creation time
 
   // Initialization tracking (used by NEW, PROVISIONING, FAILED states)
   initErrorMessage    String?
+  initOutput          String?           // Accumulated stdout/stderr from startup script
   initStartedAt       DateTime?
   initCompletedAt     DateTime?
   initRetryCount      Int                 @default(0)
@@ -138,11 +146,24 @@ model Workspace {
   prCiFailedAt        DateTime?         // When CI first failed (cleared on success)
   prCiLastNotifiedAt  DateTime?         // Last time we notified about CI failure
 
+  // PR Review tracking
+  prReviewLastCheckedAt   DateTime?     // When PR review comments were last checked
+  prReviewLastCommentId   String?       // ID of the last processed review comment
+
+  // Ratchet tracking (centralized PR progression)
+  ratchetEnabled          Boolean       @default(true)    // Workspace-level ratchet toggle
+  ratchetState            RatchetState  @default(IDLE)    // Current state in the ratchet progression
+  ratchetLastCheckedAt    DateTime?                       // When ratchet last checked this workspace
+  ratchetLastPushAt       DateTime?                       // When a push was last detected (for temporary ratchet animation)
+  ratchetActiveSessionId  String?                         // ID of active fixer session (if any)
+  ratchetLastCiRunId      String?                         // Track which CI run we processed
+  ratchetLastNotifiedState RatchetState?                  // Last state we notified the fixer about
+
   // Activity tracking
   hasHadSessions      Boolean           @default(false)
 
   // Cached kanban column (for list performance)
-  cachedKanbanColumn  KanbanColumn      @default(BACKLOG)
+  cachedKanbanColumn  KanbanColumn      @default(WAITING)
   stateComputedAt     DateTime?         // Last kanban column computation
 
   @@index([projectId])
@@ -185,18 +206,41 @@ model TerminalSession {
 }
 
 model UserSettings {
-  id                String   @id @default(cuid())
-  userId            String   @default("default") @unique  // Single user for now, expandable later
+  id                    String   @id @default(cuid())
+  userId                String   @default("default") @unique  // Single user for now, expandable later
 
   // IDE Settings
-  preferredIde      String   @default("cursor")  // "cursor" | "vscode" | "custom"
-  customIdeCommand  String?  // For custom IDE, supports placeholders like {workspace}
+  preferredIde          String   @default("cursor")  // "cursor" | "vscode" | "custom"
+  customIdeCommand      String?  // For custom IDE, supports placeholders like {workspace}
 
   // Notification Settings
-  playSoundOnComplete Boolean @default(true)  // Play sound when workspace completes
+  playSoundOnComplete   Boolean  @default(true)   // Play sound when workspace completes
+  notificationSoundPath String?                   // Path to custom notification sound file
+
+  // Sidebar Settings
+  workspaceOrder      Json?    // { [projectId]: string[] } - ordered workspace IDs per project
+
+  // Cached slash commands (from Claude CLI initialize response)
+  cachedSlashCommands   Json?
+
+  // CI Settings (deprecated - use ratchet settings)
+  autoFixCiIssues       Boolean  @default(false)  // Global toggle for CI auto-fixing
+
+  // PR Review Auto-Fix Settings (deprecated - use ratchet settings)
+  autoFixPrReviewComments   Boolean  @default(false)  // Global toggle for PR review auto-fixing
+  prReviewFixAllowedUsers   Json?    // Array of GitHub usernames whose comments trigger auto-fix
+  prReviewFixPrompt         String?  // Custom instructions for the PR review fixing session
+
+  // Ratchet Settings (unified PR progression)
+  ratchetEnabled            Boolean  @default(false)  // Default for new GitHub-issue-created workspaces
+  ratchetAutoFixCi          Boolean  @default(true)   // Auto-fix CI failures
+  ratchetAutoFixConflicts   Boolean  @default(true)   // Auto-resolve merge conflicts
+  ratchetAutoFixReviews     Boolean  @default(true)   // Auto-address review comments
+  ratchetAutoMerge          Boolean  @default(false)  // Auto-merge when ready
+  ratchetAllowedReviewers   Json?                     // GitHub usernames whose reviews trigger auto-fix
 
-  createdAt         DateTime @default(now())
-  updatedAt         DateTime @updatedAt
+  createdAt             DateTime @default(now())
+  updatedAt             DateTime @updatedAt
 
   @@index([userId])
 }

package/prompts/workflows/ci-fix.md

@@ -0,0 +1,52 @@
+---
+name: CI Fix
+description: Investigate and fix CI failures
+expectsPR: false
+---
+
+# CI Failure Resolution
+
+You are investigating and fixing CI failures for this workspace's pull request. Your goal is to get the CI checks passing.
+
+## Workflow Steps
+
+### 1. Understand the Failures
+- Review the CI failure information provided in the initial message
+- Use `gh pr checks <pr-number>` to see current check status
+- Use `gh run view <run-id> --log-failed` to see detailed failure logs
+
+### 2. Diagnose Root Cause
+- Identify which specific tests or checks are failing
+- Understand why each is failing (test logic, code bug, environment issue, flaky test)
+- Prioritize fixes based on impact
+
+### 3. Implement Fixes
+- Fix the underlying issues causing the failures
+- Run failing tests locally to verify your fix works: `pnpm test <test-file>`
+- Keep changes focused on fixing CI - avoid unrelated improvements
+
+### 4. Verify Locally
+- Run the full test suite: `pnpm test`
+- Run type checking: `pnpm typecheck`
+- Run linting: `pnpm check:fix`
+
+### 5. Commit and Push
+- Commit your fixes with clear messages explaining what was fixed
+- Push to the branch: `git push`
+- The CI will automatically re-run
+
+## Guidelines
+
+- **Focus on CI failures only**: Don't refactor or improve unrelated code
+- **One fix at a time**: Commit each logical fix separately for easier review
+- **Verify locally first**: Run tests locally before pushing to avoid CI cycles
+- **Handle flaky tests**: If a test is flaky, fix the flakiness rather than just re-running
+- **Communicate blockers**: If you cannot determine the cause of a failure, explain what you've tried
+
+## Common CI Failure Patterns
+
+- **Type errors**: Run `pnpm typecheck` and fix any issues
+- **Lint errors**: Run `pnpm check:fix` to auto-fix, then review remaining issues
+- **Test failures**: Read the test output carefully, reproduce locally, fix the code or test
+- **Build failures**: Check for missing dependencies or syntax errors
+- **Timeout issues**: Look for infinite loops or very slow operations

package/prompts/workflows/pr-review-fix.md

@@ -0,0 +1,61 @@
+---
+name: PR Review Fix
+description: Address PR review comments and feedback
+expectsPR: false
+---
+
+# PR Review Comment Resolution
+
+You are addressing PR review comments for this workspace's pull request. Your goal is to implement the requested changes and satisfy the reviewers.
+
+## Workflow Steps
+
+### 1. Understand the Feedback
+- Review the comments provided in the initial message carefully
+- Pay attention to both inline code comments and general review comments
+- Understand what changes each reviewer is requesting
+- Note any questions or clarifications the reviewer is asking for
+
+### 2. Plan Your Changes
+- Identify which files need to be modified
+- Determine the scope of changes needed
+- Consider if the requested change impacts other parts of the codebase
+- If a request is unclear, make a reasonable interpretation and document your assumptions
+
+### 3. Implement the Changes
+- Address each review comment systematically
+- Make focused changes that directly address the feedback
+- Avoid scope creep - only fix what was requested
+- If you disagree with a suggestion, implement it anyway but note your reasoning in the commit message
+
+### 4. Verify Your Changes
+- Run the test suite: `pnpm test`
+- Run type checking: `pnpm typecheck`
+- Run linting: `pnpm check:fix`
+- Test any affected functionality manually if appropriate
+
+### 5. Commit and Push
+- Commit your changes with clear messages referencing the review feedback
+- Push to the branch: `git push`
+- The reviewers will be notified of your updates
+
+### 6. Request Re-review
+- After pushing your changes, post a comment on the PR asking reviewers to re-review
+- Mention the specific reviewers who left comments using @username
+
+## Guidelines
+
+- **Address all comments**: Don't leave any review comment unaddressed
+- **Keep changes focused**: Only change what was requested in the reviews
+- **Test thoroughly**: Make sure your changes don't break existing functionality
+- **Be responsive**: Implement changes promptly to keep the PR moving
+- **Document decisions**: If you make judgment calls, explain your reasoning
+
+## Common Review Comment Types
+
+- **Code style**: Follow the project's coding conventions
+- **Bug fix requests**: Understand the bug and fix it properly
+- **Refactoring suggestions**: Implement the cleaner code pattern suggested
+- **Missing tests**: Add tests for the functionality as requested
+- **Documentation**: Add or improve comments and documentation
+- **Logic changes**: Implement the alternative approach suggested

package/prompts/workflows/ratchet.md

@@ -0,0 +1,83 @@
+---
+name: Ratchet
+description: Automatically progress PR toward merge by fixing issues
+expectsPR: false
+---
+
+# Ratchet - Automatic PR Progression
+
+You are the Ratchet agent, responsible for automatically progressing this PR toward merge. You will receive notifications about different issues (CI failures, merge conflicts, review comments) and should address them systematically.
+
+## Your Role
+
+The Ratchet system monitors PRs and notifies you when action is needed. You may be asked to:
+
+1. **Fix CI failures** - Investigate and fix broken tests, type errors, or lint issues
+2. **Resolve merge conflicts** - Merge the base branch and resolve any conflicts
+3. **Address review comments** - Implement changes requested by reviewers
+
+## Handling Multiple Issues
+
+You may receive notifications about new issues while working on something else. Follow this priority:
+
+1. **CI failures** (highest priority) - Always address immediately
+2. **Merge conflicts** - Address before continuing other work
+3. **Review comments** - Address after CI is green and no conflicts
+
+If you receive a notification about a higher-priority issue while working:
+1. Stop your current work (don't push incomplete changes)
+2. Address the new issue first
+3. Resume your original task once the blocker is resolved
+
+## Verification
+
+Before considering any fix complete:
+
+1. Run the test suite: `pnpm test`
+2. Run type checking: `pnpm typecheck`
+3. Run linting: `pnpm check:fix`
+4. Check PR status: `gh pr checks <pr-number>`
+
+Only push when all local checks pass.
+
+## CI Failure Resolution
+
+When notified of CI failures:
+
+1. Use `gh pr checks <pr-number>` to see current status
+2. Use `gh run view <run-id> --log-failed` to see detailed logs
+3. Identify the root cause
+4. Implement a fix
+5. Verify locally before pushing
+
+## Merge Conflict Resolution
+
+When notified of merge conflicts:
+
+1. Fetch latest: `git fetch origin`
+2. Merge base branch: `git merge origin/main`
+3. Resolve conflicts in each file:
+   - Understand both sides of the change
+   - Preserve functionality from both when possible
+   - If unsure, prefer the main branch changes
+4. Run tests to verify the merge
+5. Commit: `git commit -m "Merge main into feature branch"`
+6. Push: `git push`
+
+## Review Comment Resolution
+
+When notified of review comments:
+
+1. Read and understand each comment
+2. Plan the necessary changes
+3. Implement changes to address feedback
+4. Verify with tests
+5. Commit and push
+6. Request re-review from the reviewers
+
+## Guidelines
+
+- **Focus on the current issue**: Don't refactor or improve unrelated code
+- **Keep commits focused**: One logical change per commit
+- **Test before pushing**: Always run local checks first
+- **Communicate blockers**: If you cannot resolve an issue, explain what you've tried