@noobdemon/noob-cli 1.7.6 → 1.7.8

package/src/tools.js

@@ -98,8 +98,15 @@ process.on("SIGTERM", () => {
   process.exit(143);
 });
 
+// Helper: throw nếu signal đã abort. Dùng ở đầu mỗi tool + giữa các vòng walk dài
+// để tool fs (glob/grep) cũng phản ứng với Ctrl+C, không chỉ run_command.
+function checkAbort(signal) {
+  if (signal?.aborted) throw new Error("aborted");
+}
+
 export const TOOLS = {
-  async read_file({ path: p, offset, limit }) {
+  async read_file({ path: p, offset, limit }, { signal } = {}) {
+    checkAbort(signal);
     const data = await fs.readFile(abs(p), "utf8");
     let lines = data.split("\n");
     const start = offset ? Math.max(0, offset - 1) : 0;
@@ -110,14 +117,16 @@ export const TOOLS = {
     );
   },
 
-  async write_file({ path: p, content }) {
+  async write_file({ path: p, content }, { signal } = {}) {
+    checkAbort(signal);
     await fs.mkdir(path.dirname(abs(p)), { recursive: true });
     await fs.writeFile(abs(p), content ?? "", "utf8");
     const n = (content ?? "").split("\n").length;
     return `Wrote ${n} line(s) to ${rel(abs(p))}`;
   },
 
-  async edit_file({ path: p, old_string, new_string, replace_all }) {
+  async edit_file({ path: p, old_string, new_string, replace_all }, { signal } = {}) {
+    checkAbort(signal);
     const file = abs(p);
     const data = await fs.readFile(file, "utf8");
     if (old_string === new_string) throw new Error("old_string and new_string are identical");
@@ -163,7 +172,8 @@ export const TOOLS = {
     );
   },
 
-  async list_dir({ path: p = "." }) {
+  async list_dir({ path: p = "." }, { signal } = {}) {
+    checkAbort(signal);
     const dir = abs(p);
     const entries = await fs.readdir(dir, { withFileTypes: true });
     const rows = entries
@@ -173,10 +183,13 @@ export const TOOLS = {
     return clip(`${rel(dir)}/  (${rows.length} entries)\n` + rows.map((r) => "  " + r).join("\n"));
   },
 
-  async glob({ pattern }) {
+  async glob({ pattern }, { signal } = {}) {
+    checkAbort(signal);
     const hits = [];
     const rx = globToRegExp(pattern);
     const roots = listRoots();
+    // Check signal mỗi ~256 entries thay vì mỗi entry — đỡ overhead trên repo lớn.
+    let tickCounter = 0;
     for (const root of roots) {
       (function walk(dir) {
         let ents;
@@ -186,6 +199,7 @@ export const TOOLS = {
           return;
         }
         for (const e of ents) {
+          if ((++tickCounter & 0xff) === 0) checkAbort(signal);
           if (SKIP_DIRS.has(e.name) || e.name.startsWith(".git")) continue;
           const full = path.join(dir, e.name);
           if (e.isDirectory()) walk(full);
@@ -198,11 +212,14 @@ export const TOOLS = {
     return hits.length ? clip(hits.join("\n")) : "No files matched.";
   },
 
-  async grep({ pattern, path: p, glob: g }) {
+  async grep({ pattern, path: p, glob: g }, { signal } = {}) {
+    checkAbort(signal);
     const rx = new RegExp(pattern, "i");
     const gRx = g ? globToRegExp(g) : null;
     const out = [];
+    let tickCounter = 0;
     function scanFile(full) {
+      if ((++tickCounter & 0xff) === 0) checkAbort(signal);
       const disp = displayPath(full);
       const relp = disp.split(path.sep).join("/");
       if (gRx && !gRx.test(relp)) return;
@@ -250,7 +267,7 @@ export const TOOLS = {
     return out.length ? clip(out.join("\n")) : "No matches.";
   },
 
-  run_command({ command, timeout = 60000, background = false }) {
+  run_command({ command, timeout = 60000, background = false }, { signal } = {}) {
     const isWin = process.platform === "win32";
     const shell = isWin ? "powershell.exe" : "/bin/bash";
     const args = isWin ? ["-NoProfile", "-NonInteractive", "-Command", command] : ["-c", command];
@@ -289,19 +306,34 @@ export const TOOLS = {
       const child = spawn(shell, args, { cwd: cwd(), stdio: ["ignore", "pipe", "pipe"] });
       let out = "";
       let timedOut = false;
+      let aborted = false;
       const killer = setTimeout(() => {
         timedOut = true;
-        child.kill();
+        killBgTree(child);
       }, timeout);
+      // Ctrl+C trong lúc command đang chạy → kill cây tiến trình con (Windows
+      // dùng taskkill /T để diệt cả grand-children, vd npm spawn node).
+      const onAbort = () => {
+        aborted = true;
+        killBgTree(child);
+      };
+      if (signal) {
+        if (signal.aborted) onAbort();
+        else signal.addEventListener("abort", onAbort, { once: true });
+      }
       child.stdout.on("data", (d) => (out += d));
       child.stderr.on("data", (d) => (out += d));
       child.on("error", (e) => {
         clearTimeout(killer);
+        signal?.removeEventListener?.("abort", onAbort);
         resolve(`Failed to start command: ${e.message}`);
       });
       child.on("close", (code) => {
         clearTimeout(killer);
-        const tail = timedOut
+        signal?.removeEventListener?.("abort", onAbort);
+        const tail = aborted
+          ? `\n[aborted by user (Ctrl+C) — killed.]`
+          : timedOut
           ? `\n[timed out after ${Math.round(timeout / 1000)}s — killed. If this is a server or other long-running task, re-run with {"background": true} instead.]`
           : `\n[exit code ${code}]`;
         resolve(clip((out.trim() || "(no output)") + tail));
@@ -445,8 +477,11 @@ export function describe(name, input) {
   }
 }
 
-export async function runTool(name, input) {
+export async function runTool(name, input, opts = {}) {
   const fn = TOOLS[name];
   if (!fn) throw new Error(`Unknown tool: ${name}`);
-  return await fn(input || {});
+  const { signal } = opts;
+  // Pre-check: nếu user đã Ctrl+C trước khi tool kịp chạy, bail ngay.
+  if (signal?.aborted) throw new Error("aborted");
+  return await fn(input || {}, { signal });
 }

package/src/tui.js

@@ -163,14 +163,20 @@ export function createTui({ onLine, onInterrupt, onEOF, onShiftTab, completer }
   function topRow() {
     if (liveOut) {
       // Khi đang stream prose mà busy, ghép meta (elapsed+token) vào cuối liveOut
-      // để user vẫn thấy phiên đang sống — không bị che status bar.
+      // CHỈ KHI liveOut đủ ngắn để cả dòng (liveOut + meta) chắc chắn fit trong
+      // 1 dòng terminal. Nếu liveOut quá dài → ưu tiên prose, bỏ meta lượt này
+      // (tránh terminal wrap làm dòng tạm kẹt lại trong prose vĩnh viễn — xem
+      // Note "token meter chèn vào prose" trong noob.md).
       if (busy && busyMeta) {
         const meta = c.dim(" · " + busyMeta);
-        const budget = Math.max(0, cols() - visLen(meta));
-        const head = liveOut.length > budget ? liveOut.slice(0, budget) : liveOut;
-        return head + meta;
+        const metaLen = visLen(meta);
+        const liveLen = visLen(liveOut);
+        if (liveLen + metaLen <= cols()) {
+          return liveOut + meta;
+        }
+        // liveOut đã dài: hiện prose nguyên trạng, bỏ meta để tránh wrap.
       }
-      return liveOut.slice(0, cols());
+      return liveOut.length > cols() ? liveOut.slice(0, cols()) : liveOut;
     }
     const spin = FRAMES[frame % FRAMES.length];
     // Khi busy, LUÔN hiện elapsed+tokens (busyMeta) cạnh statusText/busyLabel để

package/src/workflows.js

@@ -0,0 +1,142 @@
+import fs from "node:fs";
+import path from "node:path";
+import os from "node:os";
+
+// CRUD workflow đã lưu. Cảm hứng từ tweet_dump.txt L183–193 ("saving and sharing
+// dynamic workflows"): user nhấn 's' để snapshot prompt template ra file rồi tái
+// dùng. Map sang noob: lưu Markdown ở ~/.noob/workflows/<name>.md, format có
+// front-matter YAML-lite + body là prompt template.
+
+const DIR = path.join(os.homedir(), ".noob", "workflows");
+
+function ensureDir() {
+  try { fs.mkdirSync(DIR, { recursive: true }); } catch {}
+}
+
+// Tên file an toàn — chỉ cho phép [a-z0-9-_], chống path traversal.
+function sanitizeName(name) {
+  if (!name || typeof name !== "string") return null;
+  const trimmed = name.trim().toLowerCase();
+  if (!/^[a-z0-9][a-z0-9_-]{0,63}$/.test(trimmed)) return null;
+  return trimmed;
+}
+
+function filePath(name) {
+  const safe = sanitizeName(name);
+  if (!safe) return null;
+  return path.join(DIR, safe + ".md");
+}
+
+// Parse front-matter cực tối giản: --- ... --- ở đầu file, key: value mỗi dòng.
+function parseFile(raw) {
+  const meta = {};
+  let body = raw;
+  const m = raw.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n([\s\S]*)$/);
+  if (m) {
+    for (const line of m[1].split(/\r?\n/)) {
+      const kv = line.match(/^([a-zA-Z][a-zA-Z0-9_-]*):\s*(.*)$/);
+      if (kv) meta[kv[1]] = kv[2].trim();
+    }
+    body = m[2];
+  }
+  return { meta, body };
+}
+
+function serialize(meta, body) {
+  const lines = ["---"];
+  for (const [k, v] of Object.entries(meta)) {
+    lines.push(`${k}: ${String(v).replace(/\r?\n/g, " ")}`);
+  }
+  lines.push("---");
+  lines.push("");
+  lines.push(body);
+  return lines.join("\n");
+}
+
+// Lưu workflow. Trả về { ok, path?, error? }.
+export function saveWorkflow(name, prompt, opts = {}) {
+  const safe = sanitizeName(name);
+  if (!safe) return { ok: false, error: "invalid_name" };
+  if (!prompt || typeof prompt !== "string" || !prompt.trim()) {
+    return { ok: false, error: "empty_prompt" };
+  }
+  ensureDir();
+  const fp = path.join(DIR, safe + ".md");
+  const meta = {
+    name: safe,
+    created: opts.created || new Date().toISOString(),
+    updated: new Date().toISOString(),
+  };
+  if (opts.description) meta.description = opts.description;
+  try {
+    fs.writeFileSync(fp, serialize(meta, prompt.trim()), "utf8");
+    return { ok: true, path: fp };
+  } catch (e) {
+    return { ok: false, error: e.message };
+  }
+}
+
+// Đọc workflow. Trả về { ok, name, prompt, meta, path } hoặc { ok: false }.
+export function loadWorkflow(name) {
+  const fp = filePath(name);
+  if (!fp) return { ok: false, error: "invalid_name" };
+  if (!fs.existsSync(fp)) return { ok: false, error: "not_found" };
+  try {
+    const raw = fs.readFileSync(fp, "utf8");
+    const { meta, body } = parseFile(raw);
+    return { ok: true, name: sanitizeName(name), prompt: body.trim(), meta, path: fp };
+  } catch (e) {
+    return { ok: false, error: e.message };
+  }
+}
+
+// Liệt kê tất cả workflow đã lưu. Trả về mảng { name, description?, updated? }.
+export function listWorkflows() {
+  ensureDir();
+  let entries;
+  try {
+    entries = fs.readdirSync(DIR);
+  } catch {
+    return [];
+  }
+  const out = [];
+  for (const f of entries) {
+    if (!f.endsWith(".md")) continue;
+    const name = f.slice(0, -3);
+    if (!sanitizeName(name)) continue;
+    try {
+      const raw = fs.readFileSync(path.join(DIR, f), "utf8");
+      const { meta } = parseFile(raw);
+      out.push({
+        name,
+        description: meta.description || "",
+        updated: meta.updated || "",
+      });
+    } catch {
+      out.push({ name, description: "", updated: "" });
+    }
+  }
+  // Sort theo updated desc (mới nhất lên đầu), fallback alphabet.
+  out.sort((a, b) => {
+    if (a.updated && b.updated) return b.updated.localeCompare(a.updated);
+    return a.name.localeCompare(b.name);
+  });
+  return out;
+}
+
+// Xoá workflow. Trả về { ok, error? }.
+export function deleteWorkflow(name) {
+  const fp = filePath(name);
+  if (!fp) return { ok: false, error: "invalid_name" };
+  if (!fs.existsSync(fp)) return { ok: false, error: "not_found" };
+  try {
+    fs.unlinkSync(fp);
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: e.message };
+  }
+}
+
+export function workflowsDir() {
+  return DIR;
+}