@shepai/cli 1.162.0 → 1.163.0-pr499.0ce2086

package/dist/src/presentation/tui/wizards/github-import.wizard.js

@@ -3,12 +3,15 @@
  *
  * Interactive TUI wizard that guides users through importing a GitHub repository.
  * Offers two paths: paste a GitHub URL or browse the user's repositories.
+ * Supports browsing repos from multiple organizations.
  * Returns the selected URL/nameWithOwner and optional destination override.
  */
 import { select, input } from '@inquirer/prompts';
 import { GitHubUrlParseError } from '../../../../packages/core/src/application/ports/output/services/github-repository-service.interface.js';
 import { getTuiI18n } from '../i18n.js';
 import { shepTheme } from '../themes/shep.theme.js';
+/** Sentinel value representing the authenticated user's personal account */
+const PERSONAL_OWNER = '__personal__';
 /**
  * Format a GitHub repo for display in the select list.
  * Shows name, visibility badge, and truncated description.
@@ -27,14 +30,15 @@ function formatRepoChoice(repo) {
  * Steps:
  * 1. Choose import method (URL input or browse repos)
  * 2a. If URL: prompt for URL, validate with parseGitHubUrl
- * 2b. If browse: fetch repos via listUseCase, display select list
+ * 2b. If browse: optionally select an org, then fetch repos via listUseCase, display select list
  * 3. Optionally prompt for destination directory override
  *
  * @param gitHubService - Service for URL validation
  * @param listUseCase - Use case for listing user repos
+ * @param listOrgsUseCase - Use case for listing user's organizations
  * @returns The selected import target and optional destination
  */
