@kianax/wt 0.1.5 → 0.1.6

package/dist/cli.js

@@ -14768,35 +14768,23 @@ async function loadGlobalConfig() {
   }
   return result.data;
 }
-async function loadLocalConfig(repoRoot) {
-  const path = join2(repoRoot, LOCAL_CONFIG_FILE);
-  const raw = await loadJsonFile(path);
-  if (!raw) {
-    return null;
-  }
-  const result = LocalConfigSchema.safeParse(raw);
-  if (!result.success) {
-    console.warn(`Invalid local config at ${path}, ignoring`);
-    return null;
-  }
-  return result.data;
-}
-async function getConfig(repoRoot, repoId) {
-  const [config2, localConfig] = await Promise.all([
-    loadGlobalConfig(),
-    loadLocalConfig(repoRoot)
-  ]);
+async function getConfig(_repoRoot, repoId) {
+  const config2 = await loadGlobalConfig();
   const repoOverride = config2.repos?.[repoId];
-  const branchPrefix = localConfig?.defaults?.branchPrefix ?? repoOverride?.branchPrefix ?? config2.defaults.branchPrefix;
+  const branchPrefix = repoOverride?.branchPrefix ?? config2.defaults.branchPrefix;
   const worktreeBase = expandHome(repoOverride?.base ?? config2.paths.base);
+  const comparisonBranch = repoOverride?.comparisonBranch ?? config2.defaults.comparisonBranch;
   return {
     config: config2,
-    localConfig,
     branchPrefix,
-    worktreeBase
+    worktreeBase,
+    comparisonBranch
   };
 }
-var GLOBAL_CONFIG_PATH, LOCAL_CONFIG_FILE = ".wtrc.json", RepoOverrideSchema, ConfigSchema, LocalConfigSchema, DEFAULT_CONFIG;
+async function saveGlobalConfig(config2) {
+  await writeFileText(GLOBAL_CONFIG_PATH, JSON.stringify(config2, null, 2));
+}
+var GLOBAL_CONFIG_PATH, RepoOverrideSchema, ConfigSchema, DEFAULT_CONFIG;
 var init_config = __esm(() => {
   init_zod();
   init_compat();
@@ -14804,7 +14792,8 @@ var init_config = __esm(() => {
   GLOBAL_CONFIG_PATH = join2(homedir2(), ".config", "wt", "config.json");
   RepoOverrideSchema = exports_external.object({
     branchPrefix: exports_external.string().max(30).regex(/^[a-zA-Z0-9_/-]*$/, "Invalid branch prefix format").optional(),
-    base: exports_external.string().optional()
+    base: exports_external.string().optional(),
+    comparisonBranch: exports_external.string().optional()
   });
   ConfigSchema = exports_external.object({
     paths: exports_external.object({
@@ -14813,15 +14802,11 @@ var init_config = __esm(() => {
     }).default({ strategy: "centralized", base: "~/.worktrees" }),
     defaults: exports_external.object({
       branchPrefix: exports_external.string().default(""),
-      staleDays: exports_external.number().default(30)
+      staleDays: exports_external.number().default(30),
+      comparisonBranch: exports_external.string().optional()
     }).default({ branchPrefix: "", staleDays: 30 }),
     repos: exports_external.record(exports_external.string(), RepoOverrideSchema).optional()
   });
-  LocalConfigSchema = exports_external.object({
-    defaults: exports_external.object({
-      branchPrefix: exports_external.string().optional()
-    }).optional()
-  });
   DEFAULT_CONFIG = {
     paths: {
       strategy: "centralized",
@@ -14851,7 +14836,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@kianax/wt",
-    version: "0.1.5",
+    version: "0.1.6",
     description: "Git worktree manager - make worktrees as effortless as branches",
     type: "module",
     main: "dist/cli.js",
@@ -53143,7 +53128,15 @@ function DetailsView({ worktree, onClose, onSelect }) {
               }, undefined, true, undefined, this),
               worktree.ahead === 0 && worktree.behind === 0 && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
                 children: "up to date"
-              }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this),
+              worktree.comparisonBranch && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+                dimColor: true,
+                children: [
+                  " (vs ",
+                  worktree.comparisonBranch,
+                  ")"
+                ]
+              }, undefined, true, undefined, this)
             ]
           }, undefined, true, undefined, this),
           commitMessage && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
@@ -53331,118 +53324,616 @@ var init_RenameDialog = __esm(async () => {
   jsx_dev_runtime4 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
+// src/tui/components/SettingsDialog.tsx
+function SettingsDialog({
+  repoId,
+  onClose,
+  onSaved
+}) {
+  const [config2, setConfig] = import_react30.useState(null);
+  const [selectedField, setSelectedField] = import_react30.useState("paths.strategy");
+  const [editMode, setEditMode] = import_react30.useState(false);
+  const [editValue, setEditValue] = import_react30.useState("");
+  const [error48, setError] = import_react30.useState(null);
+  const [isSaving, setIsSaving] = import_react30.useState(false);
+  const [repoOverrideIds, setRepoOverrideIds] = import_react30.useState([]);
+  import_react30.useEffect(() => {
+    loadGlobalConfig().then((cfg) => {
+      setConfig(cfg);
+      setRepoOverrideIds(Object.keys(cfg.repos ?? {}));
+    });
+  }, []);
+  const allFields = [
+    ...FIELD_ORDER,
+    ...repoOverrideIds.flatMap((id) => [
+      `repos.${id}.branchPrefix`,
+      `repos.${id}.base`,
+      `repos.${id}.comparisonBranch`
+    ]),
+    "addRepo"
+  ];
+  const selectedIndex = allFields.indexOf(selectedField);
+  function getFieldValue(fieldId) {
+    if (!config2)
+      return "";
+    if (fieldId === "paths.strategy")
+      return config2.paths.strategy;
+    if (fieldId === "paths.base")
+      return config2.paths.base;
+    if (fieldId === "defaults.branchPrefix")
+      return config2.defaults.branchPrefix;
+    if (fieldId === "defaults.staleDays")
+      return String(config2.defaults.staleDays);
+    if (fieldId === "defaults.comparisonBranch")
+      return config2.defaults.comparisonBranch ?? "";
+    const match = fieldId.match(/^repos\.(.+)\.(branchPrefix|base|comparisonBranch)$/);
+    if (match) {
+      const [, repoId2, field] = match;
+      const repoConfig = config2.repos?.[repoId2];
+      if (!repoConfig)
+        return "";
+      return repoConfig[field] ?? "";
+    }
+    return "";
+  }
+  function updateField(fieldId, value) {
+    if (!config2)
+      return;
+    const newConfig = { ...config2 };
+    if (fieldId === "paths.strategy") {
+      newConfig.paths = {
+        ...newConfig.paths,
+        strategy: value
+      };
+    } else if (fieldId === "paths.base") {
+      newConfig.paths = { ...newConfig.paths, base: value };
+    } else if (fieldId === "defaults.branchPrefix") {
+      newConfig.defaults = { ...newConfig.defaults, branchPrefix: value };
+    } else if (fieldId === "defaults.staleDays") {
+      const num = Number.parseInt(value, 10);
+      if (!Number.isNaN(num) && num > 0) {
+        newConfig.defaults = { ...newConfig.defaults, staleDays: num };
+      }
+    } else if (fieldId === "defaults.comparisonBranch") {
+      newConfig.defaults = {
+        ...newConfig.defaults,
+        comparisonBranch: value || undefined
+      };
+    } else {
+      const match = fieldId.match(/^repos\.(.+)\.(branchPrefix|base|comparisonBranch)$/);
+      if (match) {
+        const [, repoIdMatch, field] = match;
+        newConfig.repos = {
+          ...newConfig.repos,
+          [repoIdMatch]: {
+            ...newConfig.repos?.[repoIdMatch],
+            [field]: value || undefined
+          }
+        };
+      }
+    }
+    setConfig(newConfig);
+  }
+  function addRepoOverride(id) {
+    if (!config2 || !id.trim())
+      return;
+    const newConfig = {
+      ...config2,
+      repos: {
+        ...config2.repos,
+        [id]: { branchPrefix: "", base: "", comparisonBranch: "" }
+      }
+    };
+    setConfig(newConfig);
+    setRepoOverrideIds([...repoOverrideIds, id]);
+    setSelectedField(`repos.${id}.branchPrefix`);
+  }
+  function deleteRepoOverride(id) {
+    if (!config2)
+      return;
+    const newRepos = { ...config2.repos };
+    delete newRepos[id];
+    setConfig({ ...config2, repos: newRepos });
+    setRepoOverrideIds(repoOverrideIds.filter((r) => r !== id));
+    setSelectedField("addRepo");
+  }
+  async function handleSave() {
+    if (!config2)
+      return;
+    const result = ConfigSchema.safeParse(config2);
+    if (!result.success) {
+      const firstIssue = result.error.issues[0];
+      setError(`Validation error: ${firstIssue?.message ?? "Unknown error"}`);
+      return;
+    }
+    setIsSaving(true);
+    setError(null);
+    try {
+      await saveGlobalConfig(config2);
+      onSaved();
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err));
+      setIsSaving(false);
+    }
+  }
+  use_input_default((input, key) => {
+    if (isSaving)
+      return;
+    if (editMode) {
+      if (key.escape) {
+        setEditMode(false);
+        setEditValue("");
+        return;
+      }
+      if (key.return) {
+        if (selectedField === "addRepo" && editValue.trim()) {
+          addRepoOverride(editValue.trim());
+        } else {
+          updateField(selectedField, editValue);
+        }
+        setEditMode(false);
+        setEditValue("");
+        return;
+      }
+      if (selectedField === "paths.strategy") {
+        if (key.leftArrow || key.rightArrow) {
+          const currentIdx = STRATEGIES.indexOf(editValue);
+          const newIdx = key.rightArrow ? (currentIdx + 1) % STRATEGIES.length : (currentIdx - 1 + STRATEGIES.length) % STRATEGIES.length;
+          setEditValue(STRATEGIES[newIdx]);
+        }
+        return;
+      }
+      if (selectedField === "defaults.staleDays") {
+        if (key.backspace || key.delete) {
+          setEditValue((v) => v.slice(0, -1));
+          return;
+        }
+        if (input && /^\d$/.test(input)) {
+          setEditValue((v) => v + input);
+        }
+        return;
+      }
+      if (key.backspace || key.delete) {
+        setEditValue((v) => v.slice(0, -1));
+        return;
+      }
+      if (input && /^[a-zA-Z0-9_/~.-]$/.test(input)) {
+        setEditValue((v) => v + input);
+      }
+      return;
+    }
+    if (key.escape) {
+      onClose();
+      return;
+    }
+    if (key.ctrl && input === "s") {
+      handleSave();
+      return;
+    }
+    if (input === "j" || key.downArrow) {
+      const nextIndex = Math.min(selectedIndex + 1, allFields.length - 1);
+      setSelectedField(allFields[nextIndex]);
+      return;
+    }
+    if (input === "k" || key.upArrow) {
+      const prevIndex = Math.max(selectedIndex - 1, 0);
+      setSelectedField(allFields[prevIndex]);
+      return;
+    }
+    if (key.tab) {
+      const nextIndex = (selectedIndex + 1) % allFields.length;
+      setSelectedField(allFields[nextIndex]);
+      return;
+    }
+    if (key.return) {
+      if (selectedField === "addRepo") {
+        setEditValue(repoId);
+        setEditMode(true);
+        return;
+      }
+      setEditValue(getFieldValue(selectedField));
+      setEditMode(true);
+      return;
+    }
+    if (input === "d") {
+      const match = selectedField.match(/^repos\.(.+)\./);
+      if (match) {
+        deleteRepoOverride(match[1]);
+      }
+    }
+  });
+  if (!config2) {
+    return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+      flexDirection: "column",
+      borderStyle: "round",
+      borderColor: theme.dialog.info,
+      padding: 1,
+      marginTop: 1,
+      children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        dimColor: true,
+        children: "Loading configuration..."
+      }, undefined, false, undefined, this)
+    }, undefined, false, undefined, this);
+  }
+  return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+    flexDirection: "column",
+    borderStyle: "round",
+    borderColor: theme.dialog.info,
+    padding: 1,
+    marginTop: 1,
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        bold: true,
+        color: theme.dialog.info,
+        children: "Settings"
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        marginTop: 1,
+        flexDirection: "column",
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+            bold: true,
+            dimColor: true,
+            children: "Worktree Storage"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+            dimColor: true,
+            children: "─".repeat(17)
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(FieldRow, {
+            label: "Strategy",
+            value: config2.paths.strategy,
+            isSelected: selectedField === "paths.strategy",
+            isEditing: editMode && selectedField === "paths.strategy",
+            editValue,
+            isEnum: true
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(FieldRow, {
+            label: "Base path",
+            value: config2.paths.base,
+            isSelected: selectedField === "paths.base",
+            isEditing: editMode && selectedField === "paths.base",
+            editValue
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        marginTop: 1,
+        flexDirection: "column",
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+            bold: true,
+            dimColor: true,
+            children: "Defaults"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+            dimColor: true,
+            children: "─".repeat(8)
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(FieldRow, {
+            label: "Branch prefix",
+            value: config2.defaults.branchPrefix || "(none)",
+            isSelected: selectedField === "defaults.branchPrefix",
+            isEditing: editMode && selectedField === "defaults.branchPrefix",
+            editValue
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(FieldRow, {
+            label: "Stale days",
+            value: String(config2.defaults.staleDays),
+            isSelected: selectedField === "defaults.staleDays",
+            isEditing: editMode && selectedField === "defaults.staleDays",
+            editValue
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(FieldRow, {
+            label: "Compare branch",
+            value: config2.defaults.comparisonBranch || "(auto)",
+            isSelected: selectedField === "defaults.comparisonBranch",
+            isEditing: editMode && selectedField === "defaults.comparisonBranch",
+            editValue
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        marginTop: 1,
+        flexDirection: "column",
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+            bold: true,
+            dimColor: true,
+            children: "Repository Overrides"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+            dimColor: true,
+            children: "─".repeat(20)
+          }, undefined, false, undefined, this),
+          repoOverrideIds.map((id) => /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+            flexDirection: "column",
+            marginLeft: 1,
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                dimColor: true,
+                children: id
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+                marginLeft: 2,
+                flexDirection: "column",
+                children: [
+                  /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(FieldRow, {
+                    label: "branchPrefix",
+                    value: config2.repos?.[id]?.branchPrefix || "(none)",
+                    isSelected: selectedField === `repos.${id}.branchPrefix`,
+                    isEditing: editMode && selectedField === `repos.${id}.branchPrefix`,
+                    editValue
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(FieldRow, {
+                    label: "base",
+                    value: config2.repos?.[id]?.base || "(none)",
+                    isSelected: selectedField === `repos.${id}.base`,
+                    isEditing: editMode && selectedField === `repos.${id}.base`,
+                    editValue
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(FieldRow, {
+                    label: "compareBranch",
+                    value: config2.repos?.[id]?.comparisonBranch || "(auto)",
+                    isSelected: selectedField === `repos.${id}.comparisonBranch`,
+                    isEditing: editMode && selectedField === `repos.${id}.comparisonBranch`,
+                    editValue
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this)
+            ]
+          }, id, true, undefined, this)),
+          /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+            marginTop: repoOverrideIds.length > 0 ? 1 : 0,
+            children: selectedField === "addRepo" && editMode ? /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+              children: [
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  color: theme.accent,
+                  children: "[+ Add: "
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  color: theme.accent,
+                  children: editValue
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                  color: theme.accent,
+                  children: "█]"
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+              color: selectedField === "addRepo" ? theme.accent : undefined,
+              inverse: selectedField === "addRepo",
+              children: "[+ Add override]"
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
+      error48 && /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        marginTop: 1,
+        children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+          color: theme.ui.error,
+          children: error48
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this),
+      isSaving && /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        marginTop: 1,
+        children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+          dimColor: true,
+          children: "Saving..."
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        marginTop: 1,
+        borderStyle: "single",
+        borderTop: true,
+        borderBottom: false,
+        borderLeft: false,
+        borderRight: false,
+        paddingTop: 1,
+        children: editMode ? selectedField === "paths.strategy" ? /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+          dimColor: true,
+          children: "←/→ cycle  Enter confirm  Esc cancel"
+        }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+          dimColor: true,
+          children: "Type to edit  Enter confirm  Esc cancel"
+        }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+          dimColor: true,
+          children: "↑/↓ navigate  Tab next  Enter edit  Esc cancel  ^S save"
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
+function FieldRow({
+  label,
+  value,
+  isSelected,
+  isEditing,
+  editValue,
+  isEnum
+}) {
+  const displayValue = isEditing ? editValue : value;
+  const labelWidth = 14;
+  const paddedLabel = `${label}:`.padEnd(labelWidth);
+  return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        dimColor: !isSelected,
+        children: paddedLabel
+      }, undefined, false, undefined, this),
+      isEditing ? /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+        children: isEnum ? /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+          color: theme.accent,
+          children: [
+            "[",
+            displayValue,
+            " ▾]"
+          ]
+        }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+          children: [
+            /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+              color: theme.accent,
+              children: displayValue
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+              color: theme.accent,
+              children: "█"
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this)
+      }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        color: isSelected ? theme.accent : undefined,
+        inverse: isSelected,
+        children: displayValue
+      }, undefined, false, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
+var import_react30, jsx_dev_runtime5, FIELD_ORDER, STRATEGIES;
+var init_SettingsDialog = __esm(async () => {
+  init_config();
+  init_theme();
+  await init_build2();
+  import_react30 = __toESM(require_react(), 1);
+  jsx_dev_runtime5 = __toESM(require_jsx_dev_runtime(), 1);
+  FIELD_ORDER = [
+    "paths.strategy",
+    "paths.base",
+    "defaults.branchPrefix",
+    "defaults.staleDays",
+    "defaults.comparisonBranch"
+  ];
+  STRATEGIES = ["centralized", "sibling"];
+});
+
 // src/tui/components/StatusBar.tsx
 function StatusBar() {
-  return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
     paddingLeft: 3,
     marginBottom: 1,
-    children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+    children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
       children: [
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "["
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           color: theme.accent,
           children: "↵"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "]"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: " select "
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "["
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           color: theme.accent,
           children: "q"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "]"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: " quit "
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "["
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           color: theme.accent,
           children: "n"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "]"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: " new "
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "["
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           color: theme.accent,
           children: "d"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "]"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: " delete "
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "["
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           color: theme.accent,
           children: "r"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "]"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: " rename "
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "["
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           color: theme.accent,
           children: "i"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+          dimColor: true,
+          children: "]"
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+          dimColor: true,
+          children: " info "
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+          dimColor: true,
+          children: "["
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+          color: theme.accent,
+          children: "s"
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
           children: "]"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           dimColor: true,
-          children: " info"
+          children: " settings"
         }, undefined, false, undefined, this)
       ]
     }, undefined, true, undefined, this)
   }, undefined, false, undefined, this);
 }
