fix(clawsweeper): address review for clawsweeper-commit-openclaw-openclaw-4cba08df01ea (1)

openclaw-clownfish[bot] · openclaw-clownfish[bot] · commit 60b04426ea7e · 2026-04-29T23:21:25.000Z
diff --git a/src/config/zod-schema.providers-whatsapp.test.ts b/src/config/zod-schema.providers-whatsapp.test.ts
@@ -108,5 +108,32 @@ describe("WhatsApp prompt config Zod validation", () => {
     });
 
     expect(result.success).toBe(true);
+    if (result.success) {
+      expect(Object.hasOwn(result.data, "exposeErrorText")).toBe(false);
+      expect(Object.hasOwn(result.data.accounts?.work ?? {}, "exposeErrorText")).toBe(false);
+    }
+  });
+
+  it("keeps deprecated exposeErrorText out of generated config surfaces", () => {
+    const schema = WhatsAppConfigSchema.toJSONSchema({
+      target: "draft-07",
+      unrepresentable: "any",
+    }) as {
+      properties?: {
+        exposeErrorText?: unknown;
+        accounts?: {
+          additionalProperties?: {
+            properties?: {
+              exposeErrorText?: unknown;
+            };
+          };
+        };
+      };
+    };
+
+    expect(schema.properties?.exposeErrorText).toBeUndefined();
+    expect(schema.properties?.accounts?.additionalProperties?.properties?.exposeErrorText).toBe(
+      undefined,
+    );
   });
 });
diff --git a/src/config/zod-schema.providers-whatsapp.ts b/src/config/zod-schema.providers-whatsapp.ts
@@ -48,6 +48,18 @@ const WhatsAppAckReactionSchema = z
   .strict()
   .optional();
 
+function stripDeprecatedWhatsAppNoopKeys(value: unknown): unknown {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return value;
+  }
+  if (!Object.hasOwn(value, "exposeErrorText")) {
+    return value;
+  }
+  const next = { ...(value as Record<string, unknown>) };
+  delete next.exposeErrorText;
+  return next;
+}
+
 function buildWhatsAppCommonShape(params: { useDefaults: boolean }) {
   return {
     enabled: z.boolean().optional(),
@@ -57,7 +69,6 @@ function buildWhatsAppCommonShape(params: { useDefaults: boolean }) {
     sendReadReceipts: z.boolean().optional(),
     messagePrefix: z.string().optional(),
     responsePrefix: z.string().optional(),
-    exposeErrorText: z.boolean().optional(),
     dmPolicy: params.useDefaults
       ? DmPolicySchema.optional().default("pairing")
       : DmPolicySchema.optional(),
@@ -131,7 +142,7 @@ function enforceAllowlistDmPolicyAllowFrom(params: {
   });
 }
 
-export const WhatsAppAccountSchema = z
+const WhatsAppAccountObjectSchema = z
   .object({
     ...buildWhatsAppCommonShape({ useDefaults: false }),
     name: z.string().optional(),
@@ -142,7 +153,12 @@ export const WhatsAppAccountSchema = z
   })
   .strict();
 
-export const WhatsAppConfigSchema = z
+export const WhatsAppAccountSchema = z.preprocess(
+  stripDeprecatedWhatsAppNoopKeys,
+  WhatsAppAccountObjectSchema,
+);
+
+const WhatsAppConfigObjectSchema = z
   .object({
     ...buildWhatsAppCommonShape({ useDefaults: true }),
     accounts: z.record(z.string(), WhatsAppAccountSchema.optional()).optional(),
@@ -207,3 +223,8 @@ export const WhatsAppConfigSchema = z
       });
     }
   });
+
+export const WhatsAppConfigSchema = z.preprocess(
+  stripDeprecatedWhatsAppNoopKeys,
+  WhatsAppConfigObjectSchema,
+);
