@shepai/cli 1.122.2-pr394.daae4c9 → 1.122.2-pr395.c8c0b94

package/dist/src/presentation/cli/commands/feat/rebase.command.js

@@ -0,0 +1,45 @@
+/**
+ * Feature Rebase Command
+ *
+ * Rebases a feature branch on top of the current main branch.
+ * For fork repositories, syncs local main with upstream first.
+ * Aborts and surfaces conflicting file names on rebase conflict.
+ *
+ * Usage:
+ *   shep feat rebase <feature-id>
+ */
+import { Command } from 'commander';
+import { container } from '../../../../../packages/core/src/infrastructure/di/container.js';
+import { RebaseFeatureUseCase } from '../../../../../packages/core/src/application/use-cases/features/rebase-feature.use-case.js';
+import { GitPrError, GitPrErrorCode, } from '../../../../../packages/core/src/application/ports/output/services/git-pr-service.interface.js';
+import { colors, messages } from '../../ui/index.js';
+export function createRebaseCommand() {
+    return new Command('rebase')
+        .description('Rebase a feature branch on top of the latest main (syncs fork upstream first)')
+        .argument('<feature-id>', 'Feature ID (or prefix)')
+        .action(async (featureId) => {
+        try {
+            const useCase = container.resolve(RebaseFeatureUseCase);
+            const result = await useCase.execute(featureId);
+            messages.newline();
+            messages.success(`Rebased: ${result.branch}`);
+            console.log(`  ${colors.muted('Branch:')}  ${colors.accent(result.branch)}`);
+            console.log(`  ${colors.muted('Status:')}  ${colors.success('up to date with main')}`);
+            messages.newline();
+        }
+        catch (error) {
+            if (error instanceof GitPrError && error.code === GitPrErrorCode.REBASE_CONFLICT) {
+                messages.newline();
+                messages.error('Rebase failed: merge conflicts detected');
+                console.error(colors.muted(error.message));
+                console.error(colors.muted('Run `git status` in your worktree to see conflict details.'));
+                messages.newline();
+            }
+            else {
+                const err = error instanceof Error ? error : new Error(String(error));
+                messages.error('Failed to rebase feature', err);
+            }
+            process.exitCode = 1;
+        }
+    });
+}

package/dist/src/presentation/cli/commands/repo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/repo/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAO3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/repo/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAQ3C"}

package/dist/src/presentation/cli/commands/repo/index.js

@@ -13,6 +13,7 @@
 import { Command } from 'commander';
 import { createShowCommand } from './show.command.js';
 import { createLsCommand } from './ls.command.js';
+import { createSyncCommand } from './sync.command.js';
 /**
  * Create the repo command with all subcommands
  */
@@ -20,6 +21,7 @@ export function createRepoCommand() {
     const repo = new Command('repo')
         .description('Manage tracked repositories')
         .addCommand(createLsCommand())
-        .addCommand(createShowCommand());
+        .addCommand(createShowCommand())
+        .addCommand(createSyncCommand());
     return repo;
 }

package/dist/src/presentation/cli/commands/repo/sync.command.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Repo Sync Command
+ *
+ * Syncs the local main branch with the upstream remote for fork repositories.
+ * For non-fork repositories, outputs an informational message and exits cleanly.
+ *
+ * Usage:
+ *   shep repo sync
+ */
+import { Command } from 'commander';
+export declare function createSyncCommand(): Command;
+//# sourceMappingURL=sync.command.d.ts.map

package/dist/src/presentation/cli/commands/repo/sync.command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/repo/sync.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,wBAAgB,iBAAiB,IAAI,OAAO,CAuB3C"}

package/dist/src/presentation/cli/commands/repo/sync.command.js

@@ -0,0 +1,38 @@
+/**
+ * Repo Sync Command
+ *
+ * Syncs the local main branch with the upstream remote for fork repositories.
+ * For non-fork repositories, outputs an informational message and exits cleanly.
+ *
+ * Usage:
+ *   shep repo sync
+ */
+import { Command } from 'commander';
+import { container } from '../../../../../packages/core/src/infrastructure/di/container.js';
+import { SyncForkMainUseCase } from '../../../../../packages/core/src/application/use-cases/sync-fork-main.use-case.js';
+import { colors, messages } from '../../ui/index.js';
+export function createSyncCommand() {
+    return new Command('sync')
+        .description('Sync fork main branch with upstream remote')
+        .action(async () => {
+        try {
+            const useCase = container.resolve(SyncForkMainUseCase);
+            const result = await useCase.execute(process.cwd());
+            messages.newline();
+            if (!result.synced) {
+                messages.info('Repository is not a fork, nothing to sync');
+            }
+            else {
+                messages.success('Fork main synced with upstream');
+                console.log(`  ${colors.muted('Upstream:')} ${colors.accent(result.upstreamUrl ?? '')}`);
+                console.log(`  ${colors.muted('Status:')}   ${colors.success('local main up to date')}`);
+            }
+            messages.newline();
+        }
+        catch (error) {
+            const err = error instanceof Error ? error : new Error(String(error));
+            messages.error('Failed to sync fork main', err);
+            process.exitCode = 1;
+        }
+    });
+}

