@opengeni/react 0.34.1 → 0.34.3

package/src/timeline/projection.ts

@@ -6,6 +6,7 @@ import {
   isCreditExhaustion,
   tryParseJson,
 } from "../lib/format";
+import { mcpToolLeaf, toolMatchesLeaf } from "./tool-display-name";
 import type {
   AgentMessageItem,
   ActivityItem,
@@ -22,12 +23,8 @@ import type {
   ToolCallItem,
   WorkerItem,
 } from "./types";
-/** Readable label for a tool call, without leaking an MCP server prefix. */
-export function toolDisplayName(name: string): string {
-  const boundary = name.indexOf("__");
-  const toolPart = boundary >= 0 ? name.slice(boundary + 2) : name;
-  return toolPart.replace(/[_-]+/g, " ").trim();
-}
+
+export { toolDisplayName, mcpToolLeaf, toolMatchesLeaf } from "./tool-display-name";
 
 /* ----------------------------------------------------------------------------
    Timeline projection
@@ -43,10 +40,23 @@ export function toolDisplayName(name: string): string {
    memoized, unit-tested, and re-run incrementally as new events stream in.
    -------------------------------------------------------------------------- */
 
-/** Tool names on the first-party OpenGeni MCP server that operate on sessions. */
+/** Tool leaves on the first-party OpenGeni MCP server that operate on sessions. */
 const WORKER_SPAWN_TOOL = "session_create";
 const WORKER_MESSAGE_TOOL = "session_send_message";
 
+/**
+ * Tools whose durable side-effect events already own the timeline (MemoryRow).
+ * Emitting a generic tool-call too is double chrome — skip the call.
+ *
+ * Goal tools are intentionally NOT landmark-only: an agent `goal_set` /
+ * `goal_update` / `goal_complete` / `goal_pause` stays an in-cluster tool row,
+ * and the matching `goal.*` session event is suppressed below when `actor` is
+ * `"agent"`. That keeps mid-turn goal tools from splitting the step rail with
+ * a breakaway GoalRow pill. Non-agent goal events (API, create-session,
+ * system auto-pause, continuations) still render as landmarks.
+ */
+const LANDMARK_ONLY_TOOL_LEAVES = new Set(["memory_save", "memory_correct"]);
+
 export function buildTimeline(events: SessionEvent[]): TimelineItem[] {
   const items: TimelineItem[] = [];
   const prescan = prescanTurnAnchors(events);
@@ -186,6 +196,9 @@ export function buildTimeline(events: SessionEvent[]): TimelineItem[] {
             open.text = text || open.text;
           }
           open.streaming = false;
+          // Completion time is what the footer shows ("finished at"); keep the
+          // first-delta stamp only until this event arrives.
+          open.occurredAt = event.occurredAt;
           // The SDK can emit a hosted-tool item only after its provider-native
           // operation has completed, even though answer deltas were already
           // streamed. The completed message event is the durable ordering
@@ -237,13 +250,16 @@ export function buildTimeline(events: SessionEvent[]): TimelineItem[] {
         const callId = typeof payload.id === "string" ? payload.id : null;
         const args = payload.arguments ?? null;
         closeStreamingTail();
-        if (name === WORKER_SPAWN_TOOL || name === WORKER_MESSAGE_TOOL) {
+        if (
+          toolMatchesLeaf(name, WORKER_SPAWN_TOOL) ||
+          toolMatchesLeaf(name, WORKER_MESSAGE_TOOL)
+        ) {
           items.push({
             kind: "worker",
             id: event.id,
             turnId,
             callId,
-            action: name === WORKER_SPAWN_TOOL ? "spawn" : "message",
+            action: toolMatchesLeaf(name, WORKER_SPAWN_TOOL) ? "spawn" : "message",
             prompt: workerPrompt(args),
             workerSessionId: extractSessionRef(args),
             status: "running",
@@ -251,6 +267,10 @@ export function buildTimeline(events: SessionEvent[]): TimelineItem[] {
           });
           break;
         }
+        if (LANDMARK_ONLY_TOOL_LEAVES.has(mcpToolLeaf(name))) {
+          // Goal/memory landmarks arrive as goal.* / memory.* events.
+          break;
+        }
         // Live Responses `web_search_call` events and the later SDK
         // `RunToolCallItem` share the same item id. Merge so mid-stream cards
         // do not duplicate when the step finally materializes.
@@ -639,6 +659,11 @@ export function buildTimeline(events: SessionEvent[]): TimelineItem[] {
       case "goal.resumed":
       case "goal.cleared":
       case "goal.continuation": {
+        // Agent tool mutations already appear as tool-call rows in the activity
+        // cluster. Re-emitting them as GoalRow landmarks splits "N steps" mid-turn.
+        if (shouldSuppressAgentGoalLandmark(event.type, payload)) {
+          break;
+        }
         items.push({
           kind: "goal",
           id: event.id,
@@ -1423,6 +1448,22 @@ function goalText(payload: Record<string, unknown>): string | null {
   return null;
 }
 
+/**
+ * Agent-owned goal mutations already have an in-cluster tool row. Suppress the
+ * breakaway landmark for those only. `goal.completed` has no actor field today
+ * and is only emitted by the agent tool, so it is always suppressed. API /
+ * system / create-session / continuation landmarks stay visible.
+ */
+function shouldSuppressAgentGoalLandmark(type: string, payload: Record<string, unknown>): boolean {
+  if (type === "goal.completed") {
+    return true;
+  }
+  if (type === "goal.set" || type === "goal.updated" || type === "goal.paused") {
+    return payload.actor === "agent";
+  }
+  return false;
+}
+
 /**
  * Fold a `memory.saved` / `memory.corrected` event into a {@link MemoryItem}.
  * Reads DEFENSIVELY (the payload is untyped `unknown`, no Zod schema): a missing
@@ -1563,14 +1604,3 @@ export function extractSessionRef(value: unknown, depth = 0): string | null {
 function looksLikeId(value: string): boolean {
   return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
 }
-
-/**
- * Readable label for a tool call ("session_create" -> "session create").
- *
- * MCP tools are namespaced `<serverId>__<toolName>` (see prefixedMcpToolName),
- * and for catalog-imported servers that serverId is an opaque slug+hash
- * ("mcp-integrations-sh-supabase-com-34ed9dcf1390-0i6tcf8"). De-slugging the
- * whole thing leaked that id into the timeline; strip the server prefix and show
- * just the tool ("list organizations"). Names without the `__` boundary (plain
- * built-ins like "session_create") are unaffected.
- */

package/src/timeline/registry.ts

@@ -1,4 +1,5 @@
 import type { ComponentType } from "react";
+import { mcpToolLeaf } from "./tool-display-name";
 import type { ToolCallItem } from "./types";
 
 /* ----------------------------------------------------------------------------
@@ -11,7 +12,8 @@ import type { ToolCallItem } from "./types";
    Resolution order (most → least specific):
      1. exact match on `raw.type`        (e.g. "apply_patch_call", "computer_call")
      2. exact match on the tool `name`   (e.g. "exec_command", "web_search_call")
-     3. the registry's generic fallback
+     3. leaf match after MCP `__` prefix (e.g. opengeni__environment_set_variable)
+     4. the registry's generic fallback
 
    A consumer extends the defaults without forking by passing overrides to
    `createToolRegistry` — e.g. a custom renderer for their own MCP tool, or a
@@ -89,7 +91,18 @@ export function createToolRegistry(
         return byType;
       }
     }
-    return byName.get(item.name) ?? fallback;
+    const exact = byName.get(item.name);
+    if (exact) {
+      return exact;
+    }
+    const leaf = mcpToolLeaf(item.name);
+    if (leaf !== item.name) {
+      const byLeaf = byName.get(leaf);
+      if (byLeaf) {
+        return byLeaf;
+      }
+    }
+    return fallback;
   };
 
   return { resolve, fallback };

package/src/timeline/shared.tsx

@@ -1,6 +1,5 @@
 import { CameraIcon, CameraOffIcon, ChevronRightIcon } from "lucide-react";
 import { useState, type ReactNode } from "react";
-import { Collapsible } from "radix-ui";
 import { cn } from "../lib/cn";
 import { stringifyPayload } from "../lib/format";
 import { useForcedDefaultOpen } from "./disclosure-context";
@@ -207,35 +206,38 @@ export function ActivityDisclosure({
     );
   }
 
+  // Native disclosure (not radix-ui Collapsible): importing `radix-ui` from the
+  // timeline registry pulls Popper into the session share-graph and crashes
+  // lazy workspace settings (`createPopperScope is not a function`).
   return (
-    <Collapsible.Root open={open} onOpenChange={setOpen}>
-      <Collapsible.Trigger asChild>
-        <div
-          role="button"
-          tabIndex={0}
-          // Space/Enter activate a native button; Radix doesn't add this for a
-          // non-button asChild child, so we toggle here. preventDefault on Space
-          // stops the page from scrolling.
-          onKeyDown={(event) => {
-            if (event.key === "Enter" || event.key === " ") {
-              event.preventDefault();
-              setOpen((prev) => !prev);
-            }
-          }}
-          data-status={dataStatus}
-          className={cn(
-            rowClass,
-            "cursor-pointer outline-none hover:bg-og-surface-1 hover:text-og-fg",
-            "focus-visible:ring-2 focus-visible:ring-og-accent focus-visible:ring-offset-0",
-          )}
-        >
-          {inner}
+    <div>
+      <div
+        role="button"
+        tabIndex={0}
+        aria-expanded={open}
+        data-state={open ? "open" : "closed"}
+        onClick={() => setOpen((prev) => !prev)}
+        onKeyDown={(event) => {
+          if (event.key === "Enter" || event.key === " ") {
+            event.preventDefault();
+            setOpen((prev) => !prev);
+          }
+        }}
+        data-status={dataStatus}
+        className={cn(
+          rowClass,
+          "cursor-pointer outline-none hover:bg-og-surface-1 hover:text-og-fg",
+          "focus-visible:ring-2 focus-visible:ring-og-accent focus-visible:ring-offset-0",
+        )}
+      >
+        {inner}
+      </div>
+      {open ? (
+        <div className="mb-2 ml-7 mt-1.5 flex flex-col gap-2 overflow-hidden animate-og-expand">
+          {children}
         </div>
-      </Collapsible.Trigger>
-      <Collapsible.Content className="overflow-hidden data-[state=closed]:animate-og-collapse data-[state=open]:animate-og-expand">
-        <div className="mb-2 ml-7 mt-1.5 flex flex-col gap-2">{children}</div>
-      </Collapsible.Content>
-    </Collapsible.Root>
+      ) : null}
+    </div>
   );
 }
 

package/src/timeline/tool-display-name.ts

@@ -1,16 +1,35 @@
 /**
- * Readable label for a tool call ("session_create" -> "session create").
+ * MCP / first-party tool naming helpers.
  *
- * MCP tools are namespaced `<serverId>__<toolName>` (see prefixedMcpToolName),
- * and for catalog-imported servers that serverId is an opaque slug+hash.
- * De-slugging the whole thing leaked that id into the timeline; strip the
- * server prefix and show just the tool. Names without the `__` boundary (plain
- * built-ins like "session_create") are unaffected.
+ * Wire names are often `<serverId>__<toolName>` (see prefixedMcpToolName).
+ * Matching and titles must use the leaf tool name so `opengeni__session_create`
+ * and bare `session_create` resolve the same UI — without inventing previews
+ * from argument JSON.
  */
-export function toolDisplayName(name: string): string {
-  // The prefix is a single LEFT boundary (`registryId__toolName`), so split on
-  // the FIRST `__` — the tool name itself may contain `__` and must survive whole.
+
+/** Leaf tool name after the first `__` server boundary (or the whole name). */
+export function mcpToolLeaf(name: string): string {
   const boundary = name.indexOf("__");
-  const toolPart = boundary >= 0 ? name.slice(boundary + 2) : name;
-  return toolPart.replace(/[_-]+/g, " ").trim();
+  return boundary >= 0 ? name.slice(boundary + 2) : name;
+}
+
+/**
+ * True when `wireName` is exactly `leaf` or ends with `__${leaf}` (MCP prefix).
+ * Does not treat arbitrary suffixes as matches — the leaf must be the full
+ * right-hand side after `__`.
+ */
+export function toolMatchesLeaf(wireName: string, leaf: string): boolean {
+  return wireName === leaf || wireName.endsWith(`__${leaf}`);
+}
+
+/**
+ * Readable label for a tool call ("session_create" / "opengeni__session_create"
+ * → "Session create"). Title-cases the first character of the leaf phrase.
+ */
+export function toolDisplayName(name: string): string {
+  const phrase = mcpToolLeaf(name).replace(/[_-]+/g, " ").trim();
+  if (!phrase) {
+    return name;
+  }
+  return phrase.charAt(0).toUpperCase() + phrase.slice(1);
 }