prism-php · sixlive · Dec 29, 2025 · Dec 29, 2025
diff --git a/src/Providers/Anthropic/Handlers/Stream.php b/src/Providers/Anthropic/Handlers/Stream.php
@@ -83,10 +83,13 @@ protected function processStream(Response $response, Request $request, int $dept
             }
         }
 
-        // Handle tool calls if present
         if ($this->state->hasToolCalls()) {
             yield from $this->handleToolCalls($request, $depth);
+
+            return;
         }
+
+        yield $this->emitStreamEndEvent();
     }
 
     /**
@@ -116,10 +119,9 @@ protected function handleMessageStart(array $event): StreamStartEvent
         $message = $event['message'] ?? [];
         $this->state->withMessageId($message['id'] ?? EventID::generate());
 
-        // Capture initial usage data
         $usageData = $message['usage'] ?? [];
         if (! empty($usageData)) {
-            $this->state->withUsage(new Usage(
+            $this->state->addUsage(new Usage(
                 promptTokens: $usageData['input_tokens'] ?? 0,
                 completionTokens: $usageData['output_tokens'] ?? 0,
                 cacheWriteInputTokens: $usageData['cache_creation_input_tokens'] ?? null,
@@ -230,12 +232,21 @@ protected function handleMessageDelta(array $event): null
     /**
      * @param  array<string, mixed>  $event
      */
-    protected function handleMessageStop(array $event): StreamEndEvent
+    protected function handleMessageStop(array $event): ?StreamEndEvent
+    {
+        if (! $this->state->finishReason() instanceof \Prism\Prism\Enums\FinishReason) {
+            $this->state->withFinishReason(FinishReason::Stop);
+        }
+
+        return null;
+    }
+
+    protected function emitStreamEndEvent(): StreamEndEvent
     {
         return new StreamEndEvent(
             id: EventID::generate(),
             timestamp: time(),
-            finishReason: FinishReason::Stop, // Default, will be updated by message_delta
+            finishReason: $this->state->finishReason() ?? FinishReason::Stop,
             usage: $this->state->usage(),
             citations: $this->state->citations() !== [] ? $this->state->citations() : null,
             additionalContent: [

diff --git a/src/Providers/DeepSeek/Handlers/Stream.php b/src/Providers/DeepSeek/Handlers/Stream.php
@@ -198,20 +198,27 @@ protected function processStream(Response $response, Request $request, int $dept
                     );
                 }
 
-                $usage = $this->extractUsage($data);
+                $this->state->withFinishReason($finishReason);
 
-                yield new StreamEndEvent(
-                    id: EventID::generate(),
-                    timestamp: time(),
-                    finishReason: $finishReason,
-                    usage: $usage
-                );
+                $usage = $this->extractUsage($data);
+                if ($usage instanceof \Prism\Prism\ValueObjects\Usage) {
+                    $this->state->addUsage($usage);
+                }
             }
         }
 
         if ($toolCalls !== []) {
             yield from $this->handleToolCalls($request, $text, $toolCalls, $depth);
+
+            return;
         }