package/dist/src/presentation/web/components/layouts/app-shell/app-shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-shell.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/layouts/app-shell/app-shell.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAkC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAsBvE,UAAU,aAAa;IACrB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAoGD,wBAAgB,QAAQ,CAAC,EAAE,QAAQ,EAAE,EAAE,aAAa,2CAUnD"}
+{"version":3,"file":"app-shell.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/layouts/app-shell/app-shell.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAkC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAsBvE,UAAU,aAAa;IACrB,QAAQ,EAAE,SAAS,CAAC;CACrB;AA0FD,wBAAgB,QAAQ,CAAC,EAAE,QAAQ,EAAE,EAAE,aAAa,2CAUnD"}

package/dist/src/presentation/web/components/layouts/app-shell/app-shell.js

@@ -2,7 +2,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useMemo, useState } from 'react';
 import { useRouter, usePathname } from 'next/navigation';
-import { Plus, FolderPlus, GitBranch } from 'lucide-react';
+import { Plus, FolderPlus } from 'lucide-react';
 import { SidebarProvider, SidebarInset } from '../../ui/sidebar.js';
 import { AppSidebar } from '../../layouts/app-sidebar/index.js';
 import { FloatingActionButton, } from '../../common/floating-action-button/index.js';
@@ -15,7 +15,7 @@ import { SidebarFeaturesProvider, useSidebarFeaturesContext, } from '../../../ho
 import { useNotifications } from '../../../hooks/use-notifications.js';
 import { useFeatureFlags } from '../../../hooks/feature-flags-context.js';
 /** Control center route prefixes where the FAB should be visible. */
-const CONTROL_CENTER_PREFIXES = ['/', '/create', '/adopt', '/feature', '/repository'];
+const CONTROL_CENTER_PREFIXES = ['/', '/create', '/feature', '/repository'];
 function isControlCenterRoute(pathname) {
     return CONTROL_CENTER_PREFIXES.some((prefix) => pathname === prefix || (prefix !== '/' && pathname.startsWith(`${prefix}/`)));
 }
@@ -30,9 +30,6 @@ function AppShellInner({ children }) {
     const handleNewFeature = useCallback(() => {
         guardedNavigate(() => router.push('/create'));
     }, [router, guardedNavigate]);
-    const handleAdoptBranch = useCallback(() => {
-        guardedNavigate(() => router.push('/adopt'));
-    }, [router, guardedNavigate]);
     const handleFeatureClick = useCallback((featureId) => {
         guardedNavigate(() => router.push(`/feature/${featureId}`));
     }, [router, guardedNavigate]);
@@ -58,12 +55,6 @@ function AppShellInner({ children }) {
             icon: _jsx(Plus, { className: "h-4 w-4" }),
             onClick: handleNewFeature,
         },
-        {
-            id: 'adopt-branch',
-            label: 'Adopt Branch',
-            icon: _jsx(GitBranch, { className: "h-4 w-4" }),
-            onClick: handleAdoptBranch,
-        },
         {
             id: 'add-repository',
             label: 'Add Repository',
@@ -71,7 +62,7 @@ function AppShellInner({ children }) {
             onClick: handleAddRepository,
             loading: addingRepo,
         },
-    ], [handleNewFeature, handleAdoptBranch, handleAddRepository, addingRepo]);
+    ], [handleNewFeature, handleAddRepository, addingRepo]);
     return (_jsxs(SidebarProvider, { defaultOpen: false, children: [_jsx(AppSidebar, { features: features, featureFlags: featureFlags, onFeatureClick: handleFeatureClick }), _jsx(SidebarInset, { children: _jsxs("div", { className: "relative h-full", children: [_jsxs("div", { className: "absolute top-3 right-3 z-50 flex gap-1", "data-test-id": "canvas-actions-toolbar", children: [_jsx(SoundToggle, {}), _jsx(ThemeToggle, {})] }), _jsx("main", { className: "h-full", children: children }), isControlCenterRoute(pathname) && _jsx(FloatingActionButton, { actions: fabActions })] }) })] }));
 }
 export function AppShell({ children }) {