mixdog 1.1.2 → 1.2.1

package/src/tui/components/prompt-input/key-handler.mjs

@@ -42,6 +42,14 @@ function gridSelectionActive(suppressShiftNavRef) {
   return Boolean(suppressShiftNavRef?.current);
 }
 
+// A palette accept/complete may hand back the next draft: a string (caret at
+// its end) or { value, cursor } (a `$name` skill mention completed at the caret).
+export 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;
+}
+
 export function createPromptKeyHandler(ctx) {
   const {
     disabled,
@@ -55,6 +63,7 @@ export function createPromptKeyHandler(ctx) {
     submitDraft,
     commandPaletteActive,
     commandPaletteOptionCount,
+    commandPaletteMovesCaret,
     onCommandPaletteNavigate,
     onCommandPaletteAccept,
     onCommandPaletteComplete,
@@ -177,8 +186,12 @@ export function createPromptKeyHandler(ctx) {
       }
 
       if (commandPaletteActive) {
-        const accepted = onCommandPaletteAccept?.(draftRef.current.value);
-        if (accepted !== false) {
+        const accepted = onCommandPaletteAccept?.(draftRef.current.value, draftRef.current.cursor);
+        // A draft-shaped accept (skill mention completion) replaces the draft.
+        const replacement = paletteResultDraft(accepted);
+        if (replacement) {
+          commitDraft(replacement);
+        } else if (accepted !== false) {
           commitDraft({ value: '', cursor: 0, selectionAnchor: null });
         }
         return;
@@ -276,10 +289,10 @@ export function createPromptKeyHandler(ctx) {
 
     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;
@@ -291,7 +304,7 @@ export function createPromptKeyHandler(ctx) {
     }
 
     if (key.leftArrow || rawShiftLeft) {
-      if (commandPaletteActive) {
+      if (commandPaletteActive && !commandPaletteMovesCaret) {
         onCommandPaletteNavigate?.('left');
         return;
       }
@@ -301,7 +314,7 @@ export function createPromptKeyHandler(ctx) {
       return;
     }
     if (key.rightArrow || rawShiftRight) {
-      if (commandPaletteActive) {
+      if (commandPaletteActive && !commandPaletteMovesCaret) {
         onCommandPaletteNavigate?.('right');
         return;
       }

package/src/tui/components/user-message-skills.mjs

@@ -0,0 +1,38 @@
+/*
+ * components/user-message-skills.mjs — the skills a user row applied.
+ *
+ * A user transcript row carries `appliedSkills` (the runtime's record of the
+ * skills that turn actually loaded, live or restored). The row marks the
+ * `$name` tokens of exactly those skills — found by the shared mention parser
+ * the runtime and desktop use — and adds one applied-skills line under the
+ * text. The row-height estimate counts that same line.
+ */
+import { skillMentions } from '../../runtime/shared/skill-mentions.mjs';
+
+/** The applied skill names of a row value: non-empty strings only. */
+export function appliedSkillNames(value) {
+  return (Array.isArray(value) ? value : []).filter((name) => typeof name === 'string' && name);
+}
+
+/** The line rendered under a user row, or '' when it applied no skill. */
+export function appliedSkillsLine(value) {
+  const names = appliedSkillNames(value);
+  return names.length ? `Skills applied: ${names.join(', ')}` : '';
+}
+
+/** `text` split into plain and marked spans; only `$name` tokens of applied
+ *  skills are marked, so unknown names, `$HOME` and `$300` stay plain. */
+export 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;
+}