@rivus/agent 0.16.0 → 0.16.2

package/dist/bootstrap/pi-feishu.js

@@ -1,15 +1,15 @@
+import { i as resolvePiSessionToolNames, l as validatePiSkillCommand, m as createPiBashTool, n as createPiToolProxyDefinitions, p as createPiSkillReadTools, r as createPiSessionResources, t as createPiToolNameResolver } from "../chunks/pi.js";
 import { d as resolveInvocationAuthority, r as createPiSkillRuntime, s as createToolInputDigest, u as createInvocationAuthority } from "../chunks/rivus-tool.js";
-import { $t as openJsonlRecoveryControl, A as createScheduledAutomation, An as createLangfuseAgentTelemetry, Bn as createFeishuTopicContextResolver, Dn as createPiAgentLoop, Dt as createBackgroundSessionHostTools, Ei as openJsonFeishuSessionStore, En as createPiSessionRegistry, Gi as readPersistenceFile, Hi as ToolInvocationDenied, Ii as createFeishuCardDeliveryReconciler, In as createJsonlAgentEventLog, Ji as mergePiProviderModelDeclaration, Jt as createFeishuPresentationPreparation, K as createRivusMemoryToolDescriptor, Ki as isRecord$4, Lt as createBackgroundSessionService, Nt as openJsonlBackgroundSessionDeliveryStore, Oi as openJsonlFeishuInboxRepository, Ot as createBackgroundSessionSupervisor, Pi as openJsonlFeishuCardDeliveryLedger, Qr as createUuidRunIds, Si as createJsonFetchRequest, Ti as createSessionScheduler, Tn as readAutomationPresentation, Ui as createToolBroker, Un as createConfiguredFeishuTextReplySender, W as createProjectMemoryPromptPreparer, Wi as openJsonlToolOperationLedger, Wn as createConfiguredFeishuCardRolloverRuntime, Xt as createAgentHarnessPooledRuntime, Yi as writeAtomicTextFile, Yt as createFeishuDeploymentEndpoint, Zr as createSystemClock, an as createAgentsMdInstructionsProvider, bn as createJsonFileFeishuCardTargetRegistry, c as createConfiguredFeishuAutomationCardSender, d as createHumanInteractionToolApprovalGateway, en as openJsonlToolOperationLedger$1, f as createHumanInteractionEndpointRegistry, g as loadRivusDeploymentManifest, hr as createLazyFeishuWebSocketEventDispatcher, ht as resolveFeishuDeliveryChatId, ii as createAgentHarness, j as AUTOMATION_SUPPRESSION_PREFIX, jn as resolveLangfuseTelemetryConfig, jt as openJsonlBackgroundSessionRepository, k as openJsonAutomationTickRepository, l as createRoutedHumanInteractionToolApprovalService, mn as createFeishuCotPublisher, mt as createConfiguredFeishuBackgroundSessionDelivery, n as createConfiguredFeishuHumanInteractionPresenter, o as createJsonlHumanInteractionRepository, on as createWorkspaceRootHandle, qi as mergePiProviderBaseUrlOverride, t as createHumanInteractionService, tn as createToolBroker$1, tr as createConfiguredFeishuOpenApiClient, u as createHumanInteractionModelChangeApproval, wt as resolveBackgroundSessionSupervisorIntervalMs, z as openJsonlAgentMemoryService } from "../chunks/src.js";
+import { $t as openJsonlRecoveryControl, A as createScheduledAutomation, An as createLangfuseAgentTelemetry, Bn as createFeishuTopicContextResolver, Dn as createPiAgentLoop, Dt as createBackgroundSessionHostTools, Ei as openJsonFeishuSessionStore, En as createPiSessionRegistry, Gi as readPersistenceFile, Hi as ToolInvocationDenied, Hn as createConfiguredFeishuMessageReactionSender, Ii as createFeishuCardDeliveryReconciler, In as createJsonlAgentEventLog, Ji as mergePiProviderModelDeclaration, Jt as createFeishuPresentationPreparation, K as createRivusMemoryToolDescriptor, Ki as isRecord$4, Lt as createBackgroundSessionService, Nt as openJsonlBackgroundSessionDeliveryStore, Oi as openJsonlFeishuInboxRepository, Ot as createBackgroundSessionSupervisor, Pi as openJsonlFeishuCardDeliveryLedger, Qr as createUuidRunIds, Si as createJsonFetchRequest, Ti as createSessionScheduler, Tn as readAutomationPresentation, Ui as createToolBroker, Un as createConfiguredFeishuTextReplySender, W as createProjectMemoryPromptPreparer, Wi as openJsonlToolOperationLedger, Wn as createConfiguredFeishuCardRolloverRuntime, Xt as createAgentHarnessPooledRuntime, Yi as writeAtomicTextFile, Yt as createFeishuDeploymentEndpoint, Zr as createSystemClock, an as createAgentsMdInstructionsProvider, bn as createJsonFileFeishuCardTargetRegistry, c as createConfiguredFeishuAutomationCardSender, d as createHumanInteractionToolApprovalGateway, en as openJsonlToolOperationLedger$1, f as createHumanInteractionEndpointRegistry, g as loadRivusDeploymentManifest, hr as createLazyFeishuWebSocketEventDispatcher, ht as resolveFeishuDeliveryChatId, ii as createAgentHarness, j as AUTOMATION_SUPPRESSION_PREFIX, jn as resolveLangfuseTelemetryConfig, jt as openJsonlBackgroundSessionRepository, k as openJsonAutomationTickRepository, l as createRoutedHumanInteractionToolApprovalService, mn as createFeishuCotPublisher, mt as createConfiguredFeishuBackgroundSessionDelivery, n as createConfiguredFeishuHumanInteractionPresenter, o as createJsonlHumanInteractionRepository, on as createWorkspaceRootHandle, qi as mergePiProviderBaseUrlOverride, t as createHumanInteractionService, tn as createToolBroker$1, tr as createConfiguredFeishuOpenApiClient, u as createHumanInteractionModelChangeApproval, wt as resolveBackgroundSessionSupervisorIntervalMs, z as openJsonlAgentMemoryService } from "../chunks/src.js";
 import { I as resolveFeishuEndpointCredentials, J as migrateRivusModelManagementConfig, K as installRivusModelManagementCliLauncher, U as runDeploymentProcessEffect, X as loadMergedLocalEnvFile, Y as parseRivusModelManagementHomeConfig, q as installRivusRuntimeManagementSkill } from "../chunks/rivus-daemon-cli.js";
 import { t as createSha256Digest } from "../chunks/sha256-digest.js";
 import { a as toRivusModelManagementSubmission, i as projectRivusModelCliResponse, r as parseRivusModelManagementWireRequest, t as createRivusModelManagementFailure } from "../chunks/rivus-model-management-wire.js";
 import { f as createBackgroundSessionStepSourceMessageId } from "../chunks/background-session-authority.js";
