opencode-worktree 0.3.1 → 0.3.3

package/bin/opencode-worktree

@@ -5,7 +5,6 @@ import path from 'node:path';
 import os from 'node:os';
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
-import updateNotifier from 'update-notifier';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -13,8 +12,6 @@ const pkg = JSON.parse(
   fs.readFileSync(new URL('../package.json', import.meta.url), 'utf8'),
 );
 
-updateNotifier({ pkg }).notify({ isGlobal: true });
-
 const detectPlatformAndArch = () => {
   let platform;
   switch (os.platform()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-worktree",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "private": false,
   "type": "module",
   "description": "TUI for managing git worktrees with opencode integration.",
@@ -48,6 +48,7 @@
   "devDependencies": {
     "@types/bun": "^1.2.0",
     "@types/node": "^24.2.0",
+    "@types/update-notifier": "^6.0.8",
     "typescript": "^5.9.3"
   }
 }

package/script/build.ts

@@ -107,6 +107,8 @@ const buildBinary = async (target: Target) => {
         OTUI_TREE_SITTER_WORKER_PATH: JSON.stringify(
           bunfsRoot + workerRelativePath,
         ),
+        __PACKAGE_VERSION__: JSON.stringify(version),
+        __PACKAGE_NAME__: JSON.stringify(packageName),
       },
     });
   } catch (error) {

package/src/cli.ts

@@ -1,9 +1,19 @@
 import { runApp } from "./ui.js";
 
+// Build-time injected constants (defined in script/build.ts)
+// Use typeof check to provide fallbacks for dev mode (bun run dev)
+declare const __PACKAGE_VERSION__: string | undefined;
+declare const __PACKAGE_NAME__: string | undefined;
+
+const pkg = {
+  name: typeof __PACKAGE_NAME__ !== "undefined" ? __PACKAGE_NAME__ : "opencode-worktree",
+  version: typeof __PACKAGE_VERSION__ !== "undefined" ? __PACKAGE_VERSION__ : "dev",
+};
+
 // Accept optional path argument: opencode-worktree [path]
 const targetPath = process.argv[2] || process.cwd();
 
-runApp(targetPath).catch((error: unknown) => {
+runApp(targetPath, pkg).catch((error: unknown) => {
   console.error("Failed to start OpenTUI worktree selector.");
   console.error(error);
   process.exit(1);

package/src/ui.ts

@@ -10,6 +10,7 @@ import {
   type KeyEvent,
   type SelectOption,
 } from "@opentui/core";
+import updateNotifier from "update-notifier";
 import { basename } from "node:path";
 import {
   createWorktree,
@@ -45,14 +46,22 @@ const CONFIRM_UNLINK_VALUE: ConfirmAction = "unlink";
 const CONFIRM_DELETE_VALUE: ConfirmAction = "delete";
 const CONFIRM_CANCEL_VALUE: ConfirmAction = "cancel";
 
-export const runApp = async (targetPath: string): Promise<void> => {
+export type PackageInfo = {
+  name: string;
+  version: string;
+};
+
+export const runApp = async (
+  targetPath: string,
+  pkg?: PackageInfo,
+): Promise<void> => {
   const renderer = await createCliRenderer({
     exitOnCtrlC: false,
     targetFps: 30,
   });
 
   renderer.setBackgroundColor("transparent");
-  new WorktreeSelector(renderer, targetPath);
+  new WorktreeSelector(renderer, targetPath, pkg);
 };
 
 class WorktreeSelector {
@@ -60,6 +69,7 @@ class WorktreeSelector {
   private statusText: TextRenderable;
   private instructions: TextRenderable;
   private title: TextRenderable;
+  private versionNotice: TextRenderable | null = null;
 
   private inputContainer: BoxRenderable | null = null;
   private branchInput: InputRenderable | null = null;
@@ -99,6 +109,7 @@ class WorktreeSelector {
   constructor(
     private renderer: CliRenderer,
     private targetPath: string,
+    private pkg?: PackageInfo,
   ) {
     // Load worktrees first to get initial options
     this.repoRoot = resolveRepoRoot(this.targetPath);
@@ -115,6 +126,34 @@ class WorktreeSelector {
     });
     this.renderer.root.add(this.title);
 
+    // Display version or update notification in title line
+    if (this.pkg) {
+      const notifier = updateNotifier({ pkg: this.pkg });
+
+      let noticeContent: string;
+      let noticeColor: string;
+
+      if (notifier.update) {
+        // Update available
+        noticeContent = `Update: ${notifier.update.current} → ${notifier.update.latest} (npm i -g)`;
+        noticeColor = "#F59E0B"; // Amber
+      } else {
+        // On latest version
+        noticeContent = `v${this.pkg.version}`;
+        noticeColor = "#64748B"; // Subtle gray
+      }
+
+      this.versionNotice = new TextRenderable(renderer, {
+        id: "version-notice",
+        position: "absolute",
+        left: 78 - noticeContent.length,
+        top: 1,
+        content: noticeContent,
+        fg: noticeColor,
+      });
+      this.renderer.root.add(this.versionNotice);
+    }
+
     this.selectElement = new SelectRenderable(renderer, {
       id: "worktree-selector",
       position: "absolute",
@@ -1024,7 +1063,7 @@ class WorktreeSelector {
     const branchDisplay = worktree.branch || basename(worktree.path);
 
     // Build dialog title
-    const title = `Remove: ${branchDisplay}`;
+    const title = "DELETE WORKTREE";
 
     this.confirmContainer = new BoxRenderable(this.renderer, {
       id: "confirm-container",
@@ -1032,18 +1071,30 @@ class WorktreeSelector {
       left: 2,
       top: 3,
       width: 76,
-      height: isDirty ? 10 : 8,
+      height: isDirty ? 12 : 10,
       borderStyle: "single",
-      borderColor: "#F59E0B",
+      borderColor: "#EF4444",
       title,
       titleAlignment: "center",
-      backgroundColor: "#0F172A",
+      backgroundColor: "#1C1917",
       border: true,
     });
     this.renderer.root.add(this.confirmContainer);
 
-    // Warning for dirty worktree
+    // 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
     if (isDirty) {
       const warningText = new TextRenderable(this.renderer, {
         id: "confirm-warning",
@@ -1051,7 +1102,7 @@ class WorktreeSelector {
         left: 1,
         top: yOffset,
         content: "⚠ This worktree has uncommitted changes!",
-        fg: "#F59E0B",
+        fg: "#EF4444",
       });
       this.confirmContainer.add(warningText);
       yOffset += 2;
@@ -1063,7 +1114,7 @@ class WorktreeSelector {
       left: 1,
       top: yOffset,
       content: `Path: ${worktree.path}`,
-      fg: "#94A3B8",
+      fg: "#A8A29E",
     });
     this.confirmContainer.add(pathText);
     yOffset += 2;
@@ -1095,13 +1146,13 @@ class WorktreeSelector {
       width: 72,
       height: 4,
       options,
-      backgroundColor: "#0F172A",
-      focusedBackgroundColor: "#1E293B",
-      selectedBackgroundColor: "#1E3A5F",
-      textColor: "#E2E8F0",
-      selectedTextColor: "#38BDF8",
-      descriptionColor: "#94A3B8",
-      selectedDescriptionColor: "#E2E8F0",
+      backgroundColor: "#1C1917",
+      focusedBackgroundColor: "#292524",
+      selectedBackgroundColor: "#44403C",
+      textColor: "#E7E5E4",
+      selectedTextColor: "#F87171",
+      descriptionColor: "#A8A29E",
+      selectedDescriptionColor: "#E7E5E4",
       showDescription: true,
       wrapSelection: true,
     });
@@ -1318,7 +1369,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",
@@ -1326,18 +1377,36 @@ class WorktreeSelector {
       left: 2,
       top: 3,
       width: 76,
-      height: hasDirty ? 12 : 10,
+      height: hasDirty ? 14 : 12,
       borderStyle: "single",
-      borderColor: "#F59E0B",
+      borderColor: "#EF4444",
       title,
       titleAlignment: "center",
-      backgroundColor: "#0F172A",
+      backgroundColor: "#1C1917",
       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, {
@@ -1346,28 +1415,22 @@ class WorktreeSelector {
         left: 1,
         top: yOffset,
         content: `⚠ ${dirtyWorktrees.length} worktree${dirtyWorktrees.length === 1 ? " has" : "s have"} uncommitted changes!`,
-        fg: "#F59E0B",
+        fg: "#EF4444",
       });
       this.confirmContainer.add(warningText);
       yOffset += 2;
     }
 
-    // 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",
+    // Info text
+    const infoText = new TextRenderable(this.renderer, {
+      id: "confirm-info",
       position: "absolute",
       left: 1,
       top: yOffset,
-      content: `Worktrees: ${displayList}`,
-      fg: "#94A3B8",
+      content: "This will remove worktree directories from disk.",
+      fg: "#A8A29E",
     });
-    this.confirmContainer.add(listText);
+    this.confirmContainer.add(infoText);
     yOffset += 2;
 
     // Build options
@@ -1397,13 +1460,13 @@ class WorktreeSelector {
       width: 72,
       height: 4,
       options,
-      backgroundColor: "#0F172A",
-      focusedBackgroundColor: "#1E293B",
-      selectedBackgroundColor: "#1E3A5F",
-      textColor: "#E2E8F0",
-      selectedTextColor: "#38BDF8",
-      descriptionColor: "#94A3B8",
-      selectedDescriptionColor: "#E2E8F0",
+      backgroundColor: "#1C1917",
+      focusedBackgroundColor: "#292524",
+      selectedBackgroundColor: "#44403C",
+      textColor: "#E7E5E4",
+      selectedTextColor: "#F87171",
+      descriptionColor: "#A8A29E",
+      selectedDescriptionColor: "#E7E5E4",
       showDescription: true,
       wrapSelection: true,
     });