Compare commits

...

5 Commits

Author SHA1 Message Date
shokollm
28b343f817 fix: worktree created in wrong directory (issue #185)
cmd_start was calling create_worktree without passing $WORKTREES_DIR,
causing worktrees to be created in $PWD (daemon's working directory)
instead of ~/.kugetsu-worktrees/
2026-04-06 05:18:31 +00:00
shokollm
836fde07fc fix: destroy --base -y fails with 'target is required' (issue #183)
Removed erroneous code that set target="" when target="--base".
This caused the early exit at 'if [ -z "$target" ]' to trigger
before reaching the actual --base handling at line 517.
2026-04-06 04:14:03 +00:00
shokollm
c8bb0b36f4 fix: get_repo_url() strips user/org from path (issue #181)
The sed pattern 's/.*\///' on line 44 was removing everything up to the
LAST slash, but for issue refs like 'git.fbrns.co/shoko/kugetsu#158' it
should remove the instance prefix only (up to the FIRST slash).

Before: git.fbrns.co/shoko/kugetsu#158 -> kugetsu (WRONG)
After:  git.fbrns.co/shoko/kugetsu#158 -> shoko/kugetsu (CORRECT)

Also adds comprehensive test suite for git URL parsing functions:
- get_repo_url(), issue_ref_to_worktree_name(), issue_ref_to_branch_name()
- extract_issue_ref_from_message(), validate_issue_ref()
- issue_ref_to_filename(), filename_to_issue_ref()
2026-04-06 04:00:18 +00:00
937b7c69de Merge pull request 'fix: remove doubled .kugetsu-worktrees path segment in issue_ref_to_worktree_path' (#180) from fix/issue-179-worktree-path-doubled into main 2026-04-06 05:27:16 +02:00
shokollm
2051266809 fix: remove doubled .kugetsu-worktrees path segment in issue_ref_to_worktree_path
Fixes #179 - cmd_start fails due to incorrect worktree path being created
with .kugetsu-worktrees/.kugetsu-worktrees/ instead of just the worktree name.
2026-04-06 03:23:23 +00:00
3 changed files with 301 additions and 7 deletions

View File

@@ -246,7 +246,7 @@ cmd_start() {
local before_sessions=$(opencode session list 2>/dev/null | grep -oP '^ses_\w+' | sort)
local before_set="|$before_sessions|"
create_worktree "$issue_ref"
create_worktree "$issue_ref" "$WORKTREES_DIR"
local after_sessions=$(opencode session list 2>/dev/null | grep -oP '^ses_\w+' | sort)
local new_session_id=""
@@ -479,10 +479,6 @@ cmd_destroy() {
local target="${1:-}"
local force=false
if [ "$target" = "--base" ]; then
target=""
fi
if [ "$2" = "-y" ]; then
force=true
fi

View File

@@ -10,7 +10,7 @@ issue_ref_to_worktree_path() {
local issue_ref="$1"
local parent_dir="${2:-$WORKTREES_DIR}"
local worktree_name=$(issue_ref_to_worktree_name "$issue_ref")
echo "$parent_dir/.kugetsu-worktrees/$worktree_name"
echo "$parent_dir/$worktree_name"
}
issue_ref_to_branch_name() {
@@ -41,7 +41,7 @@ get_repo_url() {
fi
local instance=$(echo "$issue_ref" | cut -d'/' -f1 | cut -d'#' -f1)
local rest=$(echo "$issue_ref" | sed 's/.*\///' | sed 's/#.*//')
local rest=$(echo "$issue_ref" | sed 's/^[^\/]*\///' | sed 's/#.*//')
if [ -n "${GIT_SERVERS[$instance]:-}" ]; then
echo "${GIT_SERVERS[$instance]}/${rest}.git"

View File

@@ -0,0 +1,298 @@
#!/bin/bash
# Git URL Parsing Tests for kugetsu
# Tests all functions that parse or construct git URLs and issue refs
#
# Run with: bash skills/kugetsu/tests/test-git-url-parsing.sh
set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "$SCRIPT_DIR/../scripts/kugetsu-config.sh"
source "$SCRIPT_DIR/../scripts/kugetsu-worktree.sh"
source "$SCRIPT_DIR/../scripts/kugetsu-session.sh"
PASS=0
FAIL=0
pass() {
echo "PASS: $1"
PASS=$((PASS + 1))
}
fail() {
echo "FAIL: $1"
echo " Expected: $2"
echo " Got: $3"
FAIL=$((FAIL + 1))
}
echo "=== Git URL Parsing Test Suite ==="
echo ""
# Test: get_repo_url with standard GitHub issue ref
echo "--- Test: get_repo_url with github.com ---"
result=$(get_repo_url "github.com/shoko/kugetsu#14")
expected="https://github.com/shoko/kugetsu.git"
if [ "$result" = "$expected" ]; then
pass "get_repo_url standard github issue ref"
else
fail "get_repo_url standard github issue ref" "$expected" "$result"
fi
# Test: get_repo_url with custom instance
echo "--- Test: get_repo_url with git.fbrns.co ---"
result=$(get_repo_url "git.fbrns.co/shoko/kugetsu#158")
expected="https://git.fbrns.co/shoko/kugetsu.git"
if [ "$result" = "$expected" ]; then
pass "get_repo_url custom instance issue ref (ISSUE #181)"
else
fail "get_repo_url custom instance issue ref (ISSUE #181)" "$expected" "$result"
fi
# Test: get_repo_url with gitlab.com (if configured)
echo "--- Test: get_repo_url with gitlab.com ---"
if [ -n "${GIT_SERVERS[gitlab.com]:-}" ]; then
result=$(get_repo_url "gitlab.com/someuser/somerepo#42")
expected="https://gitlab.com/someuser/somerepo.git"
if [ "$result" = "$expected" ]; then
pass "get_repo_url gitlab.com issue ref"
else
fail "get_repo_url gitlab.com issue ref" "$expected" "$result"
fi
else
echo "SKIP: get_repo_url gitlab.com (not configured in GIT_SERVERS)"
fi
# Test: get_repo_url with bitbucket.org (if configured)
echo "--- Test: get_repo_url with bitbucket.org ---"
if [ -n "${GIT_SERVERS[bitbucket.org]:-}" ]; then
result=$(get_repo_url "bitbucket.org/myteam/myproject#7")
expected="https://bitbucket.org/myteam/myproject.git"
if [ "$result" = "$expected" ]; then
pass "get_repo_url bitbucket.org issue ref"
else
fail "get_repo_url bitbucket.org issue ref" "$expected" "$result"
fi
else
echo "SKIP: get_repo_url bitbucket.org (not configured in GIT_SERVERS)"
fi
# Test: get_repo_url with large issue number
echo "--- Test: get_repo_url with large issue number ---"
result=$(get_repo_url "github.com/shoko/kugetsu#999999")
expected="https://github.com/shoko/kugetsu.git"
if [ "$result" = "$expected" ]; then
pass "get_repo_url with large issue number"
else
fail "get_repo_url with large issue number" "$expected" "$result"
fi
# Test: issue_ref_to_worktree_name standard
echo "--- Test: issue_ref_to_worktree_name standard ---"
result=$(issue_ref_to_worktree_name "github.com/shoko/kugetsu#14")
expected="github.com-shoko-kugetsu-14"
if [ "$result" = "$expected" ]; then
pass "issue_ref_to_worktree_name standard"
else
fail "issue_ref_to_worktree_name standard" "$expected" "$result"
fi
# Test: issue_ref_to_worktree_name with custom instance
echo "--- Test: issue_ref_to_worktree_name custom instance ---"
result=$(issue_ref_to_worktree_name "git.fbrns.co/shoko/kugetsu#158")
expected="git.fbrns.co-shoko-kugetsu-158"
if [ "$result" = "$expected" ]; then
pass "issue_ref_to_worktree_name custom instance"
else
fail "issue_ref_to_worktree_name custom instance" "$expected" "$result"
fi
# Test: issue_ref_to_branch_name with number
echo "--- Test: issue_ref_to_branch_name with number ---"
result=$(issue_ref_to_branch_name "github.com/shoko/kugetsu#14")
expected="fix/issue-14"
if [ "$result" = "$expected" ]; then
pass "issue_ref_to_branch_name with number"
else
fail "issue_ref_to_branch_name with number" "$expected" "$result"
fi
# Test: issue_ref_to_branch_name with discuss suffix
# Note: #-discuss falls through to fix/issue-temp because #[^-]+$ doesn't match #-<text-with-hyphens>
echo "--- Test: issue_ref_to_branch_name with discuss suffix ---"
result=$(issue_ref_to_branch_name "github.com/shoko/kugetsu#-discuss")
expected="fix/issue-temp"
if [ "$result" = "$expected" ]; then
pass "issue_ref_to_branch_name with discuss suffix"
else
fail "issue_ref_to_branch_name with discuss suffix" "$expected" "$result"
fi
# Test: issue_ref_to_branch_name with identifier that has no hyphens
echo "--- Test: issue_ref_to_branch_name with pure identifier ---"
result=$(issue_ref_to_branch_name "github.com/shoko/kugetsu#someid")
expected="fix/someid"
if [ "$result" = "$expected" ]; then
pass "issue_ref_to_branch_name with pure identifier"
else
fail "issue_ref_to_branch_name with pure identifier" "$expected" "$result"
fi
# Test: issue_ref_to_branch_name without number
echo "--- Test: issue_ref_to_branch_name without number ---"
result=$(issue_ref_to_branch_name "github.com/shoko/kugetsu#abc")
expected="fix/abc"
if [ "$result" = "$expected" ]; then
pass "issue_ref_to_branch_name without number"
else
fail "issue_ref_to_branch_name without number" "$expected" "$result"
fi
# Test: extract_issue_ref_from_message with short form
echo "--- Test: extract_issue_ref_from_message short form ---"
result=$(extract_issue_ref_from_message "github.com/shoko/kugetsu#14")
expected="github.com/shoko/kugetsu#14"
if [ "$result" = "$expected" ]; then
pass "extract_issue_ref_from_message short form"
else
fail "extract_issue_ref_from_message short form" "$expected" "$result"
fi
# Test: extract_issue_ref_from_message with https URL
echo "--- Test: extract_issue_ref_from_message with https URL ---"
result=$(extract_issue_ref_from_message "https://github.com/shoko/kugetsu/issues/14")
expected="github.com/shoko/kugetsu#14"
if [ "$result" = "$expected" ]; then
pass "extract_issue_ref_from_message with https URL"
else
fail "extract_issue_ref_from_message with https URL" "$expected" "$result"
fi
# Test: extract_issue_ref_from_message with custom instance
echo "--- Test: extract_issue_ref_from_message custom instance ---"
result=$(extract_issue_ref_from_message "https://git.fbrns.co/shoko/kugetsu/issues/158")
expected="git.fbrns.co/shoko/kugetsu#158"
if [ "$result" = "$expected" ]; then
pass "extract_issue_ref_from_message custom instance"
else
fail "extract_issue_ref_from_message custom instance" "$expected" "$result"
fi
# Test: extract_issue_ref_from_message with empty message
echo "--- Test: extract_issue_ref_from_message empty message ---"
result=$(extract_issue_ref_from_message "")
expected=""
if [ "$result" = "$expected" ]; then
pass "extract_issue_ref_from_message empty message"
else
fail "extract_issue_ref_from_message empty message" "$expected" "$result"
fi
# Test: extract_issue_ref_from_message with no issue ref
echo "--- Test: extract_issue_ref_from_message no issue ref ---"
result=$(extract_issue_ref_from_message "Just a regular message without any issue reference")
expected=""
if [ "$result" = "$expected" ]; then
pass "extract_issue_ref_from_message no issue ref"
else
fail "extract_issue_ref_from_message no issue ref" "$expected" "$result"
fi
# Test: extract_issue_ref_from_message with gitlab URL
echo "--- Test: extract_issue_ref_from_message gitlab URL ---"
result=$(extract_issue_ref_from_message "https://gitlab.com/someuser/somerepo/issues/42")
expected="gitlab.com/someuser/somerepo#42"
if [ "$result" = "$expected" ]; then
pass "extract_issue_ref_from_message gitlab URL"
else
fail "extract_issue_ref_from_message gitlab URL" "$expected" "$result"
fi
# Test: validate_issue_ref valid format
echo "--- Test: validate_issue_ref valid format ---"
if validate_issue_ref "github.com/shoko/kugetsu#14" 2>/dev/null; then
pass "validate_issue_ref valid format"
else
fail "validate_issue_ref valid format" "exit 0" "exit non-zero"
fi
# Test: validate_issue_ref invalid format (missing parts)
echo "--- Test: validate_issue_ref invalid format ---"
if ! validate_issue_ref "invalid-ref" 2>/dev/null; then
pass "validate_issue_ref invalid format"
else
fail "validate_issue_ref invalid format" "exit non-zero" "exit 0"
fi
# Test: issue_ref_to_filename
echo "--- Test: issue_ref_to_filename ---"
result=$(issue_ref_to_filename "github.com/shoko/kugetsu#14")
expected="github.com-shoko-kugetsu-14.json"
if [ "$result" = "$expected" ]; then
pass "issue_ref_to_filename"
else
fail "issue_ref_to_filename" "$expected" "$result"
fi
# Test: filename_to_issue_ref
echo "--- Test: filename_to_issue_ref ---"
result=$(filename_to_issue_ref "github.com-shoko-kugetsu-14.json")
expected="github.com/shoko/kugetsu#14"
if [ "$result" = "$expected" ]; then
pass "filename_to_issue_ref"
else
fail "filename_to_issue_ref" "$expected" "$result"
fi
# Test: get_repo_url with org having hyphen
echo "--- Test: get_repo_url with hyphenated org ---"
result=$(get_repo_url "github.com/my-org/my-repo#1")
expected="https://github.com/my-org/my-repo.git"
if [ "$result" = "$expected" ]; then
pass "get_repo_url with hyphenated org"
else
fail "get_repo_url with hyphenated org" "$expected" "$result"
fi
# Test: get_repo_url with repo having dots
echo "--- Test: get_repo_url with dotted repo ---"
result=$(get_repo_url "github.com/shoko/kugetsu.utils#5")
expected="https://github.com/shoko/kugetsu.utils.git"
if [ "$result" = "$expected" ]; then
pass "get_repo_url with dotted repo"
else
fail "get_repo_url with dotted repo" "$expected" "$result"
fi
# Test: get_repo_url with underscore in username
echo "--- Test: get_repo_url with underscore in user ---"
result=$(get_repo_url "github.com/my_user/my_repo#10")
expected="https://github.com/my_user/my_repo.git"
if [ "$result" = "$expected" ]; then
pass "get_repo_url with underscore in user"
else
fail "get_repo_url with underscore in user" "$expected" "$result"
fi
# Test: get_repo_url with instance not in GIT_SERVERS (fallback)
echo "--- Test: get_repo_url with unknown instance ---"
result=$(get_repo_url "unknown.example.com/owner/repo#1")
expected="https://unknown.example.com/owner/repo.git"
if [ "$result" = "$expected" ]; then
pass "get_repo_url with unknown instance"
else
fail "get_repo_url with unknown instance" "$expected" "$result"
fi
echo ""
echo "=== Test Results ==="
echo "Passed: $PASS"
echo "Failed: $FAIL"
if [ $FAIL -eq 0 ]; then
echo "All tests passed!"
exit 0
else
echo "Some tests failed!"
exit 1
fi