@ordewell/cli 0.4.15 → 0.4.16

package/dist/main.js

@@ -3035,12 +3035,39 @@ function findCommand(name) {
   const key = name.replace(/^\//, "").toLowerCase();
   return BY_NAME.get(key) ?? skillByName.get(key);
 }
-function completions(text) {
-  if (!text.startsWith("/")) return [];
-  const typed = text.slice(1);
-  if (/\s/.test(typed)) return [];
-  const prefix = typed.toLowerCase();
-  return [...SLASH_COMMANDS, ...skillCommands].filter((c) => c.name.startsWith(prefix));
+var TRAILING_PUNCT = /[,.!?;:]+$/;
+function slashTokens(text) {
+  const tokens = [];
+  const re = /(^|\s)\/(\S*)/g;
+  let match;
+  while (match = re.exec(text)) {
+    const start = match.index + match[1].length;
+    const raw = match[2];
+    const punct = raw.match(TRAILING_PUNCT)?.[0] ?? "";
+    const nameLen = raw.length - punct.length;
+    tokens.push({
+      start,
+      end: start + 1 + raw.length,
+      name: raw.slice(0, nameLen).toLowerCase(),
+      nameEnd: start + 1 + nameLen
+    });
+  }
+  return tokens;
+}
+function activeToken(text, cursor) {
+  return slashTokens(text).find((t) => t.end === cursor) ?? null;
+}
+function skillMatchKind(name) {
+  if (name.length === 0) return null;
+  if (skillByName.has(name)) return "exact";
+  for (const key of skillByName.keys()) {
+    if (key.startsWith(name)) return "prefix";
+  }
+  return null;
+}
+function tokenCompletions(token) {
+  const pool = token.start === 0 ? [...SLASH_COMMANDS, ...skillCommands] : skillCommands;
+  return pool.filter((c) => c.name.startsWith(token.name));
 }
 
 // src/tui/markdown.ts
@@ -3768,17 +3795,32 @@ function renderStatus(state, cols) {
   const tail = thinking.length > room ? `\u2026${thinking.slice(-(room - 1)).trimStart()}` : thinking;
   return truncate(`${head}${style.grey(` \xB7 ${tail}`)}`, cols);
 }
-var LEADING_TOKEN = /^\/\S*/;
-function skillTokenLength(text) {
-  const match = LEADING_TOKEN.exec(text);
-  if (!match) return 0;
-  return findCommand(match[0])?.source === "skill" ? match[0].length : 0;
+function highlightSpans(text) {
+  const spans = [];
+  const expandedExact = /* @__PURE__ */ new Set();
+  for (const token of slashTokens(text)) {
+    const kind = skillMatchKind(token.name);
+    if (kind === null) continue;
+    if (kind === "exact") {
+      if (expandedExact.has(token.name)) continue;
+      expandedExact.add(token.name);
+    }
+    spans.push({ start: token.start, end: token.nameEnd });
+  }
+  return spans;
 }
-function paintRange(text, base, tokenEnd) {
-  const localEnd = Math.max(0, Math.min(text.length, tokenEnd - base));
-  if (localEnd <= 0) return text;
-  if (localEnd >= text.length) return style.cyan(text);
-  return style.cyan(text.slice(0, localEnd)) + text.slice(localEnd);
+function paintSpans(text, base, spans) {
+  if (spans.length === 0) return text;
+  let out = "";
+  let cursor = 0;
+  for (const span of spans) {
+    const localStart = Math.max(cursor, Math.min(text.length, span.start - base));
+    const localEnd = Math.max(0, Math.min(text.length, span.end - base));
+    if (localEnd <= localStart) continue;
+    out += text.slice(cursor, localStart) + style.cyan(text.slice(localStart, localEnd));
+    cursor = localEnd;
+  }
+  return out + text.slice(cursor);
 }
 function renderInput(state, cols) {
   const prompt = state.focus === "plan" ? style.grey("\u276F ") : style.cyan("\u276F ");
@@ -3786,28 +3828,31 @@ function renderInput(state, cols) {
   const room = chatEditorRoom(cols, lines !== null);
   const { text, cursor } = state.editor;
   const continuation = " ".repeat(width(prompt));
-  const tokenEnd = skillTokenLength(text);
+  const spans = highlightSpans(text);
   if (!lines) {
     const visible = text.replace(/\n/g, "\xB6").replace(/\t/g, " ");
-    const painted = tokenEnd > 0 ? paintRange(visible, 0, tokenEnd) : visible;
+    const painted = paintSpans(visible, 0, spans);
     return [prompt + painted + suggest(state, room - width(visible))];
   }
   const { line: lineIndex, col } = cursorInLines(lines, cursor, text.length);
-  const rawLines = lines.map((l) => l.line);
-  return rawLines.map((raw, i) => {
+  return lines.map(({ line: raw, start: base }, i) => {
     const prefix = i === 0 ? prompt : continuation;
     const line = raw.replace(/\t/g, " ");
     const isCursorLine = i === lineIndex;
-    const lineTokenEnd = i === 0 ? tokenEnd : 0;
-    const rendered = isCursorLine ? paintRange(line.slice(0, col), 0, lineTokenEnd) + style.inverse(line.slice(col, col + 1) || " ") + paintRange(line.slice(col + 1), col + 1, lineTokenEnd) : paintRange(line, 0, lineTokenEnd);
-    const used = width(line) + (isCursorLine && col >= line.length ? 1 : 0);
-    const hint = i === rawLines.length - 1 ? suggest(state, room - used) : "";
-    return prefix + rendered + hint;
+    if (!isCursorLine) return prefix + paintSpans(line, base, spans);
+    const before = paintSpans(line.slice(0, col), base, spans);
+    const caretChar = line.slice(col, col + 1) || " ";
+    const after = paintSpans(line.slice(col + 1), base + col + 1, spans);
+    const used = width(line.slice(0, col)) + width(caretChar);
+    const hint = suggest(state, room - used);
+    return prefix + before + style.inverse(caretChar) + hint + after;
   });
 }
 function suggest(state, room) {
   if (state.focus === "plan" || room <= 2) return "";
-  const matches = completions(state.editor.text);
+  const token = activeToken(state.editor.text, state.editor.cursor);
+  if (!token) return "";
+  const matches = tokenCompletions(token);
   if (matches.length === 0) return "";
   const names = matches.map((c) => c.name).join(" ");
   return style.grey(`  ${truncate(names, Math.max(0, room - 2))}`);
@@ -4434,10 +4479,13 @@ function handleKey2(state, key) {
   if (isMouseSelect(key)) return handleMouseSelect(state, key);
   if (key.name === "wheelignored") return step(state);
   if (key.name === "tab" && state.focus === "chat") {
-    const matches = completions(state.editor.text);
-    if (matches.length > 0) {
-      const text = `/${matches[0].name} `;
-      return step({ ...state, editor: { ...state.editor, text, cursor: text.length } });
+    const token = activeToken(state.editor.text, state.editor.cursor);
+    const matches = token ? tokenCompletions(token) : [];
+    if (token && matches.length > 0) {
+      const { text: full } = state.editor;
+      const completed = `/${matches[0].name} `;
+      const text = full.slice(0, token.start) + completed + full.slice(token.end);
+      return step({ ...state, editor: { ...state.editor, text, cursor: token.start + completed.length } });
     }
   }
   if (key.name === "tab") return step({ ...state, focus: state.focus === "chat" ? "plan" : "chat" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordewell/cli",
-  "version": "0.4.15",
+  "version": "0.4.16",
   "description": "Ordewell CLI and TUI — plan, run and verify coding-agent tasks from the terminal.",
   "license": "Apache-2.0",
   "author": "Alessandro Costanzo Ciano",