dsh-ntr 0.1.4 → 0.1.5

package/README.en.md

@@ -240,7 +240,26 @@ Mount it in your profile's `cordis.patch.yml`. When `cwd` / `allowedCwdRoots` ar
         allowedCwdRoots: [~/.dsh/dsh-ntr/workspaces]
 ```
 
-Optional agent fields: `npmPackage` (auto `npm install -g` when not found on PATH), `exposedModels` (which variants the NTR seat menu lists), `idleTimeoutMs` (idle-release window for chat processes; `0` = never release, default 30 minutes). Plugin-level there are also `transcriptMaxEntries` (per-conversation event buffer cap, default 600) and `probeModelsOnBoot` (kept for compatibility; boot-time per-agent probing no longer happens — see the comment on `bootstrapCatalogs`). Reliability timeouts and retries (`startupTimeoutMs`, `cancelFallbackMs`, `staleCancelRetryDelayMs`, `staleCancelMaxRetries`, `permissionTimeoutMs`, `permissionFallbackTimeoutMs`) are covered by [AGENTS.md](./AGENTS.md) constraints 12 and 13; anything editable in the Settings page should be edited there.
+Optional agent fields: `npmPackage` (auto `npm install -g` when not found on PATH), `exposedModels` (which variants the NTR seat menu lists), `idleTimeoutMs` (idle-release window for chat processes; `0` = never release, default 30 minutes), `mcpServers` (extra MCP servers handed to the agent). Plugin-level there are also `transcriptMaxEntries` (per-conversation event buffer cap, default 600) and `probeModelsOnBoot` (kept for compatibility; boot-time per-agent probing no longer happens — see the comment on `bootstrapCatalogs`). Reliability timeouts and retries (`startupTimeoutMs`, `cancelFallbackMs`, `staleCancelRetryDelayMs`, `staleCancelMaxRetries`, `permissionTimeoutMs`, `permissionFallbackTimeoutMs`) are covered by [AGENTS.md](./AGENTS.md) constraints 12 and 13; anything editable in the Settings page should be edited there.
+
+`mcpServers` uses the plugin's OWN shape (every entry carries a `name` and a `transport`), not the ACP wire shape — the wire's stdio entry has no `type`, and an entry written in the wire shape is silently dropped by the agent:
+
+```yaml
+      - id: pi
+        command: pi-acp
+        mcpServers:
+          - name: codegraph
+            transport: stdio          # stdio needs command; http / sse need url
+            command: /opt/bin/codegraph
+            args: ["serve", "--mcp"]
+            env: { CODEGRAPH_INDEX: /srv/index }
+          - name: remote
+            transport: http
+            url: https://mcp.example.com/mcp
+            headers: { Authorization: "Bearer …" }
+```
+
+These servers are handed to the agent when a session is created; the agent launches and uses them itself. The MCP servers the agent configures for itself are unaffected — this only adds more.
 
 ### Build & install
 

package/README.md

@@ -240,7 +240,26 @@ agent 要动敏感的东西时会问你。审批卡直接出现在聊天输入
         allowedCwdRoots: [~/.dsh/dsh-ntr/workspaces]
 ```
 
