@genee/omp-opsx-addon 0.2.0 → 0.4.0

package/lib/status-probe.ts

@@ -0,0 +1,289 @@
+/**
+ * Provider 状态探测模块。
+ *
+ * 对无 usage fetcher 的 provider（如 ArkCodingPlan）主动发最小探测请求，
+ * 区分「429 类错误 vs 正常模型」，驱动底部 widget「可用/耗尽」二元态。
+ *
+ * 探测是 fire-and-forget 异步操作，绝不阻塞渲染路径。结果写入 provider-status.ts
+ * 的进程内状态机（exhausted 集合），渲染自动读取。
+ *
+ * 探测分类：
+ * - ok（2xx）→ markAvailable（清除耗尽）
+ * - exhausted（429，或 403 非 region）→ markExhausted
+ * - region-blocked（403 + region 关键词）→ markExhausted（归耗尽显示）
+ * - auth-error（401）/ model-not-found（404）/ network-error（异常/超时）→ 不写状态
+ *   （宁缺毋谎：无法区分「provider 真不可用」与「探测请求构造失真」）
+ *
+ * Cooldown ledger：进程内 Map<canonicalProvider, lastProbedAt>，复用 probe_ttl_ms。
+ * markStatusProbeStarted 在任何 await 之前写入，彻底关死 in-flight 竞态窗口。
+ */
+
+import { REGION_BLOCK_TOKENS } from './reachability-probe.js';
+import { canonicalizeProvider } from './usage-resolver.js';
+import { markExhausted, markAvailable } from './provider-status.js';
+import { getLogger } from './logger.js';
+
+// ── 类型 ────────────────────────────────────────────────────────────────
+
+/** 状态探测的分类结果。 */
+export type StatusProbeClass =
+  | 'ok'              // 2xx：真实模型、真实 key，请求走通
+  | 'exhausted'       // 429，或 403 非 region 文本
+  | 'region-blocked'  // 403 + region 关键词
+  | 'auth-error'      // 401
+  | 'model-not-found' // 404
+  | 'network-error';  // fetch 抛异常 / 超时
+
+/** 状态探测结果。 */
+export interface StatusProbeResult {
+  provider: string;
+  class: StatusProbeClass;
+  detail?: string;
+  probedAt: number;
+}
+
+/** 网络探测选项。 */
+export interface StatusProbeOptions {
+  baseUrl: string;
+  model: string;
+  apiKey: string;
+  timeoutMs: number;
+  fetchImpl?: typeof fetch;
+}
+
+/** 调度配置。 */
+export interface ScheduleConfig {
+  enabled: boolean;
+  ttlMs: number;
+  timeoutMs: number;
+  excluded: string[];
+}
+
+/** 调度选项。 */
+export interface ScheduleOptions {
+  placeholderIds: string[];
+  models: { id: string; provider: string; baseUrl?: string }[];
+  getApiKey?: (provider: string) => Promise<string | undefined>;
+  config: ScheduleConfig;
+  fetchImpl?: typeof fetch;
+}
+
+// ── 纯分类函数 ─────────────────────────────────────────────────────────
+
+/**
+ * 纯分类：HTTP 状态 + 响应体文本 → 分类。
+ * 无 IO，直接单测。
+ */
+export function classifyStatusResponse(status: number, bodyText: string): StatusProbeClass {
+  // 2xx → ok
+  if (status >= 200 && status < 300) {
+    return 'ok';
+  }
+  // 429 → exhausted
+  if (status === 429) {
+    return 'exhausted';
+  }
+  // 403 + region 关键词 → region-blocked，否则 exhausted
+  if (status === 403) {
+    const lower = bodyText.toLowerCase();
+    if (REGION_BLOCK_TOKENS.some((tok) => lower.includes(tok))) {
+      return 'region-blocked';
+    }
+    return 'exhausted';
+  }
+  // 401 → auth-error
+  if (status === 401) {
+    return 'auth-error';
+  }
+  // 404 → model-not-found
+  if (status === 404) {
+    return 'model-not-found';
+  }
+  // 其余一律 → network-error（detail 记原始 status）
+  return 'network-error';
+}
+
+// ── 网络探测函数 ───────────────────────────────────────────────────────
+
+/**
+ * 对单个 provider 执行状态探测。
+ * 绝不抛异常：所有错误/超时/解析失败 → network-error 结果。
+ */
+export async function probeProviderStatus(
+  provider: string,
+  opts: StatusProbeOptions,
+): Promise<StatusProbeResult> {
+  const fetchFn = opts.fetchImpl ?? fetch;
+  const url = `${opts.baseUrl.replace(/\/+$/, '')}/chat/completions`;
+
+  try {
+    const response = await fetchFn(url, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${opts.apiKey}`,
+      },
+      body: JSON.stringify({
+        model: opts.model,
+        messages: [{ role: 'user', content: 'hi' }],
+        max_tokens: 1,
+      }),
+      signal: AbortSignal.timeout(opts.timeoutMs),
+    });
+
+    let bodyText = '';
+    try {
+      bodyText = await response.text();
+    } catch {
+      // 响应体读取失败 → 按空文本处理
+      bodyText = '';
+    }
+
+    const classification = classifyStatusResponse(response.status, bodyText);
+    return {
+      provider,
+      class: classification,
+      detail: classification === 'network-error' ? `status ${response.status}` : undefined,
+      probedAt: Date.now(),
+    };
+  } catch (e: unknown) {
+    // 网络/超时/AbortError → network-error，绝不抛
+    const err = e as Error & { name?: string };
+    const detail = err.name === 'AbortError' || err.name === 'TimeoutError'
+      ? 'timeout'
+      : (err.message ?? String(e));
+    return {
+      provider,
+      class: 'network-error',
+      detail,
+      probedAt: Date.now(),
+    };
+  }
+}
+
+// ── Cooldown ledger ─────────────────────────────────────────────────────
+
+const probeLedger = new Map<string, number>();
+
+/** 检查是否已到下次探测时间。 */
+export function isStatusProbeDue(provider: string, ttlMs: number): boolean {
+  const canonical = canonicalizeProvider(provider);
+  const lastProbedAt = probeLedger.get(canonical);
+  if (lastProbedAt === undefined) {
+    return true;
+  }
+  return Date.now() - lastProbedAt >= ttlMs;
+}
+
+/** 标记探测已开始（在任何 await 之前调用，关死竞态窗口）。 */
+export function markStatusProbeStarted(provider: string): void {
+  const canonical = canonicalizeProvider(provider);
+  probeLedger.set(canonical, Date.now());
+}
+
+/** 测试 seam：清空 ledger。 */
+export function _resetForTest(): void {
+  probeLedger.clear();
+}
+
+// ── 调度入口 ─────────────────────────────────────────────────────────
+
+/**
+ * 调度状态探测。
+ *
+ * 探测是 fire-and-forget 异步操作，绝不阻塞调用路径。
+ * 返回写入计数（可能为任意非负整数），调用方可据此判断是否需要重渲染。
+ *
+ * 异常全部吞没：fetch 失败/超时/解析失败/状态机写入失败均不影响其他 provider。
+ */
+export async function scheduleStatusProbes(opts: ScheduleOptions): Promise<number> {
+  const { placeholderIds, models, getApiKey, config, fetchImpl } = opts;
+
+  // 快速短路：未启用或无可用的 getApiKey → 零请求，不抛 TypeError
+  if (!config.enabled || getApiKey === undefined) {
+    return 0;
+  }
+
+  // 同步过滤候选：excluded + 无 baseUrl/无模型
+  const excludedSet = new Set(config.excluded.map(canonicalizeProvider));
+  const modelMap = new Map<string, { id: string; baseUrl: string }>();
+  for (const m of models) {
+    if (m.baseUrl && !modelMap.has(canonicalizeProvider(m.provider))) {
+      modelMap.set(canonicalizeProvider(m.provider), { id: m.id, baseUrl: m.baseUrl });
+    }
+  }
+
+  const candidates = placeholderIds.filter((id) => {
+    const canonical = canonicalizeProvider(id);
+    if (excludedSet.has(canonical)) {
+      return false;
+    }
+    const modelInfo = modelMap.get(canonical);
+    if (!modelInfo) {
+      return false;
+    }
+    // cooldown 检查
+    if (!isStatusProbeDue(id, config.ttlMs)) {
+      return false;
+    }
+    return true;
+  });
+
+  if (candidates.length === 0) {
+    return 0;
+  }
+
+  // 对每个候选：先 markStatusProbeStarted（占位），再 await getApiKey
+  // 关死 in-flight 竞态窗口
+  const probePromises = candidates.map(async (provider) => {
+    markStatusProbeStarted(provider);
+    const apiKey = await getApiKey(provider);
+    if (!apiKey) {
+      // 无 key → 跳过请求但保留 cooldown 占位（下个 TTL 再查）
+      return null;
+    }
+    const modelInfo = modelMap.get(canonicalizeProvider(provider));
+    if (!modelInfo) {
+      return null;
+    }
+    return probeProviderStatus(provider, {
+      baseUrl: modelInfo.baseUrl,
+      model: modelInfo.id,
+      apiKey,
+      timeoutMs: config.timeoutMs,
+      fetchImpl,
+    });
+  });
+
+  // 并发探测，单个失败不连坐
+  const results = await Promise.allSettled(probePromises);
+  let written = 0;
+
+  for (const result of results) {
+    if (result.status === 'fulfilled') {
+      const probeResult = result.value;
+      if (!probeResult) {
+        continue; // 跳过的 provider
+      }
+      const canonical = canonicalizeProvider(probeResult.provider);
+      // 映射到状态机：exhausted/region-blocked → markExhausted；ok → markAvailable
+      if (probeResult.class === 'exhausted' || probeResult.class === 'region-blocked') {
+        markExhausted(probeResult.provider);
+        written++;
+        getLogger().info(`[omp-opsx-addon] status probe: ${canonical} -> ${probeResult.class}`);
+      } else if (probeResult.class === 'ok') {
+        markAvailable(probeResult.provider);
+        written++;
+        getLogger().info(`[omp-opsx-addon] status probe: ${canonical} -> ok`);
+      } else {
+        // auth-error/model-not-found/network-error 不写状态
+        getLogger().warn(
+          `[omp-opsx-addon] status probe: ${canonical} -> ${probeResult.class}${probeResult.detail ? ` (${probeResult.detail})` : ''}`,
+        );
+      }
+    }
+    // rejected promise 在理论上不应发生（probeProviderStatus 已吞没所有异常），防御性忽略
+  }
+
+  return written;
+}

package/lib/system-prompt.ts

@@ -100,15 +100,15 @@ export function buildStaticPrompt(): string {
 | 审查代码实现 | task(agent:"reviewer", task:"审阅代码 + 执行全局验证（lint/单测/e2e）") |
 
 ## 2 个 Loop
-- **Loop 1 – Propose → Review**:planner 完成 → proposal-reviewer → P0/P1 发回 → 通过告知用户。Propose-review loop：最多 planner→reviewer 往复 2 轮。
-- **Loop 2 – Code → Review**:coder 完成(交付前自验证)→ code-reviewer 审阅 + 全局验证 → P0/P1 发回修复 → 仅 P2+ 视为通过。Code-review loop：最多 coder→reviewer 往复 3 轮(含首次实现),reviewer 兼执行全局验证。
+- **Loop 1 – Propose → Review**:planner 完成 → proposal-reviewer → P0/P1 发回 → 通过告知用户。Propose-review loop：最多 planner→reviewer 往复 2 轮。委派 planner/proposal-reviewer 的 task 描述须含『先读 openspec/changes/<name>/scratchpad.md，禁止重复探索』。
+- **Loop 2 – Code → Review**:coder 完成(交付前自验证)→ code-reviewer 审阅 + 全局验证 → P0/P1 发回修复 → 仅 P2+ 视为通过。Code-review loop：最多 coder→reviewer 往复 3 轮(含首次实现),reviewer 兼执行全局验证。委派 coder/code-reviewer 的 task 描述须含『先读 openspec/changes/<name>/scratchpad.md，禁止重复探索』。
 - 达上限时停止自动流转，向用户说明未解决的问题并请求决策。
 
 ## /goal 集成(可选)
 Planner 在 proposal 末尾输出 \`## Budget Estimate\`;主 agent 提取用于 \`/goal\`。
 
 ## 自动流程协作
-coder 输出 STATUS: blocked 且含 SESSION: → 阅读阻塞原因决策;收到 P0/P1 → 修复再审。
+coder 输出 STATUS: blocked 且含 SESSION: → 阅读阻塞原因决策;收到 P0/P1 → 修复再审。P0/P1 发回修复时 task 描述同样须含『先读 openspec/changes/<name>/scratchpad.md，禁止重复探索』。
 
 ## 上下文卫生（主 session 预算）
 - 代码调研/搜代码/理解架构 → task(agent:"scout")；主 session 不亲自 read 全文调研。
@@ -118,7 +118,7 @@ coder 输出 STATUS: blocked 且含 SESSION: → 阅读阻塞原因决策;收到
 - 主 session 上下文超过 ~50k tokens：必须先委托再继续，禁止继续亲自调研。`;
 }
 
-const STATIC_LINE_COUNT = buildStaticPrompt().split('\n').length;
+export const STATIC_LINE_COUNT = buildStaticPrompt().split('\n').length;
 
 /** Dynamic layer: Dispatch config + change status. Placed after the static
  *  layer so only this tail is re-prefilled when it changes between turns. */

package/lib/unified-config.ts

@@ -20,7 +20,11 @@
  *     which models the auto-selector may pick from.
  *   - `tiers`: list of `{ pattern, tier }` overrides for tier scoring.
  *   - `role_tiers`: `role → tier_name` map overriding the default expected
- *     tier (DEFAULT_ROLE_TIER in model-tiers).
+ *     tier (DEFAULT_ROLE_TIER in model-tiers) for the four opsx agents.
+ *   - `model_role_tiers`: `omp_role → tier_name | 'skip'` map controlling
+ *     which selector tier each OMP model role (default/smol/slow/vision/plan/
+ *     designer/commit/tiny/task/advisor + custom roles) follows after
+ *     /pick-model; `skip` excludes the role from the session overlay.
  */
 
 import { existsSync, readFileSync } from 'fs';
@@ -60,12 +64,15 @@ export interface OpsxYamlShape {
     model_allowlist?: string[];
     tiers?: TierOverride[];
     role_tiers?: Partial<Record<OpsxRole, TierName>>;
+    /** OMP model role → tier override; `skip` excludes the role from the overlay. Keys are arbitrary strings (custom roles allowed). */
+    model_role_tiers?: Record<string, string>;
     plan_providers?: string[];
     probe_enabled?: boolean;
     probe_timeout_ms?: number;
     probe_http_enabled?: boolean;
     probe_ttl_ms?: number;
     excluded_providers?: string[];
+    status_probe_enabled?: boolean;
     redis_enabled?: boolean;
     redis_host?: string;
     redis_port?: number;
@@ -89,6 +96,8 @@ export interface ResolvedOpsxConfig {
     modelAllowlist: string[];
     tierOverrides: TierOverride[];
     roleTiers: Partial<Record<OpsxRole, TierName>>;
+    /** OMP model role → tier (or `'skip'`); drives the pick-model role overlay. */
+    ompRoleTiers: Record<string, TierName | 'skip'>;
     /** Provider ids that have monthly plan subscriptions. */
     planProviders: string[];
     warnings: string[];
@@ -102,6 +111,8 @@ export interface ResolvedOpsxConfig {
     probe_ttl_ms: number;
     /** 静态排除的 provider 列表（零探测成本） */
     excluded_providers: string[];
+    /** 是否开启状态探测，默认 true */
+    status_probe_enabled: boolean;
     /** 是否启用本地 Redis 实时中转（默认 true；false 时纯文件路径）。 */
     redis_enabled: boolean;
     /** Redis host（默认 127.0.0.1）。 */
@@ -214,6 +225,36 @@ export function parseRoleTiers(
     return out;
 }
 
+/**
+ * Validate `model_role_tiers` entries. Keys are OMP model role names
+ * (built-in OR custom — never checked against the built-in set); values
+ * must be a tier name or the sentinel `'skip'`. Invalid entries are dropped
+ * with a warning.
+ */
+export function parseOmpRoleTiers(
+    raw: unknown,
+    warn: (msg: string) => void,
+): Record<string, TierName | 'skip'> {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return {};
+    const out: Record<string, TierName | 'skip'> = {};
+    for (const [role, v] of Object.entries(raw as Record<string, unknown>)) {
+        if (typeof v !== 'string') {
+            warn(`[omp-opsx-addon] model_role_tiers.${role}: expected tier name or 'skip', got ${typeof v}`);
+            continue;
+        }
+        if (v === 'skip') {
+            out[role] = 'skip';
+            continue;
+        }
+        if (!TIER_NAMES.includes(v as TierName)) {
+            warn(`[omp-opsx-addon] model_role_tiers.${role}: expected tier name or 'skip' (got "${v}"; use one of ${TIER_NAMES.join('/')})`);
+            continue;
+        }
+        out[role] = v as TierName;
+    }
+    return out;
+}
+
 /** Validate the model_allowlist (array of glob strings). */
 export function parseModelAllowlist(
     raw: unknown,
@@ -302,6 +343,7 @@ export function parseOpsxConfig(
         modelAllowlist: parseModelAllowlist(obj.model_allowlist, localWarn),
         tierOverrides: parseTierOverrides(obj.tiers, localWarn),
         roleTiers: parseRoleTiers(obj.role_tiers, localWarn),
+        ompRoleTiers: parseOmpRoleTiers(obj.model_role_tiers, localWarn),
         planProviders: sanitizePlanProviders(obj.plan_providers),
         warnings,
         probe_enabled: parseProbeBool(obj.probe_enabled, 'probe_enabled', true, localWarn),
@@ -309,6 +351,7 @@ export function parseOpsxConfig(
         probe_http_enabled: parseProbeBool(obj.probe_http_enabled, 'probe_http_enabled', false, localWarn),
         probe_ttl_ms: parsePositiveInt(obj.probe_ttl_ms, 'probe_ttl_ms', 600_000, localWarn),
         excluded_providers: parseStringArray(obj.excluded_providers, 'excluded_providers', localWarn),
+        status_probe_enabled: parseProbeBool(obj.status_probe_enabled, 'status_probe_enabled', true, localWarn),
         redis_enabled: parseProbeBool(obj.redis_enabled, 'redis_enabled', true, localWarn),
         redis_host: redisHost,
         redis_port: parsePositiveInt(obj.redis_port, 'redis_port', 6379, localWarn),
@@ -353,12 +396,14 @@ function pickTopLevelKeys(raw: OpsxYamlShape): OpsxYamlShape {
         model_allowlist: raw.model_allowlist,
         tiers: raw.tiers,
         role_tiers: raw.role_tiers,
+        model_role_tiers: raw.model_role_tiers,
         plan_providers: raw.plan_providers,
         probe_enabled: raw.probe_enabled,
         probe_timeout_ms: raw.probe_timeout_ms,
         probe_http_enabled: raw.probe_http_enabled,
         probe_ttl_ms: raw.probe_ttl_ms,
         excluded_providers: raw.excluded_providers,
+        status_probe_enabled: raw.status_probe_enabled,
         redis_enabled: raw.redis_enabled,
         redis_host: raw.redis_host,
         redis_port: raw.redis_port,
@@ -443,12 +488,14 @@ export function readOpsxSettingsFromPaths(
     merged.model_allowlist = projectTop.model_allowlist ?? globalTop.model_allowlist;
     merged.tiers = projectTop.tiers ?? globalTop.tiers;
     merged.role_tiers = projectTop.role_tiers ?? globalTop.role_tiers;
+    merged.model_role_tiers = projectTop.model_role_tiers ?? globalTop.model_role_tiers;
     merged.plan_providers = projectTop.plan_providers ?? globalTop.plan_providers;
     merged.probe_enabled = projectTop.probe_enabled ?? globalTop.probe_enabled;
     merged.probe_timeout_ms = projectTop.probe_timeout_ms ?? globalTop.probe_timeout_ms;
     merged.probe_http_enabled = projectTop.probe_http_enabled ?? globalTop.probe_http_enabled;
     merged.probe_ttl_ms = projectTop.probe_ttl_ms ?? globalTop.probe_ttl_ms;
     merged.excluded_providers = projectTop.excluded_providers ?? globalTop.excluded_providers;
+    merged.status_probe_enabled = projectTop.status_probe_enabled ?? globalTop.status_probe_enabled;
     merged.redis_enabled = projectTop.redis_enabled ?? globalTop.redis_enabled;
     merged.redis_host = projectTop.redis_host ?? globalTop.redis_host;
     merged.redis_port = projectTop.redis_port ?? globalTop.redis_port;