@shepai/cli 1.167.0 → 1.168.0-pr505.7d2bb14

package/dist/packages/core/src/infrastructure/repositories/sqlite-settings.repository.js

@@ -66,11 +66,14 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         approval_gate_allow_merge, approval_gate_push_on_impl_complete,
         feature_flag_skills, feature_flag_env_deploy, feature_flag_debug, feature_flag_github_import, feature_flag_adopt_branch, feature_flag_git_rebase_sync,
         feature_flag_react_file_manager,
+        feature_flag_inventory,
         workflow_enable_evidence, workflow_commit_evidence,
         hide_ci_status, default_fast_mode,
         interactive_agent_enabled, interactive_agent_auto_timeout_minutes,
         interactive_agent_max_concurrent_sessions,
-        auto_archive_delay_minutes
+        auto_archive_delay_minutes,
+        stage_timeout_fast_implement_ms,
+        fab_position_swapped
       ) VALUES (
         @id, @created_at, @updated_at,
         @model_analyze, @model_requirements, @model_plan, @model_implement, @model_default,
@@ -95,11 +98,14 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         @approval_gate_allow_merge, @approval_gate_push_on_impl_complete,
         @feature_flag_skills, @feature_flag_env_deploy, @feature_flag_debug, @feature_flag_github_import, @feature_flag_adopt_branch, @feature_flag_git_rebase_sync,
         @feature_flag_react_file_manager,
+        @feature_flag_inventory,
         @workflow_enable_evidence, @workflow_commit_evidence,
         @hide_ci_status, @default_fast_mode,
         @interactive_agent_enabled, @interactive_agent_auto_timeout_minutes,
         @interactive_agent_max_concurrent_sessions,
-        @auto_archive_delay_minutes
+        @auto_archive_delay_minutes,
+        @stage_timeout_fast_implement_ms,
+        @fab_position_swapped
       )
     `);
         // Execute with named parameters (safe from SQL injection)
@@ -195,6 +201,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         feature_flag_adopt_branch = @feature_flag_adopt_branch,
         feature_flag_git_rebase_sync = @feature_flag_git_rebase_sync,
         feature_flag_react_file_manager = @feature_flag_react_file_manager,
+        feature_flag_inventory = @feature_flag_inventory,
         workflow_enable_evidence = @workflow_enable_evidence,
         workflow_commit_evidence = @workflow_commit_evidence,
         hide_ci_status = @hide_ci_status,
@@ -202,7 +209,9 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         interactive_agent_enabled = @interactive_agent_enabled,
         interactive_agent_auto_timeout_minutes = @interactive_agent_auto_timeout_minutes,
         interactive_agent_max_concurrent_sessions = @interactive_agent_max_concurrent_sessions,
-        auto_archive_delay_minutes = @auto_archive_delay_minutes
+        auto_archive_delay_minutes = @auto_archive_delay_minutes,
+        stage_timeout_fast_implement_ms = @stage_timeout_fast_implement_ms,
+        fab_position_swapped = @fab_position_swapped
       WHERE id = @id
     `);
         // Execute with named parameters (safe from SQL injection)

package/dist/packages/core/src/infrastructure/services/agents/common/executors/claude-code-interactive-executor.service.d.ts

@@ -32,6 +32,9 @@
  *   errors when shep itself is running inside a Claude Code session.
  * - SDK message types are mapped to our own InteractiveAgentEvent to
  *   keep the application layer decoupled from SDK specifics.