-import { i as resolvePiSessionToolNames, l as validatePiSkillCommand, n as createPiToolProxyDefinitions, p as createPiSkillReadTools, r as createPiSessionResources, t as createPiToolNameResolver } from "../chunks/pi.js";
 import { Effect, Either } from "effect";
 import { createHash, randomUUID } from "node:crypto";
 import { chmod, mkdir, open, readFile, realpath, rename, stat, unlink } from "node:fs/promises";
 import { delimiter, dirname, isAbsolute, join, relative, resolve } from "node:path";
-import { ModelRuntime, SessionManager, SettingsManager, createAgentSession, createBashToolDefinition, defineTool, estimateTokens } from "@earendil-works/pi-coding-agent";
+import { ModelRuntime, SessionManager, SettingsManager, createAgentSession, estimateTokens } from "@earendil-works/pi-coding-agent";
 import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
 import { Type } from "typebox";
@@ -155,26 +155,29 @@ function createPiManagedSessionContext(options) {
 			if (input.invocation?.kind === "feishu" && input.invocation.allowedActorOpenIds.length === 1) context = options.contexts.issue(input);
 		},
 		deactivate,
-		tool: defineTool(createBashToolDefinition(options.cwd, { spawnHook: (spawn) => {
-			const { RIVUS_MODEL_CONTEXT: _context, RIVUS_MODEL_SOCKET: _socket, ...baseEnv } = spawn.env;
-			const prepared = {
-				...spawn,
-				env: {
-					...baseEnv,
-					PATH: [
-						options.binDirectory,
-						dirname(options.nodeExecutable),
-						baseEnv.PATH
-					].filter(Boolean).join(delimiter),
-					RIVUS_MODEL_MANAGEMENT_ENABLED: "true",
-					RIVUS_MODEL_SOCKET: options.socketPath
-				}
-			};
-			return context ? createPiModelManagementBashSpawnHook({
-				context,
-				socketPath: options.socketPath
-			})(prepared) : prepared;
-		} }))
+		tool: createPiBashTool(options.cwd, {
+			...options.bashToolOptions,
+			spawnHook: (spawn) => {
+				const { RIVUS_MODEL_CONTEXT: _context, RIVUS_MODEL_SOCKET: _socket, ...baseEnv } = spawn.env;
+				const prepared = {
+					...spawn,
+					env: {
+						...baseEnv,
+						PATH: [
+							options.binDirectory,
+							dirname(options.nodeExecutable),
+							baseEnv.PATH
+						].filter(Boolean).join(delimiter),
+						RIVUS_MODEL_MANAGEMENT_ENABLED: "true",
+						RIVUS_MODEL_SOCKET: options.socketPath
+					}
+				};
+				return context ? createPiModelManagementBashSpawnHook({
+					context,
+					socketPath: options.socketPath
+				})(prepared) : prepared;
+			}
+		})
 	};
 }
 //#endregion
