@shepai/cli 1.136.1 → 1.137.0-pr440.3cc2b78

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

@@ -1,22 +1,24 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useCallback } from 'react';
-import { Code2, Terminal, FolderOpen } from 'lucide-react';
+import { Code2, Terminal, FolderOpen, RefreshCw } from 'lucide-react';
 import { BaseDrawer } from '../../common/base-drawer/index.js';
 import { DrawerTitle, DrawerDescription } from '../../ui/drawer.js';
 import { Separator } from '../../ui/separator.js';
 import { ActionButton } from '../../common/action-button/index.js';
+import { useFeatureFlags } from '../../../hooks/feature-flags-context.js';
 import { useRepositoryActions } from './use-repository-actions.js';
 export function RepositoryDrawer({ data, onClose }) {
+    const featureFlags = useFeatureFlags();
     const handleClose = useCallback(() => {
         onClose();
     }, [onClose]);
-    const actions = useRepositoryActions(data?.repositoryPath ? { repositoryPath: data.repositoryPath } : null);
+    const actions = useRepositoryActions(data?.repositoryPath ? { repositoryId: data.id, repositoryPath: data.repositoryPath } : null);
     return (_jsx(BaseDrawer, { open: data !== null, onClose: handleClose, size: "md", modal: false, "data-testid": "repository-drawer", deployTarget: data?.repositoryPath
             ? {
                 targetId: data.repositoryPath,
                 targetType: 'repository',
                 repositoryPath: data.repositoryPath,
             }
-            : undefined, header: data ? (_jsxs("div", { "data-testid": "repository-drawer-header", children: [_jsx(DrawerTitle, { children: data.name }), data.repositoryPath ? (_jsx(DrawerDescription, { className: "truncate font-mono text-xs", children: data.repositoryPath })) : null] })) : undefined, children: data?.repositoryPath ? (_jsxs(_Fragment, { children: [_jsx(Separator, {}), _jsxs("div", { className: "flex flex-col gap-3 p-4", children: [_jsx("div", { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "OPEN WITH" }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(ActionButton, { label: "Open in IDE", onClick: actions.openInIde, loading: actions.ideLoading, error: !!actions.ideError, icon: Code2, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open in Shell", onClick: actions.openInShell, loading: actions.shellLoading, error: !!actions.shellError, icon: Terminal, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open Folder", onClick: actions.openFolder, loading: actions.folderLoading, error: !!actions.folderError, icon: FolderOpen, variant: "outline", size: "sm" })] })] })] })) : null }));
+            : undefined, header: data ? (_jsxs("div", { "data-testid": "repository-drawer-header", children: [_jsx(DrawerTitle, { children: data.name }), data.repositoryPath ? (_jsx(DrawerDescription, { className: "truncate font-mono text-xs", children: data.repositoryPath })) : null] })) : undefined, children: data?.repositoryPath ? (_jsxs(_Fragment, { children: [_jsx(Separator, {}), _jsxs("div", { className: "flex flex-col gap-3 p-4", children: [_jsx("div", { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "OPEN WITH" }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(ActionButton, { label: "Open in IDE", onClick: actions.openInIde, loading: actions.ideLoading, error: !!actions.ideError, icon: Code2, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open in Shell", onClick: actions.openInShell, loading: actions.shellLoading, error: !!actions.shellError, icon: Terminal, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open Folder", onClick: actions.openFolder, loading: actions.folderLoading, error: !!actions.folderError, icon: FolderOpen, variant: "outline", size: "sm" })] })] }), data.id && featureFlags.gitRebaseSync ? (_jsxs(_Fragment, { children: [_jsx(Separator, {}), _jsxs("div", { className: "flex flex-col gap-3 p-4", children: [_jsx("div", { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "GIT OPERATIONS" }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(ActionButton, { label: "Sync Main", onClick: actions.syncMain, loading: actions.syncLoading, error: !!actions.syncError, icon: RefreshCw, variant: "outline", size: "sm" }), actions.syncError ? (_jsx("p", { className: "text-destructive text-xs", children: actions.syncError })) : null] })] })] })) : null] })) : null }));
 }

package/dist/src/presentation/web/components/common/repository-node/repository-drawer.stories.d.ts

@@ -8,4 +8,6 @@ export declare const LongPath: Story;
 export declare const WithoutPath: Story;
 /** Repository drawer rendered inside a full-page context — starts open. */
 export declare const InDrawer: Story;
+/** Repository drawer with git operations section visible (gitRebaseSync flag enabled). */
+export declare const WithGitOperations: Story;
 //# sourceMappingURL=repository-drawer.stories.d.ts.map

