@humanu/orchestra 0.5.73 → 0.5.74
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
package/resources/api/tmux.sh
CHANGED
|
@@ -506,14 +506,6 @@ _tmux_truncate_tab_label() {
|
|
|
506
506
|
fi
|
|
507
507
|
}
|
|
508
508
|
|
|
509
|
-
_tmux_pad_tab_label() {
|
|
510
|
-
local label="$1"
|
|
511
|
-
local width="${2:-14}"
|
|
512
|
-
|
|
513
|
-
label="$(_tmux_truncate_tab_label "$label" "$width")"
|
|
514
|
-
printf '%-*s' "$width" "$label"
|
|
515
|
-
}
|
|
516
|
-
|
|
517
509
|
_tmux_workspace_session_rows() {
|
|
518
510
|
local current_session="$1"
|
|
519
511
|
local repo_root="$2"
|
|
@@ -589,8 +581,8 @@ _tmux_workspace_session_tabs() {
|
|
|
589
581
|
local current_session="$1"
|
|
590
582
|
local fallback_display_name="$2"
|
|
591
583
|
local session_dir repo_root rows tabs name display_name tab_label escaped_tab_label divider active_style inactive_style muted_style reset_style
|
|
592
|
-
local
|
|
593
|
-
local
|
|
584
|
+
local tab_max_width=24
|
|
585
|
+
local active_label_max_width=22
|
|
594
586
|
|
|
595
587
|
session_dir="$(tmux display-message -t "$current_session" -p '#{pane_current_path}' 2>/dev/null || echo "")"
|
|
596
588
|
repo_root="$(_tmux_shared_root_for_path "$session_dir" 2>/dev/null || true)"
|
|
@@ -602,7 +594,7 @@ _tmux_workspace_session_tabs() {
|
|
|
602
594
|
fi
|
|
603
595
|
|
|
604
596
|
if [[ -z "$rows" ]]; then
|
|
605
|
-
tab_label="$(
|
|
597
|
+
tab_label="$(_tmux_truncate_tab_label "$fallback_display_name" "$active_label_max_width")"
|
|
606
598
|
escaped_tab_label="$(_tmux_status_escape_text "$tab_label")"
|
|
607
599
|
printf '#[bg=#414868] #[fg=#ff9e64,bg=#414868,bold]● #[fg=#c0caf5,bg=#414868,bold]%s #[default]' "$escaped_tab_label"
|
|
608
600
|
return
|
|
@@ -621,7 +613,7 @@ _tmux_workspace_session_tabs() {
|
|
|
621
613
|
tabs+="$divider"
|
|
622
614
|
fi
|
|
623
615
|
if [[ "$name" == "__ellipsis__" ]]; then
|
|
624
|
-
tab_label="
|
|
616
|
+
tab_label="⋯"
|
|
625
617
|
escaped_tab_label="$(_tmux_status_escape_text "$tab_label")"
|
|
626
618
|
tabs+="${muted_style} ${escaped_tab_label} ${reset_style}"
|
|
627
619
|
continue
|
|
@@ -631,11 +623,11 @@ _tmux_workspace_session_tabs() {
|
|
|
631
623
|
display_name="$(tmux_format_session_display "$name" without-timestamp)"
|
|
632
624
|
fi
|
|
633
625
|
if [[ "$name" == "$current_session" ]]; then
|
|
634
|
-
tab_label="$(
|
|
626
|
+
tab_label="$(_tmux_truncate_tab_label "$display_name" "$active_label_max_width")"
|
|
635
627
|
escaped_tab_label="$(_tmux_status_escape_text "$tab_label")"
|
|
636
628
|
tabs+="#[bg=#414868] #[fg=#ff9e64,bg=#414868,bold]● ${active_style}${escaped_tab_label} ${reset_style}"
|
|
637
629
|
else
|
|
638
|
-
tab_label="$(
|
|
630
|
+
tab_label="$(_tmux_truncate_tab_label "$display_name" "$tab_max_width")"
|
|
639
631
|
escaped_tab_label="$(_tmux_status_escape_text "$tab_label")"
|
|
640
632
|
tabs+="${inactive_style} ${escaped_tab_label} ${reset_style}"
|
|
641
633
|
fi
|
|
@@ -651,7 +643,7 @@ _tmux_orchestra_status_left() {
|
|
|
651
643
|
}
|
|
652
644
|
|
|
653
645
|
_tmux_orchestra_status_right() {
|
|
654
|
-
printf ''
|
|
646
|
+
printf '#[fg=#565f89,bg=#1a1b26]Ctrl+b,h for help#[default]'
|
|
655
647
|
}
|
|
656
648
|
|
|
657
649
|
_tmux_configure_orchestra_bindings() {
|
|
@@ -669,6 +661,8 @@ _tmux_configure_orchestra_bindings() {
|
|
|
669
661
|
|
|
670
662
|
tmux bind-key -T prefix '?' if-shell -F '#{@orchestra_display_name}' \
|
|
671
663
|
"run-shell -b \"$help_command\"" 'list-keys -N' >/dev/null 2>&1 || true
|
|
664
|
+
tmux bind-key -T prefix h if-shell -F '#{@orchestra_display_name}' \
|
|
665
|
+
"run-shell -b \"$help_command\"" 'refresh-client -S' >/dev/null 2>&1 || true
|
|
672
666
|
tmux bind-key -T prefix r if-shell -F '#{@orchestra_display_name}' \
|
|
673
667
|
"$prompt_command" 'refresh-client -S' >/dev/null 2>&1 || true
|
|
674
668
|
tmux bind-key -T prefix '>' if-shell -F '#{@orchestra_display_name}' \
|
|
@@ -700,7 +694,7 @@ _tmux_configure_orchestra_status() {
|
|
|
700
694
|
tmux set-option -t "$session_name" status-left "$status_left" >/dev/null 2>&1 || true
|
|
701
695
|
tmux set-option -t "$session_name" status-left-length 1000 >/dev/null 2>&1 || true
|
|
702
696
|
tmux set-option -t "$session_name" status-right "$status_right" >/dev/null 2>&1 || true
|
|
703
|
-
tmux set-option -t "$session_name" status-right-length
|
|
697
|
+
tmux set-option -t "$session_name" status-right-length 40 >/dev/null 2>&1 || true
|
|
704
698
|
tmux set-option -t "$session_name" window-status-format "" >/dev/null 2>&1 || true
|
|
705
699
|
tmux set-option -t "$session_name" window-status-current-format "" >/dev/null 2>&1 || true
|
|
706
700
|
tmux set-option -t "$session_name" window-status-separator "" >/dev/null 2>&1 || true
|
|
@@ -1509,21 +1503,32 @@ tmux_show_orchestra_help_popup() {
|
|
|
1509
1503
|
fi
|
|
1510
1504
|
|
|
1511
1505
|
local popup_command
|
|
1512
|
-
popup_command=
|
|
1506
|
+
popup_command="$(cat <<'EOF'
|
|
1507
|
+
bash -lc '
|
|
1508
|
+
trap "exit 0" INT TERM
|
|
1509
|
+
printf "%s\n" \
|
|
1513
1510
|
"Orchestra tmux shortcuts" \
|
|
1514
1511
|
"" \
|
|
1512
|
+
"Ctrl+b, d Detach and return to Orchestra" \
|
|
1513
|
+
"Ctrl+b, r Rename the current Orchestra session" \
|
|
1514
|
+
"" \
|
|
1515
1515
|
"Ctrl+b, Left Previous Orchestra session in this workspace" \
|
|
1516
1516
|
"Ctrl+b, Right Next Orchestra session in this workspace" \
|
|
1517
1517
|
"Ctrl+b, < Previous Orchestra session in this workspace" \
|
|
1518
1518
|
"Ctrl+b, > Next Orchestra session in this workspace" \
|
|
1519
|
-
"
|
|
1520
|
-
"Ctrl+b, d Detach and return to Orchestra" \
|
|
1519
|
+
"" \
|
|
1521
1520
|
"Ctrl+b, [ Copy/scroll mode" \
|
|
1521
|
+
"Ctrl+b, h Show this help" \
|
|
1522
1522
|
"Ctrl+b, ? Show this help" \
|
|
1523
1523
|
"" \
|
|
1524
|
-
"Press
|
|
1524
|
+
"Press any key to close..."
|
|
1525
|
+
IFS= read -rsn1 _ || true
|
|
1526
|
+
exit 0
|
|
1527
|
+
'
|
|
1528
|
+
EOF
|
|
1529
|
+
)"
|
|
1525
1530
|
|
|
1526
|
-
tmux display-popup "${target_args[@]}" -E -w 78 -h
|
|
1531
|
+
tmux display-popup "${target_args[@]}" -E -w 78 -h 18 -T "Orchestra shortcuts" "$popup_command" >/dev/null 2>&1 || true
|
|
1527
1532
|
}
|
|
1528
1533
|
|
|
1529
1534
|
# Find the adjacent active Orchestra session registered for the current repo.
|
|
Binary file
|
|
Binary file
|
|
Binary file
|