opencode-worktree 0.3.0 → 0.3.2

package/README.md

@@ -43,7 +43,7 @@ opencode-worktree /path/to/your/repo
 
 - `Up`/`Down` or `j`/`k`: navigate
 - `Enter`: open selected worktree in opencode (or toggle selection in delete mode)
-- `o`: open worktree folder in file manager (Finder/Explorer)
+- `o`: open worktree folder in file manager or custom editor (configurable)
 - `d`: enter multi-select delete mode (press again to confirm deletion)
 - `n`: create new worktree
 - `c`: edit configuration (post-create hooks)
@@ -67,7 +67,10 @@ When you first run `opencode-worktree` in a repository without a configuration f
 
 ### Editing configuration
 
-Press `c` at any time to edit your configuration. Currently, this allows you to set or modify the post-create hook command.
+Press `c` at any time to edit your configuration. You can configure:
+
+- **Post-create hook**: Command to run after creating a worktree (e.g., `npm install`)
+- **Open command**: Custom command for opening worktree folders (e.g., `webstorm`, `code`)
 
 ### Post-create hooks
 
@@ -95,6 +98,31 @@ The hook output is streamed to the TUI in real-time. If the hook fails, you can
 }
 ```
 
+### Custom open command
+
+Use a custom command when pressing `o` to open worktree folders. Useful for opening in your preferred IDE.
+
+```json
+{
+  "openCommand": "webstorm"
+}
+```
+
+**Examples:**
+
+```json
+{
+  "openCommand": "code"
+}
+```
+
+```json
+{
+  "postCreateHook": "npm install",
+  "openCommand": "webstorm"
+}
+```
+
 ## Update notifications
 
 When a new version is published to npm, the CLI will show a non-intrusive update message on the next run.

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.0",
+  "version": "0.3.2",
   "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/config.ts

@@ -3,6 +3,7 @@ import { join } from "node:path";
 
 export type Config = {
   postCreateHook?: string;
+  openCommand?: string; // Custom command to open worktree folder (e.g., "webstorm", "code")
 };
 
 const CONFIG_FILENAME = ".opencode-worktree.json";
@@ -46,6 +47,10 @@ export const loadRepoConfig = (repoRoot: string): Config => {
       config.postCreateHook = parsed.postCreateHook;
     }
 
+    if (typeof parsed.openCommand === "string") {
+      config.openCommand = parsed.openCommand;
+    }
+
     return config;
   } catch {
     // If we can't read or parse the config, return empty

package/src/opencode.ts

@@ -20,23 +20,32 @@ export const launchOpenCode = (cwd: string): void => {
 };
 
 /**
- * Open a path in the system file manager (Finder on macOS, xdg-open on Linux, explorer on Windows)
+ * Open a path in the system file manager or with a custom command
+ * If customCommand is provided, uses that instead of the system default
  */
-export const openInFileManager = (path: string): boolean => {
-  const platform = process.platform;
+export const openInFileManager = (path: string, customCommand?: string): boolean => {
   let command: string;
   let args: string[];
 
-  if (platform === "darwin") {
-    command = "open";
-    args = [path];
-  } else if (platform === "win32") {
-    command = "explorer";
+  if (customCommand) {
+    // Use custom command (e.g., "webstorm", "code")
+    command = customCommand;
     args = [path];
   } else {
-    // Linux and others
-    command = "xdg-open";
-    args = [path];
+    // Use system default
+    const platform = process.platform;
+
+    if (platform === "darwin") {
+      command = "open";
+      args = [path];
+    } else if (platform === "win32") {
+      command = "explorer";
+      args = [path];
+    } else {
+      // Linux and others
+      command = "xdg-open";
+      args = [path];
+    }
   }
 
   try {

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;
@@ -91,12 +101,15 @@ class WorktreeSelector {
   // Config editor state
   private isEditingConfig = false;
   private configContainer: BoxRenderable | null = null;
-  private configInput: InputRenderable | null = null;
+  private configHookInput: InputRenderable | null = null;
+  private configOpenInput: InputRenderable | null = null;
+  private configActiveField: "hook" | "open" = "hook";
   private isFirstTimeSetup = false;
 
   constructor(
     private renderer: CliRenderer,
     private targetPath: string,
+    private pkg?: PackageInfo,
   ) {
     // Load worktrees first to get initial options
     this.repoRoot = resolveRepoRoot(this.targetPath);
@@ -113,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",
@@ -263,8 +304,21 @@ class WorktreeSelector {
         return;
       }
       if (key.name === "return") {
-        const value = this.configInput?.value || "";
-        this.handleConfigSave(value);
+        this.handleConfigSave();
+        return;
+      }
+      if (key.name === "tab") {
+        // Switch between fields
+        if (this.configActiveField === "hook") {
+          this.configActiveField = "open";
+          this.configHookInput?.blur();
+          this.configOpenInput?.focus();
+        } else {
+          this.configActiveField = "hook";
+          this.configOpenInput?.blur();
+          this.configHookInput?.focus();
+        }
+        this.renderer.requestRender();
         return;
       }
       return;
@@ -350,9 +404,17 @@ class WorktreeSelector {
       return;
     }
 
-    const success = openInFileManager(worktree.path);
+    // Load config to check for custom open command
+    const config = this.repoRoot ? loadRepoConfig(this.repoRoot) : {};
+    const customCommand = config.openCommand;
+
+    const success = openInFileManager(worktree.path, customCommand);
     if (success) {
-      this.setStatus(`Opened ${worktree.path} in file manager.`, "success");
+      if (customCommand) {
+        this.setStatus(`Opened ${worktree.path} with ${customCommand}.`, "success");
+      } else {
+        this.setStatus(`Opened ${worktree.path} in file manager.`, "success");
+      }
     } else {
       this.setStatus("Failed to open file manager.", "error");
     }
@@ -658,6 +720,7 @@ class WorktreeSelector {
     }
 
     this.isEditingConfig = true;
+    this.configActiveField = "hook";
     this.selectElement.visible = false;
     this.selectElement.blur();
 
@@ -665,8 +728,8 @@ class WorktreeSelector {
     const existingConfig = loadRepoConfig(this.repoRoot);
 
     const title = this.isFirstTimeSetup
-      ? "First-time Setup: Configure Post-create Hook"
-      : "Edit Post-create Hook";
+      ? "First-time Setup: Project Configuration"
+      : "Edit Project Configuration";
 
     this.configContainer = new BoxRenderable(this.renderer, {
       id: "config-container",
@@ -674,7 +737,7 @@ class WorktreeSelector {
       left: 2,
       top: 3,
       width: 76,
-      height: 8,
+      height: 12,
       borderStyle: "single",
       borderColor: "#38BDF8",
       title,
@@ -684,50 +747,76 @@ class WorktreeSelector {
     });
     this.renderer.root.add(this.configContainer);
 
-    const helpText = new TextRenderable(this.renderer, {
-      id: "config-help",
+    // Post-create hook field
+    const hookLabel = new TextRenderable(this.renderer, {
+      id: "config-hook-label",
       position: "absolute",
       left: 1,
       top: 1,
-      content: "Command to run after creating a worktree (e.g., npm install):",
+      content: "Post-create hook (e.g., npm install):",
       fg: "#94A3B8",
     });
-    this.configContainer.add(helpText);
+    this.configContainer.add(hookLabel);
+
+    this.configHookInput = new InputRenderable(this.renderer, {
+      id: "config-hook-input",
+      position: "absolute",
+      left: 1,
+      top: 2,
+      width: 72,
+      placeholder: "npm install",
+      value: existingConfig.postCreateHook || "",
+      focusedBackgroundColor: "#1E293B",
+      backgroundColor: "#1E293B",
+    });
+    this.configContainer.add(this.configHookInput);
 
-    const skipHint = new TextRenderable(this.renderer, {
-      id: "config-skip-hint",
+    // Open command field
+    const openLabel = new TextRenderable(this.renderer, {
+      id: "config-open-label",
       position: "absolute",
       left: 1,
       top: 4,
-      content: "Leave empty to skip post-create hooks.",
-      fg: "#64748B",
+      content: "Open folder command (e.g., webstorm, code):",
+      fg: "#94A3B8",
     });
-    this.configContainer.add(skipHint);
+    this.configContainer.add(openLabel);
 
-    this.configInput = new InputRenderable(this.renderer, {
-      id: "config-hook-input",
+    this.configOpenInput = new InputRenderable(this.renderer, {
+      id: "config-open-input",
       position: "absolute",
       left: 1,
-      top: 3,
+      top: 5,
       width: 72,
-      placeholder: "npm install",
-      value: existingConfig.postCreateHook || "",
+      placeholder: "open (default)",
+      value: existingConfig.openCommand || "",
       focusedBackgroundColor: "#1E293B",
       backgroundColor: "#1E293B",
     });
-    this.configContainer.add(this.configInput);
+    this.configContainer.add(this.configOpenInput);
+
+    // Help text
+    const helpText = new TextRenderable(this.renderer, {
+      id: "config-help",
+      position: "absolute",
+      left: 1,
+      top: 7,
+      content: "Tab to switch fields • Leave empty to use defaults",
+      fg: "#64748B",
+    });
+    this.configContainer.add(helpText);
 
-    this.instructions.content = "Enter to save • Esc to cancel";
+    this.instructions.content = "Tab switch • Enter save • Esc cancel";
     this.setStatus(
       this.isFirstTimeSetup
-        ? "Welcome! Configure your post-create hook for this repository."
-        : "Edit the post-create hook command.",
+        ? "Welcome! Configure your project settings."
+        : "Edit project configuration.",
       "info"
     );
 
     // Delay focus to prevent the triggering keypress from being captured
     setTimeout(() => {
-      this.configInput?.focus();
+      this.configHookInput?.focus();
       this.renderer.requestRender();
     }, 0);
   }
@@ -736,14 +825,18 @@ class WorktreeSelector {
     this.isEditingConfig = false;
     this.isFirstTimeSetup = false;
 
-    if (this.configInput) {
-      this.configInput.blur();
+    if (this.configHookInput) {
+      this.configHookInput.blur();
+    }
+    if (this.configOpenInput) {
+      this.configOpenInput.blur();
     }
 
     if (this.configContainer) {
       this.renderer.root.remove(this.configContainer.id);
       this.configContainer = null;
-      this.configInput = null;
+      this.configHookInput = null;
+      this.configOpenInput = null;
     }
 
     this.selectElement.visible = true;
@@ -757,27 +850,35 @@ class WorktreeSelector {
     }, 0);
   }
 
-  private handleConfigSave(hookCommand: string): void {
+  private handleConfigSave(): void {
     if (!this.repoRoot) {
       this.setStatus("No git repository found.", "error");
       this.hideConfigEditor();
       return;
     }
 
-    const trimmed = hookCommand.trim();
+    const hookValue = (this.configHookInput?.value || "").trim();
+    const openValue = (this.configOpenInput?.value || "").trim();
     const config: Config = {};
 
-    if (trimmed) {
-      config.postCreateHook = trimmed;
+    if (hookValue) {
+      config.postCreateHook = hookValue;
+    }
+    if (openValue) {
+      config.openCommand = openValue;
     }
 
     const success = saveRepoConfig(this.repoRoot, config);
 
     if (success) {
-      if (trimmed) {
-        this.setStatus(`Post-create hook saved: "${trimmed}"`, "success");
+      const changes: string[] = [];
+      if (hookValue) changes.push(`hook: "${hookValue}"`);
+      if (openValue) changes.push(`open: "${openValue}"`);
+      
+      if (changes.length > 0) {
+        this.setStatus(`Config saved: ${changes.join(", ")}`, "success");
       } else {
-        this.setStatus("Post-create hook cleared.", "success");
+        this.setStatus("Config cleared.", "success");
       }
     } else {
       this.setStatus("Failed to save config.", "error");