Merge remote-tracking branch 'github/master' into xtr/trajectory-inspection-ui

# Conflicts:
#	packages/client/runtime/src/client/sessions/fold-adapter.ts
#	packages/compact/compact-basic/src/summarizer.ts

scripts/gen-cordis-catalog.ts

@@ -36,8 +36,7 @@ export const LINK_MAP: Record<string, string> = {
   ContinuationStop: 'core.md',
   GenerateOptions: 'core.md',
   InboxPlacement: 'core.md',
-  AgentMessage: 'core.md',
-  AgentMessageId: 'core.md',
+  MessageId: 'core.md',
   HookContext: 'core.md',
   SettleReason: 'core.md',
   LlmCallConfig: 'core.md',
@@ -50,6 +49,7 @@ export const LINK_MAP: Record<string, string> = {
   ResolvedRetryPolicy: 'llm-streaming.md',
   Message: 'core.md',
   MessageSource: 'core.md',
+  UserMessage: 'session.md',
   PromptDecision: 'core.md',
   RequestErrorAction: 'core.md',
   RequestError: 'core.md',

scripts/type-equiv.manifest.json

@@ -14,17 +14,17 @@
     {
       "doc": "docs/core-data-structures/core.md",
       "symbol": "AssistantProvenance",
-      "source": "packages/llm/llm/src/types.ts"
+      "source": "packages/llm/llm/src/message.ts"
     },
     {
       "doc": "docs/core-data-structures/core.md",
       "symbol": "Message",
-      "source": "packages/llm/llm/src/types.ts"
+      "source": "packages/llm/llm/src/message.ts"
     },
     {
       "doc": "docs/core-data-structures/core.md",
       "symbol": "MessageSourceMap",
-      "source": "packages/llm/llm/src/types.ts"
+      "source": "packages/llm/llm/src/message.ts"
     },
     {
       "doc": "docs/core-data-structures/core.md",
@@ -101,16 +101,6 @@
       "symbol": "SendOptions",
       "source": "packages/core/agent/src/types.ts"
     },
-    {
-      "doc": "docs/core-data-structures/core.md",
-      "symbol": "AgentMessageId",
-      "source": "packages/core/agent/src/types.ts"
-    },
-    {
-      "doc": "docs/core-data-structures/core.md",
-      "symbol": "AgentMessage",
-      "source": "packages/core/agent/src/types.ts"
-    },
     {
       "doc": "docs/core-data-structures/core.md",
       "symbol": "CancelOptions",
@@ -320,8 +310,8 @@
     },
     {
       "doc": "docs/core-data-structures/session.md",
-      "symbol": "UserMessageData",
-      "source": "packages/core/session/src/types.ts"
+      "symbol": "UserMessage",
+      "source": "packages/llm/llm/src/message.ts"
     },
     {
       "doc": "docs/core-data-structures/session.md",