@@ -17,6 +17,7 @@ import {
|
17 | 17 | } from "./diagnostic-session-context.js"; |
18 | 18 | import { |
19 | 19 | formatRecoveryOutcome, |
| 20 | +resolveStuckSessionRecoveryRef, |
20 | 21 | type StuckSessionRecoveryOutcome, |
21 | 22 | type StuckSessionRecoveryRequest, |
22 | 23 | } from "./diagnostic-session-recovery.js"; |
@@ -52,10 +53,6 @@ function isActiveRunProgressStale(params: {
|
52 | 53 | return typeof lastProgressAgeMs === "number" && lastProgressAgeMs >= params.staleAbortMs; |
53 | 54 | } |
54 | 55 | |
55 | | -function recoveryKey(params: StuckSessionRecoveryParams): string | undefined { |
56 | | -return params.sessionKey?.trim() || params.sessionId?.trim() || undefined; |
57 | | -} |
58 | | - |
59 | 56 | function formatRecoveryContext( |
60 | 57 | params: StuckSessionRecoveryParams, |
61 | 58 | extra?: { activeSessionId?: string; lane?: string; activeCount?: number; queuedCount?: number }, |
@@ -84,7 +81,7 @@ function formatRecoveryContext(
|
84 | 81 | export async function recoverStuckDiagnosticSession( |
85 | 82 | params: StuckSessionRecoveryParams, |
86 | 83 | ): Promise<StuckSessionRecoveryOutcome> { |
87 | | -const key = recoveryKey(params); |
| 84 | +const key = resolveStuckSessionRecoveryRef(params); |
88 | 85 | if (!key || recoveriesInFlight.has(key)) { |
89 | 86 | return { |
90 | 87 | status: "skipped", |
@@ -133,8 +130,7 @@ export async function recoverStuckDiagnosticSession(
|
133 | 130 | fileActiveWorkSessionId ?? |
134 | 131 | params.sessionId) |
135 | 132 | : (fileActiveWorkSessionId ?? params.sessionId); |
136 | | -const laneKey = params.sessionKey?.trim() || params.sessionId?.trim(); |
137 | | -const sessionLane = laneKey ? resolveEmbeddedSessionLane(laneKey) : null; |
| 133 | +const sessionLane = key ? resolveEmbeddedSessionLane(key) : null; |
138 | 134 | let aborted = false; |
139 | 135 | let drained = true; |
140 | 136 | let forceCleared = false; |
|