@ganglion/xacpx 0.20.0 → 0.20.2

package/dist/bridge/bridge-main.js

@@ -2102,9 +2102,9 @@ function decodeTarget(value) {
     return null;
   if (parseCanonicalFileTime(item.creationDate) === null)
     return null;
-  if (item.commandLine !== undefined && typeof item.commandLine !== "string")
+  if (item.commandLine !== undefined && item.commandLine !== null && typeof item.commandLine !== "string")
     return null;
-  if (item.executablePath !== undefined && typeof item.executablePath !== "string")
+  if (item.executablePath !== undefined && item.executablePath !== null && typeof item.executablePath !== "string")
     return null;
   return {
     pid: Number(item.pid),
@@ -2228,8 +2228,9 @@ async function terminateWindowsResidual(target, options = {}) {
 }
 async function runPowerShellWorker(request, deadlineMs) {
   return await new Promise((resolve2, reject) => {
-    const child = spawn("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command", "-"], {
-      stdio: ["pipe", "pipe", "pipe"],
+    const encodedScript = Buffer.from(WINDOWS_TREE_WORKER_SCRIPT, "utf16le").toString("base64");
+    const child = spawn("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand", encodedScript], {
+      stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true,
       env: {
         ...process.env,
@@ -2266,7 +2267,6 @@ async function runPowerShellWorker(request, deadlineMs) {
     });
     child.once("error", (error) => finish(error));
     child.once("close", (code) => code === 0 ? finish() : finish(new Error(`Windows process worker failed (${code}): ${stderr}`)));
-    child.stdin.end(WINDOWS_TREE_WORKER_SCRIPT);
   });
 }
 var UUID, OUTCOMES, WINDOWS_TREE_WORKER_SCRIPT;
@@ -2375,7 +2375,14 @@ if($request.action -eq 'terminate-one-cim'){
   if(!$check.ok){Write-Output (@{outcome=$check.status} | ConvertTo-Json -Compress);exit 0}
   try {
     if(![XacpxNativeProcess]::Alive($check.handle)){$status='already-exited'}
-    elseif(![XacpxNativeProcess]::Kill($check.handle)){$status=if([XacpxNativeProcess]::LastError() -eq 5){'access-denied'}else{'query-failed'}}
+    elseif(![XacpxNativeProcess]::Kill($check.handle)){
+      $code=[XacpxNativeProcess]::LastError()
+      # Ancestor kills can cascade through Job objects (libuv/Node children
+      # die with their parent), so a failed kill on an already-dying process
+      # is a confirmed exit, not a denial.
+      if([XacpxNativeProcess]::WaitDead($check.handle)){$status='already-exited'}
+      else{$status=if($code -eq 5){'access-denied'}else{'query-failed'}}
+    }
     else{$status=if([XacpxNativeProcess]::WaitDead($check.handle)){'killed'}else{'kill-requested-unconfirmed'}}
     Write-Output (@{outcome=$status} | ConvertTo-Json -Compress);exit 0
   } finally {[XacpxNativeProcess]::Close($check.handle)}
@@ -2430,7 +2437,15 @@ try {
   foreach($node in $nodes){
     $h=$handles[$node.pid]
     if(![XacpxNativeProcess]::Alive($h)){[void]$outcomes.Add((Outcome $node 'already-exited'));continue}
-    if(![XacpxNativeProcess]::Kill($h)){$status=if([XacpxNativeProcess]::LastError() -eq 5){'access-denied'}else{'query-failed'};[void]$outcomes.Add((Outcome $node $status));continue}
+    if(![XacpxNativeProcess]::Kill($h)){
+      $code=[XacpxNativeProcess]::LastError()
+      # Ancestor kills can cascade through Job objects (libuv/Node children
+      # die with their parent), so a failed kill on an already-dying process
+      # is a confirmed exit, not a denial.
+      if([XacpxNativeProcess]::WaitDead($h)){$status='already-exited'}
+      else{$status=if($code -eq 5){'access-denied'}else{'query-failed'}}
+      [void]$outcomes.Add((Outcome $node $status));continue
+    }
     $status=if([XacpxNativeProcess]::WaitDead($h)){'killed'}else{'kill-requested-unconfirmed'}
     [void]$outcomes.Add((Outcome $node $status))
   }
@@ -3245,6 +3260,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     emittedToolCallIds: new Set,
     positionedToolCallIds: new Set,
     toolCalls: new Map,
+    cursorPlanEntries: new Map,
     toolEventMode,
     driver,
     rawStream,
@@ -3303,13 +3319,17 @@ function parseStreamingChunks(state, line) {
     }
     const wantsStructured = state.toolEventMode === "structured" || state.toolEventMode === "both";
     const wantsText = (state.toolEventMode === "text" || state.toolEventMode === "both") && state.formatToolCalls;
-    if (wantsStructured && state.onToolEvent) {
-      const merged = update.toolCallId ? mergeToolCallUpdate(state, update.toolCallId, update) : update;
+    const merged = update.toolCallId && (state.onToolEvent || state.onPlan) ? mergeToolCallUpdate(state, update.toolCallId, update) : update;
+    const cursorPlan = normalizeCursorPlanUpdate(state, merged);
+    const consumedAsPlan = cursorPlan !== undefined && state.onPlan !== undefined;
+    if (consumedAsPlan) {
+      state.onPlan?.(cursorPlan);
+    } else if (wantsStructured && state.onToolEvent) {
       const toolEvent = buildToolUseEvent(merged, state.driver);
       if (toolEvent)
         state.onToolEvent(toolEvent);
     }
-    if (wantsText) {
+    if (wantsText && !consumedAsPlan) {
       const formatted = formatToolCallEvent(update, update.sessionUpdate);
       if (formatted) {
         const toolCallId = update.toolCallId;
@@ -3325,7 +3345,7 @@ function parseStreamingChunks(state, line) {
   }
   if (update.sessionUpdate === "plan") {
     const entries = Array.isArray(update.entries) ? update.entries.filter((x) => !!x && typeof x === "object" && typeof x.content === "string" && typeof x.status === "string") : [];
-    if (entries.length > 0)
+    if (Array.isArray(update.entries))
       state.onPlan?.(entries);
     return;
   }
@@ -3437,7 +3457,7 @@ function isEmptyToolField(v) {
 function mergeToolCallUpdate(state, toolCallId, update) {
   const prev = state.toolCalls.get(toolCallId) ?? { toolCallId };
   const merged = { ...prev };
-  for (const key of ["kind", "title", "rawInput", "content", "rawOutput", "locations", "status"]) {
+  for (const key of ["kind", "title", "toolCallId", "parentToolCallId", "rawInput", "content", "rawOutput", "locations", "status"]) {
     const next = update[key];
     if (!isEmptyToolField(next))
       merged[key] = next;
@@ -3469,19 +3489,7 @@ function buildToolUseEvent(update, driver) {
   const toolCallId = update.toolCallId;
   if (!toolCallId)
     return null;
-  const kindRaw = update.kind ?? "";
-  const kind = (() => {
-    switch (kindRaw) {
-      case "read":
-      case "search":
-      case "execute":
-      case "edit":
-      case "think":
-        return kindRaw;
-      default:
-        return "other";
-    }
-  })();
+  const kind = normalizeToolKind(update, driver);
   const title = (update.title ?? "").trim();
   const toolName = title || "Tool";
   const summaryRaw = summarizeToolInput(update.rawInput, title) || summarizeToolInput(update.rawOutput, title);
@@ -3497,8 +3505,8 @@ function buildToolUseEvent(update, driver) {
   const content = update.content;
   const rawOutput = update.rawOutput ?? claudeToolResponse;
   const locations = update.locations;
-  const parentToolCallId = claudeMeta?.parentToolUseId?.trim();
-  const isSubagent = claudeMeta?.toolName === "Agent" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" || driver === "kimi" && isKimiSubagentInput(rawInput) || driver === "codex" && isCodexSubagentMeta(update._meta?.codex?.subagent);
+  const parentToolCallId = claudeMeta?.parentToolUseId?.trim() || update.parentToolCallId?.trim();
+  const isSubagent = claudeMeta?.toolName === "Agent" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" || driver === "kimi" && isKimiSubagentInput(rawInput) || driver === "codex" && isCodexSubagentMeta(update._meta?.codex?.subagent) || driver === "cursor" && isCursorSubagentInput(rawInput, title);
   return {
     toolCallId,
     ...parentToolCallId ? { parentToolCallId } : {},
@@ -3513,6 +3521,147 @@ function buildToolUseEvent(update, driver) {
     status
   };
 }
+function normalizeCursorPlanUpdate(state, update) {
+  if (state.driver !== "cursor")
+    return;
+  const title = normalizeCursorToolName(update.title);
+  if (!CURSOR_PLAN_TOOL_NAMES.has(title))
+    return;
+  const input = cursorToolInput(update.rawInput);
+  if (!Array.isArray(input?.todos))
+    return;
+  const merge = input.merge === true;
+  if (input.todos.length === 0) {
+    state.cursorPlanEntries.clear();
+    return [];
+  }
+  const patches = input.todos.map((todo, index) => parseCursorPlanTodo(todo, index)).filter((todo) => todo !== undefined);
+  if (patches.length === 0)
+    return;
+  if (!merge)
+    state.cursorPlanEntries.clear();
+  for (const patch of patches) {
+    const previous = state.cursorPlanEntries.get(patch.key);
+    const content = patch.content ?? previous?.content;
+    if (!content)
+      continue;
+    const status = patch.status ?? previous?.status ?? "pending";
+    const priority = patch.priority ?? previous?.priority;
+    state.cursorPlanEntries.set(patch.key, {
+      content,
+      status,
+      ...priority ? { priority } : {}
+    });
+  }
+  return [...state.cursorPlanEntries.values()];
+}
+function parseCursorPlanTodo(value, index) {
+  if (!isRecord2(value))
+    return;
+  const id = readFirstString(value, ["id", "todoId", "taskId"]);
+  const content = readFirstString(value, ["content", "task", "description", "title", "text"]);
+  const key = id ? `id:${id}` : content ? `content:${content}` : `index:${index}`;
+  const status = normalizeCursorPlanStatus(value.status ?? value.state);
+  const priority = normalizePlanPriority(value.priority);
+  if (!content && !status && !priority && !id)
+    return;
+  return {
+    key,
+    ...content ? { content } : {},
+    ...status ? { status } : {},
+    ...priority ? { priority } : {}
+  };
+}
+function normalizeCursorPlanStatus(value) {
+  if (typeof value !== "string")
+    return;
+  const normalized = value.trim().toLowerCase().replace(/[\s-]+/g, "_").replace(/^todo_status_/, "");
+  switch (normalized) {
+    case "pending":
+    case "todo":
+    case "not_started":
+    case "notstarted":
+    case "incomplete":
+      return "pending";
+    case "in_progress":
+    case "inprogress":
+    case "active":
+    case "working":
+      return "in_progress";
+    case "completed":
+    case "complete":
+    case "done":
+    case "finished":
+      return "completed";
+    default:
+      return;
+  }
+}
+function normalizePlanPriority(value) {
+  if (value !== "high" && value !== "medium" && value !== "low")
+    return;
+  return value;
+}
+function cursorToolInput(rawInput) {
+  if (!isRecord2(rawInput))
+    return;
+  if (isRecord2(rawInput.args))
+    return rawInput.args;
+  return rawInput;
+}
+function normalizeCursorToolName(title) {
+  return (title ?? "").trim().toLowerCase().replace(/[\s_-]+/g, "");
+}
+function normalizeToolKind(update, driver) {
+  const kindRaw = update?.kind?.trim().toLowerCase() ?? "";
+  switch (kindRaw) {
+    case "read":
+    case "search":
+    case "execute":
+    case "edit":
+    case "think":
+      return kindRaw;
+  }
+  if (driver !== "cursor")
+    return "other";
+  switch (normalizeCursorToolName(update?.title)) {
+    case "read":
+    case "readfile":
+      return "read";
+    case "grep":
+    case "glob":
+    case "search":
+      return "search";
+    case "shell":
+    case "bash":
+    case "terminal":
+      return "execute";
+    case "strreplace":
+    case "replace":
+    case "edit":
+    case "write":
+    case "delete":
+      return "edit";
+    case "task":
+    case "delegate":
+    case "runsubagent":
+    case "switchmode":
+    case "todowrite":
+    case "createplan":
+    case "updateplan":
+    case "plan":
+      return "think";
+    default:
+      return "other";
+  }
+}
+function isCursorSubagentInput(rawInput, title) {
+  const normalizedTitle = normalizeCursorToolName(title);
+  if (!CURSOR_SUBAGENT_TOOL_NAMES.has(normalizedTitle))
+    return false;
+  const input = cursorToolInput(rawInput);
+  return input !== undefined && readFirstString(input, ["subagent_type", "subagentType", "agent", "agentType", "prompt", "instructions"]) !== undefined;
+}
 function isKimiSubagentInput(rawInput) {
   return isRecord2(rawInput) && readFirstString(rawInput, ["prompt"]) !== undefined && readFirstString(rawInput, ["subagent_type", "subagentType"]) !== undefined;
 }
@@ -3527,6 +3676,12 @@ function summarizeToolInput(rawInput, title = "") {
   }
   if (!isRecord2(rawInput))
     return;
+  const nestedInput = cursorToolInput(rawInput);
+  if (nestedInput !== rawInput) {
+    const nestedSummary = summarizeToolInput(nestedInput, title);
+    if (nestedSummary)
+      return nestedSummary;
+  }
   const taskSummary = summarizeTaskInput(rawInput, title);
   if (taskSummary)
     return taskSummary;
@@ -3547,6 +3702,16 @@ function summarizeToolInput(rawInput, title = "") {
       return parts.join(" ");
     }
   }
+  const globPattern = readFirstString(rawInput, ["glob_pattern"]);
+  if (globPattern) {
+    const targetDirectory = readFirstString(rawInput, ["target_directory"]);
+    return targetDirectory ? `${globPattern} in ${targetDirectory}` : globPattern;
+  }
+  const mode = readFirstString(rawInput, ["target_mode_id", "mode_id"]);
+  const explanation = readFirstString(rawInput, ["explanation"]);
+  if (mode || explanation) {
+    return mode && explanation ? `${mode}: ${explanation}` : mode ?? explanation;
+  }
   return readFirstString(rawInput, [
     "path",
     "file",
@@ -3560,6 +3725,7 @@ function summarizeToolInput(rawInput, title = "") {
     "pattern",
     "text",
     "search",
+    "working_directory",
     "name",
     "description"
   ]);
@@ -3666,7 +3832,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, 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_PLAN_TOOL_NAMES, CURSOR_SUBAGENT_TOOL_NAMES, USAGE_BREAKDOWN_FIELDS;
 var init_streaming_prompt = __esm(() => {
   init_background_followup();
   init_tool_kind_emoji();
@@ -3676,6 +3842,8 @@ 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_SUBAGENT_TOOL_NAMES = new Set(["task", "delegate", "runsubagent", "subagent"]);
   USAGE_BREAKDOWN_FIELDS = [
     ["inputTokens", ["inputTokens", "input_tokens"]],
     ["outputTokens", ["outputTokens", "output_tokens"]],
@@ -7210,13 +7378,14 @@ async function verifyAcpInitialize(command, args, options = {}) {
   let stdoutBuffer = "";
   let settled = false;
   let timer;
-  let windowsTarget;
-  if (process.platform === "win32" && child.pid) {
+  const windowsProbe = (async () => {
+    if (process.platform !== "win32" || !child.pid)
+      return;
     const identity = await probeWindowsProcessIdentity(child.pid);
-    if (identity.status === "found") {
-      windowsTarget = { pid: child.pid, creationDate: identity.identity.creationDate, executablePath: identity.identity.executablePath };
-    }
-  }
+    if (identity.status !== "found")
+      return;
+    return { pid: child.pid, creationDate: identity.identity.creationDate, executablePath: identity.identity.executablePath };
+  })();
   try {
     await new Promise((resolve2, reject) => {
       const finish = (error) => {
@@ -7301,6 +7470,7 @@ async function verifyAcpInitialize(command, args, options = {}) {
     child.stdin.destroy();
     child.stdout.destroy();
     child.stderr.destroy();
+    const windowsTarget = await windowsProbe;
     if (process.platform !== "win32" || windowsTarget) {
       await terminateProcessTree(windowsTarget ?? child.pid ?? 0, { detachedProcessGroup: detached });
     }

package/dist/cli.js

@@ -4816,9 +4816,9 @@ function decodeTarget(value) {
     return null;
   if (parseCanonicalFileTime(item.creationDate) === null)
     return null;
-  if (item.commandLine !== undefined && typeof item.commandLine !== "string")
+  if (item.commandLine !== undefined && item.commandLine !== null && typeof item.commandLine !== "string")
     return null;
-  if (item.executablePath !== undefined && typeof item.executablePath !== "string")
+  if (item.executablePath !== undefined && item.executablePath !== null && typeof item.executablePath !== "string")
     return null;
   return {
     pid: Number(item.pid),
@@ -4942,8 +4942,9 @@ async function terminateWindowsResidual(target, options = {}) {
 }
 async function runPowerShellWorker(request, deadlineMs) {
   return await new Promise((resolve2, reject) => {
-    const child = spawn2("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command", "-"], {
-      stdio: ["pipe", "pipe", "pipe"],
+    const encodedScript = Buffer.from(WINDOWS_TREE_WORKER_SCRIPT, "utf16le").toString("base64");
+    const child = spawn2("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand", encodedScript], {
+      stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true,
       env: {
         ...process.env,
@@ -4980,7 +4981,6 @@ async function runPowerShellWorker(request, deadlineMs) {
     });
     child.once("error", (error) => finish(error));
     child.once("close", (code) => code === 0 ? finish() : finish(new Error(`Windows process worker failed (${code}): ${stderr}`)));
-    child.stdin.end(WINDOWS_TREE_WORKER_SCRIPT);
   });
 }
 var UUID, OUTCOMES, WINDOWS_TREE_WORKER_SCRIPT;
@@ -5089,7 +5089,14 @@ if($request.action -eq 'terminate-one-cim'){
   if(!$check.ok){Write-Output (@{outcome=$check.status} | ConvertTo-Json -Compress);exit 0}
   try {
     if(![XacpxNativeProcess]::Alive($check.handle)){$status='already-exited'}
-    elseif(![XacpxNativeProcess]::Kill($check.handle)){$status=if([XacpxNativeProcess]::LastError() -eq 5){'access-denied'}else{'query-failed'}}
+    elseif(![XacpxNativeProcess]::Kill($check.handle)){
+      $code=[XacpxNativeProcess]::LastError()
+      # Ancestor kills can cascade through Job objects (libuv/Node children
+      # die with their parent), so a failed kill on an already-dying process
+      # is a confirmed exit, not a denial.
+      if([XacpxNativeProcess]::WaitDead($check.handle)){$status='already-exited'}
+      else{$status=if($code -eq 5){'access-denied'}else{'query-failed'}}
+    }
     else{$status=if([XacpxNativeProcess]::WaitDead($check.handle)){'killed'}else{'kill-requested-unconfirmed'}}
     Write-Output (@{outcome=$status} | ConvertTo-Json -Compress);exit 0
   } finally {[XacpxNativeProcess]::Close($check.handle)}
@@ -5144,7 +5151,15 @@ try {
   foreach($node in $nodes){
     $h=$handles[$node.pid]
     if(![XacpxNativeProcess]::Alive($h)){[void]$outcomes.Add((Outcome $node 'already-exited'));continue}
-    if(![XacpxNativeProcess]::Kill($h)){$status=if([XacpxNativeProcess]::LastError() -eq 5){'access-denied'}else{'query-failed'};[void]$outcomes.Add((Outcome $node $status));continue}
+    if(![XacpxNativeProcess]::Kill($h)){
+      $code=[XacpxNativeProcess]::LastError()
+      # Ancestor kills can cascade through Job objects (libuv/Node children
+      # die with their parent), so a failed kill on an already-dying process
+      # is a confirmed exit, not a denial.
+      if([XacpxNativeProcess]::WaitDead($h)){$status='already-exited'}
+      else{$status=if($code -eq 5){'access-denied'}else{'query-failed'}}
+      [void]$outcomes.Add((Outcome $node $status));continue
+    }
     $status=if([XacpxNativeProcess]::WaitDead($h)){'killed'}else{'kill-requested-unconfirmed'}
     [void]$outcomes.Add((Outcome $node $status))
   }
@@ -5222,13 +5237,14 @@ async function verifyAcpInitialize(command, args, options = {}) {
   let stdoutBuffer = "";
   let settled = false;
   let timer;
-  let windowsTarget;
-  if (process.platform === "win32" && child.pid) {
+  const windowsProbe = (async () => {
+    if (process.platform !== "win32" || !child.pid)
+      return;
     const identity = await probeWindowsProcessIdentity(child.pid);
-    if (identity.status === "found") {
-      windowsTarget = { pid: child.pid, creationDate: identity.identity.creationDate, executablePath: identity.identity.executablePath };
-    }
-  }
+    if (identity.status !== "found")
+      return;
+    return { pid: child.pid, creationDate: identity.identity.creationDate, executablePath: identity.identity.executablePath };
+  })();
   try {
     await new Promise((resolve2, reject) => {
       const finish = (error) => {
@@ -5313,6 +5329,7 @@ async function verifyAcpInitialize(command, args, options = {}) {
     child.stdin.destroy();
     child.stdout.destroy();
     child.stderr.destroy();
+    const windowsTarget = await windowsProbe;
     if (process.platform !== "win32" || windowsTarget) {
       await terminateProcessTree(windowsTarget ?? child.pid ?? 0, { detachedProcessGroup: detached });
     }
@@ -52636,6 +52653,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     emittedToolCallIds: new Set,
     positionedToolCallIds: new Set,
     toolCalls: new Map,
+    cursorPlanEntries: new Map,
     toolEventMode,
     driver,
     rawStream,
@@ -52694,13 +52712,17 @@ function parseStreamingChunks(state, line) {
     }
     const wantsStructured = state.toolEventMode === "structured" || state.toolEventMode === "both";
     const wantsText = (state.toolEventMode === "text" || state.toolEventMode === "both") && state.formatToolCalls;
-    if (wantsStructured && state.onToolEvent) {
-      const merged = update.toolCallId ? mergeToolCallUpdate(state, update.toolCallId, update) : update;
+    const merged = update.toolCallId && (state.onToolEvent || state.onPlan) ? mergeToolCallUpdate(state, update.toolCallId, update) : update;
+    const cursorPlan = normalizeCursorPlanUpdate(state, merged);
+    const consumedAsPlan = cursorPlan !== undefined && state.onPlan !== undefined;
+    if (consumedAsPlan) {
+      state.onPlan?.(cursorPlan);
+    } else if (wantsStructured && state.onToolEvent) {
       const toolEvent = buildToolUseEvent(merged, state.driver);
       if (toolEvent)
         state.onToolEvent(toolEvent);
     }
-    if (wantsText) {
+    if (wantsText && !consumedAsPlan) {
       const formatted = formatToolCallEvent(update, update.sessionUpdate);
       if (formatted) {
         const toolCallId = update.toolCallId;
@@ -52716,7 +52738,7 @@ function parseStreamingChunks(state, line) {
   }
   if (update.sessionUpdate === "plan") {
     const entries = Array.isArray(update.entries) ? update.entries.filter((x) => !!x && typeof x === "object" && typeof x.content === "string" && typeof x.status === "string") : [];
-    if (entries.length > 0)
+    if (Array.isArray(update.entries))
       state.onPlan?.(entries);
     return;
   }
@@ -52828,7 +52850,7 @@ function isEmptyToolField(v) {
 function mergeToolCallUpdate(state, toolCallId, update) {
   const prev = state.toolCalls.get(toolCallId) ?? { toolCallId };
   const merged = { ...prev };
-  for (const key of ["kind", "title", "rawInput", "content", "rawOutput", "locations", "status"]) {
+  for (const key of ["kind", "title", "toolCallId", "parentToolCallId", "rawInput", "content", "rawOutput", "locations", "status"]) {
     const next = update[key];
     if (!isEmptyToolField(next))
       merged[key] = next;
@@ -52860,19 +52882,7 @@ function buildToolUseEvent(update, driver) {
   const toolCallId = update.toolCallId;
   if (!toolCallId)
     return null;
-  const kindRaw = update.kind ?? "";
-  const kind = (() => {
-    switch (kindRaw) {
-      case "read":
-      case "search":
-      case "execute":
-      case "edit":
-      case "think":
-        return kindRaw;
-      default:
-        return "other";
-    }
-  })();
+  const kind = normalizeToolKind(update, driver);
   const title = (update.title ?? "").trim();
   const toolName = title || "Tool";
   const summaryRaw = summarizeToolInput(update.rawInput, title) || summarizeToolInput(update.rawOutput, title);
@@ -52888,8 +52898,8 @@ function buildToolUseEvent(update, driver) {
   const content = update.content;
   const rawOutput = update.rawOutput ?? claudeToolResponse;
   const locations = update.locations;
-  const parentToolCallId = claudeMeta?.parentToolUseId?.trim();
-  const isSubagent = claudeMeta?.toolName === "Agent" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" || driver === "kimi" && isKimiSubagentInput(rawInput) || driver === "codex" && isCodexSubagentMeta(update._meta?.codex?.subagent);
+  const parentToolCallId = claudeMeta?.parentToolUseId?.trim() || update.parentToolCallId?.trim();
+  const isSubagent = claudeMeta?.toolName === "Agent" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" || driver === "kimi" && isKimiSubagentInput(rawInput) || driver === "codex" && isCodexSubagentMeta(update._meta?.codex?.subagent) || driver === "cursor" && isCursorSubagentInput(rawInput, title);
   return {
     toolCallId,
     ...parentToolCallId ? { parentToolCallId } : {},
@@ -52904,6 +52914,147 @@ function buildToolUseEvent(update, driver) {
     status
   };
 }
+function normalizeCursorPlanUpdate(state, update) {
+  if (state.driver !== "cursor")
+    return;
+  const title = normalizeCursorToolName(update.title);
+  if (!CURSOR_PLAN_TOOL_NAMES.has(title))
+    return;
+  const input = cursorToolInput(update.rawInput);
+  if (!Array.isArray(input?.todos))
+    return;
+  const merge2 = input.merge === true;
+  if (input.todos.length === 0) {
+    state.cursorPlanEntries.clear();
+    return [];
+  }
+  const patches = input.todos.map((todo, index) => parseCursorPlanTodo(todo, index)).filter((todo) => todo !== undefined);
+  if (patches.length === 0)
+    return;
+  if (!merge2)
+    state.cursorPlanEntries.clear();
+  for (const patch of patches) {
+    const previous = state.cursorPlanEntries.get(patch.key);
+    const content = patch.content ?? previous?.content;
+    if (!content)
+      continue;
+    const status = patch.status ?? previous?.status ?? "pending";
+    const priority = patch.priority ?? previous?.priority;
+    state.cursorPlanEntries.set(patch.key, {
+      content,
+      status,
+      ...priority ? { priority } : {}
+    });
+  }
+  return [...state.cursorPlanEntries.values()];
+}
+function parseCursorPlanTodo(value, index) {
+  if (!isRecord4(value))
+    return;
+  const id = readFirstString(value, ["id", "todoId", "taskId"]);
+  const content = readFirstString(value, ["content", "task", "description", "title", "text"]);
+  const key = id ? `id:${id}` : content ? `content:${content}` : `index:${index}`;
+  const status = normalizeCursorPlanStatus(value.status ?? value.state);
+  const priority = normalizePlanPriority(value.priority);
+  if (!content && !status && !priority && !id)
+    return;
+  return {
+    key,
+    ...content ? { content } : {},
+    ...status ? { status } : {},
+    ...priority ? { priority } : {}
+  };
+}
+function normalizeCursorPlanStatus(value) {
+  if (typeof value !== "string")
+    return;
+  const normalized = value.trim().toLowerCase().replace(/[\s-]+/g, "_").replace(/^todo_status_/, "");
+  switch (normalized) {
+    case "pending":
+    case "todo":
+    case "not_started":
+    case "notstarted":
+    case "incomplete":
+      return "pending";
+    case "in_progress":
+    case "inprogress":
+    case "active":
+    case "working":
+      return "in_progress";
+    case "completed":
+    case "complete":
+    case "done":
+    case "finished":
+      return "completed";
+    default:
+      return;
+  }
+}
+function normalizePlanPriority(value) {
+  if (value !== "high" && value !== "medium" && value !== "low")
+    return;
+  return value;
+}
+function cursorToolInput(rawInput) {
+  if (!isRecord4(rawInput))
+    return;
+  if (isRecord4(rawInput.args))
+    return rawInput.args;
+  return rawInput;
+}
+function normalizeCursorToolName(title) {
+  return (title ?? "").trim().toLowerCase().replace(/[\s_-]+/g, "");
+}
+function normalizeToolKind(update, driver) {
+  const kindRaw = update?.kind?.trim().toLowerCase() ?? "";
+  switch (kindRaw) {
+    case "read":
+    case "search":
+    case "execute":
+    case "edit":
+    case "think":
+      return kindRaw;
+  }
+  if (driver !== "cursor")
+    return "other";
+  switch (normalizeCursorToolName(update?.title)) {
+    case "read":
+    case "readfile":
+      return "read";
+    case "grep":
+    case "glob":
+    case "search":
+      return "search";
+    case "shell":
+    case "bash":
+    case "terminal":
+      return "execute";
+    case "strreplace":
+    case "replace":
+    case "edit":
+    case "write":
+    case "delete":
+      return "edit";
+    case "task":
+    case "delegate":
+    case "runsubagent":
+    case "switchmode":
+    case "todowrite":
+    case "createplan":
+    case "updateplan":
+    case "plan":
+      return "think";
+    default:
+      return "other";
+  }
+}
+function isCursorSubagentInput(rawInput, title) {
+  const normalizedTitle = normalizeCursorToolName(title);
+  if (!CURSOR_SUBAGENT_TOOL_NAMES.has(normalizedTitle))
+    return false;
+  const input = cursorToolInput(rawInput);
+  return input !== undefined && readFirstString(input, ["subagent_type", "subagentType", "agent", "agentType", "prompt", "instructions"]) !== undefined;
+}
 function isKimiSubagentInput(rawInput) {
   return isRecord4(rawInput) && readFirstString(rawInput, ["prompt"]) !== undefined && readFirstString(rawInput, ["subagent_type", "subagentType"]) !== undefined;
 }
@@ -52918,6 +53069,12 @@ function summarizeToolInput(rawInput, title = "") {
   }
   if (!isRecord4(rawInput))
     return;
+  const nestedInput = cursorToolInput(rawInput);
+  if (nestedInput !== rawInput) {
+    const nestedSummary = summarizeToolInput(nestedInput, title);
+    if (nestedSummary)
+      return nestedSummary;
+  }
   const taskSummary = summarizeTaskInput(rawInput, title);
   if (taskSummary)
     return taskSummary;
@@ -52938,6 +53095,16 @@ function summarizeToolInput(rawInput, title = "") {
       return parts.join(" ");
     }
   }
+  const globPattern = readFirstString(rawInput, ["glob_pattern"]);
+  if (globPattern) {
+    const targetDirectory = readFirstString(rawInput, ["target_directory"]);
+    return targetDirectory ? `${globPattern} in ${targetDirectory}` : globPattern;
+  }
+  const mode = readFirstString(rawInput, ["target_mode_id", "mode_id"]);
+  const explanation = readFirstString(rawInput, ["explanation"]);
+  if (mode || explanation) {
+    return mode && explanation ? `${mode}: ${explanation}` : mode ?? explanation;
+  }
   return readFirstString(rawInput, [
     "path",
     "file",
@@ -52951,6 +53118,7 @@ function summarizeToolInput(rawInput, title = "") {
     "pattern",
     "text",
     "search",
+    "working_directory",
     "name",
     "description"
   ]);
@@ -53057,7 +53225,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, 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_PLAN_TOOL_NAMES, CURSOR_SUBAGENT_TOOL_NAMES, USAGE_BREAKDOWN_FIELDS;
 var init_streaming_prompt = __esm(() => {
   init_background_followup();
   init_tool_kind_emoji();
@@ -53067,6 +53235,8 @@ 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_SUBAGENT_TOOL_NAMES = new Set(["task", "delegate", "runsubagent", "subagent"]);
   USAGE_BREAKDOWN_FIELDS = [
     ["inputTokens", ["inputTokens", "input_tokens"]],
     ["outputTokens", ["outputTokens", "output_tokens"]],

package/dist/process/windows-process-tree.d.ts

@@ -56,3 +56,4 @@ export declare function queryWindowsProcessIdentity(pid: number, options?: Windo
 export declare function probeWindowsProcessIdentity(pid: number, options?: WindowsProcessWorkerOptions): Promise<WindowsProbeStatus>;
 export declare function snapshotWindowsProcessesByToken(token: string, options?: WindowsProcessWorkerOptions): Promise<WindowsTokenProcess[] | null>;
 export declare function terminateWindowsResidual(target: BatchTarget, options?: WindowsProcessWorkerOptions): Promise<KillOutcome>;
+export declare const WINDOWS_TREE_WORKER_SCRIPT: string;

package/package.json

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