-export async function githubImportWizard(gitHubService, listUseCase) {
+export async function githubImportWizard(gitHubService, listUseCase, listOrgsUseCase) {
     // Step 1: Choose import method
     const t = getTuiI18n().t;
     const method = await select({
@@ -58,7 +62,7 @@ export async function githubImportWizard(gitHubService, listUseCase) {
         url = await promptForUrl(gitHubService);
     }
     else {
-        url = await promptForBrowse(listUseCase);
+        url = await promptForBrowse(listUseCase, listOrgsUseCase);
     }
     // Step 3: Optional destination override
     const dest = await promptForDestination();
@@ -97,11 +101,39 @@ async function promptForUrl(gitHubService) {
 }
 /**
  * Prompt the user to browse and select from their GitHub repositories.
- * Fetches repos via the list use case and displays them in a select prompt.
+ * If organizations are available, first prompts the user to select an owner.
  */
-async function promptForBrowse(listUseCase) {
-    const repos = await listUseCase.execute({ limit: 30 });
+async function promptForBrowse(listUseCase, listOrgsUseCase) {
     const t = getTuiI18n().t;
+    let owner;
+    // Try to load organizations for the owner selector
+    if (listOrgsUseCase) {
+        try {
+            const orgs = await listOrgsUseCase.execute();
+            if (orgs.length > 0) {
+                const ownerChoices = [
+                    { name: 'My repositories', value: PERSONAL_OWNER },
+                    ...orgs.map((org) => ({
+                        name: org.login,
+                        value: org.login,
+                        description: org.description || undefined,
+                    })),
+                ];
+                const selectedOwner = await select({
+                    message: 'Select account',
+                    choices: ownerChoices,
+                    theme: shepTheme,
+                });
+                if (selectedOwner !== PERSONAL_OWNER) {
+                    owner = selectedOwner;
+                }
+            }
+        }
+        catch {
+            // Org listing failure is non-critical — proceed with personal repos
+        }
+    }
+    const repos = await listUseCase.execute({ limit: 30, owner });
     if (repos.length === 0) {
         throw new Error(t('tui:wizards.githubImport.noRepos'));
     }

package/dist/src/presentation/web/app/actions/get-git-log.d.ts

@@ -0,0 +1,44 @@
+export interface GitLogEntry {
+    hash: string;
+    shortHash: string;
+    subject: string;
+    author: string;
+    relativeDate: string;
+    branch?: string;
+}
+export interface GitBranchInfo {
+    name: string;
+    isCurrent: boolean;
+    lastCommitDate: string;
+}
+export interface GitRemoteInfo {
+    name: string;
+    url: string;
+}
+export interface GitWorkingTreeStatus {
+    staged: number;
+    modified: number;
+    untracked: number;
+}
+export interface GitDiffStats {
+    filesChanged: number;
+    insertions: number;
+    deletions: number;
+}
+export interface GitRepoInfo {
+    commits: GitLogEntry[];
+    branches: GitBranchInfo[];
+    remotes: GitRemoteInfo[];
+    tags: string[];
+    stashCount: number;
+    currentBranch: string;
+    diffStats: GitDiffStats | null;
+    workingTree: GitWorkingTreeStatus;
+    error?: string;
+}
+export declare function getGitRepoInfo(repositoryPath: string, commitLimit?: number): Promise<GitRepoInfo>;
+export declare function getGitLog(repositoryPath: string, limit?: number): Promise<{
+    entries: GitLogEntry[];
+    error?: string;
+}>;
+//# sourceMappingURL=get-git-log.d.ts.map

package/dist/src/presentation/web/app/actions/get-git-log.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-git-log.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-git-log.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,YAAY,GAAG,IAAI,CAAC;IAC/B,WAAW,EAAE,oBAAoB,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,cAAc,CAClC,cAAc,EAAE,MAAM,EACtB,WAAW,SAAI,GACd,OAAO,CAAC,WAAW,CAAC,CAwHtB;AAGD,wBAAsB,SAAS,CAC7B,cAAc,EAAE,MAAM,EACtB,KAAK,SAAK,GACT,OAAO,CAAC;IAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAGrD"}

package/dist/src/presentation/web/app/actions/get-git-log.js

@@ -0,0 +1,125 @@
+'use server';
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+const execFileAsync = promisify(execFile);
+async function git(cwd, args) {
+    const { stdout } = await execFileAsync('git', args, { cwd, timeout: 5000 });
+    return stdout.trim();
+}
+export async function getGitRepoInfo(repositoryPath, commitLimit = 8) {
+    const empty = {
+        commits: [],
+        branches: [],
+        remotes: [],
+        tags: [],
+        stashCount: 0,
+        currentBranch: '',
+        diffStats: null,
+        workingTree: { staged: 0, modified: 0, untracked: 0 },
+    };
+    if (!repositoryPath.trim()) {
+        return { ...empty, error: 'Repository path is required' };
+    }
+    const results = await Promise.allSettled([
+        // 0: commits
+        git(repositoryPath, [
+            'log',
+            `--max-count=${commitLimit}`,
+            '--format=%H%x00%h%x00%s%x00%an%x00%cr',
+            '--no-color',
+        ]),
+        // 1: current branch
+        git(repositoryPath, ['branch', '--show-current']),
+        // 2: branches with dates
+        git(repositoryPath, [
+            'branch',
+            '--sort=-committerdate',
+            '--format=%(HEAD)%(refname:short)%00%(committerdate:relative)',
+            '--no-color',
+        ]),
+        // 3: remotes
+        git(repositoryPath, ['remote', '-v']),
+        // 4: tags (recent 5)
+        git(repositoryPath, ['tag', '--sort=-creatordate', '-l', '--format=%(refname:short)']),
+        // 5: stash count
+        git(repositoryPath, ['stash', 'list']),
+        // 6: working tree status
+        git(repositoryPath, ['status', '--porcelain']),
+        // 7: diff stats (uncommitted)
+        git(repositoryPath, ['diff', '--shortstat']),
+    ]);
+    const val = (i) => (results[i].status === 'fulfilled' ? results[i].value : '');
+    // Parse commits
+    const commits = val(0)
+        .split('\n')
+        .filter(Boolean)
+        .map((line) => {
+        const [hash, shortHash, subject, author, relativeDate] = line.split('\0');
+        return { hash, shortHash, subject, author, relativeDate };
+    });
+    const currentBranch = val(1);
+    if (commits.length > 0 && currentBranch) {
+        commits[0].branch = currentBranch;
+    }
+    // Parse branches
+    const branches = val(2)
+        .split('\n')
+        .filter(Boolean)
+        .slice(0, 10)
+        .map((line) => {
+        const isCurrent = line.startsWith('*');
+        const clean = isCurrent ? line.slice(1) : line;
+        const [name, lastCommitDate] = clean.split('\0');
+        return { name: name.trim(), isCurrent, lastCommitDate: lastCommitDate?.trim() ?? '' };
+    });
+    // Parse remotes (dedup fetch/push)
+    const remoteMap = new Map();
+    val(3)
+        .split('\n')
+        .filter(Boolean)
+        .forEach((line) => {
+        const match = line.match(/^(\S+)\s+(\S+)\s+\(fetch\)/);
+        if (match) {
+            // Strip credentials/tokens from URL before sending to client
+            const sanitized = match[2].replace(/\/\/[^@]+@/, '//').replace(/x-access-token:[^@]+@/, '');
+            remoteMap.set(match[1], sanitized);
+        }
+    });
+    const remotes = Array.from(remoteMap, ([name, url]) => ({ name, url }));
+    // Parse tags (top 5)
+    const tags = val(4).split('\n').filter(Boolean).slice(0, 5);
+    // Stash count
+    const stashCount = val(5).split('\n').filter(Boolean).length;
+    // Working tree status
+    const statusLines = val(6).split('\n').filter(Boolean);
+    const workingTree = { staged: 0, modified: 0, untracked: 0 };
+    for (const line of statusLines) {
+        const x = line[0];
+        const y = line[1];
+        if (x === '?' && y === '?')
+            workingTree.untracked++;
+        else if (x !== ' ' && x !== '?')
+            workingTree.staged++;
+        if (y !== ' ' && y !== '?')
+            workingTree.modified++;
+    }
+    // Diff stats
+    let diffStats = null;
+    const diffLine = val(7);
+    if (diffLine) {
+        const files = diffLine.match(/(\d+) file/);
+        const ins = diffLine.match(/(\d+) insertion/);
+        const del = diffLine.match(/(\d+) deletion/);
+        diffStats = {
+            filesChanged: files ? parseInt(files[1], 10) : 0,
+            insertions: ins ? parseInt(ins[1], 10) : 0,
+            deletions: del ? parseInt(del[1], 10) : 0,
+        };
+    }
+    return { commits, branches, remotes, tags, stashCount, currentBranch, diffStats, workingTree };
+}
+// Keep backward compat
+export async function getGitLog(repositoryPath, limit = 10) {
+    const info = await getGitRepoInfo(repositoryPath, limit);
+    return { entries: info.commits, error: info.error };
+}

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

@@ -0,0 +1,6 @@
+import type { GitHubOrganization } from '../../../../../packages/core/src/application/ports/output/services/github-repository-service.interface.js';
+export declare function listGitHubOrganizations(): Promise<{
+    orgs?: GitHubOrganization[];
+    error?: string;
+}>;
+//# sourceMappingURL=list-github-organizations.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"list-github-organizations.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/list-github-organizations.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oFAAoF,CAAC;AAG7H,wBAAsB,uBAAuB,IAAI,OAAO,CAAC;IACvD,IAAI,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CAYD"}

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

@@ -0,0 +1,17 @@
+'use server';
+import { resolve } from '../../lib/server-container.js';
+import { GitHubAuthError } from '../../../../../packages/core/src/application/ports/output/services/github-repository-service.interface.js';
+export async function listGitHubOrganizations() {
+    try {
+        const useCase = resolve('ListGitHubOrganizationsUseCase');
+        const orgs = await useCase.execute();
+        return { orgs };
+    }
+    catch (error) {
+        if (error instanceof GitHubAuthError) {
+            return { error: 'GitHub CLI is not authenticated. Run `gh auth login` to sign in.' };
+        }
+        const message = error instanceof Error ? error.message : 'Failed to list organizations';
+        return { error: message };
+    }
+}

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

@@ -2,6 +2,7 @@ import type { GitHubRepo } from '../../../../../packages/core/src/application/po
 interface ListGitHubRepositoriesInput {
     search?: string;
     limit?: number;
+    owner?: string;
 }
 export declare function listGitHubRepositories(input?: ListGitHubRepositoriesInput): Promise<{
     repos?: GitHubRepo[];

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

@@ -1 +1 @@
-{"version":3,"file":"list-github-repositories.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/list-github-repositories.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oFAAoF,CAAC;AAGrH,UAAU,2BAA2B;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,CAAC,EAAE,2BAA2B,GAClC,OAAO,CAAC;IAAE,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAYnD"}
+{"version":3,"file":"list-github-repositories.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/list-github-repositories.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oFAAoF,CAAC;AAGrH,UAAU,2BAA2B;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,CAAC,EAAE,2BAA2B,GAClC,OAAO,CAAC;IAAE,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAYnD"}

package/dist/src/presentation/web/app/actions/open-folder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-folder.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/open-folder.ts"],"names":[],"mappings":"AAiBA,wBAAsB,UAAU,CAC9B,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA8B9D"}
+{"version":3,"file":"open-folder.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/open-folder.ts"],"names":[],"mappings":"AAiBA,wBAAsB,UAAU,CAC9B,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAkC9D"}

package/dist/src/presentation/web/app/actions/open-folder.js

@@ -1,7 +1,7 @@
 'use server';
 import { existsSync } from 'node:fs';
 import { platform } from 'node:os';
-import { isAbsolute } from 'node:path';
+import { isAbsolute, normalize } from 'node:path';
 import { spawn } from 'node:child_process';
 // Use a record lookup instead of if/else to prevent the bundler from
 // tree-shaking platform branches at build time. Turbopack evaluates
@@ -27,7 +27,10 @@ export async function openFolder(repositoryPath) {
                 error: `Unsupported platform: ${platform()}`,
             };
         }
-        const child = spawn(entry.cmd, entry.args(repositoryPath), {
+        // Normalize to platform-native separators — explorer.exe on Windows
+        // does not understand forward-slash paths and falls back to Documents.
+        const nativePath = normalize(repositoryPath);
+        const child = spawn(entry.cmd, entry.args(nativePath), {
             detached: true,
             stdio: 'ignore',
         });

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;AASvB,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,oDA2BD"}
+{"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"}

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

@@ -6,7 +6,9 @@ import './globals.css';
 import { AppShell } from '../components/layouts/app-shell/index.js';
 import { Toaster } from '../components/ui/sonner.js';
 import { getFeatureFlags } from '../lib/feature-flags.js';
+import { getFabLayout } from '../lib/fab-layout.js';
 import { FeatureFlagsProvider } from '../hooks/feature-flags-context.js';
+import { FabLayoutProvider } from '../hooks/fab-layout-context.js';
 import { QueryProvider } from '../components/providers/query-provider.js';
 import { I18nProvider } from '../components/providers/i18n-provider.js';
 import { getLanguagePreference } from '../lib/language.js';
@@ -36,5 +38,5 @@ export default async function RootLayout({ children, }) {
     const { language, dir } = getLanguagePreference();
     return (_jsxs("html", { lang: language, dir: dir, suppressHydrationWarning: true, children: [_jsx("head", { children: _jsx("script", { dangerouslySetInnerHTML: {
                         __html: `(function(){try{var d=document.documentElement,t=localStorage.getItem('shep-theme'),s=window.matchMedia('(prefers-color-scheme: dark)').matches;if(t==='dark'||(t==='system'&&s)||(!t&&s)){d.classList.add('dark')}}catch(e){}})();`,
-                    } }) }), _jsxs("body", { className: "min-h-screen antialiased", children: [_jsx(I18nProvider, { initialLanguage: language, children: _jsx(QueryProvider, { children: _jsx(FeatureFlagsProvider, { flags: getFeatureFlags(), children: _jsx(AppShell, { sidebarOpen: sidebarOpen, children: children }) }) }) }), _jsx(Toaster, { position: "bottom-center" })] })] }));
+                    } }) }), _jsxs("body", { className: "min-h-screen antialiased", children: [_jsx(I18nProvider, { initialLanguage: language, children: _jsx(QueryProvider, { children: _jsx(FeatureFlagsProvider, { flags: getFeatureFlags(), children: _jsx(FabLayoutProvider, { layout: getFabLayout(), children: _jsx(AppShell, { sidebarOpen: sidebarOpen, children: children }) }) }) }) }), _jsx(Toaster, { position: "bottom-center" })] })] }));
 }

