dsh-agent-toolkit 0.2.9 → 0.3.0

package/lib/index.js

@@ -71,7 +71,10 @@ function isTeamVisible(role) {
 const BASIC_TOOLS = [
 	{
 		id: "@deepseek-ai/dsh-persona",
-		config: { text: "You are a coding agent powered by the {{model}} model. Your working directory is {{cwd}}. If you need information or a decision from the user, ask directly in your reply and wait for their next message." }
+		config: {
+			prefix: "You are a coding agent powered by the {{model}} model. If you need information or a decision from the user, ask directly in your reply and wait for their next message.",
+			suffix: "Your working directory is {{cwd}}."
+		}
 	},
 	{
 		id: "@deepseek-ai/dsh-agent-instructions",
@@ -1469,8 +1472,6 @@ function createDelegateTool(toolName, deps) {
 }
 //#endregion
 //#region src/delegate/index.ts
-/** 团队名册段在 prompt 中的位置：紧随内置 subagent 段（116.5）之后。 */
-const TEAM_SECTION_ORDER = 116.6;
 /**
 * 团队名册段文本：仅当该 agent scope 的可见工具里确有委派工具时渲染，否则空
 * （空段渲染时被丢弃）。工具白名单 restrict 只作用于 tools 视图，名册段必须
@@ -1530,7 +1531,7 @@ function setupDelegate(ctx, config, registry, channels) {
 	else ctx.logger.info(`dsh-agent-toolkit: subagent provider "${provider}" 尚未注册；team_delegate 将等它出现时挂载`);
 	ctx.systemPrompt.section({
 		name: "plugin:dsh-agent-toolkit:team",
-		order: TEAM_SECTION_ORDER,
+		order: ctx.systemPrompt.getSectionOrder("TOOL_SUBAGENT") + .1,
 		text: (context) => teamSectionText(config.toolName, registry.list(), ctx.tools.get(config.toolName, context.scope) !== void 0)
 	});
 }
@@ -2931,6 +2932,13 @@ const projectBotDomain = defineDomain({
 function bindingKey(botId, chatId) {
 	return `${botId}:${chatId}`;
 }
+//#endregion
+//#region src/channels/outbound.ts
+/** 从 assistant 消息内容块取最后一个 text 块的纯文本；无 text 块返回 ''（非 undefined）。 */
+function lastTextOf(content) {
+	const texts = content.filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text);
+	return texts.length === 0 ? "" : texts[texts.length - 1];
+}
 /** 向段序列追加内容：与尾段同类则合并，异类开新段。 */
 function appendToSegments(segments, kind, text) {
 	const tail = segments[segments.length - 1];
@@ -2940,6 +2948,30 @@ function appendToSegments(segments, kind, text) {
 		content: text
 	});
 }
+/** 向段序列应用一个流式 chunk：text-delta → text、reasoning-delta → process、reasoning block-end → 过程段段落分隔；其余类型不消费返回 false。 */
+function applyStreamChunk(segments, chunk) {
+	if (chunk.type === "text-delta") appendToSegments(segments, "text", chunk.text);
+	else if (chunk.type === "reasoning-delta") appendToSegments(segments, "process", chunk.text);
+	else if (chunk.type === "block-end" && chunk.block?.type === "reasoning" && segments[segments.length - 1]?.kind === "process") appendToSegments(segments, "process", "\n\n");
+	else return false;
+	return true;
+}
+/**
+* 对账尾 text 段：把最后一个 text 段的内容替换为权威全文（丢帧补齐）。
+* 前置条件：调用方已保证尾 text 段归属本结算 step（lastTextStep 命中结算 step）。
+* 返回是否发生替换；authoritative 为空、无 text 段或内容已相等时返回 false。
+*/
+function reconcileTrailingText(segments, authoritative) {
+	if (authoritative === "") return false;
+	let tail;
+	for (let i = segments.length - 1; i >= 0; i--) if (segments[i].kind === "text") {
+		tail = segments[i];
+		break;
+	}
+	if (tail === void 0 || tail.content === authoritative) return false;
+	tail.content = authoritative;
+	return true;
+}
 function mapTurnEnd(reason) {
 	if (reason.kind === "completed") return "done";
 	if (reason.kind === "aborted" || reason.kind === "interrupted") return "cancelled";
@@ -2975,14 +3007,12 @@ var Outbound = class {
 			};
 			return;
 		}
-		if (event.type === "assistant/chunk") {
+		if (event.type === "assistant/message") {
 			const turn = rt.turn;
 			if (turn === void 0 || turn.n !== event.data.turn) return;
-			const chunk = event.data.chunk;
-			if (chunk.type === "text-delta" && typeof chunk.text === "string") appendToSegments(turn.segments, "text", chunk.text);
-			else if (chunk.type === "reasoning-delta" && typeof chunk.text === "string") appendToSegments(turn.segments, "process", chunk.text);
-			else if (chunk.type === "block-end" && chunk.block?.type === "reasoning" && turn.segments[turn.segments.length - 1]?.kind === "process") appendToSegments(turn.segments, "process", "\n\n");
-			else return;
+			if (turn.lastTextStep !== event.data.step) return;
+			const authoritative = lastTextOf(event.data.message.content ?? []);
+			if (!reconcileTrailingText(turn.segments, authoritative)) return;
 			const snapshot = turn.segments.map((s) => ({ ...s }));
 			this.enqueue(rt, async () => {
 				if (rt.reply === void 0) return;
@@ -3027,6 +3057,36 @@ var Outbound = class {
 		}
 	}
 	/**
+	* 出站：瞬态流式帧 → 段构建 + 打字机。chunk 帧不携带 turn/step，由 start 帧建 attempt 基线
+	* （turn/step，宿主 accumulator 同款取数）；end 帧不消费；生命周期仍由 turn/start、turn/end 驱动。
+	* 帧为 fire-and-forget，丢帧后无重传，正文由 assistant/message 结算对账有界恢复。
+	*/
+	handleAssistantFrame(sessionId, frame) {
+		const rt = this.sessions.get(sessionId);
+		if (rt === void 0) return;
+		const turn = rt.turn;
+		if (turn === void 0) return;
+		if (frame.type === "start") {
+			if (turn.n !== frame.turn) return;
+			turn.attemptStep = frame.step;
+			return;
+		}
+		if (frame.type !== "chunk") return;
+		const step = turn.attemptStep;
+		if (step === void 0) return;
+		if (!applyStreamChunk(turn.segments, frame.chunk)) return;
+		if (frame.chunk.type === "text-delta") turn.lastTextStep = step;
+		const snapshot = turn.segments.map((s) => ({ ...s }));
+		this.enqueue(rt, async () => {
+			if (rt.reply === void 0) return;
+			if (!turn.began) {
+				await rt.reply.beginTurn();
+				turn.began = true;
+			}
+			await rt.reply.update(snapshot);
+		});
+	}
+	/**
 	* turn 外错误（agent/error：resume/驱动边界失败等没有 turn/end 的场景）：
 	* notice 错误摘要并释放 inflight 槽 + 删除表情；turn 进行中的错误由 turn/end 报告，跳过防双发。
 	*/
@@ -3291,7 +3351,7 @@ var Router = class {
 //#endregion
 //#region src/channels/approval/center.ts
 /** 审批中心（渠道无关）：自有 bot 会话的 approval ask → 渠道审批卡片挂起 → 卡片回调 resolve。
-*  spec: docs/superpowers/specs/2026-09-08-feishu-approval-card-design.md（飞书独占 / 仅发起人 / 不超时）。 */
+*  spec: docs/superpowers/specs/archive/2026-09-08-feishu-approval-card-design.md（飞书独占 / 仅发起人 / 不超时）。 */
 var ApprovalCenter = class {
 	sessions;
 	channelFor;
@@ -3927,7 +3987,7 @@ function setupBots(ctx, config, deps) {
 		return ref;
 	};
 	/** 创作期注入已迁至 agent-setup.ts + tool-scope.ts（基础工具行 standing scope 挂载 + persona/tools）。
-	*  preset 优先 joiner（agent-bot 组合）：mount 成功后委派子会话 composeFrom 认父（spec: docs/superpowers/specs/2026-09-07-bot-delegation-preset-mount-design.md）。 */
+	*  preset 优先 joiner（agent-bot 组合）：mount 成功后委派子会话 composeFrom 认父（spec: docs/superpowers/specs/archive/2026-09-07-bot-delegation-preset-mount-design.md）。 */
 	const toolsScope = createToolsScope(ctx);
 	const agentsPort = createAgentsPort(ctx, deps.botPresetId !== void 0 ? createScopeJoiner(ctx, deps.botPresetId, toolsScope, log.warn) : toolsScope, deps.ownedSessions);
 	const workspaceRegistry = ctx.get("workspaceRegistry", false);
@@ -3995,6 +4055,9 @@ function setupBots(ctx, config, deps) {
 	ctx.on("session/event", (session, event) => {
 		runtime?.outbound.handleSessionEvent(String(session.header.id), event);
 	});
+	ctx.on("agent/assistant-stream", ({ agent, frame }) => {
+		runtime?.outbound.handleAssistantFrame(String(agent.session.id), frame);
+	});
 	if (config.approval) ctx.on("approval/request", createApprovalAnswerer(() => runtime?.approval), { prepend: true });
 	ctx.on("agent/error", ({ agent, error }) => {
 		const text = error instanceof Error ? error.message : String(error?.message ?? error);
@@ -4046,7 +4109,7 @@ function setupBots(ctx, config, deps) {
 //#endregion
 //#region src/agents/bot-preset.ts
 /** agent-bot preset 组合序列化：BASIC_TOOLS → preset 行（bot 会话挂载的最小组合，
-*  委派子会话 composeFrom 认父的前提；spec: docs/superpowers/specs/2026-09-07-bot-delegation-preset-mount-design.md）。 */
+*  委派子会话 composeFrom 认父的前提；spec: docs/superpowers/specs/archive/2026-09-07-bot-delegation-preset-mount-design.md）。 */
 /** BASIC_TOOLS 插件包名 → preset 行 id（与 standard/agent-team 的行 id 对齐）。新增 BASIC_TOOLS 行必须在此登记。 */
 const ROW_IDS = {
 	"@deepseek-ai/dsh-persona": "persona",
@@ -4079,7 +4142,7 @@ function botPresetComposition() {
 /**
 * Agent 团队 preset 自动生成：派生宿主当前 shipped standard composition，
 * 文本级禁用 subagent 工具族 4 个行，写入首个 trust=user 的 preset root。
-* 设计：docs/superpowers/specs/2026-09-02-agent-team-preset-design.md
+* 设计：docs/superpowers/specs/archive/2026-09-02-agent-team-preset-design.md
 */
 /** 禁用目标行：覆盖与 team_delegate 竞争/配套的 5 个模型可见工具所属的 4 个行。 */
 const TEAM_PRESET_DISABLED_ROWS = [