+
+        yield new StreamEndEvent(
+            id: EventID::generate(),
+            timestamp: time(),
+            finishReason: $this->state->finishReason() ?? FinishReason::Stop,
+            usage: $this->state->usage()
+        );
     }
 
     /**

diff --git a/src/Providers/Gemini/Handlers/Stream.php b/src/Providers/Gemini/Handlers/Stream.php
@@ -183,11 +183,9 @@ protected function processStream(Response $response, Request $request, int $dept
                 }
             }
 
-            // Handle completion
             $finishReason = $this->mapFinishReason($data);
 
             if ($finishReason !== FinishReason::Unknown) {
-                // Emit thinking complete if we had thinking
                 if ($this->state->reasoningId() !== '') {
                     yield new ThinkingCompleteEvent(
                         id: EventID::generate(),
@@ -196,7 +194,6 @@ protected function processStream(Response $response, Request $request, int $dept
                     );
                 }
 
-                // Emit text complete if we had text
                 if ($this->state->hasTextStarted()) {
                     yield new TextCompleteEvent(
                         id: EventID::generate(),
@@ -205,27 +202,29 @@ protected function processStream(Response $response, Request $request, int $dept
                     );
                 }
 
-                // Extract grounding metadata if available
-                $groundingMetadata = $this->extractGroundingMetadata($data);
-
-                // Emit stream end event
-                yield new StreamEndEvent(
-                    id: EventID::generate(),
-                    timestamp: time(),
-                    finishReason: $finishReason,
-                    usage: $this->state->usage(),
-                    additionalContent: Arr::whereNotNull([
-                        'grounding_metadata' => $groundingMetadata,
-                        'thoughtSummaries' => $this->state->thinkingSummaries() === [] ? null : $this->state->thinkingSummaries(),
-                    ])
-                );
+                $this->state->withFinishReason($finishReason);
+                $this->state->withMetadata([
+                    'grounding_metadata' => $this->extractGroundingMetadata($data),
+                ]);
             }
         }
 
-        // Handle tool calls if present and not already handled
-        if ($this->state->hasToolCalls() && $this->mapFinishReason([]) === FinishReason::Unknown) {
+        if ($this->state->hasToolCalls()) {
             yield from $this->handleToolCalls($request, $depth);
+
+            return;
         }
+
+        yield new StreamEndEvent(
+            id: EventID::generate(),
+            timestamp: time(),
+            finishReason: $this->state->finishReason() ?? FinishReason::Stop,
+            usage: $this->state->usage(),
+            additionalContent: Arr::whereNotNull([
+                'grounding_metadata' => $this->state->metadata()['grounding_metadata'] ?? null,
+                'thoughtSummaries' => $this->state->thinkingSummaries() === [] ? null : $this->state->thinkingSummaries(),
+            ])
+        );
     }
 
     /**
@@ -333,16 +332,26 @@ protected function handleToolCalls(
             }
         }
 
-        // Add messages for next turn and continue streaming
         if ($toolResults !== []) {
             $request->addMessage(new AssistantMessage($this->state->currentText(), $mappedToolCalls));
             $request->addMessage(new ToolResultMessage($toolResults));
 
             $depth++;
             if ($depth < $request->maxSteps()) {
+                $previousUsage = $this->state->usage();
                 $this->state->reset();
                 $nextResponse = $this->sendRequest($request);
                 yield from $this->processStream($nextResponse, $request, $depth);
+
+                if ($previousUsage instanceof \Prism\Prism\ValueObjects\Usage && $this->state->usage() instanceof \Prism\Prism\ValueObjects\Usage) {
+                    $this->state->withUsage(new Usage(
+                        promptTokens: $previousUsage->promptTokens + $this->state->usage()->promptTokens,
+                        completionTokens: $previousUsage->completionTokens + $this->state->usage()->completionTokens,
+                        cacheWriteInputTokens: ($previousUsage->cacheWriteInputTokens ?? 0) + ($this->state->usage()->cacheWriteInputTokens ?? 0),
+                        cacheReadInputTokens: ($previousUsage->cacheReadInputTokens ?? 0) + ($this->state->usage()->cacheReadInputTokens ?? 0),
+                        thoughtTokens: ($previousUsage->thoughtTokens ?? 0) + ($this->state->usage()->thoughtTokens ?? 0)
+                    ));
+                }
             }
         }
     }

diff --git a/src/Providers/Groq/Handlers/Stream.php b/src/Providers/Groq/Handlers/Stream.php
@@ -150,7 +150,6 @@ protected function processStream(Response $response, Request $request, int $dept
             if ($rawFinishReason !== null) {
                 $finishReason = $this->mapFinishReason($data);
 
-                // Complete text if we have any
                 if ($this->state->hasTextStarted() && $text !== '') {
                     yield new TextCompleteEvent(
                         id: EventID::generate(),
@@ -159,17 +158,21 @@ protected function processStream(Response $response, Request $request, int $dept
                     );
                 }
 
-                // Extract usage information from the final chunk
-                $usage = $this->extractUsage($data);
+                $this->state->withFinishReason($finishReason);
 
-                yield new StreamEndEvent(
-                    id: EventID::generate(),
-                    timestamp: time(),
-                    finishReason: $finishReason,
-                    usage: $usage
-                );
+                $usage = $this->extractUsage($data);
+                if ($usage instanceof \Prism\Prism\ValueObjects\Usage) {
+                    $this->state->addUsage($usage);
+                }
             }
         }
+
+        yield new StreamEndEvent(
+            id: EventID::generate(),
+            timestamp: time(),
+            finishReason: $this->state->finishReason() ?? FinishReason::Stop,
+            usage: $this->state->usage()
+        );
     }
 
     /**

diff --git a/src/Providers/Mistral/Handlers/Stream.php b/src/Providers/Mistral/Handlers/Stream.php
@@ -163,16 +163,21 @@ protected function processStream(Response $response, Request $request, int $dept
                     );
                 }
 
-                $usage = $this->extractUsage($data);
+                $this->state->withFinishReason($finishReason);
 
-                yield new StreamEndEvent(
-                    id: EventID::generate(),
-                    timestamp: time(),
-                    finishReason: $finishReason,
-                    usage: $usage
-                );
+                $usage = $this->extractUsage($data);
+                if ($usage instanceof \Prism\Prism\ValueObjects\Usage) {
+                    $this->state->addUsage($usage);
+                }
             }
         }
+
+        yield new StreamEndEvent(
+            id: EventID::generate(),
+            timestamp: time(),
+            finishReason: $this->state->finishReason() ?? FinishReason::Stop,
+            usage: $this->state->usage()
+        );
     }
 
     /**

diff --git a/src/Providers/Ollama/Handlers/Stream.php b/src/Providers/Ollama/Handlers/Stream.php
@@ -66,7 +66,10 @@ protected function processStream(Response $response, Request $request, int $dept
             throw new PrismException('Maximum tool call chain depth exceeded');
         }
 
-        $this->state->reset();
+        if ($depth === 0) {
+            $this->state->reset();
+        }
+
         $text = '';
 
         while (! $response->getBody()->eof()) {
@@ -280,6 +283,7 @@ protected function handleToolCalls(
         // Continue streaming if within step limit
         $depth++;
         if ($depth < $request->maxSteps()) {
+            $this->state->reset();
             $nextResponse = $this->sendRequest($request);
             yield from $this->processStream($nextResponse, $request, $depth);
         }

diff --git a/src/Providers/Ollama/ValueObjects/OllamaStreamState.php b/src/Providers/Ollama/ValueObjects/OllamaStreamState.php
@@ -39,8 +39,8 @@ public function completionTokens(): int
     public function reset(): self
     {
         parent::reset();
-        $this->promptTokens = 0;
-        $this->completionTokens = 0;
+        // Note: Token counts are intentionally NOT reset here.
+        // They accumulate across tool-call turns to provide total usage.
 
         return $this;
     }

diff --git a/src/Providers/OpenAI/Handlers/Stream.php b/src/Providers/OpenAI/Handlers/Stream.php
@@ -243,27 +243,33 @@ protected function processStream(Response $response, Request $request, int $dept
             }
 
             if (data_get($data, 'type') === 'response.completed') {
-                yield new StreamEndEvent(
-                    id: EventID::generate(),
-                    timestamp: time(),
-                    finishReason: $this->mapFinishReason($data),
-                    usage: new Usage(
-                        promptTokens: data_get($data, 'response.usage.input_tokens'),
-                        completionTokens: data_get($data, 'response.usage.output_tokens'),
-                        cacheReadInputTokens: data_get($data, 'response.usage.input_tokens_details.cached_tokens'),
-                        thoughtTokens: data_get($data, 'response.usage.output_tokens_details.reasoning_tokens')
-                    ),
-                    additionalContent: Arr::whereNotNull([
-                        'response_id' => data_get($data, 'response.id'),
-                        'reasoningSummaries' => $this->state->thinkingSummaries() === [] ? null : $this->state->thinkingSummaries(),
-                    ])
-                );
+                $this->state->withFinishReason($this->mapFinishReason($data));
+                $this->state->addUsage(new Usage(
+                    promptTokens: data_get($data, 'response.usage.input_tokens'),
+                    completionTokens: data_get($data, 'response.usage.output_tokens'),
+                    cacheReadInputTokens: data_get($data, 'response.usage.input_tokens_details.cached_tokens'),
+                    thoughtTokens: data_get($data, 'response.usage.output_tokens_details.reasoning_tokens')
+                ));
+                $this->state->withMetadata(['response_id' => data_get($data, 'response.id')]);
             }
         }
 
         if ($this->state->hasToolCalls()) {
             yield from $this->handleToolCalls($request, $depth);
+
+            return;
         }
+
+        yield new StreamEndEvent(
+            id: EventID::generate(),
+            timestamp: time(),
+            finishReason: $this->state->finishReason() ?? FinishReason::Stop,
+            usage: $this->state->usage() ?? new Usage(0, 0),
+            additionalContent: Arr::whereNotNull([
+                'response_id' => $this->state->metadata()['response_id'] ?? null,
+                'reasoningSummaries' => $this->state->thinkingSummaries() === [] ? null : $this->state->thinkingSummaries(),
+            ])
+        );
     }
 
     /**

diff --git a/src/Providers/OpenRouter/Handlers/Stream.php b/src/Providers/OpenRouter/Handlers/Stream.php
@@ -215,16 +215,21 @@ protected function processStream(Response $response, Request $request, int $dept
                     );
                 }
 
-                $usage = $this->extractUsage($data);
+                $this->state->withFinishReason($finishReason);
 
-                yield new StreamEndEvent(
-                    id: EventID::generate(),
-                    timestamp: time(),
-                    finishReason: $finishReason,
-                    usage: $usage
-                );
+                $usage = $this->extractUsage($data);
+                if ($usage instanceof \Prism\Prism\ValueObjects\Usage) {
+                    $this->state->addUsage($usage);
+                }
             }
         }
+
+        yield new StreamEndEvent(
+            id: EventID::generate(),
+            timestamp: time(),
+            finishReason: $this->state->finishReason() ?? FinishReason::Stop,
+            usage: $this->state->usage()
+        );
     }
 
     /**

diff --git a/src/Providers/XAI/Handlers/Stream.php b/src/Providers/XAI/Handlers/Stream.php
@@ -165,7 +165,14 @@ protected function processStream(Response $response, Request $request, int $dept
             $rawFinishReason = data_get($data, 'choices.0.finish_reason');
             if ($rawFinishReason !== null) {
                 $finishReason = $this->extractFinishReason($data);
+                if ($finishReason instanceof \Prism\Prism\Enums\FinishReason) {
+                    $this->state->withFinishReason($finishReason);
+                }
+
                 $usage = $this->extractUsage($data);
+                if ($usage instanceof \Prism\Prism\ValueObjects\Usage) {
+                    $this->state->addUsage($usage);
+                }
             }
         }
 
@@ -194,8 +201,8 @@ protected function processStream(Response $response, Request $request, int $dept
         yield new StreamEndEvent(
             id: EventID::generate(),
             timestamp: time(),
-            finishReason: $finishReason ?? FinishReason::Stop,
-            usage: $usage
+            finishReason: $this->state->finishReason() ?? FinishReason::Stop,
+            usage: $this->state->usage()
         );
     }