opencode-worktree 0.3.3 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-worktree",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "private": false,
   "type": "module",
   "description": "TUI for managing git worktrees with opencode integration.",
@@ -42,13 +42,11 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@opentui/core": "^0.1.75",
-    "update-notifier": "^7.3.1"
+    "@opentui/core": "^0.1.75"
   },
   "devDependencies": {
     "@types/bun": "^1.2.0",
     "@types/node": "^24.2.0",
-    "@types/update-notifier": "^6.0.8",
     "typescript": "^5.9.3"
   }
 }

package/src/ui.ts

@@ -10,7 +10,7 @@ import {
   type KeyEvent,
   type SelectOption,
 } from "@opentui/core";
-import updateNotifier from "update-notifier";
+import { checkForUpdate } from "./update-check.js";
 import { basename } from "node:path";
 import {
   createWorktree,
@@ -128,17 +128,17 @@ class WorktreeSelector {
 
     // Display version or update notification in title line
     if (this.pkg) {
-      const notifier = updateNotifier({ pkg: this.pkg });
+      const updateInfo = checkForUpdate(this.pkg);
 
       let noticeContent: string;
       let noticeColor: string;
 
-      if (notifier.update) {
+      if (updateInfo?.hasUpdate) {
         // Update available
-        noticeContent = `Update: ${notifier.update.current} → ${notifier.update.latest} (npm i -g)`;
+        noticeContent = `Update: ${updateInfo.current} → ${updateInfo.latest} (npm i -g)`;
         noticeColor = "#F59E0B"; // Amber
       } else {
-        // On latest version
+        // On latest version (or no cache yet)
         noticeContent = `v${this.pkg.version}`;
         noticeColor = "#64748B"; // Subtle gray
       }
@@ -1063,7 +1063,7 @@ class WorktreeSelector {
     const branchDisplay = worktree.branch || basename(worktree.path);
 
     // Build dialog title
-    const title = "DELETE WORKTREE";
+    const title = `Remove: ${branchDisplay}`;
 
     this.confirmContainer = new BoxRenderable(this.renderer, {
       id: "confirm-container",
@@ -1071,30 +1071,18 @@ class WorktreeSelector {
       left: 2,
       top: 3,
       width: 76,
-      height: isDirty ? 12 : 10,
+      height: isDirty ? 10 : 8,
       borderStyle: "single",
-      borderColor: "#EF4444",
+      borderColor: "#F59E0B",
       title,
       titleAlignment: "center",
-      backgroundColor: "#1C1917",
+      backgroundColor: "#0F172A",
       border: true,
     });
     this.renderer.root.add(this.confirmContainer);
 
-    // Branch name prominently displayed
-    let yOffset = 1;
-    const branchHeader = new TextRenderable(this.renderer, {
-      id: "confirm-branch",
-      position: "absolute",
-      left: 1,
-      top: yOffset,
-      content: `Branch: ${branchDisplay}`,
-      fg: "#FBBF24",
-    });
-    this.confirmContainer.add(branchHeader);
-    yOffset += 2;
-
     // Warning for dirty worktree
+    let yOffset = 1;
     if (isDirty) {
       const warningText = new TextRenderable(this.renderer, {
         id: "confirm-warning",
@@ -1102,7 +1090,7 @@ class WorktreeSelector {
         left: 1,
         top: yOffset,
         content: "⚠ This worktree has uncommitted changes!",
-        fg: "#EF4444",
+        fg: "#F59E0B",
       });
       this.confirmContainer.add(warningText);
       yOffset += 2;
@@ -1114,7 +1102,7 @@ class WorktreeSelector {
       left: 1,
       top: yOffset,
       content: `Path: ${worktree.path}`,
-      fg: "#A8A29E",
+      fg: "#94A3B8",
     });
     this.confirmContainer.add(pathText);
     yOffset += 2;
@@ -1146,13 +1134,13 @@ class WorktreeSelector {
       width: 72,
       height: 4,
       options,
-      backgroundColor: "#1C1917",
-      focusedBackgroundColor: "#292524",
-      selectedBackgroundColor: "#44403C",
-      textColor: "#E7E5E4",
-      selectedTextColor: "#F87171",
-      descriptionColor: "#A8A29E",
-      selectedDescriptionColor: "#E7E5E4",
+      backgroundColor: "#0F172A",
+      focusedBackgroundColor: "#1E293B",
+      selectedBackgroundColor: "#1E3A5F",
+      textColor: "#E2E8F0",
+      selectedTextColor: "#38BDF8",
+      descriptionColor: "#94A3B8",
+      selectedDescriptionColor: "#E2E8F0",
       showDescription: true,
       wrapSelection: true,
     });
@@ -1192,6 +1180,17 @@ class WorktreeSelector {
       this.confirmSelect = null;
     }
 
+    // Restore original title and colors (in case we came from delete mode)
+    this.title.content = "OPENCODE WORKTREES";
+    this.title.fg = "#E2E8F0";
+    this.selectElement.backgroundColor = "#0F172A";
+    this.selectElement.focusedBackgroundColor = "#1E293B";
+    this.selectElement.selectedBackgroundColor = "#1E3A5F";
+    this.selectElement.textColor = "#E2E8F0";
+    this.selectElement.selectedTextColor = "#38BDF8";
+    this.selectElement.descriptionColor = "#94A3B8";
+    this.selectElement.selectedDescriptionColor = "#E2E8F0";
+
     this.selectElement.visible = true;
     this.instructions.content =
       "↑/↓ navigate • Enter open • o folder • d delete • n new • c config • q quit";
@@ -1283,8 +1282,21 @@ class WorktreeSelector {
     this.isSelectingForDelete = true;
     this.selectedForDelete.clear();
 
-    // Rebuild options to show checkboxes
-    this.selectElement.options = this.buildOptions(worktrees);
+    // Change title to indicate delete mode
+    this.title.content = "DELETE WORKTREES";
+    this.title.fg = "#EF4444"; // Red
+
+    // Change select element colors to danger theme
+    this.selectElement.backgroundColor = "#1C1917";
+    this.selectElement.focusedBackgroundColor = "#292524";
+    this.selectElement.selectedBackgroundColor = "#44403C";
+    this.selectElement.textColor = "#E7E5E4";
+    this.selectElement.selectedTextColor = "#F87171";
+    this.selectElement.descriptionColor = "#A8A29E";
+    this.selectElement.selectedDescriptionColor = "#E7E5E4";
+
+    // Rebuild options to show checkboxes (only deletable worktrees)
+    this.selectElement.options = this.buildOptions(deletableWorktrees);
     this.instructions.content =
       "Enter toggle selection • d confirm delete • Esc cancel";
     this.setStatus("Select worktrees to delete, then press 'd' to confirm.", "info");
@@ -1294,6 +1306,20 @@ class WorktreeSelector {
   private exitSelectMode(): void {
     this.isSelectingForDelete = false;
     this.selectedForDelete.clear();
+
+    // Restore original title
+    this.title.content = "OPENCODE WORKTREES";
+    this.title.fg = "#E2E8F0";
+
+    // Restore original select element colors
+    this.selectElement.backgroundColor = "#0F172A";
+    this.selectElement.focusedBackgroundColor = "#1E293B";
+    this.selectElement.selectedBackgroundColor = "#1E3A5F";
+    this.selectElement.textColor = "#E2E8F0";
+    this.selectElement.selectedTextColor = "#38BDF8";
+    this.selectElement.descriptionColor = "#94A3B8";
+    this.selectElement.selectedDescriptionColor = "#E2E8F0";
+
     this.loadWorktrees();
     this.instructions.content =
       "↑/↓ navigate • Enter open • o folder • d delete • n new • c config • q quit";
@@ -1320,10 +1346,13 @@ class WorktreeSelector {
       this.selectedForDelete.add(worktree.path);
     }
 
-    // Rebuild options to update checkboxes
+    // Rebuild options to update checkboxes (only deletable worktrees)
     if (this.repoRoot) {
       const worktrees = listWorktrees(this.repoRoot);
-      this.selectElement.options = this.buildOptions(worktrees);
+      const deletableWorktrees = worktrees.filter(
+        (wt) => !isMainWorktree(this.repoRoot!, wt.path)
+      );
+      this.selectElement.options = this.buildOptions(deletableWorktrees);
       // Restore selection index
       this.selectElement.setSelectedIndex(selectedIndex);
     }
@@ -1369,7 +1398,7 @@ class WorktreeSelector {
     const hasDirty = dirtyWorktrees.length > 0;
 
     const count = worktrees.length;
-    const title = `DELETE ${count} WORKTREE${count === 1 ? "" : "S"}`;
+    const title = `Delete ${count} worktree${count === 1 ? "" : "s"}`;
 
     this.confirmContainer = new BoxRenderable(this.renderer, {
       id: "confirm-container",
@@ -1377,36 +1406,18 @@ class WorktreeSelector {
       left: 2,
       top: 3,
       width: 76,
-      height: hasDirty ? 14 : 12,
+      height: hasDirty ? 12 : 10,
       borderStyle: "single",
-      borderColor: "#EF4444",
+      borderColor: "#F59E0B",
       title,
       titleAlignment: "center",
-      backgroundColor: "#1C1917",
+      backgroundColor: "#0F172A",
       border: true,
     });
     this.renderer.root.add(this.confirmContainer);
 
     let yOffset = 1;
 
-    // List branches to be deleted prominently
-    const branchNames = worktrees
-      .map((wt) => wt.branch || basename(wt.path))
-      .slice(0, 3);
-    const displayList =
-      branchNames.join(", ") + (worktrees.length > 3 ? `, +${worktrees.length - 3} more` : "");
-
-    const branchHeader = new TextRenderable(this.renderer, {
-      id: "confirm-branches",
-      position: "absolute",
-      left: 1,
-      top: yOffset,
-      content: `Branches: ${displayList}`,
-      fg: "#FBBF24",
-    });
-    this.confirmContainer.add(branchHeader);
-    yOffset += 2;
-
     // Warning for dirty worktrees
     if (hasDirty) {
       const warningText = new TextRenderable(this.renderer, {
@@ -1415,22 +1426,28 @@ class WorktreeSelector {
         left: 1,
         top: yOffset,
         content: `⚠ ${dirtyWorktrees.length} worktree${dirtyWorktrees.length === 1 ? " has" : "s have"} uncommitted changes!`,
-        fg: "#EF4444",
+        fg: "#F59E0B",
       });
       this.confirmContainer.add(warningText);
       yOffset += 2;
     }
 
-    // Info text
-    const infoText = new TextRenderable(this.renderer, {
-      id: "confirm-info",
+    // List worktrees to be deleted
+    const branchNames = worktrees
+      .map((wt) => wt.branch || basename(wt.path))
+      .slice(0, 3);
+    const displayList =
+      branchNames.join(", ") + (worktrees.length > 3 ? `, +${worktrees.length - 3} more` : "");
+
+    const listText = new TextRenderable(this.renderer, {
+      id: "confirm-list",
       position: "absolute",
       left: 1,
       top: yOffset,
-      content: "This will remove worktree directories from disk.",
-      fg: "#A8A29E",
+      content: `Worktrees: ${displayList}`,
+      fg: "#94A3B8",
     });
-    this.confirmContainer.add(infoText);
+    this.confirmContainer.add(listText);
     yOffset += 2;
 
     // Build options
@@ -1460,13 +1477,13 @@ class WorktreeSelector {
       width: 72,
       height: 4,
       options,
-      backgroundColor: "#1C1917",
-      focusedBackgroundColor: "#292524",
-      selectedBackgroundColor: "#44403C",
-      textColor: "#E7E5E4",
-      selectedTextColor: "#F87171",
-      descriptionColor: "#A8A29E",
-      selectedDescriptionColor: "#E7E5E4",
+      backgroundColor: "#0F172A",
+      focusedBackgroundColor: "#1E293B",
+      selectedBackgroundColor: "#1E3A5F",
+      textColor: "#E2E8F0",
+      selectedTextColor: "#38BDF8",
+      descriptionColor: "#94A3B8",
+      selectedDescriptionColor: "#E2E8F0",
       showDescription: true,
       wrapSelection: true,
     });

package/src/update-check.ts

@@ -0,0 +1,163 @@
+import { spawn } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import os from "node:os";
+
+export type UpdateInfo = {
+  hasUpdate: boolean;
+  current: string;
+  latest: string;
+};
+
+type UpdateCache = {
+  name: string; // Package name to verify cache matches
+  latest: string;
+  lastCheck: number;
+};
+
+const CACHE_DIR = path.join(os.homedir(), ".config", "configstore");
+const CACHE_FILE = path.join(CACHE_DIR, "opencode-worktree-update.json");
+
+// Check interval: 1 hour in milliseconds
+const CHECK_INTERVAL_MS = 60 * 60 * 1000;
+
+/**
+ * Read the cached update info from disk
+ * Returns null if cache doesn't exist or package name doesn't match
+ */
+function readCache(packageName: string): UpdateCache | null {
+  try {
+    if (!fs.existsSync(CACHE_FILE)) {
+      return null;
+    }
+    const content = fs.readFileSync(CACHE_FILE, "utf-8");
+    const cache = JSON.parse(content) as UpdateCache;
+    
+    // Verify the cache is for the correct package
+    if (cache.name !== packageName) {
+      return null;
+    }
+    
+    return cache;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Compare two semver version strings
+ * Returns true if latest > current
+ */
+function isNewerVersion(current: string, latest: string): boolean {
+  // Handle dev versions
+  if (current === "dev" || current === "0.0.0") {
+    return false;
+  }
+
+  const parseVersion = (v: string): number[] => {
+    return v
+      .replace(/^v/, "")
+      .split(".")
+      .map((n) => parseInt(n, 10) || 0);
+  };
+
+  const currentParts = parseVersion(current);
+  const latestParts = parseVersion(latest);
+
+  for (let i = 0; i < 3; i++) {
+    const c = currentParts[i] || 0;
+    const l = latestParts[i] || 0;
+    if (l > c) return true;
+    if (l < c) return false;
+  }
+
+  return false;
+}
+
+/**
+ * Spawn a detached background process to fetch the latest version from npm
+ * and write it to the cache file. This doesn't block the main process.
+ */
+function fetchLatestInBackground(packageName: string): void {
+  // Create an inline script that fetches from npm and writes to cache
+  const script = `
+    const https = require('https');
+    const fs = require('fs');
+    const path = require('path');
+    const os = require('os');
+
+    const cacheDir = path.join(os.homedir(), '.config', 'configstore');
+    const cacheFile = path.join(cacheDir, 'opencode-worktree-update.json');
+
+    const url = 'https://registry.npmjs.org/${packageName}/latest';
+
+    https.get(url, { headers: { 'Accept': 'application/json' } }, (res) => {
+      let data = '';
+      res.on('data', (chunk) => { data += chunk; });
+      res.on('end', () => {
+        try {
+          const pkg = JSON.parse(data);
+          if (pkg.version) {
+            if (!fs.existsSync(cacheDir)) {
+              fs.mkdirSync(cacheDir, { recursive: true });
+            }
+            fs.writeFileSync(cacheFile, JSON.stringify({
+              name: '${packageName}',
+              latest: pkg.version,
+              lastCheck: Date.now()
+            }, null, 2));
+          }
+        } catch {}
+      });
+    }).on('error', () => {});
+  `;
+
+  try {
+    // Spawn node to run the script
+    const child = spawn(process.execPath, ["-e", script], {
+      detached: true,
+      stdio: "ignore",
+      env: { ...process.env },
+    });
+
+    // Unref so the parent process can exit independently
+    child.unref();
+  } catch {
+    // Silently fail - background fetch is best-effort
+  }
+}
+
+/**
+ * Check for updates. This is non-blocking:
+ * 1. Reads the cached latest version (if available)
+ * 2. Compares against current version
+ * 3. Spawns a background process to refresh the cache for next time
+ *
+ * Returns null if no cache exists yet (first run)
+ */
+export function checkForUpdate(pkg: {
+  name: string;
+  version: string;
+}): UpdateInfo | null {
+  const cache = readCache(pkg.name);
+  const now = Date.now();
+
+  // Spawn background fetch if cache is stale or doesn't exist
+  const shouldFetch =
+    !cache || now - cache.lastCheck > CHECK_INTERVAL_MS;
+
+  if (shouldFetch) {
+    fetchLatestInBackground(pkg.name);
+  }
+
+  // If no cache, we can't determine if there's an update yet
+  if (!cache) {
+    return null;
+  }
+
+  return {
+    hasUpdate: isNewerVersion(pkg.version, cache.latest),
+    current: pkg.version,
+    latest: cache.latest,
+  };
+}