nolo-cli 0.148.0-alpha.1 → 0.151.0-alpha.2

package/{streamAgentChatTurn-GYGMYOSM.js → streamAgentChatTurn-MN2SSPGA.js}

@@ -1,6 +1,9 @@
 import {
-  applyModelLayerOverride
-} from "./chunk-LTRXGFMS.js";
+  applyPublicAgentCatalogOverride
+} from "./chunk-XRUSXPCQ.js";
+import {
+  buildCliPrompt
+} from "./chunk-ATNTHIZI.js";
 import {
   applyImageConfigRuntimeOverride,
   buildDynamicContexts,
@@ -15,11 +18,8 @@ import {
   resolveTurnToolContext,
   trimMessagesWithSummary,
   validateAccessAndBalance
-} from "./chunk-HUFPWXFW.js";
-import "./chunk-O2OWEFII.js";
-import {
-  buildCliPrompt
-} from "./chunk-ATNTHIZI.js";
+} from "./chunk-T6X3D7NB.js";
+import "./chunk-KFHQQ3NO.js";
 import {
   filterAndCleanMessages,
   handleToolCalls,
@@ -27,15 +27,11 @@ import {
   readStreamChunk,
   sendOpenAICompletionsRequest,
   updateTotalUsage
-} from "./chunk-DIXLJWCD.js";
+} from "./chunk-PCKVQXYV.js";
 import "./chunk-JEXVIMYZ.js";
 import {
   prepareTools
-} from "./chunk-DCFPQW22.js";
-import {
-  isContextOverflowText,
-  parseApiError
-} from "./chunk-OCZKATRC.js";
+} from "./chunk-Z7OJUX6S.js";
 import {
   INVALID_TOOL_ARGS_REPLACEMENT,
   buildInvalidToolCallSelfHealResult,
@@ -48,40 +44,51 @@ import {
   sanitizeOutboundResponsesInput,
   selectResponsesConversationState,
   updateResponsesConversationState
-} from "./chunk-P4BX6FFU.js";
-import "./chunk-EOARMOVD.js";
+} from "./chunk-AOCM7HPT.js";
+import "./chunk-W4S6OTSC.js";
 import "./chunk-HS7MLR74.js";
+import "./chunk-Y2DXOPSO.js";
+import {
+  isOwnedAgentRecord,
+  resolveBillingSource
+} from "./chunk-JKMLSTZK.js";
+import "./chunk-I2ZMGXXF.js";
+import "./chunk-OXME3PEE.js";
 import {
+  isContextOverflowText,
+  parseApiError,
   performServerProxyFetchWithRetry
-} from "./chunk-T767MPHB.js";
-import "./chunk-2JMMBU6V.js";
-import "./chunk-DY7ANLKG.js";
-import "./chunk-5UTFL4QJ.js";
-import "./chunk-KQHGZWSV.js";
+} from "./chunk-SMENBO3M.js";
 import {
   createSSEParser,
+  selectMaxExecutionTime,
   waitForAbortableDelay
-} from "./chunk-BKWMNZ2X.js";
+} from "./chunk-ES633ZS5.js";
 import "./chunk-NF64D32W.js";
-import "./chunk-3L2WKC3W.js";
-import "./chunk-4JMDLJAD.js";
-import "./chunk-PCVVZ2MH.js";
-import "./chunk-CPUFH46E.js";
-import "./chunk-YRRASA5Q.js";
+import "./chunk-XPWGOTBQ.js";
+import "./chunk-ZIWPQEFU.js";
+import "./chunk-CBHGZRCE.js";
+import "./chunk-SCMHQUMK.js";
+import "./chunk-RSHPU4PD.js";
+import {
+  getPublicImageAgentDefaultProfile,
+  getPublicImageAgentMode
+} from "./chunk-VIDPVFP3.js";
+import "./chunk-5MM7NNO6.js";
+import "./chunk-IA7TRNNR.js";
+import "./chunk-AGIM7IMJ.js";
 import "./chunk-63W5N6P3.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-T7F46O36.js";
