@yitom/agy-acp-map 0.1.8 → 0.1.12

package/dist/agent-sdk.d.ts

@@ -41,6 +41,8 @@ export declare class AgyAcpService {
     closeSession(params: any): Promise<any>;
     deleteSession(params: any): Promise<any>;
     cancelSession(params: any): void;
+    /** Kill every live agy child (bridge shutdown path; see sdk-server.ts). */
+    shutdown(): Promise<void>;
     promptSession(params: any, notifyClient: (update: any) => Promise<void> | void, opts?: {
         isPreLocked?: boolean;
     }): Promise<{

package/dist/agy-acp-win-x64.exe

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/agy-acp-win-x64.exe
-size: 86638592 bytes
-sha256: 04f1c91b9f04b9971c5054925401246c5e2ce70cb34f2c0668ca1527a4f91930
+size: 86640640 bytes
+sha256: c8e70067edbdf6ea2df6b33a207ca32035179f4c487a20ac7d4d78167af27583

package/dist/bin.js

@@ -11020,6 +11020,7 @@ function createMapperState(richRoots) {
     emittedImageUris: new Set,
     emittedTextDelta: false,
     emittedThoughtDelta: false,
+    retryCount: 0,
     richRoots
   };
 }
@@ -11035,7 +11036,8 @@ function resetTurnState(state) {
     turnDone: false,
     emittedImageUris: new Set,
     emittedTextDelta: false,
-    emittedThoughtDelta: false
+    emittedThoughtDelta: false,
+    retryCount: 0
   };
 }
 function toolCallIdForStep(state, stepIndex) {
@@ -11184,6 +11186,31 @@ function extractThought(s) {
   }
   return;
 }
