Merge branch 'worktree/pr343-retarget-latest-master' into worktree/pr344-retarget-stack

# Conflicts:
#	scripts/type-equiv.manifest.json

scripts/type-equiv.manifest.json

@@ -66,6 +66,11 @@
       "symbol": "SessionEvent",
       "source": "packages/core/session/src/types.ts"
     },
+    {
+      "doc": "docs/core-data-structures/core.md",
+      "symbol": "SendOptions",
+      "source": "packages/core/agent/src/types.ts"
+    },
     {
       "doc": "docs/core-data-structures/core.md",
       "symbol": "AgentCancelCause",
@@ -283,6 +288,11 @@
       "symbol": "TokenSurfaceNode",
       "source": "packages/llm/token-meter/src/types.ts"
     },
+    {
+      "doc": "docs/core-data-structures/session.md",
+      "symbol": "PromptMessageData",
+      "source": "packages/core/session/src/types.ts"
+    },
     {
       "doc": "docs/core-data-structures/session.md",
       "symbol": "SessionEventMap",
@@ -379,6 +389,11 @@
       "symbol": "SessionRecord",
       "source": "packages/session-query/session-query/src/types.ts"
     },
+    {
+      "doc": "docs/core-data-structures/session-query.md",
+      "symbol": "SessionSurfaceSnapshot",
+      "source": "packages/session-query/session-query/src/types.ts"
+    },
     {
       "doc": "docs/core-data-structures/session-query.md",
       "symbol": "SessionEventRecord",
@@ -474,6 +489,26 @@
       "symbol": "SessionTitleProvider",
       "source": "packages/session-title/session-title/src/index.ts"
     },
+    {
+      "doc": "docs/core-data-structures/session-reference.md",
+      "symbol": "SessionReferenceInput",
+      "source": "packages/context/session-reference/src/types.ts"
+    },
+    {
+      "doc": "docs/core-data-structures/session-reference.md",
+      "symbol": "SessionReferenceCandidate",
+      "source": "packages/context/session-reference/src/types.ts"
+    },
+    {
+      "doc": "docs/core-data-structures/session-reference.md",
+      "symbol": "PreparedReferencedMessage",
+      "source": "packages/context/session-reference/src/types.ts"
+    },
+    {
+      "doc": "docs/core-data-structures/session-reference.md",
+      "symbol": "SessionReferenceErrorCode",
+      "source": "packages/context/session-reference/src/config.ts"
+    },
     {
       "doc": "docs/core-data-structures/tools.md",
       "symbol": "ToolDefinition",
@@ -699,6 +734,36 @@
       "symbol": "TaskRead",
       "source": "packages/tasks/tasks/src/types.ts"
     },
+    {
+      "doc": "docs/core-data-structures/pty.md",
+      "symbol": "PtyWaitReason",
+      "source": "packages/pty/pty/src/types.ts"
+    },
+    {
+      "doc": "docs/core-data-structures/pty.md",
+      "symbol": "PtySessionStatus",
+      "source": "packages/pty/pty/src/types.ts"
+    },
+    {
+      "doc": "docs/core-data-structures/pty.md",
+      "symbol": "PtyBackend",
+      "source": "packages/pty/pty/src/types.ts"
+    },
+    {
+      "doc": "docs/core-data-structures/pty.md",
+      "symbol": "PtyBackendSession",
+      "source": "packages/pty/pty/src/types.ts"
+    },
+    {
+      "doc": "docs/core-data-structures/pty.md",
+      "symbol": "PtySendOperation",
+      "source": "packages/pty/pty/src/types.ts"
+    },
+    {
+      "doc": "docs/core-data-structures/pty.md",
+      "symbol": "PtySendResult",
+      "source": "packages/pty/pty/src/types.ts"
+    },
     {
       "doc": "docs/core-data-structures/sandbox.md",
       "symbol": "SandboxMode",
@@ -1109,6 +1174,11 @@
       "symbol": "SessionEvent",
       "source": "packages/core/session/src/types.ts"
     },
+    {
+      "doc": "docs/core-data-structures/core.zh.md",
+      "symbol": "SendOptions",
+      "source": "packages/core/agent/src/types.ts"
+    },
     {
       "doc": "docs/core-data-structures/core.zh.md",
       "symbol": "AgentCancelCause",
@@ -1231,6 +1301,11 @@
       "source": "packages/llm/llm/src/index.ts",
       "projection": "public-api"
     },
+    {
+      "doc": "docs/core-data-structures/session.zh.md",
+      "symbol": "PromptMessageData",
+      "source": "packages/core/session/src/types.ts"
+    },
     {
       "doc": "docs/core-data-structures/session.zh.md",
       "symbol": "SessionEventMap",
@@ -1327,6 +1402,11 @@
       "symbol": "SessionRecord",
       "source": "packages/session-query/session-query/src/types.ts"
     },
+    {
+      "doc": "docs/core-data-structures/session-query.zh.md",
+      "symbol": "SessionSurfaceSnapshot",
+      "source": "packages/session-query/session-query/src/types.ts"
+    },
     {
       "doc": "docs/core-data-structures/session-query.zh.md",
       "symbol": "SessionEventRecord",