@iloom/cli 0.3.2 → 0.3.4

package/dist/index.js

@@ -272,12 +272,18 @@ var init_SettingsManager = __esm({
         remote: z.string().optional()
       }).optional().describe("Merge behavior configuration: local (merge locally) or github-pr (create PR)"),
       ide: z.object({
-        type: z.enum(["vscode", "cursor", "webstorm", "sublime", "intellij", "windsurf"]).default("vscode").describe(
-          "IDE to launch when starting a loom. Options: vscode (Visual Studio Code), cursor (Cursor AI editor), webstorm (JetBrains WebStorm), sublime (Sublime Text), intellij (JetBrains IntelliJ IDEA), windsurf (Windsurf editor)."
+        type: z.enum(["vscode", "cursor", "webstorm", "sublime", "intellij", "windsurf", "antigravity"]).default("vscode").describe(
+          "IDE to launch when starting a loom. Options: vscode (Visual Studio Code), cursor (Cursor AI editor), webstorm (JetBrains WebStorm), sublime (Sublime Text), intellij (JetBrains IntelliJ IDEA), windsurf (Windsurf editor), antigravity (Antigravity IDE)."
         )
       }).optional().describe(
-        "IDE configuration for workspace launches. Controls which editor opens when you start a loom. Supports VSCode, Cursor, WebStorm, Sublime Text, IntelliJ, and Windsurf. Note: Color synchronization (title bar colors) only works with VSCode-compatible editors (vscode, cursor, windsurf)."
-      )
+        "IDE configuration for workspace launches. Controls which editor opens when you start a loom. Supports VSCode, Cursor, WebStorm, Sublime Text, IntelliJ, Windsurf, and Antigravity. Note: Color synchronization (title bar colors) only works with VSCode-compatible editors (vscode, cursor, windsurf, antigravity)."
+      ),
+      colors: z.object({
+        terminal: z.boolean().default(true).describe("Apply terminal background colors based on branch name (macOS only)"),
+        vscode: z.boolean().default(false).describe(
+          "Apply VSCode/Cursor title bar colors based on branch name. Note: This modifies .vscode/settings.json which may be in source control. Default is false for safety; enable via init or explicitly if .vscode is gitignored."
+        )
+      }).optional().describe("Color synchronization settings for workspace identification")
     });
     IloomSettingsSchemaNoDefaults = z.object({
       mainBranch: z.string().min(1, "Settings 'mainBranch' cannot be empty").optional().describe("Name of the main/primary branch for the repository"),
@@ -328,12 +334,18 @@ var init_SettingsManager = __esm({
         remote: z.string().optional()
       }).optional().describe("Merge behavior configuration: local (merge locally) or github-pr (create PR)"),
       ide: z.object({
-        type: z.enum(["vscode", "cursor", "webstorm", "sublime", "intellij", "windsurf"]).optional().describe(
-          "IDE to launch when starting a loom. Options: vscode (Visual Studio Code), cursor (Cursor AI editor), webstorm (JetBrains WebStorm), sublime (Sublime Text), intellij (JetBrains IntelliJ IDEA), windsurf (Windsurf editor)."
+        type: z.enum(["vscode", "cursor", "webstorm", "sublime", "intellij", "windsurf", "antigravity"]).optional().describe(
+          "IDE to launch when starting a loom. Options: vscode (Visual Studio Code), cursor (Cursor AI editor), webstorm (JetBrains WebStorm), sublime (Sublime Text), intellij (JetBrains IntelliJ IDEA), windsurf (Windsurf editor), antigravity (Antigravity IDE)."
         )
       }).optional().describe(
-        "IDE configuration for workspace launches. Controls which editor opens when you start a loom. Supports VSCode, Cursor, WebStorm, Sublime Text, IntelliJ, and Windsurf. Note: Color synchronization (title bar colors) only works with VSCode-compatible editors (vscode, cursor, windsurf)."
-      )
+        "IDE configuration for workspace launches. Controls which editor opens when you start a loom. Supports VSCode, Cursor, WebStorm, Sublime Text, IntelliJ, Windsurf, and Antigravity. Note: Color synchronization (title bar colors) only works with VSCode-compatible editors (vscode, cursor, windsurf, antigravity)."
+      ),
+      colors: z.object({
+        terminal: z.boolean().optional().describe("Apply terminal background colors based on branch name (macOS only)"),
+        vscode: z.boolean().optional().describe(
+          "Apply VSCode/Cursor title bar colors based on branch name. Note: This modifies .vscode/settings.json which may be in source control."
+        )
+      }).optional().describe("Color synchronization settings for workspace identification")
     });
     SettingsManager = class {
       /**
@@ -543,99 +555,52 @@ ${errorMessages.join("\n")}`
 // src/utils/color.ts
 var color_exports = {};
 __export(color_exports, {
+  MIN_COLOR_DISTANCE: () => MIN_COLOR_DISTANCE,
   calculateForegroundColor: () => calculateForegroundColor,
+  colorDistance: () => colorDistance,
   generateColorFromBranchName: () => generateColorFromBranchName,
   getColorPalette: () => getColorPalette,
   hexToRgb: () => hexToRgb,
   lightenColor: () => lightenColor,
   rgbToHex: () => rgbToHex,
-  saturateColor: () => saturateColor
+  saturateColor: () => saturateColor,
+  selectDistinctColor: () => selectDistinctColor
 });
 import { createHash as createHash2 } from "crypto";
 function getColorPalette() {
   return [
-    // First 10 colors preserved for backward compatibility
-    { r: 220, g: 235, b: 248 },
+    { r: 220, g: 235, b: 255 },
     // 0: Soft blue
-    { r: 248, g: 220, b: 235 },
+    { r: 255, g: 220, b: 235 },
     // 1: Soft pink
-    { r: 220, g: 248, b: 235 },
+    { r: 220, g: 255, b: 235 },
     // 2: Soft green
-    { r: 248, g: 240, b: 220 },
+    { r: 255, g: 245, b: 220 },
     // 3: Soft cream
-    { r: 240, g: 220, b: 248 },
+    { r: 245, g: 220, b: 255 },
     // 4: Soft lavender
-    { r: 220, g: 240, b: 248 },
+    { r: 220, g: 245, b: 255 },
     // 5: Soft cyan
     { r: 235, g: 235, b: 235 },
     // 6: Soft grey
-    { r: 228, g: 238, b: 248 },
-    // 7: Soft ice blue
-    { r: 248, g: 228, b: 238 },
-    // 8: Soft rose
-    { r: 228, g: 248, b: 238 },
-    // 9: Soft mint
-    // 30 new colors (indices 10-39)
-    { r: 235, g: 245, b: 250 },
-    // 10: Pale sky blue
-    { r: 250, g: 235, b: 245 },
-    // 11: Pale orchid
-    { r: 235, g: 250, b: 245 },
-    // 12: Pale seafoam
-    { r: 250, g: 245, b: 235 },
-    // 13: Pale peach
-    { r: 245, g: 235, b: 250 },
-    // 14: Pale periwinkle
-    { r: 235, g: 245, b: 235 },
-    // 15: Pale sage
-    { r: 245, g: 250, b: 235 },
-    // 16: Pale lemon
-    { r: 245, g: 235, b: 235 },
-    // 17: Pale blush
-    { r: 235, g: 235, b: 250 },
-    // 18: Pale lavender blue
-    { r: 250, g: 235, b: 235 },
-    // 19: Pale coral
-    { r: 235, g: 250, b: 250 },
-    // 20: Pale aqua
-    { r: 240, g: 248, b: 255 },
-    // 21: Alice blue
-    { r: 255, g: 240, b: 248 },
-    // 22: Lavender blush
-    { r: 240, g: 255, b: 248 },
-    // 23: Honeydew tint
-    { r: 255, g: 248, b: 240 },
-    // 24: Antique white
-    { r: 248, g: 240, b: 255 },
-    // 25: Magnolia
-    { r: 240, g: 248, b: 240 },
-    // 26: Mint cream tint
-    { r: 248, g: 255, b: 240 },
-    // 27: Ivory tint
-    { r: 248, g: 240, b: 240 },
-    // 28: Misty rose tint
-    { r: 240, g: 240, b: 255 },
-    // 29: Ghost white tint
-    { r: 255, g: 245, b: 238 },
-    // 30: Seashell
-    { r: 245, g: 255, b: 250 },
-    // 31: Azure mist
-    { r: 250, g: 245, b: 255 },
-    // 32: Lilac mist
-    { r: 255, g: 250, b: 245 },
-    // 33: Snow peach
-    { r: 238, g: 245, b: 255 },
-    // 34: Powder blue
-    { r: 255, g: 238, b: 245 },
-    // 35: Pink lace
-    { r: 245, g: 255, b: 238 },
-    // 36: Pale lime
-    { r: 238, g: 255, b: 245 },
-    // 37: Pale turquoise
-    { r: 245, g: 238, b: 255 },
-    // 38: Pale violet
-    { r: 255, g: 245, b: 255 }
-    // 39: Pale magenta
+    { r: 255, g: 230, b: 230 },
+    // 7: Soft coral
+    { r: 230, g: 255, b: 230 },
+    // 8: Soft mint
+    { r: 255, g: 245, b: 230 },
+    // 9: Soft peach
+    { r: 220, g: 255, b: 255 },
+    // 10: Soft aqua
+    { r: 255, g: 220, b: 255 },
+    // 11: Soft magenta
+    { r: 255, g: 255, b: 220 },
+    // 12: Soft yellow
+    { r: 235, g: 220, b: 255 },
+    // 13: Soft violet
+    { r: 220, g: 255, b: 245 },
+    // 14: Soft sea green
+    { r: 255, g: 235, b: 220 }
+    // 15: Soft salmon
   ];
 }
 function rgbToHex(r, g, b) {
@@ -675,6 +640,51 @@ function generateColorFromBranchName(branchName) {
     index
   };
 }
+function colorDistance(a, b) {
+  return Math.sqrt(
+    Math.pow(a.r - b.r, 2) + Math.pow(a.g - b.g, 2) + Math.pow(a.b - b.b, 2)
+  );
+}
+function selectDistinctColor(branchName, usedHexColors) {
+  const palette = getColorPalette();
+  const hashBasedColor = generateColorFromBranchName(branchName);
+  if (usedHexColors.length === 0) {
+    return hashBasedColor;
+  }
+  const usedRgbColors = [];
+  for (const hex of usedHexColors) {
+    try {
+      usedRgbColors.push(hexToRgb(hex));
+    } catch {
+      logger_default.debug(`[selectDistinctColor] Skipping invalid hex color: ${hex}`);
+    }
+  }
+  if (usedRgbColors.length === 0) {
+    return hashBasedColor;
+  }
+  const isTooSimilar = usedRgbColors.some(
+    (usedRgb) => colorDistance(hashBasedColor.rgb, usedRgb) < MIN_COLOR_DISTANCE
+  );
+  if (!isTooSimilar) {
+    return hashBasedColor;
+  }
+  for (let i = 0; i < palette.length; i++) {
+    const candidateRgb = palette[i];
+    if (!candidateRgb) continue;
+    const isDistinct = usedRgbColors.every(
+      (usedRgb) => colorDistance(candidateRgb, usedRgb) >= MIN_COLOR_DISTANCE
+    );
+    if (isDistinct) {
+      return {
+        rgb: candidateRgb,
+        hex: rgbToHex(candidateRgb.r, candidateRgb.g, candidateRgb.b),
+        index: i
+      };
+    }
+  }
+  logger_default.debug(`[selectDistinctColor] No distinct color found, falling back to hash-based for ${branchName}`);
+  return hashBasedColor;
+}
 function lightenColor(rgb, amount) {
   const clamp = (value) => Math.min(255, Math.max(0, Math.round(value)));
   return {
@@ -703,10 +713,12 @@ function calculateForegroundColor(rgb) {
   const luminance = 0.2126 * r + 0.7152 * g + 0.0722 * b;
   return luminance > 0.5 ? "#000000" : "#ffffff";
 }
+var MIN_COLOR_DISTANCE;
 var init_color = __esm({
   "src/utils/color.ts"() {
     "use strict";
     init_logger();
+    MIN_COLOR_DISTANCE = 20;
   }
 });
 
@@ -959,7 +971,7 @@ async function branchExists(branchName, path6 = process.cwd(), includeRemote = t
     return false;
   }
 }
-async function getRepoRoot(path6 = process.cwd()) {
+async function getWorktreeRoot(path6 = process.cwd()) {
   try {
     const result = await executeGitCommand(["rev-parse", "--show-toplevel"], { cwd: path6 });
     return result.trim();
@@ -967,6 +979,20 @@ async function getRepoRoot(path6 = process.cwd()) {
     return null;
   }
 }
+async function getRepoRoot(path6 = process.cwd()) {
+  try {
+    const gitCommonDir = await executeGitCommand(
+      ["rev-parse", "--path-format=absolute", "--git-common-dir"],
+      { cwd: path6 }
+    );
+    const trimmedPath = gitCommonDir.trim();
+    const repoRoot = trimmedPath.replace(/\/\.git\/worktrees\/[^/]+$/, "").replace(/\/\.git$/, "");
+    return repoRoot;
+  } catch (error) {
+    logger.warn(`Failed to determine repo root from git-common-dir: ${path6}`, error instanceof Error ? error.message : String(error));
+    return null;
+  }
+}
 async function findMainWorktreePath(path6 = process.cwd(), options) {
   try {
     const output = await executeGitCommand(["worktree", "list", "--porcelain"], { cwd: path6 });
@@ -1165,6 +1191,14 @@ async function isFileTrackedByGit(filePath, cwd = process.cwd()) {
     throw error;
   }
 }
+async function isFileGitignored(filePath, cwd = process.cwd()) {
+  try {
+    await executeGitCommand(["check-ignore", "-q", filePath], { cwd });
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 // src/lib/GitWorktreeManager.ts
 var GitWorktreeManager = class {
@@ -3382,6 +3416,9 @@ var PromptTemplateManager = class {
     if (variables.SETTINGS_SCHEMA_CONTENT !== void 0) {
       result = result.replace(/SETTINGS_SCHEMA_CONTENT/g, variables.SETTINGS_SCHEMA_CONTENT);
     }
+    if (variables.VSCODE_SETTINGS_GITIGNORED !== void 0) {
+      result = result.replace(/VSCODE_SETTINGS_GITIGNORED/g, variables.VSCODE_SETTINGS_GITIGNORED);
+    }
     return result;
   }
   /**
@@ -3627,6 +3664,14 @@ var ClaudeContextManager = class {
   }
 };
 
+// src/types/index.ts
+var UserAbortedCommitError = class extends Error {
+  constructor(message = "User aborted the commit") {
+    super(message);
+    this.name = "UserAbortedCommitError";
+  }
+};
+
 // src/utils/index.ts
 init_logger();
 
@@ -3939,6 +3984,7 @@ export {
   IssueTrackerFactory,
   LinearMarkupConverter,
   TableFormatter,
+  UserAbortedCommitError,
   WorkspaceManager,
   branchExists,
   createLogger,
@@ -3953,8 +3999,10 @@ export {
   getCurrentBranch,
   getDefaultBranch,
   getRepoRoot,
+  getWorktreeRoot,
   hasUncommittedChanges,
   isEmptyRepository,
+  isFileGitignored,
   isFileTrackedByGit,
   isPRBranch,
   isValidGitRepo,