mini-coder 0.6.5 → 0.7.1

package/bun.lock

@@ -7,15 +7,15 @@
       "dependencies": {
         "@cel-tui/components": "^0.8.3",
         "@cel-tui/core": "^0.8.3",
-        "@earendil-works/pi-ai": "^0.75.5",
+        "@earendil-works/pi-ai": "^0.79.3",
         "diff": "^9.0.0",
         "simple-git": "^3.36.0",
         "yaml": "^2.9.0",
       },
       "devDependencies": {
-        "@biomejs/biome": "^2.4.15",
+        "@biomejs/biome": "^2.5.0",
         "@types/bun": "^1.3.14",
-        "prettier": "^3.8.3",
+        "prettier": "^3.8.4",
         "typescript": "^6.0.3",
       },
     },
@@ -75,23 +75,23 @@
 
     "@babel/runtime": ["@babel/runtime@7.29.2", "", {}, "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g=="],
 
-    "@biomejs/biome": ["@biomejs/biome@2.4.15", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.4.15", "@biomejs/cli-darwin-x64": "2.4.15", "@biomejs/cli-linux-arm64": "2.4.15", "@biomejs/cli-linux-arm64-musl": "2.4.15", "@biomejs/cli-linux-x64": "2.4.15", "@biomejs/cli-linux-x64-musl": "2.4.15", "@biomejs/cli-win32-arm64": "2.4.15", "@biomejs/cli-win32-x64": "2.4.15" }, "bin": { "biome": "bin/biome" } }, "sha512-j5VH3a/h/HXTKBM50MDMxRCzkeLv9S2XJcW2WgnZT1+xyisi+0bISrXR82gCX+8S9lvK0skEvHJRN+3Ktr2hlw=="],
+    "@biomejs/biome": ["@biomejs/biome@2.5.0", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.5.0", "@biomejs/cli-darwin-x64": "2.5.0", "@biomejs/cli-linux-arm64": "2.5.0", "@biomejs/cli-linux-arm64-musl": "2.5.0", "@biomejs/cli-linux-x64": "2.5.0", "@biomejs/cli-linux-x64-musl": "2.5.0", "@biomejs/cli-win32-arm64": "2.5.0", "@biomejs/cli-win32-x64": "2.5.0" }, "bin": { "biome": "bin/biome" } }, "sha512-4kURkd9hAPrdDM3C9n82ycYgx8hvQcW6MjKTEejruj8rK0N8P3OPpdy8BvI8kt3KWY4ycF5XtDOrktetEfhfuw=="],
 
-    "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@2.4.15", "", { "os": "darwin", "cpu": "arm64" }, "sha512-rF3PPqLq1yoST79zaQbDjVJwsuIeci/O+9bgNmC5QpgOqz6aqYuzA4abyAGx+mgyiDXn4A049xAN8gijbuR1Qg=="],
+    "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@2.5.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Mn3Fwi3SA5fgmfCPqmzpWF2DLZnms3BVAhM088nTnGrTZmHS3wwIjcoZPqpXeNgd3DrrLH6xp8vTLIBuJoZiXw=="],
 
-    "@biomejs/cli-darwin-x64": ["@biomejs/cli-darwin-x64@2.4.15", "", { "os": "darwin", "cpu": "x64" }, "sha512-/5KHXYMfSJs1fNXiX30xFtI8JcCFV6zaVVLxOa0M2sfqBKHkpQhRTv94yxQWxeTY2lzo2OuTlNvPC+hDQt2wcQ=="],
+    "@biomejs/cli-darwin-x64": ["@biomejs/cli-darwin-x64@2.5.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-rg3VPL5P8mYro6pqlXYXuJWph21slVp3SZtAqWSrkZs40d2gTzYmHF8E/X1iTID25btmNKltNDJ926sqVBp7DQ=="],
 
-    "@biomejs/cli-linux-arm64": ["@biomejs/cli-linux-arm64@2.4.15", "", { "os": "linux", "cpu": "arm64" }, "sha512-owaAMZD/T4LrD0ELNCk0Km3qrRHuM0X6EAyVE1FSqGY0rbLoiDLrO4Us2tllm6cAeB2Ioa9C2C08NZPdr8+0Ug=="],
+    "@biomejs/cli-linux-arm64": ["@biomejs/cli-linux-arm64@2.5.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-tl+LW8fdD96/xdeWtWwc82LIOc5CoY7N2AsogLTp5R4ECErYt+8Jl/N68ezN9vzSiqPTxw6vjcihoLPYKZHrlw=="],
 
