@rivus/agent 0.13.2 → 0.14.0

package/dist/mcp.d.ts

@@ -1,42 +1,7 @@
-import { k as BackgroundSessionAuthority, r as BackgroundSessionService } from "./background-session-service.js";
+import { _ as BackgroundSessionControlContext, b as createBackgroundSessionControl, g as BackgroundSessionControlCommand, h as BackgroundSessionControl, v as BackgroundSessionControlError, x as toControlContext, y as BackgroundSessionControlOrigin } from "./chunks/api3.js";
 import { Readable, Writable } from "node:stream";
 
-//#region src/application/background-session/background-session-control.d.ts
-type BackgroundSessionControlCommand = "start" | "wait" | "list" | "status" | "send" | "stop";
-interface BackgroundSessionControlOrigin {
-  readonly allowedActorOpenIds: ReadonlyArray<string>;
-  readonly conversationId?: string;
-  readonly endpointId: string;
-  readonly tenantKey: string;
-}
-interface BackgroundSessionControlContext {
-  readonly agentId: string;
-  readonly authority: BackgroundSessionAuthority;
-  readonly origin: BackgroundSessionControlOrigin;
-  readonly policyEpoch: number;
-  readonly runId: string;
-  readonly sessionKey: string;
-  readonly sourceMessageId: string;
-}
-interface BackgroundSessionControl {
-  handle(command: BackgroundSessionControlCommand, context: BackgroundSessionControlContext, input: unknown): Promise<unknown>;
-}
-declare function createBackgroundSessionControl(options: {
-  readonly service: BackgroundSessionService;
-}): BackgroundSessionControl;
-declare class BackgroundSessionControlError extends Error {
-  readonly name = "BackgroundSessionControlError";
-}
-declare function toControlContext(input: {
-  readonly agentId: string;
-  readonly authority: BackgroundSessionAuthority;
-  readonly origin: BackgroundSessionControlOrigin;
-  readonly policyEpoch: number;
-  readonly sessionKey: string;
-  readonly sourceMessageId?: string;
-}): BackgroundSessionControlContext;
-//#endregion
-//#region src/infrastructure/mcp/background-session-mcp-server.d.ts
+//#region src/adapters/mcp/background-session-mcp-server.d.ts
 declare const BACKGROUND_SESSION_MCP_SERVER_NAME = "rivus-background-sessions";
 declare const BACKGROUND_SESSION_MCP_SERVER_VERSION = "1.0.0";
 interface BackgroundSessionMcpServerOptions {
@@ -64,7 +29,7 @@ interface RunBackgroundSessionMcpServerEnv {
 }
 declare function runBackgroundSessionMcpServer(options?: RunBackgroundSessionMcpServerEnv): Promise<void>;
 //#endregion
-//#region src/infrastructure/http/background-session-control-http-server.d.ts
+//#region src/adapters/http/background-session-control-http-server.d.ts
 interface BackgroundSessionControlHttpServerOptions {
   readonly control: BackgroundSessionControl;
   readonly host?: string;

package/dist/mcp.js

@@ -1,9 +1,8 @@
-import { l as createBackgroundSessionToolContracts, s as createBackgroundSessionKey } from "./background-session-authority.js";
-import { a as readBackgroundSessionWaitInput, i as readBackgroundSessionString, n as readBackgroundSessionObject, r as readBackgroundSessionPhase, t as readBackgroundSessionInteger } from "./background-session-input.js";
+import { F as createBackgroundSessionControl, I as toControlContext, P as BackgroundSessionControlError, q as createBackgroundSessionToolContracts } from "./chunks/api2.js";
 import { randomUUID } from "node:crypto";
-import { pathToFileURL } from "node:url";
 import { createServer } from "node:http";
-//#region src/infrastructure/mcp/background-session-mcp-server.ts
+import { pathToFileURL } from "node:url";
+//#region src/adapters/mcp/background-session-mcp-server.ts
 const BACKGROUND_SESSION_MCP_SERVER_NAME = "rivus-background-sessions";
 const BACKGROUND_SESSION_MCP_SERVER_VERSION = "1.0.0";
 var BackgroundSessionMcpError = class extends Error {
@@ -202,116 +201,7 @@ function isRecord(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
-//#region src/application/background-session/background-session-control.ts
-function createBackgroundSessionControl(options) {
-	return { handle: async (command, context, input) => {
-		const executionContext = {
-			agentId: context.agentId,
-			callId: `mcp-call:${randomUUID()}`,
-			instanceId: `mcp:${context.agentId}`,
-			policyEpoch: context.policyEpoch,
-			runId: context.runId,
-			sessionKey: context.sessionKey,
-			sourceMessageId: context.sourceMessageId,
-			toolId: `background.${command}`,
-			toolVersion: "1.0.0",
-			origin: toToolOrigin(context.origin)
-		};
-		switch (command) {
-			case "start": {
-				const { displayName, prompt } = readObject(input, ["displayName", "prompt"]);
-				if (typeof prompt !== "string" || prompt.trim() === "") throw new BackgroundSessionControlError("background.start requires a non-empty prompt");
-				const sessionId = `bg-${randomUUID()}`;
-				return options.service.start({
-					authority: {
-						...context.authority,
-						sessionKey: createBackgroundSessionKey(sessionId)
-					},
-					context: executionContext,
-					...displayName === void 0 ? {} : { displayName: readString(displayName, "displayName") },
-					prompt,
-					sessionId
-				});
-			}
-			case "wait": return options.service.wait({
-				context: executionContext,
-				...readBackgroundSessionWaitInput(input, (message) => new BackgroundSessionControlError(message))
-			});
-			case "list": {
-				const { limit, phase } = readObject(input, ["limit", "phase"]);
-				return options.service.list({
-					context: executionContext,
-					...limit === void 0 ? {} : { limit: readInteger(limit, "limit") },
-					...phase === void 0 ? {} : { phase: readPhase(phase) }
-				});
-			}
-			case "status": {
-				const { sessionId } = readObject(input, ["sessionId"]);
-				return options.service.status({
-					context: executionContext,
-					sessionId: readString(sessionId, "sessionId")
-				});
-			}
-			case "send": {
-				const { message, sessionId } = readObject(input, ["message", "sessionId"]);
-				return options.service.send({
-					context: executionContext,
-					message: readString(message, "message"),
-					sessionId: readString(sessionId, "sessionId")
-				});
-			}
-			case "stop": {
-				const { reason, sessionId } = readObject(input, ["reason", "sessionId"]);
-				return options.service.stop({
-					context: executionContext,
-					...reason === void 0 ? {} : { reason: readString(reason, "reason") },
-					sessionId: readString(sessionId, "sessionId")
-				});
-			}
-		}
-	} };
-}
-var BackgroundSessionControlError = class extends Error {
-	name = "BackgroundSessionControlError";
-};
-function toControlContext(input) {
-	return {
-		agentId: input.agentId,
-		authority: input.authority,
-		origin: {
-			allowedActorOpenIds: input.origin.allowedActorOpenIds,
-			...input.origin.conversationId === void 0 ? {} : { conversationId: input.origin.conversationId },
-			endpointId: input.origin.endpointId,
-			tenantKey: input.origin.tenantKey
-		},
-		policyEpoch: input.policyEpoch,
-		runId: `mcp:${randomUUID()}`,
-		sessionKey: input.sessionKey,
-		sourceMessageId: input.sourceMessageId ?? `mcp:${randomUUID()}`
-	};
-}
-function toToolOrigin(origin) {
-	return {
-		allowedActorOpenIds: origin.allowedActorOpenIds,
-		endpointId: origin.endpointId,
-		tenantKey: origin.tenantKey,
-		...origin.conversationId === void 0 ? {} : { conversationId: origin.conversationId }
-	};
-}
-function readObject(input, allowed) {
-	return readBackgroundSessionObject(input, allowed, (message) => new BackgroundSessionControlError(message));
-}
-function readString(value, name) {
-	return readBackgroundSessionString(value, name, (message) => new BackgroundSessionControlError(message));
-}
-function readInteger(value, name) {
-	return readBackgroundSessionInteger(value, name, (message) => new BackgroundSessionControlError(message));
-}
-function readPhase(value) {
-	return readBackgroundSessionPhase(value, (message) => new BackgroundSessionControlError(message));
-}
-//#endregion
-//#region src/infrastructure/http/background-session-control-http-server.ts
+//#region src/adapters/http/background-session-control-http-server.ts
 var BackgroundSessionControlHttpError = class extends Error {
 	statusCode;
 	name = "BackgroundSessionControlHttpError";

package/dist/pi.d.ts

@@ -1,21 +1,107 @@
-import { a as createPiToolProxyDefinitions, i as createPiToolNameResolver, n as PiToolApprovalRequest, r as PiToolProxyOptions, t as PiToolApprovalGateway } from "./pi-tool-proxy.js";
-import { o as RegisteredRivusSkill } from "./rivus-plugin.js";
-import { ToolDefinition } from "@earendil-works/pi-coding-agent";
+import { a as AgentLoopInput } from "./chunks/agent-loop.js";
+import { d as MemoryScope } from "./chunks/api.js";
+import { Q as RivusResolvedToolDescriptor, ft as RivusRuntimeToolId, rt as RivusToolGrantSet, st as RegisteredRivusSkill } from "./chunks/api2.js";
+import { a as PiToolResult, i as PiToolDefinition, n as PiToolApprovalRequest, r as PiToolContent, t as PiToolApprovalGateway, u as ToolExecutionRequest } from "./chunks/pi-tool-proxy.js";
 
-//#region src/infrastructure/pi/pi-project-skill-read-tool.d.ts
+//#region src/adapters/pi/skills/pi-skill-read-tool.d.ts
 declare class ProjectSkillReadDenied extends Error {
   readonly name = "ProjectSkillReadDenied";
 }
-declare function createPiProjectSkillReadTool(options: {
+declare function createPiSkillReadTool(options: {
   readonly cwd: string;
   readonly skillPaths: ReadonlyArray<string>;
-}): ToolDefinition;
+}): PiToolDefinition;
+declare const createPiProjectSkillReadTool: typeof createPiSkillReadTool;
+declare function createPiSkillReadTools(options: {
+  readonly cwd: string;
+  readonly runtimeToolIds: ReadonlyArray<RivusRuntimeToolId>;
+  readonly skillPaths: ReadonlyArray<string>;
+}): PiToolDefinition[];
 //#endregion
-//#region src/infrastructure/pi/pi-skill-tool.d.ts
+//#region src/adapters/pi/skills/pi-skill-tool.d.ts
+interface PiSkillReadDetails {
+  readonly contentLength: number;
+  readonly digest: string;
+  readonly skillId: string;
+  readonly title: string;
+  readonly version: string;
+}
 interface PiSkillRuntime {
   readonly prompt: string;
-  readonly tool?: ToolDefinition;
+  readonly tool?: PiToolDefinition<PiSkillReadDetails>;
 }
 declare function createPiSkillRuntime(skills: ReadonlyArray<RegisteredRivusSkill>): PiSkillRuntime;
 //#endregion
-export { type PiSkillRuntime, type PiToolApprovalGateway, type PiToolApprovalRequest, type PiToolProxyOptions, ProjectSkillReadDenied, createPiProjectSkillReadTool, createPiSkillRuntime, createPiToolNameResolver, createPiToolProxyDefinitions };
+//#region src/adapters/pi/skills/pi-skill-catalog.d.ts
+interface PiSkillCatalogEntry {
+  readonly name: string;
+}
+interface PiSkillCatalogDiagnostic {
+  readonly message: string;
+  readonly path?: string;
+  readonly type: "warning" | "error" | "collision";
+}
+declare class InvalidPiSkillCatalog extends Error {
+  readonly name = "InvalidPiSkillCatalog";
+}
+declare function validatePiSkillCatalog(input: {
+  readonly diagnostics: ReadonlyArray<PiSkillCatalogDiagnostic>;
+  readonly skills: ReadonlyArray<PiSkillCatalogEntry>;
+}): ReadonlySet<string>;
+declare function validatePiSkillCommand(text: string, skillNames: ReadonlySet<string>): void;
+//#endregion
+//#region src/adapters/pi/skills/pi-skill-sources.d.ts
+declare class InvalidPiSkillSource extends Error {
+  readonly name = "InvalidPiSkillSource";
+}
+interface ResolvePiSkillSourcesOptions {
+  readonly agentDir: string;
+  readonly homeDirectory: string;
+  readonly projectSkillPaths?: ReadonlyArray<string>;
+}
+declare function resolvePiSkillSources(options: ResolvePiSkillSourcesOptions): Promise<ReadonlyArray<string>>;
+//#endregion
+//#region src/adapters/pi/tool-execution/pi-session-tools.d.ts
+interface PiNamedTool {
+  readonly name: string;
+}
+declare function resolvePiSessionToolNames(runtimeToolIds: ReadonlyArray<RivusRuntimeToolId>, customTools: ReadonlyArray<PiNamedTool>): ReadonlyArray<string>;
+//#endregion
+//#region src/adapters/pi/runtime/pi-session-resources.d.ts
+interface CreatePiSessionResourcesOptions {
+  readonly agentDir: string;
+  readonly appendSystemPromptOverride?: (base: string[]) => string[];
+  readonly cwd: string;
+  readonly homeDirectory: string;
+  readonly projectSkillPaths?: ReadonlyArray<string>;
+  readonly systemPromptOverride?: (base: string | undefined) => string | undefined;
+}
+interface PiSessionResources {
+  readonly skillNames: ReadonlySet<string>;
+  readonly skillPaths: ReadonlyArray<string>;
+  readonly withSessionOptions: <Options extends object>(options: Options) => BoundPiSessionOptions<Options>;
+}
+type BoundPiSessionOptions<Options extends object> = Omit<Options, "agentDir" | "cwd" | "resourceLoader" | "settingsManager"> & {
+  readonly agentDir: string;
+  readonly cwd: string;
+};
+declare function createPiSessionResources(options: CreatePiSessionResourcesOptions): Promise<PiSessionResources>;
+//#endregion
+//#region src/adapters/compatibility/agent-execution/pi/pi-tool-proxy.d.ts
+interface ToolBroker {
+  execute(request: ToolExecutionRequest): Promise<unknown>;
+}
+interface PiToolProxyOptions {
+  readonly agentId: string;
+  readonly instanceId: string;
+  readonly tools: ReadonlyArray<RivusResolvedToolDescriptor>;
+  readonly toolGrantSet: RivusToolGrantSet;
+  readonly broker: ToolBroker;
+  readonly approvals: PiToolApprovalGateway;
+  readonly getActiveInput: () => AgentLoopInput | undefined;
+  readonly memoryScopes?: ReadonlyArray<MemoryScope>;
+}
+declare function createPiToolProxyDefinitions(options: PiToolProxyOptions): PiToolDefinition[];
+declare function createPiToolNameResolver(tools: ReadonlyArray<Pick<RivusResolvedToolDescriptor, "id">>): (toolName: string) => string;
+//#endregion
+export { type CreatePiSessionResourcesOptions, InvalidPiSkillCatalog, InvalidPiSkillSource, type PiSessionResources, type PiSkillRuntime, type PiToolApprovalGateway, type PiToolApprovalRequest, type PiToolContent, type PiToolDefinition, type PiToolProxyOptions, type PiToolResult, ProjectSkillReadDenied, type ResolvePiSkillSourcesOptions, createPiProjectSkillReadTool, createPiSessionResources, createPiSkillReadTool, createPiSkillReadTools, createPiSkillRuntime, createPiToolNameResolver, createPiToolProxyDefinitions, resolvePiSessionToolNames, resolvePiSkillSources, validatePiSkillCatalog, validatePiSkillCommand };

package/dist/pi.js

@@ -1,146 +1,3 @@
-import { d as requiresToolApproval } from "./agent-memory.js";
-import { l as createPiSkillRuntime, o as createInvocationAuthority, r as createToolInputDigest } from "./tool-input-digest.js";
-import { createHash } from "node:crypto";
-import { readFile, realpath, stat } from "node:fs/promises";
-import { isAbsolute, relative } from "node:path";
-import { Unsafe } from "typebox";
-import { createReadToolDefinition } from "@earendil-works/pi-coding-agent";
-//#region src/infrastructure/pi/pi-project-skill-read-tool.ts
-var ProjectSkillReadDenied = class extends Error {
-	name = "ProjectSkillReadDenied";
-};
-function createPiProjectSkillReadTool(options) {
-	const { skillPaths } = options;
-	if (skillPaths.length === 0) throw new ProjectSkillReadDenied("Project Skill read requires a trusted Skill source");
-	const allowedRoots = [...skillPaths];
-	return createReadToolDefinition(options.cwd, { operations: {
-		access: async (absolutePath) => {
-			await stat(await authorize(absolutePath, allowedRoots));
-		},
-		readFile: async (absolutePath) => readFile(await authorize(absolutePath, allowedRoots))
-	} });
-}
-async function authorize(path, sources) {
-	const candidate = await realpath(path);
-	for (const source of sources) {
-		const canonicalSource = await realpath(source);
-		if (!(await stat(canonicalSource)).isDirectory()) {
-			if (candidate === canonicalSource) return candidate;
-			continue;
-		}
-		const relation = relative(canonicalSource, candidate);
-		if (relation === "" || !relation.startsWith("..") && !isAbsolute(relation)) return candidate;
-	}
-	throw new ProjectSkillReadDenied("read is restricted to the bound Project Skill sources");
-}
-//#endregion
-//#region src/infrastructure/pi/pi-tool-proxy.ts
-function createPiToolProxyDefinitions(options) {
-	const names = /* @__PURE__ */ new Set();
-	return options.tools.map((tool) => {
-		const name = toPiToolName(tool.id);
-		if (names.has(name)) throw new Error(`Pi tool name collision: ${name}`);
-		names.add(name);
-		return {
-			description: tool.description,
-			execute: async (callId, input, signal) => {
-				const activeInput = options.getActiveInput();
-				const invocation = activeInput?.invocation;
-				if (!activeInput || !invocation) throw new Error(`tool ${tool.id} requires an active agent run with a trusted invocation`);
-				if (!invocation.tenantKey) throw new Error(`tool ${tool.id} requires a trusted tenant identity`);
-				throwIfAborted(signal ?? activeInput.abortSignal);
-				const inputDigest = createToolInputDigest(input);
-				const operationId = createBoundId("operation", {
-					agentId: options.agentId,
-					inputDigest,
-					instanceId: options.instanceId,
-					sourceMessageId: invocation.sourceMessageId,
-					toolId: tool.id,
-					toolVersion: tool.version
-				});
-				const approvalId = createBoundId("approval", {
-					callId,
-					operationId,
-					runId: activeInput.runId
-				});
-				if (requiresToolApproval(tool.risk)) {
-					if (invocation.allowedActorOpenIds.length === 0) throw new Error(`tool ${tool.id} requires at least one trusted approval actor`);
-					await options.approvals.requestApproval({
-						agentId: options.agentId,
-						allowedActorOpenIds: invocation.allowedActorOpenIds,
-						approvalId,
-						callId,
-						endpointId: invocation.endpointId,
-						inputDigest,
-						instanceId: options.instanceId,
-						operationId,
-						risk: tool.risk,
-						runId: activeInput.runId,
-						sessionKey: activeInput.sessionKey,
-						signal: signal ?? activeInput.abortSignal,
-						sourceMessageId: invocation.sourceMessageId,
-						tenantKey: invocation.tenantKey,
-						toolId: tool.id,
-						toolVersion: tool.version
-					});
-					throwIfAborted(signal ?? activeInput.abortSignal);
-				}
-				const result = await options.broker.execute({
-					authority: createInvocationAuthority({
-						agentId: options.agentId,
-						allowedActorOpenIds: invocation.allowedActorOpenIds,
-						...invocation.kind === "background-session" ? invocation.conversationId ? { conversationId: invocation.conversationId } : {} : invocation.memory?.conversationId ? { conversationId: invocation.memory.conversationId } : {},
-						endpointId: invocation.endpointId,
-						instanceId: options.instanceId,
-						...invocation.memory ? { memory: {
-							...invocation.memory,
-							scopes: options.memoryScopes ?? []
-						} } : {},
-						runId: activeInput.runId,
-						sessionKey: activeInput.sessionKey,
-						sourceMessageId: invocation.sourceMessageId,
-						tenantKey: invocation.tenantKey,
-						toolGrantSet: options.toolGrantSet
-					}),
-					callId,
-					input,
-					operationId,
-					...requiresToolApproval(tool.risk) ? { approvalId } : {},
-					toolId: tool.id,
-					version: tool.version
-				});
-				return {
-					content: [{
-						text: stringifyToolResult(result),
-						type: "text"
-					}],
-					details: result
-				};
-			},
-			executionMode: "sequential",
-			label: tool.id,
-			name,
-			parameters: Unsafe(tool.inputSchema),
-			promptSnippet: `${name}: ${tool.description}`
-		};
-	});
-}
-function createPiToolNameResolver(tools) {
-	const toolIdsByPiName = new Map(tools.map((tool) => [toPiToolName(tool.id), tool.id]));
-	return (toolName) => toolIdsByPiName.get(toolName) ?? toolName;
-}
-function toPiToolName(toolId) {
-	return `rivus_${toolId.replace(/[^a-zA-Z0-9_-]/g, "_")}`;
-}
-function createBoundId(kind, binding) {
-	return `${kind}:${createHash("sha256").update(JSON.stringify(binding)).digest("hex")}`;
-}
-function throwIfAborted(signal) {
-	if (signal.aborted) throw signal.reason ?? /* @__PURE__ */ new Error("tool execution was aborted");
-}
-function stringifyToolResult(result) {
-	if (typeof result === "string") return result;
-	return JSON.stringify(result ?? null);
-}
-//#endregion
-export { ProjectSkillReadDenied, createPiProjectSkillReadTool, createPiSkillRuntime, createPiToolNameResolver, createPiToolProxyDefinitions };
+import { n as createPiSkillRuntime } from "./chunks/pi-skill-tool.js";
+import { a as InvalidPiSkillSource, c as validatePiSkillCatalog, d as createPiProjectSkillReadTool, f as createPiSkillReadTool, i as resolvePiSessionToolNames, l as validatePiSkillCommand, n as createPiToolProxyDefinitions, o as resolvePiSkillSources, p as createPiSkillReadTools, r as createPiSessionResources, s as InvalidPiSkillCatalog, t as createPiToolNameResolver, u as ProjectSkillReadDenied } from "./chunks/pi.js";
+export { InvalidPiSkillCatalog, InvalidPiSkillSource, ProjectSkillReadDenied, createPiProjectSkillReadTool, createPiSessionResources, createPiSkillReadTool, createPiSkillReadTools, createPiSkillRuntime, createPiToolNameResolver, createPiToolProxyDefinitions, resolvePiSessionToolNames, resolvePiSkillSources, validatePiSkillCatalog, validatePiSkillCommand };

package/dist/testing/index.d.ts

@@ -1,4 +1,4 @@
-import { a as assertRivusPluginConforms, i as RivusPluginLifecycleProbe, n as RivusPluginConformanceInput, o as createFakeRivusPlugin, r as RivusPluginConformanceReport, t as RivusPluginConformanceError } from "../rivus-plugin-testkit.js";
+import { a as assertRivusPluginConforms, i as RivusPluginLifecycleProbe, n as RivusPluginConformanceInput, o as createFakeRivusPlugin, r as RivusPluginConformanceReport, t as RivusPluginConformanceError } from "../chunks/rivus-plugin-testkit.js";
 
 //#region src/testing/langfuse-drive-e2e.d.ts
 interface LangfuseObservation {

package/dist/testing/index.js

@@ -1,4 +1,4 @@
-import { n as assertRivusPluginConforms, r as createFakeRivusPlugin, t as RivusPluginConformanceError } from "../rivus-plugin-testkit.js";
+import { n as assertRivusPluginConforms, r as createFakeRivusPlugin, t as RivusPluginConformanceError } from "../chunks/rivus-plugin-testkit.js";
 //#region src/testing/langfuse-drive-e2e.ts
 async function runLangfuseDriveE2E(options) {
 	const timeoutMs = options.timeoutMs ?? 12e4;

package/examples/pi-feishu-deployment.bootstrap.ts

@@ -1,15 +1,10 @@
-import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { mkdir, readFile } from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
+import { homedir } from "node:os";
 import { join, relative } from "node:path";
 import { Effect } from "effect";
 import * as Lark from "@larksuiteoapi/node-sdk";
-import {
-  AuthStorage,
-  createAgentSession,
-  DefaultResourceLoader,
-  ModelRegistry,
-  SessionManager
-} from "@earendil-works/pi-coding-agent";
+import { AuthStorage, createAgentSession, ModelRegistry, SessionManager } from "@earendil-works/pi-coding-agent";
 import {
   createAgentsMdInstructionsProvider,
   createAgentHarness,
@@ -51,6 +46,7 @@ import {
   createUuidRunIds,
   createWorkspaceRootHandle,
   loadRivusDeploymentManifest,
+  mergePiProviderBaseUrlOverride,
   openJsonlBackgroundSessionDeliveryStore,
   openJsonlBackgroundSessionRepository,
   resolveBackgroundSessionSupervisorIntervalMs,
@@ -65,8 +61,6 @@ import {
   readAutomationPresentation,
   resolveFeishuEndpointCredentials,
   resolveLangfuseTelemetryConfig,
-  validateProjectSkillCatalog,
-  validateProjectSkillCommand,
   type CreateRivusDeploymentBackgroundSessionInput,
   type CreateRivusDeploymentEndpointInput,
   type CreateRivusDeploymentAutomationInput,
@@ -81,10 +75,13 @@ import {
   type RivusThinkingLevel
 } from "@rivus/agent";
 import {
-  createPiProjectSkillReadTool,
+  createPiSkillReadTools,
+  createPiSessionResources,
   createPiSkillRuntime,
+  resolvePiSessionToolNames,
   createPiToolNameResolver,
-  createPiToolProxyDefinitions
+  createPiToolProxyDefinitions,
+  validatePiSkillCommand
 } from "@rivus/agent/pi";
 
 type PiSessionOptions = NonNullable<Parameters<typeof createAgentSession>[0]>;
@@ -500,15 +497,21 @@ export async function createRivusDeploymentAdapters(context: RivusDeploymentBoot
       const sessionRegistry = createPiSessionRegistry({
         createSession: async (firstInput) => {
           let activeInput = firstInput;
+          const resources = await createPiSessionResources({
+            agentDir: PI_AGENT_DIR,
+            appendSystemPromptOverride: () =>
+              [workspaceInstructions.content, skillRuntime.prompt].filter((content) => content.length > 0),
+            cwd: workingDirectory,
+            homeDirectory: homedir(),
+            ...(input.projectSpace ? { projectSkillPaths: input.projectSpace.skillPaths } : {}),
+            systemPromptOverride: () => input.definition.systemPrompt
+          });
           const customTools = [
-            ...(input.projectSpace
-              ? [
-                  createPiProjectSkillReadTool({
-                    cwd: input.projectSpace.workingDirectory,
-                    skillPaths: input.projectSpace.skillPaths
-                  })
-                ]
-              : []),
+            ...createPiSkillReadTools({
+              cwd: workingDirectory,
+              runtimeToolIds: input.definition.runtimeToolGrantSet.toolIds,
+              skillPaths: resources.skillNames.size > 0 ? resources.skillPaths : []
+            }),
             ...createPiToolProxyDefinitions({
               agentId: input.agentId,
               approvals: createHumanInteractionToolApprovalGateway({ registry: interactionRegistry }),
@@ -521,37 +524,23 @@ export async function createRivusDeploymentAdapters(context: RivusDeploymentBoot
             }),
             ...(skillRuntime.tool ? [skillRuntime.tool] : [])
           ];
-          const resourceLoader = new DefaultResourceLoader({
-            agentDir: PI_AGENT_DIR,
-            ...(input.projectSpace ? { additionalSkillPaths: [...input.projectSpace.skillPaths] } : {}),
-            appendSystemPromptOverride: () =>
-              [workspaceInstructions.content, skillRuntime.prompt].filter((content) => content.length > 0),
-            cwd: workingDirectory,
-            noContextFiles: true,
-            noExtensions: true,
-            noPromptTemplates: true,
-            noSkills: true,
-            noThemes: true,
-            systemPromptOverride: () => input.definition.systemPrompt
-          });
-          await resourceLoader.reload();
-          const nativeSkillNames = input.projectSpace
-            ? validateProjectSkillCatalog(resourceLoader.getSkills())
-            : new Set<string>();
-          const result = await createAgentSession({
-            ...piOptions,
-            customTools,
-            resourceLoader,
-            sessionManager: SessionManager.create(workingDirectory, join(instanceState, "sessions")),
-            tools: customTools.map(({ name }) => name)
-          });
+          const activeToolNames = resolvePiSessionToolNames(input.definition.runtimeToolGrantSet.toolIds, customTools);
+          const result = await createAgentSession(
+            resources.withSessionOptions({
+              ...piOptions,
+              customTools,
+              excludeTools: [],
+              sessionManager: SessionManager.create(workingDirectory, join(instanceState, "sessions")),
+              tools: [...activeToolNames]
+            })
+          );
           return {
             activate: (loopInput) => {
               activeInput = loopInput;
             },
             dispose: () => result.session.dispose(),
             preparePrompt: async (loopInput) => {
-              validateProjectSkillCommand(loopInput.text, nativeSkillNames);
+              validatePiSkillCommand(loopInput.text, resources.skillNames);
               return prepareProjectMemory ? prepareProjectMemory(loopInput) : loopInput.text;
             },
             resolveToolName,
@@ -792,5 +781,5 @@ function sleep(ms: number): Effect.Effect<void> {
 }
 
 async function writeProviderBaseUrlOverride(provider: string, baseUrl: string): Promise<void> {
-  await writeFile(PI_MODELS_FILE, `${JSON.stringify({ providers: { [provider]: { baseUrl } } }, null, 2)}\n`, "utf8");
+  await mergePiProviderBaseUrlOverride({ baseUrl, filePath: PI_MODELS_FILE, provider });
 }