+function extractErrorDetail(s, maxLen = 300) {
+  const seen = new Set;
+  const parts = [];
+  const candidates = [
+    s.error,
+    s.message,
+    s.text,
+    s.description,
+    s.reason,
+    s.error_info?.message
+  ];
+  for (const c of candidates) {
+    if (typeof c !== "string")
+      continue;
+    const t = c.replace(/\s+/g, " ").trim();
+    if (!t || seen.has(t))
+      continue;
+    seen.add(t);
+    parts.push(t);
+    if (parts.join(" | ").length >= maxLen)
+      break;
+  }
+  const joined = parts.join(" | ");
+  return joined.length > maxLen ? joined.slice(0, maxLen) + "…" : joined;
+}
 function formatUpdateForProtocol(update, protocolVersion) {
   if (protocolVersion >= 2) {
     if (update.sessionUpdate === "tool_call") {
@@ -11310,6 +11337,23 @@ function mapAgyEvent(sessionId, event, state, opts) {
     if (stepType === "user_input") {
       return { notifications, state };
     }
+    if (stepType === "error_message") {
+      const detail = extractErrorDetail(s);
+      if (detail) {
+        state.retryCount = (state.retryCount ?? 0) + 1;
+        notifications.push(notify(sessionId, {
+          sessionUpdate: "agent_message_chunk",
+          messageId: `msg_agent_retry_${stepIndex}_${Date.now()}`,
+          content: {
+            type: "text",
+            text: `
+> 第 ${state.retryCount} 次尝试遇到问题，正在重试…（${detail}）
+`
+          }
+        }));
+      }
+      return { notifications, state };
+    }
     if (stepType === "agent_response") {
       const text = s.text_delta;
       if (typeof text === "string" && text.length > 0) {
@@ -12499,7 +12543,7 @@ class SessionHistoryStore {
 var AGENT_INFO = {
   name: "agy-acp",
   title: "agy ACP (stream-json)",
-  version: "0.1.8"
+  version: "0.1.12"
 };
 var BRIDGE_CAPABILITIES = {
   prompt: true,
@@ -17805,6 +17849,9 @@ class AgyAcpService {
   cancelSession(params) {
     this.core.cancelSession(params);
   }
+  async shutdown() {
+    await this.core.shutdown();
+  }
   promptSession(params, notifyClient, opts) {
     const targetSession = this.core.sessions.get(params?.sessionId);
     const version = params?.protocolVersion === 2 || params?.protocolVersion !== 1 && targetSession?.protocolVersion === 2 ? 2 : 1;
@@ -17874,5 +17921,23 @@ var app = createDualAcpApp(service);
 var stream = ndJsonStream2(Writable.toWeb(process.stdout), Readable.toWeb(process.stdin));
 process.stderr.write(`[agy-acp-sdk] Starting official @agentclientprotocol/sdk stdio server...
 `);
+var shuttingDown = false;
+async function shutdown(code) {
+  if (shuttingDown)
+    process.exit(code);
+  shuttingDown = true;
+  debugLog2(`shutdown code=${code}: killing supervised agy children`);
+  try {
+    await service.shutdown();
+  } catch (err) {
+    debugLog2(`shutdown kill error: ${err?.message}`);
+  }
+  debugLog2("shutdown complete");
+  process.exit(code);
+}
+process.on("SIGINT", () => void shutdown(0));
+process.on("SIGTERM", () => void shutdown(0));
+process.stdin.on("end", () => void shutdown(0));
+process.stdin.on("close", () => void shutdown(0));
 await app.connect(stream);
-debugLog2("CONNECT-SETUP-DONE (stream established; exit 0 only happens after stdin END/CLOSE)");
+debugLog2("CONNECT-SETUP-DONE (serving; exit only via stdin close or signal)");

package/dist/index.js

@@ -10694,6 +10694,7 @@ function createMapperState(richRoots) {
     emittedImageUris: new Set,
     emittedTextDelta: false,
     emittedThoughtDelta: false,
+    retryCount: 0,
     richRoots
   };
 }
@@ -10709,7 +10710,8 @@ function resetTurnState(state) {
     turnDone: false,
     emittedImageUris: new Set,
     emittedTextDelta: false,
-    emittedThoughtDelta: false
+    emittedThoughtDelta: false,
+    retryCount: 0
   };
 }
 function toolCallIdForStep(state, stepIndex) {
@@ -10858,6 +10860,31 @@ function extractThought(s) {
   }
   return;
 }
+function extractErrorDetail(s, maxLen = 300) {
+  const seen = new Set;
+  const parts = [];
+  const candidates = [
+    s.error,
+    s.message,
+    s.text,
+    s.description,
+    s.reason,
+    s.error_info?.message
+  ];
+  for (const c of candidates) {
+    if (typeof c !== "string")
+      continue;
+    const t = c.replace(/\s+/g, " ").trim();
+    if (!t || seen.has(t))
+      continue;
+    seen.add(t);
+    parts.push(t);
+    if (parts.join(" | ").length >= maxLen)
+      break;
+  }
+  const joined = parts.join(" | ");
+  return joined.length > maxLen ? joined.slice(0, maxLen) + "…" : joined;
+}
 function formatUpdateForProtocol(update, protocolVersion) {
   if (protocolVersion >= 2) {
     if (update.sessionUpdate === "tool_call") {
@@ -10984,6 +11011,23 @@ function mapAgyEvent(sessionId, event, state, opts) {
     if (stepType === "user_input") {
       return { notifications, state };
     }
+    if (stepType === "error_message") {
+      const detail = extractErrorDetail(s);
+      if (detail) {
+        state.retryCount = (state.retryCount ?? 0) + 1;
+        notifications.push(notify(sessionId, {
+          sessionUpdate: "agent_message_chunk",
+          messageId: `msg_agent_retry_${stepIndex}_${Date.now()}`,
+          content: {
+            type: "text",
+            text: `
+> 第 ${state.retryCount} 次尝试遇到问题，正在重试…（${detail}）
+`
+          }
+        }));
+      }
+      return { notifications, state };
+    }
     if (stepType === "agent_response") {
       const text = s.text_delta;
       if (typeof text === "string" && text.length > 0) {
@@ -12286,7 +12330,7 @@ class SessionHistoryStore {
 var AGENT_INFO = {
   name: "agy-acp",
   title: "agy ACP (stream-json)",
-  version: "0.1.8"
+  version: "0.1.12"
 };
 var BRIDGE_CAPABILITIES = {
   prompt: true,
@@ -17605,6 +17649,9 @@ class AgyAcpService {
   cancelSession(params) {
     this.core.cancelSession(params);
   }
+  async shutdown() {
+    await this.core.shutdown();
+  }
   promptSession(params, notifyClient, opts) {
     const targetSession = this.core.sessions.get(params?.sessionId);
     const version = params?.protocolVersion === 2 || params?.protocolVersion !== 1 && targetSession?.protocolVersion === 2 ? 2 : 1;
@@ -17712,6 +17759,7 @@ export {
   deleteOnCloseEnabled,
   discoverAgyCatalog,
   escalateKill,
+  extractErrorDetail,
   extractImagePaths,
   extractLaunchConfig,
   fileToAcpImageBlock,

package/dist/lib/map-agy-to-acp.d.ts

@@ -21,6 +21,8 @@ export interface MapperState {
     emittedTextDelta?: boolean;
     /** True when at least one agent_response thought_delta was emitted this turn. */
     emittedThoughtDelta?: boolean;
+    /** Model-side retries seen this turn (error_message steps surfaced visibly). */
+    retryCount?: number;
     /** Session roots for image allowlist (set by server). */
     richRoots?: FileToAcpImageOpts;
 }
@@ -33,6 +35,11 @@ export declare function createMapperState(richRoots?: FileToAcpImageOpts): Mappe
 /** Reset per-turn tracking (keep conversationId / tools / richRoots / turnSeq+1). */
 export declare function resetTurnState(state: MapperState): MapperState;
 export declare function guessToolKind(name: unknown): string;
+/**
+ * Pull a human-readable cause out of an error_message step. agy field names
+ * vary by failure kind, so probe the likely carriers and cap the length.
+ */
+export declare function extractErrorDetail(s: Record<string, unknown>, maxLen?: number): string;
 /** Format or adapt updates according to client ACP protocol version (v1 vs v2). */
 export declare function formatUpdateForProtocol(update: Record<string, unknown>, protocolVersion: number): Record<string, unknown> | null;
 export interface MapAgyEventOpts {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yitom/agy-acp-map",
-  "version": "0.1.8",
+  "version": "0.1.12",
   "publishConfig": {
     "access": "public"
   },