@humanu/orchestra 0.5.52 → 0.5.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@humanu/orchestra",
-  "version": "0.5.52",
+  "version": "0.5.53",
   "description": "AI-powered Git worktree and tmux session manager with modern TUI",
   "keywords": [
     "git",

package/resources/api/tmux.sh

@@ -435,20 +435,35 @@ tmux_list_sessions_for_slug() {
   d="$(_tmux_delim)"
   ORCH_PREFIX="$(_tmux_orch_prefix)"
   
-  # If worktree_path provided, match both old (absolute-path hash) and new (slug hash)
+  # If worktree_path provided, match hash-based and no-hash prefixes
   if [[ -n "$worktree_path" ]]; then
-    local hash_slug hash_path
+    local hash_slug hash_path branch_name
     hash_slug="$(tmux_path_hash "$slug")"
     hash_path="$(tmux_path_hash "$worktree_path")"
+    branch_name="$(git_worktree_path_to_branch "$worktree_path" 2>/dev/null || true)"
+
     local p1_new="${ORCH_PREFIX}${slug}${d}${hash_slug}${d}"
     local p2_new="${slug}${d}${hash_slug}${d}"
     local p1_old="${ORCH_PREFIX}${slug}${d}${hash_path}${d}"
     local p2_old="${slug}${d}${hash_path}${d}"
-    
-    # List sessions with either hash variant
+    local p1_plain="${ORCH_PREFIX}${slug}${d}"
+    local p2_plain="${slug}${d}"
+
+    local p1_branch_hash=""
+    local p2_branch_hash=""
+    local p1_branch_plain=""
+    local p2_branch_plain=""
+    if [[ -n "$branch_name" ]]; then
+      p1_branch_hash="${ORCH_PREFIX}${branch_name}${d}${hash_path}${d}"
+      p2_branch_hash="${branch_name}${d}${hash_path}${d}"
+      p1_branch_plain="${ORCH_PREFIX}${branch_name}${d}"
+      p2_branch_plain="${branch_name}${d}"
+    fi
+
+    # List sessions with any known prefix variant
     tmux list-sessions -F '#{session_name}|||#{session_last_attached}|||#{session_activity}' 2>/dev/null \
       | sed 's/|||/\t/g' \
-      | awk -v a="$p1_new" -v b="$p2_new" -v c="$p1_old" -v d="$p2_old" 'BEGIN{FS="\t"} index($1, a)==1 || index($1, b)==1 || index($1, c)==1 || index($1, d)==1 {print $1"\t"$2"\t"$3}' \
+      | awk -v a="$p1_new" -v b="$p2_new" -v c="$p1_old" -v d="$p2_old" -v e="$p1_plain" -v f="$p2_plain" -v g="$p1_branch_hash" -v h="$p2_branch_hash" -v i="$p1_branch_plain" -v j="$p2_branch_plain" 'BEGIN{FS="\t"} (length(a)>0 && index($1, a)==1) || (length(b)>0 && index($1, b)==1) || (length(c)>0 && index($1, c)==1) || (length(d)>0 && index($1, d)==1) || (length(e)>0 && index($1, e)==1) || (length(f)>0 && index($1, f)==1) || (length(g)>0 && index($1, g)==1) || (length(h)>0 && index($1, h)==1) || (length(i)>0 && index($1, i)==1) || (length(j)>0 && index($1, j)==1) {print $1"\t"$2"\t"$3}' \
       | sort -t $'\t' -k2,2nr -k3,3nr \
       | awk -F '\t' '{print $1}' | awk '!seen[$0]++' || true
   else

package/resources/scripts/shell/git/bridge_delete_branch_only.sh

@@ -2,8 +2,8 @@
 
 # shellcheck shell=bash
 
-# Delete worktree only
-bridge_delete_worktree_only() {
+# Delete branch only
+bridge_delete_branch_only() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1
@@ -11,15 +11,13 @@ bridge_delete_worktree_only() {
   branch_name="$1"
   
   if git_require_repo_root >/dev/null 2>&1; then
-    worktree_path="$(git_branch_to_worktree_path "$branch_name")"
-    
-    if [[ -n "$worktree_path" ]]; then
-      git_remove_worktree "$worktree_path"
+    if git_branch_exists "$branch_name"; then
+      git_delete_branch "$branch_name"
       echo "true"
     else
-      json_error "No worktree found for branch: $branch_name"
+      json_error "Branch not found: $branch_name"
     fi
   else
     json_error "Not a git repository"
   fi
-}
+}

package/resources/scripts/shell/git/bridge_delete_worktree_only.sh

@@ -2,8 +2,8 @@
 
 # shellcheck shell=bash
 
-# Delete worktree
-bridge_delete_worktree() {
+# Delete worktree only
+bridge_delete_worktree_only() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1
@@ -12,17 +12,13 @@ bridge_delete_worktree() {
   
   if git_require_repo_root >/dev/null 2>&1; then
     worktree_path="$(git_branch_to_worktree_path "$branch_name")"
-    
     if [[ -n "$worktree_path" ]]; then
       git_remove_worktree "$worktree_path"
+      echo "true"
+    else
+      json_error "No worktree found for branch: $branch_name"
     fi
-    
-    if git_branch_exists "$branch_name"; then
-      git_delete_branch "$branch_name"
-    fi
-    
-    echo "true"
   else
     json_error "Not a git repository"
   fi
-}
+}