@inline-openclaw/inline 0.0.68 → 0.0.70

package/dist/channel-plugin-api.js

@@ -70363,7 +70363,7 @@ function countInlineExecApprovalEligibleAccounts(params) {
   }).length;
 }
 function isExecApprovalRequest(request) {
-  return "command" in request.request;
+  return request.approvalKind != null ? request.approvalKind === "exec" : ("command" in request.request) && !("proposalHash" in request.request);
 }
 function isTargetForwardingMode(mode) {
   return mode === "targets" || mode === "both";
@@ -74293,7 +74293,9 @@ ${entityLines.slice(-ATTACHMENT_CONTEXT_LIMIT).join(`
 }
 async function monitorInlineProvider(params) {
   let { cfg } = params;
-  const { account, runtime, abortSignal, log, statusSink } = params;
+  const { account, runtime, log, statusSink } = params;
+  const shutdown = new AbortController;
+  const abortSignal = AbortSignal.any([params.abortSignal, shutdown.signal]);
   const core3 = getInlineRuntime();
   if (!account.configured || !account.baseUrl) {
     throw new Error(`Inline not configured for account "${account.accountId}" (missing baseUrl or token)`);
@@ -74786,6 +74788,8 @@ async function monitorInlineProvider(params) {
     });
   };
   const handleInboundNow = async (input) => {
+    if (abortSignal.aborted)
+      return;
     const chatId = input.chatId;
     const msg = input.msg;
     const rawBodyOverride = input.rawBodyOverride ?? null;
@@ -75933,7 +75937,7 @@ This model will be used for your next message.`, []);
       closing: false
     };
     const renderInlineProgressPlaceholder = async () => {
-      if (!progressPlaceholderEnabled || progressState.closing || adoptingThread)
+      if (abortSignal.aborted || !progressPlaceholderEnabled || progressState.closing || adoptingThread)
         return;
       const text = sanitizeInlineDeliveryText(formatChannelProgressDraftText({
         entry: account.config,
@@ -75943,7 +75947,7 @@ This model will be used for your next message.`, []);
       if (!text || text === progressState.text)
         return;
       progressState.opChain = progressState.opChain.then(async () => {
-        if (progressState.closing || text === progressState.text)
+        if (abortSignal.aborted || progressState.closing || text === progressState.text)
           return;
         if (progressState.messageId == null) {
           const sent = await client.sendMessage({
@@ -76046,6 +76050,8 @@ This model will be used for your next message.`, []);
     };
     const nextEditStreamInterval = (requestDurationMs) => Math.min(INLINE_EDIT_STREAM_MAX_INTERVAL_MS, Math.max(INLINE_EDIT_STREAM_MIN_INTERVAL_MS, Math.ceil(requestDurationMs * 1.25)));
     const sendEditStreamSnapshot = async (snapshot) => {
+      if (abortSignal.aborted)
+        return;
       try {
         if (editStreamState.messageId == null) {
           let sent;
@@ -76101,6 +76107,11 @@ This model will be used for your next message.`, []);
       }
     };
     const scheduleEditStreamDrain = () => {
+      if (abortSignal.aborted) {
+        editStreamState.pendingSnapshot = null;
+        clearEditStreamTimer();
+        return;
+      }
       if (editStreamState.failed || editStreamState.inFlight != null || editStreamState.timer != null || editStreamState.pendingSnapshot == null) {
         return;
       }
@@ -76310,7 +76321,7 @@ This model will be used for your next message.`, []);
       await resetEditStreamForAssistantMessage();
     };
     const handlePartialStreamPayload = (payload) => {
-      if (adoptingThread)
+      if (abortSignal.aborted || adoptingThread)
         return;
       const visiblePayload = resolveInlineChatVisibleReplyPayload(payload);
       if (!visiblePayload)
@@ -76396,6 +76407,7 @@ This model will be used for your next message.`, []);
       }
     };
     const replyOptions = {
+      abortSignal,
       onObservedReplyDelivery: async () => {
         delivered = true;
       },
@@ -76538,7 +76550,7 @@ This model will be used for your next message.`, []);
       let undeliveredFinalActions;
       try {
         const dispatch = await dispatchInlineReplyWithSessionInitRetry({
-          shouldRetry: () => !delivered && !skippedNonSilent && !failedNonSilent,
+          shouldRetry: () => !abortSignal.aborted && !delivered && !skippedNonSilent && !failedNonSilent,
           onRetry: (retry, delayMs) => {
             log?.warn(`[${account.accountId}] AGENT_DISPATCH_TRACE phase=session_init_conflict_retry ` + `retry=${retry} delay_ms=${delayMs}`);
           },
@@ -76549,6 +76561,8 @@ This model will be used for your next message.`, []);
               ...dispatcherPipelineOptions,
               ...buildInlineTypingDispatcherOptions(typingCallbacks),
               deliver: async (payload, info) => {
+                if (abortSignal.aborted)
+                  return inlineReplyDeliveryResult(false);
                 let payloadVisible = false;
                 const markPayloadVisible = () => {
                   delivered = true;
@@ -76850,7 +76864,7 @@ Attachment: ${mediaUrl}` : `Attachment: ${mediaUrl}`;
       const skipFallbackSuppressed = dispatchResult.sourceReplyDeliveryMode === "message_tool_only";
       const hostRequestedNoVisibleRecovery = dispatchResult.noVisibleReplyFallbackEligible === true;
       const explicitFailure = dispatchError != null || failedNonSilent;
-      if (!delivered && !hostDeliveredReply && !deferredToActiveRun && !adoptingThread && (explicitFailure || !hostHandledTurn && !deliberateSilence && (skippedNonSilent && !skipFallbackSuppressed || hostRequestedNoVisibleRecovery))) {
+      if (!abortSignal.aborted && dispatchResult.sendPolicyDenied !== true && !delivered && !hostDeliveredReply && !deferredToActiveRun && !adoptingThread && (explicitFailure || !hostHandledTurn && !deliberateSilence && !skipFallbackSuppressed && (skippedNonSilent || hostRequestedNoVisibleRecovery))) {
         botPresenceLifecycle.fail();
         const fallbackText = undeliveredFinalText.trim() ? undeliveredFinalText : dispatchError != null ? INLINE_REQUEST_ERROR_FALLBACK : EMPTY_RESPONSE_FALLBACK;
         const sent = await client.sendMessage({
@@ -76869,12 +76883,16 @@ Attachment: ${mediaUrl}` : `Attachment: ${mediaUrl}`;
       }
     } finally {
       endActiveThreadRoute();
+      if (abortSignal.aborted) {
+        runTypingCleanup();
+        botPresenceLifecycle.cleanup();
+      }
       if (adoptedThreadThisTurn) {
         await sendDeliveryTyping(deliveryChatId, false).catch((error51) => runtime.error?.(`inline adopted thread typing cleanup failed: ${String(error51)}`));
         botPresenceLifecycle.cleanup();
       }
       await setParentThreadCreationTyping(false);
-      if (callbackActionEvent && !callbackActionAnswered) {
+      if (!abortSignal.aborted && callbackActionEvent && !callbackActionAnswered) {
         try {
           await answerCallbackIfNeeded();
         } catch (error51) {
@@ -77460,6 +77478,8 @@ Attachment: ${mediaUrl}` : `Attachment: ${mediaUrl}`;
     });
   };
   const scheduleInboundTask = (label, run, options) => {
+    if (abortSignal.aborted)
+      return;
     let task;
     try {
       if (options?.serialKey) {
@@ -77467,7 +77487,10 @@ Attachment: ${mediaUrl}` : `Attachment: ${mediaUrl}`;
         const previous = inboundTaskChains.get(serialKey) ?? Promise.resolve();
         task = previous.catch(() => {
           return;
-        }).then(run);
+        }).then(() => {
+          if (!abortSignal.aborted)
+            return run();
+        });
         const settled = task.catch(() => {
           return;
         });
@@ -77616,8 +77639,33 @@ Attachment: ${mediaUrl}` : `Attachment: ${mediaUrl}`;
     suppressedVoiceMessageEditTimeouts.clear();
   };
   const drainInboundTasks = async () => {
-    while (pendingInboundTasks.size > 0) {
-      await Promise.allSettled(pendingInboundTasks);
+    let timer;
+    const drained = (async () => {
+      while (pendingInboundTasks.size > 0) {
+        await Promise.allSettled(pendingInboundTasks);
+      }
+    })();
+    let onAbort;
+    try {
+      await Promise.race([
+        drained,
+        new Promise((resolve) => {
+          onAbort = () => {
+            timer = setTimeout(() => {
+              log?.warn(`[${account.accountId}] inline shutdown grace expired with pending inbound work`);
+              resolve();
+            }, 15000);
+          };
+          if (abortSignal.aborted)
+            onAbort();
+          else
+            abortSignal.addEventListener("abort", onAbort, { once: true });
+        })
+      ]);
+    } finally {
+      clearTimeout(timer);
+      if (onAbort)
+        abortSignal.removeEventListener("abort", onAbort);
     }
   };
   const loop = (async () => {
@@ -77810,6 +77858,7 @@ Attachment: ${mediaUrl}` : `Attachment: ${mediaUrl}`;
       return;
     }
     stopPromise = (async () => {
+      shutdown.abort();
       clearInterval(diagnosticsTimer);
       clearPendingInlineVoiceMessages();
       await client.close().catch(() => {});
@@ -77818,11 +77867,13 @@ Attachment: ${mediaUrl}` : `Attachment: ${mediaUrl}`;
     })();
     await stopPromise;
   };
-  abortSignal.addEventListener("abort", () => {
+  params.abortSignal.addEventListener("abort", () => {
     stop();
   }, { once: true });
+  if (params.abortSignal.aborted)
+    stop();
   const done = loop.then(drainInboundTasks, async (error51) => {
-    await drainInboundTasks();
+    await stop();
     throw error51;
   });
   return { stop, done };
@@ -78826,6 +78877,11 @@ import {
   normalizeLowercaseStringOrEmpty as normalizeLowercaseStringOrEmpty3,
   normalizeOptionalString as normalizeOptionalString4
 } from "openclaw/plugin-sdk/string-coerce-runtime";
+
+// src/inline/approval-contract.ts
+var INLINE_APPROVAL_EVENT_KINDS = ["exec", "plugin", "system-agent"];
+
+// src/inline/approval-native.ts
 function accountParams(params) {
   return {
     cfg: params.cfg,
@@ -78964,7 +79020,7 @@ var inlineNativeApprovalCapability = createApproverRestrictedNativeApprovalCapab
   resolveApproverDmTargets: resolveInlineApproverDmTargets,
   notifyOriginWhenDmOnly: true,
   nativeRuntime: createLazyChannelApprovalNativeRuntimeAdapter({
-    eventKinds: ["exec", "plugin"],
+    eventKinds: INLINE_APPROVAL_EVENT_KINDS,
     isConfigured: ({ cfg, accountId }) => isInlineExecApprovalClientEnabled(accountParams({ cfg, accountId })),
     shouldHandle: ({ cfg, accountId, request }) => shouldHandleInlineExecApprovalRequest(requestParams({ cfg, accountId, request })),
     load: async () => loadBundledEntryExportSync(import.meta.url, {
@@ -80828,5 +80884,5 @@ export {
   inlineChannelPlugin2 as inlineChannelPlugin
 };
 
-//# debugId=B8D72C8F948823B764756E2164756E21
+//# debugId=D6C0042DF79E773F64756E2164756E21
 //# sourceMappingURL=channel-plugin-api.js.map