-可选的 agent 字段：`npmPackage`（PATH 里找不到时自动 `npm install -g`）、`exposedModels`（NTR 座位菜单列哪些变体）、`idleTimeoutMs`（聊天进程的空闲释放窗口，`0` = 永不释放，默认 30 分钟）。插件级还有 `transcriptMaxEntries`（会话事件缓冲上限，默认 600）与 `probeModelsOnBoot`（保留字段，启动时已不再为每个 agent 探测，见 `bootstrapCatalogs` 的注释）。可靠性超时与重试的默认值（`startupTimeoutMs`、`cancelFallbackMs`、`staleCancelRetryDelayMs`、`staleCancelMaxRetries`、`permissionTimeoutMs` 与 `permissionFallbackTimeoutMs`）见 [AGENTS.md](./AGENTS.md) 约束 12 与 13；设置页能改的都在设置页改。
+可选的 agent 字段：`npmPackage`（PATH 里找不到时自动 `npm install -g`）、`exposedModels`（NTR 座位菜单列哪些变体）、`idleTimeoutMs`（聊天进程的空闲释放窗口，`0` = 永不释放，默认 30 分钟）、`mcpServers`（额外交给 agent 连接的 MCP 服务器）。插件级还有 `transcriptMaxEntries`（会话事件缓冲上限，默认 600）与 `probeModelsOnBoot`（保留字段，启动时已不再为每个 agent 探测，见 `bootstrapCatalogs` 的注释）。可靠性超时与重试的默认值（`startupTimeoutMs`、`cancelFallbackMs`、`staleCancelRetryDelayMs`、`staleCancelMaxRetries`、`permissionTimeoutMs` 与 `permissionFallbackTimeoutMs`）见 [AGENTS.md](./AGENTS.md) 约束 12 与 13；设置页能改的都在设置页改。
+
+`mcpServers` 是**插件自己的形状**（每条必带 `name` 与 `transport`），不是 ACP 线格式——线格式里 stdio 那条不带 `type`，照线格式手写会被 agent 静默丢弃：
+
+```yaml
+      - id: pi
+        command: pi-acp
+        mcpServers:
+          - name: codegraph
+            transport: stdio          # stdio 需 command；http / sse 需 url
+            command: /opt/bin/codegraph
+            args: ["serve", "--mcp"]
+            env: { CODEGRAPH_INDEX: /srv/index }
+          - name: remote
+            transport: http
+            url: https://mcp.example.com/mcp
+            headers: { Authorization: "Bearer …" }
+```
+
+这些服务器在**建会话时**交给 agent，由 agent 自己拉起并使用；agent 自己配置的 MCP 服务器不受影响，这里只是额外追加。
 
 ### 构建与安装
 

package/cordis.patch.yml

@@ -34,6 +34,29 @@
         #                                DEGRADED native route the turn still ends, after
         #                                `permissionFallbackTimeoutMs` (default 300000) —
         #                                see `LedgerFallbackReason`.
+        # nativeApprovalTimeoutMs: 300000
+        #                              How long the native approval route (the composer
+        #                              takeover) may stay unanswered before the ask is
+        #                              WITHDRAWN and re-asked on the settings ledger. 0 waits
+        #                              for the host forever. Default matches
+        #                              `permissionFallbackTimeoutMs`: one window for "this
+        #                              route is not working", not two. Raise it if a
+        #                              deployment's users routinely deliberate for minutes
+        #                              before answering (withdrawing only relocates the
+        #                              question to Settings — it never answers for them).
+        # permissionFallbackTimeoutMs: 300000
+        #                              Deadline for a DEGRADED ask (`unavailable`, or
+        #                              `native-timeout` after the withdrawal above): past it
+        #                              the ask is answered `cancelled` instead of hanging the
+        #                              turn. 0 disables even this. `permissionTimeoutMs > 0`
+        #                              governs every path alike and overrides both.
+        #                              `nativeApprovalTimeoutMs` and
+        #                              `permissionFallbackTimeoutMs` are ALSO editable at
+        #                              runtime (NTR 设置 → 审批时限). The card's value is
+        #                              persisted in the plugin's own state file and OUTRANKS
+        #                              this file; the card shows what this file asked for and
+        #                              offers a reset back to it. Only `permissionTimeoutMs`
+        #                              stays config-file-only, as the override of both.
         # cancelFallbackMs: 15000    # force-finalize a turn the agent ignores after session/cancel (0 = off)
         # staleCancelRetryDelayMs: 600  # resend a prompt answered cancelled with no cancel requested (0 = at once)
         # staleCancelMaxRetries: 2      # cap on those resends before the cancelled stop is reported as-is
@@ -70,3 +93,12 @@
         #                                #   shows as connected) is released after
         #                                #   `probeIdleTimeoutMs` (5 min) whatever this
         #                                #   says, 0 included.
+        #     mcpServers:                # extra MCP servers handed to the agent at
+        #       - name: codegraph        #   session setup (the agent starts them
+        #         transport: stdio       #   itself). The plugin's OWN shape: every
+        #         command: /opt/bin/codegraph   #   entry carries a name and a transport.
+        #         args: [serve, --mcp]    #   `stdio` needs command, `http`/`sse` need
+        #         env: { KEY: value }    #   url. NOT the ACP wire shape, whose stdio
+        #                                #   variant has no `type` field (an entry
+        #                                #   written that way is silently dropped by
+        #                                #   the agent).