@ganglion/xacpx 0.18.1 → 0.19.0

package/dist/bridge/bridge-main.js

@@ -2633,12 +2633,12 @@ var init_prompt_media = __esm(() => {
   };
 });
 
-// src/transport/claude-background-followup.ts
+// src/transport/background-followup.ts
 import { access, open as open2, readFile, readdir, stat } from "node:fs/promises";
 import { constants as fsConstants } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { basename, dirname as dirname2, join as join2 } from "node:path";
-function isClaudeAsyncAgentLaunch(event) {
+function isAsyncAgentLaunch(event) {
   return isAsyncAgentLaunchOutput(event.rawOutput);
 }
 function isAsyncAgentLaunchOutput(rawOutput) {
@@ -2660,13 +2660,13 @@ function tryParseJsonObject(text) {
     return;
   }
 }
-function claudeAsyncAgentId(event) {
+function asyncAgentId(event) {
   const fromObject = findStringField(event.rawOutput, new Set(["agentId", "agent_id"]));
   if (fromObject)
     return fromObject;
   return /\bagent(?:Id|_id)["']?\s*[:=]\s*["']?([A-Za-z0-9_-]+)/i.exec(textOfUnknown(event.rawOutput))?.[1];
 }
-async function findClaudeTranscriptPath(input) {
+async function findNativeTranscriptPath(input) {
   const configDirName = input.driver === "qoder" ? ".qoder" : ".claude";
   const projectsDir = join2(input.homeDir ?? homedir2(), configDirName, "projects");
   const direct = join2(projectsDir, encodeClaudeProjectDirectory(input.cwd), `${input.sessionId}.jsonl`);
@@ -2686,8 +2686,8 @@ async function findClaudeTranscriptPath(input) {
   }
   return;
 }
-async function followClaudeBackgroundTurn(options) {
-  const transcriptPath = options.transcriptPath ?? await findClaudeTranscriptPath(options);
+async function followBackgroundTurn(options) {
+  const transcriptPath = options.transcriptPath ?? await findNativeTranscriptPath(options);
   if (!transcriptPath) {
     return { status: "unavailable", completedToolCallIds: [], failedToolCallIds: [] };
   }
@@ -2869,8 +2869,8 @@ async function followClaudeBackgroundTurn(options) {
         ...previous?.rawOutput !== undefined ? { rawOutput: previous.rawOutput } : output ? { rawOutput: output } : {},
         status: readBoolean(block, "is_error") || previous?.status === "error" ? "error" : "success"
       };
-      if (event.isSubagent && isClaudeAsyncAgentLaunch(event)) {
-        const agentId = claudeAsyncAgentId(event);
+      if (event.isSubagent && isAsyncAgentLaunch(event)) {
+        const agentId = asyncAgentId(event);
         if (agentId)
           parentToolCallIdByAgentId.set(agentId, event.toolCallId);
       }
@@ -3183,7 +3183,7 @@ async function waitForPoll(ms, signal) {
   });
 }
 var DEFAULT_POLL_INTERVAL_MS = 250, DEFAULT_TIMEOUT_MS, FINAL_SUBAGENT_DRAIN_MAX_POLLS = 4, FINAL_SUBAGENT_DRAIN_STABLE_POLLS = 2, ASYNC_AGENT_LAUNCH;
-var init_claude_background_followup = __esm(() => {
+var init_background_followup = __esm(() => {
   DEFAULT_TIMEOUT_MS = 30 * 60 * 1000;
   ASYNC_AGENT_LAUNCH = /Async agent launched successfully|["']?status["']?\s*:\s*["']async_launched["']/i;
 });
@@ -3454,8 +3454,8 @@ function buildToolUseEvent(update, driver) {
   const claudeMeta = isClaudeDriver ? update._meta?.claudeCode : undefined;
   const claudeToolResponse = claudeMeta?.toolResponse;
   const hasClaudeToolResponse = !isEmptyToolField(claudeToolResponse);
-  const isAsyncAgentLaunch = update._meta?.claudeCode?.toolName === "Agent" && isRecord2(claudeToolResponse) && claudeToolResponse.status === "async_launched" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" && isAsyncAgentLaunchOutput(update.rawOutput);
-  const status = isAsyncAgentLaunch ? "running" : statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : hasClaudeToolResponse ? "success" : "running";
+  const isAsyncAgentLaunch2 = update._meta?.claudeCode?.toolName === "Agent" && isRecord2(claudeToolResponse) && claudeToolResponse.status === "async_launched" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" && isAsyncAgentLaunchOutput(update.rawOutput);
+  const status = isAsyncAgentLaunch2 ? "running" : statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : hasClaudeToolResponse ? "success" : "running";
   const rawInput = update.rawInput;
   const content = update.content;
   const rawOutput = update.rawOutput ?? claudeToolResponse;
@@ -3631,7 +3631,7 @@ function isGenericToolTitle(kind, title) {
 }
 var USAGE_BREAKDOWN_FIELDS;
 var init_streaming_prompt = __esm(() => {
-  init_claude_background_followup();
+  init_background_followup();
   init_tool_kind_emoji();
   USAGE_BREAKDOWN_FIELDS = [
     ["inputTokens", ["inputTokens", "input_tokens"]],

package/dist/cli.js

@@ -33177,12 +33177,12 @@ var init_prompt_media = __esm(() => {
   };
 });
 
-// src/transport/claude-background-followup.ts
+// src/transport/background-followup.ts
 import { access as access4, open as open5, readFile as readFile14, readdir as readdir3, stat as stat3 } from "node:fs/promises";
 import { constants as fsConstants } from "node:fs";
 import { homedir as homedir10 } from "node:os";
 import { basename as basename3, dirname as dirname12, join as join20 } from "node:path";
-function isClaudeAsyncAgentLaunch(event) {
+function isAsyncAgentLaunch(event) {
   return isAsyncAgentLaunchOutput(event.rawOutput);
 }
 function isAsyncAgentLaunchOutput(rawOutput) {
@@ -33204,13 +33204,13 @@ function tryParseJsonObject(text) {
     return;
   }
 }
-function claudeAsyncAgentId(event) {
+function asyncAgentId(event) {
   const fromObject = findStringField(event.rawOutput, new Set(["agentId", "agent_id"]));
   if (fromObject)
     return fromObject;
   return /\bagent(?:Id|_id)["']?\s*[:=]\s*["']?([A-Za-z0-9_-]+)/i.exec(textOfUnknown(event.rawOutput))?.[1];
 }
-async function findClaudeTranscriptPath(input) {
+async function findNativeTranscriptPath(input) {
   const configDirName = input.driver === "qoder" ? ".qoder" : ".claude";
   const projectsDir = join20(input.homeDir ?? homedir10(), configDirName, "projects");
   const direct = join20(projectsDir, encodeClaudeProjectDirectory(input.cwd), `${input.sessionId}.jsonl`);
@@ -33230,8 +33230,8 @@ async function findClaudeTranscriptPath(input) {
   }
   return;
 }
-async function followClaudeBackgroundTurn(options) {
-  const transcriptPath = options.transcriptPath ?? await findClaudeTranscriptPath(options);
+async function followBackgroundTurn(options) {
+  const transcriptPath = options.transcriptPath ?? await findNativeTranscriptPath(options);
   if (!transcriptPath) {
     return { status: "unavailable", completedToolCallIds: [], failedToolCallIds: [] };
   }
@@ -33413,8 +33413,8 @@ async function followClaudeBackgroundTurn(options) {
         ...previous?.rawOutput !== undefined ? { rawOutput: previous.rawOutput } : output ? { rawOutput: output } : {},
         status: readBoolean(block, "is_error") || previous?.status === "error" ? "error" : "success"
       };
-      if (event.isSubagent && isClaudeAsyncAgentLaunch(event)) {
-        const agentId = claudeAsyncAgentId(event);
+      if (event.isSubagent && isAsyncAgentLaunch(event)) {
+        const agentId = asyncAgentId(event);
         if (agentId)
           parentToolCallIdByAgentId.set(agentId, event.toolCallId);
       }
@@ -33727,7 +33727,7 @@ async function waitForPoll(ms, signal) {
   });
 }
 var DEFAULT_POLL_INTERVAL_MS = 250, DEFAULT_TIMEOUT_MS, FINAL_SUBAGENT_DRAIN_MAX_POLLS = 4, FINAL_SUBAGENT_DRAIN_STABLE_POLLS = 2, ASYNC_AGENT_LAUNCH;
-var init_claude_background_followup = __esm(() => {
+var init_background_followup = __esm(() => {
   DEFAULT_TIMEOUT_MS = 30 * 60 * 1000;
   ASYNC_AGENT_LAUNCH = /Async agent launched successfully|["']?status["']?\s*:\s*["']async_launched["']/i;
 });
@@ -33987,8 +33987,8 @@ function buildToolUseEvent(update, driver) {
   const claudeMeta = isClaudeDriver ? update._meta?.claudeCode : undefined;
   const claudeToolResponse = claudeMeta?.toolResponse;
   const hasClaudeToolResponse = !isEmptyToolField(claudeToolResponse);
-  const isAsyncAgentLaunch = update._meta?.claudeCode?.toolName === "Agent" && isRecord4(claudeToolResponse) && claudeToolResponse.status === "async_launched" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" && isAsyncAgentLaunchOutput(update.rawOutput);
-  const status = isAsyncAgentLaunch ? "running" : statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : hasClaudeToolResponse ? "success" : "running";
+  const isAsyncAgentLaunch2 = update._meta?.claudeCode?.toolName === "Agent" && isRecord4(claudeToolResponse) && claudeToolResponse.status === "async_launched" || driver === "qoder" && update._meta?.qoder?.toolName === "Agent" && isAsyncAgentLaunchOutput(update.rawOutput);
+  const status = isAsyncAgentLaunch2 ? "running" : statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : hasClaudeToolResponse ? "success" : "running";
   const rawInput = update.rawInput;
   const content = update.content;
   const rawOutput = update.rawOutput ?? claudeToolResponse;
@@ -34164,7 +34164,7 @@ function isGenericToolTitle(kind, title) {
 }
 var USAGE_BREAKDOWN_FIELDS;
 var init_streaming_prompt = __esm(() => {
-  init_claude_background_followup();
+  init_background_followup();
   init_tool_kind_emoji();
   USAGE_BREAKDOWN_FIELDS = [
     ["inputTokens", ["inputTokens", "input_tokens"]],
@@ -35314,9 +35314,9 @@ var init_acpx_cli_transport = __esm(() => {
   require4 = createRequire5(import.meta.url);
 });
 
-// src/transport/claude-background-followup-transport.ts
-function createClaudeBackgroundFollowupTransport(delegate, options) {
-  const followBackgroundTurn = options.followBackgroundTurn ?? followClaudeBackgroundTurn;
+// src/transport/background-followup-transport.ts
+function createBackgroundFollowupTransport(delegate, options) {
+  const runBackgroundFollowup = options.followBackgroundTurn ?? followBackgroundTurn;
   const prompt = async (session3, text, reply, replyContext, promptOptions) => {
     const latestToolEvents = new Map;
     const pendingToolEvents = new Map;
@@ -35329,9 +35329,9 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
         pendingToolEvents.set(event.toolCallId, event);
       else
         pendingToolEvents.delete(event.toolCallId);
-      if (event.isSubagent && isClaudeAsyncAgentLaunch(event)) {
+      if (event.isSubagent && isAsyncAgentLaunch(event)) {
         asyncToolCallIds.add(event.toolCallId);
-        const agentId = claudeAsyncAgentId(event);
+        const agentId = asyncAgentId(event);
         if (agentId)
           subagentIdsByToolCallId.set(event.toolCallId, agentId);
       }
@@ -35350,7 +35350,7 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
       try {
         agentSessionId = await delegate.getAgentSessionId?.(session3);
       } catch (error2) {
-        await options.logger.error("transport.claude_background_followup.session_id_failed", "failed to resolve agent session id for background follow-up", { alias: session3.alias, error: error2 instanceof Error ? error2.message : String(error2) });
+        await options.logger.error(`${LEGACY_LOG_EVENT_PREFIX}.session_id_failed`, "failed to resolve agent session id for background follow-up", { alias: session3.alias, error: error2 instanceof Error ? error2.message : String(error2) });
       }
     }
     if (!agentSessionId) {
@@ -35363,8 +35363,8 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
       }
       return result;
     }
-    await options.logger.info("transport.claude_background_followup.started", "following background-agent continuation", { alias: session3.alias, agentSessionId, driver, taskCount: asyncToolCallIds.size });
-    const followup = await followBackgroundTurn({
+    await options.logger.info(`${LEGACY_LOG_EVENT_PREFIX}.started`, "following background-agent continuation", { alias: session3.alias, agentSessionId, driver, taskCount: asyncToolCallIds.size });
+    const followup = await runBackgroundFollowup({
       cwd: session3.cwd,
       sessionId: agentSessionId,
       driver,
@@ -35399,7 +35399,7 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
         ...followup.status === "completed" && !failed ? {} : { rawOutput: { message: failed ? "background Agent failed" : `background continuation ${followup.status}` } }
       });
     }
-    await options.logger.info(`transport.claude_background_followup.${followup.status}`, `background-agent follow-up ${followup.status}`, {
+    await options.logger.info(`${LEGACY_LOG_EVENT_PREFIX}.${followup.status}`, `background-agent follow-up ${followup.status}`, {
       alias: session3.alias,
       agentSessionId,
       driver,
@@ -35417,8 +35417,9 @@ function createClaudeBackgroundFollowupTransport(delegate, options) {
     }
   });
 }
-var init_claude_background_followup_transport = __esm(() => {
-  init_claude_background_followup();
+var LEGACY_LOG_EVENT_PREFIX = "transport.claude_background_followup";
+var init_background_followup_transport = __esm(() => {
+  init_background_followup();
 });
 
 // src/util/async.ts
@@ -36782,21 +36783,28 @@ class WorkspaceGit {
     }
     return startPoint;
   }
-  async includeRenameSources(root, paths) {
-    const selected = new Set(paths);
-    const expanded = new Set(paths);
+  async readPorcelain(root) {
     const fields = (await this.runRaw(root, ["-c", "core.quotePath=false", "status", "--porcelain", "-z"])).split("\x00");
+    const entries = [];
     for (let index = 0;index < fields.length; index += 1) {
       const field = fields[index];
       if (!field)
         continue;
       const status = field.slice(0, 2);
       const path14 = field.slice(3);
-      if (status[0] !== "R" && status[0] !== "C")
-        continue;
-      const originalPath = fields[++index];
-      if (originalPath && selected.has(path14))
-        expanded.add(originalPath);
+      const entry = { status, path: path14 };
+      if (status[0] === "R" || status[0] === "C")
+        entry.originalPath = fields[++index];
+      entries.push(entry);
+    }
+    return entries;
+  }
+  async includeRenameSources(root, paths) {
+    const selected = new Set(paths);
+    const expanded = new Set(paths);
+    for (const entry of await this.readPorcelain(root)) {
+      if (entry.originalPath && selected.has(entry.path))
+        expanded.add(entry.originalPath);
     }
     return [...expanded];
   }
@@ -36834,6 +36842,38 @@ class WorkspaceGit {
       }
     });
   }
+  async untrack(workspace3, paths) {
+    await this.withWrite(workspace3, async () => {
+      const root = await this.rootFor(workspace3);
+      await this.run(root, ["--literal-pathspecs", "rm", "--cached", "--force", "--", ...this.validatePaths(paths)]);
+    });
+  }
+  async discard(workspace3, paths) {
+    await this.withWrite(workspace3, async () => {
+      const root = await this.rootFor(workspace3);
+      const selected = new Set(this.validatePaths(paths));
+      const deletePaths = new Set;
+      const restorePaths = new Set;
+      for (const entry of await this.readPorcelain(root)) {
+        if (!selected.has(entry.path))
+          continue;
+        if (entry.status === "??" || entry.status[0] === "A" || entry.originalPath !== undefined) {
+          deletePaths.add(entry.path);
+          if (entry.originalPath)
+            restorePaths.add(entry.originalPath);
+        } else {
+          restorePaths.add(entry.path);
+        }
+      }
+      if (deletePaths.size) {
+        await this.run(root, ["--literal-pathspecs", "reset", "-q", "--", ...deletePaths]);
+        await this.run(root, ["--literal-pathspecs", "clean", "-qf", "--", ...deletePaths]);
+      }
+      if (restorePaths.size) {
+        await this.run(root, ["--literal-pathspecs", "restore", "--source=HEAD", "--staged", "--worktree", "--", ...restorePaths]);
+      }
+    });
+  }
   async commit(workspace3, message) {
     return this.withWrite(workspace3, async () => {
       const root = await this.rootFor(workspace3);
@@ -37564,6 +37604,12 @@ class ControlService {
   gitUnstage(workspace3, paths) {
     return this.mutateWorkspaceGit(() => this.workspaceGit.unstage(workspace3, paths));
   }
+  gitUntrack(workspace3, paths) {
+    return this.mutateWorkspaceGit(() => this.workspaceGit.untrack(workspace3, paths));
+  }
+  gitDiscard(workspace3, paths) {
+    return this.mutateWorkspaceGit(() => this.workspaceGit.discard(workspace3, paths));
+  }
   gitCommit(workspace3, message) {
     return this.mutateWorkspaceGit(() => this.workspaceGit.commit(workspace3, message));
   }
@@ -38594,7 +38640,7 @@ async function buildApp(paths, deps = {}) {
       });
     }
   })))) : deps.createCliTransport?.(acpxCommand) ?? new AcpxCliTransport({ ...config4.transport, command: acpxCommand });
-  const transport = createClaudeBackgroundFollowupTransport(baseTransport, {
+  const transport = createBackgroundFollowupTransport(baseTransport, {
     logger,
     resolveDriver: (agent4) => config4.agents[agent4]?.driver
   });
@@ -39269,7 +39315,7 @@ var init_main = __esm(async () => {
   init_acpx_bridge_client();
   init_acpx_bridge_transport();
   init_acpx_cli_transport();
-  init_claude_background_followup_transport();
+  init_background_followup_transport();
   init_queue_owner_reaper();
   init_collect_reap_targets();
   init_channel_registry();

package/dist/control/control-service.d.ts

@@ -158,6 +158,8 @@ export declare class ControlService {
     private withWorktreeRegistration;
     gitStage(workspace: string, paths: string[]): Promise<void>;
     gitUnstage(workspace: string, paths: string[]): Promise<void>;
+    gitUntrack(workspace: string, paths: string[]): Promise<void>;
+    gitDiscard(workspace: string, paths: string[]): Promise<void>;
     gitCommit(workspace: string, message: string): Promise<GitCommitResult>;
     gitFetch(workspace: string, remote?: string): Promise<void>;
     gitPull(workspace: string): Promise<void>;

package/dist/control/workspace-git.d.ts

@@ -77,6 +77,7 @@ export declare class WorkspaceGit {
     private validatePaths;
     private validateBranch;
     private validateStartPoint;
+    private readPorcelain;
     private includeRenameSources;
     /** Git write commands for one configured workspace share a FIFO. Reads remain
      * concurrent, and a failed write releases the next command instead of poisoning
@@ -84,6 +85,8 @@ export declare class WorkspaceGit {
     private withWrite;
     stage(workspace: string, paths: string[]): Promise<void>;
     unstage(workspace: string, paths: string[]): Promise<void>;
+    untrack(workspace: string, paths: string[]): Promise<void>;
+    discard(workspace: string, paths: string[]): Promise<void>;
     commit(workspace: string, message: string): Promise<GitCommitResult>;
     checkout(workspace: string, options: GitCheckoutOptions): Promise<void>;
     fetch(workspace: string, remote?: string): Promise<void>;

package/package.json

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