fix(dev): restore session metadata surfaces

Author: henry701

build-local.sh

@@ -49,6 +49,9 @@ export PATH="$PATH:$REPO_ROOT/node_modules/.bin"
 echo "==> Installing dependencies..."
 bun install --minimum-release-age 0 --frozen-lockfile
 
+echo "==> Regenerating JavaScript SDK..."
+bun "$REPO_ROOT/packages/sdk/js/script/build.ts"
+
 echo "==> Building opencode (native linux-x64, --single)..."
 cd "$PKG_DIR"
 bun run script/build.ts --single --skip-install

packages/app/src/components/session/session-context-breakdown.test.ts

@@ -10,11 +10,12 @@ const user = (id: string) => {
   } as unknown as Message
 }
 
-const assistant = (id: string) => {
+const assistant = (id: string, toolDefs?: string) => {
   return {
     id,
     role: "assistant",
     time: { created: 1 },
+    tool_defs: toolDefs,
   } as unknown as Message
 }
 
@@ -58,4 +59,25 @@ describe("estimateSessionContextBreakdown", () => {
     expect(total).toBeLessThanOrEqual(10)
     expect(output.every((segment) => segment.width <= 100)).toBeTrue()
   })
+
+  test("counts the latest assistant tool definitions separately", () => {
+    const firstToolDefs = "old tool definitions"
+    const latestToolDefs = "new tool definitions"
+    const messages = [user("u1"), assistant("a1", firstToolDefs), assistant("a2", latestToolDefs)]
+    const parts = {
+      u1: [{ type: "text", text: "hello" }] as unknown as Part[],
+      a1: [{ type: "text", text: "first response" }] as unknown as Part[],
+      a2: [{ type: "text", text: "latest response" }] as unknown as Part[],
+    }
+
+    const output = estimateSessionContextBreakdown({
+      messages,
+      parts,
+      input: 100,
+      systemPrompt: "system",
+    })
+
+    const map = Object.fromEntries(output.map((segment) => [segment.key, segment.tokens]))
+    expect(map.toolDefs).toBe(Math.ceil(latestToolDefs.length / 4))
+  })
 })

packages/app/src/components/session/session-context-breakdown.ts

@@ -1,6 +1,6 @@
 import type { Message, Part } from "@opencode-ai/sdk/v2/client"
 
