Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(pi): adapt model refresh to official Pi APIs (#5378)
Chris Zhange90b4020caf8
diff --git a/docs/dev-rules/pi-harness.md b/docs/dev-rules/pi-harness.mdindex 1e04f717c1..4875a24442 100644--- a/docs/dev-rules/pi-harness.md+++ b/docs/dev-rules/pi-harness.md@@ -94,9 +94,12 @@ Pi 任务时冻结,并写入该任务 `settings.json` 的 `compaction.reserveT模型容量用于 Pi 原生请求长度裁剪,不能随小预算缩到 1K;工作预算只调整原生压缩阈值,并作为已应用预算进入 Cindy 的用量快照。大窗切小窗先由 Desktop 的统一目标窗口事务按目标窗口 90% 固定压力线评估(独立于 Pi-日常自动压缩百分比),命中时复用既有上下文接续事务;未命中时保留当前原生会话,使用-`set_compaction_reserve_tokens` 原地更新压缩保留量,再用原生 `set_model` 与 `get_state`-确认 provider/model/contextWindow。同 ID 模型的目录资料或工作预算改变也属于这条路径。+日常自动压缩百分比),命中时复用既有上下文接续事务;未命中时,已加载的 Pi 1.0 模型使用启动时写入的+`compaction.modelOverrides["provider/modelId"].reserveTokens`,再用原生 `set_model` 与+`get_state` 确认 provider/model/contextWindow。百分比沿用任务启动快照;工作预算按来源和模型解析。+如果新目录或工作预算要求的保留量与运行中 Pi 实际配置不同,预览返回既有 `rebuild`,+由宿主恢复流程加载配置;不得谎称文件改写已更新 Pi 内存。旧 Pi 不支持按模型配置时,+同保留量的选择仍可热切,需变化时走同一预览分支。普通切模不得用 `switch_session` 或扩展 `/reload` 重读压缩配置:两者会重建会话或扩展状态,不能当成无损配置刷新。忙时选择必须在回合结束后走同一切换与容量事务,不能由延后服务直接关闭 Pi。原生校验完成前,子代理 route 保持 pending;确认并持久化目标路由后才放行@@ -130,8 +133,9 @@ SSH 不套用本机限核值。沿用现有默认值与 override 存储,不新### 运行中的模型目录与凭据更新模型目录更新沿用 Cindy 的统一目录和 Pi 的原生 provider 配置,不能另建一份模型权威表。-先预览目标资料和容量,再在现有串行切换边界应用配置;Pi 的 `refresh_models` 只刷新目录,-即使 provider/model ID 未变也须通过 `set_model` 应用新 descriptor。刷新响应中的+先预览目标资料和容量,再在现有串行切换边界应用配置;扩展调用公开的+`ctx.modelRegistry.refresh({ allowNetwork: false })` 刷新目录,+即使 provider/model ID 未变也须通过 `set_model` 应用新 descriptor。刷新结果中的`aborted` 或 provider errors 表示未完整成功,不能仅凭 RPC `success: true` 继续。新增原生适配器使用 Pi 公开的 `unregisterProvider`/`registerProvider` 与模型目录刷新,@@ -140,11 +144,14 @@ Pi 内存,不进入 prompt、聊天历史、日志或明文配置文件。交后续子代理的启动配置和来源专用授权;已运行子代理仍保留其独立身份。私有命令的 prompt响应不等于配置成功,必须收到对应 nonce 的完成回执。来源一致性检查不可因热切而删除。-`refresh_models` 与 `set_compaction_reserve_tokens` 需要配套 Pi 原生 RPC 支持;当前-`tools/pi/latest.json` 的版本 pin 不代表这两项接口已经发布。旧 Pi 缺少本次操作所需接口时,-在改变当前模型前明确反馈,不自动降级为会话重载。开发、单测或本地补丁通过不等于托管-runtime 已升级;发布须分别核验 Pi 接口、Cindy 接入与实际 runtime 版本。-接口补丁、重启边界和隔离验证见+**只适配官方 Pi,不修改 Pi 源码或二进制。** `refresh_models` 与+`set_compaction_reserve_tokens` 不是官方 RPC,不得作为 Cindy 的运行依赖,也不再维护+配套补丁。Pi 上游缺陷与 Cindy 适配缺陷分别记录;不得为了使检查变绿而定制 runtime。++同一私有桥接的只读 `inspect` 操作通过运行期 `pi.getSettings()` 返回配置副本与 Pi+版本;不修改凭据、不重载扩展。旧版没有该 API 时使用启动时读取的私有设置快照。+Pi action API 不能在扩展加载期间调用。查询命令的归属与 nonce 必须验证,避免未知 slash+命令变成实际模型输入;设置回执确认后才继续切模。官方接口与恢复边界见[`../research/pi-native-model-refresh.md`](../research/pi-native-model-refresh.md)。diff --git a/docs/research/pi-native-model-refresh.md b/docs/research/pi-native-model-refresh.mdindex 3b801a7f4a..edb88142d2 100644--- a/docs/research/pi-native-model-refresh.md+++ b/docs/research/pi-native-model-refresh.md@@ -1,88 +1,56 @@-# Pi 原生模型刷新与会话连续性--## 问题与采用的方向--已有任务跨来源选模型被拒绝,源于 Cindy 外层将来源变化一律判成进程替换,-而窗口检查又禁止这类替换。只删除拒绝条件会恢复换模型,但仍会丢掉 Pi 进程内状态。-此外,过去通过 `switch_session` 重读压缩配置,即使不退出进程,也会重建会话和扩展。--本次沿用 Pi 原生模型选择、provider 注册和压缩机制:普通切模保留当前会话,-目录下发与凭据变化先进入 Pi,再选择目标模型;容量不足走 Cindy 已有的目标窗口-保护和上下文接续。不能把重新打开 Pi 会话当作普通配置刷新。--对应报告:[跨来源选择被拒绝](https://github.com/makecindy/cindy/issues/4486)。-其建议中的关闭后懒创建不是本次采用的默认方案。--## Pi 配套改动与发布依赖--[配套补丁](pi-native-model-refresh.patch) 基于 Pi-`1b347794e2a630e4359f2584f4eea388145d0ddf`,新增两个小范围原生 RPC:--- `refresh_models`:离线重读模型配置,不替换当前模型描述、扩展实例或排队输入。- 返回的 `aborted` 和 provider `errors` 必须同时检查;成功后显式 `set_model`- 才应用目标描述,包括 provider/model ID 没变的情况。-- `set_compaction_reserve_tokens`:调整当前会话的压缩保留量,所有既有压缩入口- 读取同一有效值;`null` 恢复配置值。不会落盘或触发会话重载。--该补丁是供评审与上游提交使用的源码制品,**不被 Cindy 构建自动应用**。-`tools/pi/latest.json` 仍为 v0.85.1,没有改 pin、下载或替换托管 runtime。-因此本分支不代表现有安装版本已具备新增接口,也不能单独作为完整修复发布。-配套 Pi 版本发布、托管 runtime 更新和实际平台验收须分别完成。--旧 Pi 可以直接完成的选择继续使用原生 `set_model`;需要新接口时,先探测其支持,-在改变目录、凭据或模型前报错,保留原会话。不能用 `switch_session`、`/reload`-或自动关闭来掩盖接口缺失。--2026-09-30 查询时,上游贡献规则要求维护者先给予 `lgtm`,当前提交账号未在批准-名册中;配套改动已本地实现并验证,尚未向上游提交 PR。规则见-[Pi CONTRIBUTING.md](https://github.com/earendil-works/pi/blob/1b347794e2a630e4359f2584f4eea388145d0ddf/CONTRIBUTING.md)。--## 哪些动作需要替换状态--| 情况 | 本次处理 | 是否重开 Pi |-| --- | --- | --- |-| 已加载的模型或供应商之间切换 | 原生选择,核实实际模型与窗口 | 否 |-| Cindy 新增模型、同名模型资料变化 | 刷新当前目录,重新应用目标模型 | 否,需配套接口 |-| 新增供应商或凭据更新 | 私有交接,更新 Cindy 管理的 provider 注册 | 否,需配套接口 |-| 压缩预算变化 | 修改当前会话保留量 | 否,需配套接口 |-| 内容已接近目标小窗口上限 | Cindy 既有目标窗口保护与有交接内容的接续 | 可能;这是容量接续,不是选来源的固定步骤 |-| 回合正在执行 | 等既有安全边界,再运行同一选择事务 | 不为选择中断回合 |-| Pi 已退出、可执行版本或不可热更的启动条件变化 | 按既有生命周期恢复或显式更新 | 需要新进程;不属于普通模型切换 |-| 发生部分应用且无法确认实际路由 | 明确失败并停止不确定的运行实例,禁止错误来源继续接收内容 | 故障处理,不能假报无损切换 |--同一任务保存的聊天记录、Pi 原生会话及扩展内存是不同层次。保留聊天记录不等于-重开 Pi 没有损失。本机 Gateway 代理每次请求读取当前 key;启动占位 key 不是-必须重启的理由。SSH 则需另外维护远端凭据和按需代理转发。--## 实现边界--模型权威仍为 Cindy 统一目录。运行中的 Pi 使用最新可选清单枚举新增 ID,再按来源-取得具体描述;不能只更新选择器,或从启动时模型数组推断实时可用模型。-私有模型文件与设置文件需要回滚时,恢复原字节,不用已经变化的新目录重新生成旧状态。--凭据不放进 prompt、历史或日志。宿主仅对当前实例及本次随机 nonce 返回受限的-凭据快照,收到对应完成回执才继续。只替换 Cindy 自己管理的原生适配器;用户其它扩展-不被卸载。新启动子任务同步已应用的目录、能力与独立来源授权;已运行子任务保持自身身份。--桌面本机、device-link 远控、手机、IM 和定时任务的选择必须走同一宿主容量事务。定时任务-在捕获运行实例、等待结果和拼接交接内容前完成容量准备;排队派发也经过同一发送锁。-延后选择在-回合结束后仍经过该事务;旧选择的迟到回执不能覆盖新选择或新账号。失败通知独立于成功-通知,使用固定原因码,不把原始错误或凭据传给控制端。--## 验证证据与限制--Pi 补丁的 3 个定向测试文件共 22 个用例通过,覆盖真实 JSONL RPC handler、-RPC client、运行中的压缩触发阈值、参数校验、同 ID 模型重新选择及队列/扩展保留。-定向类型检查与改动文件格式检查通过。没有运行 Pi 整仓构建或全量测试。--另将 Cindy 实际生成的原生适配器和私有命令载入真实 Pi 测试 harness,用隔离临时目录、-假模型和假凭据验证新增供应商、同 ID 更新、nonce 回执及扩展实例/排队内容保留,1 个整合-用例通过。没有调用付费模型或读取个人授权。这不是正在运行的 Cindy 产品验收。--Cindy 核心模型路由与压缩预算的两个定向文件共 144 个用例通过,新增私有桥接的-3 个用例通过。宿主与既有容量事务的 6 个文件 323 例通过,收尾后相关 4 个文件-156 例通过(两组有重叠,不相加);调度直发/排队的 2 个文件 156 例通过,包含冷 Pi-历史恢复、跨来源热切、准备失败停止发送及结果监听顺序。各消费入口的定向验证见本 PR 的验证记录。未启动 Desktop DEV、模拟器或现有-Pi 任务;未完成 Windows、SSH 主机或桌面/手机双设备实机验收。源码与隔离验证通过,-不能替代配套 runtime 发布后各端的实际选择与容量接续验收。+# Cindy 对官方 Pi 的模型刷新适配++Cindy 必须适配官方 Pi,不修改 Pi 源码或二进制。此前方案假定的+`refresh_models` 和 `set_compaction_reserve_tokens` 并非官方 RPC;删除它们的调用及+配套补丁,不能要求用户安装定制 Pi 来完成普通切模。++## 官方接口++- Cindy 私有扩展命令通过 `ctx.modelRegistry.refresh({ allowNetwork: false })`+ 读取目录,检查 `aborted` 与 provider errors,再用 `get_available_models` 核对目标。+- 已有原生适配器通过公开的 `unregisterProvider` / `registerProvider` 更新。+ 只处理 Cindy 自己注册的项,用户扩展实例和会话保持连续。+- `set_model` 应用模型描述,`get_state` 确认实际 provider、model 和 contextWindow;+ 同 ID 资料更新也必须重新应用。+- Pi 1.0 支持 `compaction.modelOverrides["provider/modelId"].reserveTokens`。+ Cindy 在启动前为可选模型生成预算,切模时 Pi 原生选择对应保留量。+- `pi.getSettings()` 仅在运行期读取配置副本。文件改写不代表运行中设置已更新,+ 不能修改返回副本或访问 Pi 私有 SessionManager 伪装热更新。++接口依据:[Pi 1.0 扩展 API](https://github.com/earendil-works/pi/blob/v1.0.0/packages/coding-agent/src/core/extensions/types.ts)、+[原生设置解析](https://github.com/earendil-works/pi/blob/v1.0.0/packages/coding-agent/src/core/settings-manager.ts)。++## 切换与恢复边界++| 操作 | Cindy 处理 |+| --- | --- |+| 已加载模型或供应商间选择 | 保留进程、会话和扩展;使用原生 set_model 与按模型预算 |+| 凭据更新、目录更新且目标预算仍适用 | 私有 nonce 交接、原生目录刷新、重新应用模型 |+| 新模型、容量或工作预算变化,实际保留量不再匹配 | 变更前预览返回 rebuild,由已有宿主恢复流程加载启动配置 |+| 旧版 Pi 没有按模型配置能力 | 相同保留量仍可热切;需变化时使用同一恢复分支 |+| 内容已接近目标小窗口上限 | 先经过现有目标窗口保护与上下文接续 |+| 回合正在执行 | 等既有安全边界,不为模型选择中断回合 |+| 部分应用且无法确认路由 | 停止不确定的实例,保留任务记录以便恢复 |++普通切模不调用 `switch_session` 或扩展 `/reload`。真正不可热读的设置与普通供应商+变化分别处理;恢复保存的历史不等于保留扩展内存,不宣称恢复流程完全无损。++## 凭据与消费入口++私有命令只在确认扩展拥有该命令后调用。随机 nonce 绑定当前实例,凭据仅经受限的+extension UI 交接进入进程内存,不进入模型 prompt、聊天历史或明文配置。+`inspect` 仅返回运行中的设置;`refresh` 完成后返回相同设置快照。+不能把 prompt 接受回执当作刷新成功。失败需要回滚时恢复原文件字节。++桌面本机、远控、手机、IM、排队与定时任务仍走既有宿主选择和容量事务。+新子代理继承已确认的路由;已运行子代理保留独立身份。SSH 保留远端凭据与代理转发边界。++## 验证边界++定向测试覆盖原生供应商映射、凭据更新、同 ID 重选、按模型压缩预算、旧版本恢复判断、+失败回滚和远端文件操作。测试替身明确拒绝两个非官方 RPC,避免再引入该依赖。++另用未修改的官方 Pi 1.0、临时配置、假凭据和本地模拟服务验证真实桥接加载、公开+目录刷新、模型请求、会话与扩展连续性,以及压缩过程实际采用按模型保留量。+不启动 Cindy DEV,不读取个人授权或调用付费模型。具体执行结果写入 PR 验证记录。+Windows、真实 SSH、桌面与手机双设备交互需分别验收;隔离测试不代表已安装应用已更新。diff --git a/docs/research/pi-native-model-refresh.patch b/docs/research/pi-native-model-refresh.patchdeleted file mode 100644index 15aadf8724..0000000000--- a/docs/research/pi-native-model-refresh.patch+++ /dev/null@@ -1,542 +0,0 @@-diff --git a/packages/coding-agent/docs/rpc-commands.md b/packages/coding-agent/docs/rpc-commands.md-index 24f6032..894f2fc 100644---- a/packages/coding-agent/docs/rpc-commands.md-+++ b/packages/coding-agent/docs/rpc-commands.md-@@ -269,6 +269,20 @@ Response contains an array of full [Model](#model-object) objects:- }- ```--+### refresh_models-+-+Reload `models.json` without replacing the session. This command does not perform network model discovery. It preserves the current model selection, extension instances, and queued messages. Use `set_model` after a successful refresh to apply a changed descriptor, even when the provider and model ID are unchanged.-+-+```json-+{"type": "refresh_models"}-+```-+-+Response data contains `models` (the available model snapshot), `aborted`, and `errors` (provider IDs mapped to error messages). Treat `aborted: true` or nonempty `errors` as an incomplete refresh; `success: true` only means the refresh command ran. A malformed model configuration returns a failed response.-+-+```json-+{"type": "response", "command": "refresh_models", "success": true, "data": {"models": [], "aborted": false, "errors": {}}}-+```-+- ## Thinking-- ### set_thinking_level-@@ -416,6 +430,18 @@ Response:- {"type": "response", "command": "set_auto_compaction", "success": true}- ```--+### set_compaction_reserve_tokens-+-+Set a non-negative safe integer reserve for the live session. `null` clears the runtime override and restores the configured value for the current model. The override applies to manual and automatic compaction without reloading extensions or changing queued messages. It is not saved to `settings.json` or carried into another session.-+-+```json-+{"type": "set_compaction_reserve_tokens", "reserveTokens": 32000}-+```-+-+```json-+{"type": "response", "command": "set_compaction_reserve_tokens", "success": true, "data": {"reserveTokens": 32000}}-+```-+- ## Retry-- ### set_auto_retry-diff --git a/packages/coding-agent/docs/rpc.md b/packages/coding-agent/docs/rpc.md-index a39cc8d..e48d34f 100644---- a/packages/coding-agent/docs/rpc.md-+++ b/packages/coding-agent/docs/rpc.md-@@ -156,6 +156,7 @@ The detailed references formerly on this page now have dedicated pages. These an- <a id="set_model"></a>- <a id="cycle_model"></a>- <a id="get_available_models"></a>-+<a id="refresh_models"></a>- <a id="set_thinking_level"></a>- <a id="cycle_thinking_level"></a>- <a id="get_available_thinking_levels"></a>-@@ -163,6 +164,7 @@ The detailed references formerly on this page now have dedicated pages. These an- <a id="set_follow_up_mode"></a>- <a id="compact"></a>- <a id="set_auto_compaction"></a>-+<a id="set_compaction_reserve_tokens"></a>- <a id="set_auto_retry"></a>- <a id="abort_retry"></a>- <a id="bash"></a>-diff --git a/packages/coding-agent/src/core/agent-session.ts b/packages/coding-agent/src/core/agent-session.ts-index 4aaf3c2..7d22670 100644---- a/packages/coding-agent/src/core/agent-session.ts-+++ b/packages/coding-agent/src/core/agent-session.ts-@@ -31,6 +31,7 @@ import {- runToolCall,- type ThinkingLevel,- } from "@earendil-works/pi-agent-core";-+import type { ModelsRefreshResult } from "@earendil-works/pi-ai";- import { contentText, getCurrentSystemMessage, retryDelayMs } from "@earendil-works/pi-ai";- import type {- AssistantMessage,-@@ -382,6 +383,23 @@ export class AgentSession {- private _compactionAbortController: AbortController | undefined = undefined;- private _autoCompactionAbortController: AbortController | undefined = undefined;- private _overflowRecoveryAttempted = false;-+ private _runtimeCompactionReserveTokens: number | undefined;-+-+ /** Override the reserve for this live session without reloading its extensions or queues. */-+ setRuntimeCompactionReserveTokens(value: number | null): number {-+ if (value !== null && (!Number.isSafeInteger(value) || value < 0)) {-+ throw new Error("Compaction reserve tokens must be a non-negative safe integer or null.");-+ }-+ this._runtimeCompactionReserveTokens = value === null ? undefined : value;-+ return this.getEffectiveCompactionSettings(this.model).reserveTokens;-+ }-+-+ private getEffectiveCompactionSettings(model?: Model<any>): ReturnType<SettingsManager["getCompactionSettings"]> {-+ const settings = this.settingsManager.getCompactionSettings(model);-+ return this._runtimeCompactionReserveTokens === undefined-+ ? settings-+ : { ...settings, reserveTokens: this._runtimeCompactionReserveTokens };-+ }-- // Branch summarization state- private _branchSummaryAbortController: AbortController | undefined = undefined;-@@ -488,6 +506,11 @@ export class AgentSession {- return this._modelRuntime;- }--+ /** Reload the local model catalogue while retaining this session and its extensions. */-+ async refreshModels(): Promise<ModelsRefreshResult> {-+ return this._modelRuntime.refresh({ allowNetwork: false });-+ }-+- private async _getRequiredRequestAuth(- model: Model<any>,- signal?: AbortSignal,-@@ -728,7 +751,7 @@ export class AgentSession {- return shouldCompact(- estimateProjectedContextTokens(projection, this.sessionManager.getBranch()).tokens,- model.contextWindow,-- this.settingsManager.getCompactionSettings(this.model),-+ this.getEffectiveCompactionSettings(this.model),- );- }--@@ -2689,7 +2712,7 @@ export class AgentSession {- throw new Error(formatNoModelSelectedMessage());- }--- const settings = this.settingsManager.getCompactionSettings(model);-+ const settings = this.getEffectiveCompactionSettings(model);- const pathEntries = this.sessionManager.getBranch();-- const preparation = prepareCompaction(pathEntries, settings);-@@ -2864,7 +2887,7 @@ export class AgentSession {- skipAbortedCheck = true,- toolResults: AgentMessage[] = [],- ): Promise<boolean> {-- const settings = this.settingsManager.getCompactionSettings(this.model);-+ const settings = this.getEffectiveCompactionSettings(this.model);- if (!settings.enabled) return false;-- // Skip if message was aborted (user cancelled) - unless skipAbortedCheck is false-@@ -3011,7 +3034,7 @@ export class AgentSession {- */- private async _runAutoCompaction(reason: "overflow" | "threshold", willRetry: boolean): Promise<boolean> {- const model = this.model;-- const settings = this.settingsManager.getCompactionSettings(model);-+ const settings = this.getEffectiveCompactionSettings(model);- let abortController: AbortController | undefined;- let started = false;- let fromExtension = false;-diff --git a/packages/coding-agent/src/modes/rpc/rpc-client.ts b/packages/coding-agent/src/modes/rpc/rpc-client.ts-index 94ee29f..66e6c29 100644---- a/packages/coding-agent/src/modes/rpc/rpc-client.ts-+++ b/packages/coding-agent/src/modes/rpc/rpc-client.ts-@@ -281,6 +281,12 @@ export class RpcClient {- return this.getData<{ models: ModelInfo[] }>(response).models;- }--+ /** Reload models.json without replacing the current session. Never probes the network. */-+ async refreshModels(): Promise<{ models: ModelInfo[]; aborted: boolean; errors: Record<string, string> }> {-+ const response = await this.send({ type: "refresh_models" });-+ return this.getData(response);-+ }-+- /**- * Set thinking level.- */-@@ -333,6 +339,12 @@ export class RpcClient {- await this.send({ type: "set_auto_compaction", enabled });- }--+ /** Override the live session's compaction reserve; null restores configured settings. */-+ async setCompactionReserveTokens(reserveTokens: number | null): Promise<number> {-+ const response = await this.send({ type: "set_compaction_reserve_tokens", reserveTokens });-+ return this.getData<{ reserveTokens: number }>(response).reserveTokens;-+ }-+- /**- * Set auto-retry enabled/disabled.- */-diff --git a/packages/coding-agent/src/modes/rpc/rpc-mode.ts b/packages/coding-agent/src/modes/rpc/rpc-mode.ts-index 1c0995d..88f52e7 100644---- a/packages/coding-agent/src/modes/rpc/rpc-mode.ts-+++ b/packages/coding-agent/src/modes/rpc/rpc-mode.ts-@@ -490,6 +490,15 @@ export async function runRpcMode(runtimeHost: AgentSessionRuntime): Promise<neve- return success(id, "get_available_models", { models });- }--+ case "refresh_models": {-+ const result = await session.refreshModels();-+ return success(id, "refresh_models", {-+ models: session.modelRuntime.getAvailableSnapshot(),-+ aborted: result.aborted,-+ errors: Object.fromEntries([...result.errors].map(([provider, cause]) => [provider, cause.message])),-+ });-+ }-+- // =================================================================- // Thinking- // =================================================================-@@ -540,6 +549,11 @@ export async function runRpcMode(runtimeHost: AgentSessionRuntime): Promise<neve- return success(id, "set_auto_compaction");- }--+ case "set_compaction_reserve_tokens": {-+ const reserveTokens = session.setRuntimeCompactionReserveTokens(command.reserveTokens);-+ return success(id, "set_compaction_reserve_tokens", { reserveTokens });-+ }-+- // =================================================================- // Retry- // =================================================================-diff --git a/packages/coding-agent/src/modes/rpc/rpc-types.ts b/packages/coding-agent/src/modes/rpc/rpc-types.ts-index 7fc7151..cea41e5 100644---- a/packages/coding-agent/src/modes/rpc/rpc-types.ts-+++ b/packages/coding-agent/src/modes/rpc/rpc-types.ts-@@ -33,6 +33,7 @@ export type RpcCommand =- | { id?: string; type: "set_model"; provider: string; modelId: string }- | { id?: string; type: "cycle_model" }- | { id?: string; type: "get_available_models" }-+ | { id?: string; type: "refresh_models" }-- // Thinking- | { id?: string; type: "set_thinking_level"; level: ThinkingLevel }-@@ -46,6 +47,7 @@ export type RpcCommand =- // Compaction- | { id?: string; type: "compact"; customInstructions?: string }- | { id?: string; type: "set_auto_compaction"; enabled: boolean }-+ | { id?: string; type: "set_compaction_reserve_tokens"; reserveTokens: number | null }-- // Retry- | { id?: string; type: "set_auto_retry"; enabled: boolean }-@@ -159,6 +161,13 @@ export type RpcResponse =- success: true;- data: { models: Model<any>[] };- }-+ | {-+ id?: string;-+ type: "response";-+ command: "refresh_models";-+ success: true;-+ data: { models: Model<any>[]; aborted: boolean; errors: Record<string, string> };-+ }-- // Thinking- | { id?: string; type: "response"; command: "set_thinking_level"; success: true }-@@ -184,6 +193,13 @@ export type RpcResponse =- // Compaction- | { id?: string; type: "response"; command: "compact"; success: true; data: CompactionResult }- | { id?: string; type: "response"; command: "set_auto_compaction"; success: true }-+ | {-+ id?: string;-+ type: "response";-+ command: "set_compaction_reserve_tokens";-+ success: true;-+ data: { reserveTokens: number };-+ }-- // Retry- | { id?: string; type: "response"; command: "set_auto_retry"; success: true }-diff --git a/packages/coding-agent/test/rpc-prompt-response-semantics.test.ts b/packages/coding-agent/test/rpc-prompt-response-semantics.test.ts-index 98325b1..fa5df38 100644---- a/packages/coding-agent/test/rpc-prompt-response-semantics.test.ts-+++ b/packages/coding-agent/test/rpc-prompt-response-semantics.test.ts-@@ -1,4 +1,4 @@--import { existsSync, mkdirSync, rmSync } from "node:fs";-+import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";- import { tmpdir } from "node:os";- import { join } from "node:path";- import { Agent } from "@earendil-works/pi-agent-core";-@@ -17,7 +17,7 @@ import type { LoadExtensionsResult } from "../src/core/extensions/index.ts";- import { SessionManager } from "../src/core/session-manager.ts";- import { SettingsManager } from "../src/core/settings-manager.ts";- import { runRpcMode } from "../src/modes/rpc/rpc-mode.ts";--import { createInMemoryModelRegistry, getModelRuntime } from "./model-runtime-test-utils.ts";-+import { createModelRegistry, getModelRuntime } from "./model-runtime-test-utils.ts";- import { createTestExtensionsResult, createTestResourceLoader } from "./utilities.ts";-- const rpcIo = vi.hoisted(() => ({-@@ -103,6 +103,7 @@ async function createRuntimeHost(options: {- extensionsResult?: LoadExtensionsResult;- }): Promise<{- runtimeHost: AgentSessionRuntime;-+ modelsPath: string;- cleanup: () => Promise<void>;- }> {- const tempDir = join(tmpdir(), `pi-rpc-prompt-${Date.now()}-${Math.random().toString(36).slice(2)}`);-@@ -135,7 +136,8 @@ async function createRuntimeHost(options: {- const sessionManager = SessionManager.inMemory();- const settingsManager = SettingsManager.create(tempDir, tempDir);- const authStorage = AuthStorage.create(join(tempDir, "auth.json"));-- const modelRegistry = await createInMemoryModelRegistry(authStorage);-+ const modelsPath = join(tempDir, "models.json");-+ const modelRegistry = await createModelRegistry(authStorage, modelsPath);- if (options.withAuth) {- await authStorage.modify("anthropic", async () => ({ type: "api_key", key: "test-key" }));- }-@@ -160,6 +162,7 @@ async function createRuntimeHost(options: {-- return {- runtimeHost,-+ modelsPath,- cleanup: async () => {- try {- await session.abort();-@@ -176,16 +179,18 @@ async function createRuntimeHost(options: {-- async function startRpcMode(options: Parameters<typeof createRuntimeHost>[0]): Promise<{- lineHandler: (line: string) => void;-+ session: AgentSession;-+ modelsPath: string;- cleanup: () => Promise<void>;- }> {- rpcIo.outputLines = [];- rpcIo.lineHandler = undefined;--- const { runtimeHost, cleanup } = await createRuntimeHost(options);-+ const { runtimeHost, modelsPath, cleanup } = await createRuntimeHost(options);- void runRpcMode(runtimeHost);- await vi.waitFor(() => expect(rpcIo.lineHandler).toBeDefined());--- return { lineHandler: rpcIo.lineHandler!, cleanup };-+ return { lineHandler: rpcIo.lineHandler!, session: runtimeHost.session, modelsPath, cleanup };- }-- describe("RPC prompt response semantics", () => {-@@ -194,6 +199,76 @@ describe("RPC prompt response semantics", () => {- rpcIo.lineHandler = undefined;- });--+ it("refreshes model metadata and compaction reserve without replacing session state", async () => {-+ const { lineHandler, session, modelsPath, cleanup } = await startRpcMode({ withAuth: true, responseDelayMs: 0 });-+ try {-+ const current = session.model!;-+ const runner = session.extensionRunner;-+ await session.followUp("keep queued");-+ writeFileSync(-+ modelsPath,-+ JSON.stringify({-+ providers: {-+ [current.provider]: {-+ modelOverrides: { [current.id]: { contextWindow: current.contextWindow + 1000 } },-+ },-+ },-+ }),-+ );-+ lineHandler(JSON.stringify({ id: "refresh", type: "refresh_models" }));-+ await vi.waitFor(() =>-+ expect(parseOutputLines(rpcIo.outputLines)).toContainEqual(-+ expect.objectContaining({-+ id: "refresh",-+ success: true,-+ command: "refresh_models",-+ data: expect.objectContaining({ aborted: false, errors: {} }),-+ }),-+ ),-+ );-+ expect(session.model).toBe(current);-+ lineHandler(-+ JSON.stringify({ id: "same-id", type: "set_model", provider: current.provider, modelId: current.id }),-+ );-+ await vi.waitFor(() =>-+ expect(parseOutputLines(rpcIo.outputLines)).toContainEqual(-+ expect.objectContaining({-+ id: "same-id",-+ success: true,-+ command: "set_model",-+ data: expect.objectContaining({ contextWindow: current.contextWindow + 1000 }),-+ }),-+ ),-+ );-+ lineHandler(JSON.stringify({ id: "reserve", type: "set_compaction_reserve_tokens", reserveTokens: 32000 }));-+ await vi.waitFor(() =>-+ expect(parseOutputLines(rpcIo.outputLines)).toContainEqual(-+ expect.objectContaining({-+ id: "reserve",-+ success: true,-+ command: "set_compaction_reserve_tokens",-+ data: { reserveTokens: 32000 },-+ }),-+ ),-+ );-+ lineHandler(JSON.stringify({ id: "invalid", type: "set_compaction_reserve_tokens", reserveTokens: -1 }));-+ await vi.waitFor(() =>-+ expect(parseOutputLines(rpcIo.outputLines)).toContainEqual(-+ expect.objectContaining({-+ id: "invalid",-+ success: false,-+ command: "set_compaction_reserve_tokens",-+ }),-+ ),-+ );-+ expect(session.extensionRunner).toBe(runner);-+ expect(session.pendingMessageCount).toBe(1);-+ expect(session.model?.contextWindow).toBe(current.contextWindow + 1000);-+ } finally {-+ await cleanup();-+ }-+ });-+- it("emits one failure response when prompt preflight rejects", async () => {- const { lineHandler, cleanup } = await startRpcMode({- withAuth: false,-diff --git a/packages/coding-agent/test/suite/agent-session-compaction-model-overrides.test.ts b/packages/coding-agent/test/suite/agent-session-compaction-model-overrides.test.ts-index c606bca..3887337 100644---- a/packages/coding-agent/test/suite/agent-session-compaction-model-overrides.test.ts-+++ b/packages/coding-agent/test/suite/agent-session-compaction-model-overrides.test.ts-@@ -33,6 +33,99 @@ describe("AgentSession compaction model overrides", () => {- while (harnesses.length) harnesses.pop()?.cleanup();- });--+ it("changes the live compaction reserve without replacing extensions or queued input", async () => {-+ const observed: number[] = [];-+ let extensionLoads = 0;-+ const harness = await createHarness({-+ models: [{ id: "faux-1", contextWindow: 4000 }],-+ tools: [],-+ settings: { compaction: { reserveTokens: 10, keepRecentTokens: 150 } },-+ extensionFactories: [-+ (pi) => {-+ extensionLoads++;-+ pi.on("session_before_compact", (event) => {-+ observed.push(event.preparation.settings.reserveTokens);-+ return {-+ compaction: {-+ summary: "runtime reserve summary",-+ firstKeptEntryId: event.preparation.firstKeptEntryId,-+ tokensBefore: event.preparation.tokensBefore,-+ },-+ };-+ });-+ },-+ ],-+ });-+ harnesses.push(harness);-+ seedHistory(harness);-+ await harness.session.followUp("queued follow-up");-+ const sessionFile = harness.session.sessionFile;-+ const extensionRunner = harness.session.extensionRunner;-+ expect(harness.session.setRuntimeCompactionReserveTokens(2000)).toBe(2000);-+ expect(() => harness.session.setRuntimeCompactionReserveTokens(-1)).toThrow();-+ expect(() => harness.session.setRuntimeCompactionReserveTokens(Number.MAX_SAFE_INTEGER + 1)).toThrow();-+ expect(harness.session.pendingMessageCount).toBe(1);-+ await harness.session.compact();-+ expect(observed).toEqual([2000]);-+ expect(harness.session.extensionRunner).toBe(extensionRunner);-+ expect(harness.session.sessionFile).toBe(sessionFile);-+ expect(harness.session.pendingMessageCount).toBe(1);-+ expect(extensionLoads).toBe(1);-+ expect(harness.session.setRuntimeCompactionReserveTokens(null)).toBe(10);-+ expect(harness.settingsManager.getCompactionReserveTokens()).toBe(10);-+ });-+-+ it("reports incomplete model refresh without changing the selected model", async () => {-+ const harness = await createHarness({ models: [{ id: "faux-1" }], tools: [] });-+ harnesses.push(harness);-+ const selected = harness.session.model;-+ const failure = new Error("provider unavailable");-+ const refresh = vi.spyOn(harness.session.modelRuntime, "refresh").mockResolvedValue({-+ aborted: false,-+ errors: new Map([["faux", failure]]),-+ });-+-+ expect(await harness.session.refreshModels()).toEqual({-+ aborted: false,-+ errors: new Map([["faux", failure]]),-+ });-+ expect(refresh).toHaveBeenCalledWith({ allowNetwork: false });-+ expect(harness.session.model).toBe(selected);-+ });-+-+ it("applies the runtime reserve to the next pre-prompt compaction threshold", async () => {-+ const preparations: number[] = [];-+ const harness = await createHarness({-+ models: [{ id: "faux-1", contextWindow: 4000 }],-+ tools: [],-+ settings: { compaction: { enabled: true, reserveTokens: 10, keepRecentTokens: 150 } },-+ extensionFactories: [-+ (pi) => {-+ pi.on("session_before_compact", (event) => {-+ preparations.push(event.preparation.settings.reserveTokens);-+ return {-+ compaction: {-+ summary: "runtime threshold summary",-+ firstKeptEntryId: event.preparation.firstKeptEntryId,-+ tokensBefore: event.preparation.tokensBefore,-+ },-+ };-+ });-+ },-+ ],-+ });-+ harnesses.push(harness);-+ seedHistory(harness, 2500);-+ harness.setResponses([fauxAssistantMessage("first"), fauxAssistantMessage("second")]);-+ await harness.session.prompt("before reserve update");-+ expect(preparations).toEqual([]);-+ seedHistory(harness, 2500);-+ harness.session.setRuntimeCompactionReserveTokens(2000);-+ await harness.session.prompt("after reserve update");-+ expect(preparations).toEqual([2000]);-+ expect(harness.eventsOfType("compaction_end")).toHaveLength(1);-+ });-+- it.each(["manual", "pre-prompt", "post-run", "overflow"] as const)(- "uses model token settings for %s compaction and extension preparation",- async (path) => {-diff --git a/packages/coding-agent/test/rpc-client-runtime-refresh.test.ts b/packages/coding-agent/test/rpc-client-runtime-refresh.test.ts-new file mode 100644-index 0000000..5437df1---- /dev/null-+++ b/packages/coding-agent/test/rpc-client-runtime-refresh.test.ts-@@ -0,0 +1,31 @@-+import { describe, expect, it, vi } from "vitest";-+import { RpcClient } from "../src/modes/rpc/rpc-client.ts";-+-+type ClientTransport = {-+ send: (command: { type: string; reserveTokens?: number | null }) => Promise<unknown>;-+ getData: <T>(response: unknown) => T;-+};-+-+describe("RpcClient runtime refresh", () => {-+ it("uses the public refresh and live compaction commands", async () => {-+ const client = new RpcClient();-+ const transport = client as unknown as ClientTransport;-+ const send = vi.fn(async (command: { type: string; reserveTokens?: number | null }) => ({-+ data:-+ command.type === "refresh_models"-+ ? { models: [], aborted: false, errors: {} }-+ : { reserveTokens: command.reserveTokens === null ? 16384 : command.reserveTokens },-+ }));-+ transport.send = send;-+ transport.getData = <T>(response: unknown): T => (response as { data: T }).data;-+-+ expect(await client.refreshModels()).toEqual({ models: [], aborted: false, errors: {} });-+ expect(await client.setCompactionReserveTokens(32000)).toBe(32000);-+ expect(await client.setCompactionReserveTokens(null)).toBe(16384);-+ expect(send.mock.calls.map(([command]) => command)).toEqual([-+ { type: "refresh_models" },-+ { type: "set_compaction_reserve_tokens", reserveTokens: 32000 },-+ { type: "set_compaction_reserve_tokens", reserveTokens: null },-+ ]);-+ });-+});diff --git a/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.ts b/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.tsindex 79bb917db2..02d4c59fc5 100644--- a/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.ts+++ b/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.ts@@ -93,7 +93,7 @@ describe('Cindy native provider refresh bridge', () => {it('acknowledges success only after applying a valid staged snapshot', async () => {const source = CINDY_BRIDGE_EXTENSION_SOURCE;- const start = source.indexOf("pi.registerCommand('cindy-native-provider-refresh'");+ const start = source.indexOf('const initialNativeSettings =');const end = source.indexOf('if (!currentPermissionState().reviewOnly)', start);expect(start).toBeGreaterThan(0);expect(end).toBeGreaterThan(start);@@ -101,16 +101,25 @@ describe('Cindy native provider refresh bridge', () => {`async function setup(pi: any, nativeProviderAdapters: any, parseCindyProviderRefreshSnapshot: any) {\nconst SECRET_ENV_NAMES = new Set<string>();\n${source.slice(start, end)}\n}\n(globalThis as any).setup = setup;`,{ compilerOptions: { target: ts.ScriptTarget.ES2022 } },).outputText;- const sandbox: Record<string, unknown> = {};+ const sandbox: Record<string, unknown> = { piCodingAgent: { VERSION: '1.0.0' },+ process: { env: { PI_CODING_AGENT_DIR: '/fixture' } }, path: { join: () => '/fixture/settings.json' },+ readFileSync: () => JSON.stringify({ compaction: { reserveTokens: 1234 } }),+ };runInNewContext(code, sandbox);const setup = sandbox.setup as (pi: unknown, controller: unknown, parse: (raw: unknown, nonce: string) => unknown,) => Promise<void>;let handler: ((args: string, ctx: unknown) => Promise<void>) | undefined;const applied: unknown[] = [];- await setup({ registerCommand: (_name: string, command: { handler: typeof handler }) => { handler = command.handler; } },+ let loaded = false;+ await setup({ getSettings: () => {+ if (!loaded) throw new Error('Action methods cannot be called during extension loading');+ return { compaction: { reserveTokens: 1234 } };+ },+ registerCommand: (_name: string, command: { handler: typeof handler }) => { handler = command.handler; } },{ refresh: async (snapshot: unknown) => { applied.push(snapshot); } },(raw, nonce) => raw === 'valid' ? { nonce, env: {}, aliases: [] } : undefined);+ loaded = true;const calls: Array<{ title: string; payload: unknown }> = [];const ctx = { ui: { input: async (title: string, raw: string) => {const payload = JSON.parse(raw) as unknown;@@ -121,7 +130,16 @@ describe('Cindy native provider refresh bridge', () => {expect(applied).toHaveLength(1);expect(calls).toEqual([{ title: 'cindy:provider-refresh', payload: { nonce: 'abcdefghijklmnop' } },- { title: 'cindy:provider-refresh-ack', payload: { nonce: 'abcdefghijklmnop', ok: true } },+ { title: 'cindy:provider-refresh-ack', payload: { nonce: 'abcdefghijklmnop', ok: true,+ runtimeSettings: { version: '1.0.0', compaction: { reserveTokens: 1234 } } } },]);+ calls.length = 0;+ await handler?.('abcdefghijklmnop', { ui: { input: async (title: string, raw: string) => {+ calls.push({ title, payload: JSON.parse(raw) });+ return title === 'cindy:provider-refresh'+ ? JSON.stringify({ nonce: 'abcdefghijklmnop', operation: 'inspect' }) : undefined;+ } } });+ expect(applied).toHaveLength(1); // Inspection never refreshes providers or credentials.+ expect(calls.at(-1)?.payload).toMatchObject({ ok: true, runtimeSettings: { version: '1.0.0' } });});});diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-auto-review-dispatch.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-auto-review-dispatch.test.tsindex 4d880da0c2..4c105b9fe8 100644--- a/packages/maker-core/src/agents/pi/__tests__/pi-auto-review-dispatch.test.ts+++ b/packages/maker-core/src/agents/pi/__tests__/pi-auto-review-dispatch.test.ts@@ -13,6 +13,7 @@import {promises as fs,+ existsSync,mkdirSync,mkdtempSync,readdirSync,@@ -98,16 +99,29 @@ vi.mock('../transport.js', () => ({vi.mock('../rpc-client.js', () => ({PiRpcProcess: class {isClosed = false;+ private readonly onEvent: (event: unknown) => void;+ private readonly nativeSettings: { compaction?: Record<string, unknown> };constructor(opts: {onEvent: (event: unknown) => void;onExit: (exit: { code: number | null; signal: string | null }) => void }) {captured.onEvent = opts.onEvent;captured.onExit = opts.onExit;+ this.onEvent = opts.onEvent;+ // Freeze local startup settings; the remote spawn-only fixture has no+ // local settings file. Keep ACK delivery bound to this runtime instance.+ const settingsPath = captured.env.PI_CODING_AGENT_DIR+ ? path.join(captured.env.PI_CODING_AGENT_DIR, 'settings.json') : undefined;+ this.nativeSettings = settingsPath && existsSync(settingsPath)+ ? JSON.parse(readFileSync(settingsPath, 'utf8'))+ : {};}async request(cmd: Record<string, unknown> & { type: string },): Promise<{ success: boolean; command?: string; data?: unknown; error?: string }> {captured.requests.push(cmd);+ if (cmd.type === 'refresh_models' || cmd.type === 'set_compaction_reserve_tokens') {+ return { success: false, error: `Unknown command: ${cmd.type}` };+ }if (cmd.type === 'set_model' && captured.holdSetModel) {await captured.holdSetModel;}@@ -134,13 +148,27 @@ vi.mock('../rpc-client.js', () => ({if (cmd.type === 'steer' && captured.failSteer) {return { command: 'steer', success: false, error: 'receipt steer rejected' };}+ if (cmd.type === 'prompt' && typeof cmd.message === 'string' &&+ cmd.message.startsWith('/cindy-native-provider-refresh ')) {+ const nonce = cmd.message.split(' ')[1];+ this.onEvent({ type: 'extension_ui_request', method: 'input',+ title: 'cindy:provider-refresh', id: nonce, placeholder: JSON.stringify({ nonce }) });+ const response = captured.sent.findLast((message) => message.id === nonce);+ const snapshot = JSON.parse(String(response?.value ?? '{}'));+ this.onEvent({ type: 'extension_ui_request', method: 'input',+ title: 'cindy:provider-refresh-ack', id: `${nonce}-ack`, placeholder: JSON.stringify({+ nonce, ok: snapshot.nonce === nonce && snapshot.operation === 'inspect',+ runtimeSettings: { version: '1.0.0', compaction: this.nativeSettings.compaction ?? {} },+ }) });+ return { command: 'prompt', success: true };+ }if (cmd.type === 'prompt') captured.onPrompt?.(cmd);- if (cmd.type === 'get_commands' && captured.commandCatalog) {+ if (cmd.type === 'get_commands') {return {type: 'response',command: 'get_commands',success: true,- data: { commands: captured.commandCatalog },+ data: { commands: captured.commandCatalog ?? [{ name: 'cindy-native-provider-refresh', source: 'extension' }] },} as never;}if (cmd.type === 'get_state') {diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-native-auto-compact.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-native-auto-compact.test.tsindex 41280135c0..dae2dc4439 100644--- a/packages/maker-core/src/agents/pi/__tests__/pi-native-auto-compact.test.ts+++ b/packages/maker-core/src/agents/pi/__tests__/pi-native-auto-compact.test.ts@@ -16,8 +16,10 @@ const knobs = vi.hoisted(() => ({compactHold: null as null | Promise<void>,rpcCalls: [] as Array<Record<string, unknown>>,switchSessionSuccess: true,- reserveSuccess: true,- reserveUnknown: false,+ bridgeAckSuccess: true,+ runtimeVersion: '1.0.0',+ nativeSettings: null as null | { compaction?: Record<string, unknown> },+ configHome: '',autoCompactionSuccess: true,runtimeProvider: "cindy",runtimeModel: "m",@@ -35,9 +37,12 @@ const knobs = vi.hoisted(() => ({vi.mock("../transport.js", () => ({createPiStdioTransport: (opts: {args?: string[];+ env?: Record<string, string>;onProcessSpawned?: (pid: number) => void | (() => void);}) => {knobs.spawnArgs = opts.args ?? [];+ knobs.configHome = opts.env?.PI_CODING_AGENT_DIR ?? '';+ knobs.nativeSettings = JSON.parse(readFileSync(path.join(knobs.configHome, 'settings.json'), 'utf8'));opts.onProcessSpawned?.(1234);return {writeLine: async () => {},@@ -66,6 +71,25 @@ vi.mock("../rpc-client.js", () => ({error?: string;}> {knobs.rpcCalls.push(cmd);+ if (cmd.type === 'get_commands') return { success: true, data: { commands: [+ { name: 'cindy-native-provider-refresh', source: 'extension' },+ ] } };+ if (cmd.type === 'prompt' && typeof cmd.message === 'string' && cmd.message.startsWith('/cindy-native-provider-refresh ')) {+ const nonce = cmd.message.split(' ')[1];+ knobs.onEvent?.({ type: 'extension_ui_request', method: 'input',+ title: 'cindy:provider-refresh-ack', id: 'refresh-ack', placeholder: JSON.stringify({+ nonce, ok: knobs.bridgeAckSuccess, code: knobs.bridgeAckSuccess ? undefined : 'APPLY_FAILED',+ runtimeSettings: { version: knobs.runtimeVersion, compaction: knobs.nativeSettings?.compaction ?? {} },+ }) });+ return { success: true, data: {} };+ }+ if (cmd.type === 'get_available_models') {+ const config = JSON.parse(readFileSync(path.join(knobs.configHome, 'models.json'), 'utf8')) as {+ providers: Record<string, { models?: Array<{ id: string }> }>;+ };+ return { success: true, data: { models: Object.entries(config.providers).flatMap(+ ([provider, spec]) => (spec.models ?? []).map(model => ({ provider, id: model.id }))) } };+ }if (cmd.type === "get_session_stats" && knobs.contextTokens !== null) {return { success: true, data: { contextUsage: {tokens: knobs.contextTokens, contextWindow: knobs.runtimeContextWindow,@@ -95,10 +119,7 @@ vi.mock("../rpc-client.js", () => ({: { success: false, error: "runtime rejected" };}if (cmd.type === "set_compaction_reserve_tokens") {- if (knobs.reserveUnknown) return { success: false, error: "Unknown command: set_compaction_reserve_tokens" };- return knobs.reserveSuccess- ? { success: true, data: { reserveTokens: cmd.reserveTokens ?? 16_384 } }- : { success: false, error: "reserve rejected" };+ return { success: false, error: "Unknown command: set_compaction_reserve_tokens" };}if (cmd.type === "set_model") {knobs.runtimeProvider = String(cmd.provider);@@ -188,8 +209,9 @@ describe("PiAgent native auto-compaction ownership", () => {knobs.compactHold = null;knobs.rpcCalls = [];knobs.switchSessionSuccess = true;- knobs.reserveSuccess = true;- knobs.reserveUnknown = false;+ knobs.bridgeAckSuccess = true;+ knobs.runtimeVersion = '1.0.0';+ knobs.nativeSettings = null;knobs.autoCompactionSuccess = true;knobs.runtimeProvider = "cindy";knobs.runtimeModel = "m";@@ -232,7 +254,7 @@ describe("PiAgent native auto-compaction ownership", () => {} finally { await handle.close(); }});- it('clears a startup narrow budget with the effective native default reserve', async () => {+ it('requests a fresh native runtime to clear a startup narrow budget', async () => {let budget: number | null = 1_000;const deps = buildDeps();deps.runtimeConfig = { ...deps.runtimeConfig, piAutoCompactThresholdPct: undefined };@@ -242,15 +264,14 @@ describe("PiAgent native auto-compaction ownership", () => {});budget = null;knobs.rpcCalls = [];- await handle.setModel!('m', { providerId: 'xd' });- expect(knobs.rpcCalls).toContainEqual({- type: 'set_compaction_reserve_tokens', reserveTokens: 16_384,- });- expect(readLatestPiSettings().compaction).toBeUndefined();+ expect(await handle.previewModelSwitch?.('m', { providerId: 'xd' })).toMatchObject({ action: 'rebuild' });+ await expect(handle.setModel!('m', { providerId: 'xd' })).rejects.toThrow(/load the changed native compaction/);+ expect(knobs.rpcCalls.some(call => call.type === 'set_model')).toBe(false);+ expect(readLatestPiSettings().compaction?.reserveTokens).toBe(199_100);await handle.close();});- it('applies a new narrow budget when the previous route had no budget', async () => {+ it('requires native settings reload for a new narrow budget without partially changing the route', async () => {let budget: number | null = null;const deps = buildDeps();deps.runtimeConfig = { ...deps.runtimeConfig, piAutoCompactThresholdPct: undefined };@@ -258,15 +279,13 @@ describe("PiAgent native auto-compaction ownership", () => {const handle = await new PiAgent(deps).startSession({sessionId: 'add-budget', workingDir: cwd, model: 'm', providerId: 'xd',});- expect(readLatestPiSettings().compaction).toBeUndefined();+ expect(readLatestPiSettings().compaction?.reserveTokens).toBeUndefined();budget = 1_000;knobs.rpcCalls = [];- await handle.setModel!('m', { providerId: 'xd' });- expect(knobs.rpcCalls).toContainEqual({- type: 'set_compaction_reserve_tokens', reserveTokens: 199_100,- });- expect(readLatestPiSettings().compaction?.reserveTokens).toBe(199_100);- expect(handle.getUsageSnapshot().contextWindow).toBe(1_000);+ expect(await handle.previewModelSwitch?.('m', { providerId: 'xd' })).toMatchObject({ action: 'rebuild' });+ await expect(handle.setModel!('m', { providerId: 'xd' })).rejects.toThrow(/load the changed native compaction/);+ expect(readLatestPiSettings().compaction?.reserveTokens).toBeUndefined();+ expect(handle.getUsageSnapshot().contextWindow).toBe(200_000);await handle.close();});@@ -666,14 +685,17 @@ describe("PiAgent native auto-compaction ownership", () => {expect(setModelIndexes).toHaveLength(1);expect(switchIndex).toBe(-1);expect(verifyIndex).toBeGreaterThan(setModelIndexes[0]!);- expect(knobs.rpcCalls.some((call) => call.type === "set_compaction_reserve_tokens")).toBe(true);+ expect(knobs.rpcCalls.some((call) => call.type === "set_compaction_reserve_tokens")).toBe(false);+ expect(knobs.nativeSettings?.compaction?.modelOverrides).toMatchObject({+ 'cindy/m': { reserveTokens: 50_000 }, 'cindy/n': { reserveTokens: 25_000 },+ });expect(knobs.runtimeProvider).toBe("cindy");expect(knobs.runtimeModel).toBe("n");expect(handle.getUsageSnapshot().contextWindow).toBe(100_000);await handle.close();});- it("recomputes reserve tokens from the final verified runtime window", async () => {+ it("rejects an unexpected runtime window rather than claiming an unapplied reserve", async () => {const deps = buildDeps();deps.runtimeConfig = {...deps.runtimeConfig,@@ -690,13 +712,12 @@ describe("PiAgent native auto-compaction ownership", () => {knobs.targetRuntimeContextWindow = 1_000_000;knobs.setModelReportsContextWindow = false;knobs.rpcCalls = [];- await handle.setModel!("n");-- expect(readLatestPiSettings().compaction?.reserveTokens).toBe(100_000);+ await expect(handle.setModel!("n")).rejects.toThrow(/PI_CATALOG_RELOAD_UNCONFIRMED/);+ expect(readLatestPiSettings().compaction?.reserveTokens).toBe(20_000);expect(knobs.rpcCalls.filter((call) => call.type === "switch_session")).toHaveLength(0);expect(knobs.rpcCalls.filter((call) => call.type === "set_model")).toHaveLength(1);expect(knobs.rpcCalls.filter((call) => call.type === "get_state")).toHaveLength(1);- expect(handle.getUsageSnapshot().contextWindow).toBe(1_000_000);+ expect(knobs.closeCalls).toBe(1);await handle.close();});@@ -721,25 +742,24 @@ describe("PiAgent native auto-compaction ownership", () => {knobs.setModelReportsContextWindow = false;knobs.rpcCalls = [];- await handle.setModel!("n");-- expect(readLatestPiSettings().compaction?.reserveTokens).toBe(10_000);+ await expect(handle.setModel!("n")).rejects.toThrow(/PI_CATALOG_RELOAD_UNCONFIRMED/);+ expect(readLatestPiSettings().compaction?.reserveTokens).toBe(20_000);expect(knobs.rpcCalls.filter((call) => call.type === "switch_session")).toHaveLength(0);expect(knobs.rpcCalls.filter((call) => call.type === "set_model")).toHaveLength(1);expect(knobs.rpcCalls.filter((call) => call.type === "get_state")).toHaveLength(1);- expect(handle.getUsageSnapshot().contextWindow).toBe(100_000);+ expect(knobs.closeCalls).toBe(1);await handle.close();});- it("uses the confirmed runtime window for native reserve", async () => {+ it("does not fake a live native reserve change after a window mismatch", async () => {const handle = await start();knobs.targetRuntimeContextWindow = 1_000_000;knobs.setModelReportsContextWindow = false;knobs.verifiedContextWindows = [1_000_000];- await handle.setModel!("n");- expect(readLatestPiSettings().compaction?.reserveTokens).toBe(250_000);- expect(knobs.closeCalls).toBe(0);+ await expect(handle.setModel!("n")).rejects.toThrow(/PI_CATALOG_RELOAD_UNCONFIRMED/);+ expect(readLatestPiSettings().compaction?.reserveTokens).toBe(50_000);+ expect(knobs.closeCalls).toBe(1);await handle.close();});@@ -836,7 +856,7 @@ describe("PiAgent native auto-compaction ownership", () => {renameSync(a, `${a}-moved`);symlinkSync(b, a, process.platform === "win32" ? "junction" : "dir");}- knobs.targetRuntimeContextWindow = 1_000_000;+ knobs.targetRuntimeContextWindow = 100_000;knobs.setModelReportsContextWindow = false;knobs.rpcCalls = [];await handle.setModel!("n");@@ -851,16 +871,16 @@ describe("PiAgent native auto-compaction ownership", () => {} finally { await handle.close(); }});- it("rejects before switching when the native reserve setter fails", async () => {+ it("rejects before switching when the native settings inspection fails", async () => {const handle = await start();- knobs.reserveSuccess = false;- await expect(handle.setModel!("n")).rejects.toThrow(/did not confirm the current compaction reserve/);+ knobs.bridgeAckSuccess = false;+ await expect(handle.setModel!("n")).rejects.toThrow(/could not read the live Pi compaction settings/);expect(knobs.rpcCalls.filter((call) => call.type === "set_model")).toHaveLength(0);expect(knobs.closeCalls).toBe(0);await handle.close();});- it("keeps the old Pi route untouched when a catalog refresh also needs an unsupported reserve setter", async () => {+ it("keeps an older official Pi route untouched when a new reserve requires reloading settings", async () => {let addNative = false;const deps = buildDeps();deps.resolvePiNativeProviders = async () => ({@@ -872,10 +892,11 @@ describe("PiAgent native auto-compaction ownership", () => {sessionId: "old-pi-no-partial-refresh", workingDir: cwd, model: "m", providerId: "xd",});addNative = true;- knobs.reserveUnknown = true;+ knobs.runtimeVersion = '0.85.1';knobs.rpcCalls = [];- await expect(handle.setModel!("n", { providerId: "xd" })).rejects.toThrow(/does not support live compaction/);- expect(knobs.rpcCalls.map((call) => call.type)).toEqual(["set_compaction_reserve_tokens"]);+ expect(await handle.previewModelSwitch?.('n', { providerId: 'xd' })).toMatchObject({ action: 'rebuild' });+ await expect(handle.setModel!("n", { providerId: "xd" })).rejects.toThrow(/load the changed native compaction/);+ expect(knobs.rpcCalls.some(call => call.type === 'set_model' || call.type === 'refresh_models' || call.type === 'set_compaction_reserve_tokens')).toBe(false);expect(knobs.closeCalls).toBe(0);expect(handle.model).toBe("m");await handle.close();diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.tsindex 1749adbcb3..7970c35e35 100644--- a/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.ts+++ b/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.ts@@ -2,6 +2,7 @@ import ts from "typescript";import { createHash } from "node:crypto";import {mkdirSync,+ existsSync,mkdtempSync,readdirSync,readFileSync,@@ -93,6 +94,7 @@ vi.mock("../rpc-client.js", () => {PiRpcRequestTimeoutError,PiRpcProcess: class {isClosed = false;+ private nativeSettings: Record<string, unknown> | undefined;constructor(opts: {onEvent: (event: Record<string, unknown>) => void;onExit: (info: {@@ -120,6 +122,15 @@ vi.mock("../rpc-client.js", () => {captured.initialModel ??= argValue("--model");captured.runtimeProvider ??= captured.initialProvider;captured.runtimeModel ??= captured.initialModel;+ if (!this.nativeSettings) {+ const file = path.join(String(captured.env.PI_CODING_AGENT_DIR), 'settings.json');+ const remote = captured.remoteModels.get(file)+ ?? [...captured.remoteModels].find(([name]) => name.endsWith('/settings.json'))?.[1];+ this.nativeSettings = JSON.parse(remote ?? (existsSync(file) ? readFileSync(file, 'utf8') : '{}'));+ }+ if (command.type === 'refresh_models' || command.type === 'set_compaction_reserve_tokens') {+ return { success: false, error: `Unknown command: ${command.type}` };+ }const response = captured.requestHandler? await captured.requestHandler(command): command.type === "get_state"@@ -136,12 +147,14 @@ vi.mock("../rpc-client.js", () => {const nonce = command.message.split(" ")[1];captured.onEvent?.({ type: "extension_ui_request", method: "input",title: "cindy:provider-refresh", id: "refresh-input", placeholder: JSON.stringify({ nonce }) });+ const snapshot = JSON.parse(String(captured.responses.findLast((response) => response.id === 'refresh-input')?.value ?? '{}'));captured.onEvent?.({ type: "extension_ui_request", method: "input",title: "cindy:provider-refresh-ack", id: "refresh-ack",- placeholder: JSON.stringify(captured.refreshAckMode === 'invalid'- ? { nonce, ok: false, code: 'INVALID_PAYLOAD' } : { nonce, ok: true }) });+ placeholder: JSON.stringify(captured.refreshAckMode === 'invalid' && snapshot.operation === 'refresh'+ ? { nonce, ok: false, code: 'INVALID_PAYLOAD' } : { nonce, ok: true,+ runtimeSettings: { version: '1.0.0', compaction: this.nativeSettings?.compaction ?? {} } }) });}- if (response.success && command.type === "refresh_models" &&+ if (response.success && command.type === "get_available_models" &&!Array.isArray((response.data as { models?: unknown } | undefined)?.models)) {const modelFile = path.join(String(captured.env.PI_CODING_AGENT_DIR), "models.json");const remoteModelContent = captured.remoteModels.get(modelFile)@@ -154,9 +167,6 @@ vi.mock("../rpc-client.js", () => {Object.entries(configured.providers).flatMap(([provider, spec]) =>(spec.models ?? []).map((model) => ({ provider, id: model.id }))) } };}- if (response.success && command.type === "set_compaction_reserve_tokens") {- return { success: true, data: { reserveTokens: command.reserveTokens ?? 16_384 } };- }if (response.success && command.type === "get_commands" &&!Array.isArray((response.data as { commands?: unknown } | undefined)?.commands)) {return { success: true, data: { commands: captured.hasRefreshCommand@@ -656,6 +666,14 @@ describe("Pi provider-aware model routing", () => {});it("routes host subscriptions through PI native providers and wire model ids", async () => {+ captured.requestHandler = async (command) => ({ success: true, data:+ command.type === 'get_available_models' ? { models: [+ { provider: 'anthropic', id: 'claude-opus-5', contextWindow: 200_000 },+ { provider: 'xai', id: 'grok-4.5', contextWindow: 200_000 },+ { provider: 'xai', id: 'grok-4.6', contextWindow: 200_000 },+ ] } : command.type === 'get_state'+ ? { sessionFile: '/mock/s.jsonl', model: { contextWindow: 200_000 } } : {},+ });const authProviderIds: Array<string | null | undefined> = [];let resolveProxyProviderId: (() => string | null) | undefined;const proxyRegistrations: Array<{@@ -892,6 +910,7 @@ describe("Pi provider-aware model routing", () => {JSON.parse(readFileSync(path.join(configHome, "settings.json"), "utf8")),).toEqual({transport: "sse",+ compaction: { modelOverrides: expect.any(Object) },retry: {enabled: true,maxRetries: 6,@@ -1597,7 +1616,7 @@ describe("Pi provider-aware model routing", () => {await expect(handle.setModel!("shared-model", { providerId: "xd" }),).resolves.toBeUndefined();- expect(captured.requests.some((request) => request.type === "refresh_models")).toBe(true);+ expect(captured.requests.some((request) => request.type === "get_available_models")).toBe(true);await handle.close();});@@ -1685,7 +1704,7 @@ describe("Pi provider-aware model routing", () => {});includeXai = true;await handle.setModel!("xai/grok-4.6", { providerId: "xai" });- expect(captured.requests.some((request) => request.type === "refresh_models")).toBe(true);+ expect(captured.requests.some((request) => request.type === "get_available_models")).toBe(true);expect(captured.requests.some((request) => request.type === "switch_session")).toBe(false);expect(captured.requests).toContainEqual({type: "set_model",@@ -1724,11 +1743,11 @@ describe("Pi provider-aware model routing", () => {models: [{id: "grok-4.6",+ contextWindow: 200_000,wireId: "grok-4.6",name: "Grok 4.6",api: "openai-responses" as const,catalogAddition: true,- contextWindow: 100_000,},],};@@ -1789,7 +1808,7 @@ describe("Pi provider-aware model routing", () => {name: "Native A",baseUrl: "http://a.test",api: "openai-completions",- models: [{ id: "wide-model" }, { id: "narrow-model" }],+ models: [{ id: "wide-model", contextWindow: 200_000 }, { id: "narrow-model", contextWindow: 200_000 }],},],env: { CINDY_PI_XAI_PROXY_API_KEY: "xai-proxy-placeholder" },@@ -1858,7 +1877,7 @@ describe("Pi provider-aware model routing", () => {},};}- if (command.type === "refresh_models" && ++refreshCalls === 2) {+ if (command.type === "get_available_models" && ++refreshCalls === 1) {return { success: false, error: "refresh failed" };}return { success: true, data: {} };@@ -1956,6 +1975,7 @@ describe("Pi provider-aware model routing", () => {},],};+ let privatePrompts = 0;captured.requestHandler = async (command) => {if (command.type === "get_state") {return {@@ -1966,7 +1986,7 @@ describe("Pi provider-aware model routing", () => {},};}- if (command.type === "prompt") {+ if (command.type === "prompt" && ++privatePrompts === 2) {const modelsPath = path.join(captured.env.PI_CODING_AGENT_DIR as string,"models.json",@@ -2062,6 +2082,7 @@ describe("Pi provider-aware model routing", () => {},],};+ let privatePrompts = 0;captured.requestHandler = async (command) => {if (command.type === "get_state") {return {@@ -2072,7 +2093,7 @@ describe("Pi provider-aware model routing", () => {},};}- if (command.type === "prompt") {+ if (command.type === "prompt" && ++privatePrompts === 2) {throw new Error("pi rpc timeout after 30000ms: prompt");}return { success: true, data: {} };@@ -2248,7 +2269,9 @@ describe("Pi provider-aware model routing", () => {},},}- : { success: true, data: {} };+ : command.type === 'get_available_models'+ ? { success: true, data: { models: [{ provider: 'xai', id: 'grok-4.5', contextWindow: 500_000 }] } }+ : { success: true, data: {} };const agent = new PiAgent({auth: {getState: async () => ({@@ -3787,6 +3810,55 @@ describe("Pi provider-aware model routing", () => {resolvePiNativeProviders,});+ it.each([+ { label: 'different live window', window: 400_000, action: 'rebuild' },+ { label: 'matching live window', window: 128_000, action: 'hot' },+ { label: 'missing live window', window: undefined, action: 'rebuild' },+ { label: 'failed live catalog read', window: null, action: 'rebuild' },+ ] as const)('checks an inherited model before switching: $label', async ({ window, action }) => {+ const deps = byomDeps(async () => ({ providers: [+ { id: 'native-a', name: 'Current', baseUrl: 'http://a.test', api: 'openai-completions',+ models: [{ id: 'local-model', contextWindow: 200_000 }] },+ { id: 'pi-native', sourceProviderId: 'native-account', name: 'Inherited', baseUrl: 'http://b.test',+ inheritModels: true, modelIdAliases: { 'catalog-alias': 'catalog-model' },+ models: [{ id: 'catalog-model', wireId: 'wire-model' }] },+ ], env: {} }));+ deps.runtimeConfig = { ...deps.runtimeConfig, piAutoCompactThresholdPct: 75 };+ captured.requestHandler = async (command) => {+ if (command.type === 'get_available_models') return window === null+ ? { success: false, error: 'catalog unavailable' }+ : { success: true, data: { models: [+ { provider: 'unrelated', id: 'wire-model', contextWindow: 128_000 },+ { provider: 'pi-native', id: 'wire-model', contextWindow: window },+ ] } };+ return { success: true, data: command.type === 'get_state'+ ? { sessionFile: '/mock/s.jsonl', model: { contextWindow: captured.runtimeProvider === 'pi-native' ? window : 200_000 } }+ : {} };+ };+ const handle = await new PiAgent(deps).startSession({+ sessionId: 'inherited-window', workingDir: cwd, model: 'local-model', providerId: 'native-a',+ });+ const config = captured.env.PI_CODING_AGENT_DIR!;+ const before = ['models.json', 'settings.json'].map(file => readFileSync(path.join(config, file), 'utf8'));+ captured.requests.length = 0;+ const preview = await handle.previewModelSwitch?.('catalog-alias', { providerId: 'native-account' });+ expect(preview).toMatchObject({ action, targetContextWindow: window ?? null, windowVerified: false });+ expect(captured.requests).toContainEqual({ type: 'get_available_models' });+ if (action === 'rebuild') {+ await expect(handle.setModel!('catalog-alias', { providerId: 'native-account' })).rejects.toThrow(/before selecting/);+ expect(captured.requests.some(request => request.type === 'set_model')).toBe(false);+ expect(['models.json', 'settings.json'].map(file => readFileSync(path.join(config, file), 'utf8'))).toEqual(before);+ expect(captured.closes).toBe(0);+ expect(handle.model).toBe('local-model');+ } else {+ await handle.setModel!('catalog-alias', { providerId: 'native-account' });+ expect(captured.runtimeProvider).toBe('pi-native');+ expect(captured.runtimeModel).toBe('wire-model');+ expect(captured.closes).toBe(0);+ }+ await handle.close();+ });+it('refreshes a managed adapter when the same model ID gets a new descriptor', async () => {let window = 100_000;const deps = byomDeps(async () => ({ providers: [{@@ -3806,7 +3878,7 @@ describe("Pi provider-aware model routing", () => {expect(captured.requests).toContainEqual(expect.objectContaining({type: 'prompt', message: expect.stringMatching(/^\/cindy-native-provider-refresh /),}));- expect(captured.requests.filter((request) => request.type === 'refresh_models')).toHaveLength(2);+ expect(captured.requests.filter((request) => request.type === 'get_available_models')).toHaveLength(1);expect(captured.requests.some((request) => request.type === 'switch_session')).toBe(false);await handle.close();});@@ -3840,7 +3912,7 @@ describe("Pi provider-aware model routing", () => {expect(await handle.previewModelSwitch?.('local-model', { providerId: 'native-a' })).toMatchObject({ action: 'refresh' });await handle.setModel!('local-model', { providerId: 'native-a' });- const snapshot = JSON.parse(String(captured.responses.find(response => response.id === 'refresh-input')?.value));+ const snapshot = JSON.parse(String(captured.responses.findLast(response => response.id === 'refresh-input' && JSON.parse(String(response.value)).operation === 'refresh')?.value));expect(snapshot.env.CINDY_PI_KEY_ACTIVE).toBe('running-endpoint-key');expect(snapshot.env).not.toHaveProperty('CINDY_PI_KEY_UNUSED');for (const alias of snapshot.aliases) {@@ -3882,7 +3954,7 @@ describe("Pi provider-aware model routing", () => {expect(captured.closes).toBe(0);await handle.setModel!('local-model', { providerId: 'native-a' });expect(captured.requests.filter((request) => request.type === 'set_model')).toHaveLength(2);- expect(captured.requests.filter((request) => request.type === 'refresh_models')).toHaveLength(2);+ expect(captured.requests.filter((request) => request.type === 'get_available_models')).toHaveLength(1);await handle.close();});@@ -4070,6 +4142,8 @@ describe("Pi provider-aware model routing", () => {captured.requests.length = 0;await handle.setModel!("model-b", { providerId: "native-a" });expect(captured.requests.map((request) => request.type)).toEqual([+ "get_commands",+ "prompt","set_model","get_state",]);@@ -5654,13 +5728,14 @@ describe("Pi provider-aware model routing", () => {resolveRemotePiBinaryPath: async () => "/remote/pi",getRemotePiFileOps: () => ({mkdirp: async () => {},- writeFile: async (file) => {+ writeFile: async (file, content) => {+ captured.remoteModels.set(file, content);remoteWrittenFiles.push(file);},stat: async () => ({ isFile: true }),rm: async () => {},listDir: async () => [],- readFile: async () => { throw new Error("Unexpected remote file read in empty directory fixture"); },+ readFile: async (file) => captured.remoteModels.get(file) ?? "",sha256File: async () => { throw new Error("Unexpected remote file hash in empty directory fixture"); },}),getRemotePiTransport: async (_hostId, opts) => {@@ -5879,13 +5954,14 @@ describe("Pi provider-aware model routing", () => {resolveRemotePiBinaryPath: async () => "/remote/pi",getRemotePiFileOps: () => ({mkdirp: async () => {},- writeFile: async () => {+ writeFile: async (file, content) => {+ captured.remoteModels.set(file, content);remoteWrites += 1;},stat: async () => ({ isFile: true }),rm: async () => {},listDir: async () => [],- readFile: async () => { throw new Error("Unexpected remote file read in empty directory fixture"); },+ readFile: async (file) => captured.remoteModels.get(file) ?? "",sha256File: async () => { throw new Error("Unexpected remote file hash in empty directory fixture"); },}),getRemotePiTransport: async (_hostId, opts) => {diff --git a/packages/maker-core/src/agents/pi/cindy-bridge-source.ts b/packages/maker-core/src/agents/pi/cindy-bridge-source.tsindex 92fd0ba60d..e0fd535bd7 100644--- a/packages/maker-core/src/agents/pi/cindy-bridge-source.ts+++ b/packages/maker-core/src/agents/pi/cindy-bridge-source.ts@@ -3677,6 +3677,8 @@ ${PI_NATIVE_PROVIDER_ADAPTER_SOURCE}export default async function cindyBridge(pi: any) {installTextOnlyTurnPolicy(pi);const nativeProviderAdapters = await registerCindyNativeProviderAdapters(pi);+ const initialNativeSettings = typeof pi.getSettings === 'function' ? undefined+ : JSON.parse(readFileSync(path.join(process.env.PI_CODING_AGENT_DIR, 'settings.json'), 'utf8'));pi.registerCommand('cindy-native-provider-refresh', {description: 'Cindy internal native provider refresh',handler: async (args: string, ctx: any) => {@@ -3684,15 +3686,25 @@ export default async function cindyBridge(pi: any) {if (!/^[A-Za-z0-9_-]{16,128}$/.test(nonce)) return;let code: 'INVALID_PAYLOAD' | 'APPLY_FAILED' | undefined;let mutationStarted = false;+ let runtimeSettings;try {const raw = await ctx.ui.input('cindy:provider-refresh', JSON.stringify({ nonce }));- const snapshot = parseCindyProviderRefreshSnapshot(raw, nonce);- if (!snapshot) {+ let inspect = false;+ try { const request = JSON.parse(raw); inspect = request?.nonce === nonce && request?.operation === 'inspect'; }+ catch { /* The normal snapshot parser rejects invalid JSON. */ }+ const snapshot = inspect ? undefined : parseCindyProviderRefreshSnapshot(raw, nonce);+ if (!inspect && !snapshot) {code = 'INVALID_PAYLOAD';- } else {+ } else if (snapshot) {mutationStarted = true;await nativeProviderAdapters.refresh(snapshot, ctx, SECRET_ENV_NAMES);}+ if (!code) {+ // getSettings returns a copy. Never reach into Pi's private session or+ // pretend a settings.json rewrite changed the live SettingsManager.+ const settings = typeof pi.getSettings === 'function' ? pi.getSettings() : initialNativeSettings;+ runtimeSettings = { version: piCodingAgent.VERSION, compaction: settings.compaction ?? {} };+ }} catch {code = mutationStarted ? 'APPLY_FAILED' : 'INVALID_PAYLOAD';}@@ -3700,7 +3712,7 @@ export default async function cindyBridge(pi: any) {// explicit, nonce-bound receipt before accepting a refreshed catalog.try {await ctx.ui.input('cindy:provider-refresh-ack', JSON.stringify(- code ? { nonce, ok: false, code } : { nonce, ok: true },+ code ? { nonce, ok: false, code } : { nonce, ok: true, runtimeSettings },));} catch { /* A missing receipt forces the host to retire this process. */ }},diff --git a/packages/maker-core/src/agents/pi/index.ts b/packages/maker-core/src/agents/pi/index.tsindex 99e202ff7a..98f0b4f363 100644--- a/packages/maker-core/src/agents/pi/index.ts+++ b/packages/maker-core/src/agents/pi/index.ts@@ -100,6 +100,7 @@ import {CINDY_PI_TEXT_ONLY_CLOSED_PREFIX,CINDY_BRIDGE_EXTENSION_SOURCE } from './cindy-bridge-source.js';import { nativeProviderAdapterAliases } from './native-provider-adapter-source.js';+import { parsePiNativeRuntimeSettings, resolvePiNativeReserve, type PiNativeRuntimeSettings } from './native-runtime-settings.js';import {CINDY_SUBAGENT_ENV,CINDY_SUBAGENT_EXTENSION_FILENAME,@@ -2099,8 +2100,8 @@ export class PiAgent extends BaseAgent {* 每会话随机目录(run-tmp/<hex>),只读会话文件会让「重启后新会话」拿不到* 用户配置;稳定根文件才是跨启动生效的逃生门(对齐原生 pi 的* ~/.pi/agent/settings.json 位置语义,Cindy 自身从不写它)。- * 远端 fileOps 无 readFile,保持原覆写行为(远端 configHome 全托管,且本机- * shell 路径对远端主机无意义)。+ * 远端 configHome 全托管,不透传本机 shell 配置;未提供新预算表时通过+ * fileOps.readFile 保留远端既有 modelOverrides,读取/解析失败交给调用方处理。*/private async buildSettingsJsonPreservingUserKeys(settingsJsonPath: string,@@ -2111,15 +2112,31 @@ export class PiAgent extends BaseAgent {piCompactionPct?: number;packages?: readonly PiNativePackageEntry[];disabledSkills?: DisabledSkillLaunchSnapshot;+ compactionModelOverrides?: Record<string, { reserveTokens: number }>;},): Promise<string> {- const built = this.buildCurrentPiSettingsJson(+ let built = this.buildCurrentPiSettingsJson(opts.contextWindow,opts.piCompactionPct,opts.packages,opts.workingContextWindow,);- if (opts.fileOps) return built;+ if (opts.compactionModelOverrides) {+ const settings = JSON.parse(built);+ settings.compaction = { ...settings.compaction, modelOverrides: opts.compactionModelOverrides };+ built = JSON.stringify(settings, null, 2) + '\n';+ }+ if (opts.fileOps) {+ if (!opts.compactionModelOverrides) {+ const current = JSON.parse(await opts.fileOps.readFile(settingsJsonPath, 1_000_000));+ const settings = JSON.parse(built);+ if (current.compaction?.modelOverrides) {+ settings.compaction = { ...settings.compaction, modelOverrides: current.compaction.modelOverrides };+ }+ return JSON.stringify(settings, null, 2) + '\n';+ }+ return built;+ }const readOrNull = async (file: string): Promise<string | null> => {try {return await fs.readFile(file, 'utf8');@@ -2134,7 +2151,14 @@ export class PiAgent extends BaseAgent {? Promise.resolve(null): readOrNull(stableUserSettingsPath),]);- const merged = mergePiUserSettingsPassthrough(built, sessionContent, stableContent);+ const mergedSettings = JSON.parse(mergePiUserSettingsPassthrough(built, sessionContent, stableContent));+ // Package/resource setup rewrites this private file after the model catalog.+ // Keep the per-model budgets generated with that catalog.+ if (!opts.compactionModelOverrides && sessionContent) {+ const overrides = JSON.parse(sessionContent).compaction?.modelOverrides;+ if (overrides) mergedSettings.compaction = { ...mergedSettings.compaction, modelOverrides: overrides };+ }+ const merged = JSON.stringify(mergedSettings, null, 2) + '\n';// Runtime rewrites use the startup bindings, never paths reconstructed from// settings.json: those paths can now point to a different physical Skill.if (opts.disabledSkills) {@@ -2386,9 +2410,23 @@ export class PiAgent extends BaseAgent {// isolated embedded runtime. Other PI providers ignore this transport knob.// Agent-level retries stay with Pi (provider maxRetries stays 0 — Pi docs:// SDK retries can swallow quota errors before the agent sees them).+ const compactionModelOverrides: Record<string, { reserveTokens: number }> = {};+ const addBudget = (provider: string, id: string, window: number, workingWindow?: number) => {+ const settings = JSON.parse(buildPiSettingsJsonContent(window, opts.piCompactionPct, [], workingWindow));+ compactionModelOverrides[`${provider}/${id}`] = { reserveTokens: settings.compaction?.reserveTokens ?? 16_384 };+ };+ for (const model of models) addBudget(PI_PROVIDER_ID, model.id, model.contextWindow,+ this.deps.resolveModelContextLimit?.(gatewayProviderId ?? 'xd', model.id) ?? undefined);+ for (const provider of nativeProviders) {+ if (provider.id === PI_PROVIDER_ID) continue;+ for (const model of provider.models) {+ const workingWindow = this.deps.resolveModelContextLimit?.(provider.sourceProviderId ?? provider.id, model.id) ?? undefined;+ addBudget(provider.id, model.wireId ?? model.id, Math.max(model.contextWindow ?? 128_000, workingWindow ?? 0), workingWindow);+ }+ }const settingsJsonContent = await this.buildSettingsJsonPreservingUserKeys(settingsJsonPath,- opts,+ { ...opts, compactionModelOverrides },);// 远端 launch identity 必须覆盖进程启动才读的快照。只 hash models.json 时,// retry/transport/compaction 改写会落到旧 configHome,daemon 纯 attach。@@ -3860,12 +3898,13 @@ export class PiAgent extends BaseAgent {let appliedModelConfigHash = modelConfigHash;let pendingCurrentDescriptorRefresh = false;let retainedLiveGatewayModel = initialProvider === PI_PROVIDER_ID ? selectedRuntimeModel : undefined;- let providerRefreshStage: {+ const providerRefreshStages = new Map<string, {nonce: string;+ operation: 'inspect' | 'refresh';env: Record<string, string>;aliases: ReturnType<typeof nativeProviderAdapterAliases>;- acknowledge: (ok: boolean, code?: string) => void;- } | null = null;+ acknowledge: (ok: boolean, code?: string, settings?: unknown) => void;+ }>();let mutableWireModel = initialWireModel;// Pi RPC 实际选中的 provider。与用于宿主鉴权/审阅元数据的 mutableProviderId 分开:// null/订阅来源会归一到 cindy,setModel 未显式传来源时也必须跟随本次解析结果。@@ -5332,19 +5371,19 @@ export class PiAgent extends BaseAgent {if (event.method === 'input' &&(event.title === 'cindy:provider-refresh' || event.title === 'cindy:provider-refresh-ack')) {const requestId = typeof event.id === 'string' ? event.id : '';- let payload: { nonce?: unknown; ok?: unknown; code?: unknown } = {};+ let payload: { nonce?: unknown; ok?: unknown; code?: unknown; runtimeSettings?: unknown } = {};try { payload = JSON.parse(typeof event.placeholder === 'string' ? event.placeholder : '{}'); }catch { /* Invalid private command payload is rejected below. */ }- const stage = providerRefreshStage;+ const stage = typeof payload.nonce === 'string' ? providerRefreshStages.get(payload.nonce) : undefined;const valid = Boolean(requestId && stage && payload.nonce === stage.nonce &&!closed && !piProcessExited && !proc.isClosed && !accountBoundaryTeardown);if (event.title === 'cindy:provider-refresh') {proc.send(valid? { type: 'extension_ui_response', id: requestId,- value: JSON.stringify({ nonce: stage!.nonce, env: stage!.env, aliases: stage!.aliases }) }+ value: JSON.stringify({ nonce: stage!.nonce, operation: stage!.operation, env: stage!.env, aliases: stage!.aliases }) }: { type: 'extension_ui_response', id: requestId, cancelled: true });} else {- if (valid) stage!.acknowledge(payload.ok === true, typeof payload.code === 'string' ? payload.code : undefined);+ if (valid) stage!.acknowledge(payload.ok === true, typeof payload.code === 'string' ? payload.code : undefined, payload.runtimeSettings);proc.send({ type: 'extension_ui_response', id: requestId, cancelled: true });}return;@@ -6129,6 +6168,45 @@ export class PiAgent extends BaseAgent {'[PI_CATALOG_RELOAD_UNCONFIRMED] 模型目录重载未确认,已终止本任务。请重新打开任务后再切换模型。',);};+ let liveRuntimeSettings: PiNativeRuntimeSettings | undefined;+ const queryNativeRuntime = async (+ operation: 'inspect' | 'refresh',+ env: Record<string, string> = {},+ aliases: ReturnType<typeof nativeProviderAdapterAliases> = [],+ ): Promise<{ ok: boolean; code?: string }> => {+ // Unknown extension commands become model prompts. Check ownership first.+ const commands = await proc.request({ type: 'get_commands' });+ const entries = (commands.data as { commands?: Array<{ name?: unknown; source?: unknown }> } | undefined)?.commands;+ if (!commands.success || !entries?.some((entry) =>+ entry.name === 'cindy-native-provider-refresh' && entry.source === 'extension')) {+ throw new Error('Cindy native provider refresh extension is unavailable; reopen this task with the current Cindy version.');+ }+ const nonce = randomBytes(24).toString('base64url');+ let timer: ReturnType<typeof setTimeout> | undefined;+ const ack = new Promise<{ ok: boolean; code?: string; settings?: unknown }>((resolve) => {+ providerRefreshStages.set(nonce, { nonce, operation, env, aliases,+ acknowledge: (ok, code, settings) => resolve({ ok, code, settings }) });+ timer = setTimeout(() => resolve({ ok: false, code: 'ACK_TIMEOUT' }), 10_000);+ });+ try {+ const response = await proc.request({ type: 'prompt', message: `/cindy-native-provider-refresh ${nonce}` });+ if (!response.success) return { ok: false, code: 'COMMAND_FAILED' };+ const receipt = await ack;+ if (!receipt.ok) return receipt;+ const settings = parsePiNativeRuntimeSettings(receipt.settings);+ if (!settings) return { ok: false, code: 'INVALID_SETTINGS' };+ liveRuntimeSettings = settings;+ return { ok: true };+ } finally {+ if (timer) clearTimeout(timer);+ providerRefreshStages.delete(nonce);+ }+ };+ const reserveForWindow = (window: number, source: string | null | undefined, model: string): number => {+ const settings = JSON.parse(buildPiSettingsJsonContent(window, sessionPiAutoCompactPct, [],+ this.deps.resolveModelContextLimit?.(source, model) ?? undefined));+ return settings.compaction?.reserveTokens ?? 16_384;+ };const previewPiModelSwitch = async (model: string,target?: { providerId?: string | null },@@ -6165,6 +6243,7 @@ export class PiAgent extends BaseAgent {: requestedProviderId;const gateway = !sourceId || sourceId === 'xd' || sourceId === PI_PROVIDER_ID;let nativeModel: PiNativeModelSpec | undefined;+ let inheritsNativeWindow = false;if (!gateway) {let native = latestProviders.find((entry) => (entry.sourceProviderId ?? entry.id) === sourceId);if (sameRoute) {@@ -6199,6 +6278,8 @@ export class PiAgent extends BaseAgent {return { action: 'unavailable', targetContextWindow: null, windowVerified: false,reason: `Pi provider '${sourceId}' does not offer model '${model}'` };}+ inheritsNativeWindow = native.inheritModels === true && nativeModel.api === undefined+ && nativeModel.catalogAddition !== true && nativeModel.contextWindow === undefined;}const gatewaySpec = gateway? this.deps.resolvePiGatewayModelSpec?.(sourceId, model, { remote })@@ -6210,9 +6291,32 @@ export class PiAgent extends BaseAgent {const knownDescriptor = this.deps.resolvePiRuntimeModelDescriptor? this.deps.resolvePiRuntimeModelDescriptor(sourceId, model): this.capabilities.availableModels.find((candidate) => candidate.id === model);- const targetContextWindow = nativeModel?.contextWindow- ?? knownDescriptor?.contextWindow- ?? (sameRoute && gateway ? retainedLiveGatewayModel?.contextWindow : undefined) ?? null;+ const workingWindow = this.deps.resolveModelContextLimit?.(sourceId, model) ?? 0;+ let configuredWindow = nativeModel ? nativeModel.contextWindow ?? 128_000+ : knownDescriptor?.contextWindow ?? (sameRoute && gateway ? retainedLiveGatewayModel?.contextWindow : undefined);+ if (inheritsNativeWindow) {+ // 128K is only a default for models Cindy materializes. An inherited+ // entry uses either our explicit model override or Pi's live catalog.+ configuredWindow = workingWindow > 0 ? workingWindow : undefined;+ if (!configuredWindow) {+ try {+ const available = await proc.request({ type: 'get_available_models' });+ const entries = (available.data as { models?: Array<{ provider?: string; id?: string; contextWindow?: number }> } | undefined)?.models;+ const provider = latestProviders.find((entry) => (entry.sourceProviderId ?? entry.id) === sourceId)?.id;+ const wireId = nativeModel?.wireId ?? nativeModel?.id;+ const actualWindow = available.success+ ? entries?.find((entry) => entry.provider === provider && entry.id === wireId)?.contextWindow : undefined;+ if (typeof actualWindow === 'number' && Number.isSafeInteger(actualWindow) && actualWindow > 0) {+ configuredWindow = actualWindow;+ }+ } catch { /* No mutation: leave window resolution to the existing recovery path. */ }+ if (!configuredWindow) {+ return { action: 'rebuild', targetContextWindow: null, windowVerified: false,+ reason: 'Pi must resolve the inherited model window before selecting this model' };+ }+ }+ }+ const targetContextWindow = configuredWindow ? Math.max(configuredWindow, workingWindow) : null;// A refresh may change any provider block, so all credentials it references// must be synchronised with the running Pi process before it is published.// The private refresh bridge owns this update; this preview never handles a key.@@ -6250,6 +6354,20 @@ export class PiAgent extends BaseAgent {}}const needsRefresh = configChanged || envChanged || adaptersChanged || gatewayCredentialChanged;+ const inspected = await queryNativeRuntime('inspect');+ if (!inspected.ok || !liveRuntimeSettings) {+ return { action: 'unavailable', targetContextWindow, windowVerified: false,+ reason: 'Cindy could not read the live Pi compaction settings' };+ }+ const targetProvider = gateway ? PI_PROVIDER_ID+ : latestProviders.find((entry) => (entry.sourceProviderId ?? entry.id) === sourceId)?.id;+ const targetModel = nativeModel?.wireId ?? nativeModel?.id ?? model;+ if (targetContextWindow && targetProvider &&+ resolvePiNativeReserve(liveRuntimeSettings, targetProvider, targetModel) !==+ reserveForWindow(targetContextWindow, sourceId, model)) {+ return { action: 'rebuild', targetContextWindow, windowVerified: false,+ reason: 'Pi must load the changed native compaction settings before selecting this model' };+ }return {action: needsRefresh ? 'refresh' : 'hot',targetContextWindow,@@ -6294,7 +6412,6 @@ export class PiAgent extends BaseAgent {? await this.deps.auth.getAuthEnv({ credentialMode: 'gateway-key', providerId: requestedProviderId }): authEnv;const nextAliases = nativeProviderAdapterAliases(nextProviders);- const currentAliases = nativeProviderAdapterAliases(nativeProviders);const mutableEnv = (value: Record<string, string>) => Object.fromEntries(Object.entries(value).filter(([key]) => /^CINDY_PI_KEY_[A-Z0-9_]+$/.test(key)|| key === PI_API_KEY_ENV || key === PI_SESSION_TOKEN_ENV@@ -6303,43 +6420,8 @@ export class PiAgent extends BaseAgent {...(gatewayAuthEnv[PI_API_KEY_ENV] ? { [PI_API_KEY_ENV]: gatewayAuthEnv[PI_API_KEY_ENV] } : {}),...(proxySessionToken ? { [PI_SESSION_TOKEN_ENV]: proxySessionToken } : {}),});- const oldEnv = mutableEnv({ ...nativeEnv, ...authEnv,- ...(proxySessionToken ? { [PI_SESSION_TOKEN_ENV]: proxySessionToken } : {}),- });- let bridgeChanged = JSON.stringify(desiredEnv) !== JSON.stringify(oldEnv)- || JSON.stringify(nextAliases) !== JSON.stringify(currentAliases);- const projected = await this.writeModelsJson(- configHome, nextProviders,- nextGateway ? (nextDescriptor ?? retainedLiveGatewayModel ?? retainedRuntimeModel) : retainedLiveGatewayModel,- nextGateway ? requestedProviderId : authProviderId,- { remote, fileOps, preview: true, contextWindow: nextDescriptor?.contextWindow ?? ctx.contextWindow,- workingContextWindow: this.deps.resolveModelContextLimit?.(sourceId, model) ?? undefined,- piCompactionPct: sessionPiAutoCompactPct, packages: nativePackagePaths,- disabledSkills: disabledSkillLaunch },- );- bridgeChanged ||= projected.modelConfigHash !== appliedModelConfigHash && nextAliases.length > 0;- if (bridgeChanged) {- // Unknown slash commands are ordinary prompts in Pi. Confirm that our- // private extension owns this name before ever sending a nonce/secret- // refresh command or touching the on-disk catalog.- const commands = await proc.request({ type: 'get_commands' });- const loaded = (commands.data as { commands?: Array<{ name?: unknown; source?: unknown }> }- | undefined)?.commands;- if (!commands.success || !loaded?.some((entry) =>- entry.name === 'cindy-native-provider-refresh' && entry.source === 'extension')) {- throw new Error('Pi native provider refresh extension is unavailable; update the bundled Pi runtime and retry.');- }- }- // First probe the installed Pi's native RPC against the still-current private- // catalog. Unknown-command here leaves the active route untouched.- const probe = await proc.request({ type: 'refresh_models' });- if (!probe.success && /^Unknown command:/.test(probe.error ?? '')) {- throw new Error('Pi runtime does not support live model refresh; update the bundled Pi runtime and retry.');- }- const probeData = probe.data as { aborted?: boolean; errors?: Record<string, string> } | undefined;- if (!probe.success || probeData?.aborted || Object.keys(probeData?.errors ?? {}).length > 0) {- throw new Error(`pi: current catalog refresh failed: ${probe.error ?? 'aborted'}`);- }+ // Preview has verified the Cindy-owned command and native settings.+ // The extension uses Pi's public ModelRegistry.refresh; no custom Pi RPC.const previousGatewayModel = retainedLiveGatewayModel;const modelsPath = joinRemotePosixPath(configHome, 'models.json');const settingsPath = joinRemotePosixPath(configHome, 'settings.json');@@ -6386,47 +6468,23 @@ export class PiAgent extends BaseAgent {await restoreFilesOrTerminate();throw error;}- if (bridgeChanged) {- const nonce = randomBytes(24).toString('base64url');- let acknowledge!: (ok: boolean, code?: string) => void;- const ack = new Promise<{ ok: boolean; code?: string }>((resolve) => {- acknowledge = (ok, code) => resolve({ ok, code });- });- providerRefreshStage = { nonce, env: desiredEnv, aliases: nextAliases, acknowledge };- try {- const command = await proc.request({ type: 'prompt', message: `/cindy-native-provider-refresh ${nonce}` });- const receipt = await Promise.race([- ack,- new Promise<{ ok: boolean; code: string }>((resolve) =>- setTimeout(() => resolve({ ok: false, code: 'ACK_TIMEOUT' }), 10_000)),- ]);- if (!command.success || !receipt.ok) {- if (receipt.code === 'INVALID_PAYLOAD') {- await restoreFilesOrTerminate();- throw new Error('Pi rejected the native provider refresh payload; the original route is unchanged.');- }- return await terminateUnconfirmedCatalogReload(receipt.code ?? command.error);- }- } catch (error) {- if (providerRefreshStage && !proc.isClosed) {- // A rejected or timed-out prompt could have changed the extension's- // registry before the RPC transport failed. Never guess its state.- if (!(error instanceof Error && /extension is unavailable|rejected the native provider/.test(error.message))) {- return await terminateUnconfirmedCatalogReload(error);- }+ try {+ const receipt = await queryNativeRuntime('refresh', desiredEnv, nextAliases);+ if (!receipt.ok) {+ if (receipt.code === 'INVALID_PAYLOAD') {+ await restoreFilesOrTerminate();+ throw new Error('Pi rejected the native provider refresh payload; the original route is unchanged.');}- throw error;- } finally {- providerRefreshStage = null;+ return await terminateUnconfirmedCatalogReload(receipt.code);}+ } catch (error) {+ if (error instanceof Error && /rejected the native provider/.test(error.message)) throw error;+ return await terminateUnconfirmedCatalogReload(error);}try {- const refreshed = await proc.request({ type: 'refresh_models' });- const result = refreshed.data as { models?: Array<{ provider?: string; id?: string }>;- aborted?: boolean; errors?: Record<string, string> } | undefined;- if (!refreshed.success || result?.aborted || Object.keys(result?.errors ?? {}).length > 0) {- throw new Error('Pi did not complete the model catalog refresh');- }+ const refreshed = await proc.request({ type: 'get_available_models' });+ const result = refreshed.data as { models?: Array<{ provider?: string; id?: string }> } | undefined;+ if (!refreshed.success) throw new Error('Pi did not expose the refreshed model catalog');const desiredProvider = nextGateway ? PI_PROVIDER_ID : nextProviders.find((entry) => (entry.sourceProviderId ?? entry.id) === sourceId)?.id;const desiredNative = nextProviders.find((entry) => entry.id === desiredProvider);@@ -6539,32 +6597,6 @@ export class PiAgent extends BaseAgent {if (preview.action === 'rebuild') {throw new Error(preview.reason ?? 'Pi model route needs a new process startup input');}- // If the target window changes the reserve, check the optional Pi RPC- // while the old catalog and route are still intact. An older runtime must- // not receive a bridge/catalog mutation before we learn it cannot finish.- const projectedReserve = (window: number, workingWindow?: number): number => {- const settings = JSON.parse(buildPiSettingsJsonContent(- window, sessionPiAutoCompactPct, [], workingWindow,- )) as { compaction?: { reserveTokens?: number } };- // Pi's null setter clears the runtime override back to its in-memory- // SettingsManager value, which may still be the old per-task reserve.- return settings.compaction?.reserveTokens ?? 16_384;- };- const currentReserve = projectedReserve(ctx.contextWindow, ctx.workingContextWindow);- const nextProjectedReserve = projectedReserve(- preview.targetContextWindow ?? ctx.contextWindow,- this.deps.resolveModelContextLimit?.(effectiveProviderId, model) ?? undefined);- if (currentReserve !== nextProjectedReserve) {- const reserveProbe = await proc.request({- type: 'set_compaction_reserve_tokens', reserveTokens: currentReserve,- });- if (!reserveProbe.success ||- (reserveProbe.data as { reserveTokens?: unknown } | undefined)?.reserveTokens !== currentReserve) {- throw new Error(/^Unknown command:/.test(reserveProbe.error ?? '')- ? 'Pi runtime does not support live compaction reserve updates; update the bundled Pi runtime and retry.'- : 'Pi did not confirm the current compaction reserve; model switch was not started.');- }- }if (preview.action === 'refresh') await refreshLiveCatalog(model, effectiveProviderId);// Never let a requested native source silently fall through to Cindy's// gateway when a provider disappeared or a model was removed.@@ -6620,49 +6652,12 @@ export class PiAgent extends BaseAgent {// 所以这一步落的是**带 pending 标记的**新路由:内容已经就位(证明可写、内容可回滚),但// 扩展见到 `pending: true` 就拒绝派发。等待窗口里一个子进程都起不来,既不会用未确认的新// 路由、也不会用与父不一致的旧路由;确认后再清掉标记放行。- const reserveForWindow = (window: number, source: string | null | undefined,- modelId: string, workingWindow?: number): number => {- const settings = JSON.parse(buildPiSettingsJsonContent(- window, sessionPiAutoCompactPct, [],- workingWindow ?? this.deps.resolveModelContextLimit?.(source, modelId) ?? undefined,- )) as { compaction?: { reserveTokens?: number } };- return settings.compaction?.reserveTokens ?? 16_384;- };- const oldReserve = currentReserve;- const targetReserve = nextProjectedReserve;- if (routeUnchanged && preview.action === 'hot' && oldReserve === targetReserve- && !pendingCurrentDescriptorRefresh) {+ if (routeUnchanged && preview.action === 'hot' && !pendingCurrentDescriptorRefresh) {if (!(await writeSubagentRuntimeFile({ model: wireModel, provider }))) {deps.logger.warn('pi: same-route setModel could not refresh subagent snapshot', { model, provider });}return;}- let reserveApplied = false;- if (targetReserve !== oldReserve) {- const setReserve = await proc.request({- type: 'set_compaction_reserve_tokens', reserveTokens: targetReserve,- });- if (!setReserve.success) {- throw new Error(/^Unknown command:/.test(setReserve.error ?? '')- ? 'Pi runtime does not support live compaction reserve updates; update the bundled Pi runtime and retry.'- : `pi: compaction reserve update failed: ${setReserve.error ?? 'unknown'}`);- }- if ((setReserve.data as { reserveTokens?: unknown } | undefined)?.reserveTokens !== targetReserve) {- await terminateUnconfirmedCatalogReload('Pi reserve update was not acknowledged');- }- reserveApplied = true;- }- const restoreReserveOrTerminate = async (): Promise<void> => {- if (!reserveApplied) return;- try {- const restored = await proc.request({- type: 'set_compaction_reserve_tokens', reserveTokens: oldReserve,- });- if (restored.success &&- (restored.data as { reserveTokens?: unknown } | undefined)?.reserveTokens === oldReserve) return;- } catch { /* An unconfirmed reserve rollback requires retirement. */ }- await terminateUnconfirmedCatalogReload('compaction reserve rollback failed');- };const previousSnapshot = {model: mutableWireModel,provider: mutablePiProviderId,@@ -6671,7 +6666,6 @@ export class PiAgent extends BaseAgent {subagentRoutingEnabled&& !(await writeSubagentRuntimeFile({ model: wireModel, provider, pending: true }))) {- await restoreReserveOrTerminate();throw new Error('pi: 无法持久化子代理路由快照,已取消本次模型切换(避免父会话切到新 provider 而子代理仍按旧路由派发)。' +'请检查运行目录是否可写后重试。',@@ -6746,7 +6740,6 @@ export class PiAgent extends BaseAgent {'pi: 模型切换失败且子代理路由快照无法回滚,已终止本会话以避免委派请求发往未启用的端点。' + '请检查运行目录是否可写后重开会话。',);}- await restoreReserveOrTerminate();throw new Error(`pi set_model failed: ${resp.error ?? 'unknown'}`);}// Confirm the materialized route and real window before releasing children.@@ -6762,14 +6755,8 @@ export class PiAgent extends BaseAgent {}const verifiedWindow = verifiedModel.contextWindow;const verifiedReserve = reserveForWindow(verifiedWindow, effectiveProviderId, model);- if (verifiedReserve !== targetReserve) {- const corrected = await proc.request({- type: 'set_compaction_reserve_tokens', reserveTokens: verifiedReserve,- });- if (!corrected.success) throw new Error('Pi did not confirm the actual-window reserve');- if ((corrected.data as { reserveTokens?: unknown } | undefined)?.reserveTokens !== verifiedReserve) {- throw new Error('Pi did not acknowledge the actual-window reserve');- }+ if (!liveRuntimeSettings || resolvePiNativeReserve(liveRuntimeSettings, provider, wireModel) !== verifiedReserve) {+ throw new Error('Pi selected a model whose native compaction settings require a fresh runtime');}await this.writePiRuntimeSettings(configHome, {fileOps, contextWindow: verifiedWindow,diff --git a/packages/maker-core/src/agents/pi/native-runtime-settings.ts b/packages/maker-core/src/agents/pi/native-runtime-settings.tsnew file mode 100644index 0000000000..eab9ec5ea2--- /dev/null+++ b/packages/maker-core/src/agents/pi/native-runtime-settings.ts@@ -0,0 +1,32 @@+/** Official Pi settings are immutable until a native runtime reload. */+export interface PiNativeRuntimeSettings {+ version: string;+ compaction: {+ reserveTokens?: number;+ modelOverrides?: Record<string, { reserveTokens?: number }>;+ };+}++export function parsePiNativeRuntimeSettings(value: unknown): PiNativeRuntimeSettings | undefined {+ if (!value || typeof value !== 'object') return undefined;+ const state = value as Partial<PiNativeRuntimeSettings>;+ if (typeof state.version !== 'string' || !state.compaction || typeof state.compaction !== 'object' || Array.isArray(state.compaction)) return undefined;+ const valid = (tokens: unknown) => tokens === undefined ||+ (typeof tokens === 'number' && Number.isSafeInteger(tokens) && tokens >= 0);+ if (!valid(state.compaction.reserveTokens)) return undefined;+ const overrides = state.compaction.modelOverrides;+ if (overrides !== undefined && (!overrides || typeof overrides !== 'object' || Array.isArray(overrides))) return undefined;+ for (const entry of Object.values(overrides ?? {})) {+ if (!entry || typeof entry !== 'object' || !valid(entry.reserveTokens)) return undefined;+ }+ return state as PiNativeRuntimeSettings;+}++export function resolvePiNativeReserve(settings: PiNativeRuntimeSettings, provider: string, model: string): number {+ // Per-model compaction settings are an official Pi 1.0 feature. Older Pi+ // accepts unknown settings keys but does not apply them.+ const major = /^(\d+)\./.exec(settings.version)?.[1];+ const override = major && Number(major) >= 1+ ? settings.compaction.modelOverrides?.[`${provider}/${model}`]?.reserveTokens : undefined;+ return override ?? settings.compaction.reserveTokens ?? 16_384;+}