@quantiya/codevibe-claude-plugin 2.0.12 → 2.0.14

package/hooks/session-end.sh

@@ -25,33 +25,29 @@ EXIT_CODE=$?
 
 if [ $EXIT_CODE -eq 0 ]; then
   log "INFO" "SessionEnd event sent successfully"
+else
+  log "ERROR" "Failed to send SessionEnd event (exit code: $EXIT_CODE)"
+fi
 
-  # Clean up session-specific files
-  if [ -n "$SESSION_ID" ]; then
-    PID_FILE="${CODEVIBE_TMPDIR}/codevibe-claude-${SESSION_ID}.pid"
-    PORT_FILE="${CODEVIBE_TMPDIR}/codevibe-claude-${SESSION_ID}.port"
-
-    # Kill the MCP server for this session
-    if [ -f "$PID_FILE" ]; then
-      PID=$(cat "$PID_FILE")
-      if ps -p "$PID" > /dev/null 2>&1; then
-        log "INFO" "Stopping MCP server for session $SESSION_ID (PID: $PID)"
-        kill "$PID" 2>/dev/null || true
-      fi
-      rm -f "$PID_FILE"
+# Local cleanup is independent of telemetry/backend delivery. A terminal-loss
+# monitor can retire the hosted row before this hook's concurrent POST finishes,
+# producing an expected non-200 response; exact owned files must still disappear.
+if [ -n "$SESSION_ID" ]; then
+  PID_FILE="${CODEVIBE_TMPDIR}/codevibe-claude-${SESSION_ID}.pid"
+  PORT_FILE="${CODEVIBE_TMPDIR}/codevibe-claude-${SESSION_ID}.port"
+
+  if [ -f "$PID_FILE" ]; then
+    PID=$(cat "$PID_FILE")
+    if [[ "$PID" =~ ^[0-9]+$ ]]; then
+      _reap_codevibe_daemon_pid "$PID" "SessionEnd for $SESSION_ID"
     fi
-
-    # Remove port file (should also be cleaned up by server, but just in case)
-    rm -f "$PORT_FILE"
-
-    # Remove sent UUIDs tracking file
-    SENT_UUIDS_FILE="${CODEVIBE_TMPDIR}/codevibe-claude-sent-uuids-${SESSION_ID}.txt"
-    rm -f "$SENT_UUIDS_FILE"
-
-    log "INFO" "Session cleanup completed for $SESSION_ID"
+    rm -f "$PID_FILE"
   fi
-else
-  log "ERROR" "Failed to send SessionEnd event (exit code: $EXIT_CODE)"
+
+  rm -f "$PORT_FILE"
+  SENT_UUIDS_FILE="${CODEVIBE_TMPDIR}/codevibe-claude-sent-uuids-${SESSION_ID}.txt"
+  rm -f "$SENT_UUIDS_FILE"
+  log "INFO" "Session cleanup completed for $SESSION_ID"
 fi
 
 # Hooks are best-effort telemetry. Never propagate send_to_mcp failures to