package/dist/src/presentation/web/components/common/repository-node/repository-drawer.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repository-drawer.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/repository-node/repository-drawer.stories.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,gBAAgB,CAOvC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAqB/C,eAAO,MAAM,OAAO,EAAE,KAErB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,KAUtB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAIzB,CAAC;AAuBF,2EAA2E;AAC3E,eAAO,MAAM,QAAQ,EAAE,KAEtB,CAAC"}
+{"version":3,"file":"repository-drawer.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/repository-node/repository-drawer.stories.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,gBAAgB,CAOvC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAqB/C,eAAO,MAAM,OAAO,EAAE,KAErB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,KAUtB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAIzB,CAAC;AAuBF,2EAA2E;AAC3E,eAAO,MAAM,QAAQ,EAAE,KAEtB,CAAC;AAkCF,0FAA0F;AAC1F,eAAO,MAAM,iBAAiB,EAAE,KAE/B,CAAC"}

package/dist/src/presentation/web/components/common/repository-node/repository-drawer.stories.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { Button } from '../../ui/button.js';
+import { FeatureFlagsProvider } from '../../../hooks/feature-flags-context.js';
 import { RepositoryDrawer } from './repository-drawer.js';
 const meta = {
     title: 'Drawers/Feature/RepositoryDrawer',
@@ -43,3 +44,23 @@ function RepositoryDrawerShellTemplate({ data }) {
 export const InDrawer = {
     render: () => _jsx(RepositoryDrawerShellTemplate, { data: repoData }),
 };
+/* ---------------------------------------------------------------------------
+ * Git operations story — wraps with FeatureFlagsProvider to enable gitRebaseSync
+ * ------------------------------------------------------------------------- */
+function WithGitOpsTemplate({ data }) {
+    const [selected, setSelected] = useState(data);
+    const allEnabledFlags = {
+        skills: true,
+        envDeploy: true,
+        debug: true,
+        githubImport: true,
+        adoptBranch: true,
+        gitRebaseSync: true,
+        reactFileManager: true,
+    };
+    return (_jsx(FeatureFlagsProvider, { flags: allEnabledFlags, children: _jsxs("div", { style: { height: '100vh', background: '#f8fafc', padding: '2rem' }, children: [_jsx("button", { type: "button", onClick: () => setSelected(data), style: { padding: '8px 16px', border: '1px solid #ccc', borderRadius: '6px' }, children: "Open Drawer" }), _jsx(RepositoryDrawer, { data: selected, onClose: () => setSelected(null) })] }) }));
+}
+/** Repository drawer with git operations section visible (gitRebaseSync flag enabled). */
+export const WithGitOperations = {
+    render: () => _jsx(WithGitOpsTemplate, { data: repoData }),
+};

package/dist/src/presentation/web/components/common/repository-node/repository-node.js

@@ -17,7 +17,7 @@ export function RepositoryNode({ data }) {
     const router = useRouter();
     const featureFlags = useFeatureFlags();
     const [confirmOpen, setConfirmOpen] = useState(false);
-    const actions = useRepositoryActions(data.repositoryPath ? { repositoryPath: data.repositoryPath } : null);
+    const actions = useRepositoryActions(data.repositoryPath ? { repositoryId: data.id, repositoryPath: data.repositoryPath } : null);
     const deployAction = useDeployAction(data.repositoryPath
         ? {
             targetId: data.repositoryPath,

package/dist/src/presentation/web/components/common/repository-node/use-repository-actions.d.ts

@@ -1,16 +1,20 @@
 export interface RepositoryActionsInput {
+    repositoryId?: string;
     repositoryPath: string;
 }
 export interface RepositoryActionsState {
     openInIde: () => Promise<void>;
     openInShell: () => Promise<void>;
     openFolder: () => Promise<void>;
+    syncMain: () => Promise<void>;
     ideLoading: boolean;
     shellLoading: boolean;
     folderLoading: boolean;
+    syncLoading: boolean;
     ideError: string | null;
     shellError: string | null;
     folderError: string | null;
+    syncError: string | null;
 }
 export declare function useRepositoryActions(input: RepositoryActionsInput | null): RepositoryActionsState;
 //# sourceMappingURL=use-repository-actions.d.ts.map

package/dist/src/presentation/web/components/common/repository-node/use-repository-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-repository-actions.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/repository-node/use-repository-actions.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAID,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,sBAAsB,GAAG,IAAI,GAAG,sBAAsB,CAyGjG"}
+{"version":3,"file":"use-repository-actions.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/repository-node/use-repository-actions.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,sBAAsB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAID,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,sBAAsB,GAAG,IAAI,GAAG,sBAAsB,CA6HjG"}

package/dist/src/presentation/web/components/common/repository-node/use-repository-actions.js

@@ -3,22 +3,27 @@ import { useState, useCallback, useRef, useEffect } from 'react';
 import { openIde } from '../../../app/actions/open-ide.js';
 import { openShell } from '../../../app/actions/open-shell.js';
 import { openFolder } from '../../../app/actions/open-folder.js';
+import { syncRepository } from '../../../app/actions/sync-repository.js';
 const ERROR_CLEAR_DELAY = 5000;
 export function useRepositoryActions(input) {
     const [ideLoading, setIdeLoading] = useState(false);
     const [shellLoading, setShellLoading] = useState(false);
     const [folderLoading, setFolderLoading] = useState(false);
+    const [syncLoading, setSyncLoading] = useState(false);
     const [ideError, setIdeError] = useState(null);
     const [shellError, setShellError] = useState(null);
     const [folderError, setFolderError] = useState(null);
+    const [syncError, setSyncError] = useState(null);
     const ideTimerRef = useRef(null);
     const shellTimerRef = useRef(null);
     const folderTimerRef = useRef(null);
+    const syncTimerRef = useRef(null);
     // Clear timers on unmount
     useEffect(() => {
         const ideRef = ideTimerRef;
         const shellRef = shellTimerRef;
         const folderRef = folderTimerRef;
+        const syncRef = syncTimerRef;
         return () => {
             if (ideRef.current)
                 clearTimeout(ideRef.current);
@@ -26,6 +31,8 @@ export function useRepositoryActions(input) {
                 clearTimeout(shellRef.current);
             if (folderRef.current)
                 clearTimeout(folderRef.current);
+            if (syncRef.current)
+                clearTimeout(syncRef.current);
         };
     }, []);
     const performAction = useCallback(async (action, setLoading, setError, timerRef, isLoading) => {
@@ -55,15 +62,19 @@ export function useRepositoryActions(input) {
     const handleOpenIde = useCallback(() => performAction(() => openIde({ repositoryPath: input.repositoryPath }), setIdeLoading, setIdeError, ideTimerRef, ideLoading), [performAction, ideLoading, input]);
     const handleOpenShell = useCallback(() => performAction(() => openShell({ repositoryPath: input.repositoryPath }), setShellLoading, setShellError, shellTimerRef, shellLoading), [performAction, shellLoading, input]);
     const handleOpenFolder = useCallback(() => performAction(() => openFolder(input.repositoryPath), setFolderLoading, setFolderError, folderTimerRef, folderLoading), [performAction, folderLoading, input]);
+    const handleSyncMain = useCallback(() => performAction(() => syncRepository(input.repositoryId ?? ''), setSyncLoading, setSyncError, syncTimerRef, syncLoading), [performAction, syncLoading, input]);
     return {
         openInIde: handleOpenIde,
         openInShell: handleOpenShell,
         openFolder: handleOpenFolder,
+        syncMain: handleSyncMain,
         ideLoading,
         shellLoading,
         folderLoading,
+        syncLoading,
         ideError,
         shellError,
         folderError,
+        syncError,
     };
 }

package/dist/src/presentation/web/components/features/control-center/control-center-inner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control-center-inner.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/control-center-inner.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAY,MAAM,eAAe,CAAC;AAGpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAuB5E,UAAU,uBAAuB;IAC/B,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,YAAY,EAAE,IAAI,EAAE,CAAC;CACtB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,uBAAuB,2CAuWzF"}
+{"version":3,"file":"control-center-inner.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/control-center-inner.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAY,MAAM,eAAe,CAAC;AAKpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAuB5E,UAAU,uBAAuB;IAC/B,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,YAAY,EAAE,IAAI,EAAE,CAAC;CACtB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,uBAAuB,2CAoYzF"}

package/dist/src/presentation/web/components/features/control-center/control-center-inner.js

@@ -1,8 +1,10 @@
 'use client';
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useRouter, usePathname } from 'next/navigation';
-import { useReactFlow } from '@xyflow/react';
+import { Panel, useReactFlow } from '@xyflow/react';
+import { Eye, EyeOff } from 'lucide-react';
+import { cn } from '../../../lib/utils.js';
 import { FeaturesCanvas } from '../../features/features-canvas/index.js';
 import { useSidebarFeaturesContext, mapNodeStateToSidebarStatus, } from '../../../hooks/sidebar-features-context.js';
 import { useSelectedFeatureId } from '../../../hooks/use-selected-feature-id.js';
@@ -26,7 +28,7 @@ export function ControlCenterInner({ initialNodes, initialEdges }) {
     const { fitView } = useReactFlow();
     const drawerTimerRef = useRef(null);
     const { defaultViewport, onMoveEnd: handleViewportChange, resetViewport, } = useViewportPersistence();
-    const { nodes, edges, onNodesChange, handleConnect, handleAddRepository, handleDeleteFeature, handleRetryFeature, handleStartFeature, handleStopFeature, handleDeleteRepository, createFeatureNode, setCallbacks, } = useControlCenterState(initialNodes, initialEdges);
+    const { nodes, edges, onNodesChange, handleConnect, handleAddRepository, handleArchiveFeature, handleDeleteFeature, handleRetryFeature, handleStartFeature, handleStopFeature, handleUnarchiveFeature, handleDeleteRepository, createFeatureNode, showArchived, setShowArchived, setCallbacks, } = useControlCenterState(initialNodes, initialEdges);
     // Publish sidebar features + repo state to context
     const { setFeatures: setSidebarFeatures, setHasRepositories: setSidebarHasRepos } = useSidebarFeaturesContext();
     const featureNodes = useMemo(() => nodes.filter((n) => n.type === 'featureNode'), [nodes]);
@@ -201,6 +203,8 @@ export function ControlCenterInner({ initialNodes, initialEdges }) {
             onRetryFeature: handleRetryFeature,
             onStartFeature: handleStartFeature,
             onStopFeature: handleStopFeature,
+            onArchiveFeature: handleArchiveFeature,
+            onUnarchiveFeature: handleUnarchiveFeature,
             onRepositoryAdd: handleAddFeatureToRepo,
             onRepositoryClick: handleRepositoryClick,
             onRepositoryDelete: handleDeleteRepository,
@@ -208,10 +212,12 @@ export function ControlCenterInner({ initialNodes, initialEdges }) {
     }, [
         setCallbacks,
         handleAddFeatureToFeature,
+        handleArchiveFeature,
         handleDeleteFeature,
         handleRetryFeature,
         handleStartFeature,
         handleStopFeature,
+        handleUnarchiveFeature,
         handleAddFeatureToRepo,
         handleRepositoryClick,
         handleDeleteRepository,
@@ -263,5 +269,8 @@ export function ControlCenterInner({ initialNodes, initialEdges }) {
             return nodes;
         return nodes.map((n) => n.type === 'repositoryNode' ? { ...n, data: { ...n.data, pulseAdd: true } } : n);
     }, [nodes, isCreateDrawerOpen]);
-    return (_jsx(FeaturesCanvas, { nodes: showCanvas ? displayNodes : [], edges: showCanvas ? edges : [], selectedFeatureId: selectedFeatureId, defaultViewport: defaultViewport, onNodesChange: onNodesChange, onConnect: handleConnect, onAddFeature: handleAddFeature, onNodeClick: handleNodeClick, onPaneClick: handleClearDrawers, onMoveEnd: handleMoveEnd, onResetViewport: resetViewport, emptyState: _jsx(ControlCenterEmptyState, { onRepositorySelect: addRepoAndFocus }) }));
+    const archiveToggle = (_jsx(Panel, { position: "top-right", children: _jsxs("button", { type: "button", "aria-label": showArchived ? 'Hide archived features' : 'Show archived features', "data-testid": "archive-toggle-button", onClick: () => setShowArchived(!showArchived), className: cn('bg-card flex items-center gap-1.5 rounded-md border px-2.5 py-1.5 text-xs font-medium shadow-sm transition-colors', showArchived
+                ? 'border-primary/30 text-primary'
+                : 'text-muted-foreground hover:text-foreground'), children: [showArchived ? _jsx(Eye, { className: "h-3.5 w-3.5" }) : _jsx(EyeOff, { className: "h-3.5 w-3.5" }), showArchived ? 'Archived visible' : 'Show archived'] }) }));
+    return (_jsx(FeaturesCanvas, { nodes: showCanvas ? displayNodes : [], edges: showCanvas ? edges : [], selectedFeatureId: selectedFeatureId, defaultViewport: defaultViewport, onNodesChange: onNodesChange, onConnect: handleConnect, onAddFeature: handleAddFeature, onNodeClick: handleNodeClick, onPaneClick: handleClearDrawers, onMoveEnd: handleMoveEnd, onResetViewport: resetViewport, toolbar: archiveToggle, emptyState: _jsx(ControlCenterEmptyState, { onRepositorySelect: addRepoAndFocus }) }));
 }

package/dist/src/presentation/web/components/features/control-center/control-center.stories.d.ts

@@ -15,4 +15,10 @@ export declare const WithNodeActions: Story;
  * "Horizontal" to switch back.
  */
 export declare const DagreLayout: Story;
+/**
+ * Canvas with active and archived features.
+ * The archive toggle button appears in the top-right corner ("Show archived").
+ * Click the toggle to reveal the dimmed archived feature node.
+ */
+export declare const WithArchivedFeatures: Story;
 //# sourceMappingURL=control-center.stories.d.ts.map

package/dist/src/presentation/web/components/features/control-center/control-center.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control-center.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/control-center.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAQjD,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,aAAa,CAkBpC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AA0EnC,eAAO,MAAM,KAAK,EAAE,KAKnB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAQ1B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAKzB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,KAS7B,CAAC;AAiIF;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,EAAE,KAKzB,CAAC"}
+{"version":3,"file":"control-center.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/control-center.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAQjD,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,aAAa,CAkBpC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AA0EnC,eAAO,MAAM,KAAK,EAAE,KAKnB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAQ1B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAKzB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,KAS7B,CAAC;AAiIF;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,EAAE,KAKzB,CAAC;AA4DF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,KASlC,CAAC"}

package/dist/src/presentation/web/components/features/control-center/control-center.stories.js

@@ -245,3 +245,73 @@ export const DagreLayout = {
         initialEdges: dagreLayoutedEdges,
     },
 };
+// --- Archive toggle stories ---
+const archiveRepoNode = {
+    id: 'repo-archive',
+    type: 'repositoryNode',
+    position: { x: 50, y: 115 },
+    data: { name: 'shep-ai/cli' },
+};
+const archivedFeatureNodes = [
+    {
+        id: 'feat-active',
+        type: 'featureNode',
+        position: { x: 400, y: 0 },
+        data: {
+            name: 'Auth Module',
+            description: 'OAuth2 authentication flow',
+            featureId: '#f1',
+            lifecycle: 'implementation',
+            state: 'running',
+            progress: 65,
+            repositoryPath: '/home/user/my-repo',
+            branch: 'feat/auth-module',
+        },
+    },
+    {
+        id: 'feat-done',
+        type: 'featureNode',
+        position: { x: 400, y: 230 },
+        data: {
+            name: 'Payment Gateway',
+            description: 'Stripe integration for subscriptions',
+            featureId: '#f2',
+            lifecycle: 'deploy',
+            state: 'done',
+            progress: 100,
+            runtime: '1h 42m',
+            repositoryPath: '/home/user/my-repo',
+            branch: 'feat/payment-gateway',
+        },
+    },
+    {
+        id: 'feat-archived',
+        type: 'featureNode',
+        position: { x: 800, y: 115 },
+        data: {
+            name: 'Old Dashboard',
+            description: 'Previous iteration of the admin dashboard',
+            featureId: '#f3',
+            lifecycle: 'maintain',
+            state: 'archived',
+            progress: 100,
+            repositoryPath: '/home/user/my-repo',
+            branch: 'feat/old-dashboard',
+        },
+    },
+];
+/**
+ * Canvas with active and archived features.
+ * The archive toggle button appears in the top-right corner ("Show archived").
+ * Click the toggle to reveal the dimmed archived feature node.
+ */
+export const WithArchivedFeatures = {
+    args: {
+        initialNodes: [archiveRepoNode, ...archivedFeatureNodes],
+        initialEdges: [
+            { id: 'e-repo-active', source: 'repo-archive', target: 'feat-active', ...dashedEdge },
+            { id: 'e-repo-done', source: 'repo-archive', target: 'feat-done', ...dashedEdge },
+            { id: 'e-repo-archived', source: 'repo-archive', target: 'feat-archived', ...dashedEdge },
+        ],
+    },
+};

package/dist/src/presentation/web/components/features/control-center/use-control-center-state.d.ts

@@ -14,12 +14,18 @@ export interface ControlCenterState {
         repoPath: string;
     };
     handleLayout: (direction: LayoutDirection) => void;
+    handleArchiveFeature: (featureId: string) => void;
     handleDeleteFeature: (featureId: string, cleanup?: boolean, cascadeDelete?: boolean, closePr?: boolean) => void;
     handleRetryFeature: (featureId: string) => void;
     handleStartFeature: (featureId: string) => void;
     handleStopFeature: (featureId: string) => void;
+    handleUnarchiveFeature: (featureId: string) => void;
     handleDeleteRepository: (repositoryId: string) => Promise<void>;
     createFeatureNode: (sourceNodeId: string | null, dataOverride?: Partial<FeatureNodeData>, edgeType?: string) => string;
+    /** Whether archived features are shown on the canvas. */
+    showArchived: boolean;
+    /** Toggle archived feature visibility. */
+    setShowArchived: (show: boolean) => void;
     /** Stable lookup: repositoryPath for a feature node. */
     getFeatureRepositoryPath: (featureNodeId: string) => string | undefined;
     /** Stable lookup: repository data by nodeId. */

package/dist/src/presentation/web/components/features/control-center/use-control-center-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-control-center-state.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/use-control-center-state.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;AAgBjC,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAM7E,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,aAAa,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,EAAE,KAAK,IAAI,CAAC;IAC/D,aAAa,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IAChD,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/E,YAAY,EAAE,CAAC,SAAS,EAAE,eAAe,KAAK,IAAI,CAAC;IACnD,mBAAmB,EAAE,CACnB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,OAAO,EACjB,aAAa,CAAC,EAAE,OAAO,EACvB,OAAO,CAAC,EAAE,OAAO,KACd,IAAI,CAAC;IACV,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,sBAAsB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,iBAAiB,EAAE,CACjB,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,YAAY,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACvC,QAAQ,CAAC,EAAE,MAAM,KACd,MAAM,CAAC;IACZ,wDAAwD;IACxD,wBAAwB,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACxE,gDAAgD;IAChD,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,kBAAkB,GAAG,SAAS,CAAC;IACtE,0EAA0E;IAC1E,YAAY,EAAE,CAAC,SAAS,EAAE,cAAc,KAAK,IAAI,CAAC;CACnD;AAQD,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,cAAc,EAAE,EAC9B,YAAY,EAAE,IAAI,EAAE,GACnB,kBAAkB,CAwhBpB"}
+{"version":3,"file":"use-control-center-state.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/use-control-center-state.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;AAkBjC,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAM7E,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,aAAa,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,EAAE,KAAK,IAAI,CAAC;IAC/D,aAAa,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IAChD,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/E,YAAY,EAAE,CAAC,SAAS,EAAE,eAAe,KAAK,IAAI,CAAC;IACnD,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,mBAAmB,EAAE,CACnB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,OAAO,EACjB,aAAa,CAAC,EAAE,OAAO,EACvB,OAAO,CAAC,EAAE,OAAO,KACd,IAAI,CAAC;IACV,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,sBAAsB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,sBAAsB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,iBAAiB,EAAE,CACjB,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,YAAY,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACvC,QAAQ,CAAC,EAAE,MAAM,KACd,MAAM,CAAC;IACZ,yDAAyD;IACzD,YAAY,EAAE,OAAO,CAAC;IACtB,0CAA0C;IAC1C,eAAe,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACzC,wDAAwD;IACxD,wBAAwB,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACxE,gDAAgD;IAChD,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,kBAAkB,GAAG,SAAS,CAAC;IACtE,0EAA0E;IAC1E,YAAY,EAAE,CAAC,SAAS,EAAE,cAAc,KAAK,IAAI,CAAC;CACnD;AAQD,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,cAAc,EAAE,EAC9B,YAAY,EAAE,IAAI,EAAE,GACnB,kBAAkB,CA+kBpB"}

package/dist/src/presentation/web/components/features/control-center/use-control-center-state.js

@@ -1,12 +1,14 @@
 'use client';
-import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useRouter } from 'next/navigation';
 import { toast } from 'sonner';
 import { layoutWithDagre, CANVAS_LAYOUT_DEFAULTS, } from '../../../lib/layout-with-dagre.js';
+import { archiveFeature } from '../../../app/actions/archive-feature.js';
 import { deleteFeature } from '../../../app/actions/delete-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 { unarchiveFeature } from '../../../app/actions/unarchive-feature.js';
 import { addRepository } from '../../../app/actions/add-repository.js';
 import { deleteRepository } from '../../../app/actions/delete-repository.js';
 import { getFeatureMetadata } from '../../../app/actions/get-feature-metadata.js';
@@ -25,7 +27,9 @@ export function useControlCenterState(initialNodes, initialEdges) {
     const router = useRouter();
     const deleteSound = useSoundAction('delete');
     const createSound = useSoundAction('create');
-    const { nodes, edges, reconcile, updateFeature, addPendingFeature, removeFeature, restoreFeature, addRepository: addRepositoryToMap, removeRepository, replaceRepository, getFeatureRepositoryPath, getRepositoryData, getRepoMapSize, setCallbacks, beginMutation, endMutation, isMutating, } = useGraphState(initialNodes, initialEdges);
+    // Archive toggle: persists during session, resets on page reload (FR-10)
+    const [showArchived, setShowArchived] = useState(false);
+    const { nodes, edges, reconcile, updateFeature, addPendingFeature, removeFeature, restoreFeature, addRepository: addRepositoryToMap, removeRepository, replaceRepository, getFeatureRepositoryPath, getRepositoryData, getRepoMapSize, setCallbacks, beginMutation, endMutation, isMutating, } = useGraphState(initialNodes, initialEdges, showArchived);
     // Refs for stable access to latest nodes/edges without callback recreation
     const nodesRef = useRef(nodes);
     const edgesRef = useRef(edges);
@@ -279,6 +283,46 @@ export function useControlCenterState(initialNodes, initialEdges) {
         })
             .finally(() => endMutation());
     }, [beginMutation, endMutation]);
+    const handleArchiveFeature = useCallback((featureId) => {
+        const nodeId = `feat-${featureId}`;
+        beginMutation();
+        updateFeature(nodeId, { state: 'archived' });
+        archiveFeature(featureId)
+            .then((result) => {
+            if (result.error) {
+                updateFeature(nodeId, { state: 'done' });
+                toast.error(result.error);
+            }
+            else {
+                toast.success('Feature archived');
+            }
+        })
+            .catch(() => {
+            updateFeature(nodeId, { state: 'done' });
+            toast.error('Failed to archive feature');
+        })
+            .finally(() => endMutation());
+    }, [updateFeature, beginMutation, endMutation]);
+    const handleUnarchiveFeature = useCallback((featureId) => {
+        const nodeId = `feat-${featureId}`;
+        beginMutation();
+        updateFeature(nodeId, { state: 'done' });
+        unarchiveFeature(featureId)
+            .then((result) => {
+            if (result.error) {
+                updateFeature(nodeId, { state: 'archived' });
+                toast.error(result.error);
+            }
+            else {
+                toast.success('Feature unarchived');
+            }
+        })
+            .catch(() => {
+            updateFeature(nodeId, { state: 'archived' });
+            toast.error('Failed to unarchive feature');
+        })
+            .finally(() => endMutation());
+    }, [updateFeature, beginMutation, endMutation]);
     const handleDeleteFeature = useCallback((featureId, cleanup, cascadeDelete, closePr) => {
         const nodeId = `feat-${featureId}`;
         const shouldCascade = cascadeDelete === true;
@@ -455,13 +499,17 @@ export function useControlCenterState(initialNodes, initialEdges) {
         onNodesChange,
         handleConnect,
         handleAddRepository,
+        handleArchiveFeature,
         handleLayout,
         handleDeleteFeature,
         handleRetryFeature,
         handleStartFeature,
         handleStopFeature,
+        handleUnarchiveFeature,
         handleDeleteRepository,
         createFeatureNode,
+        showArchived,
+        setShowArchived,
         getFeatureRepositoryPath,
         getRepositoryData,
         setCallbacks,

package/dist/src/presentation/web/components/features/settings/feature-flags-settings-section.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-flags-settings-section.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/settings/feature-flags-settings-section.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AA8BzE,MAAM,WAAW,gCAAgC;IAC/C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,wBAAgB,2BAA2B,CAAC,EAAE,YAAY,EAAE,EAAE,gCAAgC,2CAgE7F"}
+{"version":3,"file":"feature-flags-settings-section.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/settings/feature-flags-settings-section.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAiCzE,MAAM,WAAW,gCAAgC;IAC/C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,wBAAgB,2BAA2B,CAAC,EAAE,YAAY,EAAE,EAAE,gCAAgC,2CAgE7F"}

package/dist/src/presentation/web/components/features/settings/feature-flags-settings-section.js

@@ -13,6 +13,7 @@ const FLAG_DESCRIPTIONS = {
     debug: 'Enable debug UI elements and verbose client-side logging',
     githubImport: 'Enable GitHub repository import in the web UI',
     adoptBranch: 'Enable the ability to adopt existing branches as tracked features',
+    gitRebaseSync: 'Enable git rebase-on-main and sync-main operations in the web UI',
     reactFileManager: 'Use the built-in React file manager instead of the native OS folder picker. Also serves as automatic fallback when the native picker is unavailable.',
 };
 const FLAG_LABELS = {
@@ -21,6 +22,7 @@ const FLAG_LABELS = {
     debug: 'Debug',
     githubImport: 'GitHub Import',
     adoptBranch: 'Adopt Branch',
+    gitRebaseSync: 'Git Rebase & Sync',
     reactFileManager: 'React File Manager',
 };
 const FLAG_KEYS = [
@@ -29,6 +31,7 @@ const FLAG_KEYS = [
     'debug',
     'githubImport',
     'adoptBranch',
+    'gitRebaseSync',
     'reactFileManager',
 ];
 export function FeatureFlagsSettingsSection({ featureFlags }) {

package/dist/src/presentation/web/components/features/settings/feature-flags-settings-section.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-flags-settings-section.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/settings/feature-flags-settings-section.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAE/E,QAAA,MAAM,IAAI;;;;;;;CAO0C,CAAC;AAErD,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,KAWrB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,KAWxB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAWzB,CAAC"}
+{"version":3,"file":"feature-flags-settings-section.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/settings/feature-flags-settings-section.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAE/E,QAAA,MAAM,IAAI;;;;;;;CAO0C,CAAC;AAErD,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,KAYrB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,KAYxB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAYzB,CAAC"}

package/dist/src/presentation/web/components/features/settings/feature-flags-settings-section.stories.js

@@ -16,6 +16,7 @@ export const Default = {
             debug: false,
             githubImport: false,
             adoptBranch: false,
+            gitRebaseSync: false,
             reactFileManager: false,
         },
     },
@@ -28,6 +29,7 @@ export const AllEnabled = {
             debug: true,
             githubImport: true,
             adoptBranch: true,
+            gitRebaseSync: true,
             reactFileManager: true,
         },
     },
@@ -40,6 +42,7 @@ export const AllDisabled = {
             debug: false,
             githubImport: false,
             adoptBranch: false,
+            gitRebaseSync: false,
             reactFileManager: false,
         },
     },

package/dist/src/presentation/web/components/features/settings/settings-page-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-page-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/settings/settings-page-client.tsx"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EACV,QAAQ,EAGT,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA2B/E,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,iBAAiB,EAAE,CAAC;CAC1C;AA6QD,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,kBAAkB,GACnB,EAAE,uBAAuB,2CAgpCzB"}
+{"version":3,"file":"settings-page-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/settings/settings-page-client.tsx"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EACV,QAAQ,EAGT,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA2B/E,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,iBAAiB,EAAE,CAAC;CAC1C;AA6QD,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,kBAAkB,GACnB,EAAE,uBAAuB,2CA6pCzB"}

package/dist/src/presentation/web/components/features/settings/settings-page-client.js

@@ -121,6 +121,7 @@ export function SettingsPageClient({ settings, shepHome, dbFileSize, availableTe
         debug: false,
         githubImport: false,
         adoptBranch: false,
+        gitRebaseSync: false,
         reactFileManager: false,
     };
     // Agent state
@@ -497,6 +498,10 @@ export function SettingsPageClient({ settings, shepHome, dbFileSize, availableTe
                                             const newFlags = { ...flags, adoptBranch: v };
                                             setFlags(newFlags);
                                             save({ featureFlags: newFlags });
+                                        } }), _jsx(SwitchRow, { label: "Git Rebase & Sync", description: "Enable git rebase-on-main and sync-main operations", id: "flag-gitRebaseSync", testId: "switch-flag-gitRebaseSync", checked: flags.gitRebaseSync, onChange: (v) => {
+                                            const newFlags = { ...flags, gitRebaseSync: v };
+                                            setFlags(newFlags);
+                                            save({ featureFlags: newFlags });
                                         } }), _jsx(SwitchRow, { label: "React File Manager", description: "Use the built-in React file manager instead of the native OS folder picker", id: "flag-reactFileManager", testId: "switch-flag-reactFileManager", checked: flags.reactFileManager, onChange: (v) => {
                                             const newFlags = { ...flags, reactFileManager: v };
                                             setFlags(newFlags);

package/dist/src/presentation/web/components/features/settings/settings-page-client.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-page-client.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/settings/settings-page-client.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAM5D,QAAA,MAAM,IAAI;;;;;;;CAOiC,CAAC;AAE5C,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAoBzB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,KAa7B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,KAsB5B,CAAC"}
+{"version":3,"file":"settings-page-client.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/settings/settings-page-client.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAM5D,QAAA,MAAM,IAAI;;;;;;;CAOiC,CAAC;AAE5C,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAqBzB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,KAa7B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,KAsB5B,CAAC"}

package/dist/src/presentation/web/components/features/settings/settings-page-client.stories.js

@@ -32,6 +32,7 @@ export const AllSections = {
                 debug: false,
                 githubImport: false,
                 adoptBranch: false,
+                gitRebaseSync: false,
                 reactFileManager: false,
             },
         },

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;AAwBvE,UAAU,aAAa;IACrB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAsKD,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;AA+JD,wBAAgB,QAAQ,CAAC,EAAE,QAAQ,EAAE,EAAE,aAAa,2CAUnD"}

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

@@ -6,8 +6,6 @@ import { Plus, FolderPlus, Github, GitBranch } 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';
-import { ThemeToggle } from '../../common/theme-toggle/index.js';
-import { SoundToggle } from '../../common/sound-toggle/index.js';
 import { ReactFileManagerDialog } from '../../common/react-file-manager-dialog/index.js';
 import { pickFolder } from '../../common/add-repository-button/pick-folder.js';
 import { GitHubImportDialog } from '../../common/github-import-dialog/index.js';
@@ -121,7 +119,7 @@ function AppShellInner({ children }) {
         featureFlags.githubImport,
         featureFlags.adoptBranch,
     ]);
-    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) && hasRepositories ? (_jsx(FloatingActionButton, { actions: fabActions })) : null, featureFlags.githubImport ? (_jsx(GitHubImportDialog, { open: githubDialogOpen, onOpenChange: setGithubDialogOpen, onImportComplete: handleGitHubImportComplete })) : null] }) }), _jsx(ReactFileManagerDialog, { open: showReactPicker, onOpenChange: (open) => {
+    return (_jsxs(SidebarProvider, { defaultOpen: false, children: [_jsx(AppSidebar, { features: features, featureFlags: featureFlags, onFeatureClick: handleFeatureClick }), _jsx(SidebarInset, { children: _jsxs("div", { className: "relative h-full", children: [_jsx("main", { className: "h-full", children: children }), isControlCenterRoute(pathname) && hasRepositories ? (_jsx(FloatingActionButton, { actions: fabActions })) : null, featureFlags.githubImport ? (_jsx(GitHubImportDialog, { open: githubDialogOpen, onOpenChange: setGithubDialogOpen, onImportComplete: handleGitHubImportComplete })) : null] }) }), _jsx(ReactFileManagerDialog, { open: showReactPicker, onOpenChange: (open) => {
                     if (!open)
                         setShowReactPicker(false);
                 }, onSelect: handleReactPickerSelect })] }));

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

@@ -1 +1 @@
-{"version":3,"file":"app-sidebar.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/layouts/app-sidebar/app-sidebar.tsx"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAG/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,YAAY,EAAE,iBAAiB,CAAC;IAEhC,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C;AAED,wBAAgB,UAAU,CAAC,EACzB,QAAQ,EACR,YAAY,EAEZ,cAAc,GACf,EAAE,eAAe,2CAgHjB"}
+{"version":3,"file":"app-sidebar.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/layouts/app-sidebar/app-sidebar.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAI/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,YAAY,EAAE,iBAAiB,CAAC;IAEhC,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C;AAED,wBAAgB,UAAU,CAAC,EACzB,QAAQ,EACR,YAAY,EAEZ,cAAc,GACf,EAAE,eAAe,2CA6MjB"}