@asgard-js/react 0.2.58 → 0.2.59

package/dist/components/templates/text-template/bot-typing-placeholder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot-typing-placeholder.d.ts","sourceRoot":"","sources":["../../../../src/components/templates/text-template/bot-typing-placeholder.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAW,MAAM,OAAO,CAAC;AAI3C,UAAU,yBAAyB;IACjC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,SAAS,CAahF"}
+{"version":3,"file":"bot-typing-placeholder.d.ts","sourceRoot":"","sources":["../../../../src/components/templates/text-template/bot-typing-placeholder.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAW,MAAM,OAAO,CAAC;AAI3C,UAAU,yBAAyB;IACjC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,SAAS,CAgChF"}

package/dist/components/tool-call-consent/tool-call-consent-gate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-call-consent-gate.d.ts","sourceRoot":"","sources":["../../../src/components/tool-call-consent/tool-call-consent-gate.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA4C,MAAM,OAAO,CAAC;AAe5E;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,IAAI,SAAS,CAuJ/C"}
+{"version":3,"file":"tool-call-consent-gate.d.ts","sourceRoot":"","sources":["../../../src/components/tool-call-consent/tool-call-consent-gate.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA4C,MAAM,OAAO,CAAC;AAe5E;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,IAAI,SAAS,CAmL/C"}

package/dist/hooks/use-channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-channel.d.ts","sourceRoot":"","sources":["../../src/hooks/use-channel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EAGnB,YAAY,EACZ,mBAAmB,EACnB,SAAS,EACT,eAAe,EACf,WAAW,EACX,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC;IACzF,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACrC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,CACb,QAAQ,EAAE,WAAW,CAAC,SAAS,CAAC,EAChC,OAAO,EAAE;QACP,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;KACnC,KACE,IAAI,CAAC;IACV,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,kBAAkB,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IAC5G,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE;QAC7B,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;KACrE,KAAK;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;KAAE,CAAC;IAC5F;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,WAAW,CAAC,EAAE,CACZ,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,KACnG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,KAAK,IAAI,CAAC;IAC7G,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,qBAAqB,CAAC,EAAE,CAAC,OAAO,EAAE,qBAAqB,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,SAAS,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnH;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,gBAAgB,CAwPnE"}
+{"version":3,"file":"use-channel.d.ts","sourceRoot":"","sources":["../../src/hooks/use-channel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EAGnB,YAAY,EACZ,mBAAmB,EACnB,SAAS,EACT,eAAe,EACf,WAAW,EACX,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC;IACzF,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACrC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,CACb,QAAQ,EAAE,WAAW,CAAC,SAAS,CAAC,EAChC,OAAO,EAAE;QACP,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;KACnC,KACE,IAAI,CAAC;IACV,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,kBAAkB,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IAC5G,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE;QAC7B,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;KACrE,KAAK;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;KAAE,CAAC;IAC5F;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,WAAW,CAAC,EAAE,CACZ,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,KACnG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,KAAK,IAAI,CAAC;IAC7G,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,qBAAqB,CAAC,EAAE,CAAC,OAAO,EAAE,qBAAqB,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,CAAC,SAAS,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnH;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,gBAAgB,CAwQnE"}

package/dist/index.js

@@ -136,7 +136,7 @@ function dI(e) {
             b(!1);
           },
           onSseError(O) {
-            b(!1), O && typeof O == "object" && ("isAuthError" in O || "isBotProviderError" in O) && u?.(
+            b(!1), g(null), O && typeof O == "object" && ("isAuthError" in O || "isBotProviderError" in O) && u?.(
               O
             ), c?.(O);
           },
@@ -145,7 +145,11 @@ function dI(e) {
               conversation: M
             });
           }
-        }
+        },
+        // Adopt the channel as soon as it exists — before the RESET_CHANNEL run
+        // completes — so a tool_call.consent emitted during reset can be replied
+        // to (otherwise `channel` is still null and the reply is dropped).
+        g
       );
       y(!0), g(I);
     },
