@genee/omp-opsx-addon 0.9.0 → 0.11.0

package/README.md

@@ -51,7 +51,7 @@
 
 **共享协议技能** `skills/opsx-orchestration-protocol/SKILL.md` 是四角色共享编排协议的单一真源：scratchpad 四区共享缓存与角色读写矩阵（append-only、planner 建+写 / coder 读+写 / 两个 reviewer 只读）、supersede 权威语义与两档客观判据（档一继续 + supersede 修正，档二 `STATUS: blocked` 交主 agent 裁决）、无关状态硬栅栏（节内首行角色门——仅 coder 适用，reviewer / planner / proposal-reviewer MUST NOT 受本节限制）、P0/P1 评审闭环与轮次上限（Loop 1 ≤2 轮、Loop 2 最多 3 轮含首次实现与修复）、报告契约、生效与兜底。模板不再复述这些正文，每处只留指向技能的一行指针。
 
-- **位置与发现**：技能在包根 `skills/`，由宿主对扩展根的技能发现通道自动收录，**无需安装动作**——`installAgents()` 的写入集合仍只有 4 个 `.omp/agents/*.md` 与 `.addon-version`，不落项目目录、不建 `.omp/skills/`，技能也不参与 MARKER / 版本 / conflict 状态机。
+- **位置与发现**：技能在包根 `skills/`，由宿主对扩展根的技能发现通道自动收录，**无需安装动作**——`installAgents()` 的写入集合仍只有 4 个 `.omp/agents/*.md` 与 `.addon-version`（戳记录安装时插件包版本，不参与安装/更新判定），不落项目目录、不建 `.omp/skills/`，技能也不参与 MARKER / 版本 / conflict 状态机。
 - **生效方式**：frontmatter `autoloadSkills` 在子 agent 首个 prompt 之前把技能正文注入其上下文，等价于 `/skill:opsx-orchestration-protocol`（coder / planner 另各注入一个官方技能）。
 - **frontmatter**：`name` / `description` / `tools` / `autoloadSkills`（+ 可选 `model`）。原 `skill:` 字段是宿主 agent frontmatter 白名单不解析的死配置，已移除。
 - **兜底**：`autoloadSkills` 解析失败是静默的，故每份模板对**每个**技能各留一行 `skill://<name>` 指针（Skill tool 手动读取，逐行同构、不合并）；技能名不可解析且 `skill://<name>` 亦不可读时视为前提缺失，子 agent 输出 `STATUS: blocked`（无 SESSION）并报缺失技能名交由主 agent 决策，不凭记忆复述其流程。
@@ -117,11 +117,10 @@ payg_last_resort: true
 autoselect_on_start: true
 ```
 
-> **旧键已废弃（仍生效）**：顶层的 `coder:` / `reviewer:` / `planner:` / `proposal-reviewer:` 与
-> `role_tiers:` 是上面的旧写法，仍照常生效，但读到时会按层文件各 warn 一条（单文件多个旧键合并为
-> 一条、列出全部旧键名），并计划一个版本周期后移除。迁移：顶层 role 键挪进 `agents:` mapping、
-> `role_tiers:` 改名 `agent_tiers:`（schema 不变）。同一文件内新旧同现时**新键胜出**（`agents.*` >
-> 顶层旧键、`agent_tiers` > `role_tiers`）；跨层合并语义不变（agent 值逐键覆盖、tier 表整键覆盖）。
+> **旧键已移除（≥0.10.0）**：顶层的 `coder:` / `reviewer:` / `planner:` / `proposal-reviewer:` 与
+> `role_tiers:` 不再被读取。读到时仍按层文件各 warn 一条（单文件多个旧键合并为一条、列出全部旧键名，
+> 声明 no longer read），并指明迁移路径：顶层 role 键挪进 `agents:` mapping、`role_tiers:` 改名
+> `agent_tiers:`（schema 不变）。旧键值失效后受影响 agent 回落 `auto`、tier 期望回落默认档位。
 
 ### `agents` / `agent_tiers` 与 `model_role_tiers` 消歧义
 
@@ -170,7 +169,7 @@ reviewer pick（high 档选中模型；与当前模型一致则不调用 setMode
 实例只应用一次，之后用户显式 `/model` 切换保持权威——启动路径不会再次触发、不回写主会话模型。pinned role
 （`agents.*` 显式钉值）照常优先于自动 pick（钉值旁路选择器，不被自动写入覆盖）。启动应用路径的任何错误
 （选择计算抛错、settings 不可用、setModel 失败）只 warn（`[omp-opsx-addon] session-start autoselect error:
-...`），不阻塞会话启动。`autoselect_on_start: false`（任一层 opsx.yml）完全退出，行为与本键引入前一致。
+...`），不阻塞会话启动，也不进入重试。若首次尝试无异常完成但 reviewer pick 为空（冷启动探测超时 / 注册表晚就绪的典型形态），插件以有界退避 `[5s, 15s, 30s]` 后台重试（不阻塞 handler / 首 turn），重试前仅对当前不可达 provider 绕过 TTL 重探，并在 `ctx.models.current()` 显示用户已接管时静默让位；预算耗尽则 warn 一条并建议手动 `/pick-model`。`autoselect_on_start: false`（任一层 opsx.yml）完全退出（含重试），行为与本键引入前一致。
 手动 `/pick-model` 命令照常可用、立即生效；task 子 agent 不触发启动应用。
 
 ### `/pick-model`：selector 约束与 role 定向（`[roleList:]`）
@@ -459,8 +458,10 @@ quality_preference: balanced   # balanced（缺省，逐字节现状）| cost |
 - top 补选没有可用模型（候选耗尽/allowlist 全过滤）时，slow 不写覆盖、warn 汇总
   （`no-pick`），命令不中断；无任何模型时计划为空，与既有「模型注册表不可用」分支一致。
 - 覆盖为 **session 作用域、不写盘**：`overrideModelRoles` 只写 runtime overlay，
-  session 结束即还原；不会修改你的 `~/.omp/agent/config.yml`。每次应用前先
-  `clearOverride('modelRoles')`，避免上一 selector 的旧 role 值残留；`reset` 重算无约束
+  session 结束即还原；不会修改你的 `~/.omp/agent/config.yml`。每次应用前先清除本 session
+  的 modelRoles 运行时覆盖（宿主 18.3+ 走注册表句柄 `clearOverrideValue(cfgModelRoles)`，
+  ≤18.1 走路径式 `clearOverride('modelRoles')`，两者由 `lib/host-settings-adapter.ts`
+  统一选取），避免上一 selector 的旧 role 值残留；`reset` 重算无约束
   默认并覆盖（**不清空**，否则回落 config 硬钉）。
 
 > **手动清理建议**：若全局 `~/.omp/agent/config.yml` 里有 `modelRoles.smol` 钉在会耗尽的

package/index.ts

@@ -114,7 +114,7 @@ import {
 } from './lib/pick-model-render.js';
 import { buildStaticPrompt, buildDynamicPrompt } from './lib/system-prompt.js';
 import { type ProviderHealth, canonicalizeProvider, listDetectableProviders, healthCacheKey } from './lib/usage-resolver.js';
