claudeup 4.15.1 → 4.17.0

package/src/ui/App.js

@@ -5,7 +5,10 @@ import fs from "node:fs";
 import { AppProvider, useApp, useNavigation, useModal, } from "./state/AppContext.js";
 import { DimensionsProvider, useDimensions, } from "./state/DimensionsContext.js";
 import { ModalContainer } from "./components/modals/index.js";
-import { PluginsScreen, McpScreen, McpRegistryScreen, SettingsScreen, CliToolsScreen, ModelSelectorScreen, ProfilesScreen, SkillsScreen, } from "./screens/index.js";
+import { PluginsScreen, McpScreen, McpRegistryScreen, SettingsScreen, CliToolsScreen, ModelSelectorScreen, ProfilesScreen, SkillsScreen, GitignoreScreen, } from "./screens/index.js";
+import { checkGitignore } from "../services/gitignore-prerun.js";
+import { loadGitignoreState, applyAllSafeFixes, } from "../services/gitignore-service.js";
+import { useGitignoreModal } from "./hooks/useGitignoreModal.js";
 import { repairAllMarketplaces } from "../services/local-marketplace.js";
 import { migrateMarketplaceRename, recoverMarketplaceSettings, } from "../services/claude-settings.js";
 import { autoAddMissingMarketplaces } from "../services/marketplace-sync.js";
@@ -40,6 +43,8 @@ function Router() {
             return _jsx(ProfilesScreen, {});
         case "skills":
             return _jsx(SkillsScreen, {});
+        case "gitignore":
+            return _jsx(GitignoreScreen, {});
         default:
             return _jsx(PluginsScreen, {});
     }
