@ganglion/xacpx 0.15.2 → 0.15.4

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";
@@ -3913,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;

package/dist/cli.js

@@ -20164,7 +20164,7 @@ async function resolveSessionAgentCommandFromIndex(session3) {
     const raw = await readFile12(resolve2(home, ".acpx", "sessions", "index.json"), "utf8");
     const parsed = JSON.parse(raw);
     const targetCwd = resolve2(session3.cwd);
-    const match = parsed.entries?.find((entry) => entry.name === session3.transportSession && entry.cwd === targetCwd && typeof entry.agentCommand === "string" && entry.agentCommand.trim().length > 0);
+    const match = parsed.entries?.find((entry) => entry.name === session3.transportSession && typeof entry.cwd === "string" && resolve2(entry.cwd) === targetCwd && typeof entry.agentCommand === "string" && entry.agentCommand.trim().length > 0);
     return match?.agentCommand?.trim();
   } catch {
     return;
@@ -24733,7 +24733,7 @@ class CommandRouter {
   async handle(chatKey, input, reply, replyContextToken, accountId, media, metadata, abortSignal, onToolEvent, onThought, perfSpan, onPlan, onUsage, onCommands) {
     const startedAt = Date.now();
     let command = parseCommand(input);
-    if (metadata?.channel === "control" && command.kind !== "prompt") {
+    if (metadata?.channel === "control" && command.kind !== "prompt" && command.kind !== "session.reset") {
       command = { kind: "prompt", text: input.trim() };
     }
     await this.logger.debug("command.parsed", "parsed inbound command", {
@@ -31587,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";
@@ -32481,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",
@@ -33841,7 +33860,9 @@ class ControlService {
       workspace: session3.workspace,
       transportSession: session3.transportSession,
       running: this.deps.activeTurns.isActiveAnywhere(session3.alias),
-      archived: session3.archived === true
+      archived: session3.archived === true,
+      ...session3.source === "agent-side" ? { native: true } : {},
+      ...session3.agentCommand ? { agentCommand: session3.agentCommand } : {}
     }));
   }
   async listNativeSessions(_chatKey, agent3, workspace3) {
@@ -33992,10 +34013,14 @@ class ControlService {
       resolveSettled = resolve4;
     });
     this.inFlight.set(key, { controller, settled });
+    let internalAlias;
     let wasArchived = false;
+    let priorTransportSession;
     try {
-      const internalAlias = await this.deps.sessions.resolveAliasForChat(params.chatKey, params.sessionAlias);
-      wasArchived = (await this.deps.sessions.getSession(internalAlias))?.archived === true;
+      internalAlias = await this.deps.sessions.resolveAliasForChat(params.chatKey, params.sessionAlias);
+      const prior = await this.deps.sessions.getSession(internalAlias);
+      wasArchived = prior?.archived === true;
+      priorTransportSession = prior?.transportSession;
     } catch {}
     try {
       await this.deps.sessions.useSession(params.chatKey, params.sessionAlias);
@@ -34138,6 +34163,14 @@ ${chunk}` : chunk
     } finally {
       this.inFlight.delete(key);
       resolveSettled();
+      if (internalAlias && priorTransportSession) {
+        try {
+          const after = await this.deps.sessions.getSession(internalAlias);
+          if (after && after.transportSession !== priorTransportSession) {
+            this.deps.events.emit({ type: "sessions-changed" });
+          }
+        } catch {}
+      }
     }
   }
   cancelTurn(chatKey, sessionAlias) {

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

@@ -18,6 +18,15 @@ export interface ControlSessionInfo {
     transportSession: string;
     running: boolean;
     archived: boolean;
+    /** True when this logical session was attached to an existing agent-side (native) rollout
+     *  rather than freshly created. Mirrors LogicalSession.source === "agent-side"; omitted for
+     *  fresh xacpx sessions so the wire stays minimal. */
+    native?: 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/package.json

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