-var jsx_dev_runtime5;
+var jsx_dev_runtime6;
 var init_StatusBar = __esm(async () => {
   init_theme();
   await init_build2();
-  jsx_dev_runtime5 = __toESM(require_jsx_dev_runtime(), 1);
+  jsx_dev_runtime6 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
 // src/lib/version.ts
@@ -53497,8 +53988,8 @@ function WorktreeItem({
   isSelected,
   isCurrent
 }) {
-  const [age, setAge] = import_react30.useState(null);
-  import_react30.useEffect(() => {
+  const [age, setAge] = import_react31.useState(null);
+  import_react31.useEffect(() => {
     getCommitInfo(worktree.path).then((info) => {
       if (info) {
         setAge(formatAge(info.timestamp));
@@ -53555,48 +54046,48 @@ function WorktreeItem({
   const pathEnd = nameEnd + GAP + COLUMNS.path;
   const ageEnd = pathEnd + GAP + COLUMNS.age;
   const statusEnd = ageEnd + GAP + COLUMNS.status;
-  return /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Box_default, {
     children: [
-      /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
         color: isSelected ? theme.accent : undefined,
         children: rowText.slice(0, cursorEnd)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
         color: isCurrent ? theme.accent : "dim",
         children: rowText.slice(cursorEnd, iconEnd)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
         color: isSelected ? theme.accent : undefined,
         children: rowText.slice(iconEnd, nameEnd)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
         dimColor: true,
         children: rowText.slice(nameEnd, pathEnd)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
         dimColor: true,
         children: rowText.slice(pathEnd, ageEnd)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
         color: statusColor,
         children: rowText.slice(ageEnd, statusEnd)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
         color: ahead && ahead > 0 ? theme.ui.success : theme.status.behind,
         children: rowText.slice(statusEnd)
       }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }
-var import_react30, jsx_dev_runtime6;
+var import_react31, jsx_dev_runtime7;
 var init_WorktreeItem = __esm(async () => {
   init_log();
   init_paths();
   init_theme();
   init_columns();
   await init_build2();
-  import_react30 = __toESM(require_react(), 1);
-  jsx_dev_runtime6 = __toESM(require_jsx_dev_runtime(), 1);
+  import_react31 = __toESM(require_react(), 1);
+  jsx_dev_runtime7 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
 // src/tui/components/WorktreeList.tsx
@@ -53614,20 +54105,20 @@ function WorktreeList({
     return currentPath === wt.path || currentPath.startsWith(`${wt.path}/`);
   };
   if (isLoading && worktrees.length === 0) {
-    return /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
       paddingX: 1,
       paddingY: 1,
-      children: /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
+      children: /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
         dimColor: true,
         children: "Loading worktrees..."
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this);
   }
   if (worktrees.length === 0) {
-    return /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
       paddingX: 1,
       paddingY: 1,
-      children: /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
+      children: /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
         dimColor: true,
         children: "No worktrees found"
       }, undefined, false, undefined, this)
@@ -53636,12 +54127,12 @@ function WorktreeList({
   const title = ` worktrees v${VERSION2} `;
   const boxWidth = terminalWidth - 2;
   const titleLineWidth = boxWidth - title.length - 4;
-  return /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
     flexDirection: "column",
     paddingX: 1,
     paddingTop: 1,
     children: [
-      /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
         dimColor: true,
         children: [
           "╭─",
@@ -53650,46 +54141,46 @@ function WorktreeList({
           "─╮"
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
         children: [
-          /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
             dimColor: true,
             children: "│"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
             width: boxWidth - 2,
-            children: /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
+            children: /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
               dimColor: true,
               children: formatHeader()
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
             dimColor: true,
             children: "│"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      worktrees.map((wt, index) => /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Box_default, {
+      worktrees.map((wt, index) => /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
         children: [
-          /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
             dimColor: true,
             children: "│"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
             width: boxWidth - 2,
-            children: /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(WorktreeItem, {
+            children: /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(WorktreeItem, {
               worktree: wt,
               isSelected: index === selectedIndex,
               isCurrent: isCurrentWorktree(wt)
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
             dimColor: true,
             children: "│"
           }, undefined, false, undefined, this)
         ]
       }, wt.path, true, undefined, this)),
-      /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
         dimColor: true,
         children: [
           "╰",
@@ -53700,7 +54191,7 @@ function WorktreeList({
     ]
   }, undefined, true, undefined, this);
 }
-var jsx_dev_runtime7;
+var jsx_dev_runtime8;
 var init_WorktreeList = __esm(async () => {
   init_version();
   init_columns();
@@ -53708,14 +54199,15 @@ var init_WorktreeList = __esm(async () => {
     init_build2(),
     init_WorktreeItem()
   ]);
-  jsx_dev_runtime7 = __toESM(require_jsx_dev_runtime(), 1);
+  jsx_dev_runtime8 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
 // src/lib/git/status.ts
-async function getWorktreeStatus(worktreePath, branch) {
+async function getWorktreeStatus(worktreePath, branch, configuredBranch) {
   const status = [];
   let ahead;
   let behind;
+  let actualComparisonBranch;
   const statusResult = await git(["status", "--porcelain"], {
     cwd: worktreePath
   });
@@ -53724,11 +54216,12 @@ async function getWorktreeStatus(worktreePath, branch) {
   }
   if (branch) {
     const mainBranch = await getMainBranch(worktreePath);
-    const comparisonBranch = await getComparisonBranch(worktreePath);
+    const comparisonBranch = configuredBranch ? await verifyBranch(worktreePath, configuredBranch) : await getComparisonBranch(worktreePath);
     if (comparisonBranch) {
       const isPrimaryWorktree = mainBranch && branch === mainBranch;
       const hasRemoteComparison = comparisonBranch.startsWith("origin/");
       if (!isPrimaryWorktree || hasRemoteComparison) {
+        actualComparisonBranch = comparisonBranch;
         const aheadBehindResult = await git(["rev-list", "--left-right", "--count", `${comparisonBranch}...HEAD`], { cwd: worktreePath });
         if (aheadBehindResult.success) {
           const parts = aheadBehindResult.stdout.trim().split(/\s+/);
@@ -53778,7 +54271,7 @@ async function getWorktreeStatus(worktreePath, branch) {
       }
     }
   }
-  return { status, ahead, behind };
+  return { status, ahead, behind, comparisonBranch: actualComparisonBranch };
 }
 async function getMainBranch(cwd2) {
   for (const branch of DEFAULT_BRANCHES) {
@@ -53804,6 +54297,13 @@ async function getComparisonBranch(cwd2) {
   }
   return null;
 }
+async function verifyBranch(cwd2, branch) {
+  const result = await git(["rev-parse", "--verify", branch], { cwd: cwd2 });
+  if (result.success) {
+    return branch;
+  }
+  return getComparisonBranch(cwd2);
+}
 var init_status = __esm(() => {
   init_exec();
   init_constants();
@@ -53811,11 +54311,11 @@ var init_status = __esm(() => {
 
 // src/tui/hooks/useWorktrees.ts
 function useWorktrees() {
-  const [worktrees, setWorktrees] = import_react31.useState([]);
-  const [isLoading, setIsLoading] = import_react31.useState(true);
-  const [error48, setError] = import_react31.useState(null);
-  const primaryPathRef = import_react31.useRef(null);
-  const fetchWorktrees = import_react31.useCallback(async () => {
+  const [worktrees, setWorktrees] = import_react32.useState([]);
+  const [isLoading, setIsLoading] = import_react32.useState(true);
+  const [error48, setError] = import_react32.useState(null);
+  const primaryPathRef = import_react32.useRef(null);
+  const fetchWorktrees = import_react32.useCallback(async () => {
     setIsLoading(true);
     setError(null);
     try {
@@ -53824,6 +54324,14 @@ function useWorktrees() {
       if (primary) {
         primaryPathRef.current = primary.path;
       }
+      let configuredComparisonBranch;
+      try {
+        const repoInfo = await getRepoInfo();
+        if (repoInfo) {
+          const { comparisonBranch } = await getConfig(repoInfo.worktreeRoot, repoInfo.repoId);
+          configuredComparisonBranch = comparisonBranch;
+        }
+      } catch {}
       const initialWorktrees = list.map((wt) => ({
         ...wt,
         status: []
@@ -53832,12 +54340,13 @@ function useWorktrees() {
       setIsLoading(false);
       const withStatus = await Promise.all(list.map(async (wt) => {
         try {
-          const statusResult = await getWorktreeStatus(wt.path, wt.branch);
+          const statusResult = await getWorktreeStatus(wt.path, wt.branch, configuredComparisonBranch);
           return {
             ...wt,
             status: statusResult.status,
             ahead: statusResult.ahead,
-            behind: statusResult.behind
+            behind: statusResult.behind,
+            comparisonBranch: statusResult.comparisonBranch
           };
         } catch {
           return { ...wt, status: [] };
@@ -53849,7 +54358,7 @@ function useWorktrees() {
       setIsLoading(false);
     }
   }, []);
-  import_react31.useEffect(() => {
+  import_react32.useEffect(() => {
     fetchWorktrees();
   }, [fetchWorktrees]);
   return {
@@ -53859,22 +54368,24 @@ function useWorktrees() {
     refresh: fetchWorktrees
   };
 }
-var import_react31;
+var import_react32;
 var init_useWorktrees = __esm(() => {
+  init_config();
+  init_repo();
   init_status();
   init_worktree();
-  import_react31 = __toESM(require_react(), 1);
+  import_react32 = __toESM(require_react(), 1);
 });
 
 // src/tui/App.tsx
-function App2({ repoName: _repoName, currentPath, onSelect }) {
+function App2({ repoName, currentPath, onSelect }) {
   const { exit } = use_app_default();
   const { worktrees, isLoading, error: error48, refresh } = useWorktrees();
-  const [selectedIndex, setSelectedIndex] = import_react32.useState(0);
-  const [activeDialog, setActiveDialog] = import_react32.useState("none");
-  const [initialSelectionDone, setInitialSelectionDone] = import_react32.useState(false);
-  const [destinationPath, setDestinationPath] = import_react32.useState(currentPath);
-  import_react32.useEffect(() => {
+  const [selectedIndex, setSelectedIndex] = import_react33.useState(0);
+  const [activeDialog, setActiveDialog] = import_react33.useState("none");
+  const [initialSelectionDone, setInitialSelectionDone] = import_react33.useState(false);
+  const [destinationPath, setDestinationPath] = import_react33.useState(currentPath);
+  import_react33.useEffect(() => {
     if (!initialSelectionDone && worktrees.length > 0 && currentPath) {
       const index = worktrees.findIndex((wt) => currentPath === wt.path || currentPath.startsWith(`${wt.path}/`));
       if (index !== -1) {
@@ -53883,7 +54394,7 @@ function App2({ repoName: _repoName, currentPath, onSelect }) {
       setInitialSelectionDone(true);
     }
   }, [worktrees, currentPath, initialSelectionDone]);
-  import_react32.useEffect(() => {
+  import_react33.useEffect(() => {
     if (selectedIndex >= worktrees.length && worktrees.length > 0) {
       setSelectedIndex(worktrees.length - 1);
     }
@@ -53917,6 +54428,10 @@ function App2({ repoName: _repoName, currentPath, onSelect }) {
       setActiveDialog("details");
       return;
     }
+    if (input === "s") {
+      setActiveDialog("settings");
+      return;
+    }
     if (input === "q") {
       if (destinationPath && destinationPath !== currentPath) {
         onSelect(destinationPath);
@@ -53945,10 +54460,10 @@ function App2({ repoName: _repoName, currentPath, onSelect }) {
     setActiveDialog("none");
   };
   if (error48) {
-    return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
       flexDirection: "column",
       padding: 1,
-      children: /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Text, {
+      children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
         color: "red",
         children: [
           "Error: ",
@@ -53957,21 +54472,21 @@ function App2({ repoName: _repoName, currentPath, onSelect }) {
       }, undefined, true, undefined, this)
     }, undefined, false, undefined, this);
   }
-  return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(WorktreeList, {
+      /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(WorktreeList, {
         worktrees,
         selectedIndex,
         isLoading,
         currentPath: destinationPath
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(StatusBar, {}, undefined, false, undefined, this),
-      activeDialog === "create" && /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(CreateDialog, {
+      /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(StatusBar, {}, undefined, false, undefined, this),
+      activeDialog === "create" && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(CreateDialog, {
         onClose: handleDialogClose,
         onCreated: handleCreated
       }, undefined, false, undefined, this),
-      activeDialog === "delete" && selectedWorktree && primaryWorktree && /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(DeleteConfirm, {
+      activeDialog === "delete" && selectedWorktree && primaryWorktree && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(DeleteConfirm, {
         worktree: selectedWorktree,
         primaryWorktree,
         currentPath,
@@ -53983,23 +54498,31 @@ function App2({ repoName: _repoName, currentPath, onSelect }) {
           handleDeleted();
         }
       }, undefined, false, undefined, this),
-      activeDialog === "rename" && selectedWorktree && /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(RenameDialog, {
+      activeDialog === "rename" && selectedWorktree && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(RenameDialog, {
         worktree: selectedWorktree,
         onClose: handleDialogClose,
         onRenamed: handleRenamed
       }, undefined, false, undefined, this),
-      activeDialog === "details" && selectedWorktree && /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(DetailsView, {
+      activeDialog === "details" && selectedWorktree && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(DetailsView, {
         worktree: selectedWorktree,
         onClose: handleDialogClose,
         onSelect: () => {
           setDestinationPath(selectedWorktree.path);
           setActiveDialog("none");
         }
+      }, undefined, false, undefined, this),
+      activeDialog === "settings" && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(SettingsDialog, {
+        repoId: repoName,
+        onClose: handleDialogClose,
+        onSaved: () => {
+          refresh();
+          setActiveDialog("none");
+        }
       }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }
-var import_react32, jsx_dev_runtime8;
+var import_react33, jsx_dev_runtime9;
 var init_App2 = __esm(async () => {
   init_useWorktrees();
   await __promiseAll([
@@ -54008,11 +54531,12 @@ var init_App2 = __esm(async () => {
     init_DeleteConfirm(),
     init_DetailsView(),
     init_RenameDialog(),
+    init_SettingsDialog(),
     init_StatusBar(),
     init_WorktreeList()
   ]);
-  import_react32 = __toESM(require_react(), 1);
-  jsx_dev_runtime8 = __toESM(require_jsx_dev_runtime(), 1);
+  import_react33 = __toESM(require_react(), 1);
+  jsx_dev_runtime9 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
 // src/tui/components/SetupFlow.tsx
@@ -54070,9 +54594,9 @@ ${command}
 }
 function SetupFlow({ onComplete, onQuit }) {
   const { exit } = use_app_default();
-  const [state, setState] = import_react33.useState("prompt");
-  const [error48, setError] = import_react33.useState(null);
-  const [isProcessing, setIsProcessing] = import_react33.useState(false);
+  const [state, setState] = import_react34.useState("prompt");
+  const [error48, setError] = import_react34.useState(null);
+  const [isProcessing, setIsProcessing] = import_react34.useState(false);
   const shellInfo = detectShell();
   use_input_default(async (input, key) => {
     if (isProcessing)
@@ -54118,37 +54642,37 @@ function SetupFlow({ onComplete, onQuit }) {
     }
   });
   if (state === "success") {
-    return /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
       flexDirection: "column",
       padding: 1,
-      children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+      children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
         borderStyle: "round",
         borderColor: theme.ui.success,
         paddingX: 2,
         paddingY: 1,
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
             bold: true,
             color: theme.ui.success,
             children: "✓ Shell integration installed!"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
             marginTop: 1,
             flexDirection: "column",
             children: [
-              /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                 children: [
                   "Added to ",
                   shellInfo.configPath
                 ]
               }, undefined, true, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                 dimColor: true,
                 children: [
                   "Restart your terminal or run:",
                   " ",
-                  /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                     color: theme.accent,
                     children: [
                       "source ",
@@ -54159,9 +54683,9 @@ function SetupFlow({ onComplete, onQuit }) {
               }, undefined, true, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
             marginTop: 1,
-            children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               dimColor: true,
               children: "Press any key to continue..."
             }, undefined, false, undefined, this)
@@ -54171,37 +54695,37 @@ function SetupFlow({ onComplete, onQuit }) {
     }, undefined, false, undefined, this);
   }
   if (state === "already-setup") {
-    return /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
       flexDirection: "column",
       padding: 1,
-      children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+      children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
         borderStyle: "round",
         borderColor: theme.ui.warning,
         paddingX: 2,
         paddingY: 1,
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
             bold: true,
             color: theme.ui.warning,
             children: "Shell integration already configured"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
             marginTop: 1,
             flexDirection: "column",
             children: [
-              /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                 children: [
                   'Found "wt shell-init" in ',
                   shellInfo.configPath
                 ]
               }, undefined, true, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                 dimColor: true,
                 children: [
                   "Try restarting your terminal or run:",
                   " ",
-                  /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                     color: theme.accent,
                     children: [
                       "source ",
@@ -54212,9 +54736,9 @@ function SetupFlow({ onComplete, onQuit }) {
               }, undefined, true, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
             marginTop: 1,
-            children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               dimColor: true,
               children: "Press any key to continue..."
             }, undefined, false, undefined, this)
@@ -54224,48 +54748,48 @@ function SetupFlow({ onComplete, onQuit }) {
     }, undefined, false, undefined, this);
   }
   if (state === "error") {
-    return /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
       flexDirection: "column",
       padding: 1,
-      children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+      children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
         borderStyle: "round",
         borderColor: theme.ui.error,
         paddingX: 2,
         paddingY: 1,
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
             bold: true,
             color: theme.ui.error,
             children: "✗ Failed to set up shell integration"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
             marginTop: 1,
-            children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               color: theme.ui.error,
               children: error48
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
             marginTop: 1,
             flexDirection: "column",
             children: [
-              /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                 children: [
                   "You can manually add this to ",
                   shellInfo.configPath,
                   ":"
                 ]
               }, undefined, true, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                 color: theme.accent,
                 children: shellInfo.command
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
             marginTop: 1,
-            children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               dimColor: true,
               children: "Press any key to continue..."
             }, undefined, false, undefined, this)
@@ -54274,56 +54798,56 @@ function SetupFlow({ onComplete, onQuit }) {
       }, undefined, true, undefined, this)
     }, undefined, false, undefined, this);
   }
-  return /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
     flexDirection: "column",
     padding: 1,
-    children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+    children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
       borderStyle: "round",
       borderColor: theme.accent,
       paddingX: 2,
       paddingY: 1,
       flexDirection: "column",
       children: [
-        /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
           bold: true,
           color: theme.accent,
           children: "Shell Integration Setup"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
           marginTop: 1,
           flexDirection: "column",
           children: [
-            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               children: [
                 "Shell integration lets you ",
-                /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                   bold: true,
                   children: "cd"
                 }, undefined, false, undefined, this),
                 " into worktrees by selecting them in the TUI."
               ]
             }, undefined, true, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               dimColor: true,
               children: "Without it, selections just print the path."
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
           marginTop: 1,
           flexDirection: "column",
           children: [
-            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               children: [
                 "Detected shell:",
                 " ",
-                /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                   color: theme.ui.success,
                   children: shellInfo.name
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               dimColor: true,
               children: [
                 "Will add to: ",
@@ -54332,72 +54856,72 @@ function SetupFlow({ onComplete, onQuit }) {
             }, undefined, true, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
           marginTop: 1,
           flexDirection: "column",
           children: [
-            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               dimColor: true,
               children: "Command to be added:"
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               color: theme.accent,
               children: shellInfo.command
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
           marginTop: 1,
           flexDirection: "column",
           gap: 0,
           children: [
-            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               children: [
-                /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                   color: theme.accent,
                   bold: true,
                   children: "y"
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                   dimColor: true,
                   children: " - Set up now (recommended)"
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               children: [
-                /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                   color: theme.accent,
                   bold: true,
                   children: "s"
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                   dimColor: true,
                   children: " - Skip for now"
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               children: [
-                /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                   color: theme.accent,
                   bold: true,
                   children: "n"
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                   dimColor: true,
                   children: " - Don't ask again"
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
               children: [
-                /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                   color: theme.accent,
                   bold: true,
                   children: "q"
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+                /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                   dimColor: true,
                   children: " - Quit"
                 }, undefined, false, undefined, this)
@@ -54405,9 +54929,9 @@ function SetupFlow({ onComplete, onQuit }) {
             }, undefined, true, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        isProcessing && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
+        isProcessing && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
           marginTop: 1,
-          children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
+          children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
             dimColor: true,
             children: "Setting up..."
           }, undefined, false, undefined, this)
@@ -54416,14 +54940,14 @@ function SetupFlow({ onComplete, onQuit }) {
     }, undefined, true, undefined, this)
   }, undefined, false, undefined, this);
 }
-var import_react33, jsx_dev_runtime9;
+var import_react34, jsx_dev_runtime10;
 var init_SetupFlow = __esm(async () => {
   init_preferences();
   init_compat();
   init_theme();
   await init_build2();
-  import_react33 = __toESM(require_react(), 1);
-  jsx_dev_runtime9 = __toESM(require_jsx_dev_runtime(), 1);
+  import_react34 = __toESM(require_react(), 1);
+  jsx_dev_runtime10 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
 // src/tui/index.ts
@@ -54442,7 +54966,7 @@ function hasShellIntegration() {
 }
 async function showSetupFlow() {
   return new Promise((resolve2) => {
-    const { waitUntilExit } = render_default(import_react34.default.createElement(SetupFlow, {
+    const { waitUntilExit } = render_default(import_react35.default.createElement(SetupFlow, {
       onComplete: () => resolve2(true),
       onQuit: () => resolve2(false)
     }), getRenderOptions());
@@ -54453,7 +54977,7 @@ async function showMainTui(repoName) {
   return new Promise((resolve2) => {
     let selectedPath = null;
     const currentPath = process.cwd();
-    const { waitUntilExit } = render_default(import_react34.default.createElement(App2, {
+    const { waitUntilExit } = render_default(import_react35.default.createElement(App2, {
       repoName,
       currentPath,
       onSelect: (path) => {
@@ -54489,7 +55013,7 @@ async function launchTui() {
   }
   return showMainTui(repoInfo.repoId);
 }
-var import_react34;
+var import_react35;
 var init_tui = __esm(async () => {
   init_source();
   init_repo();
@@ -54499,7 +55023,7 @@ var init_tui = __esm(async () => {
     init_App2(),
     init_SetupFlow()
   ]);
-  import_react34 = __toESM(require_react(), 1);
+  import_react35 = __toESM(require_react(), 1);
   if (!process.env.NO_COLOR) {
     source_default.level = 3;
   }
@@ -54927,7 +55451,7 @@ wt() {
             # Check for cd handoff (TUI selection)
             # Output format is __wt_cd__"/path/to/dir" (quoted to handle spaces)
             if [[ "$output" == __wt_cd__* ]]; then
-                eval cd "\${output#__wt_cd__}"
+                eval cd \${output#__wt_cd__}
             elif [[ -n "$output" ]]; then
                 echo "$output"
             fi