dsh-global-supervisor 0.0.0-stage → 0.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -0
- package/README.md +52 -2
- package/README.zh-CN.md +55 -0
- package/client/client.js +168 -0
- package/client/src/factory-banner.txt +3 -0
- package/client/src/index.ts +153 -0
- package/cordis.patch.yml +8 -0
- package/dist/adapters/dsh-agent.d.ts +48 -0
- package/dist/adapters/dsh-agent.js +93 -0
- package/dist/adapters/dsh-agent.js.map +1 -0
- package/dist/adapters/dsh-im-notifier.d.ts +37 -0
- package/dist/adapters/dsh-im-notifier.js +48 -0
- package/dist/adapters/dsh-im-notifier.js.map +1 -0
- package/dist/adapters/dsh-llm-catalog.d.ts +26 -0
- package/dist/adapters/dsh-llm-catalog.js +41 -0
- package/dist/adapters/dsh-llm-catalog.js.map +1 -0
- package/dist/adapters/dsh-schedule.d.ts +51 -0
- package/dist/adapters/dsh-schedule.js +36 -0
- package/dist/adapters/dsh-schedule.js.map +1 -0
- package/dist/adapters/dsh-session.d.ts +40 -0
- package/dist/adapters/dsh-session.js +118 -0
- package/dist/adapters/dsh-session.js.map +1 -0
- package/dist/adapters/dsh-workspace.d.ts +29 -0
- package/dist/adapters/dsh-workspace.js +61 -0
- package/dist/adapters/dsh-workspace.js.map +1 -0
- package/dist/adapters/host-services.d.ts +13 -0
- package/dist/adapters/host-services.js +28 -0
- package/dist/adapters/host-services.js.map +1 -0
- package/dist/database/connection.d.ts +17 -0
- package/dist/database/connection.js +38 -0
- package/dist/database/connection.js.map +1 -0
- package/dist/database/migrations.d.ts +17 -0
- package/dist/database/migrations.js +239 -0
- package/dist/database/migrations.js.map +1 -0
- package/dist/database/repository/audit-repository.d.ts +29 -0
- package/dist/database/repository/audit-repository.js +21 -0
- package/dist/database/repository/audit-repository.js.map +1 -0
- package/dist/database/repository/event-repository.d.ts +34 -0
- package/dist/database/repository/event-repository.js +41 -0
- package/dist/database/repository/event-repository.js.map +1 -0
- package/dist/database/repository/event-routing-rule-repository.d.ts +37 -0
- package/dist/database/repository/event-routing-rule-repository.js +47 -0
- package/dist/database/repository/event-routing-rule-repository.js.map +1 -0
- package/dist/database/repository/plugin-setting-repository.d.ts +14 -0
- package/dist/database/repository/plugin-setting-repository.js +34 -0
- package/dist/database/repository/plugin-setting-repository.js.map +1 -0
- package/dist/database/repository/project-repository.d.ts +36 -0
- package/dist/database/repository/project-repository.js +83 -0
- package/dist/database/repository/project-repository.js.map +1 -0
- package/dist/database/repository/routing-rule-repository.d.ts +27 -0
- package/dist/database/repository/routing-rule-repository.js +57 -0
- package/dist/database/repository/routing-rule-repository.js.map +1 -0
- package/dist/database/repository/schedule-binding-repository.d.ts +33 -0
- package/dist/database/repository/schedule-binding-repository.js +36 -0
- package/dist/database/repository/schedule-binding-repository.js.map +1 -0
- package/dist/database/repository/task-repository.d.ts +47 -0
- package/dist/database/repository/task-repository.js +91 -0
- package/dist/database/repository/task-repository.js.map +1 -0
- package/dist/database/repository/task-run-repository.d.ts +23 -0
- package/dist/database/repository/task-run-repository.js +30 -0
- package/dist/database/repository/task-run-repository.js.map +1 -0
- package/dist/database/repository/thread-subscription-repository.d.ts +29 -0
- package/dist/database/repository/thread-subscription-repository.js +42 -0
- package/dist/database/repository/thread-subscription-repository.js.map +1 -0
- package/dist/database/repository/worker-report-repository.d.ts +38 -0
- package/dist/database/repository/worker-report-repository.js +32 -0
- package/dist/database/repository/worker-report-repository.js.map +1 -0
- package/dist/index.d.ts +88 -0
- package/dist/index.js +211 -0
- package/dist/index.js.map +1 -0
- package/dist/probe.d.ts +20 -0
- package/dist/probe.js +213 -0
- package/dist/probe.js.map +1 -0
- package/dist/protocols/schedule-timing.d.ts +34 -0
- package/dist/protocols/schedule-timing.js +165 -0
- package/dist/protocols/schedule-timing.js.map +1 -0
- package/dist/protocols/worker-report.d.ts +28 -0
- package/dist/protocols/worker-report.js +87 -0
- package/dist/protocols/worker-report.js.map +1 -0
- package/dist/runtime.d.ts +42 -0
- package/dist/runtime.js +92 -0
- package/dist/runtime.js.map +1 -0
- package/dist/services/agent-controller.d.ts +61 -0
- package/dist/services/agent-controller.js +146 -0
- package/dist/services/agent-controller.js.map +1 -0
- package/dist/services/event-batcher.d.ts +43 -0
- package/dist/services/event-batcher.js +98 -0
- package/dist/services/event-batcher.js.map +1 -0
- package/dist/services/event-manager.d.ts +52 -0
- package/dist/services/event-manager.js +64 -0
- package/dist/services/event-manager.js.map +1 -0
- package/dist/services/event-router.d.ts +60 -0
- package/dist/services/event-router.js +201 -0
- package/dist/services/event-router.js.map +1 -0
- package/dist/services/model-queue.d.ts +42 -0
- package/dist/services/model-queue.js +54 -0
- package/dist/services/model-queue.js.map +1 -0
- package/dist/services/notifier.d.ts +53 -0
- package/dist/services/notifier.js +99 -0
- package/dist/services/notifier.js.map +1 -0
- package/dist/services/project-monitor.d.ts +65 -0
- package/dist/services/project-monitor.js +125 -0
- package/dist/services/project-monitor.js.map +1 -0
- package/dist/services/router-identity.d.ts +60 -0
- package/dist/services/router-identity.js +93 -0
- package/dist/services/router-identity.js.map +1 -0
- package/dist/services/scheduler.d.ts +55 -0
- package/dist/services/scheduler.js +87 -0
- package/dist/services/scheduler.js.map +1 -0
- package/dist/services/settings-api.d.ts +40 -0
- package/dist/services/settings-api.js +212 -0
- package/dist/services/settings-api.js.map +1 -0
- package/dist/services/task-manager.d.ts +88 -0
- package/dist/services/task-manager.js +304 -0
- package/dist/services/task-manager.js.map +1 -0
- package/dist/services/task-state-machine.d.ts +17 -0
- package/dist/services/task-state-machine.js +37 -0
- package/dist/services/task-state-machine.js.map +1 -0
- package/dist/services/workspace-manager.d.ts +81 -0
- package/dist/services/workspace-manager.js +147 -0
- package/dist/services/workspace-manager.js.map +1 -0
- package/dist/tools/supervisor-tools.d.ts +9 -0
- package/dist/tools/supervisor-tools.js +644 -0
- package/dist/tools/supervisor-tools.js.map +1 -0
- package/dist/tools/toolkit.d.ts +40 -0
- package/dist/tools/toolkit.js +45 -0
- package/dist/tools/toolkit.js.map +1 -0
- package/dist/tools/worker-report-tool.d.ts +9 -0
- package/dist/tools/worker-report-tool.js +59 -0
- package/dist/tools/worker-report-tool.js.map +1 -0
- package/dist/types/index.d.ts +128 -0
- package/dist/types/index.js +6 -0
- package/dist/types/index.js.map +1 -0
- package/dist/utils/id.d.ts +4 -0
- package/dist/utils/id.js +8 -0
- package/dist/utils/id.js.map +1 -0
- package/docs/API_COMPATIBILITY.md +109 -0
- package/docs/ARCHITECTURE.md +28 -0
- package/docs/ASSESSMENT_SWOT.md +151 -0
- package/docs/DATABASE.md +28 -0
- package/docs/DEPLOYMENT.md +63 -0
- package/docs/DEVELOPMENT_PLAN.md +628 -0
- package/docs/INTEGRATIONS.md +88 -0
- package/docs/ITERATION_PLAN.md +953 -0
- package/docs/SUPER_AGENT_GAP_ANALYSIS.md +440 -0
- package/docs/TASK_STATE_MACHINE.md +26 -0
- package/docs/TEST_PLAN.md +53 -0
- package/docs/TROUBLESHOOTING.md +43 -0
- package/docs/UI_PANEL_PLAN.md +83 -0
- package/docs/USER_GUIDE.md +213 -0
- package/package.json +72 -4
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026 dsh-global-supervisor contributors
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -1,3 +1,53 @@
|
|
|
1
|
-
#
|
|
1
|
+
# dsh-global-supervisor
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
> [简体中文](README.zh-CN.md) | **English**
|
|
4
|
+
|
|
5
|
+
Global supervisor plugin for DSH (DeepSeek Harness): cross-workspace project management, task dispatch, status monitoring, scheduled inspections, and event response — without modifying DSH core.
|
|
6
|
+
|
|
7
|
+
A single Router session manages many project workspaces: identify projects, dispatch tasks, resume sessions, receive structured worker reports, run periodic patrols. All state persists in SQLite and survives host restarts.
|
|
8
|
+
|
|
9
|
+
## Highlights
|
|
10
|
+
|
|
11
|
+
- **Router/Worker split** — the Router session holds 24 `supervisor_*` tools; worker sessions report via `worker_report` with server-side permission checks (not prompt constraints).
|
|
12
|
+
- **Task state machine** — `pending → queued → running → completed` plus `blocked / need_human / failed / canceled`; strict transition table with audit trail; Task/TaskRun separation keeps retry history intact.
|
|
13
|
+
- **SQLite persistence** — 13 tables on built-in `node:sqlite`, zero native dependencies.
|
|
14
|
+
- **Event-driven** — webhook intake + 5 cordis event subscriptions with a unified dedup pipeline; observe/auto rule routing; multiple events batched into one Router notification.
|
|
15
|
+
- **Thread passthrough** — tasks created from an event auto-subscribe to its thread; follow-up events on the same thread go straight to the assigned worker, bypassing the Router.
|
|
16
|
+
- **Context recall** — `supervisor_recall` pulls related context (thread events, subscriptions, worker reports, run history) in one hop.
|
|
17
|
+
- **Watchdog, 4 classes** — startup-timeout retry, run-timeout retry, need-human escalation, idle/lost worker detection; 5-minute scans.
|
|
18
|
+
- **IM push (optional)** — need-human alerts and completion summaries to Feishu/Telegram etc. via dsh-im, with automatic fallback to the Router session.
|
|
19
|
+
- **Model control** — per-task / per-project model selection and switching; `steer` to inject instructions into a running task.
|
|
20
|
+
- **Serial dispatch** — ModelQueue defaults to concurrency 1 with priority queue-jumping that never preempts a running task, tuned for local inference.
|
|
21
|
+
- **Scheduled inspections** — reuses the DSH native host-wide Schedule service (0.2.2-rc.x); no custom cron.
|
|
22
|
+
|
|
23
|
+
## Requirements
|
|
24
|
+
|
|
25
|
+
- DSH Desktop **0.2.2-rc.x** (host-wide Schedule requires 0.2.x; 0.1.x is incompatible)
|
|
26
|
+
- Node ≥ 22.19 (built-in `node:sqlite`; shipped with the DSH runtime)
|
|
27
|
+
|
|
28
|
+
## Install
|
|
29
|
+
|
|
30
|
+
```powershell
|
|
31
|
+
# Run in the DSH Desktop built-in terminal (replace "desktop" with your profile name)
|
|
32
|
+
dsh plugin --profile desktop add dsh-global-supervisor
|
|
33
|
+
```
|
|
34
|
+
|
|
35
|
+
Restart DSH Desktop. **Installing is not enough**: open the settings panel ("Global Supervisor") and assign a Router session first. IM push is optional (configure a dsh-im bot). Patch-level configuration options: see `cordis.patch.yml`.
|
|
36
|
+
|
|
37
|
+
For development, link mode works too: in the profile directory run `pnpm add "dsh-global-supervisor@link:<repo path>"` and add the package name to `dsh.profile.bundles`.
|
|
38
|
+
|
|
39
|
+
## Documentation
|
|
40
|
+
|
|
41
|
+
Full documentation ships inside the npm package (in Chinese) at `node_modules/dsh-global-supervisor/docs/`: USER_GUIDE (usage), DEVELOPMENT_PLAN, API_COMPATIBILITY (API contract + host sandbox contract), ITERATION_PLAN, TEST_PLAN, DEPLOYMENT, TROUBLESHOOTING, INTEGRATIONS. Engineering discipline: [AGENTS.md](AGENTS.md).
|
|
42
|
+
|
|
43
|
+
## Development
|
|
44
|
+
|
|
45
|
+
Build and tests must run on the DSH runtime node (≥ 22.19; PATH node is often too old). All release gates (tsc, client bundle, vitest, bundle smoke) run via `node scripts/prepublish-check.mjs`, wired to `prepublishOnly` — `npm publish` enforces them automatically.
|
|
46
|
+
|
|
47
|
+
## Status
|
|
48
|
+
|
|
49
|
+
Version 0.5.2 — the full planned feature set is complete: 25 tools (24 Router + `worker_report`), 190 unit tests, and every major flow verified end-to-end against a real DSH Desktop 0.2.2-rc.x host.
|
|
50
|
+
|
|
51
|
+
## License
|
|
52
|
+
|
|
53
|
+
MIT
|
package/README.zh-CN.md
ADDED
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
# dsh-global-supervisor
|
|
2
|
+
|
|
3
|
+
> **简体中文** | [English](README.md)
|
|
4
|
+
|
|
5
|
+
DSH(DeepSeek Harness)全局监督插件:跨 Workspace 的项目管理、任务分派、状态监控、定时巡检与事件响应。
|
|
6
|
+
|
|
7
|
+
在不修改 DSH 核心源码的前提下,以一个 Router 会话统一管理多个项目 Workspace——识别项目、分派任务、恢复 Session、接收结构化汇报、定时巡检,全局状态 SQLite 持久化,Host 重启后可恢复。
|
|
8
|
+
|
|
9
|
+
## 核心特性
|
|
10
|
+
|
|
11
|
+
- **Router/Worker 分工**:Router 会话持有 `supervisor_*` 工具集(24 个)统一调度;Worker 会话经 `worker_report` 结构化汇报(权限服务端校验,非 Prompt 约束)。
|
|
12
|
+
- **任务状态机**:`pending → queued → running → completed` 及 `blocked / need_human / failed / canceled`,严格转换表 + 审计留痕;Task 与 TaskRun 分离,重试不覆盖历史。
|
|
13
|
+
- **SQLite 持久化**:十三张表(八表基线 + plugin_settings / routing_rules / event_routing_rules / thread_subscriptions 等),基于 Node 内建 `node:sqlite`,零原生依赖。
|
|
14
|
+
- **事件驱动**:Webhook 接入外部事件 + 五种 cordis 内部事件订阅,统一流水去重;observe/auto 双模式规则路由(转述/静音/直投 Worker),多条事件自动合批为一条 Router 通知。
|
|
15
|
+
- **Thread 直通**:从事件创建的任务自动订阅来源 Thread,同 Thread 后续事件直投该任务 Worker,不经 Router。
|
|
16
|
+
- **上下文召回**:`supervisor_recall` 按事件/任务 ID 一跳召回关联上下文(同 Thread 事件、订阅任务、Worker 汇报、执行历史)。
|
|
17
|
+
- **看门狗四分类**:启动超时重试 / 执行超时重试 / 需人工超时升级 / Worker 空闲失联检测,每 5 分钟自动扫描。
|
|
18
|
+
- **IM 推送(可选)**:经 dsh-im 把需人工提醒与完成摘要推到飞书/Telegram 等手机 IM,不可用自动降级 Router 会话。
|
|
19
|
+
- **串行派发**:ModelQueue 默认并发 1,优先级插队不抢占运行中任务,适配本地推理资源。
|
|
20
|
+
- **定时巡检**:复用 DSH 原生 Host-wide Schedule(0.2.2-rc.x),不自研 Cron。
|
|
21
|
+
|
|
22
|
+
## 环境要求
|
|
23
|
+
|
|
24
|
+
- DSH Desktop **0.2.2-rc.x**(Host-wide Schedule 依赖 0.2.x;0.1.x 不兼容)
|
|
25
|
+
- Node ≥ 22.19(内建 `node:sqlite`)
|
|
26
|
+
|
|
27
|
+
## 安装
|
|
28
|
+
|
|
29
|
+
```powershell
|
|
30
|
+
# DSH Desktop 内置终端执行(--profile 后换成你自己的 profile 名)
|
|
31
|
+
dsh plugin --profile desktop add dsh-global-supervisor
|
|
32
|
+
```
|
|
33
|
+
|
|
34
|
+
安装后重启 DSH Desktop。**装完 ≠ 可用**:首次使用需在设置面板(全局监督)指派 Router 会话,IM 推送为可选项(配置 dsh-im bot 后生效);patch 级配置项见包内 `cordis.patch.yml` 示例。
|
|
35
|
+
|
|
36
|
+
开发期调试可用 link 模式:profile 目录 `pnpm add "dsh-global-supervisor@link:<仓库路径>"` 并把包名加入 profile 的 `dsh.profile.bundles`。
|
|
37
|
+
|
|
38
|
+
## 开发
|
|
39
|
+
|
|
40
|
+
```powershell
|
|
41
|
+
# 构建与测试须用 DSH runtime node(本机 PATH node 过旧)
|
|
42
|
+
node24 node_modules\typescript\bin\tsc -p tsconfig.json # host 侧构建(含类型检查)
|
|
43
|
+
node24 scripts\build-client.mjs # client 侧构建(设置面板 bundle)
|
|
44
|
+
node24 node_modules\vitest\vitest.mjs run # 全部测试
|
|
45
|
+
```
|
|
46
|
+
|
|
47
|
+
完整文档随 npm 包发行(安装后位于 `node_modules/dsh-global-supervisor/docs/`):USER_GUIDE(使用说明)、DEVELOPMENT_PLAN(开发方案)、API_COMPATIBILITY(API 使用契约与宿主沙箱契约)、ITERATION_PLAN(迭代方案)、TEST_PLAN(测试与验收映射)、DEPLOYMENT(部署运维)、TROUBLESHOOTING(排障)、INTEGRATIONS(外部集成样例)、ASSESSMENT_SWOT(生态定位评估)。工程纪律见 [AGENTS.md](AGENTS.md)。
|
|
48
|
+
|
|
49
|
+
## 状态
|
|
50
|
+
|
|
51
|
+
当前版本 0.5.2:规划功能全部完成——跨 Workspace 任务管理、事件路由与合批、Thread 直通、上下文召回、看门狗四分类、IM 通知、steer 与模型切换。25 个工具、190 个单测,主要流程均在真实 DSH Desktop 0.2.2-rc.x Host 实测通过(细节见包内 API_COMPATIBILITY 变更记录)。
|
|
52
|
+
|
|
53
|
+
## License
|
|
54
|
+
|
|
55
|
+
MIT
|
package/client/client.js
ADDED
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
window.__ModuleLoader__.load({ id: "dsh-global-supervisor", factory: (require) => {
|
|
2
|
+
var module = { exports: {} };
|
|
3
|
+
var exports = module.exports;
|
|
4
|
+
"use strict";
|
|
5
|
+
var __defProp = Object.defineProperty;
|
|
6
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
7
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
8
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
9
|
+
var __export = (target, all) => {
|
|
10
|
+
for (var name in all)
|
|
11
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
12
|
+
};
|
|
13
|
+
var __copyProps = (to, from, except, desc) => {
|
|
14
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
15
|
+
for (let key of __getOwnPropNames(from))
|
|
16
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
17
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
18
|
+
}
|
|
19
|
+
return to;
|
|
20
|
+
};
|
|
21
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
22
|
+
|
|
23
|
+
// client/src/index.ts
|
|
24
|
+
var index_exports = {};
|
|
25
|
+
__export(index_exports, {
|
|
26
|
+
apply: () => apply,
|
|
27
|
+
inject: () => inject
|
|
28
|
+
});
|
|
29
|
+
module.exports = __toCommonJS(index_exports);
|
|
30
|
+
var import_react = require("react");
|
|
31
|
+
var inject = ["slots"];
|
|
32
|
+
function api(path) {
|
|
33
|
+
const relative = path.replace(/^\/+/, "");
|
|
34
|
+
if (typeof document === "undefined") return `/${relative}`;
|
|
35
|
+
return new URL(relative, document.baseURI).pathname;
|
|
36
|
+
}
|
|
37
|
+
var style = {
|
|
38
|
+
card: { display: "grid", gap: "12px", padding: "16px", fontSize: "14px" },
|
|
39
|
+
row: { display: "flex", gap: "8px", alignItems: "center", flexWrap: "wrap" },
|
|
40
|
+
label: { minWidth: "72px", opacity: "0.8" },
|
|
41
|
+
select: { padding: "4px 8px", minWidth: "220px" },
|
|
42
|
+
button: { padding: "6px 16px", cursor: "pointer" },
|
|
43
|
+
hint: { opacity: 0.7, fontSize: "12px" }
|
|
44
|
+
};
|
|
45
|
+
function SupervisorPanel() {
|
|
46
|
+
const [data, setData] = (0, import_react.useState)(null);
|
|
47
|
+
const [error, setError] = (0, import_react.useState)("");
|
|
48
|
+
const [mode, setMode] = (0, import_react.useState)("session");
|
|
49
|
+
const [workspaceId, setWorkspaceId] = (0, import_react.useState)("");
|
|
50
|
+
const [sessionId, setSessionId] = (0, import_react.useState)("");
|
|
51
|
+
const [busy, setBusy] = (0, import_react.useState)(false);
|
|
52
|
+
const [result, setResult] = (0, import_react.useState)("");
|
|
53
|
+
const reload = (0, import_react.useCallback)(() => {
|
|
54
|
+
setError("");
|
|
55
|
+
fetch(api("global-supervisor/settings")).then((r) => r.json()).then((payload) => {
|
|
56
|
+
setData(payload);
|
|
57
|
+
if (payload.router) {
|
|
58
|
+
setMode(payload.router.mode === "workspace" ? "workspace" : "session");
|
|
59
|
+
setSessionId(payload.router.sessionId);
|
|
60
|
+
setWorkspaceId(payload.router.workspaceId ?? "");
|
|
61
|
+
}
|
|
62
|
+
}).catch((e) => setError(String(e)));
|
|
63
|
+
}, []);
|
|
64
|
+
(0, import_react.useEffect)(() => {
|
|
65
|
+
reload();
|
|
66
|
+
}, [reload]);
|
|
67
|
+
const submit = (0, import_react.useCallback)(() => {
|
|
68
|
+
setBusy(true);
|
|
69
|
+
setResult("");
|
|
70
|
+
const body = mode === "workspace" ? { mode, sessionId, workspaceId } : { mode, sessionId };
|
|
71
|
+
fetch(api("global-supervisor/claim"), { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify(body) }).then(async (r) => ({ ok: r.ok, payload: await r.json() })).then(({ ok, payload }) => {
|
|
72
|
+
setResult(ok ? "\u5DF2\u4FDD\u5B58\uFF08\u5373\u65F6\u751F\u6548\uFF09" : `\u5931\u8D25\uFF1A${String(payload["error"] ?? payload["reason"] ?? "unknown")}`);
|
|
73
|
+
if (ok) reload();
|
|
74
|
+
}).catch((e) => setResult(`\u5931\u8D25\uFF1A${String(e)}`)).finally(() => {
|
|
75
|
+
setBusy(false);
|
|
76
|
+
});
|
|
77
|
+
}, [mode, sessionId, workspaceId, reload]);
|
|
78
|
+
if (error !== "") return (0, import_react.createElement)("div", { style: style.card }, `\u52A0\u8F7D\u5931\u8D25\uFF1A${error}`);
|
|
79
|
+
if (data === null) return (0, import_react.createElement)("div", { style: style.card }, "\u52A0\u8F7D\u4E2D\u2026");
|
|
80
|
+
const selectedWorkspace = data.workspaces.find((w) => w.id === workspaceId);
|
|
81
|
+
const sessionOptions = mode === "workspace" ? (selectedWorkspace?.sessions ?? []).map((s) => ({ id: s.id, label: s.label })) : data.workspaces.flatMap((w) => w.sessions.map((s) => ({ id: s.id, label: `${w.title} / ${s.label}` })));
|
|
82
|
+
return (0, import_react.createElement)(
|
|
83
|
+
"div",
|
|
84
|
+
{ style: style.card },
|
|
85
|
+
(0, import_react.createElement)(
|
|
86
|
+
"div",
|
|
87
|
+
{ style: style.row },
|
|
88
|
+
(0, import_react.createElement)("span", { style: style.label }, "\u5F53\u524D Router"),
|
|
89
|
+
(0, import_react.createElement)("strong", null, data.router ? `${data.router.source === "preset" ? "\uFF08\u9884\u7F6E\uFF09" : ""}${data.router.mode === "workspace" ? "\u5DE5\u4F5C\u533A\u6A21\u5F0F" : "\u4F1A\u8BDD\u6A21\u5F0F"} \xB7 ${data.router.sessionId.slice(0, 18)}\u2026${data.router.claimedAt ? `\uFF08${data.router.claimedAt.slice(0, 10)} \u8BBE\u7F6E\uFF09` : ""}` : "\u672A\u8BBE\u7F6E\uFF08\u65E0\u9884\u7F6E\u4E14\u672A\u6307\u6D3E\uFF09")
|
|
90
|
+
),
|
|
91
|
+
(0, import_react.createElement)(
|
|
92
|
+
"div",
|
|
93
|
+
{ style: style.row },
|
|
94
|
+
(0, import_react.createElement)("span", { style: style.label }, "\u6A21\u5F0F"),
|
|
95
|
+
(0, import_react.createElement)("label", null, (0, import_react.createElement)("input", { type: "radio", checked: mode === "session", onChange: () => setMode("session") }), " \u4EC5\u6307\u5B9A\u4F1A\u8BDD"),
|
|
96
|
+
(0, import_react.createElement)("label", null, (0, import_react.createElement)("input", { type: "radio", checked: mode === "workspace", onChange: () => setMode("workspace") }), " \u6574\u4E2A\u5DE5\u4F5C\u533A")
|
|
97
|
+
),
|
|
98
|
+
mode === "workspace" ? (0, import_react.createElement)(
|
|
99
|
+
"div",
|
|
100
|
+
{ style: style.row },
|
|
101
|
+
(0, import_react.createElement)("span", { style: style.label }, "\u5DE5\u4F5C\u533A"),
|
|
102
|
+
(0, import_react.createElement)(
|
|
103
|
+
"select",
|
|
104
|
+
{ style: style.select, value: workspaceId, onChange: (e) => {
|
|
105
|
+
setWorkspaceId(e.target.value);
|
|
106
|
+
setSessionId("");
|
|
107
|
+
} },
|
|
108
|
+
(0, import_react.createElement)("option", { value: "" }, "\u2014 \u9009\u62E9\u5DE5\u4F5C\u533A \u2014"),
|
|
109
|
+
...data.workspaces.map((w) => (0, import_react.createElement)("option", { key: w.id, value: w.id }, `${w.title}\uFF08${w.sessions.length} \u4F1A\u8BDD\uFF09`))
|
|
110
|
+
)
|
|
111
|
+
) : null,
|
|
112
|
+
(0, import_react.createElement)(
|
|
113
|
+
"div",
|
|
114
|
+
{ style: style.row },
|
|
115
|
+
(0, import_react.createElement)("span", { style: style.label }, "Router \u4F1A\u8BDD"),
|
|
116
|
+
(0, import_react.createElement)(
|
|
117
|
+
"select",
|
|
118
|
+
{ style: style.select, value: sessionId, onChange: (e) => setSessionId(e.target.value) },
|
|
119
|
+
(0, import_react.createElement)("option", { value: "" }, "\u2014 \u9009\u62E9\u4F1A\u8BDD \u2014"),
|
|
120
|
+
...sessionOptions.map((s) => (0, import_react.createElement)("option", { key: s.id, value: s.id }, s.label))
|
|
121
|
+
),
|
|
122
|
+
(0, import_react.createElement)("span", { style: style.hint }, mode === "workspace" ? "\u8BE5\u5DE5\u4F5C\u533A\u4E0B\u5168\u90E8\u4F1A\u8BDD\u5747\u4E3A Router\uFF08\u8BA4\u9886\u53D1\u8D77\u8005\u8BB0\u5F55\uFF09" : "\u4EC5\u8BE5\u4F1A\u8BDD\u53EF\u8C03\u7528 supervisor \u5DE5\u5177")
|
|
123
|
+
),
|
|
124
|
+
(0, import_react.createElement)(
|
|
125
|
+
"div",
|
|
126
|
+
{ style: style.row },
|
|
127
|
+
(0, import_react.createElement)("button", { style: style.button, disabled: busy || sessionId === "" || mode === "workspace" && workspaceId === "", onClick: submit }, busy ? "\u4FDD\u5B58\u4E2D\u2026" : "\u4FDD\u5B58"),
|
|
128
|
+
result !== "" ? (0, import_react.createElement)("span", null, result) : null
|
|
129
|
+
),
|
|
130
|
+
(0, import_react.createElement)("div", { style: style.hint }, "\u4FDD\u5B58\u540E\u5373\u65F6\u751F\u6548\uFF08\u65E0\u9700\u91CD\u542F\uFF09\uFF1B\u6B64\u524D\u521B\u5EFA\u7684\u5B9A\u65F6\u5DE1\u68C0\u6295\u9012\u76EE\u6807\u4E0D\u81EA\u52A8\u8FC1\u79FB\uFF0C\u8BF7\u91CD\u8BBE\u8C03\u5EA6\u3002")
|
|
131
|
+
);
|
|
132
|
+
}
|
|
133
|
+
function apply(ctx) {
|
|
134
|
+
const report = (phase, extra) => {
|
|
135
|
+
void fetch(api("global-supervisor/client-ping"), {
|
|
136
|
+
method: "POST",
|
|
137
|
+
headers: { "content-type": "application/json" },
|
|
138
|
+
body: JSON.stringify({ phase, ...extra })
|
|
139
|
+
}).catch(() => void 0);
|
|
140
|
+
};
|
|
141
|
+
try {
|
|
142
|
+
ctx.slots.inject("settings.section", () => {
|
|
143
|
+
try {
|
|
144
|
+
const off = ctx.slots.register(
|
|
145
|
+
{
|
|
146
|
+
name: "settings.section",
|
|
147
|
+
id: "global-supervisor",
|
|
148
|
+
order: 60,
|
|
149
|
+
label: () => "\u5168\u5C40\u76D1\u7763"
|
|
150
|
+
},
|
|
151
|
+
() => (0, import_react.createElement)(SupervisorPanel)
|
|
152
|
+
);
|
|
153
|
+
report("registered", { registered: true, disposer: typeof off === "function" });
|
|
154
|
+
} catch (e) {
|
|
155
|
+
report("register-failed", { error: String(e) });
|
|
156
|
+
}
|
|
157
|
+
});
|
|
158
|
+
report("apply", { registered: false });
|
|
159
|
+
} catch (e) {
|
|
160
|
+
report("apply-failed", { error: String(e) });
|
|
161
|
+
}
|
|
162
|
+
if (typeof ctx.effect === "function") {
|
|
163
|
+
ctx.effect(() => void 0, "global-supervisor: settings section");
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
return module.exports;
|
|
168
|
+
}});
|
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* dsh-global-supervisor client:设置面板(Router 身份管理唯一动态入口)。
|
|
3
|
+
* 契约见 docs/UI_PANEL_PLAN.md:apply(ctx) → slots.inject('settings.section') → register。
|
|
4
|
+
* 第一版零 UI 库依赖(原生元素 + 内联样式),react 经 host 模块表注入(构建 external)。
|
|
5
|
+
*/
|
|
6
|
+
import { createElement as h, useCallback, useEffect, useState } from 'react';
|
|
7
|
+
|
|
8
|
+
/** client 侧服务访问白名单(Cordis 门禁:属性访问需在此声明——better-sidebar 同款机制)。 */
|
|
9
|
+
export const inject = ['slots'];
|
|
10
|
+
|
|
11
|
+
/** client ctx 的最小服务面。 */
|
|
12
|
+
interface ClientContext {
|
|
13
|
+
slots: {
|
|
14
|
+
register(meta: Record<string, unknown>, build: (props?: Record<string, unknown>) => unknown): (() => void) | unknown;
|
|
15
|
+
inject(slot: string, ready: () => unknown): unknown;
|
|
16
|
+
};
|
|
17
|
+
effect?(fn: () => unknown, label?: string): unknown;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
/** GET /global-supervisor/settings 响应。 */
|
|
21
|
+
interface SettingsPayload {
|
|
22
|
+
router: { mode: string; sessionId: string; workspaceId?: string; claimedAt: string; source: 'claimed' | 'preset' } | null;
|
|
23
|
+
workspaces: Array<{ id: string; title: string; path: string; sessions: Array<{ id: string; label: string }> }>;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
function api(path: string): string {
|
|
27
|
+
const relative = path.replace(/^\/+/, '');
|
|
28
|
+
if (typeof document === 'undefined') return `/${relative}`;
|
|
29
|
+
return new URL(relative, document.baseURI).pathname;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const style = {
|
|
33
|
+
card: { display: 'grid', gap: '12px', padding: '16px', fontSize: '14px' } as Record<string, string>,
|
|
34
|
+
row: { display: 'flex', gap: '8px', alignItems: 'center', flexWrap: 'wrap' } as Record<string, string>,
|
|
35
|
+
label: { minWidth: '72px', opacity: '0.8' } as Record<string, string>,
|
|
36
|
+
select: { padding: '4px 8px', minWidth: '220px' } as Record<string, string>,
|
|
37
|
+
button: { padding: '6px 16px', cursor: 'pointer' } as Record<string, string>,
|
|
38
|
+
hint: { opacity: 0.7, fontSize: '12px' } as Record<string, string>,
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
/** 面板组件:加载状态 → 选择模式/工作区/会话 → 提交指派。 */
|
|
42
|
+
function SupervisorPanel(): unknown {
|
|
43
|
+
const [data, setData] = useState<SettingsPayload | null>(null);
|
|
44
|
+
const [error, setError] = useState('');
|
|
45
|
+
const [mode, setMode] = useState<'session' | 'workspace'>('session');
|
|
46
|
+
const [workspaceId, setWorkspaceId] = useState('');
|
|
47
|
+
const [sessionId, setSessionId] = useState('');
|
|
48
|
+
const [busy, setBusy] = useState(false);
|
|
49
|
+
const [result, setResult] = useState('');
|
|
50
|
+
|
|
51
|
+
const reload = useCallback(() => {
|
|
52
|
+
setError('');
|
|
53
|
+
fetch(api('global-supervisor/settings'))
|
|
54
|
+
.then((r) => r.json() as Promise<SettingsPayload>)
|
|
55
|
+
.then((payload) => {
|
|
56
|
+
setData(payload);
|
|
57
|
+
if (payload.router) {
|
|
58
|
+
setMode(payload.router.mode === 'workspace' ? 'workspace' : 'session');
|
|
59
|
+
setSessionId(payload.router.sessionId);
|
|
60
|
+
setWorkspaceId(payload.router.workspaceId ?? '');
|
|
61
|
+
}
|
|
62
|
+
})
|
|
63
|
+
.catch((e: unknown) => setError(String(e)));
|
|
64
|
+
}, []);
|
|
65
|
+
|
|
66
|
+
useEffect(() => { reload(); }, [reload]);
|
|
67
|
+
|
|
68
|
+
const submit = useCallback(() => {
|
|
69
|
+
setBusy(true);
|
|
70
|
+
setResult('');
|
|
71
|
+
const body = mode === 'workspace' ? { mode, sessionId, workspaceId } : { mode, sessionId };
|
|
72
|
+
fetch(api('global-supervisor/claim'), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(body) })
|
|
73
|
+
.then(async (r) => ({ ok: r.ok, payload: await r.json() as Record<string, unknown> }))
|
|
74
|
+
.then(({ ok, payload }) => {
|
|
75
|
+
setResult(ok ? '已保存(即时生效)' : `失败:${String(payload['error'] ?? payload['reason'] ?? 'unknown')}`);
|
|
76
|
+
if (ok) reload();
|
|
77
|
+
})
|
|
78
|
+
.catch((e: unknown) => setResult(`失败:${String(e)}`))
|
|
79
|
+
.finally(() => { setBusy(false); });
|
|
80
|
+
}, [mode, sessionId, workspaceId, reload]);
|
|
81
|
+
|
|
82
|
+
if (error !== '') return h('div', { style: style.card }, `加载失败:${error}`);
|
|
83
|
+
if (data === null) return h('div', { style: style.card }, '加载中…');
|
|
84
|
+
|
|
85
|
+
const selectedWorkspace = data.workspaces.find((w) => w.id === workspaceId);
|
|
86
|
+
// 会话模式下跨工作区平铺时带工作区名前缀(同名会话可区分)
|
|
87
|
+
const sessionOptions = mode === 'workspace'
|
|
88
|
+
? (selectedWorkspace?.sessions ?? []).map((s) => ({ id: s.id, label: s.label }))
|
|
89
|
+
: data.workspaces.flatMap((w) => w.sessions.map((s) => ({ id: s.id, label: `${w.title} / ${s.label}` })));
|
|
90
|
+
|
|
91
|
+
return h('div', { style: style.card },
|
|
92
|
+
h('div', { style: style.row },
|
|
93
|
+
h('span', { style: style.label }, '当前 Router'),
|
|
94
|
+
h('strong', null, data.router
|
|
95
|
+
? `${data.router.source === 'preset' ? '(预置)' : ''}${data.router.mode === 'workspace' ? '工作区模式' : '会话模式'} · ${data.router.sessionId.slice(0, 18)}…${data.router.claimedAt ? `(${data.router.claimedAt.slice(0, 10)} 设置)` : ''}`
|
|
96
|
+
: '未设置(无预置且未指派)')),
|
|
97
|
+
h('div', { style: style.row },
|
|
98
|
+
h('span', { style: style.label }, '模式'),
|
|
99
|
+
h('label', null, h('input', { type: 'radio', checked: mode === 'session', onChange: () => setMode('session') }), ' 仅指定会话'),
|
|
100
|
+
h('label', null, h('input', { type: 'radio', checked: mode === 'workspace', onChange: () => setMode('workspace') }), ' 整个工作区')),
|
|
101
|
+
mode === 'workspace'
|
|
102
|
+
? h('div', { style: style.row },
|
|
103
|
+
h('span', { style: style.label }, '工作区'),
|
|
104
|
+
h('select', { style: style.select, value: workspaceId, onChange: (e: Event) => { setWorkspaceId((e.target as HTMLSelectElement).value); setSessionId(''); } },
|
|
105
|
+
h('option', { value: '' }, '— 选择工作区 —'),
|
|
106
|
+
...data.workspaces.map((w) => h('option', { key: w.id, value: w.id }, `${w.title}(${w.sessions.length} 会话)`))))
|
|
107
|
+
: null,
|
|
108
|
+
h('div', { style: style.row },
|
|
109
|
+
h('span', { style: style.label }, 'Router 会话'),
|
|
110
|
+
h('select', { style: style.select, value: sessionId, onChange: (e: Event) => setSessionId((e.target as HTMLSelectElement).value) },
|
|
111
|
+
h('option', { value: '' }, '— 选择会话 —'),
|
|
112
|
+
...sessionOptions.map((s) => h('option', { key: s.id, value: s.id }, s.label))),
|
|
113
|
+
h('span', { style: style.hint }, mode === 'workspace' ? '该工作区下全部会话均为 Router(认领发起者记录)' : '仅该会话可调用 supervisor 工具')),
|
|
114
|
+
h('div', { style: style.row },
|
|
115
|
+
h('button', { style: style.button, disabled: busy || sessionId === '' || (mode === 'workspace' && workspaceId === ''), onClick: submit }, busy ? '保存中…' : '保存'),
|
|
116
|
+
result !== '' ? h('span', null, result) : null),
|
|
117
|
+
h('div', { style: style.hint }, '保存后即时生效(无需重启);此前创建的定时巡检投递目标不自动迁移,请重设调度。'));
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/** client 入口:注册全局监督设置面板(slots 就绪后经 inject 回调注册——宿主范式)。 */
|
|
121
|
+
export function apply(ctx: ClientContext): void {
|
|
122
|
+
const report = (phase: string, extra: Record<string, unknown>): void => {
|
|
123
|
+
void fetch(api('global-supervisor/client-ping'), {
|
|
124
|
+
method: 'POST',
|
|
125
|
+
headers: { 'content-type': 'application/json' },
|
|
126
|
+
body: JSON.stringify({ phase, ...extra }),
|
|
127
|
+
}).catch(() => undefined);
|
|
128
|
+
};
|
|
129
|
+
try {
|
|
130
|
+
ctx.slots.inject('settings.section', () => {
|
|
131
|
+
try {
|
|
132
|
+
const off = ctx.slots.register(
|
|
133
|
+
{
|
|
134
|
+
name: 'settings.section',
|
|
135
|
+
id: 'global-supervisor',
|
|
136
|
+
order: 60,
|
|
137
|
+
label: () => '全局监督',
|
|
138
|
+
},
|
|
139
|
+
() => h(SupervisorPanel),
|
|
140
|
+
);
|
|
141
|
+
report('registered', { registered: true, disposer: typeof off === 'function' });
|
|
142
|
+
} catch (e) {
|
|
143
|
+
report('register-failed', { error: String(e) });
|
|
144
|
+
}
|
|
145
|
+
});
|
|
146
|
+
report('apply', { registered: false });
|
|
147
|
+
} catch (e) {
|
|
148
|
+
report('apply-failed', { error: String(e) });
|
|
149
|
+
}
|
|
150
|
+
if (typeof ctx.effect === 'function') {
|
|
151
|
+
ctx.effect(() => undefined, 'global-supervisor: settings section');
|
|
152
|
+
}
|
|
153
|
+
}
|
package/cordis.patch.yml
ADDED
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AgentRegistry 适配器:Worker 会话控制的唯一触达点。
|
|
3
|
+
* 派发编排:get-or-resume(活跃复用/冷恢复)→ createUserMessage → followup。
|
|
4
|
+
* 铁律:不持久化 Agent 句柄——每次派发即时解析(Host 重启安全)。
|
|
5
|
+
*/
|
|
6
|
+
import type { Context } from '@deepseek-ai/cordis';
|
|
7
|
+
import type { Agent } from '@deepseek-ai/dsh-agent';
|
|
8
|
+
/** Agent 活动状态纯数据视图。 */
|
|
9
|
+
export interface AgentInfo {
|
|
10
|
+
sessionId: string;
|
|
11
|
+
status: 'idle' | 'running';
|
|
12
|
+
provider: string | undefined;
|
|
13
|
+
model: string | undefined;
|
|
14
|
+
}
|
|
15
|
+
/** 模型偏好入参(plain 形状;reasoningEffort 经品牌化构造在适配层转换)。 */
|
|
16
|
+
export interface ModelPrefInput {
|
|
17
|
+
provider: string;
|
|
18
|
+
model: string;
|
|
19
|
+
reasoningEffort?: string;
|
|
20
|
+
}
|
|
21
|
+
export declare class DshAgentAdapter {
|
|
22
|
+
private readonly ctx;
|
|
23
|
+
constructor(ctx: Context);
|
|
24
|
+
private agents;
|
|
25
|
+
/** 当前活动 Agent 列表(运行时 Registry,非持久化清单)。 */
|
|
26
|
+
listAgents(): Promise<AgentInfo[]>;
|
|
27
|
+
/** 查活动 Agent(不存在返回 undefined——冷会话)。 */
|
|
28
|
+
getAgent(sessionId: string): Promise<Agent | undefined>;
|
|
29
|
+
/** 会话是否正在执行(无活动 Agent 视为空闲)。 */
|
|
30
|
+
isBusy(sessionId: string): Promise<boolean>;
|
|
31
|
+
/** get-or-resume:活跃复用;冷会话经 sessionPersistence 恢复。 */
|
|
32
|
+
ensureAgent(sessionId: string): Promise<Agent>;
|
|
33
|
+
/**
|
|
34
|
+
* 派发任务指令:ensureAgent → followup(排队一个完整执行轮次)。
|
|
35
|
+
* modelPref 非空时在 followup 前应用模型选择(任务边界切换,KV-cache 代价最小;
|
|
36
|
+
* select 等值幂等、持久化进会话日志——见 dsh-agent model-selection)。
|
|
37
|
+
* source 用 { kind: 'user' }(探针已验证的构造形态;supervisor 代表用户派发)。
|
|
38
|
+
*/
|
|
39
|
+
dispatch(sessionId: string, text: string, modelPref?: ModelPrefInput): Promise<void>;
|
|
40
|
+
/** 对 live 会话立即应用模型选择(冷会话返回 false,不主动唤醒——由下次派发承担)。 */
|
|
41
|
+
selectModelNow(sessionId: string, pref: ModelPrefInput): Promise<boolean>;
|
|
42
|
+
/** 运行中纠偏(不排队新轮次)。 */
|
|
43
|
+
steer(sessionId: string, text: string): Promise<void>;
|
|
44
|
+
/** 取消当前执行(保留排队任务由调用方决定 keepInbox)。 */
|
|
45
|
+
cancelAgent(sessionId: string, cause: string, keepInbox?: boolean): Promise<void>;
|
|
46
|
+
/** 等待会话整体空闲(含 followup 排队内容的收敛)。 */
|
|
47
|
+
whenIdle(sessionId: string): Promise<void>;
|
|
48
|
+
}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { awaitService } from './host-services.js';
|
|
2
|
+
/** 转为 ModelSelection(effort 经 ReasoningEffortId 构造函数品牌化——合规转换非断言)。 */
|
|
3
|
+
async function toSelection(pref) {
|
|
4
|
+
if (pref.reasoningEffort === undefined || pref.reasoningEffort === '')
|
|
5
|
+
return { provider: pref.provider, model: pref.model };
|
|
6
|
+
const { ReasoningEffortId } = await import('@deepseek-ai/dsh-llm');
|
|
7
|
+
return { provider: pref.provider, model: pref.model, reasoningEffort: ReasoningEffortId(pref.reasoningEffort) };
|
|
8
|
+
}
|
|
9
|
+
export class DshAgentAdapter {
|
|
10
|
+
ctx;
|
|
11
|
+
constructor(ctx) {
|
|
12
|
+
this.ctx = ctx;
|
|
13
|
+
}
|
|
14
|
+
agents() {
|
|
15
|
+
return awaitService(this.ctx, 'agents');
|
|
16
|
+
}
|
|
17
|
+
/** 当前活动 Agent 列表(运行时 Registry,非持久化清单)。 */
|
|
18
|
+
async listAgents() {
|
|
19
|
+
const agents = await this.agents();
|
|
20
|
+
return agents.list().map((agent) => ({
|
|
21
|
+
sessionId: agent.id,
|
|
22
|
+
status: agent.status,
|
|
23
|
+
provider: agent.options.provider,
|
|
24
|
+
model: agent.options.model,
|
|
25
|
+
}));
|
|
26
|
+
}
|
|
27
|
+
/** 查活动 Agent(不存在返回 undefined——冷会话)。 */
|
|
28
|
+
async getAgent(sessionId) {
|
|
29
|
+
const agents = await this.agents();
|
|
30
|
+
return agents.get(sessionId);
|
|
31
|
+
}
|
|
32
|
+
/** 会话是否正在执行(无活动 Agent 视为空闲)。 */
|
|
33
|
+
async isBusy(sessionId) {
|
|
34
|
+
const agent = await this.getAgent(sessionId);
|
|
35
|
+
return agent !== undefined && agent.status === 'running';
|
|
36
|
+
}
|
|
37
|
+
/** get-or-resume:活跃复用;冷会话经 sessionPersistence 恢复。 */
|
|
38
|
+
async ensureAgent(sessionId) {
|
|
39
|
+
const agents = await this.agents();
|
|
40
|
+
const live = agents.get(sessionId);
|
|
41
|
+
if (live)
|
|
42
|
+
return live;
|
|
43
|
+
const handle = await agents.resume({ resumeSessionId: sessionId });
|
|
44
|
+
return handle.agent;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* 派发任务指令:ensureAgent → followup(排队一个完整执行轮次)。
|
|
48
|
+
* modelPref 非空时在 followup 前应用模型选择(任务边界切换,KV-cache 代价最小;
|
|
49
|
+
* select 等值幂等、持久化进会话日志——见 dsh-agent model-selection)。
|
|
50
|
+
* source 用 { kind: 'user' }(探针已验证的构造形态;supervisor 代表用户派发)。
|
|
51
|
+
*/
|
|
52
|
+
async dispatch(sessionId, text, modelPref) {
|
|
53
|
+
const agent = await this.ensureAgent(sessionId);
|
|
54
|
+
if (modelPref !== undefined) {
|
|
55
|
+
agent.model.select(await toSelection(modelPref));
|
|
56
|
+
}
|
|
57
|
+
const { createUserMessage } = await import('@deepseek-ai/dsh-llm');
|
|
58
|
+
agent.followup(createUserMessage({
|
|
59
|
+
content: [{ type: 'text', text }],
|
|
60
|
+
source: { kind: 'user' },
|
|
61
|
+
}));
|
|
62
|
+
}
|
|
63
|
+
/** 对 live 会话立即应用模型选择(冷会话返回 false,不主动唤醒——由下次派发承担)。 */
|
|
64
|
+
async selectModelNow(sessionId, pref) {
|
|
65
|
+
const agent = await this.getAgent(sessionId);
|
|
66
|
+
if (!agent)
|
|
67
|
+
return false;
|
|
68
|
+
agent.model.select(await toSelection(pref));
|
|
69
|
+
return true;
|
|
70
|
+
}
|
|
71
|
+
/** 运行中纠偏(不排队新轮次)。 */
|
|
72
|
+
async steer(sessionId, text) {
|
|
73
|
+
const agent = await this.ensureAgent(sessionId);
|
|
74
|
+
const { createUserMessage } = await import('@deepseek-ai/dsh-llm');
|
|
75
|
+
agent.steer(createUserMessage({
|
|
76
|
+
content: [{ type: 'text', text }],
|
|
77
|
+
source: { kind: 'user' },
|
|
78
|
+
}));
|
|
79
|
+
}
|
|
80
|
+
/** 取消当前执行(保留排队任务由调用方决定 keepInbox)。 */
|
|
81
|
+
async cancelAgent(sessionId, cause, keepInbox = false) {
|
|
82
|
+
const agent = await this.getAgent(sessionId);
|
|
83
|
+
if (agent) {
|
|
84
|
+
agent.cancel(cause, { keepInbox });
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
/** 等待会话整体空闲(含 followup 排队内容的收敛)。 */
|
|
88
|
+
async whenIdle(sessionId) {
|
|
89
|
+
const agent = await this.ensureAgent(sessionId);
|
|
90
|
+
await agent.whenIdle();
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
//# sourceMappingURL=dsh-agent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dsh-agent.js","sourceRoot":"","sources":["../../src/adapters/dsh-agent.ts"],"names":[],"mappings":"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"}
|