-import "./chunk-6FGTMQCL.js";
-import "./chunk-XPRWFQQK.js";
-import "./chunk-UQNS32WZ.js";
-import "./chunk-MEYIRKDN.js";
-import "./chunk-QU5A4LYX.js";
-import {
-  getCurrentSpaceId
-} from "./chunk-ZJ7UHBJS.js";
+import "./chunk-GQN2WLAI.js";
+import "./chunk-ILU2NPWY.js";
+import "./chunk-SSFDFOVT.js";
+import "./chunk-F32Z66T4.js";
+import "./chunk-EYWJT7A2.js";
+import "./chunk-ZKZ5X2HS.js";
 import {
   addToolMessage,
   addUserMessage,
+  applyBuiltinAgentRuntimeOverride,
   estimateMissingUsage,
   finalizeTransientMessageOnError,
   messageStreamEnd,
@@ -92,21 +99,27 @@ import {
   selectAllMsgs,
   selectCurrentDialogConfig,
   selectDialogConfigByKey,
-  shouldBlockForGptPro,
   updateTokens,
   updateToolMessage
-} from "./chunk-42Z3EMC4.js";
+} from "./chunk-556RW72X.js";
 import "./chunk-523DITKR.js";
-import "./chunk-YYLHWIW6.js";
-import "./chunk-6O4IK4V2.js";
-import "./chunk-LPVCRQMM.js";
+import {
+  isOAuthApiKeyRef
+} from "./chunk-UKZX3NHN.js";
+import "./chunk-OFFL4DCR.js";
+import "./chunk-QYPE3TS3.js";
+import "./chunk-IZ7OJB6K.js";
+import "./chunk-4JH2UMJR.js";
+import {
+  getCurrentSpaceId
+} from "./chunk-ZJ7UHBJS.js";
+import "./chunk-BYXBJQAS.js";
 import {
   createCliChatTurnStream,
   getCliChatSession,
   startCliChatSession
-} from "./chunk-Z4CSIXYP.js";
+} from "./chunk-PLSVXHSA.js";
 import "./chunk-5RGU3J7P.js";
-import "./chunk-M76ECQRD.js";
 import {
   addActiveController,
   claimDialogTurnPhase,
@@ -118,128 +131,139 @@ import {
   selectPendingUserInputQueue,
   setDialogTurnPhase,
   tokenUsageLiveUpdate
-} from "./chunk-B6SAMB33.js";
+} from "./chunk-OWYYDMGJ.js";
+import "./chunk-ZRAU6T47.js";
+import "./chunk-4LCOCOR5.js";
 import "./chunk-YDH3FDFQ.js";
-import "./chunk-MX574M24.js";
-import "./chunk-4DPP773Q.js";
 import {
-  getPublicImageAgentDefaultProfile,
-  getPublicImageAgentMode
-} from "./chunk-VIDPVFP3.js";
-import "./chunk-AGGIDPCZ.js";
-import "./chunk-CU3QB4HW.js";
-import "./chunk-B2XUQXQX.js";
-import "./chunk-6TPOEJMQ.js";
-import "./chunk-AUDNYVRC.js";
-import "./chunk-KHCLMKZZ.js";
+  selectCurrentServer
+} from "./chunk-QFEW2ULV.js";
+import "./chunk-XI7DGLUK.js";
+import "./chunk-EDX5XSJM.js";
+import "./chunk-UAD2WT54.js";
+import {
+  patch,
+  read,
+  selectById,
+  write
+} from "./chunk-74RAWNQN.js";
+import "./chunk-3PVYUPXK.js";
+import "./chunk-A4MW3YZL.js";
+import "./chunk-AIZE5TDM.js";
+import {
+  selectRuntimeCurrentServer
+} from "./chunk-4YRTZIVN.js";
+import "./chunk-UEILX4EV.js";
+import "./chunk-IJERIUXS.js";
+import {
+  getIsDesktopApp
+} from "./chunk-6Q7UTJKR.js";
+import "./chunk-QQ56R7KS.js";
+import "./chunk-OW765XBU.js";
+import {
+  selectIdentityToken,
+  selectIdentityUser,
+  selectIdentityUserId
+} from "./chunk-SEJ5OS6F.js";
+import "./chunk-D2MDMY2M.js";
+import "./chunk-HIQ4GF53.js";
+import "./chunk-JZX2XLKC.js";
+import "./chunk-EUGTFFO6.js";
+import "./chunk-XETG4RIX.js";
+import "./chunk-GKXCHNTE.js";
 import {
   assertDesktopAgentRuntimeTurnBodyHasNoRawSecrets,
   buildDesktopAgentRuntimeAgentConfigSnapshot,
   buildDesktopAgentRuntimeDialogHistorySnapshot,
   resolveAgentContextWindow,
   stripImagePartsForTextOnlyAgent
-} from "./chunk-OHOVNO7I.js";
+} from "./chunk-UOKFKFPO.js";
 import "./chunk-5ZUL4CUO.js";