+ * - AskUserQuestion is intercepted via the SDK's `canUseTool` callback,
+ *   which pauses the stream until the user responds. The callback delegates
+ *   to the `onUserQuestion` option provided by the session service.
  */
 import type { IInteractiveAgentExecutor, InteractiveAgentOptions, InteractiveAgentSessionHandle } from '../../../../../application/ports/output/agents/interactive-agent-executor.interface.js';
 export declare class ClaudeCodeInteractiveExecutor implements IInteractiveAgentExecutor {

package/dist/packages/core/src/infrastructure/services/agents/common/executors/claude-code-interactive-executor.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-code-interactive-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/claude-code-interactive-executor.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAOH,OAAO,KAAK,EACV,yBAAyB,EACzB,uBAAuB,EACvB,6BAA6B,EAE9B,MAAM,wFAAwF,CAAC;AAgBhG,qBAAa,6BAA8B,YAAW,yBAAyB;IACvE,aAAa,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAOvF,aAAa,CACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,6BAA6B,CAAC;IAOzC;;;;;;OAMG;IACH,OAAO,CAAC,OAAO;IAmBf,OAAO,CAAC,eAAe;IAkBvB,OAAO,CAAC,WAAW;IAoBnB;;;;;;OAMG;YACY,SAAS;IA6BxB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,aAAa;CAuPtB"}
+{"version":3,"file":"claude-code-interactive-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/claude-code-interactive-executor.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAOH,OAAO,KAAK,EACV,yBAAyB,EACzB,uBAAuB,EACvB,6BAA6B,EAI9B,MAAM,wFAAwF,CAAC;AAgBhG,qBAAa,6BAA8B,YAAW,yBAAyB;IACvE,aAAa,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAOvF,aAAa,CACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,6BAA6B,CAAC;IAOzC;;;;;;OAMG;IACH,OAAO,CAAC,OAAO;IAmBf,OAAO,CAAC,eAAe;IAgDvB,OAAO,CAAC,WAAW;IAqCnB;;;;;;OAMG;YACY,SAAS;IA6BxB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,aAAa;CA4PtB"}

package/dist/packages/core/src/infrastructure/services/agents/common/executors/claude-code-interactive-executor.service.js

@@ -32,6 +32,9 @@
  *   errors when shep itself is running inside a Claude Code session.
  * - SDK message types are mapped to our own InteractiveAgentEvent to
  *   keep the application layer decoupled from SDK specifics.
+ * - AskUserQuestion is intercepted via the SDK's `canUseTool` callback,
+ *   which pauses the stream until the user responds. The callback delegates
+ *   to the `onUserQuestion` option provided by the session service.
  */
 import { unstable_v2_createSession, unstable_v2_resumeSession, } from '@anthropic-ai/claude-agent-sdk';
 /** Default model used when options.model is not specified. */
@@ -83,9 +86,37 @@ export class ClaudeCodeInteractiveExecutor {
     buildSdkOptions(options) {
         // Strip CLAUDECODE env var to prevent nested-session detection errors.
         const { CLAUDECODE: _, ...cleanEnv } = process.env;
+        // Build the canUseTool callback that intercepts AskUserQuestion.
+        // When the agent calls AskUserQuestion, this callback:
+        // 1. Delegates to onUserQuestion (which notifies the UI and waits for user response)
+        // 2. Returns { behavior: 'allow', updatedInput } with the user's answers injected
+        // 3. The SDK passes the updated input to AskUserQuestion, which sees pre-filled answers
+        //
+        // For ALL other tools: auto-allow (same effect as bypassPermissions).
+        const canUseTool = options.onUserQuestion
+            ? async (toolName, input, opts) => {
+                if (toolName === 'AskUserQuestion') {
+                    const questions = input.questions ?? [];
+                    const answers = await options.onUserQuestion({
+                        toolCallId: opts.toolUseID,
+                        questions,
+                    });
+                    // Inject answers into the tool input so the SDK treats it as already answered
+                    return {
+                        behavior: 'allow',
+                        updatedInput: { ...input, answers },
+                    };
+                }
+                // Auto-allow all other tools
+                return { behavior: 'allow' };
+            }
+            : undefined;
         return {
             model: options.model ?? DEFAULT_MODEL,
-            permissionMode: 'bypassPermissions',
+            // When onUserQuestion is provided, use canUseTool to intercept AskUserQuestion
+            // while auto-allowing everything else (replaces bypassPermissions).
+            // When not provided, use bypassPermissions for backward compatibility.
+            ...(canUseTool ? { canUseTool } : { permissionMode: 'bypassPermissions' }),
             env: cleanEnv,
             // Forward system prompt using preset+append pattern
             ...(options.systemPrompt && {
@@ -106,6 +137,22 @@ export class ClaudeCodeInteractiveExecutor {
                 return resolvedSessionId;
             },
             send: (message) => sdkSession.send(message),
+            sendToolResult: (toolResult) => sdkSession.send({
+                type: 'user',
+                session_id: sdkSession.sessionId,
+                parent_tool_use_id: toolResult.toolCallId,
+                tool_use_result: toolResult.result,
+                message: {
+                    role: 'user',
+                    content: [
+                        {
+                            type: 'tool_result',
+                            tool_use_id: toolResult.toolCallId,
+                            content: JSON.stringify(toolResult.result),
+                        },
+                    ],
+                },
+            }),
             stream: () => this.mapStream(sdkSession, (id) => (resolvedSessionId = id)),
             close: async () => sdkSession.close(),
             abort: () => {
@@ -189,11 +236,17 @@ export class ClaudeCodeInteractiveExecutor {
                             }
                         }
                         else if (block.type === 'tool_use') {
-                            events.push({
-                                type: 'tool_use',
-                                label: block.name,
-                                detail: JSON.stringify(block.input ?? {}),
-                            });
+                            // AskUserQuestion is handled by canUseTool callback — don't emit as tool_use
+                            if (block.name === 'AskUserQuestion') {
+                                // Silently skip — the canUseTool callback already handled this
+                            }
+                            else {
+                                events.push({
+                                    type: 'tool_use',
+                                    label: block.name,
+                                    detail: JSON.stringify(block.input ?? {}),
+                                });
+                            }
                         }
                     }
                 }

package/dist/packages/core/src/infrastructure/services/interactive/interactive-session.service.d.ts

@@ -75,6 +75,13 @@ export declare class InteractiveSessionService implements IInteractiveSessionSer
     markRead(featureId: string): Promise<void>;
     getTurnStatuses(featureIds: string[]): Promise<Map<string, string>>;
     getAllActiveTurnStatuses(): Promise<Map<string, string>>;
+    respondToInteraction(featureId: string, answers: Record<string, string>): Promise<void>;
+    /**
+     * Build the onUserQuestion callback for a session.
+     * Called by the SDK's canUseTool when the agent invokes AskUserQuestion.
+     * Returns a Promise that doesn't resolve until the user submits their answers.
+     */
+    private buildOnUserQuestionCallback;
     /** Find the in-memory state for an active session for a feature. */
     private findActiveStateForFeature;
     /** Resolve the agent type from an explicit override or settings. */

package/dist/packages/core/src/infrastructure/services/interactive/interactive-session.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interactive-session.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/interactive/interactive-session.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interactive-session.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/interactive/interactive-session.service.ts"],"names":[],"mappings":"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"}

package/dist/packages/core/src/infrastructure/services/interactive/interactive-session.service.js

@@ -80,6 +80,8 @@ export class InteractiveSessionService {
             updatedAt: now,
         };
         await this.sessionRepo.create(session);
+        // Mark as processing immediately so the FAB shows the spinner during boot
+        void this.sessionRepo.updateTurnStatus(session.id, 'processing');
         // Carry over agentSessionId from previous session so resumption works
         let previousAgentSessionId;
         for (const [, s] of this.sessions) {
@@ -113,6 +115,8 @@ export class InteractiveSessionService {
             subscribers: new Set(),
             turnInProgress: false,
             turnQueue: [],
+            pendingInteraction: null,
+            pendingInteractionResolver: null,
         };
         this.sessions.set(session.id, state);
         // Fire-and-forget the async boot sequence. The API returns the session
@@ -189,6 +193,9 @@ export class InteractiveSessionService {
             // Create the interactive executor and session
             const executor = this.executorFactory.createInteractiveExecutor(resolvedAgentType, authConfig);
             let handle;
+            // Build the onUserQuestion callback that pauses the SDK stream
+            // and waits for user input via the UI.
+            const onUserQuestion = this.buildOnUserQuestionCallback(state);
             const previousAgentSessionId = state.agentSessionId;
             if (previousAgentSessionId) {
                 // Resume existing SDK session
@@ -196,6 +203,7 @@ export class InteractiveSessionService {
                     cwd: worktreePath,
                     model: state.model,
                     systemPrompt: context,
+                    onUserQuestion,
                 });
             }
             else {
@@ -204,6 +212,7 @@ export class InteractiveSessionService {
                     cwd: worktreePath,
                     model: state.model,
                     systemPrompt: context,
+                    onUserQuestion,
                 });
             }
             state.handle = handle;
@@ -585,6 +594,12 @@ export class InteractiveSessionService {
                                 });
                             }
                             break;
+                        case 'user_question':
+                            // AskUserQuestion is now handled by the canUseTool callback
+                            // (buildOnUserQuestionCallback) which pauses the SDK stream.
+                            // This event should not appear in the stream anymore, but if it
+                            // does (e.g. from a different code path), ignore it here.
+                            break;
                     }
                 }
             }
