openclaw-openagent 1.0.11 → 1.0.13

package/src/transport/oasn/oasn-invocation.ts

@@ -407,15 +407,10 @@ export class OasnInvocation {
       };
     }
 
-    // 失败/超时/取消 —— 文本统一用 user_error.message 兜底
-    const userError = final.userError ?? final.user_error;
-    const inlineResult = final.inlineResult ?? final.inline_result;
-    const visible = final.visibleResult ?? final.visible_result;
-    const message = userError?.message
-      ?? inlineResult?.summary
-      ?? visible?.inlineResultSummary
-      ?? visible?.inline_result_summary
-      ?? `Invocation ended with status=${final.status}`;
+    const message = this._invocationFailureMessage(
+      final,
+      `Invocation ended with status=${final.status}`,
+    );
     return {
       requestId: invocationId,
       status: 'error',
@@ -450,15 +445,55 @@ export class OasnInvocation {
 
   /** 终态错误专用 TransportError，便于上层 catch */
   private _terminalError(final: GetInvocationResponse, handle: TaskHandle): TransportError {
-    const userError = final.userError ?? final.user_error;
-    const code = userError?.code ?? `INVOCATION_${final.status.toUpperCase()}`;
-    const msg = userError?.message ?? `Invocation ${final.status}`;
+    const code = this._invocationFailureCode(final) ?? `INVOCATION_${final.status.toUpperCase()}`;
+    const msg = this._invocationFailureMessage(final, `Invocation ${final.status}`);
     return makeTransportError(code, msg, {
       invocationId: handle.invocationId,
       sessionId: handle.sessionId,
     });
   }
 
+  private _invocationFailureCode(final: GetInvocationResponse): string | undefined {
+    return this._firstText(
+      final.userError?.code,
+      final.user_error?.code,
+      final.userErrorCode,
+      final.user_error_code,
+    );
+  }
+
+  private _invocationFailureMessage(final: GetInvocationResponse, fallback: string): string {
+    const userMessage = this._firstText(
+      final.userError?.message,
+      final.user_error?.message,
+      final.userErrorMessage,
+      final.user_error_message,
+    );
+    if (userMessage) return userMessage;
+
+    const inlineResult = final.inlineResult ?? final.inline_result;
+    const visible = final.visibleResult ?? final.visible_result;
+    const fallbackMessage = this._firstText(
+      inlineResult?.summary,
+      visible?.inlineResultSummary,
+      visible?.inline_result_summary,
+      final.progress?.safeStatusMessage,
+      final.progress?.safe_status_message,
+    );
+    const code = this._invocationFailureCode(final);
+    if (fallbackMessage && code && !fallbackMessage.includes(code)) return `${fallbackMessage} (${code})`;
+    return fallbackMessage ?? code ?? fallback;
+  }
+
+  private _firstText(...values: Array<unknown>): string | undefined {
+    for (const value of values) {
+      if (typeof value !== 'string') continue;
+      const trimmed = value.trim();
+      if (trimmed) return trimmed;
+    }
+    return undefined;
+  }
+
   private _toArtifactRef(art: ArtifactResponse): ArtifactRef {
     return {
       id: art.artifactId ?? art.artifact_id ?? '',

package/src/transport/oasn/oasn-types.ts

@@ -316,8 +316,12 @@ export interface GetInvocationResponse {
   nextPollAfterMs?: number | null;
   next_poll_after_ms?: number | null;
   warnings?: string[];
-  userError?: { code: string; message: string };
-  user_error?: { code: string; message: string };
+  userError?: { code?: string; message?: string | null };
+  user_error?: { code?: string; message?: string | null };
+  userErrorCode?: string;
+  user_error_code?: string;
+  userErrorMessage?: string | null;
+  user_error_message?: string | null;
   createdAt?: string;
   created_at?: string;
   updatedAt?: string;

package/src/types/openclaw-plugin-sdk-media-store.d.ts

@@ -0,0 +1,9 @@
+declare module 'openclaw/plugin-sdk/media-store' {
+  export function saveMediaBuffer(
+    buffer: Buffer,
+    mimeType: string,
+    namespace: string,
+    maxBytes: number,
+    filename?: string,
+  ): Promise<{ id: string }>;
+}