dsh-llm-workbuddy 0.1.2 → 0.1.3

package/README.md

@@ -42,7 +42,8 @@
 ```
 
 - **后端路由**（`lib/index.js` 的 `registerWorkbuddyRoutes`）运行在 `dsh web` 的
-  HTTP 服务上，通过 Cordis 的 `ctx.webServer` 注册，headless profile 下自动跳过。
+  HTTP 服务上，通过 Cordis 的 `webServer` 服务注册（用 `ctx.get("webServer")`
+  探测，`webServer` 不列入 `inject`），headless profile 下自动跳过。
 - **前端胶囊**（`lib/client.js`）是零依赖的原生浏览器 JS，由 DSH 的 `dsh.client`
   双端机制在 `window.__DSH_BOOT__` 中注入，serve 于
   `/plugins/dsh-llm-workbuddy/client.js`。
@@ -163,13 +164,16 @@ Web 登录后终端脚本也读得到同一份会话。
 
 ### 后端路由（`lib/index.js`）
 
-插件在 `apply(ctx, config)` 里通过 `ctx.webServer.register(...)` 注册两条路由
-（headless profile 无 `webServer`，自动跳过）：
+插件在 `apply(ctx, config)` 里用 `ctx.get("webServer")` 探测 HTTP 服务（不在
+`inject` 里，headless profile 无 `webServer` 时返回 `undefined`、自动跳过），
+然后通过 `webServer.register({ kind: 'exact', path, handler })` 注册两条精确
+路由，并用 `ctx.effect` 包裹以便热重载自动清理。HTTP 方法过滤在 handler 内自行
+判断（`req.method`），因为路由 API 本身不含方法字段：
 
 | 方法 + 路径 | 行为 |
 |---|---|
-| `GET /api/workbuddy/status` | 读取会话文件（默认 `~/.codebuddy-session.json`，或配置的 `sessionFile`）的 `auth.expiresAt` 判断会话是否有效，并 `fetch` 代理 `/health` 判断 `proxyUp`；返回 JSON：`{ sessionFile, authenticated, expiresAt, account, proxyUp, tokenValid, loginScriptAvailable }` |
-| `POST /api/workbuddy/login` | 若已有有效会话则直接返回 `alreadyLoggedIn`；否则用系统 `python3` `spawn` 包内 `login_workbuddy.py --session-file <sessionFile>`，从子进程 stdout 解析出 `authUrl` 立即返回 `{ authUrl, pending:true }`（设备流在后台继续，前端轮询 status 感知完成） |
+| `GET /api/workbuddy/status` | 读取会话文件（默认 `~/.codebuddy-session.json`，或配置的 `sessionFile`）的 `auth.expiresAt` 判断会话是否有效，并 `fetch` 代理 `/health` 判断 `proxyUp`；返回 JSON：`{ sessionFile, authenticated, expiresAt, account, proxyUp, tokenValid, loginScriptAvailable }`；非 GET 返回 405 |
+| `POST /api/workbuddy/login` | 若已有有效会话则直接返回 `alreadyLoggedIn`；否则用系统 `python3` `spawn` 包内 `login_workbuddy.py --session-file <sessionFile>`，从子进程 stdout 解析出 `authUrl` 立即返回 `{ authUrl, pending:true }`（设备流在后台继续，前端轮询 status 感知完成）；非 POST 返回 405 |
 
 > 会话文件与登录脚本路径的解析顺序：
 > 1. 配置里显式指定的 `sessionFile` / `loginScript`；

package/lib/index.js

@@ -38,7 +38,11 @@ import { MAX_TIMER_DELAY_MS, idleWatchdog, timeoutOf } from "@deepseek-ai/dsh-ti
 
 /** Plugin identity (Cordis convention). */
 export const name = "llm-workbuddy";
-export const inject = ["llm", "webServer"];
+// `llm` is a hard requirement (the adapter must always register). `webServer`
+// is optional — headless profiles have no HTTP surface, so it must NOT be in
+// `inject` (that would make the whole plugin PENDING forever in headless).
+// We probe it at the use site instead. See cordis-tutorial/03-services.md.
+export const inject = ["llm"];
 
 /** The single provider route this plugin owns. */
 export const PROVIDER = "workbuddy";
@@ -765,14 +769,28 @@ async function probeProxy(baseURL) {
  * file appears and reports `authenticated: true`.
  */
 function registerWorkbuddyRoutes(ctx, config) {
-  if (ctx.webServer === undefined) return; // headless profile: no HTTP surface
+  // Probe the optional webServer service. In a headless profile it is absent
+  // and we skip the HTTP surface entirely — the adapter (registered in apply)
+  // still works. Because `webServer` is not in `inject`, this must be a
+  // runtime probe, not a dereference.
+  const webServer = ctx.get("webServer");
+  if (webServer === undefined) return;
   const baseURL = config_baseURL();
   const { sessionFile, loginScript } = resolveLoginPaths(config);
-  ctx.webServer.register({
+  // The register() call returns a disposer. Wrapping it in ctx.effect ties it
+  // to the plugin fiber so config hot-edit / reload cleans the routes up
+  // instead of leaking them (a leaked route makes a duplicate re-register
+  // throw). Method filtering must be done inside the handler — the route API
+  // only accepts `{ kind, path, handler }`.
+  ctx.effect(() => webServer.register({
+    kind: "exact",
     path: "/api/workbuddy/status",
-    exact: true,
-    methods: ["GET"],
-    async handler(_req, res) {
+    async handler(req, res) {
+      if (req.method !== "GET") {
+        res.writeHead(405, { "content-type": "application/json" });
+        res.end(JSON.stringify({ error: "method not allowed" }));
+        return;
+      }
       const session = readSessionStatus(sessionFile);
       const proxy = await probeProxy(baseURL);
       res.writeHead(200, { "content-type": "application/json" });
@@ -782,12 +800,16 @@ function registerWorkbuddyRoutes(ctx, config) {
         loginScriptAvailable: existsSync(loginScript),
       }));
     },
-  });
-  ctx.webServer.register({
+  }));
+  ctx.effect(() => webServer.register({
+    kind: "exact",
     path: "/api/workbuddy/login",
-    exact: true,
-    methods: ["POST"],
-    async handler(_req, res) {
+    async handler(req, res) {
+      if (req.method !== "POST") {
+        res.writeHead(405, { "content-type": "application/json" });
+        res.end(JSON.stringify({ error: "method not allowed" }));
+        return;
+      }
       if (!existsSync(loginScript)) {
         res.writeHead(503, { "content-type": "application/json" });
         res.end(JSON.stringify({ error: "login_workbuddy.py not found" }));
@@ -817,7 +839,7 @@ function registerWorkbuddyRoutes(ctx, config) {
       res.writeHead(200, { "content-type": "application/json" });
       res.end(JSON.stringify({ authUrl, pending: true }));
     },
-  });
+  }));
 }
 
 /** Lazily resolve the configured proxy base URL for the health probe. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-llm-workbuddy",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "WorkBuddy (via the local workbuddy2api proxy) LLM provider adapter for DeepSeek Harness, with a Web login-status widget",
   "type": "module",
   "main": "lib/index.js",