-import "./chunk-CQ3WA2NE.js";
-import "./chunk-PQWU42UQ.js";
-import "./chunk-N7J63Q6C.js";
-import "./chunk-K2CSUCHJ.js";
+import "./chunk-GCKHQECX.js";
+import {
+  projectUserPartForModel
+} from "./chunk-G6OOUQWJ.js";
+import "./chunk-56GBUMO5.js";
+import "./chunk-WJZOQR2J.js";
+import "./chunk-WD4XYDYC.js";
 import {
   extractImagePartsFromResponseOutput,
   extractTextFromResponseOutput,
   toResponsesTools
-} from "./chunk-PUOC4YRO.js";
+} from "./chunk-3SZA4U64.js";
 import {
   resolveRuntimeToolSurfaceForAgent
-} from "./chunk-RGNEEJ3Y.js";
-import "./chunk-H6A6X4EK.js";
-import "./chunk-S5XGT6GB.js";
-import "./chunk-27ONFIEY.js";
+} from "./chunk-QLQ573SU.js";
+import "./chunk-3MZAGMYY.js";
+import "./chunk-6CCFTVBP.js";
 import {
   getModelInfo
-} from "./chunk-AKG5W4LG.js";
-import "./chunk-RYZINGPM.js";
-import {
-  estimateTokenCount
-} from "./chunk-PSCNXBYA.js";
-import "./chunk-L36OWPP3.js";
-import "./chunk-BYXBJQAS.js";
+} from "./chunk-BPMPOFWP.js";
+import "./chunk-5MMAK75Q.js";
 import "./chunk-DWLEOOGR.js";
-import {
-  isOpenAiResponsesModel
-} from "./chunk-7KVZ5LDQ.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
-import {
-  getApiEndpoint
-} from "./chunk-3BXNTXYI.js";
-import "./chunk-W7XHHYWM.js";
-import "./chunk-RSEEDUMS.js";
-import "./chunk-UAD2WT54.js";
-import "./chunk-ZWQUWF6W.js";
-import "./chunk-HDLLCBRF.js";
-import "./chunk-4VJAC32I.js";
-import "./chunk-XUWRURDF.js";
-import "./chunk-5J3PYNUP.js";
-import "./chunk-CYSYR67N.js";
-import "./chunk-Y3PMXGLH.js";
-import {
-  selectCurrentServer,
-  selectMaxExecutionTime
-} from "./chunk-SONWNI3L.js";
-import "./chunk-Y5GCAMGP.js";
-import "./chunk-QDSINZM3.js";
+import "./chunk-LIQJTQRN.js";
+import "./chunk-UHTDNB5Y.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
 import {
-  patch,
-  read,
-  selectById,
-  write
-} from "./chunk-HYZIYH2H.js";
-import "./chunk-7CHC4W22.js";
+  isAbortError
+} from "./chunk-7DPNBQSV.js";
+import "./chunk-5EBLANFT.js";
+import "./chunk-NYYFIKHI.js";
+import {
+  isSystemBuiltinTrustedAgentKey
+} from "./chunk-EZVK3N5L.js";
+import {
+  extractCustomId
+} from "./chunk-M2EJHDJP.js";
 import {
   createDialogMessageKeyAndId,
   dialogMessageKey
-} from "./chunk-3AH7LNUB.js";
+} from "./chunk-5EMSBTQ6.js";
+import "./chunk-I42VC5KR.js";
+import "./chunk-U6VC4MU4.js";
+import "./chunk-TYYRSFBG.js";
+import {
+  isAntigravityOAuthAgent
+} from "./chunk-XZNCX52W.js";
 import "./chunk-WWC7I6TA.js";
-import "./chunk-QSJ3HFEF.js";
-import "./chunk-IAESIMK7.js";
+import "./chunk-PJNFNEJE.js";
 import {
-  selectRuntimeCurrentServer
-} from "./chunk-WIWM4FE3.js";
+  estimateTokenCount
+} from "./chunk-PSCNXBYA.js";
+import "./chunk-K2AER7RX.js";
 import {
-  getIsDesktopApp,
-  isAbortError
-} from "./chunk-QOKAKDPE.js";
+  isOpenAiResponsesModel
+} from "./chunk-UBUH2TCC.js";
 import {
-  selectIdentityToken,
-  selectIdentityUser,
-  selectIdentityUserId
-} from "./chunk-SEJ5OS6F.js";
-import "./chunk-OW765XBU.js";
-import "./chunk-GBRG75BQ.js";
+  getApiEndpoint
+} from "./chunk-I4SN4NUQ.js";
+import "./chunk-5BHQICF2.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
-import {
-  isSystemBuiltinTrustedAgentKey
-} from "./chunk-BNGW5ASC.js";
-import {
-  extractCustomId
-} from "./chunk-M2EJHDJP.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
-import "./chunk-U6VC4MU4.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import "./chunk-LCBAMY2M.js";
 import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
