@drisp/cli 0.5.23 → 0.5.26

package/dist/cli.js

@@ -2,7 +2,7 @@
 import "./chunk-HXBCZAP7.js";
 import {
   rotateGatewayToken
-} from "./chunk-MRAM6EYI.js";
+} from "./chunk-4NX4WFPB.js";
 import {
   CREDENTIAL_SOURCES_TRIED,
   EXEC_EXIT_CODE,
@@ -10,6 +10,7 @@ import {
   GatewayUnreachableError,
   IndexedTimeline,
   PORTABLE_PROVIDER_ENV_VARS,
+  attachRuntimeEventLoop,
   bootstrapRuntimeConfig,
   buildApiKeyHelperSettings,
   buildPostByToolUseId,
@@ -26,7 +27,6 @@ import {
   createRelayQuestionCallback,
   createRuntime,
   createSessionStore,
-  createWsClientTransport,
   credentialHelperKey,
   cursorToVisualPosition,
   daemonStatePaths,
@@ -48,8 +48,6 @@ import {
   getMostRecentAthenaSession,
   getSessionMeta,
   hintGlyphs,
-  ingestRuntimeDecision,
-  ingestRuntimeEvent,
   isBashToolResponse,
   isCommandPrefix,
   isScopedPermissionsRequest,
@@ -62,6 +60,7 @@ import {
   makeSkippedProbe,
   mergeFeedItems,
   messageGlyphs,
+  parseFrontmatter,
   parseToolName,
   probeSkipReason,
   processRegistry,
@@ -75,6 +74,7 @@ import {
   renderInputLines,
   resolveClaudeBinary,
   resolveClaudeSettingsSurfacePaths,
+  resolveEffectiveCapabilities,
   resolveHarnessAdapter,
   resolveHookForwarderCommand,
   resolveRuntimeAuthOverlay,
@@ -87,6 +87,7 @@ import {
   sessionsDir,
   sliceAnsi,
   spaces,
+  startDashboardDecisionDrain,
   startSessionBridge,
   stringWidth,
   stripAnsi,
@@ -95,13 +96,13 @@ import {
   visualPositionToOffset,
   wrapText,
   writeAttachmentMirror,
-  writeGatewayClientConfig,
-  wsClientOptionsForEndpoint
-} from "./chunk-EC67PEFT.js";
+  writeGatewayClientConfig
+} from "./chunk-YZ7RCBKO.js";
 import {
   generateId as generateId2
-} from "./chunk-BTKQ67RE.js";
+} from "./chunk-QYB6N2OT.js";
 import {
+  createWsClientTransport,
   dashboardClientConfigPath,
   disableTelemetry,
   initTelemetry,
@@ -120,8 +121,9 @@ import {
   trackSetupCompleted,
   trackTelemetryOptedOut,
   writeDashboardClientConfig,
-  writeGatewayTrace
-} from "./chunk-BTY7MYYT.js";
+  writeGatewayTrace,
+  wsClientOptionsForEndpoint
+} from "./chunk-3U37HT4T.js";
 import {
   McpOptionsStep,
   StepSelector,
@@ -158,20 +160,20 @@ import {
   useWorkflowSessionController,
   writeGlobalConfig,
   writeProjectConfig
-} from "./chunk-JHSADKDJ.js";
+} from "./chunk-73V7GXV6.js";
 
 // src/app/entry/cli.tsx
 import { render } from "ink";
 import meow from "meow";
-import fs9 from "fs";
+import fs10 from "fs";
 import { createRequire as createRequire2 } from "module";
 import os7 from "os";
-import path9 from "path";
+import path10 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/app/shell/AppShell.tsx
 import process6 from "process";
-import React9, {
+import React8, {
   Profiler,
   useState as useState18,
   useCallback as useCallback19,
@@ -179,7 +181,7 @@ import React9, {
   useEffect as useEffect14,
   useMemo as useMemo17
 } from "react";
-import { Box as Box19, Text as Text25, useApp, useInput as useInput17, useStdout as useStdout9 } from "ink";
+import { Box as Box18, Text as Text24, useApp, useInput as useInput17, useStdout as useStdout9 } from "ink";
 
 // src/ui/components/PermissionDialog.tsx
 import { useCallback, useMemo } from "react";
@@ -1741,20 +1743,14 @@ function useFeed(runtime, messages = [], initialAllowedTools, sessionStore, opti
       dashboardDecisionInboxRef.current = createDashboardDecisionInbox();
     }
     const inbox = dashboardDecisionInboxRef.current;
-    const applyPending = () => {
-      const rows = inbox.pendingForSession({ athenaSessionId, limit: 25 });
-      for (const row of rows) {
-        runtime.sendDecision(row.requestId, row.decision);
-        inbox.markConsumed({ id: row.id });
-      }
-    };
-    applyPending();
-    const interval = setInterval(
-      applyPending,
-      options?.dashboardDecisionPollIntervalMs ?? 1e3
-    );
+    const drain = startDashboardDecisionDrain({
+      runtime,
+      inbox,
+      athenaSessionId,
+      ...options?.dashboardDecisionPollIntervalMs !== void 0 ? { pollIntervalMs: options.dashboardDecisionPollIntervalMs } : {}
+    });
     return () => {
-      clearInterval(interval);
+      drain.stop();
     };
   }, [
     runtime,
@@ -1943,43 +1939,47 @@ function useFeed(runtime, messages = [], initialAllowedTools, sessionStore, opti
       ...options?.relayQuestion ? { relayQuestion: options.relayQuestion } : {},
       signal: abortRef.current.signal
     };
-    const unsub = runtime.onEvent((runtimeEvent) => {
-      const parentCycleId = getActivePerfCycleId();
-      const cycleId = startPerfCycle(`feed:${runtimeEvent.kind}`, {
-        parent_cycle_id: parentCycleId ?? void 0,
-        runtime_event_id: runtimeEvent.id,
-        runtime_kind: runtimeEvent.kind,
-        hook_name: runtimeEvent.hookName,
-        tool_name: runtimeEvent.toolName
-      });
-      logPerfEvent("feed.runtime_event", {
-        cycle_id: cycleId ?? void 0,
-        runtime_event_id: runtimeEvent.id,
-        runtime_kind: runtimeEvent.kind,
-        hook_name: runtimeEvent.hookName,
-        tool_name: runtimeEvent.toolName
-      });
-      const doneCause = startPerfStage("cause.start", {
-        source: "runtime.event",
-        runtime_kind: runtimeEvent.kind
-      });
-      try {
+    const loop = attachRuntimeEventLoop({
+      runtime,
+      ingest: () => ({
+        mapper: mapperRef.current,
+        store: sessionStoreRef.current,
+        controllerCallbacks
+      }),
+      wrapEvent: (runtimeEvent, run) => {
+        const parentCycleId = getActivePerfCycleId();
+        const cycleId = startPerfCycle(`feed:${runtimeEvent.kind}`, {
+          parent_cycle_id: parentCycleId ?? void 0,
+          runtime_event_id: runtimeEvent.id,
+          runtime_kind: runtimeEvent.kind,
+          hook_name: runtimeEvent.hookName,
+          tool_name: runtimeEvent.toolName
+        });
+        logPerfEvent("feed.runtime_event", {
+          cycle_id: cycleId ?? void 0,
+          runtime_event_id: runtimeEvent.id,
+          runtime_kind: runtimeEvent.kind,
+          hook_name: runtimeEvent.hookName,
+          tool_name: runtimeEvent.toolName
+        });
+        const doneCause = startPerfStage("cause.start", {
+          source: "runtime.event",
+          runtime_kind: runtimeEvent.kind
+        });
+        try {
+          run();
+        } finally {
+          doneCause();
+        }
+      },
+      onEventReceived: (runtimeEvent) => {
         if (options?.relayPermission && runtimeEvent.kind === "permission.request") {
           writeGatewayTrace(
             `useFeed permission event relay-enabled id=${runtimeEvent.id} tool=${runtimeEvent.toolName ?? ""}`
           );
         }
-        const { feedEvents: newFeedEvents, decision } = ingestRuntimeEvent(
-          runtimeEvent,
-          {
-            mapper: mapperRef.current,
-            store: sessionStoreRef.current,
-            controllerCallbacks
-          }
-        );
-        if (decision) {
-          runtime.sendDecision(runtimeEvent.id, decision);
-        }
+      },
+      emitEventFeed: (newFeedEvents, runtimeEvent) => {
         if (!abortRef.current.signal.aborted && newFeedEvents.length > 0) {
           for (const fe of newFeedEvents) {
             if (fe.kind === "permission.decision" && fe.cause?.hook_request_id) {
@@ -1989,12 +1989,8 @@ function useFeed(runtime, messages = [], initialAllowedTools, sessionStore, opti
           feedStoreRef.current.pushEvents(newFeedEvents);
           publishDashboardFeedEvents(newFeedEvents, runtimeEvent);
         }
-      } finally {
-        doneCause();
-      }
-    });
-    const unsubDecision = runtime.onDecision(
-      (eventId, decision) => {
+      },
+      wrapDecision: (eventId, decision, run) => {
         const parentCycleId = getActivePerfCycleId();
         const cycleId = startPerfCycle("feed:decision", {
           parent_cycle_id: parentCycleId ?? void 0,
@@ -2013,31 +2009,31 @@ function useFeed(runtime, messages = [], initialAllowedTools, sessionStore, opti
           decision_source: decision.source
         });
         try {
-          if (abortRef.current.signal.aborted) return;
-          if (decision.intent?.kind === "question_answer" || decision.source === "timeout") {
-            dequeueQuestion(eventId);
-          }
-          const feedEvent = ingestRuntimeDecision(eventId, decision, {
-            mapper: mapperRef.current,
-            store: sessionStoreRef.current
-          });
-          if (feedEvent) {
-            feedStoreRef.current.pushEvents([feedEvent]);
-            publishDashboardFeedEvents([feedEvent]);
-            if (feedEvent.kind === "permission.decision" && feedEvent.cause?.hook_request_id) {
-              dequeuePermission(feedEvent.cause.hook_request_id);
-            }
-          }
+          run();
         } finally {
           doneCause();
         }
+      },
+      skipDecision: () => abortRef.current.signal.aborted,
+      beforeDecisionIngest: (eventId, decision) => {
+        if (decision.intent?.kind === "question_answer" || decision.source === "timeout") {
+          dequeueQuestion(eventId);
+        }
+      },
+      emitDecisionFeed: (feedEvent) => {
+        if (feedEvent) {
+          feedStoreRef.current.pushEvents([feedEvent]);
+          publishDashboardFeedEvents([feedEvent]);
+          if (feedEvent.kind === "permission.decision" && feedEvent.cause?.hook_request_id) {
+            dequeuePermission(feedEvent.cause.hook_request_id);
+          }
+        }
       }
-    );
+    });
     refreshRuntimeStatus(true);
     return () => {
       abortRef.current.abort();
-      unsub();
-      unsubDecision();
+      loop.stop();
     };
   }, [
     runtime,
@@ -2307,6 +2303,7 @@ function useHeaderMetrics(events) {
       return cachedRef.current;
     }
     let modelName = null;
+    let effortLevel = null;
     let sessionStartTime = null;
     let toolCallCount = 0;
     let permissionsAllowed = 0;
@@ -2323,6 +2320,9 @@ function useHeaderMetrics(events) {
           modelName = event.data.model;
         }
       }
+      if (typeof event.effort_level === "string") {
+        effortLevel = event.effort_level;
+      }
       if (event.kind === "agent.message" && typeof event.data.model === "string") {
         modelName = event.data.model;
       }
@@ -2375,6 +2375,7 @@ function useHeaderMetrics(events) {
     );
     const result = {
       modelName,
+      effortLevel,
       toolCallCount,
       totalToolCallCount: toolCallCount + subagentToolTotal,
       subagentCount: subagentMap.size,
@@ -4443,6 +4444,8 @@ function getClipboardCommand() {
 
 // src/core/feed/defaultRender.ts
 var DEFAULT_RENDER = /* @__PURE__ */ new Set([
+  "prompt.expansion",
+  "tool.batch",
   "compact.post",
   "task.created",
   "cwd.changed",
@@ -4708,14 +4711,14 @@ function extractWebSearch(_input, response) {
   return { type: "text", content: extractTextContent(response), maxLines: 10 };
 }
 function extractNotebookEdit(input, _response) {
-  const path10 = typeof input["notebook_path"] === "string" ? input["notebook_path"] : "";
+  const path11 = typeof input["notebook_path"] === "string" ? input["notebook_path"] : "";
   const mode = typeof input["edit_mode"] === "string" ? input["edit_mode"] : "replace";
   const source = typeof input["new_source"] === "string" ? input["new_source"] : "";
-  if (!source) return { type: "text", content: `${mode} cell in ${path10}` };
+  if (!source) return { type: "text", content: `${mode} cell in ${path11}` };
   return {
     type: "code",
     content: source,
-    language: detectLanguage(path10),
+    language: detectLanguage(path11),
     maxLines: 10
   };
 }
@@ -5239,10 +5242,10 @@ function extractToolSubject(toolName, toolInput) {
       const parts = [];
       const pattern = str(input, "pattern");
       const glob = str(input, "glob");
-      const path10 = str(input, "path");
+      const path11 = str(input, "path");
       if (pattern) parts.push(`"${pattern}"`);
       if (glob) parts.push(glob);
-      if (path10) parts.push(`in ${path10}`);
+      if (path11) parts.push(`in ${path11}`);
       return parts.length > 0 ? parts.join("  ") : void 0;
     }
     case "Skill":
@@ -5500,9 +5503,11 @@ function renderDetailLines(event, width, pairedPostEvent, theme = darkTheme) {
     case "setup":
     case "unknown.hook":
     case "todo.add":
+    case "tool.batch":
     case "todo.update":
     case "todo.done":
     case "teammate.idle":
+    case "prompt.expansion":
     case "task.created":
     case "task.completed":
     case "config.change":
@@ -6118,13 +6123,11 @@ function buildBodyLines({
 }
 
 // src/ui/components/FeedGrid.tsx
-import React7 from "react";
-import { Text as Text15 } from "ink";
+import React6 from "react";
+import { Text as Text14 } from "ink";
 
 // src/ui/components/FeedRow.tsx
 import { performance as performance2 } from "perf_hooks";
-import React3 from "react";
-import { Box as Box9, Text as Text12 } from "ink";
 
 // src/core/feed/cellFormatters.ts
 function isLifecycleOp(op) {
@@ -6338,7 +6341,6 @@ function formatDetails(opts) {
 }
 
 // src/ui/components/FeedRow.tsx
-import { Fragment as Fragment4, jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
 var ROW_LINE_CACHE_MAX_VARIANTS = 16;
 var ROW_LINE_CACHE_MAX_ENTRIES = 2e3;
 var rowLineCache = /* @__PURE__ */ new Map();
@@ -6555,40 +6557,11 @@ function formatFeedRowLine({
     logVisibleRowFormat(performance2.now() - startedAt);
   }
 }
-function FeedRowImpl({
-  entry,
-  cols,
-  focused,
-  expanded,
-  matched,
-  ascii,
-  theme
-}) {
-  const parts = lineParts({
-    entry,
-    cols,
-    focused,
-    expanded,
-    matched,
-    ascii,
-    theme
-  });
-  return /* @__PURE__ */ jsxs10(Fragment4, { children: [
-    /* @__PURE__ */ jsx11(Box9, { width: 1, flexShrink: 0, children: /* @__PURE__ */ jsx11(Text12, { wrap: "truncate-end", children: parts.gutter }) }),
-    /* @__PURE__ */ jsx11(Box9, { width: 5, flexShrink: 0, children: /* @__PURE__ */ jsx11(Text12, { wrap: "truncate-end", children: parts.time }) }),
-    /* @__PURE__ */ jsx11(Box9, { width: cols.gapW, flexShrink: 0 }),
-    /* @__PURE__ */ jsx11(Box9, { width: cols.toolW, flexShrink: 0, children: /* @__PURE__ */ jsx11(Text12, { wrap: "truncate-end", children: parts.tool }) }),
-    /* @__PURE__ */ jsx11(Box9, { width: cols.gapW, flexShrink: 0 }),
-    /* @__PURE__ */ jsx11(Box9, { width: cols.detailsW, flexShrink: 0, children: /* @__PURE__ */ jsx11(Text12, { wrap: "truncate-end", children: parts.detail }) }),
-    /* @__PURE__ */ jsx11(Box9, { flexGrow: 1, flexShrink: 1 })
-  ] });
-}
-var FeedRow = React3.memo(FeedRowImpl);
 
 // src/ui/components/FeedHeader.tsx
-import React4 from "react";
-import { Box as Box10, Text as Text13 } from "ink";
-import { Fragment as Fragment5, jsx as jsx12, jsxs as jsxs11 } from "react/jsx-runtime";
+import React3 from "react";
+import { Box as Box9, Text as Text12 } from "ink";
+import { Fragment as Fragment4, jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
 function formatFeedHeaderLine(cols, theme, innerWidth) {
   const headerColor = theme.feed.headerLabel;
   const style = (s) => source_default.hex(headerColor)(s);
@@ -6603,17 +6576,17 @@ function formatFeedHeaderLine(cols, theme, innerWidth) {
 function FeedHeaderImpl({ cols, theme }) {
   const headerColor = theme.feed.headerLabel;
   const style = (s) => source_default.hex(headerColor)(s);
-  return /* @__PURE__ */ jsxs11(Fragment5, { children: [
-    /* @__PURE__ */ jsx12(Box10, { width: 1, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text13, { children: " " }) }),
-    /* @__PURE__ */ jsx12(Box10, { width: 5, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text13, { wrap: "truncate-end", children: style(fit("TIME", 5)) }) }),
-    /* @__PURE__ */ jsx12(Box10, { width: cols.gapW, flexShrink: 0 }),
-    /* @__PURE__ */ jsx12(Box10, { width: cols.toolW, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text13, { wrap: "truncate-end", children: style(fit("ACTION", cols.toolW)) }) }),
-    /* @__PURE__ */ jsx12(Box10, { width: cols.gapW, flexShrink: 0 }),
-    /* @__PURE__ */ jsx12(Box10, { width: cols.detailsW, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text13, { wrap: "truncate-end", children: style(fit("DETAILS", cols.detailsW)) }) }),
-    /* @__PURE__ */ jsx12(Box10, { flexGrow: 1, flexShrink: 1 })
+  return /* @__PURE__ */ jsxs10(Fragment4, { children: [
+    /* @__PURE__ */ jsx11(Box9, { width: 1, flexShrink: 0, children: /* @__PURE__ */ jsx11(Text12, { children: " " }) }),
+    /* @__PURE__ */ jsx11(Box9, { width: 5, flexShrink: 0, children: /* @__PURE__ */ jsx11(Text12, { wrap: "truncate-end", children: style(fit("TIME", 5)) }) }),
+    /* @__PURE__ */ jsx11(Box9, { width: cols.gapW, flexShrink: 0 }),
+    /* @__PURE__ */ jsx11(Box9, { width: cols.toolW, flexShrink: 0, children: /* @__PURE__ */ jsx11(Text12, { wrap: "truncate-end", children: style(fit("ACTION", cols.toolW)) }) }),
+    /* @__PURE__ */ jsx11(Box9, { width: cols.gapW, flexShrink: 0 }),
+    /* @__PURE__ */ jsx11(Box9, { width: cols.detailsW, flexShrink: 0, children: /* @__PURE__ */ jsx11(Text12, { wrap: "truncate-end", children: style(fit("DETAILS", cols.detailsW)) }) }),
+    /* @__PURE__ */ jsx11(Box9, { flexGrow: 1, flexShrink: 1 })
   ] });
 }
-var FeedHeader = React4.memo(FeedHeaderImpl);
+var FeedHeader = React3.memo(FeedHeaderImpl);
 
 // src/ui/components/rowCache.ts
 var DEFAULT_MAX_SIZE = 100;
@@ -6880,11 +6853,11 @@ function buildFeedSurface(params) {
 }
 
 // src/ui/components/FeedSurface.tsx
-import React6 from "react";
-import { Text as Text14 } from "ink";
+import React5 from "react";
+import { Text as Text13 } from "ink";
 
 // src/ui/components/IncrementalFeedSurface.tsx
-import React5 from "react";
+import React4 from "react";
 
 // src/ui/components/feedSurfaceDiff.ts
 function diffFeedSurface(prev, next) {
@@ -6947,19 +6920,19 @@ function IncrementalFeedSurfaceImpl({
   feedStartCol,
   stdout = process.stdout
 }) {
-  const prevLinesRef = React5.useRef([]);
-  const prevFeedStartRowRef = React5.useRef(feedStartRow);
-  const prevFeedStartColRef = React5.useRef(feedStartCol);
-  const prevLineWidthRef = React5.useRef(surface.lineWidth);
-  const feedStartRowRef = React5.useRef(feedStartRow);
-  const feedStartColRef = React5.useRef(feedStartCol);
-  const lineWidthRef = React5.useRef(surface.lineWidth);
-  const stdoutRef = React5.useRef(stdout);
+  const prevLinesRef = React4.useRef([]);
+  const prevFeedStartRowRef = React4.useRef(feedStartRow);
+  const prevFeedStartColRef = React4.useRef(feedStartCol);
+  const prevLineWidthRef = React4.useRef(surface.lineWidth);
+  const feedStartRowRef = React4.useRef(feedStartRow);
+  const feedStartColRef = React4.useRef(feedStartCol);
+  const lineWidthRef = React4.useRef(surface.lineWidth);
+  const stdoutRef = React4.useRef(stdout);
   feedStartRowRef.current = feedStartRow;
   feedStartColRef.current = feedStartCol;
   lineWidthRef.current = surface.lineWidth;
   stdoutRef.current = stdout;
-  React5.useEffect(() => {
+  React4.useEffect(() => {
     const prevLines = prevLinesRef.current;
     const nextLines = surface.allLines;
     const prevStartRow = prevFeedStartRowRef.current;
@@ -7016,7 +6989,7 @@ function IncrementalFeedSurfaceImpl({
       linesCleared: result.linesCleared
     });
   }, [surface, feedStartRow, feedStartCol, stdout]);
-  React5.useEffect(() => {
+  React4.useEffect(() => {
     return () => {
       if (prevLinesRef.current.length > 0) {
         paintFeedSurface(
@@ -7032,10 +7005,10 @@ function IncrementalFeedSurfaceImpl({
   }, []);
   return null;
 }
-var IncrementalFeedSurface = React5.memo(IncrementalFeedSurfaceImpl);
+var IncrementalFeedSurface = React4.memo(IncrementalFeedSurfaceImpl);
 
 // src/ui/components/FeedSurface.tsx
-import { jsx as jsx13 } from "react/jsx-runtime";
+import { jsx as jsx12 } from "react/jsx-runtime";
 var VALID_BACKENDS = /* @__PURE__ */ new Set([
   "ink-full",
   "incremental"
@@ -7057,7 +7030,7 @@ function FeedSurfaceImpl({
 }) {
   const backend = resolveFeedBackend(backendProp);
   if (backend === "incremental") {
-    return /* @__PURE__ */ jsx13(
+    return /* @__PURE__ */ jsx12(
       IncrementalFeedSurface,
       {
         surface,
@@ -7067,15 +7040,15 @@ function FeedSurfaceImpl({
       }
     );
   }
-  return /* @__PURE__ */ jsx13(InkFullFeedSurface, { surface, backend });
+  return /* @__PURE__ */ jsx12(InkFullFeedSurface, { surface, backend });
 }
 function InkFullFeedSurface({
   surface,
   backend
 }) {
-  const output = React6.useMemo(() => surface.allLines.join("\n"), [surface]);
-  const prevLinesRef = React6.useRef(0);
-  React6.useEffect(() => {
+  const output = React5.useMemo(() => surface.allLines.join("\n"), [surface]);
+  const prevLinesRef = React5.useRef(0);
+  React5.useEffect(() => {
     const linesRendered = surface.allLines.length;
     const prevLines = prevLinesRef.current;
     prevLinesRef.current = linesRendered;
@@ -7089,12 +7062,12 @@ function InkFullFeedSurface({
       linesCleared
     });
   }, [surface, backend]);
-  return /* @__PURE__ */ jsx13(Text14, { children: output });
+  return /* @__PURE__ */ jsx12(Text13, { children: output });
 }
-var FeedSurfaceView = React6.memo(FeedSurfaceImpl);
+var FeedSurfaceView = React5.memo(FeedSurfaceImpl);
 
 // src/ui/components/FeedGrid.tsx
-import { Fragment as Fragment6, jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
+import { Fragment as Fragment5, jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
 function FeedGridImpl({
   feedHeaderRows,
   feedContentRows,
@@ -7114,16 +7087,16 @@ function FeedGridImpl({
 }) {
   const backend = resolveFeedBackend(backendProp);
   const isIncremental = backend === "incremental";
-  const rowCacheRef = React7.useRef(new RowCache());
-  const prevGlobalsRef = React7.useRef({ innerWidth, ascii, theme, cols });
-  React7.useEffect(() => {
+  const rowCacheRef = React6.useRef(new RowCache());
+  const prevGlobalsRef = React6.useRef({ innerWidth, ascii, theme, cols });
+  React6.useEffect(() => {
     const prev = prevGlobalsRef.current;
     if (prev.innerWidth !== innerWidth || prev.ascii !== ascii || prev.theme !== theme || prev.cols !== cols) {
       rowCacheRef.current.bumpGeneration();
       prevGlobalsRef.current = { innerWidth, ascii, theme, cols };
     }
   }, [innerWidth, ascii, theme, cols]);
-  const surface = React7.useMemo(
+  const surface = React6.useMemo(
     () => buildFeedSurface({
       feedHeaderRows,
       feedContentRows,
@@ -7155,7 +7128,7 @@ function FeedGridImpl({
     ]
   );
   const { visibleContentRows } = surface;
-  const visibleRowSignatures = React7.useMemo(() => {
+  const visibleRowSignatures = React6.useMemo(() => {
     const signatures = [];
     if (visibleContentRows <= 0) return signatures;
     for (let offset = 0; offset < visibleContentRows; offset++) {
@@ -7184,8 +7157,8 @@ function FeedGridImpl({
     feedCursor,
     searchMatchSet
   ]);
-  const prevViewportRef = React7.useRef(null);
-  React7.useEffect(() => {
+  const prevViewportRef = React6.useRef(null);
+  React6.useEffect(() => {
     const previous = prevViewportRef.current;
     const current = {
       signatures: visibleRowSignatures,
@@ -7229,9 +7202,9 @@ function FeedGridImpl({
   if (isIncremental) {
     const totalFeedRows = feedHeaderRows + feedContentRows;
     const placeholderLines = "\n".repeat(Math.max(0, totalFeedRows - 1));
-    return /* @__PURE__ */ jsxs12(Fragment6, { children: [
-      /* @__PURE__ */ jsx14(Text15, { children: placeholderLines }),
-      /* @__PURE__ */ jsx14(
+    return /* @__PURE__ */ jsxs11(Fragment5, { children: [
+      /* @__PURE__ */ jsx13(Text14, { children: placeholderLines }),
+      /* @__PURE__ */ jsx13(
         FeedSurfaceView,
         {
           surface,
@@ -7242,7 +7215,7 @@ function FeedGridImpl({
       )
     ] });
   }
-  return /* @__PURE__ */ jsx14(
+  return /* @__PURE__ */ jsx13(
     FeedSurfaceView,
     {
       surface,
@@ -7251,11 +7224,11 @@ function FeedGridImpl({
     }
   );
 }
-var FeedGrid = React7.memo(FeedGridImpl);
+var FeedGrid = React6.memo(FeedGridImpl);
 
 // src/ui/components/MessagePanel.tsx
-import React8, { useMemo as useMemo11 } from "react";
-import { Text as Text16 } from "ink";
+import React7, { useMemo as useMemo11 } from "react";
+import { Text as Text15 } from "ink";
 
 // src/core/feed/panelFilter.ts
 var USER_TAGS = /* @__PURE__ */ new Set(["msg.user", "prompt"]);
@@ -7303,7 +7276,7 @@ function messageText(entry) {
 }
 
 // src/ui/components/MessagePanel.tsx
-import { jsx as jsx15 } from "react/jsx-runtime";
+import { jsx as jsx14 } from "react/jsx-runtime";
 var INDICATOR_OVERHEAD = 2;
 function buildRenderedLines(entries, width, theme) {
   const contentWidth2 = width - INDICATOR_OVERHEAD;
@@ -7438,9 +7411,9 @@ function MessagePanelImpl(props) {
     ),
     [wrapped, contentRows, viewportStart, style, width, messageCursorIndex]
   );
-  return /* @__PURE__ */ jsx15(Text16, { children: lines.join("\n") });
+  return /* @__PURE__ */ jsx14(Text15, { children: lines.join("\n") });
 }
-var MessagePanel = React8.memo(MessagePanelImpl);
+var MessagePanel = React7.memo(MessagePanelImpl);
 
 // src/ui/hooks/useFeedColumns.ts
 import { useMemo as useMemo12, useRef as useRef12 } from "react";
@@ -7652,6 +7625,7 @@ function buildHeaderModel(input) {
     workflow: workflowRef ?? "default",
     harness: detectHarness(input.harness),
     model_name: input.modelName ?? null,
+    effort_level: input.effortLevel ?? null,
     context: { used: input.contextUsed ?? null, max: input.contextMax ?? null },
     total_tokens: input.totalTokens ?? null,
     token_label: codexHarness ? "Billable" : "Tokens",
@@ -7860,7 +7834,8 @@ function renderHeaderLines(model, width, hasColor, theme) {
   const sidText = `${sidLabel}${sidValue}${style(sidScope, palette.label)}`;
   const wfText = `${style("Workflow: ", palette.label)}${style(model.workflow, palette.value)}`;
   const harnessText = `${style("Harness: ", palette.label)}${style(model.harness, palette.value)}`;
-  const modelText = `${style("Model: ", palette.label)}${style(formatModelName(model.model_name), palette.value)}`;
+  const effortSuffix = model.effort_level ? style(` with ${model.effort_level} effort`, palette.label) : "";
+  const modelText = `${style("Model: ", palette.label)}${style(formatModelName(model.model_name), palette.value)}${effortSuffix}`;
   const tokenLabel = model.token_label ?? "Tokens";
   const runLabel = model.run_label ?? "Runs";
   const leftTokens = [
@@ -7988,8 +7963,8 @@ function executeCommand(command, args, ctx) {
 
 // src/ui/components/SessionPicker.tsx
 import { useState as useState11 } from "react";
-import { Box as Box11, Text as Text17, useInput as useInput12, useStdout as useStdout5 } from "ink";
-import { jsx as jsx16, jsxs as jsxs13 } from "react/jsx-runtime";
+import { Box as Box10, Text as Text16, useInput as useInput12, useStdout as useStdout5 } from "ink";
+import { jsx as jsx15, jsxs as jsxs12 } from "react/jsx-runtime";
 var PICKER_CHROME_ROWS = 5;
 var ROWS_PER_SESSION = 3;
 function resolveVisibleCount(terminalRows) {
@@ -8031,13 +8006,13 @@ function SessionPicker({
     }
   });
   if (loading) {
-    return /* @__PURE__ */ jsxs13(Box11, { flexDirection: "column", padding: 1, children: [
-      /* @__PURE__ */ jsx16(Box11, { marginBottom: 1, children: /* @__PURE__ */ jsx16(Text17, { bold: true, color: theme.accent, children: "Sessions" }) }),
-      /* @__PURE__ */ jsx16(Text17, { dimColor: true, children: "Loading sessions\u2026" })
+    return /* @__PURE__ */ jsxs12(Box10, { flexDirection: "column", padding: 1, children: [
+      /* @__PURE__ */ jsx15(Box10, { marginBottom: 1, children: /* @__PURE__ */ jsx15(Text16, { bold: true, color: theme.accent, children: "Sessions" }) }),
+      /* @__PURE__ */ jsx15(Text16, { dimColor: true, children: "Loading sessions\u2026" })
     ] });
   }
   if (sessions.length === 0) {
-    return /* @__PURE__ */ jsx16(Box11, { flexDirection: "column", padding: 1, children: /* @__PURE__ */ jsx16(Text17, { dimColor: true, children: "No previous sessions found." }) });
+    return /* @__PURE__ */ jsx15(Box10, { flexDirection: "column", padding: 1, children: /* @__PURE__ */ jsx15(Text16, { dimColor: true, children: "No previous sessions found." }) });
   }
   const scrollStart = Math.max(
     0,
@@ -8047,8 +8022,8 @@ function SessionPicker({
     )
   );
   const visible = sessions.slice(scrollStart, scrollStart + visibleCount);
-  return /* @__PURE__ */ jsxs13(Box11, { flexDirection: "column", padding: 1, children: [
-    /* @__PURE__ */ jsx16(Box11, { marginBottom: 1, children: /* @__PURE__ */ jsx16(Text17, { bold: true, color: theme.accent, children: "Sessions" }) }),
+  return /* @__PURE__ */ jsxs12(Box10, { flexDirection: "column", padding: 1, children: [
+    /* @__PURE__ */ jsx15(Box10, { marginBottom: 1, children: /* @__PURE__ */ jsx15(Text16, { bold: true, color: theme.accent, children: "Sessions" }) }),
     visible.map((session, vi) => {
       const realIndex = scrollStart + vi;
       const isFocused = realIndex === focusIndex;
@@ -8060,23 +8035,23 @@ function SessionPicker({
       const meta = `${shortId}${branch} \xB7 ${time}${msgs}`;
       const titleRaw = session.summary || session.firstPrompt || `Session ${shortId}`;
       const title = compactText(titleRaw.replace(/\n/g, " ").trim(), 60);
-      return /* @__PURE__ */ jsxs13(
-        Box11,
+      return /* @__PURE__ */ jsxs12(
+        Box10,
         {
           flexDirection: "column",
           marginBottom: vi === visible.length - 1 ? 0 : 1,
           children: [
-            /* @__PURE__ */ jsx16(Box11, { children: /* @__PURE__ */ jsxs13(Text17, { color: isFocused ? "cyan" : void 0, bold: isFocused, children: [
+            /* @__PURE__ */ jsx15(Box10, { children: /* @__PURE__ */ jsxs12(Text16, { color: isFocused ? "cyan" : void 0, bold: isFocused, children: [
               isFocused ? "\u276F " : "  ",
               title
             ] }) }),
-            /* @__PURE__ */ jsx16(Box11, { paddingLeft: 2, children: /* @__PURE__ */ jsx16(Text17, { dimColor: true, children: meta }) })
+            /* @__PURE__ */ jsx15(Box10, { paddingLeft: 2, children: /* @__PURE__ */ jsx15(Text16, { dimColor: true, children: meta }) })
           ]
         },
         session.sessionId
       );
     }),
-    /* @__PURE__ */ jsx16(Box11, { marginTop: 1, children: /* @__PURE__ */ jsx16(Text17, { dimColor: true, children: "\u2191/\u2193 Navigate \xB7 Enter Select \xB7 Esc Cancel" }) })
+    /* @__PURE__ */ jsx15(Box10, { marginTop: 1, children: /* @__PURE__ */ jsx15(Text16, { dimColor: true, children: "\u2191/\u2193 Navigate \xB7 Enter Select \xB7 Esc Cancel" }) })
   ] });
 }
 
@@ -8097,7 +8072,7 @@ function renderYankLines(entry, width, theme) {
 
 // src/setup/SetupWizard.tsx
 import { useState as useState14, useCallback as useCallback15, useEffect as useEffect10, useRef as useRef13 } from "react";
-import { Box as Box16, Text as Text22, useInput as useInput13 } from "ink";
+import { Box as Box15, Text as Text21, useInput as useInput13 } from "ink";
 
 // src/setup/useSetupState.ts
 import { useState as useState12, useCallback as useCallback13 } from "react";
@@ -8131,14 +8106,14 @@ function useSetupState() {
 }
 
 // src/setup/steps/ThemeStep.tsx
-import { Box as Box12, Text as Text18 } from "ink";
-import { jsx as jsx17, jsxs as jsxs14 } from "react/jsx-runtime";
+import { Box as Box11, Text as Text17 } from "ink";
+import { jsx as jsx16, jsxs as jsxs13 } from "react/jsx-runtime";
 function ThemeStep({ onComplete, onPreview }) {
   const theme = useTheme();
-  return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx17(Text18, { bold: true, color: theme.accent, children: "Choose your display theme" }),
-    /* @__PURE__ */ jsx17(Text18, { color: theme.textMuted, children: "This applies immediately after setup completes." }),
-    /* @__PURE__ */ jsx17(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx17(
+  return /* @__PURE__ */ jsxs13(Box11, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx16(Text17, { bold: true, color: theme.accent, children: "Choose your display theme" }),
+    /* @__PURE__ */ jsx16(Text17, { color: theme.textMuted, children: "This applies immediately after setup completes." }),
+    /* @__PURE__ */ jsx16(Box11, { marginTop: 1, children: /* @__PURE__ */ jsx16(
       StepSelector,
       {
         options: [
@@ -8168,8 +8143,8 @@ function ThemeStep({ onComplete, onPreview }) {
 
 // src/setup/steps/HarnessStep.tsx
 import { useState as useState13, useCallback as useCallback14 } from "react";
-import { Box as Box13, Text as Text19 } from "ink";
-import { jsx as jsx18, jsxs as jsxs15 } from "react/jsx-runtime";
+import { Box as Box12, Text as Text18 } from "ink";
+import { jsx as jsx17, jsxs as jsxs14 } from "react/jsx-runtime";
 function HarnessStep({ onComplete, onError }) {
   const theme = useTheme();
   const capabilities = listHarnessCapabilities();
@@ -8180,7 +8155,7 @@ function HarnessStep({ onComplete, onError }) {
     (check) => {
       const glyph = check.status === "pass" ? "\u2713" : check.status === "fail" ? "\u2717" : "!";
       const color = check.status === "pass" ? theme.status.success : check.status === "fail" ? theme.status.error : theme.status.warning;
-      return /* @__PURE__ */ jsx18(Text19, { color, children: `${glyph} ${check.label}: ${check.message}` }, check.label);
+      return /* @__PURE__ */ jsx17(Text18, { color, children: `${glyph} ${check.label}: ${check.message}` }, check.label);
     },
     [theme.status.error, theme.status.success, theme.status.warning]
   );
@@ -8212,10 +8187,10 @@ function HarnessStep({ onComplete, onError }) {
     },
     [capabilities, onComplete, onError]
   );
-  return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx18(Text19, { bold: true, color: theme.accent, children: "Select harness" }),
-    /* @__PURE__ */ jsx18(Text19, { color: theme.textMuted, children: "Choose your coding harness. You can skip this step with S." }),
-    status === "selecting" && /* @__PURE__ */ jsx18(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx18(
+  return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx17(Text18, { bold: true, color: theme.accent, children: "Select harness" }),
+    /* @__PURE__ */ jsx17(Text18, { color: theme.textMuted, children: "Choose your coding harness. You can skip this step with S." }),
+    status === "selecting" && /* @__PURE__ */ jsx17(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx17(
       StepSelector,
       {
         options: capabilities.map((capability, index) => ({
@@ -8227,22 +8202,22 @@ function HarnessStep({ onComplete, onError }) {
         onSelect: (value) => handleSelect(value)
       }
     ) }),
-    (status === "verifying" || status === "success" || status === "error") && /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", marginTop: 1, children: [
-      /* @__PURE__ */ jsx18(
+    (status === "verifying" || status === "success" || status === "error") && /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", marginTop: 1, children: [
+      /* @__PURE__ */ jsx17(
         StepStatus,
         {
           status,
           message: message || "Verifying harness..."
         }
       ),
-      checks.length > 0 && /* @__PURE__ */ jsx18(Box13, { flexDirection: "column", marginTop: 1, children: checks.map(renderCheckLine) })
+      checks.length > 0 && /* @__PURE__ */ jsx17(Box12, { flexDirection: "column", marginTop: 1, children: checks.map(renderCheckLine) })
     ] })
   ] });
 }
 
 // src/setup/components/WizardFrame.tsx
-import { Box as Box14, Text as Text20, useStdout as useStdout6 } from "ink";
-import { jsx as jsx19, jsxs as jsxs16 } from "react/jsx-runtime";
+import { Box as Box13, Text as Text19, useStdout as useStdout6 } from "ink";
+import { jsx as jsx18, jsxs as jsxs15 } from "react/jsx-runtime";
 var MAX_WIDTH = 60;
 function WizardFrame({ title, header, footer, children }) {
   const theme = useTheme();
@@ -8256,25 +8231,25 @@ function WizardFrame({ title, header, footer, children }) {
   const topLine = `${g["frame.topLeft"]}${h.repeat(3)}${titlePadded}${h.repeat(topFillCount)}${g["frame.topRight"]}`;
   const teeLine = `${g["frame.teeLeft"]}${h.repeat(frameWidth - 2)}${g["frame.teeRight"]}`;
   const bottomLine = `${g["frame.bottomLeft"]}${h.repeat(frameWidth - 2)}${g["frame.bottomRight"]}`;
-  return /* @__PURE__ */ jsxs16(Box14, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsx19(Text20, { color: theme.accent, children: topLine }),
-    /* @__PURE__ */ jsx19(Box14, { flexDirection: "column", paddingX: 1, paddingY: 1, children: header }),
-    /* @__PURE__ */ jsx19(Text20, { color: theme.accent, children: teeLine }),
-    /* @__PURE__ */ jsx19(Box14, { flexDirection: "column", paddingX: 1, paddingY: 1, children }),
-    /* @__PURE__ */ jsx19(Text20, { color: theme.accent, children: teeLine }),
-    /* @__PURE__ */ jsx19(Box14, { paddingX: 1, children: footer }),
-    /* @__PURE__ */ jsx19(Text20, { color: theme.accent, children: bottomLine })
+  return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", paddingX: 1, children: [
+    /* @__PURE__ */ jsx18(Text19, { color: theme.accent, children: topLine }),
+    /* @__PURE__ */ jsx18(Box13, { flexDirection: "column", paddingX: 1, paddingY: 1, children: header }),
+    /* @__PURE__ */ jsx18(Text19, { color: theme.accent, children: teeLine }),
+    /* @__PURE__ */ jsx18(Box13, { flexDirection: "column", paddingX: 1, paddingY: 1, children }),
+    /* @__PURE__ */ jsx18(Text19, { color: theme.accent, children: teeLine }),
+    /* @__PURE__ */ jsx18(Box13, { paddingX: 1, children: footer }),
+    /* @__PURE__ */ jsx18(Text19, { color: theme.accent, children: bottomLine })
   ] });
 }
 
 // src/setup/components/WizardHints.tsx
-import { Box as Box15, Text as Text21 } from "ink";
-import { jsx as jsx20 } from "react/jsx-runtime";
+import { Box as Box14, Text as Text20 } from "ink";
+import { jsx as jsx19 } from "react/jsx-runtime";
 function WizardHints({ stepState, stepIndex }) {
   const theme = useTheme();
   const g = getGlyphs();
   if (stepState === "verifying" || stepState === "success") {
-    return /* @__PURE__ */ jsx20(Box15, {});
+    return /* @__PURE__ */ jsx19(Box14, {});
   }
   const hints = [];
   if (stepState === "error") {
@@ -8286,7 +8261,7 @@ function WizardHints({ stepState, stepIndex }) {
     if (stepIndex > 0) hints.push(`${g["hint.escape"]} back`);
     hints.push("s skip");
   }
-  return /* @__PURE__ */ jsx20(Box15, { children: /* @__PURE__ */ jsx20(Text21, { color: theme.textMuted, children: hints.join("  ") }) });
+  return /* @__PURE__ */ jsx19(Box14, { children: /* @__PURE__ */ jsx19(Text20, { color: theme.textMuted, children: hints.join("  ") }) });
 }
 
 // src/infra/telemetry/identity.ts
@@ -8296,7 +8271,7 @@ function generateDeviceId() {
 }
 
 // src/setup/SetupWizard.tsx
-import { Fragment as Fragment7, jsx as jsx21, jsxs as jsxs17 } from "react/jsx-runtime";
+import { Fragment as Fragment6, jsx as jsx20, jsxs as jsxs16 } from "react/jsx-runtime";
 var STEP_SUMMARIES = [
   { label: "Theme", summarize: (r) => r.theme },
   { label: "Harness", summarize: (r) => r.harness ?? "skipped" }
@@ -8417,12 +8392,12 @@ function SetupWizard({ onComplete, onThemePreview }) {
       }
     }
   }, [isComplete, result, onComplete, writeRetryCount]);
-  return /* @__PURE__ */ jsxs17(
+  return /* @__PURE__ */ jsxs16(
     WizardFrame,
     {
       title: "ATHENA SETUP",
-      header: /* @__PURE__ */ jsx21(Text22, { color: theme.textMuted, children: "Configure your defaults in under a minute." }),
-      footer: /* @__PURE__ */ jsx21(
+      header: /* @__PURE__ */ jsx20(Text21, { color: theme.textMuted, children: "Configure your defaults in under a minute." }),
+      footer: /* @__PURE__ */ jsx20(
         WizardHints,
         {
           stepState: isComplete ? writeError ? "error" : "verifying" : stepState,
@@ -8433,21 +8408,21 @@ function SetupWizard({ onComplete, onThemePreview }) {
         STEP_SUMMARIES.slice(
           0,
           isComplete ? STEP_SUMMARIES.length : stepIndex
-        ).map((step, i) => /* @__PURE__ */ jsxs17(Text22, { color: theme.status.success, children: [
+        ).map((step, i) => /* @__PURE__ */ jsxs16(Text21, { color: theme.status.success, children: [
           getGlyphs()["todo.done"],
           " ",
           step.label,
           " \xB7 ",
           step.summarize(result)
         ] }, i)),
-        stepIndex === 0 && !isComplete && /* @__PURE__ */ jsx21(
+        stepIndex === 0 && !isComplete && /* @__PURE__ */ jsx20(
           ThemeStep,
           {
             onComplete: handleThemeComplete,
             onPreview: handleThemePreview
           }
         ),
-        stepIndex === 1 && !isComplete && /* @__PURE__ */ jsx21(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx21(
+        stepIndex === 1 && !isComplete && /* @__PURE__ */ jsx20(Box15, { marginTop: 1, children: /* @__PURE__ */ jsx20(
           HarnessStep,
           {
             onComplete: handleHarnessComplete,
@@ -8455,11 +8430,11 @@ function SetupWizard({ onComplete, onThemePreview }) {
           },
           retryCount
         ) }),
-        stepState === "error" && !isComplete && /* @__PURE__ */ jsx21(Text22, { color: theme.status.error, children: "Press r to retry this step." }),
-        isComplete && !writeError && /* @__PURE__ */ jsx21(StepStatus, { status: "verifying", message: "Saving setup..." }),
-        isComplete && writeError && /* @__PURE__ */ jsxs17(Fragment7, { children: [
-          /* @__PURE__ */ jsx21(StepStatus, { status: "error", message: writeError }),
-          /* @__PURE__ */ jsx21(Text22, { color: theme.textMuted, children: "Press r to retry saving." })
+        stepState === "error" && !isComplete && /* @__PURE__ */ jsx20(Text21, { color: theme.status.error, children: "Press r to retry this step." }),
+        isComplete && !writeError && /* @__PURE__ */ jsx20(StepStatus, { status: "verifying", message: "Saving setup..." }),
+        isComplete && writeError && /* @__PURE__ */ jsxs16(Fragment6, { children: [
+          /* @__PURE__ */ jsx20(StepStatus, { status: "error", message: writeError }),
+          /* @__PURE__ */ jsx20(Text21, { color: theme.textMuted, children: "Press r to retry saving." })
         ] })
       ]
     }
@@ -8468,7 +8443,7 @@ function SetupWizard({ onComplete, onThemePreview }) {
 
 // src/app/workflow/WorkflowPicker.tsx
 import { useState as useState15, useCallback as useCallback16, useEffect as useEffect11 } from "react";
-import { Box as Box17, Text as Text23, useInput as useInput14, useStdout as useStdout7 } from "ink";
+import { Box as Box16, Text as Text22, useInput as useInput14, useStdout as useStdout7 } from "ink";
 
 // src/core/workflows/workflowOptions.ts
 import fs3 from "fs";
@@ -8532,7 +8507,7 @@ function loadWorkflowOptions() {
 }
 
 // src/app/workflow/WorkflowPicker.tsx
-import { jsx as jsx22, jsxs as jsxs18 } from "react/jsx-runtime";
+import { jsx as jsx21, jsxs as jsxs17 } from "react/jsx-runtime";
 var DEFAULT_WORKFLOW_OPTION = {
   label: "default",
   value: "default",
@@ -8628,22 +8603,22 @@ function WorkflowPicker({
   } else if (phase.type === "error") {
     hints.push("r retry");
   }
-  return /* @__PURE__ */ jsx22(
-    Box17,
+  return /* @__PURE__ */ jsx21(
+    Box16,
     {
       flexDirection: "column",
       alignItems: "center",
       justifyContent: "center",
       height: rows,
-      children: /* @__PURE__ */ jsx22(Box17, { width: frameWidth + 4, children: /* @__PURE__ */ jsxs18(
+      children: /* @__PURE__ */ jsx21(Box16, { width: frameWidth + 4, children: /* @__PURE__ */ jsxs17(
         WizardFrame,
         {
           title: "WORKFLOW",
-          header: /* @__PURE__ */ jsx22(Text23, { color: theme.textMuted, children: "Choose a workflow for this project." }),
-          footer: /* @__PURE__ */ jsx22(Text23, { color: theme.textMuted, children: hints.join("  ") }),
+          header: /* @__PURE__ */ jsx21(Text22, { color: theme.textMuted, children: "Choose a workflow for this project." }),
+          footer: /* @__PURE__ */ jsx21(Text22, { color: theme.textMuted, children: hints.join("  ") }),
           children: [
-            phase.type === "loading" && /* @__PURE__ */ jsx22(StepStatus, { status: "verifying", message: "Loading workflows..." }),
-            phase.type === "selecting" && /* @__PURE__ */ jsx22(
+            phase.type === "loading" && /* @__PURE__ */ jsx21(StepStatus, { status: "verifying", message: "Loading workflows..." }),
+            phase.type === "selecting" && /* @__PURE__ */ jsx21(
               StepSelector,
               {
                 options: phase.options,
@@ -8651,15 +8626,15 @@ function WorkflowPicker({
                 gap: 1
               }
             ),
-            phase.type === "installing" && /* @__PURE__ */ jsx22(StepStatus, { status: "verifying", message: "Installing workflow..." }),
-            phase.type === "mcp-options" && /* @__PURE__ */ jsx22(
+            phase.type === "installing" && /* @__PURE__ */ jsx21(StepStatus, { status: "verifying", message: "Installing workflow..." }),
+            phase.type === "mcp-options" && /* @__PURE__ */ jsx21(
               McpOptionsStep,
               {
                 servers: phase.servers,
                 onComplete: handleMcpComplete
               }
             ),
-            phase.type === "error" && /* @__PURE__ */ jsx22(Text23, { color: theme.status.error, children: phase.message })
+            phase.type === "error" && /* @__PURE__ */ jsx21(Text22, { color: theme.status.error, children: phase.message })
           ]
         }
       ) })
@@ -8669,58 +8644,8 @@ function WorkflowPicker({
 
 // src/app/modelPreferences/ModelPicker.tsx
 import { useState as useState16, useEffect as useEffect12, useCallback as useCallback17 } from "react";
-import { Box as Box18, Text as Text24, useInput as useInput15, useStdout as useStdout8 } from "ink";
-
-// src/app/modelPreferences/listAvailableModels.ts
-var CLAUDE_MODEL_OPTIONS = [
-  {
-    value: "sonnet",
-    label: "Sonnet",
-    description: "Balanced default for day-to-day coding work."
-  },
-  {
-    value: "opus",
-    label: "Opus",
-    description: "Stronger reasoning for complex architecture and debugging."
-  },
-  {
-    value: "haiku",
-    label: "Haiku",
-    description: "Fastest option for lighter tasks."
-  },
-  {
-    value: "opusplan",
-    label: "OpusPlan",
-    description: "Uses Opus for planning and Sonnet for execution."
-  }
-];
-function isCodexRuntimeWithModels(runtime) {
-  return Boolean(runtime && "listModels" in runtime);
-}
-async function listAvailableModels(input) {
-  switch (input.harness) {
-    case "claude-code":
-      return CLAUDE_MODEL_OPTIONS;
-    case "openai-codex": {
-      if (!isCodexRuntimeWithModels(input.runtime)) {
-        throw new Error("Codex runtime is not available");
-      }
-      const models = await input.runtime.listModels();
-      return models.map((model) => ({
-        value: model.model,
-        label: model.displayName,
-        description: model.description,
-        isDefault: model.isDefault
-      }));
-    }
-    case "opencode":
-    default:
-      return [];
-  }
-}
-
-// src/app/modelPreferences/ModelPicker.tsx
-import { jsx as jsx23, jsxs as jsxs19 } from "react/jsx-runtime";
+import { Box as Box17, Text as Text23, useInput as useInput15, useStdout as useStdout8 } from "ink";
+import { jsx as jsx22, jsxs as jsxs18 } from "react/jsx-runtime";
 function ModelPicker({
   projectDir,
   rows,
@@ -8738,7 +8663,7 @@ function ModelPicker({
   const loadModels = useCallback17(() => {
     setPhase({ type: "loading" });
     setTimeout(() => {
-      void listAvailableModels({ harness, runtime }).then((options) => {
+      void resolveHarnessAdapter(harness).listModels(runtime).then((options) => {
         if (options.length === 0) {
           setPhase({
             type: "error",
@@ -8786,28 +8711,28 @@ function ModelPicker({
     hints.push("r retry");
     if (onClose) hints.push(`${g["hint.escape"]} close`);
   }
-  return /* @__PURE__ */ jsx23(
-    Box18,
+  return /* @__PURE__ */ jsx22(
+    Box17,
     {
       flexDirection: "column",
       alignItems: "center",
       justifyContent: "center",
       height: rows,
-      children: /* @__PURE__ */ jsx23(Box18, { width: frameWidth + 4, children: /* @__PURE__ */ jsxs19(
+      children: /* @__PURE__ */ jsx22(Box17, { width: frameWidth + 4, children: /* @__PURE__ */ jsxs18(
         WizardFrame,
         {
           title: "MODEL",
-          header: /* @__PURE__ */ jsxs19(Box18, { flexDirection: "column", children: [
-            /* @__PURE__ */ jsx23(Text24, { color: theme.textMuted, children: "Choose the preferred model for this project." }),
-            currentModelName ? /* @__PURE__ */ jsxs19(Text24, { color: theme.textMuted, children: [
+          header: /* @__PURE__ */ jsxs18(Box17, { flexDirection: "column", children: [
+            /* @__PURE__ */ jsx22(Text23, { color: theme.textMuted, children: "Choose the preferred model for this project." }),
+            currentModelName ? /* @__PURE__ */ jsxs18(Text23, { color: theme.textMuted, children: [
               "Current: ",
               currentModelName
             ] }) : null
           ] }),
-          footer: /* @__PURE__ */ jsx23(Text24, { color: theme.textMuted, children: hints.join("  ") }),
+          footer: /* @__PURE__ */ jsx22(Text23, { color: theme.textMuted, children: hints.join("  ") }),
           children: [
-            phase.type === "loading" && /* @__PURE__ */ jsx23(StepStatus, { status: "verifying", message: "Loading models..." }),
-            phase.type === "selecting" && /* @__PURE__ */ jsx23(
+            phase.type === "loading" && /* @__PURE__ */ jsx22(StepStatus, { status: "verifying", message: "Loading models..." }),
+            phase.type === "selecting" && /* @__PURE__ */ jsx22(
               StepSelector,
               {
                 options: phase.options.map((option) => ({
@@ -8820,14 +8745,14 @@ function ModelPicker({
                 gap: 1
               }
             ),
-            phase.type === "saving" && /* @__PURE__ */ jsx23(
+            phase.type === "saving" && /* @__PURE__ */ jsx22(
               StepStatus,
               {
                 status: "verifying",
                 message: `Saving model preference (${phase.model})...`
               }
             ),
-            phase.type === "error" && /* @__PURE__ */ jsx23(Text24, { color: theme.status.error, children: phase.message })
+            phase.type === "error" && /* @__PURE__ */ jsx22(Text23, { color: theme.status.error, children: phase.message })
           ]
         }
       ) })
@@ -9636,7 +9561,7 @@ function toSessionPickerEntries(sessions) {
 
 // src/app/shell/startupDiagnostics.ts
 function shouldTrackStartupDiagnostics(harness) {
-  return harness === "claude-code";
+  return resolveHarnessAdapter(harness).capabilities.emitsStartupDiagnostics;
 }
 function createPendingStartupDiagnosticsEvent(args) {
   return {
@@ -9673,6 +9598,20 @@ function deriveStartupTimeoutFailure(args) {
   };
 }
 
+// src/app/shell/resolveAllowedTools.ts
+var BASELINE_ALLOWED_TOOLS = ["mcp__*"];
+function resolveAllowedTools(harness, allowedTools) {
+  const extras = [
+    ...BASELINE_ALLOWED_TOOLS,
+    ...resolveHarnessAdapter(harness).capabilities.extraAllowedTools
+  ];
+  const merged = [...allowedTools ?? []];
+  for (const tool of extras) {
+    if (!merged.includes(tool)) merged.push(tool);
+  }
+  return merged;
+}
+
 // src/app/shell/channelDispatchCompletion.ts
 function findChannelDispatchReply(feedEvents, afterFeedEventCount) {
   return feedEvents.slice(afterFeedEventCount).reverse().find(
@@ -9712,7 +9651,7 @@ function buildSessionTelemetrySummary(carry, metrics) {
 }
 
 // src/app/shell/AppShell.tsx
-import { Fragment as Fragment8, jsx as jsx24, jsxs as jsxs20 } from "react/jsx-runtime";
+import { Fragment as Fragment7, jsx as jsx23, jsxs as jsxs19 } from "react/jsx-runtime";
 var EMPTY_SESSION_METRICS = {
   modelName: null,
   toolCallCount: 0,
@@ -9741,21 +9680,21 @@ function PermissionErrorFallback({ onDeny }) {
   useInput17((_input, key) => {
     if (key.escape) onDeny();
   });
-  return /* @__PURE__ */ jsx24(Text25, { color: theme.status.error, children: "[Permission dialog error -- press Escape to deny and continue]" });
+  return /* @__PURE__ */ jsx23(Text24, { color: theme.status.error, children: "[Permission dialog error -- press Escape to deny and continue]" });
 }
 function QuestionErrorFallback({ onSkip }) {
   const theme = useTheme();
   useInput17((_input, key) => {
     if (key.escape) onSkip();
   });
-  return /* @__PURE__ */ jsx24(Text25, { color: theme.status.error, children: "[Question dialog error -- press Escape to skip and continue]" });
+  return /* @__PURE__ */ jsx23(Text24, { color: theme.status.error, children: "[Question dialog error -- press Escape to skip and continue]" });
 }
 function DiagnosticsConsentErrorFallback({ onDismiss }) {
   const theme = useTheme();
   useInput17((_input, key) => {
     if (key.escape) onDismiss();
   });
-  return /* @__PURE__ */ jsx24(Text25, { color: theme.status.error, children: "[Diagnostics consent dialog error -- press Escape to dismiss]" });
+  return /* @__PURE__ */ jsx23(Text24, { color: theme.status.error, children: "[Diagnostics consent dialog error -- press Escape to dismiss]" });
 }
 var STARTUP_HANDSHAKE_TIMEOUT_MS = 2500;
 function AppContent({
@@ -10799,6 +10738,7 @@ function AppContent({
       sessionTotal: sessionScope.total,
       harness,
       modelName: metrics.modelName ?? modelName,
+      effortLevel: metrics.effortLevel ?? null,
       errorReason: startupFailure?.message
     });
     return renderHeaderLines(headerModel, innerWidth, hasColor, theme)[0];
@@ -10823,6 +10763,7 @@ function AppContent({
     harness,
     modelName,
     metrics.modelName,
+    metrics.effortLevel,
     startupFailure?.message,
     innerWidth,
     hasColor,
@@ -10872,27 +10813,27 @@ function AppContent({
     [withBorderEdges, frameLine]
   );
   if (pagerActive) {
-    return /* @__PURE__ */ jsx24(Box19, {});
+    return /* @__PURE__ */ jsx23(Box18, {});
   }
-  return /* @__PURE__ */ jsxs20(Box19, { flexDirection: "column", width: frameWidth, children: [
-    /* @__PURE__ */ jsx24(
+  return /* @__PURE__ */ jsxs19(Box18, { flexDirection: "column", width: frameWidth, children: [
+    /* @__PURE__ */ jsx23(
       MaybeProfiler,
       {
         enabled: perfEnabled,
         id: "app.main.header-frame",
         onRender: handleSectionProfilerRender,
-        children: /* @__PURE__ */ jsx24(Text25, { children: `${border(topBorder)}
+        children: /* @__PURE__ */ jsx23(Text24, { children: `${border(topBorder)}
 ${withBorderEdges(frameLine(headerLine1))}
 ${border(sectionBorder)}` })
       }
     ),
-    /* @__PURE__ */ jsx24(
+    /* @__PURE__ */ jsx23(
       MaybeProfiler,
       {
         enabled: perfEnabled,
         id: "app.main.todo-header",
         onRender: handleSectionProfilerRender,
-        children: /* @__PURE__ */ jsx24(
+        children: /* @__PURE__ */ jsx23(
           TodoHeaderSection,
           {
             actualTodoRows,
@@ -10910,13 +10851,13 @@ ${border(sectionBorder)}` })
         )
       }
     ),
-    /* @__PURE__ */ jsx24(
+    /* @__PURE__ */ jsx23(
       MaybeProfiler,
       {
         enabled: perfEnabled,
         id: "app.main.body-prefix",
         onRender: handleSectionProfilerRender,
-        children: /* @__PURE__ */ jsx24(
+        children: /* @__PURE__ */ jsx23(
           TodoBodySection,
           {
             innerWidth,
@@ -10943,13 +10884,13 @@ ${border(sectionBorder)}` })
         )
       }
     ),
-    /* @__PURE__ */ jsx24(
+    /* @__PURE__ */ jsx23(
       MaybeProfiler,
       {
         enabled: perfEnabled,
         id: "app.main.feed",
         onRender: handleSectionProfilerRender,
-        children: workflowPickerVisible ? /* @__PURE__ */ jsx24(
+        children: workflowPickerVisible ? /* @__PURE__ */ jsx23(
           WorkflowPicker,
           {
             projectDir,
@@ -10960,7 +10901,7 @@ ${border(sectionBorder)}` })
               onWorkflowSelected(name);
             }
           }
-        ) : modelPickerVisible ? /* @__PURE__ */ jsx24(
+        ) : modelPickerVisible ? /* @__PURE__ */ jsx23(
           ModelPicker,
           {
             projectDir,
@@ -10974,8 +10915,8 @@ ${border(sectionBorder)}` })
               onModelSelected(selectedModel);
             }
           }
-        ) : splitMode ? /* @__PURE__ */ jsxs20(Box19, { flexDirection: "row", children: [
-          /* @__PURE__ */ jsx24(Box19, { width: messagePanelWidth + 1, flexShrink: 0, children: /* @__PURE__ */ jsx24(
+        ) : splitMode ? /* @__PURE__ */ jsxs19(Box18, { flexDirection: "row", children: [
+          /* @__PURE__ */ jsx23(Box18, { width: messagePanelWidth + 1, flexShrink: 0, children: /* @__PURE__ */ jsx23(
             MessagePanel,
             {
               entries: messageEntries,
@@ -10987,7 +10928,7 @@ ${border(sectionBorder)}` })
               borderColor: theme.border
             }
           ) }),
-          /* @__PURE__ */ jsx24(Box19, { flexGrow: 1, children: /* @__PURE__ */ jsx24(
+          /* @__PURE__ */ jsx23(Box18, { flexGrow: 1, children: /* @__PURE__ */ jsx23(
             FeedGrid,
             {
               feedHeaderRows,
@@ -11007,7 +10948,7 @@ ${border(sectionBorder)}` })
               onboarding: feedOnboarding
             }
           ) })
-        ] }) : /* @__PURE__ */ jsx24(
+        ] }) : /* @__PURE__ */ jsx23(
           FeedGrid,
           {
             feedHeaderRows,
@@ -11029,13 +10970,13 @@ ${border(sectionBorder)}` })
         )
       }
     ),
-    /* @__PURE__ */ jsx24(
+    /* @__PURE__ */ jsx23(
       MaybeProfiler,
       {
         enabled: perfEnabled,
         id: "app.main.input",
         onRender: handleSectionProfilerRender,
-        children: /* @__PURE__ */ jsx24(
+        children: /* @__PURE__ */ jsx23(
           InputSection,
           {
             innerWidth,
@@ -11065,13 +11006,13 @@ ${border(sectionBorder)}` })
         )
       }
     ),
-    /* @__PURE__ */ jsx24(
+    /* @__PURE__ */ jsx23(
       MaybeProfiler,
       {
         enabled: perfEnabled,
         id: "app.main.footer",
         onRender: handleSectionProfilerRender,
-        children: /* @__PURE__ */ jsx24(
+        children: /* @__PURE__ */ jsx23(
           FooterSection,
           {
             frameFooterHelp: frame.footerHelp,
@@ -11082,22 +11023,22 @@ ${border(sectionBorder)}` })
         )
       }
     ),
-    /* @__PURE__ */ jsx24(
+    /* @__PURE__ */ jsx23(
       MaybeProfiler,
       {
         enabled: perfEnabled,
         id: "app.main.diagnostics-dialog",
         onRender: handleSectionProfilerRender,
-        children: /* @__PURE__ */ jsx24(Fragment8, { children: pendingStartupDiagnostics && /* @__PURE__ */ jsx24(
+        children: /* @__PURE__ */ jsx23(Fragment7, { children: pendingStartupDiagnostics && /* @__PURE__ */ jsx23(
           ErrorBoundary,
           {
-            fallback: /* @__PURE__ */ jsx24(
+            fallback: /* @__PURE__ */ jsx23(
               DiagnosticsConsentErrorFallback,
               {
                 onDismiss: () => setPendingStartupDiagnostics(null)
               }
             ),
-            children: /* @__PURE__ */ jsx24(
+            children: /* @__PURE__ */ jsx23(
               DiagnosticsConsentDialog,
               {
                 harnessLabel,
@@ -11108,22 +11049,22 @@ ${border(sectionBorder)}` })
         ) })
       }
     ),
-    /* @__PURE__ */ jsx24(
+    /* @__PURE__ */ jsx23(
       MaybeProfiler,
       {
         enabled: perfEnabled,
         id: "app.main.permission-dialog",
         onRender: handleSectionProfilerRender,
-        children: /* @__PURE__ */ jsx24(Fragment8, { children: appMode.type === "permission" && currentPermissionRequest && /* @__PURE__ */ jsx24(
+        children: /* @__PURE__ */ jsx23(Fragment7, { children: appMode.type === "permission" && currentPermissionRequest && /* @__PURE__ */ jsx23(
           ErrorBoundary,
           {
-            fallback: /* @__PURE__ */ jsx24(
+            fallback: /* @__PURE__ */ jsx23(
               PermissionErrorFallback,
               {
                 onDeny: () => handlePermissionDecision("deny")
               }
             ),
-            children: /* @__PURE__ */ jsx24(
+            children: /* @__PURE__ */ jsx23(
               PermissionDialog,
               {
                 request: currentPermissionRequest,
@@ -11135,17 +11076,17 @@ ${border(sectionBorder)}` })
         ) })
       }
     ),
-    /* @__PURE__ */ jsx24(
+    /* @__PURE__ */ jsx23(
       MaybeProfiler,
       {
         enabled: perfEnabled,
         id: "app.main.question-dialog",
         onRender: handleSectionProfilerRender,
-        children: /* @__PURE__ */ jsx24(Fragment8, { children: appMode.type === "question" && currentQuestionRequest && /* @__PURE__ */ jsx24(
+        children: /* @__PURE__ */ jsx23(Fragment7, { children: appMode.type === "question" && currentQuestionRequest && /* @__PURE__ */ jsx23(
           ErrorBoundary,
           {
-            fallback: /* @__PURE__ */ jsx24(QuestionErrorFallback, { onSkip: handleQuestionSkip }),
-            children: /* @__PURE__ */ jsx24(
+            fallback: /* @__PURE__ */ jsx23(QuestionErrorFallback, { onSkip: handleQuestionSkip }),
+            children: /* @__PURE__ */ jsx23(
               QuestionDialog,
               {
                 request: currentQuestionRequest,
@@ -11166,10 +11107,10 @@ function MaybeProfiler({
   onRender,
   children
 }) {
-  if (!enabled) return /* @__PURE__ */ jsx24(Fragment8, { children });
-  return /* @__PURE__ */ jsx24(Profiler, { id, onRender, children });
+  if (!enabled) return /* @__PURE__ */ jsx23(Fragment7, { children });
+  return /* @__PURE__ */ jsx23(Profiler, { id, onRender, children });
 }
-var TodoHeaderSection = React9.memo(function TodoHeaderSection2({
+var TodoHeaderSection = React8.memo(function TodoHeaderSection2({
   actualTodoRows,
   innerWidth,
   useAscii,
@@ -11208,9 +11149,9 @@ var TodoHeaderSection = React9.memo(function TodoHeaderSection2({
       theme
     ]
   );
-  return /* @__PURE__ */ jsx24(Fragment8, { children: todoHeaderLine !== null && /* @__PURE__ */ jsx24(Text25, { children: withBorderEdges(frameLine(todoHeaderLine)) }, "todo-header") });
+  return /* @__PURE__ */ jsx23(Fragment7, { children: todoHeaderLine !== null && /* @__PURE__ */ jsx23(Text24, { children: withBorderEdges(frameLine(todoHeaderLine)) }, "todo-header") });
 });
-var TodoBodySection = React9.memo(function TodoBodySection2({
+var TodoBodySection = React8.memo(function TodoBodySection2({
   innerWidth,
   actualTodoRows,
   todoScroll,
@@ -11297,9 +11238,9 @@ var TodoBodySection = React9.memo(function TodoBodySection2({
     ]
   );
   if (output === null) return null;
-  return /* @__PURE__ */ jsx24(Text25, { children: output });
+  return /* @__PURE__ */ jsx23(Text24, { children: output });
 });
-var FooterSection = React9.memo(function FooterSection2({
+var FooterSection = React8.memo(function FooterSection2({
   frameFooterHelp,
   toastMessage,
   hintTextColor,
@@ -11311,9 +11252,9 @@ var FooterSection = React9.memo(function FooterSection2({
     return fit(hint, innerWidth);
   }, [frameFooterHelp, toastMessage, hintTextColor, innerWidth]);
   if (output === null) return null;
-  return /* @__PURE__ */ jsx24(Text25, { children: output });
+  return /* @__PURE__ */ jsx23(Text24, { children: output });
 });
-var InputSection = React9.memo(function InputSection2({
+var InputSection = React8.memo(function InputSection2({
   innerWidth,
   useAscii,
   borderColor,
@@ -11338,7 +11279,7 @@ var InputSection = React9.memo(function InputSection2({
   topBorder,
   bottomBorder
 }) {
-  return /* @__PURE__ */ jsx24(
+  return /* @__PURE__ */ jsx23(
     ShellInput2,
     {
       ref: inputRef,
@@ -11547,13 +11488,13 @@ function App({
     refreshRuntime();
   }, [refreshRuntime]);
   if (phase.type === "setup") {
-    return /* @__PURE__ */ jsx24(
+    return /* @__PURE__ */ jsx23(
       MaybeProfiler,
       {
         enabled: perfEnabled,
         id: "app.setup",
         onRender: handleProfilerRender,
-        children: /* @__PURE__ */ jsx24(ThemeProvider, { value: activeTheme, children: /* @__PURE__ */ jsx24(
+        children: /* @__PURE__ */ jsx23(ThemeProvider, { value: activeTheme, children: /* @__PURE__ */ jsx23(
           SetupWizard,
           {
             onThemePreview: (themeName) => {
@@ -11566,17 +11507,17 @@ function App({
     );
   }
   if (phase.type === "session-select") {
-    return /* @__PURE__ */ jsx24(
+    return /* @__PURE__ */ jsx23(
       MaybeProfiler,
       {
         enabled: perfEnabled,
         id: "app.session-select",
         onRender: handleProfilerRender,
-        children: /* @__PURE__ */ jsx24(
+        children: /* @__PURE__ */ jsx23(
           ErrorBoundary,
           {
-            fallback: /* @__PURE__ */ jsx24(Text25, { color: "red", children: "[Session picker error -- starting new session]" }),
-            children: /* @__PURE__ */ jsx24(
+            fallback: /* @__PURE__ */ jsx23(Text24, { color: "red", children: "[Session picker error -- starting new session]" }),
+            children: /* @__PURE__ */ jsx23(
               SessionPicker,
               {
                 sessions,
@@ -11590,7 +11531,7 @@ function App({
       }
     );
   }
-  return /* @__PURE__ */ jsx24(ThemeProvider, { value: activeTheme, children: /* @__PURE__ */ jsx24(
+  return /* @__PURE__ */ jsx23(ThemeProvider, { value: activeTheme, children: /* @__PURE__ */ jsx23(
     HookProvider,
     {
       projectDir,
@@ -11603,7 +11544,7 @@ function App({
       ),
       athenaSessionId,
       ...attachmentId !== void 0 ? { attachmentId } : {},
-      children: /* @__PURE__ */ jsx24(
+      children: /* @__PURE__ */ jsx23(
         AppContent,
         {
           projectDir,
@@ -11639,15 +11580,6 @@ function App({
     }
   ) });
 }
-function resolveAllowedTools(harness, allowedTools) {
-  const extras = harness === "openai-codex" ? ["mcp__*", "Permissions", "Bash", "Edit"] : ["mcp__*"];
-  const base = allowedTools ?? [];
-  const merged = [...base];
-  for (const tool of extras) {
-    if (!merged.includes(tool)) merged.push(tool);
-  }
-  return merged;
-}
 function usePerfRenderLog(enabled, id) {
   const renderCountRef = useRef16(0);
   renderCountRef.current += 1;
@@ -11943,44 +11875,62 @@ function shouldShowSetup({
 }
 
 // src/app/entry/execCommand.ts
+import crypto2 from "crypto";
+
+// src/app/entry/resumeResolution.ts
 import crypto from "crypto";
-function isValidTimeout(timeoutMs) {
-  if (timeoutMs === void 0) return true;
-  return Number.isFinite(timeoutMs) && timeoutMs > 0;
-}
-function resolveContinueFlag(input) {
-  if (input.continueFlag === void 0) {
+function resolveResumeTarget(input) {
+  const createSessionId = input.createSessionId ?? crypto.randomUUID;
+  const getSessionMetaFn = input.getSessionMetaFn ?? getSessionMeta;
+  const getMostRecentSessionFn = input.getMostRecentSessionFn ?? getMostRecentAthenaSession;
+  const { request } = input;
+  if (request.kind === "fresh") {
     return {
-      athenaSessionId: input.createSessionId(),
+      athenaSessionId: createSessionId(),
       adapterResumeSessionId: void 0
     };
   }
-  if (input.continueFlag === "") {
-    const recent = input.getMostRecentSessionFn(input.projectDir);
-    if (!recent) {
-      input.logError(
-        "Error: --continue was provided but no previous Athena sessions exist for this project."
-      );
+  if (request.kind === "explicit") {
+    const meta = getSessionMetaFn(request.sessionId);
+    if (!meta) {
+      input.logError(input.messages.unknownExplicit(request.sessionId));
       return void 0;
     }
     return {
-      athenaSessionId: recent.id,
-      adapterResumeSessionId: recent.adapterSessionIds.at(-1)
+      athenaSessionId: meta.id,
+      adapterResumeSessionId: meta.adapterSessionIds.at(-1)
     };
   }
-  const meta = input.getSessionMetaFn(input.continueFlag);
-  if (!meta) {
-    input.logError(`Error: Unknown Athena session ID: ${input.continueFlag}`);
+  const recent = getMostRecentSessionFn(input.projectDir);
+  if (!recent) {
+    input.logError(input.messages.missingRecent);
+    if (input.missingRecentPolicy === "fresh") {
+      return {
+        athenaSessionId: createSessionId(),
+        adapterResumeSessionId: void 0
+      };
+    }
     return void 0;
   }
   return {
-    athenaSessionId: meta.id,
-    adapterResumeSessionId: meta.adapterSessionIds.at(-1)
+    athenaSessionId: recent.id,
+    adapterResumeSessionId: recent.adapterSessionIds.at(-1)
   };
 }
+
+// src/app/entry/execCommand.ts
+function isValidTimeout(timeoutMs) {
+  if (timeoutMs === void 0) return true;
+  return Number.isFinite(timeoutMs) && timeoutMs > 0;
+}
+function continueFlagToRequest(continueFlag) {
+  if (continueFlag === void 0) return { kind: "fresh" };
+  if (continueFlag === "") return { kind: "most-recent" };
+  return { kind: "explicit", sessionId: continueFlag };
+}
 async function runExecCommand(input, deps = {}) {
   const logError = deps.logError ?? console.error;
-  const createSessionId = deps.createSessionId ?? crypto.randomUUID;
+  const createSessionId = deps.createSessionId ?? crypto2.randomUUID;
   const runExecFn = deps.runExecFn ?? runExec;
   const getMostRecentSessionFn = deps.getMostRecentSessionFn ?? getMostRecentAthenaSession;
   const getSessionMetaFn = deps.getSessionMetaFn ?? getSessionMeta;
@@ -11994,9 +11944,17 @@ async function runExecCommand(input, deps = {}) {
   }
   let continueResolution;
   try {
-    continueResolution = resolveContinueFlag({
+    continueResolution = resolveResumeTarget({
       projectDir: input.projectDir,
-      continueFlag: input.flags.continueFlag,
+      request: continueFlagToRequest(input.flags.continueFlag),
+      // Headless exec treats a missing resume target as a hard error rather
+      // than silently starting fresh, so a resume request that finds nothing
+      // exits non-zero for callers/scripts.
+      missingRecentPolicy: "error",
+      messages: {
+        unknownExplicit: (sessionId) => `Error: Unknown Athena session ID: ${sessionId}`,
+        missingRecent: "Error: --continue was provided but no previous Athena sessions exist for this project."
+      },
       createSessionId,
       getMostRecentSessionFn,
       getSessionMetaFn,
@@ -12026,49 +11984,61 @@ async function runExecCommand(input, deps = {}) {
     outputLastMessagePath: input.flags.outputLastMessage,
     ephemeral: input.flags.ephemeral,
     timeoutMs: input.flags.timeoutMs,
-    channels: input.flags.channels
+    channels: input.flags.channels,
+    // Reporting-only summary: strip to name + source layer so secret-bearing
+    // MCP env/command/args and skill paths never reach the startup notice or
+    // the exec.started event (R3).
+    personalCapabilities: {
+      mcpServers: input.runtimeConfig.personalMcpServers.map((server) => ({
+        name: server.name,
+        sourceLayer: server.sourceLayer
+      })),
+      skills: input.runtimeConfig.personalSkills.map((skill) => ({
+        name: skill.name,
+        sourceLayer: skill.sourceLayer
+      }))
+    },
+    // Same strip for shadowed (conflicting) capabilities — name + source
+    // layer only, never the personal MCP env/command/args or skill path (R7).
+    capabilityConflicts: {
+      mcpServers: input.runtimeConfig.capabilityConflicts.mcpServers.map(
+        (server) => ({
+          name: server.name,
+          sourceLayer: server.sourceLayer
+        })
+      ),
+      skills: input.runtimeConfig.capabilityConflicts.skills.map((skill) => ({
+        name: skill.name,
+        sourceLayer: skill.sourceLayer
+      }))
+    }
   });
   return result.exitCode;
 }
 
 // src/app/entry/interactiveSession.ts
-import crypto2 from "crypto";
 function resolveInteractiveSession(input) {
-  const logError = input.logError ?? console.error;
-  const createSessionId = input.createSessionId ?? crypto2.randomUUID;
-  const getSessionMetaFn = input.getSessionMetaFn ?? getSessionMeta;
-  const getMostRecentSessionFn = input.getMostRecentSessionFn ?? getMostRecentAthenaSession;
-  if (input.resumeSessionId) {
-    const meta = getSessionMetaFn(input.resumeSessionId);
-    if (!meta) {
-      logError(
-        `Unknown session ID: ${input.resumeSessionId}
-Use 'athena-flow sessions' to choose an available session.`
-      );
-      return void 0;
-    }
-    return {
-      athenaSessionId: meta.id,
-      initialSessionId: meta.adapterSessionIds.at(-1)
-    };
-  }
-  if (input.resumeMostRecent) {
-    const recent = getMostRecentSessionFn(input.projectDir);
-    if (!recent) {
-      logError("No previous sessions found. Starting new session.");
-      return {
-        athenaSessionId: createSessionId(),
-        initialSessionId: void 0
-      };
-    }
-    return {
-      athenaSessionId: recent.id,
-      initialSessionId: recent.adapterSessionIds.at(-1)
-    };
-  }
+  const request = input.resumeSessionId ? { kind: "explicit", sessionId: input.resumeSessionId } : input.resumeMostRecent ? { kind: "most-recent" } : { kind: "fresh" };
+  const target = resolveResumeTarget({
+    projectDir: input.projectDir,
+    request,
+    // Interactive falls back to a fresh session when resume-most-recent finds
+    // no history — the terminal stays usable rather than exiting.
+    missingRecentPolicy: "fresh",
+    messages: {
+      unknownExplicit: (sessionId) => `Unknown session ID: ${sessionId}
+Use 'athena-flow sessions' to choose an available session.`,
+      missingRecent: "No previous sessions found. Starting new session."
+    },
+    logError: input.logError ?? console.error,
+    ...input.createSessionId ? { createSessionId: input.createSessionId } : {},
+    ...input.getSessionMetaFn ? { getSessionMetaFn: input.getSessionMetaFn } : {},
+    ...input.getMostRecentSessionFn ? { getMostRecentSessionFn: input.getMostRecentSessionFn } : {}
+  });
+  if (!target) return void 0;
   return {
-    athenaSessionId: createSessionId(),
-    initialSessionId: void 0
+    athenaSessionId: target.athenaSessionId,
+    initialSessionId: target.adapterResumeSessionId
   };
 }
 
@@ -12338,6 +12308,27 @@ function runWorkflowCommand(input, deps = {}) {
           `  note: project config overrides global at ${projectConfigPath(input.projectDir)}`
         );
       }
+      const { mcpServers, skills } = resolveEffectiveCapabilities({
+        globalConfig,
+        projectConfig
+      });
+      if (mcpServers.length === 0 && skills.length === 0) {
+        logOut("Personal capabilities: none configured");
+      } else {
+        logOut("Personal capabilities:");
+        if (mcpServers.length > 0) {
+          logOut("  MCP servers:");
+          for (const server of mcpServers) {
+            logOut(`    ${server.name} [${server.sourceLayer}]`);
+          }
+        }
+        if (skills.length > 0) {
+          logOut("  Skills:");
+          for (const skill of skills) {
+            logOut(`    ${skill.name} [${skill.sourceLayer}]`);
+          }
+        }
+      }
       return 0;
     }
     default:
@@ -12346,6 +12337,343 @@ function runWorkflowCommand(input, deps = {}) {
   }
 }
 
+// src/app/entry/mcpCommand.ts
+function parseArgs(args, context) {
+  let project = false;
+  let global = false;
+  const env2 = [];
+  const positional = [];
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === "--project") {
+      project = true;
+    } else if (arg === "--global") {
+      global = true;
+    } else if (arg === "--env") {
+      const value = args[i + 1];
+      if (value === void 0) {
+        return { error: `mcp ${context}: --env requires a KEY=VALUE argument` };
+      }
+      env2.push(value);
+      i++;
+    } else if (arg.startsWith("--")) {
+      return { error: `Unknown flag for mcp ${context}: ${arg}` };
+    } else {
+      positional.push(arg);
+    }
+  }
+  if (project && global) {
+    return {
+      error: `mcp ${context}: --project and --global are mutually exclusive`
+    };
+  }
+  return { project, global, env: env2, positional };
+}
+function parseEnv(entries) {
+  const env2 = {};
+  for (const entry of entries) {
+    const eq = entry.indexOf("=");
+    if (eq <= 0) {
+      return { error: `Invalid --env value (expected KEY=VALUE): ${entry}` };
+    }
+    env2[entry.slice(0, eq)] = entry.slice(eq + 1);
+  }
+  return env2;
+}
+function runMcpCommand(input, deps = {}) {
+  const readGlobal = deps.readGlobalConfig ?? readGlobalConfig;
+  const readProject = deps.readProjectConfig ?? readConfig;
+  const writeGlobal = deps.writeGlobalConfig ?? writeGlobalConfig;
+  const writeProject = deps.writeProjectConfig ?? writeProjectConfig;
+  const logError = deps.logError ?? console.error;
+  const logOut = deps.logOut ?? console.log;
+  const { subcommand } = input;
+  if (subcommand === "add") {
+    const parsed = parseArgs(input.subcommandArgs, "add");
+    if ("error" in parsed) {
+      logError(parsed.error);
+      return 1;
+    }
+    const name = parsed.positional[0];
+    if (!name) {
+      logError("mcp add: missing server name");
+      return 1;
+    }
+    const [command, ...args] = input.serverCommandTokens;
+    if (!command) {
+      logError(
+        `mcp add: missing server command. Usage: mcp add ${name} -- <command> [args...]`
+      );
+      return 1;
+    }
+    const envResult = parseEnv(parsed.env);
+    if ("error" in envResult) {
+      logError(envResult.error);
+      return 1;
+    }
+    const server = { command };
+    if (args.length > 0) {
+      server.args = args;
+    }
+    if (Object.keys(envResult).length > 0) {
+      server.env = envResult;
+    }
+    const layer = parsed.project ? "project" : "global";
+    const existing = (layer === "project" ? readProject(input.projectDir).mcpServers : readGlobal().mcpServers) ?? {};
+    const overwriting = name in existing;
+    const merged = { ...existing, [name]: server };
+    if (layer === "project") {
+      writeProject(input.projectDir, { mcpServers: merged });
+    } else {
+      writeGlobal({ mcpServers: merged });
+    }
+    logOut(
+      `${overwriting ? "Overwrote" : "Added"} personal MCP server '${name}' [${layer}]`
+    );
+    return 0;
+  }
+  if (subcommand === "list") {
+    const parsed = parseArgs(input.subcommandArgs, "list");
+    if ("error" in parsed) {
+      logError(parsed.error);
+      return 1;
+    }
+    const listSingleLayer = (servers, label) => {
+      const names = Object.keys(servers);
+      if (names.length === 0) {
+        logOut(`No personal MCP servers configured (${label}).`);
+        return;
+      }
+      logOut(`Personal MCP servers (${label}):`);
+      for (const name of names) {
+        logOut(`  ${name}  ${servers[name].command}`);
+      }
+    };
+    if (parsed.global) {
+      listSingleLayer(readGlobal().mcpServers ?? {}, "global");
+      return 0;
+    }
+    if (parsed.project) {
+      listSingleLayer(
+        readProject(input.projectDir).mcpServers ?? {},
+        "project"
+      );
+      return 0;
+    }
+    const { mcpServers } = resolveEffectiveCapabilities({
+      globalConfig: readGlobal(),
+      projectConfig: readProject(input.projectDir)
+    });
+    if (mcpServers.length === 0) {
+      logOut("No personal MCP servers configured.");
+      return 0;
+    }
+    logOut("Personal MCP servers (effective):");
+    for (const server of mcpServers) {
+      logOut(`  ${server.name}  ${server.command} [${server.sourceLayer}]`);
+    }
+    return 0;
+  }
+  if (subcommand === "remove") {
+    const parsed = parseArgs(input.subcommandArgs, "remove");
+    if ("error" in parsed) {
+      logError(parsed.error);
+      return 1;
+    }
+    const name = parsed.positional[0];
+    if (!name) {
+      logError("mcp remove: missing server name");
+      return 1;
+    }
+    const layer = parsed.project ? "project" : "global";
+    const existing = (layer === "project" ? readProject(input.projectDir).mcpServers : readGlobal().mcpServers) ?? {};
+    if (!(name in existing)) {
+      logError(
+        `mcp remove: no personal MCP server '${name}' found in ${layer} config`
+      );
+      return 1;
+    }
+    const next = { ...existing };
+    delete next[name];
+    if (layer === "project") {
+      writeProject(input.projectDir, { mcpServers: next });
+    } else {
+      writeGlobal({ mcpServers: next });
+    }
+    logOut(`Removed personal MCP server '${name}' [${layer}]`);
+    return 0;
+  }
+  logError(`Unknown mcp subcommand: ${subcommand}`);
+  return 1;
+}
+
+// src/app/entry/skillCommand.ts
+import fs4 from "fs";
+import path4 from "path";
+function resolvePersonalSkill(ref, projectDir) {
+  const absPath = path4.isAbsolute(ref) ? ref : path4.resolve(projectDir, ref);
+  if (!fs4.existsSync(absPath)) {
+    return { error: `skill install: path not found: ${ref}` };
+  }
+  let skillDir;
+  let skillMdPath;
+  if (fs4.statSync(absPath).isDirectory()) {
+    skillDir = absPath;
+    skillMdPath = path4.join(absPath, "SKILL.md");
+  } else if (path4.basename(absPath) === "SKILL.md") {
+    skillDir = path4.dirname(absPath);
+    skillMdPath = absPath;
+  } else {
+    return {
+      error: `skill install: expected a directory containing SKILL.md or a SKILL.md file: ${ref}`
+    };
+  }
+  if (!fs4.existsSync(skillMdPath)) {
+    return { error: `skill install: no SKILL.md found at ${skillDir}` };
+  }
+  try {
+    const { frontmatter } = parseFrontmatter(
+      fs4.readFileSync(skillMdPath, "utf-8")
+    );
+    return { name: frontmatter.name, source: ref, path: skillDir };
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return { error: `skill install: invalid SKILL.md (${message})` };
+  }
+}
+function parseArgs2(args, context) {
+  let project = false;
+  let global = false;
+  const positional = [];
+  for (const arg of args) {
+    if (arg === "--project") {
+      project = true;
+    } else if (arg === "--global") {
+      global = true;
+    } else if (arg.startsWith("--")) {
+      return { error: `Unknown flag for skill ${context}: ${arg}` };
+    } else {
+      positional.push(arg);
+    }
+  }
+  if (project && global) {
+    return {
+      error: `skill ${context}: --project and --global are mutually exclusive`
+    };
+  }
+  return { project, global, positional };
+}
+function runSkillCommand(input, deps = {}) {
+  const readGlobal = deps.readGlobalConfig ?? readGlobalConfig;
+  const readProject = deps.readProjectConfig ?? readConfig;
+  const writeGlobal = deps.writeGlobalConfig ?? writeGlobalConfig;
+  const writeProject = deps.writeProjectConfig ?? writeProjectConfig;
+  const resolveSkill = deps.resolveSkill ?? resolvePersonalSkill;
+  const logError = deps.logError ?? console.error;
+  const logOut = deps.logOut ?? console.log;
+  const { subcommand } = input;
+  if (subcommand === "install") {
+    const parsed = parseArgs2(input.subcommandArgs, "install");
+    if ("error" in parsed) {
+      logError(parsed.error);
+      return 1;
+    }
+    const ref = parsed.positional[0];
+    if (!ref) {
+      logError(
+        "skill install: missing skill path. Usage: skill install <path>"
+      );
+      return 1;
+    }
+    const resolved = resolveSkill(ref, input.projectDir);
+    if ("error" in resolved) {
+      logError(resolved.error);
+      return 1;
+    }
+    const layer = parsed.project ? "project" : "global";
+    const existing = (layer === "project" ? readProject(input.projectDir).skills : readGlobal().skills) ?? [];
+    const overwriting = existing.some((s) => s.name === resolved.name);
+    const next = [...existing.filter((s) => s.name !== resolved.name), resolved];
+    if (layer === "project") {
+      writeProject(input.projectDir, { skills: next });
+    } else {
+      writeGlobal({ skills: next });
+    }
+    logOut(
+      `${overwriting ? "Reinstalled" : "Installed"} personal skill '${resolved.name}' [${layer}]`
+    );
+    return 0;
+  }
+  if (subcommand === "list") {
+    const parsed = parseArgs2(input.subcommandArgs, "list");
+    if ("error" in parsed) {
+      logError(parsed.error);
+      return 1;
+    }
+    const listSingleLayer = (skills2, label) => {
+      if (skills2.length === 0) {
+        logOut(`No personal skills configured (${label}).`);
+        return;
+      }
+      logOut(`Personal skills (${label}):`);
+      for (const skill of skills2) {
+        logOut(`  ${skill.name}  ${skill.source}`);
+      }
+    };
+    if (parsed.global) {
+      listSingleLayer(readGlobal().skills ?? [], "global");
+      return 0;
+    }
+    if (parsed.project) {
+      listSingleLayer(readProject(input.projectDir).skills ?? [], "project");
+      return 0;
+    }
+    const { skills } = resolveEffectiveCapabilities({
+      globalConfig: readGlobal(),
+      projectConfig: readProject(input.projectDir)
+    });
+    if (skills.length === 0) {
+      logOut("No personal skills configured.");
+      return 0;
+    }
+    logOut("Personal skills (effective):");
+    for (const skill of skills) {
+      logOut(`  ${skill.name}  ${skill.source} [${skill.sourceLayer}]`);
+    }
+    return 0;
+  }
+  if (subcommand === "remove") {
+    const parsed = parseArgs2(input.subcommandArgs, "remove");
+    if ("error" in parsed) {
+      logError(parsed.error);
+      return 1;
+    }
+    const target = parsed.positional[0];
+    if (!target) {
+      logError("skill remove: missing skill name or source");
+      return 1;
+    }
+    const layer = parsed.project ? "project" : "global";
+    const existing = (layer === "project" ? readProject(input.projectDir).skills : readGlobal().skills) ?? [];
+    const next = existing.filter((s) => s.name !== target && s.source !== target);
+    if (next.length === existing.length) {
+      logError(
+        `skill remove: no personal skill '${target}' found in ${layer} config`
+      );
+      return 1;
+    }
+    if (layer === "project") {
+      writeProject(input.projectDir, { skills: next });
+    } else {
+      writeGlobal({ skills: next });
+    }
+    logOut(`Removed personal skill '${target}' [${layer}]`);
+    return 0;
+  }
+  logError(`Unknown skill subcommand: ${subcommand}`);
+  return 1;
+}
+
 // src/app/entry/marketplaceCommand.ts
 var DEFAULT_MARKETPLACE_SLUG3 = "lespaceman/athena-workflow-marketplace";
 var USAGE2 = `Usage: athena-flow marketplace <subcommand>
@@ -12461,9 +12789,9 @@ Default: ${DEFAULT_MARKETPLACE_SLUG3}`
 }
 
 // src/app/entry/channelCommand.ts
-import fs4 from "fs";
+import fs5 from "fs";
 import os3 from "os";
-import path4 from "path";
+import path5 from "path";
 var USAGE3 = `Usage: athena-flow channel telegram configure --bot-token <token> --user-id <id> [--chat-id <id>]
 
 Configures ~/.config/athena/channels/telegram.json and enables telegram in the global channels list.`;
@@ -12474,16 +12802,16 @@ function parseTelegramId(flagName, value) {
   return Number(value);
 }
 function writeTelegramChannelConfig(config) {
-  const dir = path4.join(os3.homedir(), ".config", "athena", "channels");
-  const configPath = path4.join(dir, "telegram.json");
-  fs4.mkdirSync(dir, { recursive: true, mode: 448 });
-  fs4.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n", {
+  const dir = path5.join(os3.homedir(), ".config", "athena", "channels");
+  const configPath = path5.join(dir, "telegram.json");
+  fs5.mkdirSync(dir, { recursive: true, mode: 448 });
+  fs5.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n", {
     encoding: "utf-8",
     mode: 384
   });
   if (process.platform !== "win32") {
-    fs4.chmodSync(dir, 448);
-    fs4.chmodSync(configPath, 384);
+    fs5.chmodSync(dir, 448);
+    fs5.chmodSync(configPath, 384);
   }
 }
 function runChannelCommand(input, deps = {}) {
@@ -12530,22 +12858,22 @@ function runChannelCommand(input, deps = {}) {
 // src/app/entry/dashboardCommand.ts
 import crypto3 from "crypto";
 import { spawn } from "child_process";
-import fs6 from "fs";
+import fs7 from "fs";
 import { createRequire } from "module";
 import os5 from "os";
-import path6 from "path";
+import path7 from "path";
 import { fileURLToPath } from "url";
 
 // src/infra/daemon/serviceUnit.ts
-import fs5 from "fs";
+import fs6 from "fs";
 import os4 from "os";
-import path5 from "path";
+import path6 from "path";
 function installServiceUnit(options) {
   const platform = options.platform ?? process.platform;
   const env2 = options.env ?? process.env;
   const home = env2["HOME"] ?? os4.homedir();
   if (platform === "darwin") {
-    const target = options.targetPath ?? path5.join(home, "Library", "LaunchAgents", "ai.drisp.daemon.plist");
+    const target = options.targetPath ?? path6.join(home, "Library", "LaunchAgents", "ai.drisp.daemon.plist");
     const paths = daemonStatePaths(env2);
     const plist = renderLaunchdPlist({
       label: "ai.drisp.daemon",
@@ -12565,7 +12893,7 @@ function installServiceUnit(options) {
     };
   }
   if (platform === "linux") {
-    const target = options.targetPath ?? path5.join(home, ".config", "systemd", "user", "drisp-daemon.service");
+    const target = options.targetPath ?? path6.join(home, ".config", "systemd", "user", "drisp-daemon.service");
     const unit = renderSystemdUnit({
       description: "Drisp dashboard runtime daemon",
       nodeBinary: options.nodeBinary,
@@ -12587,16 +12915,16 @@ function installServiceUnit(options) {
   };
 }
 function writeIfChanged(target, content) {
-  const dir = path5.dirname(target);
-  fs5.mkdirSync(dir, { recursive: true, mode: 448 });
+  const dir = path6.dirname(target);
+  fs6.mkdirSync(dir, { recursive: true, mode: 448 });
   let existing = null;
   try {
-    existing = fs5.readFileSync(target, "utf-8");
+    existing = fs6.readFileSync(target, "utf-8");
   } catch (err) {
     if (err.code !== "ENOENT") throw err;
   }
   if (existing === content) return;
-  fs5.writeFileSync(target, content, { mode: 384 });
+  fs6.writeFileSync(target, content, { mode: 384 });
 }
 function renderLaunchdPlist(input) {
   const argv = [input.nodeBinary, input.daemonEntry].map((s) => `		<string>${escapeXml(s)}</string>`).join("\n");
@@ -12697,7 +13025,7 @@ var cachedVersion = null;
 function readPackageVersion() {
   if (cachedVersion !== null) return cachedVersion;
   try {
-    const injected = "0.5.23";
+    const injected = "0.5.26";
     if (typeof injected === "string" && injected.length > 0) {
       cachedVersion = injected;
       return cachedVersion;
@@ -13684,11 +14012,11 @@ function resolveDaemonEntry() {
     return null;
   }
   const candidates = [
-    path6.join(path6.dirname(here), "dashboard-daemon.js"),
+    path7.join(path7.dirname(here), "dashboard-daemon.js"),
     // When invoked via `npm run start`, `here` may be the unbundled source
     // path. Walk up until we hit a `dist/` sibling.
-    path6.join(
-      path6.dirname(here),
+    path7.join(
+      path7.dirname(here),
       "..",
       "..",
       "..",
@@ -13698,7 +14026,7 @@ function resolveDaemonEntry() {
   ];
   for (const candidate of candidates) {
     try {
-      fs6.accessSync(candidate, fs6.constants.R_OK);
+      fs7.accessSync(candidate, fs7.constants.R_OK);
       return candidate;
     } catch {
     }
@@ -13883,14 +14211,14 @@ async function defaultTailDaemonLog(opts) {
   let stream2 = null;
   let watcher = null;
   try {
-    const stat = fs6.statSync(paths.logPath);
+    const stat = fs7.statSync(paths.logPath);
     const size = stat.size;
     const buf = Buffer.alloc(Math.min(size, opts.tail * 1024));
-    const fd = fs6.openSync(paths.logPath, "r");
+    const fd = fs7.openSync(paths.logPath, "r");
     try {
-      fs6.readSync(fd, buf, 0, buf.length, Math.max(0, size - buf.length));
+      fs7.readSync(fd, buf, 0, buf.length, Math.max(0, size - buf.length));
     } finally {
-      fs6.closeSync(fd);
+      fs7.closeSync(fd);
     }
     const lines = buf.toString("utf-8").split("\n").filter((l) => l.length > 0);
     const tail = lines.slice(-opts.tail);
@@ -13908,22 +14236,22 @@ async function defaultTailDaemonLog(opts) {
     }
     throw err;
   }
-  let position = fs6.statSync(paths.logPath).size;
+  let position = fs7.statSync(paths.logPath).size;
   return await new Promise((resolve) => {
     let pollTimer = null;
     const drain = () => {
       try {
-        const stat = fs6.statSync(paths.logPath);
+        const stat = fs7.statSync(paths.logPath);
         if (stat.size < position) {
           position = 0;
         }
         if (stat.size > position) {
-          const fd = fs6.openSync(paths.logPath, "r");
+          const fd = fs7.openSync(paths.logPath, "r");
           const buf = Buffer.alloc(stat.size - position);
           try {
-            fs6.readSync(fd, buf, 0, buf.length, position);
+            fs7.readSync(fd, buf, 0, buf.length, position);
           } finally {
-            fs6.closeSync(fd);
+            fs7.closeSync(fd);
           }
           position = stat.size;
           process.stdout.write(buf);
@@ -13938,7 +14266,7 @@ async function defaultTailDaemonLog(opts) {
       }
     };
     try {
-      watcher = fs6.watch(paths.logPath, { persistent: true }, () => {
+      watcher = fs7.watch(paths.logPath, { persistent: true }, () => {
         drain();
       });
     } catch {
@@ -14142,8 +14470,8 @@ function parsePairedRunner(raw) {
 
 // src/app/entry/gatewayCommand.ts
 import { spawn as spawn2 } from "child_process";
-import fs7 from "fs";
-import path7 from "path";
+import fs8 from "fs";
+import path8 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var USAGE5 = `Usage: athena-flow gateway <subcommand> [--json]
 
@@ -14162,12 +14490,12 @@ Subcommands:
   reload-channels  Reload channel sidecars without restarting the daemon.
 `;
 function defaultResolveDaemonEntry() {
-  const here = path7.dirname(fileURLToPath2(import.meta.url));
-  return path7.resolve(here, "athena-gateway.js");
+  const here = path8.dirname(fileURLToPath2(import.meta.url));
+  return path8.resolve(here, "athena-gateway.js");
 }
 function readToken(tokenPath) {
   try {
-    return fs7.readFileSync(tokenPath, "utf-8").trim();
+    return fs8.readFileSync(tokenPath, "utf-8").trim();
   } catch (err) {
     const code = err.code;
     if (code === "ENOENT") {
@@ -14517,9 +14845,9 @@ import process7 from "process";
 
 // src/harnesses/claude/system/doctorEnvironment.ts
 import { execFileSync } from "child_process";
-import * as fs8 from "fs";
+import * as fs9 from "fs";
 import * as os6 from "os";
-import * as path8 from "path";
+import * as path9 from "path";
 var MANAGED_POLICY_KEYS = [
   "forceLoginMethod",
   "forceLoginOrgUUID",
@@ -14623,8 +14951,8 @@ function collectEnvironment(options = {}) {
   const detectVersion = options.detectClaudeVersionFn ?? detectClaudeVersion;
   const runAuthStatus = options.runClaudeAuthStatusFn ?? runClaudeAuthStatus;
   const resolveForwarder = options.resolveHookForwarderCommandFn ?? resolveHookForwarderCommand;
-  const statFn = options.statFn ?? ((p) => fs8.statSync(p));
-  const readFileFn = options.readFileFn ?? ((p) => fs8.readFileSync(p, "utf8"));
+  const statFn = options.statFn ?? ((p) => fs9.statSync(p));
+  const readFileFn = options.readFileFn ?? ((p) => fs9.readFileSync(p, "utf8"));
   const settingsPaths = resolveClaudeSettingsSurfacePaths(
     homeDir,
     cwd,
@@ -14669,7 +14997,7 @@ function collectEnvironment(options = {}) {
   });
   let globalConfigPresent = false;
   try {
-    statFn(path8.join(homeDir, ".claude.json"));
+    statFn(path9.join(homeDir, ".claude.json"));
     globalConfigPresent = true;
   } catch {
     globalConfigPresent = false;
@@ -15078,15 +15406,15 @@ async function runDoctorCommand(options) {
 }
 
 // src/app/entry/cli.tsx
-import { jsx as jsx25 } from "react/jsx-runtime";
+import { jsx as jsx24 } from "react/jsx-runtime";
 function resolvePackageJsonPath(entryUrl) {
-  let currentDir = path9.dirname(fileURLToPath3(entryUrl));
+  let currentDir = path10.dirname(fileURLToPath3(entryUrl));
   for (; ; ) {
-    const candidatePath = path9.join(currentDir, "package.json");
-    if (fs9.existsSync(candidatePath)) {
+    const candidatePath = path10.join(currentDir, "package.json");
+    if (fs10.existsSync(candidatePath)) {
       return candidatePath;
     }
-    const parentDir = path9.dirname(currentDir);
+    const parentDir = path10.dirname(currentDir);
     if (parentDir === currentDir) {
       throw new Error("Could not locate package.json for CLI metadata.");
     }
@@ -15101,6 +15429,8 @@ var KNOWN_COMMANDS = /* @__PURE__ */ new Set([
   "resume",
   "exec",
   "workflow",
+  "mcp",
+  "skill",
   "marketplace",
   "channel",
   "gateway",
@@ -15177,6 +15507,38 @@ function printExecDryRunSummary(runtimeConfig, context) {
   lines.push(
     `  plugin mcp config: ${runtimeConfig.pluginMcpConfig ?? "<none>"}`
   );
+  const mcpLabel = "personal mcp servers:";
+  const skillLabel = "personal skills:";
+  const personalLabelWidth = mcpLabel.length;
+  lines.push("  personal capabilities:");
+  if (runtimeConfig.personalMcpServers.length === 0) {
+    lines.push(`    ${mcpLabel.padEnd(personalLabelWidth)} <none>`);
+  } else {
+    lines.push(`    ${mcpLabel}`);
+    for (const server of runtimeConfig.personalMcpServers) {
+      lines.push(`      - ${server.name} [${server.sourceLayer}]`);
+    }
+  }
+  if (runtimeConfig.personalSkills.length === 0) {
+    lines.push(`    ${skillLabel.padEnd(personalLabelWidth)} <none>`);
+  } else {
+    lines.push(`    ${skillLabel}`);
+    for (const skill of runtimeConfig.personalSkills) {
+      lines.push(`      - ${skill.name} [${skill.sourceLayer}]`);
+    }
+  }
+  const { mcpServers: conflictMcp, skills: conflictSkills } = runtimeConfig.capabilityConflicts;
+  if (conflictMcp.length === 0 && conflictSkills.length === 0) {
+    lines.push("    conflicts (shadowed by workflow plugin): <none>");
+  } else {
+    lines.push("    conflicts (shadowed by workflow plugin):");
+    for (const server of conflictMcp) {
+      lines.push(`      - ${server.name} [${server.sourceLayer}]`);
+    }
+    for (const skill of conflictSkills) {
+      lines.push(`      - ${skill.name} [${skill.sourceLayer}]`);
+    }
+  }
   for (const line of lines) {
     console.log(line);
   }
@@ -15207,6 +15569,8 @@ var cli = meow(
 			resume [sessionId]    Resume most recent (or specified) session
 			exec "<prompt>"       Run non-interactively (CI/script mode)
 			workflow <sub>        Manage workflows (install, list, search, remove, upgrade, use)
+			mcp <sub>             Manage personal MCP servers (add, remove, list)
+			skill <sub>           Manage personal skills (install, remove, list)
 			marketplace <sub>     Manage marketplace sources (add, refresh, remove, list)
 			channel <sub>         Manage external channels
 			dashboard <sub>       Manage dashboard pairing and runtime daemon (pair, status, daemon, unpair)
@@ -15389,6 +15753,10 @@ var cli = meow(
         type: "boolean",
         default: false
       },
+      env: {
+        type: "string",
+        isMultiple: true
+      },
       printApiKey: {
         type: "boolean",
         default: false
@@ -15400,7 +15768,7 @@ var cli = meow(
   }
 );
 async function main() {
-  const projectDir = path9.resolve(cli.flags.projectDir);
+  const projectDir = path10.resolve(cli.flags.projectDir);
   const [command, ...commandArgs] = cli.input;
   if (command && !KNOWN_COMMANDS.has(command)) {
     console.error(
@@ -15444,9 +15812,9 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
         await exitWith(1);
         return;
       }
-      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-CCCUR6KA.js");
+      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-5FENJHBW.js");
       const { waitUntilExit } = render(
-        /* @__PURE__ */ jsx25(
+        /* @__PURE__ */ jsx24(
           WorkflowInstallWizard,
           {
             source: resolvedSource,
@@ -15465,6 +15833,40 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
     );
     return;
   }
+  if (command === "mcp") {
+    const rawArgs = process.argv.slice(2);
+    const dashIdx = rawArgs.indexOf("--");
+    const serverCommandTokens = dashIdx >= 0 ? rawArgs.slice(dashIdx + 1) : [];
+    const cleanArgs = serverCommandTokens.length > 0 ? commandArgs.slice(0, commandArgs.length - serverCommandTokens.length) : commandArgs;
+    const [subcommand = "", ...subcommandArgs] = cleanArgs;
+    if (cli.flags.project) subcommandArgs.push("--project");
+    if (cli.flags.global) subcommandArgs.push("--global");
+    for (const entry of cli.flags.env ?? []) {
+      subcommandArgs.push("--env", entry);
+    }
+    await exitWith(
+      runMcpCommand({
+        subcommand,
+        subcommandArgs,
+        serverCommandTokens,
+        projectDir
+      })
+    );
+    return;
+  }
+  if (command === "skill") {
+    const [subcommand = "", ...subcommandArgs] = commandArgs;
+    if (cli.flags.project) subcommandArgs.push("--project");
+    if (cli.flags.global) subcommandArgs.push("--global");
+    await exitWith(
+      runSkillCommand({
+        subcommand,
+        subcommandArgs,
+        projectDir
+      })
+    );
+    return;
+  }
   if (command === "marketplace") {
     const [subcommand = "", ...subcommandArgs] = commandArgs;
     await exitWith(runMarketplaceCommand({ subcommand, subcommandArgs }));
@@ -15591,8 +15993,8 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
   const showSetup = command === "exec" ? false : shouldShowSetup({
     cliInput: cli.input,
     setupComplete: globalConfig.setupComplete,
-    globalConfigExists: fs9.existsSync(
-      path9.join(os7.homedir(), ".config", "athena", "config.json")
+    globalConfigExists: fs10.existsSync(
+      path10.join(os7.homedir(), ".config", "athena", "config.json")
     )
   });
   let runtimeConfig;
@@ -15685,7 +16087,7 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
   const { athenaSessionId, initialSessionId } = interactiveSession;
   const instanceId = process.pid;
   render(
-    /* @__PURE__ */ jsx25(
+    /* @__PURE__ */ jsx24(
       App,
       {
         projectDir,