u-foo 2.3.18 → 2.3.20

package/README.md

@@ -143,7 +143,9 @@ ufoo resume <ucode|uclaude|ucodex|nickname>
 ufoo recover list
 ```
 
-Common chat commands include `/status`, `/bus list`, `/bus status`, `/settings`, `/project list`, `/project switch <index|path>`, `/open <path>`, `/resume list`, `/group status`, and `@nickname <message>`.
+Common chat commands include `/status`, `/bus list`, `/bus status`, `/settings`, `/project list`, `/project switch <index|path>`, `/open <path>`, `/resume list`, `/group status`, `/skills`, and `@nickname <message>`.
+
+In `ufoo chat`, `/skills` lists ufoo's built-in available skills and preset workflow capabilities so users can discover and choose them. It does not execute a task by itself, and it is not a private capability list for any one agent.
 
 ### Event Bus
 
@@ -197,7 +199,7 @@ Use decisions sparingly for plan-level constraints. Durable project facts belong
 | Online | `ufoo online server|token|room|channel|connect|send|inbox` |
 | History | `ufoo history build|show|prompt` |
 | Skills | `ufoo skills list|install` |
-| Chat settings | `/settings`, `/settings agent`, `/settings router`, `/settings ucode` |
+| Chat commands | `/skills`, `/settings`, `/settings agent`, `/settings router`, `/settings ucode` |
 
 ### Groups
 
@@ -246,8 +248,12 @@ Use the low-level queue runtime:
 ucode-core submit --tool read --args-json '{"path":"README.md"}' --json
 ucode-core run-once --json
 ucode-core list --json
+ucode-core skills list --json
+ucode-core skills show <name>
 ```
 
+`ucode-core skills list` discovers ufoo/ucode built-in and local `SKILL.md` preset workflow capabilities for selection. It lists metadata only; full skill bodies are loaded by ucode only when the user explicitly references a skill such as `$demo` or a direct `SKILL.md` link.
+
 ## Configuration
 
 Project configuration is stored in `.ufoo/config.json`. `ucode` provider credentials are stored globally in `~/.ufoo/config.json` and merged into project config at load time.

package/README.zh-CN.md

@@ -133,7 +133,9 @@ ufoo resume <ucode|uclaude|ucodex|nickname>
 ufoo recover list
 ```
 
-常见 chat 命令包括 `/status`、`/bus list`、`/bus status`、`/settings`、`/project list`、`/project switch <index|path>`、`/open <path>`、`/resume list`、`/group status` 和 `@nickname <message>`。
+常见 chat 命令包括 `/status`、`/bus list`、`/bus status`、`/settings`、`/project list`、`/project switch <index|path>`、`/open <path>`、`/resume list`、`/group status`、`/skills` 和 `@nickname <message>`。
+
+在 `ufoo chat` 中，`/skills` 用于列出 ufoo 内置的可用 skills 和预设工作流能力，方便用户发现和选择。它本身不等于执行任务，也不表示某个 agent 的私有能力列表。
 
 ### 事件总线
 
@@ -211,8 +213,12 @@ ufoo ucode build
 ucode-core submit --tool read --args-json '{"path":"README.md"}' --json
 ucode-core run-once --json
 ucode-core list --json
+ucode-core skills list --json
+ucode-core skills show <name>
 ```
 
+`ucode-core skills list` 用于发现 ufoo/ucode 内置和本地 `SKILL.md` 预设工作流能力，输出的是供选择的元数据；完整 skill 内容只会在用户显式引用 `$demo` 或直接链接某个 `SKILL.md` 时由 ucode 加载。
+
 ## 命令参考
 
 | 范围 | 命令 |
@@ -228,7 +234,7 @@ ucode-core list --json
 | Online | `ufoo online server|token|room|channel|connect|send|inbox` |
 | History | `ufoo history build|show|prompt` |
 | Skills | `ufoo skills list|install` |
-| Chat 设置 | `/settings`, `/settings agent`, `/settings router`, `/settings ucode` |
+| Chat 命令 | `/skills`, `/settings`, `/settings agent`, `/settings router`, `/settings ucode` |
 
 ## 配置
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "2.3.18",
+  "version": "2.3.20",
   "description": "Multi-Agent Workspace Protocol. Just add u. claude → uclaude, codex → ucodex.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://ufoo.dev",

package/src/chat/agentViewController.js

