@rivus/agent 0.6.1 → 0.6.2

package/dist/index.d.ts

@@ -222,6 +222,7 @@ type FeishuStreamAction = {
 } | {
   readonly type: "handoff";
   readonly runId: AgentRunId;
+  readonly text?: string;
 } | {
   readonly type: "finish";
   readonly runId: AgentRunId;
@@ -234,6 +235,7 @@ type FeishuStreamAction = {
   readonly type: "cancel";
   readonly runId: AgentRunId;
   readonly reason?: string;
+  readonly text?: string;
 };
 interface FeishuStreamProjector {
   apply(event: AgentDomainEvent): ReadonlyArray<FeishuStreamAction>;
@@ -1355,6 +1357,7 @@ interface FeishuCardRolloverSuccessorRequest {
   readonly generation: number;
   readonly presentationId: string;
   readonly run: FeishuAgentRunPreparation;
+  readonly text?: string;
 }
 interface FeishuCardRolloverStreamPublisher {
   flush(runId?: string): Effect.Effect<void, unknown>;
@@ -2080,10 +2083,12 @@ interface FeishuCardKitCancel {
   readonly cardId: string;
   readonly reason?: string;
   readonly sequence: number;
+  readonly text?: string;
 }
 interface FeishuCardKitHandoff {
   readonly cardId: string;
   readonly sequence: number;
+  readonly text?: string;
 }
 interface FeishuCardKitClient {
   cancel(request: FeishuCardKitCancel): Effect.Effect<void, unknown>;
@@ -2494,6 +2499,7 @@ declare function createFeishuCotPublisher(options: FeishuCotPublisherOptions): F
 //#region src/infrastructure/feishu/feishu-cardkit-target-preparation.d.ts
 interface FeishuCardTargetCreateOptions {
   readonly generation?: number;
+  readonly initialContent?: string;
 }
 interface FeishuCardTargetCreator {
   createTarget(run: FeishuAgentRunPreparation, options?: FeishuCardTargetCreateOptions): Effect.Effect<FeishuCardTarget, unknown>;
@@ -3110,7 +3116,16 @@ type FeishuAgentRunCardInput = {
   readonly text: string;
 } | {
   readonly agentName: string;
-  readonly status: "cancelled" | "failed" | "handoff";
+  readonly reason?: string;
+  readonly status: "cancelled";
+  readonly text?: string;
+} | {
+  readonly agentName: string;
+  readonly status: "failed";
+} | {
+  readonly agentName: string;
+  readonly status: "handoff";
+  readonly text?: string;
 };
 declare function createFeishuAgentRunCard(input: FeishuAgentRunCardInput): FeishuRawCardJson;
 //#endregion

package/dist/index.js

@@ -2866,8 +2866,8 @@ function resolveRunPresentation(input) {
 			title: input.generation ? "正在处理（续）" : "正在处理"
 		};
 		case "handoff": return {
-			content: "任务仍在后台处理，进度将继续显示在下一条消息。",
-			note: "本卡片的流式窗口已交接",
+			content: input.text || "任务仍在后台处理，进度将继续显示在下一条消息。",
+			note: "本卡片已停止更新；后续进度见下一条消息",
 			template: "blue",
 			title: "已转到新消息"
 		};
@@ -2883,14 +2883,35 @@ function resolveRunPresentation(input) {
 			template: "red",
 			title: "处理失败"
 		};
-		case "cancelled": return {
-			content: "已停止生成。",
-			note: "本次运行已取消",
-			template: "grey",
-			title: "已取消"
-		};
+		case "cancelled": return resolveCancellationPresentation(input.reason, input.text);
 	}
 }
+function resolveCancellationPresentation(reason, text) {
+	const timeoutMs = readRunTimeoutMs(reason);
+	if (timeoutMs !== void 0) return {
+		content: text || `任务执行超过 ${formatDuration(timeoutMs)}，已停止。本次没有形成最终结论。`,
+		note: `达到 ${formatDuration(timeoutMs)}运行时限；以上是超时前进度，不是最终结论`,
+		template: "orange",
+		title: "执行超时"
+	};
+	return {
+		content: text || "已停止生成。",
+		note: "本次运行已取消",
+		template: "grey",
+		title: "已取消"
+	};
+}
+function readRunTimeoutMs(reason) {
+	const match = /^run timed out after (\d+)ms$/.exec(reason ?? "");
+	if (!match) return void 0;
+	const milliseconds = Number(match[1]);
+	return Number.isSafeInteger(milliseconds) && milliseconds > 0 ? milliseconds : void 0;
+}
+function formatDuration(milliseconds) {
+	if (milliseconds % 36e5 === 0) return `${milliseconds / 36e5} 小时`;
+	if (milliseconds % 6e4 === 0) return `${milliseconds / 6e4} 分钟`;
+	return `${Math.ceil(milliseconds / 1e3)} 秒`;
+}
 //#endregion
 //#region src/infrastructure/feishu/feishu-tenant-token-provider.ts
 var FeishuTenantAccessTokenError = class {
@@ -3004,10 +3025,20 @@ function isStreamingClosed(error) {
 	return error instanceof FeishuOpenApiError && (error.code === 200850 || error.code === 300309);
 }
 function updateWholeCard(baseUrl, agentName, request, status, call) {
+	const requestText = "text" in request ? request.text : void 0;
 	const card = status === "completed" ? createFeishuAgentRunCard({
 		agentName,
 		status,
-		text: "text" in request ? request.text : ""
+		text: requestText ?? ""
+	}) : status === "cancelled" ? createFeishuAgentRunCard({
+		agentName,
+		..."reason" in request && request.reason ? { reason: request.reason } : {},
+		status,
+		...requestText === void 0 ? {} : { text: requestText }
+	}) : status === "handoff" ? createFeishuAgentRunCard({
+		agentName,
+		status,
+		...requestText === void 0 ? {} : { text: requestText }
 	}) : createFeishuAgentRunCard({
 		agentName,
 		status
@@ -3040,7 +3071,8 @@ function createFeishuCardKitPublisher(options) {
 			});
 			case "handoff": return yield* options.client.handoff({
 				cardId: target.cardId,
-				sequence
+				sequence,
+				...action.text === void 0 ? {} : { text: action.text }
 			});
 			case "finish":
 				yield* options.client.finish({
@@ -3060,7 +3092,8 @@ function createFeishuCardKitPublisher(options) {
 				yield* options.client.cancel({
 					cardId: target.cardId,
 					...action.reason ? { reason: action.reason } : {},
-					sequence
+					sequence,
+					...action.text === void 0 ? {} : { text: action.text }
 				});
 				return yield* ledger.markTerminal(action.runId);
 		}
@@ -3168,7 +3201,7 @@ function createFeishuCardKitOpenApiTargetCreator(options) {
 					runId: run.runId,
 					sessionKey: run.sessionKey,
 					status: "running",
-					text: initialContent
+					text: createOptions?.initialContent ?? initialContent
 				})),
 				type: "card_json"
 			},
@@ -3225,7 +3258,10 @@ function createConfiguredFeishuCardRolloverRuntime(options) {
 	});
 	const cardRollover = createFeishuCardRollover({
 		clock: options.clock,
-		createSuccessor: ({ generation, run }) => creator.createTarget(run, { generation }),
+		createSuccessor: ({ generation, run, text }) => creator.createTarget(run, {
+			generation,
+			...text === void 0 ? {} : { initialContent: text }
+		}),
 		leaseMs,
 		...options.observe ? { observe: options.observe } : {},
 		publisher,

package/dist/rivus-daemon-cli.js

@@ -433,6 +433,7 @@ function createFeishuCardRollover(options) {
 	const leaseMs = options.leaseMs ?? 51e4;
 	if (!Number.isSafeInteger(leaseMs) || leaseMs < 1) throw new Error("Feishu card stream lease must be a positive integer");
 	const counters = createCounters();
+	const latestTextByRun = /* @__PURE__ */ new Map();
 	const liveRuns = /* @__PURE__ */ new Map();
 	const semaphore = Effect.unsafeMakeSemaphore(1);
 	const exclusive = (effect) => semaphore.withPermits(1)(effect);
@@ -448,7 +449,7 @@ function createFeishuCardRollover(options) {
 	const presentationId = (runId, generation) => `${runId}#${generation}`;
 	const publishProgress = (action) => Effect.suspend(() => {
 		const chain = options.store.chain(action.runId);
-		if (chain && acceptsCardPresentationProgress(chain)) return options.publisher.publish(action);
+		if (chain && acceptsCardPresentationProgress(chain)) return options.publisher.publish(action).pipe(Effect.tap(() => Effect.sync(() => latestTextByRun.set(action.runId, action.text))));
 		return recordNow({
 			...chain ? {
 				generation: chain.activeGeneration,
@@ -458,20 +459,28 @@ function createFeishuCardRollover(options) {
 			type: "stale_update_dropped"
 		});
 	});
-	const publishTerminal = (action) => options.publisher.publish(action).pipe(Effect.tapError((error) => recordNow({
-		error,
-		runId: action.runId,
-		type: "terminal_delivery_failed"
-	})), Effect.tap(() => options.store.markTerminal({
-		runId: action.runId,
-		terminalReceiptId: `${action.runId}:${action.type}`
-	}).pipe(Effect.catchAll((error) => recordNow({
-		error,
-		runId: action.runId,
-		type: "presentation_write_failed"
-	})))), Effect.ensuring(Effect.sync(() => {
-		liveRuns.delete(action.runId);
-	})));
+	const publishTerminal = (action) => {
+		const latestText = latestTextByRun.get(action.runId);
+		const resolvedAction = action.type === "cancel" && action.text === void 0 && latestText !== void 0 ? {
+			...action,
+			text: latestText
+		} : action;
+		return options.publisher.publish(resolvedAction).pipe(Effect.tapError((error) => recordNow({
+			error,
+			runId: action.runId,
+			type: "terminal_delivery_failed"
+		})), Effect.tap(() => options.store.markTerminal({
+			runId: action.runId,
+			terminalReceiptId: `${action.runId}:${action.type}`
+		}).pipe(Effect.catchAll((error) => recordNow({
+			error,
+			runId: action.runId,
+			type: "presentation_write_failed"
+		})))), Effect.ensuring(Effect.sync(() => {
+			latestTextByRun.delete(action.runId);
+			liveRuns.delete(action.runId);
+		})));
+	};
 	const publishAction = (action) => {
 		switch (action.type) {
 			case "update_text": return publishProgress(action);
@@ -505,6 +514,7 @@ function createFeishuCardRollover(options) {
 		};
 		const predecessor = start.presentation;
 		const generation = predecessor.generation + 1;
+		const text = latestTextByRun.get(runId);
 		record({
 			cardId: predecessor.cardId,
 			generation,
@@ -517,7 +527,8 @@ function createFeishuCardRollover(options) {
 		const created = yield* options.createSuccessor({
 			generation,
 			presentationId: successorId,
-			run
+			run,
+			...text === void 0 ? {} : { text }
 		}).pipe(Effect.map((target) => ({ target })), Effect.catchAll((error) => options.store.failHandoff({
 			failedAt: startedAt.toISOString(),
 			runId
@@ -539,6 +550,7 @@ function createFeishuCardRollover(options) {
 		};
 		yield* options.publisher.publish({
 			runId,
+			...text === void 0 ? {} : { text },
 			type: "handoff"
 		}).pipe(Effect.catchAll((error) => recordNow({
 			cardId: predecessor.cardId,
@@ -584,6 +596,7 @@ function createFeishuCardRollover(options) {
 				runId: run.runId,
 				sourceMessageId: run.messageId
 			});
+			latestTextByRun.delete(run.runId);
 			liveRuns.set(run.runId, run);
 			return presentation;
 		})),
@@ -605,6 +618,7 @@ function createFeishuCardRollover(options) {
 		},
 		publish: (action) => exclusive(publishAction(action)),
 		releaseRun: (runId) => Effect.sync(() => {
+			latestTextByRun.delete(runId);
 			liveRuns.delete(runId);
 		}),
 		recover: () => exclusive(Effect.gen(function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivus/agent",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "A local agent daemon core built around a usable agent harness and domain events.",
   "type": "module",
   "license": "MIT",