From 02161dd2a65a4f108673f08e36d88207e79a436b Mon Sep 17 00:00:00 2001
From: DoSun <dosun9588@gmail.com>
Date: Fri, 8 May 2026 18:59:00 +0800
Subject: [PATCH] fix: pass dynamic provider_id from initData instead of
 hardcoding

- Add _providerId field to SessionHandle, extracted from initData.account.apiProvider
- Include provider_id in user message emit, assistant message fallback, and session.ready
- Revert getProviderId normalization (keep raw value from subprocess)
---
 src/server/routes/provider.ts | 4 +---
 src/server/sessionHandle.ts   | 9 +++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/server/routes/provider.ts b/src/server/routes/provider.ts
index 52067c1b1..e1543441d 100644
--- a/src/server/routes/provider.ts
+++ b/src/server/routes/provider.ts
@@ -20,9 +20,7 @@ function getModels(initData: InitData | null): ModelInfo[] {
 }
 
 function getProviderId(initData: InitData | null): string {
-  const p = initData?.account?.apiProvider
-  if (!p || p === 'firstParty') return 'anthropic'
-  return p
+  return initData?.account?.apiProvider ?? 'anthropic'
 }
 
 function getProviderName(initData: InitData | null): string {
diff --git a/src/server/sessionHandle.ts b/src/server/sessionHandle.ts
index 687067a34..93749dbf0 100644
--- a/src/server/sessionHandle.ts
+++ b/src/server/sessionHandle.ts
@@ -117,6 +117,7 @@ export class SessionHandle {
   private child: ChildProcess | null = null
   private _status: SessionState = 'starting'
   private _model?: string
+  private _providerId?: string
   private _permissionMode?: string
   private _title?: string
   private _costUsd = 0
@@ -411,6 +412,9 @@ export class SessionHandle {
           const first = (initData.models as Array<Record<string, string>>)[0]
           this._model = first?.value ?? first?.name
         }
+        if (initData.account?.apiProvider) {
+          this._providerId = initData.account.apiProvider
+        }
         this._status = 'running'
         this.lastActiveAt = Date.now()
         const resolve = this.initResolve
@@ -420,6 +424,7 @@ export class SessionHandle {
         this.emitEvent('ready', {
           status: 'running',
           model: this._model,
+          provider_id: this._providerId,
         })
         this.opts.onInit?.(initData)
         return
@@ -454,6 +459,9 @@ export class SessionHandle {
         if (!msg.model && this._model) {
           msg = { ...msg, model: this._model }
         }
+        if (!msg.provider_id && this._providerId) {
+          msg = { ...msg, provider_id: this._providerId }
+        }
         this.emitEvent('message', msg)
         break
       }
@@ -606,6 +614,7 @@ export class SessionHandle {
       content,
       session_id: this.sessionId,
       model: this._model ?? '',
+      provider_id: this._providerId ?? '',
     })
 
     this.writeStdin(userMsg)