agent-loft 0.2.112 → 0.2.114

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.
Files changed (41) hide show
  1. package/README.md +4 -3
  2. package/package.json +3 -1
  3. package/src/agents/codex/session.ts +31 -3
  4. package/src/agents/dsh/acp.ts +193 -0
  5. package/src/agents/dsh/driver.ts +126 -0
  6. package/src/agents/dsh/errors.ts +43 -0
  7. package/src/agents/dsh/history.ts +346 -0
  8. package/src/agents/dsh/sdk.ts +191 -0
  9. package/src/agents/dsh/session.ts +454 -0
  10. package/src/agents/dsh/steps.ts +22 -0
  11. package/src/agents/dsh/which.ts +23 -0
  12. package/src/agents/health.ts +51 -2
  13. package/src/channels/feishu/bot.ts +1 -1
  14. package/src/channels/web/api.ts +14 -0
  15. package/src/channels/web/server.ts +69 -11
  16. package/src/core/builtin-agents.ts +1 -1
  17. package/src/core/command-catalog.ts +2 -1
  18. package/src/core/commands.ts +2 -1
  19. package/src/core/config.ts +23 -3
  20. package/src/core/experts.ts +3 -3
  21. package/src/core/hub.ts +4 -3
  22. package/src/core/memory-curator.ts +2 -2
  23. package/src/core/memory.ts +2 -2
  24. package/src/core/permission.ts +1 -1
  25. package/src/core/realtime-relay.ts +142 -0
  26. package/src/core/types.ts +4 -1
  27. package/src/core/users.ts +1 -1
  28. package/src/main.ts +5 -1
  29. package/web/css/composer.css +38 -0
  30. package/web/lib/dom.js +2 -0
  31. package/web/lib/rt-worklet.js +110 -0
  32. package/web/lib/ws.js +5 -2
  33. package/web/settings/agent-defaults.js +2 -2
  34. package/web/settings/agents.js +15 -1
  35. package/web/settings/commands.js +1 -1
  36. package/web/settings/experts.js +1 -1
  37. package/web/settings/memory.js +2 -1
  38. package/web/views/composer.js +1 -1
  39. package/web/views/sidebar.js +1 -1
  40. package/web/views/topbar.js +1 -1
  41. package/web/views/voice-call.js +248 -56
@@ -19,6 +19,7 @@ import { skillEvents } from "../../core/skills.js";
19
19
  import { expertEvents } from "../../core/experts.js";
20
20
  import { enforceTerminalAccess, killAllTerminals, terminalEvents, watchTerminalAccess } from "../../core/terminals.js";
21
21
  import { RUNNING_VERSION } from "../../core/upgrade.js";
22
+ import { RealtimeRelay, RELAY_RATE } from "../../core/realtime-relay.js";
22
23
  import type { RealtimeEvent, Settlement } from "../../core/types.js";
23
24
  import { getUser, isAdmin, legacyOwnerId, userEvents, type User } from "../../core/users.js";
24
25
  import { currentUser, handleApi, takeUploads } from "./api.js";
@@ -268,8 +269,24 @@ type Client = {
268
269
  pushEndpoint: string | null;
269
270
  /** 最后一次收到这个页面的消息(含 ping) */
270
271
  seen: number;
272
+ /** 这个页面正在打的语音对话:声音经这里中转(relay 建好之前是 undefined) */
273
+ rt?: { key: string; relay?: RealtimeRelay };
271
274
  };
272
275
 
276
+ /** 一块麦克风 PCM 的上限(正常是 20ms ≈ 1KB) */
277
+ const MAX_AUDIO_CHUNK = 64 * 1024;
278
+ /** 发给页面的声音积压超过这么多就丢(手机网络卡住时别越攒越多、越放越晚) */
279
+ const MAX_AUDIO_BACKLOG = 256 * 1024;
280
+
281
+ /** 收掉这个页面的语音中转;stopCall:顺带让 Codex 挂断 */
282
+ function endRelay(client: Client, stopCall: boolean): void {
283
+ const rt = client.rt;
284
+ if (!rt) return;
285
+ client.rt = undefined;
286
+ rt.relay?.close();
287
+ if (stopCall) void hub.realtimeStop(rt.key).catch(() => {});
288
+ }
289
+
273
290
  /** 每次进程启动换一个:客户端发现变了,就知道 seq 已经从头计数,得整页重拉 */
274
291
  const EPOCH = Math.random().toString(36).slice(2, 10);
275
292
 
