dsh-cloud-experts 0.0.0-stage → 0.1.2

package/README.md

@@ -1,3 +1,37 @@
-# Temporary Holding Version
+# dsh-cloud-experts
 
-This version is a temporary placeholder for this package. An operational version to replace this has been submitted for review and is awaiting a staged release.
+把远端服务器上的 Claude Code / Codex CLI 注册为 DSH 云端子智能体：插件经 SSH 调用远端 `fed-expert` wrapper（协议 `fed-expert/v1`），订阅凭据、模型选择、资源围栏全部留在远端服务器，本机零凭据。
+
+## 提供的能力
+
+- 子智能体 provider：`cloud-claude` / `cloud-codex`（one-shot external provider，多轮靠 prompt 自携带上下文）
+- 工具：`consult_claude` / `consult_codex`（由官方 `@deepseek-ai/dsh-tool-subagent` 挂接）
+
+## 前置要求
+
+远端服务器需部署配套的 `fed-expert` wrapper（接收 stdin prompt，stdout 返回答案，stderr 首行 `FED_ENVELOPE:{json}` 信封），并为本机配置一把 forced-command + `restrict` 的 SSH 专用钥。
+
+## 配置
+
+| 键 | 默认 | 说明 |
+|---|---|---|
+| host | `allen-bwg` | SSH 目标（走本机 ssh config 别名，需已配置 HostName/User） |
+| keyPath | 空 | 专用钥路径（空 = ssh config 默认身份） |
+| remoteEntry | `~/bin/fed-expert` | 远端 wrapper 路径 |
+| origin | `dsh-plugin` | 审计来源标记 |
+| disposeGraceMs | 5000 | 取消时进程回收宽限 |
+
+## 安装
+
+- **DSH Desktop / GO 插件市场**：按包名 `dsh-cloud-experts` 安装（依赖 peers `0.2.2-rc.1`）；
+- **开发模式（Desktop）**：本目录先 `npm install`（link 模式不代装依赖），再 Plugins → Install from path。
+
+装完新开会话，工具列表出现 `consult_claude` / `consult_codex` 即成功。
+
+## 版本
+
+- 0.1.2：ssh 内置 ServerAliveInterval=15（NAT 防断）+ 本地 360s 看门狗；0.1.1：对齐官方 inject。
+
+## License
+
+MIT

package/cordis.patch.yml

@@ -0,0 +1,15 @@
+- insert:
+    - id: subagent-cloud-experts
+      name: dsh-cloud-experts
+    - id: tool-subagent-cloud-claude
+      name: '@deepseek-ai/dsh-tool-subagent'
+      config:
+        provider: cloud-claude
+        toolName: consult_claude
+        maxDepth: provider-managed
+    - id: tool-subagent-cloud-codex
+      name: '@deepseek-ai/dsh-tool-subagent'
+      config:
+        provider: cloud-codex
+        toolName: consult_codex
+        maxDepth: provider-managed

package/lib/index.js