+import "./chunk-RVWMAFIT.js";
+import "./chunk-CHCS6XPJ.js";
+import {
+  asTrimmedLowercaseString
+} from "./chunk-QSJ3HFEF.js";
+import "./chunk-ZWQUWF6W.js";
+import "./chunk-KHCLMKZZ.js";
+import "./chunk-VEA7H5FG.js";
+import "./chunk-4VJAC32I.js";
 import "./chunk-4VNS5WPM.js";
 
 // packages/ai/agent/isVoiceModel.ts
@@ -320,6 +344,15 @@ function runChatQueueTurnEnd(payload) {
   };
 }
 
+// packages/agent-runtime/platformAgentCatalogOverrides.ts
+function applyPlatformAgentOverrides(record, agentKey) {
+  if (!record || typeof record !== "object") return record;
+  const raw = record;
+  const effectiveKey = agentKey ?? (typeof raw.dbKey === "string" ? raw.dbKey : void 0) ?? (typeof raw.key === "string" ? raw.key : void 0) ?? (typeof raw.id === "string" ? raw.id : void 0);
+  const builtinApplied = effectiveKey ? applyBuiltinAgentRuntimeOverride(effectiveKey, record) : record;
+  return applyPublicAgentCatalogOverride(builtinApplied, effectiveKey);
+}
+
 // packages/ai/chat/streamRetry.ts
 var MAX_INITIAL_STREAM_RETRIES = 3;
 var DEFAULT_INITIAL_STREAM_RETRY_AFTER_MS = 1500;