-    "@biomejs/cli-linux-arm64-musl": ["@biomejs/cli-linux-arm64-musl@2.4.15", "", { "os": "linux", "cpu": "arm64" }, "sha512-ZPcxznxm0pogHBLZhYntyR3sR+MrZjqJIKEr7ZqVen0Rl+P/4upVmfYXjftizi9RoqZntg33fv/1fbdhbYXpEQ=="],
+    "@biomejs/cli-linux-arm64-musl": ["@biomejs/cli-linux-arm64-musl@2.5.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-vQdM4oSGaf7ZNeGO9w5+Y8SBtyser9M6znxYbm7Ec8wInxJu1WiKxFYZW5Auj2d80bcVvefuGGRxoFOE0eee8g=="],
 
-    "@biomejs/cli-linux-x64": ["@biomejs/cli-linux-x64@2.4.15", "", { "os": "linux", "cpu": "x64" }, "sha512-0jj7THz12GbUOLmMibktK6DZjqz2zV64KFxyBtcFTKPiiOIY0a7vns1elpO1dERvxpsZ5ik0oFfz0oGwFde1+g=="],
+    "@biomejs/cli-linux-x64": ["@biomejs/cli-linux-x64@2.5.0", "", { "os": "linux", "cpu": "x64" }, "sha512-zpEGf4RQbFEh8Vt7OmavLyyOzRbtcE9osCqrS1kfvt8jDvxwhKXLSf7n0ebr/ov0RJ9ssP+lhs6C8a9WwFvrQA=="],
 
-    "@biomejs/cli-linux-x64-musl": ["@biomejs/cli-linux-x64-musl@2.4.15", "", { "os": "linux", "cpu": "x64" }, "sha512-CNq/9W38SYSH023lfcQ4KKU8K0YX8T//FZUhcgtMMRABDojx5XsMV7jlweAvGSl389wJQB29Qo6Zb/a+jdvt+w=="],
+    "@biomejs/cli-linux-x64-musl": ["@biomejs/cli-linux-x64-musl@2.5.0", "", { "os": "linux", "cpu": "x64" }, "sha512-+9hIcMngJ+yGUahXqZuZ8CoWKJE9SAZsFsM3QDvXpNsLbXZ9lqVzgBhOk/jTSYkOA0GLP9eu3teukqpLUojHMg=="],
 
-    "@biomejs/cli-win32-arm64": ["@biomejs/cli-win32-arm64@2.4.15", "", { "os": "win32", "cpu": "arm64" }, "sha512-ouhkYdlhp/1GghEJPdWwD/Vi3gQ1nFxuSpMolWsbq3Lsq3QUR4jl6UdhhscdCugKU5vOEuMiJhvKj66O0OCq+w=="],
+    "@biomejs/cli-win32-arm64": ["@biomejs/cli-win32-arm64@2.5.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-jB0wAvTLI4itx5VidqVUejPQFhRUxiZ9l9FvZ26D5fl6t3qme+ZB4PD3bTSeL1vZ8NI2Rx/zj6H9zcESuGHKGw=="],
 
-    "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.4.15", "", { "os": "win32", "cpu": "x64" }, "sha512-zBrGq5mx5wwpnow4+2BxUvleDM+GNd4sLbPaMapsSLQLD0NGRCquqPBTgN+7XkUteHvj7M+BstuI8tmnV7+HgQ=="],
+    "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.5.0", "", { "os": "win32", "cpu": "x64" }, "sha512-VT/lF+GId+67j8aDfLkxdxNoVApsPSTbyAtB3jJq0IWTrY77WXfbPfpngxq0bA6JCEv/7k8C9qWjDRKRznDlyw=="],
 
     "@cel-tui/clew": ["@cel-tui/clew@0.8.3", "", { "peerDependencies": { "typescript": ">=5.0.0" } }, "sha512-7OFUe8ECleXjq9+vv2EvDcTXsiWNSQqVALD1LC/Gi9DzVp1aw0S6SloJuAv1KUVkwjZxil+mvYlk2LoC28mETQ=="],
 
