@ai-setting/roy-task-plugin 0.6.0 → 0.6.1

package/dist/cli.js

@@ -142,7 +142,7 @@ var CREATED_LINE = /Task created(?:\s+successfully)?\s*:\s*#(\d+)/;
 function extractCreatedTask(text, titleHint) {
   if (!text)
     return;
-  return fromJson(text) ?? fromEmbeddedTaskObject(text) ?? fromTaskObjectBlob(text) ?? fromSuccessLine(text, titleHint);
+  return fromJson(text) ?? fromSuccessLine(text, titleHint) ?? fromEmbeddedTaskObject(text) ?? fromTaskObjectBlob(text);
 }
 function uniqueTaskId(text) {
   let id;
@@ -199,10 +199,7 @@ function titleFromCreatedActionTitle(text) {
 var BLOB_GATE = ['"taskId"', '"actionTitle"', "Task created:"];
 function fromEmbeddedTaskObject(text) {
   let found;
-  for (const obj of topLevelObjects(text)) {
-    const task = taskFromObject(obj);
-    if (!task)
-      continue;
+  for (const task of taskCandidates(text, jsonTree(text))) {
     if (found === undefined)
       found = task;
     else if (found.id !== task.id)
@@ -210,6 +207,49 @@ function fromEmbeddedTaskObject(text) {
   }
   return found;
 }
+function looksLikeArrayStart(text, at) {
+  for (let i = at + 1;i < text.length; i++) {
+    const ch = text[i];
+    if (ch === " " || ch === "\t" || ch === `
+` || ch === "\r")
+      continue;
+    return ch === "{" || ch === "[" || ch === '"' || ch === "]";
+  }
+  return false;
+}
+function taskCandidates(text, roots) {
+  const out = [];
+  const pending = [...roots].reverse();
+  while (pending.length > 0) {
+    const node = pending.pop();
+    if (node.end < 0) {
+      if (node.ch === "[" && looksLikeArrayStart(text, node.start))
+        continue;
+      pushChildren(pending, node);
+      continue;
+    }
+    if (node.ch === "[")
+      continue;
+    const parsed = parseObject(text, node);
+    const task = parsed ? taskFromObject(parsed) : undefined;
+    if (task)
+      out.push(task);
+  }
+  return out;
+}
+function pushChildren(pending, node) {
+  for (let i = node.children.length - 1;i >= 0; i--)
+    pending.push(node.children[i]);
+}
+function parseObject(text, node) {
+  try {
+    const parsed = JSON.parse(text.slice(node.start, node.end + 1));
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      return parsed;
+    }
+  } catch {}
+  return;
+}
 function taskFromObject(obj) {
   const id = obj["id"];
   const title = obj["title"];
@@ -219,60 +259,36 @@ function taskFromObject(obj) {
     return;
   return { id, title: title.trim() };
 }
-function topLevelObjects(text) {
-  const out = [];
-  let depth = 0;
+function jsonTree(text) {
+  const roots = [];
+  const stack = [];
   let inString = false;
   let escaped = false;
-  let start = -1;
+  const open = (ch, at) => {
+    const node = { ch, start: at, end: -1, children: [] };
+    const parent = stack[stack.length - 1];
+    (parent ? parent.children : roots).push(node);
+    stack.push(node);
+  };
+  const close = (ch, at) => {
+    const want = ch === "}" ? "{" : "[";
+    let k = stack.length - 1;
+    while (k >= 0 && stack[k].ch !== want)
+      k--;
+    if (k < 0)
+      return;
+    stack.length = k + 1;
+    const node = stack.pop();
+    node.end = at;
+  };
   for (let i = 0;i < text.length; i++) {
     const ch = text[i];
     if (inString) {
-      if (escaped)
-        escaped = false;
-      else if (ch === "\\")
-        escaped = true;
-      else if (ch === '"')
+      if (ch === `
+`) {
         inString = false;
-      continue;
-    }
-    if (ch === '"') {
-      inString = true;
-      continue;
-    }
-    if (ch === "{") {
-      if (depth === 0 && !insideArray(text, i))
-        start = i;
-      depth++;
-      continue;
-    }
-    if (ch === "]" && depth === 0)
-      continue;
-    if (ch !== "}")
-      continue;
-    depth--;
-    if (depth !== 0 || start < 0)
-      continue;
-    const slice = text.slice(start, i + 1);
-    start = -1;
-    try {
-      const parsed = JSON.parse(slice);
-      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-        out.push(parsed);
-      }
-    } catch {}
-  }
-  return out;
-}
-function insideArray(text, at) {
-  let brackets = 0;
-  let braces = 0;
-  let inString = false;
-  let escaped = false;
-  for (let i = 0;i < at; i++) {
-    const ch = text[i];
-    if (inString) {
-      if (escaped)
+        escaped = false;
+      } else if (escaped)
         escaped = false;
       else if (ch === "\\")
         escaped = true;
@@ -282,16 +298,12 @@ function insideArray(text, at) {
     }
     if (ch === '"')
       inString = true;
-    else if (ch === "{")
-      braces++;
-    else if (ch === "}")
-      braces--;
-    else if (ch === "[")
-      brackets++;
-    else if (ch === "]")
-      brackets--;
+    else if (ch === "{" || ch === "[")
+      open(ch, i);
+    else if (ch === "}" || ch === "]")
+      close(ch, i);
   }
-  return brackets > 0 && braces <= 0;
+  return roots;
 }
 function fromSuccessLine(text, titleHint) {
   const m = CREATED_LINE.exec(text);
@@ -1162,6 +1174,7 @@ function createRoyAgentCardPort(options = {}) {
     return inFlight;
   };
   return {
+    enabled: true,
     async start(input) {
       const n = await withTimeout("load", getNotifier(), opTimeoutMs);
       return withTimeout("start", n.startTask({
@@ -1200,6 +1213,7 @@ function createRoyAgentCardPort(options = {}) {
 }
 function createNoopCardPort() {
   return {
+    enabled: false,
     async start() {
       return { messageId: "", pinned: false };
     },
@@ -1248,6 +1262,8 @@ function cardReport(handle) {
     out.cardMessageId = handle.messageId;
   if (handle.error)
     out.cardError = handle.error;
+  if (handle.cardWantedButNoTask && !handle.messageId && !handle.error)
+    out.cardExpected = true;
   if (handle.meta && typeof handle.meta.id === "number")
     out.taskId = handle.meta.id;
   return out;
@@ -1433,6 +1449,7 @@ class Dispatcher {
           plan,
           error: sent.error ?? "unknown",
           text: result.text,
+          ...createdTaskReport(result.createdTask),
           ...cardReport(card)
         };
       }
@@ -1447,6 +1464,7 @@ class Dispatcher {
         plan,
         replyMessageId: sent.messageId,
         text: result.text,
+        ...createdTaskReport(result.createdTask),
         ...cardReport(card)
       };
     };
@@ -1456,8 +1474,10 @@ class Dispatcher {
     const handle = { messageId: "" };
     if (!this.deps.card)
       return handle;
-    if (!input.createdTask)
+    if (!input.createdTask) {
+      handle.cardWantedButNoTask = this.deps.card.enabled === true;
       return handle;
+    }
     const meta = buildCardMeta({
       task: input.createdTask,
       messageId: input.messageId,
@@ -2308,13 +2328,14 @@ function formatBanner(options, commands, maxConcurrency) {
 `);
 }
 function cardSuffix(result) {
-  if (!("cardMessageId" in result) && !("cardError" in result))
-    return "";
-  if (result.cardError)
+  if ("cardError" in result && result.cardError)
     return `  card=FAILED(${result.cardError})`;
-  if (result.cardMessageId)
+  if ("cardMessageId" in result && result.cardMessageId)
     return `  card=${result.cardMessageId}`;
-  return "  card=none(no task created)";
+  return result.cardExpected ? "  card=none(no task created)" : "";
+}
+function taskSuffix(result) {
+  return result.taskId === undefined ? "" : `  task=${result.taskId}`;
 }
 function formatResult(label, result) {
   const card = cardSuffix(result);
@@ -2326,13 +2347,13 @@ function formatResult(label, result) {
     case "duplicate":
       return `[roy-task] ${label} duplicate dropped key=${result.key ?? "(unknown)"}`;
     case "no-output":
-      return `[roy-task] ${label} no-output (agent produced no text; not replying) ` + `toolCalls=${result.toolCalls}${card}`;
+      return `[roy-task] ${label} no-output (agent produced no text; not replying) ` + `toolCalls=${result.toolCalls}${taskSuffix(result)}${card}`;
     case "no-reply":
-      return `[roy-task] ${label} no-reply (reply disabled) chars=${result.text.length}${card}`;
+      return `[roy-task] ${label} no-reply (reply disabled) chars=${result.text.length}${taskSuffix(result)}${card}`;
     case "agent-error":
-      return `[roy-task] ${label} agent-error: ${result.error}${card}`;
+      return `[roy-task] ${label} agent-error: ${result.error}${taskSuffix(result)}${card}`;
     case "reply-failed":
-      return `[roy-task] ${label} reply-failed: ${result.error}${card}`;
+      return `[roy-task] ${label} reply-failed: ${result.error}${taskSuffix(result)}${card}`;
     case "no-target":
       return `[roy-task] ${label} skipped: ${result.reason}`;
   }
@@ -2462,7 +2483,7 @@ function formatStatus(report) {
 }
 
 // ../../../packages/cli/src/main.ts
-var VERSION = "0.6.0";
+var VERSION = "0.6.1";
 async function main(argv) {
   const parsed = parseArgs(argv);
   switch (parsed.command) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-task-plugin",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {