jettypod 4.4.106 → 4.4.108

package/apps/dashboard/app/api/claude/sessions/route.ts

@@ -1,5 +1,5 @@
 import { NextResponse } from 'next/server';
-import { listSessions, createSession, linkSession, getSessionByWorkItem } from '@/lib/db';
+import { listSessions, createSession, linkSession, getSessionByWorkItem, closeSession } from '@/lib/db';
 
 export const dynamic = 'force-dynamic';
 
@@ -59,3 +59,25 @@ export async function PATCH(request: Request) {
     return NextResponse.json({ error: 'Failed to link session' }, { status: 500 });
   }
 }
+
+// DELETE /api/claude/sessions - Close a session
+export async function DELETE(request: Request) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const sessionId = searchParams.get('sessionId');
+
+    if (!sessionId) {
+      return NextResponse.json({ error: 'sessionId required' }, { status: 400 });
+    }
+
+    const success = closeSession(parseInt(sessionId, 10));
+    if (!success) {
+      return NextResponse.json({ error: 'Session not found' }, { status: 404 });
+    }
+
+    return NextResponse.json({ success: true });
+  } catch (error) {
+    console.error('Failed to close session:', error);
+    return NextResponse.json({ error: 'Failed to close session' }, { status: 500 });
+  }
+}

package/apps/dashboard/app/layout.tsx

@@ -1,6 +1,7 @@
 import type { Metadata } from "next";
 import { Geist, Geist_Mono } from "next/font/google";
 import "./globals.css";
