workshell 0.1.0 → 0.2.0

package/dist/index.js

@@ -7098,37 +7098,78 @@ function newCommand(branchName, fromBranch) {
 }
 
 // commands/open.ts
+import { execSync as execSync3 } from "child_process";
 import { mkdirSync as mkdirSync4 } from "fs";
 import { basename as basename4, dirname as dirname4, join as join4 } from "path";
-function openCommand(branch) {
-  if (isInsideWorktree()) {
-    const currentBranch = getCurrentBranch();
-    console.log();
-    console.log(warn(`You're inside a worktree (branch: ${cyan(currentBranch)})`));
-    console.log(`  This will nest subshells (subshell inside subshell).`);
-    console.log();
-    if (!confirm("Continue?")) {
-      process.exit(0);
+function isGhInstalled() {
+  try {
+    execSync3("gh --version", { stdio: "pipe", encoding: "utf-8" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isGhAuthenticated() {
+  try {
+    execSync3("gh auth status", { stdio: "pipe", encoding: "utf-8" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function getPRInfo(prRef) {
+  try {
+    const output = execSync3(
+      `gh pr view ${prRef} --json number,headRefName`,
+      { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
+    );
+    return JSON.parse(output);
+  } catch {
+    return null;
+  }
+}
+function fetchPRBranch(prRef, prInfo) {
+  try {
+    execSync3(`git fetch origin ${prInfo.headRefName}:${prInfo.headRefName}`, { stdio: "pipe" });
+    return true;
+  } catch {
+  }
+  const currentBranch = getCurrentBranch();
+  try {
+    execSync3(`gh pr checkout ${prRef}`, { stdio: "pipe" });
+    execSync3(`git checkout "${currentBranch}"`, { stdio: "pipe" });
+    return true;
+  } catch {
+    try {
+      execSync3(`git checkout "${currentBranch}"`, { stdio: "pipe" });
+    } catch {
     }
-    console.log();
   }
-  if (!branchExists(branch)) {
-    console.error(`Error: branch '${branch}' not found`);
-    process.exit(1);
+  try {
+    execSync3(`git fetch origin pull/${prInfo.number}/head:${prInfo.headRefName}`, { stdio: "pipe" });
+    return true;
+  } catch {
+    return false;
   }
+}
+function openBranch(branch, prNumber) {
   const parentBranch = getCurrentBranch();
+  const mainWorktree = getMainWorktree();
   const existingWorktreePath = getWorktreeForBranch(branch);
   if (existingWorktreePath) {
     const worktreeId2 = getWorktreeId(existingWorktreePath);
-    const mainWorktree2 = getMainWorktree();
     console.log();
-    console.log(success(bold(branch)), dim(`(existing worktree)`));
+    if (prNumber) {
+      console.log(success(bold(`PR #${prNumber}`)), dim(`branch: ${cyan(branch)} (existing worktree)`));
+    } else {
+      console.log(success(bold(branch)), dim(`(existing worktree)`));
+    }
     console.log(dim("Type 'wk close' to return."));
     console.log();
     spawnShell(existingWorktreePath, {
       branch,
       worktreePath: existingWorktreePath,
-      repoPath: mainWorktree2
+      repoPath: mainWorktree
     });
     console.log();
     console.log(success(`Back in ${bold(parentBranch)}`));
@@ -7138,7 +7179,6 @@ function openCommand(branch) {
     return;
   }
   const store = loadStore();
-  const mainWorktree = getMainWorktree();
   const repoName = basename4(mainWorktree);
   const worktreeId = `${repoName}@${slugify(branch)}`;
   const worktreePath = join4(getWorktreesDir(), worktreeId);
@@ -7150,8 +7190,13 @@ function openCommand(branch) {
   });
   saveStore(store);
   console.log();
-  console.log(success(bold(branch)));
-  console.log(dim(`Opened branch in ephemeral subshell`));
+  if (prNumber) {
+    console.log(success(bold(`PR #${prNumber}`)), dim(`branch: ${cyan(branch)}`));
+    console.log(dim(`Opened PR in ephemeral subshell`));
+  } else {
+    console.log(success(bold(branch)));
+    console.log(dim(`Opened branch in ephemeral subshell`));
+  }
   console.log(dim("Type 'exit' or 'wk close' to return."));
   console.log();
   spawnShell(worktreePath, {
@@ -7165,6 +7210,55 @@ function openCommand(branch) {
   autoCleanupWorktree(worktreeId, worktreePath, currentStore, saveStore);
   console.log();
 }
+function openCommand(ref) {
+  if (isInsideWorktree()) {
+    const currentBranch = getCurrentBranch();
+    console.log();
+    console.log(warn(`You're inside a worktree (branch: ${cyan(currentBranch)})`));
+    console.log(`  This will nest subshells (subshell inside subshell).`);
+    console.log();
+    if (!confirm("Continue?")) {
+      process.exit(0);
+    }
+    console.log();
+  }
+  if (branchExists(ref)) {
+    openBranch(ref);
+    return;
+  }
+  if (!isGhInstalled()) {
+    console.error(fail(`Branch '${ref}' not found.`));
+    console.error(dim("  Install GitHub CLI (gh) to open PRs: https://cli.github.com/"));
+    process.exit(1);
+  }
+  if (!isGhAuthenticated()) {
+    console.error(fail(`Branch '${ref}' not found.`));
+    console.error(dim("  Run 'gh auth login' to open PRs from GitHub."));
+    process.exit(1);
+  }
+  const prInfo = getPRInfo(ref);
+  if (!prInfo) {
+    console.error(fail(`'${ref}' is not a local branch or GitHub PR.`));
+    process.exit(1);
+  }
+  const branch = prInfo.headRefName;
+  const prNumber = prInfo.number;
+  if (branchExists(branch)) {
+    console.log(dim(`PR #${prNumber} \u2192 ${branch}`));
+    openBranch(branch, prNumber);
+    return;
+  }
+  console.log(dim(`Fetching PR #${prNumber}...`));
+  if (!fetchPRBranch(ref, prInfo)) {
+    console.error(fail(`Failed to fetch branch '${branch}' for PR #${prNumber}`));
+    process.exit(1);
+  }
+  if (!branchExists(branch)) {
+    console.error(fail(`Failed to fetch branch '${branch}' for PR #${prNumber}`));
+    process.exit(1);
+  }
+  openBranch(branch, prNumber);
+}
 
 // commands/ls.ts
 var import_table = __toESM(require_src(), 1);
@@ -8015,7 +8109,7 @@ function lsCommand(plain = false) {
 }
 
 // commands/rm.ts
-import { execSync as execSync3 } from "child_process";
+import { execSync as execSync4 } from "child_process";
 import { resolve as resolve2 } from "path";
 function rmCommand(branch, force = false) {
   const mainWorktree = getMainWorktree();
@@ -8046,8 +8140,8 @@ function rmCommand(branch, force = false) {
   }
   if (isDirty && force) {
     try {
-      execSync3(`git -C "${worktreePath}" reset --hard HEAD`, { stdio: "ignore" });
-      execSync3(`git -C "${worktreePath}" clean -fd`, { stdio: "ignore" });
+      execSync4(`git -C "${worktreePath}" reset --hard HEAD`, { stdio: "ignore" });
+      execSync4(`git -C "${worktreePath}" clean -fd`, { stdio: "ignore" });
     } catch {
     }
   }
@@ -8065,7 +8159,7 @@ function rmCommand(branch, force = false) {
 }
 
 // commands/status.ts
-import { execSync as execSync4 } from "child_process";
+import { execSync as execSync5 } from "child_process";
 import { existsSync as existsSync4, readdirSync as readdirSync3 } from "fs";
 import { resolve as resolve3 } from "path";
 function getDetailedStatus(path) {
@@ -8073,7 +8167,7 @@ function getDetailedStatus(path) {
     return [];
   }
   try {
-    const status = execSync4(`git -C "${path}" status --short`, { encoding: "utf-8" }).trim();
+    const status = execSync5(`git -C "${path}" status --short`, { encoding: "utf-8" }).trim();
     if (!status) {
       return [];
     }
@@ -8139,17 +8233,17 @@ function statusCommand() {
 }
 
 // commands/preclose.ts
-import { execSync as execSync5 } from "child_process";
+import { execSync as execSync6 } from "child_process";
 function precloseCommand(force) {
   if (!hasUncommittedChanges()) {
     process.exit(0);
   }
   if (force) {
     try {
-      execSync5("git reset --hard HEAD", { stdio: "ignore" });
-      execSync5("git clean -ffd", { stdio: "ignore" });
-      execSync5("git submodule foreach --recursive 'git reset --hard HEAD; git clean -ffd'", { stdio: "ignore" });
-      execSync5("git submodule update --init --recursive --force", { stdio: "ignore" });
+      execSync6("git reset --hard HEAD", { stdio: "ignore" });
+      execSync6("git clean -ffd", { stdio: "ignore" });
+      execSync6("git submodule foreach --recursive 'git reset --hard HEAD; git clean -ffd'", { stdio: "ignore" });
+      execSync6("git submodule update --init --recursive --force", { stdio: "ignore" });
     } catch {
     }
     process.exit(0);
@@ -8221,162 +8315,8 @@ function promptChoice() {
   }
 }
 
-// commands/pr.ts
-import { execSync as execSync6 } from "child_process";
-import { mkdirSync as mkdirSync5 } from "fs";
-import { basename as basename5, dirname as dirname5, join as join6 } from "path";
-function checkGhInstalled() {
-  try {
-    execSync6("gh --version", { stdio: "pipe", encoding: "utf-8" });
-  } catch {
-    console.error(fail("GitHub CLI (gh) is not installed."));
-    console.error(dim("  Install it from: https://cli.github.com/"));
-    process.exit(1);
-  }
-}
-function checkGhAuthenticated() {
-  try {
-    execSync6("gh auth status", { stdio: "pipe", encoding: "utf-8" });
-  } catch {
-    console.error(fail("Not authenticated with GitHub CLI."));
-    console.error(dim("  Run: gh auth login"));
-    process.exit(1);
-  }
-}
-function getPRInfo(prRef) {
-  try {
-    const output = execSync6(
-      `gh pr view ${prRef} --json number,headRefName,headRepository,headRepositoryOwner,isCrossRepository`,
-      { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
-    );
-    return JSON.parse(output);
-  } catch (err) {
-    const message = err instanceof Error && "stderr" in err ? err.stderr : String(err);
-    if (message.includes("Could not resolve")) {
-      console.error(fail(`PR '${prRef}' not found.`));
-      console.error(dim("  Make sure you're in a GitHub repository and the PR exists."));
-    } else if (message.includes("no pull requests found")) {
-      console.error(fail(`No pull request found for '${prRef}'.`));
-    } else {
-      console.error(fail(`Failed to get PR info: ${message}`));
-    }
-    process.exit(1);
-  }
-}
-function fetchPRBranch(prRef, prInfo) {
-  try {
-    execSync6(`git fetch origin ${prInfo.headRefName}:${prInfo.headRefName}`, { stdio: "pipe" });
-    return;
-  } catch {
-  }
-  const currentBranch = getCurrentBranch();
-  try {
-    execSync6(`gh pr checkout ${prRef}`, { stdio: "pipe" });
-    execSync6(`git checkout "${currentBranch}"`, { stdio: "pipe" });
-    return;
-  } catch {
-    try {
-      execSync6(`git checkout "${currentBranch}"`, { stdio: "pipe" });
-    } catch {
-    }
-  }
-  try {
-    execSync6(`git fetch origin pull/${prInfo.number}/head:${prInfo.headRefName}`, { stdio: "pipe" });
-    return;
-  } catch (fetchErr) {
-    const message = fetchErr instanceof Error ? fetchErr.message : String(fetchErr);
-    console.error(fail(`Failed to fetch PR branch: ${message}`));
-    process.exit(1);
-  }
-}
-function branchExistsLocally(branch) {
-  try {
-    execSync6(`git show-ref --verify --quiet refs/heads/${branch}`);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function createWorktreeForPR(branch, path) {
-  execSync6(`git worktree add "${path}" "${branch}"`, { stdio: "ignore" });
-}
-function prOpenCommand(prRef) {
-  checkGhInstalled();
-  checkGhAuthenticated();
-  const prInfo = getPRInfo(prRef);
-  const branch = prInfo.headRefName;
-  const prNumber = prInfo.number;
-  if (isInsideWorktree()) {
-    const currentBranch = getCurrentBranch();
-    console.log();
-    console.log(warn(`You're inside a worktree (branch: ${cyan(currentBranch)})`));
-    console.log(`  This will nest subshells (subshell inside subshell).`);
-    console.log();
-    if (!confirm("Continue?")) {
-      process.exit(0);
-    }
-    console.log();
-  }
-  const parentBranch = getCurrentBranch();
-  const existingWorktreePath = getWorktreeForBranch(branch);
-  if (existingWorktreePath) {
-    const worktreeId2 = getWorktreeId(existingWorktreePath);
-    const mainWorktree2 = getMainWorktree();
-    console.log();
-    console.log(success(bold(`PR #${prNumber}`)), dim(`branch: ${cyan(branch)} (existing worktree)`));
-    console.log(dim("Type 'wk close' to return."));
-    console.log();
-    spawnShell(existingWorktreePath, {
-      branch,
-      worktreePath: existingWorktreePath,
-      repoPath: mainWorktree2
-    });
-    console.log();
-    console.log(success(`Back in ${bold(parentBranch)}`));
-    const currentStore2 = loadStore();
-    autoCleanupWorktree(worktreeId2, existingWorktreePath, currentStore2, saveStore);
-    console.log();
-    return;
-  }
-  if (!branchExistsLocally(branch)) {
-    console.log(dim(`Fetching PR #${prNumber}...`));
-    fetchPRBranch(prRef, prInfo);
-  }
-  if (!branchExistsLocally(branch)) {
-    console.error(fail(`Failed to fetch branch '${branch}' for PR #${prNumber}`));
-    process.exit(1);
-  }
-  const store = loadStore();
-  const mainWorktree = getMainWorktree();
-  const repoName = basename5(mainWorktree);
-  const worktreeId = `${repoName}@${slugify(branch)}`;
-  const worktreePath = join6(getWorktreesDir(), worktreeId);
-  mkdirSync5(dirname5(worktreePath), { recursive: true });
-  createWorktreeForPR(branch, worktreePath);
-  initSubmodules(worktreePath);
-  setWorktreeMeta(store, worktreeId, {
-    created_at: (/* @__PURE__ */ new Date()).toISOString()
-  });
-  saveStore(store);
-  console.log();
-  console.log(success(bold(`PR #${prNumber}`)), dim(`branch: ${cyan(branch)}`));
-  console.log(dim(`Opened PR in ephemeral subshell`));
-  console.log(dim("Type 'exit' or 'wk close' to return."));
-  console.log();
-  spawnShell(worktreePath, {
-    branch,
-    worktreePath,
-    repoPath: mainWorktree
-  });
-  console.log();
-  console.log(success(`Back in ${bold(parentBranch)}`));
-  const currentStore = loadStore();
-  autoCleanupWorktree(worktreeId, worktreePath, currentStore, saveStore);
-  console.log();
-}
-
 // index.ts
-var VERSION = "0.1.0";
+var VERSION = "0.2.0";
 function printHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
@@ -8387,8 +8327,7 @@ ${import_picocolors4.default.bold("Usage:")} ${cyan2("wk")} ${dim2("<command>")}
 
 ${import_picocolors4.default.bold("Commands:")}
   ${green2("new")} ${dim2("[branch]")}    Create a branch and open it ${dim2("[--from <branch>]")}
-  ${green2("open")} ${dim2("<branch>")}   Open a branch in an ephemeral subshell
-  ${green2("pr open")} ${dim2("<ref>")}   Open a GitHub PR in an ephemeral subshell
+  ${green2("open")} ${dim2("<ref>")}      Open a branch or PR in an ephemeral subshell
   ${green2("close")}           Exit current subshell
   ${green2("ls")}              List open branches
   ${green2("status")}          Show current branch
@@ -8453,15 +8392,24 @@ ${import_picocolors4.default.bold("Description:")}
 function printOpenHelp() {
   const dim2 = import_picocolors4.default.dim;
   const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wk open")} - Open a branch in an ephemeral subshell
+  console.log(`${import_picocolors4.default.bold("wk open")} - Open a branch or PR in an ephemeral subshell
 
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wk open")} ${dim2("<branch>")}
+${import_picocolors4.default.bold("Usage:")} ${cyan2("wk open")} ${dim2("<ref>")}
 
 ${import_picocolors4.default.bold("Arguments:")}
-  ${dim2("<branch>")}  Branch name ${dim2("(required)")}
+  ${dim2("<ref>")}  Branch name, PR number, or PR URL ${dim2("(required)")}
+
+${import_picocolors4.default.bold("Examples:")}
+  ${dim2("$")} ${cyan2("wk open feature-branch")}           ${dim2("# Open local branch")}
+  ${dim2("$")} ${cyan2("wk open 123")}                      ${dim2("# Open PR #123")}
+  ${dim2("$")} ${cyan2("wk open https://github.com/o/r/pull/123")}
 
 ${import_picocolors4.default.bold("Description:")}
-  Opens the specified branch in an ephemeral subshell.
+  Opens the specified ref in an ephemeral subshell.
+  
+  First tries to open as a local branch. If not found, tries to fetch
+  as a GitHub PR (requires gh CLI to be installed and authenticated).
+  
   If a worktree already exists for the branch, uses that.
   Otherwise, creates a new worktree automatically.
   Type 'wk close' to return.`);
@@ -8544,51 +8492,6 @@ ${import_picocolors4.default.bold("Config locations")} ${dim2("(in precedence or
   ${cyan2(".git/workshell.toml")}  Local only, not committed
   ${cyan2("workshell.toml")}       Project root, can be committed`);
 }
-function printPrHelp() {
-  const dim2 = import_picocolors4.default.dim;
-  const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wk pr")} - Work with GitHub Pull Requests
-
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wk pr")} ${dim2("<subcommand>")} ${dim2("[options]")}
-
-${import_picocolors4.default.bold("Subcommands:")}
-  ${cyan2("open")} ${dim2("<ref>")}  Open a PR in an ephemeral subshell
-
-${import_picocolors4.default.bold("Examples:")}
-  ${dim2("$")} ${cyan2("wk pr open 123")}                      ${dim2("# Open PR by number")}
-  ${dim2("$")} ${cyan2("wk pr open https://github.com/o/r/pull/123")}  ${dim2("# Open PR by URL")}
-
-${import_picocolors4.default.bold("Requirements:")}
-  Requires GitHub CLI (gh) to be installed and authenticated.
-  ${dim2("Install: https://cli.github.com/")}
-  ${dim2("Auth:    gh auth login")}`);
-}
-function printPrOpenHelp() {
-  const dim2 = import_picocolors4.default.dim;
-  const cyan2 = import_picocolors4.default.cyan;
-  console.log(`${import_picocolors4.default.bold("wk pr open")} - Open a GitHub PR in an ephemeral subshell
-
-${import_picocolors4.default.bold("Usage:")} ${cyan2("wk pr open")} ${dim2("<ref>")}
-
-${import_picocolors4.default.bold("Arguments:")}
-  ${dim2("<ref>")}  PR number, URL, or branch name ${dim2("(required)")}
-
-${import_picocolors4.default.bold("Examples:")}
-  ${dim2("$")} ${cyan2("wk pr open 123")}
-  ${dim2("$")} ${cyan2("wk pr open https://github.com/owner/repo/pull/123")}
-  ${dim2("$")} ${cyan2("wk pr open feature-branch")}
-
-${import_picocolors4.default.bold("Description:")}
-  Fetches the PR branch and opens it in an ephemeral subshell.
-  If a worktree already exists for the branch, uses that.
-  Otherwise, creates a new worktree automatically.
-  Type 'wk close' to return.
-
-${import_picocolors4.default.bold("Requirements:")}
-  Requires GitHub CLI (gh) to be installed and authenticated.
-  ${dim2("Install: https://cli.github.com/")}
-  ${dim2("Auth:    gh auth login")}`);
-}
 function isHelp(arg) {
   return arg === "--help" || arg === "-h";
 }
@@ -8630,7 +8533,7 @@ switch (cmd) {
       process.exit(0);
     }
     if (!args[1]) {
-      console.error("Usage: wk open <branch>");
+      console.error("Usage: wk open <branch|pr-number|pr-url>");
       process.exit(1);
     }
     openCommand(args[1]);
@@ -8667,29 +8570,6 @@ switch (cmd) {
     }
     configCommand();
     break;
-  case "pr": {
-    const subCmd = args[1];
-    if (!subCmd || isHelp(subCmd)) {
-      printPrHelp();
-      process.exit(0);
-    }
-    if (subCmd === "open") {
-      if (isHelp(args[2])) {
-        printPrOpenHelp();
-        process.exit(0);
-      }
-      if (!args[2]) {
-        console.error("Usage: wk pr open <pr-number|url|branch>");
-        process.exit(1);
-      }
-      prOpenCommand(args[2]);
-    } else {
-      console.error(`Unknown pr subcommand: ${subCmd}`);
-      console.error("Run 'wk pr --help' for usage.");
-      process.exit(1);
-    }
-    break;
-  }
   case "close":
     if (isHelp(args[1])) {
       printCloseHelp();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workshell",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Agent- and human-friendly Git multitasking, powered by worktrees",
   "type": "module",
   "license": "MIT",