-import { readOpsxSettings, resolveManagedProviders, type ResolvedOpsxConfig, type RoleValue, OPSX_ROLES } from './lib/unified-config.js';
+import { readOpsxSettings, resolveManagedProviders, type ResolvedOpsxConfig, type AgentValue, OPSX_AGENTS } from './lib/unified-config.js';
 import {
     createConcurrencyController,
     createNodeFsPort,
@@ -362,7 +362,7 @@ const AGENT_MAP: Record<Role, string> = {
     'proposal-reviewer': 'proposal-reviewer',
 };
 function findRoleForModel(provider: string, modelId: string, sel: SelectionContext): Role | null {
-    for (const role of OPSX_ROLES) {
+    for (const role of OPSX_AGENTS) {
         const r = sel.selectorResults[role];
         if (!r) continue;
         if (r.allCandidates.some((c) => c.selector === `${provider}/${modelId}`)) {
@@ -375,10 +375,8 @@ function findRoleForModel(provider: string, modelId: string, sel: SelectionConte
 export interface SelectionContext {
     selectorResults: Record<Role, SelectorResult>;
     roleModels: Record<Role, string | undefined>;
-    /** Display label for each role from config, e.g. "auto", "smol", "deepseek-v4-pro". */
-    roleConfigs: Record<Role, string | undefined>;
     /** Parsed role value kind for each role (auto | omp-alias | model | provider-model). */
-    roleKind: Record<Role, RoleValue['kind']>;
+    roleKind: Record<Role, AgentValue['kind']>;
     /** Full-role session overlay payload written to `overrideModelRoles` (all known OMP roles). */
     roleOverrides: Record<string, string>;
     /** Known roles left out of the overlay payload (config skip / capability gate / no pick). */
@@ -389,7 +387,7 @@ export interface SelectionContext {
     routingBand?: TaskBand;
 }
 
-function roleValueToModelString(value: RoleValue): string | undefined {
+function roleValueToModelString(value: AgentValue): string | undefined {
     if (value.kind === 'auto') return undefined;
     if (value.kind === 'omp-alias') return `@${value.alias}`;
     if (value.kind === 'provider-model') return `${value.provider}/${value.modelId}`;
@@ -509,8 +507,7 @@ function computeSelectionSync(
         scopeRoles === null || scopedSlots.has(slot) ? filteredModels : basePool;
     const selectorResults = {} as Record<Role, SelectorResult>;
     const roleModels = {} as Record<Role, string | undefined>;
-    const roleConfigs = {} as Record<Role, string | undefined>;
-    const roleKind = {} as Record<Role, RoleValue['kind']>;
+    const roleKind = {} as Record<Role, AgentValue['kind']>;
     const planSet = mergePlanProviders(config.planProviders, config.planProvidersRemove);
     // Speed-aware selection: undefined when disabled — zero DB IO, and the
     // selector keeps the frozen W1 order byte-for-byte.
@@ -547,14 +544,9 @@ function computeSelectionSync(
         if (routing.stallActive && ROLE_TO_OMP_ALIAS[role] === 'default') parts.push('stall+1');
         return parts.length > 0 ? parts.join(', ') : undefined;
     };
-    for (const role of OPSX_ROLES) {
-        const value = config.roles[role];
+    for (const role of OPSX_AGENTS) {
+        const value = config.agents[role];
         roleKind[role] = value.kind;
-        // Config label shown in /pick-model choices markdown (`角色 (label)`):
-        // auto roles display the OMP tier-role alias; pinned roles the pin.
-        roleConfigs[role] = value.kind === 'auto'
-            ? ROLE_TO_OMP_ALIAS[role]
-            : (roleValueToModelString(value) ?? '?');
         const alias = `@${ROLE_TO_OMP_ALIAS[role]}`;
         if (value.kind === 'auto') {
             // coder's pick feeds the mid slot, the other three feed high —
@@ -563,10 +555,10 @@ function computeSelectionSync(
             const pool = poolForSlot(role === 'coder' ? 'mid' : 'high');
             if (pool && pool.length > 0) {
                 const ompRole = ROLE_TO_OMP_ALIAS[role];
-                const tier = routedTierFor(role, ompRole, (config.roleTiers[role]
+                const tier = routedTierFor(role, ompRole, (config.agentTiers[role]
                     ?? (OMP_ROLE_TO_TIER as Record<string, TierName>)[ompRole]
                     ?? 'mid') as TierName);
-                const roleTiers = { ...config.roleTiers, [role]: tier };
+                const roleTiers = { ...config.agentTiers, [role]: tier };
                 const result = selectAllRoles(
                     [role],
                     pool,
@@ -611,7 +603,7 @@ function computeSelectionSync(
     // roleOverrides; explicit paths bypass (显式指令 > 守门).
     if (routing?.guard && !routing.explicit) {
         const incumbentResults = routing.guard.incumbent?.selectorResults ?? null;
-        for (const role of OPSX_ROLES) {
+        for (const role of OPSX_AGENTS) {
             const prev = incumbentResults?.[role];
             if (!prev?.picked) continue;
             const cur = selectorResults[role];
@@ -709,7 +701,7 @@ function computeSelectionSync(
         roleOverrides = plan.overrides;
         skippedRoles = plan.skipped;
     }
-    return { selectorResults, roleModels, roleConfigs, roleKind, roleOverrides, skippedRoles, paygLastResort: config.paygLastResort, routingBand: routing?.band };
+    return { selectorResults, roleModels, roleKind, roleOverrides, skippedRoles, paygLastResort: config.paygLastResort, routingBand: routing?.band };
 }
 // change: pick-model-ux — choices/switch/refresh/reset output rendering lives
 // in lib/pick-model-render.ts (shared compact block renderer); the former
@@ -758,6 +750,14 @@ interface OwnedConcurrency {
 
 let ownedConcurrency: OwnedConcurrency | null = null;
 
+// Process-wide resize-handler slot: the host re-runs the plugin factory per
+// session binding WITHOUT re-evaluating the module graph, so a closure-level
+// "previous handler" variable is per-instance — each binding would attach its
+// own stdout resize listener and nobody could off the others (observed as
+// MaxListenersExceededWarning: 11 resize listeners after enough bindings).
+// Module scope gives every binding the same single slot.
+let activeResizeHandler: (() => void) | null = null;
+
 /** Test-only: reset the module-level control-loop owner (production never calls this). */
 export function __resetOwnedConcurrencyForTests(): void {
     ownedConcurrency = null;
@@ -843,7 +843,7 @@ export interface ConcurrencyAssemblyDeps {
     configPath: string;
     /** Agent dir the log reader / `model_perf` path derive from. */
     agentDir?: string;
-    /** Host settings port for the hot-apply (`settings.override`). */
+    /** Host settings singleton for the hot-apply (API generation resolved inside the adapter). */
     settings?: SettingsPort | null;
     /** Cross-process ① aggregation channel (`null` → local-only + warn). */
     redis?: ConcurrencyRedisPort | null;
@@ -898,6 +898,9 @@ export function createConcurrencyControllerIfEnabled(
 
 // ── plugin entry ────────────────────────────────────────────────────
 
+/** Bounded backoff for session-start autoselect cold-start recovery (precedent: RESET_IMMINENT_MS). Not a config key. */
+export const AUTOSELECT_RETRY_DELAYS_MS = [5_000, 15_000, 30_000] as const;
+
 export default (pi: ExtensionAPI) => {
     // Route plugin logging through the host logger (rolling file) instead of
     // console.*, which would corrupt the TUI. Injected before any log path runs.
@@ -907,19 +910,21 @@ export default (pi: ExtensionAPI) => {
     // but the model repeatedly breaks sloppy control lines too — retry loops
     // burn tokens and abort agents. Point it at the simplest old_string/
     // new_string "replace" variant instead.
-    // Preferred path: `settings.override` (in-memory, per-session). omp
-    // 18.0.11 removed `edit.modelVariants` from the settings schema, so on
-    // that host the pin is persisted into the global config.yml once — the
-    // host reads the merged view directly, making the file equivalent.
-    applyEditVariantPin(pi, { 'deepseek-v4-flash': 'replace' });
+    // Preferred path: the runtime override (registry handle on omp >= 18.3,
+    // `settings.override` before that), in-memory and per-session. omp 18.0.11
+    // dropped `edit.modelVariants` from the path-based settings schema, so on
+    // hosts where neither runtime API reaches it the pin is persisted into the
+    // global config.yml once — the host reads the merged view directly, making
+    // the file equivalent. Fire-and-forget: the pin applies from the first
+    // edit turn, nothing here depends on its completion, and the function
+    // never rejects (it warns through the host logger).
+    void applyEditVariantPin(pi, { 'deepseek-v4-flash': 'replace' });
     const directory = process.cwd();
     const warn = (msg: string) => pi.logger.warn(msg);
     const opsxConfig = readOpsxSettings(directory, warn, opsxGlobalHomeForTests ?? homedir());
     // Static orchestration rules — built once, reused every turn for cache stability.
     const STATIC_PROMPT = buildStaticPrompt();
     let initialModel: { provider: string; id: string } | null = null;
-    // Active resize handler — tracked so each session_start can off the previous one.
-    let activeResizeHandler: (() => void) | null = null;
     let selection: SelectionContext | null = null;
     // 403 no longer auto-blocks; the set is always empty in the running session.
     // A one-time startup migration clears stale blockedModels written by the old
@@ -1070,12 +1075,12 @@ export default (pi: ExtensionAPI) => {
      * poller/assembly call sites keep the all-auto semantics.
      */
     const buildEffectiveConfig = (scopedSlots: ReadonlySet<TierName> | null = null): ResolvedOpsxConfig => {
-        const roles = {} as Record<Role, RoleValue>;
-        for (const role of OPSX_ROLES) {
+        const agents = {} as Record<Role, AgentValue>;
+        for (const role of OPSX_AGENTS) {
             const slot: TierName = role === 'coder' ? 'mid' : 'high';
-            roles[role] = scopedSlots === null || scopedSlots.has(slot) ? { kind: 'auto' } : opsxConfig.roles[role];
+            agents[role] = scopedSlots === null || scopedSlots.has(slot) ? { kind: 'auto' } : opsxConfig.agents[role];
         }
-        return { ...opsxConfig, roles };
+        return { ...opsxConfig, agents };
     };
     const startPollerFor = async (ctx: ExtensionContext, onTick?: () => void): Promise<void> => {
         const auth = ctx.modelRegistry?.authStorage;
@@ -1099,7 +1104,12 @@ export default (pi: ExtensionAPI) => {
         });
     };
 
-    const ensureSelection = (ctx: ExtensionContext, force = false, explicit = false): Promise<SelectionContext> => {
+    const ensureSelection = (
+        ctx: ExtensionContext,
+        force = false,
+        explicit = false,
+        opts?: { reprobeUnreachable?: boolean },
+    ): Promise<SelectionContext> => {
         if (selectionPromise && !force) return selectionPromise;
         selectionPromise = (async () => {
             await startPollerFor(ctx);
@@ -1109,7 +1119,7 @@ export default (pi: ExtensionAPI) => {
             } catch (e) {
                 warn(`[omp-opsx-addon] modelRegistry error: ${e}`);
             }
-            const reach = await refreshReachability(models, opsxConfig);
+            const reach = await refreshReachability(models, opsxConfig, opts);
             firstUnreachableProviders = reach.unreachable;
             availableByProvider = reach.availableByProvider;
             const health = getSharedUsage()?.health ?? null;
@@ -1149,8 +1159,8 @@ export default (pi: ExtensionAPI) => {
     // copy in node_modules is a separate, uninitialized instance — writing to
     // it was a no-op). This thin wrapper is the single call site the
     // constrained-period tick-reselect path (auto-model-family) also uses.
-    const applyRoleModel = (sel: SelectionContext): void => {
-        applyRoleModelOverrides(pi.pi?.settings, sel, warn);
+    const applyRoleModel = async (sel: SelectionContext): Promise<void> => {
+        await applyRoleModelOverrides(pi.pi?.settings, sel, warn);
     };
 
     // Instance-level usage-record claim: true only while this instance's
@@ -1164,10 +1174,15 @@ export default (pi: ExtensionAPI) => {
     let recordsOwnUsage = false;
 
     // ── adaptive provider concurrency: host seams ─────────────────
-    /** Host settings port for the control loop's hot-apply (narrowed to `override`). */
+    /**
+     * Host settings port for the control loop's hot-apply. The API shape is the
+     * adapter's business (`lib/host-settings-adapter.ts`: registry handles on
+     * omp >= 18.3, path-based `override` before that), so any object — i.e.
+     * every host generation — qualifies here.
+     */
     const hostSettingsPort = (): SettingsPort | null => {
-        const settings = pi.pi?.settings as unknown as { override?: unknown } | undefined;
-        return settings && typeof settings.override === 'function' ? (settings as SettingsPort) : null;
+        const settings = pi.pi?.settings as unknown;
+        return settings && typeof settings === 'object' ? (settings as SettingsPort) : null;
     };
     /** Config root + agent dir for the control loop (host settings, else `~/.omp/agent`). */
     const resolveConcurrencyPaths = (): { agentDir: string; configPath: string } => {
@@ -1507,7 +1522,8 @@ export default (pi: ExtensionAPI) => {
                 },
             });
             // One resize listener per process: each new owning session replaces
-            // the previous handler instead of accumulating. (ExtensionContext
+            // the previous handler in the module-level slot instead of
+            // accumulating across factory re-bindings. (ExtensionContext
             // exposes no `signal`, so per-session abort cleanup never fires —
             // ownership above, not teardown hooks, keeps the singletons sane.)
             if (activeResizeHandler) process.stdout.off('resize', activeResizeHandler);
@@ -1696,7 +1712,7 @@ export default (pi: ExtensionAPI) => {
     pi.on('session_start', async (_event, ctx) => {
         try {
             const frontmatter = (role: Role): string | undefined =>
-                frontmatterModel(role, opsxConfig.roles[role]);
+                frontmatterModel(role, opsxConfig.agents[role]);
             await installAgents(
                 directory,
                 frontmatter('coder'),
@@ -1719,25 +1735,67 @@ export default (pi: ExtensionAPI) => {
     // choice. Owner gate before the once-flag: subagent bindings re-run the
     // factory with independent closures (a closure once-flag cannot see
     // them), so the process-level owner rule decides — same rule as the
-    // usage/render claim in the first handler. Awaited, never fire-and-forget:
-    // a detached apply would race the user's first prompt onto the native
-    // model. Pins (opsx.yml agents.*) bypass selection via synthPinnedResult
-    // and are never touched here.
+    // usage/render claim in the first handler. First attempt is awaited
+    // (first-turn-before-prompt contract); cold-start no-pick recovery is a
+    // bounded fire-and-forget retry chain that does not block the handler.
+    // Pins (opsx.yml agents.*) bypass selection via synthPinnedResult and are
+    // never touched here.
     pi.on('session_start', async (_event, ctx) => {
         if (!opsxConfig.autoselectOnStart) return;
         if (!(ctx.hasUI || !hasTickOwner())) return;
         if (autoApplied) return;
         autoApplied = true;
-        try {
-            const sel = await ensureSelection(ctx);
-            applyRoleModel(sel);
-            const picked = sel.selectorResults.reviewer?.picked;
-            if (picked && ctx.model && `${ctx.model.provider}/${ctx.model.id}` !== `${picked.provider}/${picked.id}`) {
-                await pi.setModel(picked);
+
+        const modelKeyOf = (m: { provider?: string; id?: string } | null | undefined): string | null =>
+            m?.provider && m?.id ? `${m.provider}/${m.id}` : null;
+        const entryModelKey = modelKeyOf(ctx.model);
+
+        const attemptOnce = async (reprobeUnreachable: boolean): Promise<'picked' | 'no-pick' | 'error'> => {
+            try {
+                const sel = await ensureSelection(
+                    ctx,
+                    false,
+                    false,
+                    reprobeUnreachable ? { reprobeUnreachable: true } : undefined,
+                );
+                await applyRoleModel(sel);
+                const picked = sel.selectorResults.reviewer?.picked;
+                if (picked && ctx.model && `${ctx.model.provider}/${ctx.model.id}` !== `${picked.provider}/${picked.id}`) {
+                    await pi.setModel(picked);
+                }
+                return picked ? 'picked' : 'no-pick';
+            } catch (e) {
+                warn(`[omp-opsx-addon] session-start autoselect error: ${e}`);
+                return 'error';
             }
-        } catch (e) {
-            warn(`[omp-opsx-addon] session-start autoselect error: ${e}`);
-        }
+        };
+
+        const first = await attemptOnce(false);
+        if (first !== 'no-pick') return;
+
+        // Fire-and-forget bounded recovery: first attempt already failed with
+        // no reviewer pick (typical cold-start probe/registry lag). Do not
+        // await this chain in the handler — that would delay the first turn.
+        void (async () => {
+            try {
+                for (const delay of AUTOSELECT_RETRY_DELAYS_MS) {
+                    await new Promise<void>((r) => setTimeout(r, delay));
+                    // Yield to an explicit user /model or manual /pick-model
+                    // (both change the live session model via setModel).
+                    const live = typeof ctx.models?.current === 'function' ? ctx.models.current() : undefined;
+                    if (live !== undefined && live !== null && modelKeyOf(live) !== entryModelKey) {
+                        return;
+                    }
+                    const outcome = await attemptOnce(true);
+                    if (outcome !== 'no-pick') return;
+                }
+                warn(
+                    '[omp-opsx-addon] session-start autoselect: retries exhausted; run /pick-model to apply manually',
+                );
+            } catch (e) {
+                warn(`[omp-opsx-addon] session-start autoselect retry error: ${e}`);
+            }
+        })();
     });
     // ── Diagnostic-only error path (429/403; never auto-switches) ─
     const diagnoseProviderError = async (ctx: ExtensionContext, source: string, errorType: '429' | '403'): Promise<void> => {
@@ -1919,13 +1977,13 @@ export default (pi: ExtensionAPI) => {
                         }
                     }
                     // Check all agent models
-                    for (const role of OPSX_ROLES) {
+                    for (const role of OPSX_AGENTS) {
                         const result = freshSel.selectorResults[role];
                         const picked = result?.picked;
                         if (!picked) continue;
                         const agent = AGENT_MAP[role];
                         const pickedSel = `${picked.provider}/${picked.id}`;
-                        const roleCfg = opsxConfig.roles[role];
+                        const roleCfg = opsxConfig.agents[role];
                         if (roleCfg.kind === 'model' || roleCfg.kind === 'provider-model') {
                             const pinned = roleValueToModelString(roleCfg);
                             if (pinned && pinned !== pickedSel) {
@@ -1946,7 +2004,7 @@ export default (pi: ExtensionAPI) => {
                         }
                     }
                     selection = freshSel;
-                    applyRoleModel(freshSel);
+                    await applyRoleModel(freshSel);
                     const content = changes.length > 0
                         ? renderPickModelReport('refresh', { action: '已刷新', constraint: formatFamilyConstraint(familyConstraint) || undefined, detail: [changes.join('\n')] }, symbols)
                         : renderPickModelReport('refresh', { action: '已刷新 · 所有模型状态正常，无需切换' }, symbols);
@@ -1996,7 +2054,7 @@ export default (pi: ExtensionAPI) => {
                             ...annotationOfPicked(sel.selectorResults.reviewer, newPrimary),
                         }));
                     }
-                    for (const role of OPSX_ROLES) {
+                    for (const role of OPSX_AGENTS) {
                         const picked = sel.selectorResults[role]?.picked;
                         if (!picked) continue;
                         const newSel = `${picked.provider}/${picked.id}`;
@@ -2013,7 +2071,7 @@ export default (pi: ExtensionAPI) => {
                     if (newPrimary) await pi.setModel(newPrimary);
                     selection = sel;
                     selectionHealthKey = buildSelectionHealthKey(health, reach, familyConstraint, collapsed);
-                    applyRoleModel(sel);
+                    await applyRoleModel(sel);
                     pi.sendMessage({
                         customType: 'pick-model',
                         content: renderPickModelReport('reset', {
@@ -2117,7 +2175,7 @@ export default (pi: ExtensionAPI) => {
                     // fail to pick. Out-of-scope pinned/omp-alias roles keep their
                     // config value and synthPinnedResult never carries a picked —
                     // counting them would roll back every scoped constraint.
-                    const emptyRole = OPSX_ROLES.find(
+                    const emptyRole = OPSX_AGENTS.find(
                         (r) => sel.roleKind[r] === 'auto' && !sel.selectorResults[r]?.picked,
                     );
                     if (emptyRole) {
@@ -2136,7 +2194,7 @@ export default (pi: ExtensionAPI) => {
                     const currentModel = ctx.model;
                     const oldPrimary = currentModel ? `${currentModel.provider}/${currentModel.id}` : undefined;
                     const oldRolePicks: Record<string, string | undefined> = {};
-                    for (const role of OPSX_ROLES) {
+                    for (const role of OPSX_AGENTS) {
                         const prev = selection?.selectorResults[role]?.picked;
                         oldRolePicks[role] = prev ? `${prev.provider}/${prev.id}` : undefined;
                     }
@@ -2152,7 +2210,7 @@ export default (pi: ExtensionAPI) => {
                             ...annotationOfPicked(sel.selectorResults.reviewer, newPrimary),
                         }));
                     }
-                    for (const role of OPSX_ROLES) {
+                    for (const role of OPSX_AGENTS) {
                         const picked = sel.selectorResults[role]?.picked;
                         if (!picked) continue;
                         const newSel = `${picked.provider}/${picked.id}`;
@@ -2186,7 +2244,7 @@ export default (pi: ExtensionAPI) => {
                     if (newPrimary) await pi.setModel(newPrimary);
                     selection = sel;
                     selectionHealthKey = buildSelectionHealthKey(health, reach, familyConstraint, collapsed);
-                    applyRoleModel(sel);
+                    await applyRoleModel(sel);
                     const content = renderPickModelReport('switch', {
                         action: '已切换 selector 约束',
                         constraint: formatFamilyConstraint(familyConstraint) || undefined,
@@ -2204,7 +2262,7 @@ export default (pi: ExtensionAPI) => {
                 // ── /pick-model choices (default) ────────────────
                 const sel = await getSelectionForCommand(ctx);
                 const roleLines = formatRoleLines(
-                    OPSX_ROLES.map((role) => ({
+                    OPSX_AGENTS.map((role) => ({
                         name: AGENT_MAP[role],
                         kind: sel.roleKind[role],
                         fallbackModel: sel.roleModels[role],
@@ -2248,9 +2306,9 @@ export default (pi: ExtensionAPI) => {
                     action: '当前选择',
                     constraint: formatFamilyConstraint(familyConstraint) || undefined,
                     detail,
-                    overview: formatCandidateOverview(OPSX_ROLES.map((role) => sel.selectorResults[role])),
+                    overview: formatCandidateOverview(OPSX_AGENTS.map((role) => sel.selectorResults[role])),
                     appendix: appendixParts.length > 0 ? appendixParts.join('\n') : undefined,
-                    footnote: formatFootnote(OPSX_ROLES.map((role) => sel.selectorResults[role]), sel.paygLastResort),
+                    footnote: formatFootnote(OPSX_AGENTS.map((role) => sel.selectorResults[role]), sel.paygLastResort),
                 }, symbols);
                 pi.sendMessage({ customType: 'pick-model', content, display: true }, { triggerTurn: false });
             } catch (e) {

package/lib/agent-defs.ts

@@ -1,4 +1,20 @@
-export const ADDON_VERSION = '0.1.0';
+import { existsSync, readFileSync } from 'fs';
+import { readFile, writeFile, mkdir } from 'fs/promises';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+
+function readAddonVersion(): string {
+    try {
+        const pkgPath = join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json');
+        const raw = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+        const v = raw?.version;
+        return typeof v === 'string' && v.trim() !== '' ? v : '0.0.0';
+    } catch {
+        return '0.0.0';
+    }
+}
+
+export const ADDON_VERSION = readAddonVersion();
 
 const MARKER = '<!-- @genee/omp-opsx-addon -->';
 
@@ -120,11 +136,12 @@ autoloadSkills: opsx-orchestration-protocol${model ? `\nmodel: "${model}"` : ''}
 ${MARKER}
 `;
 
-const CODER_MD = (model?: string) => `---
+export const CODER_MD = (model?: string) => `---
 name: coder
 description: OpenSpec 变更实现 agent，同步 tasks.md 进度
 tools: read, write, edit, bash, glob, grep, todo
-autoloadSkills: opsx-orchestration-protocol, openspec-apply-change${model ? `\nmodel: "${model}"` : ''}
+autoloadSkills: opsx-orchestration-protocol, openspec-apply-change
+thinkingLevel: low${model ? `\nmodel: "${model}"` : ''}
 ---
 
 你是一个快速、专注的代码实现 agent。你从 prompt 和对话上下文推断要做什么。
@@ -146,6 +163,10 @@ autoloadSkills: opsx-orchestration-protocol, openspec-apply-change${model ? `\nm
 - E2E 不属于自验证门槛，开发过程中不跑；整个变更只在终审轮由 code-reviewer 跑一次。
 - 项目级全量校验（全仓库 lint/typecheck/\`bun test\`）不属于自验证门槛：若失败可归因于并发 sibling 的半成品改动（与本改动无关），把失败连同「已排查与本改动无关」的证据作为上下文上报（交付摘要中注明），不要被其阻塞；最终由 code-reviewer 的全局验证兜底确认。
 
+## 执行效率
+- 相互独立的只读调用（read/grep/glob）MUST 在同一轮内并行打包发起，不得一次一轮串行。
+- 顺序无关的验证命令（lint/typecheck/单测）用 \`&&\` 或 \`;\` 串联在单次 bash 里执行，不得每条命令单独一轮。
+
 ## 协作流程（由你编排）
 三条义务（报告 → 修复 → 轮次上限）见技能 \`opsx-orchestration-protocol\` 的「评审闭环与轮次上限」节。
 
@@ -166,7 +187,7 @@ FILES: <逗号分隔的修改/创建文件列表>
 ${MARKER}
 `;
 
-const PLANNER_MD = (model?: string) => `---
+export const PLANNER_MD = (model?: string) => `---
 name: planner
 description: OpenSpec 提案规划 agent
 tools: read, write, edit, bash, glob, grep, todo
@@ -186,6 +207,7 @@ autoloadSkills: opsx-orchestration-protocol, openspec-propose${model ? `\nmodel:
 ## 提案拆分
 - 接大需求先评估契约边界:能拆则拆成多个小变更,先输出拆分建议(契约边界+提案清单)待主 agent 确认后再开写。对冲:同批串行落地、共享编辑区的强耦合改动合并为一个提案不拆;拆分收益仅在分批落地时成立。
 - 纲领/roadmap change 只做层级管理(阶段/依赖/验收口径),不含实现细节。
+- tasks.md 单个任务预估执行轮次超过约 40 轮（多文件、多验证环节）时 MUST 拆分为可独立交付的子任务——上下文重放随轮数二次增长，长任务是重放大头。
 
 ## Budget 估算
 
@@ -220,10 +242,6 @@ autoloadSkills: opsx-orchestration-protocol, openspec-propose${model ? `\nmodel:
 ${MARKER}
 `;
 
-import { readFile, writeFile, mkdir } from 'fs/promises';
-import { existsSync } from 'fs';
-import { join } from 'path';
-
 type Status = 'unchanged' | 'created' | 'updated' | 'conflict';
 
 async function agentStatus(file: string, want: string): Promise<Status> {

package/lib/concurrency-control.ts

@@ -471,7 +471,7 @@ export interface ConcurrencyControlOptions {
     dbPath?: string;
     /** Cross-process ① aggregation channel; `null`/omitted disables it (warn + local only). */
     redis?: ConcurrencyRedisPort | null;
-    /** Settings hot-apply seam; omitted → file write only. */
+    /** Host settings singleton for the hot-apply seam; omitted → file write only. */
     settings?: SettingsPort | null;
     /** Per-provider ceiling overrides (`concurrency_ceiling_by_provider`). */
     ceilingByProvider?: Record<string, number>;
@@ -868,7 +868,7 @@ export class ConcurrencyController {
             const shared = sharedMap[provider];
             const divergedFromShared = typeof shared === 'number' && shared !== next.limit;
             if ((evaluation.increased || evaluation.decreased || decay.moved || divergedFromShared) && isWriter) {
-                view.written = this.persistLimit(provider, next.limit, sharedMap, now);
+                view.written = await this.persistLimit(provider, next.limit, sharedMap, now);
             }
             result.providers[provider] = view;
         }
@@ -1145,12 +1145,12 @@ export class ConcurrencyController {
         return Math.max(1, Math.ceil((interval * AGGREGATION_TTL_INTERVALS) / 1000));
     }
 
-    private persistLimit(
+    private async persistLimit(
         provider: string,
         limit: number,
         sharedMap: Record<string, number>,
         now: number,
-    ): boolean {
+    ): Promise<boolean> {
         // Write gate (task 4.2): |Δ| >= 1 AND more than
         // concurrency_write_min_interval_ms since this provider's last write.
         const gate = shouldWriteLimit({
@@ -1179,7 +1179,7 @@ export class ConcurrencyController {
             return false;
         }
         // Adopt the in-lock read: it is the freshest view of every provider, so
-        // the rest of this tick and the whole-key `settings.override` below never
+        // the rest of this tick and the whole-key hot-apply override below never
         // carry a snapshot taken before another process's write landed.
         if (outcome.limits) {
             for (const [id, value] of Object.entries(outcome.limits)) sharedMap[id] = value;
@@ -1188,7 +1188,7 @@ export class ConcurrencyController {
         this.lastWriteAt.set(provider, now);
         if (this.settings) {
             try {
-                const applied = applyLimit({
+                const applied = await applyLimit({
                     settings: this.settings,
                     merged: outcome.limits ?? merged,
                     provider,