@jskit-ai/assistant-core 0.1.216 → 0.1.218

package/examples/conversation/README.md

@@ -75,3 +75,13 @@ database or files; the UI has no storage assumptions.
 
 See the JSKIT guide **Embeddable assistant conversations** for the complete
 client, storage and provider contracts and reusable storage-adapter checks.
+
+An adapter that sets `conversation.cancellableDelivery` and supplies
+`actions.cancel(messageId)` also exposes **Cancel** next to **Retry** for uncertain
+delivery. The application owns that cancellation and preserves accepted history.
+Standalone delivery continues to offer cancellation only for definite failures.
+Direct `AssistantTranscript` consumers opt in with `cancellableDelivery`.
+
+The shared transcript interleaves timestamped messages across storage and native
+streaming turns. Equal timestamps keep source order; undated notices keep their
+slots. Reasoning groups form after ordering, preserving original turn identities.

package/examples/conversation/package.json

@@ -8,14 +8,14 @@
     "build": "vite build"
   },
   "dependencies": {
-    "@jskit-ai/assistant-core": "0.1.216",
-    "@jskit-ai/http-runtime": "0.1.236",
-    "@jskit-ai/kernel": "0.1.238",
+    "@jskit-ai/assistant-core": "0.1.218",
+    "@jskit-ai/http-runtime": "0.1.238",
+    "@jskit-ai/kernel": "0.1.240",
     "@mdi/js": "^7.4.47",
     "vue": "^3.5.13",
     "vuetify": "^4.0.0",
-    "@jskit-ai/connectors-core": "0.1.55",
-    "@jskit-ai/connectors-catalog": "0.1.55"
+    "@jskit-ai/connectors-core": "0.1.57",
+    "@jskit-ai/connectors-catalog": "0.1.57"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^6.0.7",

package/fixtures/responsive-assistant/DeliveryFixture.vue

@@ -3,6 +3,7 @@ import { reactive, ref } from "vue";
 import AssistantConversationElement from "../../src/client/conversation/AssistantConversationElement.vue";
 import { createAssistantMessageDelivery } from "../../src/client/conversation/messageDelivery.js";
 
+const recoveryFixture = new URLSearchParams(location.search).has("recovery");
 const draft = ref("");
 const turns = ref([]);
 const requests = ref([]);
@@ -29,11 +30,24 @@ function accept() {
     assistant: { text: "Accepted once." } }];
   pendingRequest.resolve({ ok: true });
 }
