dsh-supermesh 0.0.5 → 0.0.6

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.
@@ -9,8 +9,9 @@
9
9
  **派活。** 一张票该开跑时 `create_worker`,建 worktree、开分支、起会话一次性配好。
10
10
  **槽位满了就让它留在 `queued`,不要硬开** —— 硬开的后果是两个 Worker 抢同一个端口。
11
11
 
12
- **看着。** Worker 的汇报会进你的收件箱。`ready` 说明能审了,`failed` 说明要重试,
13
- `dropped` 说明这活不用做了。**收工的时候留下 branch 和 worktree,那是唯一记录。**
12
+ **看着。** Worker 跑完会以结算通知叫醒你,收尾文本就在通知里;`reportState` 在票上。
13
+ `ready` 说明能审了,`failed` 说明要重试,`dropped` 说明这活不用做了。
14
+ **收工的时候留下 branch 和 worktree,那是唯一记录。**
14
15
 
15
16
  **收尾。** PR 合了、CI 绿了、人说行了,就把票推到 `done`。
16
17
  **合并和关闭不会产生新触发 —— 别等它,自己去看。**
@@ -19,9 +19,11 @@
19
19
 
20
20
  收到触发后按这个顺序走,**每一步都可能提前结束**:
21
21
 
22
- 0. **这条消息是在叫你吗** —— 看邮件里的 `mentioned`。`mentioned: no` 的消息(别人开的 issue、别人的评论)
23
- 只是时间线记录:可以判一次话题归属,但**不建票、不派工、不叫醒任何人**。
24
- 只有 `mentioned: yes`、这条话题已经挂在票上(订阅跟进),或者人直接对你说「做」,才算开工请求。
22
+ 0. **这条消息是在叫你吗** —— 看邮件里的 `strength`。
23
+ `strength: inferred` 的消息(没 @ bot 的 issue、评论,或非管理员在既有话题上的跟进)只是候选:
24
+ 可以判一次话题归属、记分诊,但**不建票、不派工、不叫醒任何人**,`create_ticket` 也会拒绝。
25
+ 只有 `strength: explicit`(人明确 @ bot,或管理员在已订阅话题上的跟进)才是开工请求。
26
+ inferred 模式被显式改成 `auto` 时,候选才允许建票;没改就按上面处理。
25
27
  1. **已经是老话题了吗** —— 用 `list_ticket` 看这条话题是否已挂在某张票上。
26
28
  挂了就别再判一次,那条触发会自动进对应项目的收件箱。
27
29
  2. **需要开新票吗** —— 消息明确指向某张已有票 → `attach_thread_to_ticket`,
@@ -15,7 +15,7 @@ import { HTTPError, defineHandler, getQuery, getRouterParam, readBody } from "h3
15
15
  import { createStorage } from "unstorage";
16
16
  import fs from "unstorage/drivers/fs";
17
17
  import { homedir } from "node:os";
18
- import { ReasoningEffortId, createUserMessage } from "@deepseek-ai/dsh-llm";
18
+ import { ReasoningEffortId, boundContextSummary, createUserMessage, joinAssistantStreamText } from "@deepseek-ai/dsh-llm";
19
19
  import { access, lstat, mkdir, mkdtemp, realpath, rename, rm, writeFile } from "node:fs/promises";
20
20
  import { Session, SessionId } from "@deepseek-ai/dsh-session";
21
21
  import { realpathNormalize } from "@deepseek-ai/dsh-workspace";
@@ -1455,25 +1455,14 @@ var Worker = class Worker extends Model {
1455
1455
  }).where("id", "=", id).execute();
1456
1456
  }
