@rivus/agent 0.14.0 → 0.14.2

package/README.md

@@ -58,10 +58,7 @@ npx rivus --help
 Create the default Personal Agent Home without cloning this repository or installing another local Rivus copy:
 
 ```bash
-npm install --global \
-  @rivus/agent \
-  @earendil-works/pi-coding-agent@^0.80.6 \
-  @larksuiteoapi/node-sdk@^1.70.0
+npm install --global @rivus/agent
 rivus setup
 cp "$HOME/.rivus-agent/.env.example" "$HOME/.rivus-agent/.env"
 # Fill the Feishu and model-provider values in ~/.rivus-agent/.env.
@@ -71,11 +68,8 @@ rivus start
 
 `setup` refuses to overwrite existing Home files. `start`, `status`, and `check-config` read `RIVUS_HOME` or `~/.rivus-agent`, use its configured Workspace as cwd, and keep state outside npm installation files. `doctor` checks the Home, global modules, manifest, Workspace, and enabled Endpoint credential references without importing Plugin code or contacting external services. Existing standalone projects remain supported through `rivus init <directory>` and `rivus doctor <directory>`. See the [local deployment runbook](docs/en/operations/local-deployment.md).
 
-The Pi plus Feishu Bootstrap is an application-edge package export: install `@earendil-works/pi-coding-agent` and `@larksuiteoapi/node-sdk` beside the global Rivus package. The `@rivus/agent` core keeps those SDKs out of its mandatory runtime dependency graph.
-
-```bash
-npm install @earendil-works/pi-coding-agent@^0.80.6 @larksuiteoapi/node-sdk@^1.70.0
-```
+The maintained Pi plus Feishu Bootstrap is the default Personal Home runtime, so its pinned Pi SDK and compatible
+Feishu SDK are installed transitively with `@rivus/agent`. Optional adapter SDKs such as ACP remain separate peers.
 
 ## Quick Start
 
@@ -427,7 +421,7 @@ Recognized variables:
 - `RIVUS_WEATHER_DEFAULT_LOCATION` selects the example `current-weather` Tool's fallback city and defaults to `北京`; it is not a Core setting.
 - `RIVUS_TELEMETRY_ENVIRONMENT` defaults to `NODE_ENV`, then `local`; `RIVUS_TELEMETRY_SERVICE_NAME` defaults to `rivus-agent`.
 
-For both SDK bootstrap templates, `PI_MODEL` should use Pi's provider/model form when `PI_API_KEY`, `PI_API_KEY_FILE`, or `PI_BASE_URL` is set, for example `anthropic/claude-opus-4-5` or `zai/glm-5.1` for GLM BYOK. The templates apply the resolved Pi API key through Pi `AuthStorage.setRuntimeApiKey()`, resolve the model through Pi's public `ModelRegistry.find(provider, modelId)` API, and apply `PI_BASE_URL` by merging a local `.rivus/pi-models.json` provider override without removing existing custom models or other providers, matching Pi's `models.json` configuration model.
+For both SDK bootstrap templates, `PI_MODEL` should use Pi's provider/model form when `PI_API_KEY`, `PI_API_KEY_FILE`, or `PI_BASE_URL` is set, for example `anthropic/claude-opus-4-5` or `zai/glm-5.2` for GLM BYOK. The templates create Pi's isolated `ModelRuntime`, apply the resolved API key with `setRuntimeApiKey()`, resolve the model with `getModel(provider, modelId)`, and apply `PI_BASE_URL` by merging a local `.rivus/pi-models.json` provider override without removing existing custom models or other providers, matching Pi's `models.json` configuration model.
 
 ## Core Usage
 

package/dist/bootstrap/pi-feishu.js

@@ -9,7 +9,7 @@ import { mkdir, readFile } from "node:fs/promises";
 import { join, relative } from "node:path";
 import { homedir } from "node:os";
 import * as Lark from "@larksuiteoapi/node-sdk";
-import { AuthStorage, ModelRegistry, SessionManager, createAgentSession } from "@earendil-works/pi-coding-agent";
+import { ModelRuntime, SessionManager, createAgentSession } from "@earendil-works/pi-coding-agent";
 //#region examples/pi-feishu-deployment.bootstrap.ts
 const STATE_DIR = process.env.RIVUS_DEPLOYMENT_STATE_DIR?.trim() || ".rivus/deployment";
 const PI_AGENT_DIR = join(STATE_DIR, "pi-agent");
@@ -532,23 +532,25 @@ async function resolveFeishuBotOpenId(credentials, domain) {
 	return openId;
 }
 async function createPiSessionOptions(context) {
-	const authStorage = AuthStorage.create(PI_AUTH_FILE);
 	const modelReference = optional(context.env.PI_MODEL);
 	const configuredModel = modelReference ? parseModelReference(modelReference) : void 0;
 	const provider = configuredModel?.provider;
 	const apiKey = await resolvePiApiKey(context.env);
 	const baseUrl = optional(context.env.PI_BASE_URL);
 	if ((apiKey || baseUrl) && !provider) throw new Error("PI_API_KEY and PI_BASE_URL require PI_MODEL in provider/model form");
-	if (apiKey) authStorage.setRuntimeApiKey(provider, apiKey);
 	if (baseUrl) await writeProviderBaseUrlOverride(provider, baseUrl);
-	const modelRegistry = ModelRegistry.create(authStorage, baseUrl ? PI_MODELS_FILE : void 0);
-	const model = configuredModel ? modelRegistry.find(configuredModel.provider, configuredModel.modelId) : void 0;
-	if (modelReference && !model) throw new Error(`PI_MODEL ${modelReference} was not found in the Pi model registry`);
+	const modelRuntime = await ModelRuntime.create({
+		allowModelNetwork: false,
+		authPath: PI_AUTH_FILE,
+		modelsPath: baseUrl ? PI_MODELS_FILE : null
+	});
+	if (apiKey) await modelRuntime.setRuntimeApiKey(provider, apiKey);
+	const model = configuredModel ? modelRuntime.getModel(configuredModel.provider, configuredModel.modelId) : void 0;
+	if (modelReference && !model) throw new Error(`PI_MODEL ${modelReference} was not found in the Pi model runtime`);
 	const thinkingLevel = readThinkingLevel(context.env.PI_THINKING_LEVEL);
 	return {
-		authStorage,
 		cwd: process.cwd(),
-		modelRegistry,
+		modelRuntime,
 		...model ? { model } : {},
 		...thinkingLevel ? { thinkingLevel } : {}
 	};
@@ -568,7 +570,7 @@ function optional(value) {
 }
 function parseModelReference(reference) {
 	const separator = reference.indexOf("/");
-	if (separator <= 0 || separator === reference.length - 1) throw new Error("PI_MODEL must use provider/model form, for example zai/glm-5.1");
+	if (separator <= 0 || separator === reference.length - 1) throw new Error("PI_MODEL must use provider/model form, for example zai/glm-5.2");
 	return {
 		modelId: reference.slice(separator + 1),
 		provider: reference.slice(0, separator)

package/dist/chunks/src.js

@@ -1108,7 +1108,7 @@ function decodeInboundDeliverySnapshots(raw, options) {
 		if (delivery.revision !== (previous?.revision ?? 0) + 1) throw new Error(`invalid ${options.label} revision at line ${index + 1}`);
 		try {
 			if (previous) {
-				if (!isValidInboundDeliveryTransition(previous, delivery)) throw new Error("transition");
+				if (!isValidPersistedTransition(previous, delivery, options.acceptLegacySameAttemptClaims ?? false)) throw new Error("transition");
 			} else validateNewInboundDelivery(delivery);
 		} catch {
 			throw new Error(`invalid ${options.label} transition at line ${index + 1}`);
@@ -1153,6 +1153,14 @@ function decodeDelivery(value, payloadCodec) {
 function isEnvelope(value) {
 	return isRecord$5(value) && value.version === 1 && "delivery" in value;
 }
+function isValidPersistedTransition(previous, next, acceptLegacySameAttemptClaims) {
+	if (isValidInboundDeliveryTransition(previous, next)) return true;
+	if (!acceptLegacySameAttemptClaims || previous.state.status !== "pending" || next.state.status !== "leased" || next.attempts !== previous.attempts) return false;
+	return isValidInboundDeliveryTransition(previous, {
+		...next,
+		attempts: next.attempts + 1
+	});
+}
 //#endregion
 //#region src/modules/inbound-delivery/infrastructure/persistence/delivery/jsonl-inbound-delivery-repository.ts
 function openJsonlInboundDeliveryRepository(options) {
@@ -1160,6 +1168,7 @@ function openJsonlInboundDeliveryRepository(options) {
 		catch: (error) => error,
 		try: () => readPersistenceFile(options.filePath)
 	}).pipe(Effect.map((raw) => decodeInboundDeliverySnapshots(raw, {
+		...options.acceptLegacySameAttemptClaims === void 0 ? {} : { acceptLegacySameAttemptClaims: options.acceptLegacySameAttemptClaims },
 		label: options.label ?? "Inbound Delivery",
 		payload: options.payload
 	})), Effect.map((initial) => createInMemoryInboundDeliveryRepository({
@@ -1588,6 +1597,7 @@ function nonEmpty$1(value) {
 //#region src/adapters/compatibility/inbound-delivery/jsonl-feishu-inbox-repository.ts
 function openJsonlFeishuInboxRepository(options) {
 	return Effect.runPromise(openJsonlInboundDeliveryRepository({
+		acceptLegacySameAttemptClaims: true,
 		filePath: options.filePath,
 		label: "Feishu inbox",
 		payload: feishuInboundDeliveryPayloadCodec

package/dist/cli.js

@@ -416,8 +416,8 @@ function isMissingPath(error) {
 	return error instanceof Error && "code" in error && error.code === "ENOENT";
 }
 function projectPackageJson(directory, manifest) {
-	const pi = manifest.peerDependencies?.["@earendil-works/pi-coding-agent"];
-	const lark = manifest.peerDependencies?.["@larksuiteoapi/node-sdk"];
+	const pi = manifest.dependencies?.["@earendil-works/pi-coding-agent"];
+	const lark = manifest.dependencies?.["@larksuiteoapi/node-sdk"];
 	const effect = manifest.dependencies?.effect;
 	if (!pi || !lark || !effect) throw new Error("Rivus package manifest is missing its Effect, Pi, or Feishu dependency range");
 	const projectName = sanitizePackageName(basename(directory));

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

@@ -4,7 +4,7 @@ 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, ModelRegistry, SessionManager } from "@earendil-works/pi-coding-agent";
+import { createAgentSession, ModelRuntime, SessionManager } from "@earendil-works/pi-coding-agent";
 import {
   createAgentsMdInstructionsProvider,
   createAgentHarness,
@@ -720,7 +720,6 @@ async function resolveFeishuBotOpenId(
 }
 
 async function createPiSessionOptions(context: RivusDeploymentBootstrapContext): Promise<PiSessionOptions> {
-  const authStorage = AuthStorage.create(PI_AUTH_FILE);
   const modelReference = optional(context.env.PI_MODEL);
   const configuredModel = modelReference ? parseModelReference(modelReference) : undefined;
   const provider = configuredModel?.provider;
@@ -729,16 +728,19 @@ async function createPiSessionOptions(context: RivusDeploymentBootstrapContext):
   if ((apiKey || baseUrl) && !provider) {
     throw new Error("PI_API_KEY and PI_BASE_URL require PI_MODEL in provider/model form");
   }
-  if (apiKey) authStorage.setRuntimeApiKey(provider!, apiKey);
   if (baseUrl) await writeProviderBaseUrlOverride(provider!, baseUrl);
-  const modelRegistry = ModelRegistry.create(authStorage, baseUrl ? PI_MODELS_FILE : undefined);
-  const model = configuredModel ? modelRegistry.find(configuredModel.provider, configuredModel.modelId) : undefined;
-  if (modelReference && !model) throw new Error(`PI_MODEL ${modelReference} was not found in the Pi model registry`);
+  const modelRuntime = await ModelRuntime.create({
+    allowModelNetwork: false,
+    authPath: PI_AUTH_FILE,
+    modelsPath: baseUrl ? PI_MODELS_FILE : null
+  });
+  if (apiKey) await modelRuntime.setRuntimeApiKey(provider!, apiKey);
+  const model = configuredModel ? modelRuntime.getModel(configuredModel.provider, configuredModel.modelId) : undefined;
+  if (modelReference && !model) throw new Error(`PI_MODEL ${modelReference} was not found in the Pi model runtime`);
   const thinkingLevel = readThinkingLevel(context.env.PI_THINKING_LEVEL);
   return {
-    authStorage,
     cwd: process.cwd(),
-    modelRegistry,
+    modelRuntime,
     ...(model ? { model } : {}),
     ...(thinkingLevel ? { thinkingLevel } : {})
   };
@@ -762,7 +764,7 @@ function optional(value: string | undefined): string | undefined {
 function parseModelReference(reference: string): { readonly modelId: string; readonly provider: string } {
   const separator = reference.indexOf("/");
   if (separator <= 0 || separator === reference.length - 1) {
-    throw new Error("PI_MODEL must use provider/model form, for example zai/glm-5.1");
+    throw new Error("PI_MODEL must use provider/model form, for example zai/glm-5.2");
   }
   return { modelId: reference.slice(separator + 1), provider: reference.slice(0, separator) };
 }

package/examples/pi-feishu.bootstrap.ts

@@ -2,7 +2,7 @@ import { mkdir } from "node:fs/promises";
 import { homedir } from "node:os";
 import { Effect } from "effect";
 import * as Lark from "@larksuiteoapi/node-sdk";
-import { AuthStorage, createAgentSession, ModelRegistry, SessionManager } from "@earendil-works/pi-coding-agent";
+import { createAgentSession, ModelRuntime, SessionManager } from "@earendil-works/pi-coding-agent";
 import {
   createJsonFetchRequest,
   createJsonFileFeishuCardTargetRegistry,
@@ -164,44 +164,45 @@ function createLazyFeishuWebSocketClient(options: {
 }
 
 async function createPiSessionOptions(context: RivusDaemonBootstrapContext): Promise<PiSessionOptions> {
-  const authStorage = AuthStorage.create(PI_AUTH_FILE);
   const provider = readProviderFromModel(context.config.pi.model);
 
-  if (context.config.pi.apiKey) {
+  if (context.config.pi.baseUrl) {
     if (!provider) {
-      throw new Error("PI_API_KEY requires PI_MODEL in provider/model form, for example zai/glm-5.1");
+      throw new Error("PI_BASE_URL requires PI_MODEL in provider/model form, for example zai/glm-5.2");
     }
-    authStorage.setRuntimeApiKey(provider, context.config.pi.apiKey);
+    await writeProviderBaseUrlOverride(provider, context.config.pi.baseUrl);
   }
 
-  if (context.config.pi.baseUrl) {
+  const modelRuntime = await ModelRuntime.create({
+    allowModelNetwork: false,
+    authPath: PI_AUTH_FILE,
+    modelsPath: context.config.pi.baseUrl ? PI_MODELS_FILE : null
+  });
+  if (context.config.pi.apiKey) {
     if (!provider) {
-      throw new Error("PI_BASE_URL requires PI_MODEL in provider/model form, for example zai/glm-5.1");
+      throw new Error("PI_API_KEY requires PI_MODEL in provider/model form, for example zai/glm-5.2");
     }
-    await writeProviderBaseUrlOverride(provider, context.config.pi.baseUrl);
+    await modelRuntime.setRuntimeApiKey(provider, context.config.pi.apiKey);
   }
-
-  const modelRegistry = ModelRegistry.create(authStorage, context.config.pi.baseUrl ? PI_MODELS_FILE : undefined);
-  const model = context.config.pi.model ? resolveConfiguredPiModel(modelRegistry, context.config.pi.model) : undefined;
+  const model = context.config.pi.model ? resolveConfiguredPiModel(modelRuntime, context.config.pi.model) : undefined;
   return {
-    authStorage,
     cwd: process.cwd(),
-    modelRegistry,
+    modelRuntime,
     ...(model ? { model } : {}),
     ...(context.config.pi.thinkingLevel ? { thinkingLevel: context.config.pi.thinkingLevel } : {})
   };
 }
 
-function resolveConfiguredPiModel(modelRegistry: ModelRegistry, modelReference: string): PiSessionOptions["model"] {
+function resolveConfiguredPiModel(modelRuntime: ModelRuntime, modelReference: string): PiSessionOptions["model"] {
   const provider = readProviderFromModel(modelReference);
   const modelId = readModelIdFromModel(modelReference);
   if (!provider || !modelId) {
-    throw new Error("PI_MODEL must use provider/model form, for example zai/glm-5.1");
+    throw new Error("PI_MODEL must use provider/model form, for example zai/glm-5.2");
   }
 
-  const model = modelRegistry.find(provider, modelId);
+  const model = modelRuntime.getModel(provider, modelId);
   if (!model) {
-    throw new Error(`PI_MODEL ${modelReference} was not found in the Pi model registry`);
+    throw new Error(`PI_MODEL ${modelReference} was not found in the Pi model runtime`);
   }
   return model as PiSessionOptions["model"];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivus/agent",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "description": "A local agent daemon core built around a usable agent harness and domain events.",
   "type": "module",
   "license": "MIT",
@@ -88,35 +88,28 @@
     "version-packages:ci": "npm run version-packages && npm run check"
   },
   "dependencies": {
+    "@earendil-works/pi-coding-agent": "0.84.4",
+    "@larksuiteoapi/node-sdk": "1.71.1",
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/exporter-trace-otlp-proto": "^0.220.0",
     "@opentelemetry/resources": "^2.9.0",
     "@opentelemetry/sdk-trace-base": "^2.9.0",
     "@opentelemetry/sdk-trace-node": "^2.9.0",
+    "axios": "1.18.0",
     "effect": "^3.21.4",
     "typebox": "^1.1.38"
   },
   "peerDependencies": {
-    "@agentclientprotocol/sdk": "^1.3.0",
-    "@earendil-works/pi-coding-agent": "0.80.6",
-    "@larksuiteoapi/node-sdk": "^1.70.0"
+    "@agentclientprotocol/sdk": "^1.3.0"
   },
   "peerDependenciesMeta": {
     "@agentclientprotocol/sdk": {
       "optional": true
-    },
-    "@earendil-works/pi-coding-agent": {
-      "optional": true
-    },
-    "@larksuiteoapi/node-sdk": {
-      "optional": true
     }
   },
   "devDependencies": {
     "@agentclientprotocol/sdk": "^1.3.0",
     "@changesets/cli": "^2.31.1",
-    "@earendil-works/pi-coding-agent": "0.80.6",
-    "@larksuiteoapi/node-sdk": "1.71.1",
     "@types/node": "24.13.3",
     "@vitest/coverage-v8": "4.1.10",
     "jscpd": "4.2.5",
@@ -128,7 +121,6 @@
     "node": "^24.11.0"
   },
   "overrides": {
-    "axios": "1.16.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.2.4"
   },
   "devEngines": {