@x-otto/cli 0.0.1-alpha.8 → 0.1.0-alpha.9

package/dist/bundled-extensions/plugin-otto-wire-protocols/plugin.ts

@@ -19,6 +19,8 @@ import type { WireProtocolFactoryInput } from '@x-otto/provider'
 function adaptToOpenAICompletions(input: WireProtocolFactoryInput) {
   return createOpenAICompletionsProvider({
     resolveKey: () => input.resolveAuth().then((a) => a?.token),
+    resolveBaseUrl: input.resolveBaseUrl,
+    preferResolvedBaseUrl: input.preferResolvedBaseUrl,
     headers: input.headers,
     tokenDerivedHeaders: input.tokenDerivedHeaders,
     logger: input.logger,
@@ -32,6 +34,7 @@ function adaptToOpenAIResponses(input: WireProtocolFactoryInput) {
   return createOpenAIResponsesProvider({
     resolveKey: () => input.resolveAuth().then((a) => a?.token),
     resolveBaseUrl: input.resolveBaseUrl,
+    preferResolvedBaseUrl: input.preferResolvedBaseUrl,
     tokenDerivedHeaders: input.tokenDerivedHeaders,
     headers: input.headers,
     logger: input.logger,
@@ -45,6 +48,7 @@ function adaptToAnthropicMessages(input: WireProtocolFactoryInput) {
   return createAnthropicProvider({
     resolveAuth: () => input.resolveAuth(),
     resolveBaseUrl: input.resolveBaseUrl,
+    preferResolvedBaseUrl: input.preferResolvedBaseUrl,
     customizeRequest: input.customizeRequest,
     logger: input.logger,
     // RFC-270 缺陷 1（P0）：此前这两行缺失——另两个 adapter 都透传了 headers，唯独本

package/dist/bundled-extensions/plugin-otto-wire-protocols/src/anthropic-messages.ts

@@ -41,30 +41,12 @@ import type {
  * （红线：绝不 fallback 到 createLogger）。
  */
 import type { WireProtocolLogger } from '@x-otto/provider'
-
-const noopLogger: WireProtocolLogger = { debug: () => {}, info: () => {}, warn: () => {}, error: () => {} }
+import { noopWireProtocolLogger, resolveProviderBaseUrl } from '@x-otto/provider'
 
 export type AnthropicCredentialResolver = () => Promise<string | undefined>
 export type AnthropicAuthResolver = () => Promise<ResolvedAuth | undefined>
 export type AnthropicBaseUrlResolver = () => Promise<string | undefined>
 
-async function resolveBaseUrl(
-  modelBaseUrl: string,
-  resolver?: AnthropicBaseUrlResolver,
-): Promise<string> {
-  const envUrl = process.env['ANTHROPIC_BASE_URL']
-  if (envUrl) {
-    return envUrl
-  }
-  if (resolver) {
-    const authUrl = await resolver()
-    if (authUrl) {
-      return authUrl
-    }
-  }
-  return modelBaseUrl
-}
-
 export function toBudgetTokens(level: string, maxOutputTokens: number): number {
   // RFC-235：Anthropic 是 token 预算型（非 effort 关键字）。otto 档位 → maxOutput 百分比预算。
   // 词表对齐 Claude Code（去 minimal 加 max）：low 25% / medium 50% / high 75% / xhigh 90% / max 95%。
@@ -623,6 +605,7 @@ export interface AnthropicProviderOptions {
   resolveKey?: AnthropicCredentialResolver
   resolveAuth?: AnthropicAuthResolver
   resolveBaseUrl?: AnthropicBaseUrlResolver
+  preferResolvedBaseUrl?: boolean
   /**
    * 请求定制点（RFC-140 D-copilot-spoof-split，取代此前的 `enableClaudeCodeSpoof` 布尔开关）：
    * `createAnthropicProvider` 是**任意**声明 `wireApi: 'anthropic-messages'` 的插件共用的
@@ -638,8 +621,8 @@ export interface AnthropicProviderOptions {
    */
   customizeRequest?: (input: AnthropicRequestCustomizeInput) => AnthropicRequestCustomization
   /**
-   * RFC-270 缺陷 1（P0）：静态额外 headers（如 manifest 声明的 `x-llm-appcode` 企业网关
-   * 路由标识）。此前本 Options **完全没有这个字段**——`plugin.ts` 的 adapter 也因此未透传
+   * RFC-270 缺陷 1（P0）：静态额外 headers（如 manifest 声明的企业网关路由标识头）。
+   * 此前本 Options **完全没有这个字段**——`plugin.ts` 的 adapter 也因此未透传
    * `input.headers`，声明式 provider 给本协议写的 headers 被静默丢弃且不报错。该缺陷长期
    * 未被发现，是因为唯一的真实用例 `anthropic-version` 恰好被 @anthropic-ai/sdk 自身硬编码
    * 补上（`client.js` buildRequest），掩盖了丢弃。
@@ -649,7 +632,7 @@ export interface AnthropicProviderOptions {
   tokenDerivedHeaders?: TokenDerivedHeader[]
   /** RFC-270 D3：manifest 显式声明后，允许自定义头覆盖鉴权头（企业网关换鉴权）。 */
   allowAuthHeaderOverride?: boolean
-  /** RFC-185 D3：宿主注入的日志端口，缺省 no-op（见文件头 noopLogger 注释）。 */
+  /** RFC-185 D3：宿主注入的日志端口，缺省 no-op（`noopWireProtocolLogger`，@x-otto/provider 单例）。 */
   logger?: WireProtocolLogger
 }
 
@@ -666,10 +649,11 @@ class AnthropicStream implements ProviderStream {
   constructor(
     private readonly resolveCredential?: AnthropicCredentialResolver,
     private readonly baseUrlResolver?: AnthropicBaseUrlResolver,
+    private readonly preferResolvedBaseUrl = false,
     private readonly authResolver?: AnthropicAuthResolver,
     /** 见 `AnthropicProviderOptions.customizeRequest` 注释。缺省 = 零定制。 */
     private readonly customizeRequest?: (input: AnthropicRequestCustomizeInput) => AnthropicRequestCustomization,
-    private readonly logger: WireProtocolLogger = noopLogger,
+    private readonly logger: WireProtocolLogger = noopWireProtocolLogger,
     /** 见 `AnthropicProviderOptions.headers`（RFC-270 缺陷 1 修复）。 */
     private readonly staticHeaders?: Record<string, string>,
     private readonly tokenDerivedHeaders?: TokenDerivedHeader[],
@@ -711,7 +695,12 @@ class AnthropicStream implements ProviderStream {
     context: StreamContext,
     auth: ResolvedAuth,
   ): Promise<{ client: Anthropic; requestParams: Anthropic.MessageStreamParams; baseURL: string }> {
-    const baseURL = await resolveBaseUrl(model.baseUrl, this.baseUrlResolver)
+    const baseURL = await resolveProviderBaseUrl(
+      'ANTHROPIC_BASE_URL',
+      this.baseUrlResolver,
+      model.baseUrl,
+      this.preferResolvedBaseUrl,
+    )
     // RFC-140 D-copilot-spoof-split：本文件不再判断"是否 oauth 才伪装"——那是具体厂商
     // （如 plugin-anthropic 的 Claude Code 伪装）的业务逻辑，交给 customizeRequest 定制器
     // 自行按 input.auth.mode 判断要不要返回定制内容。未提供定制器 = 零调用零开销。
@@ -906,6 +895,7 @@ export function createAnthropicProvider(options: AnthropicProviderOptions = {}):
   return new AnthropicStream(
     options.resolveKey,
     options.resolveBaseUrl,
+    options.preferResolvedBaseUrl,
     options.resolveAuth,
     options.customizeRequest,
     options.logger,

package/dist/bundled-extensions/plugin-otto-wire-protocols/src/openai-completions.ts

@@ -20,9 +20,7 @@ import type {
   WireRequestCustomization,
   WireRequestCustomizeInput,
 } from '@x-otto/provider'
-
-/** RFC-185 D3：日志走宿主注入端口，缺省 no-op——插件源码禁 createLogger（防第二单例直写 stderr）。 */
-const noopLogger: WireProtocolLogger = { debug: () => {}, info: () => {}, warn: () => {}, error: () => {} }
+import { noopWireProtocolLogger, resolveProviderBaseUrl } from '@x-otto/provider'
 
 /**
  * 通用 OpenAI Chat Completions provider（对标 opencode/pi 的 openai-compatible 基座）。
@@ -38,6 +36,7 @@ const noopLogger: WireProtocolLogger = { debug: () => {}, info: () => {}, warn:
  * RFC-122 D3：支持声明式 `tokenDerivedHeaders`（插件 provider 轴），JWT claim 值提取后注入请求头。
  */
 export type OpenAICompletionsCredentialResolver = (provider: string) => Promise<string | undefined>
+export type OpenAICompletionsBaseUrlResolver = () => Promise<string | undefined>
 
 // RFC-122 D3：TokenDerivedHeader 定义单一真源在 @x-otto/provider（协议中立层，见该包
 // types.ts 头注释）——此前本文件与 openai-responses.ts 各自重复定义一份相同形状，
@@ -45,6 +44,8 @@ export type OpenAICompletionsCredentialResolver = (provider: string) => Promise<
 
 export interface OpenAICompletionsProviderOptions {
   resolveKey?: OpenAICompletionsCredentialResolver
+  resolveBaseUrl?: OpenAICompletionsBaseUrlResolver
+  preferResolvedBaseUrl?: boolean
   /** RFC-122 D3：静态额外 headers（如 vendor 自定义头）。 */
   headers?: Record<string, string>
   /** RFC-122 D3：JWT claim 派生 headers。 */
@@ -73,9 +74,11 @@ class OpenAICompletionsStream implements ProviderStream {
 
   constructor(
     private readonly resolveCredential?: OpenAICompletionsCredentialResolver,
+    private readonly baseUrlResolver?: OpenAICompletionsBaseUrlResolver,
+    private readonly preferResolvedBaseUrl = false,
     private readonly extraHeaders?: Record<string, string>,
     private readonly tokenDerivedHeaders?: TokenDerivedHeader[],
-    private readonly logger: WireProtocolLogger = noopLogger,
+    private readonly logger: WireProtocolLogger = noopWireProtocolLogger,
     /** 见 `OpenAICompletionsProviderOptions.customizeRequest`。缺省 = 零定制。 */
     private readonly customizeRequest?: (input: WireRequestCustomizeInput) => WireRequestCustomization,
     private readonly allowAuthHeaderOverride?: boolean,
@@ -127,17 +130,29 @@ class OpenAICompletionsStream implements ProviderStream {
     })
 
     yield* streamChatCompletions({
-      url: `${model.baseUrl}/chat/completions`,
+      url: `${await resolveProviderBaseUrl(
+        model.provider === 'deepseek' ? 'DEEPSEEK_BASE_URL' : 'OPENAI_BASE_URL',
+        this.baseUrlResolver,
+        model.baseUrl,
+        this.preferResolvedBaseUrl,
+      )}/chat/completions`,
       headers,
       body: buildChatCompletionsBody(model, context),
       identity: { api: model.api, provider: model.provider, model: model.id },
       signal,
       timeout: options.timeout,
-      // RFC-XX reasoning-thinking：reasoning 模型的 thinking 阶段可能长达分钟级零
-      // visible token——中间无任何 SSE chunk，默认 120s idle 会无差别单边坑所有 reasoning
-      // 模型（实测 turn 3 触发：thinking_start → 零输出 → stream.retry×2 → 崩）。
-      // 此处给 reasoning 模型显式加大 idle 苟（300s），非 reasoning 模型保持默认 120s。
-      idleTimeout: model.reasoning ? 300_000 : undefined,
+      // RFC-361：**不再**给 reasoning 模型统一放大 idleTimeout。
+      //
+      // 旧做法（`idleTimeout: model.reasoning ? 300_000 : undefined`）是"把阈值往上堆"的
+      // 治标手段：它同时放宽了两个语义完全不同的阶段——"首 token 前的长思考"（正常）与
+      // "已开始吐字后突然静默"（真卡死）。后果有二：①300s 对 deepseek-v4-flash·max 的
+      // thinking 仍然不够，误杀照旧（真机实测 4 个长推理任务因此失败）；②真卡死的检测被
+      // 无谓延迟到 5 分钟。
+      //
+      // 新机制由 `@x-otto/shared` 的 `stream()` 分段承担：首字节前默认 900s（放行长思考），
+      // 首字节后回到 120s（保持对流中断的灵敏度）。故此处不再需要按 `model.reasoning`
+      // 区分——分段判据比"模型是否声明 reasoning"更准（同一个 reasoning 模型的不同 turn，
+      // 思考时长差异极大，用模型属性预测本就是弱相关变量）。
       // RFC-232（终局修正）：跨 wire 协议救回违约响应，见 @x-otto/provider stream-state.ts。
       registeredToolNames: registeredToolNames(context.tools),
     })
@@ -149,6 +164,8 @@ export function createOpenAICompletionsProvider(
 ): ProviderStream {
   return new OpenAICompletionsStream(
     options.resolveKey,
+    options.resolveBaseUrl,
+    options.preferResolvedBaseUrl,
     options.headers,
     options.tokenDerivedHeaders,
     options.logger,

package/dist/bundled-extensions/plugin-otto-wire-protocols/src/openai-responses.ts

@@ -34,9 +34,7 @@ import type {
   WireRequestCustomization,
   WireRequestCustomizeInput,
 } from '@x-otto/provider'
-
-/** RFC-185 D3：日志走宿主注入端口，缺省 no-op——插件源码禁 createLogger（防第二单例直写 stderr）。 */
-const noopLogger: WireProtocolLogger = { debug: () => {}, info: () => {}, warn: () => {}, error: () => {} }
+import { noopWireProtocolLogger, resolveProviderBaseUrl } from '@x-otto/provider'
 
 export type OpenAIResponsesCredentialResolver = () => Promise<string | undefined>
 export type OpenAIResponsesBaseUrlResolver = () => Promise<string | undefined>
@@ -318,7 +316,11 @@ function dispatchResponsesSSEEvent(
       }
       const hasTool = [...state.blocks.values()].some((b) => b.kind === 'tool_call')
       if (type === 'response.incomplete') {
-        state.stopReason = 'max_tokens'
+        // 08-14 review A1：不再无条件映射 max_tokens——读 incomplete_details.reason 区分截断根因。
+        // OpenAI Responses 的 incomplete 可能因 max_output_tokens（真截断，走引擎续写/升档路径）
+        // 或 content_filter（内容过滤，应映射 refusal 让引擎干净终止，而非误走"触顶重试"白烧一轮）。
+        const reason = (response?.incomplete_details as Record<string, unknown> | undefined)?.reason
+        state.stopReason = reason === 'content_filter' ? 'refusal' : 'max_tokens'
       } else {
         state.stopReason = hasTool ? 'tool_use' : 'end_turn'
       }
@@ -359,6 +361,7 @@ class OpenAIResponsesStream implements ProviderStream {
   constructor(
     private readonly resolveCredential?: OpenAIResponsesCredentialResolver,
     private readonly baseUrlResolver?: OpenAIResponsesBaseUrlResolver,
+    private readonly preferResolvedBaseUrl = false,
     private readonly tokenDerivedHeaders?: TokenDerivedHeader[],
     /**
      * 终局 review 2026-07-10 P1-7：静态额外 headers（如 vendor 自定义头），对齐
@@ -369,7 +372,7 @@ class OpenAIResponsesStream implements ProviderStream {
      * 补齐此字段后硬编码分支已冗余，随本次一并删除（见下方 buildHeaders）。
      */
     private readonly staticHeaders?: Record<string, string>,
-    private readonly logger: WireProtocolLogger = noopLogger,
+    private readonly logger: WireProtocolLogger = noopWireProtocolLogger,
     /** 见 `OpenAIResponsesProviderOptions.customizeRequest`。缺省 = 零定制。 */
     private readonly customizeRequest?: (input: WireRequestCustomizeInput) => WireRequestCustomization,
     private readonly allowAuthHeaderOverride?: boolean,
@@ -401,17 +404,12 @@ class OpenAIResponsesStream implements ProviderStream {
   }
 
   private async resolveBaseUrl(model: Model): Promise<string> {
-    const envUrl = process.env['OPENAI_BASE_URL']
-    if (envUrl) {
-      return envUrl
-    }
-    if (this.baseUrlResolver) {
-      const url = await this.baseUrlResolver()
-      if (url) {
-        return url
-      }
-    }
-    return model.baseUrl
+    return resolveProviderBaseUrl(
+      'OPENAI_BASE_URL',
+      this.baseUrlResolver,
+      model.baseUrl,
+      this.preferResolvedBaseUrl,
+    )
   }
 
   /**
@@ -464,7 +462,10 @@ class OpenAIResponsesStream implements ProviderStream {
         body,
         headers: this.buildHeaders(auth, model.provider),
         signal,
-        timeout: options.timeout ?? 300000,
+        // RFC-361 D5：不再兜底 300s——那会让墙钟先于首字节空闲阈值（默认 900s）触发，
+        // 使分段计时成为死代码。`stream()` 会按 `max(requested, firstTokenIdle + 余量)`
+        // 统一解析，保证墙钟总是大于首字节阈值。o3/o1 等 reasoning 模型的长思考同样受益。
+        timeout: options.timeout,
         onResponse: (h) => {
           responseHeaders = h
         },
@@ -541,6 +542,7 @@ class OpenAIResponsesStream implements ProviderStream {
 export interface OpenAIResponsesProviderOptions {
   resolveKey?: OpenAIResponsesCredentialResolver
   resolveBaseUrl?: OpenAIResponsesBaseUrlResolver
+  preferResolvedBaseUrl?: boolean
   /** RFC-122 D3：插件声明式 token 派生 header（provider-loader 装载时注入） */
   tokenDerivedHeaders?: TokenDerivedHeader[]
   /**
@@ -566,6 +568,7 @@ export function createOpenAIResponsesProvider(
   return new OpenAIResponsesStream(
     options.resolveKey,
     options.resolveBaseUrl,
+    options.preferResolvedBaseUrl,
     options.tokenDerivedHeaders,
     options.headers,
     options.logger,

package/dist/bundled-extensions-C3n8jg20.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+import{dirname as e,join as t}from"node:path";import{existsSync as n}from"node:fs";import{fileURLToPath as r}from"node:url";function i(){let i=t(e(r(import.meta.url)),`bundled-extensions`);return n(i)?i:``}export{i as t};
+//# sourceMappingURL=bundled-extensions-C3n8jg20.js.map

package/dist/bundled-extensions-C3n8jg20.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bundled-extensions-C3n8jg20.js","names":[],"sources":["../src/bundled-extensions.ts"],"sourcesContent":["/**\n * bundled-extensions.ts —— 随 otto 分发的内置扩展目录解析。\n *\n * cli 构建时（scripts/bundle-builtin-extensions.mjs）把内置扩展的编译产物拷进\n * `dist/bundled-extensions/<id>/`。本模块解析该目录，供 `discoverPlugins` 作为\n * 最高优先扫描层传入。\n *\n * ## 为什么在 cli 层解析而不是 plugin 层\n * `@x-otto/plugin` 是库，不该知道 cli 的 dist 布局（反向依赖）。目录位置只有 cli\n * 自己知道（它拥有 `import.meta.url` → dist 的路径）。\n *\n * ## 分布式的可移植性\n * 发布物 = `dist/`（package.json files:[\"dist\"]）。本目录与 dist 同级，\n * 打包后相对路径关系保持不变——`import.meta.url` 解析到 dist 内的一个 js，\n * `../bundled-extensions` 即发布物内的扩展目录。\n */\nimport { existsSync } from 'node:fs'\nimport { dirname, join } from 'node:path'\nimport { fileURLToPath } from 'node:url'\n\n/** cli 发布物内内置扩展目录（不存在 = 该发布物没带内置扩展，返回空）。 */\nexport function bundledExtensionsDir(): string {\n  // dist 里的这个 js 文件 → dist/bundled-extensions（同目录，非父级——这是 cli 构建\n  // 时拷进去的发布物内目录，见 scripts/bundle-builtin-extensions.mjs）。\n  const dir = join(dirname(fileURLToPath(import.meta.url)), 'bundled-extensions')\n  return existsSync(dir) ? dir : ''\n}\n"],"mappings":";4HAqBA,SAAgB,GAA+B,CAG7C,IAAM,EAAM,EAAK,EAAQ,EAAc,OAAO,KAAK,IAAI,CAAC,CAAE,qBAAqB,CAC/E,OAAO,EAAW,EAAI,CAAG,EAAM"}