jettypod 4.4.116 → 4.4.120

package/apps/dashboard/lib/db.ts

@@ -26,8 +26,10 @@ export interface WorkItem {
   completed_at: string | null;
   rejection_reason: string | null;
   rejected_at: string | null;
+  ready_for_review: number;
   created_at: string;
   display_order: number | null;
+  conversational: number;
   children?: WorkItem[];
   chores?: WorkItem[];
   bugs?: WorkItem[];
@@ -44,7 +46,7 @@ export interface Decision {
   created_at: string;
 }
 
-function getProjectRoot(): string | null {
+export function getProjectRoot(): string | null {
   // Use JETTYPOD_PROJECT_PATH if set (passed by Electron main process)
   if (process.env.JETTYPOD_PROJECT_PATH) {
     return process.env.JETTYPOD_PROJECT_PATH;
@@ -108,6 +110,9 @@ function ensureColumns(db: Database.Database): void {
     tryAddTo('work_items', 'display_order', 'INTEGER DEFAULT NULL');
     tryAddTo('work_items', 'rejection_reason', 'TEXT');
     tryAddTo('work_items', 'rejected_at', 'TEXT');
+    tryAddTo('work_items', 'conversational', 'INTEGER DEFAULT 0');
+    tryAddTo('work_items', 'plan_at_creation', 'TEXT DEFAULT NULL');
+    tryAddTo('work_items', 'ready_for_review', 'INTEGER DEFAULT 0');
   } catch {
     // Table might not exist yet - ensureSchema will handle it
   }
@@ -140,7 +145,7 @@ function ensureColumns(db: Database.Database): void {
 }
 
 // Check if a project folder has no implementation code
-function isBlankProject(projectPath: string): boolean {
+export function isBlankProject(projectPath: string): boolean {
   const IMPL_PATTERNS = [
     /\.js$/, /\.ts$/, /\.jsx$/, /\.tsx$/, /\.mjs$/, /\.cjs$/,
     /\.py$/, /\.rb$/, /\.go$/, /\.rs$/, /\.java$/, /\.kt$/,
@@ -171,33 +176,48 @@ function isBlankProject(projectPath: string): boolean {
   return !scan(projectPath, projectPath);
 }
 
+// Check if any onboarding chore has been started (moved out of backlog)
+export function hasOnboardingStarted(): boolean {
+  try {
+    const db = getDb();
+    const result = db.prepare(`
+      SELECT COUNT(*) as count FROM work_items
+      WHERE parent_id = (SELECT id FROM work_items WHERE type = 'epic' AND title = 'Project Planning')
+      AND status != 'backlog'
+    `).get() as { count: number } | undefined;
+    return (result?.count ?? 0) > 0;
+  } catch {
+    return false;
+  }
+}
+
 // Seed onboarding epic into a blank project's database if not already present
 function seedOnboardingIfBlank(db: Database.Database, dbPath: string): void {
   try {
     const projectPath = path.dirname(path.dirname(dbPath)); // .jettypod/work.db -> project root
     if (!isBlankProject(projectPath)) return;
 
-    const existing = db.prepare("SELECT id FROM work_items WHERE type = 'epic' AND title = 'Project Onboarding'").get();
+    const existing = db.prepare("SELECT id FROM work_items WHERE type = 'epic' AND title = 'Project Planning'").get();
     if (existing) return;
 
     const insert = db.prepare(
-      'INSERT INTO work_items (type, title, description, parent_id, status, created_at) VALUES (?, ?, ?, ?, ?, ?)'
+      'INSERT INTO work_items (type, title, description, parent_id, status, created_at, conversational) VALUES (?, ?, ?, ?, ?, ?, ?)'
     );
     const now = new Date().toISOString();
 
-    const epicResult = insert.run('epic', 'Project Onboarding',
-      'Get your project set up and planned. Work through these chores one at a time — each one is a short conversation.', null, 'backlog', now);
+    const epicResult = insert.run('epic', 'Project Planning',
+      'Get your project set up and planned. Work through these chores one at a time — each one is a short conversation.', null, 'backlog', now, 0);
     const epicId = epicResult.lastInsertRowid;
 
     const chores = [
-      { title: 'Align on the user journey', desc: 'Help the user define what their product does.\n\nCLAUDE SESSION GUIDANCE:\nOpen with: "What do users DO in this product?"\n\nOUTCOME:\n- A clear description of the core user journey' },
+      { title: 'Align on the user journey', desc: 'Help the user define what their product does.\n\nCLAUDE SESSION GUIDANCE:\nOpen with: "What do users do in this product?"\n\nOUTCOME:\n- A clear description of the core user journey' },
       { title: 'Explore UX approaches', desc: 'Help the user decide how the product should feel.\n\nCONTEXT FROM PREVIOUS CHORE:\nRead previous decisions first.\n\nCLAUDE SESSION GUIDANCE:\nPresent 3 UX approaches.\n\nOUTCOME:\n- 3 UX options compared\n- A winner chosen' },
       { title: 'Choose a tech stack', desc: 'Help the user pick the right tech stack.\n\nCONTEXT FROM PREVIOUS CHORES:\nRead previous decisions first.\n\nCLAUDE SESSION GUIDANCE:\nPresent 3 tech stack options.\n\nOUTCOME:\n- A tech stack chosen with rationale' },
       { title: 'Break the project into epics', desc: 'Break the project into buildable phases.\n\nCONTEXT FROM PREVIOUS CHORES:\nRead all previous decisions.\n\nCLAUDE SESSION GUIDANCE:\nPropose 3-5 epics.\n\nOUTCOME:\n- 3-5 epics created in the backlog' },
     ];
 
     for (const chore of chores) {
-      insert.run('chore', chore.title, chore.desc, epicId, 'backlog', now);
+      insert.run('chore', chore.title, chore.desc, epicId, 'backlog', now, 1);
     }
   } catch (err) {
     console.error('Could not seed onboarding:', err instanceof Error ? err.message : err);
@@ -283,7 +303,7 @@ export function getAllWorkItems(): WorkItem[] {
   const db = getDb();
   const items = db.prepare(`
     SELECT id, type, title, description, status, parent_id, epic_id,
-           branch_name, mode, phase, completed_at, created_at
+           branch_name, mode, phase, completed_at, created_at, conversational
     FROM work_items
     ORDER BY id
   `).all() as WorkItem[];
@@ -294,18 +314,33 @@ export function getWorkItem(id: number): WorkItem | null {
   const db = getDb();
   const item = db.prepare(`
     SELECT id, type, title, description, status, parent_id, epic_id,
-           branch_name, mode, phase, completed_at, created_at
+           branch_name, mode, phase, completed_at, created_at, conversational,
+           ready_for_review, rejection_reason
     FROM work_items
     WHERE id = ?
   `).get(id) as WorkItem | undefined;
   return item || null;
 }
 
+export function createWorkItem(
+  type: 'epic' | 'feature' | 'chore' | 'bug',
+  title: string,
+  description?: string,
+  parentId?: number
+): WorkItem {
+  const db = getWriteDb();
+  const now = new Date().toISOString();
+  const result = db.prepare(
+    'INSERT INTO work_items (type, title, description, parent_id, status, created_at, conversational) VALUES (?, ?, ?, ?, ?, ?, ?)'
+  ).run(type, title, description || null, parentId || null, 'backlog', now, 0);
+  return getWorkItem(result.lastInsertRowid as number)!;
+}
+
 export function getChildWorkItems(parentId: number): WorkItem[] {
   const db = getDb();
   const items = db.prepare(`
     SELECT id, type, title, description, status, parent_id, epic_id,
-           branch_name, mode, phase, completed_at, created_at
+           branch_name, mode, phase, completed_at, created_at, conversational
     FROM work_items
     WHERE parent_id = ?
     ORDER BY id
@@ -388,7 +423,7 @@ export function getActiveWork(): WorkItem[] {
   const db = getDb();
   const items = db.prepare(`
     SELECT id, type, title, description, status, parent_id, epic_id,
-           branch_name, mode, phase, completed_at, created_at
+           branch_name, mode, phase, completed_at, created_at, conversational
     FROM work_items
     WHERE status = 'in_progress'
     ORDER BY id
@@ -400,7 +435,7 @@ export function getRecentlyCompleted(limit: number = 10): WorkItem[] {
   const db = getDb();
   const items = db.prepare(`
     SELECT id, type, title, description, status, parent_id, epic_id,
-           branch_name, mode, phase, completed_at, created_at
+           branch_name, mode, phase, completed_at, created_at, conversational
     FROM work_items
     WHERE status = 'done'
     ORDER BY completed_at DESC
@@ -437,7 +472,7 @@ export function getKanbanData(doneLimit: number = 50): KanbanData {
     // Get all chores that belong to features (for chore expansion)
     const featureChores = db.prepare(`
       SELECT c.id, c.type, c.title, c.description, c.status, c.parent_id, c.epic_id,
-             c.branch_name, c.mode, c.phase, c.completed_at, c.created_at,
+             c.branch_name, c.mode, c.phase, c.completed_at, c.created_at, c.conversational,
              wc.current_step, wc.total_steps
       FROM work_items c
       INNER JOIN work_items f ON c.parent_id = f.id
@@ -459,7 +494,7 @@ export function getKanbanData(doneLimit: number = 50): KanbanData {
     // Get all bugs that belong to features (for bug expansion)
     const featureBugs = db.prepare(`
       SELECT b.id, b.type, b.title, b.description, b.status, b.parent_id, b.epic_id,
-             b.branch_name, b.mode, b.phase, b.completed_at, b.created_at
+             b.branch_name, b.mode, b.phase, b.completed_at, b.created_at, b.conversational
       FROM work_items b
       INNER JOIN work_items f ON b.parent_id = f.id
       WHERE b.type = 'bug' AND f.type = 'feature'
@@ -482,7 +517,8 @@ export function getKanbanData(doneLimit: number = 50): KanbanData {
     // - Bugs if they exist
     const allItems = db.prepare(`
       SELECT w.id, w.type, w.title, w.description, w.status, w.parent_id, w.epic_id,
-             w.branch_name, w.mode, w.phase, w.completed_at, w.created_at, w.display_order,
+             w.branch_name, w.mode, w.phase, w.completed_at, w.created_at, w.conversational, w.display_order,
+             w.ready_for_review,
              p.type as parent_type,
              wc.current_step, wc.total_steps
       FROM work_items w
@@ -547,6 +583,13 @@ export function getKanbanData(doneLimit: number = 50): KanbanData {
       }
     }
 
+    // Sort in-flight: review items first (ascending by id), then non-review (ascending by id)
+    inFlight.sort((a, b) => {
+      if (a.ready_for_review && !b.ready_for_review) return -1;
+      if (!a.ready_for_review && b.ready_for_review) return 1;
+      return a.id - b.id;
+    });
+
     // Always ensure an ungrouped entry exists in backlog for drag-drop target
     if (!backlogGroups.has('ungrouped')) {
       backlogGroups.set('ungrouped', {
@@ -610,17 +653,42 @@ export function updateWorkItemDescription(id: number, description: string): bool
 
 export function updateWorkItemStatus(id: number, status: string, rejectionReason?: string): boolean {
   const db = getWriteDb();
+  // Normalize rejection reason: treat empty/whitespace-only as no rejection
+  const normalizedRejection = rejectionReason?.trim() || undefined;
   const completedAt = status === 'done' ? new Date().toISOString() : null;
-  const rejectedAt = rejectionReason ? new Date().toISOString() : null;
-  const result = db.prepare(`
-    UPDATE work_items SET status = ?, completed_at = ?, rejection_reason = ?, rejected_at = ? WHERE id = ?
-  `).run(status, completedAt, rejectionReason ?? null, rejectedAt, id);
+  const rejectedAt = normalizedRejection ? new Date().toISOString() : null;
+  // Clear ready_for_review on accept or reject
+  const readyForReview = (status === 'done' || normalizedRejection) ? 0 : undefined;
+  const result = readyForReview !== undefined
+    ? db.prepare(`
+        UPDATE work_items SET status = ?, completed_at = ?, rejection_reason = ?, rejected_at = ?, ready_for_review = ? WHERE id = ?
+      `).run(status, completedAt, normalizedRejection ?? null, rejectedAt, readyForReview, id)
+    : db.prepare(`
+        UPDATE work_items SET status = ?, completed_at = ?, rejection_reason = ?, rejected_at = ? WHERE id = ?
+      `).run(status, completedAt, normalizedRejection ?? null, rejectedAt, id);
 
   // When work item is cancelled, mark any linked sessions as orphaned
   if (status === 'cancelled' && result.changes > 0) {
     orphanSessionsByWorkItem(id);
   }
 
+  // When a chore is marked done, check if all sibling chores are done
+  // and set ready_for_review on the parent feature.
+  // Edge cases: no chores (length 0) → no auto-set; cancelled chores ≠ done → no auto-set
+  if (status === 'done' && result.changes > 0) {
+    const item = db.prepare('SELECT parent_id, type FROM work_items WHERE id = ?').get(id) as { parent_id: number | null; type: string } | undefined;
+    if (item?.parent_id && item.type === 'chore') {
+      const parent = db.prepare('SELECT id, type FROM work_items WHERE id = ?').get(item.parent_id) as { id: number; type: string } | undefined;
+      if (parent?.type === 'feature') {
+        const siblings = db.prepare('SELECT status FROM work_items WHERE parent_id = ? AND type = ?').all(parent.id, 'chore') as { status: string }[];
+        const allDone = siblings.length > 0 && siblings.every(s => s.status === 'done');
+        if (allDone) {
+          db.prepare('UPDATE work_items SET ready_for_review = 1 WHERE id = ?').run(parent.id);
+        }
+      }
+    }
+  }
+
   return result.changes > 0;
 }
 
@@ -1224,3 +1292,51 @@ export function setMainBranch(branch: string | null): void {
   }
   writeConfig(config);
 }
+
+// ==================== Usage Tracking ====================
+
+const FREE_WEEKLY_LIMIT = 20;
+
+/**
+ * Get the Monday 00:00:00 UTC of the current week.
+ * Returns format matching SQLite's CURRENT_TIMESTAMP ("YYYY-MM-DD HH:MM:SS")
+ * so lexicographic comparison in WHERE clauses works correctly.
+ */
+function getCurrentWeekStart(): string {
+  const now = new Date();
+  const day = now.getUTCDay(); // 0=Sun, 1=Mon, ...
+  const diff = day === 0 ? 6 : day - 1; // days since Monday
+  const monday = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() - diff));
+  return monday.toISOString().replace('T', ' ').replace('.000Z', '');
+}
+
+export interface WeeklyUsage {
+  used: number;
+  limit: number;
+  remaining: number;
+  allowed: boolean;
+}
+
+/**
+ * Count work items created on the free plan during the current week.
+ */
+export function getWeeklyUsage(): WeeklyUsage {
+  const db = getDb();
+  const weekStart = getCurrentWeekStart();
+  const projectRoot = getProjectRoot();
+
+  console.log('[usage] getWeeklyUsage called', { projectRoot, weekStart });
+
+  const row = db.prepare(
+    `SELECT COUNT(*) as count FROM work_items
+     WHERE plan_at_creation = 'free' AND created_at >= ?`
+  ).get(weekStart) as { count: number } | undefined;
+
+  const used = row?.count ?? 0;
+  const remaining = Math.max(0, FREE_WEEKLY_LIMIT - used);
+  const result = { used, limit: FREE_WEEKLY_LIMIT, remaining, allowed: remaining > 0 };
+
+  console.log('[usage] getWeeklyUsage result', { row, result });
+
+  return result;
+}

package/apps/dashboard/lib/kanban-utils.ts

@@ -0,0 +1,70 @@
+import type { InFlightItem, KanbanGroup, WorkItem } from '@/lib/db';
+
+export interface KanbanData {
+  inFlight: InFlightItem[];
+  backlog: Map<string, KanbanGroup>;
+  done: Map<string, KanbanGroup>;
+}
+
+// Helper to find item by ID in the kanban data
+export function findItemById(data: KanbanData, id: number): { item: InFlightItem; status: string } | null {
+  const inFlightItem = data.inFlight.find(item => item.id === id);
+  if (inFlightItem) return { item: inFlightItem, status: 'in_progress' };
+
+  for (const group of data.backlog.values()) {
+    const backlogItem = group.items.find(item => item.id === id);
+    if (backlogItem) return { item: backlogItem as InFlightItem, status: 'backlog' };
+  }
+
+  for (const group of data.done.values()) {
+    const doneItem = group.items.find(item => item.id === id);
+    if (doneItem) return { item: doneItem as InFlightItem, status: 'done' };
+  }
+
+  return null;
+}
+
+// Extract onboarding chore items from kanban data for the OnboardingWelcome component
+export function getOnboardingItems(data: KanbanData): WorkItem[] {
+  for (const group of data.backlog.values()) {
+    if (group.epicTitle === 'Project Planning') {
+      return group.items;
+    }
+  }
+  return [];
+}
+
+// Build a status map from kanban data (item id -> status string)
+export function buildStatusMap(kanbanData: KanbanData): Map<number, string> {
+  const map = new Map<number, string>();
+  for (const item of kanbanData.inFlight) {
+    map.set(item.id, item.status);
+  }
+  for (const group of kanbanData.backlog.values()) {
+    for (const item of group.items) {
+      map.set(item.id, item.status);
+    }
+  }
+  for (const group of kanbanData.done.values()) {
+    for (const item of group.items) {
+      map.set(item.id, item.status);
+    }
+  }
+  return map;
+}
+
+// Build a mode map from kanban data (feature id -> mode) for detecting mode transitions
+export function buildModeMap(kanbanData: KanbanData): Map<number, string | null> {
+  const map = new Map<number, string | null>();
+  const collectFeatures = (items: WorkItem[]) => {
+    for (const item of items) {
+      if (item.type === 'feature') {
+        map.set(item.id, item.mode);
+      }
+    }
+  };
+  collectFeatures(kanbanData.inFlight);
+  for (const group of kanbanData.backlog.values()) collectFeatures(group.items);
+  for (const group of kanbanData.done.values()) collectFeatures(group.items);
+  return map;
+}

package/apps/dashboard/lib/run-migrations.js

@@ -99,14 +99,36 @@ function runMigrations(betterDb) {
     )
   `);
 
-  // Get already-applied migrations
-  const applied = betterDb.prepare('SELECT id FROM migrations').all().map(r => r.id);
+  // Create _meta table for schema versioning
+  betterDb.exec(`
+    CREATE TABLE IF NOT EXISTS _meta (
+      key TEXT PRIMARY KEY,
+      value TEXT
+    )
+  `);
 
   // Load migration files
   const files = fs.readdirSync(migrationsDir)
     .filter(f => f.endsWith('.js') && f !== 'index.js' && !f.endsWith('.test.js'))
     .sort();
 
+  const knownMigrationCount = files.length;
+
+  // Check schema version for forward-compatibility
+  const versionRow = betterDb.prepare('SELECT value FROM _meta WHERE key = ?').get('schema_version');
+  const currentVersion = versionRow ? parseInt(versionRow.value, 10) : 0;
+
+  if (currentVersion > knownMigrationCount) {
+    console.warn(
+      `⚠️  Database schema version (${currentVersion}) is newer than this version of JettyPod supports (${knownMigrationCount}).` +
+      '\n   Please update JettyPod to avoid compatibility issues.'
+    );
+    return; // Don't run migrations — the DB is from a newer version
+  }
+
+  // Get already-applied migrations
+  const applied = betterDb.prepare('SELECT id FROM migrations').all().map(r => r.id);
+
   // Create shim for callback-based migration API
   const shim = createDbShim(betterDb);
 
@@ -140,6 +162,9 @@ function runMigrations(betterDb) {
       throw err;
     }
   }
+
+  // Update schema version to reflect current state
+  betterDb.prepare('INSERT OR REPLACE INTO _meta (key, value) VALUES (?, ?)').run('schema_version', String(knownMigrationCount));
 }
 
 module.exports = { runMigrations };

package/apps/dashboard/lib/session-state-machine.ts

@@ -43,6 +43,7 @@ export type SessionState = 'idle' | 'connecting' | 'streaming' | 'done' | 'error
 /** All possible state transition events */
 export type SessionEvent =
   | 'SEND'        // User sends a message
+  | 'QUEUE'       // User sends a message while streaming — queued for later
   | 'CONNECTED'   // Connection established, streaming begins
   | 'COMPLETE'    // Stream completed successfully
   | 'ERROR'       // An error occurred
@@ -82,11 +83,13 @@ const TRANSITIONS: Record<SessionState, Partial<Record<SessionEvent, SessionStat
     CLEAR: 'idle',
   },
   connecting: {
+    QUEUE: 'connecting', // Queue message while connecting (stays in same state)
     CONNECTED: 'streaming',
     ERROR: 'error',
     STOP: 'idle',
   },
   streaming: {
+    QUEUE: 'streaming',  // Queue message while streaming (stays in same state)
     COMPLETE: 'done',
     ERROR: 'error',
     STOP: 'idle',