@ganglion/xacpx 0.20.2 → 0.20.3-beta.0

package/dist/bridge/bridge-main.js

@@ -3524,18 +3524,19 @@ function buildToolUseEvent(update, driver) {
 function normalizeCursorPlanUpdate(state, update) {
   if (state.driver !== "cursor")
     return;
-  const title = normalizeCursorToolName(update.title);
-  if (!CURSOR_PLAN_TOOL_NAMES.has(title))
+  if (!CURSOR_PLAN_TOOL_NAMES.has(cursorToolIdentity(update)))
     return;
   const input = cursorToolInput(update.rawInput);
-  if (!Array.isArray(input?.todos))
+  const output = cursorToolInput(update.rawOutput);
+  const todos = readCursorTodoList(input) ?? readCursorTodoList(output);
+  if (todos === undefined)
     return;
-  const merge = input.merge === true;
-  if (input.todos.length === 0) {
+  const merge = input?.merge === true || output?.merge === true;
+  if (todos.length === 0) {
     state.cursorPlanEntries.clear();
     return [];
   }
-  const patches = input.todos.map((todo, index) => parseCursorPlanTodo(todo, index)).filter((todo) => todo !== undefined);
+  const patches = todos.map((todo, index) => parseCursorPlanTodo(todo, index)).filter((todo) => todo !== undefined);
   if (patches.length === 0)
     return;
   if (!merge)
@@ -3555,6 +3556,15 @@ function normalizeCursorPlanUpdate(state, update) {
   }
   return [...state.cursorPlanEntries.values()];
 }
+function readCursorTodoList(input) {
+  if (!input)
+    return;
+  for (const key of ["todos", "todoList"]) {
+    if (Array.isArray(input[key]))
+      return input[key];
+  }
+  return;
+}
 function parseCursorPlanTodo(value, index) {
   if (!isRecord2(value))
     return;
@@ -3612,6 +3622,11 @@ function cursorToolInput(rawInput) {
 function normalizeCursorToolName(title) {
   return (title ?? "").trim().toLowerCase().replace(/[\s_-]+/g, "");
 }
+function cursorToolIdentity(update) {
+  const input = cursorToolInput(update.rawInput);
+  const declared = typeof input?.[CURSOR_TOOL_NAME_KEY] === "string" ? input[CURSOR_TOOL_NAME_KEY] : undefined;
+  return normalizeCursorToolName(declared ?? update.title);
+}
 function normalizeToolKind(update, driver) {
   const kindRaw = update?.kind?.trim().toLowerCase() ?? "";
   switch (kindRaw) {
@@ -3624,12 +3639,14 @@ function normalizeToolKind(update, driver) {
   }
   if (driver !== "cursor")
     return "other";
-  switch (normalizeCursorToolName(update?.title)) {
+  switch (cursorToolIdentity(update ?? {})) {
     case "read":
     case "readfile":
       return "read";
     case "grep":
     case "glob":
+    case "find":
+    case "codebasesearch":
     case "search":
       return "search";
     case "shell":
@@ -3647,6 +3664,8 @@ function normalizeToolKind(update, driver) {
     case "runsubagent":
     case "switchmode":
     case "todowrite":
+    case "updatetodos":
+    case "todoread":
     case "createplan":
     case "updateplan":
     case "plan":
@@ -3656,8 +3675,7 @@ function normalizeToolKind(update, driver) {
   }
 }
 function isCursorSubagentInput(rawInput, title) {
-  const normalizedTitle = normalizeCursorToolName(title);
-  if (!CURSOR_SUBAGENT_TOOL_NAMES.has(normalizedTitle))
+  if (!CURSOR_SUBAGENT_TOOL_NAMES.has(cursorToolIdentity({ title, rawInput })))
     return false;
   const input = cursorToolInput(rawInput);
   return input !== undefined && readFirstString(input, ["subagent_type", "subagentType", "agent", "agentType", "prompt", "instructions"]) !== undefined;
@@ -3832,7 +3850,7 @@ function isGenericToolTitle(kind, title) {
   }
   return false;
 }
-var SENTENCE_TERMINAL_AT_END, PARAGRAPH_BOUNDARY_AT_END, PARAGRAPH_BOUNDARY_AT_START, LINE_BREAK_AT_END, LINE_BREAK_AT_START, PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END, CURSOR_PLAN_TOOL_NAMES, CURSOR_SUBAGENT_TOOL_NAMES, USAGE_BREAKDOWN_FIELDS;
+var SENTENCE_TERMINAL_AT_END, PARAGRAPH_BOUNDARY_AT_END, PARAGRAPH_BOUNDARY_AT_START, LINE_BREAK_AT_END, LINE_BREAK_AT_START, PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END, CURSOR_TOOL_NAME_KEY = "_toolName", CURSOR_PLAN_TOOL_NAMES, CURSOR_SUBAGENT_TOOL_NAMES, USAGE_BREAKDOWN_FIELDS;
 var init_streaming_prompt = __esm(() => {
   init_background_followup();
   init_tool_kind_emoji();
@@ -3842,7 +3860,14 @@ var init_streaming_prompt = __esm(() => {
   LINE_BREAK_AT_END = /\r?\n[\t ]*$/;
   LINE_BREAK_AT_START = /^[\t ]*\r?\n/;
   PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END = /\r?\n[\t ]*\r$/;
-  CURSOR_PLAN_TOOL_NAMES = new Set(["todowrite", "createplan", "updateplan", "plan"]);
+  CURSOR_PLAN_TOOL_NAMES = new Set([
+    "todowrite",
+    "createplan",
+    "updateplan",
+    "plan",
+    "updatetodos",
+    "todoread"
+  ]);
   CURSOR_SUBAGENT_TOOL_NAMES = new Set(["task", "delegate", "runsubagent", "subagent"]);
   USAGE_BREAKDOWN_FIELDS = [
     ["inputTokens", ["inputTokens", "input_tokens"]],

package/dist/cli.js

@@ -52917,18 +52917,19 @@ function buildToolUseEvent(update, driver) {
 function normalizeCursorPlanUpdate(state, update) {
   if (state.driver !== "cursor")
     return;
-  const title = normalizeCursorToolName(update.title);
-  if (!CURSOR_PLAN_TOOL_NAMES.has(title))
+  if (!CURSOR_PLAN_TOOL_NAMES.has(cursorToolIdentity(update)))
     return;
   const input = cursorToolInput(update.rawInput);
-  if (!Array.isArray(input?.todos))
+  const output = cursorToolInput(update.rawOutput);
+  const todos = readCursorTodoList(input) ?? readCursorTodoList(output);
+  if (todos === undefined)
     return;
-  const merge2 = input.merge === true;
-  if (input.todos.length === 0) {
+  const merge2 = input?.merge === true || output?.merge === true;
+  if (todos.length === 0) {
     state.cursorPlanEntries.clear();
     return [];
   }
-  const patches = input.todos.map((todo, index) => parseCursorPlanTodo(todo, index)).filter((todo) => todo !== undefined);
+  const patches = todos.map((todo, index) => parseCursorPlanTodo(todo, index)).filter((todo) => todo !== undefined);
   if (patches.length === 0)
     return;
   if (!merge2)
@@ -52948,6 +52949,15 @@ function normalizeCursorPlanUpdate(state, update) {
   }
   return [...state.cursorPlanEntries.values()];
 }
+function readCursorTodoList(input) {
+  if (!input)
+    return;
+  for (const key of ["todos", "todoList"]) {
+    if (Array.isArray(input[key]))
+      return input[key];
+  }
+  return;
+}
 function parseCursorPlanTodo(value, index) {
   if (!isRecord4(value))
     return;
@@ -53005,6 +53015,11 @@ function cursorToolInput(rawInput) {
 function normalizeCursorToolName(title) {
   return (title ?? "").trim().toLowerCase().replace(/[\s_-]+/g, "");
 }
+function cursorToolIdentity(update) {
+  const input = cursorToolInput(update.rawInput);
+  const declared = typeof input?.[CURSOR_TOOL_NAME_KEY] === "string" ? input[CURSOR_TOOL_NAME_KEY] : undefined;
+  return normalizeCursorToolName(declared ?? update.title);
+}
 function normalizeToolKind(update, driver) {
   const kindRaw = update?.kind?.trim().toLowerCase() ?? "";
   switch (kindRaw) {
@@ -53017,12 +53032,14 @@ function normalizeToolKind(update, driver) {
   }
   if (driver !== "cursor")
     return "other";
-  switch (normalizeCursorToolName(update?.title)) {
+  switch (cursorToolIdentity(update ?? {})) {
     case "read":
     case "readfile":
       return "read";
     case "grep":
     case "glob":
+    case "find":
+    case "codebasesearch":
     case "search":
       return "search";
     case "shell":
@@ -53040,6 +53057,8 @@ function normalizeToolKind(update, driver) {
     case "runsubagent":
     case "switchmode":
     case "todowrite":
+    case "updatetodos":
+    case "todoread":
     case "createplan":
     case "updateplan":
     case "plan":
@@ -53049,8 +53068,7 @@ function normalizeToolKind(update, driver) {
   }
 }
 function isCursorSubagentInput(rawInput, title) {
-  const normalizedTitle = normalizeCursorToolName(title);
-  if (!CURSOR_SUBAGENT_TOOL_NAMES.has(normalizedTitle))
+  if (!CURSOR_SUBAGENT_TOOL_NAMES.has(cursorToolIdentity({ title, rawInput })))
     return false;
   const input = cursorToolInput(rawInput);
   return input !== undefined && readFirstString(input, ["subagent_type", "subagentType", "agent", "agentType", "prompt", "instructions"]) !== undefined;
@@ -53225,7 +53243,7 @@ function isGenericToolTitle(kind, title) {
   }
   return false;
 }
-var SENTENCE_TERMINAL_AT_END, PARAGRAPH_BOUNDARY_AT_END, PARAGRAPH_BOUNDARY_AT_START, LINE_BREAK_AT_END, LINE_BREAK_AT_START, PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END, CURSOR_PLAN_TOOL_NAMES, CURSOR_SUBAGENT_TOOL_NAMES, USAGE_BREAKDOWN_FIELDS;
+var SENTENCE_TERMINAL_AT_END, PARAGRAPH_BOUNDARY_AT_END, PARAGRAPH_BOUNDARY_AT_START, LINE_BREAK_AT_END, LINE_BREAK_AT_START, PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END, CURSOR_TOOL_NAME_KEY = "_toolName", CURSOR_PLAN_TOOL_NAMES, CURSOR_SUBAGENT_TOOL_NAMES, USAGE_BREAKDOWN_FIELDS;
 var init_streaming_prompt = __esm(() => {
   init_background_followup();
   init_tool_kind_emoji();
@@ -53235,7 +53253,14 @@ var init_streaming_prompt = __esm(() => {
   LINE_BREAK_AT_END = /\r?\n[\t ]*$/;
   LINE_BREAK_AT_START = /^[\t ]*\r?\n/;
   PARTIAL_CRLF_PARAGRAPH_BOUNDARY_AT_END = /\r?\n[\t ]*\r$/;
-  CURSOR_PLAN_TOOL_NAMES = new Set(["todowrite", "createplan", "updateplan", "plan"]);
+  CURSOR_PLAN_TOOL_NAMES = new Set([
+    "todowrite",
+    "createplan",
+    "updateplan",
+    "plan",
+    "updatetodos",
+    "todoread"
+  ]);
   CURSOR_SUBAGENT_TOOL_NAMES = new Set(["task", "delegate", "runsubagent", "subagent"]);
   USAGE_BREAKDOWN_FIELDS = [
     ["inputTokens", ["inputTokens", "input_tokens"]],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ganglion/xacpx",
-  "version": "0.20.2",
+  "version": "0.20.3-beta.0",
   "description": "随时随地通过聊天频道（微信 / 飞书 / 元宝等）远程控制 `acpx` 上的 Claude Code、Codex 等 Agents。",
   "keywords": [
     "acpx",