eve-lark 0.4.3 → 0.4.5

package/dist/index.js

@@ -610,10 +610,29 @@ function buildStreamingCard(opts) {
     lines.push(`<font color='grey'>${opts.status}</font>`);
   }
   lines.push(opts.buffer.length > 0 ? opts.buffer : "_\u2026_");
-  return {
-    config: { ...BASE_CONFIG },
-    elements: [{ tag: "div", text: { tag: "lark_md", content: lines.join("\n\n") } }]
-  };
+  if (opts.askRequest) {
+    lines.push(`**${opts.askRequest.prompt}**`);
+    if (opts.askRequest.allowFreeform && (opts.askRequest.options?.length ?? 0) === 0) {
+      lines.push(`<font color='grey'>_Reply to this chat with your answer_</font>`);
+    }
+  }
+  const elements = [
+    { tag: "div", text: { tag: "lark_md", content: lines.join("\n\n") } }
+  ];
+  if (opts.askRequest?.options && opts.askRequest.options.length > 0) {
+    const buttons = opts.askRequest.options.map((opt) => ({
+      tag: "button",
+      text: { tag: "plain_text", content: opt.label },
+      type: opt.style ?? "default",
+      value: {
+        [ASK_BUTTON_VALUE_MARKER]: true,
+        requestId: opts.askRequest.requestId,
+        optionId: opt.id
+      }
+    }));
+    elements.push({ tag: "action", actions: buttons });
+  }
+  return { config: { ...BASE_CONFIG }, elements };
 }
 __name(buildStreamingCard, "buildStreamingCard");
 function buildErrorCard(message) {
@@ -681,10 +700,12 @@ function buildAskCard(request) {
   return { config: { ...BASE_CONFIG }, elements };
 }
 __name(buildAskCard, "buildAskCard");
-function buildAskAnsweredCard(request, selected) {
-  const elements = [
-    { tag: "div", text: { tag: "lark_md", content: request.prompt } }
-  ];
+function buildAskAnsweredCard(request, selected, priorBuffer) {
+  const elements = [];
+  if (priorBuffer && priorBuffer.length > 0) {
+    elements.push({ tag: "div", text: { tag: "lark_md", content: priorBuffer } });
+  }
+  elements.push({ tag: "div", text: { tag: "lark_md", content: request.prompt } });
   const summary = selected.kind === "option" ? `<font color='green'>\u2713 ${escapeMarkdown(selected.label)}</font>` : `<font color='green'>\u2713 ${escapeMarkdown(selected.text)}</font>`;
   elements.push({ tag: "div", text: { tag: "lark_md", content: summary } });
   return { config: { ...BASE_CONFIG }, elements };
@@ -702,6 +723,28 @@ function buildCardKitStreamingCard(opts) {
     lines.push(`<font color='grey'>${opts.status}</font>`);
   }
   lines.push(opts.buffer.length > 0 ? opts.buffer : "_\u2026_");
+  if (opts.askRequest) {
+    lines.push(`**${opts.askRequest.prompt}**`);
+    if (opts.askRequest.allowFreeform && (opts.askRequest.options?.length ?? 0) === 0) {
+      lines.push(`<font color='grey'>_Reply to this chat with your answer_</font>`);
+    }
+  }
+  const elements = [
+    { tag: "markdown", content: lines.join("\n\n") }
+  ];
+  if (opts.askRequest?.options && opts.askRequest.options.length > 0) {
+    const buttons = opts.askRequest.options.map((opt) => ({
+      tag: "button",
+      text: { tag: "plain_text", content: opt.label },
+      type: opt.style ?? "default",
+      value: {
+        [ASK_BUTTON_VALUE_MARKER]: true,
+        requestId: opts.askRequest.requestId,
+        optionId: opt.id
+      }
+    }));
+    elements.push({ tag: "action", actions: buttons });
+  }
   return {
     schema: "2.0",
     config: {
@@ -709,27 +752,38 @@ function buildCardKitStreamingCard(opts) {
       wide_screen_mode: true,
       update_multi: true
     },
-    body: {
-      elements: [
-        { tag: "markdown", content: lines.join("\n\n") }
-      ]
-    }
+    body: { elements }
   };
 }
 __name(buildCardKitStreamingCard, "buildCardKitStreamingCard");
-function buildCardKitFinalCard(text, toolCalls) {
+function buildCardKitFinalCard(text, toolCalls, askRequest) {
   const lines = [];
   const toolLine = renderToolCalls(toolCalls ?? []);
   if (toolLine) lines.push(toolLine);
   lines.push(text);
+  if (askRequest) {
+    lines.push(`**${askRequest.prompt}**`);
+  }
+  const elements = [
+    { tag: "markdown", content: lines.join("\n\n") }
+  ];
+  if (askRequest?.options && askRequest.options.length > 0) {
+    const buttons = askRequest.options.map((opt) => ({
+      tag: "button",
+      text: { tag: "plain_text", content: opt.label },
+      type: opt.style ?? "default",
+      value: {
+        [ASK_BUTTON_VALUE_MARKER]: true,
+        requestId: askRequest.requestId,
+        optionId: opt.id
+      }
+    }));
+    elements.push({ tag: "action", actions: buttons });
+  }
   return {
     schema: "2.0",
     config: { streaming_mode: false, wide_screen_mode: true, update_multi: true },
-    body: {
-      elements: [
-        { tag: "markdown", content: lines.join("\n\n") }
-      ]
-    }
+    body: { elements }
   };
 }
 __name(buildCardKitFinalCard, "buildCardKitFinalCard");
@@ -746,6 +800,10 @@ var StreamingCardController = class {
   status;
   messageId;
   fallbackToText = false;
+  /** Active HITL input request, when set via `setAskRequest`. The card
+   *  builder appends prompt + buttons to the same streaming card so the
+   *  user can answer inline instead of getting a separate ask-card. */
+  askRequest = null;
   /** Tool calls made during this turn, in order. Rendered above the buffer
    *  so users can see what the agent is doing / has done, Claude-Code-style. */
   toolCalls = [];
@@ -817,6 +875,82 @@ var StreamingCardController = class {
   getToolCalls() {
     return this.toolCalls;
   }
+  /** Current streaming buffer (for handleCardAction to preserve when patching
+   *  the "answered" state of an inline ask card). */
+  getBuffer() {
+    return this.buffer;
+  }
+  /** Card message id (so input.requested can reuse the existing card instead
+   *  of creating a separate ask-card). */
+  getMessageId() {
+    return this.messageId;
+  }
+  /** Active HITL request being rendered inline on this card, or null. */
+  getAskRequest() {
+    return this.askRequest;
+  }
+  /**
+   * Render an `ask_question` request inline on this card by appending prompt
+   * + option buttons below the streaming text. Patches immediately so the
+   * user sees the buttons as soon as the agent asks.
+   *
+   * If the prior turn already finalized (state="completed"), transition back
+   * to "streaming" so the next patch can update the same card. The card
+   * keeps its messageId — no new card is sent.
+   */
+  setAskRequest(req) {
+    if (this.state === "aborted") return;
+    this.askRequest = req;
+    if (this.state === "completed" && this.messageId) {
+      this.state = "streaming";
+    }
+    if (this.state === "streaming") {
+      this.schedulePatch();
+    }
+  }
+  /** Clear the inline ask request (e.g. after the user clicked an option). */
+  clearAskRequest() {
+    this.askRequest = null;
+  }
+  /**
+   * Reset per-turn state for the next turn within the same session. Clears
+   * the streaming buffer, tool-call history, status, and any inline ask —
+   * but keeps the card messageId and transitions back to "streaming" so the
+   * next message.appended patches the SAME card. Without this, the second
+   * turn's message.completed would create a brand-new card and the user
+   * would see N cards for N turns within one logical conversation.
+   *
+   * Called from the channel's `turn.started` event handler.
+   */
+  resetForNewTurn() {
+    this.buffer = "";
+    this.status = void 0;
+    this.toolCalls = [];
+    this.askRequest = null;
+    this.fallbackToText = false;
+    this.cancelCreateTimer();
+    this.cancelPatchTimer();
+    this.patchInFlight = null;
+    this.patchScheduled = false;
+    if (this.messageId) {
+      this.state = "streaming";
+    } else {
+      this.state = "idle";
+    }
+  }
+  /**
+   * Full reset for a brand-new inbound user message (not a continuation
+   * of the same conversation flow). Same as {@link resetForNewTurn} but
+   * ALSO clears the card messageId so the next `sendCard` creates a fresh
+   * card. Without this, all top-level messages in the same chat would
+   * patch the first card — the user would only see the latest reply
+   * overwritten onto one card instead of N independent cards.
+   */
+  resetForNewMessage() {
+    this.resetForNewTurn();
+    this.messageId = void 0;
+    this.state = "idle";
+  }
   async finalize(fullText) {
     if (this.state === "completed" || this.state === "aborted") return;
     this.cancelCreateTimer();
@@ -836,7 +970,7 @@ var StreamingCardController = class {
       try {
         const res = await this.client.sendCard({
           chatId: this.deps.chatId,
-          card: this.deps.useCardKitV2 ? buildCardKitFinalCard(fullText, this.toolCalls) : buildTextCard(fullText),
+          card: this.deps.useCardKitV2 ? buildCardKitFinalCard(fullText, this.toolCalls, this.askRequest) : buildTextCard(fullText),
           rootId: this.deps.rootId,
           parentId: this.deps.parentId
         });
@@ -862,7 +996,7 @@ var StreamingCardController = class {
     }
     await this.client.patchCard({
       messageId: this.messageId,
-      card: this.deps.useCardKitV2 ? buildCardKitStreamingCard({ buffer: fullText, streamingMode: false, toolCalls: this.toolCalls }) : buildStreamingCard({ buffer: fullText, status: void 0, toolCalls: this.toolCalls })
+      card: this.deps.useCardKitV2 ? buildCardKitStreamingCard({ buffer: fullText, streamingMode: false, toolCalls: this.toolCalls, askRequest: this.askRequest }) : buildStreamingCard({ buffer: fullText, status: void 0, toolCalls: this.toolCalls, askRequest: this.askRequest })
     });
     this.state = "completed";
   }
@@ -914,7 +1048,7 @@ var StreamingCardController = class {
     try {
       const res = await this.client.sendCard({
         chatId: this.deps.chatId,
-        card: this.deps.useCardKitV2 ? buildCardKitStreamingCard({ buffer: this.buffer, status: this.status, streamingMode: true, toolCalls: this.toolCalls }) : buildStreamingCard({ buffer: this.buffer, status: this.status, toolCalls: this.toolCalls }),
+        card: this.deps.useCardKitV2 ? buildCardKitStreamingCard({ buffer: this.buffer, status: this.status, streamingMode: true, toolCalls: this.toolCalls, askRequest: this.askRequest }) : buildStreamingCard({ buffer: this.buffer, status: this.status, toolCalls: this.toolCalls, askRequest: this.askRequest }),
         rootId: this.deps.rootId,
         parentId: this.deps.parentId
       });
@@ -952,7 +1086,7 @@ var StreamingCardController = class {
     if (this.state !== "streaming") return;
     if (this.patchInFlight) return;
     if (this.messageId === void 0) return;
-    const card = this.deps.useCardKitV2 ? buildCardKitStreamingCard({ buffer: this.buffer, status: this.status, streamingMode: true, toolCalls: this.toolCalls }) : buildStreamingCard({ buffer: this.buffer, status: this.status, toolCalls: this.toolCalls });
+    const card = this.deps.useCardKitV2 ? buildCardKitStreamingCard({ buffer: this.buffer, status: this.status, streamingMode: true, toolCalls: this.toolCalls, askRequest: this.askRequest }) : buildStreamingCard({ buffer: this.buffer, status: this.status, toolCalls: this.toolCalls, askRequest: this.askRequest });
     this.patchInFlight = this.client.patchCard({ messageId: this.messageId, card }).catch((e) => {
       console.warn(
         "[eve-lark] streaming card patch failed:",
@@ -1582,6 +1716,7 @@ function createLarkChannel(optionsInput) {
   const pendingInputsByRequestId = /* @__PURE__ */ new Map();
   const pendingInputsByChatToken = /* @__PURE__ */ new Map();
   const authCards = /* @__PURE__ */ new Map();
+  const expectFreshCard = /* @__PURE__ */ new Set();
   function getController(sessionId, meta) {
     let ctrl = controllers.get(sessionId);
     if (!ctrl) {
@@ -1609,11 +1744,6 @@ function createLarkChannel(optionsInput) {
     return ctrl;
   }
   __name(getController, "getController");
-  function dropController(sessionId) {
-    controllers.delete(sessionId);
-    sessionMeta.delete(sessionId);
-  }
-  __name(dropController, "dropController");
   async function cleanupAckReaction(sessionId) {
     const meta = sessionMeta.get(sessionId);
     if (!meta?.ackReactionId || !meta.messageId) return;
@@ -1940,6 +2070,7 @@ function createLarkChannel(optionsInput) {
     console.log(
       `[eve-lark] helpers.send returned sessionId=${session.id} for chatId=${parsed.chatId}`
     );
+    expectFreshCard.add(session.id);
     sessionMeta.set(session.id, {
       chatId: parsed.chatId,
       rootId: parsed.rootId ?? void 0,
@@ -1983,14 +2114,18 @@ function createLarkChannel(optionsInput) {
     helpers.waitUntil(
       (async () => {
         if (pending.cardMessageId && selectedOpt) {
+          const ctrlForBuffer = controllers.get(pending.sessionId);
+          const priorBuffer = ctrlForBuffer?.getBuffer() ?? void 0;
           try {
             await client.patchCard({
               messageId: pending.cardMessageId,
-              card: buildAskAnsweredCard(pending.request, {
-                kind: "option",
-                label: selectedOpt.label
-              })
+              card: buildAskAnsweredCard(
+                pending.request,
+                { kind: "option", label: selectedOpt.label },
+                priorBuffer
+              )
             });
+            ctrlForBuffer?.clearAskRequest();
           } catch (e) {
             console.warn(
               "[eve-lark] patchCard after ask-answer failed:",
@@ -2101,22 +2236,29 @@ function createLarkChannel(optionsInput) {
         `[eve-lark] input.requested sessionId=${sessionId} chatId=${info.chatId} count=${requests.length}`
       );
       for (const req of requests) {
-        const card = buildAskCard(req);
+        const existingCtrl = controllers.get(sessionId);
+        const canPatchExisting = existingCtrl && existingCtrl.getMessageId() && (options.replyMode === "streaming" || options.replyMode === "streaming-v2");
         let cardMessageId;
-        try {
-          const res = await client.sendCard({
-            chatId: info.chatId,
-            card,
-            rootId: info.rootId,
-            parentId: info.parentId
-          });
-          cardMessageId = res.messageId;
-        } catch (e) {
-          console.error(
-            `[eve-lark] ask card send failed (requestId=${req.requestId}):`,
-            e instanceof Error ? e.message : e
-          );
-          continue;
+        if (canPatchExisting && existingCtrl) {
+          existingCtrl.setAskRequest(req);
+          cardMessageId = existingCtrl.getMessageId();
+        } else {
+          const card = buildAskCard(req);
+          try {
+            const res = await client.sendCard({
+              chatId: info.chatId,
+              card,
+              rootId: info.rootId,
+              parentId: info.parentId
+            });
+            cardMessageId = res.messageId;
+          } catch (e) {
+            console.error(
+              `[eve-lark] ask card send failed (requestId=${req.requestId}):`,
+              e instanceof Error ? e.message : e
+            );
+            continue;
+          }
         }
         const pending = {
           requestId: req.requestId,
@@ -2155,7 +2297,6 @@ function createLarkChannel(optionsInput) {
         await deliverReply(sessionId, info, text);
       } finally {
         await cleanupAckReaction(sessionId);
-        dropController(sessionId);
       }
     },
     async "turn.failed"(data, _channel, ctx) {
@@ -2196,7 +2337,6 @@ function createLarkChannel(optionsInput) {
         }
       }
       await cleanupAckReaction(sessionId);
-      dropController(sessionId);
     },
     async "session.failed"(data) {
       const userText = formatFailureMessage(data, "session failed", { sentence: "session" });
@@ -2205,11 +2345,29 @@ function createLarkChannel(optionsInput) {
         `[eve-lark] session.failed: ${userText}` + (errorId ? ` (errorId=${errorId})` : "")
       );
     },
+    // A new turn is starting within an existing session. Two cases:
+    //
+    //   1. NEW inbound message (the webhook handler set `expectFreshCard`):
+    //      force a fresh card so each user message gets its own reply card.
+    //   2. Continuation (HITL answer via button click / freeform, or tool
+    //      resume): keep the same card so the whole flow stays on one card.
+    async "turn.started"(_data, _channel, ctx) {
+      const sessionId = ctx?.session?.id;
+      if (!sessionId) return;
+      const ctrl = controllers.get(sessionId);
+      if (ctrl) {
+        if (expectFreshCard.has(sessionId)) {
+          ctrl.resetForNewMessage();
+          expectFreshCard.delete(sessionId);
+        } else {
+          ctrl.resetForNewTurn();
+        }
+      }
+    },
     // Turn ended cleanly. eve fires this after the final message.completed
     // (or instead of it when the assistant step ended in tool-calls with no
-    // visible text). Either way, free this session's controller + ack
-    // reaction so we don't leak waiting for a message.completed that's
-    // never coming.
+    // visible text). Just clean up the ack reaction — the controller stays
+    // for the next turn (cleaned by stale-sweep if the session goes quiet).
     async "turn.completed"(data, _channel, ctx) {
       const sessionId = ctx?.session?.id;
       if (!sessionId) return;
@@ -2217,7 +2375,6 @@ function createLarkChannel(optionsInput) {
         await cleanupAckReaction(sessionId);
       } catch {
       }
-      dropController(sessionId);
     },
     // The agent needs the user to sign in to an external service (e.g.
     // GitHub, Slack, Linear). Render a card with a "Sign in with <X>"