package/dist/src/presentation/web/components/common/base-drawer/base-drawer.js

@@ -58,7 +58,7 @@ export function BaseDrawer({ open, onClose, modal = false, dismissOnOutsideClick
     return (_jsxs(Drawer, { direction: drawerDirection, modal: modal, handleOnly: true, open: open, onOpenChange: (isOpen) => {
             if (!isOpen)
                 onClose();
-        }, children: [modal ? _jsx(DrawerOverlay, {}) : null, _jsxs(DrawerContent, { ref: contentRef, direction: drawerDirection, showCloseButton: false, className: cn(drawerVariants({ size }), 'bg-white/85 backdrop-blur-xl dark:bg-neutral-800/85', className), "data-testid": testId, onInteractOutside: modal ? undefined : (e) => e.preventDefault(), children: [_jsx(DrawerTitle, { asChild: true, children: _jsx("span", { className: "sr-only", children: title }) }), _jsx(DrawerDescription, { asChild: true, children: _jsx("span", { className: "sr-only", children: title }) }), _jsxs("button", { type: "button", "aria-label": "Close", onClick: onClose, className: "ring-offset-background focus:ring-ring absolute end-4 top-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden", "data-testid": testId ? `${testId}-close-button` : undefined, children: [_jsx(XIcon, { className: "size-4" }), _jsx("span", { className: "sr-only", children: "Close" })] }), header ? _jsx(DrawerHeader, { className: "shrink-0", children: header }) : null, header ? _jsx(Separator, {}) : null, featureFlags.envDeploy && deployTarget ? _jsx(DeployBar, { deployTarget: deployTarget }) : null, _jsx("div", { className: "flex min-h-0 flex-1 flex-col overflow-hidden", children: children }), footer ? _jsx(DrawerFooter, { className: "shrink-0", children: footer }) : null] })] }));
+        }, children: [modal ? _jsx(DrawerOverlay, {}) : null, _jsxs(DrawerContent, { ref: contentRef, direction: drawerDirection, showCloseButton: false, className: cn(drawerVariants({ size }), 'bg-white/85 backdrop-blur-xl dark:bg-neutral-800/85', className), "data-testid": testId, onInteractOutside: modal ? undefined : (e) => e.preventDefault(), children: [_jsx(DrawerTitle, { asChild: true, children: _jsx("span", { className: "sr-only", children: title }) }), _jsx(DrawerDescription, { asChild: true, children: _jsx("span", { className: "sr-only", children: title }) }), _jsxs("button", { type: "button", "aria-label": "Close", onClick: onClose, className: "ring-offset-background focus:ring-ring absolute end-3 top-2 z-50 rounded-sm p-1 opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden", "data-testid": testId ? `${testId}-close-button` : undefined, children: [_jsx(XIcon, { className: "size-4" }), _jsx("span", { className: "sr-only", children: "Close" })] }), header ? _jsx(DrawerHeader, { className: "shrink-0", children: header }) : null, header ? _jsx(Separator, {}) : null, featureFlags.envDeploy && deployTarget ? _jsx(DeployBar, { deployTarget: deployTarget }) : null, _jsx("div", { className: "flex min-h-0 flex-1 flex-col overflow-hidden", children: children }), footer ? _jsx(DrawerFooter, { className: "shrink-0", children: footer }) : null] })] }));
 }
 function DeployBar({ deployTarget }) {
     const deployAction = useDeployAction(deployTarget);

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

@@ -1 +1 @@
-{"version":3,"file":"feature-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/feature-drawer-client.tsx"],"names":[],"mappings":"AAkDA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAK/D,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,UAAU,CAAC;IACjB,8FAA8F;IAC9F,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,qFAAqF;IACrF,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EAAE,WAAW,EACjB,MAAM,EACN,uBAA8B,GAC/B,EAAE,wBAAwB,2CA0uB1B"}
+{"version":3,"file":"feature-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/feature-drawer-client.tsx"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAK/D,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,UAAU,CAAC;IACjB,8FAA8F;IAC9F,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,qFAAqF;IACrF,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EAAE,WAAW,EACjB,MAAM,EACN,uBAA8B,GAC/B,EAAE,wBAAwB,2CAoxB1B"}

package/dist/src/presentation/web/components/common/control-center-drawer/feature-drawer-client.js

@@ -1,13 +1,15 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useCallback, useEffect, useRef } from 'react';
+import { cn } from '../../../lib/utils.js';
 import { useTranslation } from 'react-i18next';
 import { useRouter, usePathname } from 'next/navigation';
 import { toast } from 'sonner';
