openclaw
diff --git a/‎extensions/imessage/src/approval-handler.runtime.ts‎
Lines changed: 6 additions & 48 deletions b/‎extensions/imessage/src/approval-handler.runtime.ts‎
Lines changed: 6 additions & 48 deletions
@@ -1,23 +1,18 @@
 import {
+  buildChannelApprovalExpiredText,
+  buildChannelApprovalResolvedText,
   createChannelApprovalNativeRuntimeAdapter,
-  type ExpiredApprovalView,
   type PendingApprovalView,
-  type ResolvedApprovalView,
+  resolvePreparedApprovalAccountId,
 } from "openclaw/plugin-sdk/approval-handler-runtime";
 import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";
 import { buildApprovalReactionPendingContent } from "openclaw/plugin-sdk/approval-reaction-runtime";
 import type { ExecApprovalReplyDecision } from "openclaw/plugin-sdk/approval-reply-runtime";
 import {
-  buildApprovalResolvedReplyPayload,
-  buildPluginApprovalExpiredMessage,
-  buildPluginApprovalResolvedMessage,
   type ExecApprovalRequest,
-  type ExecApprovalResolved,
   type PluginApprovalRequest,
-  type PluginApprovalResolved,
 } from "openclaw/plugin-sdk/approval-runtime";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import {
   registerIMessageApprovalReactionTarget,
   unregisterIMessageApprovalReactionTarget,
@@ -30,7 +25,6 @@ import { normalizeIMessageHandle, parseIMessageTarget } from "./targets.js";
 const log = createSubsystemLogger("imessage/approvals");
 
 type ApprovalRequest = ExecApprovalRequest | PluginApprovalRequest;
-type ApprovalResolved = ExecApprovalResolved | PluginApprovalResolved;
 type IMessagePendingDelivery = {
   text: string;
   allowedDecisions: readonly ExecApprovalReplyDecision[];
@@ -66,42 +60,6 @@ function buildPendingPayload(params: {
   };
 }
 
-function buildResolvedText(params: {
-  request: ApprovalRequest;
-  resolved: ApprovalResolved;
-  view: ResolvedApprovalView;
-}): string {
-  if (params.view.approvalKind === "plugin") {
-    return buildPluginApprovalResolvedMessage(params.resolved as PluginApprovalResolved);
-  }
-  const resolvedByText = params.resolved.resolvedBy
-    ? ` Resolved by ${params.resolved.resolvedBy}.`
-    : "";
-  const payload = buildApprovalResolvedReplyPayload({
-    approvalId: params.request.id,
-    approvalSlug: params.request.id.slice(0, 8),
-    text: `✅ Exec approval ${params.resolved.decision}.${resolvedByText} ID: ${params.request.id}`,
-  });
-  return payload.text ?? "";
-}
-
-function buildExpiredText(params: { request: ApprovalRequest; view: ExpiredApprovalView }): string {
-  if (params.view.approvalKind === "plugin") {
-    return buildPluginApprovalExpiredMessage(params.request as PluginApprovalRequest);
-  }
-  return `⏱️ Exec approval expired. ID: ${params.request.id}`;
-}
-
-function resolvePreparedAccountId(params: {
-  plannedAccountId?: string | null;
-  contextAccountId?: string | null;
-}): string | undefined {
-  return (
-    normalizeOptionalString(params.plannedAccountId) ??
-    normalizeOptionalString(params.contextAccountId)
-  );
-}
-
 function buildConversationKeyForTarget(to: string): IMessageApprovalConversationKey | null {
   try {
     const parsed = parseIMessageTarget(to);
@@ -138,11 +96,11 @@ export const imessageApprovalNativeRuntime = createChannelApprovalNativeRuntimeA
       buildPendingPayload({ request, approvalKind, nowMs, view }),
     buildResolvedResult: ({ request, resolved, view }) => ({
       kind: "update",
-      payload: { text: buildResolvedText({ request, resolved, view }) },
+      payload: { text: buildChannelApprovalResolvedText({ request, resolved, view }) },
     }),
     buildExpiredResult: ({ request, view }) => ({
       kind: "update",
-      payload: { text: buildExpiredText({ request, view }) },
+      payload: { text: buildChannelApprovalExpiredText({ request, view }) },
     }),
   },
   transport: {
@@ -153,7 +111,7 @@ export const imessageApprovalNativeRuntime = createChannelApprovalNativeRuntimeA
       }
       const prepared: PreparedIMessageApprovalTarget = {
         to,
-        accountId: resolvePreparedAccountId({
+        accountId: resolvePreparedApprovalAccountId({
           plannedAccountId: (plannedTarget.target as { accountId?: string | null }).accountId,
           contextAccountId: accountId,
         }),