@@ -616,6 +649,7 @@ var sendOpenAIResponseRequest = async ({
         const toolMessage = {
           id: runningToolMessageId,
           dbKey: runningToolDbKey,
+          dialogId,
           role: "tool",
           content: selfHealContent,
           toolCallId: callId,
@@ -698,13 +732,22 @@ var sendOpenAIResponseRequest = async ({
     const functionTools = getModelInfo(agentConfig.model)?.hasImageOutput ? [] : prepareTools(agentConfig.tools ?? [], { provider: agentConfig.provider });
     const imageMode = getPublicImageAgentMode(agentConfig);
     const imageProfile = imageMode === "continuous" ? getPublicImageAgentDefaultProfile("continuous") : null;
+    const imageGenerationModel = asOptionalTrimmedString(
+      agentConfig?.imageModel
+    );
     const tools = [
       ...toResponsesTools(functionTools) ?? [],
-      ...shouldEnableBuiltInImageGeneration(agentConfig) ? [{ type: "image_generation" }] : [],
+      ...shouldEnableBuiltInImageGeneration(agentConfig) ? [
+        {
+          type: "image_generation",
+          ...imageGenerationModel ? { model: imageGenerationModel } : {}
+        }
+      ] : [],
       ...imageMode === "continuous" ? [
         {
           type: "image_generation",
           action: "auto",
+          ...imageGenerationModel ? { model: imageGenerationModel } : {},
           quality: imageProfile?.quality,
           output_format: imageProfile?.outputFormat
         }
@@ -1088,18 +1131,93 @@ var buildAgentViewMessages = (allMessages, currentAgentKey) => {
   return result;
 };
 
-// packages/ai/agent/quickChatModelOverride.ts
-function applyQuickChatModelOverride(base, override) {
-  return applyModelLayerOverride(
-    base,
-    override
-  );
+// packages/core/gptProTier.ts
+var GPT_PRO_REQUIRED_RECHARGE_AMOUNT = 199;
+var SUPPORTED_TIER_PROVIDERS = /* @__PURE__ */ new Set([
+  "nolo",
+  "openai",
+  "deepinfra"
+]);
+var CLAUDE_PREMIUM_RE = /^(?:anthropic\/)?claude-(opus|fable)(?:-\d+(?:[.-]\d+)*(?:-[a-z0-9]+)*)?$/i;
+var GPT_PRO_RE = /^(?:openai\/)?gpt-[a-z0-9.-]+-pro(?:-[a-z0-9]+(?:[.-][a-z0-9]+)*)?$/i;
+var GPT_SOL_RE = /^(?:openai\/)?gpt-\d+(?:\.\d+)*-sol(?:-[a-z0-9]+(?:[.-][a-z0-9]+)*)?$/i;
+var KIMI_K3_MODELS = /* @__PURE__ */ new Set([
+  "kimi-k3",
+  "moonshotai/kimi-k3"
+]);
+function classifyPremiumModel(model) {
+  const normalizedModel = asTrimmedLowercaseString(model);
+  if (!normalizedModel) return void 0;
+  const claudeMatch = CLAUDE_PREMIUM_RE.exec(normalizedModel);
+  if (claudeMatch) {
+    return claudeMatch[1].toLowerCase() === "opus" ? "claude-opus" : "claude-fable";
+  }
+  if (GPT_PRO_RE.test(normalizedModel)) {
+    return "gpt-pro";
+  }
+  if (GPT_SOL_RE.test(normalizedModel)) {
+    return "gpt-sol";
+  }
+  if (KIMI_K3_MODELS.has(normalizedModel)) {
+    return "kimi-k3";
+  }
+  return void 0;
+}
+function isGptProModel(provider, model) {
+  const normalizedProvider = asTrimmedLowercaseString(provider);
+  if (!SUPPORTED_TIER_PROVIDERS.has(normalizedProvider)) {
+    return false;
+  }
+  return classifyPremiumModel(model) !== void 0;
+}
+var GPT_PRO_BLOCKED_MESSAGE = `GPT Pro / Kimi K3 \u7B49\u9AD8\u7EA7\u6A21\u578B\u9700\u8981\u5148\u5F00\u901A ${GPT_PRO_REQUIRED_RECHARGE_AMOUNT} \u79EF\u5206\u6863\u4F4D\u3002`;
+function shouldBlockForGptPro(input) {
+  if (input?.premium !== true || input?.platformPaid !== true) {
+    return { blocked: false };
+  }
+  if (asTrimmedLowercaseString(input.gptProStatus) === "active") {
+    return { blocked: false };
+  }
+  return { blocked: true, message: GPT_PRO_BLOCKED_MESSAGE };
+}
+
+// packages/ai/agent/platformPaidCall.ts
+var asTrimmed = (value) => typeof value === "string" ? value.trim() : "";
+var hasOAuthCredentialShape = (agentConfig) => isOAuthApiKeyRef(agentConfig?.apiKeyRef) || isAntigravityOAuthAgent({
+  key: "platform-paid-call-probe",
+  apiKeyRef: agentConfig?.apiKeyRef ?? void 0,
+  provider: agentConfig?.provider ?? void 0,
+  customProviderUrl: agentConfig?.customProviderUrl ?? void 0
+});
+function isPlatformPaidAgentCall(probe) {
+  const agentConfig = probe?.agentConfig ?? {};
+  const authKind = asTrimmed(probe?.authKind);
+  if (authKind) return authKind === "platform-key";
+  if (asTrimmed(agentConfig.apiSource) === "cli") return false;
+  return resolveBillingSource({
+    local: agentConfig.local,
+    isLocal: agentConfig.isLocal,
+    cliProvider: agentConfig.cliProvider,
+    apiSource: agentConfig.apiSource,
+    provider: agentConfig.provider,
+    billingSource: agentConfig.billingSource,
+    // 形态证明而非记录自声明（见文件头）：自声明 isOAuth 不足以证明 OAuth 通道归属。
+    isOAuth: hasOAuthCredentialShape(agentConfig),
+    apiKeyRef: agentConfig.apiKeyRef,
+    customProviderUrl: agentConfig.customProviderUrl,
+    isOwned: isOwnedAgentRecord(
+      agentConfig,
+      asTrimmed(probe?.callerUserId) || void 0
+    ),
+    userId: agentConfig.userId,
+    ownerId: agentConfig.ownerId
+  }) === "platform_credits";
 }
 
 // packages/ai/agent/persistMessageWithFixedId.ts
 async function persistMessageWithFixedId(dispatch, message) {
   dispatch(addUserMessage(message));
-  const { controller, ...messageToWrite } = message;
+  const { controller, dialogId: _dialogId, ...messageToWrite } = message;
   try {
     const writeRequest = dispatch(
       write({
@@ -1363,7 +1481,8 @@ var toolMessageWillPersist = (toolMsg) => {
   if (typeof content === "string") return content.trim().length > 0;
   return Array.isArray(content) && content.length > 0;
 };
-var shouldUseDesktopLocalRuntime = (agentConfig) => {
+var shouldUseDesktopLocalRuntime = (agentConfig, explicitTarget) => {
+  if (explicitTarget?.kind === "machine") return false;
   if (!getIsDesktopApp()) return false;
   return agentConfig?.apiSource !== "cli";
 };
@@ -1604,11 +1723,7 @@ var finalizeQuickChatAgentTurnFailure = async (dispatch, dialogKey, agentKey, er
 var normalizeAgentRunUserInput = (userInput) => {
   if (typeof userInput === "string") return userInput;
   if (!Array.isArray(userInput)) return "";
-  return userInput.filter((part) => {
-    if (!part || typeof part !== "object") return false;
-    if (part.type === "text") return typeof part.text === "string";
-    return part.type === "image_url" && typeof part.image_url?.url === "string" && !!part.image_url.url.trim();
-  });
+  return userInput.flatMap((part) => projectUserPartForModel(part));
 };
 var isSimpleTextInput = (userInput) => {
   if (typeof userInput === "string") return true;
@@ -1794,6 +1909,9 @@ function createRemoteToolEventHandlers(opts) {
           isStreaming: false,
           content: projectedContent,
           toolName,
+          // F1: keep server-projected metadata (incl. executionLocation)
+          // on the message so tool rows can render the actual host.
+          ...mergedMeta ? { metadata: mergedMeta } : {},
           toolPayload: {
             ...existing.toolPayload ?? {},
             toolName,
@@ -1813,6 +1931,9 @@ function createRemoteToolEventHandlers(opts) {
           isStreaming: false,
           toolName,
           toolCallId: callId,
+          // F1: surface executionLocation (and any other server metadata)
+          // even on the no-prior-call fallback path.
+          ...mergedMeta ? { metadata: mergedMeta } : {},
           toolPayload: {
             toolName,
             status: resultStatus,
@@ -1910,7 +2031,7 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
       rawAgentConfig = providedAgentConfig;
       agentConfigSource = "provided";
     } else if (isUsableAgentConfig(cachedAgentConfig)) {
-      rawAgentConfig = cachedAgentConfig;
+      rawAgentConfig = applyPlatformAgentOverrides(cachedAgentConfig, agentKey);
       agentConfigSource = "cache";
     } else {
       const builtinFallback = resolveBuiltinPlatformAgentRecord(
@@ -1923,10 +2044,10 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
           quickChatPerfStartedAt
         );
         if (isUsableAgentConfig(readConfig)) {
-          rawAgentConfig = readConfig;
+          rawAgentConfig = applyPlatformAgentOverrides(readConfig, agentKey);
           agentConfigSource = "read";
         } else {
-          rawAgentConfig = builtinFallback ?? readConfig ?? null;
+          rawAgentConfig = builtinFallback ?? (readConfig ? applyPlatformAgentOverrides(readConfig, agentKey) : null);
           agentConfigSource = builtinFallback ? "builtin-unusable-record" : "read";
         }
       } catch (error) {
@@ -1944,18 +2065,6 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
         `Agent config not found for ID: ${agentKey}`
       );
     }
-    if (runtimeOptions?.quickChatModelOverride) {
-      rawAgentConfig = applyQuickChatModelOverride(
-        rawAgentConfig,
-        runtimeOptions.quickChatModelOverride
-      );
-    }
-    if (runtimeOptions?.quickChatReasoningEffort && (rawAgentConfig.model === "deepseek-flash" || rawAgentConfig.model === "deepseek-v4-flash" || rawAgentConfig.model === "deepseek-v4-flash-vision-exp" || rawAgentConfig.model === "deepseek-v4-pro")) {
-      rawAgentConfig = {
-        ...rawAgentConfig,
-        reasoning_effort: runtimeOptions.quickChatReasoningEffort
-      };
-    }
     if (isLiveAudioOnlyAgent(rawAgentConfig)) {
       return rejectWithValue(
         "\u6B64 Agent \u4EC5\u652F\u6301\u5B9E\u65F6\u8BED\u97F3\u6A21\u5F0F\uFF0C\u8BF7\u4F7F\u7528\u8BED\u97F3\u9762\u677F\u8FDB\u884C\u5BF9\u8BDD\u3002"
@@ -1972,18 +2081,29 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
       apiSource: agentConfig.apiSource,
       source: agentConfigSource
     });
-    const gptProCheck = shouldBlockForGptPro(
-      agentConfig,
-      selectIdentityUser(getState())?.gptProAccess?.status
-    );
+    const identityState = getState();
+    const gptProCheck = shouldBlockForGptPro({
+      premium: isGptProModel(agentConfig.provider, agentConfig.model),
+      platformPaid: isPlatformPaidAgentCall({
+        agentConfig,
+        callerUserId: selectIdentityUserId(identityState)
+      }),
+      gptProStatus: selectIdentityUser(identityState)?.gptProAccess?.status
+    });
     if (gptProCheck.blocked) {
       return rejectWithValue(gptProCheck.message);
     }
     const configuredBoundMachineId = asTrimmedString(
       agentConfig.runtimeBinding?.machineId
     );
-    const boundMachineId = resolveRemoteBoundMachineId(configuredBoundMachineId);
-    if (agentConfig.apiSource === "cli" || boundMachineId && !getIsDesktopApp()) {
+    const currentDialog = selectDialogConfigByKey(state, explicitDialogKey) ?? selectCurrentDialogConfig(state);
+    const explicitTarget = runtimeOptions?.runtimeTarget ?? (currentDialog?.runtimeBinding?.target?.kind === "server" || currentDialog?.runtimeBinding?.target?.kind === "machine" ? currentDialog.runtimeBinding.target : void 0);
+    const boundMachineId = explicitTarget ? explicitTarget.kind === "machine" ? asTrimmedString(explicitTarget.machineId) : null : resolveRemoteBoundMachineId(configuredBoundMachineId);
+    const hasExplicitMachineTarget = explicitTarget?.kind === "machine";
+    if (hasExplicitMachineTarget && !boundMachineId) {
+      return rejectWithValue("\u663E\u5F0F\u9009\u62E9\u7684\u7535\u8111\u76EE\u6807\u7F3A\u5C11 machineId\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9\u6267\u884C\u7535\u8111\u3002");
+    }
+    if (hasExplicitMachineTarget || agentConfig.apiSource === "cli" && !explicitTarget || boundMachineId && !getIsDesktopApp()) {
       console.info("[streamAgentChatTurn] Triggered CLI/machine route. apiSource:", agentConfig.apiSource, "boundMachineId:", boundMachineId, "agentKey:", agentKey);
       const currentState = getState();
       const w2 = typeof globalThis !== "undefined" && globalThis.window ? globalThis.window : null;
@@ -2018,6 +2138,7 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
         let accumulated2 = "";
         let totalTurnUsage2 = void 0;
         const buildMachineAssistantMessage = () => ({
+          dialogId: dialogId2,
           id: messageId,
           dbKey: msgKey,
           role: "assistant",
@@ -2067,6 +2188,7 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
             stream: true,
             persistDialog: false,
             clientDialogId: dialogId2,
+            ...explicitTarget ? { runtimeTarget: explicitTarget } : {},
             runtimeContext: {
               surface: "web",
               host: "browser",
@@ -2292,6 +2414,7 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
       let cliTurnUsage = null;
       const decoder = new TextDecoder();
       const buildCliAssistantMessage = () => ({
+        dialogId: dialogId2,
         id: messageId,
         dbKey: msgKey,
         role: "assistant",
@@ -2399,6 +2522,7 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
                 dialogId: dialogId2,
                 dialogKey: dialogKey2,
                 usage: cliUsage,
+                contextUsageAuthoritative: !isCliEstimated,
                 agentConfig: isCliEstimated ? { ...agentConfig, apiSource: "cli" } : agentConfig
               })).unwrap();
             } catch (err) {
@@ -2414,7 +2538,6 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
       }
       return;
     }
-    const currentDialog = selectDialogConfigByKey(state, explicitDialogKey) ?? selectCurrentDialogConfig(state);
     const activeDialogKey = currentDialog?.dbKey;
     const dialogKey = explicitDialogKey || activeDialogKey;
     if (!dialogKey) {
@@ -2426,7 +2549,7 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
       dialogKey,
       dialogId
     });
-    if (shouldUseDesktopLocalRuntime(agentConfig)) {
+    if (shouldUseDesktopLocalRuntime(agentConfig, explicitTarget)) {
       const desktopMessageMetadata = buildMessageMetadata(agentConfig);
       const w2 = typeof globalThis !== "undefined" && globalThis.window ? globalThis.window : null;
       loopKey = `loop:${dialogId}`;
@@ -2440,6 +2563,7 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
       let streamError = null;
       let reasoningBuffer = "";
       const activeToolMessages = /* @__PURE__ */ new Map();
+      let desktopToolExecutionLocation = void 0;
       const ensureAssistantMessageKeys = () => {
         if (!assistantMessageKeys) {
           assistantMessageKeys = createDialogMessageKeyAndId(dialogId);
@@ -2547,15 +2671,22 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
                 isStreaming: true,
                 toolName: toolEvent.toolName,
                 toolCallId: callId,
+                // F2: 实际执行位置（服务端/runtime 投影）挂到 tool
+                // 卡片 metadata。优先事件自带 metadata（runtime
+                // 投影层直接注入的同名字段），兜底用 turn 级
+                // execution_location 帧。缺失/不合法时渲染层
+                // projectToolExecutionLocation 收敛为 unknown。
+                metadata: {
+                  ...isRecord(toolEvent.metadata) ? toolEvent.metadata : {},
+                  ...desktopToolExecutionLocation !== void 0 && !(isRecord(toolEvent.metadata) && toolEvent.metadata.executionLocation !== void 0) ? { executionLocation: desktopToolExecutionLocation } : {},
+                  ...toolEvent.argumentsPreview ? { argumentsPreview: toolEvent.argumentsPreview } : {}
+                },
                 ...toolEvent.argumentsPreview ? {
                   toolPayload: {
                     input: {
                       command: toolEvent.argumentsPreview,
                       cmd: toolEvent.argumentsPreview
                     }
-                  },
-                  metadata: {
-                    argumentsPreview: toolEvent.argumentsPreview
                   }
                 } : {}
               };
@@ -2570,7 +2701,13 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
                 const mergedMeta = {
                   ...existingMeta,
                   ...toolEvent.metadata,
-                  ...isError ? { error: true, message: toolEvent.message } : {}
+                  ...isError ? { error: true, message: toolEvent.message } : {},
+                  // 服务端/runtime 已在事件 metadata 带
+                  // executionLocation 时尊重之；tool-call 阶段
+                  // 已写入的值由 existingMeta 保留；仅当两边都
+                  // 没有且 turn 级 execution_location 帧存在时
+                  // 兜底补上，绝不覆盖已有值。
+                  ...existingMeta.executionLocation === void 0 && (!isRecord(toolEvent.metadata) || toolEvent.metadata.executionLocation === void 0) && desktopToolExecutionLocation !== void 0 ? { executionLocation: desktopToolExecutionLocation } : {}
                 };
                 const toolResultMsg = {
                   ...existing,
@@ -2592,6 +2729,8 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
           } else if (event.type === "status") {
             const phase = event.phase === "validating-context" ? "validating" : event.phase;
             setDialogTurnPhase({ phase, dialogKey, turnId: turnPhaseTurnId ?? void 0 });
+          } else if (event.type === "execution_location") {
+            desktopToolExecutionLocation = event.location;
           } else if (event.type === "done") {
             streamResult = event.result;
           } else if (event.type === "error") {
@@ -2632,6 +2771,7 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
               stopToolNameById
             );
             await persistMessageWithFixedId(dispatch, {
+              dialogId,
               id: segment2.messageId,
               dbKey: segment2.key,
               role: "assistant",
@@ -2682,6 +2822,7 @@ var streamAgentChatTurnHandler = async (args, thunkApi) => {
               errorToolNameById
             );
             await persistMessageWithFixedId(dispatch, {
+              dialogId,
               id: segment2.messageId,
               dbKey: segment2.key,
               role: "assistant",
@@ -2858,6 +2999,7 @@ ${info.actionHint}` : streamError;
         let accumulated = "";
         let totalTurnUsage2 = void 0;
         const buildRemoteAssistantMessage = () => ({
+          dialogId,
           id: messageId,
           dbKey: msgKey,
           role: "assistant",
@@ -2902,6 +3044,7 @@ ${info.actionHint}` : streamError;
           stream: true,
           persistDialog: false,
           clientDialogId: dialogId,
+          ...explicitTarget ? { runtimeTarget: explicitTarget } : {},
           runtimeContext: {
             surface: "web",
             host: "browser",
@@ -3066,6 +3209,7 @@ ${info.actionHint}` : streamError;
     const normalizedReferences = turnToolContext.resolvedReferences ?? [];
     const referenceTools = turnToolContext.referencedTools ?? [];
     const contextTools = turnToolContext.contextTools ?? [];
+    const attachmentTools = turnToolContext.attachmentToolNames ?? [];
     const mergedContentCache = turnToolContext.mergedContentCache ?? /* @__PURE__ */ new Map();
     logQuickChatPerfStage2(quickChatPerfStartedAt, "stream-agent-references-resolved", {
       referenceCount: normalizedReferences.length,
@@ -3083,7 +3227,7 @@ ${info.actionHint}` : streamError;
     const initialHistoryIds = new Set(initialRawMsgs.map((m) => m.id));
     const agentConfigWithTools = mergeAgentToolsWithRuntime(
       agentConfigWithReferences,
-      contextTools,
+      [...contextTools, ...attachmentTools],
       mentionedTools,
       runtimeOptions,
       state