@haoyiyin/9router 0.1.2 → 0.1.4

package/README.md

@@ -1,38 +1,28 @@
 # @haoyiyin/9router
 
-pi 扩展 — 9Router provider（含 OpenCode Free `oc/` 模型）+ fetch / search / transcribe 工具。
+Pi extension — a **9Router provider** (including OpenCode Free `oc/` models) plus `fetch`, `search`, and `transcribe` tools.
 
-Fork of [`@xynogen/pix-9router`](https://www.npmjs.com/package/@xynogen/pix-9router)，修复了 9router 的 `/v1/models` 永远不列出 OpenCode Free `-free` 模型的问题，本扩展直接暴露这些 `oc/` 模型。
+A fork of [`@xynogen/pix-9router`](https://www.npmjs.com/package/@xynogen/pix-9router) that fixes the issue where 9router's `/v1/models` never lists OpenCode Free `-free` models — this extension exposes those `oc/` models directly.
 
-## 安装
+## Install
 
 ```
 pi install npm:@haoyiyin/9router
 ```
 
-## 配置
+## Configure
 
-默认无内置地址。运行 `/9router` → 输入 9Router 地址和 API Key → 存入 `~/.pi/agent/haoyiyin/9router.json`（权限 `0600`）。Key 已配置时 `/9router` 可留空保持原值。
+There is no built-in default endpoint. Run `/9router`, enter the 9Router base URL and API key, and they are saved to `~/.pi/agent/haoyiyin/9router.json` (mode `0600`). Leave the key empty to keep the currently configured key.
 
-也可以设置环境变量兜底：`ROUTER_API_BASE` / `ROUTER_API_KEY`（配置文件优先）。
+Environment variables are supported as a fallback: `ROUTER_API_BASE` / `ROUTER_API_KEY` (the config file takes precedence).
 
-## oc 模型
+## oc models
 
-每 30 分钟自动拉取 `opencode.ai/zen/v1/models` 中 id 以 `-free` 结尾的模型，以 `oc/<id>` 形式注册进 9router provider。列表波动会自动跟随。缓存文件：`~/.cache/pi/zen-oc-models.json`。
+Every 30 minutes the extension fetches models from `opencode.ai/zen/v1/models` whose ids end in `-free`, and registers them under the 9router provider as `oc/<id>`. Changes to the upstream list are picked up automatically. Cache file: `~/.cache/pi/zen-oc-models.json`.
 
-## 迁移
+## Tools
 
-如果你装过 `@xynogen/pix-9router`：
-
-```
-pi remove npm:@xynogen/pix-9router
-```
-
-并（可选）删除 `~/.zshrc` 里的 `ROUTER_API_KEY` / `ROUTER_API_BASE` export。
-
-## 工具
-
-`fetch` / `search` / `transcribe` 与 `pix-9router` 一致；collapse 配置仍在 `~/.pi/agent/pix.json`。
+`fetch` / `search` / `transcribe` behave the same as `pix-9router`; collapse config still lives in `~/.pi/agent/pix.json`.
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haoyiyin/9router",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "type": "module",
   "main": "src/index.ts",
   "description": "Pi extension — 9Router provider (OpenCode Free oc/-free models + router models) + fetch/search/transcribe tools",

package/src/command.ts

@@ -1,6 +1,6 @@
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { loadConfig, saveConfig, DEFAULT_BASE } from "./config.ts";
-import { registerProvider } from "./provider.ts";
+import { registerProvider, isStaleCtxError } from "./provider.ts";
 
 // Never contains a real key. If a dialog pre-fills this placeholder as an
 // editable default, an exact match is treated as "keep the current key".
@@ -41,7 +41,9 @@ export function registerCommand(pi: ExtensionAPI): void {
 				await registerProvider(pi);
 			} catch (err) {
 				ctx.ui.notify(
-					`9Router saved, but provider re-registration failed: ${err instanceof Error ? err.message : String(err)}`,
+					isStaleCtxError(err)
+						? "9Router saved. This extension instance was replaced by a session change/reload; the new instance has re-registered the provider."
+						: `9Router saved, but provider re-registration failed: ${err instanceof Error ? err.message : String(err)}`,
 					"warning",
 				);
 			}

package/src/index.ts

@@ -2,7 +2,7 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import registerFetch from "./fetch.ts";
 import registerSearch from "./search.ts";
 import registerTranscribe from "./transcribe.ts";
-import { registerProvider } from "./provider.ts";
+import { registerProvider, isStaleCtxError } from "./provider.ts";
 import { registerCommand } from "./command.ts";
 
 export default async function (pi: ExtensionAPI): Promise<void> {
@@ -15,14 +15,27 @@ export default async function (pi: ExtensionAPI): Promise<void> {
 	await registerProvider(pi);
 
 	let refreshing = false;
+	let closed = false;
 	const timer = setInterval(
 		async () => {
 			// ponytail: models refresh by unregister+register; zen cache TTL is
 			// 30m so refetch happens naturally. Overlap guard avoids re-entrancy.
-			if (refreshing) return;
+			if (closed || refreshing) return;
 			refreshing = true;
 			try {
 				await registerProvider(pi);
+			} catch (err) {
+				// The captured `pi` goes stale after session replacement or
+				// extension reload, and pi's assertActive() throw must never
+				// escape this callback — it would crash the whole process as an
+				// uncaughtException. The new session's extension instance
+				// re-registers the provider itself, so stop this timer for good.
+				if (isStaleCtxError(err)) {
+					closed = true;
+					clearInterval(timer);
+				}
+				// Any other error (network hiccup, bad upstream payload) is
+				// swallowed: the next tick retries.
 			} finally {
 				refreshing = false;
 			}
@@ -32,4 +45,8 @@ export default async function (pi: ExtensionAPI): Promise<void> {
 	if (typeof (timer as { unref?: () => void }).unref === "function") {
 		(timer as { unref: () => void }).unref();
 	}
+	pi.on("session_shutdown", () => {
+		closed = true;
+		clearInterval(timer);
+	});
 }

package/src/provider.ts

@@ -69,6 +69,16 @@ export function getReasoning(model: RouterModel, devModel?: ModelsDevModel): boo
 	return /reasoner|thinking|xhigh|high|max|pro|codex|opus|sonnet/i.test(model.id ?? "");
 }
 
+/**
+ * True if `err` is pi's stale-extension-ctx error, thrown when a captured
+ * `pi`/command ctx is used after session replacement (newSession / fork /
+ * switchSession) or extension reload. A stale instance can never recover —
+ * the new session's extension instance re-registers everything itself.
+ */
+export function isStaleCtxError(err: unknown): boolean {
+	return err instanceof Error && /stale after session replacement|ctx is stale/.test(err.message);
+}
+
 export async function registerProvider(pi: ExtensionAPI): Promise<void> {
 	const cfg = loadConfig();