1457
1457
  async reportProgress(id, reportState, report) {
1458
- return this.db.transaction().execute(async (trx) => {
1458
+ await this.db.transaction().execute(async (trx) => {
1459
1459
  const worker = await new Worker(trx).findById(id);
1460
1460
  if (!worker || worker.status === "ended") throw new Error("Worker 已结束或不存在");
1461
1461
  const ticket = await trx.selectFrom("ticket").selectAll().where("id", "=", worker.ticketId).executeTakeFirst();
1462
1462
  if (!ticket || ticket.status === "done" || ticket.status === "cancelled") throw new Error("工单已结束或不存在");
1463
1463
  const now = (/* @__PURE__ */ new Date()).toISOString();
1464
1464
  await new Worker(trx).setReport(id, reportState, report, now);
1465
- const message = await new Inbox(trx).enqueue({
1466
- type: "project",
1467
- projectId: ticket.projectId,
1468
- origin: "worker",
1469
- kind: "ticket",
1470
- ticketId: ticket.id,
1471
- workerId: id,
1472
- title: reportState,
1473
- message: report
1474
- });
1475
1465
  if (reportState === "ready") await new Ticket(trx).endOnReport(ticket.id, now);
1476
- return message;
1477
1466
  });
1478
1467
  }
1479
1468
  };
@@ -1546,6 +1535,33 @@ const { error } = await new Migrator({
1546
1535
  provider: new MigrationProvider(database, migrations)
1547
1536
  }).migrateToLatest();
1548
1537
  if (error) throw error;
1538
+ // src/channel/_shared/admission.ts
1539
+ /**
1540
+ * 准入只回答「这条消息能不能进流程」,强度回答「它算不算开工请求」。
1541
+ * 没 @ bot 的消息最多是 inferred 候选,只有管理员点名或已订阅话题上的跟进才是 explicit。
1542
+ */
1543
+ function channelTriggerStrength(input) {
1544
+ if (!input.human || input.historical && !input.subscribed) return null;
1545
+ if (input.subscribed) return input.admin ? "explicit" : input.inferred === "off" ? null : "inferred";
1546
+ if (!input.admin || input.ignored && !input.mentioned) return null;
1547
+ if (input.mentioned) return "explicit";
1548
+ return input.kind === "open" && input.inferred !== "off" ? "inferred" : null;
1549
+ }
1550
+ /** 已投递的触发按当前事实判强度,供收件箱与建票闸使用。 */
1551
+ function triggerStrengthOf(input) {
1552
+ return input.admin && (input.mentioned || input.subscribed) ? "explicit" : "inferred";
1553
+ }
1554
+ /** 建票闸:没有触发来源(人工建票)放行,inferred 候选只有 auto 模式才允许开票。 */
1555
+ function ticketAllowed(strength, inferred) {
1556
+ return strength !== "inferred" || inferred === "auto";
1557
+ }
1558
+ /**
1559
+ * 进流程不等于被点名。没 @ bot 的消息只是时间线记录:可以分诊,但不建票、不派工、也不在渠道上发言。
1560
+ * 只有明确 @、或者这条话题已经被票订阅(人在跟进已有任务)才算在跟 bot 说话。
1561
+ */
1562
+ function addressedToBot(input) {
1563
+ return input.mentioned || input.subscribed;
1564
+ }
1549
1565
  // src/channel/_shared/proxy.ts
1550
1566
  async function channelProxyEnvironment(url, inherited) {
1551
1567
  const env = { ...inherited };
@@ -1609,6 +1625,7 @@ const defaults = {
1609
1625
  supervisor: null
1610
1626
  },
1611
1627
  administrators: [],
1628
+ inferred: "observe",
1612
1629
  maxWorkers: 10,
1613
1630
  backgroundLimitMinutes: 30,
1614
1631
  autoMerge: false,
@@ -1678,6 +1695,7 @@ function valid(value, allowEmpty = false) {
1678
1695
  return entries.every(([key, entry]) => {
1679
1696
  if (key === "administrators") return Array.isArray(entry) && entry.length <= 100 && entry.every((name) => typeof name === "string" && /^[a-z0-9][\w.-]{0,254}$/i.test(name.trim()));
1680
1697
  if (key === "autoMerge" || key === "autoArchiveWorkers") return typeof entry === "boolean";
1698
+ if (key === "inferred") return entry === "off" || entry === "observe" || entry === "auto";
1681
1699
  if (key === "models") return validModels(entry);
1682
1700
  if (!Object.hasOwn(limits, key)) return false;
1683
1701
  const [min, max] = limits[key];
@@ -1885,6 +1903,31 @@ singlet.stale = function stale() {
1885
1903
  singlet.drain = async function drain() {
1886
1904
  while (pending.size) await Promise.allSettled([...pending.values()].map((record) => record.promise));
1887
1905
  };
1906
+ // src/service/admission.ts
1907
+ async function admin(actorName) {
1908
+ const name = (actorName ?? "").toLowerCase();
1909
+ return name !== "" && (await setting.load()).administrators.some((entry) => entry.toLowerCase() === name);
1910
+ }
1911
+ /** 按触发自身的点名事实和话题订阅判强度;订阅状态每次现查,票可能在建票之后才挂上。 */
1912
+ async function triggerStrength(trigger) {
1913
+ const subscribed = (await db.ticketThread.listTicketIds(trigger.threadId)).length > 0;
1914
+ return triggerStrengthOf({
1915
+ mentioned: Boolean(trigger.mentioned),
1916
+ subscribed,
1917
+ admin: await admin(trigger.actorName)
1918
+ });
1919
+ }
1920
+ /** 建票闸用:指定 triggerId 时按那条触发判,否则取这些话题里最新的一条人类触发。 */
1921
+ async function latestTriggerStrength(threadIds, triggerId) {
1922
+ if (triggerId) {
1923
+ const trigger = await db.trigger.findById(triggerId);
1924
+ return trigger ? triggerStrength(trigger) : void 0;
1925
+ }
1926
+ const candidates = (await Promise.all(threadIds.map((id) => db.trigger.listByThread(id, 20)))).flat();
1927
+ const human = candidates.filter((row) => row.human === 1);
1928
+ const trigger = (human.length ? human : candidates).sort((left, right) => right.at.localeCompare(left.at))[0];
1929
+ return trigger ? triggerStrength(trigger) : void 0;
1930
+ }
1888
1931
  // src/service/session.ts
1889
1932
  const presets$1 = {
1890
1933
  main: "orchestrator",
@@ -2050,16 +2093,19 @@ const session = defineService({
2050
2093
  if (identity.workerId && (await db.worker.findById(id))?.status === "ended") throw new Error("worker_ended");
2051
2094
  const ctx = getServerContext(server);
2052
2095
  if (mode === "interrupt") await session.cancel(id, true);
2096
+ const live = ctx.agents.get(SessionId(id));
2097
+ const target = mode === "interrupt" ? "steer" : mode === "queue" || live?.status !== "running" ? "queue" : "steer";
2053
2098
  const admitted = await ctx.sessionController.prompt({
2054
2099
  sessionId: SessionId(id),
2055
2100
  requestId,
2056
- mode: mode === "interrupt" ? "steer" : "queue",
2101
+ mode: target,
2057
2102
  content: [{
2058
2103
  type: "text",
2059
2104
  text
2060
2105
  }]
2061
2106
  }, controller$2.signal);
2062
2107
  if (admitted && typeof admitted === "object" && "ok" in admitted && admitted.ok === false) throw new Error(`prompt_rejected: ${String(admitted.error ?? "unknown")}`);
2108
+ return requestId;
2063
2109
  }),
2064
2110
  async cancel(id, keepInbox = false) {
2065
2111
  (await resolveAgent(id)).cancel({
@@ -2230,7 +2276,8 @@ const inbox = defineService({
2230
2276
  kind: trigger.kind,
2231
2277
  actorName: trigger.actorName,
2232
2278
  human: Boolean(trigger.human),
2233
- mentioned: Boolean(trigger.mentioned)
2279
+ mentioned: Boolean(trigger.mentioned),
2280
+ strength: await triggerStrength(trigger)
2234
2281
  });
2235
2282
  }
2236
2283
  const messages = rows.map((message) => ({
@@ -2328,12 +2375,13 @@ const inbox = defineService({
2328
2375
  }
2329
2376
  if ((await session.activity(id)).running || stopped$2) continue;
2330
2377
  const trigger = message.triggerId ? await db.trigger.findById(message.triggerId) : void 0;
2378
+ const strength = trigger ? await triggerStrength(trigger) : void 0;
2331
2379
  await session.send(id, [
2332
2380
  message.title ?? "",
2333
2381
  `[Inbox ${message.id}]`,
2334
2382
  message.triggerId ? `triggerId: ${message.triggerId}` : "",
2335
2383
  message.threadId ? `threadId: ${message.threadId}` : "",
2336
- trigger ? `actor: ${trigger.actorName ?? "unknown"} human: ${trigger.human ? "yes" : "no"} mentioned: ${trigger.mentioned ? "yes" : "no"}` : "",
2384
+ trigger ? `actor: ${trigger.actorName ?? "unknown"} human: ${trigger.human ? "yes" : "no"} mentioned: ${trigger.mentioned ? "yes" : "no"} strength: ${strength}` : "",
2337
2385
  message.message
2338
2386
  ].filter(Boolean).join(String.fromCharCode(10)), "queue", requestId);
2339
2387
  await db.inbox.resetDelivery(message.id);
@@ -2758,14 +2806,14 @@ const devops = defineService({
2758
2806
  },
2759
2807
  save(kind, patch) {
2760
2808
  return channel.serialize(() => save(kind, patch)).then(async (view) => {
2761
- const { shell } = await import("./shell-DqAUjFxq.js");
2809
+ const { shell } = await import("./shell-BZBvr4aJ.js");
2762
2810
  await shell.refresh();
2763
2811
  return view;
2764
2812
  });
2765
2813
  },
2766
2814
  removeCredentials(kind) {
2767
2815
  return channel.serialize(() => removeCredentials(kind)).then(async (view) => {
2768
- const { shell } = await import("./shell-DqAUjFxq.js");
2816
+ const { shell } = await import("./shell-BZBvr4aJ.js");
2769
2817
  await shell.refresh();
2770
2818
  return view;
2771
2819
  });
@@ -4027,6 +4075,42 @@ const archive = defineService({ async session(id) {
4027
4075
  const eventQueues = /* @__PURE__ */ new Map();
4028
4076
  let stopped = false;
4029
4077
  let observing = false;
4078
+ const finish = singlet((current) => `worker:finish:${current.id}`, async (current, reason) => {
4079
+ const worker = await db.worker.findById(current.id);
4080
+ if (!worker || worker.status === "ended") return;
4081
+ const asks = (await db.inbox.listByTicket(worker.ticketId)).filter((message) => message.kind === "ask" && message.workerId === worker.id);
4082
+ if (!reason) {
4083
+ if (asks.some((message) => message.status === "pending")) {
4084
+ await deferWhileWaiting(worker);
4085
+ return;
4086
+ }
4087
+ const answered = asks.filter((message) => message.answer);
4088
+ if (answered.length) {
4089
+ const receipts = await session.receipts(worker.id);
4090
+ if (answered.some((message) => !receipts.some((receipt) => receipt.requestId === `supermesh:answer:${message.id}`))) {
4091
+ await deferWhileWaiting(worker);
4092
+ return;
4093
+ }
4094
+ }
4095
+ }
4096
+ if (stopped) return;
4097
+ const now = (/* @__PURE__ */ new Date()).toISOString();
4098
+ await db.worker.setBackgroundUntil(worker.id, null);
4099
+ await db.worker.end(worker.id, reason ?? (worker.reportState === "failed" ? "failed" : "completed"), now);
4100
+ const ticket = await db.ticket.findById(worker.ticketId);
4101
+ if (ticket && ticket.status !== "done" && ticket.status !== "cancelled") {
4102
+ if (ticket.prState === "merged" || ticket.prState === "closed") await finishTicket(ticket.id, "done", now, now);
4103
+ else if (!reason && worker.reportState === "dropped") await finishTicket(ticket.id, "done", now, now);
4104
+ else await db.ticket.update(ticket.id, {
4105
+ status: !reason && worker.reportState === "ready" ? "review" : "waiting",
4106
+ updatedAt: now
4107
+ });
4108
+ }
4109
+ const ended = await db.ticket.findById(worker.ticketId);
4110
+ if (!reason && worker.reportState !== "failed" && ended && (ended.status === "done" || ended.status === "cancelled")) await archiveWorker(worker.id);
4111
+ if (ended && (ended.status === "done" || ended.status === "cancelled")) await releaseDependents(ended.id);
4112
+ await notifyRouter(worker, reason);
4113
+ });
4030
4114
  const worker = defineService({
4031
4115
  start() {
4032
4116
  if (singlet.busy("worker:slots") || eventQueues.size) throw new Error("worker_busy");
@@ -4158,7 +4242,8 @@ const worker = defineService({
4158
4242
  })}`,
4159
4243
  "来源话题:",
4160
4244
  ...sources,
4161
- worker.recoveryNote ?? ""
4245
+ worker.recoveryNote ?? "",
4246
+ "你的最后一条消息会原样转给项目编排。"
4162
4247
  ].filter(Boolean).join(String.fromCharCode(10));
4163
4248
  const now = (/* @__PURE__ */ new Date()).toISOString();
4164
4249
  await db.worker.start(worker.id, now);
@@ -4289,6 +4374,7 @@ const worker = defineService({
4289
4374
  if (!observing || stopped || event.type !== "turn/end") return;
4290
4375
  const previous = eventQueues.get(source.id) ?? Promise.resolve();
4291
4376
  const action = () => stopped ? Promise.resolve() : (async () => {
4377
+ if (event.data.reason.kind === "aborted" && event.data.reason.reason.kind === "hook" && event.data.reason.reason.reason === "supermesh_cancel") return;
4292
4378
  const identity = await session.resolve(source.id);
4293
4379
  if (!identity || identity.role !== "worker" || !identity.workerId) return;
4294
4380
  const current = await db.worker.findById(identity.workerId);
@@ -4309,39 +4395,6 @@ const worker = defineService({
4309
4395
  return current;
4310
4396
  })
4311
4397
  });
4312
- async function finish(current, reason) {
4313
- const asks = (await db.inbox.listByTicket(current.ticketId)).filter((message) => message.kind === "ask" && message.workerId === current.id);
4314
- if (!reason) {
4315
- if (asks.some((message) => message.status === "pending")) {
4316
- await deferWhileWaiting(current);
4317
- return;
4318
- }
4319
- const answered = asks.filter((message) => message.answer);
4320
- if (answered.length) {
4321
- const receipts = await session.receipts(current.id);
4322
- if (answered.some((message) => !receipts.some((receipt) => receipt.requestId === `supermesh:answer:${message.id}`))) {
4323
- await deferWhileWaiting(current);
4324
- return;
4325
- }
4326
- }
4327
- }
4328
- if (stopped) return;
4329
- const now = (/* @__PURE__ */ new Date()).toISOString();
4330
- await db.worker.setBackgroundUntil(current.id, null);
4331
- await db.worker.end(current.id, reason ?? (current.reportState === "failed" ? "failed" : "completed"), now);
4332
- const ticket = await db.ticket.findById(current.ticketId);
4333
- if (ticket && ticket.status !== "done" && ticket.status !== "cancelled") {
4334
- if (ticket.prState === "merged" || ticket.prState === "closed") await finishTicket(ticket.id, "done", now, now);
4335
- else if (!reason && current.reportState === "dropped") await finishTicket(ticket.id, "done", now, now);
4336
- else await db.ticket.update(ticket.id, {
4337
- status: !reason && current.reportState === "ready" ? "review" : "waiting",
4338
- updatedAt: now
4339
- });
4340
- }
4341
- const ended = await db.ticket.findById(current.ticketId);
4342
- if (!reason && current.reportState !== "failed" && ended && (ended.status === "done" || ended.status === "cancelled")) await archiveWorker(current.id);
4343
- if (ended && (ended.status === "done" || ended.status === "cancelled")) await releaseDependents(ended.id);
4344
- }
4345
4398
  async function blockedByDependency(ticketId) {
4346
4399
  const links = await db.ticketLink.listDependsOn(ticketId);
4347
4400
  if (!links.length) return false;
@@ -4397,14 +4450,75 @@ async function deferWhileWaiting(current) {
4397
4450
  if (!ticket || ticket.status === "done" || ticket.status === "cancelled") return;
4398
4451
  const now = (/* @__PURE__ */ new Date()).toISOString();
4399
4452
  await db.worker.end(current.id, "completed", now);
4400
- if (ticket.prState === "merged") {
4401
- await finishTicket(ticket.id, "done", now, now);
4402
- return;
4403
- }
4404
- await db.ticket.update(ticket.id, {
4453
+ if (ticket.prState === "merged") await finishTicket(ticket.id, "done", now, now);
4454
+ else await db.ticket.update(ticket.id, {
4405
4455
  status: "waiting",
4406
4456
  updatedAt: now
4407
4457
  });
4458
+ await notifyRouter(current);
4459
+ }
4460
+ function settlementSummary(name, stopReason) {
4461
+ const subject = `Worker ${name}`;
4462
+ if (stopReason === "completed") return `${subject} finished. It cannot receive follow-up messages.`;
4463
+ if (stopReason === "aborted") return `${subject} was stopped before it finished.`;
4464
+ return `${subject} failed before it finished.`;
4465
+ }
4466
+ /** 官方结算只带子级最后一条非空 assistant 消息;没有正文时用流式拼接兜底。 */
4467
+ async function closingText(id) {
4468
+ const { events } = await session.history(id);
4469
+ let message = [];
4470
+ let streamed = "";
4471
+ for (const event of events) if (event.type === "assistant/message") {
4472
+ const content = event.data.message.content;
4473
+ if (content.length > 0) message = content.flatMap((part) => part.type === "text" && part.text.length > 0 ? [part.text] : []);
4474
+ streamed += joinAssistantStreamText(event.data.stream);
4475
+ } else if (event.type === "assistant/attempt") streamed += joinAssistantStreamText(event.data.stream);
4476
+ return message.length ? message : streamed ? [streamed] : [];
4477
+ }
4478
+ /**
4479
+ * Worker 是独立根会话,不在官方 subagent 树里,拿不到官方的结算通知。
4480
+ * 这里按官方结算的形状补一条:同一条消息、同一个 source.form,编排在跑就 steer,空闲就 followup。
4481
+ * 编排不在线也投:先激活会话再送,官方是直接丢掉。
4482
+ */
4483
+ async function notifyRouter(current, reason) {
4484
+ try {
4485
+ const ticket = await db.ticket.findById(current.ticketId);
4486
+ if (!ticket) return;
4487
+ const project = await db.project.findById(ticket.projectId);
4488
+ if (!project?.enabled) return;
4489
+ const existing = project.orchestratorSessionId;
4490
+ const id = existing && await session.resolve(existing).then(Boolean, () => false) ? existing : await session.create("project", { projectId: project.id });
4491
+ const agent = await session.activate(id);
4492
+ const stopReason = reason === "failed" ? "error" : reason === "stopped" ? "aborted" : "completed";
4493
+ const summary = settlementSummary(ticket.id, stopReason);
4494
+ const closing = await closingText(current.id);
4495
+ const message = createUserMessage({
4496
+ content: [{
4497
+ type: "text",
4498
+ text: summary
4499
+ }, ...closing.length === 0 ? [{
4500
+ type: "text",
4501
+ text: "It left no closing message."
4502
+ }] : [{
4503
+ type: "text",
4504
+ text: "Its closing message:"
4505
+ }, ...closing.map((text) => ({
4506
+ type: "text",
4507
+ text
4508
+ }))]],
4509
+ source: {
4510
+ kind: "subagent-settled",
4511
+ form: "notice",
4512
+ summary: boundContextSummary(summary),
4513
+ stopReason,
4514
+ senderSessionId: current.id
4515
+ }
4516
+ });
4517
+ if (agent.status === "idle") agent.followup(message);
4518
+ else agent.steer(message);
4519
+ } catch (error) {
4520
+ getServerContext(server).logger.warn("supermesh: worker %s settlement notice failed: %s", current.id, error instanceof Error ? error.message : String(error));
4521
+ }
4408
4522
  }
4409
4523
  async function archiveWorker(id) {
4410
4524
  await archive.session(id);
@@ -4827,4 +4941,4 @@ function readMetadata(raw) {
4827
4941
  providerId: "providerId" in value && typeof value.providerId === "string" ? value.providerId : ""
4828
4942
  };
4829
4943
  }
4830
- export { project as a, shell as c, singlet as d, setting as f, db as g, channelProxyEnvironment as h, archive as i, inbox as l, DSH_PLUGIN_HOME as m, server as n, worktree as o, defineService as p, worker as r, devops as s, channel as t, session as u };
4944
+ export { addressedToBot as _, project as a, db as b, shell as c, latestTriggerStrength as d, singlet as f, channelProxyEnvironment as g, DSH_PLUGIN_HOME as h, archive as i, inbox as l, defineService as m, server as n, worktree as o, setting as p, worker as r, devops as s, channel as t, session as u, channelTriggerStrength as v, ticketAllowed as y };