mixdog 1.2.0 → 1.2.2

package/src/standalone/session-service.mjs

@@ -296,6 +296,7 @@ export function createSessionService({
     },
     getSize: () => sessions.size,
     getBusyCount: retention.liveBusyCount,
+    getTurnBusyCount: retention.liveTurnBusyCount,
     getStatus,
     getExternalClientCount: () => desktopServices.externalClientCount,
   });

package/src/tui/App.jsx

@@ -21,6 +21,7 @@ import { useApp, useStdin, useStdout } from 'ink';
 import { useSession } from './hooks/useSession.mjs';
 import { pickFolder } from '../standalone/folder-dialog.mjs';
 import { deriveSlashPalette } from './app/slash-palette.mjs';
+import { skillMentionQuery, useSkillMentionSkills } from './app/skill-mention-palette.mjs';
 import { shouldSupersedePanelEpoch, supersedePanelEpoch } from './app/panel-epoch.mjs';
 import { createPanelSurface } from './app/panel-surface.mjs';
 import { resolvePickerState } from './app/picker-index-mode.mjs';
@@ -215,6 +216,8 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
     setPromptDraft,
     promptDraftOverride,
     setPromptDraftOverride,
+    promptCaret,
+    setPromptCaret,
     promptLayoutValueRef,
     setPromptLayoutRows,
     textEntryLayoutRows,
@@ -625,7 +628,8 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
     pastedTextsRef,
   });
 
