@ganglion/xacpx 0.15.1 → 0.15.3

package/README.md

@@ -1,5 +1,7 @@
 # xacpx
 
+![xacpx.png](xacpx_banner.png)
+
 > Remotely drive Codex, Claude Code, and other acpx sessions from WeChat, Feishu, or Yuanbao.
 
 [![npm](https://img.shields.io/npm/v/@ganglion/xacpx?style=flat-square)](https://www.npmjs.com/package/@ganglion/xacpx)
@@ -13,8 +15,6 @@ English · **[中文](./docs/zh/README_zh.md)**
 
 `xacpx` is a tool that lets you control ACP agents such as Codex / Claude Code / Gemini / OpenCode directly from WeChat, Feishu, or Yuanbao. It connects chat messages to your agent CLI sessions through `acpx`, so you can, right from your phone:
 
-[![xacpx.png](https://s41.ax1x.com/2026/06/05/pmZXIv6.png)](https://imgchr.com/i/pmZXIv6)
-
 - Create and switch between sessions
 - Have the agent keep working in a specific project directory
 - View streaming replies, final results, and tool-call summaries

package/dist/bridge/bridge-main.js

@@ -820,6 +820,13 @@ var init_streaming_prompt = __esm(() => {
   ];
 });
 
+// src/transport/model-not-advertised.ts
+function isModelNotAdvertisedError(text) {
+  if (!text)
+    return false;
+  return /Cannot (?:apply --model|replay saved model)\b/i.test(text) || /did not advertise (?:that model|model support)/i.test(text);
+}
+
 // src/recovery/discover-parent-package-paths.ts
 import { spawn as spawn2 } from "node:child_process";
 import { createRequire as createRequire2 } from "node:module";
@@ -3470,6 +3477,143 @@ var init_path = __esm(() => {
   ROOT_PATH_RE = /^(\/|[a-zA-Z]:\/?)$/;
 });
 
+// src/transport/codex-subagent-filter.ts
+import { closeSync, openSync, readdirSync, readSync, statSync } from "node:fs";
+import { homedir as homedir4 } from "node:os";
+import { join as join3 } from "node:path";
+function resolveCodexHome(env = process.env) {
+  const fromEnv = env.CODEX_HOME?.trim();
+  return fromEnv ? fromEnv : join3(homedir4(), ".codex");
+}
+function isPlainObject(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function isSubagentSource(source) {
+  if (!isPlainObject(source) || !Object.hasOwn(source, "subagent"))
+    return false;
+  const subagent = source.subagent;
+  if (!isPlainObject(subagent))
+    return false;
+  return Object.values(subagent).some((variant) => isPlainObject(variant) && typeof variant.parent_thread_id === "string");
+}
+function sessionMetaLineIsSubagent(line) {
+  if (!line)
+    return false;
+  let parsed;
+  try {
+    parsed = JSON.parse(line);
+  } catch {
+    return false;
+  }
+  const payload = parsed?.payload;
+  return isSubagentSource(payload?.source);
+}
+function createSubagentPredicate(reader) {
+  let index = null;
+  const cache = new Map;
+  return (sessionId) => {
+    const cached = cache.get(sessionId);
+    if (cached !== undefined)
+      return cached;
+    let result = false;
+    try {
+      if (!index) {
+        index = new Map;
+        for (const path4 of reader.listRolloutPaths()) {
+          const id = path4.match(ROLLOUT_RE)?.[1];
+          if (id)
+            index.set(id.toLowerCase(), path4);
+        }
+      }
+      const path3 = index.get(sessionId.toLowerCase());
+      if (path3)
+        result = sessionMetaLineIsSubagent(reader.readFirstLine(path3));
+    } catch {
+      result = false;
+    }
+    cache.set(sessionId, result);
+    return result;
+  };
+}
+function filterSubagentSessions(result, isSubagent) {
+  return {
+    ...result,
+    sessions: result.sessions.filter((session3) => {
+      try {
+        return !isSubagent(session3.sessionId);
+      } catch {
+        return true;
+      }
+    })
+  };
+}
+function nodeRolloutReader(home) {
+  const root = join3(home, "sessions");
+  return {
+    listRolloutPaths() {
+      const out = [];
+      const walk = (dir) => {
+        let entries;
+        try {
+          entries = readdirSync(dir, { withFileTypes: true });
+        } catch {
+          return;
+        }
+        for (const entry of entries) {
+          const full = join3(dir, entry.name);
+          if (entry.isDirectory())
+            walk(full);
+          else if (entry.isFile() && entry.name.startsWith("rollout-") && entry.name.endsWith(".jsonl"))
+            out.push(full);
+        }
+      };
+      walk(root);
+      return out;
+    },
+    readFirstLine(path3) {
+      let fd;
+      try {
+        statSync(path3);
+        fd = openSync(path3, "r");
+        const buf = Buffer.alloc(READ_CHUNK);
+        let acc = "";
+        let total = 0;
+        for (;; ) {
+          const bytes = readSync(fd, buf, 0, READ_CHUNK, total);
+          if (bytes <= 0)
+            break;
+          acc += buf.toString("utf8", 0, bytes);
+          total += bytes;
+          const nl = acc.indexOf(`
+`);
+          if (nl !== -1)
+            return acc.slice(0, nl);
+          if (total >= FIRST_LINE_READ_CAP)
+            return;
+        }
+        return acc.length ? acc : undefined;
+      } catch {
+        return;
+      } finally {
+        if (fd !== undefined) {
+          try {
+            closeSync(fd);
+          } catch {}
+        }
+      }
+    }
+  };
+}
+function codexSubagentPredicate(env) {
+  return createSubagentPredicate(nodeRolloutReader(resolveCodexHome(env)));
+}
+var CODEX_AGENT_NAME = "codex", FIRST_LINE_READ_CAP, READ_CHUNK, ROLLOUT_RE;
+var init_codex_subagent_filter = __esm(() => {
+  FIRST_LINE_READ_CAP = 1024 * 1024;
+  READ_CHUNK = 64 * 1024;
+  ROLLOUT_RE = /rollout-.*-([0-9a-fA-F-]{36})\.jsonl$/;
+});
+
 // src/transport/agent-session-list.ts
 function isUnknownFilterCwdOption(output) {
   return /(?:unknown|unrecognized) option/i.test(output) && output.includes("--filter-cwd");
@@ -3487,7 +3631,11 @@ async function runAgentSessionList(options) {
     }
     throw new Error(options.formatError(result));
   }
-  return parseAgentSessionListOutput(result.stdout, filterLocally ? options.filterCwd : undefined);
+  const parsed = parseAgentSessionListOutput(result.stdout, filterLocally ? options.filterCwd : undefined);
+  if (parsed && options.isSubagentSession) {
+    return filterSubagentSessions(parsed, options.isSubagentSession);
+  }
+  return parsed;
 }
 function parseAgentSessionListOutput(stdout, filterCwd) {
   let parsed;
@@ -3522,16 +3670,17 @@ function filterAgentSessionListByCwd(result, cwd) {
 }
 var init_agent_session_list = __esm(() => {
   init_path();
+  init_codex_subagent_filter();
 });
 
 // src/transport/acpx-session-files.ts
 import { readdir, unlink as unlink2 } from "node:fs/promises";
-import { homedir as homedir4 } from "node:os";
-import { join as join3 } from "node:path";
+import { homedir as homedir5 } from "node:os";
+import { join as join4 } from "node:path";
 async function deleteAcpxSessionFiles(options) {
-  const dir = options.sessionsDir ?? join3(homedir4(), ".acpx", "sessions");
+  const dir = options.sessionsDir ?? join4(homedir5(), ".acpx", "sessions");
   const safeId = encodeURIComponent(options.acpxRecordId);
-  await unlink2(join3(dir, `${safeId}.json`)).catch(() => {
+  await unlink2(join4(dir, `${safeId}.json`)).catch(() => {
     return;
   });
   let entries;
@@ -3542,7 +3691,7 @@ async function deleteAcpxSessionFiles(options) {
   }
   const streamFiles = entries.filter((name) => name.startsWith(`${safeId}.stream.`));
   for (const name of streamFiles) {
-    await unlink2(join3(dir, name)).catch(() => {
+    await unlink2(join4(dir, name)).catch(() => {
       return;
     });
   }
@@ -3622,8 +3771,8 @@ init_prompt_output();
 init_prompt_media();
 init_streaming_prompt();
 import { copyFile, readdir as readdir2 } from "node:fs/promises";
-import { homedir as homedir5 } from "node:os";
-import { dirname as dirname2, join as join4, win32 } from "node:path";
+import { homedir as homedir6 } from "node:os";
+import { dirname as dirname2, join as join5, win32 } from "node:path";
 import { spawn as spawn4 } from "node:child_process";
 
 // src/bridge/parse-missing-optional-dep.ts
@@ -3643,6 +3792,7 @@ function parseMissingOptionalDep(text) {
 init_discover_parent_package_paths();
 init_acpx_queue_owner_launcher();
 init_agent_session_list();
+init_codex_subagent_filter();
 init_acpx_session_files();
 class EnsureSessionFailedError extends Error {
   kind;
@@ -3708,7 +3858,8 @@ class BridgeRuntime {
         ], { format: "json" }));
         return await this.run(spec.command, spec.args);
       },
-      formatError: (result) => result.stderr || result.stdout || `sessions list failed with exit code ${result.code}`
+      formatError: (result) => result.stderr || result.stdout || `sessions list failed with exit code ${result.code}`,
+      isSubagentSession: (input.driver ?? input.agent) === CODEX_AGENT_NAME ? codexSubagentPredicate() : undefined
     });
   }
   async resumeAgentSession(input) {
@@ -3769,6 +3920,21 @@ class BridgeRuntime {
     throw new Error(message);
   }
   async ensureSession(input, onProgress) {
+    try {
+      return await this.attemptEnsureSession(input, onProgress);
+    } catch (error) {
+      const requestedModel = input.model?.trim();
+      if (requestedModel && error instanceof EnsureSessionFailedError && isModelNotAdvertisedError(error.message)) {
+        onProgress?.({
+          kind: "note",
+          text: `agent did not advertise model "${requestedModel}"; retrying with the agent's default model`
+        });
+        return await this.attemptEnsureSession({ ...input, model: undefined }, onProgress);
+      }
+      throw error;
+    }
+  }
+  async attemptEnsureSession(input, onProgress) {
     onProgress?.("spawn");
     const timeoutMs = this.sessionInitTimeoutMs();
     const now = this.options.now ?? Date.now;
@@ -4218,11 +4384,11 @@ async function tryRepairAcpxSessionIndex(deps = {}) {
   if (platform !== "win32") {
     return false;
   }
-  const home = deps.home ?? process.env.HOME ?? process.env.USERPROFILE ?? homedir5();
+  const home = deps.home ?? process.env.HOME ?? process.env.USERPROFILE ?? homedir6();
   if (!home) {
     return false;
   }
-  const pathJoin = platform === "win32" ? win32.join : join4;
+  const pathJoin = platform === "win32" ? win32.join : join5;
   const sessionsDir = pathJoin(home, ".acpx", "sessions");
   const indexPath = pathJoin(sessionsDir, "index.json");
   const readdirFn = deps.readdirFn ?? readdir2;
@@ -4372,6 +4538,7 @@ class BridgeServer {
         return await this.runtime.listAgentSessions({
           agent: requireString(params, "agent"),
           agentCommand: asOptionalString(params.agentCommand),
+          driver: asOptionalString(params.driver),
           cwd: requireString(params, "cwd"),
           cursor: asOptionalString(params.cursor),
           filterCwd: asOptionalString(params.filterCwd)

package/dist/cli.js

@@ -23806,6 +23806,15 @@ var init_session_shortcut_handler = __esm(() => {
 });
 
 // src/commands/handlers/native-session-handler.ts
+async function listFirstNonEmptyPage(listAgentSessions, query) {
+  let result = await listAgentSessions(query);
+  let guard = 0;
+  while (result && result.sessions.length === 0 && result.nextCursor && guard < MAX_EMPTY_PAGE_ADVANCE) {
+    guard++;
+    result = await listAgentSessions({ ...query, cursor: result.nextCursor });
+  }
+  return result;
+}
 async function handleNativeSessionList(context, chatKey, input) {
   const target = await resolveNativeTarget(context, chatKey, input);
   if (isRouterResponse(target)) {
@@ -23818,13 +23827,14 @@ async function handleNativeSessionList(context, chatKey, input) {
   const query = {
     agent: target.agent,
     agentCommand: target.agentCommand,
+    ...target.driver ? { driver: target.driver } : {},
     cwd: target.cwd,
     ...input.cursor ? { cursor: input.cursor } : {},
     ...input.all ? {} : { filterCwd: target.cwd }
   };
   let result;
   try {
-    result = await listAgentSessions(query);
+    result = await listFirstNonEmptyPage(listAgentSessions, query);
   } catch (error2) {
     return { text: renderNativeListError(target, error2) };
   }
@@ -23950,6 +23960,7 @@ async function resolveNativeTarget(context, chatKey, input) {
     agent: agent3,
     agentDisplayName: displayAgentName(agent3),
     agentCommand: resolveRuntimeAgentCommand(agentConfig.driver, agentConfig.command, context.config?.transport.preferLocalAgents !== false),
+    driver: agentConfig.driver,
     workspace: workspaceResolution.workspace,
     workspaceLabel: workspaceResolution.workspaceLabel,
     cwd: workspaceResolution.cwd,
@@ -24185,7 +24196,7 @@ function displayAgentName(agent3) {
   }
   return agent3.charAt(0).toUpperCase() + agent3.slice(1);
 }
-var NATIVE_SESSION_CACHE_TTL_MS;
+var NATIVE_SESSION_CACHE_TTL_MS, MAX_EMPTY_PAGE_ADVANCE = 25;
 var init_native_session_handler = __esm(() => {
   init_resolve_agent_command();
   init_channel_scope();
@@ -25054,6 +25065,7 @@ class CommandRouter {
     const result = await listAgentSessions({
       agent: agent3,
       ...agentCommand ? { agentCommand } : {},
+      ...agentConfig.driver ? { driver: agentConfig.driver } : {},
       cwd: workspaceConfig.cwd,
       filterCwd: workspaceConfig.cwd
     });
@@ -31575,6 +31587,13 @@ var init_acpx_bridge_transport = __esm(() => {
   init_quota_gated_reply_sink();
 });
 
+// src/transport/model-not-advertised.ts
+function isModelNotAdvertisedError(text) {
+  if (!text)
+    return false;
+  return /Cannot (?:apply --model|replay saved model)\b/i.test(text) || /did not advertise (?:that model|model support)/i.test(text);
+}
+
 // src/transport/prompt-media.ts
 import { mkdtemp, open as open4, rm as rm9, writeFile as writeFile7 } from "node:fs/promises";
 import { tmpdir as defaultTmpdir } from "node:os";
@@ -32150,6 +32169,143 @@ function permissionModeToFlag(permissionMode) {
   }
 }
 
+// src/transport/codex-subagent-filter.ts
+import { closeSync, openSync, readdirSync, readSync, statSync as statSync2 } from "node:fs";
+import { homedir as homedir9 } from "node:os";
+import { join as join19 } from "node:path";
+function resolveCodexHome(env = process.env) {
+  const fromEnv = env.CODEX_HOME?.trim();
+  return fromEnv ? fromEnv : join19(homedir9(), ".codex");
+}
+function isPlainObject3(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function isSubagentSource(source) {
+  if (!isPlainObject3(source) || !Object.hasOwn(source, "subagent"))
+    return false;
+  const subagent = source.subagent;
+  if (!isPlainObject3(subagent))
+    return false;
+  return Object.values(subagent).some((variant) => isPlainObject3(variant) && typeof variant.parent_thread_id === "string");
+}
+function sessionMetaLineIsSubagent(line) {
+  if (!line)
+    return false;
+  let parsed;
+  try {
+    parsed = JSON.parse(line);
+  } catch {
+    return false;
+  }
+  const payload = parsed?.payload;
+  return isSubagentSource(payload?.source);
+}
+function createSubagentPredicate(reader) {
+  let index = null;
+  const cache = new Map;
+  return (sessionId) => {
+    const cached2 = cache.get(sessionId);
+    if (cached2 !== undefined)
+      return cached2;
+    let result = false;
+    try {
+      if (!index) {
+        index = new Map;
+        for (const path16 of reader.listRolloutPaths()) {
+          const id = path16.match(ROLLOUT_RE)?.[1];
+          if (id)
+            index.set(id.toLowerCase(), path16);
+        }
+      }
+      const path15 = index.get(sessionId.toLowerCase());
+      if (path15)
+        result = sessionMetaLineIsSubagent(reader.readFirstLine(path15));
+    } catch {
+      result = false;
+    }
+    cache.set(sessionId, result);
+    return result;
+  };
+}
+function filterSubagentSessions(result, isSubagent) {
+  return {
+    ...result,
+    sessions: result.sessions.filter((session3) => {
+      try {
+        return !isSubagent(session3.sessionId);
+      } catch {
+        return true;
+      }
+    })
+  };
+}
+function nodeRolloutReader(home) {
+  const root = join19(home, "sessions");
+  return {
+    listRolloutPaths() {
+      const out = [];
+      const walk = (dir) => {
+        let entries;
+        try {
+          entries = readdirSync(dir, { withFileTypes: true });
+        } catch {
+          return;
+        }
+        for (const entry of entries) {
+          const full = join19(dir, entry.name);
+          if (entry.isDirectory())
+            walk(full);
+          else if (entry.isFile() && entry.name.startsWith("rollout-") && entry.name.endsWith(".jsonl"))
+            out.push(full);
+        }
+      };
+      walk(root);
+      return out;
+    },
+    readFirstLine(path15) {
+      let fd;
+      try {
+        statSync2(path15);
+        fd = openSync(path15, "r");
+        const buf = Buffer.alloc(READ_CHUNK);
+        let acc = "";
+        let total = 0;
+        for (;; ) {
+          const bytes = readSync(fd, buf, 0, READ_CHUNK, total);
+          if (bytes <= 0)
+            break;
+          acc += buf.toString("utf8", 0, bytes);
+          total += bytes;
+          const nl = acc.indexOf(`
+`);
+          if (nl !== -1)
+            return acc.slice(0, nl);
+          if (total >= FIRST_LINE_READ_CAP)
+            return;
+        }
+        return acc.length ? acc : undefined;
+      } catch {
+        return;
+      } finally {
+        if (fd !== undefined) {
+          try {
+            closeSync(fd);
+          } catch {}
+        }
+      }
+    }
+  };
+}
+function codexSubagentPredicate(env) {
+  return createSubagentPredicate(nodeRolloutReader(resolveCodexHome(env)));
+}
+var CODEX_AGENT_NAME = "codex", FIRST_LINE_READ_CAP, READ_CHUNK, ROLLOUT_RE;
+var init_codex_subagent_filter = __esm(() => {
+  FIRST_LINE_READ_CAP = 1024 * 1024;
+  READ_CHUNK = 64 * 1024;
+  ROLLOUT_RE = /rollout-.*-([0-9a-fA-F-]{36})\.jsonl$/;
+});
+
 // src/transport/agent-session-list.ts
 function isUnknownFilterCwdOption(output) {
   return /(?:unknown|unrecognized) option/i.test(output) && output.includes("--filter-cwd");
@@ -32167,7 +32323,11 @@ async function runAgentSessionList(options) {
     }
     throw new Error(options.formatError(result));
   }
-  return parseAgentSessionListOutput(result.stdout, filterLocally ? options.filterCwd : undefined);
+  const parsed = parseAgentSessionListOutput(result.stdout, filterLocally ? options.filterCwd : undefined);
+  if (parsed && options.isSubagentSession) {
+    return filterSubagentSessions(parsed, options.isSubagentSession);
+  }
+  return parsed;
 }
 function parseAgentSessionListOutput(stdout2, filterCwd) {
   let parsed;
@@ -32202,16 +32362,17 @@ function filterAgentSessionListByCwd(result, cwd) {
 }
 var init_agent_session_list = __esm(() => {
   init_path();
+  init_codex_subagent_filter();
 });
 
 // src/transport/acpx-session-files.ts
 import { readdir as readdir3, unlink as unlink2 } from "node:fs/promises";
-import { homedir as homedir9 } from "node:os";
-import { join as join19 } from "node:path";
+import { homedir as homedir10 } from "node:os";
+import { join as join20 } from "node:path";
 async function deleteAcpxSessionFiles(options) {
-  const dir = options.sessionsDir ?? join19(homedir9(), ".acpx", "sessions");
+  const dir = options.sessionsDir ?? join20(homedir10(), ".acpx", "sessions");
   const safeId = encodeURIComponent(options.acpxRecordId);
-  await unlink2(join19(dir, `${safeId}.json`)).catch(() => {
+  await unlink2(join20(dir, `${safeId}.json`)).catch(() => {
     return;
   });
   let entries;
@@ -32222,7 +32383,7 @@ async function deleteAcpxSessionFiles(options) {
   }
   const streamFiles = entries.filter((name) => name.startsWith(`${safeId}.stream.`));
   for (const name of streamFiles) {
-    await unlink2(join19(dir, name)).catch(() => {
+    await unlink2(join20(dir, name)).catch(() => {
       return;
     });
   }
@@ -32327,6 +32488,18 @@ class AcpxCliTransport {
     this.streamingHooks = streamingHooks;
   }
   async ensureSession(session3, _onProgress) {
+    try {
+      await this.runEnsureSession(session3);
+    } catch (error2) {
+      const requestedModel = session3.model?.trim();
+      if (requestedModel && isModelNotAdvertisedError(error2 instanceof Error ? error2.message : null)) {
+        await this.runEnsureSession({ ...session3, model: undefined });
+        return;
+      }
+      throw error2;
+    }
+  }
+  async runEnsureSession(session3) {
     const args = this.buildArgs(session3, [
       "sessions",
       "new",
@@ -32352,7 +32525,8 @@ class AcpxCliTransport {
           timeoutMs: this.sessionInitTimeoutMs
         });
       },
-      formatError: (result) => normalizeCommandError(result) ?? `command failed with exit code ${result.code}`
+      formatError: (result) => normalizeCommandError(result) ?? `command failed with exit code ${result.code}`,
+      isSubagentSession: (query.driver ?? query.agent) === CODEX_AGENT_NAME ? codexSubagentPredicate() : undefined
     });
   }
   async tailSessionHistory(session3, lines) {
@@ -32812,6 +32986,7 @@ var init_acpx_cli_transport = __esm(() => {
   init_terminate_process_tree();
   init_acpx_queue_owner_launcher();
   init_agent_session_list();
+  init_codex_subagent_filter();
   init_acpx_session_files();
   require4 = createRequire5(import.meta.url);
 });
@@ -33284,8 +33459,8 @@ function createControlEventBus(logger2) {
 
 // src/transport/native-session-history.ts
 import { readFile as readFile14 } from "node:fs/promises";
-import { homedir as homedir10 } from "node:os";
-import { join as join20 } from "node:path";
+import { homedir as homedir11 } from "node:os";
+import { join as join21 } from "node:path";
 function classifyToolKind(name) {
   const n = name.toLowerCase();
   if (/(^|[^a-z])(read|cat|view|open)([^a-z]|$)/.test(n))
@@ -33397,8 +33572,8 @@ function mapAcpxMessagesToHistory(raw) {
 }
 async function readNativeSessionHistory(opts) {
   try {
-    const dir = opts.sessionsDir ?? join20(opts.homeDir ?? homedir10(), ".acpx", "sessions");
-    const indexRaw = await readFile14(join20(dir, "index.json"), "utf8").catch(() => null);
+    const dir = opts.sessionsDir ?? join21(opts.homeDir ?? homedir11(), ".acpx", "sessions");
+    const indexRaw = await readFile14(join21(dir, "index.json"), "utf8").catch(() => null);
     if (!indexRaw)
       return [];
     const index = JSON.parse(indexRaw);
@@ -33407,7 +33582,7 @@ async function readNativeSessionHistory(opts) {
     for (const entry of candidates) {
       if (!entry.file)
         continue;
-      const recRaw = await readFile14(join20(dir, entry.file), "utf8").catch(() => null);
+      const recRaw = await readFile14(join21(dir, entry.file), "utf8").catch(() => null);
       if (!recRaw)
         continue;
       const record3 = JSON.parse(recRaw);
@@ -33425,14 +33600,14 @@ var init_native_session_history = () => {};
 // src/control/workspace-fs.ts
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
-import { homedir as homedir11 } from "node:os";
+import { homedir as homedir12 } from "node:os";
 import { readdir as readdir4, realpath, stat as stat3, open as open5 } from "node:fs/promises";
 import { isAbsolute as isAbsolute3, relative, resolve as resolve3, sep } from "node:path";
 function expandHome2(p) {
   if (p === "~")
-    return homedir11();
+    return homedir12();
   if (p.startsWith("~/") || p.startsWith("~" + sep))
-    return resolve3(homedir11(), p.slice(2));
+    return resolve3(homedir12(), p.slice(2));
   return p;
 }
 
@@ -33561,16 +33736,16 @@ class WorkspaceFs {
     }
     const files = [];
     try {
-      const { stdout: stdout2 } = await execFileAsync("git", ["-C", root, "status", "--porcelain"], { maxBuffer: GIT_MAX_BUFFER });
-      for (const line of stdout2.split(`
-`)) {
-        if (!line)
+      const { stdout: stdout2 } = await execFileAsync("git", ["-C", root, "-c", "core.quotePath=false", "status", "--porcelain", "-z"], { maxBuffer: GIT_MAX_BUFFER });
+      const fields = stdout2.split("\x00");
+      for (let i = 0;i < fields.length; i++) {
+        const field = fields[i];
+        if (!field)
           continue;
-        const status = line.slice(0, 2);
-        let path15 = line.slice(3);
-        const arrow = path15.indexOf(" -> ");
-        if (arrow >= 0)
-          path15 = path15.slice(arrow + 4);
+        const status = field.slice(0, 2);
+        const path15 = field.slice(3);
+        if (status[0] === "R" || status[0] === "C")
+          i++;
         files.push({ path: path15, status });
       }
     } catch {}
@@ -33585,6 +33760,15 @@ class WorkspaceFs {
         diff = "";
       }
     }
+    if (rel && !diff) {
+      try {
+        diff = (await execFileAsync("git", ["-C", root, "-c", "core.quotePath=false", "diff", "--no-index", "--", "/dev/null", rel], { maxBuffer: GIT_MAX_BUFFER })).stdout;
+      } catch (e) {
+        const out = e.stdout;
+        if (typeof out === "string")
+          diff = out;
+      }
+    }
     const truncated = diff.length > DIFF_CAP;
     return { workspace: workspace3, files, diff: truncated ? diff.slice(0, DIFF_CAP) : diff, truncated, ...await this.gitContext(root) };
   }
@@ -33676,7 +33860,8 @@ class ControlService {
       workspace: session3.workspace,
       transportSession: session3.transportSession,
       running: this.deps.activeTurns.isActiveAnywhere(session3.alias),
-      archived: session3.archived === true
+      archived: session3.archived === true,
+      ...session3.agentCommand ? { agentCommand: session3.agentCommand } : {}
     }));
   }
   async listNativeSessions(_chatKey, agent3, workspace3) {
@@ -34036,10 +34221,10 @@ var init_control_service = __esm(() => {
 
 // src/control/upload-store.ts
 import { mkdtemp as mkdtemp2, readdir as readdir5, rm as rm10, stat as stat4, writeFile as writeFile8 } from "node:fs/promises";
-import { homedir as homedir12 } from "node:os";
+import { homedir as homedir13 } from "node:os";
 import path16 from "node:path";
 function defaultRootDir() {
-  const home = process.env.HOME ?? homedir12();
+  const home = process.env.HOME ?? homedir13();
   return path16.join(coreHomeDir(home), "runtime", "uploads");
 }
 function sanitizeUploadFilename(raw) {
@@ -34115,7 +34300,7 @@ var init_upload_store = __esm(() => {
 
 // src/config/agent-catalog.ts
 import { existsSync as existsSync3 } from "node:fs";
-import { delimiter as delimiter2, join as join21 } from "node:path";
+import { delimiter as delimiter2, join as join22 } from "node:path";
 function isBinaryOnPath(binary) {
   const path17 = process.env.PATH ?? "";
   const exts = process.platform === "win32" ? ["", ".exe", ".cmd", ".bat"] : [""];
@@ -34124,7 +34309,7 @@ function isBinaryOnPath(binary) {
       continue;
     for (const ext of exts) {
       try {
-        if (existsSync3(join21(dir, binary + ext)))
+        if (existsSync3(join22(dir, binary + ext)))
           return true;
       } catch {}
     }
@@ -34215,8 +34400,8 @@ __export(exports_main, {
   buildApp: () => buildApp
 });
 import { randomUUID as randomUUID3 } from "node:crypto";
-import { homedir as homedir13 } from "node:os";
-import { dirname as dirname13, join as join22 } from "node:path";
+import { homedir as homedir14 } from "node:os";
+import { dirname as dirname13, join as join23 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function startProgressHeartbeat(orchestration3, config4, logger2, channel) {
   const thresholdSeconds = config4.orchestration.progressHeartbeatSeconds;
@@ -34907,8 +35092,8 @@ async function main() {
   }
 }
 async function prepareChannelMedia(configPath, config4) {
-  const runtimeDir = join22(dirname13(configPath), "runtime");
-  const mediaRootDir = join22(runtimeDir, "media");
+  const runtimeDir = join23(dirname13(configPath), "runtime");
+  const mediaRootDir = join23(runtimeDir, "media");
   const mediaStore = new RuntimeMediaStore({ rootDir: mediaRootDir });
   await mediaStore.cleanupExpired().catch((error2) => {
     console.error("[xacpx] media cleanup failed:", error2 instanceof Error ? error2.message : String(error2));
@@ -34917,16 +35102,16 @@ async function prepareChannelMedia(configPath, config4) {
   return { mediaStore, channelDeps: { mediaStore, allowedMediaRoots } };
 }
 function resolveRuntimePaths() {
-  const home = process.env.HOME ?? homedir13();
+  const home = process.env.HOME ?? homedir14();
   if (!home) {
     throw new Error("Unable to resolve the current user home directory");
   }
-  const configPath = coreEnv("CONFIG") ?? join22(coreHomeDir(home), "config.json");
-  const runtimeDir = join22(dirname13(configPath), "runtime");
+  const configPath = coreEnv("CONFIG") ?? join23(coreHomeDir(home), "config.json");
+  const runtimeDir = join23(dirname13(configPath), "runtime");
   return {
     configPath,
-    statePath: coreEnv("STATE") ?? join22(coreHomeDir(home), "state.json"),
-    perfLogPath: join22(runtimeDir, "perf.log"),
+    statePath: coreEnv("STATE") ?? join23(coreHomeDir(home), "state.json"),
+    perfLogPath: join23(runtimeDir, "perf.log"),
     orchestrationSocketPath: coreEnv("ORCHESTRATION_SOCKET") ?? resolveDaemonOrchestrationSocketPath(runtimeDir)
   };
 }
@@ -34938,13 +35123,13 @@ function resolveBridgeEntryPath() {
 }
 function resolveAppLogPath(configPath) {
   const rootDir = dirname13(configPath);
-  const runtimeDir = join22(rootDir, "runtime");
-  return join22(runtimeDir, "app.log");
+  const runtimeDir = join23(rootDir, "runtime");
+  return join23(runtimeDir, "app.log");
 }
 function resolvePerfLogPath(configPath) {
   const rootDir = dirname13(configPath);
-  const runtimeDir = join22(rootDir, "runtime");
-  return join22(runtimeDir, "perf.log");
+  const runtimeDir = join23(rootDir, "runtime");
+  return join23(runtimeDir, "perf.log");
 }
 function resolveOrchestrationSocketPathFromConfigPath(configPath) {
   const runtimeDir = resolveRuntimeDirFromConfigPath(configPath);
@@ -35186,10 +35371,10 @@ var init_config_check = __esm(async () => {
 // src/doctor/checks/daemon-check.ts
 import { readdir as readdir6, readFile as readFile15, rm as rm11 } from "node:fs/promises";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
-import { homedir as homedir14 } from "node:os";
-import { join as join23 } from "node:path";
+import { homedir as homedir15 } from "node:os";
+import { join as join24 } from "node:path";
 async function checkDaemon(options = {}) {
-  const home = options.home ?? process.env.HOME ?? homedir14();
+  const home = options.home ?? process.env.HOME ?? homedir15();
   const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
   const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
     home,
@@ -35289,7 +35474,7 @@ async function detectStaleConsumerLockFix(runtimeDir, deps) {
     if (!fileName.endsWith(CONSUMER_LOCK_SUFFIX)) {
       continue;
     }
-    const lockPath = join23(runtimeDir, fileName);
+    const lockPath = join24(runtimeDir, fileName);
     const lock2 = await deps.readConsumerLock(lockPath);
     if (lock2 && !deps.isProcessRunning(lock2.pid)) {
       stalePaths.push(lockPath);
@@ -35354,10 +35539,10 @@ var init_daemon_check = __esm(() => {
 
 // src/doctor/checks/logs-check.ts
 import { stat as stat5, readdir as readdir7 } from "node:fs/promises";
-import { basename as basename4, join as join24 } from "node:path";
-import { homedir as homedir15 } from "node:os";
+import { basename as basename4, join as join25 } from "node:path";
+import { homedir as homedir16 } from "node:os";
 async function checkLogs(options = {}) {
-  const home = options.home ?? process.env.HOME ?? homedir15();
+  const home = options.home ?? process.env.HOME ?? homedir16();
   const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
   const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
     home,
@@ -35389,7 +35574,7 @@ async function checkLogs(options = {}) {
   const matched = entries.filter((entry) => isTrackedLogName(entry, tracked));
   const files = [];
   for (const name of matched) {
-    const path17 = join24(paths.runtimeDir, name);
+    const path17 = join25(paths.runtimeDir, name);
     try {
       const fileStat = await probe.stat(path17);
       if (fileStat.isDirectory()) {
@@ -35539,9 +35724,9 @@ var init_orchestration_health = __esm(() => {
 });
 
 // src/doctor/checks/orchestration-socket-check.ts
-import { homedir as homedir16 } from "node:os";
+import { homedir as homedir17 } from "node:os";
 async function checkOrchestrationSocket(options = {}) {
-  const home = options.home ?? process.env.HOME ?? homedir16();
+  const home = options.home ?? process.env.HOME ?? homedir17();
   const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
   const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
     home,
@@ -35716,9 +35901,9 @@ var init_plugin_check = __esm(async () => {
 import { constants } from "node:fs";
 import { access as access4, stat as stat6 } from "node:fs/promises";
 import { dirname as dirname14 } from "node:path";
-import { homedir as homedir17 } from "node:os";
+import { homedir as homedir18 } from "node:os";
 async function checkRuntime(options = {}) {
-  const home = options.home ?? process.env.HOME ?? homedir17();
+  const home = options.home ?? process.env.HOME ?? homedir18();
   const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
   const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
     home,
@@ -36351,10 +36536,10 @@ var init_render_doctor = __esm(() => {
 });
 
 // src/doctor/doctor.ts
-import { homedir as homedir18 } from "node:os";
-import { join as join25 } from "node:path";
+import { homedir as homedir19 } from "node:os";
+import { join as join26 } from "node:path";
 async function runDoctor(options = {}, deps = {}) {
-  const home = deps.home ?? process.env.HOME ?? homedir18();
+  const home = deps.home ?? process.env.HOME ?? homedir19();
   const runtimePaths = resolveDoctorRuntimePaths(home, deps.resolveRuntimePaths);
   const sharedLoadConfig = createSharedLoadConfig(runtimePaths, deps.loadConfig ?? loadConfig);
   const runners = [
@@ -36507,8 +36692,8 @@ function resolveDoctorRuntimePaths(home, resolver) {
     return resolveRuntimePaths();
   }
   return {
-    configPath: join25(coreHomeDir(home), "config.json"),
-    statePath: join25(coreHomeDir(home), "state.json")
+    configPath: join26(coreHomeDir(home), "config.json"),
+    statePath: join26(coreHomeDir(home), "state.json")
   };
 }
 function depsUseExplicitRuntimeOverrides() {
@@ -36691,8 +36876,8 @@ var init_doctor2 = __esm(async () => {
 // src/cli.ts
 init_core_home();
 import { randomUUID as randomUUID4 } from "node:crypto";
-import { homedir as homedir19 } from "node:os";
-import { dirname as dirname15, join as join26, sep as sep2 } from "node:path";
+import { homedir as homedir20 } from "node:os";
+import { dirname as dirname15, join as join27, sep as sep2 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 
 // src/runtime/migrate-core-home.ts
@@ -52946,7 +53131,7 @@ async function createCliScheduledTaskService() {
   return new ScheduledTaskService(state, stateStore);
 }
 function resolveConfigPathForCurrentEnv() {
-  return coreEnv("CONFIG") ?? join26(coreHomeDir(requireHome2()), "config.json");
+  return coreEnv("CONFIG") ?? join27(coreHomeDir(requireHome2()), "config.json");
 }
 function resolveDaemonPathsForCurrentConfig() {
   const configPath = resolveConfigPathForCurrentEnv();
@@ -53297,7 +53482,7 @@ function decodeFirstRunOnboarding(raw) {
   return null;
 }
 function requireHome2() {
-  const home = process.env.HOME ?? homedir19();
+  const home = process.env.HOME ?? homedir20();
   if (!home) {
     throw new Error("Unable to resolve the current user home directory");
   }
@@ -53321,7 +53506,7 @@ function safeDaemonLogPaths() {
     const configPath = resolveConfigPathForCurrentEnv();
     const paths = resolveDaemonPathsForCurrentConfig();
     return {
-      appLog: join26(dirname15(configPath), "runtime", "app.log"),
+      appLog: join27(dirname15(configPath), "runtime", "app.log"),
       stderrLog: paths.stderrLog
     };
   } catch {

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

@@ -18,6 +18,11 @@ export interface ControlSessionInfo {
     transportSession: string;
     running: boolean;
     archived: boolean;
+    /** The agent adapter command this session runs (acpx-recorded, or the agent's resolved
+     *  default). Surfaced so the web can avoid seeding a new session's model picker from a
+     *  session on a different adapter version (whose advertised model ids may be in an
+     *  incompatible format). Omitted when unknown. */
+    agentCommand?: string;
 }
 export interface ControlAgentInfo {
     name: string;

package/dist/transport/types.d.ts

@@ -102,6 +102,8 @@ export interface AgentSession {
 export interface AgentSessionListQuery {
     agent: string;
     agentCommand?: string;
+    /** Resolved acpx driver for `agent` (e.g. a custom `my-codex` agent has driver `codex`). Used to gate driver-specific list filtering. */
+    driver?: string;
     cwd: string;
     cursor?: string;
     filterCwd?: string;

package/package.json

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