@san-siva/gitsy 1.0.4 → 1.0.6

package/README.md

@@ -109,6 +109,7 @@ g-wa -t new-feature
 - Moves your repository into a `main` subdirectory
 - Creates a `worktrees` directory for branch isolation
 - Provides clear step-by-step feedback throughout the process
+- Requires confirmation before making any changes
 
 **Structure after setup:**
 ```
@@ -121,7 +122,9 @@ your-repo/
 ```
 
 **Key features:**
-- Only creates worktrees from the default branch (main/master)
+- Creates new branches from your current branch (preserves branch context)
+- If you're on `develop` and create a new branch, it will be cut from `develop`
+- During restructuring, automatically creates worktrees for both the original branch and target branch
 - Automatically sanitizes branch names for directory creation
 - Converts paths to absolute paths for clarity
 - Checks for existing worktrees to prevent duplicates

package/bin/g-wa

@@ -78,7 +78,7 @@ check_branch_in_worktree() {
 	local branch=$1
 	local step_number=$2
 
-	print_message "${BLUE}Checking if branch exists in worktrees...${NC}" $step_number
+	print_message "${BLUE}Checking if ${NC}${branch}${BLUE} branch exists...${NC}" $step_number
 
 	# Check if branch is already checked out in another worktree
 	local existing_worktree=$(git worktree list | grep "\[${branch}\]" | awk '{print $1}')
@@ -92,7 +92,6 @@ check_branch_in_worktree() {
 
 generate_worktree_path() {
 	local target_branch=$1
-	local step_number=$2
 
 	# Determine worktree directory based on current location
 	local worktree_dir
@@ -142,7 +141,7 @@ checkout_or_create_branch() {
 	# Check if branch exists locally
 	if git show-ref --verify --quiet "refs/heads/${target_branch}"; then
 		try_fetching_branch
-		print_message "${BLUE}Creating worktree for branch ${NC}${target_branch}${BLUE} at ${NC}${path}${NC}" $((step_number + 1))
+		print_message "${BLUE}Creating ${NC}${target_branch}${BLUE} worktree...${NC}" $((step_number + 1))
 		create_worktree "${target_branch}" "${path}"
 		return
 	fi
@@ -153,7 +152,7 @@ checkout_or_create_branch() {
 	if git ls-remote --heads origin "${target_branch}" | grep -q "${target_branch}"; then
 		print_message "${GREEN}Branch available on remote.${NC}"
 		try_fetching_branch
-		print_message "${BLUE}Creating worktree for branch ${NC}${target_branch}${BLUE} at ${NC}${path}${NC}" $((step_number + 2))
+		print_message "${BLUE}Creating ${NC}${target_branch}${BLUE} worktree...${NC}" $((step_number + 2))
 		create_worktree "${target_branch}" "${path}"
 		return
 	fi
@@ -162,7 +161,7 @@ checkout_or_create_branch() {
 
 	create_new_branch=$(prompt_user true "Create new branch?" $((step_number + 2)))
 	if [ "${create_new_branch}" = "y" ]; then
-		print_message "${BLUE}Creating worktree for branch ${NC}${target_branch}${BLUE} at ${NC}${path}${NC}" $((step_number + 3))
+		print_message "${BLUE}Creating ${NC}${target_branch}${BLUE} worktree...${NC}" $((step_number + 3))
 		create_worktree "${target_branch}" "${path}" true
 		return
 	fi
@@ -177,6 +176,7 @@ prompt_restructure_confirmation() {
 	local repo_name=$2
 	local default_branch=$3
 	local step_number=$4
+	local target_branch=$5
 
 	# Save the current branch before restructuring
 	local original_branch=$(get_current_branch)
@@ -197,13 +197,24 @@ prompt_restructure_confirmation() {
 
 	# If not on default branch, mention worktree will be created
 	if [ "$original_branch" != "$default_branch" ]; then
-		local sanitized_name=$(sanitize_branch_name "$original_branch")
+		local sanitized_original=$(sanitize_branch_name "$original_branch")
+		local sanitized_target=$(sanitize_branch_name "$target_branch")
 		print_message "" 0 >&2
 		print_message "Note: You're currently on ${BLUE}${original_branch}${NC} (not ${BLUE}${default_branch}${NC})" 0 >&2
-		print_message "Two directories will be created:" 0 >&2
-		print_message "" 0 >&2
-		print_message "• ${BLUE}${repo_name}/main${NC} → ${BLUE}${default_branch}${NC} branch" 0 >&2
-		print_message "• ${BLUE}${repo_name}/worktrees/${sanitized_name}${NC} → ${BLUE}${original_branch}${NC} branch" 0 >&2
+
+		# Check if target branch is the same as original branch
+		if [ "$target_branch" = "$original_branch" ]; then
+			print_message "Two directories will be created:" 0 >&2
+			print_message "" 0 >&2
+			print_message "• ${BLUE}${repo_name}/main${NC} → ${BLUE}${default_branch}${NC} branch" 0 >&2
+			print_message "• ${BLUE}${repo_name}/worktrees/${sanitized_original}${NC} → ${BLUE}${original_branch}${NC} branch" 0 >&2
+		else
+			print_message "Three directories will be created:" 0 >&2
+			print_message "" 0 >&2
+			print_message "• ${BLUE}${repo_name}/main${NC} → ${BLUE}${default_branch}${NC} branch" 0 >&2
+			print_message "• ${BLUE}${repo_name}/worktrees/${sanitized_original}${NC} → ${BLUE}${original_branch}${NC} branch" 0 >&2
+			print_message "• ${BLUE}${repo_name}/worktrees/${sanitized_target}${NC} → ${BLUE}${target_branch}${NC} branch (cut from ${BLUE}${original_branch}${NC})" 0 >&2
+		fi
 	fi
 
 	# Prompt user for confirmation
@@ -266,7 +277,7 @@ checkout_main_in_main_branch() {
 	local step_number=$4
 
 	# Checkout the default branch into main
-	print_message "${BLUE}Checking out branch ${NC}${default_branch}${BLUE} into main directory...${NC}" $step_number
+	print_message "${BLUE}Creating main worktree...${NC}" $step_number
 	if ! git -c color.ui=always checkout "$default_branch" 2>&1 | indent; then
 		print_message "" -1
 		print_message "${RED}Failed to checkout ${NC}${default_branch}${RED} branch. [Fail]${NC}" -1
@@ -276,16 +287,48 @@ checkout_main_in_main_branch() {
 	print_message "${GREEN}Repository restructured successfully to ${NC}${repo_name}/main/${GREEN}. [DONE]${NC}"
 }
 
-should_trigger_from_default_branch() {
-	local default_branch=$1
-	local original_branch=$2
+checkout_current_branch() {
+	local step_number=$1
+	local default_branch=$2
+	local original_branch=$3
 
-	if [ "$original_branch" != "$default_branch" ]; then
+	if [ -z "$step_number" ]; then
+		step_number=0
+	fi
+
+	if [ -z "$default_branch" ]; then
+		print_message "" -1
+		print_message "${RED}Default branch is not set. [Fail]${NC}" -1
+		exit 1
+	fi
+
+	if [ "$default_branch" = "$original_branch" ]; then
+		return 0
+	fi
+
+	local path=$(generate_worktree_path "$original_branch" $step_number)
+	print_message "${BLUE}Creating ${NC}${original_branch}${BLUE} worktree...${NC}" $step_number
+	create_worktree "$original_branch" "$path"
+
+	# Navigate to the created worktree
+	if ! navigate_to_dir "$path"; then
+		print_message "" -1
+		print_message "${RED}Failed to navigate to ${original_branch} worktree. [Fail]${NC}" -1
+		exit 1
+	fi
+}
+
+already_restructured() {
+	local current_dir=$(pwd)
+	if ! navigate_to_main_dir "false"; then
+		return 1
+	fi
+	if ! navigate_to_dir "$current_dir"; then
 		print_message "" -1
-		print_message "${RED}Warning: We only support creating worktrees from the default branch.${NC}" -1
-		print_message "${RED}Commit or stash changes, checkout to ${NC}${default_branch}${RED}, and try again.${NC}" -1
+		print_message "${RED}Failed to navigate back to original directory. [Fail]${NC}" -1
 		exit 1
 	fi
+	return 0
 }
 
 create_main_dir_if_necessary() {
@@ -301,17 +344,15 @@ create_main_dir_if_necessary() {
 	local parent_dir=$(basename "$(dirname "$git_root")")
 	local repo_name=$(get_repo_name)
 
-	# Check if already in correct structure (repo_name/main/.git)
-	if [ "$current_dir" = "main" ] && [ "$parent_dir" = "$repo_name" ]; then
+	if already_restructured; then
 		return 0
 	fi
 
+	# Save original branch before restructuring
+	local original_branch=$(get_current_branch)
+
 	# Prompt user for restructuring
-	prompt_restructure_confirmation "$git_root" "$repo_name" "$default_branch" "$step_number"
-	local prompt_exit_code=$?
-	if [ $prompt_exit_code -ne 0 ]; then
-		exit $prompt_exit_code
-	fi
+	prompt_restructure_confirmation "$git_root" "$repo_name" "$default_branch" "$step_number" "$target_branch"
 
 	# Get parent directory path
 	local parent_path=$(dirname "$git_root")
@@ -329,18 +370,11 @@ create_main_dir_if_necessary() {
 
 	# Checkout the default branch into main directory
 	checkout_main_in_main_branch "$repo_name" "$main_dir" "$default_branch" $((step_number + 2))
-}
 
-create_target_dir_if_necessary() {
-	# Generate worktree path
-	local path=$(generate_worktree_path "${target_branch}" $step_number)
+	# Create worktree for original branch and navigate to it (if different from default)
+	checkout_current_branch $((step_number + 3)) "$default_branch" "$original_branch"
 
-	# Check if branch exists locally
-	if git show-ref --verify --quiet "refs/heads/${target_branch}"; then
-		try_fetching_branch
-		create_worktree "${target_branch}" "${path}"
-		return
-	fi
+	return 1
 }
 
 main() {
@@ -369,8 +403,6 @@ main() {
 	local default_branch=$(get_default_branch)
 	local current_branch=$(get_current_branch)
 
-	should_trigger_from_default_branch "$default_branch" "$current_branch"
-
 	local step_number=2
 	if [ "$stash" = true ]; then
 		step_number=3
@@ -381,22 +413,29 @@ main() {
 	local current_dir=$(basename "$git_root")
 	local parent_dir=$(basename "$(dirname "$git_root")")
 	local repo_name=$(get_repo_name)
-	local needs_restructure=false
+	create_main_dir_if_necessary "$default_branch" $step_number
+	local needs_restructure=$?
 
-	if [ "$current_dir" != "main" ] || [ "$parent_dir" != "$repo_name" ]; then
-		needs_restructure=true
-	fi
+	if [ $needs_restructure -eq 1 ]; then
+		checkout_or_create_branch $((step_number + 4))
+	else
+		# Notify user that worktree will be created
+		local sanitized_target=$(sanitize_branch_name "$target_branch")
+		print_message "" -1
+		print_message "${BLUE}Will create ${NC}${target_branch}${BLUE} worktree (cut from ${NC}${current_branch}${BLUE})${NC}" -1
+		print_message "Location: ${BLUE}${repo_name}/worktrees/${sanitized_target}${NC}" -1
+		print_message "" -1
 
-	create_main_dir_if_necessary "$default_branch" $step_number
+		# Prompt user for confirmation
+		local proceed=$(prompt_user false "Proceed with creating worktree?" "$step_number")
+		if [ "$proceed" != "y" ]; then
+			print_message "" -1
+			print_message "${RED}Worktree creation cancelled by user.${NC}" -1
+			exit 1
+		fi
 
-	# Calculate next step number
-	local next_step=$((step_number + 1))
-	if [ "$needs_restructure" = true ]; then
-		# Restructuring uses 3 steps: prompt, move, checkout
-		next_step=$((step_number + 3))
+		checkout_or_create_branch $((step_number + 1))
 	fi
-
-	checkout_or_create_branch $next_step
 }
 
 main "$@"

package/bin/g-wr

@@ -87,27 +87,34 @@ set_flags() {
 }
 
 cd_to_worktrees_dir() {
-	local current_dir=$(pwd)
-	local current_dirname=$(basename "$current_dir")
-	if [ "$current_dirname" = "worktrees" ]; then
+	# Get git root and navigate to repo root's worktrees directory
+	local git_root=$(git rev-parse --show-toplevel)
+	local git_root_parent=$(dirname "$git_root")
+	local git_root_parent_name=$(basename "$git_root_parent")
+
+	# If we're in a worktree (parent is "worktrees"), use that directory
+	if [ "$git_root_parent_name" = "worktrees" ]; then
+		if ! navigate_to_dir "$git_root_parent"; then
+			print_message "" -1 >&2
+			print_message "${RED}Failed to navigate to worktrees directory. [Fail]${NC}" -1 >&2
+			exit 1
+		fi
 		return 0
 	fi
 
-	if [ -d "../worktrees" ]; then
-		if navigate_to_dir "../worktrees"; then
-			return 0
-		fi
+	# Otherwise, we're in main, so look for ../worktrees
+	local worktrees_dir="$git_root_parent/worktrees"
+	if [ ! -d "$worktrees_dir" ]; then
+		print_message "" -1 >&2
+		print_message "${RED}Worktrees directory not found at ${NC}${worktrees_dir}${RED}. [Fail]${NC}" -1 >&2
+		exit 1
 	fi
 
-	if [ -d "../../worktrees" ]; then
-		if navigate_to_dir "../../worktrees"; then
-			return 0
-		fi
+	if ! navigate_to_dir "$worktrees_dir"; then
+		print_message "" -1 >&2
+		print_message "${RED}Failed to navigate to worktrees directory. [Fail]${NC}" -1 >&2
+		exit 1
 	fi
-
-	print_message "" -1 >&2
-	print_message "${RED}Worktrees directory not found. [Fail]${NC}" -1 >&2
-	exit 1
 }
 
 find_worktree_by_name() {
@@ -122,13 +129,11 @@ find_worktree_by_name() {
 		fi
 
 		if [ "$dir" = "$worktree_name" ]; then
-			navigate_to_main_dir
 			echo "$worktrees_dir/$dir"
 			return 0
 		fi
 	done
 
-	navigate_to_main_dir
 	return 1
 }
 
@@ -145,26 +150,22 @@ find_worktree_by_branch() {
 			continue
 		fi
 
-		if ! navigate_to_dir "$dir"; then
+		local worktree_path="$worktrees_dir/$dir"
+		if ! navigate_to_dir "$worktree_path"; then
 			continue
 		fi
 
 		local branch=$(get_current_branch 2>/dev/null)
 		if [ -z "$branch" ]; then
-			navigate_to_dir "$worktrees_dir"
 			continue
 		fi
 
 		if [ "$branch" = "$target_branch" ]; then
-			navigate_to_main_dir
-			echo "$worktrees_dir/$dir"
+			echo "$worktree_path"
 			return 0
 		fi
-
-		navigate_to_dir "$worktrees_dir"
 	done
 
-	navigate_to_main_dir
 	return 1
 }
 
@@ -182,12 +183,18 @@ check_if_worktree_is_clean() {
 	local worktree_path=$1
 	local step_number=$2
 
+	print_message "${BLUE}Checking for uncommitted changes...${NC}" $step_number
+
 	if has_uncommitted_changes "$worktree_path"; then
-		response=$(prompt_user "false" "Your worktree has uncommitted changes. Do you want to discard them?" $step_number)
+		print_message "${PROMPT}Worktree has uncommitted changes.${NC}" 0
+		response=$(prompt_user "false" "Do you want to discard them and remove the worktree?" $step_number)
 		if [ "$response" = "n" ]; then
-			print_message "${RED}Skipping worktree removal.${NC}" 0
+			print_message "" -1
+			print_message "${RED}Worktree removal cancelled. Your changes are safe.${NC}" -1
 			exit 0
 		fi
+	else
+		print_message "${GREEN}No uncommitted changes found.${NC}" 0
 	fi
 }
 
@@ -197,27 +204,23 @@ remove_worktree() {
 
 	print_message "${BLUE}Removing worktree at ${NC}${worktree_path}${BLUE}...${NC}" $step_number
 
-	if [ -z "$worktree_name" ]; then
-		# Try using git worktree remove first with --force flag
-		if git -c color.ui=always worktree remove --force "$worktree_path" 2>&1 | indent; then
-			# Verify the directory was actually removed
-			if [ ! -d "$worktree_path" ]; then
-				print_message "${GREEN}Worktree removed successfully using git.${NC}" 0
-				return 0
-			fi
+	# Always try using git worktree remove first with --force flag
+	if git -c color.ui=always worktree remove --force "$worktree_path" 2>&1 | indent; then
+		# Verify the directory was actually removed
+		if [ ! -d "$worktree_path" ]; then
+			print_message "${GREEN}Worktree removed successfully.${NC}" 0
+			return 0
 		fi
-		print_message "${PROMPT}Git worktree remove incomplete. Attempting manual removal...${NC}" 0
 	fi
 
-	# Fallback to rm -rf
+	# Fallback to rm -rf if git worktree remove failed
+	print_message "${PROMPT}Git worktree remove incomplete. Attempting manual removal...${NC}" 0
 	if rm -rf "$worktree_path" 2>&1 | indent; then
-		if [ -z "$worktree_name" ]; then
-			# Also need to prune the worktree from git's records
-			git -c color.ui=always worktree prune 2>&1 | indent
-		fi
+		# Also need to prune the worktree from git's records
+		git -c color.ui=always worktree prune 2>&1 | indent
 		# Verify the directory was actually removed
 		if [ ! -d "$worktree_path" ]; then
-			print_message "${GREEN}Worktree removed successfully using rm -rf.${NC}" 0
+			print_message "${GREEN}Worktree removed successfully.${NC}" 0
 			return 0
 		fi
 	fi
@@ -262,7 +265,13 @@ main() {
 		print_message "${GREEN}Found worktree: ${NC}${worktree_dirname}${GREEN} at ${NC}${worktree_path}${NC}" $((step_number + 1))
 	fi
 
-	print_message "${BLUE}Checking for uncommitted changes...${NC}" $((step_number + 2))
+	# Prevent removal of main directory
+	if [ "$worktree_dirname" = "main" ]; then
+		print_message "" -1
+		print_message "${RED}Cannot remove main directory. This is your default branch worktree. [Fail]${NC}" -1
+		exit 1
+	fi
+
 	check_if_worktree_is_clean "$worktree_path" $((step_number + 2))
 
 	remove_worktree "$worktree_path" $((step_number + 3))

package/bin/utils

@@ -468,6 +468,7 @@ navigate_to_main_dir() {
 	local current_dir=$(pwd)
 	local current_dirname=$(basename "$current_dir")
 	local parent_dirname=$(basename "$(dirname "$current_dir")")
+	local should_exit_on_failure=$1
 
 	# Already in main directory (but not nested main/main)
 	if [ "$current_dirname" = "main" ] && [ "$parent_dirname" != "main" ]; then
@@ -488,9 +489,13 @@ navigate_to_main_dir() {
 		fi
 	fi
 
-	print_message "" -1
-	print_message "${RED}Failed to find main directory. [Fail]${NC}" -1
-	exit 1
+	if [ "$should_exit_on_failure" = "true" ]; then
+		print_message "" -1
+		print_message "${RED}Failed to find main directory. [Fail]${NC}" -1
+		exit 1
+	fi
+
+	return 1
 }
 
 check_uncommitted_changes() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@san-siva/gitsy",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "A set of bash utilities for managing Git repositories with ease",
   "keywords": [
     "git",