@@ -1,6 +1,9 @@
 const os = require("os");
 const { version: packageVersion } = require("../../package.json");
 
+const ANSI_RESET = "\x1b[0m";
+const CLAUDE_ORANGE = "\x1b[38;2;217;119;87m";
+
 function createAgentViewController(options = {}) {
   const {
     screen,
@@ -39,6 +42,7 @@ function createAgentViewController(options = {}) {
     sendBusMessage = () => {},
     sendResize = () => {},
     requestScreenSnapshot = () => {},
+    sendBusWatch = () => {},
   } = options;
 
   if (!screen || typeof screen.render !== "function") {
@@ -55,6 +59,8 @@ function createAgentViewController(options = {}) {
   let busInputValue = "";
   let busInputCursor = 0;
   let busLogLines = [];
+  let busStartupAgentId = "";
+  let busStartupLineCount = 0;
   const originalRender = screen.render.bind(screen);
   let renderFrozen = false;
 
@@ -64,10 +70,14 @@ function createAgentViewController(options = {}) {
   };
 
   function getRows() {
+    if (Number.isFinite(screen.height) && screen.height > 0) return screen.height;
+    if (Number.isFinite(screen.rows) && screen.rows > 0) return screen.rows;
     return processStdout.rows || 24;
   }
 
   function getCols() {
+    if (Number.isFinite(screen.width) && screen.width > 0) return screen.width;
+    if (Number.isFinite(screen.cols) && screen.cols > 0) return screen.cols;
     return processStdout.columns || 80;
   }
 
@@ -76,6 +86,10 @@ function createAgentViewController(options = {}) {
       .replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, "");
   }
 
+  function hasAnsi(text = "") {
+    return /\x1b(?:\][^\x07\x1b]*(?:\x07|\x1b\\)|\[[0-9;?]*[ -/]*[@-~])/.test(String(text || ""));
+  }
+
   function clamp(value, min, max) {
     const normalized = Number.isFinite(value) ? Math.floor(value) : min;
     return Math.max(min, Math.min(max, normalized));
@@ -141,6 +155,39 @@ function createAgentViewController(options = {}) {
     return `${truncateToWidth(clean, normalizedWidth - 1).trimEnd()}…`;
   }
 
+  function fitAnsiText(text = "", width = 1) {
+    const normalizedWidth = Math.max(1, width);
+    const raw = String(text || "").replace(/\r/g, "");
+    if (!hasAnsi(raw)) return fitText(raw, normalizedWidth);
+    if (displayWidth(raw) <= normalizedWidth) {
+      return padToWidth(raw, normalizedWidth);
+    }
+    if (normalizedWidth <= 1) return "…";
+
+    const ansiPattern = /\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\x1b\[[0-9;?]*[ -/]*[@-~]/g;
+    let out = "";
+    let cells = 0;
+    let index = 0;
+    while (index < raw.length && cells < normalizedWidth - 1) {
+      ansiPattern.lastIndex = index;
+      const match = ansiPattern.exec(raw);
+      if (match && match.index === index) {
+        out += match[0];
+        index += match[0].length;
+        continue;
+      }
+      const char = Array.from(raw.slice(index))[0] || "";
+      if (!char) break;
+      const charWidth = charDisplayWidth(char);
+      if (cells + charWidth > normalizedWidth - 1) break;
+      out += char;
+      cells += charWidth;
+      index += char.length;
+    }
+    const suffix = `${ANSI_RESET}…`;
+    return padToWidth(`${out}${suffix}`, normalizedWidth);
+  }
+
   function horizontalLine(width = 80) {
     return "─".repeat(Math.max(1, width));
   }
@@ -149,6 +196,11 @@ function createAgentViewController(options = {}) {
     return fitText(text, Math.max(1, width));
   }
 
+  function logLine(text = "", width = 80) {
+    const normalizedWidth = Math.max(1, width);
+    return hasAnsi(text) ? fitAnsiText(text, normalizedWidth) : plainLine(text, normalizedWidth);
+  }
+
   function sliceDisplayCells(text = "", startCell = 0, maxCells = 1) {
     const targetStart = Math.max(0, startCell);
     const targetWidth = Math.max(1, maxCells);
@@ -174,6 +226,7 @@ function createAgentViewController(options = {}) {
 
   function wrapTextLine(text = "", width = 80) {
     const inner = Math.max(1, width);
+    if (hasAnsi(text)) return [String(text || "")];
     const clean = stripAnsi(String(text || ""));
     if (!clean) return [""];
     const lines = [];
@@ -209,11 +262,14 @@ function createAgentViewController(options = {}) {
   function forceScreenRepaint() {
     if (typeof screen.realloc === "function") {
       screen.realloc();
-      return;
-    }
-    if (typeof screen.alloc === "function") {
+    } else if (typeof screen.alloc === "function") {
       screen.alloc(true);
     }
+    try {
+      originalRender();
+    } catch {
+      // Ignore repaint failures while restoring from raw agent view.
+    }
   }
 
   function compactProjectPath(projectRoot = "") {
@@ -247,16 +303,21 @@ function createAgentViewController(options = {}) {
   function buildClaudeStartupLines(agentLabel = "", width = 80) {
     const label = String(agentLabel || "").trim();
     const projectPath = compactProjectPath(getProjectRoot());
-    const product = "Claude Code";
+    const product = "ClaudeCode";
     const detail = label ? `${label} · managed headless` : "managed headless";
+    const iconWidth = 9;
+    const iconLine = (icon = "", text = "") => {
+      const pad = " ".repeat(Math.max(0, iconWidth - displayWidth(icon)));
+      return `${CLAUDE_ORANGE}${icon}${ANSI_RESET}${pad}${text}`;
+    };
     const lines = [
-      ` ▐▛███▜▌${product} v${packageVersion}`,
-      `▝▜█████▛▘${detail}`,
-      ` ▘▘▝▝${projectPath}`,
+      iconLine("▐▛███▜▌", `${product}v${packageVersion}`),
+      iconLine("▝▜█████▛▘", detail),
+      iconLine(" ▘▘▝▝", projectPath),
       "",
     ];
     if (width < 44) return lines;
-    return lines.map((line) => padToWidth(line, Math.min(58, Math.max(1, width))));
+    return lines.map((line) => fitAnsiText(line, Math.min(58, Math.max(1, width))));
   }
 
   function buildCodexStartupLines(agentLabel = "", width = 80) {
@@ -288,11 +349,31 @@ function createAgentViewController(options = {}) {
     return buildClaudeStartupLines(agentLabel || agentId, width);
   }
 
+  function staticStartupLines(agentId = "", agentLabel = "", width = 80) {
+    const lines = buildInternalStartupLines(agentId, agentLabel, width);
+    if (lines.length > 0 && String(lines[lines.length - 1] || "") === "") {
+      return lines.slice(0, -1);
+    }
+    return lines;
+  }
+
   function resetBusView(agentId) {
     busInputValue = "";
     busInputCursor = 0;
+    busStartupAgentId = agentId || "";
     const label = getAgentLabel(agentId);
-    busLogLines = buildInternalStartupLines(agentId, label, getCols());
+    const startupLines = staticStartupLines(agentId, label, getCols());
+    busLogLines = startupLines.concat("");
+    busStartupLineCount = startupLines.length;
+  }
+
+  function refreshBusStartupLines(width = getCols()) {
+    if (!busStartupAgentId || busStartupLineCount <= 0) return;
+    const label = getAgentLabel(busStartupAgentId);
+    const startupLines = staticStartupLines(busStartupAgentId, label, width);
+    const tailLines = busLogLines.slice(busStartupLineCount);
+    busLogLines = startupLines.concat(tailLines.length > 0 ? tailLines : [""]);
+    busStartupLineCount = startupLines.length;
   }
 
   function appendBusLog(text = "") {
@@ -331,6 +412,7 @@ function createAgentViewController(options = {}) {
     const rows = getRows();
     const cols = getCols();
     const width = Math.max(20, cols);
+    refreshBusStartupLines(width);
     const inputTop = Math.max(4, rows - 3);
     const logContentTop = 1;
     const logContentBottom = Math.max(logContentTop, inputTop - 1);
@@ -339,7 +421,7 @@ function createAgentViewController(options = {}) {
     processStdout.write("\x1b[?25l");
     const visibleLines = getWrappedBusLogLines(width).slice(-logContentHeight);
     for (let i = 0; i < logContentHeight; i += 1) {
-      writeAt(logContentTop + i, plainLine(visibleLines[i] || "", width));
+      writeAt(logContentTop + i, logLine(visibleLines[i] || "", width));
     }
 
     writeAt(inputTop, horizontalLine(width));
@@ -392,6 +474,7 @@ function createAgentViewController(options = {}) {
   function enterAgentView(agentId, options = {}) {
     if (currentView === "agent" && viewingAgent === agentId) return;
     if (currentView === "agent") {
+      if (agentViewUsesBus && viewingAgent) sendBusWatch(viewingAgent, false);
       disconnectAgentOutput();
       disconnectAgentInput();
     }
@@ -416,6 +499,7 @@ function createAgentViewController(options = {}) {
     agentInputSuppressUntil = now() + 300;
     agentViewUsesBus = Boolean(options.useBus);
     if (agentViewUsesBus) {
+      sendBusWatch(agentId, true);
       resetBusView(agentId);
       renderBusView();
     } else {
@@ -439,12 +523,15 @@ function createAgentViewController(options = {}) {
 
     disconnectAgentOutput();
     disconnectAgentInput();
+    if (agentViewUsesBus && viewingAgent) sendBusWatch(viewingAgent, false);
     agentViewUsesBus = false;
     agentOutputSuppressed = false;
     agentBarVisible = false;
     busInputValue = "";
     busInputCursor = 0;
     busLogLines = [];
+    busStartupAgentId = "";
+    busStartupLineCount = 0;
 
     currentView = "main";
     viewingAgent = null;
@@ -462,11 +549,11 @@ function createAgentViewController(options = {}) {
     setDashboardView("agents");
     setSelectedAgentIndex(-1);
     setScreenGrabKeys(false);
-    forceScreenRepaint();
     clearTargetAgent();
     renderDashboard();
     focusInput();
     resizeInput();
+    forceScreenRepaint();
     try {
       if (screen.program && typeof screen.program.showCursor === "function") {
         screen.program.showCursor();

package/src/chat/commandExecutor.js

@@ -448,12 +448,12 @@ function createCommandExecutor(options = {}) {
         try {
           const skills = createSkills(projectRoot);
 
-          if (subcommand === "list") {
+          if (!subcommand || subcommand === "list") {
             const skillList = skills.list();
             if (skillList.length === 0) {
-              logMessage("system", "{white-fg}No skills found{/white-fg}");
+              logMessage("system", "{white-fg}No built-in ufoo skills found{/white-fg}");
             } else {
-              logMessage("system", `{cyan-fg}Available skills:{/cyan-fg} ${skillList.length}`);
+              logMessage("system", `{cyan-fg}Available built-in ufoo skills:{/cyan-fg} ${skillList.length}`);
               for (const skill of skillList) {
                 logMessage("system", `  • ${skill}`);
               }

package/src/chat/commands.js

@@ -129,10 +129,10 @@ const COMMAND_TREE = {
     },
   },
   "/skills": {
-    desc: "Skills management",
+    desc: "List ufoo built-in skills and preset workflows",
     children: {
-      install: { desc: "Install skills (use: all or name)" },
-      list: { desc: "List available skills" },
+      install: { desc: "Install built-in skills (use: all or name)" },
+      list: { desc: "List built-in skills for discovery" },
     },
   },
   "/status": { desc: "Status display" },

package/src/chat/daemonMessageRouter.js

@@ -19,6 +19,8 @@ function createDaemonMessageRouter(options = {}) {
     getCurrentView = () => "main",
     isAgentViewUsesBus = () => false,
     getViewingAgent = () => "",
+    isAgentEventForViewingAgent = (data, viewingAgent, publisher) =>
+      Boolean(viewingAgent && (publisher === viewingAgent || data?.target === viewingAgent)),
     writeToAgentTerm = () => {},
     consumePendingDelivery = () => false,
     getPendingState = () => null,
@@ -352,6 +354,19 @@ function createDaemonMessageRouter(options = {}) {
   function handleBusMessage(msg) {
     const data = msg.data || {};
     if (data.event === "activity_state_changed") {
+      const publisher = data.publisher && data.publisher !== "unknown"
+        ? data.publisher
+        : (data.subscriber || "bus");
+      const viewingAgent = getViewingAgent();
+      if (
+        getCurrentView() === "agent" &&
+        isAgentViewUsesBus() &&
+        viewingAgent &&
+        isAgentEventForViewingAgent(data, viewingAgent, publisher)
+      ) {
+        const state = data.state || (data.data && data.data.state) || "";
+        if (state) writeToAgentTerm(`[state] ${state}\r\n`);
+      }
       requestStatus();
       return true;
     }
@@ -375,11 +390,12 @@ function createDaemonMessageRouter(options = {}) {
     if (data.silent && !streamPayload) return true;
     if (!displayMessage && !streamPayload) return true;
 
+    const viewingAgent = getViewingAgent();
     const isAgentViewTarget =
       getCurrentView() === "agent" &&
       isAgentViewUsesBus() &&
-      getViewingAgent() &&
-      publisher === getViewingAgent();
+      viewingAgent &&
+      isAgentEventForViewingAgent(data, viewingAgent, publisher);
 
     const displayName = resolveAgentDisplayName(publisher);
 

package/src/chat/index.js

@@ -1581,6 +1581,14 @@ async function runChat(projectRoot, options = {}) {
         source: "chat-internal-agent-view",
       });
     },
+    sendBusWatch: (agentId, enabled) => {
+      if (!agentId) return;
+      send({
+        type: IPC_REQUEST_TYPES.BUS_WATCH,
+        agent_id: agentId,
+        enabled: enabled !== false,
+      });
+    },
     sendResize: (cols, rows) => {
       sendResizeWithCapabilities(cols, rows);
     },
@@ -1612,6 +1620,21 @@ async function runChat(projectRoot, options = {}) {
     getCurrentView: () => getCurrentView(),
     isAgentViewUsesBus: () => isAgentViewUsesBus(),
     getViewingAgent: () => getViewingAgent(),
+    isAgentEventForViewingAgent: (data, viewingAgent, publisher) => {
+      if (!viewingAgent) return false;
+      const label = getAgentLabel(viewingAgent);
+      const candidates = [
+        publisher,
+        data && data.publisher,
+        data && data.target,
+        data && data.subscriber,
+      ].filter(Boolean);
+      return candidates.some((value) => (
+        value === viewingAgent ||
+        value === label ||
+        resolveAgentId(value) === viewingAgent
+      ));
+    },
     writeToAgentTerm,
     consumePendingDelivery,
     getPendingState,

package/src/code/agent.js

@@ -25,6 +25,12 @@ const {
   loadSessionSnapshot,
 } = require("./sessionStore");
 const { buildPromptContext } = require("./prompts");
+const {
+  buildSkillInjections,
+  formatSkillsList,
+  listUcodeSkills,
+  showSkill,
+} = require("./skills");
 
 function printPrompt() {
   process.stdout.write("> ");
@@ -243,6 +249,61 @@ function createToolLogCollector(logs = [], onToolLog = null) {
   };
 }
 
+function pushSkillWarning(logs = [], onToolLog = null, warning = "") {
+  const text = String(warning || "").trim();
+  if (!text) return null;
+  const entry = {
+    type: "skills",
+    phase: "warning",
+    message: text,
+    error: text,
+  };
+  if (Array.isArray(logs)) logs.push(entry);
+  if (typeof onToolLog === "function") {
+    try {
+      onToolLog(entry);
+    } catch {
+      // ignore callback failures
+    }
+  }
+  return entry;
+}
+
+function stripSkillBlocksFromText(value = "") {
+  return String(value || "")
+    .replace(/<skill>\s*[\s\S]*?<\/skill>\s*/g, "")
+    .trim();
+}
+
+function stripSkillBlocksFromMessages(messages = []) {
+  if (!Array.isArray(messages)) return [];
+  return messages.map((message) => {
+    if (!message || typeof message !== "object" || Array.isArray(message)) return message;
+    if (typeof message.content === "string") {
+      return {
+        ...message,
+        content: stripSkillBlocksFromText(message.content),
+      };
+    }
+    if (Array.isArray(message.content)) {
+      return {
+        ...message,
+        content: message.content.map((item) => {
+          if (!item || typeof item !== "object" || Array.isArray(item)) return item;
+          if (typeof item.text === "string") {
+            return {
+              ...item,
+              text: stripSkillBlocksFromText(item.text),
+            };
+          }
+          return item;
+        }),
+      };
+    }
+    return message;
+  });
+}
+
 function isProjectAnalysisTask(task = "") {
   const text = String(task || "").trim().toLowerCase();
   if (!text) return false;
@@ -398,6 +459,16 @@ async function runNaturalLanguageTask(task = "", state = {}, options = {}) {
   const taskPrompt = analysisTask
     ? `${taskText}\n\nAnalysis requirements:\n- Inspect repository evidence before concluding.\n- Cite concrete file observations.\n- Keep findings concise and actionable.`
     : taskText;
+  const skillInjections = buildSkillInjections({
+    prompt: taskPrompt,
+    workspaceRoot,
+  });
+  for (const warning of skillInjections.warnings || []) {
+    pushSkillWarning(logs, onToolLog, warning);
+  }
+  const effectiveTaskPrompt = Array.isArray(skillInjections.blocks) && skillInjections.blocks.length > 0
+    ? `${skillInjections.blocks.join("\n\n")}\n\n${taskPrompt}`
+    : taskPrompt;
   const systemContext = [String(state.context || "").trim(), preflightContext]
     .filter(Boolean)
     .join("\n\n");
@@ -422,7 +493,7 @@ async function runNaturalLanguageTask(task = "", state = {}, options = {}) {
     workspaceRoot,
     provider,
     model,
-    prompt: taskPrompt,
+    prompt: effectiveTaskPrompt,
     systemPrompt: systemContext,
     messages: Array.isArray(state.nlMessages) ? state.nlMessages : [],
     sessionId: String(sessionIdValue || ""),
@@ -440,7 +511,7 @@ async function runNaturalLanguageTask(task = "", state = {}, options = {}) {
     // Use decomposed runner for bug fix tasks
     if (useDecomposition) {
       const decomposedResult = await runDecomposedTask({
-        task: taskText,
+        task: effectiveTaskPrompt,
         state,
         onProgress: options.onProgress,
         onToolEvent: pushToolLog,
@@ -497,7 +568,7 @@ async function runNaturalLanguageTask(task = "", state = {}, options = {}) {
       state.sessionId = cliRes.sessionId.trim();
     }
     if (cliRes && Array.isArray(cliRes.messages)) {
-      state.nlMessages = cliRes.messages;
+      state.nlMessages = stripSkillBlocksFromMessages(cliRes.messages);
     }
     const normalized = String(cliRes.output || "").trim();
     const summary = extractJsonSummary(normalized);
@@ -1235,6 +1306,8 @@ function runSingleCommand(line = "", workspaceRoot = process.cwd()) {
         "  help",
         "  exit|quit",
         "  ubus|/ubus",
+        "  skills [list]",
+        "  skills show <name>",
         "  bg|/bg <task>",
         "  resume <session-id>",
         "  tool <read|write|edit|bash> <args-json>",
@@ -1254,6 +1327,45 @@ function runSingleCommand(line = "", workspaceRoot = process.cwd()) {
       kind: "ubus",
     };
   }
+  const skillsMatch = text.match(/^(?:\/skills|skills)(?:\s+(.*))?$/i);
+  if (skillsMatch) {
+    const args = String(skillsMatch[1] || "").trim().split(/\s+/).filter(Boolean);
+    const action = String(args[0] || "list").toLowerCase();
+    if (action === "list" || action === "ls") {
+      const outcome = listUcodeSkills({ workspaceRoot });
+      return {
+        kind: "skills",
+        output: formatSkillsList(outcome),
+        skills: outcome.skills,
+        errors: outcome.errors,
+      };
+    }
+    if (action === "show") {
+      const name = String(args[1] || "").trim();
+      if (!name) {
+        return {
+          kind: "error",
+          output: "usage: skills show <name>",
+        };
+      }
+      const result = showSkill({ name, workspaceRoot });
+      if (!result.ok) {
+        return {
+          kind: "error",
+          output: result.error,
+        };
+      }
+      return {
+        kind: "skills",
+        output: result.output,
+        skill: result.skill,
+      };
+    }
+    return {
+      kind: "error",
+      output: "usage: skills [list] | skills show <name>",
+    };
+  }
   if (text === "bg" || text === "/bg") {
     return {
       kind: "error",
@@ -1498,7 +1610,7 @@ async function runUcodeCoreAgent({
       if (result.kind === "probe") {
         return;
       }
-      if (result.kind === "help" || result.kind === "tool" || result.kind === "error") {
+      if (result.kind === "help" || result.kind === "tool" || result.kind === "skills" || result.kind === "error") {
         stdout.write(`${result.output}\n`);
       }
       if (result.kind === "ubus") {
@@ -1701,6 +1813,8 @@ module.exports = {
   normalizeToolLogEvent,
   isProjectAnalysisTask,
   buildNlFallbackSummary,
+  buildNlContext,
+  stripSkillBlocksFromMessages,
   resolvePlannerProvider,
   extractJsonSummary,
   enrichNativeError,