@@ -81,7 +86,7 @@ function GlobalKeyHandler({ onDebugToggle, onExit, }) {
         // Don't handle keys when modal is open or searching
         if (state.modal || state.isSearching)
             return;
-        // Global navigation shortcuts (1-5) - include mcp-registry as it's a sub-screen of mcp
+        // Global navigation shortcuts (1-7) - include mcp-registry as it's a sub-screen of mcp
         const isTopLevel = [
             "plugins",
             "mcp",
@@ -91,6 +96,7 @@ function GlobalKeyHandler({ onDebugToggle, onExit, }) {
             "model-selector",
             "profiles",
             "skills",
+            "gitignore",
         ].includes(state.currentRoute.screen);
         if (isTopLevel) {
             if (input === "1")
@@ -105,6 +111,8 @@ function GlobalKeyHandler({ onDebugToggle, onExit, }) {
                 navigateToScreen("profiles");
             else if (input === "6")
                 navigateToScreen("cli-tools");
+            else if (input === "7")
+                navigateToScreen("gitignore");
             // Tab navigation cycling
             if (key.tab) {
                 const screens = [
@@ -114,6 +122,7 @@ function GlobalKeyHandler({ onDebugToggle, onExit, }) {
                     "settings",
                     "profiles",
                     "cli-tools",
+                    "gitignore",
                 ];
                 const currentIndex = screens.indexOf(state.currentRoute.screen);
                 if (currentIndex !== -1) {
@@ -148,7 +157,7 @@ function GlobalKeyHandler({ onDebugToggle, onExit, }) {
   ?             This help
 
 Quick Navigation
-  1  Plugins      4  Settings
+  1  Plugins      4  Settings    7  Gitignore
   2  Skills       5  Profiles
   3  MCP Servers  6  CLI Tools
 
@@ -193,6 +202,8 @@ function AppContent({ onExit }) {
     const [recoveryReport, setRecoveryReport] = useState(null);
     const [mismatchData, setMismatchData] = useState(null);
     const mismatchModal = useMismatchModal();
+    const [gitignoreData, setGitignoreData] = useState(null);
+    const gitignoreModal = useGitignoreModal();
     // Check for updates on startup (non-blocking)
     useEffect(() => {
         checkForUpdates()
@@ -213,6 +224,23 @@ function AppContent({ onExit }) {
         mismatchModal.show(mismatchData);
         setMismatchData(null);
     }, [mismatchData, mismatchModal]);
+    // Show gitignore modal — wait for the modal slot to be free so we don't
+    // stomp on the mismatch modal that may have just been shown.
+    useEffect(() => {
+        if (!gitignoreData)
+            return;
+        if (state.modal)
+            return;
+        gitignoreModal.show({
+            violationCount: gitignoreData.violationCount,
+            safeCount: gitignoreData.safeCount,
+            onFixSafe: async () => {
+                const s = await loadGitignoreState(state.projectPath);
+                await applyAllSafeFixes(state.projectPath, s.violations);
+            },
+        });
+        setGitignoreData(null);
+    }, [gitignoreData, gitignoreModal, state.modal, state.projectPath]);
     // Auto-refresh marketplaces on startup
     useEffect(() => {
         const noRefresh = process.argv.includes("--no-refresh");
@@ -277,6 +305,22 @@ function AppContent({ onExit }) {
             }
         })
             .catch(() => { }); // non-fatal
+        // Check for gitignore manifest violations and surface a popup if any.
+        // Loads twice (once for count, once when user picks "fix safe") because
+        // the second load happens after edits — keeps detection cheap on startup.
+        (async () => {
+            try {
+                const result = await checkGitignore(process.cwd());
+                if (result.violationCount > 0) {
+                    const s = await loadGitignoreState(process.cwd());
+                    const safeCount = s.violations.filter((v) => v.severity === "safe").length;
+                    setGitignoreData({ violationCount: result.violationCount, safeCount });
+                }
+            }
+            catch {
+                // non-fatal
+            }
+        })();
         repairAllMarketplaces()
             .then(async () => {
             dispatch({ type: "HIDE_PROGRESS" });

package/src/ui/App.tsx

@@ -21,8 +21,15 @@ import {
 	ModelSelectorScreen,
 	ProfilesScreen,
 	SkillsScreen,
+	GitignoreScreen,
 } from "./screens/index.js";
 import type { Screen } from "./state/types.js";
+import { checkGitignore } from "../services/gitignore-prerun.js";
+import {
+	loadGitignoreState,
+	applyAllSafeFixes,
+} from "../services/gitignore-service.js";
+import { useGitignoreModal } from "./hooks/useGitignoreModal.js";
 import { repairAllMarketplaces } from "../services/local-marketplace.js";
 import {
 	migrateMarketplaceRename,
@@ -70,6 +77,8 @@ function Router() {
 			return <ProfilesScreen />;
 		case "skills":
 			return <SkillsScreen />;
+		case "gitignore":
+			return <GitignoreScreen />;
 		default:
 			return <PluginsScreen />;
 	}
@@ -120,7 +129,7 @@ function GlobalKeyHandler({
 		// Don't handle keys when modal is open or searching
 		if (state.modal || state.isSearching) return;
 
-		// Global navigation shortcuts (1-5) - include mcp-registry as it's a sub-screen of mcp
+		// Global navigation shortcuts (1-7) - include mcp-registry as it's a sub-screen of mcp
 		const isTopLevel = [
 			"plugins",
 			"mcp",
@@ -130,6 +139,7 @@ function GlobalKeyHandler({
 			"model-selector",
 			"profiles",
 			"skills",
+			"gitignore",
 		].includes(state.currentRoute.screen);
 
 		if (isTopLevel) {
@@ -139,6 +149,7 @@ function GlobalKeyHandler({
 			else if (input === "4") navigateToScreen("settings");
 			else if (input === "5") navigateToScreen("profiles");
 			else if (input === "6") navigateToScreen("cli-tools");
+			else if (input === "7") navigateToScreen("gitignore");
 
 			// Tab navigation cycling
 			if (key.tab) {
@@ -149,6 +160,7 @@ function GlobalKeyHandler({
 					"settings",
 					"profiles",
 					"cli-tools",
+					"gitignore",
 				];
 				const currentIndex = screens.indexOf(
 					state.currentRoute.screen as Screen,
@@ -187,7 +199,7 @@ function GlobalKeyHandler({
   ?             This help
 
 Quick Navigation
-  1  Plugins      4  Settings
+  1  Plugins      4  Settings    7  Gitignore
   2  Skills       5  Profiles
   3  MCP Servers  6  CLI Tools
 
@@ -319,6 +331,11 @@ function AppContent({ onExit }: AppContentProps) {
 	const [recoveryReport, setRecoveryReport] = useState<string | null>(null);
 	const [mismatchData, setMismatchData] = useState<VersionMismatchInfo[] | null>(null);
 	const mismatchModal = useMismatchModal();
+	const [gitignoreData, setGitignoreData] = useState<{
+		violationCount: number;
+		safeCount: number;
+	} | null>(null);
+	const gitignoreModal = useGitignoreModal();
 
 	// Check for updates on startup (non-blocking)
 	useEffect(() => {
@@ -341,6 +358,22 @@ function AppContent({ onExit }: AppContentProps) {
 		setMismatchData(null);
 	}, [mismatchData, mismatchModal]);
 
+	// Show gitignore modal — wait for the modal slot to be free so we don't
+	// stomp on the mismatch modal that may have just been shown.
+	useEffect(() => {
+		if (!gitignoreData) return;
+		if (state.modal) return;
+		gitignoreModal.show({
+			violationCount: gitignoreData.violationCount,
+			safeCount: gitignoreData.safeCount,
+			onFixSafe: async () => {
+				const s = await loadGitignoreState(state.projectPath);
+				await applyAllSafeFixes(state.projectPath, s.violations);
+			},
+		});
+		setGitignoreData(null);
+	}, [gitignoreData, gitignoreModal, state.modal, state.projectPath]);
+
 	// Auto-refresh marketplaces on startup
 	useEffect(() => {
 		const noRefresh = process.argv.includes("--no-refresh");
@@ -409,6 +442,22 @@ function AppContent({ onExit }: AppContentProps) {
 			})
 			.catch(() => {}); // non-fatal
 
+		// Check for gitignore manifest violations and surface a popup if any.
+		// Loads twice (once for count, once when user picks "fix safe") because
+		// the second load happens after edits — keeps detection cheap on startup.
+		(async () => {
+			try {
+				const result = await checkGitignore(process.cwd());
+				if (result.violationCount > 0) {
+					const s = await loadGitignoreState(process.cwd());
+					const safeCount = s.violations.filter((v) => v.severity === "safe").length;
+					setGitignoreData({ violationCount: result.violationCount, safeCount });
+				}
+			} catch {
+				// non-fatal
+			}
+		})();
+
 		repairAllMarketplaces()
 			.then(async () => {
 				dispatch({ type: "HIDE_PROGRESS" });

package/src/ui/components/TabBar.js

@@ -6,6 +6,7 @@ const TABS = [
     { key: "4", label: "Settings", screen: "settings" },
     { key: "5", label: "Profiles", screen: "profiles" },
     { key: "6", label: "CLI", screen: "cli-tools" },
+    { key: "7", label: "Gitignore", screen: "gitignore" },
 ];
 export function TabBar({ currentScreen }) {
     return (_jsx("box", { flexDirection: "row", gap: 0, children: TABS.map((tab, index) => {

package/src/ui/components/TabBar.tsx

@@ -14,6 +14,7 @@ const TABS: Tab[] = [
 	{ key: "4", label: "Settings", screen: "settings" },
 	{ key: "5", label: "Profiles", screen: "profiles" },
 	{ key: "6", label: "CLI", screen: "cli-tools" },
+	{ key: "7", label: "Gitignore", screen: "gitignore" },
 ];
 
 interface TabBarProps {

package/src/ui/hooks/useGitignoreModal.js

@@ -0,0 +1,75 @@
+import { useCallback } from "react";
+import { useApp, useNavigation } from "../state/AppContext.js";
+export function buildGitignoreModal(args) {
+    const { violationCount, safeCount, onFixSafe, onOpenTab, onDismiss } = args;
+    const options = [
+        {
+            label: safeCount > 0
+                ? `Append ${safeCount} safe entr${safeCount === 1 ? "y" : "ies"} to .gitignore`
+                : "(no safe-fixable entries)",
+            value: "fix-safe",
+        },
+        {
+            label: "Open Gitignore tab to review",
+            value: "open-tab",
+        },
+        {
+            label: "Dismiss",
+            value: "dismiss",
+        },
+    ];
+    return {
+        type: "select",
+        title: "Gitignore violations detected",
+        message: `Found ${violationCount} issue(s) where the resolved gitignore manifest ` +
+            `disagrees with your working tree.\n\n` +
+            `Safe fixes append to .gitignore (no index mutation). Destructive fixes ` +
+            `(\`git rm --cached\`, removing .gitignore lines) must be applied one at ` +
+            `a time from the Gitignore tab.`,
+        options,
+        onSelect: (value) => {
+            if (value === "fix-safe")
+                onFixSafe();
+            else if (value === "open-tab")
+                onOpenTab();
+            else
+                onDismiss();
+        },
+        onCancel: onDismiss,
+    };
+}
+export function useGitignoreModal() {
+    const { dispatch } = useApp();
+    const { navigateToScreen } = useNavigation();
+    const show = useCallback((args) => {
+        if (args.violationCount === 0)
+            return;
+        const dismiss = () => dispatch({ type: "HIDE_MODAL" });
+        const modal = buildGitignoreModal({
+            violationCount: args.violationCount,
+            safeCount: args.safeCount,
+            onFixSafe: () => {
+                dispatch({ type: "HIDE_MODAL" });
+                void Promise.resolve(args.onFixSafe()).catch((err) => {
+                    dispatch({
+                        type: "SHOW_MODAL",
+                        modal: {
+                            type: "message",
+                            title: "Safe fixes failed",
+                            message: err instanceof Error ? err.message : String(err),
+                            variant: "error",
+                            onDismiss: dismiss,
+                        },
+                    });
+                });
+            },
+            onOpenTab: () => {
+                dispatch({ type: "HIDE_MODAL" });
+                navigateToScreen("gitignore");
+            },
+            onDismiss: dismiss,
+        });
+        dispatch({ type: "SHOW_MODAL", modal });
+    }, [dispatch, navigateToScreen]);
+    return { show };
+}

package/src/ui/hooks/useGitignoreModal.ts

@@ -0,0 +1,97 @@
+import { useCallback } from "react";
+import { useApp, useNavigation } from "../state/AppContext.js";
+import type { ModalState } from "../state/types.js";
+
+/**
+ * Startup gitignore-violation modal. Mirrors `useMismatchModal` so the
+ * two flows feel identical to the user — claudeup launches, detects
+ * a problem, asks "fix safe entries / open the tab / dismiss".
+ *
+ * Pure builder is exported separately for tests.
+ */
+
+export interface BuildModalArgs {
+  violationCount: number;
+  safeCount: number;
+  onFixSafe: () => void;
+  onOpenTab: () => void;
+  onDismiss: () => void;
+}
+
+export function buildGitignoreModal(args: BuildModalArgs): ModalState {
+  const { violationCount, safeCount, onFixSafe, onOpenTab, onDismiss } = args;
+  const options = [
+    {
+      label:
+        safeCount > 0
+          ? `Append ${safeCount} safe entr${safeCount === 1 ? "y" : "ies"} to .gitignore`
+          : "(no safe-fixable entries)",
+      value: "fix-safe",
+    },
+    {
+      label: "Open Gitignore tab to review",
+      value: "open-tab",
+    },
+    {
+      label: "Dismiss",
+      value: "dismiss",
+    },
+  ];
+  return {
+    type: "select",
+    title: "Gitignore violations detected",
+    message:
+      `Found ${violationCount} issue(s) where the resolved gitignore manifest ` +
+      `disagrees with your working tree.\n\n` +
+      `Safe fixes append to .gitignore (no index mutation). Destructive fixes ` +
+      `(\`git rm --cached\`, removing .gitignore lines) must be applied one at ` +
+      `a time from the Gitignore tab.`,
+    options,
+    onSelect: (value: string) => {
+      if (value === "fix-safe") onFixSafe();
+      else if (value === "open-tab") onOpenTab();
+      else onDismiss();
+    },
+    onCancel: onDismiss,
+  };
+}
+
+export function useGitignoreModal() {
+  const { dispatch } = useApp();
+  const { navigateToScreen } = useNavigation();
+
+  const show = useCallback(
+    (args: { violationCount: number; safeCount: number; onFixSafe: () => Promise<void> | void }) => {
+      if (args.violationCount === 0) return;
+      const dismiss = () => dispatch({ type: "HIDE_MODAL" });
+      const modal = buildGitignoreModal({
+        violationCount: args.violationCount,
+        safeCount: args.safeCount,
+        onFixSafe: () => {
+          dispatch({ type: "HIDE_MODAL" });
+          void Promise.resolve(args.onFixSafe()).catch((err) => {
+            dispatch({
+              type: "SHOW_MODAL",
+              modal: {
+                type: "message",
+                title: "Safe fixes failed",
+                message: err instanceof Error ? err.message : String(err),
+                variant: "error",
+                onDismiss: dismiss,
+              },
+            });
+          });
+        },
+        onOpenTab: () => {
+          dispatch({ type: "HIDE_MODAL" });
+          navigateToScreen("gitignore");
+        },
+        onDismiss: dismiss,
+      });
+      dispatch({ type: "SHOW_MODAL", modal });
+    },
+    [dispatch, navigateToScreen],
+  );
+
+  return { show };
+}

package/src/ui/renderers/gitignoreRenderers.js

@@ -0,0 +1,33 @@
+import { jsx as _jsx, jsxs as _jsxs } from "@opentui/react/jsx-runtime";
+const SELECTION_BG = "#7e57c2";
+const SELECTION_FG = "white";
+// Layout: "  X Verb    path" — 2 (gutter) + 2 (status) + 7 (verb) + 4 (gap)
+// = 15 prefix chars. On a 38-col panel inner width that leaves 23 chars for
+// the path; truncate at 22 to keep 1 col safety margin (OpenTUI <text>
+// reserves a second line if the rendered string equals the inner width).
+const MAX_PATH_LEN = 22;
+function truncatePath(p) {
+    return p.length > MAX_PATH_LEN ? p.slice(0, MAX_PATH_LEN - 1) + "…" : p;
+}
+export function renderRuleRow(row, isSelected) {
+    const { rule, violation } = row;
+    const path = truncatePath(rule.pattern);
+    const key = `${rule.action}:${rule.pattern}`;
+    // Layout: status-glyph (2) + verb (7) + 2 spaces + path
+    // OK rule: ✓ Ignore  path
+    // Violated:! Track   path
+    const verb = rule.action === "ignore" ? "Ignore " : "Track  ";
+    if (!violation) {
+        // Clean rule — muted, just confirmation
+        if (isSelected) {
+            return (_jsx("text", { bg: SELECTION_BG, fg: SELECTION_FG, children: `▶ ✓ ${verb}  ${path}` }, key));
+        }
+        return (_jsxs("text", { children: [_jsx("span", { fg: "green", children: `  ✓ ` }), _jsx("span", { fg: "gray", children: `${verb}  ${path}` })] }, key));
+    }
+    // Violated rule — color encodes severity of the fix
+    const sevColor = violation.severity === "safe" ? "yellow" : "red";
+    if (isSelected) {
+        return (_jsx("text", { bg: SELECTION_BG, fg: SELECTION_FG, children: `▶ ! ${verb}  ${path}` }, key));
+    }
+    return (_jsxs("text", { children: [_jsx("span", { fg: sevColor, children: `  ! ` }), _jsx("span", { fg: "white", children: `${verb}  ${path}` })] }, key));
+}

package/src/ui/renderers/gitignoreRenderers.tsx

@@ -0,0 +1,70 @@
+import React from "react";
+import type { ResolvedRule, Violation } from "../../types/gitignore.js";
+
+/**
+ * A unified row for the Gitignore screen — represents one resolved rule,
+ * optionally annotated with the violation it has against the working tree.
+ */
+export interface RuleRow {
+  rule: ResolvedRule;
+  violation?: Violation;
+}
+
+const SELECTION_BG = "#7e57c2";
+const SELECTION_FG = "white";
+
+// Layout: "  X Verb    path" — 2 (gutter) + 2 (status) + 7 (verb) + 4 (gap)
+// = 15 prefix chars. On a 38-col panel inner width that leaves 23 chars for
+// the path; truncate at 22 to keep 1 col safety margin (OpenTUI <text>
+// reserves a second line if the rendered string equals the inner width).
+const MAX_PATH_LEN = 22;
+
+function truncatePath(p: string): string {
+  return p.length > MAX_PATH_LEN ? p.slice(0, MAX_PATH_LEN - 1) + "…" : p;
+}
+
+export function renderRuleRow(row: RuleRow, isSelected: boolean): React.ReactNode {
+  const { rule, violation } = row;
+  const path = truncatePath(rule.pattern);
+  const key = `${rule.action}:${rule.pattern}`;
+
+  // Layout: status-glyph (2) + verb (7) + 2 spaces + path
+  // OK rule: ✓ Ignore  path
+  // Violated:! Track   path
+
+  const verb = rule.action === "ignore" ? "Ignore " : "Track  ";
+
+  if (!violation) {
+    // Clean rule — muted, just confirmation
+    if (isSelected) {
+      return (
+        <text key={key} bg={SELECTION_BG} fg={SELECTION_FG}>
+          {`▶ ✓ ${verb}  ${path}`}
+        </text>
+      );
+    }
+    return (
+      <text key={key}>
+        <span fg="green">{`  ✓ `}</span>
+        <span fg="gray">{`${verb}  ${path}`}</span>
+      </text>
+    );
+  }
+
+  // Violated rule — color encodes severity of the fix
+  const sevColor = violation.severity === "safe" ? "yellow" : "red";
+
+  if (isSelected) {
+    return (
+      <text key={key} bg={SELECTION_BG} fg={SELECTION_FG}>
+        {`▶ ! ${verb}  ${path}`}
+      </text>
+    );
+  }
+  return (
+    <text key={key}>
+      <span fg={sevColor}>{`  ! `}</span>
+      <span fg="white">{`${verb}  ${path}`}</span>
+    </text>
+  );
+}