refactor(core): simplify location filesystem (#31545)

packages/core/src/session/event.ts

@@ -1,9 +1,8 @@
 import { Schema } from "effect"
-import { ProviderMetadata } from "@opencode-ai/llm"
+import { ProviderMetadata, ToolContent } from "@opencode-ai/llm"
 import { EventV2 } from "../event"
 import { ModelV2 } from "../model"
 import { NonNegativeInt } from "../schema"
-import { ToolOutput } from "../tool-output"
 import { V2Schema } from "../v2-schema"
 import { FileAttachment, Prompt } from "./prompt"
 import { SessionSchema } from "./schema"
@@ -360,8 +359,8 @@ export namespace Tool {
     ...options,
     schema: {
       ...ToolBase,
-      structured: ToolOutput.Structured,
-      content: Schema.Array(ToolOutput.Content),
+      structured: Schema.Record(Schema.String, Schema.Any),
+      content: Schema.Array(ToolContent),
     },
   })
   export type Progress = typeof Progress.Type
@@ -371,8 +370,8 @@ export namespace Tool {
     ...options,
     schema: {
       ...ToolBase,
-      structured: ToolOutput.Structured,
-      content: Schema.Array(ToolOutput.Content),
+      structured: Schema.Record(Schema.String, Schema.Any),
+      content: Schema.Array(ToolContent),
       outputPaths: Schema.Array(Schema.String).pipe(Schema.optional),
       result: Schema.Unknown.pipe(Schema.optional),
       provider: Schema.Struct({

packages/core/src/session/message.ts

@@ -1,9 +1,8 @@
 export * as SessionMessage from "./message"
 
 import { Schema } from "effect"
-import { ProviderMetadata } from "@opencode-ai/llm"
+import { ProviderMetadata, ToolContent } from "@opencode-ai/llm"
 import { ModelV2 } from "../model"
-import { ToolOutput } from "../tool-output"
 import { V2Schema } from "../v2-schema"
 import { SessionEvent } from "./event"
 import { Prompt } from "./prompt"
@@ -76,25 +75,25 @@ export class ToolStatePending extends Schema.Class<ToolStatePending>("Session.Me
 export class ToolStateRunning extends Schema.Class<ToolStateRunning>("Session.Message.ToolState.Running")({
   status: Schema.Literal("running"),
   input: Schema.Record(Schema.String, Schema.Unknown),
-  structured: ToolOutput.Structured,
-  content: ToolOutput.Content.pipe(Schema.Array),
+  structured: Schema.Record(Schema.String, Schema.Any),
+  content: ToolContent.pipe(Schema.Array),
 }) {}
 
 export class ToolStateCompleted extends Schema.Class<ToolStateCompleted>("Session.Message.ToolState.Completed")({
   status: Schema.Literal("completed"),
   input: Schema.Record(Schema.String, Schema.Unknown),
   attachments: SessionEvent.FileAttachment.pipe(Schema.Array, Schema.optional),
-  content: ToolOutput.Content.pipe(Schema.Array),
+  content: ToolContent.pipe(Schema.Array),
   outputPaths: SessionEvent.Tool.Success.data.fields.outputPaths,
-  structured: ToolOutput.Structured,
+  structured: Schema.Record(Schema.String, Schema.Any),
   result: SessionEvent.Tool.Success.data.fields.result,
 }) {}
 
 export class ToolStateError extends Schema.Class<ToolStateError>("Session.Message.ToolState.Error")({
   status: Schema.Literal("error"),
   input: Schema.Record(Schema.String, Schema.Unknown),
-  content: ToolOutput.Content.pipe(Schema.Array),
-  structured: ToolOutput.Structured,
+  content: ToolContent.pipe(Schema.Array),
+  structured: Schema.Record(Schema.String, Schema.Any),
   error: SessionEvent.UnknownError,
   result: SessionEvent.Tool.Failed.data.fields.result,
 }) {}

packages/core/src/session/runner/publish-llm-event.ts

@@ -1,8 +1,7 @@
 import {
-  ToolOutput as LLMToolOutput,
+  ToolOutput,
   type LLMEvent,
   type ProviderMetadata,
-  type ToolOutput as LLMToolOutputType,
   type ToolResultValue,
   type Usage,
 } from "@opencode-ai/llm"
@@ -45,13 +44,13 @@ const message = (value: unknown) => {
   }
 }
 
-type ToolOutput =
-  | { readonly structured: Record<string, unknown>; readonly content: LLMToolOutputType["content"] }
+type SettledOutput =
+  | { readonly structured: Record<string, unknown>; readonly content: ToolOutput["content"] }
   | { readonly error: { readonly type: "unknown"; readonly message: string } }
 
-const settledOutput = (value: LLMToolOutputType | undefined, result: ToolResultValue): ToolOutput => {
+const settledOutput = (value: ToolOutput | undefined, result: ToolResultValue): SettledOutput => {
   if (result.type === "error") return { error: { type: "unknown", message: message(result.value) } }
-  const settled = value ?? LLMToolOutput.fromResultValue(result)
+  const settled = value ?? ToolOutput.fromResultValue(result)
   if (!settled) throw new Error(`Unsupported tool result: ${message(result)}`)
   return { structured: record(settled.structured), content: settled.content }
 }

packages/core/src/session/runner/to-llm-message.ts

@@ -38,9 +38,8 @@ const toolCall = (tool: SessionMessage.AssistantTool, providerMetadata: Provider
 
 const toolResult = (tool: SessionMessage.AssistantTool, providerMetadata: ProviderMetadata | undefined) => {
   if (tool.state.status === "completed") {
-    // TODO: Materialize remote URL and managed file sources before provider-history lowering.
-    // ToolOutput.toResultValue intentionally rejects unmaterialized sources rather than
-    // guessing whether a provider can fetch them or leaking host-local resource paths.
+    // TODO: Materialize remote and managed URIs before provider-history lowering.
+    // ToolOutput.toResultValue rejects unresolved URIs rather than treating them as media bytes.
     const result =
       tool.provider?.executed === true && tool.state.result !== undefined
         ? tool.state.result