@shepai/cli 1.126.0 → 1.127.0-pr406.05077bf

package/dist/src/presentation/web/app/(dashboard)/get-graph-data.js

@@ -5,52 +5,57 @@ import { getSettings } from '../../../../../packages/core/src/infrastructure/ser
 import { layoutWithDagre, CANVAS_LAYOUT_DEFAULTS } from '../../lib/layout-with-dagre.js';
 import { buildGraphNodes } from '../build-graph-nodes.js';
 const execFileAsync = promisify(execFileCb);
-async function gitCommand(cwd, args) {
-    try {
-        const { stdout } = await execFileAsync('git', args, { cwd });
-        return stdout.trim();
-    }
-    catch {
-        return null;
-    }
-}
+// Cache git info per repo path — git state rarely changes between polls
+const gitInfoCache = new Map();
+const GIT_INFO_TTL_MS = 30_000; // 30 seconds
+/**
+ * Fetch branch, last commit info, and behind-count in a single git process.
+ *
+ * Results are cached for 5s so repeated polls don't spawn child processes.
+ */
 async function fetchRepoGitInfo(repo) {
+    const cached = gitInfoCache.get(repo.path);
+    if (cached && Date.now() < cached.expiresAt)
+        return cached.info;
+    const FIELD_SEP = '\x1f'; // ASCII unit separator — won't appear in commit messages
     try {
-        const [currentBranch, commitMessage, committer] = await Promise.all([
-            gitCommand(repo.path, ['symbolic-ref', '--short', 'HEAD']),
-            gitCommand(repo.path, ['log', '-1', '--format=%s']),
-            gitCommand(repo.path, ['log', '-1', '--format=%an']),
-        ]);
+        // Single spawn: branch + commit subject + author
+        const { stdout } = await execFileAsync('git', ['-c', 'log.showSignature=false', 'log', '-1', `--format=%D${FIELD_SEP}%s${FIELD_SEP}%an`], { cwd: repo.path });
+        const [refsRaw, commitMessage, committer] = stdout.trim().split(FIELD_SEP);
+        // Extract current branch from decoration string (e.g. "HEAD -> main, origin/main")
+        const branchMatch = refsRaw?.match(/HEAD -> ([^,]+)/);
+        const currentBranch = branchMatch?.[1]?.trim() ?? null;
         if (!currentBranch)
             return null;
-        // Try to determine the default branch to compute behind count
+        // Determine behind-count with one more spawn only when needed
         let behindCount = null;
-        const defaultBranch = await gitCommand(repo.path, [
-            'symbolic-ref',
-            '--short',
-            'refs/remotes/origin/HEAD',
-        ]).then((ref) => ref?.replace('origin/', '') ?? null);
-        if (defaultBranch && currentBranch !== defaultBranch) {
-            const behind = await gitCommand(repo.path, [
-                'rev-list',
-                '--count',
-                `${currentBranch}..origin/${defaultBranch}`,
-            ]);
-            behindCount = behind !== null ? parseInt(behind, 10) : null;
-            if (isNaN(behindCount))
-                behindCount = null;
+        try {
+            const { stdout: defaultRef } = await execFileAsync('git', ['symbolic-ref', '--short', 'refs/remotes/origin/HEAD'], { cwd: repo.path });
+            const defaultBranch = defaultRef.trim().replace('origin/', '');
+            if (currentBranch === defaultBranch) {
+                behindCount = 0;
+            }
+            else {
+                const { stdout: countOut } = await execFileAsync('git', ['rev-list', '--count', `${currentBranch}..origin/${defaultBranch}`], { cwd: repo.path });
+                behindCount = parseInt(countOut.trim(), 10);
+                if (isNaN(behindCount))
+                    behindCount = null;
+            }
         }
-        else if (!defaultBranch || currentBranch === defaultBranch) {
-            behindCount = 0;
+        catch {
+            // No remote HEAD or rev-list failed — leave as null
         }
-        return {
+        const info = {
             branch: currentBranch,
             commitMessage: commitMessage ?? 'unknown',
             committer: committer ?? 'unknown',
             behindCount,
         };
+        gitInfoCache.set(repo.path, { info, expiresAt: Date.now() + GIT_INFO_TTL_MS });
+        return info;
     }
     catch {
+        gitInfoCache.set(repo.path, { info: null, expiresAt: Date.now() + GIT_INFO_TTL_MS });
         return null;
     }
 }

package/dist/src/presentation/web/app/actions/adopt-branch.d.ts

@@ -0,0 +1,11 @@
+import type { Feature } from '../../../../../packages/core/src/domain/generated/output.js';
+interface AdoptBranchInput {
+    branchName: string;
+    repositoryPath: string;
+}
+export declare function adoptBranch(input: AdoptBranchInput): Promise<{
+    feature?: Feature;
+    error?: string;
+}>;
+export {};
+//# sourceMappingURL=adopt-branch.d.ts.map

package/dist/src/presentation/web/app/actions/adopt-branch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"adopt-branch.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/adopt-branch.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAEpE,UAAU,gBAAgB;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAsB,WAAW,CAC/B,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAkBhD"}

package/dist/src/presentation/web/app/actions/adopt-branch.js

@@ -0,0 +1,20 @@
+'use server';
+import { resolve } from '../../lib/server-container.js';
+export async function adoptBranch(input) {
+    const { branchName, repositoryPath } = input;
+    if (!branchName?.trim()) {
+        return { error: 'Branch name is required' };
+    }
+    if (!repositoryPath?.trim()) {
+        return { error: 'Repository path is required' };
+    }
+    try {
+        const useCase = resolve('AdoptBranchUseCase');
+        const result = await useCase.execute({ branchName, repositoryPath });
+        return { feature: result.feature };
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : 'Failed to adopt branch';
+        return { error: message };
+    }
+}

package/dist/src/presentation/web/app/actions/approve-feature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approve-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/approve-feature.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAK/E,wBAAsB,cAAc,CAClC,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAsChD"}
+{"version":3,"file":"approve-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/approve-feature.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,wBAAsB,cAAc,CAClC,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiChD"}

package/dist/src/presentation/web/app/actions/approve-feature.js

@@ -1,7 +1,5 @@
 'use server';
 import { resolve } from '../../lib/server-container.js';
-import { AgentRunStatus } from '../../../../../packages/core/src/domain/generated/output.js';
-const ERROR_STATUSES = new Set([AgentRunStatus.failed, AgentRunStatus.interrupted]);
 export async function approveFeature(featureId, payload) {
     if (!featureId.trim()) {
         return { approved: false, error: 'Feature id is required' };
@@ -15,13 +13,10 @@ export async function approveFeature(featureId, payload) {
         if (!feature.agentRunId) {
             return { approved: false, error: 'Feature has no agent run' };
         }
-        const runRepo = resolve('IAgentRunRepository');
-        const run = await runRepo.findById(feature.agentRunId);
-        if (run && ERROR_STATUSES.has(run.status)) {
-            const resumeUseCase = resolve('ResumeFeatureUseCase');
-            await resumeUseCase.execute(featureId, { promptPrefix: 'User approved. Please continue.' });
-            return { approved: true };
-        }
+        // Always use ApproveAgentRunUseCase — it handles waitingApproval, failed,
+        // and interrupted statuses. This ensures approval is propagated via
+        // Command({update: {_approvalAction: 'approved'}}) so the graph node
+        // receives it on resume.
         const approveUseCase = resolve('ApproveAgentRunUseCase');
         const result = await approveUseCase.execute(feature.agentRunId, payload);
         if (!result.approved) {

package/dist/src/presentation/web/app/actions/list-branches.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Server action that returns all branch names (local + remote) for a repository.
+ * Used by the adopt branch drawer to populate the branch combobox.
+ */
+export declare function listBranches(repositoryPath: string): Promise<string[]>;
+//# sourceMappingURL=list-branches.d.ts.map

package/dist/src/presentation/web/app/actions/list-branches.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list-branches.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/list-branches.ts"],"names":[],"mappings":"AAKA;;;GAGG;AACH,wBAAsB,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAW5E"}

package/dist/src/presentation/web/app/actions/list-branches.js

@@ -0,0 +1,18 @@
+'use server';
+import { resolve } from '../../lib/server-container.js';
+/**
+ * Server action that returns all branch names (local + remote) for a repository.
+ * Used by the adopt branch drawer to populate the branch combobox.
+ */
+export async function listBranches(repositoryPath) {
+    if (!repositoryPath?.trim()) {
+        return [];
+    }
+    try {
+        const worktreeService = resolve('IWorktreeService');
+        return await worktreeService.listBranches(repositoryPath);
+    }
+    catch {
+        return [];
+    }
+}

package/dist/src/presentation/web/app/actions/reject-feature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reject-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/reject-feature.ts"],"names":[],"mappings":"AAWA,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC;IACT,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA8CD"}
+{"version":3,"file":"reject-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/reject-feature.ts"],"names":[],"mappings":"AAMA,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC;IACT,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CAyCD"}

package/dist/src/presentation/web/app/actions/reject-feature.js

@@ -1,7 +1,5 @@
 'use server';
 import { resolve } from '../../lib/server-container.js';
-import { AgentRunStatus } from '../../../../../packages/core/src/domain/generated/output.js';
-const ERROR_STATUSES = new Set([AgentRunStatus.failed, AgentRunStatus.interrupted]);
 export async function rejectFeature(featureId, feedback, attachments) {
     if (!featureId.trim()) {
         return { rejected: false, error: 'Feature id is required' };
@@ -18,13 +16,10 @@ export async function rejectFeature(featureId, feedback, attachments) {
         if (!feature.agentRunId) {
             return { rejected: false, error: 'Feature has no agent run' };
         }
-        const runRepo = resolve('IAgentRunRepository');
-        const run = await runRepo.findById(feature.agentRunId);
-        if (run && ERROR_STATUSES.has(run.status)) {
-            const resumeUseCase = resolve('ResumeFeatureUseCase');
-            await resumeUseCase.execute(featureId, { promptPrefix: feedback });
-            return { rejected: true, iteration: 1 };
-        }
+        // Always use RejectAgentRunUseCase — it handles waitingApproval, failed,
+        // and interrupted statuses. This ensures rejection feedback is propagated
+        // via Command({update: {_approvalAction, _rejectionFeedback}}) so the
+        // graph node receives the feedback on resume.
         const rejectUseCase = resolve('RejectAgentRunUseCase');
         const result = await rejectUseCase.execute(feature.agentRunId, feedback, attachments);
         if (!result.rejected) {

package/dist/src/presentation/web/app/build-feature-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-feature-node-data.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/app/build-feature-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAQ9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,MAAM,WAAW,2BAA2B;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,6EAA6E;IAC7E,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qEAAqE;IACrE,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,GAAG,IAAI,EACpB,OAAO,CAAC,EAAE,2BAA2B,GACpC,eAAe,CAgDjB"}
+{"version":3,"file":"build-feature-node-data.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/app/build-feature-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAQ9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,MAAM,WAAW,2BAA2B;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,6EAA6E;IAC7E,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qEAAqE;IACrE,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,GAAG,IAAI,EACpB,OAAO,CAAC,EAAE,2BAA2B,GACpC,eAAe,CAiDjB"}

package/dist/src/presentation/web/app/build-feature-node-data.js

@@ -36,6 +36,7 @@ export function buildFeatureNodeData(feature, run, options) {
         ...(run?.agentType && { agentType: run.agentType }),
         ...(run?.modelId && { modelId: run.modelId }),
         ...(run?.error && { errorMessage: run.error }),
+        ...(feature.agentRunId != null && { hasAgentRun: true }),
         ...(feature.plan != null && { hasPlan: true }),
         ...(feature.pr && {
             pr: {

package/dist/src/presentation/web/app/build-graph-nodes.js

@@ -132,6 +132,7 @@ function appendFeatureNodes(repoFeatures, repoNodeId, allFeaturesWithRuns, nodes
             ...(run?.modelId && { modelId: run.modelId }),
             ...(run?.error && { errorMessage: run.error }),
             ...(blockedBy && { blockedBy }),
+            ...(feature.agentRunId != null && { hasAgentRun: true }),
             ...(feature.plan != null && { hasPlan: true }),
             ...(feature.pr && {
                 pr: {

package/dist/src/presentation/web/components/common/control-center-drawer/adopt-branch-drawer.d.ts

@@ -0,0 +1,20 @@
+import type { RepositoryOption } from '../../common/feature-create-drawer/feature-create-drawer.js';
+export interface AdoptBranchDrawerProps {
+    open: boolean;
+    onClose: () => void;
+    onSubmit: (branchName: string, repositoryPath: string) => void;
+    isSubmitting?: boolean;
+    error?: string;
+    /** Available repositories for the repository selector */
+    repositories?: RepositoryOption[];
+    /** Currently selected repository path */
+    selectedRepositoryPath?: string;
+    /** Callback when user selects a different repository */
+    onRepositoryChange?: (repositoryPath: string) => void;
+    /** Available branch names for the combobox dropdown */
+    branches?: string[];
+    /** Whether branches are still loading */
+    branchesLoading?: boolean;
+}
+export declare function AdoptBranchDrawer({ open, onClose, onSubmit, isSubmitting, error, repositories, selectedRepositoryPath, onRepositoryChange, branches, branchesLoading, }: AdoptBranchDrawerProps): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=adopt-branch-drawer.d.ts.map

package/dist/src/presentation/web/components/common/control-center-drawer/adopt-branch-drawer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"adopt-branch-drawer.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/adopt-branch-drawer.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iEAAiE,CAAC;AAExG,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/D,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yDAAyD;IACzD,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAClC,yCAAyC;IACzC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,wDAAwD;IACxD,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,uDAAuD;IACvD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,iBAAiB,CAAC,EAChC,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,YAAoB,EACpB,KAAK,EACL,YAAiB,EACjB,sBAAsB,EACtB,kBAAkB,EAClB,QAAa,EACb,eAAuB,GACxB,EAAE,sBAAsB,2CAmVxB"}

package/dist/src/presentation/web/components/common/control-center-drawer/adopt-branch-drawer.js

@@ -0,0 +1,105 @@
+'use client';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState, useCallback, useEffect, useRef } from 'react';
+import { Check, CheckIcon, ChevronsUpDown, GitBranch, Loader2 } from 'lucide-react';
+import { BaseDrawer } from '../../common/base-drawer/index.js';
+import { DrawerTitle, DrawerDescription } from '../../ui/drawer.js';
+import { Button } from '../../ui/button.js';
+import { Input } from '../../ui/input.js';
+import { Label } from '../../ui/label.js';
+import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList, } from '../../ui/command.js';
+import { Popover, PopoverContent, PopoverTrigger } from '../../ui/popover.js';
+import { cn } from '../../../lib/utils.js';
+export function AdoptBranchDrawer({ open, onClose, onSubmit, isSubmitting = false, error, repositories = [], selectedRepositoryPath, onRepositoryChange, branches = [], branchesLoading = false, }) {
+    const [branchName, setBranchName] = useState('');
+    const [comboboxOpen, setComboboxOpen] = useState(false);
+    const [inputValue, setInputValue] = useState('');
+    const inputRef = useRef(null);
+    const [repoOpen, setRepoOpen] = useState(false);
+    const [repoQuery, setRepoQuery] = useState('');
+    const repoInputRef = useRef(null);
+    const selectedRepo = repositories.find((r) => r.path === selectedRepositoryPath);
+    const hasRepo = !!selectedRepositoryPath;
+    // Reset state when drawer closes
+    useEffect(() => {
+        if (!open) {
+            setBranchName('');
+            setInputValue('');
+            setComboboxOpen(false);
+            setRepoOpen(false);
+            setRepoQuery('');
+        }
+    }, [open]);
+    // Reset branch selection when repository changes
+    useEffect(() => {
+        setBranchName('');
+        setInputValue('');
+    }, [selectedRepositoryPath]);
+    const handleSubmit = useCallback((e) => {
+        e.preventDefault();
+        const trimmed = branchName.trim();
+        if (!trimmed || !selectedRepositoryPath || isSubmitting)
+            return;
+        onSubmit(trimmed, selectedRepositoryPath);
+    }, [branchName, selectedRepositoryPath, isSubmitting, onSubmit]);
+    const handleClose = useCallback(() => {
+        setBranchName('');
+        setInputValue('');
+        onClose();
+    }, [onClose]);
+    const handleSelect = useCallback((branch) => {
+        setBranchName(branch);
+        setInputValue(branch);
+        setComboboxOpen(false);
+    }, []);
+    const handleInputChange = useCallback((e) => {
+        setInputValue(e.target.value);
+        if (!comboboxOpen)
+            setComboboxOpen(true);
+    }, [comboboxOpen]);
+    const handleInputKeyDown = useCallback((e) => {
+        if (e.key === 'Enter') {
+            e.preventDefault();
+            const trimmed = inputValue.trim();
+            if (trimmed) {
+                setBranchName(trimmed);
+                setComboboxOpen(false);
+            }
+        }
+        if (e.key === 'Escape') {
+            setComboboxOpen(false);
+            setInputValue(branchName);
+        }
+    }, [inputValue, branchName]);
+    const handleRepoSelect = useCallback((path) => {
+        onRepositoryChange?.(path);
+        setRepoOpen(false);
+        setRepoQuery('');
+    }, [onRepositoryChange]);
+    const filteredBranches = branches.filter((b) => b.toLowerCase().includes(inputValue.toLowerCase()));
+    const filteredRepos = repoQuery.trim()
+        ? repositories.filter((r) => r.name.toLowerCase().includes(repoQuery.toLowerCase()) ||
+            r.path.toLowerCase().includes(repoQuery.toLowerCase()))
+        : repositories;
+    useEffect(() => {
+        if (repoOpen) {
+            setTimeout(() => repoInputRef.current?.focus(), 0);
+        }
+        else {
+            setRepoQuery('');
+        }
+    }, [repoOpen]);
+    const isDisabled = !branchName.trim() || !selectedRepositoryPath || isSubmitting;
+    const header = (_jsxs("div", { children: [_jsxs(DrawerTitle, { className: "flex items-center gap-2", children: [_jsx(GitBranch, { className: "h-4 w-4" }), "Adopt Branch"] }), _jsx(DrawerDescription, { className: "text-muted-foreground text-sm", children: "Import an existing git branch into Shep's feature tracking" })] }));
+    return (_jsx(BaseDrawer, { open: open, onClose: handleClose, size: "sm", modal: false, header: header, "data-testid": "adopt-branch-drawer", children: _jsxs("form", { onSubmit: handleSubmit, className: "flex flex-1 flex-col", children: [_jsx("div", { className: "flex-1 overflow-y-auto p-4", children: _jsxs("div", { className: "flex flex-col gap-4", children: [_jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(Label, { children: "Repository" }), _jsxs(Popover, { open: repoOpen, onOpenChange: setRepoOpen, children: [_jsx(PopoverTrigger, { asChild: true, children: _jsxs("button", { type: "button", role: "combobox", "aria-expanded": repoOpen, "aria-label": "Repository", disabled: isSubmitting, "data-testid": "adopt-repo-combobox", className: cn('border-input bg-background ring-offset-background focus:ring-ring flex h-9 w-full items-center justify-between rounded-md border px-3 py-2 text-sm focus:ring-2 focus:ring-offset-2 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50', !selectedRepo && 'text-muted-foreground'), children: [_jsx("span", { className: "truncate", children: selectedRepo ? selectedRepo.name : 'Select repository...' }), _jsx(ChevronsUpDown, { className: "ml-2 h-4 w-4 shrink-0 opacity-50" })] }) }), _jsx(PopoverContent, { className: "w-80 p-0", align: "start", "data-testid": "adopt-repo-combobox-content", children: _jsxs("div", { className: "flex flex-col", children: [_jsx("div", { className: "border-b p-2", children: _jsx(Input, { ref: repoInputRef, placeholder: "Search repositories...", value: repoQuery, onChange: (e) => setRepoQuery(e.target.value), className: "h-8 border-0 p-0 text-sm shadow-none focus-visible:ring-0", "data-testid": "adopt-repo-search" }) }), _jsx("div", { className: "max-h-48 overflow-y-auto py-1", role: "listbox", "aria-label": "Repositories", children: filteredRepos.length === 0 ? (_jsx("p", { className: "text-muted-foreground px-3 py-2 text-sm", children: "No repositories found." })) : (filteredRepos.map((r) => (_jsxs("button", { type: "button", role: "option", "aria-selected": selectedRepositoryPath === r.path, onClick: () => handleRepoSelect(r.path), className: cn('hover:bg-accent hover:text-accent-foreground flex w-full items-center gap-2 px-3 py-2 text-sm', selectedRepositoryPath === r.path && 'bg-accent/50'), "data-testid": `adopt-repo-option-${r.id}`, children: [_jsx(CheckIcon, { className: cn('h-4 w-4 shrink-0', selectedRepositoryPath !== r.path && 'invisible') }), _jsxs("span", { className: "flex flex-col items-start truncate", children: [_jsx("span", { className: "truncate", children: r.name }), _jsx("span", { className: "text-muted-foreground truncate text-xs", children: r.path })] })] }, r.id)))) })] }) })] }), _jsx("p", { className: "text-muted-foreground text-xs", children: "Select the repository that contains the branch you want to adopt." })] }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(Label, { htmlFor: "branch-name", children: "Branch name" }), _jsxs(Popover, { open: comboboxOpen, onOpenChange: setComboboxOpen, children: [_jsx(PopoverTrigger, { asChild: true, children: _jsxs(Button, { variant: "outline", role: "combobox", "aria-expanded": comboboxOpen, disabled: isSubmitting || !hasRepo, className: "w-full justify-between font-normal", "data-testid": "adopt-branch-input", children: [_jsx("span", { className: "truncate", children: !hasRepo
+                                                                ? 'Select a repository first...'
+                                                                : branchesLoading
+                                                                    ? 'Loading branches...'
+                                                                    : branchName || 'Select a branch...' }), _jsx(ChevronsUpDown, { className: "ml-2 h-4 w-4 shrink-0 opacity-50" })] }) }), _jsx(PopoverContent, { className: "w-[var(--radix-popover-trigger-width)] p-0", align: "start", children: _jsxs(Command, { children: [_jsx(CommandInput, { ref: inputRef, placeholder: "Search branches...", value: inputValue, onChange: handleInputChange, onKeyDown: handleInputKeyDown, "data-testid": "adopt-branch-search" }), _jsxs(CommandList, { children: [!branchesLoading && filteredBranches.length === 0 && (_jsx(CommandEmpty, { children: branches.length === 0
+                                                                        ? 'No branches found.'
+                                                                        : inputValue
+                                                                            ? 'No match — press Enter to use this value.'
+                                                                            : 'No branches available.' })), branchesLoading ? (_jsx(CommandEmpty, { children: _jsx(Loader2, { className: "mx-auto h-4 w-4 animate-spin" }) })) : null, filteredBranches.length > 0 && (_jsx(CommandGroup, { children: filteredBranches.map((branch) => (_jsxs(CommandItem, { selected: branch === branchName, onClick: () => handleSelect(branch), children: [_jsx(Check, { className: cn('mr-2 h-4 w-4', branch === branchName ? 'opacity-100' : 'opacity-0') }), _jsx(GitBranch, { className: "mr-2 h-3 w-3 opacity-50" }), branch] }, branch))) }))] })] }) })] }), _jsx("p", { className: "text-muted-foreground text-xs", children: hasRepo
+                                            ? 'Select a branch from the dropdown or type to search. Local and remote branches are shown.'
+                                            : 'Please select a repository above to see available branches.' })] }), error ? (_jsx("p", { className: "text-destructive text-sm", "data-testid": "adopt-branch-error", children: error })) : null] }) }), _jsx("div", { className: "border-t p-4", children: _jsxs("div", { className: "flex gap-2", children: [_jsx(Button, { type: "button", variant: "outline", onClick: handleClose, disabled: isSubmitting, className: "flex-1", children: "Cancel" }), _jsx(Button, { type: "submit", disabled: isDisabled, className: "flex-1", "data-testid": "adopt-branch-submit", children: isSubmitting ? (_jsxs(_Fragment, { children: [_jsx(Loader2, { className: "mr-2 h-4 w-4 animate-spin" }), "Adopting..."] })) : ('Adopt Branch') })] }) })] }) }));
+}

package/dist/src/presentation/web/components/common/control-center-drawer/adopt-branch-drawer.stories.d.ts

@@ -0,0 +1,38 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import { AdoptBranchDrawer } from './adopt-branch-drawer.js';
+/**
+ * **AdoptBranchDrawer** is a right-side sliding drawer for importing an
+ * existing git branch into Shep's feature tracking system.
+ *
+ * ### Form
+ * - **Repository** (required) — combobox for selecting which repository to adopt from
+ * - **Branch name** (required) — combobox with search for selecting a branch (scoped to selected repo)
+ * - **Adopt Branch** button — disabled when no repo/branch is selected or submitting
+ * - **Cancel** button — closes the drawer
+ *
+ * ### States
+ * - Default: no repo or branch selected, submit disabled
+ * - Loading branches: combobox shows loading spinner
+ * - Loading submit: button shows spinner
+ * - Error: error message shown below combobox
+ */
+declare const meta: Meta<typeof AdoptBranchDrawer>;
+export default meta;
+type Story = StoryObj<typeof AdoptBranchDrawer>;
+/** Default — click the trigger button to open the adopt branch drawer with repo and branch selectors. */
+export declare const Default: Story;
+/** Pre-opened drawer with repository and branch comboboxes for quick visual inspection. */
+export declare const PreOpened: Story;
+/** No repository selected — branch selector shows "Select a repository first..." */
+export declare const NoRepoSelected: Story;
+/** Branches loading state — combobox shows "Loading branches..." */
+export declare const BranchesLoading: Story;
+/** Loading state — submit in progress, button shows spinner. */
+export declare const Loading: Story;
+/** Error state — error message visible below combobox. */
+export declare const WithError: Story;
+/** No branches available — empty state in the combobox dropdown. */
+export declare const NoBranches: Story;
+/** Adopt branch drawer rendered inside a full-page context — starts open. */
+export declare const InDrawer: Story;
+//# sourceMappingURL=adopt-branch-drawer.stories.d.ts.map

package/dist/src/presentation/web/components/common/control-center-drawer/adopt-branch-drawer.stories.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"adopt-branch-drawer.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/adopt-branch-drawer.stories.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAO1D;;;;;;;;;;;;;;;GAeG;AACH,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,iBAAiB,CAmBxC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAuFhD,yGAAyG;AACzG,eAAO,MAAM,OAAO,EAAE,KAErB,CAAC;AAEF,2FAA2F;AAC3F,eAAO,MAAM,SAAS,EAAE,KAMvB,CAAC;AAEF,oFAAoF;AACpF,eAAO,MAAM,cAAc,EAAE,KAM5B,CAAC;AAEF,oEAAoE;AACpE,eAAO,MAAM,eAAe,EAAE,KAM7B,CAAC;AAEF,gEAAgE;AAChE,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAC;AAEF,0DAA0D;AAC1D,eAAO,MAAM,SAAS,EAAE,KAWvB,CAAC;AAEF,oEAAoE;AACpE,eAAO,MAAM,UAAU,EAAE,KAMxB,CAAC;AAyCF,6EAA6E;AAC7E,eAAO,MAAM,QAAQ,EAAE,KAEtB,CAAC"}

package/dist/src/presentation/web/components/common/control-center-drawer/adopt-branch-drawer.stories.js

@@ -0,0 +1,161 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
+import { within, userEvent, fn } from '@storybook/test';
+import { AdoptBranchDrawer } from './adopt-branch-drawer.js';
+import { Button } from '../../ui/button.js';
+/* ---------------------------------------------------------------------------
+ * Meta
+ * ------------------------------------------------------------------------- */
+/**
+ * **AdoptBranchDrawer** is a right-side sliding drawer for importing an
+ * existing git branch into Shep's feature tracking system.
+ *
+ * ### Form
+ * - **Repository** (required) — combobox for selecting which repository to adopt from
+ * - **Branch name** (required) — combobox with search for selecting a branch (scoped to selected repo)
+ * - **Adopt Branch** button — disabled when no repo/branch is selected or submitting
+ * - **Cancel** button — closes the drawer
+ *
+ * ### States
+ * - Default: no repo or branch selected, submit disabled
+ * - Loading branches: combobox shows loading spinner
+ * - Loading submit: button shows spinner
+ * - Error: error message shown below combobox
+ */
+const meta = {
+    title: 'Drawers/Feature/AdoptBranchDrawer',
+    component: AdoptBranchDrawer,
+    tags: ['autodocs'],
+    parameters: {
+        layout: 'fullscreen',
+    },
+    argTypes: {
+        open: { control: 'boolean', description: 'Controls drawer visibility' },
+        onClose: { description: 'Called when the drawer is dismissed' },
+        onSubmit: { description: 'Called with branch name and repo path when submitted' },
+        isSubmitting: { control: 'boolean', description: 'Shows loading state' },
+        error: { control: 'text', description: 'Error message to display' },
+        repositories: { description: 'Available repositories for selection' },
+        selectedRepositoryPath: { description: 'Currently selected repository path' },
+        onRepositoryChange: { description: 'Called when user selects a different repository' },
+        branches: { description: 'Available branch names for the combobox dropdown' },
+        branchesLoading: { control: 'boolean', description: 'Whether branches are loading' },
+    },
+};
+export default meta;
+/* ---------------------------------------------------------------------------
+ * Shared data
+ * ------------------------------------------------------------------------- */
+const logSubmit = fn().mockName('onSubmit');
+const logClose = fn().mockName('onClose');
+const logRepoChange = fn().mockName('onRepositoryChange');
+const sampleRepositories = [
+    { id: 'repo-1', name: 'my-app', path: '/Users/dev/projects/my-app' },
+    { id: 'repo-2', name: 'api-server', path: '/Users/dev/projects/api-server' },
+    { id: 'repo-3', name: 'shared-lib', path: '/Users/dev/projects/shared-lib' },
+];
+const sampleBranches = [
+    'feat/user-auth',
+    'feat/dashboard-redesign',
+    'fix/login-bug',
+    'fix/memory-leak',
+    'chore/update-deps',
+    'refactor/api-layer',
+    'docs/readme-update',
+    'release/v2.0',
+    'hotfix/critical-fix',
+    'develop',
+];
+/* ---------------------------------------------------------------------------
+ * Trigger wrapper
+ * ------------------------------------------------------------------------- */
+function AdoptDrawerTrigger({ label = 'Open Adopt Branch', isSubmitting = false, error, repositories = sampleRepositories, selectedRepositoryPath = sampleRepositories[0].path, branches = sampleBranches, branchesLoading = false, }) {
+    const [open, setOpen] = useState(false);
+    const [selectedRepo, setSelectedRepo] = useState(selectedRepositoryPath);
+    return (_jsxs("div", { className: "flex h-screen items-start p-4", children: [_jsx(Button, { variant: "outline", onClick: () => setOpen(true), children: label }), _jsx(AdoptBranchDrawer, { open: open, onClose: () => {
+                    setOpen(false);
+                    logClose();
+                }, onSubmit: (branchName, repoPath) => {
+                    logSubmit(branchName, repoPath);
+                    setOpen(false);
+                }, isSubmitting: isSubmitting, error: error, repositories: repositories, selectedRepositoryPath: selectedRepo, onRepositoryChange: (path) => {
+                    setSelectedRepo(path);
+                    logRepoChange(path);
+                }, branches: branches, branchesLoading: branchesLoading })] }));
+}
+/* ---------------------------------------------------------------------------
+ * Stories
+ * ------------------------------------------------------------------------- */
+/** Default — click the trigger button to open the adopt branch drawer with repo and branch selectors. */
+export const Default = {
+    render: () => _jsx(AdoptDrawerTrigger, {}),
+};
+/** Pre-opened drawer with repository and branch comboboxes for quick visual inspection. */
+export const PreOpened = {
+    render: () => _jsx(AdoptDrawerTrigger, { label: "Open Drawer" }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        await userEvent.click(canvas.getByRole('button', { name: 'Open Drawer' }));
+    },
+};
+/** No repository selected — branch selector shows "Select a repository first..." */
+export const NoRepoSelected = {
+    render: () => _jsx(AdoptDrawerTrigger, { label: "Open (No Repo)", selectedRepositoryPath: "" }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        await userEvent.click(canvas.getByRole('button', { name: 'Open (No Repo)' }));
+    },
+};
+/** Branches loading state — combobox shows "Loading branches..." */
+export const BranchesLoading = {
+    render: () => _jsx(AdoptDrawerTrigger, { label: "Open (Loading Branches)", branchesLoading: true }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        await userEvent.click(canvas.getByRole('button', { name: 'Open (Loading Branches)' }));
+    },
+};
+/** Loading state — submit in progress, button shows spinner. */
+export const Loading = {
+    render: () => _jsx(AdoptDrawerTrigger, { label: "Open (Loading)", isSubmitting: true }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        await userEvent.click(canvas.getByRole('button', { name: 'Open (Loading)' }));
+    },
+};
+/** Error state — error message visible below combobox. */
+export const WithError = {
+    render: () => (_jsx(AdoptDrawerTrigger, { label: "Open (Error)", error: 'Branch "main" cannot be adopted. The main branch should not be tracked as a feature.' })),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        await userEvent.click(canvas.getByRole('button', { name: 'Open (Error)' }));
+    },
+};
+/** No branches available — empty state in the combobox dropdown. */
+export const NoBranches = {
+    render: () => _jsx(AdoptDrawerTrigger, { label: "Open (No Branches)", branches: [] }),
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        await userEvent.click(canvas.getByRole('button', { name: 'Open (No Branches)' }));
+    },
+};
+/* ---------------------------------------------------------------------------
+ * Shell template — starts open in full-page context
+ * ------------------------------------------------------------------------- */
+function AdoptDrawerShellTemplate() {
+    const [open, setOpen] = useState(true);
+    const [selectedRepo, setSelectedRepo] = useState(sampleRepositories[0].path);
+    return (_jsxs("div", { style: { height: '100vh', background: '#f8fafc', padding: '2rem' }, children: [_jsx("button", { type: "button", onClick: () => setOpen(true), style: { padding: '8px 16px', border: '1px solid #ccc', borderRadius: '6px' }, children: "Open Drawer" }), _jsx(AdoptBranchDrawer, { open: open, onClose: () => {
+                    setOpen(false);
+                    logClose();
+                }, onSubmit: (branchName, repoPath) => {
+                    logSubmit(branchName, repoPath);
+                    setOpen(false);
+                }, repositories: sampleRepositories, selectedRepositoryPath: selectedRepo, onRepositoryChange: (path) => {
+                    setSelectedRepo(path);
+                    logRepoChange(path);
+                }, branches: sampleBranches })] }));
+}
+/** Adopt branch drawer rendered inside a full-page context — starts open. */
+export const InDrawer = {
+    render: () => _jsx(AdoptDrawerShellTemplate, {}),
+};

package/dist/src/presentation/web/components/common/control-center-drawer/adopt-drawer-client.d.ts

@@ -0,0 +1,7 @@
+import type { RepositoryOption } from '../../common/feature-create-drawer/feature-create-drawer.js';
+export interface AdoptDrawerClientProps {
+    repositoryPath: string;
+    repositories: RepositoryOption[];
+}
+export declare function AdoptDrawerClient({ repositoryPath, repositories }: AdoptDrawerClientProps): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=adopt-drawer-client.d.ts.map

package/dist/src/presentation/web/components/common/control-center-drawer/adopt-drawer-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"adopt-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/adopt-drawer-client.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iEAAiE,CAAC;AAExG,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,gBAAgB,EAAE,CAAC;CAClC;AAED,wBAAgB,iBAAiB,CAAC,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,sBAAsB,2CA+FzF"}