-import { Loader2, Trash2, Play, Square, Copy, Check, Code2, ExternalLink, Archive, ArchiveRestore, } from 'lucide-react';
+import { Loader2, Trash2, Play, Square, Copy, Check, Archive, ArchiveRestore } from 'lucide-react';
 import { approveFeature } from '../../../app/actions/approve-feature.js';
 import { resumeFeature } from '../../../app/actions/resume-feature.js';
 import { startFeature } from '../../../app/actions/start-feature.js';
+import { stopFeature } from '../../../app/actions/stop-feature.js';
 import { rejectFeature } from '../../../app/actions/reject-feature.js';
 import { getFeatureArtifact } from '../../../app/actions/get-feature-artifact.js';
 import { getResearchArtifact } from '../../../app/actions/get-research-artifact.js';
@@ -19,10 +21,8 @@ import { useDeployAction } from '../../../hooks/use-deploy-action.js';
 import { useAgentEventsContext } from '../../../hooks/agent-events-provider.js';
 import { BaseDrawer } from '../../common/base-drawer/index.js';
 import { DeploymentStatusBadge } from '../../common/deployment-status-badge/index.js';
-import { Button } from '../../ui/button.js';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../../ui/tooltip.js';
 import { DeleteFeatureDialog } from '../../common/delete-feature-dialog/index.js';