-export type SessionContextBreakdownKey = "system" | "user" | "assistant" | "tool" | "other"
+export type SessionContextBreakdownKey = "system" | "user" | "assistant" | "tool" | "toolDefs" | "other"
 
 export type SessionContextBreakdownSegment = {
   key: SessionContextBreakdownKey
@@ -33,14 +33,18 @@ const charsFromAssistantPart = (part: Part) => {
 }
 
 const build = (
-  tokens: { system: number; user: number; assistant: number; tool: number; other: number },
+  tokens: { system: number; user: number; assistant: number; tool: number; toolDefs: number; other: number },
   input: number,
 ) => {
   return [
     {
       key: "system",
       tokens: tokens.system,
     },
+    {
+      key: "toolDefs",
+      tokens: tokens.toolDefs,
+    },
     {
       key: "user",
       tokens: tokens.user,
@@ -75,6 +79,14 @@ export function estimateSessionContextBreakdown(args: {
 }) {
   if (!args.input) return []
 
+  const toolDefsChars = (() => {
+    for (let i = args.messages.length - 1; i >= 0; i--) {
+      const msg = args.messages[i]
+      if (msg.role === "assistant" && msg.tool_defs) return msg.tool_defs.length
+    }
+    return 0
+  })()
+
   const counts = args.messages.reduce(
     (acc, msg) => {
       const parts = args.parts[msg.id] ?? []
@@ -105,6 +117,7 @@ export function estimateSessionContextBreakdown(args: {
       user: 0,
       assistant: 0,
       tool: 0,
+      toolDefs: toolDefsChars,
     },
   )
 
@@ -113,8 +126,9 @@ export function estimateSessionContextBreakdown(args: {
     user: estimateTokens(counts.user),
     assistant: estimateTokens(counts.assistant),
     tool: estimateTokens(counts.tool),
+    toolDefs: estimateTokens(counts.toolDefs),
   }
-  const estimated = tokens.system + tokens.user + tokens.assistant + tokens.tool
+  const estimated = tokens.system + tokens.user + tokens.assistant + tokens.tool + tokens.toolDefs
 
   if (estimated <= args.input) {
     return build({ ...tokens, other: args.input - estimated }, args.input)
@@ -126,7 +140,8 @@ export function estimateSessionContextBreakdown(args: {
     user: Math.floor(tokens.user * scale),
     assistant: Math.floor(tokens.assistant * scale),
     tool: Math.floor(tokens.tool * scale),
+    toolDefs: Math.floor(tokens.toolDefs * scale),
   }
-  const total = scaled.system + scaled.user + scaled.assistant + scaled.tool
+  const total = scaled.system + scaled.user + scaled.assistant + scaled.tool + scaled.toolDefs
   return build({ ...scaled, other: Math.max(0, args.input - total) }, args.input)
 }

packages/app/src/components/session/session-context-system.test.ts

@@ -0,0 +1,33 @@
+import { describe, expect, test } from "bun:test"
+import type { Message } from "@opencode-ai/sdk/v2/client"
+import { getSessionSystemPrompt } from "./session-context-system"
+
+const user = (id: string, system?: string) => {
+  return {
+    id,
+    role: "user",
+    system,
+    time: { created: 1 },
+  } as unknown as Message
+}
+
+const assistant = (id: string, systemPrompt?: string) => {
+  return {
+    id,
+    role: "assistant",
+    system_prompt: systemPrompt,
+    time: { created: 1 },
+  } as unknown as Message
+}
+
+describe("getSessionSystemPrompt", () => {
+  test("prefers the latest stored assistant system prompt", () => {
+    expect(getSessionSystemPrompt([user("u1", "user system"), assistant("a1", " assistant system ")] as Message[])).toBe(
+      "assistant system",
+    )
+  })
+
+  test("falls back to the latest user system prompt", () => {
+    expect(getSessionSystemPrompt([user("u1", "old"), user("u2", " current ")] as Message[])).toBe("current")
+  })
+})

packages/app/src/components/session/session-context-system.ts

@@ -0,0 +1,17 @@
+import type { Message } from "@opencode-ai/sdk/v2/client"
+
+export function getSessionSystemPrompt(messages: Message[]) {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i]
+    if (msg.role !== "assistant") continue
+    const trimmed = msg.system_prompt?.trim()
+    if (trimmed) return trimmed
+  }
+
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i]
+    if (msg.role !== "user") continue
+    const trimmed = msg.system?.trim()
+    if (trimmed) return trimmed
+  }
+}

packages/app/src/components/session/session-context-tab.tsx

@@ -2,27 +2,28 @@ import { createMemo, createEffect, on, onCleanup, For, Show } from "solid-js"
 import type { JSX } from "solid-js"
 import { useSync } from "@/context/sync"
 import { checksum } from "@opencode-ai/core/util/encode"
-import { findLast } from "@opencode-ai/core/util/array"
 import { same } from "@/utils/same"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Accordion } from "@opencode-ai/ui/accordion"
 import { StickyAccordionHeader } from "@opencode-ai/ui/sticky-accordion-header"
 import { File } from "@opencode-ai/ui/file"
 import { Markdown } from "@opencode-ai/ui/markdown"
 import { ScrollView } from "@opencode-ai/ui/scroll-view"
-import type { Message, Part, UserMessage } from "@opencode-ai/sdk/v2/client"
+import type { Message, Part } from "@opencode-ai/sdk/v2/client"
 import { useLanguage } from "@/context/language"
 import { useProviders } from "@/hooks/use-providers"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { getSessionContextMetrics } from "./session-context-metrics"
 import { estimateSessionContextBreakdown, type SessionContextBreakdownKey } from "./session-context-breakdown"
 import { createSessionContextFormatter } from "./session-context-format"
+import { getSessionSystemPrompt } from "./session-context-system"
 
 const BREAKDOWN_COLOR: Record<SessionContextBreakdownKey, string> = {
   system: "var(--syntax-info)",
   user: "var(--syntax-success)",
   assistant: "var(--syntax-property)",
   tool: "var(--syntax-warning)",
+  toolDefs: "var(--syntax-keyword)",
   other: "var(--syntax-comment)",
 }
 
@@ -88,7 +89,6 @@ function RawMessage(props: {
 }
 
 const emptyMessages: Message[] = []
-const emptyUserMessages: UserMessage[] = []
 
 export function SessionContextTab() {
   const sync = useSync()
@@ -108,22 +108,6 @@ export function SessionContextTab() {
     { equals: same },
   )
 
-  const userMessages = createMemo(
-    () => messages().filter((m) => m.role === "user") as UserMessage[],
-    emptyUserMessages,
-    { equals: same },
-  )
-
-  const visibleUserMessages = createMemo(
-    () => {
-      const revert = info()?.revert?.messageID
-      if (!revert) return userMessages()
-      return userMessages().filter((m) => m.id < revert)
-    },
-    emptyUserMessages,
-    { equals: same },
-  )
-
   const usd = createMemo(
     () =>
       new Intl.NumberFormat(language.intl(), {
@@ -151,14 +135,7 @@ export function SessionContextTab() {
     }
   })
 
-  const systemPrompt = createMemo(() => {
-    const msg = findLast(visibleUserMessages(), (m) => !!m.system)
-    const system = msg?.system
-    if (!system) return
-    const trimmed = system.trim()
-    if (!trimmed) return
-    return trimmed
-  })
+  const systemPrompt = createMemo(() => getSessionSystemPrompt(messages()))
 
   const providerLabel = createMemo(() => {
     const c = ctx()
@@ -190,6 +167,7 @@ export function SessionContextTab() {
 
   const breakdownLabel = (key: SessionContextBreakdownKey) => {
     if (key === "system") return language.t("context.breakdown.system")
+    if (key === "toolDefs") return language.t("context.breakdown.toolDefs")
     if (key === "user") return language.t("context.breakdown.user")
     if (key === "assistant") return language.t("context.breakdown.assistant")
     if (key === "tool") return language.t("context.breakdown.tool")

packages/app/src/i18n/en.ts

@@ -374,6 +374,7 @@ export const dict = {
   "context.breakdown.user": "User",
   "context.breakdown.assistant": "Assistant",
   "context.breakdown.tool": "Tool Calls",
+  "context.breakdown.toolDefs": "Tool Definitions",
   "context.breakdown.other": "Other",
 
   "context.systemPrompt.title": "System Prompt",

packages/opencode/src/server/routes/instance/httpapi/public.ts

@@ -260,6 +260,10 @@ function applyLegacySchemaOverrides(spec: OpenApiSpec) {
   if (!schemas) return
   if (schemas.AgentConfig) schemas.AgentConfig.additionalProperties = {}
   if (schemas.Command?.properties?.template) schemas.Command.properties.template = { type: "string" }
+  if (schemas.AssistantMessage?.properties) {
+    schemas.AssistantMessage.properties.tool_defs = { type: "string" }
+    schemas.AssistantMessage.properties.system_prompt = { type: "string" }
+  }
   if (schemas.Workspace?.properties) {
     schemas.Workspace.properties.branch = nullable(schemas.Workspace.properties.branch)
     schemas.Workspace.properties.directory = nullable(schemas.Workspace.properties.directory)

packages/opencode/src/session/message-v2.ts

@@ -2,6 +2,7 @@ import { EventV2 } from "@opencode-ai/core/event"
 import { SessionID, MessageID, PartID } from "./schema"
 import { SessionV1 } from "@opencode-ai/core/v1/session"
 import { ProviderV2 } from "@opencode-ai/core/provider"
+import { Effect, Schema } from "effect"
 import {
   APIError,
   AbortedError,
@@ -14,7 +15,6 @@ import {
   StructuredOutputError,
   SubtaskPart,
   User as CoreUser,
-  WithParts as CoreWithParts,
   type ToolPart,
 } from "@opencode-ai/core/v1/session"
 export {
@@ -32,7 +32,11 @@ export {
   type ToolStateError,
 } from "@opencode-ai/core/v1/session"
 
-export const Assistant = CoreAssistant
+export const Assistant = Schema.Struct({
+  ...CoreAssistant.fields,
+  tool_defs: Schema.optional(Schema.String),
+  system_prompt: Schema.optional(Schema.String),
+}).annotate({ identifier: "AssistantMessage" })
 export type Assistant = CoreAssistant & {
   tool_defs?: string
   system_prompt?: string
@@ -41,9 +45,13 @@ export type Assistant = CoreAssistant & {
 export const User = CoreUser
 export type User = CoreUser & { delivery?: "immediate" | "deferred" }
 
+export const Info = Schema.Union([User, Assistant]).annotate({ discriminator: "role", identifier: "Message" })
 export type Info = User | Assistant
 
-export const WithParts = CoreWithParts
+export const WithParts = Schema.Struct({
+  info: Info,
+  parts: Schema.Array(Part),
+})
 export type WithParts = {
   info: Info
   parts: Part[]
@@ -66,7 +74,6 @@ import { errorMessage } from "@/util/error"
 import { isMedia } from "@/util/media"
 import type { SystemError } from "bun"
 import type { Provider } from "@/provider/provider"
-import { Effect, Schema } from "effect"
 import * as EffectLogger from "@opencode-ai/core/effect/logger"
 
 /** Error shape thrown by Bun's fetch() when gzip/br decompression fails mid-stream */

packages/opencode/test/server/httpapi-public-openapi.test.ts

@@ -105,6 +105,15 @@ describe("PublicApi OpenAPI v2 errors", () => {
     }
   })
 
+  test("documents assistant context metadata for generated clients", () => {
+    const spec = OpenApi.fromApi(PublicApi) as OpenApiSpec
+
+    expect(spec.components.schemas.AssistantMessage?.properties).toMatchObject({
+      tool_defs: { type: "string" },
+      system_prompt: { type: "string" },
+    })
+  })
+
   test("preserves required request bodies for v2 mutations", () => {
     const spec = OpenApi.fromApi(PublicApi) as OpenApiSpec