Skip to content

A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.

Merge remote-tracking branch 'origin/feat/group-chat-engine' into fix/238-group-folder-scope

Fei2411a017a1b27dc8
diff --cc ds-bot/client.js
index 5504bd91,fd6c1720..4df51537
--- a/ds-bot/client.js
+++ b/ds-bot/client.js
@@@ -7285,71 -7339,8 +7341,71 @@@ var thinkingLive = (step) => step.statu
var texts = (step) => step.blocks.filter((block) => block.kind === "text" && block.text.trim() !== "");
var stepReasoning = (step) => step.blocks.filter((block) => block.kind === "reasoning").map((block) => block.text).join("\n").trim();
+// src/shared/group-replies.js
+var RELAY_LIST = /"replies"\s*:\s*\[/;
+var PRUNE_MARKER = /\[\.\.\. tool result middle pruned \.\.\.\]/;
+function parseReplies(text) {
+ try {
+ return { replies: JSON.parse(text).replies ?? [], broken: false };
+ } catch {
+ }
+ const replies = [];
+ const head = RELAY_LIST.exec(text);
+ if (head) {
+ for (const piece of text.slice(head.index + head[0].length).split(PRUNE_MARKER)) {
+ const first = piece.indexOf('{"');
+ if (first !== -1) scanReplies(piece, first, replies);
+ }
+ }
+ return { replies, broken: true };
+}
+function scanReplies(text, start, replies) {
+ let depth = 0;
+ let from = -1;
+ let inString = false;
+ let escaped = false;
+ for (let i = start; i < text.length; i += 1) {
+ const ch = text[i];
+ if (inString) {
+ if (escaped) escaped = false;
+ else if (ch === "\\") escaped = true;
+ else if (ch === '"') inString = false;
+ continue;
+ }
+ if (ch === '"') {
+ inString = true;
+ continue;
+ }
+ if (ch === "{") {
+ if (depth === 0) from = i;
+ depth += 1;
+ } else if (ch === "}") {
+ depth -= 1;
+ if (depth === 0 && from >= 0) {
+ try {
+ replies.push(JSON.parse(text.slice(from, i + 1)));
+ } catch {
+ }
+ from = -1;
+ }
+ } else if (ch === "]" && depth === 0) break;
+ }
+}
+function stackReplies(replies) {
+ const items = [];
+ replies.forEach((reply, index) => {
+ const last = items.at(-1);
+ if (reply.kind === void 0 && last?.reply.kind === void 0 && last?.reply.botId === reply.botId) {
+ last.texts.push(reply.text);
+ last.time = reply.time;
+ last.duration = reply.duration;
+ } else items.push({ reply, index, texts: reply.kind === void 0 ? [reply.text] : [], time: reply.time, duration: reply.duration });
+ });
+ return items;
+}
+
// src/client/fold.js
- var import_react14 = require("react");
+ var import_react15 = require("react");
var FOLD_AT = { chars: 1500, lines: 25 };
var FOLD_HUGE = { chars: 2e4, lines: Infinity };
var ALWAYS = { chars: -1, lines: 0 };
@@@ -8082,19 -8117,31 +8182,19 @@@ function GroupMessage({ bot, text, text
{ className: "bt-group-name", style: flat ? void 0 : { color: inkText(colorOf(bot)) } },
flat ? lead : null,
bot.name,
- room2?.admin === bot.id ? (0, import_react16.createElement)("span", { className: "bt-group-role" }, t("Admin")) : null,
- Number.isFinite(time) ? (0, import_react16.createElement)("span", { className: "bt-group-time", title: clockLabel(time) }, messageClock(time)) : null,
- took ? (0, import_react16.createElement)("span", { className: "bt-group-took", title: t("Ran for {duration}", { duration: took }) }, took) : null
+ room2?.admin === bot.id ? (0, import_react17.createElement)("span", { className: "bt-group-role" }, t("Admin")) : null,
+ Number.isFinite(time) ? (0, import_react17.createElement)("span", { className: "bt-group-time", title: clockLabel(time) }, messageClock(time)) : null,
+ took ? (0, import_react17.createElement)("span", { className: "bt-group-took", title: t("Ran for {duration}", { duration: took }) }, took) : null
),
- (0, import_react16.createElement)(Bubbles, { texts: texts2, roster, selfId: bot.id, actions, sessionId: room2?.id, msgKey, useUi, lead: flat ? null : lead, whole })
+ (0, import_react17.createElement)(Bubbles, { texts: texts2, roster, selfId: bot.id, actions, sessionId: room2?.id, msgKey, useUi, lead: flat ? null : lead, whole })
);
}
-function stackReplies(replies) {
- const items = [];
- replies.forEach((reply, index) => {
- const last = items.at(-1);
- if (reply.kind === void 0 && last?.reply.kind === void 0 && last?.reply.botId === reply.botId) {
- last.texts.push(reply.text);
- last.time = reply.time;
- last.duration = reply.duration;
- } else items.push({ reply, index, texts: reply.kind === void 0 ? [reply.text] : [], time: reply.time, duration: reply.duration });
- });
- return items;
-}
function GroupEvent({ prefix, room: room2, name, roster, actions }) {
- return (0, import_react16.createElement)(
+ return (0, import_react17.createElement)(
"div",
{ className: "bt-event" },
- (0, import_react16.createElement)("span", null, prefix),
- room2 ? (0, import_react16.createElement)("button", { type: "button", onClick: () => actions.openSession(room2.id) }, (0, import_react16.createElement)(RoomAvatar, { room: room2, roster, size: 16 }), room2.name) : name ? (0, import_react16.createElement)("span", null, name) : null
+ (0, import_react17.createElement)("span", null, prefix),
+ room2 ? (0, import_react17.createElement)("button", { type: "button", onClick: () => actions.openSession(room2.id) }, (0, import_react17.createElement)(RoomAvatar, { room: room2, roster, size: 16 }), room2.name) : name ? (0, import_react17.createElement)("span", null, name) : null
);
}
var MEMORY_SAVED = /^(Saved to|Updated in|Removed from) /;
@@@ -8273,47 -8319,26 +8374,47 @@@ function ChatRows({ items, sessionId, r
function chatRow(row, key, { sessionId, selfId, roster, actions, useUi, onBtwDelete }) {
switch (row.kind) {
case "divider":
- return (0, import_react16.createElement)(PartLine, { key, time: row.time });
+ return (0, import_react17.createElement)(PartLine, { key, time: row.time });
case "user":
- return (0, import_react16.createElement)(EarlierUser, { key, row });
+ return (0, import_react17.createElement)(EarlierUser, { key, row, actions });
case "answer":
- return (0, import_react16.createElement)(AnsweredReply, { key, node: { data: row } });
+ return (0, import_react17.createElement)(AnsweredReply, { key, node: { data: row } });
// A display-only view replays from the blueprint the host kept on the call.
case "view":
- return (0, import_react16.createElement)(WidgetCell, { key, sessionId, callId: row.callId, args: { text: (name) => name === "title" ? row.title : void 0, value: (name) => name === "view" ? row.view : void 0 }, done: true, isError: false, roster, actions });
+ return (0, import_react17.createElement)(WidgetCell, { key, sessionId, callId: row.callId, args: { text: (name) => name === "title" ? row.title : void 0, value: (name) => name === "view" ? row.view : void 0 }, done: true, isError: false, roster, actions });
case "bot": {
- const bubbles = (0, import_react16.createElement)(Bubbles, { key, texts: row.texts, roster, selfId, actions, sessionId: useUi ? sessionId : void 0, msgKey: useUi ? `${sessionId}:${row.time}` : void 0, useUi, fold: FOLD_HUGE });
+ const bubbles = (0, import_react17.createElement)(Bubbles, { key, texts: row.texts, roster, selfId, actions, sessionId: useUi ? sessionId : void 0, msgKey: useUi ? `${sessionId}:${row.time}` : void 0, useUi, fold: FOLD_HUGE });
const speaker = layoutOf(roster.prefs) === "flat" ? roster.byId[selfId] : void 0;
- return speaker ? (0, import_react16.createElement)(import_react16.Fragment, { key }, (0, import_react16.createElement)(SpeakerHead, { bot: speaker, time: row.time }), bubbles) : bubbles;
+ return speaker ? (0, import_react17.createElement)(import_react17.Fragment, { key }, (0, import_react17.createElement)(SpeakerHead, { bot: speaker, time: row.time }), bubbles) : bubbles;
}
case "btw":
- return (0, import_react16.createElement)(BtwCardView, { key, card: row.card, sessionId, actions, onDeleted: onBtwDelete });
+ return (0, import_react17.createElement)(BtwCardView, { key, card: row.card, sessionId, actions, onDeleted: onBtwDelete });
+ case "post": {
+ const poster = roster.byId[row.botId] ?? { id: row.botId, name: row.name ?? t("a Bot"), color: "gray" };
- return (0, import_react16.createElement)(GroupMessage, {
++ return (0, import_react17.createElement)(GroupMessage, {
+ key,
+ bot: poster,
+ text: row.file ? stripLongNote(row.text) : row.text,
+ texts: row.texts,
+ room: roster.roomsById[sessionId],
+ roster,
+ actions,
+ msgKey: `${sessionId}:post:${row.seq ?? row.time}`,
+ time: row.time,
+ duration: row.duration,
+ whole: row.file ? { length: row.length, load: () => actions.fileText(row.file) } : void 0
+ });
+ }
+ case "relay": {
+ const reply = row.reply;
+ const speaker = roster.byId[reply.botId] ?? { id: reply.botId, name: reply.name ?? t("a Bot"), color: reply.color ?? "gray" };
- return (0, import_react16.createElement)(RelayEvent, { key, reply, bot: speaker, sessionId, actions });
++ return (0, import_react17.createElement)(RelayEvent, { key, reply, bot: speaker, sessionId, actions });
+ }
case "event": {
- if (row.role === "report") return (0, import_react16.createElement)(GroupEvent, { key, prefix: t("Replies from"), room: roster.roomsById[row.roomId], name: t("a group chat"), roster, actions });
+ if (row.role === "report") return (0, import_react17.createElement)(GroupEvent, { key, prefix: t("Replies from"), room: roster.roomsById[row.roomId], name: t("a group chat"), roster, actions });
const other = roster.byId[row.botId] ?? { id: row.botId, name: row.name ?? t("a Bot"), color: "gray" };
const prefix = { stopped: t("Stopped by"), reply: t("Reply from") }[row.role] ?? t("Message from");
- return (0, import_react16.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => {
+ return (0, import_react17.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => {
if (selfId && other.id) actions.openExchange(selfId, other.id);
}, whole: true });
}
@@@ -8348,13 -8373,13 +8449,13 @@@ function TriggerCell({ node, sessionId
return first?.turn === turn && unseenSince(visit, first.start) ? clockLabel(first.start) : "";
});
const body = triggerBody();
- return unreadOpening ? (0, import_react16.createElement)(import_react16.Fragment, null, (0, import_react16.createElement)("div", { className: "bt-open-new" }, (0, import_react16.createElement)(NewDivider), (0, import_react16.createElement)("div", { className: "bt-time-sep", role: "separator" }, unreadOpening)), body) : body;
+ return unreadOpening ? (0, import_react17.createElement)(import_react17.Fragment, null, (0, import_react17.createElement)("div", { className: "bt-open-new" }, (0, import_react17.createElement)(NewDivider), (0, import_react17.createElement)("div", { className: "bt-time-sep", role: "separator" }, unreadOpening)), body) : body ?? (0, import_react17.createElement)(CellEmpty);
function triggerBody() {
if (source.kind === "bot") {
- if (source.handoff === true) return (0, import_react16.createElement)(EarlierParts, { sessionId, roster, actions });
- if (source.handoff === true) return roster.roomsById[sessionId] ? null : (0, import_react17.createElement)(EarlierParts, { sessionId, roster, actions });
++ if (source.handoff === true) return (0, import_react17.createElement)(EarlierParts, { sessionId, roster, actions });
if (source.role === "kickoff" || source.role === "room") return null;
if (source.role === "secret" || deferred) return null;
- if (source.role === "update") return (0, import_react16.createElement)("div", { className: "bt-event" }, t("Profile updated"));
+ if (source.role === "update") return (0, import_react17.createElement)("div", { className: "bt-event" }, t("Profile updated"));
if (source.role === "post") {
if (source.logged !== void 0) return null;
if (source.failed !== void 0 || source.resumed === true || source.stopped === true || source.done === true) return null;
@@@ -8566,67 -8591,58 +8667,67 @@@ function useLiveNote(actions, sessionId
return () => actions.noteLive(sessionId, id, null);
}, [sessionId, id, key]);
}
-var RELAY_LIST = /"replies"\s*:\s*\[/;
-var PRUNE_MARKER = /\[\.\.\. tool result middle pruned \.\.\.\]/;
-function parseReplies(text) {
- try {
- return { replies: JSON.parse(text).replies ?? [], broken: false };
- } catch {
+function RelayEvent({ reply, bot, sessionId, actions }) {
+ if (reply.kind === "failed") {
- return (0, import_react16.createElement)(
++ return (0, import_react17.createElement)(
+ "div",
+ { className: "bt-event bt-event-error", role: "status", title: [reply.code, reply.status, reply.text].filter(Boolean).join(" · ") },
+ t("{name} could not answer: {reason}", { name: bot.name, reason: failureLabel(reply.code, reply.text) })
+ );
}
- const replies = [];
- const head = RELAY_LIST.exec(text);
- if (head) {
- for (const piece of text.slice(head.index + head[0].length).split(PRUNE_MARKER)) {
- const first = piece.indexOf('{"');
- if (first !== -1) scanReplies(piece, first, replies);
- }
+ if (reply.kind === "lookup") {
- return (0, import_react16.createElement)(
++ return (0, import_react17.createElement)(
+ "div",
+ { className: "bt-event" },
+ reply.text ? t("{name} looked up its own chat for “{text}”", { name: bot.name, text: reply.text }) : t("{name} looked up its own chat", { name: bot.name })
+ );
}
- return { replies, broken: true };
-}
-function scanReplies(text, start, replies) {
- let depth = 0;
- let from = -1;
- let inString = false;
- let escaped = false;
- for (let i = start; i < text.length; i += 1) {
- const ch = text[i];
- if (inString) {
- if (escaped) escaped = false;
- else if (ch === "\\") escaped = true;
- else if (ch === '"') inString = false;
- continue;
- }
- if (ch === '"') {
- inString = true;
- continue;
- }
- if (ch === "{") {
- if (depth === 0) from = i;
- depth += 1;
- } else if (ch === "}") {
- depth -= 1;
- if (depth === 0 && from >= 0) {
- try {
- replies.push(JSON.parse(text.slice(from, i + 1)));
- } catch {
- }
- from = -1;
- }
- } else if (ch === "]" && depth === 0) break;
+ if (reply.kind === "missed") {
- return (0, import_react16.createElement)("div", { className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name }));
++ return (0, import_react17.createElement)("div", { className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name }));
+ }
+ if (reply.kind === "admin-passed") {
- return (0, import_react16.createElement)(
++ return (0, import_react17.createElement)(
+ "div",
+ { className: "bt-event" },
+ t("{name} did not answer or call anyone; call a member with @Name", { name: bot.name })
+ );
+ }
+ if (reply.kind === "paused") {
- return (0, import_react16.createElement)(
++ return (0, import_react17.createElement)(
+ "div",
+ { className: "bt-event" },
+ t("Paused after {count} Bot relays. Waiting: {names}", { count: reply.count, names: (reply.names ?? []).join(t(" and ")) })
+ );
+ }
+ if (reply.kind === "resumed") {
- return (0, import_react16.createElement)("div", { className: "bt-event" }, t("{name} was cut off by a restart and picked its work back up", { name: bot.name }));
++ return (0, import_react17.createElement)("div", { className: "bt-event" }, t("{name} was cut off by a restart and picked its work back up", { name: bot.name }));
}
+ if (reply.kind === "cut") {
- return (0, import_react16.createElement)("div", { className: "bt-event" }, t("{name} was cut off by a restart again and stopped", { name: bot.name }));
++ return (0, import_react17.createElement)("div", { className: "bt-event" }, t("{name} was cut off by a restart again and stopped", { name: bot.name }));
+ }
+ if (reply.kind === "approval" || reply.kind === "working") {
- return (0, import_react16.createElement)(
++ return (0, import_react17.createElement)(
+ "div",
+ { className: "bt-event" },
- (0, import_react16.createElement)(
++ (0, import_react17.createElement)(
+ "button",
+ { type: "button", className: "bt-event-whole", onClick: () => actions.showDetails(sessionId) },
- (0, import_react16.createElement)(BotMark, { bot, size: 16 }),
- (0, import_react16.createElement)("span", { className: "bt-event-name" }, t(reply.kind === "working" ? "{name} started on it" : "{name} paused for your approval", { name: bot.name }))
++ (0, import_react17.createElement)(BotMark, { bot, size: 16 }),
++ (0, import_react17.createElement)("span", { className: "bt-event-name" }, t(reply.kind === "working" ? "{name} started on it" : "{name} paused for your approval", { name: bot.name }))
+ )
+ );
+ }
+ if (reply.kind === "stopped") {
- return (0, import_react16.createElement)("div", { className: "bt-event" }, t("You stopped {name}'s work", { name: bot.name }));
++ return (0, import_react17.createElement)("div", { className: "bt-event" }, t("You stopped {name}'s work", { name: bot.name }));
+ }
+ if (reply.kind === "done") {
- return (0, import_react16.createElement)("div", { className: "bt-event" }, t("{name} finished its work", { name: bot.name }));
++ return (0, import_react17.createElement)("div", { className: "bt-event" }, t("{name} finished its work", { name: bot.name }));
+ }
+ return null;
}
function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi, useWork }) {
- const [live, setLive] = (0, import_react16.useState)({ replies: [], speaking: [] });
- (0, import_react16.useEffect)(() => {
+ const [live, setLive] = (0, import_react17.useState)({ replies: [], speaking: [] });
+ (0, import_react17.useEffect)(() => {
if (done) return void 0;
let stop = false;
let timer;
@@@ -8670,17 -8686,69 +8771,17 @@@
stackReplies(replies).map(({ reply, index, texts: texts2, time, duration }) => {
const bot = roster.byId[reply.botId] ?? { id: reply.botId, name: reply.name, color: reply.color ?? "gray" };
if (reply.kind === "user") {
- return (0, import_react16.createElement)("div", { key: `user-${index}`, className: "bt-urow" }, (0, import_react16.createElement)(
+ return (0, import_react17.createElement)("div", { key: `user-${index}`, className: "bt-urow" }, (0, import_react17.createElement)(
"div",
{ className: "bt-ububble" },
- (0, import_react16.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: reply.text, labels: mdLabels3(), variant: "compact" }),
- Number.isFinite(time) ? (0, import_react16.createElement)("div", { className: "bt-utime", title: clockLabel(time) }, messageClock(time)) : null
+ (0, import_react17.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: reply.text, labels: mdLabels3(), variant: "compact" }),
+ Number.isFinite(time) ? (0, import_react17.createElement)("div", { className: "bt-utime", title: clockLabel(time) }, messageClock(time)) : null
));
}
- if (reply.kind === "failed") {
- return (0, import_react17.createElement)(
- "div",
- { key: `${reply.botId}-${index}`, className: "bt-event bt-event-error", role: "status", title: [reply.code, reply.status, reply.text].filter(Boolean).join(" · ") },
- t("{name} could not answer: {reason}", { name: bot.name, reason: failureLabel(reply.code, reply.text) })
- );
- }
- if (reply.kind === "lookup") {
- return (0, import_react17.createElement)(
- "div",
- { key: `${reply.botId}-${index}`, className: "bt-event" },
- reply.text ? t("{name} looked up its own chat for “{text}”", { name: bot.name, text: reply.text }) : t("{name} looked up its own chat", { name: bot.name })
- );
- }
- if (reply.kind === "missed") {
- return (0, import_react17.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name }));
- }
- if (reply.kind === "admin-passed") {
- return (0, import_react17.createElement)(
- "div",
- { key: `${reply.botId}-${index}`, className: "bt-event" },
- t("{name} did not answer or call anyone; call a member with @Name", { name: bot.name })
- );
- }
- if (reply.kind === "paused") {
- return (0, import_react17.createElement)(
- "div",
- { key: `paused-${index}`, className: "bt-event" },
- t("Paused after {count} Bot relays. Waiting: {names}", { count: reply.count, names: (reply.names ?? []).join(t(" and ")) })
- );
- }
- if (reply.kind === "resumed") {
- return (0, import_react17.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart and picked its work back up", { name: bot.name }));
- }
- if (reply.kind === "cut") {
- return (0, import_react17.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart again and stopped", { name: bot.name }));
- }
- if (reply.kind === "approval" || reply.kind === "working") {
- return (0, import_react17.createElement)(
- "div",
- { key: `${reply.botId}-${index}`, className: "bt-event" },
- (0, import_react17.createElement)(
- "button",
- { type: "button", className: "bt-event-whole", onClick: () => actions.showDetails(sessionId) },
- (0, import_react17.createElement)(BotMark, { bot, size: 16 }),
- (0, import_react17.createElement)("span", { className: "bt-event-name" }, t(reply.kind === "working" ? "{name} started on it" : "{name} paused for your approval", { name: bot.name }))
- )
- );
- }
- if (reply.kind === "stopped") {
- return (0, import_react17.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("You stopped {name}'s work", { name: bot.name }));
- }
- if (reply.kind === "done") {
- return (0, import_react17.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} finished its work", { name: bot.name }));
+ if (reply.kind !== void 0) {
- return (0, import_react16.createElement)(RelayEvent, { key: `${reply.botId ?? reply.kind}-${index}`, reply, bot, sessionId, actions });
++ return (0, import_react17.createElement)(RelayEvent, { key: `${reply.botId ?? reply.kind}-${index}`, reply, bot, sessionId, actions });
}
- return (0, import_react16.createElement)(GroupMessage, { key: `${reply.botId}-${index}`, bot, texts: texts2, room: room2, roster, actions, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi, time, duration });
+ return (0, import_react17.createElement)(GroupMessage, { key: `${reply.botId}-${index}`, bot, texts: texts2, room: room2, roster, actions, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi, time, duration });
}),
pending.map((id, at) => {
const bot = roster.byId[id];
@@@ -8926,10 -8994,10 +9027,10 @@@ function ActivityIndicator({ sessionId
const bot = roster.byId[sessionId];
const room2 = roster.roomsById[sessionId];
const moveAt = useWork?.((work) => {
- const entry = bot === void 0 ? void 0 : work.bots?.[bot.id];
+ const entry = bot !== void 0 ? work.bots?.[bot.id] : room2 !== void 0 ? work.rooms?.[room2.id]?.find((item) => item.self === true) : void 0;
return entry?.switching === true && entry.folder === true && entry.roomId === void 0 ? entry.since : 0;
}) ?? 0;
- const entries2 = (0, import_react17.useMemo)(() => Object.values(JSON.parse(liveKey)), [liveKey]);
+ const entries2 = (0, import_react18.useMemo)(() => Object.values(JSON.parse(liveKey)), [liveKey]);
const streaming = entries2.some((entry) => entry.text);
const tools = entries2.filter((entry) => !entry.text).sort((a, b) => a.at - b.at);
const relaying = tools.some((entry) => entry.relay);
diff --cc ds-bot/src/host/parts.js
index 293cb84c,ed56e687..aba0c7b6
--- a/ds-bot/src/host/parts.js
+++ b/ds-bot/src/host/parts.js
@@@ -1074,10 -1057,9 +1082,10 @@@ export function install(rt)
const past = rt.pastOwners.get(agent.id)
if (past !== undefined && !rt.isBotSession(agent.id)) {
await forward(past, payload.messages).catch(error => rt.warn('ds-bot: input for %s was not handed on: %s', agent.id, error))
- return { kind: 'reject' }
+ return takeOverStep(agent, payload)
}
- if (!rt.isBotSession(agent.id)) return next()
+ const place = placeOf(agent.id)
+ if (place === undefined) return next()
adoptCompaction(agent)
const job = switches.get(agent.id)
if (job !== undefined) {
diff --cc ds-bot/src/host/turns.js
index 2ef99290,b3b57be4..1f6ec5c3
--- a/ds-bot/src/host/turns.js
+++ b/ds-bot/src/host/turns.js
@@@ -693,9 -701,29 +705,29 @@@ export function install(rt)
// claims the running turn nor queues as the next one's trigger.
} else if (source?.kind === 'schedule' && rt.roomOf(id)) {
// A group's scheduled task reaches the group as the user's message.
- queueRoomMessage(id, { text: reminderText(textOf(event.data.content)) })
+ queueRoomMessage(rt.roomOf(id).id, { text: reminderText(textOf(event.data.content)) })
} else if (source?.kind === REFERENCE_KIND && rt.roomOf(id)) {
- attachReference(roomInbox.get(id), source, textOf(event.data.content))
+ attachReference(roomInbox.get(rt.roomOf(id).id), source, textOf(event.data.content))
+ } else if (source?.kind === 'subagent-settled') {
+ // A settled sub-run's notice: the work it hung under goes on once a turn
+ // reads it, like a reply that came back. The notice names only the child;
+ // its run is the earliest of the child's not read yet. One read while a
+ // turn does other work comes back in a turn of its own, like any
+ // handed-back result.
+ const run = rt.subWorkRun?.(source.senderSessionId)
+ if (run !== undefined) {
+ rt.takenWork?.(run.parent, run.id)
+ const info = { kind: SOURCE_KIND, role: 'reply', work: run.parent, replyTo: run.id, exchangeId: run.id, senderSessionId: source.senderSessionId }
+ if (entry.turn === undefined) entry.pending = info
+ else if (entry.info === undefined && !opened) {
+ // DSH opens the turn before it records the message that filled its
+ // inbox: a notice that opened the turn claims it, like the first
+ // relay of a turn.
+ entry.opened = true
+ entry.answers = true
+ claimTrigger(id, entry, info)
+ } else if (rt.workOf?.(entry.info) !== run.parent) entry.later = [...(entry.later ?? []), { info, text: textOf(event.data.content) }]
+ }
} else if (source?.kind === 'user' || source?.kind === REPLY_KIND) {
if (rt.roomOf(id) && source.kind === 'user') {
const content = Array.isArray(event.data.content) ? event.data.content : []
diff --cc ds-bot/test/tool-cells.test.js
index d1d445d9,0bbfdc7c..95790f56
--- a/ds-bot/test/tool-cells.test.js
+++ b/ds-bot/test/tool-cells.test.js
@@@ -9,8 -9,7 +9,8 @@@ import { build } from 'esbuild
const { outputFiles } = await build({
stdin: {
contents: [
- "export { ToolCell, TriggerCell, callTree } from './src/client/cells.js'",
- "export { ToolCell, TriggerCell, callTree, stackReplies, CellEmpty, Bubbles } from './src/client/cells.js'",
++ "export { ToolCell, TriggerCell, callTree, CellEmpty, Bubbles } from './src/client/cells.js'",
+ "export { stackReplies } from './src/shared/group-replies.js'",
"export { QuestionDock } from './src/client/questions.js'",
"export { SecretDock } from './src/client/secret-card.js'",
"export { countCards } from './src/client/sources.js'",
diff --cc ds-bot/test/work-dir.test.js
index d9f83dc3,154e8fc7..b965d02e
--- a/ds-bot/test/work-dir.test.js
+++ b/ds-bot/test/work-dir.test.js
@@@ -3,10 -3,7 +3,10 @@@ import { existsSync, mkdirSync, mkdtemp
import { homedir, hostname, tmpdir } from 'node:os'
import { join, resolve } from 'node:path'
import { test } from 'node:test'
+import { createToolResultMessage, createUserMessage } from '@deepseek-ai/dsh-llm'
+import { Session } from '@deepseek-ai/dsh-session'
- import { apply } from '../index.js'
+ import { createRuntime } from '../index.js'
+import { SOURCE_KIND } from '../src/host/constants.js'
import { dshHomeOf } from '../src/host/folders.js'
import { escapeRegExp } from '../src/host/text.js'
import { fakeApproval, fakeContext } from './fake-ctx.js'
@@@ -292,15 -290,14 +294,15 @@@ test('a group\'s folder holds for ever
assert.equal(requests.length, 0)
assert.match(await tool('list_bots', {}, 'a'), new RegExp(`"Ops" — .*; members work in ${escapeRegExp(project)} here`))
- // The member's group Session moves at its next turn there, not within a reply; its
- // own chat stays.
+ // The group's own Session moves at once; the member's group Session moves at its
+ // next turn there, not within a reply; its own chat stays.
+ await until(() => state().rooms.r1.sessionId === 's1')
assert.equal(await preStep('b'), 'next')
assert.equal(await preStep('gb', [], 2), 'next')
- assert.deepEqual(created, [])
- assert.deepEqual(await preStep('gb'), { kind: 'enter', messages: [] })
- await until(() => state().rooms.r1.sessions.b === 's1')
assert.deepEqual(created, [{ cwd: project }])
- assert.deepEqual(await preStep('gb'), { kind: 'reject' })
++ assert.deepEqual(await preStep('gb'), { kind: 'enter', messages: [] })
+ await until(() => state().rooms.r1.sessions.b === 's2')
+ assert.deepEqual(created, [{ cwd: project }, { cwd: project }])
assert.equal(state().bots.b.sessionId, 'b')
// A Main Bot clears it without asking; setting it asks the user once for every member.
@@@ -345,16 -342,14 +347,16 @@@ test('a group\'s permissions hold for e
assert.equal((await call('update-bot', { id: 'b', permission: 'danger-full-access' })).ok, true)
assert.deepEqual([presetOf.get('b'), presetOf.get('gb')], ['danger-full-access', 'read-only'])
- // A fresh part of the group conversation starts on the group's preset.
+ // A fresh part of the group conversation starts on the group's preset; the group's
+ // own Session moved for the folder first.
await call('update-room', { id: 'r1', workDir: project })
+ await until(() => state().rooms.r1.sessionId === 's1')
- assert.deepEqual(await preStep('gb'), { kind: 'reject' })
+ assert.deepEqual(await preStep('gb'), { kind: 'enter', messages: [] })
- await until(() => state().rooms.r1.sessions.b === 's1')
- assert.equal(presetOf.get('s1'), 'read-only')
+ await until(() => state().rooms.r1.sessions.b === 's2')
+ assert.equal(presetOf.get('s2'), 'read-only')
await call('update-room', { id: 'r1', permission: null })
- assert.equal(presetOf.get('s1'), 'danger-full-access')
+ assert.equal(presetOf.get('s2'), 'danger-full-access')
})
test('the approval counts every Session that would work in the folder', async (t) => {