mixdog 1.2.0 → 1.2.2

package/src/tui/dist/index.mjs

@@ -23394,15 +23394,30 @@ function warnLockRateLimited(warnedAt, lockPath, line) {
   } catch {
   }
 }
-function reportLockWait(lockPath, waitedMs, mode) {
+function formatLockTiming(timing) {
+  return Object.entries(timing || {}).filter(([, ms]) => Number.isFinite(ms)).map(([name, ms]) => ` ${name}=${ms}ms`).join("");
+}
+function recordLockTiming(lockPath, fields) {
+  const lease = heldLockPaths.getStore()?.get(lockPath);
+  if (lease?.active) Object.assign(lease.timing, fields);
+}
+function reportLockWait(lockPath, waitedMs, mode, timing) {
   if (waitedMs < LOCK_WAIT_WARN_MS) return;
-  warnLockRateLimited(lockWaitWarnedAt, lockPath, `[atomic-file] ${mode} lock wait ${waitedMs}ms: ${lockPath}
-`);
+  warnLockRateLimited(
+    lockWaitWarnedAt,
+    lockPath,
+    `[atomic-file] ${mode} lock wait ${waitedMs}ms:${formatLockTiming(timing)} ${lockPath}
+`
+  );
 }
-function reportLockHeld(lockPath, heldMs, mode) {
+function reportLockHeld(lockPath, heldMs, mode, timing) {
   if (heldMs < LOCK_HELD_WARN_MS) return;
-  warnLockRateLimited(lockHeldWarnedAt, lockPath, `[atomic-file] ${mode} lock held ${heldMs}ms: ${lockPath}
-`);
+  warnLockRateLimited(
+    lockHeldWarnedAt,
+    lockPath,
+    `[atomic-file] ${mode} lock held ${heldMs}ms:${formatLockTiming(timing)} ${lockPath}
+`
+  );
 }
 function* tryAcquireReclaimGuard(lockPath) {
   const guardPath = `${lockPath}.reclaim`;
@@ -23572,7 +23587,7 @@ function sweepStagedLockFiles(lockPath, now = Date.now()) {
   }
   return removed;
 }
-function* acquireLock(lockPath, opts, mode, markHeld) {
+function* acquireLock(lockPath, opts, mode, markHeld, timing = null) {
   const timeoutMs = lockTimeoutMs(opts);
   const staleMs = lockStaleMs(opts);
   const deadline = Date.now() + timeoutMs;
@@ -23599,7 +23614,9 @@ function* acquireLock(lockPath, opts, mode, markHeld) {
       attempt += 1;
       continue;
     }
-    reportLockWait(lockPath, Date.now() - waitStartedAt, mode);
+    const osMs = Date.now() - waitStartedAt;
+    if (timing) timing.osAcquireMs = osMs;
+    reportLockWait(lockPath, osMs, mode, timing);
     return;
   }
   throw timeoutError(lockPath, timeoutMs, lastError, yield* describeLockHolder(lockPath));
@@ -23625,12 +23642,14 @@ function withFileLockSync(lockPath, fn, opts = {}) {
 async function withFileLock(lockPath, fn, opts = {}) {
   if (heldLockPaths.getStore()?.get(lockPath)?.active) return fn();
   if (lockTimeoutMs(opts) <= 0) return withOsFileLock(lockPath, fn, opts);
-  return lockQueue(lockPath, () => withOsFileLock(lockPath, fn, opts));
+  const enqueuedAt = Date.now();
+  return lockQueue(lockPath, () => withOsFileLock(lockPath, fn, opts, Date.now() - enqueuedAt));
 }
-async function withOsFileLock(lockPath, fn, opts = {}) {
-  await runAsync(acquireLock(lockPath, opts, "async", true));
+async function withOsFileLock(lockPath, fn, opts = {}, queueWaitMs = 0) {
+  const timing = { queueWaitMs };
+  await runAsync(acquireLock(lockPath, opts, "async", true, timing));
   const heldSince = Date.now();
-  const lease = { active: false };
+  const lease = { active: false, timing };
   try {
     if (opts.secret === true) await enforceOwnerOnlyAclWin32Async(lockPath, { fresh: true });
     const held = new Map(heldLockPaths.getStore() || []);
@@ -23642,7 +23661,7 @@ async function withOsFileLock(lockPath, fn, opts = {}) {
     try {
       await runAsync(releaseLock(lockPath));
     } finally {
-      reportLockHeld(lockPath, Date.now() - heldSince, "async");
+      reportLockHeld(lockPath, Date.now() - heldSince, "async", timing);
       unmarkOsHeld(lockPath);
     }
   }
@@ -23919,7 +23938,28 @@ async function writeFileAtomicAsync(filePath, data, opts = {}) {
       throw err;
     }
   };
-  return opts.lock === true ? withFileLock(`${filePath}.lock`, () => _runAdaptiveFileIo(run), opts) : _runAdaptiveFileIo(run);
+  if (opts.lock !== true) return _runAdaptiveFileIo(run);
+  const lockPath = `${filePath}.lock`;
+  return withFileLock(
+    lockPath,
+    async () => {
+      const queuedAt = Date.now();
+      let startedAt = 0;
+      try {
+        return await _runAdaptiveFileIo(() => {
+          startedAt = Date.now();
+          return run();
+        });
+      } finally {
+        const now = Date.now();
+        recordLockTiming(lockPath, {
+          ioGateWaitMs: (startedAt || now) - queuedAt,
+          writeMs: startedAt ? now - startedAt : 0
+        });
+      }
+    },
+    opts
+  );
 }
 function writeJsonAtomicAsync(filePath, value, opts = {}) {
   return writeFileAtomicAsync(filePath, `${JSON.stringify(value, null, opts.compact ? 0 : 2)}
@@ -35075,7 +35115,7 @@ import { performance as performance2 } from "node:perf_hooks";
 import { format } from "node:util";
 
 // src/tui/App.jsx
-import { useState as useState19, useCallback as useCallback29, useEffect as useEffect30, useLayoutEffect as useLayoutEffect9, useMemo as useMemo9, useRef as useRef29 } from "react";
+import { useState as useState20, useCallback as useCallback29, useEffect as useEffect31, useLayoutEffect as useLayoutEffect9, useMemo as useMemo9, useRef as useRef29 } from "react";
 
 // src/tui/hooks/useSession.mjs
 import { useSyncExternalStore } from "react";
@@ -35416,8 +35456,13 @@ var SLASH_COMMANDS = [
   { name: "theme", usage: "/theme", params: "[id]", description: "Change the TUI color theme" },
   { name: "agents", usage: "/agents", params: "[refresh]", description: "Show available workflow agents" },
   { name: "effort", usage: "/effort", params: "[level]", description: "Set reasoning effort for the current model" },
-  { name: "fast", usage: "/fast", params: "[on|off|ultra]", description: "Set Fast or Ultrafast mode for the current model" },
-  { name: "mcp", usage: "/mcp", description: "Manage MCP servers and tools" },
+  {
+    name: "fast",
+    usage: "/fast",
+    params: "[on|off|ultra]",
+    description: "Set Fast or Ultrafast mode for the current model"
+  },
+  { name: "mcp", usage: "/mcp", params: "[login|logout <name>]", description: "Manage MCP servers and tools" },
   { name: "skills", usage: "/skills", description: "Choose a skill for the next request" },
   { name: "memory", usage: "/memory", params: "[status|core ...]", description: "List and edit core memories" },
   { name: "plugins", usage: "/plugins", description: "Manage local plugin integrations" },
@@ -35489,6 +35534,154 @@ function slashArgumentHint(value) {
   return command?.params ? `${command.usage} ${command.params}` : "";
 }
 
+// src/tui/app/skill-mention-palette.mjs
+import { useEffect as useEffect7, useState as useState6 } from "react";
+
+// src/runtime/shared/skill-mentions.mjs
+var MENTION = /(^|[\s([{"'`])\$([a-z0-9][a-z0-9-]{0,63})(?![A-Za-z0-9_-])/g;
+var RESERVED_NAMES = /* @__PURE__ */ new Set([
+  "path",
+  "home",
+  "user",
+  "shell",
+  "pwd",
+  "tmpdir",
+  "temp",
+  "tmp",
+  "lang",
+  "term",
+  "xdg_config_home",
+  "userprofile",
+  "appdata",
+  "localappdata",
+  "programfiles",
+  "systemroot",
+  "windir",
+  "comspec"
+]);
+function isReservedMentionName(name) {
+  const value = String(name ?? "");
+  return /^[0-9]+$/.test(value) || RESERVED_NAMES.has(value.toLowerCase());
+}
+var FENCE_OPEN = /^ {0,3}(`{3,}|~{3,})(.*)$/;
+var FENCE_CLOSE = /^ {0,3}(`{3,}|~{3,})[ \t]*$/;
+function inlineCodeRanges(source, from, to, ranges) {
+  const runs = [];
+  const re = /`+/g;
+  re.lastIndex = from;
+  for (let match = re.exec(source); match && match.index < to; match = re.exec(source)) {
+    runs.push({ start: match.index, end: Math.min(to, match.index + match[0].length) });
+  }
+  for (let index = 0; index < runs.length; index += 1) {
+    const length = runs[index].end - runs[index].start;
+    const close = runs.findIndex((run, at) => at > index && run.end - run.start === length);
+    if (close < 0) continue;
+    ranges.push([runs[index].start, runs[close].end]);
+    index = close;
+  }
+}
+function codeRanges(source) {
+  const ranges = [];
+  let open = null;
+  let proseStart = 0;
+  for (let at = 0; at <= source.length; ) {
+    const newline = source.indexOf("\n", at);
+    const end = newline < 0 ? source.length : newline;
+    const next = newline < 0 ? source.length + 1 : newline + 1;
+    const line = source.slice(at, end).replace(/\r$/, "");
+    if (!open) {
+      const fence = FENCE_OPEN.exec(line);
+      if (fence && !(fence[1][0] === "`" && fence[2].includes("`"))) {
+        inlineCodeRanges(source, proseStart, at, ranges);
+        open = { char: fence[1][0], length: fence[1].length, start: at };
+      }
+    } else {
+      const fence = FENCE_CLOSE.exec(line);
+      if (fence && fence[1][0] === open.char && fence[1].length >= open.length) {
+        ranges.push([open.start, Math.min(next, source.length)]);
+        proseStart = Math.min(next, source.length);
+        open = null;
+      }
+    }
+    at = next;
+  }
+  if (open) ranges.push([open.start, source.length]);
+  else inlineCodeRanges(source, proseStart, source.length, ranges);
+  return ranges;
+}
+function isInMarkdownCode(text, offset) {
+  const source = typeof text === "string" ? text : "";
+  if (!Number.isInteger(offset) || !source.includes("`") && !source.includes("~~~")) return false;
+  return codeRanges(source).some(([from, to]) => offset >= from && offset < to);
+}
+function skillMentionCandidates(text) {
+  const source = typeof text === "string" ? text : "";
+  const found = [];
+  let code = null;
+  for (const match of source.matchAll(MENTION)) {
+    if (isReservedMentionName(match[2])) continue;
+    const start = match.index + match[1].length;
+    code ??= source.includes("`") || source.includes("~~~") ? codeRanges(source) : [];
+    if (code.some(([from, to]) => start >= from && start < to)) continue;
+    found.push({ name: match[2], start, end: start + 1 + match[2].length });
+  }
+  return found;
+}
+function skillMentions(text, isSkill) {
+  return skillMentionCandidates(text).filter((mention) => isSkill(mention.name));
+}
+
+// src/tui/app/skill-mention-palette.mjs
+var MENTION_TAIL = /(^|[\s([{"'`])\$([a-z0-9][a-z0-9-]{0,63})?$/;
+var caretIn = (text, caret) => Number.isInteger(caret) ? Math.max(0, Math.min(text.length, caret)) : text.length;
+function skillMentionQuery(value, caret) {
+  const text = String(value ?? "");
+  const end = caretIn(text, caret);
+  const match = MENTION_TAIL.exec(text.slice(0, end));
+  if (!match) return null;
+  const start = match.index + match[1].length;
+  if (isInMarkdownCode(text, start)) return null;
+  return { query: match[2] || "", start, end };
+}
+var byName = (a, b) => a.name.localeCompare(b.name, "en");
+function skillMentionItems(skills, query) {
+  const needle = String(query || "").toLowerCase();
+  const usable = (Array.isArray(skills) ? skills : []).filter(
+    (skill) => typeof skill?.name === "string" && skill.name && skill.enabled !== false && skill.activeHere !== false && skill.source !== "builtin" && // `$path`/`$300` are never mentions, so offering them would insert prose.
+    !isReservedMentionName(skill.name)
+  );
+  const prefix = usable.filter((skill) => skill.name.startsWith(needle)).sort(byName);
+  const contains = needle ? usable.filter((skill) => !skill.name.startsWith(needle) && skill.name.includes(needle)).sort(byName) : [];
+  return [...prefix, ...contains].map((skill) => ({
+    kind: "skill",
+    name: skill.name,
+    label: `$${skill.name}`,
+    description: skill.description || ""
+  }));
+}
+function completeSkillMention(value, name, caret) {
+  const text = String(value ?? "");
+  const mention = skillMentionQuery(text, caret);
+  if (!mention || !name) return void 0;
+  const head = `${text.slice(0, mention.start)}$${name} `;
+  return { value: head + text.slice(mention.end), cursor: head.length };
+}
+function useSkillMentionSkills(store, active) {
+  const [skills, setSkills] = useState6([]);
+  useEffect7(() => {
+    if (!active) return void 0;
+    let live = true;
+    Promise.resolve().then(() => store.skillsStatus?.()).then((status) => {
+      if (live) setSkills(Array.isArray(status?.skills) ? status.skills : []);
+    }).catch(() => {
+    });
+    return () => {
+      live = false;
+    };
+  }, [store, active]);
+  return skills;
+}
+
 // src/tui/app/slash-palette.mjs
 function deriveSlashPalette({
   providerPrompt,
@@ -35500,13 +35693,28 @@ function deriveSlashPalette({
   exiting,
   commandBusy,
   promptDraft,
-  slashDismissedFor
+  slashDismissedFor,
+  skills = [],
+  promptCaret = null
 }) {
   const activeSlashQuery = providerPrompt || settingsPrompt || toolApproval || contextPanel || usagePanel ? null : slashQuery(promptDraft);
-  const slashModeLive = activeSlashQuery !== null && !picker && !toolApproval && !contextPanel && !usagePanel && !exiting && !commandBusy;
-  const slashCommands = !slashModeLive ? [] : SLASH_COMMANDS.filter((command) => slashCommandMatches(command, activeSlashQuery)).sort(compareSlashCommands);
-  const slashPaletteOpen = slashModeLive && slashDismissedFor !== promptDraft;
-  return { activeSlashQuery, slashCommands, slashPaletteOpen };
+  const surfaceFree = !picker && !toolApproval && !contextPanel && !usagePanel && !exiting && !commandBusy;
+  const slashModeLive = activeSlashQuery !== null && surfaceFree;
+  if (!slashModeLive) {
+    const mention = surfaceFree && !providerPrompt && !settingsPrompt ? skillMentionQuery(promptDraft, promptCaret) : null;
+    const slashCommands2 = mention ? skillMentionItems(skills, mention.query) : [];
+    return {
+      activeSlashQuery: mention ? mention.query : null,
+      slashCommands: slashCommands2,
+      slashPaletteOpen: slashCommands2.length > 0 && slashDismissedFor !== promptDraft,
+      paletteKind: mention ? "skills" : "commands"
+    };
+  }
+  const slashCommands = SLASH_COMMANDS.filter((command) => slashCommandMatches(command, activeSlashQuery)).sort(
+    compareSlashCommands
+  );
+  const slashPaletteOpen = slashDismissedFor !== promptDraft;
+  return { activeSlashQuery, slashCommands, slashPaletteOpen, paletteKind: "commands" };
 }
 
 // src/tui/app/panel-epoch.mjs
@@ -35611,7 +35819,7 @@ function resolvePickerState(prev, resolved, { pickerOpenedFromEnterRef, pickerOp
 }
 
 // src/tui/app/use-prompt-layout-rows.mjs
-import { useCallback as useCallback5, useEffect as useEffect7 } from "react";
+import { useCallback as useCallback5, useEffect as useEffect8 } from "react";
 import stringWidth3 from "string-width";
 
 // src/tui/display-width.mjs
@@ -35796,10 +36004,10 @@ function usePromptLayoutRows({
     },
     [promptContentColumns]
   );
-  useEffect7(() => {
+  useEffect8(() => {
     syncPromptLayoutRows(promptLayoutValueRef.current);
   }, [syncPromptLayoutRows]);
-  useEffect7(() => {
+  useEffect8(() => {
     const kind = String(settingsPrompt?.kind || "");
     if (!CORE_MULTILINE_TEXT_ENTRY_KINDS.has(kind)) {
       setTextEntryLayoutRows(1);
@@ -35812,7 +36020,7 @@ function usePromptLayoutRows({
 }
 
 // src/tui/app/use-panel-transition.mjs
-import { useEffect as useEffect8 } from "react";
+import { useEffect as useEffect9 } from "react";
 function usePanelTransition({
   panelTransitionRef,
   panelCloseInkMaskRowsRef,
@@ -35824,7 +36032,7 @@ function usePanelTransition({
   setPanelInkMaskEpoch,
   setPanelTransitionEpoch
 }) {
-  useEffect8(() => {
+  useEffect9(() => {
     const transition = panelTransitionRef.current;
     const pendingInkMask = panelCloseInkMaskRowsRef.current;
     const hadTransitionClearance = panelTransitionClearRows > 0 || panelTransitionGuardRows > 0;
@@ -35841,13 +36049,13 @@ function usePanelTransition({
     const timer2 = setTimeout(() => setPanelTransitionEpoch((epoch) => epoch + 1), 0);
     return () => clearTimeout(timer2);
   }, [panelLayoutSignature, bottomClusterRows, panelTransitionClearRows, panelTransitionGuardRows]);
-  useEffect8(() => {
+  useEffect9(() => {
     panelTransitionRef.current.tailId = latestTranscriptItem?.id ?? null;
   });
 }
 
 // src/tui/app/use-ui-open-request.mjs
-import { useEffect as useEffect9, useRef as useRef4 } from "react";
+import { useEffect as useEffect10, useRef as useRef4 } from "react";
 var SETUP_SECTION_TARGETS = Object.freeze({
   developer: ({ openDeveloperPicker }) => openDeveloperPicker(),
   voice: ({ openSettingsPicker }) => openSettingsPicker(),
@@ -35855,7 +36063,7 @@ var SETUP_SECTION_TARGETS = Object.freeze({
 });
 function useUiOpenRequest({ uiOpenRequest, runSlashCommand, sections }) {
   const seenRef = useRef4(0);
-  useEffect9(() => {
+  useEffect10(() => {
     const request = uiOpenRequest;
     const seq = Number(request?.seq) || 0;
     if (!request?.command || seq <= seenRef.current) return;
@@ -35867,7 +36075,7 @@ function useUiOpenRequest({ uiOpenRequest, runSlashCommand, sections }) {
 }
 
 // src/tui/app/use-mouse-input.mjs
-import { useCallback as useCallback6, useEffect as useEffect10, useRef as useRef5 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect11, useRef as useRef5 } from "react";
 
 // src/tui/markdown/streaming-markdown.mjs
 import { marked as marked2 } from "marked";
@@ -38593,12 +38801,35 @@ function healIncompleteLink(text, isPendingLocalPath) {
   if (label < 0 && isPendingLocalPath?.(caption)) return prefix;
   return `${prefix}[${closeEmphasis(caption)}${"]".repeat(Math.max(0, depth - 1))}]()`;
 }
+var PIPE_ROW = /^ {0,3}\|/;
+var DELIMITER_ROW = /^ {0,3}\|?\s*:?-+:?\s*(?:\|\s*:?-+:?\s*)*\|?\s*$/;
+var PARTIAL_DELIMITER_ROW = /^ {0,3}\|?[\s:|-]*$/;
+function tableCells(line) {
+  const cells = line.trim().split(/(?<!\\)\|/);
+  if (cells[0].trim() === "") cells.shift();
+  if (cells.length && cells[cells.length - 1].trim() === "") cells.pop();
+  return cells.length;
+}
+function trimPendingTableHead(text) {
+  let offset = 0;
+  for (const blank of text.matchAll(/\n[ \t]*\r?\n/g)) offset = blank.index + blank[0].length;
+  const block = text.slice(offset);
+  const lines = block.split("\n").map((line) => line.replace(/\r$/, ""));
+  if (lines.length === 0 || lines.length > 2 || !PIPE_ROW.test(lines[0])) return text;
+  if (lines.length === 2) {
+    const delimiter2 = lines[1];
+    if (!PARTIAL_DELIMITER_ROW.test(delimiter2)) return text;
+    if (DELIMITER_ROW.test(delimiter2) && tableCells(delimiter2) === tableCells(lines[0])) return text;
+  }
+  return text.slice(0, offset);
+}
 function healStreamingMarkdownTail(text, isPendingLocalPath) {
-  const value = String(text ?? "");
+  const source = String(text ?? "");
+  const fence = source.includes("`") || source.includes("~") ? openFence(source) : null;
+  if (fence) return trimPartialClosingFence(source, fence);
+  const value = source.includes("|") ? trimPendingTableHead(source) : source;
   const hasSyntax = HEALABLE_MARKDOWN_SYNTAX.test(value);
   if (!value || !hasSyntax && !isPendingLocalPath) return value;
-  const fence = openFence(value);
-  if (fence) return trimPartialClosingFence(value, fence);
   const healed = hasSyntax ? closeEmphasis(healIncompleteLink(closeInlineCode(value, isPendingLocalPath), isPendingLocalPath)) : value;
   const tail = isPendingLocalPath ? /\S+$/.exec(maskCode(healed)) : null;
   return tail && isPendingLocalPath(tail[0]) ? healed.slice(0, tail.index) : healed;
@@ -38794,6 +39025,13 @@ function resolveStreamingMarkdownParts(text, streamKey) {
 }
 
 // src/runtime/shared/model-display.mjs
+var titleCaseOption = (value) => String(value || "").split(/([\s_-]+)/).map((part) => /^[\s_-]+$/.test(part) ? part : `${part.charAt(0).toUpperCase()}${part.slice(1).toLowerCase()}`).join("");
+var effortDisplayLabel = (value) => {
+  const text = String(value || "").trim();
+  if (!text) return "";
+  if (text.toLowerCase() === "xhigh") return "XHigh";
+  return titleCaseOption(text);
+};
 function titleModelPart(part) {
   const text = String(part || "").trim();
   if (!text) return "";
@@ -38936,8 +39174,21 @@ function stripToolPrefix(name) {
 function rawToolName(name) {
   return String(name || "tool").replace(/^functions\./, "");
 }
-function parseMcpToolName(name) {
-  const text = rawToolName(name);
+var mcpToolIdentities = /* @__PURE__ */ new Map();
+function knownMcpToolIdentity(name) {
+  const known = mcpToolIdentities.get(rawToolName(name));
+  return known ? { ...known } : null;
+}
+function parseMcpToolName(nameOrTool) {
+  if (nameOrTool && typeof nameOrTool === "object") {
+    const server = String(nameOrTool.mcpServerName || "").trim();
+    const parsed = parseMcpToolName(nameOrTool.name);
+    if (!server) return parsed;
+    return { server, tool: String(nameOrTool.mcpToolName || "") || parsed?.tool || "" };
+  }
+  const text = rawToolName(nameOrTool);
+  const known = mcpToolIdentities.get(text);
+  if (known) return { ...known };
   const match = /^mcp__(.+?)__(.+)$/.exec(text);
   if (!match) return null;
   return { server: match[1], tool: match[2] };
@@ -39041,6 +39292,8 @@ function toolSearchDisplayLabel(args = {}) {
 function displayToolSearchTarget(value) {
   const text = String(value || "").trim();
   if (/^skill:/i.test(text)) return text.slice("skill:".length);
+  const known = knownMcpToolIdentity(text);
+  if (known) return `${known.server}.${known.tool}`;
   const mcp = /^mcp__(.*?)__(.+)$/.exec(text);
   if (mcp) return `${mcp[1]}.${mcp[2]}`;
   return stripToolPrefix(text);
@@ -41479,6 +41732,479 @@ function transportErrorText(error) {
   return `${TRANSPORT_SENTENCES[verdict.kind]}${detail ? ` (${detail})` : ""}.`;
 }
 
+// src/runtime/agent/orchestrator/providers/provider-error-kind.mjs
+var PROVIDER_ERROR_KINDS = Object.freeze([
+  "overloaded",
+  "rate_limited",
+  "quota_exhausted",
+  "entitlement",
+  "billing",
+  "auth",
+  "permission",
+  "context_overflow",
+  "request_too_large",
+  "policy",
+  "service_tier_unavailable",
+  "invalid_request",
+  "transient",
+  "unknown"
+]);
+var MAX_CAUSE_CHAIN_DEPTH = 8;
+function boundedCauseChain(err) {
+  const chain = [];
+  const seen = /* @__PURE__ */ new Set();
+  let cursor = err;
+  while (cursor && chain.length < MAX_CAUSE_CHAIN_DEPTH && !seen.has(cursor)) {
+    chain.push(cursor);
+    seen.add(cursor);
+    cursor = cursor?.cause;
+  }
+  return chain;
+}
+function headerValue(headers, name) {
+  if (!headers) return null;
+  const lower = name.toLowerCase();
+  if (typeof headers.get === "function") return headers.get(name) ?? headers.get(lower);
+  for (const [key, value] of Object.entries(headers)) {
+    if (String(key).toLowerCase() === lower) return Array.isArray(value) ? value[0] : value;
+  }
+  return null;
+}
+function wireDetail(err) {
+  const failed = err?.responseFailed;
+  return failed?.response?.error || failed?.error || err?.providerError || failed || null;
+}
+function headerSources(err) {
+  const detail = wireDetail(err);
+  return [
+    err?.headers,
+    err?.response?.headers,
+    err?.data?.responseHeaders,
+    err?.error?.headers,
+    detail?.headers,
+    err?.providerError?.headers,
+    err?.payload?.error?.headers
+  ].filter((headers) => headers && typeof headers === "object");
+}
+function errorHeaderValue(err, name) {
+  for (const headers of headerSources(err)) {
+    const value = headerValue(headers, name);
+    if (value != null && value !== "") return value;
+  }
+  return null;
+}
+function typedErrorCode(err) {
+  const detail = wireDetail(err);
+  for (const field of [detail?.code, detail?.type, err?.providerErrorCode, err?.code, err?.error?.code]) {
+    if (typeof field === "string" && field.trim()) return field.trim().toLowerCase();
+  }
+  return "";
+}
+var MESSAGE_DELAY_CODES = /* @__PURE__ */ new Set(["rate_limit_exceeded", "slow_down"]);
+var MESSAGE_DELAY_RE = /(?:try again in|retry (?:again )?(?:in|after)|wait(?: for)?)\s*(\d+(?:\.\d+)?)\s*(ms|milliseconds?|s|secs?|seconds?|m|mins?|minutes?)\b/i;
+function finitePositive(value) {
+  if (value == null || value === "") return null;
+  const n = Number(value);
+  return Number.isFinite(n) && n > 0 ? n : null;
+}
+function retryInfoDelayMs(details) {
+  if (!Array.isArray(details)) return null;
+  for (const detail of details) {
+    const delay = detail?.retryDelay;
+    let ms = null;
+    if (typeof delay === "string") {
+      const match = delay.trim().match(/^(\d+(?:\.\d+)?)s$/);
+      if (match) ms = Number(match[1]) * 1e3;
+    } else if (delay && typeof delay === "object") {
+      ms = Number(delay.seconds || 0) * 1e3 + Number(delay.nanos || 0) / 1e6;
+    }
+    if (finitePositive(ms) != null) return Math.ceil(ms);
+  }
+  return null;
+}
+function messageDelayMs(err) {
+  const detail = wireDetail(err) || err?.error || null;
+  for (const message of [detail?.message, err?.error?.message, err?.message]) {
+    if (typeof message !== "string" || !message) continue;
+    const match = message.match(MESSAGE_DELAY_RE);
+    if (!match) continue;
+    const value = finitePositive(match[1]);
+    if (value == null) continue;
+    const unit = String(match[2] || "").toLowerCase();
+    if (unit === "ms" || unit.startsWith("millisecond")) return Math.ceil(value);
+    if (unit === "m" || unit.startsWith("min")) return Math.ceil(value * 6e4);
+    return Math.ceil(value * 1e3);
+  }
+  return null;
+}
+function retryAfterMsFromError(err) {
+  if (!err || typeof err !== "object") return null;
+  for (const item of boundedCauseChain(err).slice(0, 2)) {
+    const at = Number(item?.retryAfterAt);
+    if (Number.isFinite(at) && at > 0) return Math.max(0, at - Date.now());
+  }
+  for (const item of boundedCauseChain(err).slice(0, 2)) {
+    const stamped = finitePositive(item?.retryAfterMs);
+    if (stamped != null) return stamped;
+  }
+  const retryAfterMs = finitePositive(errorHeaderValue(err, "retry-after-ms"));
+  if (retryAfterMs != null) return retryAfterMs;
+  const retryAfter = errorHeaderValue(err, "retry-after");
+  if (retryAfter != null) {
+    const seconds = finitePositive(retryAfter);
+    if (seconds != null) return Math.ceil(seconds * 1e3);
+    const untilDate = finitePositive(Date.parse(String(retryAfter)) - Date.now());
+    if (untilDate != null) return untilDate;
+  }
+  const detail = wireDetail(err);
+  for (const details of [
+    err.details,
+    err.error?.details,
+    err.data?.error?.details,
+    err.errorDetails,
+    err.error?.errorDetails,
+    detail?.details
+  ]) {
+    const delay = retryInfoDelayMs(details);
+    if (delay != null) return delay;
+  }
+  if (MESSAGE_DELAY_CODES.has(typedErrorCode(err))) return messageDelayMs(err);
+  return null;
+}
+var TRANSIENT_SDK_NAMES = /* @__PURE__ */ new Set([
+  "APIConnectionError",
+  "APIConnectionTimeoutError",
+  "ConnectTimeoutError",
+  "HeadersTimeoutError",
+  "BodyTimeoutError"
+]);
+var STALL_NAMES = /* @__PURE__ */ new Set(["StreamStalledError", "StreamStalledAbortError", "AgentStallAbortError"]);
+var BARE_FETCH_TRANSPORT_MESSAGE_RE = /^(?:fetch failed|failed to fetch|couldn'?t fetch\.?|load failed|network error|terminated|other side closed|socket hang up)$/i;
+var TRANSIENT_ERROR_CODES = /* @__PURE__ */ new Set([
+  "ECONNRESET",
+  "ETIMEDOUT",
+  "ESOCKETTIMEDOUT",
+  "EAI_AGAIN",
+  "ENOTFOUND",
+  "EAI_NODATA",
+  "ECONNREFUSED",
+  "ENETUNREACH",
+  "EHOSTUNREACH",
+  "EPIPE",
+  "EPROVIDERTIMEOUT",
+  "EGEMINITIMEOUT",
+  "ESTREAMSTALL",
+  "EWSACQUIRETIMEOUT",
+  "UND_ERR_SOCKET",
+  "UND_ERR_CONNECT_TIMEOUT",
+  "UND_ERR_HEADERS_TIMEOUT",
+  "UND_ERR_BODY_TIMEOUT",
+  "UND_ERR_CONNECT",
+  "EPROTO",
+  "UND_ERR_DESTROYED",
+  "UND_ERR_CLOSED",
+  "ECONNABORTED",
+  "ENETRESET",
+  "ERR_STREAM_DESTROYED",
+  "ERR_HTTP2_STREAM_ERROR",
+  "ERR_HTTP2_SESSION_ERROR",
+  "ERR_HTTP2_INVALID_SESSION",
+  "ERR_SOCKET_CONNECTION_TIMEOUT",
+  "ERR_SSL_WRONG_VERSION_NUMBER",
+  "ERR_STREAM_PREMATURE_CLOSE"
+]);
+var TLS_RECORD_FAILURE_RE = /^ERR_SSL_[A-Z0-9_/]*BAD_RECORD_MAC$/i;
+function isTransientErrorCode(code) {
+  const value = String(code || "");
+  return TRANSIENT_ERROR_CODES.has(value) || TLS_RECORD_FAILURE_RE.test(value);
+}
+var TRANSIENT_WS_CLOSE_CODES = /* @__PURE__ */ new Set([1e3, 1001, 1005, 1006, 1011, 1012]);
+function transportEvidence(err, chain, status) {
+  if (err.truncatedStream === true || err.code === "TRUNCATED_STREAM" || err.streamStalled === true) return true;
+  if (TRANSIENT_WS_CLOSE_CODES.has(Number(err.wsCloseCode ?? err.streamCloseCode ?? 0))) return true;
+  if (chain.some((item) => isTransientErrorCode(item?.code))) return true;
+  const names = chain.map((item) => String(item?.name || ""));
+  if (names.some((name) => TRANSIENT_SDK_NAMES.has(name) || STALL_NAMES.has(name))) return true;
+  return !status && chain.some((item) => BARE_FETCH_TRANSPORT_MESSAGE_RE.test(String(item?.message || "").trim()));
+}
+var TOKEN_CONTEXT_OVERFLOW_PATTERNS = [
+  /input (?:length|tokens?) exceeds? the context window/i,
+  /exceeds? the (?:maximum )?context (?:window|length)/i,
+  /maximum context length/i,
+  /context[_ ]length[_ ]exceeded/i,
+  /prompt is too long/i,
+  /reduce the length of (?:the )?(?:messages|input|prompt)/i,
+  // Wordings other backends use for the same refusal, each tied to a context
+  // or input-length noun so a tokens-per-minute rate limit never matches.
+  /prompt too long/i,
+  // z.ai, Ollama
+  /prompt exceeds max length/i,
+  // z.ai CN endpoint
+  /input is too long for requested model/i,
+  // Amazon Bedrock
+  /input token count.*exceeds the maximum/i,
+  // Google
+  /maximum prompt length is \d+/i,
+  // xAI
+  /exceeds (?:the )?maximum allowed input length/i,
+  // OpenRouter relays
+  /is longer than the model'?s context length/i,
+  // Together AI
+  /exceeds the available context size/i,
+  // llama.cpp server
+  /greater than the context length/i,
+  // LM Studio
+  /context window exceeds limit/i,
+  // MiniMax
+  /exceeded model token limit/i,
+  // Kimi
+  /too large for model with \d+ maximum context length/i,
+  // Mistral
+  /range of input length should be/i,
+  // DashScope / Qwen
+  /model_context_window_exceeded/i
+  // z.ai finish reason surfaced as text
+];
+var REQUEST_SIZE_PATTERNS = [
+  /request payload size exceeds the limit/i,
+  // Google (400, byte-size limit)
+  // A 413 re-wrapped by a proxy or aggregator without its status.
+  /request entity too large/i,
+  /request exceeds the maximum size/i
+];
+var CAPACITY_MESSAGE_RE = /\bat capacity\b|\boverloaded\b|\bserver is busy\b/i;
+var LEGACY_BILLING_MESSAGE_RE = /\binsufficient_quota\b|exceeded your (?:current )?quota/i;
+var LEGACY_QUOTA_MESSAGE_RE = /\bquota_exceeded\b|\busage_limit_reached\b|hit your usage limit/i;
+var CODE_KINDS = new Map(
+  Object.entries({
+    policy: [
+      "cyber_policy",
+      "bio_policy",
+      "cyber_policy_violation",
+      "bio_policy_violation",
+      "misalignment_policy_violation",
+      "content_policy_violation",
+      "content_filter",
+      "safety",
+      "recitation",
+      "invalid_prompt"
+    ],
+    billing: [
+      "insufficient_quota",
+      "credit_balance_exhausted",
+      "organization_spend_limit_exceeded",
+      "project_spend_limit_exceeded",
+      "organization_usage_limit_exceeded",
+      "billing_not_active",
+      "billing_hard_limit_reached",
+      "payment_required",
+      "insufficient_g1_credits_balance"
+    ],
+    entitlement: ["usage_not_included"],
+    quota_exhausted: ["quota_exceeded", "quota_exhausted", "usage_limit_reached", "provider_accounts_exhausted"],
+    context_overflow: ["context_length_exceeded", "context_window_exceeded", "model_context_window_exceeded"],
+    request_too_large: ["request_too_large", "payload_too_large", "request_entity_too_large"],
+    auth: ["invalid_api_key", "authentication_error", "unauthenticated", "unauthorized", "invalid_authentication"],
+    permission: ["permission_error", "permission_denied", "forbidden"],
+    overloaded: [
+      "server_is_overloaded",
+      "overloaded_error",
+      "overloaded",
+      "server_overloaded",
+      "model_capacity_exhausted",
+      "model_capacity_exceeded"
+    ],
+    // The requested service tier has no capacity: the same request at the
+    // same tier is refused again, so it is final rather than an overload.
+    service_tier_unavailable: ["flex_unavailable"],
+    rate_limited: ["rate_limit_exceeded", "rate_limit_error", "rate_limited", "slow_down", "too_many_requests"],
+    transient: [
+      "server_error",
+      "api_error",
+      "internal",
+      "internal_error",
+      "unavailable",
+      "service_unavailable",
+      "deadline_exceeded",
+      "timeout",
+      "previous_response_not_found",
+      "websocket_connection_limit_reached",
+      "stream_disconnected",
+      "network_error",
+      // Replay safety is still the stream-outcome gate's call (classifyError).
+      "malformed_stream"
+    ],
+    invalid_request: [
+      "invalid_request",
+      "invalid_request_error",
+      "invalid_argument",
+      "failed_precondition",
+      "bad_request",
+      "not_found",
+      "not_found_error",
+      "model_not_found",
+      "unsupported_parameter"
+    ]
+  }).flatMap(([kind, codes]) => codes.map((code) => [code, kind]))
+);
+var RESOURCE_EXHAUSTED = "resource_exhausted";
+var KIND_RANK = [
+  "policy",
+  "billing",
+  "entitlement",
+  "quota_exhausted",
+  "context_overflow",
+  "request_too_large",
+  "auth",
+  "permission",
+  "service_tier_unavailable",
+  "overloaded",
+  "rate_limited",
+  "transient",
+  "invalid_request"
+];
+function codeFields(item) {
+  const detail = wireDetail(item);
+  return [
+    detail?.code,
+    detail?.type,
+    detail?.status,
+    item?.providerErrorCode,
+    item?.code,
+    item?.type,
+    item?.error?.code,
+    item?.error?.type,
+    item?.error?.status,
+    item?.error?.error?.code,
+    item?.error?.error?.type,
+    item?.payload?.code,
+    item?.payload?.type,
+    item?.payload?.error?.code,
+    item?.payload?.error?.type,
+    item?.geminiStatus,
+    item?.status
+  ];
+}
+function typedCodes(chain) {
+  const codes = [];
+  for (const item of chain) {
+    if (!item || typeof item !== "object") continue;
+    for (const field of codeFields(item)) {
+      if (typeof field !== "string") continue;
+      const code = field.trim().toLowerCase();
+      if (code && !codes.includes(code)) codes.push(code);
+    }
+  }
+  return codes;
+}
+var VALID_STATUS = (n) => Number.isFinite(n) && n >= 100 && n <= 599;
+function statusOf(err) {
+  for (const value of [err?.httpStatus, err?.status, err?.statusCode, err?.response?.status]) {
+    const n = Number(value);
+    if (VALID_STATUS(n)) return Math.floor(n);
+  }
+  return 0;
+}
+function kindFromStatus(status) {
+  if (status === 401) return "auth";
+  if (status === 402) return "billing";
+  if (status === 403) return "permission";
+  if (status === 413) return "request_too_large";
+  if (status === 429) return "rate_limited";
+  if (status === 529) return "overloaded";
+  if (status === 408 || status === 409 || status === 425) return "transient";
+  if (status === 525 || status === 526) return null;
+  if (status >= 400 && status < 500) return "invalid_request";
+  if (status >= 500 && status < 600) return "transient";
+  return null;
+}
+function firstOf(chain, read) {
+  for (const item of chain) {
+    const value = item && typeof item === "object" ? read(item) : void 0;
+    if (value !== void 0 && value !== null) return value;
+  }
+  return null;
+}
+function resetAtOf(err, chain) {
+  const stamped = firstOf(chain, (item) => {
+    const n = Number(item.resetAt);
+    return Number.isFinite(n) && n > 0 ? n : null;
+  });
+  if (stamped != null) return stamped;
+  const exhausted = Number(err?.quotaExhausted?.resetAt);
+  return Number.isFinite(exhausted) && exhausted > 0 ? exhausted : null;
+}
+function quotaScopeOf(chain) {
+  return firstOf(chain, (item) => {
+    const scope = typeof item.quotaScope === "string" ? item.quotaScope.trim().toLowerCase() : "";
+    return scope === "minute" || scope === "day" || scope === "plan" ? scope : null;
+  });
+}
+function kindFromCodes(codes, scope) {
+  let kind = null;
+  let code = "";
+  for (const candidate of codes) {
+    let candidateKind = CODE_KINDS.get(candidate) || null;
+    if (candidate === RESOURCE_EXHAUSTED) {
+      candidateKind = scope === "day" || scope === "plan" ? "quota_exhausted" : "rate_limited";
+    }
+    if (candidateKind && (kind === null || KIND_RANK.indexOf(candidateKind) < KIND_RANK.indexOf(kind))) {
+      kind = candidateKind;
+      code = candidate;
+    }
+  }
+  return { kind, code };
+}
+function messageOf2(err, chain) {
+  const detail = wireDetail(err);
+  return [detail?.message, err?.error?.message, ...chain.map((item) => item?.message)].filter((message) => typeof message === "string" && message).join("\n");
+}
+function providerErrorKind(err, options = {}) {
+  if (!err || typeof err !== "object" && typeof err !== "function") {
+    return { kind: "unknown", code: "", status: 0, retryAfterMs: null, resetAt: null };
+  }
+  const chain = boundedCauseChain(err);
+  const status = statusOf(err);
+  const retryAfterMs = retryAfterMsFromError(err);
+  const resetAt = resetAtOf(err, chain);
+  const scope = quotaScopeOf(chain);
+  const codes = typedCodes(chain);
+  const describe = (kind2, code2 = typedErrorCode(err)) => ({ kind: kind2, code: code2 || "", status, retryAfterMs, resetAt });
+  if (err.quotaExhausted && typeof err.quotaExhausted === "object") return describe("quota_exhausted");
+  if (chain.some((item) => item?.reauthRequired === true)) return describe("auth");
+  let { kind, code } = kindFromCodes(codes, scope);
+  const quotaFlagged = options.quotaFlags !== false && chain.some((item) => item?.providerQuota === true || item?.quotaExceeded === true);
+  if (quotaFlagged && (!kind || kind === "rate_limited")) kind = "quota_exhausted";
+  const text = options.text !== false && (!kind || kind === "invalid_request") ? messageOf2(err, chain) : "";
+  if (!kind && !codes.length && text && status === 429 && CAPACITY_MESSAGE_RE.test(text)) kind = "overloaded";
+  if (options.legacyQuotaWording === true && !kind && !codes.length && !status && retryAfterMs == null && !scope && text) {
+    if (LEGACY_BILLING_MESSAGE_RE.test(text)) kind = "billing";
+    else if (LEGACY_QUOTA_MESSAGE_RE.test(text)) kind = "quota_exhausted";
+  }
+  if (!kind) kind = kindFromStatus(status);
+  if ((!kind || kind === "invalid_request") && text) {
+    if (TOKEN_CONTEXT_OVERFLOW_PATTERNS.some((re) => re.test(text))) kind = "context_overflow";
+    else if (REQUEST_SIZE_PATTERNS.some((re) => re.test(text))) kind = "request_too_large";
+  }
+  if (!kind && transportEvidence(err, chain, status)) kind = "transient";
+  if (!kind && (err.responseFailed != null || err.providerWireError === true)) kind = "transient";
+  kind = kind || "unknown";
+  if (scope === "minute" && kind === "quota_exhausted") kind = "rate_limited";
+  if (kind === "rate_limited" && (scope === "day" || scope === "plan")) kind = "quota_exhausted";
+  return describe(kind, code || void 0);
+}
+var QUOTA_KINDS = /* @__PURE__ */ new Set(["quota_exhausted", "entitlement", "billing"]);
+var DETERMINISTIC_KINDS = /* @__PURE__ */ new Set([
+  ...QUOTA_KINDS,
+  "policy",
+  "auth",
+  "permission",
+  "context_overflow",
+  "request_too_large",
+  "service_tier_unavailable",
+  "invalid_request"
+]);
+
 // src/runtime/shared/error-presentation.mjs
 var DETAILS_LIMIT = 12e3;
 var SUMMARY_LIMIT = 180;
@@ -41494,7 +42220,7 @@ function safeErrorDetails(value) {
 \u2026`;
   return text;
 }
-function messageOf2(value) {
+function messageOf3(value) {
   if (typeof value === "string") return value;
   if (value && typeof value === "object") {
     if (typeof value.message === "string") return value.message;
@@ -41508,7 +42234,7 @@ function messageOf2(value) {
   return value == null ? "" : String(value);
 }
 function unwrap(value) {
-  const raw = messageOf2(value).trim();
+  const raw = messageOf3(value).trim();
   const start = raw.indexOf("{");
   let parsed;
   if (start >= 0) {
@@ -41528,39 +42254,147 @@ function unwrap(value) {
   return { raw, message, status, code };
 }
 function isRejected429(value) {
-  return /\bAPI 429 request rejected\b/.test(messageOf2(value));
+  return /\bAPI 429 request rejected\b/.test(messageOf3(value));
+}
+var KIND_COPY = {
+  overloaded: ["overloaded", "The provider is busy right now.", "Try again later or choose another model."],
+  rate_limited: ["rate-limit", "The provider is temporarily rate-limiting requests.", "Try again shortly."],
+  quota_exhausted: [
+    "quota",
+    "The provider usage limit was reached.",
+    "Wait for the limit to reset or choose another account."
+  ],
+  entitlement: [
+    "entitlement",
+    "This model isn't included in your plan.",
+    "Upgrade your plan, or choose another model or provider."
+  ],
+  billing: [
+    "billing",
+    "The provider account is out of credits or at its spend limit.",
+    "Check your billing with the provider, then try again."
+  ],
+  permission: [
+    "permission",
+    "You don't have access to this resource.",
+    "Check your account permissions, or choose another model."
+  ],
+  context_overflow: [
+    "context-overflow",
+    "The conversation is too long for this model.",
+    "Compact the conversation or start a new one."
+  ],
+  request_too_large: [
+    "payload-size",
+    "The request exceeds the size limit.",
+    "Reduce the attachments or request size, then try again."
+  ],
+  policy: [
+    "policy",
+    "The provider refused this request under its safety policy.",
+    "Rephrase the request or choose another model."
+  ],
+  service_tier_unavailable: [
+    "service-tier",
+    "The requested service tier is unavailable right now.",
+    "Switch to the standard tier or try again later."
+  ]
+};
+var SUMMARY_KINDS = new Map(Object.entries(KIND_COPY).map(([providerKind, [, summary]]) => [summary, providerKind]));
+function waitLabel(ms) {
+  const seconds = Math.max(1, Math.ceil(ms / 1e3));
+  if (seconds < 60) return `${seconds}s`;
+  const minutes = Math.ceil(seconds / 60);
+  if (minutes < 60) return `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  return minutes % 60 ? `${hours}h ${minutes % 60}m` : `${hours}h`;
+}
+function resetLabel(resetAt) {
+  const reset = new Date(resetAt);
+  const pad = (n) => String(n).padStart(2, "0");
+  const time = `${pad(reset.getHours())}:${pad(reset.getMinutes())}`;
+  return reset.toDateString() === (/* @__PURE__ */ new Date()).toDateString() ? time : `${reset.getMonth() + 1}/${reset.getDate()} ${time}`;
+}
+var LEGACY_TEXT_KINDS = [
+  [/The provider usage limit was reached|quota.*(?:hit|exceed)|usage limit/i, "quota_exhausted"],
+  [/rate[_ -]?limit|too many requests/i, "rate_limited"]
+];
+function classify(value, raw, clean3, status, code) {
+  const persisted = value?.errorKind;
+  if (persisted && PROVIDER_ERROR_KINDS.includes(persisted.kind)) {
+    return { descriptor: persisted, typed: persisted.kind !== "unknown" };
+  }
+  const hasTypedFields = value && typeof value === "object" && Boolean(value.status || value.httpStatus || value.response?.status || value.code || value.retryAfterMs);
+  if (!hasTypedFields) {
+    const legacy = SUMMARY_KINDS.get(clean3) ?? LEGACY_TEXT_KINDS.find(([re]) => re.test(clean3))?.[1];
+    if (legacy) {
+      const wait = /retryAfter=(\d+)(ms|s|m)\b/i.exec(raw);
+      const retryAfterMs = wait ? Number(wait[1]) * { ms: 1, s: 1e3, m: 6e4 }[wait[2].toLowerCase()] : void 0;
+      return { descriptor: { kind: legacy, ...retryAfterMs ? { retryAfterMs } : {} }, typed: false };
+    }
+  }
+  let descriptor = value && typeof value === "object" ? providerErrorKind(value) : null;
+  const typed = Boolean(descriptor) && descriptor.kind !== "unknown";
+  if (!descriptor || descriptor.kind === "unknown") {
+    descriptor = providerErrorKind(
+      Object.assign(new Error(raw), { ...status ? { status } : {}, ...code ? { code } : {} })
+    );
+  }
+  if (descriptor.kind === "unknown") {
+    const known = SUMMARY_KINDS.get(clean3);
+    const legacy = known ?? LEGACY_TEXT_KINDS.find(([re]) => re.test(clean3))?.[1];
+    if (legacy) return { descriptor: { ...descriptor, kind: legacy }, typed: false };
+  }
+  return { descriptor, typed };
 }
 function describeError(value) {
-  const { raw, message, status, code } = unwrap(value);
-  const rejected429 = isRejected429(value);
+  const { raw, message, status: textStatus, code: textCode } = unwrap(value);
   const details = safeErrorDetails(raw);
   const clean3 = safeErrorDetails(message).replace(/^(?:Error invoking remote method ['"][^'"]+['"]:\s*)?(?:Error:\s*)?/i, "").trim();
+  const { descriptor, typed } = classify(value, raw, clean3, textStatus, textCode);
+  const status = typed ? Number(descriptor.status) || 0 : textStatus;
+  const code = typed ? String(descriptor.code || "") : textCode;
+  const rejected429 = isRejected429(value) && (!typed || descriptor.kind === "rate_limited");
+  const copy = KIND_COPY[descriptor.kind];
+  const retryAfterMs = Number(descriptor.retryAfterMs) > 0 ? Number(descriptor.retryAfterMs) : null;
+  const resetAt = Number(descriptor.resetAt) > 0 ? Number(descriptor.resetAt) : null;
   let kind = "unknown";
   let summary = "";
   let recovery = "";
-  const transport = transportErrorText(value) || transportErrorText(raw);
-  if (value?.reauthRequired === true || /invalid_grant|refresh token (?:expired|revoked|not available)|sign in again|sign-in expired|Reauth Required/i.test(raw)) {
+  let recoveryTemplate = "";
+  let params = null;
+  const transport = transportErrorText(value) || typed && transportErrorText({ code: code.toUpperCase(), status }) || (!typed || descriptor.kind === "transient" ? transportErrorText(raw) : null);
+  if (value?.reauthRequired === true || !typed && /invalid_grant|refresh token (?:expired|revoked|not available)|sign in again|sign-in expired|Reauth Required/i.test(raw)) {
     kind = "reauth";
     summary = "Sign-in expired.";
     recovery = "Sign in again from Providers.";
-  } else if (status === 401 || status === 403 || /\b(?:invalid|expired)\s+(?:api[ _-]?key|access token|credentials?)\b|Provider authentication failed/i.test(clean3)) {
+  } else if (descriptor.kind === "auth" || descriptor.kind === "unknown" && /\b(?:invalid|expired)\s+(?:api[ _-]?key|access token|credentials?)\b|Provider authentication failed/i.test(clean3)) {
     kind = "authentication";
     summary = "Provider authentication failed";
     recovery = "Check your sign-in or API key, then try again.";
-  } else if (/image.*dimensions.*exceed|image.*(?:too large|maximum.*(?:size|dimension))|many-image requests|An attached image exceeds the provider limit/i.test(
+  } else if (rejected429) {
+    kind = "request";
+    summary = "The provider rejected this request.";
+    recovery = "Review the request details before trying again.";
+  } else if (["invalid_request", "unknown", "request_too_large"].includes(descriptor.kind) && /image.*dimensions.*exceed|image.*(?:too large|maximum.*(?:size|dimension))|many-image requests|An attached image exceeds the provider limit/i.test(
     clean3
   )) {
     kind = "image-size";
     summary = "An attached image exceeds the provider limit.";
     recovery = "Reduce the image dimensions or number of images, then try again.";
-  } else if (status === 413 || /payload too large|request (?:body )?too large|The request exceeds the size limit/i.test(clean3)) {
-    kind = "payload-size";
-    summary = "The request exceeds the size limit.";
-    recovery = "Reduce the attachments or request size, then try again.";
-  } else if (!rejected429 && (status === 429 || /rate[_ -]?limit|quota.*(?:hit|exceed)|too many requests|The provider usage limit was reached/i.test(clean3))) {
-    kind = "rate-limit";
-    summary = "The provider usage limit was reached.";
-    recovery = "Wait for the limit to reset or choose another account.";
+  } else if (descriptor.kind === "unknown" && /payload too large|request (?:body )?too large|The request exceeds the size limit/i.test(clean3)) {
+    [kind, summary, recovery] = KIND_COPY.request_too_large;
+  } else if (copy) {
+    [kind, summary, recovery] = copy;
+    if (descriptor.kind === "rate_limited" && retryAfterMs) {
+      recovery = `Try again in ${waitLabel(retryAfterMs)}.`;
+      recoveryTemplate = "Try again in {{wait}}.";
+      params = { wait: waitLabel(retryAfterMs) };
+    } else if (descriptor.kind === "quota_exhausted" && resetAt) {
+      recovery = `It resets at ${resetLabel(resetAt)}. Switch accounts or providers to continue now.`;
+      recoveryTemplate = "It resets at {{time}}. Switch accounts or providers to continue now.";
+      params = { time: resetLabel(resetAt) };
+    }
   } else if (transport) {
     kind = "connection";
     summary = transport.replace(/\.$/, "");
@@ -41580,6 +42414,11 @@ function describeError(value) {
     kind,
     summary,
     recovery,
+    recoveryTemplate,
+    params,
+    providerKind: descriptor.kind,
+    resetAt,
+    retryAfterMs,
     details,
     // Known structured failures ignore volatile indexes; unknown failures
     // retain their diagnostic identity rather than merging unrelated work.
@@ -41730,9 +42569,27 @@ function isCancelLikeError(error) {
   const text = errText(error);
   return /aborted by session close/i.test(text) || /withRetry:\s*(?:sleep )?aborted/i.test(text) || /^sleep aborted$/i.test(text);
 }
+var KIND_LINES = {
+  overloaded: "Provider is busy at capacity.",
+  rate_limited: ({ retryAfterMs }) => retryAfterMs ? `Provider is rate-limited (retry in ${formatDurationMs(retryAfterMs)}).` : "Provider is rate-limited.",
+  quota_exhausted: "Provider usage limit reached.",
+  entitlement: "Not included in your plan.",
+  billing: "Out of credits or at spend limit.",
+  permission: "Access denied by the provider.",
+  policy: "Refused by the provider safety policy.",
+  auth: "Provider authentication failed."
+};
+function hasTypedEvidence(error) {
+  if (!error || typeof error !== "object") return false;
+  return Boolean(error.errorKind?.kind) || errorHttpStatus(error) > 0 || Boolean(error.code) || Boolean(error.retryAfterMs);
+}
 function presentErrorText(error, options = {}) {
   const presentation = describeError(error);
   if (["image-size", "payload-size", "request"].includes(presentation.kind)) return presentation.summary;
+  const kindLine = hasTypedEvidence(error) ? KIND_LINES[presentation.providerKind] : null;
+  if (kindLine && presentation.kind !== "unknown") {
+    return typeof kindLine === "function" ? kindLine(presentation) : kindLine;
+  }
   const surface = options.surface || options.tool || "";
   const subject = subjectForSurface(surface);
   const max = options.max ?? 240;
@@ -42760,6 +43617,29 @@ function deriveToolCardModel(input = {}, options = {}) {
   };
 }
 
+// src/tui/components/user-message-skills.mjs
+function appliedSkillNames(value) {
+  return (Array.isArray(value) ? value : []).filter((name) => typeof name === "string" && name);
+}
+function appliedSkillsLine(value) {
+  const names = appliedSkillNames(value);
+  return names.length ? `Skills applied: ${names.join(", ")}` : "";
+}
+function userTextSegments(text, value) {
+  const source = String(text ?? "");
+  const applied = new Set(appliedSkillNames(value));
+  if (!applied.size) return [{ text: source, mention: false }];
+  const segments = [];
+  let at = 0;
+  for (const mention of skillMentions(source, (name) => applied.has(name))) {
+    if (mention.start > at) segments.push({ text: source.slice(at, mention.start), mention: false });
+    segments.push({ text: source.slice(mention.start, mention.end), mention: true });
+    at = mention.end;
+  }
+  if (at < source.length || !segments.length) segments.push({ text: source.slice(at), mention: false });
+  return segments;
+}
+
 // src/runtime/agent/orchestrator/session/transcript-restore/tool-result-status.mjs
 function aggregateRawResultForDisplay(text) {
   if (typeof text !== "string" || !/^\[lines \d+-\d+\]$/m.test(text)) return text;
@@ -43364,8 +44244,10 @@ function estimateToolRenderedResultRows(value, { pathArg = "", isShell = false,
 function estimateTranscriptItemRows(item, columns, toolOutputExpanded, attachedTool = false) {
   if (!item) return 1;
   switch (item.kind) {
-    case "user":
-      return 1 + estimateWrappedRows(item.text, columns, 4);
+    case "user": {
+      const skillsLine = appliedSkillsLine(item.appliedSkills);
+      return 1 + estimateWrappedRows(item.text, columns, 4) + (skillsLine ? estimateWrappedRows(skillsLine, columns, 4) : 0);
+    }
     case "assistant":
       return 1 + (item.streaming ? measureStreamingMarkdownRenderedRows(item.text, columns, item.id) : measureMarkdownRenderedRows(item.text, columns, { trimPartialFences: true }));
     case "tool": {
@@ -44416,12 +45298,12 @@ function useMouseInput({
   const passthroughCtrlWheelZoom = useCallback6(() => {
     zoomRestoreSchedulerRef.current.passthrough();
   }, []);
-  useEffect10(() => {
+  useEffect11(() => {
     const scheduler = zoomRestoreSchedulerRef.current;
     scheduler.attach();
     return () => scheduler.detach();
   }, []);
-  useEffect10(() => {
+  useEffect11(() => {
     if (!inkInput || !isRawModeSupported) return void 0;
     const geometry = createMouseGeometry({
       transcriptViewportRef,
@@ -44511,7 +45393,7 @@ function useMouseInput({
 }
 
 // src/tui/app/use-transcript-scroll.mjs
-import { useCallback as useCallback12, useEffect as useEffect13, useLayoutEffect as useLayoutEffect3, useRef as useRef10 } from "react";
+import { useCallback as useCallback12, useEffect as useEffect14, useLayoutEffect as useLayoutEffect3, useRef as useRef10 } from "react";
 
 // src/tui/app/transcript-scroll-anchor.mjs
 function readingAnchorAt(geom, target) {
@@ -44533,7 +45415,7 @@ function bottomSnapRows(viewRows) {
 }
 
 // src/tui/app/use-selection-stitch.mjs
-import { useCallback as useCallback7, useEffect as useEffect11, useRef as useRef6 } from "react";
+import { useCallback as useCallback7, useEffect as useEffect12, useRef as useRef6 } from "react";
 function storeStitchRows(buffer, rows2, scroll) {
   for (const row of rows2) {
     if (!row || typeof row.y !== "number") continue;
@@ -44547,7 +45429,7 @@ function useSelectionStitchBuffer({ store, dragRef, scrollTargetRef }) {
   const stitchBufferRef = useRef6(/* @__PURE__ */ new Map());
   const stitchHarvestTimerRef = useRef6(null);
   const stitchHarvestScrollRef = useRef6(0);
-  useEffect11(
+  useEffect12(
     () => () => {
       if (stitchHarvestTimerRef.current) clearTimeout(stitchHarvestTimerRef.current);
       stitchHarvestTimerRef.current = null;
@@ -44676,7 +45558,7 @@ function useTranscriptFollow({
 }
 
 // src/tui/app/use-selection-paint.mjs
-import { useCallback as useCallback9, useEffect as useEffect12, useRef as useRef8 } from "react";
+import { useCallback as useCallback9, useEffect as useEffect13, useRef as useRef8 } from "react";
 
 // src/tui/session/render-frame-source.mjs
 var sources = /* @__PURE__ */ new Set();
@@ -44868,7 +45750,7 @@ function useSelectionPaint({
 }) {
   const selectionPaintRef = useRef8({ t: 0, rect: null, pending: null, timer: null });
   const selectionTextCaptureRef = useRef8(0);
-  useEffect12(
+  useEffect13(
     () => () => {
       const paintState = selectionPaintRef.current;
       if (paintState.timer) clearTimeout(paintState.timer);
@@ -45114,7 +45996,7 @@ function useSelectionFocusMove({
 // src/tui/app/use-transcript-scroll.mjs
 function useScrollCoalescer(scrollTranscriptRows) {
   const scrollCoalesceRef = useRef10({ pendingRows: 0, direction: 0, timer: null });
-  useEffect13(
+  useEffect14(
     () => () => {
       const state = scrollCoalesceRef.current;
       if (state.timer) clearTimeout(state.timer);
@@ -45370,9 +46252,9 @@ function useTranscriptScroll({
 }
 
 // src/tui/app/use-transcript-scroll-state.mjs
-import { useRef as useRef11, useState as useState6 } from "react";
+import { useRef as useRef11, useState as useState7 } from "react";
 function useTranscriptScrollState() {
-  const [scrollOffset, setScrollOffset] = useState6(0);
+  const [scrollOffset, setScrollOffset] = useState7(0);
   const scrollPositionRef = useRef11(0);
   const scrollTargetRef = useRef11(0);
   const maxScrollRowsRef = useRef11(0);
@@ -45380,7 +46262,7 @@ function useTranscriptScrollState() {
   const transcriptAnchorRef = useRef11(null);
   const transcriptAnchorDirtyRef = useRef11(false);
   const transcriptGeomRef = useRef11({ prefixRows: null, totalRows: 0, viewRows: 1 });
-  const [measuredRowsVersion, setMeasuredRowsVersion] = useState6(0);
+  const [measuredRowsVersion, setMeasuredRowsVersion] = useState7(0);
   const followingRef = useRef11(false);
   const lastItemsCountRef = useRef11(0);
   const lastFirstItemIdRef = useRef11(null);
@@ -45403,13 +46285,14 @@ function useTranscriptScrollState() {
 }
 
 // src/tui/app/use-prompt-state.mjs
-import { useRef as useRef12, useState as useState7 } from "react";
+import { useRef as useRef12, useState as useState8 } from "react";
 function usePromptState() {
-  const [promptDraft, setPromptDraft] = useState7("");
-  const [promptDraftOverride, setPromptDraftOverride] = useState7(null);
+  const [promptDraft, setPromptDraft] = useState8("");
+  const [promptDraftOverride, setPromptDraftOverride] = useState8(null);
+  const [promptCaret, setPromptCaret] = useState8(null);
   const promptLayoutValueRef = useRef12("");
-  const [, setPromptLayoutRows] = useState7(1);
-  const [textEntryLayoutRows, setTextEntryLayoutRows] = useState7(1);
+  const [, setPromptLayoutRows] = useState8(1);
+  const [textEntryLayoutRows, setTextEntryLayoutRows] = useState8(1);
   const promptValueRef = useRef12("");
   const promptSelectionRef = useRef12(null);
   const promptBoxRectRef = useRef12(null);
@@ -45421,6 +46304,8 @@ function usePromptState() {
     setPromptDraft,
     promptDraftOverride,
     setPromptDraftOverride,
+    promptCaret,
+    setPromptCaret,
     promptLayoutValueRef,
     setPromptLayoutRows,
     textEntryLayoutRows,
@@ -45468,7 +46353,7 @@ function useInteractionRefs() {
 }
 
 // src/tui/app/use-pasted-buffers.mjs
-import { useCallback as useCallback13, useRef as useRef14, useState as useState8 } from "react";
+import { useCallback as useCallback13, useRef as useRef14, useState as useState9 } from "react";
 
 // src/tui/paste-attachments.mjs
 import { execFile } from "node:child_process";
@@ -46035,7 +46920,7 @@ async function readClipboardText() {
 
 // src/tui/app/use-pasted-buffers.mjs
 function usePastedBufferSlice({ toEntry, formatRef }) {
-  const [, setBuffers] = useState8({});
+  const [, setBuffers] = useState9({});
   const buffersRef = useRef14({});
   const nextIdRef = useRef14(1);
   const install = useCallback13((buffers, { merge = true } = {}) => {
@@ -46104,11 +46989,11 @@ function usePastedBuffers() {
 }
 
 // src/tui/app/use-prompt-hint.mjs
-import { useCallback as useCallback14, useEffect as useEffect14, useRef as useRef15, useState as useState9 } from "react";
+import { useCallback as useCallback14, useEffect as useEffect15, useRef as useRef15, useState as useState10 } from "react";
 var PROMPT_HINT_DISMISS_MS = 2200;
 function usePromptHint() {
-  const [promptHint, setPromptHint] = useState9("");
-  const [promptHintTone, setPromptHintTone] = useState9("info");
+  const [promptHint, setPromptHint] = useState10("");
+  const [promptHintTone, setPromptHintTone] = useState10("info");
   const promptHintTimerRef = useRef15(null);
   const promptHintActiveRef = useRef15(false);
   const showPromptHint = useCallback14((text, tone = "info", dismissMs = PROMPT_HINT_DISMISS_MS) => {
@@ -46135,7 +47020,7 @@ function usePromptHint() {
     setPromptHint("");
     setPromptHintTone("info");
   }, []);
-  useEffect14(
+  useEffect15(
     () => () => {
       if (promptHintTimerRef.current) clearTimeout(promptHintTimerRef.current);
     },
@@ -46153,7 +47038,7 @@ function usePromptHint() {
 }
 
 // src/tui/app/use-welcome-prompt-hint.mjs
-import { useCallback as useCallback15, useEffect as useEffect15, useRef as useRef16, useState as useState10 } from "react";
+import { useCallback as useCallback15, useEffect as useEffect16, useRef as useRef16, useState as useState11 } from "react";
 
 // src/tui/app/app-format.mjs
 import stringWidth5 from "string-width";
@@ -46654,8 +47539,8 @@ function cleanRightMessage(value) {
 
 // src/tui/app/use-welcome-prompt-hint.mjs
 function useWelcomePromptHint({ store, state, toastErrorSignature }) {
-  const [welcomePromptHintDismissed, setWelcomePromptHintDismissed] = useState10(false);
-  const [conditionalWelcomePromptHint, setConditionalWelcomePromptHint] = useState10("");
+  const [welcomePromptHintDismissed, setWelcomePromptHintDismissed] = useState11(false);
+  const [conditionalWelcomePromptHint, setConditionalWelcomePromptHint] = useState11("");
   const welcomePromptHintRef = useRef16(null);
   if (welcomePromptHintRef.current === null) {
     welcomePromptHintRef.current = randomWelcomePromptHint();
@@ -46665,7 +47550,7 @@ function useWelcomePromptHint({ store, state, toastErrorSignature }) {
     if (!welcomePromptHintVisibleRef.current) return;
     setWelcomePromptHintDismissed(true);
   }, []);
-  useEffect15(() => {
+  useEffect16(() => {
     let alive = true;
     const refreshConditionalWelcomeHint = async () => {
       let quickModels;
@@ -48372,7 +49257,7 @@ function renderWelcomeBanner({ frameColumns, cwd: cwd2 }) {
 }
 
 // src/tui/hooks/useSharedTick.mjs
-import { useEffect as useEffect16, useRef as useRef17, useState as useState11 } from "react";
+import { useEffect as useEffect17, useRef as useRef17, useState as useState12 } from "react";
 var TICK_SLOP_MS = 16;
 var subscribers = /* @__PURE__ */ new Set();
 var timer = null;
@@ -48407,10 +49292,10 @@ function onTick() {
   reconcileTimer();
 }
 function useSharedTick(intervalMs, isActive = true, onTick2 = null) {
-  const [, setTick] = useState11(0);
+  const [, setTick] = useState12(0);
   const cbRef = useRef17(onTick2);
   cbRef.current = onTick2;
-  useEffect16(() => {
+  useEffect17(() => {
     if (!isActive) return void 0;
     const interval = Math.max(1, Number(intervalMs) || 0);
     const sub = {
@@ -48954,7 +49839,7 @@ function statuslineFooterIdentityChanged(args, lastArgs) {
   if (!lastArgs) return true;
   if (args.sessionId !== lastArgs.sessionId) return true;
   if (args.provider !== lastArgs.provider || args.model !== lastArgs.model) return true;
-  if (args.effort !== lastArgs.effort || args.fast !== lastArgs.fast) return true;
+  if (args.effort !== lastArgs.effort || args.fast !== lastArgs.fast || args.ultra !== lastArgs.ultra) return true;
   if (args.contextWindow !== lastArgs.contextWindow || args.rawContextWindow !== lastArgs.rawContextWindow) return true;
   if (args.displayContextWindow !== lastArgs.displayContextWindow) return true;
   if (args.compactBoundaryTokens !== lastArgs.compactBoundaryTokens) return true;
@@ -49027,7 +49912,7 @@ import { existsSync as existsSync7, readFileSync as readFileSync7 } from "node:f
 import { join as join7 } from "node:path";
 
 // src/runtime/shared/llm/provider-model-identities.mjs
-function fallbackModel(id, display, family, contextWindow, wire) {
+function fallbackModel(id, display, family, contextWindow, wire, levels = []) {
   const tiered = wire && typeof wire === "object";
   return {
     id,
@@ -49039,7 +49924,7 @@ function fallbackModel(id, display, family, contextWindow, wire) {
     supportsVision: true,
     supportsReasoning: true,
     supportsFunctionCalling: true,
-    reasoningLevels: tiered ? Object.keys(wire) : [],
+    reasoningLevels: tiered ? Object.keys(wire) : [...levels],
     wire
   };
 }
@@ -49053,8 +49938,16 @@ var ANTIGRAVITY_MODELS = Object.freeze([
     low: "gemini-3.1-pro-low",
     high: "gemini-3.1-pro-high"
   }),
-  fallbackModel("claude-opus-4-6-thinking", "Claude Opus 4.6 (Thinking)", null, 25e4, "claude-opus-4-6-thinking"),
-  fallbackModel("claude-sonnet-4-6", "Claude Sonnet 4.6 (Thinking)", null, 25e4, "claude-sonnet-4-6"),
+  fallbackModel("claude-opus-4-6-thinking", "Claude Opus 4.6 (Thinking)", null, 25e4, "claude-opus-4-6-thinking", [
+    "low",
+    "medium",
+    "high"
+  ]),
+  fallbackModel("claude-sonnet-4-6", "Claude Sonnet 4.6 (Thinking)", null, 25e4, "claude-sonnet-4-6", [
+    "low",
+    "medium",
+    "high"
+  ]),
   fallbackModel("gpt-oss-120b-medium", "GPT-OSS 120B (Medium)", "gpt-oss", 131072, "gpt-oss-120b-medium")
 ]);
 var ANTIGRAVITY_PRICING_ALIASES = Object.freeze({
@@ -49232,6 +50125,12 @@ var PROVIDER_CATALOGS = Object.freeze({
   // Effort tiers live in the wire id; a row without levels has no effort
   // surface (resolveAntigravityWireModel drops the effort).
   "antigravity-oauth": { relay: true, rosterFiles: ["antigravity-oauth-models.json"], rosterLadderFinal: true },
+  // api.commandcode.ai/provider/v1 relays other vendors' models.
+  "command-code-oauth": {
+    relay: true,
+    rosterFiles: ["command-code-oauth-models.json"],
+    rosterLimitsAuthoritative: true
+  },
   "cursor-oauth": { relay: true },
   "cursor-api": { relay: true },
   "opencode-go": { relay: true }
@@ -49958,6 +50857,7 @@ function localBootStatusLine(args = {}) {
     model = "",
     effort = "",
     fast = false,
+    ultra = false,
     stats = null,
     contextWindow = 0,
     displayContextWindow = 0,
@@ -49966,7 +50866,9 @@ function localBootStatusLine(args = {}) {
   const raw = String(model || "").trim();
   const { STATUS, SUBTLE } = statusColors();
   const display = shortenModelName(displayModelName(raw, provider, ""), terminalColumns());
-  const flags = [effort ? String(effort).toUpperCase() : "", fast === true ? "FAST" : ""].filter(Boolean);
+  let speedLabel = "";
+  if (fast === true) speedLabel = ultra === true ? "Ultrafast" : "Fast";
+  const flags = [effort ? effortDisplayLabel(effort) : "", speedLabel].filter(Boolean);
   const modelBits = [display, ...flags].join(` ${SUBTLE}\xB7${RESET3} `);
   const ctxPct = measuredContextUsage({
     stats,
@@ -50000,7 +50902,7 @@ ${freshL2}` : cachedL1;
 }
 
 // src/tui/components/status-line/use-statusline-text.mjs
-import { useEffect as useEffect17, useRef as useRef19, useState as useState12 } from "react";
+import { useEffect as useEffect18, useRef as useRef19, useState as useState13 } from "react";
 function useStatusLineText({
   sessionId,
   clientHostPid,
@@ -50008,6 +50910,7 @@ function useStatusLineText({
   model,
   effort,
   fast,
+  ultra,
   cwd: cwd2,
   stats,
   contextWindow,
@@ -50023,13 +50926,14 @@ function useStatusLineText({
   initialLine,
   themeEpoch
 }) {
-  const [line, setLine] = useState12(
+  const [line, setLine] = useState13(
     () => normalizeStatusLine(
       initialLine || localBootStatusLine({
         provider,
         model,
         effort,
         fast,
+        ultra,
         stats,
         contextWindow,
         displayContextWindow,
@@ -50042,7 +50946,7 @@ function useStatusLineText({
       })
     )
   );
-  const [refreshTick, setRefreshTick] = useState12(0);
+  const [refreshTick, setRefreshTick] = useState13(0);
   const statuslineArgsRef = useRef19(null);
   const bootFullDoneRef = useRef19(false);
   const mountAtRef = useRef19(Date.now());
@@ -50060,6 +50964,7 @@ function useStatusLineText({
     model,
     effort,
     fast,
+    ultra,
     cwd: cwd2,
     stats,
     contextWindow,
@@ -50092,13 +50997,13 @@ function useStatusLineText({
     String(statsForSignature.currentContextSource || "")
   ].join("|");
   const refreshMs = hasActiveStatuslineWork(line, agentWorkers, agentJobs, activeTools) ? STATUSLINE_ACTIVE_REFRESH_MS : STATUSLINE_REFRESH_MS;
-  useEffect17(() => {
+  useEffect18(() => {
     scheduleStatuslineModulePrewarm();
   }, []);
   useSharedTick(refreshMs, true, () => {
     setRefreshTick((tick) => (tick + 1) % 1e6);
   });
-  useEffect17(() => {
+  useEffect18(() => {
     let alive = true;
     let bootRetryTimer = null;
     const effectId = renderEffectIdRef.current + 1;
@@ -50107,7 +51012,7 @@ function useStatusLineText({
     const args = statuslineArgsRef.current;
     const identityChanged = statuslineFooterIdentityChanged({ ...args, agentRevision }, lastImmediateArgsRef.current);
     const prevImmediate = lastImmediateArgsRef.current;
-    const routeChanged = !prevImmediate || prevImmediate.sessionId !== args.sessionId || prevImmediate.provider !== args.provider || prevImmediate.model !== args.model || prevImmediate.effort !== args.effort || prevImmediate.fast !== args.fast;
+    const routeChanged = !prevImmediate || prevImmediate.sessionId !== args.sessionId || prevImmediate.provider !== args.provider || prevImmediate.model !== args.model || prevImmediate.effort !== args.effort || prevImmediate.fast !== args.fast || prevImmediate.ultra !== args.ultra;
     const themeChanged = themeEpochRef.current !== themeEpoch;
     if (themeChanged) {
       themeEpochRef.current = themeEpoch;
@@ -50128,6 +51033,7 @@ function useStatusLineText({
       model: args.model,
       effort: args.effort,
       fast: args.fast,
+      ultra: args.ultra,
       contextWindow: args.contextWindow,
       displayContextWindow: args.displayContextWindow,
       rawContextWindow: args.rawContextWindow,
@@ -50196,6 +51102,7 @@ function useStatusLineText({
     model,
     effort,
     fast,
+    ultra,
     cwd2,
     statsSignature,
     contextWindow,
@@ -50223,6 +51130,7 @@ function StatusLineView({
   model,
   effort,
   fast,
+  ultra = false,
   cwd: cwd2,
   stats,
   contextWindow,
@@ -50246,6 +51154,7 @@ function StatusLineView({
     model,
     effort,
     fast,
+    ultra,
     cwd: cwd2,
     stats,
     contextWindow,
@@ -50287,7 +51196,7 @@ function StatusLineView({
 var StatusLine = React11.memo(StatusLineView);
 
 // src/tui/components/PromptInput.jsx
-import { useEffect as useEffect18, useLayoutEffect as useLayoutEffect4, useState as useState13, useRef as useRef20 } from "react";
+import { useEffect as useEffect19, useLayoutEffect as useLayoutEffect4, useState as useState14, useRef as useRef20 } from "react";
 
 // src/tui/input-editing.mjs
 var graphemeSegmenter4 = new Intl.Segmenter(void 0, { granularity: "grapheme" });
@@ -50990,6 +51899,11 @@ function gridSelectionActive(suppressShiftNavRef) {
   if (typeof suppressShiftNavRef?.current === "function") return suppressShiftNavRef.current();
   return Boolean(suppressShiftNavRef?.current);
 }
+function paletteResultDraft(result) {
+  if (typeof result === "string") return { value: result, cursor: result.length, selectionAnchor: null };
+  if (typeof result?.value === "string") return { value: result.value, cursor: result.cursor, selectionAnchor: null };
+  return null;
+}
 function createPromptKeyHandler(ctx) {
   const {
     disabled,
@@ -51003,6 +51917,7 @@ function createPromptKeyHandler(ctx) {
     submitDraft,
     commandPaletteActive,
     commandPaletteOptionCount,
+    commandPaletteMovesCaret,
     onCommandPaletteNavigate,
     onCommandPaletteAccept,
     onCommandPaletteComplete,
@@ -51083,8 +51998,11 @@ function createPromptKeyHandler(ctx) {
         return;
       }
       if (commandPaletteActive) {
-        const accepted = onCommandPaletteAccept?.(draftRef.current.value);
-        if (accepted !== false) {
+        const accepted = onCommandPaletteAccept?.(draftRef.current.value, draftRef.current.cursor);
+        const replacement = paletteResultDraft(accepted);
+        if (replacement) {
+          commitDraft(replacement);
+        } else if (accepted !== false) {
           commitDraft({ value: "", cursor: 0, selectionAnchor: null });
         }
         return;
@@ -51163,10 +52081,10 @@ ${d.value.slice(d.cursor)}`,
     }
     if (key.tab) {
       if (commandPaletteActive) {
-        const completed = onCommandPaletteComplete?.(draftRef.current.value);
-        if (typeof completed === "string") {
-          commitDraft({ value: completed, cursor: completed.length, selectionAnchor: null });
-        }
+        const completed = paletteResultDraft(
+          onCommandPaletteComplete?.(draftRef.current.value, draftRef.current.cursor)
+        );
+        if (completed) commitDraft(completed);
         return;
       }
       if (onTab?.(draftRef.current.value) === true) return;
@@ -51176,7 +52094,7 @@ ${d.value.slice(d.cursor)}`,
       return;
     }
     if (key.leftArrow || rawShiftLeft) {
-      if (commandPaletteActive) {
+      if (commandPaletteActive && !commandPaletteMovesCaret) {
         onCommandPaletteNavigate?.("left");
         return;
       }
@@ -51186,7 +52104,7 @@ ${d.value.slice(d.cursor)}`,
       return;
     }
     if (key.rightArrow || rawShiftRight) {
-      if (commandPaletteActive) {
+      if (commandPaletteActive && !commandPaletteMovesCaret) {
         onCommandPaletteNavigate?.("right");
         return;
       }
@@ -51393,6 +52311,8 @@ function PromptInput({
   commandPaletteActive = false,
   commandPaletteOpen = commandPaletteActive,
   commandPaletteOptionCount = commandPaletteActive ? 2 : 0,
+  commandPaletteMovesCaret = false,
+  onCaretChange,
   mask = false,
   hint = "",
   hintTone = "info",
@@ -51415,13 +52335,14 @@ function PromptInput({
   mouseSelectionRef,
   suppressShiftNavRef
 }) {
-  const [draft, setDraft] = useState13(() => {
+  const [draft, setDraft] = useState14(() => {
     const value2 = String(initialValue || "");
     return { value: value2, cursor: value2.length, selectionAnchor: null };
   });
-  const [, bumpCursorAnchorEpoch] = useState13(0);
+  const [, bumpCursorAnchorEpoch] = useState14(0);
   const draftRef = useRef20(draft);
   const lastReportedValueRef = useRef20(draft.value);
+  const lastReportedCursorRef = useRef20(null);
   const pasteGenerationRef = useRef20(0);
   const submitGateRef = useRef20(false);
   const escapeClearAtRef = useRef20(0);
@@ -51464,7 +52385,7 @@ function PromptInput({
       flush: flushImmediate
     });
   };
-  useEffect18(
+  useEffect19(
     () => () => {
       cancelPromptImmediateFlush(flushThrottleRef.current);
     },
@@ -51491,8 +52412,15 @@ function PromptInput({
       lastReportedValueRef.current = next.value;
       onDraftChange?.(next.value);
     }
+    reportCaret(next.cursor);
     if (valueRef) valueRef.current = next.value;
   };
+  function reportCaret(nextCursor) {
+    if (nextCursor === lastReportedCursorRef.current) return;
+    lastReportedCursorRef.current = nextCursor;
+    onCaretChange?.(nextCursor);
+  }
+  useEffect19(() => reportCaret(draftRef.current.cursor), []);
   const installCursorAnchor = () => {
     if (!boxRef.current || boxRef.current.internal_cursorAnchor) return false;
     boxRef.current.internal_cursorAnchor = createCursorAnchor({
@@ -51515,7 +52443,7 @@ function PromptInput({
       commitDraft
     });
   }
-  useEffect18(
+  useEffect19(
     () => () => {
       const state = mouseExtendCoalesceRef.current;
       if (state.timer) clearTimeout(state.timer);
@@ -51573,7 +52501,7 @@ function PromptInput({
       apply(handled);
     }
   };
-  useEffect18(() => {
+  useEffect19(() => {
     if (!draftOverride || typeof draftOverride.value !== "string") return;
     pasteGenerationRef.current += 1;
     const nextValue = draftOverride.value;
@@ -51582,7 +52510,7 @@ function PromptInput({
     commitDraft({ value: nextValue, cursor: nextCursor, selectionAnchor: nextAnchor }, { skipHistory: true });
     undoStack.reset();
   }, [draftOverride?.id, draftOverride?.value, draftOverride?.cursor, draftOverride?.selectionAnchor]);
-  useEffect18(
+  useEffect19(
     () => () => {
       pasteGenerationRef.current += 1;
       if (selectionRef) selectionRef.current = null;
@@ -51611,8 +52539,11 @@ function PromptInput({
     const current = draftRef.current;
     const next = prefix ? insertText(current, prefix) : current;
     if (commandPaletteActive) {
-      const accepted = onCommandPaletteAccept?.(next.value);
-      if (accepted !== false) {
+      const accepted = onCommandPaletteAccept?.(next.value, next.cursor);
+      const replacement = paletteResultDraft(accepted);
+      if (replacement) {
+        commitDraft(replacement);
+      } else if (accepted !== false) {
         commitDraft({ value: "", cursor: 0, selectionAnchor: null });
       } else if (next !== current) {
         commitDraft(next);
@@ -51641,6 +52572,7 @@ function PromptInput({
     commandPaletteActive,
     commandPaletteOpen,
     commandPaletteOptionCount,
+    commandPaletteMovesCaret,
     onCommandPaletteNavigate,
     onCommandPaletteAccept,
     onCommandPaletteCancel,
@@ -52032,20 +52964,20 @@ function usePickerInput({
 }
 
 // src/tui/components/picker/use-picker-selection.mjs
-import { useEffect as useEffect19, useRef as useRef21, useState as useState14 } from "react";
+import { useEffect as useEffect20, useRef as useRef21, useState as useState15 } from "react";
 function usePickerSelection({ items, initialIndex, onHighlight, confirmButtons, confirmBar }) {
-  const [selectedIndex, setSelectedIndex] = useState14(() => clampItemIndex(initialIndex, items.length));
-  const [confirmFocus, setConfirmFocus] = useState14(-1);
+  const [selectedIndex, setSelectedIndex] = useState15(() => clampItemIndex(initialIndex, items.length));
+  const [confirmFocus, setConfirmFocus] = useState15(-1);
   const lastTabAtRef = useRef21(0);
-  useEffect19(() => {
+  useEffect20(() => {
     setConfirmFocus(-1);
   }, [confirmButtons.length, confirmBar]);
-  const [selectionMemo] = useState14(() => ({ value: null, initialIndex }));
-  useEffect19(() => {
+  const [selectionMemo] = useState15(() => ({ value: null, initialIndex }));
+  useEffect20(() => {
     const item = items[selectedIndex];
     if (item && item.value != null) selectionMemo.value = item.value;
   }, [items, selectedIndex, selectionMemo]);
-  useEffect19(() => {
+  useEffect20(() => {
     setSelectedIndex((i) => {
       if (selectionMemo.value != null) {
         const found = items.findIndex((entry) => entry && entry.value === selectionMemo.value);
@@ -52056,7 +52988,7 @@ function usePickerSelection({ items, initialIndex, onHighlight, confirmButtons,
       return Math.min(Math.max(0, i), Math.max(0, items.length - 1));
     });
   }, [items, selectionMemo, initialIndex]);
-  useEffect19(() => {
+  useEffect20(() => {
     if (initialIndex == null) {
       selectionMemo.initialIndex = null;
       return;
@@ -52065,7 +52997,7 @@ function usePickerSelection({ items, initialIndex, onHighlight, confirmButtons,
     selectionMemo.initialIndex = initialIndex;
     setSelectedIndex(clampItemIndex(initialIndex, items.length));
   }, [initialIndex, items.length, selectionMemo]);
-  useEffect19(() => {
+  useEffect20(() => {
     if (typeof onHighlight !== "function") return;
     const item = items[selectedIndex];
     if (item) onHighlight(item.value, item, selectedIndex);
@@ -52313,12 +53245,21 @@ function queryMatchesAlias(command, query) {
   );
 }
 function commandDisplayLabel(command, query) {
+  if (command?.label) return command.label;
   const usage = String(command?.usage || command?.name || "").replace(/^\/+/, "");
   const aliasText = command?.showAliasUsage !== false && queryMatchesAlias(command, query) && Array.isArray(command?.aliasUsage) && command.aliasUsage.length > 0 ? ` (${command.aliasUsage.join(", ")})` : "";
   const label = ACRONYM_LABELS.get(usage.toLowerCase()) || (usage ? `${usage.charAt(0).toUpperCase()}${usage.slice(1)}` : usage);
   return `${label}${aliasText}`;
 }
-function SlashCommandPalette({ commands: commands2, selectedIndex = 0, title = "Commands", columns = 80, query = "" }) {
+function SlashCommandPalette({
+  commands: commands2,
+  selectedIndex = 0,
+  title = "Commands",
+  columns = 80,
+  query = "",
+  description: descriptionText = SLASH_DESCRIPTION,
+  help: helpText = SLASH_HELP
+}) {
   const total = commands2.length;
   const half = Math.floor(MAX_VISIBLE2 / 2);
   let start = Math.max(0, selectedIndex - half);
@@ -52331,9 +53272,9 @@ function SlashCommandPalette({ commands: commands2, selectedIndex = 0, title = "
   const blankRows = Math.max(0, MAX_VISIBLE2 - visible.length - (noMatches ? 1 : 0));
   const labelWidth = Math.min(COMMAND_LABEL_WIDTH, Math.max(12, Math.floor(columns * 0.45)));
   const descriptionWidth = Math.max(0, columns - labelWidth - 12);
-  const description = truncatePanelText(SLASH_DESCRIPTION, Math.max(0, columns - 4));
+  const description = truncatePanelText(descriptionText, Math.max(0, columns - 4));
   const titleWidth = stringWidth9(String(title || ""));
-  const help = truncatePanelText(SLASH_HELP, Math.max(0, columns - titleWidth - 7));
+  const help = truncatePanelText(helpText, Math.max(0, columns - titleWidth - 7));
   return /* @__PURE__ */ jsx11(Box_default, { flexDirection: "column", flexShrink: 0, width: "100%", children: /* @__PURE__ */ jsxs9(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: theme.promptBorder, paddingX: 1, width: "100%", children: [
     /* @__PURE__ */ jsxs9(Box_default, { flexDirection: "row", justifyContent: "space-between", children: [
       /* @__PURE__ */ jsx11(Text, { color: theme.panelTitle, wrap: "truncate", children: title }),
@@ -52374,7 +53315,7 @@ var CommandRow = React13.memo(function CommandRow2({ command, isSelected, labelW
 import stringWidth11 from "string-width";
 
 // src/tui/components/ContextInspector.jsx
-import { useEffect as useEffect20, useRef as useRef22, useState as useState15 } from "react";
+import { useEffect as useEffect21, useRef as useRef22, useState as useState16 } from "react";
 import wrapAnsi4 from "wrap-ansi";
 import stringWidth10 from "string-width";
 
@@ -52435,13 +53376,13 @@ function fitLine2(text, width) {
   return result;
 }
 function ContextInspector({ inspection, columns, rows: rows2 = 16, windowTokens, onInspect, onRefresh }) {
-  const [category, setCategory] = useState15("");
-  const [index, setIndex] = useState15(0);
-  const [preview, setPreview] = useState15(null);
-  const [scroll, setScroll] = useState15(0);
-  const [fit, setFit] = useState15(false);
+  const [category, setCategory] = useState16("");
+  const [index, setIndex] = useState16(0);
+  const [preview, setPreview] = useState16(null);
+  const [scroll, setScroll] = useState16(0);
+  const [fit, setFit] = useState16(false);
   const request = useRef22(0);
-  useEffect20(
+  useEffect21(
     () => () => {
       request.current += 1;
     },
@@ -52807,7 +53748,7 @@ function ContextPanel({
 }
 
 // src/tui/components/UsagePanel.jsx
-import { useEffect as useEffect21, useState as useState16 } from "react";
+import { useEffect as useEffect22, useState as useState17 } from "react";
 import stringWidth12 from "string-width";
 
 // src/session-runtime/services/usage-dashboard-model.mjs
@@ -52835,7 +53776,7 @@ import { Fragment as Fragment6, jsx as jsx14, jsxs as jsxs12 } from "react/jsx-r
 var PROVIDER_LABEL_WIDTH = 28;
 var CREDIT_LABEL = "Credit";
 var STATUS_SEPARATOR2 = " \u2502 ";
-function resetLabel(value) {
+function resetLabel2(value) {
   const at = Number(value);
   if (!Number.isFinite(at) || at <= 0) return "";
   const date = new Date(at);
@@ -52874,7 +53815,7 @@ function creditsColor(w) {
 }
 function windowResetText(w) {
   if (isLocalEstimateWindow(w)) return "";
-  const reset = resetLabel(w?.resetAt);
+  const reset = resetLabel2(w?.resetAt);
   if (!reset) return "";
   return `\u21BB ${reset}`;
 }
@@ -53023,11 +53964,11 @@ function UsagePanel({ dashboard, loading = false, columns = 80, fillHeight = fal
   const hasMeasuredRows = Number(panelRows) > 0;
   const maxProviderRows = hasMeasuredRows ? Math.max(1, Math.floor(panelRows) - 6) : rows2.length;
   const maxScrollOffset = Math.max(0, rows2.length - maxProviderRows);
-  const [scrollOffset, setScrollOffset] = useState16(0);
+  const [scrollOffset, setScrollOffset] = useState17(0);
   const visibleRows = hasMeasuredRows ? rows2.slice(scrollOffset, scrollOffset + maxProviderRows) : rows2;
   const scrollable = rows2.length > maxProviderRows;
   const helpText = `${scrollable || isLoading || isChecking ? "\u2191/\u2193 Scroll \xB7 PgUp/PgDn Page \xB7 " : ""}Esc Back \xB7 /usage refresh`;
-  useEffect21(() => {
+  useEffect22(() => {
     setScrollOffset((offset) => Math.min(Math.max(0, offset), maxScrollOffset));
   }, [maxScrollOffset]);
   use_input_default((_input, key) => {
@@ -53106,7 +54047,7 @@ function UsagePanel({ dashboard, loading = false, columns = 80, fillHeight = fal
 }
 
 // src/tui/components/TextEntryPanel.jsx
-import { useEffect as useEffect22, useLayoutEffect as useLayoutEffect5, useRef as useRef23, useState as useState17 } from "react";
+import { useEffect as useEffect23, useLayoutEffect as useLayoutEffect5, useRef as useRef23, useState as useState18 } from "react";
 import stringWidth14 from "string-width";
 
 // src/tui/components/text-entry-layout.mjs
@@ -53261,12 +54202,12 @@ function TextEntryPanel({
   onSubmit,
   onCancel
 }) {
-  const [draft, setDraft] = useState17(() => ({
+  const [draft, setDraft] = useState18(() => ({
     value: String(initialValue || ""),
     cursor: String(initialValue || "").length,
     selectionAnchor: null
   }));
-  const [, bumpCursorAnchorEpoch] = useState17(0);
+  const [, bumpCursorAnchorEpoch] = useState18(0);
   const draftRef = useRef23(draft);
   const submitGateRef = useRef23(false);
   const boxRef = useRef23(null);
@@ -53295,13 +54236,13 @@ function TextEntryPanel({
     commitDraft(fn(draftRef.current), options);
   };
   const moveDraftVertically = createVerticalMover({ draftRef, contentWidthRef, preferredColumnRef, commitDraft });
-  useEffect22(() => {
+  useEffect23(() => {
     const value = String(initialValue || "");
     commitDraft({ value, cursor: value.length, selectionAnchor: null });
   }, [title, initialValue]);
   const labelCells = stringWidth14(String(promptLabel || ""));
   const contentCells = Math.max(1, columns - 4 - labelCells);
-  useEffect22(() => {
+  useEffect23(() => {
     if (!multiline) {
       onContentRowsChange?.(1);
       return;
@@ -53584,6 +54525,10 @@ function settingsPromptFields(kind) {
 
 // src/tui/app/app-view/floating-panel.jsx
 import { jsx as jsx16 } from "react/jsx-runtime";
+var SKILL_PALETTE_TEXT = {
+  description: "Type to filter \xB7 Enter or Tab inserts the highlighted skill.",
+  help: "\u2191/\u2193 select \xB7 Enter insert \xB7 Esc cancel"
+};
 function renderToolApproval({ toolApproval, store, frameColumns, expandedOptionPanel }) {
   const resolve3 = (approved) => {
     store.resolveToolApproval?.(toolApproval.id, {
@@ -53730,14 +54675,16 @@ function renderFloatingPanel(ctx) {
     );
   }
   if (slashPaletteOpen) {
+    const skills = ctx.paletteKind === "skills";
     return /* @__PURE__ */ jsx16(
       SlashCommandPalette,
       {
         commands: slashCommands,
         selectedIndex: slashIndex,
-        title: "Commands",
+        title: skills ? "Skills" : "Commands",
         columns: frameColumns,
-        query: activeSlashQuery
+        query: activeSlashQuery,
+        ...skills ? SKILL_PALETTE_TEXT : {}
       }
     );
   }
@@ -54074,10 +55021,13 @@ var UserMessage = React16.memo(function UserMessage2({
   text,
   attached = false,
   columns,
+  appliedSkills,
   themeEpoch: _themeEpoch = 0
 }) {
   const bandColumns = Math.max(1, columns - 1);
-  return /* @__PURE__ */ jsx20(
+  const skillsLine = appliedSkillsLine(appliedSkills);
+  const segments = userTextSegments(text, appliedSkills);
+  return /* @__PURE__ */ jsxs15(
     Box_default,
     {
       flexDirection: "column",
@@ -54086,7 +55036,12 @@ var UserMessage = React16.memo(function UserMessage2({
       backgroundColor: theme.userMessageBackground,
       paddingLeft: 2,
       paddingRight: 1,
-      children: /* @__PURE__ */ jsx20(Text, { color: theme.mixdogIvory, wrap: "wrap", children: text })
+      children: [
+        /* @__PURE__ */ jsx20(Text, { color: theme.mixdogIvory, wrap: "wrap", children: segments.length === 1 && !segments[0].mention ? text : segments.map(
+          (segment, index) => segment.mention ? /* @__PURE__ */ jsx20(Text, { color: theme.panelTitle, bold: true, children: segment.text }, index) : segment.text
+        ) }),
+        skillsLine ? /* @__PURE__ */ jsx20(Text, { color: theme.subtle, wrap: "wrap", children: skillsLine }) : null
+      ]
     }
   );
 });
@@ -54649,7 +55604,16 @@ var Item = React17.memo(function Item2({
   let node = null;
   switch (item.kind) {
     case "user":
-      node = /* @__PURE__ */ jsx27(UserMessage, { text: item.text, attached: prevKind === "user", columns, themeEpoch });
+      node = /* @__PURE__ */ jsx27(
+        UserMessage,
+        {
+          text: item.text,
+          attached: prevKind === "user",
+          columns,
+          appliedSkills: item.appliedSkills,
+          themeEpoch
+        }
+      );
       break;
     case "assistant":
       node = /* @__PURE__ */ jsx27(
@@ -54946,8 +55910,10 @@ function renderAppView(ctx) {
     inputHint,
     inputHintTone,
     liveSpinner,
+    onPromptCaretChange,
     onPromptDraftChange,
     onSubmit,
+    paletteKind,
     panelTransitionClearRows,
     picker,
     promptBoxRectRef,
@@ -54980,6 +55946,7 @@ function renderAppView(ctx) {
       onSubmit,
       disabled: exiting || !!picker || !!contextPanel || !!toolApproval || !tuiReady,
       onDraftChange: onPromptDraftChange,
+      onCaretChange: onPromptCaretChange,
       interruptActive: state.busy,
       onInterrupt: handlePromptInterrupt,
       initialValue: promptDraft,
@@ -54999,6 +55966,7 @@ function renderAppView(ctx) {
       commandPaletteActive: slashPaletteOpen && slashCommands.length > 0,
       commandPaletteOpen: slashPaletteOpen,
       commandPaletteOptionCount: slashCommands.length,
+      commandPaletteMovesCaret: paletteKind === "skills",
       onCommandPaletteNavigate: (direction) => {
         setSlashIndex((index) => stepPaletteIndex(index, direction, slashCommands.length));
       },
@@ -55108,6 +56076,7 @@ function renderAppView(ctx) {
             model: state.model,
             effort: state.effort,
             fast: state.fast,
+            ultra: state.fast === true && state.modelParameters?.serviceTier === "ultrafast",
             cwd: state.cwd,
             stats: statuslineStats,
             contextWindow: state.contextWindow,
@@ -55278,9 +56247,10 @@ function usePromptDraftFlow({
     [settingsPrompt, setSettingsPrompt, openProjectPicker, openMemoryCorePicker, openAutoClearPicker]
   );
   const acceptSlashPalette = useCallback18(
-    (draftValue = "") => {
+    (draftValue = "", caret) => {
       const command = slashCommands[slashIndex];
       if (!command) return false;
+      if (command.kind === "skill") return completeSkillMention(draftValue, command.name, caret) ?? false;
       return withPickerEnterLatch(
         pickerOpenedFromEnterRef,
         pickerOpenedFromEnterTimerRef,
@@ -55290,9 +56260,10 @@ function usePromptDraftFlow({
     [slashCommands, slashIndex, pickerOpenedFromEnterRef, pickerOpenedFromEnterTimerRef, runSlashCommand]
   );
   const completeSlashPalette = useCallback18(
-    (draftValue = "") => {
+    (draftValue = "", caret) => {
       const command = slashCommands[slashIndex];
       if (!command) return void 0;
+      if (command.kind === "skill") return completeSkillMention(draftValue, command.name, caret);
       const token = slashCommandTokenForPaletteAccept(command, draftValue);
       return token ? `/${token} ` : void 0;
     },
@@ -55780,6 +56751,105 @@ function createCoreMemoryPicker({ store, surface, setSettingsPrompt, parseMemory
   };
 }
 
+// src/tui/app/extension-pickers/mcp-login.mjs
+var POLL_MS = 1500;
+function createMcpLogin({ store, setProviderPrompt, pollMs = POLL_MS }) {
+  let active = null;
+  const stop = (flow) => {
+    flow.finished = true;
+    clearTimeout(flow.timer);
+    if (active === flow) active = null;
+  };
+  const closePrompt = (flow) => setProviderPrompt((prompt) => prompt === flow.prompt ? null : prompt);
+  const showPrompt = (flow) => {
+    if (flow.finished) return;
+    const prompt = {
+      kind: "oauth-code",
+      providerName: `MCP ${flow.name}`,
+      // The shared prompt pushes the one completion notice; no provider picker follows.
+      successReturn: () => {
+      },
+      label: `MCP sign-in \xB7 ${flow.name}`,
+      hint: "If the browser page fails to load, paste its address here.",
+      detail: flow.url,
+      login: {
+        completeCode: async (text) => {
+          const result = await store.completeMcpOAuthLogin(flow.id, text);
+          if (result?.state !== "complete") throw new Error(result?.error || "sign-in did not complete");
+          stop(flow);
+        },
+        cancel: () => {
+          if (flow.finished) return;
+          stop(flow);
+          void Promise.resolve(store.cancelMcpOAuthLogin(flow.id)).catch(() => {
+          });
+          store.pushNotice(`MCP sign-in cancelled for ${flow.name}`, "info");
+        }
+      },
+      failureReturn: () => showPrompt(flow)
+    };
+    flow.prompt = prompt;
+    setProviderPrompt(prompt);
+  };
+  const poll = (flow) => {
+    flow.timer = setTimeout(async () => {
+      if (flow.finished) return;
+      let status;
+      try {
+        status = await store.getMcpOAuthLoginStatus(flow.id);
+      } catch (e) {
+        if (flow.finished) return;
+        stop(flow);
+        closePrompt(flow);
+        store.pushNotice(`MCP sign-in failed for ${flow.name}: ${e?.message || e}`, "error");
+        return;
+      }
+      if (flow.finished) return;
+      if (status?.state === "pending") {
+        poll(flow);
+        return;
+      }
+      stop(flow);
+      closePrompt(flow);
+      if (status?.state === "complete") store.pushNotice(`MCP sign-in complete for ${flow.name}`, "info");
+      else if (status?.state === "cancelled") store.pushNotice(`MCP sign-in cancelled for ${flow.name}`, "info");
+      else store.pushNotice(`MCP sign-in failed for ${flow.name}${status?.error ? `: ${status.error}` : ""}`, "error");
+    }, pollMs);
+  };
+  const loginMcpServer = async (name) => {
+    if (active) {
+      const previous = active;
+      stop(previous);
+      closePrompt(previous);
+      void Promise.resolve(store.cancelMcpOAuthLogin(previous.id)).catch(() => {
+      });
+    }
+    try {
+      const started = await store.beginMcpOAuthLogin(name, { openBrowser: true });
+      if (started?.state === "complete") {
+        store.pushNotice(`MCP sign-in complete for ${name}`, "info");
+        return;
+      }
+      const flow = { id: started.flowId, name, url: started.url || "", finished: false, timer: null, prompt: null };
+      active = flow;
+      if (flow.url) store.pushNotice(`Sign in to ${name}: ${flow.url}`, "info");
+      showPrompt(flow);
+      poll(flow);
+    } catch (e) {
+      store.pushNotice(`MCP sign-in failed for ${name}: ${e?.message || e}`, "error");
+    }
+  };
+  const logoutMcpServer = async (name) => {
+    try {
+      await store.signOutMcpServer(name);
+      store.pushNotice(`MCP signed out of ${name}`, "info");
+    } catch (e) {
+      store.pushNotice(`MCP sign-out failed for ${name}: ${e?.message || e}`, "error");
+    }
+  };
+  return { loginMcpServer, logoutMcpServer };
+}
+
 // src/tui/app/extension-pickers/scope-note.mjs
 var scopeNote = (row) => {
   if (row?.activeHere === false) return "not in this project";
@@ -55809,8 +56879,9 @@ var serverDescription = (server, pending, optimistic) => {
   const transport = server.transport || "unknown";
   if (pending) return `${optimistic.enabled ? "enabling" : "disabling"}\u2026 \xB7 ${transport}`;
   const error = server.error ? ` \xB7 ${server.error}` : "";
+  const signIn = server.authRequired ? ` \xB7 sign-in required: /mcp login ${server.name}` : "";
   return withScope(
-    `${server.source || "config"} \xB7 ${server.status || "unknown"} \xB7 ${transport} \xB7 ${server.toolCount || 0} tools${error}`,
+    `${server.source || "config"} \xB7 ${server.status || "unknown"} \xB7 ${transport} \xB7 ${server.toolCount || 0} tools${error}${signIn}`,
     server
   );
 };
@@ -55899,32 +56970,45 @@ function createMcpServersPicker({ store, theme: theme2, surface, getPicker, setP
 }
 
 // src/tui/app/extension-pickers/plugins-pickers.mjs
+function mcpNames(p) {
+  if (Array.isArray(p.mcpServers)) return p.mcpServers.map((server) => server.name);
+  return p.mcpServerName ? [p.mcpServerName] : [];
+}
+var hasMcp = (p) => mcpNames(p).length > 0 || Boolean(p.mcpScript || p.mcpInline);
+function serverState(server) {
+  if (server.serverEnabled === false) return "off";
+  if (server.enabled === false) return "plugin off";
+  return server.status || (server.connected ? "connected" : "disconnected");
+}
 var mcpSummary = (p) => {
-  if (!p.mcpScript) return "(none)";
-  const state = p.mcpEnabled ? "enabled" : "available";
-  return `${state} (${p.mcpServerName || "plugin-mcp"})`;
+  if (!hasMcp(p))
+    return Array.isArray(p.mcpErrors) && p.mcpErrors.length ? `(invalid: ${p.mcpErrors[0].message})` : "(none)";
+  if (!Array.isArray(p.mcpServers)) return `${p.mcpEnabled ? "enabled" : "available"} (${mcpNames(p).join(", ")})`;
+  const errors = Array.isArray(p.mcpErrors) && p.mcpErrors.length ? ` \xB7 ${p.mcpErrors.length} declaration error(s)` : "";
+  return `${p.mcpServers.map((server) => `${server.name} ${serverState(server)}`).join(", ")}${errors}`;
 };
 function mcpActionItem(p) {
-  if (!p.mcpScript) {
+  if (!hasMcp(p)) {
     return {
       value: "enable-mcp",
-      label: "No MCP script",
-      description: "plugin does not expose scripts/run-mcp.mjs or mcp/server.mjs",
+      label: "No MCP server",
+      description: "plugin declares no MCP servers (.mcp.json or manifest mcpServers)",
       _action: "noop"
     };
   }
   return {
     value: "enable-mcp",
-    label: p.mcpEnabled ? "Refresh MCP server" : "Enable MCP server",
-    description: `${p.mcpServerName || "plugin-mcp"} \xB7 ${p.mcpEnabled ? "configured" : p.mcpScript}`,
+    label: p.mcpEnabled ? "Reconnect MCP servers" : "Enable MCP servers",
+    description: `${mcpNames(p).join(", ") || "plugin MCP"} \xB7 ${p.mcpEnabled ? "on" : "turned off"}`,
     _action: "enable-mcp"
   };
 }
 function pluginSummary(plugin) {
   const version = plugin.version ? ` \xB7 ${plugin.version}` : "";
-  const mcpState = plugin.mcpEnabled ? "enabled" : plugin.mcpScript;
-  const mcp = plugin.mcpScript ? ` \xB7 mcp ${mcpState}` : "";
-  return `${plugin.sourceType || plugin.source}${version} \xB7 skills ${plugin.skillCount || 0}${mcp}`;
+  const mcpOff = plugin.mcpEnabled ? "" : " off";
+  const mcp = hasMcp(plugin) ? ` \xB7 mcp ${mcpNames(plugin).length || 1}${mcpOff}` : "";
+  const warning = plugin.warning ? ` \xB7 \u26A0 ${plugin.warning}` : "";
+  return `${plugin.sourceType || plugin.source}${version} \xB7 skills ${plugin.skillCount || 0}${mcp}${warning}`;
 }
 var pluginInfoNotice = (p) => [
   `${p.title || p.name}${p.version ? ` ${p.version}` : ""}`,
@@ -55933,6 +57017,7 @@ var pluginInfoNotice = (p) => [
   `mcp: ${mcpSummary(p)}`,
   `applies to: ${Array.isArray(p.scope) && p.scope.length ? p.scope.join(", ") : "all projects"}`,
   `root: ${p.root}`,
+  p.warning ? `warning: ${p.warning}` : "",
   p.description ? `
 ${p.description}` : ""
 ].filter(Boolean).join("\n");
@@ -55958,9 +57043,9 @@ var pluginDetailItems = (p) => [
   },
   {
     value: "copy-mcp-name",
-    label: p.mcpScript ? "Copy MCP server name" : "No MCP server name",
-    description: p.mcpServerName || "",
-    _action: p.mcpScript ? "copy-mcp-name" : "noop"
+    label: mcpNames(p).length ? "Copy MCP server name" : "No MCP server name",
+    description: mcpNames(p).join(", "),
+    _action: mcpNames(p).length ? "copy-mcp-name" : "noop"
   },
   {
     value: "uninstall",
@@ -56000,7 +57085,7 @@ function createPluginsPickers({
           return;
         }
         if (detail._action === "enable-mcp") {
-          void store.enablePluginMcp?.(p).then(own.defer(() => openMcpPicker())).catch((e) => store.pushNotice(`plugin MCP enable failed: ${e?.message || e}`, "error"));
+          void store.enablePluginMcp?.(p).then(own.defer(() => openMcpPicker())).catch((e) => store.pushNotice(`plugin MCP reconnect failed: ${e?.message || e}`, "error"));
           return;
         }
         if (detail._action === "copy-root") {
@@ -56008,7 +57093,7 @@ function createPluginsPickers({
           return;
         }
         if (detail._action === "copy-mcp-name") {
-          copyText(p.mcpServerName || "", `copied plugin MCP server: ${p.mcpServerName}`);
+          copyText(mcpNames(p).join(", "), `copied plugin MCP server: ${mcpNames(p).join(", ")}`);
           return;
         }
         if (detail._action === "uninstall") {
@@ -56355,7 +57440,7 @@ function createExtensionPickers({
     setSettingsPrompt,
     openMcpPicker: mcp.openMcpPicker
   });
-  return { ...mcp, ...skills, ...plugins };
+  return { ...mcp, ...createMcpLogin({ store, setProviderPrompt }), ...skills, ...plugins };
 }
 
 // src/tui/app/maintenance-pickers/auto-clear-picker.mjs
@@ -57094,6 +58179,7 @@ var PROVIDER_DISPLAY_NAMES = /* @__PURE__ */ new Map([
   ["anthropic-oauth", "Anthropic OAuth"],
   ["grok-oauth", "Grok OAuth"],
   ["muse-code-oauth", "Muse Code"],
+  ["command-code-oauth", "Command Code"],
   ["mimo-oauth", "MiMo"],
   ["cursor-oauth", "Cursor OAuth"],
   ["antigravity-oauth", "Antigravity OAuth"],
@@ -57140,6 +58226,7 @@ var PROVIDER_DISPLAY_RANKS = {
   "anthropic-oauth": 20,
   "grok-oauth": 30,
   "muse-code-oauth": 33,
+  "command-code-oauth": 33.5,
   "mimo-oauth": 34,
   "antigravity-oauth": 31,
   "cursor-oauth": 32,
@@ -57159,13 +58246,6 @@ var PROVIDER_DISPLAY_RANKS = {
   openrouter: 950
 };
 var providerDisplayRank = (provider) => PROVIDER_DISPLAY_RANKS[String(provider || "").toLowerCase()] ?? 900;
-var titleCaseOption = (value) => String(value || "").split(/([\s_-]+)/).map((part) => /^[\s_-]+$/.test(part) ? part : `${part.charAt(0).toUpperCase()}${part.slice(1).toLowerCase()}`).join("");
-var effortDisplayLabel = (value) => {
-  const text = String(value || "").trim();
-  if (!text) return "";
-  if (text.toLowerCase() === "xhigh") return "XHigh";
-  return titleCaseOption(text);
-};
 var fastDisplayLabel = (enabled = true) => `Fast ${enabled ? "On" : "Off"}`;
 var modelDescription = (m) => [String(m?.description || "").trim(), m.fastCapable ? "Fast Available" : ""].filter(Boolean).join(" \xB7 ");
 var modelRecordDisplayName = (model) => displayModelName(model?.id, model?.provider, model?.display || model?.name);
@@ -57221,7 +58301,11 @@ var buildProviderModelItems = (models, provider, currentRoute = null) => {
     _model: model
   }));
 };
-var routeModelDetails = (route) => [routeModelDisplayName(route), route.effort ? effortDisplayLabel(route.effort) : "", route.fast ? "Fast" : ""].filter(Boolean).join(" \xB7 ");
+var routeSpeedLabel = (route) => {
+  if (!route?.fast) return "";
+  return route.modelParameters?.serviceTier === "ultrafast" ? "Ultrafast" : "Fast";
+};
+var routeModelDetails = (route) => [routeModelDisplayName(route), route.effort ? effortDisplayLabel(route.effort) : "", routeSpeedLabel(route)].filter(Boolean).join(" \xB7 ");
 var routeLabel = (route) => {
   if (!route?.provider || !route?.model) return "(unset)";
   return [providerDisplayName(route.provider), routeModelDetails(route)].filter(Boolean).join(" \xB7 ");
@@ -57231,7 +58315,7 @@ var agentModelProfile = (route) => route?.model ? routeModelDetails(route) : "";
 var agentModelParts = (route) => [
   { text: route?.model ? routeModelDisplayName(route) : "", width: 17 },
   { text: route?.effort ? effortDisplayLabel(route.effort) : "", width: 6 },
-  { text: route?.fast ? "Fast" : "", width: 4 }
+  { text: routeSpeedLabel(route), width: 9 }
 ];
 var routeFromModel = (model, effort = null) => ({
   provider: model.provider,
@@ -60240,6 +61324,7 @@ var desktopOnlyNotice = (ctx) => {
   ctx.store.pushNotice("Schedules and webhooks are managed in the Mixdog desktop app", "info");
   return true;
 };
+var openMcpPanel = panelCommand("mcp", "MCP Servers", (deps) => deps.openMcpPicker());
 var openSettings = panelCommand("settings", "Settings", (deps) => deps.openSettingsPicker());
 var panelCommands = {
   project(ctx, arg) {
@@ -60251,7 +61336,20 @@ var panelCommands = {
     ctx.openSlashPanel("project", "Projects", () => ctx.deps.openProjectPicker());
     return true;
   },
-  mcp: panelCommand("mcp", "MCP Servers", (deps) => deps.openMcpPicker()),
+  mcp(ctx, arg) {
+    const [sub, ...rest] = arg.trim().split(/\s+/);
+    const action = sub?.toLowerCase();
+    if (action === "login" || action === "logout") {
+      const name = rest.join(" ");
+      if (!name) {
+        ctx.store.pushNotice(`usage: /mcp ${action} <name>`, "warn");
+        return true;
+      }
+      void (action === "login" ? ctx.deps.loginMcpServer(name) : ctx.deps.logoutMcpServer(name));
+      return true;
+    }
+    return openMcpPanel(ctx);
+  },
   skills: panelCommand("skills", "Skills", (deps) => deps.openSkillsPicker()),
   plugins: panelCommand("plugins", "Plugins", (deps) => deps.openPluginsPicker()),
   providers: panelCommand("providers", "Providers", (deps) => deps.openProviderSetupPicker()),
@@ -60661,6 +61759,8 @@ function createAppPickers({
   const {
     openMcpServersPicker,
     openMcpPicker,
+    loginMcpServer,
+    logoutMcpServer,
     openProjectSkillsPicker,
     openSkillsPicker,
     openSkillDetailPicker,
@@ -60788,6 +61888,8 @@ function createAppPickers({
     enterProject: (...a) => enterProject(...a),
     openProjectPicker: (...a) => openProjectPicker(...a),
     openMcpPicker: (...a) => openMcpPicker(...a),
+    loginMcpServer,
+    logoutMcpServer,
     openSkillsPicker: (...a) => openSkillsPicker(...a),
     openPluginsPicker: (...a) => openPluginsPicker(...a),
     openProviderSetupPicker: (...a) => openProviderSetupPicker(...a),
@@ -61135,7 +62237,7 @@ function useMessageSelector({
 }
 
 // src/tui/app/use-terminal-chrome.mjs
-import { useEffect as useEffect23 } from "react";
+import { useEffect as useEffect24 } from "react";
 
 // src/tui/keyboard-protocol.mjs
 var ENABLE_KITTY_KEYBOARD = "\x1B[>1u";
@@ -61160,7 +62262,7 @@ function supportsExtendedKeys() {
 
 // src/tui/app/use-terminal-chrome.mjs
 function useTerminalChrome({ stdout: stdout2, isRawModeSupported, setResizeState }) {
-  useEffect23(() => {
+  useEffect24(() => {
     if (!stdout2) return void 0;
     let trailing = null;
     const DEBOUNCE_MS = 80;
@@ -61195,7 +62297,7 @@ function useTerminalChrome({ stdout: stdout2, isRawModeSupported, setResizeState
       stdout2.off("resize", onResize);
     };
   }, [stdout2]);
-  useEffect23(() => {
+  useEffect24(() => {
     if (!isRawModeSupported || !stdout2?.write) return;
     if (!supportsExtendedKeys()) return;
     try {
@@ -61206,7 +62308,7 @@ function useTerminalChrome({ stdout: stdout2, isRawModeSupported, setResizeState
 }
 
 // src/tui/app/use-transcript-window.mjs
-import { useCallback as useCallback21, useEffect as useEffect25, useLayoutEffect as useLayoutEffect8 } from "react";
+import { useCallback as useCallback21, useEffect as useEffect26, useLayoutEffect as useLayoutEffect8 } from "react";
 
 // src/tui/session/transcript-spill.mjs
 import { readFileSync as readFileSync15 } from "node:fs";
@@ -61718,7 +62820,7 @@ function overlayHintPlacement(renderedItems, transcriptWindow, { overlayHintRequ
 }
 
 // src/tui/app/use-transcript-window/selection-shift.mjs
-import { useEffect as useEffect24, useLayoutEffect as useLayoutEffect7 } from "react";
+import { useEffect as useEffect25, useLayoutEffect as useLayoutEffect7 } from "react";
 function useSelectionLayoutShift({
   transcriptWindow,
   transcriptContentHeight,
@@ -61752,7 +62854,7 @@ function useSelectionLayoutShift({
     withSelectionClip,
     paintSelectionRect
   ]);
-  useEffect24(() => {
+  useEffect25(() => {
     if (!dragRef.current.rect) return;
     const clippedRect = withSelectionClip(dragRef.current.rect);
     dragRef.current = { ...dragRef.current, rect: clippedRect };
@@ -61892,7 +62994,7 @@ function useTranscriptWindow({
     withSelectionClip,
     paintSelectionRect
   });
-  useEffect25(() => {
+  useEffect26(() => {
     clampScrollToOverflow(scrollRefs, {
       maxRows: transcriptWindow.maxScrollRows,
       scrollOffset,
@@ -62250,7 +63352,7 @@ function usePromptHistoryNavigation({
 }
 
 // src/tui/app/prompt-handlers/use-prompt-interrupt.mjs
-import { useCallback as useCallback24, useEffect as useEffect26, useRef as useRef27 } from "react";
+import { useCallback as useCallback24, useEffect as useEffect27, useRef as useRef27 } from "react";
 
 // src/tui/components/prompt-input/interrupt-policy.mjs
 function promptInterruptRestoreText(result, currentText = "") {
@@ -62295,7 +63397,7 @@ function usePromptInterrupt({
     },
     [store, promptValueRef, restoreAttachments, clearPromptHint, syncPromptLayoutRows, setPromptDraftOverride]
   );
-  useEffect26(() => {
+  useEffect27(() => {
     const pending = pendingRestoreRef.current;
     if (!pending) return;
     if (commitAsyncRestore(pending)) pendingRestoreRef.current = null;
@@ -62546,7 +63648,7 @@ function usePromptHandlers({
 }
 
 // src/tui/app/use-model-catalog-cache.mjs
-import { useCallback as useCallback27, useEffect as useEffect27, useRef as useRef28 } from "react";
+import { useCallback as useCallback27, useEffect as useEffect28, useRef as useRef28 } from "react";
 function useModelCatalogCache({ store, onboardingRef }) {
   const providerModelsCacheRef = useRef28({ models: null, at: 0 });
   const webSearchModelsCacheRef = useRef28({ models: null, at: 0 });
@@ -62562,7 +63664,7 @@ function useModelCatalogCache({ store, onboardingRef }) {
       webSearchModelsCacheRef.current = { models: null, at: 0 };
     }
   }, []);
-  useEffect27(() => {
+  useEffect28(() => {
     let alive = true;
     const timer2 = setTimeout(async () => {
       const seq = onboardingPrefetchSeqRef.current;
@@ -62598,10 +63700,10 @@ function useModelCatalogCache({ store, onboardingRef }) {
 }
 
 // src/tui/app/use-disabled-skills.mjs
-import { useCallback as useCallback28, useEffect as useEffect28, useState as useState18 } from "react";
+import { useCallback as useCallback28, useEffect as useEffect29, useState as useState19 } from "react";
 function useDisabledSkills({ store }) {
-  const [disabledSkills, setDisabledSkillsInner] = useState18(() => /* @__PURE__ */ new Set());
-  useEffect28(() => {
+  const [disabledSkills, setDisabledSkillsInner] = useState19(() => /* @__PURE__ */ new Set());
+  useEffect29(() => {
     let alive = true;
     void Promise.resolve(store.getDisabledSkills?.()).then((result) => {
       if (!alive) return;
@@ -62635,7 +63737,7 @@ function useDisabledSkills({ store }) {
 }
 
 // src/tui/app/use-onboarding-start.mjs
-import { useEffect as useEffect29 } from "react";
+import { useEffect as useEffect30 } from "react";
 function resolveOnboardingCompleted(store, onboardingCompleted) {
   if (typeof onboardingCompleted === "boolean") return onboardingCompleted;
   try {
@@ -62654,7 +63756,7 @@ function useOnboardingStart({
   setOnboardingActive,
   openOnboardingAuthStep
 }) {
-  useEffect29(() => {
+  useEffect30(() => {
     if (onboardingStartedRef.current) return void 0;
     if (resolveOnboardingCompleted(store, onboardingCompleted) && !forceOnboarding) return void 0;
     let canceled = false;
@@ -62672,17 +63774,17 @@ function useOnboardingStart({
 // src/tui/App.jsx
 function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardingCompleted = void 0 }) {
   const state = useSession(store);
-  const [toolOutputExpanded, setToolOutputExpanded] = useState19(false);
-  const [onboardingActive, setOnboardingActive] = useState19(false);
+  const [toolOutputExpanded, setToolOutputExpanded] = useState20(false);
+  const [onboardingActive, setOnboardingActive] = useState20(false);
   const { exit } = use_app_default();
   const { isRawModeSupported, internal_eventEmitter: inkInput } = use_stdin_default();
   const { stdout: stdout2 } = use_stdout_default();
-  const [exiting, setExiting] = useState19(false);
-  const [tuiReady, setTuiReady] = useState19(false);
+  const [exiting, setExiting] = useState20(false);
+  const [tuiReady, setTuiReady] = useState20(false);
   const exitRequestedRef = useRef29(false);
-  const [resizeState, setResizeState] = useState19(() => ({ ...terminalSize2(stdout2), epoch: 0 }));
-  const [panelTransitionEpoch, setPanelTransitionEpoch] = useState19(0);
-  const [panelInkMaskEpoch, setPanelInkMaskEpoch] = useState19(0);
+  const [resizeState, setResizeState] = useState20(() => ({ ...terminalSize2(stdout2), epoch: 0 }));
+  const [panelTransitionEpoch, setPanelTransitionEpoch] = useState20(0);
+  const [panelInkMaskEpoch, setPanelInkMaskEpoch] = useState20(0);
   const rightSafetyColumns = 1;
   const frameColumns = Math.max(1, resizeState.columns - rightSafetyColumns);
   const {
@@ -62704,7 +63806,7 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
   const pickerOpenedFromEnterRef = useRef29(false);
   const pickerOpenedFromEnterTimerRef = useRef29(null);
   const projectPickerRef = useRef29(null);
-  const [picker, setPickerState] = useState19(null);
+  const [picker, setPickerState] = useState20(null);
   const livePickerRef = useRef29(null);
   const setPicker = useCallback29((next) => {
     const previousPicker = livePickerRef.current;
@@ -62718,8 +63820,8 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     );
   }, []);
   livePickerRef.current = picker;
-  const [contextPanel, setContextPanel] = useState19(null);
-  const [usagePanel, setUsagePanel] = useState19(null);
+  const [contextPanel, setContextPanel] = useState20(null);
+  const [usagePanel, setUsagePanel] = useState20(null);
   const surfaceRef = useRef29(null);
   if (!surfaceRef.current) {
     surfaceRef.current = createPanelSurface({ setPicker, setContextPanel, setUsagePanel });
@@ -62728,9 +63830,9 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
   const settingsHeavyCacheRef = useRef29(null);
   const settingsRequestRef = useRef29(0);
   const closeUsagePanel = useCallback29(() => surface.closeUsage(), [surface]);
-  const [providerPrompt, setProviderPrompt] = useState19(null);
+  const [providerPrompt, setProviderPrompt] = useState20(null);
   const oauthSubmitRef = useRef29(false);
-  const [settingsPrompt, setSettingsPrompt] = useState19(null);
+  const [settingsPrompt, setSettingsPrompt] = useState20(null);
   const projectPicker = createProjectPicker({
     state,
     store,
@@ -62750,7 +63852,7 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
       setPicker(projectPicker.buildProjectPickerState({ initialEntry: true, loading: true }));
     }
   }
-  useEffect30(() => {
+  useEffect31(() => {
     if (livePickerRef.current?._projectInitialPending !== true) return;
     void projectPickerRef.current?.openProjectPicker({ initialEntry: true });
   }, [store]);
@@ -62762,6 +63864,8 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     setPromptDraft,
     promptDraftOverride,
     setPromptDraftOverride,
+    promptCaret,
+    setPromptCaret,
     promptLayoutValueRef,
     setPromptLayoutRows,
     textEntryLayoutRows,
@@ -62803,8 +63907,8 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     welcomePromptHintVisibleRef,
     dismissWelcomePromptHint
   } = useWelcomePromptHint({ store, state, toastErrorSignature });
-  const [slashIndex, setSlashIndex] = useState19(0);
-  const [slashDismissedFor, setSlashDismissedFor] = useState19("");
+  const [slashIndex, setSlashIndex] = useState20(0);
+  const [slashDismissedFor, setSlashDismissedFor] = useState20("");
   const slashPaletteRef = useRef29({ open: false, count: 0 });
   const scrollFocusRef = useRef29({});
   const onboardingStartedRef = useRef29(false);
@@ -62886,7 +63990,7 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     settingsPrompt,
     setTextEntryLayoutRows
   });
-  useEffect30(() => {
+  useEffect31(() => {
     const timer2 = setTimeout(() => setTuiReady(true), 0);
     return () => clearTimeout(timer2);
   }, []);
@@ -62932,7 +64036,7 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     getStitchedSelectionText,
     showSelectionCopyHint
   });
-  useEffect30(
+  useEffect31(
     () => () => {
       stopSmoothScroll();
     },
@@ -63060,7 +64164,7 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     setSettingsPrompt,
     closeUsagePanel
   });
-  useEffect30(() => {
+  useEffect31(() => {
     if (contextPanel?.kind === "context") openContextPicker();
   }, [
     contextPanel?.kind,
@@ -63112,7 +64216,8 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     pastedImagesRef,
     pastedTextsRef
   });
-  const { activeSlashQuery, slashCommands, slashPaletteOpen } = deriveSlashPalette({
+  const mentionSkills = useSkillMentionSkills(store, skillMentionQuery(promptDraft, promptCaret) !== null);
+  const { activeSlashQuery, slashCommands, slashPaletteOpen, paletteKind } = deriveSlashPalette({
     providerPrompt,
     settingsPrompt,
     toolApproval,
@@ -63122,7 +64227,9 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     exiting,
     commandBusy: state.commandBusy,
     promptDraft,
-    slashDismissedFor
+    slashDismissedFor,
+    skills: mentionSkills,
+    promptCaret
   });
   slashPaletteRef.current = { open: slashPaletteOpen, count: slashCommands.length };
   scrollFocusRef.current = {
@@ -63134,7 +64241,7 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     providerPrompt: !!providerPrompt,
     settingsPrompt: !!settingsPrompt
   };
-  useEffect30(() => {
+  useEffect31(() => {
     setSlashIndex((index) => Math.min(index, Math.max(0, slashCommands.length - 1)));
   }, [slashCommands.length, activeSlashQuery]);
   const {
@@ -63302,10 +64409,12 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     hasUserMessages,
     initialStatusLine,
     onPromptDraftChange,
+    onPromptCaretChange: setPromptCaret,
     onSubmit,
     overlayHintAttachItemIndex,
     overlayHintFallbackRow,
     overlayHintOnLastItem,
+    paletteKind,
     panelInkMaskEpoch,
     panelTransitionEpoch,
     picker,