-  const { activeSlashQuery, slashCommands, slashPaletteOpen } = deriveSlashPalette({
+  const mentionSkills = useSkillMentionSkills(store, skillMentionQuery(promptDraft, promptCaret) !== null);
+  const { activeSlashQuery, slashCommands, slashPaletteOpen, paletteKind } = deriveSlashPalette({
     providerPrompt,
     settingsPrompt,
     toolApproval,
@@ -636,6 +640,8 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
     commandBusy: state.commandBusy,
     promptDraft,
     slashDismissedFor,
+    skills: mentionSkills,
+    promptCaret,
   });
   slashPaletteRef.current = { open: slashPaletteOpen, count: slashCommands.length };
   scrollFocusRef.current = {
@@ -833,10 +839,12 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
     hasUserMessages,
     initialStatusLine,
     onPromptDraftChange,
+    onPromptCaretChange: setPromptCaret,
     onSubmit,
     overlayHintAttachItemIndex,
     overlayHintFallbackRow,
     overlayHintOnLastItem,
+    paletteKind,
     panelInkMaskEpoch,
     panelTransitionEpoch,
     picker,

package/src/tui/app/app-view/floating-panel.jsx

@@ -18,6 +18,12 @@ import { textEntryClearsByEmpty } from '../text-entry-policy.mjs';
 import { withPickerEnterLatch } from '../picker-enter-latch.mjs';
 import { providerPromptFields, settingsPromptFields } from './text-entry-labels.mjs';
 
+// `$name` skill completion reuses the command palette with its own copy.
+const SKILL_PALETTE_TEXT = {
+  description: 'Type to filter · Enter or Tab inserts the highlighted skill.',
+  help: '↑/↓ select · Enter insert · Esc cancel',
+};
+
 function renderToolApproval({ toolApproval, store, frameColumns, expandedOptionPanel }) {
   const resolve = (approved) => {
     store.resolveToolApproval?.(toolApproval.id, {
@@ -166,13 +172,15 @@ export function renderFloatingPanel(ctx) {
     );
   }
   if (slashPaletteOpen) {
+    const skills = ctx.paletteKind === 'skills';
     return (
       <SlashCommandPalette
         commands={slashCommands}
         selectedIndex={slashIndex}
-        title="Commands"
+        title={skills ? 'Skills' : 'Commands'}
         columns={frameColumns}
         query={activeSlashQuery}
+        {...(skills ? SKILL_PALETTE_TEXT : {})}
       />
     );
   }

package/src/tui/app/app-view.jsx

@@ -52,8 +52,10 @@ export function renderAppView(ctx) {
     inputHint,
     inputHintTone,
     liveSpinner,
+    onPromptCaretChange,
     onPromptDraftChange,
     onSubmit,
+    paletteKind,
     panelTransitionClearRows,
     picker,
     promptBoxRectRef,
@@ -85,6 +87,7 @@ export function renderAppView(ctx) {
       onSubmit={onSubmit}
       disabled={exiting || !!picker || !!contextPanel || !!toolApproval || !tuiReady}
       onDraftChange={onPromptDraftChange}
+      onCaretChange={onPromptCaretChange}
       interruptActive={state.busy}
       onInterrupt={handlePromptInterrupt}
       initialValue={promptDraft}
@@ -108,6 +111,9 @@ export function renderAppView(ctx) {
       commandPaletteActive={slashPaletteOpen && slashCommands.length > 0}
       commandPaletteOpen={slashPaletteOpen}
       commandPaletteOptionCount={slashCommands.length}
+      // The `$name` skill palette leaves Left/Right to the caret: the
+      // mention follows it.
+      commandPaletteMovesCaret={paletteKind === 'skills'}
       onCommandPaletteNavigate={(direction) => {
         setSlashIndex((index) => stepPaletteIndex(index, direction, slashCommands.length));
       }}
@@ -229,6 +235,7 @@ export 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}

package/src/tui/app/create-app-pickers.mjs

@@ -88,6 +88,8 @@ export function createAppPickers({
   const {
     openMcpServersPicker,
     openMcpPicker,
+    loginMcpServer,
+    logoutMcpServer,
     openProjectSkillsPicker,
     openSkillsPicker,
     openSkillDetailPicker,
@@ -219,6 +221,8 @@ export 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),

package/src/tui/app/extension-pickers/mcp-login.mjs

@@ -0,0 +1,107 @@
+// extension-pickers/mcp-login.mjs
+// `/mcp login <name>` and `/mcp logout <name>`. The sign-in URL is always
+// printed (and kept in the live prompt); the runtime may open the browser. The
+// flow is polled while a paste prompt (the shared 'oauth-code' provider prompt)
+// accepts the final redirect address. Pasted text is never echoed.
+const POLL_MS = 1500;
+
+export 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 · ${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 };
+}

package/src/tui/app/extension-pickers/mcp-servers-picker.mjs

@@ -8,8 +8,9 @@ const serverDescription = (server, pending, optimistic) => {
   const transport = server.transport || 'unknown';
   if (pending) return `${optimistic.enabled ? 'enabling' : 'disabling'}… · ${transport}`;
   const error = server.error ? ` · ${server.error}` : '';
+  const signIn = server.authRequired ? ` · sign-in required: /mcp login ${server.name}` : '';
   return withScope(
-    `${server.source || 'config'} · ${server.status || 'unknown'} · ${transport} · ${server.toolCount || 0} tools${error}`,
+    `${server.source || 'config'} · ${server.status || 'unknown'} · ${transport} · ${server.toolCount || 0} tools${error}${signIn}`,
     server
   );
 };

package/src/tui/app/extension-pickers/plugins-pickers.mjs

@@ -3,34 +3,52 @@
 // (info / update / MCP / copy / uninstall) and the add-plugin prompt.
 import { readStatus, withScope } from './scope-note.mjs';
 
+// A plugin's MCP servers are derived from its declarations (`mcpServers` on
+// the status row); older hosts only report `mcpScript`/`mcpServerName`.
+function mcpNames(p) {
+  if (Array.isArray(p.mcpServers)) return p.mcpServers.map((server) => server.name);
+  return p.mcpServerName ? [p.mcpServerName] : [];
+}
+const 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');
+}
+
 const 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 ? ` · ${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'} · ${p.mcpEnabled ? 'configured' : p.mcpScript}`,
+    label: p.mcpEnabled ? 'Reconnect MCP servers' : 'Enable MCP servers',
+    description: `${mcpNames(p).join(', ') || 'plugin MCP'} · ${p.mcpEnabled ? 'on' : 'turned off'}`,
     _action: 'enable-mcp',
   };
 }
 
 function pluginSummary(plugin) {
   const version = plugin.version ? ` · ${plugin.version}` : '';
-  const mcpState = plugin.mcpEnabled ? 'enabled' : plugin.mcpScript;
-  const mcp = plugin.mcpScript ? ` · mcp ${mcpState}` : '';
-  return `${plugin.sourceType || plugin.source}${version} · skills ${plugin.skillCount || 0}${mcp}`;
+  const mcpOff = plugin.mcpEnabled ? '' : ' off';
+  const mcp = hasMcp(plugin) ? ` · mcp ${mcpNames(plugin).length || 1}${mcpOff}` : '';
+  const warning = plugin.warning ? ` · ⚠ ${plugin.warning}` : '';
+  return `${plugin.sourceType || plugin.source}${version} · skills ${plugin.skillCount || 0}${mcp}${warning}`;
 }
 
 const pluginInfoNotice = (p) =>
@@ -41,6 +59,7 @@ const 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 ? `\n${p.description}` : '',
   ]
     .filter(Boolean)
@@ -68,9 +87,9 @@ const 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',
@@ -127,7 +146,7 @@ export function createPluginsPickers({
           void store
             .enablePluginMcp?.(p)
             .then(own.defer(() => openMcpPicker()))
-            .catch((e) => store.pushNotice(`plugin MCP enable failed: ${e?.message || e}`, 'error'));
+            .catch((e) => store.pushNotice(`plugin MCP reconnect failed: ${e?.message || e}`, 'error'));
           return;
         }
         if (detail._action === 'copy-root') {
@@ -135,7 +154,7 @@ export 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') {

package/src/tui/app/extension-pickers.mjs

@@ -7,6 +7,7 @@
  * store state, so they can't be pure. openMcpPicker is exposed for the
  * plugin-detail enable-mcp path (also aliased on the App body).
  */
+import { createMcpLogin } from './extension-pickers/mcp-login.mjs';
 import { createMcpServersPicker } from './extension-pickers/mcp-servers-picker.mjs';
 import { createPluginsPickers } from './extension-pickers/plugins-pickers.mjs';
 import { createSkillsPickers } from './extension-pickers/skills-pickers.mjs';
@@ -43,5 +44,5 @@ export function createExtensionPickers({
     setSettingsPrompt,
     openMcpPicker: mcp.openMcpPicker,
   });
-  return { ...mcp, ...skills, ...plugins };
+  return { ...mcp, ...createMcpLogin({ store, setProviderPrompt }), ...skills, ...plugins };
 }

package/src/tui/app/model-options.mjs

@@ -6,7 +6,7 @@
  * displayModelName formatter.
  */
 import { theme } from '../theme.mjs';
-import { displayModelName } from '../../runtime/shared/model-display.mjs';
+import { displayModelName, effortDisplayLabel } from '../../runtime/shared/model-display.mjs';
 import { isRollingModelAlias } from '../../runtime/shared/model-alias.mjs';
 import { DAYBREAK_PROVIDER, daybreakBlueOn } from '../../runtime/shared/llm/openai-daybreak.mjs';
 
@@ -169,6 +169,7 @@ const PROVIDER_DISPLAY_NAMES = 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'],
@@ -225,6 +226,7 @@ const 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,
@@ -246,18 +248,7 @@ const PROVIDER_DISPLAY_RANKS = {
 
 export const providerDisplayRank = (provider) => PROVIDER_DISPLAY_RANKS[String(provider || '').toLowerCase()] ?? 900;
 
-const titleCaseOption = (value) =>
-  String(value || '')
-    .split(/([\s_-]+)/)
-    .map((part) => (/^[\s_-]+$/.test(part) ? part : `${part.charAt(0).toUpperCase()}${part.slice(1).toLowerCase()}`))
-    .join('');
-
-export const effortDisplayLabel = (value) => {
-  const text = String(value || '').trim();
-  if (!text) return '';
-  if (text.toLowerCase() === 'xhigh') return 'XHigh';
-  return titleCaseOption(text);
-};
+export { effortDisplayLabel };
 
 export const fastDisplayLabel = (enabled = true) => `Fast ${enabled ? 'On' : 'Off'}`;
 
@@ -328,9 +319,15 @@ export const buildProviderModelItems = (models, provider, currentRoute = null) =
   }));
 };
 
-// Model · Effort · Fast, dropping the empty parts.
+// The configured speed tier: Ultrafast when the fast route asks for it.
+const routeSpeedLabel = (route) => {
+  if (!route?.fast) return '';
+  return route.modelParameters?.serviceTier === 'ultrafast' ? 'Ultrafast' : 'Fast';
+};
+
+// Model · Effort · Fast/Ultrafast, dropping the empty parts.
 const routeModelDetails = (route) =>
-  [routeModelDisplayName(route), route.effort ? effortDisplayLabel(route.effort) : '', route.fast ? 'Fast' : '']
+  [routeModelDisplayName(route), route.effort ? effortDisplayLabel(route.effort) : '', routeSpeedLabel(route)]
     .filter(Boolean)
     .join(' · ');
 
@@ -346,7 +343,7 @@ export const agentModelProfile = (route) => (route?.model ? routeModelDetails(ro
 export const 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 },
 ];
 
 export const routeFromModel = (model, effort = null) => ({

package/src/tui/app/skill-mention-palette.mjs

@@ -0,0 +1,88 @@
+/*
+ * app/skill-mention-palette.mjs — `$name` skill completion in the prompt.
+ *
+ * Typing `$` at the start of the draft or after whitespace/an opening
+ * bracket or quote (the shared runtime mention rule, runtime/shared/
+ * skill-mentions.mjs) opens the command palette with the user's enabled
+ * custom skills; accepting inserts `$name `. Built-in skills are not listed,
+ * but still load when their name is typed: the runtime resolves mentions.
+ */
+import { useEffect, useState } from 'react';
+import { isInMarkdownCode, isReservedMentionName } from '../../runtime/shared/skill-mentions.mjs';
+
+// A mention being typed just before the caret: `$` plus a partial name.
+const MENTION_TAIL = /(^|[\s([{"'`])\$([a-z0-9][a-z0-9-]{0,63})?$/;
+
+const caretIn = (text, caret) => (Number.isInteger(caret) ? Math.max(0, Math.min(text.length, caret)) : text.length);
+
+/** The mention being typed before `caret` (default: end of `value`), or null.
+ *  `start` is the `$`, `end` the caret. */
+export 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;
+  // `$` inside inline code or a fenced block is never a mention (the shared
+  // parser's rule, judged on the whole draft like the desktop composer).
+  if (isInMarkdownCode(text, start)) return null;
+  return { query: match[2] || '', start, end };
+}
+
+const byName = (a, b) => a.name.localeCompare(b.name, 'en');
+
+/** Palette rows for `query`: enabled, in-project (not `activeHere:false`)
+ *  non-built-in skills whose name starts with the query, then those that
+ *  merely contain it, each alphabetical. */
+export 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 || '',
+  }));
+}
+
+/** The draft with the `$fragment` before `caret` replaced by `$name `; the
+ *  text after the caret is kept and the caret lands after the insertion. */
+export function completeSkillMention(value, name, caret) {
+  const text = String(value ?? '');
+  const mention = skillMentionQuery(text, caret);
+  if (!mention || !name) return undefined;
+  const head = `${text.slice(0, mention.start)}$${name} `;
+  return { value: head + text.slice(mention.end), cursor: head.length };
+}
+
+/** The skill list for the palette, fetched each time a mention starts. */
+export function useSkillMentionSkills(store, active) {
+  const [skills, setSkills] = useState([]);
+  useEffect(() => {
+    if (!active) return undefined;
+    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;
+}

package/src/tui/app/slash-commands.mjs

@@ -50,8 +50,13 @@ export const 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' },

package/src/tui/app/slash-dispatch/panel-commands.mjs

@@ -14,6 +14,8 @@ const desktopOnlyNotice = (ctx) => {
   return true;
 };
 
+const openMcpPanel = panelCommand('mcp', 'MCP Servers', (deps) => deps.openMcpPicker());
+
 const openSettings = panelCommand('settings', 'Settings', (deps) => deps.openSettingsPicker());
 
 export const panelCommands = {
@@ -26,7 +28,20 @@ export const 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()),

package/src/tui/app/slash-palette.mjs

@@ -2,6 +2,7 @@
  * app/slash-palette.mjs — which slash palette (if any) the prompt draft opens.
  */
 import { SLASH_COMMANDS, slashQuery, slashCommandMatches, compareSlashCommands } from './slash-commands.mjs';
+import { skillMentionItems, skillMentionQuery } from './skill-mention-palette.mjs';
 
 export function deriveSlashPalette({
   providerPrompt,
@@ -14,18 +15,33 @@ export function deriveSlashPalette({
   commandBusy,
   promptDraft,
   slashDismissedFor,
+  skills = [],
+  promptCaret = null,
 }) {
   const activeSlashQuery =
     providerPrompt || settingsPrompt || toolApproval || contextPanel || usagePanel ? null : slashQuery(promptDraft);
+  const surfaceFree = !picker && !toolApproval && !contextPanel && !usagePanel && !exiting && !commandBusy;
   // "Slash mode" is live whenever a /token is being edited and no other
   // surface owns the floating area. The palette stays OPEN for the whole
   // slash session — including 0-match frames — so its 14-row layout never
   // unmounts/remounts per keystroke (fullscreen repaint flicker fix).
-  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 slashModeLive = activeSlashQuery !== null && surfaceFree;
+  if (!slashModeLive) {
+    // `$name` completion shares the palette, but opens only while a skill
+    // matches: `$HOME` or `$300` in prose must not raise a panel.
+    const mention =
+      surfaceFree && !providerPrompt && !settingsPrompt ? skillMentionQuery(promptDraft, promptCaret) : null;
+    const slashCommands = mention ? skillMentionItems(skills, mention.query) : [];
+    return {
+      activeSlashQuery: mention ? mention.query : null,
+      slashCommands,
+      slashPaletteOpen: slashCommands.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' };
 }