@humanu/orchestra 0.5.77 → 0.5.78

package/resources/scripts/{shell/git/bridge_switch_worktree.sh → server/services/git/switch_worktree_api.sh}

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # Switch to worktree
-bridge_switch_worktree() {
+switch_worktree_api() {
   if [[ -z "${1:-}" ]]; then
     json_error "Branch name required"
     return 1
@@ -20,4 +20,4 @@ bridge_switch_worktree() {
   else
     json_error "Not a git repository"
   fi
-}
+}

package/resources/scripts/server/services/git/worktree_api.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# shellcheck shell=bash
+
+# Master file that sources all individual services functions for worktree operations
+# This maintains the same interface while using modular files
+
+# Source individual worktree functions
+source "$(dirname "${BASH_SOURCE[0]}")/list_worktrees_api.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/check_branch_api.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/create_worktree_api.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/create_worktree_from_existing_api.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/create_worktree_from_remote_api.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/delete_worktree_api.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/delete_worktree_only_api.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/delete_branch_only_api.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/switch_worktree_api.sh"

package/resources/scripts/{shell/bridge/utils.sh → server/services/json.sh}

@@ -3,17 +3,17 @@
 # shellcheck shell=bash
 
 # Initialise JSON backend (jq preferred, python3/node fallbacks)
-bridge_init_json_backend() {
-  if [[ -n "${BRIDGE_JSON_BACKEND:-}" ]]; then
+services_init_json_backend() {
+  if [[ -n "${SERVICES_JSON_BACKEND:-}" ]]; then
     return 0
   fi
 
   if have_cmd jq; then
-    BRIDGE_JSON_BACKEND="jq"
+    SERVICES_JSON_BACKEND="jq"
   elif command -v python3 >/dev/null 2>&1; then
-    BRIDGE_JSON_BACKEND="python"
+    SERVICES_JSON_BACKEND="python"
   elif command -v node >/dev/null 2>&1; then
-    BRIDGE_JSON_BACKEND="node"
+    SERVICES_JSON_BACKEND="node"
   else
     err "jq (or python3/node fallback) required for JSON processing"
     exit 1
@@ -24,8 +24,8 @@ bridge_init_json_backend() {
 # Arguments use the format `key[:type]=value` where type defaults to `s` (string).
 # Supported types: s (string), n (numeric), b (boolean), j (raw JSON), null (null literal).
 json_object() {
-  bridge_init_json_backend
-  case "$BRIDGE_JSON_BACKEND" in
+  services_init_json_backend
+  case "$SERVICES_JSON_BACKEND" in
     jq)
       local -a jq_args=()
       local -a jq_expr_parts=()
@@ -185,9 +185,9 @@ NODE
 
 # Helper to convert newline-delimited text into a JSON array (dropping trailing blank)
 json_array_from_lines() {
-  bridge_init_json_backend
+  services_init_json_backend
   local input="$1"
-  case "$BRIDGE_JSON_BACKEND" in
+  case "$SERVICES_JSON_BACKEND" in
     jq)
       # More robust handling: split and filter out empty lines, then convert to JSON array
       printf '%s' "$input" | jq -R -s 'split("\n") | map(select(length > 0))'
@@ -219,9 +219,9 @@ NODE
 
 # Helper to encode arbitrary text as a JSON string
 json_stringify() {
-  bridge_init_json_backend
+  services_init_json_backend
   local input="$1"
-  case "$BRIDGE_JSON_BACKEND" in
+  case "$SERVICES_JSON_BACKEND" in
     jq)
       printf '%s' "$input" | jq -R -s .
       ;;
@@ -243,9 +243,9 @@ NODE
 
 # Helper to convert newline-separated JSON objects into an array
 json_array_from_json_lines() {
-  bridge_init_json_backend
+  services_init_json_backend
   local input="$1"
-  case "$BRIDGE_JSON_BACKEND" in
+  case "$SERVICES_JSON_BACKEND" in
     jq)
       printf '%s' "$input" | jq -s .
       ;;
@@ -334,8 +334,8 @@ git_error_summary() {
 
 # Helper function to output structured worktree data
 json_worktrees() {
-  bridge_init_json_backend
-  case "$BRIDGE_JSON_BACKEND" in
+  services_init_json_backend
+  case "$SERVICES_JSON_BACKEND" in
     jq)
       git_list_worktrees | jq -R -s '
         split("\n")[:-1] |
@@ -396,9 +396,9 @@ load_anthropic_api_key() {
         return 0
       fi
     else
-      bridge_init_json_backend
+      services_init_json_backend
       local api_key
-      case "$BRIDGE_JSON_BACKEND" in
+      case "$SERVICES_JSON_BACKEND" in
         python)
           api_key="$(python3 - "$config_file" <<'PY'
 import json
@@ -461,9 +461,9 @@ load_openai_api_key() {
         return 0
       fi
     else
-      bridge_init_json_backend
+      services_init_json_backend
       local api_key
-      case "$BRIDGE_JSON_BACKEND" in
+      case "$SERVICES_JSON_BACKEND" in
         python)
           api_key="$(python3 - "$config_file" <<'PY'
 import json
@@ -524,8 +524,8 @@ load_ai_primary_provider() {
     if have_cmd jq; then
       provider="$(jq -r '.ai_primary_provider // empty' "$config_file" 2>/dev/null)"
     else
-      bridge_init_json_backend
-      case "$BRIDGE_JSON_BACKEND" in
+      services_init_json_backend
+      case "$SERVICES_JSON_BACKEND" in
         python)
           provider="$(python3 - "$config_file" <<'PY'
 import json
@@ -576,8 +576,8 @@ load_openai_model() {
     if have_cmd jq; then
       model="$(jq -r '.openai_model // empty' "$config_file" 2>/dev/null)"
     else
-      bridge_init_json_backend
-      case "$BRIDGE_JSON_BACKEND" in
+      services_init_json_backend
+      case "$SERVICES_JSON_BACKEND" in
         python)
           model="$(python3 - "$config_file" <<'PY'
 import json

package/resources/scripts/{shell/bridge → server/services/session}/tmux.sh

@@ -3,7 +3,7 @@
 # shellcheck shell=bash
 
 # List tmux sessions
-bridge_list_sessions() {
+services_list_sessions() {
   if [[ -z "${1:-}" ]]; then
     json_error "Slug parameter required"
     return 1
@@ -29,7 +29,7 @@ bridge_list_sessions() {
 }
 
 # Create tmux session
-bridge_create_session() {
+services_create_session() {
   if [[ -z "${1:-}" ]]; then
     json_error "Slug required"
     return 1
@@ -47,7 +47,7 @@ bridge_create_session() {
 }
 
 # Create exact tmux session
-bridge_create_session_exact() {
+services_create_session_exact() {
   if [[ -z "${1:-}" ]]; then
     json_error "Session name required"
     return 1
@@ -63,7 +63,7 @@ bridge_create_session_exact() {
 }
 
 # Create a new tmux session in the current session's worktree and switch to it.
-bridge_create_workspace_session() {
+services_create_workspace_session() {
   if [[ -z "${1:-}" ]]; then
     json_error "Current session name required"
     return 1
@@ -83,7 +83,7 @@ bridge_create_workspace_session() {
 }
 
 # Close current tmux session after switching to the next workspace session.
-bridge_close_workspace_session() {
+services_close_workspace_session() {
   if [[ -z "${1:-}" ]]; then
     json_error "Current session name required"
     return 1
@@ -103,7 +103,7 @@ bridge_close_workspace_session() {
 }
 
 # Show interactive workspace session menu.
-bridge_workspace_session_menu() {
+services_workspace_session_menu() {
   if [[ -z "${1:-}" ]]; then
     json_error "Current session name required"
     return 1
@@ -123,7 +123,7 @@ bridge_workspace_session_menu() {
 }
 
 # Kill tmux session
-bridge_kill_session() {
+services_kill_session() {
   if [[ -z "${1:-}" ]]; then
     json_error "Session name required"
     return 1
@@ -142,7 +142,7 @@ bridge_kill_session() {
 }
 
 # Attach to tmux session
-bridge_attach_session() {
+services_attach_session() {
   if [[ -z "${1:-}" ]]; then
     json_error "Session name required"
     return 1
@@ -158,7 +158,7 @@ bridge_attach_session() {
 }
 
 # Send keys to tmux session
-bridge_tmux_send_keys() {
+services_tmux_send_keys() {
   if [[ -z "${1:-}" ]]; then
     json_error "Session name required"
     return 1
@@ -173,7 +173,7 @@ bridge_tmux_send_keys() {
 }
 
 # Cycle to next/previous registered Orchestra session in the current workspace
-bridge_cycle_workspace_session() {
+services_cycle_workspace_session() {
   if [[ -z "${1:-}" ]] || [[ -z "${2:-}" ]]; then
     json_error "Session name and direction required"
     return 1
@@ -194,7 +194,7 @@ bridge_cycle_workspace_session() {
 }
 
 # Show Orchestra tmux shortcut help popup
-bridge_tmux_help_popup() {
+services_tmux_help_popup() {
   target_client="${1:-}"
 
   if tmux_available; then
@@ -209,7 +209,7 @@ bridge_tmux_help_popup() {
 }
 
 # Get session metadata
-bridge_session_metadata() {
+services_session_metadata() {
   if [[ -z "${1:-}" ]]; then
     json_error "Session name required"
     return 1
@@ -253,7 +253,7 @@ bridge_session_metadata() {
 }
 
 # Get session preview
-bridge_session_preview() {
+services_session_preview() {
   if [[ -z "${1:-}" ]]; then
     json_error "Session name required"
     return 1
@@ -269,7 +269,7 @@ bridge_session_preview() {
 }
 
 # Check if tmux is available
-bridge_tmux_available() {
+services_tmux_available() {
   if tmux_available; then
     echo "true"
   else