-import { ActionButton } from '../../common/action-button/index.js';
 import { OpenActionMenu } from '../../common/open-action-menu/index.js';
 import { FeatureDrawerTabs } from '../../common/feature-drawer-tabs/index.js';
 import { useFeatureActions } from '../../common/feature-drawer/use-feature-actions.js';
@@ -38,9 +38,22 @@ export function FeatureDrawerClient({ view: initialView, urlTab, interactiveAgen
     const rejectSound = useSoundAction('reject');
     // Track the view locally so SSE events can update the drawer type in real-time
     const [view, setView] = useState(initialView);
-    // Sync when server re-renders with new props (e.g. after navigation)
+    // Sync when server re-renders with new props (e.g. after navigation).
+    // When reopening the SAME feature, merge server data into the existing view
+    // to preserve enriched fields (repositoryName, baseBranch, oneLiner, remoteUrl)
+    // that useDrawerSync added but the minimal server component doesn't provide.
     useEffect(() => {
-        setView(initialView);
+        setView((prev) => {
+            if (prev.type === 'feature' &&
+                initialView.type === 'feature' &&
+                prev.node.featureId === initialView.node.featureId) {
+                return {
+                    ...initialView,
+                    node: { ...prev.node, ...initialView.node },
+                };
+            }
+            return initialView;
+        });
     }, [initialView]);
     const featureNode = view.type === 'feature' ? view.node : null;
     // SSE: update drawer view when feature state changes
@@ -325,17 +338,28 @@ export function FeatureDrawerClient({ view: initialView, urlTab, interactiveAgen
             return;
         }
         toast.success('Feature resumed — agent restarting');
-        // Optimistically update canvas node
         window.dispatchEvent(new CustomEvent('shep:feature-approved', {
             detail: { featureId },
         }));
-        // Optimistically update the drawer view
         setView((prev) => {
             if (prev.type !== 'feature')
                 return prev;
             return { ...prev, node: { ...prev.node, state: 'running' } };
         });
     }, []);
+    const handleStop = useCallback(async (featureId) => {
+        const result = await stopFeature(featureId);
+        if (!result.stopped) {
+            toast.error(result.error ?? 'Failed to stop');
+            return;
+        }
+        toast.success('Agent stopped');
+        setView((prev) => {
+            if (prev.type !== 'feature')
+                return prev;
+            return { ...prev, node: { ...prev.node, state: 'error' } };
+        });
+    }, []);
     const handleStart = useCallback(async (featureId) => {
         const result = await startFeature(featureId);
         if (result.error) {
@@ -401,14 +425,21 @@ export function FeatureDrawerClient({ view: initialView, urlTab, interactiveAgen
     let headerContent = undefined;
     if (featureNode) {
         const shortId = featureNode.featureId.slice(0, 8);
-        const repoName = featureNode.repositoryName ??
-            featureNode.repositoryPath.split('/').filter(Boolean).at(-1) ??
-            '';
-        headerContent = (_jsxs(_Fragment, { children: [repoName ? (_jsxs("div", { className: "flex items-center gap-1.5 pt-0.5", children: [_jsx(Code2, { className: "text-muted-foreground size-3.5 shrink-0" }), featureNode.remoteUrl ? (_jsxs("a", { href: featureNode.remoteUrl, target: "_blank", rel: "noopener noreferrer", className: "text-muted-foreground hover:text-foreground inline-flex items-center gap-1 text-xs transition-colors", "data-testid": "feature-drawer-repo-link", children: [repoName, _jsx(ExternalLink, { className: "size-3" })] })) : (_jsx("span", { className: "text-muted-foreground text-xs", children: repoName }))] })) : null, featureActionsInput ? (_jsxs("div", { className: "flex items-center gap-2 pt-1", "data-testid": "feature-drawer-actions", children: [featureNode?.state !== 'done' ? (_jsx(OpenActionMenu, { actions: featureActions, repositoryPath: featureActionsInput.repositoryPath, worktreePath: featureActionsInput.worktreePath, showSpecs: !!featureActionsInput.specPath })) : null, featureNode?.state !== 'done' && featureFlags.envDeploy && featureDeployTarget ? (_jsxs(_Fragment, { children: [_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { children: _jsx(ActionButton, { label: isFeatureDeployActive
-                                                            ? t('featureDrawer.stopDevServer')
-                                                            : t('featureDrawer.startDevServer'), onClick: isFeatureDeployActive ? deployAction.stop : deployAction.deploy, loading: deployAction.deployLoading || deployAction.stopLoading, error: !!deployAction.deployError, icon: isFeatureDeployActive ? Square : Play, iconOnly: true, variant: "outline", size: "icon-sm" }) }) }), _jsx(TooltipContent, { children: isFeatureDeployActive
+        {
+            /* Reusable toolbar icon button classes */
+        }
+        const tbBtn = 'text-muted-foreground hover:bg-foreground/8 hover:text-foreground inline-flex size-8 items-center justify-center rounded-[3px] disabled:opacity-40';
+        const tbSep = 'bg-border/60 mx-1.5 h-5 w-px shrink-0';
+        headerContent = (_jsx("div", { "data-testid": "feature-drawer-toolbar", children: _jsxs("div", { className: "flex h-10 items-center px-2", "data-testid": "feature-drawer-actions", children: [featureActionsInput && featureNode?.state !== 'done' ? (_jsx(OpenActionMenu, { actions: featureActions, repositoryPath: featureActionsInput.repositoryPath, worktreePath: featureActionsInput.worktreePath, showSpecs: !!featureActionsInput.specPath })) : null, featureActionsInput &&
+                        featureNode?.state !== 'done' &&
+                        featureFlags.envDeploy &&
+                        featureDeployTarget ? (_jsxs(_Fragment, { children: [_jsx("div", { className: tbSep }), _jsx(TooltipProvider, { delayDuration: 300, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", disabled: deployAction.deployLoading || deployAction.stopLoading, onClick: isFeatureDeployActive ? deployAction.stop : deployAction.deploy, className: cn('inline-flex size-7 items-center justify-center rounded-[3px] disabled:opacity-40', isFeatureDeployActive
+                                                    ? 'text-red-500 hover:bg-red-500/10 hover:text-red-400'
+                                                    : 'text-green-600 hover:bg-green-500/10 dark:text-green-500'), "aria-label": isFeatureDeployActive
                                                     ? t('featureDrawer.stopDevServer')
-                                                    : t('featureDrawer.startDevServer') })] }) }), isFeatureDeployActive ? (_jsx(DeploymentStatusBadge, { status: deployAction.status, url: deployAction.url, targetId: featureDeployTarget?.targetId })) : null] })) : null, _jsxs("div", { className: "ml-auto flex items-center gap-1.5", children: [_jsx("code", { className: "bg-muted text-muted-foreground rounded px-1.5 py-0.5 font-mono text-xs", children: shortId }), _jsx("button", { type: "button", onClick: handleCopyId, className: "text-muted-foreground hover:text-foreground inline-flex items-center rounded p-0.5 transition-colors", "aria-label": t('featureDrawer.copyFeatureId'), "data-testid": "feature-drawer-copy-id", children: idCopied ? (_jsx(Check, { className: "size-3.5 text-green-600" })) : (_jsx(Copy, { className: "size-3.5" })) })] }), featureNode.featureId ? (_jsxs(_Fragment, { children: [featureNode.state === 'archived' ? (_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(Button, { variant: "ghost", size: "icon-sm", "aria-label": t('featureDrawer.unarchiveFeature'), disabled: isArchiving, className: "text-muted-foreground hover:text-primary", "data-testid": "feature-drawer-unarchive", onClick: () => handleUnarchive(featureNode.featureId), children: isArchiving ? (_jsx(Loader2, { className: "size-4 animate-spin" })) : (_jsx(ArchiveRestore, { className: "size-4" })) }) }), _jsx(TooltipContent, { children: t('featureDrawer.unarchiveFeature') })] }) })) : featureNode.state !== 'deleting' ? (_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(Button, { variant: "ghost", size: "icon-sm", "aria-label": t('featureDrawer.archiveFeature'), disabled: isArchiving, className: "text-muted-foreground hover:text-foreground", "data-testid": "feature-drawer-archive", onClick: () => handleArchive(featureNode.featureId), children: isArchiving ? (_jsx(Loader2, { className: "size-4 animate-spin" })) : (_jsx(Archive, { className: "size-4" })) }) }), _jsx(TooltipContent, { children: t('featureDrawer.archiveFeature') })] }) })) : null, _jsx(Button, { variant: "ghost", size: "icon-sm", "aria-label": t('featureDrawer.deleteFeature'), disabled: isDeleting, className: "text-muted-foreground hover:text-destructive", "data-testid": "feature-drawer-delete", onClick: () => setDeleteDialogOpen(true), children: isDeleting ? (_jsx(Loader2, { className: "size-4 animate-spin" })) : (_jsx(Trash2, { className: "size-4" })) }), _jsx(DeleteFeatureDialog, { open: deleteDialogOpen, onOpenChange: setDeleteDialogOpen, onConfirm: (cleanup, cascadeDelete, closePr) => handleDelete(featureNode.featureId, cleanup, cascadeDelete, closePr), isDeleting: isDeleting, featureName: featureNode.name, featureId: featureNode.featureId, hasChildren: featureNode.hasChildren, hasOpenPr: !!featureNode.pr && featureNode.pr.status === 'Open' })] })) : null] })) : null] }));
+                                                    : t('featureDrawer.startDevServer'), children: deployAction.deployLoading || deployAction.stopLoading ? (_jsx(Loader2, { className: "size-4 animate-spin" })) : isFeatureDeployActive ? (_jsx(Square, { className: "size-4" })) : (_jsx(Play, { className: "size-4" })) }) }), _jsx(TooltipContent, { side: "bottom", className: "text-xs", children: isFeatureDeployActive
+                                                ? t('featureDrawer.stopDevServer')
+                                                : t('featureDrawer.startDevServer') })] }) }), isFeatureDeployActive ? (_jsx(DeploymentStatusBadge, { status: deployAction.status, url: deployAction.url, targetId: featureDeployTarget?.targetId })) : null] })) : null, _jsx("div", { className: "flex-1" }), _jsxs("div", { className: "flex items-center", children: [_jsx("code", { className: "text-muted-foreground/70 font-mono text-[10px] tracking-wide select-none", children: shortId }), _jsx(TooltipProvider, { delayDuration: 300, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", onClick: handleCopyId, className: tbBtn, "aria-label": t('featureDrawer.copyFeatureId'), "data-testid": "feature-drawer-copy-id", children: idCopied ? (_jsx(Check, { className: "size-4 text-green-500" })) : (_jsx(Copy, { className: "size-4" })) }) }), _jsx(TooltipContent, { side: "bottom", className: "text-xs", children: t('featureDrawer.copyFeatureId') })] }) }), featureNode.featureId ? (_jsxs(_Fragment, { children: [_jsx("div", { className: tbSep }), _jsxs(TooltipProvider, { delayDuration: 300, children: [featureNode.state === 'archived' ? (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", disabled: isArchiving, className: tbBtn, "data-testid": "feature-drawer-unarchive", onClick: () => handleUnarchive(featureNode.featureId), children: isArchiving ? (_jsx(Loader2, { className: "size-4 animate-spin" })) : (_jsx(ArchiveRestore, { className: "size-3" })) }) }), _jsx(TooltipContent, { side: "bottom", className: "text-xs", children: t('featureDrawer.unarchiveFeature') })] })) : featureNode.state !== 'deleting' ? (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", disabled: isArchiving, className: tbBtn, "data-testid": "feature-drawer-archive", onClick: () => handleArchive(featureNode.featureId), children: isArchiving ? (_jsx(Loader2, { className: "size-4 animate-spin" })) : (_jsx(Archive, { className: "size-3" })) }) }), _jsx(TooltipContent, { side: "bottom", className: "text-xs", children: t('featureDrawer.archiveFeature') })] })) : null, _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", disabled: isDeleting, className: cn(tbBtn, 'hover:bg-destructive/10 hover:text-destructive'), "data-testid": "feature-drawer-delete", onClick: () => setDeleteDialogOpen(true), children: isDeleting ? (_jsx(Loader2, { className: "size-4 animate-spin" })) : (_jsx(Trash2, { className: "size-3" })) }) }), _jsx(TooltipContent, { side: "bottom", className: "text-xs", children: t('featureDrawer.deleteFeature') })] })] }), _jsx(DeleteFeatureDialog, { open: deleteDialogOpen, onOpenChange: setDeleteDialogOpen, onConfirm: (cleanup, cascadeDelete, closePr) => handleDelete(featureNode.featureId, cleanup, cascadeDelete, closePr), isDeleting: isDeleting, featureName: featureNode.name, featureId: featureNode.featureId, hasChildren: featureNode.hasChildren, hasOpenPr: !!featureNode.pr && featureNode.pr.status === 'Open' })] })) : null] })] }) }));
     }
     // ── Body ──────────────────────────────────────────────────────────────
     let body = null;