@@ -305,7 +322,10 @@ function broadcastEvent(env: EventEnvelope): void {
305
322
 
306
323
  /** 语音对话的字幕和状态:只推给订阅了这条对话的页面(不进缓冲区,刷新后不重放) */
307
324
  function broadcastRealtime({ key, ev }: { key: string; ev: RealtimeEvent }): void {
308
- for (const client of clients) if (client.subs.has(key) && canSeeKey(client.user, key)) send(client, { t: "rt", key, ev });
325
+ for (const client of clients) {
326
+ if (ev.type === "closed" && client.rt?.key === key && client.rt.relay) endRelay(client, false);
327
+ if (client.subs.has(key) && canSeeKey(client.user, key)) send(client, { t: "rt", key, ev });
328
+ }
309
329
  }
310
330
 
311
331
  function broadcastInteraction(i: Interaction): void {
@@ -533,19 +553,45 @@ function handleClientMessage(client: Client, raw: string): void {
533
553
  }
534
554
 
535
555
  case "rt": {
536
- // 实时语音对话:start 带浏览器的 SDP offer,ack 回对端 answer;stop 挂断
556
+ // 实时语音对话:服务器自己和 OpenAI 建 WebRTC,声音在这条 WebSocket 上中转(二进制帧,24kHz 16 位 PCM)。
557
+ // start 等连上了才 ack;stop 挂断
537
558
  if (!getConversation(key) || !canSeeKey(user, key)) return ack(false, { error: "会话不存在" });
538
559
  if (msg.op === "start") {
539
- const sdp = typeof msg.sdp === "string" ? msg.sdp : "";
540
- if (!sdp || sdp.length > 50_000) return ack(false, { error: "SDP 不对" });
560
+ endRelay(client, false);
561
+ const rt: NonNullable<Client["rt"]> = { key };
562
+ client.rt = rt;
541
563
  client.subs.add(key);
542
- void hub
543
- .realtimeStart(key, sdp)
544
- .then((answer) => ack(true, { sdp: answer }))
545
- .catch((err) => ack(false, { error: err instanceof Error ? err.message : String(err) }));
564
+ const opts = {
565
+ ...(typeof msg.voice === "string" && msg.voice ? { voice: msg.voice } : {}),
566
+ ...(typeof msg.language === "string" && msg.language ? { language: msg.language } : {}),
567
+ };
568
+ void (async () => {
569
+ const { relay, offer } = await RealtimeRelay.create();
570
+ if (client.rt !== rt) {
571
+ relay.close();
572
+ throw new Error("已挂断");
573
+ }
574
+ rt.relay = relay;
575
+ relay.onAudio = (pcm) => {
576
+ if (client.ws.readyState === client.ws.OPEN && client.ws.bufferedAmount < MAX_AUDIO_BACKLOG) client.ws.send(pcm, { binary: true });
577
+ };
578
+ relay.onFailed = (reason) => {
579
+ if (client.rt !== rt) return;
580
+ endRelay(client, true);
581
+ send(client, { t: "rt", key, ev: { type: "closed", reason } });
582
+ };
583
+ const answer = await hub.realtimeStart(key, offer, opts);
584
+ if (client.rt !== rt) throw new Error("已挂断");
585
+ await relay.accept(answer);
586
+ ack(true, { rate: RELAY_RATE });
587
+ })().catch((err) => {
588
+ if (client.rt === rt) endRelay(client, true);
589
+ ack(false, { error: err instanceof Error ? err.message : String(err) });
590
+ });
546
591
  return;
547
592
  }
548
593
  if (msg.op === "stop") {
594
+ if (client.rt?.key === key) endRelay(client, false);
549
595
  void hub.realtimeStop(key).then(() => ack(true), (err) => ack(false, { error: err instanceof Error ? err.message : String(err) }));
550
596
  return;
551
597
  }
@@ -653,15 +699,27 @@ export async function startWeb(): Promise<void> {
653
699
  const client: Client = { ws, subs: new Set(), alive: true, token, user, visible: false, viewing: null, foreground: false, pushEndpoint: null, seen: Date.now() };
654
700
  clients.add(client);
655
701
  ws.on("pong", () => (client.alive = true));
656
- ws.on("message", (data) => {
702
+ ws.on("message", (data, isBinary) => {
657
703
  try {
704
+ // 二进制帧只有一种:语音对话里麦克风的 PCM
705
+ if (isBinary) {
706
+ const chunk = Array.isArray(data) ? Buffer.concat(data) : Buffer.from(data as Buffer);
707
+ if (chunk.length <= MAX_AUDIO_CHUNK) client.rt?.relay?.pushAudio(chunk);
708
+ return;
709
+ }
658
710
  handleClientMessage(client, data.toString());
659
711
  } catch (err) {
660
712
  console.error("[web] 处理 WebSocket 消息出错:", err);
661
713
  }
662
714
  });
663
- ws.on("close", () => clients.delete(client));
664
- ws.on("error", () => clients.delete(client));
715
+ ws.on("close", () => {
716
+ clients.delete(client);
717
+ endRelay(client, true);
718
+ });
719
+ ws.on("error", () => {
720
+ clients.delete(client);
721
+ endRelay(client, true);
722
+ });
665
723
  send(client, { t: "hello", seq: hub.currentSeq(), epoch: EPOCH, version: RUNNING_VERSION });
666
724
  });
667
725
  } catch (err) {
@@ -53,7 +53,7 @@ export function builtinAgentDefaults(owner: string): Defaults {
53
53
  mcp: stored?.[engine]?.mcp ?? (admin ? null : []),
54
54
  permission: storedPermission(stored?.[engine]?.permission, engine, admin),
55
55
  });
56
- return { claude: defaults("claude"), codex: defaults("codex"), workbuddy: defaults("workbuddy"), pi: defaults("pi") };
56
+ return { claude: defaults("claude"), codex: defaults("codex"), workbuddy: defaults("workbuddy"), pi: defaults("pi"), dsh: defaults("dsh") };
57
57
  }
58
58
 
59
59
  function selection(value: unknown, what: string): string[] | null {
@@ -39,6 +39,7 @@ export const BUILTIN_COMMANDS: BuiltinSpec[] = [
39
39
  { name: "codex", description: "换成 Codex 专家(开新会话)", multiAgentOnly: true, chatOnly: true },
40
40
  { name: "workbuddy", description: "换成 WorkBuddy 专家(开新会话)", multiAgentOnly: true, chatOnly: true },
41
41
  { name: "pi", description: "换成 pi 专家(开新会话)", multiAgentOnly: true, chatOnly: true },
42
+ { name: "dsh", description: "换成 dsh 专家(开新会话)", multiAgentOnly: true, chatOnly: true },
42
43
  { name: "web", description: "接上一条 Web 会话,在飞书里查看和回复", feishuOnly: true },
43
44
  { name: "detach", description: "不再接着 Web 会话,回到这个聊天自己的会话", feishuOnly: true },
44
45
  { name: "bind", args: "<绑定码>", description: "把这个飞书账号绑定到你的 agent-loft 用户(绑定码在 Web 的「设置 → 账号」里生成)", feishuOnly: true },
@@ -166,7 +167,7 @@ export function buildCatalog(params: {
166
167
  (!c.feishuOnly || params.channel === undefined || params.channel === "feishu") &&
167
168
  (!c.chatOnly || params.channel !== "web") &&
168
169
  // /claude /codex 只在这个渠道能用对应 agent 时才有意义
169
- (!["claude", "codex", "workbuddy", "pi"].includes(c.name) || params.allowedAgents.includes(c.name)),
170
+ (!["claude", "codex", "workbuddy", "pi", "dsh"].includes(c.name) || params.allowedAgents.includes(c.name)),
170
171
  ).map((c) => ({
171
172
  name: c.name,
172
173
  ...(c.args ? { args: c.args } : {}),
@@ -70,6 +70,7 @@ export function parseCommand(raw: string): ParsedCommand {
70
70
  case "codex":
71
71
  case "workbuddy":
72
72
  case "pi":
73
+ case "dsh":
73
74
  return arg ? { kind: "chat", text } : { kind: "agent", agent: head.toLowerCase() };
74
75
  case "stop":
75
76
  return { kind: "stop" };
@@ -128,7 +129,7 @@ export function helpText(agents: string[], channel?: string): string {
128
129
  ...BUILTIN_COMMANDS.filter((c) => !c.multiAgentOnly || multi)
129
130
  .filter((c) => !c.feishuOnly || channel === "feishu")
130
131
  .filter((c) => !c.chatOnly || channel === "feishu" || channel === "weixin")
131
- .filter((c) => !["claude", "codex", "workbuddy", "pi"].includes(c.name))
132
+ .filter((c) => !["claude", "codex", "workbuddy", "pi", "dsh"].includes(c.name))
132
133
  .map((c) =>
133
134
  c.name === "expert"
134
135
  ? `\`${usageOf(c)}\` ${c.description}${multi ? `,也可以直接发 ${agents.map((a) => `\`/${a}\``).join(" ")}` : ""}`
@@ -88,6 +88,24 @@ export type AppConfig = {
88
88
  defaultEffort: string;
89
89
  models: string[];
90
90
  };
91
+ /**
92
+ * dsh(DeepSeek Harness,npm i -g @deepseek-ai/dsh):每个会话一个 `dsh --profile acp` 进程。
93
+ * 凭据、会话记录都在 dsh 自己的 DSH_HOME(默认 ~/.dsh)里,见 agents/dsh/sdk.ts
94
+ */
95
+ dsh: {
96
+ enabled: boolean;
97
+ /** dsh 可执行文件,以系统服务运行时 PATH 很短,建议写绝对路径 */
98
+ path: string;
99
+ /** DSH_HOME,空 = ~/.dsh */
100
+ home: string;
101
+ /** 每个进程都加上的 --patch 文件(比如接别家模型的 llm-pi-ai 配置),空 = 不加 */
102
+ patch: string;
103
+ /** 「服务商/模型」,如 deepseek-official/deepseek-v4-pro;空 = dsh 默认 */
104
+ defaultModel: string;
105
+ /** 思考程度(off / low / high / max),空 = dsh 默认 */
106
+ defaultEffort: string;
107
+ models: string[];
108
+ };
91
109
  };
92
110
  web: {
93
111
  enabled: boolean;
@@ -107,7 +125,7 @@ export type AppConfig = {
107
125
  quotaEnabled: boolean;
108
126
  };
109
127
  /** 输入「/」时命令列表的顺序和隐藏项,按 agent 分开(设置 → 命令) */
110
- commands: { claude: CommandPrefs; codex: CommandPrefs; workbuddy: CommandPrefs; pi: CommandPrefs };
128
+ commands: { claude: CommandPrefs; codex: CommandPrefs; workbuddy: CommandPrefs; pi: CommandPrefs; dsh: CommandPrefs };
111
129
  /** 远程控制:网页终端和远程桌面。管理员能用;成员要在 设置 → 用户 里单独开(users.json 的 remote) */
112
130
  remote: {
113
131
  terminal: boolean;
@@ -144,7 +162,7 @@ export type AppConfig = {
144
162
  };
145
163
  };
146
164
 
147
- export const AGENT_IDS = ["claude", "codex", "workbuddy", "pi"] as const;
165
+ export const AGENT_IDS = ["claude", "codex", "workbuddy", "pi", "dsh"] as const;
148
166
 
149
167
  export function defaultConfig(): AppConfig {
150
168
  return {
@@ -168,9 +186,11 @@ export function defaultConfig(): AppConfig {
168
186
  workbuddy: { enabled: false, environment: "workbuddy", cliPath: "", defaultModel: "", defaultEffort: "", models: [] },
169
187
  // 默认不开:要先填一家服务商的 API Key
170
188
  pi: { enabled: false, defaultModel: "", defaultEffort: "", models: [] },
189
+ // 默认不开:要先装 dsh、配 DeepSeek API Key
190
+ dsh: { enabled: false, path: "dsh", home: "", patch: "", defaultModel: "", defaultEffort: "", models: [] },
171
191
  },
172
192
  web: { enabled: true, host: "0.0.0.0", port: 8800, passwordHash: "", trustedProxies: ["127.0.0.1", "::1"], quotaRefreshMin: 10, quotaEnabled: true },
173
- commands: { claude: { order: [], hidden: [], custom: [] }, codex: { order: [], hidden: [], custom: [] }, workbuddy: { order: [], hidden: [], custom: [] }, pi: { order: [], hidden: [], custom: [] } },
193
+ commands: { claude: { order: [], hidden: [], custom: [] }, codex: { order: [], hidden: [], custom: [] }, workbuddy: { order: [], hidden: [], custom: [] }, pi: { order: [], hidden: [], custom: [] }, dsh: { order: [], hidden: [], custom: [] } },
174
194
  remote: {
175
195
  terminal: true,
176
196
  desktop: true,
@@ -16,8 +16,8 @@ import { canUseMcp, claudeMachineMcp, getMcp, isMachineId, machineName, specOf,
16
16
  import { activeSkills, canSee, getSkill } from "./skills.js";
17
17
  import { canUseResource, getUser } from "./users.js";
18
18
 
19
- export type Engine = "claude" | "codex" | "workbuddy" | "pi";
20
- export const ENGINES: readonly Engine[] = ["claude", "codex", "workbuddy", "pi"];
19
+ export type Engine = "claude" | "codex" | "workbuddy" | "pi" | "dsh";
20
+ export const ENGINES: readonly Engine[] = ["claude", "codex", "workbuddy", "pi", "dsh"];
21
21
  /** 能建自定义专家的引擎。WorkBuddy 目前只有内置专家(工具名、子智能体还没对齐) */
22
22
  export const EXPERT_ENGINES: readonly Engine[] = ["claude", "codex", "pi"];
23
23
 
@@ -300,7 +300,7 @@ function validate(owner: string, input: ExpertInput, prev?: Expert, selfId?: str
300
300
  const name = text(pick("name"), EXPERT_LIMITS.name, "名字");
301
301
  if (!name) throw new Error("给专家起个名字");
302
302
  const engine = pick("engine");
303
- if (engine !== "claude" && engine !== "codex" && engine !== "pi") throw new Error(engine === "workbuddy" ? "WorkBuddy 暂不支持自定义专家,用内置的 WorkBuddy 就好" : "引擎只能是 Claude、Codex 或 pi");
303
+ if (engine !== "claude" && engine !== "codex" && engine !== "pi") throw new Error(engine === "workbuddy" ? "WorkBuddy 暂不支持自定义专家,用内置的 WorkBuddy 就好" : engine === "dsh" ? "dsh 暂不支持自定义专家,用内置的 dsh 就好" : "引擎只能是 Claude、Codex 或 pi");
304
304
  if (prev && prev.engine !== engine) throw new Error("建好之后不能换引擎(用这个专家的对话都是这个引擎的会话)");
305
305
  const access = pick("access");
306
306
  if (!ACCESS_LEVELS.includes(access as ExpertAccess)) throw new Error("权限不对");
package/src/core/hub.ts CHANGED
@@ -50,6 +50,7 @@ import type {
50
50
  InteractionSpec,
51
51
  ModelInfo,
52
52
  RealtimeEvent,
53
+ RealtimeOptions,
53
54
  RuntimeInfo,
54
55
  SessionSummary,
55
56
  StepKind,
@@ -2057,7 +2058,7 @@ class Hub extends EventEmitter<{
2057
2058
  // ---------- 实时语音对话(只有 Codex) ----------
2058
2059
 
2059
2060
  /** 开始通话:offer 是浏览器的 WebRTC SDP,返回对端 answer。会话没拉起来就按绑定拉起 */
2060
- async realtimeStart(key: string, offer: string): Promise<string> {
2061
+ async realtimeStart(key: string, offer: string, opts?: RealtimeOptions): Promise<string> {
2061
2062
  const conv = getConversation(key);
2062
2063
  if (!conv) throw new Error("会话不存在");
2063
2064
  if (conv.agent !== "codex") throw new Error("只有 Codex 的对话能语音对话");
@@ -2065,7 +2066,7 @@ class Hub extends EventEmitter<{
2065
2066
  const session = this.session(key);
2066
2067
  if (!session.startRealtime) throw new Error("这个 agent 不支持语音对话");
2067
2068
  touchConversation(key);
2068
- return session.startRealtime(offer);
2069
+ return session.startRealtime(offer, opts);
2069
2070
  }
2070
2071
 
2071
2072
  async realtimeStop(key: string): Promise<void> {
@@ -2421,7 +2422,7 @@ class Hub extends EventEmitter<{
2421
2422
  ...(channel ? { channel } : {}),
2422
2423
  ...(owner && getUser(owner)?.role !== "admin" ? { member: true } : {}),
2423
2424
  });
2424
- return { type: "commands", agent: conv.agent, commands: all.filter((c) => !c.hidden && (!["claude", "codex", "workbuddy", "pi"].includes(c.name) || ctx.allowedExperts === undefined || ctx.allowedExperts.includes(c.name))) };
2425
+ return { type: "commands", agent: conv.agent, commands: all.filter((c) => !c.hidden && (!["claude", "codex", "workbuddy", "pi", "dsh"].includes(c.name) || ctx.allowedExperts === undefined || ctx.allowedExperts.includes(c.name))) };
2425
2426
  }
2426
2427
  case "pwd":
2427
2428
  return text(getConversation(key)!.cwd);
@@ -480,7 +480,7 @@ export function describeResult(r: CurateResult): string | undefined {
480
480
 
481
481
  /** 按用户的设置挑 agent。指定的那个用不了就是 undefined(不悄悄换成另一个,免得用到他没想用的额度) */
482
482
  export function pickDriver(settings: Pick<CurateSettings, "agent">): AgentDriver | undefined {
483
- const usable = hub.enabledAgents().filter((d) => d.complete && agentAvailability(d.id as "claude" | "codex" | "workbuddy" | "pi")?.available !== false);
483
+ const usable = hub.enabledAgents().filter((d) => d.complete && agentAvailability(d.id as "claude" | "codex" | "workbuddy" | "pi" | "dsh")?.available !== false);
484
484
  if (settings.agent !== "auto") return usable.find((d) => d.id === settings.agent);
485
485
  return usable.find((d) => d.id === "claude") ?? usable[0];
486
486
  }
@@ -525,7 +525,7 @@ export async function curateBatch(
525
525
  const driver = opts.driver ?? pickDriver(memory.curate);
526
526
  if (!driver) {
527
527
  // 没有能用的 agent:留着,等它能用了再整理
528
- log.error = memory.curate.agent === "auto" ? "没有能用的 agent" : `${({ claude: "Claude", codex: "Codex", workbuddy: "WorkBuddy", pi: "pi" } as Record<string, string>)[memory.curate.agent] ?? memory.curate.agent} 现在用不了(没启用、没装或没登录)`;
528
+ log.error = memory.curate.agent === "auto" ? "没有能用的 agent" : `${({ claude: "Claude", codex: "Codex", workbuddy: "WorkBuddy", pi: "pi", dsh: "dsh" } as Record<string, string>)[memory.curate.agent] ?? memory.curate.agent} 现在用不了(没启用、没装或没登录)`;
529
529
  patchMeta(userId, { lastCuration: log });
530
530
  return log;
531
531
  }
@@ -102,7 +102,7 @@ export type CurateSettings = {
102
102
  idleMinutes: number;
103
103
  dailyHour: number;
104
104
  /** auto:Claude 能用就用 Claude,否则 Codex */
105
- agent: "auto" | "claude" | "codex" | "workbuddy" | "pi";
105
+ agent: "auto" | "claude" | "codex" | "workbuddy" | "pi" | "dsh";
106
106
  /** 空 = 这个 agent 最省的默认(Claude 用 Haiku,Codex 用默认模型、思考程度 low) */
107
107
  model: string;
108
108
  };
@@ -120,7 +120,7 @@ function cleanCurate(raw: Partial<CurateSettings> | undefined, base: CurateSetti
120
120
  : base.experts;
121
121
  const idle = Math.round(Number(r.idleMinutes ?? base.idleMinutes));
122
122
  const hour = Math.round(Number(r.dailyHour ?? base.dailyHour));
123
- const agent = (["auto", "claude", "codex", "workbuddy", "pi"] as const).find((a) => a === r.agent) ?? base.agent;
123
+ const agent = (["auto", "claude", "codex", "workbuddy", "pi", "dsh"] as const).find((a) => a === r.agent) ?? base.agent;
124
124
  const model = typeof r.model === "string" ? r.model.trim().slice(0, 100) : base.model;
125
125
  return {
126
126
  when,
@@ -31,7 +31,7 @@ export function isPermissionLevel(v: unknown): v is PermissionLevel {
31
31
  return typeof v === "string" && (PERMISSION_LEVELS as readonly string[]).includes(v);
32
32
  }
33
33
 
34
- /** 这个引擎认不认这一级:自动判断只有 Claude 有(WorkBuddy、pi 也按自动改文件算) */
34
+ /** 这个引擎认不认这一级:自动判断只有 Claude 有(WorkBuddy、pi、dsh 也按自动改文件算) */
35
35
  export function engineSupports(agent: string, level: PermissionLevel): boolean {
36
36
  return level !== "auto" || agent === "claude";
37
37
  }
@@ -0,0 +1,142 @@
1
+ /**
2
+ * 实时语音的中转:服务器自己当 WebRTC 端点连 OpenAI,浏览器那头走现有的 WebSocket 收发 PCM。
3
+ * 这样声音和网页走同一条路(反向代理、Cloudflare Tunnel 都能过),浏览器不用直连 OpenAI。
4
+ *
5
+ * 浏览器 ⇄ 这里:16 位小端、单声道、24kHz 的 PCM(每块多长都行)。
6
+ * 这里 ⇄ OpenAI:Opus(RTP 时钟 48kHz,每包 20ms),加上 OpenAI 要求的 oai-events 数据通道。
7
+ */
8
+ import OpusScript from "opusscript";
9
+ import { MediaStreamTrack, RTCPeerConnection, RTCRtpCodecParameters, RtpHeader, RtpPacket } from "werift";
10
+
11
+ export const RELAY_RATE = 24000;
12
+ /** 20ms 一帧:24kHz 下 480 个采样;RTP 时间戳按 48kHz 走,一帧加 960 */
13
+ const FRAME = 480;
14
+ const FRAME_BYTES = FRAME * 2;
15
+ const RTP_STEP = 960;
16
+ /** 浏览器发过来的还没凑够一帧的、积压的上限(约 1 秒),再多说明来不及发,丢掉旧的 */
17
+ const MAX_PENDING = RELAY_RATE * 2;
18
+
19
+ export class RealtimeRelay {
20
+ /** 收到 OpenAI 的声音(解码后的 PCM),交给浏览器 */
21
+ onAudio: (pcm: Buffer) => void = () => {};
22
+ /** 和 OpenAI 的连接断了(不是 close() 主动关的) */
23
+ onFailed: (reason: string) => void = () => {};
24
+
25
+ private readonly pc: RTCPeerConnection;
26
+ private readonly track = new MediaStreamTrack({ kind: "audio" });
27
+ private readonly encoder = new OpusScript(RELAY_RATE, 1, OpusScript.Application.VOIP);
28
+ private readonly decoder = new OpusScript(RELAY_RATE, 1, OpusScript.Application.VOIP);
29
+ private pending = Buffer.alloc(0);
30
+ private seq = Math.floor(Math.random() * 0xffff);
31
+ private ts = Math.floor(Math.random() * 0xffffffff);
32
+ private closed = false;
33
+ private dropTimer: NodeJS.Timeout | undefined;
34
+
35
+ private constructor() {
36
+ this.pc = new RTCPeerConnection({
37
+ codecs: { audio: [new RTCRtpCodecParameters({ mimeType: "audio/opus", clockRate: 48000, channels: 2 })] },
38
+ });
39
+ const transceiver = this.pc.addTransceiver(this.track, { direction: "sendrecv" });
40
+ transceiver.onTrack.subscribe((remote) => {
41
+ remote.onReceiveRtp.subscribe((rtp) => {
42
+ if (this.closed || !rtp.payload.length) return;
43
+ try {
44
+ this.onAudio(Buffer.from(this.decoder.decode(rtp.payload)));
45
+ } catch {
46
+ // 坏包丢掉
47
+ }
48
+ });
49
+ });
50
+ // OpenAI 要求 offer 里有这个数据通道(事件我们走 Codex 的通知,用不上它)
51
+ this.pc.createDataChannel("oai-events");
52
+ this.pc.connectionStateChange.subscribe((state) => {
53
+ if (this.closed) return;
54
+ clearTimeout(this.dropTimer);
55
+ if (state === "failed" || state === "closed") this.fail("和语音服务的连接断开了");
56
+ // 网络抖一下会短暂 disconnected,几秒内没恢复才算断
57
+ else if (state === "disconnected") this.dropTimer = setTimeout(() => this.fail("和语音服务的连接断开了"), 5000);
58
+ });
59
+ }
60
+
61
+ /** 建好连接对象和 offer(ICE 候选收齐了写在里面),offer 交给 Codex 去 OpenAI 建通话 */
62
+ static async create(): Promise<{ relay: RealtimeRelay; offer: string }> {
63
+ const relay = new RealtimeRelay();
64
+ await relay.pc.setLocalDescription(await relay.pc.createOffer());
65
+ await relay.gathered(1500);
66
+ const offer = relay.pc.localDescription?.sdp;
67
+ if (!offer) {
68
+ relay.close();
69
+ throw new Error("没能建立语音连接");
70
+ }
71
+ return { relay, offer };
72
+ }
73
+
74
+ /** OpenAI 的 answer 回来了:连上 */
75
+ async accept(answer: string): Promise<void> {
76
+ if (this.closed) throw new Error("已挂断");
77
+ await this.pc.setRemoteDescription({ type: "answer", sdp: answer });
78
+ }
79
+
80
+ /** 浏览器发来的麦克风 PCM:凑够 20ms 就编码发出去 */
81
+ pushAudio(pcm: Buffer): void {
82
+ if (this.closed || !pcm.length) return;
83
+ this.pending = this.pending.length ? Buffer.concat([this.pending, pcm]) : Buffer.from(pcm);
84
+ if (this.pending.length > MAX_PENDING) this.pending = this.pending.subarray(this.pending.length - MAX_PENDING);
85
+ while (this.pending.length >= FRAME_BYTES) {
86
+ const frame = this.pending.subarray(0, FRAME_BYTES);
87
+ this.pending = this.pending.subarray(FRAME_BYTES);
88
+ this.sendFrame(frame);
89
+ }
90
+ }
91
+
92
+ close(): void {
93
+ if (this.closed) return;
94
+ this.closed = true;
95
+ clearTimeout(this.dropTimer);
96
+ this.pending = Buffer.alloc(0);
97
+ void this.pc.close().catch(() => {});
98
+ for (const codec of [this.encoder, this.decoder]) {
99
+ try {
100
+ codec.delete();
101
+ } catch {
102
+ // 已经释放
103
+ }
104
+ }
105
+ }
106
+
107
+ private sendFrame(frame: Buffer): void {
108
+ let payload: Buffer;
109
+ try {
110
+ payload = this.encoder.encode(frame, FRAME);
111
+ } catch {
112
+ return;
113
+ }
114
+ const header = new RtpHeader({ sequenceNumber: this.seq, timestamp: this.ts, marker: false, payloadType: 111 });
115
+ this.seq = (this.seq + 1) & 0xffff;
116
+ this.ts = (this.ts + RTP_STEP) >>> 0;
117
+ try {
118
+ this.track.writeRtp(new RtpPacket(header, Buffer.from(payload)));
119
+ } catch {
120
+ // 还没连上 / 已经关了
121
+ }
122
+ }
123
+
124
+ private fail(reason: string): void {
125
+ if (this.closed) return;
126
+ this.close();
127
+ this.onFailed(reason);
128
+ }
129
+
130
+ private gathered(ms: number): Promise<void> {
131
+ if (this.pc.iceGatheringState === "complete") return Promise.resolve();
132
+ return new Promise((resolve) => {
133
+ const timer = setTimeout(done, ms);
134
+ const sub = this.pc.iceGatheringStateChange.subscribe((state) => state === "complete" && done());
135
+ function done(): void {
136
+ clearTimeout(timer);
137
+ sub.unSubscribe();
138
+ resolve();
139
+ }
140
+ });
141
+ }
142
+ }
package/src/core/types.ts CHANGED
@@ -144,6 +144,9 @@ export type AgentEvents = {
144
144
  onRealtime?: (ev: RealtimeEvent) => void;
145
145
  };
146
146
 
147
+ /** 实时语音对话的音色和语言(页面上选的,没选就用 Codex 默认) */
148
+ export type RealtimeOptions = { voice?: string; language?: string };
149
+
147
150
  /** 实时语音对话的事件(Codex 的 thread/realtime/*) */
148
151
  export type RealtimeEvent =
149
152
  | { type: "started" }
@@ -315,7 +318,7 @@ export interface AgentSession {
315
318
  /** 开关计划模式。Claude 立即生效,Codex 下一轮生效 */
316
319
  setPlan?(on: boolean): Promise<void>;
317
320
  /** 开始实时语音对话(只有 Codex):offer 是浏览器的 WebRTC SDP,返回对端的 answer */
318
- startRealtime?(offer: string): Promise<string>;
321
+ startRealtime?(offer: string, opts?: RealtimeOptions): Promise<string>;
319
322
  /** 挂断实时语音对话;没在通话就什么都不做 */
320
323
  stopRealtime?(): Promise<void>;
321
324
  }
package/src/core/users.ts CHANGED
@@ -204,7 +204,7 @@ function cleanPermissions(value: unknown, current: ResourcePermissions = {}): Re
204
204
  for (const [kind, ids] of Object.entries(value)) {
205
205
  if (!["experts", "agents", "servers"].includes(kind)) throw new Error("未知的使用权限");
206
206
  if (ids !== null && (!Array.isArray(ids) || ids.length > 200 || ids.some((id) => typeof id !== "string" || !/^[\w-]{1,100}$/.test(id)))) throw new Error("使用权限必须是 ID 列表或 null");
207
- if (kind === "agents" && ids?.some((id: string) => !["claude", "codex", "workbuddy", "pi"].includes(id))) throw new Error("未知的内置 Agent");
207
+ if (kind === "agents" && ids?.some((id: string) => !["claude", "codex", "workbuddy", "pi", "dsh"].includes(id))) throw new Error("未知的内置 Agent");
208
208
  next[kind as ResourceKind] = ids === null ? null : [...new Set(ids as string[])];
209
209
  }
210
210
  return next;
package/src/main.ts CHANGED
@@ -7,6 +7,7 @@ import { ClaudeDriver } from "./agents/claude/driver.js";
7
7
  import { CodexDriver } from "./agents/codex/driver.js";
8
8
  import { WorkBuddyDriver } from "./agents/workbuddy/driver.js";
9
9
  import { PiDriver } from "./agents/pi/driver.js";
10
+ import { DshDriver } from "./agents/dsh/driver.js";
10
11
  import { agentHealth } from "./agents/health.js";
11
12
  import { startFeishu, stopFeishu } from "./channels/feishu/index.js";
12
13
  import { startWeixin, stopWeixin } from "./channels/weixin/index.js";
@@ -22,7 +23,7 @@ import { startScheduler, stopScheduler } from "./core/scheduled.js";
22
23
  import { startTaskRunner, stopTaskRunner } from "./core/task-runner.js";
23
24
  import { startTasksBridge, stopTasksBridge } from "./core/tasks-bridge.js";
24
25
 
25
- async function startDriver(id: "claude" | "codex" | "workbuddy" | "pi"): Promise<void> {
26
+ async function startDriver(id: "claude" | "codex" | "workbuddy" | "pi" | "dsh"): Promise<void> {
26
27
  const driver = hub.driver(id);
27
28
  if (!driver) return;
28
29
  try {
@@ -41,15 +42,18 @@ async function main(): Promise<void> {
41
42
  hub.registerDriver(new CodexDriver());
42
43
  hub.registerDriver(new WorkBuddyDriver());
43
44
  hub.registerDriver(new PiDriver());
45
+ hub.registerDriver(new DshDriver());
44
46
  if (config().agents.claude.enabled) await startDriver("claude");
45
47
  if (config().agents.codex.enabled) await startDriver("codex");
46
48
  if (config().agents.workbuddy.enabled) void startDriver("workbuddy");
47
49
  if (config().agents.pi.enabled) void startDriver("pi");
50
+ if (config().agents.dsh.enabled) void startDriver("dsh");
48
51
  // Web 上新启用了 Codex:现拉 app-server;WorkBuddy、pi 预先加载 SDK
49
52
  onConfigChange((next, prev) => {
50
53
  if (next.agents.codex.enabled && !prev.agents.codex.enabled) void startDriver("codex");
51
54
  if (next.agents.workbuddy.enabled && !prev.agents.workbuddy.enabled) void startDriver("workbuddy");
52
55
  if (next.agents.pi.enabled && !prev.agents.pi.enabled) void startDriver("pi");
56
+ if (next.agents.dsh.enabled && !prev.agents.dsh.enabled) void startDriver("dsh");
53
57
  });
54
58
 
55
59
  // 资料库:升级时把已有的附件收进来(只一次),再清掉对话没了的、上传了一直没发的
@@ -679,6 +679,44 @@ textarea.sending {
679
679
  background: color-mix(in srgb, var(--danger) 12%, transparent);
680
680
  }
681
681
 
682
+ .call-ctl.active {
683
+ color: var(--accent);
684
+ background: color-mix(in srgb, var(--accent) 12%, transparent);
685
+ }
686
+
687
+ .call-opts {
688
+ display: flex;
689
+ flex-wrap: wrap;
690
+ align-items: center;
691
+ gap: 8px 16px;
692
+ margin-top: 10px;
693
+ padding-top: 10px;
694
+ border-top: 1px solid color-mix(in srgb, var(--border) 70%, transparent);
695
+ }
696
+
697
+ .call-opts[hidden] {
698
+ display: none;
699
+ }
700
+
701
+ .call-opt {
702
+ display: inline-flex;
703
+ align-items: center;
704
+ gap: 6px;
705
+ font-size: 13px;
706
+ color: var(--fg-soft);
707
+ }
708
+
709
+ .call-opt select {
710
+ font-size: 13px;
711
+ max-width: 180px;
712
+ }
713
+
714
+ .call-opts-hint {
715
+ flex-basis: 100%;
716
+ font-size: 12px;
717
+ color: var(--fg-faint);
718
+ }
719
+
682
720
  .call-ctl.call-end {
683
721
  padding: 0 16px;
684
722
  font-size: 14px;
package/web/lib/dom.js CHANGED
@@ -89,6 +89,8 @@ ICON.claude = '<svg viewBox="0 0 640 640"><path fill="#D97757" fill-rule="evenod
89
89
  ICON.codex = '<svg viewBox="0 0 640 640"><path fill="currentColor" fill-rule="evenodd" d="M253 1C193 8 141 51 122 109C120 115 118 121 117 123C117 127 117 127 108 130C31 154 -16 240 6 321C12 346 26 370 45 391L53 399 52 407C43 448 51 491 75 527C83 539 104 560 116 569C156 596 205 604 250 591L257 589 264 595C284 613 307 624 335 631C351 635 382 635 399 631C461 618 506 575 523 511C523 508 524 508 534 504C587 485 625 442 637 384C640 369 640 341 637 325C631 293 616 266 594 244L587 236 588 228C606 142 552 60 466 41C442 36 412 37 390 44L384 46 375 38C340 9 297 -4 253 1M259 39C258 39 253 39 249 40C206 46 169 78 156 119C150 137 150 139 150 224L150 302 153 305C156 308 206 338 207 338C208 338 208 296 208 245C208 181 208 150 209 148C211 140 215 138 280 100C314 80 343 64 343 63C345 61 322 48 308 44C293 39 272 37 259 39M405 78C385 82 385 82 309 126C271 148 249 161 248 163C246 166 245 168 245 198C245 220 245 230 246 230C247 230 283 209 326 184C412 134 410 135 416 135C422 135 421 135 489 174C524 195 552 211 553 211C554 209 554 196 553 186C547 133 512 92 462 79C448 76 418 75 405 78M103 173C62 194 36 238 38 284C40 316 53 346 75 368C86 379 88 380 145 413C171 428 199 444 206 448C217 454 221 456 224 456C227 456 281 427 281 425C281 425 245 403 201 378C157 353 120 331 119 329C112 323 113 327 112 244L112 169 103 173M385 194C370 202 358 209 358 209C358 210 394 231 438 256C482 281 519 303 521 305C522 306 525 309 526 311C528 316 528 316 528 390C528 444 528 465 529 465C531 465 547 456 554 451C612 407 618 321 566 267C554 256 553 255 497 222C416 176 420 178 416 178C413 178 406 181 385 194M282 252L246 273 246 317L246 362 282 382C303 394 320 403 320 403C321 403 388 365 393 362L395 361 395 317L394 273 358 252C337 240 320 231 320 231C320 231 303 240 282 252M432 389C432 453 432 484 431 486C429 494 425 497 360 535C325 554 297 571 297 571C295 572 307 580 317 585C336 593 353 597 374 596C432 593 475 558 489 502C491 490 492 336 489 331C488 328 483 325 460 312C445 303 433 296 432 296C432 296 432 338 432 389M376 414C367 419 331 440 297 460C230 498 228 500 222 499C217 498 220 500 150 459C117 440 89 424 88 424C87 424 86 440 87 450C91 492 115 527 153 545C183 561 223 563 254 551C264 547 388 476 391 472L394 469 394 436C394 419 394 404 394 404C394 404 386 408 376 414"/></svg>';
90
90
  /** WorkBuddy 的头像(青绿渐变猫脸),沿用 SVG 容器适配各处的图标尺寸 */
91
91
  ICON.workbuddy = `<svg viewBox="0 0 320 320"><image href="${new URL("../workbuddy.png", import.meta.url).href}" width="320" height="320"/></svg>`;
92
+ /** dsh 的头像:蓝色圆角方块里一个命令提示符「>_」 */
93
+ ICON.dsh = '<svg viewBox="0 0 64 64"><rect x="2" y="2" width="60" height="60" rx="14" fill="#4D6BFE"/><path fill="none" stroke="#fff" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" d="M17 22l12 10-12 10M33 44h14"/></svg>';
92
94
  /** pi 的头像:圆角方块里一个 π,跟着文字颜色(深色模式下反过来) */
93
95
  ICON.pi = '<svg viewBox="0 0 64 64"><rect x="2" y="2" width="60" height="60" rx="14" fill="currentColor"/><path fill="none" stroke="var(--bg, #fff)" stroke-width="6" stroke-linecap="round" d="M15 21h34M25 21v24M40 21v18c0 4 2 6 6 6"/></svg>';
94
96