11import type { AssetResource } from "@t3tools/contracts" ;
22import {
33 AssetAttachmentNotFoundError ,
4+ PROVIDER_SEND_TURN_MAX_IMAGE_BYTES ,
45 AssetGitHubMediaUrlValidationError ,
56 AssetPreviewTypeValidationError ,
67 AssetProjectFaviconInspectionError ,
@@ -13,7 +14,9 @@ import {
1314 AssetWorkspacePathValidationError ,
1415 AssetWorkspaceResolutionError ,
1516 AssetWorkspaceRootNormalizationError ,
17+ ThreadId ,
1618 ToolActivityNativeAppReference ,
19+ TurnItemId ,
1720} from "@t3tools/contracts" ;
1821import {
1922 audioMimeTypeFromExtension ,
@@ -30,6 +33,7 @@ import {
3033} from "@t3tools/shared/imageDimensions" ;
3134import { githubMediaFetchUrl , githubMediaFileName } from "@t3tools/shared/githubMedia" ;
3235import { PROJECT_FAVICON_FALLBACK_MARKER } from "@t3tools/shared/projectFavicon" ;
36+ import { toolOutputImages } from "@t3tools/shared/toolOutput" ;
3337import * as Clock from "effect/Clock" ;
3438import * as Crypto from "effect/Crypto" ;
3539import * as Effect from "effect/Effect" ;
@@ -49,6 +53,7 @@ import {
4953import * as ServerSecretStore from "../auth/ServerSecretStore.ts" ;
5054import { parseAttachmentFileExtension , resolveAttachmentPathById } from "../attachmentStore.ts" ;
5155import * as ServerConfig from "../config.ts" ;
56+ import * as Orchestrator from "../orchestration-v2/Orchestrator.ts" ;
5257import { expandHomePathWith } from "../pathExpansion.ts" ;
5358import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts" ;
5459import * as WorkspacePaths from "../workspace/WorkspacePaths.ts" ;
@@ -138,6 +143,14 @@ const AssetClaimsSchema = Schema.Union([
138143 app : ToolActivityNativeAppReference ,
139144 expiresAt : Schema . Number ,
140145 } ) ,
146+ Schema . Struct ( {
147+ version : Schema . Literal ( 1 ) ,
148+ kind : Schema . Literal ( "tool-output-image" ) ,
149+ threadId : ThreadId ,
150+ itemId : TurnItemId ,
151+ index : Schema . Number ,
152+ expiresAt : Schema . Number ,
153+ } ) ,
141154 Schema . Struct ( {
142155 version : Schema . Literal ( 1 ) ,
143156 kind : Schema . Literal ( "github-media" ) ,
@@ -162,6 +175,11 @@ export type ResolvedAsset =
162175 readonly mimeType ?: string ;
163176 readonly file ?: OpenMediaFile ;
164177 }
178+ | {
179+ readonly kind : "bytes" ;
180+ readonly bytes : Uint8Array ;
181+ readonly mimeType : string ;
182+ }
165183 | {
166184 readonly kind : "github-media" ;
167185 readonly url : string ;
@@ -198,6 +216,27 @@ const optionOnNotFound = <A, R>(
198216 } ) ,
199217 ) ;
200218
219+ // The largest image a provider turn accepts, as base64 (4 characters per 3 bytes).
220+ const MAX_TOOL_OUTPUT_IMAGE_BASE64_LENGTH = Math . ceil ( PROVIDER_SEND_TURN_MAX_IMAGE_BYTES / 3 ) * 4 ;
221+
222+ /**
223+ * Decodes one image a tool returned inline; null when the stored item has no
224+ * such image, or it is larger than a provider turn accepts.
225+ */
226+ const readToolOutputImage = Effect . fn ( "AssetAccess.readToolOutputImage" ) ( function * ( input : {
227+ readonly threadId : ThreadId ;
228+ readonly itemId : TurnItemId ;
229+ readonly index : number ;
230+ } ) {
231+ const orchestrator = yield * Orchestrator . OrchestratorV2 ;
232+ const item = yield * orchestrator . getTurnItem ( input ) ;
233+ const image =
234+ item ?. type === "dynamic_tool" ? toolOutputImages ( item . output ) [ input . index ] : undefined ;
235+ return image ?. data === undefined || image . data . length > MAX_TOOL_OUTPUT_IMAGE_BASE64_LENGTH
236+ ? null
237+ : { mimeType : image . mimeType , bytes : Buffer . from ( image . data , "base64" ) } ;
238+ } ) ;
239+
201240const resolveCanonicalFile = Effect . fn ( "AssetAccess.resolveCanonicalFile" ) ( function * (
202241 filePath : string ,
203242) {
@@ -672,6 +711,28 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
672711 }
673712 break ;
674713 }
714+ case "tool-output-image" : {
715+ const image = yield * readToolOutputImage ( input . resource ) . pipe (
716+ Effect . mapError (
717+ ( cause ) => new AssetWorkspaceAssetInspectionError ( { resource : input . resource , cause } ) ,
718+ ) ,
719+ ) ;
720+ if ( image === null ) {
721+ return yield * new AssetWorkspaceAssetNotFoundError ( { resource : input . resource } ) ;
722+ }
723+ claims = {
724+ version : 1 ,
725+ kind : "tool-output-image" ,
726+ threadId : input . resource . threadId ,
727+ itemId : input . resource . itemId ,
728+ index : input . resource . index ,
729+ expiresAt,
730+ } ;
731+ // The allowed types are all `image/<extension>`.
732+ fileName = `image-${ input . resource . index + 1 } .${ image . mimeType . slice ( "image/" . length ) } ` ;
733+ imageDimensions = readImageDimensions ( image . bytes ) ;
734+ break ;
735+ }
675736 case "native-app-icon" : {
676737 claims = {
677738 version : 1 ,
@@ -806,6 +867,20 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
806867 } satisfies ResolvedAsset ;
807868 }
808869
870+ if ( claims . kind === "tool-output-image" ) {
871+ const image = yield * readToolOutputImage ( claims ) . pipe (
872+ Effect . tapError ( ( cause ) =>
873+ Effect . logError ( "Failed to read tool output image." , {
874+ threadId : claims . threadId ,
875+ itemId : claims . itemId ,
876+ cause,
877+ } ) ,
878+ ) ,
879+ Effect . orElseSucceed ( ( ) => null ) ,
880+ ) ;
881+ return image ? ( { kind : "bytes" , ...image } satisfies ResolvedAsset ) : null ;
882+ }
883+
809884 if ( claims . kind === "native-app-icon" ) {
810885 const nativeAppIconResolver = yield * NativeAppIconResolver . NativeAppIconResolver ;
811886 const iconPath = yield * nativeAppIconResolver . resolve ( claims . app ) ;
0 commit comments