@@ -0,0 +1,159 @@
+import z from "@deepseek-ai/schemastery";
+import { NO_START_CAPABILITIES, settleRunResult, subprocessRunHandle } from "@deepseek-ai/dsh-subagent";
+import { randomUUID } from "node:crypto";
+
+const name = "cloud-experts";
+// 与官方 bundle 一致：ctx.logger 原生访问、不注入（注入会因服务不存在而永久 pending）
+const inject = ["subagents", "subprocess"];
+
+const Config = z.object({
+	host: z.string().min(1).default("allen-bwg"),
+	keyPath: z.string().default(""),
+	remoteEntry: z.string().min(1).default("~/bin/fed-expert"),
+	origin: z.string().min(1).default("dsh-plugin"),
+	disposeGraceMs: z.number().default(5000)
+});
+
+const MINIMAL_ENV_KEYS = ["PATH", "SystemRoot", "USERPROFILE", "HOME"];
+
+function minimalEnv() {
+	const env = {};
+	for (const key of MINIMAL_ENV_KEYS) if (process.env[key] !== undefined) env[key] = process.env[key];
+	return env;
+}
+
+function promptText(prompt) {
+	const parts = Array.isArray(prompt) ? prompt : [prompt];
+	const texts = [];
+	for (const part of parts) {
+		if (part !== null && typeof part === "object" && part.type === "text" && typeof part.text === "string") texts.push(part.text);
+		else if (typeof part === "string") texts.push(part);
+	}
+	return texts.join("\n");
+}
+
+function writeAll(stream, data) {
+	return new Promise((resolve, reject) => {
+		const CHUNK = 65536;
+		let offset = 0;
+		const next = () => {
+			while (offset < data.length) {
+				const slice = data.subarray(offset, offset + CHUNK);
+				offset += slice.length;
+				if (!stream.write(slice)) {
+					stream.once("drain", next);
+					return;
+				}
+			}
+			stream.end(resolve);
+		};
+		stream.on("error", reject);
+		next();
+	});
+}
+
+class CloudExpertProvider {
+	capabilities = NO_START_CAPABILITIES;
+	inheritsParentContext = false;
+
+	constructor(providerName, ctx, config, expert) {
+		this.name = providerName;
+		this.ctx = ctx;
+		this.config = config;
+		this.expert = expert;
+	}
+
+	start(request) {
+		if (request.signal.aborted) throw new Error(`cloud-experts: request aborted before ${this.expert} run`);
+		const text = promptText(request.prompt) || `(empty ${this.expert} consult)`;
+		const stamp = new Date().toISOString().replace(/[^0-9]/g, "").slice(0, 14);
+		const consultId = `PLUGIN-${stamp}-${this.expert}-${randomUUID().slice(0, 8)}`;
+		const remoteCmd = [this.config.remoteEntry, this.expert, "--id", consultId, "--origin", this.config.origin].join(" ");
+		const argv = ["ssh", "-o", "BatchMode=yes", "-o", "IdentitiesOnly=yes", "-o", "ConnectTimeout=15",
+			"-o", "ServerAliveInterval=15", "-o", "ServerAliveCountMax=4", "-o", "LogLevel=ERROR"];
+		if (this.config.keyPath) argv.push("-i", this.config.keyPath);
+		argv.push(this.config.host, remoteCmd);
+
+		const child = this.ctx.subprocess.spawn({
+			argv,
+			cwd: request.cwd,
+			stdio: { stdin: "pipe", stdout: "pipe", stderr: "pipe" },
+			graceMs: this.config.disposeGraceMs,
+			signal: request.signal,
+			env: minimalEnv()
+		});
+
+		let out = "";
+		let err = "";
+		child.stdout?.on("data", (chunk) => { out += typeof chunk === "string" ? chunk : chunk.toString("utf8"); });
+		child.stdout?.on("error", () => {});
+		child.stderr?.on("data", (chunk) => { err += typeof chunk === "string" ? chunk : chunk.toString("utf8"); });
+		child.stderr?.on("error", () => {});
+		const stdinWrite = writeAll(child.stdin, Buffer.from(text, "utf8")).catch(() => {});
+
+		const controller = new AbortController();
+		const watchdog = setTimeout(() => {
+			try { child.stdin?.end(); } catch {}
+			try { child.terminate(); } catch {}
+			controller.abort(new Error(`cloud-experts: ${this.expert} local watchdog fired (360s)`));
+		}, 360000);
+		const requestCancel = () => {
+			if (!controller.signal.aborted) controller.abort(new Error(`cloud-experts: ${this.expert} run cancelled locally`));
+			try { child.stdin?.end(); } catch {}
+			try { child.terminate(); } catch {}
+		};
+		const onAbort = () => requestCancel();
+		request.signal.addEventListener("abort", onAbort, { once: true });
+
+		const attempt = async () => {
+			try {
+				await stdinWrite;
+			const info = await child.done;
+			const code = info && typeof info.code === "number" ? info.code : 0;
+			const envelope = /FED_ENVELOPE:(\{[^\n]*\})/.exec(err);
+			if (code === 0 && out.length > 0) {
+				return {
+					output: [{ type: "text", text: out }],
+					stopReason: "completed",
+					envelope: envelope ? envelope[1] : undefined
+				};
+			}
+			const failure = /FED_ERROR:([\w:.-]+)/.exec(err);
+			throw new Error(`cloud-experts: ${failure?.[1] ?? `exit-${code}`} ${err.slice(0, 200)}`);
+			} finally {
+				clearTimeout(watchdog);
+			}
+		};
+
+		const result = settleRunResult({
+			attempt,
+			collectOutput: () => out,
+			cancelled: () => request.signal.aborted,
+			onError: (error) => {
+				this.ctx.logger?.warn?.(`cloud-experts "${this.name}": run failed: %o`, error);
+			},
+			signal: request.signal,
+			onAbort
+		});
+
+		return subprocessRunHandle({
+			id: randomUUID(),
+			result,
+			signal: request.signal,
+			onAbort,
+			requestCancel,
+			teardown: async () => {
+				requestCancel();
+				try { await child.waitForExit(); } catch {}
+			}
+		});
+	}
+}
+
+function apply(ctx, config) {
+	const resolved = Config(config ?? {});
+	ctx.subagents.registerProvider(new CloudExpertProvider("cloud-claude", ctx, resolved, "claude"));
+	ctx.subagents.registerProvider(new CloudExpertProvider("cloud-codex", ctx, resolved, "codex"));
+}
+
+export { Config, apply, inject, name };

package/package.json

@@ -1,6 +1,35 @@
 {
   "name": "dsh-cloud-experts",
-  "version": "0.0.0-stage",
-  "stub": true,
-  "description": "Temporary package placeholder for staged publishing"
-}
+  "description": "Cloud expert subagents (claude/codex on the fed VPS) over SSH fed-expert wrapper",
+  "version": "0.1.2",
+  "type": "module",
+  "main": "lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./package.json": "./package.json",
+    "./cordis.patch.yml": "./cordis.patch.yml"
+  },
+  "files": [
+    "lib/index.js",
+    "cordis.patch.yml",
+    "README.md"
+  ],
+  "license": "MIT",
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    }
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "~4.1.0",
+    "@deepseek-ai/dsh-llm": "0.2.2-rc.1",
+    "@deepseek-ai/dsh-session": "0.2.2-rc.1",
+    "@deepseek-ai/dsh-subagent": "0.2.2-rc.1",
+    "@deepseek-ai/dsh-subprocess": "0.2.2-rc.1",
+    "@deepseek-ai/dsh-timeout": "0.2.2-rc.1"
+  },
+  "dependencies": {
+    "@deepseek-ai/dsh-tool-subagent": "0.2.2-rc.1",
+    "@deepseek-ai/schemastery": "~3.19.0"
+  }
+}