@kal-elsam/kairo-runtime 0.3.0 → 0.3.1

package/README.md

@@ -45,8 +45,9 @@ action), navigation, and a system strip. Layout adapts to terminal size:
 | Minimal | 60–71 cols or short height | Single panel + nav header |
 | Below gate | <60 cols | Explicit TTY fallback (Ink disabled) |
 
-Keys: `↑↓` navigate · `Tab` region · `Enter` open · `R` refresh · `C` cancel run ·
-`?` help · `Esc` back (exit only from Home).
+Keys: `↑↓` navigate · `Enter` open · `Esc` back (exit only from Overview) ·
+`R` refresh · `C` cancel run · `?` help. `Tab` switches region only when content
+is interactive (run lists / launch).
 
 Respects `NO_COLOR`, `HARNESS_ASCII=1`, and `HARNESS_INK=0`. Status is always labeled
 in text, never color alone.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kal-elsam/kairo-runtime",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Kairo Runtime — local agent operating system for Codex, Cursor, Claude, Gemini, Copilot, Engram, and Graphify.",
   "type": "module",
   "homepage": "https://github.com/Kal-elSam/harness#readme",

package/scripts/check-published-release.mjs

@@ -113,8 +113,11 @@ export async function verifyPublishedRelease({
   }
 
   const remoteTagLine = runGit(`git ls-remote --tags origin refs/tags/${releaseTag}`).trim();
+  const remotePeeledLine = runGit(`git ls-remote origin refs/tags/${releaseTag}^{}`).trim();
+  const remotePointsAtGitHead = remoteTagLine.startsWith(gitHead)
+    || remotePeeledLine.startsWith(gitHead);
 
-  if (!remoteTagLine.startsWith(gitHead)) {
+  if (!remotePointsAtGitHead) {
     throw new Error(
       `Remote tag ${releaseTag} on origin does not point to npm gitHead (${gitHead})`
     );

package/scripts/cockpit-smoke-test.sh

@@ -14,6 +14,8 @@ node --test \
   test/terminal-capabilities.test.js \
   test/cockpit-models.test.js \
   test/cockpit-controller.test.js \
-  test/cockpit-frame.test.js
+  test/cockpit-frame.test.js \
+  test/cockpit-navigation.test.js \
+  test/cockpit-input-integration.test.js
 
 echo "Kairo cockpit smoke passed"

package/scripts/cockpit-smoke.mjs

@@ -6,13 +6,25 @@ import { fileURLToPath } from "node:url";
 import { resolveLayoutMode, LAYOUT_MODES } from "../src/global/ink/layout.js";
 import { resolveTerminalCapabilities } from "../src/global/ink/terminal-capabilities.js";
 import { createFullscreenSession } from "../src/global/ink/fullscreen-session.js";
-import { buildTopBarModel, buildHomeMissionModel } from "../src/global/ink/cockpit-models.js";
+import {
+  buildFooterModel,
+  buildHomeMissionModel,
+  buildTopBarModel,
+  COCKPIT_NAV,
+  COCKPIT_REGIONS
+} from "../src/global/ink/cockpit-models.js";
+import {
+  createCockpitUiState,
+  reduceCockpitUi,
+  routeCockpitKey
+} from "../src/global/ink/cockpit-controller.js";
+import { ORCHESTRATOR_VIEWS } from "../src/global/ink/orchestrator-state.js";
 
 const root = join(dirname(fileURLToPath(import.meta.url)), "..");
 const require = createRequire(import.meta.url);
 const pkg = require(join(root, "package.json"));
 
-assert.equal(pkg.version, "0.3.0");
+assert.equal(pkg.version, "0.3.1");
 assert.ok(pkg.dependencies["ansi-escapes"]);
 
 assert.equal(resolveLayoutMode({ columns: 120, rows: 40 }), LAYOUT_MODES.WIDE);
@@ -48,4 +60,44 @@ const mission = buildHomeMissionModel({
 });
 assert.match(mission.title, /MISSION CONTROL/);
 
+function applyKey(state, keyAction) {
+  const routed = routeCockpitKey(state, keyAction);
+  if (!routed) return state;
+  return reduceCockpitUi(state, routed);
+}
+
+function smokeNavigation(layoutMode) {
+  let state = createCockpitUiState({
+    layoutMode,
+    region: layoutMode === LAYOUT_MODES.MINIMAL ? COCKPIT_REGIONS.CONTENT : COCKPIT_REGIONS.NAV
+  });
+  const diagnosticsIndex = COCKPIT_NAV.findIndex((item) => item.id === "diagnostics");
+  while (state.navIndex < diagnosticsIndex) {
+    state = applyKey(state, { type: "arrow", direction: "down" });
+  }
+  state = applyKey(state, { type: "enter" });
+  assert.equal(state.view, ORCHESTRATOR_VIEWS.DIAGNOSTICS);
+  assert.equal(state.region, COCKPIT_REGIONS.NAV);
+
+  state = applyKey(state, { type: "arrow", direction: "up" });
+  state = applyKey(state, { type: "enter" });
+  assert.equal(state.view, ORCHESTRATOR_VIEWS.LAUNCH);
+  assert.equal(state.region, COCKPIT_REGIONS.CONTENT);
+
+  const footer = buildFooterModel({
+    view: ORCHESTRATOR_VIEWS.DIAGNOSTICS,
+    region: COCKPIT_REGIONS.NAV,
+    unicode: false
+  });
+  assert.doesNotMatch(footer.text, /Tab/);
+
+  state = applyKey(state, { type: "escape" });
+  assert.equal(state.view, ORCHESTRATOR_VIEWS.HOME);
+  state = applyKey(state, { type: "escape" });
+  assert.equal(state.shouldExit, true);
+}
+
+smokeNavigation(LAYOUT_MODES.WIDE);
+smokeNavigation(LAYOUT_MODES.COMPACT);
+
 console.log("cockpit smoke OK");

package/src/cli.js

@@ -743,7 +743,8 @@ Scopes:
 Commands:
   shell      Operations cockpit (TTY). Bare ${cli} opens onboarding when ~/.harness/state.json
              is missing, otherwise the cockpit. Explicit ${cli} shell always opens the cockpit.
-             Keys: ↑↓ · Tab region · Enter · R refresh · C cancel · ? help · Esc back/exit.
+             Keys: ↑↓ · Enter · Esc back/exit · R refresh · C cancel · ? help.
+             Tab switches region only when content is interactive (runs/launch).
   run        Launch a managed agent run with local audit trail.
   runs       List, inspect, or cancel agent runs under ~/.harness/runs/.
   orchestrator  Read-only capability registry diagnostics (--json supported).

package/src/global/ink/cockpit-controller.js

@@ -1,21 +1,43 @@
-import { COCKPIT_NAV, COCKPIT_REGIONS, regionsForLayout } from "./cockpit-models.js";
-import { ORCHESTRATOR_VIEWS } from "./orchestrator-state.js";
-import { LAYOUT_MODES } from "./layout.js";
+import {
+  COCKPIT_NAV,
+  COCKPIT_REGIONS,
+  LAYOUT_MODES,
+  ORCHESTRATOR_VIEWS,
+  canTabBetweenRegions,
+  clamp,
+  defaultRegionForView,
+  interactiveRegionsFor,
+  isContentInteractiveView,
+  isNavFocusedView,
+  regionsForLayout,
+  routeCockpitKey
+} from "./cockpit-focus.js";
+
+export {
+  canTabBetweenRegions,
+  defaultRegionForView,
+  isContentInteractiveView,
+  isNavFocusedView,
+  routeCockpitKey
+};
 
 /**
  * Pure cockpit focus / navigation reducer — no I/O, no React.
  */
-
 export function createCockpitUiState({
   layoutMode = LAYOUT_MODES.COMPACT,
   view = ORCHESTRATOR_VIEWS.HOME,
   region = COCKPIT_REGIONS.NAV,
   navIndex = 0,
   listIndex = 0,
-  helpOpen = false
+  helpOpen = false,
+  returnView = null
 } = {}) {
   const regions = regionsForLayout(layoutMode);
-  const safeRegion = regions.includes(region) ? region : regions[0];
+  const preferred = region ?? defaultRegionForView(view, layoutMode);
+  const safeRegion = regions.includes(preferred)
+    ? preferred
+    : defaultRegionForView(view, layoutMode);
   return {
     layoutMode,
     view,
@@ -23,6 +45,7 @@ export function createCockpitUiState({
     navIndex: clamp(navIndex, 0, COCKPIT_NAV.length - 1),
     listIndex: Math.max(0, listIndex),
     helpOpen,
+    returnView,
     shouldExit: false
   };
 }
@@ -31,21 +54,23 @@ export function reduceCockpitUi(state, action) {
   switch (action.type) {
     case "resize": {
       const regions = regionsForLayout(action.layoutMode);
-      const region = regions.includes(state.region) ? state.region : regions[0];
-      return { ...state, layoutMode: action.layoutMode, region };
+      const preferred = regions.includes(state.region)
+        ? state.region
+        : defaultRegionForView(state.view, action.layoutMode);
+      return { ...state, layoutMode: action.layoutMode, region: preferred };
     }
     case "tab": {
-      const regions = regionsForLayout(state.layoutMode);
-      if (regions.length < 2) return state;
+      if (!canTabBetweenRegions(state)) return state;
+      const regions = interactiveRegionsFor(state);
       const index = regions.indexOf(state.region);
-      const next = regions[(index + 1) % regions.length];
+      const next = regions[(Math.max(index, 0) + 1) % regions.length];
       return { ...state, region: next };
     }
     case "arrow": {
-      if (state.helpOpen) return state;
       if (state.region === COCKPIT_REGIONS.SYSTEM) return state;
 
       const navigatesNav = state.region === COCKPIT_REGIONS.NAV
+        || isNavFocusedView(state.view)
         || (state.view === ORCHESTRATOR_VIEWS.HOME
           && state.layoutMode === LAYOUT_MODES.MINIMAL);
 
@@ -57,6 +82,10 @@ export function reduceCockpitUi(state, action) {
         };
       }
 
+      if (!isContentInteractiveView(state.view) || state.view === ORCHESTRATOR_VIEWS.LAUNCH) {
+        return state;
+      }
+
       const delta = action.direction === "up" ? -1 : 1;
       const max = Math.max(0, (action.listLength ?? 1) - 1);
       return { ...state, listIndex: clamp(state.listIndex + delta, 0, max) };
@@ -64,55 +93,55 @@ export function reduceCockpitUi(state, action) {
     case "enter-nav": {
       const item = COCKPIT_NAV[state.navIndex];
       if (!item) return state;
-      if (item.view === ORCHESTRATOR_VIEWS.HOME) {
-        return {
-          ...state,
-          view: ORCHESTRATOR_VIEWS.HOME,
-          listIndex: 0,
-          region: COCKPIT_REGIONS.CONTENT
-        };
-      }
       return {
         ...state,
         view: item.view,
         listIndex: 0,
-        region: COCKPIT_REGIONS.CONTENT,
-        helpOpen: false
+        region: defaultRegionForView(item.view, state.layoutMode),
+        helpOpen: false,
+        returnView: null
       };
     }
-    case "set-view":
+    case "set-view": {
+      const nextView = action.view;
       return {
         ...state,
-        view: action.view,
+        view: nextView,
         listIndex: 0,
-        region: action.region ?? COCKPIT_REGIONS.CONTENT
+        region: action.region ?? defaultRegionForView(nextView, state.layoutMode),
+        returnView: action.returnView ?? state.returnView,
+        helpOpen: nextView === ORCHESTRATOR_VIEWS.HELP
       };
+    }
     case "toggle-help":
-      if (state.helpOpen) {
-        return {
-          ...state,
-          helpOpen: false,
-          view: state.view === ORCHESTRATOR_VIEWS.HELP
-            ? ORCHESTRATOR_VIEWS.HOME
-            : state.view
-        };
+      if (state.helpOpen || state.view === ORCHESTRATOR_VIEWS.HELP) {
+        return goOverview(state);
       }
-      return { ...state, helpOpen: true, view: ORCHESTRATOR_VIEWS.HELP };
+      return {
+        ...state,
+        helpOpen: true,
+        view: ORCHESTRATOR_VIEWS.HELP,
+        region: defaultRegionForView(ORCHESTRATOR_VIEWS.HELP, state.layoutMode)
+      };
     case "escape": {
-      if (state.helpOpen) {
-        return { ...state, helpOpen: false, view: ORCHESTRATOR_VIEWS.HOME };
+      if (state.helpOpen || state.view === ORCHESTRATOR_VIEWS.HELP) {
+        return goOverview(state);
       }
-      if (state.view !== ORCHESTRATOR_VIEWS.HOME) {
-        const regions = regionsForLayout(state.layoutMode);
+      if (state.view === ORCHESTRATOR_VIEWS.RUN_DETAIL) {
+        const back = state.returnView && isContentInteractiveView(state.returnView)
+          ? state.returnView
+          : ORCHESTRATOR_VIEWS.ACTIVE_RUNS;
         return {
           ...state,
-          view: ORCHESTRATOR_VIEWS.HOME,
+          view: back,
           listIndex: 0,
-          region: regions.includes(COCKPIT_REGIONS.NAV)
-            ? COCKPIT_REGIONS.NAV
-            : COCKPIT_REGIONS.CONTENT
+          region: defaultRegionForView(back, state.layoutMode),
+          returnView: null
         };
       }
+      if (state.view !== ORCHESTRATOR_VIEWS.HOME) {
+        return goOverview(state);
+      }
       return { ...state, shouldExit: true };
     }
     case "clear-exit":
@@ -126,6 +155,14 @@ export function resolveNavAction(navIndex) {
   return COCKPIT_NAV[navIndex] ?? null;
 }
 
-function clamp(value, min, max) {
-  return Math.min(max, Math.max(min, value));
+function goOverview(state) {
+  return {
+    ...state,
+    helpOpen: false,
+    view: ORCHESTRATOR_VIEWS.HOME,
+    navIndex: 0,
+    listIndex: 0,
+    region: defaultRegionForView(ORCHESTRATOR_VIEWS.HOME, state.layoutMode),
+    returnView: null
+  };
 }

package/src/global/ink/cockpit-focus.js

@@ -0,0 +1,92 @@
+import { COCKPIT_NAV, COCKPIT_REGIONS, regionsForLayout } from "./cockpit-models.js";
+import { ORCHESTRATOR_VIEWS } from "./orchestrator-state.js";
+import { LAYOUT_MODES } from "./layout.js";
+
+const NAV_FOCUSED_VIEWS = new Set([
+  ORCHESTRATOR_VIEWS.HOME,
+  ORCHESTRATOR_VIEWS.PROVIDERS,
+  ORCHESTRATOR_VIEWS.DIAGNOSTICS,
+  ORCHESTRATOR_VIEWS.HELP
+]);
+
+const CONTENT_INTERACTIVE_VIEWS = new Set([
+  ORCHESTRATOR_VIEWS.ACTIVE_RUNS,
+  ORCHESTRATOR_VIEWS.RECENT_RUNS,
+  ORCHESTRATOR_VIEWS.RUN_DETAIL,
+  ORCHESTRATOR_VIEWS.LAUNCH
+]);
+
+export function isNavFocusedView(view) {
+  return NAV_FOCUSED_VIEWS.has(view);
+}
+
+export function isContentInteractiveView(view) {
+  return CONTENT_INTERACTIVE_VIEWS.has(view);
+}
+
+export function defaultRegionForView(view, layoutMode = LAYOUT_MODES.COMPACT) {
+  const regions = regionsForLayout(layoutMode);
+  if (isContentInteractiveView(view) && regions.includes(COCKPIT_REGIONS.CONTENT)) {
+    return COCKPIT_REGIONS.CONTENT;
+  }
+  if (regions.includes(COCKPIT_REGIONS.NAV)) return COCKPIT_REGIONS.NAV;
+  return regions[0] ?? COCKPIT_REGIONS.CONTENT;
+}
+
+export function interactiveRegionsFor(state) {
+  const regions = regionsForLayout(state.layoutMode);
+  if (!isContentInteractiveView(state.view) || state.view === ORCHESTRATOR_VIEWS.RUN_DETAIL) {
+    return regions.filter((region) => region === COCKPIT_REGIONS.NAV);
+  }
+  return regions.filter(
+    (region) => region === COCKPIT_REGIONS.NAV || region === COCKPIT_REGIONS.CONTENT
+  );
+}
+
+export function canTabBetweenRegions(state) {
+  if (!isContentInteractiveView(state.view)) return false;
+  if (state.view === ORCHESTRATOR_VIEWS.RUN_DETAIL) return false;
+  return interactiveRegionsFor(state).length >= 2;
+}
+
+/**
+ * Map raw key intent to a reducer action (or null when inactive / view-owned).
+ */
+export function routeCockpitKey(state, keyAction) {
+  switch (keyAction.type) {
+    case "escape":
+      return { type: "escape" };
+    case "tab":
+      return canTabBetweenRegions(state) ? { type: "tab" } : null;
+    case "arrow": {
+      if (state.region === COCKPIT_REGIONS.SYSTEM) return null;
+      if (state.region === COCKPIT_REGIONS.NAV || isNavFocusedView(state.view)) {
+        return { type: "arrow", direction: keyAction.direction };
+      }
+      if (state.region === COCKPIT_REGIONS.CONTENT && isContentInteractiveView(state.view)) {
+        if (state.view === ORCHESTRATOR_VIEWS.RUN_DETAIL || state.view === ORCHESTRATOR_VIEWS.LAUNCH) {
+          return null;
+        }
+        return {
+          type: "arrow",
+          direction: keyAction.direction,
+          listLength: keyAction.listLength
+        };
+      }
+      return null;
+    }
+    case "enter":
+      if (state.region === COCKPIT_REGIONS.NAV || isNavFocusedView(state.view)) {
+        return { type: "enter-nav" };
+      }
+      return null;
+    default:
+      return null;
+  }
+}
+
+export function clamp(value, min, max) {
+  return Math.min(max, Math.max(min, value));
+}
+
+export { COCKPIT_NAV, COCKPIT_REGIONS, LAYOUT_MODES, ORCHESTRATOR_VIEWS, regionsForLayout };

package/src/global/ink/cockpit-models.js

@@ -130,20 +130,47 @@ export function buildFooterModel({
   unicode = true
 } = {}) {
   const glyphs = resolveGlyphs(unicode);
-  if (helpOpen) {
-    return {
-      text: `Esc close help ${glyphs.bullet} R refresh ${glyphs.bullet} C cancel run`
-    };
+  const parts = [];
+
+  if (helpOpen || view === ORCHESTRATOR_VIEWS.HELP) {
+    parts.push("Esc close help");
+    parts.push("? Help");
+    return { text: parts.join(` ${glyphs.bullet} `) };
   }
-  if (view === ORCHESTRATOR_VIEWS.HOME) {
-    return {
-      text: `↑↓ Navigate ${glyphs.bullet} Tab Region ${glyphs.bullet} Enter Open ${glyphs.bullet} ? Help ${glyphs.bullet} Esc Exit`
-    };
+
+  if (view === ORCHESTRATOR_VIEWS.RUN_DETAIL) {
+    parts.push("R refresh");
+    if (canCancel) parts.push("C cancel");
+    parts.push("Esc Back");
+    return { text: parts.join(` ${glyphs.bullet} `) };
   }
-  const cancel = canCancel ? ` ${glyphs.bullet} C cancel` : "";
-  return {
-    text: `↑↓ Navigate ${glyphs.bullet} Enter Open ${glyphs.bullet} R refresh${cancel} ${glyphs.bullet} Esc Back · focus:${region}`
-  };
+
+  parts.push("↑↓ Navigate");
+
+  const showTab = view === ORCHESTRATOR_VIEWS.ACTIVE_RUNS
+    || view === ORCHESTRATOR_VIEWS.RECENT_RUNS
+    || view === ORCHESTRATOR_VIEWS.LAUNCH;
+  if (showTab) {
+    parts.push("Tab Region");
+  }
+
+  if (view === ORCHESTRATOR_VIEWS.HOME
+    || view === ORCHESTRATOR_VIEWS.PROVIDERS
+    || view === ORCHESTRATOR_VIEWS.DIAGNOSTICS
+    || region === COCKPIT_REGIONS.NAV
+    || view === ORCHESTRATOR_VIEWS.ACTIVE_RUNS
+    || view === ORCHESTRATOR_VIEWS.RECENT_RUNS) {
+    parts.push("Enter Open");
+  }
+
+  if (view !== ORCHESTRATOR_VIEWS.LAUNCH) {
+    parts.push("R refresh");
+  }
+
+  parts.push("? Help");
+  parts.push(view === ORCHESTRATOR_VIEWS.HOME ? "Esc Exit" : "Esc Back");
+
+  return { text: parts.join(` ${glyphs.bullet} `) };
 }
 
 export function resolveProjectName(workspaceRoot = "") {

package/src/global/ink/launch-input.js

@@ -5,7 +5,8 @@ import {
 } from "./orchestrator-state.js";
 
 /**
- * Launch-wizard key handler. Returns true when the key was consumed.
+ * Launch-wizard key handler.
+ * Returns true when consumed, "retreated" when Esc stepped back, false otherwise.
  */
 export function handleLaunchInput(ctx) {
   const {
@@ -22,9 +23,18 @@ export function handleLaunchInput(ctx) {
     setLaunchPermissionIndex,
     setError,
     handleLaunch,
-    reload
+    reload,
+    allowEscapeRetreat = false
   } = ctx;
 
+  if (allowEscapeRetreat && key.escape) {
+    if (launchStep === LAUNCH_WIZARD_STEPS.AGENT) {
+      return false;
+    }
+    setLaunchStep(retreatLaunchWizardStep(launchStep));
+    return "retreated";
+  }
+
   if (launchStep === LAUNCH_WIZARD_STEPS.AGENT) {
     if (key.upArrow) {
       setLaunchAgentIndex((index) => Math.max(0, index - 1));
@@ -87,7 +97,7 @@ export function handleLaunchInput(ctx) {
     }
     if (key.escape) {
       setLaunchStep(retreatLaunchWizardStep(launchStep));
-      return true;
+      return allowEscapeRetreat ? "retreated" : true;
     }
   }
 

package/src/global/ink/orchestrator-app.js

@@ -8,7 +8,9 @@ import {
 import {
   createCockpitUiState,
   reduceCockpitUi,
-  resolveNavAction
+  resolveNavAction,
+  routeCockpitKey,
+  isContentInteractiveView
 } from "./cockpit-controller.js";
 import {
   COCKPIT_REGIONS,
@@ -65,7 +67,31 @@ export function OrchestratorApp({
   };
 
   useInput((inputKey, key) => {
+    if (data.loading || data.error || data.busy) return;
+
     if (key.escape) {
+      // Launch wizard may retreat a step before leaving the view.
+      if (ui.view === ORCHESTRATOR_VIEWS.LAUNCH && data.launchableAgents.length > 0) {
+        const retreated = handleLaunchInput({
+          key,
+          inputKey,
+          launchStep: data.launchStep,
+          launchDraft: data.launchDraft,
+          launchableAgents: data.launchableAgents,
+          launchAgentIndex: data.launchAgentIndex,
+          launchPermissionIndex: data.launchPermissionIndex,
+          setLaunchAgentIndex: data.setLaunchAgentIndex,
+          setLaunchDraft: data.setLaunchDraft,
+          setLaunchStep: data.setLaunchStep,
+          setLaunchPermissionIndex: data.setLaunchPermissionIndex,
+          setError: data.setError,
+          handleLaunch: (draft) => data.handleLaunch(draft, data.dashboard?.profile, dispatch),
+          reload: data.reload,
+          allowEscapeRetreat: true
+        });
+        if (retreated === "retreated") return;
+      }
+
       const next = reduceCockpitUi(ui, { type: "escape" });
       if (next.shouldExit) {
         finish({ cancelled: true });
@@ -77,17 +103,44 @@ export function OrchestratorApp({
       return;
     }
 
-    if (data.loading || data.error || data.busy) return;
-
     if (inputKey === "?") {
       dispatch({ type: "toggle-help" });
       return;
     }
+
+    const listLength = ui.view === ORCHESTRATOR_VIEWS.ACTIVE_RUNS
+      ? (data.dashboard?.activeRuns ?? []).length
+      : ui.view === ORCHESTRATOR_VIEWS.RECENT_RUNS
+        ? (data.dashboard?.recentRuns ?? []).length
+        : 0;
+
+    let routed = null;
     if (key.tab) {
-      dispatch({ type: "tab" });
+      routed = routeCockpitKey(ui, { type: "tab" });
+    } else if (key.upArrow || key.downArrow) {
+      routed = routeCockpitKey(ui, {
+        type: "arrow",
+        direction: key.upArrow ? "up" : "down",
+        listLength
+      });
+    } else if (key.return) {
+      routed = routeCockpitKey(ui, { type: "enter" });
+    }
+
+    if (routed) {
+      if (routed.type === "enter-nav") {
+        const item = resolveNavAction(ui.navIndex);
+        if (item?.action === "launch") {
+          data.resetLaunchWizard();
+          dispatch({ type: "set-view", view: ORCHESTRATOR_VIEWS.LAUNCH });
+          return;
+        }
+      }
+      dispatch(routed);
       return;
     }
 
+    // View-specific handlers after centralized region routing.
     if (ui.view === ORCHESTRATOR_VIEWS.LAUNCH && data.launchableAgents.length > 0) {
       if (handleLaunchInput({
         key,
@@ -109,22 +162,14 @@ export function OrchestratorApp({
       }
     }
 
-    if (ui.view === ORCHESTRATOR_VIEWS.ACTIVE_RUNS || ui.view === ORCHESTRATOR_VIEWS.RECENT_RUNS) {
+    if (ui.region === COCKPIT_REGIONS.CONTENT
+      && (ui.view === ORCHESTRATOR_VIEWS.ACTIVE_RUNS || ui.view === ORCHESTRATOR_VIEWS.RECENT_RUNS)
+      && key.return) {
       const runs = ui.view === ORCHESTRATOR_VIEWS.ACTIVE_RUNS
         ? data.dashboard?.activeRuns ?? []
         : data.dashboard?.recentRuns ?? [];
-      if (key.upArrow || key.downArrow) {
-        dispatch({
-          type: "arrow",
-          direction: key.upArrow ? "up" : "down",
-          listLength: runs.length
-        });
-        return;
-      }
-      if (key.return) {
-        data.openRunDetail(selectRunFromList(runs, ui.listIndex), dispatch);
-        return;
-      }
+      data.openRunDetail(selectRunFromList(runs, ui.listIndex), dispatch, ui.view);
+      return;
     }
 
     if (ui.view === ORCHESTRATOR_VIEWS.RUN_DETAIL) {
@@ -133,7 +178,7 @@ export function OrchestratorApp({
         return;
       }
       if (inputKey.toLowerCase() === "r") {
-        data.openRunDetail(data.selectedRun, dispatch);
+        data.openRunDetail(data.selectedRun, dispatch, ui.returnView);
         return;
       }
     }
@@ -142,23 +187,6 @@ export function OrchestratorApp({
       data.reload().catch((reloadError) => {
         data.setError(reloadError instanceof Error ? reloadError.message : String(reloadError));
       });
-      return;
-    }
-
-    if (ui.view === ORCHESTRATOR_VIEWS.HOME || ui.region === COCKPIT_REGIONS.NAV) {
-      if (key.upArrow || key.downArrow) {
-        dispatch({ type: "arrow", direction: key.upArrow ? "up" : "down" });
-        return;
-      }
-      if (key.return) {
-        const item = resolveNavAction(ui.navIndex);
-        if (item?.action === "launch") {
-          data.resetLaunchWizard();
-          dispatch({ type: "set-view", view: ORCHESTRATOR_VIEWS.LAUNCH });
-          return;
-        }
-        dispatch({ type: "enter-nav" });
-      }
     }
   });
 
@@ -201,7 +229,7 @@ export function OrchestratorApp({
       layoutMode: mode,
       nav: buildNavModel({
         navIndex: ui.navIndex,
-        focused: ui.region === COCKPIT_REGIONS.NAV,
+        focused: ui.region === COCKPIT_REGIONS.NAV || !isContentInteractiveView(ui.view),
         unicode
       }),
       system: buildSystemStripModel({

package/src/global/ink/use-orchestrator-data.js

@@ -64,12 +64,16 @@ export function useOrchestratorData({
     setLaunchPermissionIndex(0);
   };
 
-  const openRunDetail = async (run, dispatch) => {
+  const openRunDetail = async (run, dispatch, returnView = null) => {
     if (!run) return;
     const events = await readRunEvents(homeDir, run.runId, { limit: 20 });
     setSelectedRun(run);
     setSelectedEvents(events);
-    dispatch({ type: "set-view", view: ORCHESTRATOR_VIEWS.RUN_DETAIL });
+    dispatch({
+      type: "set-view",
+      view: ORCHESTRATOR_VIEWS.RUN_DETAIL,
+      returnView: returnView ?? null
+    });
   };
 
   const handleLaunch = async (draft, profile, dispatch) => {