RT-34: worktree lifecycle — ephemeral trees, on-deck pool, parking-lot retirement

commands/cd.ts

@@ -52,6 +52,12 @@ const SHELL_FUNCTION = [
  ` elif [ "$1" = "nav" ]; then`,
  ` local dir`,
  ` dir="$(COLUMNS=$COLUMNS "$rt_bin" nav "\${@:2}")" && [ -n "$dir" ] && builtin cd "$dir"`,
+ ` elif [ "$1" = "worktree" ] && [ -z "$2" ]; then`,
+ ` # Bare 'rt worktree' is the nav picker (same contract as cd/nav) — jump`,
+ ` # into the selected tree. 'rt worktree <subcommand>' passes straight`,
+ ` # through below.`,
+ ` local dir`,
+ ` dir="$(COLUMNS=$COLUMNS "$rt_bin" worktree)" && [ -n "$dir" ] && builtin cd "$dir"`,
  ` elif [ "$1" = "x" ]; then`,
  ` "$rt_bin" "$@"`,
  ` local rt_cwd`,
@@ -79,7 +85,13 @@ async function ensureShellFunction(): Promise<void> {
  } catch { /* no rc file yet */ }
 
  // Latest version marker: whence -p / type -P PATH-only lookup (fixes FUNCNEST recursion)
- if (rcContent.includes('rt() {') && rcContent.includes('whence -p rt') && rcContent.includes('"$rt_bin" nav')) return;
+ // + bare 'rt worktree' cd-jump support.
+ if (
+ rcContent.includes('rt() {') &&
+ rcContent.includes('whence -p rt') &&
+ rcContent.includes('"$rt_bin" nav') &&
+ rcContent.includes('"$1" = "worktree"')
+ ) return;
 
  // Redirect stdout → stderr before showing prompts
  const origWrite = process.stdout.write.bind(process.stdout);
@@ -95,14 +107,18 @@ async function ensureShellFunction(): Promise<void> {
  const hasHashCacheBug = rcContent.includes("rt() {") && rcContent.includes("command rt cd") && !rcContent.includes("local rt_bin");
  // Uses command -v which returns the function name in zsh, causing infinite recursion
  const hasFuncnestBug = rcContent.includes("rt() {") && rcContent.includes("command -v rt") && !rcContent.includes("whence -p rt");
- const hasOldFunction = hasLegacyRtcd || hasOldRtWrapper || hasPreRehashWrapper || hasHashCacheBug || hasFuncnestBug;
+ // Function exists and is otherwise current, but predates bare 'rt worktree' cd-jump support.
+ const hasNoWorktreeNav = rcContent.includes("rt() {") && rcContent.includes('"$rt_bin" nav') && !rcContent.includes('"$1" = "worktree"');
+ const hasOldFunction = hasLegacyRtcd || hasOldRtWrapper || hasPreRehashWrapper || hasHashCacheBug || hasFuncnestBug || hasNoWorktreeNav;
 
  if (hasFuncnestBug) {
  console.error(`\n ${yellow}Upgrading rt shell wrapper: fix FUNCNEST recursion in zsh${reset}`);
  } else if (hasPreRehashWrapper) {
  console.error(`\n ${yellow}Upgrading rt shell wrapper: auto-rehash after dev-mode toggle${reset}`);
  } else if (hasNoNav) {
  console.error(`\n ${yellow}Upgrading rt shell wrapper: adding rt nav cd support${reset}`);
+ } else if (hasNoWorktreeNav) {
+ console.error(`\n ${yellow}Upgrading rt shell wrapper: adding rt worktree cd support${reset}`);
  } else if (hasHashCacheBug) {
  console.error(`\n ${yellow}Upgrading rt shell wrapper: resolve dev-mode binary by absolute path${reset}`);
  } else if (hasOldRtWrapper) {
@@ -131,7 +147,7 @@ async function ensureShellFunction(): Promise<void> {
  process.exit(0);
  }
 
- if (hasOldRtWrapper || hasPreRehashWrapper || hasNoNav || hasHashCacheBug || hasFuncnestBug) {
+ if (hasOldRtWrapper || hasPreRehashWrapper || hasNoNav || hasHashCacheBug || hasFuncnestBug || hasNoWorktreeNav) {
  rcContent = rcContent
  .replace(/\n?# rt — shell wrapper \(enables rt cd to change directory\)\n?/g, "")
  .replace(/\n?rt\(\) \{[\s\S]*?\n\}\n?/g, "\n");

commands/hooks.ts

@@ -88,18 +88,18 @@ function generateShims(dataDir: string, discoveredHooks: string[]): void {
 
  const configFile = hooksConfigPath(dataDir);
 
- // Always include pre-commit so the parking-lot guard runs even if the repo
+ // Always include pre-commit so the on-deck guard runs even if the repo
  // has no .husky/pre-commit of its own.
  const hookNames = [...new Set(["pre-commit", ...discoveredHooks])];
 
  for (const hookName of hookNames) {
  const shimPath = join(hooksDir, hookName);
 
- const parkingLotGuard = hookName === "pre-commit" ? `
-# Parking-lot guard: block commits on parking-lot/* branches.
+ const onDeckGuard = hookName === "pre-commit" ? `
+# On-deck guard: block commits on on-deck/* branches.
 CURRENT_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
-if [[ "$CURRENT_BRANCH" == parking-lot/* ]]; then
- echo "rt: commits are not allowed on parking-lot branches (on \\"$CURRENT_BRANCH\\")"
+if [[ "$CURRENT_BRANCH" == on-deck/* ]]; then
+ echo "rt: commits are not allowed on on-deck branches (on \\"$CURRENT_BRANCH\\")"
  echo "rt: switch to a feature branch before committing"
  exit 1
 fi
@@ -108,7 +108,7 @@ fi
  const shim = `#!/bin/bash
 # rt hook shim — checks ~/.rt config before running the real hook
 # Fail-safe: if config is missing or unreadable, the real hook runs
-${parkingLotGuard}
+${onDeckGuard}
 HOOKS_CONFIG="${configFile}"
 HOOK_NAME="${hookName}"