@livx.cc/agentx 0.99.53 → 0.99.54

package/dist/cli.js

@@ -3031,15 +3031,25 @@ var askUserQuestionTool = {
       multiSelect: { type: "boolean" }
     }
   },
-  async run(args, ctx) {
+  async run(input, ctx) {
+    const args = normalizeQuestion(input);
+    if (typeof args === "string") return args;
     if (!ctx.host?.ask) {
       ctx.needsInput = args;
       return "PAUSED \u2014 no interactive user is reachable from this run, so your question has been raised to the caller that delegated this task. The run stops here; do not guess and do not continue. Their answer will arrive as the next user message when the run resumes.";
     }
     const answer = ctx.host.ask(args);
-    return ctx.parkHuman ? ctx.parkHuman(answer) : answer;
+    return String(await (ctx.parkHuman ? ctx.parkHuman(answer) : answer) ?? "");
   }
 };
+function normalizeQuestion(input) {
+  const raw = input?.questions?.[0] ?? input;
+  const q2 = raw ?? {};
+  const options = (Array.isArray(q2.options) ? q2.options : []).map((o) => typeof o === "string" ? { label: o } : { label: String(o?.label ?? ""), description: o?.description }).filter((o) => o.label.trim());
+  if (typeof q2.question !== "string" || !q2.question.trim() || !options.length)
+    return "Error: AskUserQuestion needs {question: string, options: [{label, description?}] (non-empty)}.";
+  return { question: q2.question, header: typeof q2.header === "string" ? q2.header : void 0, options, multiSelect: q2.multiSelect === true };
+}
 
 // src/relevance.ts
 var STOP = /* @__PURE__ */ new Set([
@@ -8188,8 +8198,8 @@ ${nowLine()}. Anchor every relative or time-sensitive reference \u2014 "today",
             this.emitHost({ ...ev, message: safe });
             return;
           }
-          const held = this.reflexBuf.length - this.reflexForwarded;
-          const partial = held > 0 && /\[\s*t?a?s?k?$/i.test(this.reflexBuf.slice(-Math.min(held, 6)));
+          const held2 = this.reflexBuf.length - this.reflexForwarded;
+          const partial = held2 > 0 && /\[\s*t?a?s?k?$/i.test(this.reflexBuf.slice(-Math.min(held2, 6)));
           let upto = partial ? this.reflexBuf.length - this.reflexBuf.slice(-6).match(/\[\s*t?a?s?k?$/i)[0].length : this.reflexBuf.length;
           const paren = this.reflexBuf.lastIndexOf("(");
           if (paren >= this.reflexForwarded && !this.reflexBuf.includes(")", paren) && this.reflexBuf.length - paren <= 80)
@@ -13006,8 +13016,37 @@ function createLineEditor(out, input = keyInput) {
 }
 var menusOpen = 0;
 var isMenuActive = () => menusOpen > 0;
-function selectMenu(out, opts) {
-  if (!out.isTTY || !process.stdin.isTTY || !opts.items.length) return Promise.resolve(null);
+var held = null;
+function holdOutput() {
+  if (held) return;
+  const h = { orig: /* @__PURE__ */ new Map(), queue: [] };
+  for (const s of [process.stdout, process.stderr]) {
+    h.orig.set(s, s.write);
+    s.write = ((...a) => {
+      h.queue.push([s, a]);
+      const cb = a.find((x) => typeof x === "function");
+      cb?.();
+      return true;
+    });
+  }
+  held = h;
+  process.once("exit", releaseOutput);
+}
+function releaseOutput() {
+  if (!held) return;
+  const h = held;
+  held = null;
+  process.off("exit", releaseOutput);
+  for (const [s, w] of h.orig) s.write = w;
+  for (const [s, a] of h.queue) s.write(...a.filter((x) => typeof x !== "function"));
+}
+function selectMenu(stream, opts) {
+  if (!stream.isTTY || !process.stdin.isTTY || !opts.items.length) return Promise.resolve(null);
+  holdOutput();
+  const raw = held.orig.get(stream);
+  const out = { get columns() {
+    return stream.columns;
+  }, write: (x) => raw ? raw.call(stream, x) : stream.write(x) };
   const maxVisible = opts.maxVisible ?? 10;
   const dim2 = (x) => `\x1B[2m${x}\x1B[0m`;
   const inverse = (x) => `\x1B[7m${x}\x1B[0m`;
@@ -13075,6 +13114,7 @@ function selectMenu(out, opts) {
       keyInput.off("keypress", onKey);
       if (prevLines > 1) out.write(`\x1B[${prevLines - 1}A`);
       out.write("\r\x1B[J");
+      if (!menusOpen) releaseOutput();
       if (!wasRaw) {
         try {
           keyInput.setRawMode(false);
@@ -13640,6 +13680,7 @@ var spinner = /* @__PURE__ */ (() => {
       if (!tty || timer) return;
       t0 = this.turnStart || Date.now();
       timer = setInterval(() => {
+        if (isMenuActive()) return;
         const secs2 = Math.round((Date.now() - t0) / 1e3);
         const tail = this.tail?.();
         err("\r\x1B[2K" + dim(`  ${frames[i = (i + 1) % frames.length]} ${label} ${secs2 ? `${secs2}s \xB7 ` : ""}esc to interrupt`) + (tail ? "  " + tail : ""));
@@ -14001,6 +14042,10 @@ function makeHost(format = "text", opts) {
           process.stdout.write(JSON.stringify({ type: "tool_activity", id: a.id, name: a.name, input: a.input, output: a.output, status: a.status }) + "\n");
           return;
         }
+        if (a.input?.providerIdentifier === "custom-user-tools") {
+          spinner.start();
+          return;
+        }
         const clip = (s) => s.length > 200 ? s.slice(0, 200) + "\u2026" : s;
         const terminal = a.status === "completed" || a.status === "error";
         if (!terminal || !a.id || !activitySeen.has(a.id)) {
@@ -14054,6 +14099,7 @@ function makeHost(format = "text", opts) {
     ...canPrompt ? {
       async ask(q2) {
         const title = `? ${q2.header ? "[" + q2.header + "] " : ""}${q2.question}`;
+        spinner.stop();
         const v = await selectMenu(process.stderr, { title, items: q2.options.map((o) => ({ label: o.label, value: o.label, desc: o.description })) });
         if (v !== null) return v;
         const io = createInterface({ input: keyInput, output: process.stderr });