arul28 · arul28 · Apr 20, 2026 · Apr 19, 2026 · Apr 19, 2026 · Apr 19, 2026
@@ -91,6 +91,9 @@ function jsonResponse(
 describe("githubService.apiRequest", () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    // Tests assume no ambient token; CI/agents often inject GITHUB_TOKEN globally.
+    delete process.env.GITHUB_TOKEN;
+    delete process.env.ADE_GITHUB_TOKEN;
   });
 
   it("returns data and response on success (HTTP 200)", async () => {

@@ -219,6 +219,76 @@ function resolvePlannerPlanMissingIntervention(args: {
   };
 }
 
+function resolvePlannerPlanMissingInterventionsAfterPlanningSuccess(args: {
+  ctx: OrchestratorContext;
+  deps: UpdateWorkerStateDeps;
+  missionId: string;
+  attempt: OrchestratorRunGraph["attempts"][number];
+  step: OrchestratorRunGraph["steps"][number];
+}): void {
+  const stepMeta = isRecord(args.step.metadata) ? args.step.metadata : {};
+  const phaseKey = typeof stepMeta.phaseKey === "string" ? stepMeta.phaseKey.trim().toLowerCase() : "";
+  const stepType = typeof stepMeta.stepType === "string" ? stepMeta.stepType.trim().toLowerCase() : "";
+  const readOnlyExecution = stepMeta.readOnlyExecution === true;
+  const planningLike =
+    readOnlyExecution
+    || phaseKey === "planning"
+    || stepType === "planning"
+    || stepType === "analysis";
+  if (!planningLike) return;
+
+  const lastResultReport = isRecord(stepMeta.lastResultReport) ? stepMeta.lastResultReport : null;
+  const reportedPlan = lastResultReport && isRecord(lastResultReport.plan) ? lastResultReport.plan : null;
+  const planMarkdown =
+    reportedPlan && typeof reportedPlan.markdown === "string" ? reportedPlan.markdown.trim() : "";
+  if (!planMarkdown.length) return;
+
+  const mission = args.ctx.missionService.get(args.missionId);
+  if (!mission) return;
+
+  const resolvedAt = nowIso();
+  for (const intervention of mission.interventions) {
+    if (intervention.status !== "open" || intervention.interventionType !== "failed_step") continue;
+    const meta = isRecord(intervention.metadata) ? intervention.metadata : {};
+    const reasonCode = typeof meta.reasonCode === "string" ? meta.reasonCode.trim() : "";
+    if (reasonCode !== "planner_plan_missing") continue;
+    const interventionRunId = typeof meta.runId === "string" ? meta.runId.trim() : "";
+    if (interventionRunId.length > 0 && interventionRunId !== args.attempt.runId) continue;
+
+    try {
+      args.ctx.missionService.resolveIntervention({
+        missionId: args.missionId,
+        interventionId: intervention.id,
+        status: "resolved",
+        note: `Auto-resolved after planner returned report_result.plan for step "${stepTitleForMessage(args.step)}".`,
+      });
+      args.deps.recordRuntimeEvent({
+        runId: args.attempt.runId,
+        stepId: args.step.id,
+        attemptId: args.attempt.id,
+        sessionId: args.attempt.executorSessionId,
+        eventType: "intervention_resolved",
+        eventKey: `intervention_resolved:${intervention.id}:planner_plan_recovered`,
+        payload: {
+          interventionId: intervention.id,
+          reason: "planner_plan_recovered",
+          recoveredByStepId: args.step.id,
+          recoveredByStepKey: args.step.stepKey,
+          resolvedAt,
+        },
+      });
+    } catch (error) {
+      args.ctx.logger.debug("ai_orchestrator.planner_plan_missing_resolve_failed", {
+        missionId: args.missionId,
+        runId: args.attempt.runId,
+        stepId: args.step.id,
+        interventionId: intervention.id,
+        error: error instanceof Error ? error.message : String(error),
+      });
+    }
+  }
+}
+
 function resolveRecoveredFailedStepInterventions(args: {
   ctx: OrchestratorContext;
   deps: UpdateWorkerStateDeps;
@@ -1275,6 +1345,13 @@ export function updateWorkerStateFromEventCtx(
           attempt,
           step,
         });
+        resolvePlannerPlanMissingInterventionsAfterPlanningSuccess({
+          ctx,
+          deps,
+          missionId: graph.run.missionId,
+          attempt,
+          step,
+        });
       }
       if (step && ctx.aiIntegrationService) {
         const runtimeProfile = ctx.runRuntimeProfiles.get(attempt.runId) ?? resolveActiveRuntimeProfile(ctx, graph.run.missionId);

@@ -21,6 +21,14 @@ import { fadeScale } from "../../lib/motion";
 import { useAppStore } from "../../state/appStore";
 import { cn } from "../ui/cn";
 
+function schedulePaletteTimeout(handler: () => void, ms: number): ReturnType<typeof setTimeout> {
+  return globalThis.setTimeout(handler, ms);
+}
+
+function cancelPaletteTimeout(id: ReturnType<typeof setTimeout>) {
+  globalThis.clearTimeout(id);
+}
+
 export type CommandPaletteIntent = "default" | "project-browse";
 
 type Command = {
@@ -433,7 +441,7 @@ export function CommandPalette({
     const requestId = ++detailRequestRef.current;
     setDetailLoading(true);
     setDetailPath(detailTarget);
-    const timeout = window.setTimeout(() => {
+    const timeout = schedulePaletteTimeout(() => {
       void window.ade.project
         .getDetail(detailTarget)
         .then((result) => {
@@ -450,7 +458,7 @@ export function CommandPalette({
         });
     }, 140);
     return () => {
-      window.clearTimeout(timeout);
+      cancelPaletteTimeout(timeout);
     };
   }, [detail, detailTarget, mode, open]);
 

@@ -421,61 +421,34 @@ struct ADEStatusPill: View {
   }
 }
 
-struct ADEConnectionPill: View {
+struct ADEConnectionDot: View {
   @EnvironmentObject private var syncService: SyncService
 
   private var tint: Color {
     switch syncService.connectionState {
-    case .connected, .syncing: return ADEColor.success
-    case .connecting: return ADEColor.accent
-    case .disconnected, .error: return ADEColor.danger
+    case .connected: return ADEColor.success
+    case .syncing: return ADEColor.warning
+    case .connecting: return ADEColor.warning
+    case .error, .disconnected: return ADEColor.danger
     }
   }
 
-  private var label: String {
+  private var statusText: String {
     switch syncService.connectionState {
-    case .connected, .syncing: return "Connected"
+    case .connected: return "Connected"
+    case .syncing: return "Syncing"
     case .connecting: return "Connecting"
-    case .disconnected: return "Not connected"
-    case .error: return "Offline"
+    case .error: return "Error"
+    case .disconnected: return "Disconnected"
     }
   }
 
-  var body: some View {
-    Button {
-      syncService.settingsPresented = true
-    } label: {
-      HStack(spacing: 6) {
-        Circle()
-          .fill(tint)
-          .frame(width: 8, height: 8)
-        Text(label)
-          .font(.caption.weight(.semibold))
-          .foregroundStyle(ADEColor.textPrimary)
-      }
-    }
-    .buttonStyle(.plain)
-    .accessibilityLabel("Connection: \(label). Tap to open settings.")
+  private var showsHostSuffix: Bool {
+    syncService.connectionState == .connected
   }
-}
 
-struct ADEConnectionDot: View {
-  @EnvironmentObject private var syncService: SyncService
-
-  private var tint: Color {
-    switch syncService.connectionState {
-    case .connected, .syncing: return ADEColor.success
-    case .connecting: return ADEColor.warning
-    case .error: return ADEColor.danger
-    case .disconnected: return ADEColor.textMuted
-    }
-  }
-
-  private var showsHostName: Bool {
-    switch syncService.connectionState {
-    case .connected, .syncing: return true
-    default: return false
-    }
+  private var showsConnectedGlow: Bool {
+    syncService.connectionState == .connected
   }
 
   private var truncatedHostName: String? {
@@ -490,15 +463,32 @@ struct ADEConnectionDot: View {
   }
 
   private var accessibilityLabel: String {
+    let errorSuffix: String = {
+      guard syncService.connectionState == .error,
+            let raw = syncService.lastError?.trimmingCharacters(in: .whitespacesAndNewlines),
+            !raw.isEmpty
+      else {
+        return ""
+      }
+      let normalized = raw.split(whereSeparator: \.isWhitespace).joined(separator: " ")
+      let clipped = normalized.count > 120 ? String(normalized.prefix(117)) + "…" : normalized
+      return ". \(clipped)"
+    }()
+
     switch syncService.connectionState {
-    case .connected, .syncing:
+    case .connected:
       if let name = syncService.hostName, !name.isEmpty {
-        return "Connected to \(name). Tap to open settings."
+        return "Connected to \(name)"
       }
-      return "Connected. Tap to open settings."
-    case .connecting: return "Connecting. Tap to open settings."
-    case .error: return "Connection error. Tap to open settings."
-    case .disconnected: return "Not connected. Tap to open settings."
+      return "Connected"
+    case .syncing:
+      return "Syncing with host"
+    case .connecting:
+      return "Connecting to host"
+    case .error:
+      return "Connection error\(errorSuffix)"
+    case .disconnected:
+      return "Disconnected from host"
     }
   }
 
@@ -510,17 +500,31 @@ struct ADEConnectionDot: View {
         Circle()
           .fill(tint)
           .frame(width: 10, height: 10)
-          .shadow(color: tint.opacity(showsHostName ? 0.5 : 0), radius: showsHostName ? 4 : 0)
-        if showsHostName, let name = truncatedHostName {
+          .shadow(color: tint.opacity(showsConnectedGlow ? 0.5 : 0), radius: showsConnectedGlow ? 4 : 0)
+        Text(statusText)
+          .font(.caption.weight(.semibold))
+          .foregroundStyle(ADEColor.textPrimary)
+          .lineLimit(1)
+          .minimumScaleFactor(0.75)
+        if showsHostSuffix, let name = truncatedHostName {
+          Text("·")
+            .font(.caption.weight(.medium))
+            .foregroundStyle(ADEColor.textMuted)
+            .minimumScaleFactor(0.75)
           Text(name)
             .font(.caption.weight(.medium))
             .foregroundStyle(ADEColor.textSecondary)
             .lineLimit(1)
+            .minimumScaleFactor(0.75)
         }
       }
+      .frame(minHeight: 44)
+      .contentShape(Rectangle())
     }
     .buttonStyle(.plain)
     .accessibilityLabel(accessibilityLabel)
+    .accessibilityHint("Opens settings to pair or reconnect.")
+    .accessibilityShowsLargeContentViewer()
   }
 }
 

@@ -2,12 +2,18 @@ import SwiftUI
 import UIKit
 
 struct FilesHeaderStrip: View {
+  @EnvironmentObject private var syncService: SyncService
+
   let relativePath: String
   let language: FilesLanguage
   let fileSize: Int
-  let isFilesLive: Bool
   let transitionNamespace: Namespace.ID?
 
+  private var filesBrowserIsLive: Bool {
+    syncService.status(for: .files).phase == .ready
+      && (syncService.connectionState == .connected || syncService.connectionState == .syncing)
+  }
+
   var body: some View {
     HStack(alignment: .center, spacing: 12) {
       Image(systemName: fileIcon(for: relativePath))
@@ -38,7 +44,7 @@ struct FilesHeaderStrip: View {
           Text("Read only")
             .font(.caption2.weight(.medium))
             .foregroundStyle(ADEColor.textSecondary)
-          if !isFilesLive {
+          if !filesBrowserIsLive {
             Text("·").foregroundStyle(ADEColor.textMuted)
             Text("Offline")
               .font(.caption2.weight(.semibold))

@@ -87,24 +87,4 @@ extension FilesDetailScreen {
     hasLoadedDiff = true
   }
 
-  var disconnectedNotice: ADENoticeCard {
-    ADENoticeCard(
-      title: "Read-only while disconnected",
-      message: needsRepairing
-        ? "Pair again before trusting cached file previews, metadata, history, or diffs."
-        : "The last-loaded file preview, metadata, history, and diff stay visible, but refresh waits for the host to reconnect.",
-      icon: "icloud.slash",
-      tint: ADEColor.warning,
-      actionTitle: syncService.activeHostProfile == nil ? "Open Settings" : "Reconnect",
-      action: {
-        if syncService.activeHostProfile == nil {
-          syncService.settingsPresented = true
-        } else {
-          Task {
-            await syncService.reconnectIfPossible(userInitiated: true)
-          }
-        }
-      }
-    )
-  }
 }
@@ -8,8 +8,6 @@ struct FilesDetailScreen: View {
   let workspace: FilesWorkspace
   let relativePath: String
   let focusLine: Int?
-  let isFilesLive: Bool
-  let needsRepairing: Bool
   let transitionNamespace: Namespace.ID?
   let navigateToDirectory: (String) -> Void
 
@@ -94,12 +92,17 @@ struct FilesDetailScreen: View {
     .navigationBarBackButtonHidden(true)
     .toolbar {
       ToolbarItem(placement: .topBarLeading) {
-        Button {
-          dismiss()
-        } label: {
-          Image(systemName: "chevron.left")
+        HStack(spacing: 10) {
+          Button {
+            dismiss()
+          } label: {
+            Image(systemName: "chevron.left")
+          }
+          .accessibilityLabel("Back")
+          .frame(minWidth: 44, minHeight: 44)
+          .contentShape(Rectangle())
+          ADEConnectionDot()
         }
-        .accessibilityLabel("Back")
       }
       ToolbarItem(placement: .topBarTrailing) {
         Button {
@@ -157,22 +160,6 @@ struct FilesDetailScreen: View {
         }
       )
 
-      if !isFilesLive {
-        FilesCompactBanner(
-          symbol: "icloud.slash",
-          tint: ADEColor.warning,
-          title: needsRepairing ? "Pair again to trust this cached view." : "Disconnected — showing last-loaded content.",
-          actionTitle: syncService.activeHostProfile == nil ? "Settings" : "Reconnect",
-          onAction: {
-            if syncService.activeHostProfile == nil {
-              syncService.settingsPresented = true
-            } else {
-              Task { await syncService.reconnectIfPossible(userInitiated: true) }
-            }
-          }
-        )
-      }
-
       if let errorMessage {
         FilesCompactBanner(
           symbol: "exclamationmark.triangle.fill",
@@ -188,7 +175,6 @@ struct FilesDetailScreen: View {
           relativePath: relativePath,
           language: language,
           fileSize: blob.size,
-          isFilesLive: isFilesLive,
           transitionNamespace: transitionNamespace
         )