ccmanager 3.4.0 → 3.5.1

package/README.md

@@ -81,8 +81,8 @@ npx ccmanager
 
 You can customize keyboard shortcuts in two ways:
 
-1. **Through the UI**: Select "Configuration" → "Configure Shortcuts" from the main menu
-2. **Configuration file**: Edit `~/.config/ccmanager/config.json`
+1. **Through the UI**: Select **Global Configuration** → **Configure Shortcuts** from the main menu
+2. **Configuration file**: Edit `~/.config/ccmanager/config.json` or `.ccmanager.json` for per-project settings (see [Per-Project Configuration](#per-project-configuration))
 
 Example configuration:
 ```json
@@ -110,6 +110,12 @@ Note: Shortcuts from `shortcuts.json` will be automatically migrated to `config.
   - Ctrl+D
   - Ctrl+[ (equivalent to Escape)
 
+## Per-Project Configuration
+
+CCManager supports per-project configuration by placing a `.ccmanager.json` file in your git repository root. Project settings are merged with the global config (`~/.config/ccmanager/config.json`), with project settings always taking priority.
+
+For detailed configuration options and examples, see [docs/project-config.md](docs/project-config.md).
+
 ## Supported AI Assistants
 
 CCManager supports multiple AI coding assistants with tailored state detection for each:
@@ -148,7 +154,7 @@ CCManager supports configuring the command and arguments used to run Claude Code
 
 ### Quick Start
 
-1. Navigate to **Configuration** → **Configure Command Presets**
+1. Navigate to **Global Configuration** → **Configure Command Presets**
 2. Set your desired arguments (e.g., `--resume` for resuming sessions)
 3. Optionally set fallback arguments
 4. Save changes
@@ -177,7 +183,7 @@ When creating a new worktree, CCManager:
 
 ### Configuration
 
-1. Navigate to **Configuration** → **Configure Worktree**
+1. Navigate to **Global Configuration** → **Configure Worktree**
 2. Toggle **Copy Session Data** to set the default behavior
 3. Save changes
 
@@ -246,7 +252,7 @@ CCManager can automatically approve Claude Code prompts that don't require user
 
 ### Quick Start
 
-1. Navigate to **Configuration** → **Other & Experimental**
+1. Navigate to **Global Configuration** → **Other & Experimental**
 2. Enable **Auto Approval (experimental)**
 3. (Optional) Configure a custom command for verification
 

package/dist/components/App.js

@@ -14,7 +14,7 @@ import LoadingSpinner from './LoadingSpinner.js';
 import { globalSessionOrchestrator } from '../services/globalSessionOrchestrator.js';
 import { WorktreeService } from '../services/worktreeService.js';
 import { AmbiguousBranchError, } from '../types/index.js';
-import { configurationManager } from '../services/configurationManager.js';
+import { configReader } from '../services/config/configReader.js';
 import { ENV_VARS } from '../constants/env.js';
 import { MULTI_PROJECT_ERRORS } from '../constants/error.js';
 import { projectManager } from '../services/projectManager.js';
@@ -28,6 +28,7 @@ const App = ({ devcontainerConfig, multiProject }) => {
     const [menuKey, setMenuKey] = useState(0); // Force menu refresh
     const [selectedWorktree, setSelectedWorktree] = useState(null); // Store selected worktree for preset selection
     const [selectedProject, setSelectedProject] = useState(null); // Store selected project in multi-project mode
+    const [configScope, setConfigScope] = useState('global'); // Store config scope for configuration view
     // State for remote branch disambiguation
     const [pendingWorktreeCreation, setPendingWorktreeCreation] = useState(null);
     // State for loading context - track flags for message composition
@@ -177,6 +178,19 @@ const App = ({ devcontainerConfig, multiProject }) => {
         }
         // Check if this is the configuration option
         if (worktree.path === 'CONFIGURATION') {
+            setConfigScope('global');
+            navigateWithClear('configuration');
+            return;
+        }
+        // Check if this is the project configuration option
+        if (worktree.path === 'CONFIGURATION_PROJECT') {
+            setConfigScope('project');
+            navigateWithClear('configuration');
+            return;
+        }
+        // Check if this is the global configuration option
+        if (worktree.path === 'CONFIGURATION_GLOBAL') {
+            setConfigScope('global');
             navigateWithClear('configuration');
             return;
         }
@@ -197,7 +211,7 @@ const App = ({ devcontainerConfig, multiProject }) => {
         let session = sessionManager.getSession(worktree.path);
         if (!session) {
             // Check if we should show preset selector
-            if (configurationManager.getSelectPresetOnStart()) {
+            if (configReader.getSelectPresetOnStart()) {
                 setSelectedWorktree(worktree);
                 navigateWithClear('preset-selector');
                 return;
@@ -424,7 +438,7 @@ const App = ({ devcontainerConfig, multiProject }) => {
             React.createElement(MergeWorktree, { onComplete: handleReturnToMenu, onCancel: handleReturnToMenu })));
     }
     if (view === 'configuration') {
-        return React.createElement(Configuration, { onComplete: handleReturnToMenu });
+        return (React.createElement(Configuration, { scope: configScope, onComplete: handleReturnToMenu }));
     }
     if (view === 'preset-selector') {
         return (React.createElement(PresetSelector, { onSelect: handlePresetSelected, onCancel: handlePresetSelectorCancel }));

package/dist/components/App.test.js

@@ -59,7 +59,7 @@ const getManagerForProjectMock = vi.fn((_) => {
     sessionManagers.push(manager);
     return manager;
 });
-const configurationManagerMock = {
+const configReaderMock = {
     getSelectPresetOnStart: vi.fn(() => false),
 };
 const projectManagerMock = {
@@ -91,8 +91,8 @@ vi.mock('../services/globalSessionOrchestrator.js', () => ({
 vi.mock('../services/projectManager.js', () => ({
     projectManager: projectManagerMock,
 }));
-vi.mock('../services/configurationManager.js', () => ({
-    configurationManager: configurationManagerMock,
+vi.mock('../services/config/configReader.js', () => ({
+    configReader: configReaderMock,
 }));
 vi.mock('../services/worktreeService.js', () => ({
     WorktreeService: vi.fn(function () {
@@ -152,8 +152,8 @@ beforeEach(() => {
     deleteWorktreeEffectMock.mockImplementation(() => Effect.succeed(undefined));
     sessionManagers.length = 0;
     getManagerForProjectMock.mockClear();
-    configurationManagerMock.getSelectPresetOnStart.mockReset();
-    configurationManagerMock.getSelectPresetOnStart.mockReturnValue(false);
+    configReaderMock.getSelectPresetOnStart.mockReset();
+    configReaderMock.getSelectPresetOnStart.mockReturnValue(false);
     projectManagerMock.addRecentProject.mockReset();
 });
 afterEach(() => {

package/dist/components/Configuration.d.ts

@@ -1,5 +1,7 @@
 import React from 'react';
+import { ConfigScope } from '../types/index.js';
 interface ConfigurationProps {
+    scope: ConfigScope;
     onComplete: () => void;
 }
 declare const Configuration: React.FC<ConfigurationProps>;

package/dist/components/Configuration.js

@@ -8,8 +8,10 @@ import ConfigureWorktree from './ConfigureWorktree.js';
 import ConfigureCommand from './ConfigureCommand.js';
 import ConfigureOther from './ConfigureOther.js';
 import { shortcutManager } from '../services/shortcutManager.js';
-const Configuration = ({ onComplete }) => {
+import { ConfigEditorProvider } from '../contexts/ConfigEditorContext.js';
+const ConfigurationContent = ({ scope, onComplete }) => {
     const [view, setView] = useState('menu');
+    const title = scope === 'project' ? 'Project Configuration' : 'Global Configuration';
     const menuItems = [
         {
             label: 'S ⌨  Configure Shortcuts',
@@ -119,9 +121,11 @@ const Configuration = ({ onComplete }) => {
     }
     return (React.createElement(Box, { flexDirection: "column" },
         React.createElement(Box, { marginBottom: 1 },
-            React.createElement(Text, { bold: true, color: "green" }, "Configuration")),
+            React.createElement(Text, { bold: true, color: "green" }, title)),
         React.createElement(Box, { marginBottom: 1 },
             React.createElement(Text, { dimColor: true }, "Select a configuration option:")),
         React.createElement(SelectInput, { items: menuItems, onSelect: handleSelect, isFocused: true, limit: 10 })));
 };
+const Configuration = ({ scope, onComplete }) => (React.createElement(ConfigEditorProvider, { scope: scope },
+    React.createElement(ConfigurationContent, { scope: scope, onComplete: onComplete })));
 export default Configuration;

package/dist/components/ConfigureCommand.js

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
 import TextInputWrapper from './TextInputWrapper.js';
 import SelectInput from 'ink-select-input';
-import { configurationManager } from '../services/configurationManager.js';
+import { useConfigEditor } from '../contexts/ConfigEditorContext.js';
 import { shortcutManager } from '../services/shortcutManager.js';
 import Confirmation from './Confirmation.js';
 // This function ensures all strategies are included at compile time
@@ -55,10 +55,23 @@ const formatDetectionStrategy = (strategy) => {
     }
 };
 const ConfigureCommand = ({ onComplete }) => {
-    const presetsConfig = configurationManager.getCommandPresets();
+    const configEditor = useConfigEditor();
+    const scope = configEditor.getScope();
+    // Get initial presets based on scope
+    const presetsConfig = configEditor.getCommandPresets();
     const [presets, setPresets] = useState(presetsConfig.presets);
     const [defaultPresetId, setDefaultPresetId] = useState(presetsConfig.defaultPresetId);
-    const [selectPresetOnStart, setSelectPresetOnStart] = useState(configurationManager.getSelectPresetOnStart());
+    const [selectPresetOnStart, setSelectPresetOnStart] = useState(presetsConfig.selectPresetOnStart ?? false);
+    // Show if inheriting from global (for project scope)
+    const isInheriting = scope === 'project' && !configEditor.hasProjectOverride('commandPresets');
+    // Helper function to save presets config
+    const savePresetsConfig = (updatedPresets, updatedDefaultId, updatedSelectOnStart) => {
+        configEditor.setCommandPresets({
+            presets: updatedPresets,
+            defaultPresetId: updatedDefaultId ?? defaultPresetId,
+            selectPresetOnStart: updatedSelectOnStart ?? selectPresetOnStart,
+        });
+    };
     const [viewMode, setViewMode] = useState('list');
     const [selectedPresetId, setSelectedPresetId] = useState(null);
     const [selectedIndex, setSelectedIndex] = useState(0);
@@ -101,7 +114,7 @@ const ConfigureCommand = ({ onComplete }) => {
                 break;
             case 'setDefault':
                 setDefaultPresetId(preset.id);
-                configurationManager.setDefaultPreset(preset.id);
+                savePresetsConfig(presets, preset.id);
                 break;
             case 'delete':
                 if (presets.length > 1) {
@@ -145,7 +158,7 @@ const ConfigureCommand = ({ onComplete }) => {
         }
         const updatedPresets = presets.map(p => p.id === preset.id ? updatedPreset : p);
         setPresets(updatedPresets);
-        configurationManager.addPreset(updatedPreset);
+        savePresetsConfig(updatedPresets);
         setEditField(null);
         setInputValue('');
         setErrorMessage(null);
@@ -193,7 +206,7 @@ const ConfigureCommand = ({ onComplete }) => {
                 };
                 const updatedPresets = [...presets, completePreset];
                 setPresets(updatedPresets);
-                configurationManager.addPreset(completePreset);
+                savePresetsConfig(updatedPresets);
                 setViewMode('list');
                 setSelectedIndex(updatedPresets.length - 1);
                 setNewPreset({});
@@ -213,7 +226,7 @@ const ConfigureCommand = ({ onComplete }) => {
         updatedPreset.detectionStrategy = item.value;
         const updatedPresets = presets.map(p => p.id === preset.id ? updatedPreset : p);
         setPresets(updatedPresets);
-        configurationManager.addPreset(updatedPreset);
+        savePresetsConfig(updatedPresets);
         setIsSelectingStrategy(false);
     };
     const handleAddStrategySelect = (item) => {
@@ -234,14 +247,15 @@ const ConfigureCommand = ({ onComplete }) => {
             const newPresets = presets.filter(p => p.id !== selectedPresetId);
             setPresets(newPresets);
             // Update default if needed
+            let newDefaultId = defaultPresetId;
             if (defaultPresetId === selectedPresetId && newPresets.length > 0) {
                 const firstPreset = newPresets[0];
                 if (firstPreset) {
+                    newDefaultId = firstPreset.id;
                     setDefaultPresetId(firstPreset.id);
-                    configurationManager.setDefaultPreset(firstPreset.id);
                 }
             }
-            configurationManager.deletePreset(selectedPresetId);
+            savePresetsConfig(newPresets, newDefaultId);
             setViewMode('list');
             setSelectedIndex(0);
         }
@@ -531,7 +545,7 @@ const ConfigureCommand = ({ onComplete }) => {
             // Toggle select preset on start
             const newValue = !selectPresetOnStart;
             setSelectPresetOnStart(newValue);
-            configurationManager.setSelectPresetOnStart(newValue);
+            savePresetsConfig(presets, undefined, newValue);
         }
         else if (item.value.startsWith('separator')) {
             // Ignore separator selections
@@ -547,9 +561,18 @@ const ConfigureCommand = ({ onComplete }) => {
             }
         }
     };
+    const scopeLabel = scope === 'project' ? 'Project' : 'Global';
     return (React.createElement(Box, { flexDirection: "column" },
         React.createElement(Box, { marginBottom: 1 },
-            React.createElement(Text, { bold: true, color: "green" }, "Command Command Presets")),
+            React.createElement(Text, { bold: true, color: "green" },
+                "Command Presets (",
+                scopeLabel,
+                ")")),
+        isInheriting && (React.createElement(Box, { marginBottom: 1 },
+            React.createElement(Text, { backgroundColor: "cyan", color: "black" },
+                ' ',
+                "\uD83D\uDCCB Inheriting from global configuration",
+                ' '))),
         React.createElement(Box, { marginBottom: 1 },
             React.createElement(Text, { dimColor: true }, "Configure command presets for running code sessions")),
         React.createElement(SelectInput, { items: selectItems, onSelect: handleSelectItem, initialIndex: selectedIndex }),

package/dist/components/ConfigureOther.js

@@ -1,19 +1,24 @@
 import React, { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
 import SelectInput from 'ink-select-input';
-import { configurationManager } from '../services/configurationManager.js';
+import { useConfigEditor } from '../contexts/ConfigEditorContext.js';
 import { shortcutManager } from '../services/shortcutManager.js';
 import ConfigureCustomCommand from './ConfigureCustomCommand.js';
 import ConfigureTimeout from './ConfigureTimeout.js';
 import CustomCommandSummary from './CustomCommandSummary.js';
 const ConfigureOther = ({ onComplete }) => {
-    const autoApprovalConfig = configurationManager.getAutoApprovalConfig();
+    const configEditor = useConfigEditor();
+    const scope = configEditor.getScope();
+    // Get initial auto-approval config based on scope
+    const autoApprovalConfig = configEditor.getAutoApprovalConfig();
     const [view, setView] = useState('main');
     const [autoApprovalEnabled, setAutoApprovalEnabled] = useState(autoApprovalConfig.enabled);
     const [customCommand, setCustomCommand] = useState(autoApprovalConfig.customCommand ?? '');
     const [customCommandDraft, setCustomCommandDraft] = useState(customCommand);
     const [timeout, setTimeout] = useState(autoApprovalConfig.timeout ?? 30);
     const [timeoutDraft, setTimeoutDraft] = useState(timeout);
+    // Show if inheriting from global (for project scope)
+    const isInheriting = scope === 'project' && !configEditor.hasProjectOverride('autoApproval');
     useInput((input, key) => {
         if (shortcutManager.matchesShortcut('cancel', input, key)) {
             if (view === 'customCommand') {
@@ -65,7 +70,7 @@ const ConfigureOther = ({ onComplete }) => {
                 setView('timeout');
                 break;
             case 'save':
-                configurationManager.setAutoApprovalConfig({
+                configEditor.setAutoApprovalConfig({
                     enabled: autoApprovalEnabled,
                     customCommand: customCommand.trim() || undefined,
                     timeout,
@@ -97,9 +102,18 @@ const ConfigureOther = ({ onComplete }) => {
                 setView('main');
             } }));
     }
+    const scopeLabel = scope === 'project' ? 'Project' : 'Global';
     return (React.createElement(Box, { flexDirection: "column" },
         React.createElement(Box, { marginBottom: 1 },
-            React.createElement(Text, { bold: true, color: "green" }, "Other & Experimental Settings")),
+            React.createElement(Text, { bold: true, color: "green" },
+                "Other & Experimental Settings (",
+                scopeLabel,
+                ")")),
+        isInheriting && (React.createElement(Box, { marginBottom: 1 },
+            React.createElement(Text, { backgroundColor: "cyan", color: "black" },
+                ' ',
+                "\uD83D\uDCCB Inheriting from global configuration",
+                ' '))),
         React.createElement(Box, { marginBottom: 1 },
             React.createElement(Text, { dimColor: true }, "Toggle experimental capabilities and other miscellaneous options.")),
         React.createElement(CustomCommandSummary, { command: customCommand }),

package/dist/components/ConfigureOther.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { render } from 'ink-testing-library';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import ConfigureOther from './ConfigureOther.js';
-import { configurationManager } from '../services/configurationManager.js';
+import { ConfigEditorProvider } from '../contexts/ConfigEditorContext.js';
 // Mock ink to avoid stdin issues during tests
 vi.mock('ink', async () => {
     const actual = await vi.importActual('ink');
@@ -19,12 +19,45 @@ vi.mock('ink-select-input', async () => {
         default: ({ items }) => React.createElement(Box, { flexDirection: 'column' }, items.map((item, index) => React.createElement(Text, { key: index }, item.label))),
     };
 });
-vi.mock('../services/configurationManager.js', () => ({
-    configurationManager: {
-        getAutoApprovalConfig: vi.fn(),
-        setAutoApprovalConfig: vi.fn(),
-    },
-}));
+// Create mock functions that will be used by the mock class
+const mockFns = {
+    getAutoApprovalConfig: vi.fn(),
+    setAutoApprovalConfig: vi.fn(),
+    hasProjectOverride: vi.fn().mockReturnValue(false),
+    getScope: vi.fn().mockReturnValue('global'),
+};
+vi.mock('../services/config/configEditor.js', () => {
+    return {
+        ConfigEditor: class {
+            constructor() {
+                Object.defineProperty(this, "getAutoApprovalConfig", {
+                    enumerable: true,
+                    configurable: true,
+                    writable: true,
+                    value: mockFns.getAutoApprovalConfig
+                });
+                Object.defineProperty(this, "setAutoApprovalConfig", {
+                    enumerable: true,
+                    configurable: true,
+                    writable: true,
+                    value: mockFns.setAutoApprovalConfig
+                });
+                Object.defineProperty(this, "hasProjectOverride", {
+                    enumerable: true,
+                    configurable: true,
+                    writable: true,
+                    value: mockFns.hasProjectOverride
+                });
+                Object.defineProperty(this, "getScope", {
+                    enumerable: true,
+                    configurable: true,
+                    writable: true,
+                    value: mockFns.getScope
+                });
+            }
+        },
+    };
+});
 vi.mock('../services/shortcutManager.js', () => ({
     shortcutManager: {
         matchesShortcut: vi.fn().mockReturnValue(false),
@@ -50,17 +83,18 @@ vi.mock('./CustomCommandSummary.js', async () => {
         default: ({ command }) => React.createElement(Text, null, `Custom auto-approval command: ${command || 'Empty'}`),
     };
 });
-const mockedConfigurationManager = configurationManager;
 describe('ConfigureOther', () => {
     beforeEach(() => {
         vi.clearAllMocks();
     });
     it('renders experimental settings with auto-approval status', () => {
-        mockedConfigurationManager.getAutoApprovalConfig.mockReturnValue({
+        mockFns.getAutoApprovalConfig.mockReturnValue({
             enabled: true,
             customCommand: '',
+            timeout: 30,
         });
-        const { lastFrame } = render(React.createElement(ConfigureOther, { onComplete: vi.fn() }));
+        const { lastFrame } = render(React.createElement(ConfigEditorProvider, { scope: "global" },
+            React.createElement(ConfigureOther, { onComplete: vi.fn() })));
         expect(lastFrame()).toContain('Other & Experimental Settings');
         expect(lastFrame()).toContain('Auto Approval (experimental): ✅ Enabled');
         expect(lastFrame()).toContain('Custom auto-approval command: Empty');
@@ -68,11 +102,13 @@ describe('ConfigureOther', () => {
         expect(lastFrame()).toContain('Save Changes');
     });
     it('shows current custom command summary', () => {
-        mockedConfigurationManager.getAutoApprovalConfig.mockReturnValue({
+        mockFns.getAutoApprovalConfig.mockReturnValue({
             enabled: false,
             customCommand: 'jq -n \'{"needsPermission":true}\'',
+            timeout: 30,
         });
-        const { lastFrame } = render(React.createElement(ConfigureOther, { onComplete: vi.fn() }));
+        const { lastFrame } = render(React.createElement(ConfigEditorProvider, { scope: "global" },
+            React.createElement(ConfigureOther, { onComplete: vi.fn() })));
         expect(lastFrame()).toContain('Custom auto-approval command:');
         expect(lastFrame()).toContain('jq -n');
         expect(lastFrame()).toContain('Edit Custom Command');

package/dist/components/ConfigureShortcuts.js

@@ -1,66 +1,18 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
 import SelectInput from 'ink-select-input';
-import { Effect } from 'effect';
-import { shortcutManager } from '../services/shortcutManager.js';
-import { configurationManager } from '../services/configurationManager.js';
-/**
- * Format error using TaggedError discrimination
- * Pattern matches on _tag for type-safe error display
- */
-const formatError = (error) => {
-    switch (error._tag) {
-        case 'FileSystemError':
-            return `File ${error.operation} failed for ${error.path}: ${error.cause}`;
-        case 'ConfigError':
-            return `Configuration error (${error.reason}): ${error.details}`;
-        case 'ValidationError':
-            return `Validation failed for ${error.field}: ${error.constraint}`;
-        case 'GitError':
-            return `Git command failed: ${error.command} (exit ${error.exitCode})\n${error.stderr}`;
-        case 'ProcessError':
-            return `Process error: ${error.message}`;
-    }
-};
+import { useConfigEditor } from '../contexts/ConfigEditorContext.js';
 const ConfigureShortcuts = ({ onComplete, }) => {
+    const configEditor = useConfigEditor();
+    const scope = configEditor.getScope();
     const [step, setStep] = useState('menu');
-    const [shortcuts, setShortcuts] = useState(shortcutManager.getShortcuts());
+    // Get initial shortcuts based on scope
+    const initialShortcuts = configEditor.getShortcuts();
+    const [shortcuts, setShortcuts] = useState(initialShortcuts);
     const [editingShortcut, setEditingShortcut] = useState(null);
     const [error, setError] = useState(null);
-    const [isLoading, setIsLoading] = useState(true);
-    // Load configuration using Effect on component mount
-    useEffect(() => {
-        let cancelled = false;
-        const loadConfig = async () => {
-            const result = await Effect.runPromise(Effect.match(configurationManager.loadConfigEffect(), {
-                onFailure: (err) => ({
-                    type: 'error',
-                    error: err,
-                }),
-                onSuccess: config => ({ type: 'success', data: config }),
-            }));
-            if (!cancelled) {
-                if (result.type === 'error') {
-                    // Display error using TaggedError discrimination
-                    const errorMsg = formatError(result.error);
-                    setError(errorMsg);
-                }
-                else if (result.data.shortcuts) {
-                    setShortcuts(result.data.shortcuts);
-                }
-                setIsLoading(false);
-            }
-        };
-        loadConfig().catch(err => {
-            if (!cancelled) {
-                setError(`Unexpected error loading config: ${String(err)}`);
-                setIsLoading(false);
-            }
-        });
-        return () => {
-            cancelled = true;
-        };
-    }, []);
+    // Show if inheriting from global (for project scope)
+    const isInheriting = scope === 'project' && !configEditor.hasProjectOverride('shortcuts');
     const getShortcutDisplayFromState = (key) => {
         const shortcut = shortcuts[key];
         if (!shortcut)
@@ -147,28 +99,14 @@ const ConfigureShortcuts = ({ onComplete, }) => {
             return;
         }
         if (item.value === 'save') {
-            // Save shortcuts using Effect-based method
-            const saveConfig = async () => {
-                const result = await Effect.runPromise(Effect.match(configurationManager.setShortcutsEffect(shortcuts), {
-                    onFailure: (err) => ({
-                        type: 'error',
-                        error: err,
-                    }),
-                    onSuccess: () => ({ type: 'success' }),
-                }));
-                if (result.type === 'error') {
-                    // Display error using TaggedError discrimination
-                    const errorMsg = formatError(result.error);
-                    setError(errorMsg);
-                }
-                else {
-                    // Success - call onComplete
-                    onComplete();
-                }
-            };
-            saveConfig().catch(err => {
-                setError(`Unexpected error saving shortcuts: ${String(err)}`);
-            });
+            // Save shortcuts using ConfigEditor
+            try {
+                configEditor.setShortcuts(shortcuts);
+                onComplete();
+            }
+            catch (err) {
+                setError(`Error saving shortcuts: ${String(err)}`);
+            }
             return;
         }
         if (item.value === 'exit') {
@@ -180,11 +118,6 @@ const ConfigureShortcuts = ({ onComplete, }) => {
         setStep('capturing');
         setError(null);
     };
-    // Show loading indicator while loading config
-    if (isLoading) {
-        return (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Text, null, "Loading configuration...")));
-    }
     if (step === 'capturing') {
         return (React.createElement(Box, { flexDirection: "column" },
             React.createElement(Text, { bold: true, color: "green" },
@@ -197,9 +130,18 @@ const ConfigureShortcuts = ({ onComplete, }) => {
             React.createElement(Box, { marginTop: 1 },
                 React.createElement(Text, { dimColor: true }, "Reserved: Ctrl+C, Ctrl+D, Ctrl+[ (Esc)"))));
     }
+    const scopeLabel = scope === 'project' ? 'Project' : 'Global';
     return (React.createElement(Box, { flexDirection: "column" },
         React.createElement(Box, { marginBottom: 1 },
-            React.createElement(Text, { bold: true, color: "green" }, "Configure Keyboard Shortcuts")),
+            React.createElement(Text, { bold: true, color: "green" },
+                "Configure Keyboard Shortcuts (",
+                scopeLabel,
+                ")")),
+        isInheriting && (React.createElement(Box, { marginBottom: 1 },
+            React.createElement(Text, { backgroundColor: "cyan", color: "black" },
+                ' ',
+                "\uD83D\uDCCB Inheriting from global configuration",
+                ' '))),
         error && (React.createElement(Box, { marginBottom: 1 },
             React.createElement(Text, { color: "red" },
                 "Error: ",

package/dist/components/ConfigureStatusHooks.js

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
 import TextInputWrapper from './TextInputWrapper.js';
 import SelectInput from 'ink-select-input';
-import { configurationManager } from '../services/configurationManager.js';
+import { useConfigEditor } from '../contexts/ConfigEditorContext.js';
 const STATUS_LABELS = {
     idle: 'Idle',
     busy: 'Busy',
@@ -10,12 +10,18 @@ const STATUS_LABELS = {
     pending_auto_approval: 'Pending Auto Approval',
 };
 const ConfigureStatusHooks = ({ onComplete, }) => {
+    const configEditor = useConfigEditor();
+    const scope = configEditor.getScope();
     const [view, setView] = useState('menu');
     const [selectedStatus, setSelectedStatus] = useState('idle');
-    const [statusHooks, setStatusHooks] = useState(configurationManager.getStatusHooks());
+    // Get initial status hooks based on scope
+    const initialStatusHooks = configEditor.getStatusHooks() ?? {};
+    const [statusHooks, setStatusHooks] = useState(initialStatusHooks);
     const [currentCommand, setCurrentCommand] = useState('');
     const [currentEnabled, setCurrentEnabled] = useState(false);
     const [showSaveMessage, setShowSaveMessage] = useState(false);
+    // Show if inheriting from global (for project scope)
+    const isInheriting = scope === 'project' && !configEditor.hasProjectOverride('statusHooks');
     useInput((input, key) => {
         if (key.escape) {
             if (view === 'edit') {
@@ -62,7 +68,7 @@ const ConfigureStatusHooks = ({ onComplete, }) => {
     };
     const handleMenuSelect = (item) => {
         if (item.value === 'save') {
-            configurationManager.setStatusHooks(statusHooks);
+            configEditor.setStatusHooks(statusHooks);
             setShowSaveMessage(true);
             setTimeout(() => {
                 onComplete();
@@ -125,9 +131,18 @@ const ConfigureStatusHooks = ({ onComplete, }) => {
             React.createElement(Box, { marginTop: 1 },
                 React.createElement(Text, { dimColor: true }, "Press Enter to save, Tab to toggle enabled, Esc to cancel"))));
     }
+    const scopeLabel = scope === 'project' ? 'Project' : 'Global';
     return (React.createElement(Box, { flexDirection: "column" },
         React.createElement(Box, { marginBottom: 1 },
-            React.createElement(Text, { bold: true, color: "green" }, "Configure Status Hooks")),
+            React.createElement(Text, { bold: true, color: "green" },
+                "Configure Status Hooks (",
+                scopeLabel,
+                ")")),
+        isInheriting && (React.createElement(Box, { marginBottom: 1 },
+            React.createElement(Text, { backgroundColor: "cyan", color: "black" },
+                ' ',
+                "\uD83D\uDCCB Inheriting from global configuration",
+                ' '))),
         React.createElement(Box, { marginBottom: 1 },
             React.createElement(Text, { dimColor: true }, "Set commands to run when session status changes:")),
         React.createElement(SelectInput, { items: getMenuItems(), onSelect: handleMenuSelect, isFocused: true, limit: 10 }),