Merge pull request 'fix: init script captures wrong session IDs when old sessions exist' (#173) from fix/issue-172-init-script-wrong-session-ids into main

skills/kugetsu/scripts/kugetsu

@@ -93,10 +93,6 @@ EOF
 
 ensure_dirs() {
     mkdir -p "$SESSIONS_DIR"
-    mkdir -p "$LOGS_DIR"
-    mkdir -p "$WORKTREES_DIR"
-    mkdir -p "$QUEUE_DIR"
-    mkdir -p "$QUEUE_ITEMS_DIR"
 }
 
 ensure_worktree_dir() {
@@ -261,9 +257,7 @@ PYEOF
 }
 
 ensure_queue_dirs() {
-    mkdir -p "$QUEUE_DIR"
     mkdir -p "$QUEUE_ITEMS_DIR"
-    mkdir -p "$LOGS_DIR"
 }
 
 generate_queue_id() {
@@ -854,11 +848,6 @@ EOF
 }
 
 parse_issue_ref_from_message() {
-    # DEPRECATED: This function is not called anywhere.
-    # The active implementation is extract_issue_ref_from_message()
-    # in kugetsu-session.sh which is used by cmd_delegate.
-    # This function is kept for backwards compatibility and will
-    # be removed in a future release.
     local message="$1"
     
     local gitserver=""
@@ -866,20 +855,21 @@ parse_issue_ref_from_message() {
     local repo=""
     local issue_number=""
     
-    if [[ "$message" =~ (https?://)?([a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/([a-zA-Z0-9._-]+)/([a-zA-Z0-9._-]+)/(issues|pull)/([0-9]+) ]]; then
+    if echo "$message" | grep -qE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/(issues|pull)/[0-9]+'; then
-        gitserver="${BASH_REMATCH[2]}"
+        gitserver=$(echo "$message" | grep -oE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+' | head -1 | sed 's/\/[^/]*\/[^/]*$//')
-        owner="${BASH_REMATCH[3]}"
+        local full_path=$(echo "$message" | grep -oE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/(issues|pull)/[0-9]+' | head -1)
-        repo="${BASH_REMATCH[4]}"
+        owner=$(echo "$full_path" | cut -d'/' -f2)
-        issue_number="${BASH_REMATCH[6]}"
+        repo=$(echo "$full_path" | cut -d'/' -f3)
-    elif [[ "$message" =~ (https?://)?([a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/([a-zA-Z0-9._-]+)/([a-zA-Z0-9._-]+)#([0-9]+) ]]; then
+        issue_number=$(echo "$full_path" | grep -oE '[0-9]+$' | head -1)
-        gitserver="${BASH_REMATCH[2]}"
+    elif echo "$message" | grep -qE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+#[0-9]+'; then
-        owner="${BASH_REMATCH[3]}"
+        gitserver=$(echo "$message" | grep -oE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+' | head -1)
-        repo="${BASH_REMATCH[4]}"
+        owner=$(echo "$gitserver" | cut -d'/' -f2)
-        issue_number="${BASH_REMATCH[5]}"
+        repo=$(echo "$gitserver" | cut -d'/' -f3)
-    elif [[ "$message" =~ ([a-zA-Z0-9._-]+)/([a-zA-Z0-9._-]+)#([0-9]+) ]]; then
+        issue_number=$(echo "$message" | grep -oE '#[0-9]+' | grep -oE '[0-9]+' | head -1)
-        owner="${BASH_REMATCH[1]}"
+    elif echo "$message" | grep -qE '[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+#([0-9]+)'; then
-        repo="${BASH_REMATCH[2]}"
+        owner=$(echo "$message" | grep -oE '[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+#' | sed 's/#$//' | cut -d'/' -f1)
-        issue_number="${BASH_REMATCH[3]}"
+        repo=$(echo "$message" | grep -oE '[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+#' | sed 's/#$//' | cut -d'/' -f2)
+        issue_number=$(echo "$message" | grep -oE '#[0-9]+' | grep -oE '[0-9]+' | head -1)
     fi
     
     echo "${gitserver}|${owner}|${repo}|${issue_number}"

skills/kugetsu/scripts/kugetsu-log.sh

@@ -43,24 +43,15 @@ kugetsu_add_notification() {
         notifications=$(cat "$NOTIFICATIONS_FILE")
     fi
     
-    notifications=$(echo "$notifications" | python3 -c "
+    local new_notification=$(python3 -c "import json; print(json.dumps({
-import json
+        'type': '$notification_type',
-import sys
+        'message': '$message',
-
+        'issue_ref': '$issue_ref',
-notifications = json.load(sys.stdin)
+        'timestamp': '$timestamp',
-new_notification = {
+        'read': False
-    'type': '$notification_type',
+    }))")
-    'message': '''$message'''.replace('\"', '\"'),
+    
-    'issue_ref': '$issue_ref' if '$issue_ref' else None,
+    notifications=$(python3 -c "import json; n=json.loads('$notifications'); n.append(json.loads('$new_notification')); print(json.dumps(n[-50:] if len(n)>50 else n, indent=2))")
-    'timestamp': '$timestamp',
-    'read': False
-}
-
-notifications.append(new_notification)
-notifications = notifications[-50:] if len(notifications) > 50 else notifications
-
-print(json.dumps(notifications, indent=2))
-")
     
     echo "$notifications" > "$NOTIFICATIONS_FILE"
 }