@@ -418,7 +449,7 @@ export function FeatureDrawerClient({ view: initialView, urlTab, interactiveAgen
             ...(featureNode.state === 'error' && { onRetry: handleRetry }),
             ...(featureNode.state === 'pending' && { onStart: handleStart }),
         };
-        body = (_jsx(FeatureDrawerTabs, { featureName: featureNode.name, headerContent: headerContent, featureNode: enrichedNode, featureId: featureNode.featureId, initialTab: view.initialTab, urlTab: urlTab, sseEvents: events, prdData: prdData, prdSelections: prdSelections, onPrdSelect: (qId, oId) => setPrdSelections((prev) => ({ ...prev, [qId]: oId })), onPrdApprove: handlePrdApprove, onPrdReject: handlePrdReject, isPrdLoading: isLoadingPrd, techData: techData, onTechApprove: handleTechApprove, onTechReject: handleTechReject, isTechLoading: isLoadingTech, productData: isLoadingTechProduct ? null : techProductData, mergeData: mergeData, onMergeApprove: handleMergeApprove, onMergeReject: handleMergeReject, isMergeLoading: isLoadingMerge, syncStatus: syncFeatureId ? syncData : undefined, syncLoading: syncLoading, syncError: syncError, onRefreshSync: syncFeatureId ? refreshSync : undefined, onRebaseOnMain: syncFeatureId ? featureActions.rebaseOnMain : undefined, rebaseLoading: featureActions.rebaseLoading, rebaseError: featureActions.rebaseError, isRejecting: isRejecting, chatInput: chatInput, onChatInputChange: setChatInput, interactiveAgentEnabled: interactiveAgentEnabled }));
+        body = (_jsx(FeatureDrawerTabs, { featureName: featureNode.name, headerContent: headerContent, featureNode: enrichedNode, featureId: featureNode.featureId, initialTab: view.initialTab, urlTab: urlTab, sseEvents: events, prdData: prdData, prdSelections: prdSelections, onPrdSelect: (qId, oId) => setPrdSelections((prev) => ({ ...prev, [qId]: oId })), onPrdApprove: handlePrdApprove, onPrdReject: handlePrdReject, isPrdLoading: isLoadingPrd, techData: techData, onTechApprove: handleTechApprove, onTechReject: handleTechReject, isTechLoading: isLoadingTech, productData: isLoadingTechProduct ? null : techProductData, mergeData: mergeData, onMergeApprove: handleMergeApprove, onMergeReject: handleMergeReject, isMergeLoading: isLoadingMerge, syncStatus: syncFeatureId ? syncData : undefined, syncLoading: syncLoading, syncError: syncError, onRefreshSync: syncFeatureId ? refreshSync : undefined, onRebaseOnMain: syncFeatureId ? featureActions.rebaseOnMain : undefined, rebaseLoading: featureActions.rebaseLoading, rebaseError: featureActions.rebaseError, isRejecting: isRejecting, chatInput: chatInput, onChatInputChange: setChatInput, interactiveAgentEnabled: interactiveAgentEnabled, onRetry: handleRetry, onStop: handleStop, onStart: handleStart }));
     }
     return (_jsx(BaseDrawer, { open: isOpen, onClose: attemptClose, size: "lg", modal: false, "data-testid": view.type === 'feature' ? 'feature-drawer' : 'repository-drawer', children: body }));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"repository-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/repository-drawer-client.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAG9E,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,kBAAkB,CAAC;IACzB,8CAA8C;IAC9C,UAAU,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;CAClC;AAED,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,2BAA2B,2CA6KvF"}
+{"version":3,"file":"repository-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/repository-drawer-client.tsx"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAW9E,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,kBAAkB,CAAC;IACzB,8CAA8C;IAC9C,UAAU,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;CAClC;AAED,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,2BAA2B,2CAqQvF"}