@sven1103/opencode-worktree-workflow 0.6.0 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sven1103/opencode-worktree-workflow",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "OpenCode plugin for creating and cleaning up git worktrees.",
   "type": "module",
   "main": "./src/index.js",

package/src/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { execFile } from "node:child_process";
+import fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
 
@@ -68,6 +69,31 @@ function printUsage() {
   );
 }
 
+function printSubcommandUsage(command) {
+  if (command === "wt-new") {
+    process.stdout.write(
+      [
+        "Usage:",
+        "  opencode-worktree-workflow wt-new <title> [--json]",
+        "",
+        "Create a synced worktree and branch from the configured base branch.",
+      ].join("\n") + "\n",
+    );
+    return;
+  }
+
+  if (command === "wt-clean") {
+    process.stdout.write(
+      [
+        "Usage:",
+        "  opencode-worktree-workflow wt-clean [preview|apply] [selectors...] [--json]",
+        "",
+        "Preview connected worktrees or remove safe and explicitly selected review worktrees.",
+      ].join("\n") + "\n",
+    );
+  }
+}
+
 export function parseCliArgs(argv) {
   const outputJson = argv.includes("--json");
   const args = argv.filter((arg) => arg !== "--json");
@@ -84,6 +110,11 @@ export async function run(argv = process.argv.slice(2)) {
     return;
   }
 
+  if ((command === "wt-new" || command === "wt-clean") && rest.some((arg) => arg === "--help" || arg === "-h" || arg === "help")) {
+    printSubcommandUsage(command);
+    return;
+  }
+
   const plugin = await WorktreeWorkflowPlugin({
     $: createShell(process.cwd()),
     directory: process.cwd(),
@@ -120,7 +151,19 @@ export async function run(argv = process.argv.slice(2)) {
   process.stdout.write(`${result.message || JSON.stringify(result, null, 2)}\n`);
 }
 
-const invokedAsScript = process.argv[1] && fileURLToPath(import.meta.url) === process.argv[1];
+export function isInvokedAsScript(argvPath = process.argv[1]) {
+  if (!argvPath) {
+    return false;
+  }
+
+  try {
+    return fs.realpathSync(argvPath) === fileURLToPath(import.meta.url);
+  } catch {
+    return fileURLToPath(import.meta.url) === argvPath;
+  }
+}
+
+const invokedAsScript = isInvokedAsScript();
 
 if (invokedAsScript) {
   run().catch((error) => {

package/src/index.js

@@ -24,6 +24,14 @@ async function pathExists(targetPath) {
   }
 }
 
+function isMissingGitRepositoryError(message) {
+  return /not a git repository/i.test(message);
+}
+
+function isMissingRemoteError(message, remote) {
+  return new RegExp(`No such remote:?\s+${remote}|does not appear to be a git repository|Could not read from remote repository`, "i").test(message);
+}
+
 async function readJsonFile(filePath) {
   if (!(await pathExists(filePath))) {
     return null;
@@ -376,6 +384,8 @@ export const __internal = {
   buildCleanupPreviewResult,
   buildPrepareResult,
   classifyEntry,
+  isMissingGitRepositoryError,
+  isMissingRemoteError,
   parseCleanupRawArguments,
   normalizeCleanupArgs,
   toStructuredCleanupFailure,
@@ -470,8 +480,18 @@ export const WorktreeWorkflowPlugin = async ({ $, directory }) => {
   }
 
   async function getRepoRoot() {
-    const result = await git(["rev-parse", "--show-toplevel"]);
-    return result.stdout;
+    try {
+      const result = await git(["rev-parse", "--show-toplevel"]);
+      return result.stdout;
+    } catch (error) {
+      if (isMissingGitRepositoryError(error.message || "")) {
+        throw new Error(
+          "This command must run inside a git repository. Initialize a repository first or run it from an existing repo root.",
+        );
+      }
+
+      throw error;
+    }
   }
 
   async function loadWorkflowConfig(repoRoot) {
@@ -557,7 +577,17 @@ export const WorktreeWorkflowPlugin = async ({ $, directory }) => {
   }
 
   async function getBaseRef(repoRoot, remote, baseBranch) {
-    await git(["fetch", "--prune", remote, baseBranch], { cwd: repoRoot });
+    try {
+      await git(["fetch", "--prune", remote, baseBranch], { cwd: repoRoot });
+    } catch (error) {
+      if (isMissingRemoteError(error.message || "", remote)) {
+        throw new Error(
+          `Could not fetch base branch information from remote \"${remote}\". Configure the expected remote in .opencode/worktree-workflow.json or add that remote to this repository.`,
+        );
+      }
+
+      throw error;
+    }
 
     const remoteRef = `refs/remotes/${remote}/${baseBranch}`;
     const remoteExists = await git(["show-ref", "--verify", "--quiet", remoteRef], {