@@ -3977,9 +3980,14 @@ async function createRivusDeploymentAdapters(context) {
 					client: openApiClient,
 					config
 				});
+				const reactions = createConfiguredFeishuMessageReactionSender({
+					client: openApiClient,
+					config
+				});
 				const prepareCardTarget = (run) => cardRollover.prepareRun(run);
 				const endpoint = createFeishuDeploymentEndpoint({
 					agentId: input.agentId,
+					acknowledgeSteering: (messageId) => reactions.add(messageId),
 					botOpenId,
 					cardRollover: cardRollover.transport,
 					finalizeRun: (runId) => cardRollover.rollover.releaseRun(runId),
@@ -4054,13 +4062,6 @@ async function createRivusDeploymentAdapters(context) {
 				}) : void 0;
 				const sessionRegistry = createPiSessionRegistry({ createSession: async (firstInput) => {
 					let activeInput = firstInput;
-					const managedContext = management?.enabled && runContexts && input.definition.runtimeToolGrantSet.toolIds.includes("bash") ? createPiManagedSessionContext({
-						binDirectory: management.binDirectory,
-						contexts: runContexts.registry,
-						cwd: workingDirectory,
-						nodeExecutable: process.execPath,
-						socketPath: management.socketPath
-					}) : void 0;
 					const resources = await createPiSessionResources({
 						agentDir: PI_AGENT_DIR,
 						appendSystemPromptOverride: () => [workspaceInstructions.content, skillRuntime.prompt].filter((content) => content.length > 0),
@@ -4069,8 +4070,17 @@ async function createRivusDeploymentAdapters(context) {
 						...input.projectSpace ? { projectSkillPaths: input.projectSpace.skillPaths } : {},
 						systemPromptOverride: () => input.definition.systemPrompt
 					});
+					const managedContext = management?.enabled && runContexts && input.definition.runtimeToolGrantSet.toolIds.includes("bash") ? createPiManagedSessionContext({
+						...resources.bashToolOptions ? { bashToolOptions: resources.bashToolOptions } : {},
+						binDirectory: management.binDirectory,
+						contexts: runContexts.registry,
+						cwd: workingDirectory,
+						nodeExecutable: process.execPath,
+						socketPath: management.socketPath
+					}) : void 0;
+					const bashTool = input.definition.runtimeToolGrantSet.toolIds.includes("bash") ? managedContext?.tool ?? createPiBashTool(workingDirectory, resources.bashToolOptions) : void 0;
 					const customTools = [
-						...managedContext ? [managedContext.tool] : [],
+						...bashTool ? [bashTool] : [],
 						...createPiSkillReadTools({
 							cwd: workingDirectory,
 							runtimeToolIds: input.definition.runtimeToolGrantSet.toolIds,
@@ -4088,7 +4098,7 @@ async function createRivusDeploymentAdapters(context) {
 						}),
 						...skillRuntime.tool ? [skillRuntime.tool] : []
 					];
-					const activeToolNames = resolvePiSessionToolNames(managedContext ? input.definition.runtimeToolGrantSet.toolIds.filter((toolId) => toolId !== "bash") : input.definition.runtimeToolGrantSet.toolIds, customTools);
+					const activeToolNames = resolvePiSessionToolNames(bashTool ? input.definition.runtimeToolGrantSet.toolIds.filter((toolId) => toolId !== "bash") : input.definition.runtimeToolGrantSet.toolIds, customTools);
 					const result = await createAgentSession(resources.withSessionOptions({
 						...piOptions,
 						...management?.enabled ? management.runtime.getSessionOptions() : {},
@@ -4115,6 +4125,7 @@ async function createRivusDeploymentAdapters(context) {
 				} });
 				const unregisterModels = management?.enabled ? management.runtime.registerSessionRegistry(sessionRegistry) : void 0;
 				const loop = createPiAgentLoop({
+					supportsSteering: true,
 					disposeSessionAfterRun: false,
 					...management?.enabled ? { runBoundary: management.boundary } : {},
 					...telemetry ? { modelContentObserver: telemetry.modelContentObserver } : {},

package/dist/chunks/agent-loop.d.ts

@@ -416,7 +416,8 @@ interface AgentLoopInput {
   readonly steering?: AgentSteeringChannel;
 }
 interface AgentSteeringChannel {
-  next(): Promise<string>;
+  next(signal?: AbortSignal): Promise<string>;
+  close?(): Promise<readonly string[]>;
 }
 interface AgentLoop {
   run(input: AgentLoopInput): Stream.Stream<AgentLoopEvent, unknown>;

package/dist/chunks/agent-loop.js

@@ -117,14 +117,20 @@ function toEffectAgentLoopInput(input) {
 	const { steering, ...rest } = input;
 	return {
 		...rest,
-		...steering ? { steering: { next: () => Effect.promise(() => steering.next()) } } : {}
+		...steering ? { steering: {
+			...steering.close ? { close: () => Effect.promise(() => steering.close()) } : {},
+			next: () => Effect.promise((signal) => steering.next(signal))
+		} } : {}
 	};
 }
 function toCompatibilityAgentLoopInput(input) {
 	const { steering, ...rest } = input;
 	return {
 		...rest,
-		...steering ? { steering: { next: () => Effect.runPromise(steering.next()) } } : {}
+		...steering ? { steering: {
+			...steering.close ? { close: () => Effect.runPromise(steering.close()) } : {},
+			next: (signal) => Effect.runPromise(steering.next(), { signal })
+		} } : {}
 	};
 }
 function isPromiseLike(value) {

package/dist/chunks/index.d.ts

@@ -1808,6 +1808,7 @@ interface FeishuCardRolloverOptions {
   readonly createSuccessor: (request: FeishuCardRolloverSuccessorRequest) => Effect.Effect<FeishuCardRolloverTarget, unknown>;
   readonly leaseMs?: number;
   readonly observe?: (event: FeishuCardRolloverEvent) => void;
+  readonly progressDisplay?: ConversationProgressDisplay;
   readonly publisher: FeishuCardRolloverStreamPublisher;
   readonly store: FeishuCardPresentationStore;
 }
@@ -2989,6 +2990,10 @@ interface PiSessionManager {
 }
 interface PiAgentSession {
   abort?: () => Promise<void> | void;
+  /** Native queue operations required when the loop opts into steering. */
+  steer?(text: string): Promise<void> | void;
+  readonly isStreaming?: boolean;
+  clearQueue?(): unknown;
   setModel?(model: unknown): Promise<void> | void;
   setThinkingLevel?(level: string): void;
   waitForIdle?(): Promise<void>;
@@ -3003,6 +3008,7 @@ interface PiCreateAgentSessionResult {
   readonly session: PiAgentSession;
 }
 interface PiSdkAgentLoopOptions<TSessionOptions = unknown> {
+  readonly supportsSteering?: boolean;
   readonly createAgentSession: (options: TSessionOptions | undefined) => Promise<PiCreateAgentSessionResult> | PiCreateAgentSessionResult;
   readonly sessionOptions?: TSessionOptions;
 }
@@ -3018,6 +3024,7 @@ interface PiAgentSessionHandle {
   readonly refreshResources?: () => Promise<void> | void;
 }
 interface PiAgentLoopOptions {
+  readonly supportsSteering?: boolean;
   readonly resolveSession: (input: AgentLoopInput) => Promise<PiAgentSessionHandle> | PiAgentSessionHandle;
   readonly modelContentObserver?: AgentModelContentObserver;
   readonly disposeSessionAfterRun?: boolean;

package/dist/chunks/pi.js

@@ -4,9 +4,39 @@ import { t as createSha256Digest } from "./sha256-digest.js";
 import { createHash } from "node:crypto";
 import { readFile, realpath, stat } from "node:fs/promises";
 import { isAbsolute, join, relative } from "node:path";
-import { DefaultResourceLoader, SettingsManager, createReadToolDefinition } from "@earendil-works/pi-coding-agent";
+import { DefaultResourceLoader, SettingsManager, createBashToolDefinition, createReadToolDefinition, defineTool } from "@earendil-works/pi-coding-agent";
 import { Unsafe } from "typebox";
 import { realpathSync, statSync } from "node:fs";
+//#region src/adapters/pi/tool-execution/pi-bash-tool.ts
+const DEFAULT_TIMEOUT_SECONDS = 120;
+/** Keep Pi's native execution, rendering and abort cleanup with a bounded default. */
+function createPiBashTool(cwd, options) {
+	const { commandPrefix, shellPath, spawnHook } = options ?? {};
+	const tool = createBashToolDefinition(cwd, {
+		...commandPrefix === void 0 ? {} : { commandPrefix },
+		...shellPath === void 0 ? {} : { shellPath },
+		...spawnHook === void 0 ? {} : { spawnHook }
+	});
+	return defineTool({
+		...tool,
+		description: `${tool.description} Defaults to ${DEFAULT_TIMEOUT_SECONDS} seconds when timeout is omitted; set an explicit positive timeout for longer commands.`,
+		parameters: {
+			...tool.parameters,
+			properties: {
+				...tool.parameters.properties,
+				timeout: {
+					...tool.parameters.properties.timeout,
+					description: `Timeout in seconds (optional, defaults to ${DEFAULT_TIMEOUT_SECONDS})`
+				}
+			}
+		},
+		execute: (id, args, signal, onUpdate, context) => tool.execute(id, {
+			...args,
+			timeout: args.timeout === void 0 ? DEFAULT_TIMEOUT_SECONDS : args.timeout
+		}, signal, onUpdate, context)
+	});
+}
+//#endregion
 //#region src/adapters/pi/skills/pi-skill-read-tool.ts
 var ProjectSkillReadDenied = class extends Error {
 	name = "ProjectSkillReadDenied";
@@ -165,12 +195,19 @@ const PI_BEHAVIOR_SETTING_KEYS = Object.freeze([
 ]);
 async function createPiSessionResources(options) {
 	const settingsManager = createSanitizedSettingsManager(options.cwd, options.agentDir, options.settingsOverrides);
+	const commandPrefix = settingsManager.getShellCommandPrefix();
+	const shellPath = settingsManager.getShellPath();
+	const bashToolOptions = commandPrefix === void 0 && shellPath === void 0 ? void 0 : Object.freeze({
+		...commandPrefix === void 0 ? {} : { commandPrefix },
+		...shellPath === void 0 ? {} : { shellPath }
+	});
 	let skillPaths = await resolveSkillPaths(options);
 	let currentResourceLoader = createResourceLoader(options, settingsManager, skillPaths);
 	await currentResourceLoader.reload();
 	let skillNames = validatePiSkillCatalog(currentResourceLoader.getSkills());
 	const resourceLoader = createResourceLoaderFacade(() => currentResourceLoader, settingsManager);
 	return {
+		...bashToolOptions === void 0 ? {} : { bashToolOptions },
 		get skillNames() {
 			return skillNames;
 		},
@@ -366,4 +403,4 @@ function createPiToolNameResolver(tools) {
 	return createPiToolNameResolver$1(tools);
 }
 //#endregion
-export { InvalidPiSkillSource as a, validatePiSkillCatalog as c, createPiProjectSkillReadTool as d, createPiSkillReadTool as f, resolvePiSessionToolNames as i, validatePiSkillCommand as l, createPiToolProxyDefinitions as n, resolvePiSkillSources as o, createPiSkillReadTools as p, createPiSessionResources as r, InvalidPiSkillCatalog as s, createPiToolNameResolver as t, ProjectSkillReadDenied as u };
+export { InvalidPiSkillSource as a, validatePiSkillCatalog as c, createPiProjectSkillReadTool as d, createPiSkillReadTool as f, resolvePiSessionToolNames as i, validatePiSkillCommand as l, createPiBashTool as m, createPiToolProxyDefinitions as n, resolvePiSkillSources as o, createPiSkillReadTools as p, createPiSessionResources as r, InvalidPiSkillCatalog as s, createPiToolNameResolver as t, ProjectSkillReadDenied as u };

package/dist/chunks/rivus-daemon-cli.js

@@ -2350,7 +2350,7 @@ function createProcessDeploymentAdapterPorts(factories, runEffect) {
 		runtimeFactory: { create: (input) => Effect.tryPromise({
 			try: () => Promise.resolve(factories.createRuntime(input)),
 			catch: toError$3
-		}).pipe(Effect.map((runtime) => toDeploymentRuntime(runtime, runEffect))) }
+		}).pipe(Effect.map((runtime) => toEffectAgentRuntime(runtime, runEffect))) }
 	};
 }
 function adaptEndpointFactory(create, input, runEffect) {
@@ -2408,19 +2408,6 @@ function adaptBackgroundSessionFactory(create, input, runEffect) {
 		catch: toError$3
 	});
 }
-function toDeploymentRuntime(runtime, runEffect) {
-	const adapted = toEffectAgentRuntime(runtime, runEffect);
-	const cancel = adapted.cancel?.bind(adapted);
-	const dispose = adapted.dispose?.bind(adapted);
-	const steer = adapted.steer?.bind(adapted);
-	return {
-		...adapted.concurrency ? { concurrency: adapted.concurrency } : {},
-		...cancel ? { cancel: (input) => cancel(input).pipe(Effect.mapError(toError$3)) } : {},
-		...dispose ? { dispose: () => dispose().pipe(Effect.mapError(toError$3)) } : {},
-		run: (input) => adapted.run(input).pipe(Effect.mapError(toError$3)),
-		...steer ? { steer: (input) => steer(input).pipe(Effect.mapError(toError$3)) } : {}
-	};
-}
 function toLifecycleAdapter(adapter) {
 	return {
 		running: () => adapter.running(),