feat(loop): add host session redirect on worktree loop completion

src/hooks/loop.ts

@@ -310,7 +310,7 @@ export function createLoopEventHandler(
         : `Loop ended: ${reason}`
 
       v2Client.tui.publish({
-        directory: state.worktreeDir,
+        directory: state.projectDir ?? state.worktreeDir,
         body: {
           type: 'tui.toast.show',
           properties: {
@@ -327,6 +327,17 @@ export function createLoopEventHandler(
 
     if (reason === 'completed' || reason === 'cancelled') {
       await commitAndCleanupWorktree(state)
+      if (state.worktree) {
+        try {
+          await v2Client.session.delete({
+            sessionID: sessionId,
+            directory: state.projectDir ?? state.worktreeDir,
+          })
+          logger.log(`Loop: deleted loop session ${sessionId} for ${state.loopName}`)
+        } catch (err) {
+          logger.error(`Loop: failed to delete loop session ${sessionId}`, err)
+        }
+      }
     }
 
     if (state.sandbox && state.sandboxContainer && sandboxManager) {

src/services/loop.ts

@@ -38,6 +38,7 @@ export interface LoopState {
   executionModel?: string
   auditorModel?: string
   workspaceId?: string
+  hostSessionId?: string
 }
 
 export interface LoopService {
@@ -108,6 +109,7 @@ export function createLoopService(
       executionModel: row.executionModel ?? undefined,
       auditorModel: row.auditorModel ?? undefined,
       workspaceId: row.workspaceId ?? undefined,
+      hostSessionId: row.hostSessionId ?? undefined,
     }
   }
 
@@ -137,6 +139,7 @@ export function createLoopService(
       terminationReason: state.terminationReason ?? null,
       completionSummary: state.completionSummary ?? null,
       workspaceId: state.workspaceId ?? null,
+      hostSessionId: state.hostSessionId ?? null,
     }
   }
 

src/storage/cli-helpers.ts

@@ -24,7 +24,7 @@ export function listLoopsFromDb(
            worktree_branch, project_dir, max_iterations, iteration, audit_count,
            error_count, phase, audit, execution_model, auditor_model,
            model_failed, sandbox, sandbox_container, started_at, completed_at,
-           termination_reason, completion_summary, workspace_id
+           termination_reason, completion_summary, workspace_id, host_session_id
     FROM loops
     WHERE project_id = ? AND status IN (${placeholders})
   `
@@ -80,6 +80,7 @@ interface LoopRowRaw {
   termination_reason: string | null
   completion_summary: string | null
   workspace_id: string | null
+  host_session_id: string | null
 }
 
 function mapRow(row: LoopRowRaw): LoopRow {
@@ -108,5 +109,6 @@ function mapRow(row: LoopRowRaw): LoopRow {
     terminationReason: row.termination_reason,
     completionSummary: row.completion_summary,
     workspaceId: row.workspace_id,
+    hostSessionId: row.host_session_id,
   }
 }

src/storage/migrations/108_add_host_session_id_to_loops.sql

@@ -0,0 +1 @@
+ALTER TABLE loops ADD COLUMN host_session_id TEXT;

src/storage/migrations/index.ts

@@ -78,4 +78,13 @@ export const migrations: Migration[] = [
       db.run(loadSql('107_add_workspace_id_to_loops.sql'))
     },
   },
+  {
+    id: '108',
+    description: 'Add host_session_id column to loops table for post-completion redirect',
+    apply: (db: Database) => {
+      const cols = db.prepare('PRAGMA table_info(loops)').all() as Array<{ name: string }>
+      if (cols.some((c) => c.name === 'host_session_id')) return
+      db.run(loadSql('108_add_host_session_id_to_loops.sql'))
+    },
+  },
 ]

src/storage/repos/loops-repo.ts

@@ -26,6 +26,7 @@ export interface LoopRow {
   terminationReason: string | null
   completionSummary: string | null
   workspaceId: string | null
+  hostSessionId: string | null
 }
 
 export interface LoopLargeFields {
@@ -47,6 +48,7 @@ export interface LoopsRepo {
   setAuditCount(projectId: string, loopName: string, count: number): void
   setCurrentSessionId(projectId: string, loopName: string, sessionId: string): void
   setWorkspaceId(projectId: string, loopName: string, workspaceId: string): void
+  setHostSessionId(projectId: string, loopName: string, hostSessionId: string): void
   setModelFailed(projectId: string, loopName: string, failed: boolean): void
   setLastAuditResult(projectId: string, loopName: string, text: string | null): void
   setSandboxContainer(projectId: string, loopName: string, containerName: string | null): void
@@ -98,6 +100,7 @@ function mapRow(row: LoopRowRaw): LoopRow {
     terminationReason: row.termination_reason,
     completionSummary: row.completion_summary,
     workspaceId: row.workspace_id,
+    hostSessionId: row.host_session_id,
   }
 }
 
@@ -126,6 +129,7 @@ interface LoopRowRaw {
   termination_reason: string | null
   completion_summary: string | null
   workspace_id: string | null
+  host_session_id: string | null
 }
 
 export function createLoopsRepo(db: Database): LoopsRepo {
@@ -135,8 +139,8 @@ export function createLoopsRepo(db: Database): LoopsRepo {
       worktree_branch, project_dir, max_iterations, iteration, audit_count,
       error_count, phase, audit, execution_model, auditor_model,
       model_failed, sandbox, sandbox_container, started_at, completed_at,
-      termination_reason, completion_summary, workspace_id
-    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      termination_reason, completion_summary, workspace_id, host_session_id
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `)
 
   const upsertLargeStmt = db.prepare(`
@@ -152,7 +156,7 @@ export function createLoopsRepo(db: Database): LoopsRepo {
            worktree_branch, project_dir, max_iterations, iteration, audit_count,
            error_count, phase, audit, execution_model, auditor_model,
            model_failed, sandbox, sandbox_container, started_at, completed_at,
-           termination_reason, completion_summary, workspace_id
+           termination_reason, completion_summary, workspace_id, host_session_id
     FROM loops
     WHERE project_id = ? AND loop_name = ?
   `)
@@ -168,7 +172,7 @@ export function createLoopsRepo(db: Database): LoopsRepo {
            worktree_branch, project_dir, max_iterations, iteration, audit_count,
            error_count, phase, audit, execution_model, auditor_model,
            model_failed, sandbox, sandbox_container, started_at, completed_at,
-           termination_reason, completion_summary, workspace_id
+           termination_reason, completion_summary, workspace_id, host_session_id
     FROM loops
     WHERE project_id = ? AND current_session_id = ?
   `)
@@ -178,7 +182,7 @@ export function createLoopsRepo(db: Database): LoopsRepo {
            worktree_branch, project_dir, max_iterations, iteration, audit_count,
            error_count, phase, audit, execution_model, auditor_model,
            model_failed, sandbox, sandbox_container, started_at, completed_at,
-           termination_reason, completion_summary, workspace_id
+           termination_reason, completion_summary, workspace_id, host_session_id
     FROM loops
     WHERE project_id = ? AND status IN
   `
@@ -223,6 +227,11 @@ export function createLoopsRepo(db: Database): LoopsRepo {
     WHERE project_id = ? AND loop_name = ?
   `)
 
+  const setHostSessionIdStmt = db.prepare(`
+    UPDATE loops SET host_session_id = ?
+    WHERE project_id = ? AND loop_name = ?
+  `)
+
   const setModelFailedStmt = db.prepare(`
     UPDATE loops SET model_failed = ?
     WHERE project_id = ? AND loop_name = ?
@@ -306,7 +315,8 @@ export function createLoopsRepo(db: Database): LoopsRepo {
         row.completedAt,
         row.terminationReason,
         row.completionSummary,
-        row.workspaceId
+        row.workspaceId,
+        row.hostSessionId
       )
       if (result.changes === 0) {
         // Conflict - row already exists
@@ -378,6 +388,10 @@ export function createLoopsRepo(db: Database): LoopsRepo {
       setWorkspaceIdStmt.run(workspaceId, projectId, loopName)
     },
 
+    setHostSessionId(projectId: string, loopName: string, hostSessionId: string): void {
+      setHostSessionIdStmt.run(hostSessionId, projectId, loopName)
+    },
+
     setModelFailed(projectId: string, loopName: string, failed: boolean): void {
       setModelFailedStmt.run(failed ? 1 : 0, projectId, loopName)
     },

src/tools/loop.ts

@@ -32,6 +32,7 @@ interface LoopSetupOptions {
   executionModel?: string
   auditorModel?: string
   onLoopStarted?: (loopName: string) => void
+  hostSessionId?: string
 }
 
 export async function setupLoop(
@@ -224,6 +225,7 @@ export async function setupLoop(
     executionModel: options.executionModel,
     auditorModel: options.auditorModel,
     workspaceId: options.worktree ? loopContext.workspaceId : undefined,
+    hostSessionId: options.hostSessionId,
   }
 
   // Plan is persisted into loop_large_fields.prompt by loopService.setState below.
@@ -367,6 +369,7 @@ export function createLoopTools(ctx: ToolContext): Record<string, ReturnType<typ
         title: z.string().describe('Short title for the session (shown in session list)'),
         worktree: z.boolean().optional().default(false).describe('Run in isolated git worktree instead of current directory'),
         loopName: z.string().optional().describe('Name for the loop (max 25 chars, auto-incremented if collision exists)'),
+        hostSessionId: z.string().optional().describe('Host session ID for post-completion redirect'),
       },
       execute: async (args, context) => {
         if (config.loop?.enabled === false) {
@@ -406,6 +409,7 @@ export function createLoopTools(ctx: ToolContext): Record<string, ReturnType<typ
           worktree: args.worktree,
           executionModel: executionModel,
           auditorModel: auditorModel,
+          hostSessionId: args.hostSessionId,
           onLoopStarted: (id) => loopHandler.startWatchdog(id),
         })
       },

src/tui.tsx

@@ -676,6 +676,7 @@ function PlanViewerDialog(props: {
             api: props.api,
             executionModel,
             auditorModel,
+            hostSessionId: props.sessionId,
           })
 
           if (launchResult) {
@@ -1124,6 +1125,8 @@ function Sidebar(props: { api: TuiPluginApi; opts: TuiOptions; sessionId?: strin
    * - Periodic polling for transient graph states (5s interval)
    * - Manual onRefresh callbacks from dialogs
    */
+  const redirectedSessions = new Set<string>()
+
   function refreshSidebarData() {
     if (!pid) return
 
@@ -1148,6 +1151,30 @@ function Sidebar(props: { api: TuiPluginApi; opts: TuiOptions; sessionId?: strin
       setHasPlan(plan !== null)
     }
 
+    // Auto-redirect if the currently-viewed session belongs to a loop that just completed
+    if (props.sessionId && !redirectedSessions.has(props.sessionId)) {
+      const ended = states.find(l =>
+        l.sessionId === props.sessionId
+        && !l.active
+        && l.terminationReason === 'completed'
+        && l.worktree
+        && l.hostSessionId,
+      )
+      if (ended) {
+        redirectedSessions.add(props.sessionId)
+        try {
+          props.api.route.navigate('session', { sessionID: ended.hostSessionId! })
+          props.api.ui.toast({
+            message: `Loop "${ended.name}" completed · click Forge sidebar to review`,
+            variant: 'success',
+            duration: 5000,
+          })
+        } catch (err) {
+          console.error('[forge] sidebar: failed to redirect after loop completion', err)
+        }
+      }
+    }
+
     // Refresh graph status from KV (scoped to current directory)
     const status = readGraphStatus(pid, undefined, directory)
     setGraphStatusRaw(status)

src/utils/loop-launch.ts

@@ -34,6 +34,7 @@ export interface FreshLoopOptions {
   auditorModel?: string
   /** Optional override for sandbox enabled state (for testing) */
   sandboxEnabled?: boolean
+  hostSessionId?: string
 }
 
 export interface LaunchResult {
@@ -44,6 +45,7 @@ export interface LaunchResult {
   worktreeDir?: string
   worktreeBranch?: string
   workspaceId?: string
+  hostSessionId?: string
 }
 
 /**
@@ -251,6 +253,7 @@ export async function launchFreshLoop(options: FreshLoopOptions): Promise<Launch
         terminationReason: null,
         completionSummary: null,
         workspaceId: workspaceId ?? null,
+        hostSessionId: options.hostSessionId ?? null,
       }
 
       const large: LoopLargeFields = {
@@ -376,5 +379,6 @@ export async function launchFreshLoop(options: FreshLoopOptions): Promise<Launch
     worktreeDir: sessionDirectory,
     worktreeBranch,
     workspaceId,
+    hostSessionId: options.hostSessionId,
   }
 }

src/utils/tui-refresh-helpers.ts

@@ -27,6 +27,7 @@ export type LoopInfo = {
   executionModel?: string
   auditorModel?: string
   workspaceId?: string
+  hostSessionId?: string
 }
 
 /**
@@ -57,7 +58,7 @@ export function readLoopStates(projectId: string, dbPathOverride?: string): Loop
              worktree_branch, project_dir, max_iterations, iteration, audit_count,
              error_count, phase, audit, execution_model, auditor_model,
              model_failed, sandbox, sandbox_container, started_at, completed_at,
-             termination_reason, completion_summary, workspace_id
+             termination_reason, completion_summary, workspace_id, host_session_id
       FROM loops
       WHERE project_id = ?
       ORDER BY started_at DESC
@@ -87,6 +88,7 @@ export function readLoopStates(projectId: string, dbPathOverride?: string): Loop
       termination_reason: string | null
       completion_summary: string | null
       workspace_id: string | null
+      host_session_id: string | null
     }>
 
     const loops: LoopInfo[] = []
@@ -107,6 +109,7 @@ export function readLoopStates(projectId: string, dbPathOverride?: string): Loop
         executionModel: row.execution_model ?? undefined,
         auditorModel: row.auditor_model ?? undefined,
         workspaceId: row.workspace_id ?? undefined,
+        hostSessionId: row.host_session_id ?? undefined,
       })
     }
     return loops
@@ -139,7 +142,7 @@ export function readLoopByName(projectId: string, loopName: string, dbPathOverri
              worktree_branch, project_dir, max_iterations, iteration, audit_count,
              error_count, phase, audit, execution_model, auditor_model,
              model_failed, sandbox, sandbox_container, started_at, completed_at,
-             termination_reason, completion_summary, workspace_id
+             termination_reason, completion_summary, workspace_id, host_session_id
       FROM loops
       WHERE project_id = ? AND loop_name = ?
     `).get(projectId, loopName) as {
@@ -167,6 +170,7 @@ export function readLoopByName(projectId: string, loopName: string, dbPathOverri
       termination_reason: string | null
       completion_summary: string | null
       workspace_id: string | null
+      host_session_id: string | null
     } | null
 
     if (!row) return null
@@ -187,6 +191,7 @@ export function readLoopByName(projectId: string, loopName: string, dbPathOverri
       executionModel: row.execution_model ?? undefined,
       auditorModel: row.auditor_model ?? undefined,
       workspaceId: row.workspace_id ?? undefined,
+      hostSessionId: row.host_session_id ?? undefined,
     }
   } catch {
     return null

test/cli-cancel.test.ts

@@ -35,6 +35,7 @@ function createTestDb(tempDir: string): Database {
       termination_reason   TEXT,
       completion_summary   TEXT,
       workspace_id   TEXT,
+      host_session_id   TEXT,
       PRIMARY KEY (project_id, loop_name)
     )
   `)

test/cli-status.test.ts

@@ -35,6 +35,7 @@ function createTestDb(tempDir: string): Database {
       termination_reason TEXT,
       completion_summary TEXT,
       workspace_id TEXT,
+      host_session_id TEXT,
       PRIMARY KEY (project_id, loop_name)
     )
   `)