@@ -199,7 +203,9 @@ function dI(e) {
     [p, o, l, u, c, E]
   ), D = ie(
     async (S, M) => {
-      await p?.replyToolCallConsents(
+      t?.debugMode && console.log(
+        `[consent] use-channel.replyToolCallConsents · channel=${p ? "SET" : "NULL ← reply 會被丟掉!"}`
+      ), await p?.replyToolCallConsents(
         S,
         {
           onSseMessage(R) {
@@ -211,7 +217,7 @@ function dI(e) {
         M
       );
     },
-    [p, l, E]
+    [p, t, l, E]
   );
   Fe(() => {
     h || !p && m && (a !== !1 ? $(r) : A());
@@ -1890,11 +1896,21 @@ function YT(e) {
   ] }) : null;
 }
 function pz(e) {
-  const { placeholder: t } = e, { isConnecting: n, messages: r } = Rt(), i = ve(
-    () => Array.from(r?.values() ?? []).some((o) => o.type === "bot" && o.isTyping),
-    [r]
-  );
-  return n && !i ? /* @__PURE__ */ C(YT, { isTyping: !0, typingText: t }) : null;
+  const { placeholder: t } = e, { isConnecting: n, messages: r, pendingConsent: i } = Rt(), { hasTypingMessage: o, lastMessageIsCompletedBot: s } = ve(() => {
+    const a = Array.from(r?.values() ?? []), l = a[a.length - 1];
+    return {
+      hasTypingMessage: a.some((u) => u.type === "bot" && u.isTyping),
+      // A finished bot message as the latest entry means the bot has delivered
+      // its answer; the run can linger briefly afterwards (the backend keeps it
+      // open between `message.complete` and `run.done`), so suppress the
+      // placeholder to stop it flashing under the already-rendered answer.
+      // Tool-call messages are intentionally NOT treated this way — after a tool
+      // runs the bot is still working toward its reply, so the indicator must
+      // keep showing while we wait for it (otherwise the chat looks frozen).
+      lastMessageIsCompletedBot: l?.type === "bot" && !l.isTyping
+    };
+  }, [r]);
+  return n && !o && !i && !s ? /* @__PURE__ */ C(YT, { isTyping: !0, typingText: t }) : null;
 }
 const gz = "_carousel_root_v06v3_1", mz = "_carousel_time_v06v3_13", yk = {
   carousel_root: gz,
@@ -43478,102 +43494,108 @@ function t_(e, t) {
   return `${e}/${t}`;
 }
 function Ove() {
-  const { pendingConsent: e, replyToolCallConsents: t } = Rt(), [n, r] = be(null), i = it(/* @__PURE__ */ new Set()), o = it(!1);
+  const { pendingConsent: e, replyToolCallConsents: t, client: n } = Rt(), [r, i] = be(null), o = it(/* @__PURE__ */ new Set()), s = it(null);
   Fe(() => {
-    e && r((f) => f?.processId === e.processId ? f : (i.current = /* @__PURE__ */ new Set(), o.current = !1, {
+    e && i((d) => d?.processId === e.processId ? d : (o.current = /* @__PURE__ */ new Set(), {
       processId: e.processId,
       remaining: [...e.pendingCalls],
       answers: []
     }));
   }, [e]);
-  const s = ie(
-    async (f, d) => {
-      if (!o.current) {
-        o.current = !0;
+  const a = ie(
+    async (d, h) => {
+      if (s.current !== h) {
+        s.current = h;
         try {
-          await t?.(f);
+          n?.debugMode && console.log(
+            `[consent] 送出 RESPONSE_TOOL_CALL_CONSENT · pid=${h} · ${d.length} 筆 →`,
+            d.map((p) => `${p.toolCallId}:${p.result}`)
+          ), await t?.(d);
         } finally {
-          r((h) => h?.processId !== d ? h : (i.current = /* @__PURE__ */ new Set(), null));
+          s.current === h && (s.current = null), i((p) => p?.processId !== h ? p : (o.current = /* @__PURE__ */ new Set(), null));
         }
       }
     },
-    [t]
+    [t, n]
   );
   Fe(() => {
-    if (!n) return;
-    if (n.remaining.length === 0) {
-      s(n.answers, n.processId);
+    if (!r) return;
+    if (r.remaining.length === 0) {
+      a(r.answers, r.processId);
       return;
     }
-    const f = n.remaining[0];
-    if (f) {
-      if (f.alreadyAllowed) {
-        r({
-          ...n,
-          remaining: n.remaining.slice(1),
+    const d = r.remaining[0];
+    if (d) {
+      if (d.alreadyAllowed) {
+        i({
+          ...r,
+          remaining: r.remaining.slice(1),
           answers: [
-            ...n.answers,
-            { toolCallId: f.toolCallId, result: yc.ALLOW_ONCE, denyReason: "" }
+            ...r.answers,
+            { toolCallId: d.toolCallId, result: yc.ALLOW_ONCE, denyReason: "" }
           ]
         });
         return;
       }
-      i.current.has(t_(f.toolsetName, f.toolName)) && r({
-        ...n,
-        remaining: n.remaining.slice(1),
+      o.current.has(t_(d.toolsetName, d.toolName)) && i({
+        ...r,
+        remaining: r.remaining.slice(1),
         answers: [
-          ...n.answers,
-          { toolCallId: f.toolCallId, result: yc.ALLOW_ALWAYS, denyReason: "" }
+          ...r.answers,
+          { toolCallId: d.toolCallId, result: yc.ALLOW_ALWAYS, denyReason: "" }
         ]
       });
     }
-  }, [n, s]);
-  const a = ie((f) => {
-    r((d) => {
-      if (!d) return d;
-      const h = d.remaining[0];
-      if (!h) return d;
-      let p;
-      switch (f.result) {
-        case "ALLOW_ALWAYS":
-          i.current.add(t_(h.toolsetName, h.toolName)), p = {
-            toolCallId: h.toolCallId,
-            result: yc.ALLOW_ALWAYS,
-            denyReason: ""
-          };
-          break;
-        case "DENY_ONCE":
-          p = {
-            toolCallId: h.toolCallId,
-            result: yc.DENY_ONCE,
-            denyReason: f.denyReason
-          };
-          break;
-        default:
-          p = {
-            toolCallId: h.toolCallId,
-            result: yc.ALLOW_ONCE,
-            denyReason: ""
-          };
-      }
-      return {
-        ...d,
-        remaining: d.remaining.slice(1),
-        answers: [...d.answers, p]
-      };
-    });
-  }, []);
-  if (!n) return null;
-  const l = n.remaining[0];
-  if (!l || l.alreadyAllowed || i.current.has(t_(l.toolsetName, l.toolName))) return null;
-  const u = e?.pendingCalls.length ?? n.remaining.length + n.answers.length, c = n.answers.length + 1;
+  }, [r, a]);
+  const l = ie(
+    (d) => {
+      n?.debugMode && console.log(`[consent] 按下按鈕 → ${d.result}`), i((h) => {
+        if (!h) return h;
+        const p = h.remaining[0];
+        if (!p) return h;
+        let g;
+        switch (d.result) {
+          case "ALLOW_ALWAYS":
+            o.current.add(t_(p.toolsetName, p.toolName)), g = {
+              toolCallId: p.toolCallId,
+              result: yc.ALLOW_ALWAYS,
+              denyReason: ""
+            };
+            break;
+          case "DENY_ONCE":
+            g = {
+              toolCallId: p.toolCallId,
+              result: yc.DENY_ONCE,
+              denyReason: d.denyReason
+            };
+            break;
+          default:
+            g = {
+              toolCallId: p.toolCallId,
+              result: yc.ALLOW_ONCE,
+              denyReason: ""
+            };
+        }
+        return {
+          ...h,
+          remaining: h.remaining.slice(1),
+          answers: [...h.answers, g]
+        };
+      });
+    },
+    [n]
+  );
+  if (!r) return null;
+  const u = r.remaining[0];
+  if (!u || u.alreadyAllowed || o.current.has(t_(u.toolsetName, u.toolName))) return null;
+  const c = e?.pendingCalls.length ?? r.remaining.length + r.answers.length, f = r.answers.length + 1;
   return /* @__PURE__ */ C(
     Rve,
     {
-      pendingCall: l,
-      totalCount: u,
-      currentIndex: c,
-      onDecide: a
+      pendingCall: u,
+      totalCount: c,
+      currentIndex: f,
+      onDecide: l
     }
   );
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asgard-js/react",
-  "version": "0.2.58",
+  "version": "0.2.59",
   "publishConfig": {
     "access": "public"
   },
@@ -47,7 +47,7 @@
     "vite-plugin-svgr": "^4.3.0"
   },
   "peerDependencies": {
-    "@asgard-js/core": "^0.2.58",
+    "@asgard-js/core": "^0.2.59",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0"
   }