mixdog 1.2.0 → 1.2.1

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";
@@ -35489,6 +35529,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 +35688,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 +35814,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 +35999,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 +36015,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 +36027,7 @@ function usePanelTransition({
   setPanelInkMaskEpoch,
   setPanelTransitionEpoch
 }) {
-  useEffect8(() => {
+  useEffect9(() => {
     const transition = panelTransitionRef.current;
     const pendingInkMask = panelCloseInkMaskRowsRef.current;
     const hadTransitionClearance = panelTransitionClearRows > 0 || panelTransitionGuardRows > 0;
@@ -35841,13 +36044,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 +36058,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 +36070,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";
@@ -38936,8 +39139,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 +39257,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);
@@ -42760,6 +42978,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 +43605,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 +44659,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 +44754,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 +44776,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 +44790,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 +44919,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 +45111,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 +45357,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 +45613,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 +45623,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 +45646,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 +45665,8 @@ function usePromptState() {
     setPromptDraft,
     promptDraftOverride,
     setPromptDraftOverride,
+    promptCaret,
+    setPromptCaret,
     promptLayoutValueRef,
     setPromptLayoutRows,
     textEntryLayoutRows,
@@ -45468,7 +45714,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 +46281,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 +46350,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 +46381,7 @@ function usePromptHint() {
     setPromptHint("");
     setPromptHintTone("info");
   }, []);
-  useEffect14(
+  useEffect15(
     () => () => {
       if (promptHintTimerRef.current) clearTimeout(promptHintTimerRef.current);
     },
@@ -46153,7 +46399,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 +46900,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 +46911,7 @@ function useWelcomePromptHint({ store, state, toastErrorSignature }) {
     if (!welcomePromptHintVisibleRef.current) return;
     setWelcomePromptHintDismissed(true);
   }, []);
-  useEffect15(() => {
+  useEffect16(() => {
     let alive = true;
     const refreshConditionalWelcomeHint = async () => {
       let quickModels;
@@ -48372,7 +48618,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 +48653,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 = {
@@ -49232,6 +49478,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 }
@@ -50000,7 +50252,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,
@@ -50023,7 +50275,7 @@ function useStatusLineText({
   initialLine,
   themeEpoch
 }) {
-  const [line, setLine] = useState12(
+  const [line, setLine] = useState13(
     () => normalizeStatusLine(
       initialLine || localBootStatusLine({
         provider,
@@ -50042,7 +50294,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());
@@ -50092,13 +50344,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;
@@ -50287,7 +50539,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 +51242,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 +51260,7 @@ function createPromptKeyHandler(ctx) {
     submitDraft,
     commandPaletteActive,
     commandPaletteOptionCount,
+    commandPaletteMovesCaret,
     onCommandPaletteNavigate,
     onCommandPaletteAccept,
     onCommandPaletteComplete,
@@ -51083,8 +51341,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 +51424,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 +51437,7 @@ ${d.value.slice(d.cursor)}`,
       return;
     }
     if (key.leftArrow || rawShiftLeft) {
-      if (commandPaletteActive) {
+      if (commandPaletteActive && !commandPaletteMovesCaret) {
         onCommandPaletteNavigate?.("left");
         return;
       }
@@ -51186,7 +51447,7 @@ ${d.value.slice(d.cursor)}`,
       return;
     }
     if (key.rightArrow || rawShiftRight) {
-      if (commandPaletteActive) {
+      if (commandPaletteActive && !commandPaletteMovesCaret) {
         onCommandPaletteNavigate?.("right");
         return;
       }
@@ -51393,6 +51654,8 @@ function PromptInput({
   commandPaletteActive = false,
   commandPaletteOpen = commandPaletteActive,
   commandPaletteOptionCount = commandPaletteActive ? 2 : 0,
+  commandPaletteMovesCaret = false,
+  onCaretChange,
   mask = false,
   hint = "",
   hintTone = "info",
@@ -51415,13 +51678,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 +51728,7 @@ function PromptInput({
       flush: flushImmediate
     });
   };
-  useEffect18(
+  useEffect19(
     () => () => {
       cancelPromptImmediateFlush(flushThrottleRef.current);
     },
@@ -51491,8 +51755,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 +51786,7 @@ function PromptInput({
       commitDraft
     });
   }
-  useEffect18(
+  useEffect19(
     () => () => {
       const state = mouseExtendCoalesceRef.current;
       if (state.timer) clearTimeout(state.timer);
@@ -51573,7 +51844,7 @@ function PromptInput({
       apply(handled);
     }
   };
-  useEffect18(() => {
+  useEffect19(() => {
     if (!draftOverride || typeof draftOverride.value !== "string") return;
     pasteGenerationRef.current += 1;
     const nextValue = draftOverride.value;
@@ -51582,7 +51853,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 +51882,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 +51915,7 @@ function PromptInput({
     commandPaletteActive,
     commandPaletteOpen,
     commandPaletteOptionCount,
+    commandPaletteMovesCaret,
     onCommandPaletteNavigate,
     onCommandPaletteAccept,
     onCommandPaletteCancel,
@@ -52032,20 +52307,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 +52331,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 +52340,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 +52588,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 +52615,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 +52658,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 +52719,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 +53091,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
@@ -53023,11 +53307,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 +53390,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 +53545,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 +53579,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 +53868,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 +54018,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 +54364,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 +54379,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 +54947,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 +55253,10 @@ function renderAppView(ctx) {
     inputHint,
     inputHintTone,
     liveSpinner,
+    onPromptCaretChange,
     onPromptDraftChange,
     onSubmit,
+    paletteKind,
     panelTransitionClearRows,
     picker,
     promptBoxRectRef,
@@ -54980,6 +55289,7 @@ function renderAppView(ctx) {
       onSubmit,
       disabled: exiting || !!picker || !!contextPanel || !!toolApproval || !tuiReady,
       onDraftChange: onPromptDraftChange,
+      onCaretChange: onPromptCaretChange,
       interruptActive: state.busy,
       onInterrupt: handlePromptInterrupt,
       initialValue: promptDraft,
@@ -54999,6 +55309,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));
       },
@@ -55278,9 +55589,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 +55602,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;
     },
@@ -55899,32 +56212,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 +56259,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 +56285,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 +56327,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 +56335,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") {
@@ -57094,6 +57421,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 +57468,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,
@@ -61135,7 +61464,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 +61489,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 +61524,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 +61535,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 +62047,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 +62081,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 +62221,7 @@ function useTranscriptWindow({
     withSelectionClip,
     paintSelectionRect
   });
-  useEffect25(() => {
+  useEffect26(() => {
     clampScrollToOverflow(scrollRefs, {
       maxRows: transcriptWindow.maxScrollRows,
       scrollOffset,
@@ -62250,7 +62579,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 +62624,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 +62875,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 +62891,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 +62927,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 +62964,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 +62983,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 +63001,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 +63033,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 +63047,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 +63057,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 +63079,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 +63091,8 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     setPromptDraft,
     promptDraftOverride,
     setPromptDraftOverride,
+    promptCaret,
+    setPromptCaret,
     promptLayoutValueRef,
     setPromptLayoutRows,
     textEntryLayoutRows,
@@ -62803,8 +63134,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 +63217,7 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     settingsPrompt,
     setTextEntryLayoutRows
   });
-  useEffect30(() => {
+  useEffect31(() => {
     const timer2 = setTimeout(() => setTuiReady(true), 0);
     return () => clearTimeout(timer2);
   }, []);
@@ -62932,7 +63263,7 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     getStitchedSelectionText,
     showSelectionCopyHint
   });
-  useEffect30(
+  useEffect31(
     () => () => {
       stopSmoothScroll();
     },
@@ -63060,7 +63391,7 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     setSettingsPrompt,
     closeUsagePanel
   });
-  useEffect30(() => {
+  useEffect31(() => {
     if (contextPanel?.kind === "context") openContextPicker();
   }, [
     contextPanel?.kind,
@@ -63112,7 +63443,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 +63454,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 +63468,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 +63636,12 @@ function App2({ store, initialStatusLine = "", forceOnboarding = false, onboardi
     hasUserMessages,
     initialStatusLine,
     onPromptDraftChange,
+    onPromptCaretChange: setPromptCaret,
     onSubmit,
     overlayHintAttachItemIndex,
     overlayHintFallbackRow,
     overlayHintOnLastItem,
+    paletteKind,
     panelInkMaskEpoch,
     panelTransitionEpoch,
     picker,