@rivus/agent 0.5.0 → 0.5.1

package/dist/index.d.ts

@@ -18,6 +18,7 @@ interface AgentHarnessOptions {
   readonly initialEvents?: ReadonlyArray<AgentDomainEvent>;
   readonly initialRunStates?: ReadonlyArray<AgentRunState>;
   readonly loop: AgentLoop;
+  readonly runTimeoutMs?: number;
   readonly runIds: RunIdGenerator;
 }
 interface PromptCommand {
@@ -1902,14 +1903,17 @@ declare function createFeishuEventHandlers(options: FeishuEventHandlersOptions):
 //#region src/composition/feishu-agent-runtime.d.ts
 interface FeishuAgentRuntimeOptions {
   readonly agentId: string;
+  readonly botOpenId?: string;
   readonly clock: AgentClock;
   readonly eventSinks?: ReadonlyArray<AgentDomainEventSink>;
+  readonly inboxRepository?: FeishuInboxRepository;
   readonly initialEvents?: ReadonlyArray<AgentDomainEvent>;
   readonly initialRunStates?: ReadonlyArray<AgentRunState>;
   readonly loop: AgentLoop;
   readonly prepareRun?: (run: FeishuAgentRunPreparation) => Effect.Effect<void, unknown>;
   readonly periodicFlush?: FeishuPeriodicFlushSupervisor;
   readonly publish: (action: FeishuStreamAction) => Effect.Effect<void, unknown>;
+  readonly runTimeoutMs?: number;
   readonly runIds: RunIdGenerator;
 }
 interface FeishuPeriodicFlushSupervisor {
@@ -2155,6 +2159,7 @@ declare function createJsonlAgentEventLog(options: JsonlAgentEventLogOptions): A
 type ConfiguredRivusDaemonBootstrapRequest = ConfiguredFeishuOpenApiRequest;
 type ConfiguredRivusDaemonBootstrapResponse = ConfiguredFeishuOpenApiResponse;
 interface ConfiguredRivusDaemonBootstrapOptions {
+  readonly botOpenId?: string;
   readonly cardTargets: FeishuCardTargetRegistry;
   readonly clock: AgentClock;
   readonly config: RivusDaemonConfig;
@@ -2164,10 +2169,12 @@ interface ConfiguredRivusDaemonBootstrapOptions {
   readonly flushIntervalMs?: number;
   readonly initialEvents?: ReadonlyArray<AgentDomainEvent>;
   readonly initialRunStates?: ReadonlyArray<AgentRunState>;
+  readonly inboxRepository?: FeishuInboxRepository;
   readonly loop: AgentLoop;
   readonly onWorkerError?: (error: unknown) => void | Promise<void>;
   readonly request: (request: ConfiguredRivusDaemonBootstrapRequest) => Effect.Effect<ConfiguredRivusDaemonBootstrapResponse, unknown>;
   readonly runIds: RunIdGenerator;
+  readonly runTimeoutMs?: number;
   readonly sleep: (ms: number) => Effect.Effect<void, unknown>;
   readonly websocketClient: FeishuWebSocketClient;
   readonly workerIntervalMs?: number;

package/dist/index.js

@@ -1083,6 +1083,7 @@ function createAgentRunUpdateHandler(handle) {
 	});
 }
 function createAgentHarness(options) {
+	if (options.runTimeoutMs !== void 0 && (!Number.isSafeInteger(options.runTimeoutMs) || options.runTimeoutMs < 1)) throw new Error("Agent run timeout must be a positive integer");
 	let activeRun;
 	let activeCancellation;
 	let activeRunState;
@@ -1223,7 +1224,7 @@ function createAgentHarness(options) {
 				sessionKey: command.sessionKey,
 				text: command.text
 			};
-			yield* Effect.try({
+			const loop = Effect.try({
 				try: () => options.loop.run(loopInput),
 				catch: (error) => error
 			}).pipe(Effect.flatMap((loopStream) => Stream.runForEach(loopStream.pipe(Stream.interruptWhenDeferred(cancellation.deferred)), (event) => Effect.gen(function* () {
@@ -1244,6 +1245,16 @@ function createAgentHarness(options) {
 					return yield* Effect.fail(new AgentLoopFailed(runId, errorMessage, error, state));
 				});
 			}));
+			yield* options.runTimeoutMs === void 0 ? loop : Effect.raceFirst(loop, Effect.sleep(options.runTimeoutMs).pipe(Effect.flatMap(() => {
+				const request = {
+					reason: `run timed out after ${options.runTimeoutMs}ms`,
+					runId,
+					sessionKey: command.sessionKey
+				};
+				cancellation.requested = request;
+				cancellation.abortController.abort(request);
+				return Deferred.succeed(cancellation.deferred, request);
+			}), Effect.asVoid));
 			if (cancellation.requested) {
 				const cancelledAt = yield* options.clock.now;
 				yield* record({
@@ -2626,10 +2637,12 @@ function createFeishuAgentRuntime(options) {
 		...options.initialEvents ? { initialEvents: options.initialEvents } : {},
 		...options.initialRunStates ? { initialRunStates: options.initialRunStates } : {},
 		loop: options.loop,
+		...options.runTimeoutMs === void 0 ? {} : { runTimeoutMs: options.runTimeoutMs },
 		runIds: options.runIds
 	});
 	const daemon = createFeishuAgentDaemon({
 		agentId: options.agentId,
+		...options.botOpenId ? { botOpenId: options.botOpenId } : {},
 		harness,
 		...options.prepareRun ? { prepareRun: options.prepareRun } : {},
 		publish: options.publish
@@ -2638,7 +2651,10 @@ function createFeishuAgentRuntime(options) {
 	let lastHandled;
 	const queue = createFeishuMessageQueue({
 		handleMessage: (payload, handleOptions) => {
-			const effect = daemon.handleMessage(payload, handleOptions).pipe(Effect.tap((result) => describeFeishuMessageIntake(payload, { agentId: options.agentId }).pipe(Effect.tap((intake) => Effect.gen(function* () {
+			const effect = daemon.handleMessage(payload, handleOptions).pipe(Effect.tap((result) => describeFeishuMessageIntake(payload, {
+				agentId: options.agentId,
+				...options.botOpenId ? { botOpenId: options.botOpenId } : {}
+			}).pipe(Effect.tap((intake) => Effect.gen(function* () {
 				const observedAt = yield* options.clock.now;
 				lastHandled = {
 					intake,
@@ -2649,6 +2665,7 @@ function createFeishuAgentRuntime(options) {
 			})))));
 			return options.periodicFlush ? options.periodicFlush.withPeriodicFlush(effect) : effect;
 		},
+		...options.inboxRepository ? { repository: options.inboxRepository } : {},
 		shouldRetryError: isRetryableFeishuMessageError
 	});
 	const worker = createFeishuMessageWorker({ queue });
@@ -2675,7 +2692,10 @@ function createFeishuAgentRuntime(options) {
 			...lastHandled ? { lastHandled } : {}
 		}),
 		replayReceiveMessage: (payload, replayOptions) => Effect.gen(function* () {
-			const intake = yield* describeFeishuMessageIntake(payload, { agentId: options.agentId });
+			const intake = yield* describeFeishuMessageIntake(payload, {
+				agentId: options.agentId,
+				...options.botOpenId ? { botOpenId: options.botOpenId } : {}
+			});
 			return {
 				accepted: yield* observedQueue.accept(payload, replayOptions),
 				drained: yield* worker.drainAvailable(),
@@ -3114,6 +3134,7 @@ function isRecord$2(value) {
 //#endregion
 //#region src/composition/rivus-daemon-bootstrap.ts
 const DEFAULT_WORKER_INTERVAL_MS$1 = 250;
+const DEFAULT_RUN_TIMEOUT_MS = 900 * 1e3;
 function restoreConfiguredRivusDaemonBootstrap(options) {
 	return options.eventLog.readAll().pipe(Effect.map((events) => createConfiguredRivusDaemonBootstrap({
 		...options,
@@ -3139,14 +3160,17 @@ function createConfiguredRivusDaemonBootstrap(options) {
 	const periodicFlush = createPeriodicFlush(options, publisher);
 	const runtime = createFeishuAgentRuntime({
 		agentId: options.config.agentId,
+		...options.botOpenId ? { botOpenId: options.botOpenId } : {},
 		clock: options.clock,
 		eventSinks: [options.eventLog],
+		...options.inboxRepository ? { inboxRepository: options.inboxRepository } : {},
 		...options.initialEvents ? { initialEvents: options.initialEvents } : {},
 		...options.initialRunStates ? { initialRunStates: options.initialRunStates } : {},
 		loop: options.loop,
 		periodicFlush,
 		prepareRun,
 		publish: (action) => publisher.publish(action),
+		runTimeoutMs: options.runTimeoutMs ?? DEFAULT_RUN_TIMEOUT_MS,
 		runIds: options.runIds
 	});
 	const websocketTransport = createFeishuWebSocketDaemon({

package/package.json

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