fix(run): preserve active boulder continuations

src/cli/run/continuation-state.ts

@@ -1,4 +1,4 @@
-import { getPlanProgress, readBoulderState, resolveBoulderPlanPath } from "../../features/boulder-state"
+import { getPlanProgress, normalizeSessionId, readBoulderState, resolveBoulderPlanPath } from "../../features/boulder-state"
 import { getSessionAgent } from "../../features/claude-code-session-state"
 import {
   getActiveContinuationMarkerReason,
@@ -51,19 +51,25 @@ async function hasActiveBoulderContinuation(
   if (progress.isComplete) return false
   if (!client) return false
 
-  const isTrackedSession = boulder.session_ids.includes(sessionID)
+  const normalizedSessionID = normalizeSessionId(sessionID)
-  const sessionOrigin = boulder.session_origins?.[sessionID]
+  const normalizedTrackedSessionIDs = boulder.session_ids.map((trackedSessionID) => normalizeSessionId(trackedSessionID))
-  if (!isTrackedSession) {
+  if (!normalizedTrackedSessionIDs.includes(normalizedSessionID)) {
     return false
   }
 
-  const isTrackedDescendant = await isTrackedDescendantSession(client, sessionID, boulder.session_ids)
+  const sessionOrigin = boulder.session_origins?.[sessionID] ?? boulder.session_origins?.[normalizedSessionID]
-
+  if (sessionOrigin === "direct") {
-  if (isTrackedSession && sessionOrigin === "direct") {
     return true
   }
 
-  if (isTrackedSession && sessionOrigin !== "direct" && !isTrackedDescendant) {
+  const trackedAncestorSessionIDs = normalizedTrackedSessionIDs
+    .filter((trackedSessionID) => trackedSessionID !== normalizedSessionID)
+  if (trackedAncestorSessionIDs.length === 0) {
+    return true
+  }
+
+  const isTrackedDescendant = await isTrackedDescendantSession(client, sessionID, trackedAncestorSessionIDs)
+  if (!isTrackedDescendant) {
     return false
   }
 
@@ -82,23 +88,22 @@ async function hasActiveBoulderContinuation(
     return false
   }
 
-  return isTrackedSession || isTrackedDescendant
+  return true
 }
 
 async function isTrackedDescendantSession(
   client: RunContext["client"],
   sessionID: string,
-  trackedSessionIDs: string[],
+  trackedAncestorSessionIDs: string[],
 ): Promise<boolean> {
-  const ancestorSessionIDs = trackedSessionIDs.filter((trackedSessionID) => trackedSessionID !== sessionID)
+  if (trackedAncestorSessionIDs.length === 0) {
-  if (ancestorSessionIDs.length === 0) {
     return false
   }
 
   return isSessionInBoulderLineage({
     client,
     sessionID,
-    boulderSessionIDs: ancestorSessionIDs,
+    boulderSessionIDs: trackedAncestorSessionIDs,
   })
 }
 

src/hooks/atlas/session-last-agent.ts

@@ -64,20 +64,14 @@ function getLastAgentFromMessageDir(messageDir: string): string | null {
   return null
 }
 
-export async function getLastAgentFromSession(
+async function getLastAgentFromSessionMessages(
   sessionID: string,
-  client?: SessionMessagesClient,
+  client: SessionMessagesClient,
-  deps: Partial<SessionLastAgentDeps> = {},
+  deps: SessionLastAgentDeps,
 ): Promise<string | null> {
-  const resolvedDeps: SessionLastAgentDeps = {
-    ...defaultSessionLastAgentDeps,
-    ...deps,
-  }
-
-  if (resolvedDeps.isSqliteBackend() && client) {
   try {
     const response = await client.session.messages({ path: { id: sessionID } })
-      const messages = resolvedDeps.normalizeSDKResponse(response, [] as Array<{
+    const messages = deps.normalizeSDKResponse(response, [] as Array<{
       id?: string
       info?: { agent?: string; time?: { created?: number } }
       parts?: Array<{ type?: string }>
@@ -96,7 +90,7 @@ export async function getLastAgentFromSession(
     })
 
     for (const message of messages) {
-        if (resolvedDeps.isCompactionMessage(message)) {
+      if (deps.isCompactionMessage(message)) {
         continue
       }
 
@@ -112,7 +106,24 @@ export async function getLastAgentFromSession(
   return null
 }
 
+export async function getLastAgentFromSession(
+  sessionID: string,
+  client?: SessionMessagesClient,
+  deps: Partial<SessionLastAgentDeps> = {},
+): Promise<string | null> {
+  const resolvedDeps: SessionLastAgentDeps = {
+    ...defaultSessionLastAgentDeps,
+    ...deps,
+  }
+
+  if (resolvedDeps.isSqliteBackend() && client) {
+    return getLastAgentFromSessionMessages(sessionID, client, resolvedDeps)
+  }
+
   const messageDir = resolvedDeps.getMessageDir(sessionID)
+  if (!messageDir && client) {
+    return getLastAgentFromSessionMessages(sessionID, client, resolvedDeps)
+  }
   if (!messageDir) return null
 
   try {
@@ -149,5 +160,9 @@ export async function getLastAgentFromSession(
     return null
   }
 
+  if (client) {
+    return getLastAgentFromSessionMessages(sessionID, client, resolvedDeps)
+  }
+
   return null
 }