+import { getProjectName } from "@/lib/db";
 
 const geistSans = Geist({
   variable: "--font-geist-sans",
@@ -12,10 +13,13 @@ const geistMono = Geist_Mono({
   subsets: ["latin"],
 });
 
-export const metadata: Metadata = {
-  title: "Create Next App",
-  description: "Generated by create next app",
-};
+export function generateMetadata(): Metadata {
+  const projectName = getProjectName();
+  return {
+    title: `JettyPod—${projectName}`,
+    description: "JettyPod dashboard",
+  };
+}
 
 export default function RootLayout({
   children,

package/apps/dashboard/components/ClaudePanel.tsx

@@ -19,6 +19,25 @@ function unescapeContent(content: string | undefined): string {
     .replace(/\\"/g, '"');
 }
 
+// Detect skill file content that shouldn't be displayed to users
+// Skills are internal context for Claude, not user-facing output
+function isSkillContent(content: string | undefined): boolean {
+  if (!content) return false;
+  const skillPatterns = [
+    'FORBIDDEN during this skill',
+    'ALLOWED during this skill',
+    'READ-ONLY PHASE',
+    'Base directory for this skill:',
+    '# Request Routing Skill',
+    '# Simple Improvement Skill',
+    '# Bug Planning Skill',
+    '# Chore Planning Skill',
+    '# Feature Planning Skill',
+    '# Epic Planning Skill',
+  ];
+  return skillPatterns.some(pattern => content.includes(pattern));
+}
+
 interface ClaudePanelProps {
   isOpen: boolean;
   workItemId: string;
@@ -40,6 +59,7 @@ interface ClaudePanelProps {
   standaloneSessions?: SessionItem[];
   onSelectSession?: (sessionId: string) => void;
   onNewSession?: () => void;
+  onCloseSession?: (sessionId: string) => void;
   showSessionList?: boolean;
 }
 
@@ -62,6 +82,7 @@ export function ClaudePanel({
   standaloneSessions = [],
   onSelectSession,
   onNewSession,
+  onCloseSession,
   showSessionList: showSessionListProp,
 }: ClaudePanelProps) {
   // Show session list by default when no active session, or when explicitly requested
@@ -218,6 +239,7 @@ export function ClaudePanel({
               sessions={standaloneSessions}
               onSelectSession={onSelectSession || (() => {})}
               onNewSession={onNewSession || (() => {})}
+              onCloseSession={onCloseSession}
             />
           ) : (
             <>
@@ -280,6 +302,10 @@ function MessageBlock({ message }: { message: ClaudeMessage }) {
   }
 
   if (message.type === 'assistant' || message.type === 'text') {
+    // Hide skill content - it's internal context, not user-facing output
+    if (isSkillContent(message.content)) {
+      return null;
+    }
     return (
       <div className="bg-zinc-800/50 rounded-lg p-3" data-testid="output-block">
         <div className="text-zinc-200 text-sm [&_p]:my-1 [&_h1]:text-lg [&_h1]:font-bold [&_h1]:my-2 [&_h2]:text-base [&_h2]:font-semibold [&_h2]:my-2 [&_h3]:font-semibold [&_h3]:my-1 [&_pre]:bg-zinc-900 [&_pre]:p-2 [&_pre]:rounded [&_pre]:overflow-x-auto [&_pre]:my-2 [&_pre]:text-xs [&_code]:text-zinc-300 [&_code]:bg-zinc-900/50 [&_code]:px-1 [&_code]:rounded [&_pre_code]:bg-transparent [&_pre_code]:p-0 [&_ul]:list-disc [&_ul]:ml-4 [&_ol]:list-decimal [&_ol]:ml-4 [&_li]:my-0.5 [&_a]:text-blue-400 [&_a]:underline [&_blockquote]:border-l-2 [&_blockquote]:border-zinc-500 [&_blockquote]:pl-3 [&_blockquote]:italic [&_table]:text-xs [&_table]:w-full [&_th]:bg-zinc-800 [&_th]:px-2 [&_th]:py-1 [&_th]:text-left [&_td]:px-2 [&_td]:py-1 [&_td]:border-t [&_td]:border-zinc-700">
@@ -303,14 +329,9 @@ function MessageBlock({ message }: { message: ClaudeMessage }) {
     );
   }
 
+  // Hide tool_result messages - they're noise (Claude Code terminal doesn't show them either)
   if (message.type === 'tool_result') {
-    return (
-      <div className="bg-zinc-800/30 border border-zinc-700/50 rounded-lg p-3">
-        <pre className="text-xs text-zinc-400 overflow-x-auto whitespace-pre-wrap">
-          {unescapeContent(message.result || message.content)}
-        </pre>
-      </div>
-    );
+    return null;
   }
 
   if (message.type === 'error') {

package/apps/dashboard/components/RealTimeKanbanWrapper.tsx

@@ -533,6 +533,32 @@ function RealTimeKanbanContent({ initialData, initialDecisions }: RealTimeKanban
     setShowSessionList(false);
   }, [sessions, standaloneSessions]);
 
+  const handleCloseSession = useCallback(async (sessionId: string) => {
+    // Call API to mark as completed in DB
+    try {
+      await fetch(`/api/claude/sessions?sessionId=${sessionId}`, {
+        method: 'DELETE',
+      });
+    } catch (error) {
+      console.error('Failed to close session:', error);
+    }
+
+    // Remove from standalone sessions list
+    setStandaloneSessions(prev => prev.filter(s => s.id !== sessionId));
+
+    // Remove from in-memory sessions
+    setSessions(prev => {
+      const updated = new Map(prev);
+      updated.delete(sessionId);
+      return updated;
+    });
+
+    // If this was the active session, clear it
+    if (activeSessionId === sessionId) {
+      setActiveSessionId(null);
+    }
+  }, [activeSessionId]);
+
   const handleOpenSessionList = useCallback(() => {
     setShowSessionList(true);
     setClaudePanelOpen(true);
@@ -639,6 +665,7 @@ function RealTimeKanbanContent({ initialData, initialDecisions }: RealTimeKanban
         standaloneSessions={standaloneSessions}
         onSelectSession={handleSelectStandaloneSession}
         onNewSession={handleNewSession}
+        onCloseSession={handleCloseSession}
         showSessionList={showSessionList}
       />
     </div>

package/apps/dashboard/components/SessionList.tsx

@@ -14,12 +14,14 @@ interface SessionListProps {
   sessions: SessionItem[];
   onSelectSession: (sessionId: string) => void;
   onNewSession: () => void;
+  onCloseSession?: (sessionId: string) => void;
 }
 
 export function SessionList({
   sessions,
   onSelectSession,
   onNewSession,
+  onCloseSession,
 }: SessionListProps) {
   return (
     <div className="flex-1 flex flex-col" data-testid="session-list">
@@ -46,31 +48,48 @@ export function SessionList({
         ) : (
           <div className="divide-y divide-zinc-800">
             {sessions.map((session) => (
-              <motion.button
+              <div
                 key={session.id}
-                onClick={() => onSelectSession(session.id)}
-                className="w-full px-4 py-3 text-left hover:bg-zinc-800/50 transition-colors"
-                whileHover={{ x: 4 }}
+                className="flex items-center hover:bg-zinc-800/50 transition-colors"
                 data-testid={`session-item-${session.id}`}
               >
-                <div className="flex items-center gap-2">
-                  <SessionIcon hasFeature={!!session.featureId} />
-                  <div className="flex-1 min-w-0">
-                    <p className="text-sm font-medium text-white truncate">
-                      {session.featureId ? session.featureTitle : session.title}
-                    </p>
-                    {session.featureId && (
-                      <span className="inline-flex items-center px-1.5 py-0.5 mt-1 text-xs font-medium bg-blue-900/50 text-blue-300 rounded">
-                        #{session.featureId}
-                      </span>
-                    )}
-                    {!session.featureId && (
-                      <p className="text-xs text-zinc-500 mt-0.5">Unlinked session</p>
-                    )}
+                <motion.button
+                  onClick={() => onSelectSession(session.id)}
+                  className="flex-1 px-4 py-3 text-left"
+                  whileHover={{ x: 4 }}
+                >
+                  <div className="flex items-center gap-2">
+                    <SessionIcon hasFeature={!!session.featureId} />
+                    <div className="flex-1 min-w-0">
+                      <p className="text-sm font-medium text-white truncate">
+                        {session.featureId ? session.featureTitle : session.title}
+                      </p>
+                      {session.featureId && (
+                        <span className="inline-flex items-center px-1.5 py-0.5 mt-1 text-xs font-medium bg-blue-900/50 text-blue-300 rounded">
+                          #{session.featureId}
+                        </span>
+                      )}
+                      {!session.featureId && (
+                        <p className="text-xs text-zinc-500 mt-0.5">Unlinked session</p>
+                      )}
+                    </div>
+                    <ChevronIcon />
                   </div>
-                  <ChevronIcon />
-                </div>
-              </motion.button>
+                </motion.button>
+                {onCloseSession && (
+                  <button
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onCloseSession(session.id);
+                    }}
+                    className="p-2 mr-2 rounded hover:bg-zinc-700 text-zinc-500 hover:text-zinc-300 transition-colors"
+                    aria-label="Close session"
+                    data-testid={`close-session-${session.id}`}
+                  >
+                    <CloseIcon />
+                  </button>
+                )}
+              </div>
             ))}
           </div>
         )}
@@ -118,3 +137,21 @@ function ChevronIcon() {
     </svg>
   );
 }
+
+function CloseIcon() {
+  return (
+    <svg
+      className="w-4 h-4"
+      fill="none"
+      stroke="currentColor"
+      viewBox="0 0 24 24"
+    >
+      <path
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeWidth={2}
+        d="M6 18L18 6M6 6l12 12"
+      />
+    </svg>
+  );
+}

package/apps/dashboard/hooks/useClaudeSessions.ts

@@ -23,6 +23,7 @@ interface UseClaudeSessionsReturn {
   switchSession: (workItemId: string) => void;
   stopSession: (workItemId: string) => void;
   retrySession: (workItemId: string) => void;
+  closeSession: (workItemId: string, dbSessionId?: number) => Promise<void>;
   closeAllSessions: () => void;
   isSessionRunning: (workItemId: string) => boolean;
 }
@@ -234,6 +235,38 @@ export function useClaudeSessions(): UseClaudeSessionsReturn {
     }
   }, [sessions, startSession]);
 
+  const closeSession = useCallback(async (workItemId: string, dbSessionId?: number) => {
+    const session = sessions.get(workItemId);
+
+    // Abort if running
+    if (session?.abortController) {
+      session.abortController.abort();
+    }
+
+    // Call API to mark as completed in DB (if we have a DB session ID)
+    if (dbSessionId) {
+      try {
+        await fetch(`/api/claude/sessions?sessionId=${dbSessionId}`, {
+          method: 'DELETE',
+        });
+      } catch (error) {
+        console.error('Failed to close session in DB:', error);
+      }
+    }
+
+    // Remove from local state
+    setSessions((prev) => {
+      const newMap = new Map(prev);
+      newMap.delete(workItemId);
+      return newMap;
+    });
+
+    // If this was the active session, clear it
+    if (activeSessionId === workItemId) {
+      setActiveSessionId(null);
+    }
+  }, [sessions, activeSessionId]);
+
   const closeAllSessions = useCallback(() => {
     sessions.forEach((session) => {
       if (session.abortController) {
@@ -259,6 +292,7 @@ export function useClaudeSessions(): UseClaudeSessionsReturn {
     switchSession,
     stopSession,
     retrySession,
+    closeSession,
     closeAllSessions,
     isSessionRunning,
   };

package/apps/dashboard/lib/db.ts

@@ -649,3 +649,18 @@ export function getSession(sessionId: number): ClaudeSession | null {
     db.close();
   }
 }
+
+// Close a session by ID (mark as completed)
+export function closeSession(sessionId: number): boolean {
+  const db = getWriteDb();
+  try {
+    const result = db.prepare(`
+      UPDATE claude_sessions
+      SET status = 'completed', completed_at = datetime('now')
+      WHERE id = ?
+    `).run(sessionId);
+    return result.changes > 0;
+  } finally {
+    db.close();
+  }
+}

package/jettypod.js

@@ -302,7 +302,9 @@ JettyPod: Structured workflow system with skills that guide complex workflows.
 
 ## ⚠️ CRITICAL: All Work Starts with request-routing
 
-**WHY:** request-routing creates a safe workspace (worktree) where your changes can actually be committed. Without it, you'll edit files on main, then discover the pre-commit hook blocks you—leaving uncommitted changes that can't be saved.
+**WHY:** The workflow initiated by request-routing eventually creates a safe workspace (worktree) where your changes can actually be committed. Without starting this workflow, you'll edit files on main, then discover the pre-commit hook blocks you—leaving uncommitted changes that can't be saved.
+
+**WHEN WORKTREE IS CREATED:** The worktree is created when \`jettypod work start\` runs—this happens in mode skills (speed-mode, stable-mode, chore-mode, bug-mode) or simple-improvement, NOT immediately in request-routing. Planning skills (epic-planning, feature-planning, chore-planning, bug-planning) are READ-ONLY investigation phases—do not edit files during planning.
 
 **FIRST RESPONSE RULE:** If user describes ANY code change, your FIRST action must be invoking request-routing. Not after reading files. Not after understanding the problem. FIRST.
 
@@ -313,10 +315,10 @@ JettyPod: Structured workflow system with skills that guide complex workflows.
 - "refactor", "migrate", "upgrade" (technical work)
 - "I noticed...", "I'm thinking..." (when followed by desired change)
 
-**⚠️ ANTI-PATTERN: Do NOT edit files before invoking request-routing.**
+**⚠️ ANTI-PATTERN: Do NOT edit files before the worktree exists.**
 Wrong: See problem → edit files → realize you're on main → ask about workflow
 Wrong: Read files → understand problem → try to fix → get blocked → create work item
-Right: User describes work → invoke request-routing → skill creates worktree → then edit
+Right: User describes work → invoke request-routing → complete workflow until \`work start\` creates worktree → then edit
 
 ## ⚠️ CRITICAL: Skills are MANDATORY for workflows
 Skills auto-activate and MUST complete their full workflow:

package/lib/git-hooks/post-merge

@@ -48,8 +48,9 @@ function backupDatabase() {
 
     fs.copyFileSync(sourcePath, backupPath);
 
-    // Stage the backup file
-    execSync(`git add "${backupPath}"`, {
+    // Stage the backup file (force-add because .jettypod-backup is gitignored
+    // to prevent worktree symlink corruption, but backups must be committed)
+    execSync(`git add -f "${backupPath}"`, {
       stdio: ['pipe', 'pipe', 'pipe']
     });
 

package/lib/git-hooks/pre-commit

@@ -43,7 +43,12 @@ function checkBranchRestriction() {
     console.error('  1. Undo your edits:     git checkout .');
     console.error('  2. Start the workflow:  Invoke request-routing skill');
     console.error('');
-    console.error('The skill creates a worktree where commits are allowed.');
+    console.error('HOW IT WORKS:');
+    console.error('  request-routing → planning skill → mode skill → work start');
+    console.error('');
+    console.error('  The worktree is created when `jettypod work start` runs.');
+    console.error('  Planning skills are READ-ONLY investigation phases.');
+    console.error('  Only edit files AFTER the worktree exists.');
     console.error('');
     return false;
   } catch (err) {

package/lib/work-commands/index.js

@@ -2006,15 +2006,32 @@ async function testsMerge(featureId) {
     return Promise.reject(new Error(`Failed to check worktree status: ${err.message}`));
   }
 
-  // Check if there are commits to merge
+  // Detect default branch (main/master)
+  let defaultBranch;
   try {
-    const mainBranch = execSync('git symbolic-ref refs/remotes/origin/HEAD', {
+    defaultBranch = execSync('git symbolic-ref refs/remotes/origin/HEAD', {
       cwd: gitRoot,
       encoding: 'utf8',
       stdio: 'pipe'
     }).trim().replace('refs/remotes/origin/', '');
+  } catch {
+    // Fallback: check which common branch names exist
+    try {
+      execSync('git rev-parse --verify main', { cwd: gitRoot, stdio: 'pipe' });
+      defaultBranch = 'main';
+    } catch {
+      try {
+        execSync('git rev-parse --verify master', { cwd: gitRoot, stdio: 'pipe' });
+        defaultBranch = 'master';
+      } catch {
+        return Promise.reject(new Error('Could not detect default branch (tried main, master)'));
+      }
+    }
+  }
 
-    const commitCount = execSync(`git rev-list --count ${mainBranch}..${branchName}`, {
+  // Check if there are commits to merge
+  try {
+    const commitCount = execSync(`git rev-list --count ${defaultBranch}..${branchName}`, {
       cwd: gitRoot,
       encoding: 'utf8',
       stdio: 'pipe'
@@ -2028,10 +2045,10 @@ async function testsMerge(featureId) {
     console.log('⚠️  Could not check commit count, proceeding with merge');
   }
 
-  // Merge the test branch to main
+  // Merge the test branch to default branch
   try {
-    // First, ensure we're on main
-    execSync('git checkout main', {
+    // First, ensure we're on the default branch
+    execSync(`git checkout ${defaultBranch}`, {
       cwd: gitRoot,
       encoding: 'utf8',
       stdio: 'pipe'
@@ -2044,7 +2061,7 @@ async function testsMerge(featureId) {
       stdio: 'pipe'
     });
 
-    console.log('✅ Merged test branch to main');
+    console.log(`✅ Merged test branch to ${defaultBranch}`);
   } catch (err) {
     return Promise.reject(new Error(
       `Merge failed: ${err.message}\n\n` +
@@ -2288,15 +2305,32 @@ async function prototypeMerge(workItemId) {
     return Promise.reject(new Error(`Failed to check worktree status: ${err.message}`));
   }
 
-  // Check if there are commits to merge
+  // Detect default branch (main/master)
+  let defaultBranch;
   try {
-    const mainBranch = execSync('git symbolic-ref refs/remotes/origin/HEAD', {
+    defaultBranch = execSync('git symbolic-ref refs/remotes/origin/HEAD', {
       cwd: gitRoot,
       encoding: 'utf8',
       stdio: 'pipe'
     }).trim().replace('refs/remotes/origin/', '');
+  } catch {
+    // Fallback: check which common branch names exist
+    try {
+      execSync('git rev-parse --verify main', { cwd: gitRoot, stdio: 'pipe' });
+      defaultBranch = 'main';
+    } catch {
+      try {
+        execSync('git rev-parse --verify master', { cwd: gitRoot, stdio: 'pipe' });
+        defaultBranch = 'master';
+      } catch {
+        return Promise.reject(new Error('Could not detect default branch (tried main, master)'));
+      }
+    }
+  }
 
-    const commitCount = execSync(`git rev-list --count ${mainBranch}..${branchName}`, {
+  // Check if there are commits to merge
+  try {
+    const commitCount = execSync(`git rev-list --count ${defaultBranch}..${branchName}`, {
       cwd: gitRoot,
       encoding: 'utf8',
       stdio: 'pipe'
@@ -2310,10 +2344,10 @@ async function prototypeMerge(workItemId) {
     console.log('⚠️  Could not check commit count, proceeding with merge');
   }
 
-  // Merge the prototype branch to main
+  // Merge the prototype branch to default branch
   try {
-    // First, ensure we're on main
-    execSync('git checkout main', {
+    // First, ensure we're on the default branch
+    execSync(`git checkout ${defaultBranch}`, {
       cwd: gitRoot,
       encoding: 'utf8',
       stdio: 'pipe'
@@ -2326,7 +2360,7 @@ async function prototypeMerge(workItemId) {
       stdio: 'pipe'
     });
 
-    console.log('✅ Merged prototype branch to main');
+    console.log(`✅ Merged prototype branch to ${defaultBranch}`);
   } catch (err) {
     return Promise.reject(new Error(
       `Merge failed: ${err.message}\n\n` +

package/lib/work-tracking/index.js

@@ -558,6 +558,17 @@ function updateStatus(id, status) {
 
               // CRITICAL: Merge to main BEFORE cleanup
               if (isGitRepo()) {
+                // Check if branch exists before attempting merge
+                const branchExists = execSync(`git branch --list ${worktree.branch_name}`, {
+                  cwd: gitRoot,
+                  encoding: 'utf8',
+                  stdio: 'pipe'
+                }).trim();
+
+                if (!branchExists) {
+                  // Branch is gone (likely already merged/deleted) - skip merge, just cleanup stale record
+                  console.warn(`⚠️  Branch "${worktree.branch_name}" no longer exists - cleaning up stale record`);
+                } else {
                 try {
                   // Test merge to detect conflicts (without actually merging)
                   const mergeResult = execSync(`git merge --no-commit --no-ff ${worktree.branch_name}`, {
@@ -624,6 +635,7 @@ function updateStatus(id, status) {
                   console.warn(`   Worktree preserved for manual resolution`);
                   throw new Error('Merge failed - worktree preserved');
                 }
+                } // end else (branch exists)
               }
 
               // Only cleanup after successful merge

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jettypod",
-  "version": "4.4.106",
+  "version": "4.4.108",
   "description": "AI-powered development workflow manager with TDD, BDD, and automatic test generation",
   "main": "jettypod.js",
   "bin": {