+if (recoveryFixture) {
+  const at = minute => `2026-10-13T06:${minute}:00.000Z`;
+  turns.value = [
+    { turnId: "one", user: { messageId: "one", text: "Question one", at: at("01") } },
+    { turnId: "two", user: { messageId: "two", text: "Question two", at: at("03") } },
+    { turnId: "native", messages: [
+      { messageId: "reply-one", role: "assistant", text: "Reply one", at: at("02") },
+      { messageId: "reply-two", role: "assistant", text: "Reply two", at: at("04") }
+    ] }
+  ];
+  delivery.state.messages.push({ id: "uncertain", text: "Discard failed attempt", status: "uncertain", error: "Lost response", createdAt: at("05") });
+}
 const adapter = reactive({
   delivery, attachments,
-  conversation: { turns, visible: true, scrollKey: "delivery", welcomeMessage: "Start a conversation." },
+  conversation: { cancellableDelivery: recoveryFixture, turns, visible: true, scrollKey: "delivery", welcomeMessage: "Start a conversation." },
   composer: { draft, canSend: true, submitOnEnter: true, queueWhileSending },
   actions: {
+    ...(recoveryFixture ? { cancel: id => delivery.remove(id) } : {}),
     setDraft(value) { draft.value = value; }
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/assistant-core",
-  "version": "0.1.216",
+  "version": "0.1.218",
   "type": "module",
   "scripts": {
     "test": "node --test --test-concurrency=1"
@@ -47,8 +47,8 @@
     "@ai-sdk/perplexity": "^4.0.43",
     "@ai-sdk/togetherai": "^3.0.49",
     "@ai-sdk/xai": "^4.0.58",
-    "@jskit-ai/resource-core": "0.1.180",
-    "@jskit-ai/resource-crud-core": "0.1.180",
+    "@jskit-ai/resource-core": "0.1.182",
+    "@jskit-ai/resource-crud-core": "0.1.182",
     "@mdi/js": "^7.4.47",
     "@openrouter/ai-sdk-provider": "^3.0.0",
     "ai": "^7.0.101",
@@ -57,8 +57,8 @@
     "ws": "^8.20.1"
   },
   "peerDependencies": {
-    "@jskit-ai/http-runtime": "0.1.236",
-    "@jskit-ai/kernel": "0.1.238",
+    "@jskit-ai/http-runtime": "0.1.238",
+    "@jskit-ai/kernel": "0.1.240",
     "vue": "^3.5.13",
     "vuetify": "^4.0.0"
   },

package/src/client/conversation/AssistantConversationStatus.vue

@@ -1,14 +1,15 @@
 <template>
-  <div v-if="message.delivery" role="status">
-    <p>{{ message.text }}</p>
-    <p v-if="message.delivery.error" class="text-body-small">{{ message.delivery.error }}</p>
+  <div v-if="message.delivery" class="d-flex flex-wrap align-center ga-1 text-caption text-error" role="status">
+    <span>{{ message.delivery.error || message.text }}</span>
     <v-btn
-      variant="tonal"
-      min-height="48"
+      variant="text"
+      color="error"
+      size="x-small"
+      aria-label="Retry delivery check"
       :disabled="message.delivery.checking"
       @click="$emit('check-delivery', message.delivery.messageId)"
     >
-      {{ message.delivery.checking ? 'Checking delivery…' : 'Check delivery' }}
+      {{ message.delivery.checking ? 'Checking…' : 'Retry' }}
     </v-btn>
   </div>
   <slot v-else>

package/src/client/conversation/AssistantTranscript.vue

@@ -139,8 +139,7 @@
             class="assistant-transcript__message assistant-transcript__message--user"
             :class="{
               'assistant-transcript__message--pending': entry.turn.optimistic?.status === 'pending',
-              'assistant-transcript__message--failed': entry.turn.optimistic?.status === 'failed',
-              'assistant-transcript__message--unconfirmed': Boolean(entry.delivery)
+              'assistant-transcript__message--failed': entry.turn.optimistic?.status === 'failed'
             }"
           >
             <div
@@ -176,39 +175,38 @@
               <time v-if="entry.message.displayAt">{{ entry.message.displayAt }}</time>
               <span v-if="entry.turn.optimistic?.status === 'pending'" role="status">Pending</span>
             </div>
-            <div v-if="entry.delivery" class="assistant-transcript__unconfirmed-delivery">
-              <AssistantConversationStatus
-                :message="{ ...entry.delivery, text: 'Delivery unconfirmed' }"
-                @check-delivery="emit('check-delivery', $event)"
-              />
-            </div>
             <slot name="user-message-actions" :message="entry.message" :turn="entry.turn" />
             <div
-              v-if="entry.turn.optimistic?.status === 'failed'"
+              v-if="entry.delivery || entry.turn.optimistic?.status === 'failed'"
               class="assistant-transcript__optimistic-failure"
             >
-              <span role="status">Failed: {{ entry.turn.optimistic.error || "Message could not be sent." }}</span>
+              <span role="status">{{ entry.delivery ? entry.delivery.delivery.error || 'Delivery unconfirmed.' : `Failed: ${entry.turn.optimistic.error || 'Message could not be sent.'}` }}</span>
               <div v-if="!entry.turn.preview" class="assistant-transcript__optimistic-actions">
                 <v-btn
                   class="assistant-transcript__delivery-action"
-                  color="primary"
+                  color="error"
                   size="x-small"
                   type="button"
-                  variant="tonal"
-                  @click="emit('resend-turn', entry.turn.optimistic.id)"
+                  variant="text"
+                  :disabled="entry.delivery?.delivery.checking"
+                  :aria-label="entry.delivery ? 'Retry delivery check' : undefined"
+                  :title="entry.delivery ? entry.delivery.delivery.error || 'Check delivery before resending.' : undefined"
+                  @click="entry.delivery ? emit('check-delivery', entry.delivery.delivery.messageId) : emit('resend-turn', entry.turn.optimistic.id)"
                 >
-                  Retry
+                  {{ entry.delivery?.delivery.checking ? 'Checking…' : 'Retry' }}
                 </v-btn>
                 <v-btn
+                  v-if="!entry.delivery || cancellableDelivery"
                   class="assistant-transcript__delivery-action"
                   size="x-small"
                   type="button"
                   variant="text"
-                  @click="emit('cancel-turn', entry.turn.optimistic.id)"
+                  @click="emit('cancel-turn', entry.delivery?.delivery.messageId || entry.turn.optimistic.id)"
                 >
                   Cancel
                 </v-btn>
                 <v-btn
+                  v-if="!entry.delivery"
                   class="assistant-transcript__delivery-action"
                   size="x-small"
                   type="button"
@@ -340,6 +338,7 @@ function previewForTurn(turn) {
 }
 
 const props = defineProps({
+  cancellableDelivery: { type: Boolean, default: false },
   systemLabel: { type: String, default: "Status" },
   previewMessage: { type: Object, default: null },
   working: { type: Boolean, default: undefined },
@@ -588,7 +587,7 @@ function conversationMessageKey(message = {}, index = 0) {
 // Storage rows are not visual boundaries. Only an intervening message ends a
 // reasoning group, including when history is prepended or execution continues.
 const displayEntries = computed(() => {
-  const entries = [];
+  const candidates = [];
   for (const [index, turn] of props.turns.entries()) {
     const turnId = String(turn.turnId || index + 1);
     // A delivery notice belongs to its exact user message, not the previous reply.
@@ -608,18 +607,21 @@ const displayEntries = computed(() => {
         previewUserMessage: role === "user"
       }, key);
       if (!displayed) continue;
-      const previous = entries.at(-1);
-      if (role === "thinking" && previous?.role === "thinking") {
-        previous.messages.push({ ...displayed, key });
-      } else {
-        entries.push({
-          key, role, turn: { ...turn, turnId }, message: displayed,
-          delivery: role === "user" ? userDelivery : null,
-          ...(role === "thinking" ? { messages: [{ ...displayed, key }] } : {})
-        });
-      }
+      candidates.push({ key, role, turn: { ...turn, turnId }, message: displayed,
+        delivery: role === "user" ? userDelivery : null });
     }
   }
+  // Native streaming turns and saved authored turns can arrive independently.
+  // Only dated entries participate; undated notices retain their original slot.
+  const dated = candidates.filter(entry => Number.isFinite(Date.parse(entry.message.at)))
+    .sort((a, b) => Date.parse(a.message.at) - Date.parse(b.message.at))[Symbol.iterator]();
+  const entries = [];
+  for (const candidate of candidates) {
+    const entry = Number.isFinite(Date.parse(candidate.message.at)) ? dated.next().value : candidate;
+    const previous = entries.at(-1);
+    if (entry.role === "thinking" && previous?.role === "thinking") previous.messages.push({ ...entry.message, key: entry.key });
+    else entries.push({ ...entry, ...(entry.role === "thinking" ? { messages: [{ ...entry.message, key: entry.key }] } : {}) });
+  }
   // Anchor a progress group to the following message, or to the transcript end.
   // Appending progress or prepending history then preserves its expansion state.
   for (const [index, entry] of entries.entries()) {
@@ -1442,26 +1444,6 @@ watch(() => props.visible, (visible) => {
   margin-top: -0.15rem;
 }
 
-.assistant-transcript__message--user.assistant-transcript__message--unconfirmed {
-  background: rgba(var(--v-theme-warning), 0.08);
-  border: 1px solid rgba(var(--v-theme-warning), 0.6);
-}
-
-.assistant-transcript__unconfirmed-delivery {
-  border-top: 1px solid rgba(var(--v-theme-warning), 0.4);
-  font-size: 0.875rem;
-  padding-top: 0.65rem;
-}
-
-.assistant-transcript__unconfirmed-delivery :deep(p:first-child) {
-  font-weight: 700;
-  margin-bottom: 0.4rem;
-}
-
-.assistant-transcript__unconfirmed-delivery :deep(p) {
-  overflow-wrap: anywhere;
-}
-
 .assistant-transcript__optimistic-failure {
   align-items: center;
   color: rgba(var(--v-theme-error), 0.92);

package/test/messageDelivery.browser.test.js

@@ -90,3 +90,32 @@ test("the shared element renders delayed sends and supplies retry, edit and canc
     await stopProcess(vite);
   }
 });
+
+
+test("chronological messages and application Cancel work on phone and desktop", {
+  skip: process.env.JSKIT_ASSISTANT_CORE_BROWSER_INTEGRATION !== "1", timeout: 90_000
+}, async () => {
+  const vite = await startViteFixture({ fixtureRoot: fileURLToPath(new URL("../fixtures/responsive-assistant", import.meta.url)) });
+  const browser = await chromium.launch(createChromiumLaunchOptions());
+  try {
+    for (const width of [390, 1365]) {
+      const page = await browser.newPage({ viewport: { width, height: 900 } });
+      const errors = [];
+      page.on("pageerror", error => errors.push(error.message));
+      await page.goto(`${vite.baseURL}/?delivery=1&recovery=1`);
+      const rows = page.locator(".assistant-transcript__turn");
+      await expect(rows).toHaveCount(5);
+      for (const [index, text] of ["Question one", "Reply one", "Question two", "Reply two", "Discard failed attempt"].entries()) {
+        await expect(rows.nth(index)).toContainText(text);
+      }
+      await expect(page.getByRole("button", { name: "Retry delivery check" })).toBeVisible();
+      await page.screenshot({ path: `/tmp/sas-chat-recovery-${width}.png` });
+      await page.getByRole("button", { name: "Cancel", exact: true }).click();
+      await expect(rows).toHaveCount(4);
+      await expect(page.getByText("Discard failed attempt", { exact: true })).toHaveCount(0);
+      assert.deepEqual(errors, []);
+      assert.ok(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth));
+      await page.close();
+    }
+  } finally { await browser.close(); await stopProcess(vite); }
+});