@@ -101,7 +101,7 @@
 
     "@cel-tui/types": ["@cel-tui/types@0.8.3", "", { "peerDependencies": { "typescript": ">=5.0.0" } }, "sha512-yEKXCY16U/W4A4JaVysv2/x/IBEHQAfb93CzL6HugN+N15ETB3Vn8tZrQwdyrOT/9WdlCQkeBH8Vj7BJHs4Hkw=="],
 
-    "@earendil-works/pi-ai": ["@earendil-works/pi-ai@0.75.5", "", { "dependencies": { "@anthropic-ai/sdk": "0.91.1", "@aws-sdk/client-bedrock-runtime": "3.1048.0", "@google/genai": "1.52.0", "@mistralai/mistralai": "2.2.1", "@smithy/node-http-handler": "4.7.3", "http-proxy-agent": "7.0.2", "https-proxy-agent": "7.0.6", "openai": "6.26.0", "partial-json": "0.1.7", "typebox": "1.1.38" }, "bin": { "pi-ai": "dist/cli.js" } }, "sha512-zf1F5kXk1pqZeFShXOqq9ibUk8QdtRoLCDPAjO+hj44e3EUs9/GFO2qnhTC5+JA2uwVCx+WCNe1PiCjlBYWm5w=="],
+    "@earendil-works/pi-ai": ["@earendil-works/pi-ai@0.79.3", "", { "dependencies": { "@anthropic-ai/sdk": "0.91.1", "@aws-sdk/client-bedrock-runtime": "3.1048.0", "@google/genai": "1.52.0", "@mistralai/mistralai": "2.2.1", "@smithy/node-http-handler": "4.7.3", "http-proxy-agent": "7.0.2", "https-proxy-agent": "7.0.6", "openai": "6.26.0", "partial-json": "0.1.7", "typebox": "1.1.38" }, "bin": { "pi-ai": "dist/cli.js" } }, "sha512-lMSput/haP5uZAGbXhS5rAYd3GB7GYdJkoAUxg3VFummBeqGqGqllaTWrbHFN12kVGyVfWHhdySNXkiqVh65Iw=="],
 
     "@google/genai": ["@google/genai@1.52.0", "", { "dependencies": { "google-auth-library": "^10.3.0", "p-retry": "^4.6.2", "protobufjs": "^7.5.4", "ws": "^8.18.0" }, "peerDependencies": { "@modelcontextprotocol/sdk": "^1.25.2" }, "optionalPeers": ["@modelcontextprotocol/sdk"] }, "sha512-gwSvbpiN/17O9TbsqSsE/OzZcpv5Fo4RQjdngGgogtuB9RsyJ8ZHhX5KjHj1bp5N9snN2eK8LDGXSaWW2hof8Q=="],
 
@@ -231,7 +231,7 @@
 
     "path-expression-matcher": ["path-expression-matcher@1.5.0", "", {}, "sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ=="],
 
