@quantiya/codevibe-claude-plugin 2.0.11 → 2.0.13

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

package/hooks/session-start.sh

@@ -423,10 +423,12 @@ if [ -n "$EXISTING_SERVER_PORT" ]; then
   else
     # (#638 I1) APP failure: a real non-200 HTTP response — the daemon is live
     # and reachable, it just rejected this event, so the wedged-daemon reap does
-    # not apply. Keep the original recovery: drop the mapping and fall through
-    # to the plain ensure + send below.
-    log "WARN" "Failed to send to existing server (exit: $CURL_EXIT, HTTP $HTTP_CODE), will start new one"
-    rm -f "$MAPPING_FILE"
+    # not apply. Retain the verified instance mapping and stop this invocation.
+    # Deleting the mapping here can turn a resume/compaction application error
+    # into a second daemon for the same Claude instance. The next hook event can
+    # retry the same live daemon; only a later transport failure may replace it.
+    log "WARN" "SessionStart application failure from verified server (exit: $CURL_EXIT, HTTP $HTTP_CODE) — keeping daemon mapping; not relaunching"
+    exit 0
   fi
 fi
 

package/node_modules/@quantiya/codevibe-core/dist/index.d.ts

@@ -21,7 +21,7 @@ export type { Config, Environment } from './config';
 export { Logger, logger, createLogger } from './logger';
 export { parseInteractivePrompt, normalizeSnapshot, } from './prompt-parser';
 export type { ParsedInteractivePrompt, PromptKind, InteractivePromptOption, } from './prompt-parser';
-export { resumeOrCreateSession, prepareSessionEncryption, rekeySessionForNewDevices, startDeviceKeyWatcher, registerDeviceEncryptionKey, prepareEventTimestamp, _resetPrepareEventTimestampForTesting, } from './session';
+export { resumeOrCreateSession, prepareSessionEncryption, rekeySessionForNewDevices, startDeviceKeyWatcher, registerDeviceEncryptionKey, RetiredSessionCannotReactivateError, isRetiredSessionCannotReactivateError, prepareEventTimestamp, _resetPrepareEventTimestampForTesting, } from './session';
 export type { ResumeOrCreateSessionInput, ResumeOrCreateSessionResult } from './session';
 export { detectInstalledAgents, pushDetectedAgents, V1_ORCHESTRATION_PROMPT_KIND, V1_ORCHESTRATION_OPTIONS, mapOptionNumberToUserDecisionKind, mapOptionToUserDecisionKind, } from './orchestration';
 export type { DetectableAgent, V1OrchestrationOption, V1UserDecisionKind, } from './orchestration';