@hermespilot/link 0.2.5 → 0.2.7

package/dist/{chunk-N4CZ2ASZ.js → chunk-SSJ7WDD7.js}

@@ -3724,7 +3724,7 @@ import os2 from "os";
 import path5 from "path";
 
 // src/constants.ts
-var LINK_VERSION = "0.2.5";
+var LINK_VERSION = "0.2.7";
 var LINK_COMMAND = "hermeslink";
 var LINK_DEFAULT_PORT = 52379;
 var LINK_RUNTIME_DIR_NAME = ".hermeslink";
@@ -4941,17 +4941,16 @@ function readUsage(payload) {
   if (!inputTokens && !outputTokens && !totalTokens) {
     return void 0;
   }
-  const contextTokens = explicitContextTokens ?? (contextWindow !== void 0 && inputTokens !== void 0 && inputTokens <= contextWindow ? inputTokens : void 0);
   return {
     input_tokens: inputTokens ?? 0,
     output_tokens: outputTokens ?? 0,
     total_tokens: totalTokens,
-    ...contextTokens !== void 0 ? { context_tokens: contextTokens } : {},
+    ...explicitContextTokens !== void 0 ? { context_tokens: explicitContextTokens } : {},
     ...contextWindow !== void 0 ? { context_window: contextWindow } : {},
-    ...contextTokens !== void 0 && contextWindow ? {
+    ...explicitContextTokens !== void 0 && contextWindow ? {
       usage_percent: Math.min(
         100,
-        Math.round(contextTokens / contextWindow * 100)
+        Math.round(explicitContextTokens / contextWindow * 100)
       )
     } : {}
   };
@@ -5690,7 +5689,8 @@ async function buildConversationRuntimeMetadata(paths, manifest, snapshot) {
     total_tokens: 0
   };
   const contextWindow = current.contextWindow ?? usage.context_window ?? usageRun?.context_window;
-  const contextTokens = usage.context_tokens ?? (contextWindow && usage.input_tokens <= contextWindow ? usage.input_tokens : 0);
+  const contextTokens = usage.context_tokens;
+  const contextSource = contextTokens === void 0 ? "unknown" : "explicit";
   const provider = current.provider ?? usageRun?.provider;
   const reasoningEffort = current.reasoningEffort;
   return {
@@ -5707,11 +5707,14 @@ async function buildConversationRuntimeMetadata(paths, manifest, snapshot) {
       ...reasoningEffort ? { reasoning_effort: reasoningEffort } : {}
     },
     context: {
-      input_tokens: contextTokens,
+      input_tokens: contextTokens ?? 0,
       output_tokens: usage.output_tokens,
       total_tokens: usage.total_tokens,
       ...contextWindow ? { context_window: contextWindow } : {},
-      ...contextWindow && contextTokens ? {
+      ...contextTokens !== void 0 ? { used_tokens: contextTokens } : {},
+      ...contextWindow ? { window_tokens: contextWindow } : {},
+      source: contextSource,
+      ...contextWindow && contextTokens !== void 0 ? {
         usage_percent: Math.min(
           100,
           usage.usage_percent ?? Math.round(contextTokens / contextWindow * 100)
@@ -6048,12 +6051,15 @@ var ConversationCommandHandlers = class {
       manifest,
       snapshot
     );
-    const context = runtime.context.context_window ? ` / ${runtime.context.context_window}` : "";
     return [
       `\u6D88\u606F\u6570\uFF1A${stats.message_count}`,
       `Agent run \u6570\uFF1A${stats.run_count}`,
-      `Token\uFF1A${stats.total_tokens}\uFF08\u8F93\u5165 ${stats.input_tokens}\uFF0C\u8F93\u51FA ${stats.output_tokens}\uFF09`,
-      `\u4E0A\u4E0B\u6587\uFF1A${runtime.context.input_tokens}${context}`,
+      "",
+      `\u7D2F\u8BA1\u6D88\u8017\uFF1A${stats.total_tokens} tokens`,
+      `\u8F93\u5165\uFF1A${stats.input_tokens}`,
+      `\u8F93\u51FA\uFF1A${stats.output_tokens}`,
+      "",
+      ...formatContextUsageLines(runtime),
       `\u6A21\u578B\uFF1A${runtime.model.id}`,
       `Profile\uFF1A${runtime.profile.name}`
     ].join("\n");
@@ -6276,6 +6282,21 @@ var ConversationCommandHandlers = class {
     }
   }
 };
+function formatContextUsageLines(runtime) {
+  const windowTokens = runtime.context.window_tokens ?? runtime.context.context_window;
+  if (runtime.context.source === "explicit") {
+    const usedTokens = runtime.context.used_tokens ?? runtime.context.input_tokens;
+    const percent = runtime.context.usage_percent ?? (windowTokens && windowTokens > 0 ? Math.min(100, Math.round(usedTokens / windowTokens * 100)) : void 0);
+    return [
+      `\u4E0A\u4E0B\u6587\uFF1A${usedTokens}${windowTokens ? ` / ${windowTokens}` : ""}${percent === void 0 ? "" : `\uFF08${percent}%\uFF09`}`,
+      "\u6765\u6E90\uFF1A\u6A21\u578B\u8FD4\u56DE"
+    ];
+  }
+  return [
+    `\u4E0A\u4E0B\u6587\uFF1A\u672A\u77E5${windowTokens ? ` / ${windowTokens}` : ""}`,
+    "\u539F\u56E0\uFF1A\u4E0A\u6E38\u672A\u8FD4\u56DE\u5F53\u524D\u4E0A\u4E0B\u6587\u5360\u7528"
+  ];
+}
 
 // src/conversations/delivery-staging.ts
 import { mkdir as mkdir7, rm as rm4 } from "fs/promises";
@@ -7886,13 +7907,23 @@ function mergeAgentEventProjections(base, overlay) {
 function upsertAgentEventProjection(events, next) {
   let index = events.findIndex((event) => event.id === next.id);
   if (index < 0 && next.status !== "running") {
+    let matchingIndex = -1;
     for (let candidateIndex = events.length - 1; candidateIndex >= 0; candidateIndex -= 1) {
       const candidate = events[candidateIndex];
-      if (candidate?.status === "running" && candidate.title === next.title) {
-        index = candidateIndex;
-        break;
+      if (candidate?.status !== "running") {
+        continue;
+      }
+      if (candidate.title === next.title || isGenericToolTitle(next.title)) {
+        if (matchingIndex !== -1) {
+          matchingIndex = -1;
+          break;
+        }
+        matchingIndex = candidateIndex;
       }
     }
+    if (matchingIndex !== -1) {
+      index = matchingIndex;
+    }
   }
   if (index < 0) {
     return [...events, next];
@@ -7906,6 +7937,8 @@ function upsertAgentEventProjection(events, next) {
     ...previous,
     ...next,
     id: previous.id,
+    title: isGenericToolTitle(next.title) ? previous.title : next.title,
+    created_at: earliestTimestamp(previous.created_at, next.created_at),
     subtitle: nextSubtitleIsFallback ? previous.subtitle ?? next.subtitle : next.subtitle ?? previous.subtitle,
     detail: next.detail ?? previous.detail,
     completed_at: next.completed_at ?? previous.completed_at
@@ -7914,13 +7947,27 @@ function upsertAgentEventProjection(events, next) {
   copy[index] = merged;
   return copy;
 }
+function earliestTimestamp(left, right) {
+  const leftTime = Date.parse(left);
+  const rightTime = Date.parse(right);
+  if (Number.isNaN(leftTime)) {
+    return right;
+  }
+  if (Number.isNaN(rightTime)) {
+    return left;
+  }
+  return leftTime <= rightTime ? left : right;
+}
+function isGenericToolTitle(value) {
+  const normalized = value.trim().toLowerCase().replace(/[\s_-]+/gu, "");
+  return normalized === "tool" || normalized === "toolcall" || value === "\u5DE5\u5177\u8C03\u7528";
+}
 function isToolStatusFallbackSubtitle(value, title) {
   if (!value) {
     return false;
   }
   const normalized = value.trim().toLowerCase();
-  const normalizedTitle = title.trim().toLowerCase();
-  return normalized === normalizedTitle || normalized.startsWith("\u6B63\u5728\u8C03\u7528 ") || normalized.endsWith(" \u5DF2\u5B8C\u6210") || normalized.endsWith(" \u6267\u884C\u5931\u8D25");
+  return normalized.startsWith("\u6B63\u5728\u8C03\u7528 ") || normalized.endsWith(" \u5DF2\u5B8C\u6210") || normalized.endsWith(" \u6267\u884C\u5931\u8D25") || normalized === "tool" || normalized === "running";
 }
 function closeRunningAgentEvents(events, status, completedAt) {
   if (!events?.length) {
@@ -7931,7 +7978,7 @@ function closeRunningAgentEvents(events, status, completedAt) {
   );
 }
 function humanizeToolName(value) {
-  const normalized = value.trim().replace(/[_-]+/gu, " ").replace(/\s+/gu, " ");
+  const normalized = value.trim().replace(/([a-z0-9])([A-Z])/gu, "$1 $2").replace(/[_-]+/gu, " ").replace(/\s+/gu, " ");
   if (!normalized) {
     return "\u5DE5\u5177\u8C03\u7528";
   }
@@ -8147,10 +8194,34 @@ var ConversationQueryCoordinator = class {
         isMeaningfulAgentEventProjection
       );
       const agentEvents = mergeAgentEventProjections(fromLog, persisted);
-      return agentEvents.length > 0 ? { ...message, agent_events: agentEvents } : message;
+      return agentEvents.length > 0 ? {
+        ...message,
+        agent_events: agentEvents,
+        blocks: hydrateAgentEventBlocks(message.blocks, agentEvents)
+      } : message;
     });
   }
 };
+function hydrateAgentEventBlocks(blocks, agentEvents) {
+  if (!blocks?.length || agentEvents.length === 0) {
+    return blocks;
+  }
+  const agentEventById = new Map(
+    agentEvents.map((event) => [event.id, event])
+  );
+  return blocks.map((block) => {
+    if (block.type !== "agent_events" || block.events.length === 0) {
+      return block;
+    }
+    return {
+      ...block,
+      events: block.events.map((event) => {
+        const hydrated = agentEventById.get(event.id);
+        return hydrated ? upsertAgentEventProjection([event], hydrated)[0] ?? event : event;
+      })
+    };
+  });
+}
 
 // src/conversations/conversation-store.ts
 import {
@@ -9583,17 +9654,16 @@ function readChatCompletionUsage(payload) {
   if (input === void 0 && output === void 0 && total === void 0) {
     return void 0;
   }
-  const contextTokens = explicitContextTokens ?? (contextWindow !== void 0 && input !== void 0 && input <= contextWindow ? input : void 0);
   return {
     input_tokens: input ?? 0,
     output_tokens: output ?? 0,
     total_tokens: total ?? (input ?? 0) + (output ?? 0),
-    ...contextTokens !== void 0 ? { context_tokens: contextTokens } : {},
+    ...explicitContextTokens !== void 0 ? { context_tokens: explicitContextTokens } : {},
     ...contextWindow !== void 0 ? { context_window: contextWindow } : {},
-    ...contextTokens !== void 0 && contextWindow ? {
+    ...explicitContextTokens !== void 0 && contextWindow ? {
       usage_percent: Math.min(
         100,
-        Math.round(contextTokens / contextWindow * 100)
+        Math.round(explicitContextTokens / contextWindow * 100)
       )
     } : {}
   };
@@ -9994,7 +10064,7 @@ ${details.join("\n")}` : emptyHermesResponseMessage();
           conversationId,
           runId,
           delta,
-          event.payload
+          event
         );
       }
       return;
@@ -10049,6 +10119,7 @@ ${details.join("\n")}` : emptyHermesResponseMessage();
       assistant.agent_events ?? [],
       agentEvent
     );
+    appendAgentEventBlock(assistant, agentEvent, event.created_at);
     assistant.updated_at = event.created_at;
     await this.deps.writeSnapshot(conversationId, snapshot);
   }
@@ -10103,7 +10174,7 @@ ${details.join("\n")}` : emptyHermesResponseMessage();
       collectMediaReferences(event.payload)
     );
   }
-  async appendAssistantDelta(conversationId, runId, delta, rawPayload) {
+  async appendAssistantDelta(conversationId, runId, delta, event) {
     const snapshot = await this.deps.readSnapshot(conversationId);
     const run = snapshot.runs.find((item) => item.id === runId);
     if (!run) {
@@ -10147,7 +10218,10 @@ ${details.join("\n")}` : emptyHermesResponseMessage();
       assistant.parts.push({ type: "text", text: extracted.visibleText });
     }
     assistant.updated_at = (/* @__PURE__ */ new Date()).toISOString();
-    assistant.raw = { format: "hermes-run-event", payload: rawPayload };
+    assistant.raw = { format: "hermes-run-event", payload: event.rawPayload };
+    if (extracted.visibleText) {
+      appendTextBlock(assistant, extracted.visibleText, assistant.updated_at);
+    }
     await this.deps.writeSnapshot(conversationId, snapshot);
     if (extracted.visibleText) {
       await this.deps.appendEvent(conversationId, {
@@ -10155,7 +10229,7 @@ ${details.join("\n")}` : emptyHermesResponseMessage();
         message_id: assistant.id,
         run_id: runId,
         payload: { delta: extracted.visibleText },
-        raw: { format: "hermes-run-event", payload: rawPayload }
+        raw: { format: "hermes-run-event", payload: event.rawPayload }
       });
     }
     await this.importMediaReferences(
@@ -10704,18 +10778,83 @@ function isVoicePart(part) {
 function normalizeToolName(value) {
   return value.trim().toLowerCase().replace(/[\s-]+/gu, "_");
 }
+function appendTextBlock(message, delta, updatedAt) {
+  if (!delta) {
+    return;
+  }
+  const blocks = [...message.blocks ?? []];
+  const last = blocks.at(-1);
+  if (last?.type === "text") {
+    blocks[blocks.length - 1] = {
+      ...last,
+      text: `${last.text}${delta}`,
+      updated_at: updatedAt
+    };
+  } else {
+    blocks.push({
+      id: `text_${blocks.length + 1}`,
+      type: "text",
+      text: delta,
+      created_at: updatedAt,
+      updated_at: updatedAt
+    });
+  }
+  message.blocks = blocks;
+}
+function appendAgentEventBlock(message, event, updatedAt) {
+  const blocks = [...message.blocks ?? []];
+  const matchingIndex = blocks.findIndex((block) => {
+    if (block.type !== "agent_events") {
+      return false;
+    }
+    return upsertAgentEventProjection(block.events, event).length === block.events.length;
+  });
+  const targetIndex = matchingIndex >= 0 ? matchingIndex : blocks.at(-1)?.type === "agent_events" ? blocks.length - 1 : -1;
+  if (targetIndex >= 0) {
+    const block = blocks[targetIndex];
+    if (block.type === "agent_events") {
+      blocks[targetIndex] = {
+        ...block,
+        events: upsertAgentEventProjection(block.events, event),
+        updated_at: updatedAt
+      };
+    }
+  } else {
+    blocks.push({
+      id: `tools_${blocks.length + 1}`,
+      type: "agent_events",
+      events: [event],
+      created_at: updatedAt,
+      updated_at: updatedAt
+    });
+  }
+  message.blocks = blocks;
+}
 function contextUsagePayload(run) {
   const usage = run.usage;
-  const contextTokens = usage?.context_tokens;
-  if (contextTokens === void 0) {
+  if (!usage) {
     return null;
   }
+  const contextTokens = usage?.context_tokens;
   const contextWindow = usage?.context_window ?? run.context_window;
+  if (contextTokens === void 0) {
+    return {
+      input_tokens: 0,
+      output_tokens: usage.output_tokens ?? 0,
+      total_tokens: usage.total_tokens ?? 0,
+      ...contextWindow ? { context_window: contextWindow } : {},
+      ...contextWindow ? { window_tokens: contextWindow } : {},
+      source: "unknown"
+    };
+  }
   return {
     input_tokens: contextTokens,
     output_tokens: usage?.output_tokens ?? 0,
     total_tokens: usage?.total_tokens ?? contextTokens,
     ...contextWindow ? { context_window: contextWindow } : {},
+    used_tokens: contextTokens,
+    ...contextWindow ? { window_tokens: contextWindow } : {},
+    source: "explicit",
     ...usage?.usage_percent !== void 0 ? { usage_percent: usage.usage_percent } : contextWindow ? {
       usage_percent: Math.min(
         100,

package/dist/cli/index.js

@@ -26,7 +26,7 @@ import {
   startDaemonProcess,
   startLinkService,
   stopDaemonProcess
-} from "../chunk-N4CZ2ASZ.js";
+} from "../chunk-SSJ7WDD7.js";
 
 // src/cli/index.ts
 import { Command } from "commander";

package/dist/http/app.d.ts

@@ -115,7 +115,10 @@ interface ConversationRuntimeMetadata {
         output_tokens: number;
         total_tokens: number;
         context_window?: number;
+        used_tokens?: number;
+        window_tokens?: number;
         usage_percent?: number;
+        source: 'explicit' | 'unknown';
         updated_at?: string;
     };
 }
@@ -142,17 +145,33 @@ interface LinkMessagePart {
 }
 interface LinkMessageAgentEvent {
     id: string;
+    kind?: 'tool' | 'thinking_delta';
     title: string;
     status: 'running' | 'completed' | 'failed' | 'info';
     created_at: string;
     subtitle?: string;
     detail?: string;
+    text?: string;
+    phase?: 'thinking' | 'final';
     completed_at?: string;
     raw?: {
         format: string;
         payload: unknown;
     };
 }
+type LinkMessageBlock = {
+    id: string;
+    type: 'text';
+    text: string;
+    created_at: string;
+    updated_at?: string;
+} | {
+    id: string;
+    type: 'agent_events';
+    events: LinkMessageAgentEvent[];
+    created_at: string;
+    updated_at?: string;
+};
 type LinkApprovalDecisionScope = 'once' | 'session' | 'always';
 type LinkApprovalDecision = LinkApprovalDecisionScope | 'deny';
 type LinkApprovalStatus = 'pending' | 'approved' | 'denied' | 'expired';
@@ -193,6 +212,7 @@ interface LinkMessage {
     };
     parts: LinkMessagePart[];
     attachments: unknown[];
+    blocks?: LinkMessageBlock[];
     agent_events?: LinkMessageAgentEvent[];
     approvals?: LinkApprovalRequest[];
     hermes?: Record<string, unknown>;

package/dist/http/app.js

@@ -1,6 +1,6 @@
 import {
   createApp
-} from "../chunk-N4CZ2ASZ.js";
+} from "../chunk-SSJ7WDD7.js";
 export {
   createApp
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hermespilot/link",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "private": false,
   "description": "Hermes Link companion service and CLI for connecting hermes-agent through HermesPilot",
   "license": "MIT",