@@ -819,7 +834,9 @@ export class InteractiveSessionService {
                 turnStatus = statuses.get(featureId) ?? 'idle';
             }
         }
-        return { messages, sessionStatus, streamingText, sessionInfo, turnStatus };
+        // Include pending interaction if one exists
+        const pendingInteraction = state?.pendingInteraction ?? null;
+        return { messages, sessionStatus, streamingText, sessionInfo, turnStatus, pendingInteraction };
     }
     subscribeByFeature(featureId, onChunk) {
         // Subscribe at the feature level so the callback survives session restarts.
@@ -863,6 +880,89 @@ export class InteractiveSessionService {
     async getAllActiveTurnStatuses() {
         return this.sessionRepo.getAllActiveTurnStatuses();
     }
+    async respondToInteraction(featureId, answers) {
+        const state = this.findActiveStateForFeature(featureId);
+        if (!state?.pendingInteraction || !state.pendingInteractionResolver) {
+            throw new Error(`No pending interaction for feature ${featureId}`);
+        }
+        // Persist the user's answers as a structured user message.
+        // The {{interaction}} prefix lets the frontend detect and render it
+        // as a compact green bubble instead of a regular text message.
+        const interactionPayload = {
+            questions: state.pendingInteraction.questions.map((q) => ({
+                header: q.header,
+                question: q.question,
+            })),
+            answers,
+        };
+        const now = new Date();
+        const userMsg = {
+            id: crypto.randomUUID(),
+            featureId: state.featureId,
+            sessionId: state.sessionId,
+            role: InteractiveMessageRole.user,
+            content: `{{interaction}}${JSON.stringify(interactionPayload)}`,
+            createdAt: now,
+            updatedAt: now,
+        };
+        await this.messageRepo.create(userMsg);
+        // Resolve the Promise that the canUseTool callback is awaiting.
+        // This unblocks the SDK stream — the agent resumes with the user's answers.
+        state.pendingInteractionResolver(answers);
+        // Clear pending interaction state
+        state.pendingInteraction = null;
+        state.pendingInteractionResolver = null;
+        // Update turn status back to processing
+        void this.sessionRepo.updateTurnStatus(state.sessionId, 'processing');
+        // Clear the "Waiting for your response..." log
+        state.subscribers.forEach((sub) => sub({ delta: '', done: false }));
+    }
+    /**
+     * Build the onUserQuestion callback for a session.
+     * Called by the SDK's canUseTool when the agent invokes AskUserQuestion.
+     * Returns a Promise that doesn't resolve until the user submits their answers.
+     */
+    buildOnUserQuestionCallback(state) {
+        return async (interaction) => {
+            // Flush any accumulated assistant text as a separate message BEFORE
+            // the interaction. This ensures the agent's question text appears
+            // above the green answer bubble in the conversation history.
+            if (state.currentAssistantBuffer.trim()) {
+                const now = new Date();
+                const msg = {
+                    id: crypto.randomUUID(),
+                    featureId: state.featureId,
+                    sessionId: state.sessionId,
+                    role: InteractiveMessageRole.assistant,
+                    content: state.currentAssistantBuffer,
+                    createdAt: now,
+                    updatedAt: now,
+                };
+                await this.messageRepo.create(msg);
+                state.currentAssistantBuffer = '';
+                state.toolEventsLog = [];
+                // Notify subscribers so the frontend picks up the new message
+                state.subscribers.forEach((sub) => sub({ delta: '', done: true }));
+                // Small delay so the refetch completes before the interaction appears
+                await new Promise((r) => setTimeout(r, 100));
+            }
+            // Store the interaction data for the frontend
+            state.pendingInteraction = interaction;
+            // Update turn status so the dot indicator shows amber
+            void this.sessionRepo.updateTurnStatus(state.sessionId, 'awaiting_input');
+            // Notify subscribers so SSE pushes the interaction to the frontend
+            state.subscribers.forEach((sub) => sub({
+                delta: '',
+                done: false,
+                log: 'Waiting for your response...',
+                interaction,
+            }));
+            // Create a Promise that will be resolved when the user calls respondToInteraction
+            return new Promise((resolve) => {
+                state.pendingInteractionResolver = resolve;
+            });
+        };
+    }
     /** Find the in-memory state for an active session for a feature. */
     findActiveStateForFeature(featureId) {
         for (const state of this.sessions.values()) {

package/dist/src/presentation/web/app/api/interactive/chat/[featureId]/respond/route.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Respond to a pending agent interaction (AskUserQuestion).
+ *
+ * POST - Submit user's answers to the pending interaction.
+ *        The agent resumes processing after receiving the response.
+ *
+ * `featureId` is a polymorphic scope key: a feature UUID, "repo-<id>", or "global".
+ */
+import type { NextRequest } from 'next/server';
+import { NextResponse } from 'next/server';
+export declare const dynamic = "force-dynamic";
+interface RouteParams {
+    params: Promise<{
+        featureId: string;
+    }>;
+}
+export declare function POST(request: NextRequest, { params }: RouteParams): Promise<NextResponse>;
+export {};
+//# sourceMappingURL=route.d.ts.map

package/dist/src/presentation/web/app/api/interactive/chat/[featureId]/respond/route.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/presentation/web/app/api/interactive/chat/[featureId]/respond/route.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI3C,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,UAAU,WAAW;IACnB,MAAM,EAAE,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxC;AAED,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAyB/F"}

package/dist/src/presentation/web/app/api/interactive/chat/[featureId]/respond/route.js

@@ -0,0 +1,33 @@
+/**
+ * Respond to a pending agent interaction (AskUserQuestion).
+ *
+ * POST - Submit user's answers to the pending interaction.
+ *        The agent resumes processing after receiving the response.
+ *
+ * `featureId` is a polymorphic scope key: a feature UUID, "repo-<id>", or "global".
+ */
+import { NextResponse } from 'next/server';
+import { resolve } from '../../../../../../lib/server-container.js';
+export const dynamic = 'force-dynamic';
+export async function POST(request, { params }) {
+    try {
+        const { featureId } = await params;
+        const body = (await request.json());
+        if (!body.answers || typeof body.answers !== 'object') {
+            return NextResponse.json({ error: 'answers must be a non-empty object' }, { status: 400 });
+        }
+        const useCase = resolve('RespondToInteractionUseCase');
+        await useCase.execute({
+            featureId,
+            answers: body.answers,
+        });
+        return NextResponse.json({ ok: true });
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        const status = message.includes('No pending interaction') ? 409 : 500;
+        // eslint-disable-next-line no-console
+        console.error('[POST /api/interactive/chat/:featureId/respond]', error);
+        return NextResponse.json({ error: message }, { status });
+    }
+}

package/dist/src/presentation/web/app/api/interactive/chat/[featureId]/stream/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/presentation/web/app/api/interactive/chat/[featureId]/stream/route.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,UAAU,WAAW;IACnB,MAAM,EAAE,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxC;AAED,wBAAsB,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA4E1F"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/presentation/web/app/api/interactive/chat/[featureId]/stream/route.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,UAAU,WAAW;IACnB,MAAM,EAAE,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxC;AAED,wBAAsB,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAoF1F"}

package/dist/src/presentation/web/app/api/interactive/chat/[featureId]/stream/route.js

@@ -38,6 +38,13 @@ export async function GET(request, { params }) {
                     if (chunk.done) {
                         enqueue(`event: done\ndata: ${JSON.stringify({ done: true, featureId })}\n\n`);
                     }
+                    else if (chunk.interaction) {
+                        // Agent is asking the user a question — emit interaction event
+                        enqueue(`event: interaction\ndata: ${JSON.stringify({ interaction: chunk.interaction, featureId })}\n\n`);
+                        if (chunk.log) {
+                            enqueue(`event: log\ndata: ${JSON.stringify({ log: chunk.log, featureId })}\n\n`);
+                        }
+                    }
                     else if (chunk.activity) {
                         enqueue(`event: activity\ndata: ${JSON.stringify({ activity: chunk.activity, featureId })}\n\n`);
                         // Also send log for the status indicator

package/dist/src/presentation/web/app/features/feature-tree-page-client.d.ts

@@ -0,0 +1,7 @@
+import type { FeatureTreeRow, InventoryRepo } from '../../components/features/feature-tree-table/index.js';
+export interface FeatureTreePageClientProps {
+    features: FeatureTreeRow[];
+    repos: InventoryRepo[];
+}
+export declare function FeatureTreePageClient({ features, repos }: FeatureTreePageClientProps): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=feature-tree-page-client.d.ts.map

package/dist/src/presentation/web/app/features/feature-tree-page-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"feature-tree-page-client.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/features/feature-tree-page-client.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAG9F,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,KAAK,EAAE,aAAa,EAAE,CAAC;CACxB;AAED,wBAAgB,qBAAqB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,0BAA0B,2CAkBpF"}

package/dist/src/presentation/web/app/features/feature-tree-page-client.js

@@ -0,0 +1,13 @@
+'use client';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useRouter } from 'next/navigation';
+import { useCallback } from 'react';
+import { FeatureTreeTable } from '../../components/features/feature-tree-table/index.js';
+import { PageHeader } from '../../components/common/page-header/index.js';
+export function FeatureTreePageClient({ features, repos }) {
+    const router = useRouter();
+    const handleFeatureClick = useCallback((featureId) => {
+        router.push(`/feature/${featureId}/overview`);
+    }, [router]);
+    return (_jsxs("div", { "data-testid": "feature-tree-page", className: "flex h-full flex-col gap-4", children: [_jsx(PageHeader, { title: "Inventory", description: "All repositories and features" }), _jsx("div", { className: "min-h-0 flex-1", children: _jsx(FeatureTreeTable, { data: features, repos: repos, onFeatureClick: handleFeatureClick }) })] }));
+}

package/dist/src/presentation/web/app/features/get-feature-tree-data.d.ts

@@ -0,0 +1,10 @@
+import type { FeatureTreeRow } from '../../components/features/feature-tree-table/index.js';
+export interface InventoryRepo {
+    name: string;
+    remoteUrl?: string;
+}
+export declare function getFeatureTreeData(): Promise<{
+    features: FeatureTreeRow[];
+    repos: InventoryRepo[];
+}>;
+//# sourceMappingURL=get-feature-tree-data.d.ts.map

package/dist/src/presentation/web/app/features/get-feature-tree-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-feature-tree-data.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/features/get-feature-tree-data.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAI/E,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAsBD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC;IAClD,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,KAAK,EAAE,aAAa,EAAE,CAAC;CACxB,CAAC,CAgCD"}

package/dist/src/presentation/web/app/features/get-feature-tree-data.js

@@ -0,0 +1,47 @@
+import { resolve } from '../../lib/server-container.js';
+import { SdlcLifecycle } from '../../../../../packages/core/src/domain/generated/output.js';
+const LIFECYCLE_TO_STATUS = {
+    [SdlcLifecycle.Started]: 'pending',
+    [SdlcLifecycle.Analyze]: 'in-progress',
+    [SdlcLifecycle.Requirements]: 'action-needed',
+    [SdlcLifecycle.Research]: 'in-progress',
+    [SdlcLifecycle.Planning]: 'in-progress',
+    [SdlcLifecycle.Implementation]: 'in-progress',
+    [SdlcLifecycle.Review]: 'action-needed',
+    [SdlcLifecycle.Maintain]: 'done',
+    [SdlcLifecycle.Blocked]: 'blocked',
+    [SdlcLifecycle.Pending]: 'pending',
+    [SdlcLifecycle.Deleting]: 'blocked',
+    [SdlcLifecycle.AwaitingUpstream]: 'action-needed',
+    [SdlcLifecycle.Archived]: 'done',
+};
+function lifecycleToStatus(lifecycle) {
+    return LIFECYCLE_TO_STATUS[lifecycle] ?? 'pending';
+}
+export async function getFeatureTreeData() {
+    const listFeatures = resolve('ListFeaturesUseCase');
+    const listRepos = resolve('ListRepositoriesUseCase');
+    const [features, repositories] = await Promise.all([listFeatures.execute(), listRepos.execute()]);
+    const repoByPath = new Map();
+    for (const repo of repositories) {
+        repoByPath.set(repo.path, { name: repo.name, remoteUrl: repo.remoteUrl });
+    }
+    const featureRows = features.map((feature) => {
+        const repo = repoByPath.get(feature.repositoryPath);
+        return {
+            id: feature.id,
+            name: feature.name,
+            status: lifecycleToStatus(feature.lifecycle),
+            lifecycle: feature.lifecycle,
+            branch: feature.branch,
+            repositoryName: repo?.name ?? feature.repositoryPath.split('/').pop() ?? feature.repositoryPath,
+            remoteUrl: repo?.remoteUrl,
+            parentId: feature.parentId ?? undefined,
+        };
+    });
+    const repos = repositories.map((repo) => ({
+        name: repo.name,
+        remoteUrl: repo.remoteUrl,
+    }));
+    return { features: featureRows, repos };
+}

package/dist/src/presentation/web/app/features/page.d.ts

@@ -0,0 +1,4 @@
+/** Skip static pre-rendering since we need runtime DI container and server context. */
+export declare const dynamic = "force-dynamic";
+export default function FeaturesPage(): Promise<import("react/jsx-runtime").JSX.Element>;
+//# sourceMappingURL=page.d.ts.map

package/dist/src/presentation/web/app/features/page.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/features/page.tsx"],"names":[],"mappings":"AAGA,uFAAuF;AACvF,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,wBAA8B,YAAY,qDAQzC"}

package/dist/src/presentation/web/app/features/page.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { FeatureTreePageClient } from './feature-tree-page-client.js';
+import { getFeatureTreeData } from './get-feature-tree-data.js';
+/** Skip static pre-rendering since we need runtime DI container and server context. */
+export const dynamic = 'force-dynamic';
+export default async function FeaturesPage() {
+    const { features, repos } = await getFeatureTreeData();
+    return (_jsx("div", { className: "features-page-dotted-bg flex h-full flex-col p-6", children: _jsx(FeatureTreePageClient, { features: features, repos: repos }) }));
+}

package/dist/src/presentation/web/app/layout.d.ts

@@ -1,6 +1,5 @@
 import type { Metadata } from 'next';
 import '@xyflow/react/dist/base.css';
-import '@cubone/react-file-manager/dist/style.css';
 import './globals.css';
 /** Force dynamic rendering for all pages since they depend on client-side context. */
 export declare const dynamic = "force-dynamic";

package/dist/src/presentation/web/app/layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/app/layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAErC,OAAO,6BAA6B,CAAC;AACrC,OAAO,2CAA2C,CAAC;AACnD,OAAO,eAAe,CAAC;AAWvB,sFAAsF;AACtF,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,eAAO,MAAM,QAAQ,EAAE,QAkBtB,CAAC;AAEF,wBAA8B,UAAU,CAAC,EACvC,QAAQ,GACT,EAAE,QAAQ,CAAC;IACV,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC,oDA6BD"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/app/layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAErC,OAAO,6BAA6B,CAAC;AACrC,OAAO,eAAe,CAAC;AAWvB,sFAAsF;AACtF,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,eAAO,MAAM,QAAQ,EAAE,QAkBtB,CAAC;AAEF,wBAA8B,UAAU,CAAC,EACvC,QAAQ,GACT,EAAE,QAAQ,CAAC;IACV,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC,oDA6BD"}

package/dist/src/presentation/web/app/layout.js

@@ -1,7 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { cookies } from 'next/headers';
 import '@xyflow/react/dist/base.css';
-import '@cubone/react-file-manager/dist/style.css';
 import './globals.css';
 import { AppShell } from '../components/layouts/app-shell/index.js';
 import { Toaster } from '../components/ui/sonner.js';

package/dist/src/presentation/web/components/assistant-ui/thread.d.ts

@@ -1,6 +1,7 @@
-export declare function Thread({ className, statusBar, composer, }: {
+export declare function Thread({ className, afterMessages, composer, }: {
     className?: string;
-    statusBar?: React.ReactNode;
+    /** Content rendered inside the scrollable viewport, after messages (e.g. interaction bubbles). */
+    afterMessages?: React.ReactNode;
     composer?: React.ReactNode;
 }): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=thread.d.ts.map

package/dist/src/presentation/web/components/assistant-ui/thread.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thread.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/components/assistant-ui/thread.tsx"],"names":[],"mappings":"AAuFA,wBAAgB,MAAM,CAAC,EACrB,SAAS,EACT,SAAS,EACT,QAAQ,GACT,EAAE;IACD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,2CAoBA"}
+{"version":3,"file":"thread.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/components/assistant-ui/thread.tsx"],"names":[],"mappings":"AAwFA,wBAAgB,MAAM,CAAC,EACrB,SAAS,EACT,aAAa,EACb,QAAQ,GACT,EAAE;IACD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kGAAkG;IAClG,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAChC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,2CAqBA"}