-    "prettier": ["prettier@3.8.3", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw=="],
+    "prettier": ["prettier@3.8.4", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-N2MylSdi48+5N/6S5j+maeHbUSIzzZ5uOcX5Hm4QpV8Dkb1HFjfAKTKX6yNPJQD9AhcT3ifHNB66tWTTJDi11Q=="],
 
     "protobufjs": ["protobufjs@7.5.6", "", { "dependencies": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", "@protobufjs/codegen": "^2.0.5", "@protobufjs/eventemitter": "^1.1.0", "@protobufjs/fetch": "^1.1.0", "@protobufjs/float": "^1.0.2", "@protobufjs/inquire": "^1.1.1", "@protobufjs/path": "^1.1.2", "@protobufjs/pool": "^1.1.0", "@protobufjs/utf8": "^1.1.1", "@types/node": ">=13.7.0", "long": "^5.0.0" } }, "sha512-M71sTMB146U3u0di3yup8iM+zv8yPRNQVr1KK4tyBitl3qFvEGucq/rGDRShD2rsJhtN02RJaJ7j5X5hmy8SJg=="],
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "mini-coder",
-  "version": "0.6.5",
+  "version": "0.7.1",
   "type": "module",
-  "packageManager": "bun@1.3.12",
+  "packageManager": "bun@1.3.13",
   "bin": {
     "mc": "bin/mc.ts"
   },
@@ -14,15 +14,15 @@
     "format": "bun run prettier --write *.md && bun run biome format --write . && bun run biome check --write ."
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.15",
+    "@biomejs/biome": "^2.5.0",
     "@types/bun": "^1.3.14",
-    "prettier": "^3.8.3",
+    "prettier": "^3.8.4",
     "typescript": "^6.0.3"
   },
   "dependencies": {
     "@cel-tui/components": "^0.8.3",
     "@cel-tui/core": "^0.8.3",
-    "@earendil-works/pi-ai": "^0.75.5",
+    "@earendil-works/pi-ai": "^0.79.3",
     "diff": "^9.0.0",
     "simple-git": "^3.36.0",
     "yaml": "^2.9.0"

package/src/tui-conversation.ts

@@ -50,15 +50,16 @@ function ConversationMessageToolCall(call: TUIToolCall) {
     const tail = call.output.trim().slice(-200);
     const blocks: Node[] = [];
 
-    blocks.push(Text(tail, { fgColor: theme.white, wrap: "word" }));
-
     if (tail.length !== call.output.trim().length) {
       blocks.push(
         Text("Showing the last 200 characters", {
           fgColor: theme.bblack,
           italic: true,
         }),
+        Text(`[...] ${tail}`, { fgColor: theme.white, wrap: "word" }),
       );
+    } else {
+      blocks.push(Text(tail, { fgColor: theme.white, wrap: "word" }));
     }
 
     outputNode = VStack({ width: "100%" }, blocks);

package/src/tui-overlay.ts

@@ -183,6 +183,14 @@ export function useSelectOverlay(initialOptions: SelectOptions) {
     );
 }
 
+function cleanSnippet(text: string): string {
+  return text
+    .replaceAll(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "")
+    .trim()
+    .replace(/\s+/g, " ")
+    .slice(0, 80);
+}
+
 function sessionLabel(session: Session): string {
   const firstUserMessage = session.messages.find(
     (message) => message.role === "user",
@@ -195,16 +203,79 @@ function sessionLabel(session: Session): string {
       : firstUserMessage.content
           .map((block) => (block.type === "text" ? block.text : ""))
           .join(" ");
-  const snippet = text
-    .replaceAll(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "")
-    .trim()
-    .replace(/\s+/g, " ")
-    .slice(0, 80);
+  const snippet = cleanSnippet(text);
 
   return snippet || session.id;
 }
 
-export function mainMenu(state: TUIState) {
+function messageText(message: Message): string {
+  if (message.role === "user") {
+    return typeof message.content === "string"
+      ? message.content
+      : message.content
+          .map((content) =>
+            content.type === "text" ? content.text : "[image]",
+          )
+          .join(" ");
+  }
+
+  if (message.role === "toolResult") {
+    return message.content
+      .map((content) => (content.type === "text" ? content.text : "[image]"))
+      .join(" ");
+  }
+
+  return message.content
+    .map((content) => {
+      if (content.type === "text") return content.text;
+      if (content.type === "thinking") return content.thinking;
+      if (content.type === "toolCall") return `tool call: ${content.name}`;
+      return "";
+    })
+    .join(" ");
+}
+
+function messageLabel(message: Message, index: number): string {
+  const role =
+    message.role === "toolResult"
+      ? `toolResult:${message.toolName}`
+      : message.role;
+  const snippet = cleanSnippet(messageText(message));
+  const prefix = `${index + 1}. ${role} ${formatTimestamp(message.timestamp)}`;
+
+  return snippet ? `${prefix} — ${snippet}` : prefix;
+}
+
+function forkMessages(messages: Message[], selectedIndex: number): Message[] {
+  const forkedMessages = messages.slice(0, selectedIndex + 1);
+  const toolCallIds = new Set<string>();
+  const includedToolResultIds = new Set<string>();
+
+  for (const message of forkedMessages) {
+    if (message.role === "assistant") {
+      for (const content of message.content) {
+        if (content.type === "toolCall") toolCallIds.add(content.id);
+      }
+    } else if (message.role === "toolResult") {
+      includedToolResultIds.add(message.toolCallId);
+    }
+  }
+
+  for (const message of messages) {
+    if (
+      message.role === "toolResult" &&
+      toolCallIds.has(message.toolCallId) &&
+      !includedToolResultIds.has(message.toolCallId)
+    ) {
+      forkedMessages.push(message);
+      includedToolResultIds.add(message.toolCallId);
+    }
+  }
+
+  return forkedMessages;
+}
+
+export function mainMenu(state: TUIState, initialPane = "main") {
   type MenuPane = Omit<SelectOptions, "onCancel" | "onSelect">;
 
   const oauthProviders = getOAuthProviders();
@@ -264,6 +335,15 @@ export function mainMenu(state: TUIState) {
     };
   };
 
+  const forkPane = (): MenuPane => ({
+    label: "fork",
+    filter: "",
+    list: state.messages.map((message, index) => ({
+      label: messageLabel(message, index),
+      value: String(index),
+    })),
+  });
+
   const mainPane: MenuPane = {
     label: "main",
     filter: state.prompt.length ? state.prompt : "",
@@ -271,6 +351,7 @@ export function mainMenu(state: TUIState) {
       { label: "models and providers", value: "providers" },
       { label: "reasoning effort", value: "effort" },
       { label: "sessions", value: "sessions" },
+      { label: "fork", value: "fork" },
     ],
   };
   const effortPane: MenuPane = {
@@ -279,7 +360,7 @@ export function mainMenu(state: TUIState) {
     list: efforts,
   };
   const panes: MenuPane[] = [effortPane];
-  let currentPane = mainPane;
+  let currentPane = initialPane === "fork" ? forkPane() : mainPane;
   let selectedProvider: string | undefined;
 
   const openPane = (s: SelectState, pane: MenuPane) => {
@@ -362,7 +443,7 @@ export function mainMenu(state: TUIState) {
   };
 
   const select = useSelectOverlay({
-    ...mainPane,
+    ...currentPane,
     onSelect: (s) => {
       if (!s.selected) return;
 
@@ -379,6 +460,11 @@ export function mainMenu(state: TUIState) {
           });
         }
 
+        if (s.selected === "fork") {
+          openPane(s, forkPane());
+          return;
+        }
+
         const nextPane = panes.find((pane) => pane.label === s.selected);
         if (nextPane) openPane(s, nextPane);
         return;
@@ -401,6 +487,28 @@ export function mainMenu(state: TUIState) {
         return;
       }
 
+      if (currentPane.label === "fork") {
+        const selectedIndex = Number(s.selected);
+        if (
+          !Number.isInteger(selectedIndex) ||
+          !state.messages[selectedIndex]
+        ) {
+          return;
+        }
+
+        state.sessionId = undefined;
+        state.messages = forkMessages(state.messages, selectedIndex);
+        state.tuiMessages = state.messages
+          .filter((message) => message.role !== "toolResult")
+          .map(toTUIMessage);
+        state.prompt = "";
+        state.contextSize = estimateTokens(JSON.stringify(state.messages));
+        state.scrollOffset = 0;
+        state.stickToBottom = true;
+        closeMenu(s);
+        return;
+      }
+
       if (currentPane.label === "providers") {
         const provider = currentProviders.find((v) => v === s.selected);
         if (!provider) return;

package/src/tui.ts

@@ -1,3 +1,6 @@
+import { stat } from "node:fs/promises";
+import { homedir } from "node:os";
+import { join } from "node:path";
 import { cel, HStack, ProcessTerminal, VStack } from "@cel-tui/core";
 import type {
   AssistantMessage,
@@ -42,6 +45,52 @@ function clearOrAbort(state: TUIState) {
   }
 }
 
+async function directoryExists(path: string): Promise<boolean> {
+  try {
+    return (await stat(path)).isDirectory();
+  } catch {
+    return false;
+  }
+}
+
+async function handleSkillSlashCommand(prompt: string) {
+  const match = prompt.trim().match(/^\/([a-zA-Z0-9_-]+)(?:\s|$)/);
+
+  if (!match) return;
+
+  const skillName = match[1];
+  const skillRoots = [
+    join(homedir(), ".agents", "skills"),
+    join(process.cwd(), ".agents", "skills"),
+  ];
+
+  for (const root of skillRoots) {
+    if (!(await directoryExists(root))) {
+      continue;
+    }
+
+    const glob = new Bun.Glob("*/SKILL.md");
+
+    for await (const path of glob.scan({ cwd: root, absolute: true })) {
+      const file = Bun.file(path);
+
+      if (!(await file.exists())) {
+        continue;
+      }
+
+      const body = await file.text();
+      const frontmatter = body.match(/^---\s*\n([\s\S]*?)\n---/);
+      const name = frontmatter?.[1]
+        .match(/^name:\s*["']?([^"'\n]+)["']?\s*$/m)?.[1]
+        ?.trim();
+
+      if (name === skillName) {
+        return body;
+      }
+    }
+  }
+}
+
 export function initTUI(state: TUIState, leave: (s: string) => void) {
   // TODO: Cleanup accumulated sessions for this cwd.
   const { spinnerEvery, currentSpinner } = Spinner();
@@ -59,6 +108,8 @@ export function initTUI(state: TUIState, leave: (s: string) => void) {
     cel.render();
   }, 1000 / fps);
 
+  let menu = mainMenu(state);
+
   const onWindowKeyPress = (key: string) => {
     if (key === "ctrl+q" || key === "ctrl+c" || key === "ctrl+d") {
       // Quit
@@ -69,6 +120,10 @@ export function initTUI(state: TUIState, leave: (s: string) => void) {
       // Abort or clear prompt
       clearOrAbort(state);
     } else if (key === "ctrl+p") {
+      menu = mainMenu(state);
+      state.overlay = true;
+    } else if (key === "ctrl+f") {
+      menu = mainMenu(state, "fork");
       state.overlay = true;
     }
   };
@@ -78,6 +133,19 @@ export function initTUI(state: TUIState, leave: (s: string) => void) {
   };
 
   const onEditorKeyPress = (key: string) => {
+    const submit = async () => {
+      await streamAgentTUI(state);
+    };
+    const skillSubmit = async () => {
+      const skill = await handleSkillSlashCommand(state.prompt);
+      if (skill) {
+        state.streaming = true;
+        // This cause the prompt to flash the body before vanishing on submit.
+        // To avoid this I added a new state property
+        state.promptSkill = skill;
+        await streamAgentTUI(state);
+      }
+    };
     // onKeyPress
     if (key === "enter") {
       if (state.prompt === ":q") {
@@ -96,16 +164,15 @@ export function initTUI(state: TUIState, leave: (s: string) => void) {
         state.stickToBottom = true;
         return false;
       }
-      const submit = async () => {
-        await streamAgentTUI(state);
-      };
+      if (state.prompt && state.prompt[0] === "/" && !state.streaming) {
+        skillSubmit();
+        return false;
+      }
       if (state.prompt && !state.streaming) submit();
       return false;
     }
   };
 
-  const menu = mainMenu(state);
-
   cel.init(new ProcessTerminal());
   cel.viewport(() => {
     const layers = [
@@ -140,6 +207,8 @@ export function initTUI(state: TUIState, leave: (s: string) => void) {
 }
 
 async function streamAgentTUI(state: TUIState) {
+  // Just as a defensive thought, callers should set this ahead of time if doing other
+  // ops before starting the stream.
   state.streaming = true;
 
   const abortController = new AbortController();
@@ -152,6 +221,12 @@ async function streamAgentTUI(state: TUIState) {
   ];
 
   let userContent = state.prompt;
+  if (state.promptSkill) {
+    // TODO: Skill arguments? replace template marks in skill body for arguments?
+    //       Right now we just appead the user prompt to the skill body
+    userContent = `${state.promptSkill}\n${state.prompt}`;
+    state.promptSkill = undefined;
+  }
   if (state.messages.length === 0) {
     const envReminder = await injectEnvReminder();
     userContent = `${envReminder}\n\n${userContent}`;

package/src/types.ts

@@ -94,6 +94,7 @@ export type TUIMessage = {
 export type TUIState = {
   options: CliOptions;
   prompt: string;
+  promptSkill?: string;
   messages: Message[]; // Context messages
   tuiMessages: TUIMessage[];
   contextSize?: number;