@codex-infinity/pi-infinity 0.64.2 → 0.65.1

package/docs/sdk.md

@@ -115,33 +115,46 @@ interface AgentSession {
 }
 ```
 
-Session replacement APIs such as new-session, resume, fork, and import live on `AgentSessionRuntimeHost`, not on `AgentSession`.
+Session replacement APIs such as new-session, resume, fork, and import live on `AgentSessionRuntime`, not on `AgentSession`.
 
-### createAgentSessionRuntime() and AgentSessionRuntimeHost
+### createAgentSessionRuntime() and AgentSessionRuntime
 
 Use the runtime API when you need to replace the active session and rebuild cwd-bound runtime state.
 This is the same layer used by the built-in interactive, print, and RPC modes.
 
+`createAgentSessionRuntime()` takes a runtime factory plus the initial cwd/session target. The factory closes over process-global fixed inputs, recreates cwd-bound services for the effective cwd, resolves session options against those services, and returns a full runtime result.
+
 ```typescript
 import {
-  AgentSessionRuntimeHost,
+  type CreateAgentSessionRuntimeFactory,
+  createAgentSessionFromServices,
   createAgentSessionRuntime,
+  createAgentSessionServices,
+  getAgentDir,
   SessionManager,
 } from "@mariozechner/pi-coding-agent";
 
-const bootstrap = {
-  // Optional: authStorage, model, thinkingLevel, tools, customTools, resourceLoader
+const createRuntime: CreateAgentSessionRuntimeFactory = async ({ cwd, sessionManager, sessionStartEvent }) => {
+  const services = await createAgentSessionServices({ cwd });
+  return {
+    ...(await createAgentSessionFromServices({
+      services,
+      sessionManager,
+      sessionStartEvent,
+    })),
+    services,
+    diagnostics: services.diagnostics,
+  };
 };
 
-const runtime = await createAgentSessionRuntime(bootstrap, {
+const runtime = await createAgentSessionRuntime(createRuntime, {
   cwd: process.cwd(),
+  agentDir: getAgentDir(),
   sessionManager: SessionManager.create(process.cwd()),
 });
-
-const runtimeHost = new AgentSessionRuntimeHost(bootstrap, runtime);
 ```
 
-`createAgentSessionRuntime()` returns an internal runtime bundle. `AgentSessionRuntimeHost` owns replacement of that bundle across:
+`AgentSessionRuntime` owns replacement of the active runtime across:
 
 - `newSession()`
 - `switchSession()`
@@ -150,18 +163,20 @@ const runtimeHost = new AgentSessionRuntimeHost(bootstrap, runtime);
 
 Important behavior:
 
-- `runtimeHost.session` changes after those operations
+- `runtime.session` changes after those operations
 - event subscriptions are attached to a specific `AgentSession`, so re-subscribe after replacement
-- if you use extensions, call `runtimeHost.session.bindExtensions(...)` again for the new session
+- if you use extensions, call `runtime.session.bindExtensions(...)` again for the new session
+- creation returns diagnostics on `runtime.diagnostics`
+- if runtime creation or replacement fails, the method throws and the caller decides how to handle it
 
 ```typescript
-let session = runtimeHost.session;
+let session = runtime.session;
 let unsubscribe = session.subscribe(() => {});
 
-await runtimeHost.newSession();
+await runtime.newSession();
 
 unsubscribe();
-session = runtimeHost.session;
+session = runtime.session;
 unsubscribe = session.subscribe(() => {});
 ```
 
@@ -493,21 +508,21 @@ const { session } = await createAgentSession({
 
 ```typescript
 import { Type } from "@sinclair/typebox";
-import { createAgentSession, type ToolDefinition } from "@mariozechner/pi-coding-agent";
+import { createAgentSession, defineTool } from "@mariozechner/pi-coding-agent";
 
 // Inline custom tool
-const myTool: ToolDefinition = {
+const myTool = defineTool({
   name: "my_tool",
   label: "My Tool",
   description: "Does something useful",
   parameters: Type.Object({
     input: Type.String({ description: "Input value" }),
   }),
-  execute: async (toolCallId, params, onUpdate, ctx, signal) => ({
+  execute: async (_toolCallId, params) => ({
     content: [{ type: "text", text: `Result: ${params.input}` }],
     details: {},
   }),
-};
+});
 
 // Pass custom tools directly
 const { session } = await createAgentSession({
@@ -515,6 +530,8 @@ const { session } = await createAgentSession({
 });
 ```
 
+Use `defineTool()` for standalone definitions and arrays like `customTools: [myTool]`. Inline `pi.registerTool({ ... })` already infers parameter types correctly.
+
 Custom tools passed via `customTools` are combined with extension-registered tools. Extensions loaded by the ResourceLoader can also register tools via `pi.registerTool()`.
 
 > See [examples/sdk/05-tools.ts](../examples/sdk/05-tools.ts)
@@ -644,9 +661,12 @@ Sessions use a tree structure with `id`/`parentId` linking, enabling in-place br
 
 ```typescript
 import {
-  AgentSessionRuntimeHost,
+  type CreateAgentSessionRuntimeFactory,
   createAgentSession,
+  createAgentSessionFromServices,
   createAgentSessionRuntime,
+  createAgentSessionServices,
+  getAgentDir,
   SessionManager,
 } from "@mariozechner/pi-coding-agent";
 
@@ -678,21 +698,33 @@ const currentProjectSessions = await SessionManager.list(process.cwd());
 const allSessions = await SessionManager.listAll(process.cwd());
 
 // Session replacement API for /new, /resume, /fork, and import flows.
-const bootstrap = {};
-const runtime = await createAgentSessionRuntime(bootstrap, {
+const createRuntime: CreateAgentSessionRuntimeFactory = async ({ cwd, sessionManager, sessionStartEvent }) => {
+  const services = await createAgentSessionServices({ cwd });
+  return {
+    ...(await createAgentSessionFromServices({
+      services,
+      sessionManager,
+      sessionStartEvent,
+    })),
+    services,
+    diagnostics: services.diagnostics,
+  };
+};
+
+const runtime = await createAgentSessionRuntime(createRuntime, {
   cwd: process.cwd(),
+  agentDir: getAgentDir(),
   sessionManager: SessionManager.create(process.cwd()),
 });
-const runtimeHost = new AgentSessionRuntimeHost(bootstrap, runtime);
 
 // Replace the active session with a fresh one
-await runtimeHost.newSession();
+await runtime.newSession();
 
 // Replace the active session with another saved session
-await runtimeHost.switchSession("/path/to/session.jsonl");
+await runtime.switchSession("/path/to/session.jsonl");
 
 // Replace the active session with a fork from a specific entry
-await runtimeHost.fork("entry-id");
+await runtime.fork("entry-id");
 ```
 
 **SessionManager tree API:**
@@ -828,14 +860,14 @@ import { getModel } from "@mariozechner/pi-ai";
 import { Type } from "@sinclair/typebox";
 import {
   AuthStorage,
+  bashTool,
   createAgentSession,
   DefaultResourceLoader,
+  defineTool,
   ModelRegistry,
+  readTool,
   SessionManager,
   SettingsManager,
-  readTool,
-  bashTool,
-  type ToolDefinition,
 } from "@mariozechner/pi-coding-agent";
 
 // Set up auth storage (custom location)
@@ -850,7 +882,7 @@ if (process.env.MY_KEY) {
 const modelRegistry = ModelRegistry.create(authStorage);
 
 // Inline tool
-const statusTool: ToolDefinition = {
+const statusTool = defineTool({
   name: "status",
   label: "Status",
   description: "Get system status",
@@ -859,7 +891,7 @@ const statusTool: ToolDefinition = {
     content: [{ type: "text", text: `Uptime: ${process.uptime()}s` }],
     details: {},
   }),
-};
+});
 
 const model = getModel("anthropic", "claude-opus-4-5");
 if (!model) throw new Error("Model not found");
@@ -914,20 +946,30 @@ Full TUI interactive mode with editor, chat history, and all built-in commands:
 
 ```typescript
 import {
-  AgentSessionRuntimeHost,
+  type CreateAgentSessionRuntimeFactory,
+  createAgentSessionFromServices,
   createAgentSessionRuntime,
+  createAgentSessionServices,
+  getAgentDir,
   InteractiveMode,
   SessionManager,
 } from "@mariozechner/pi-coding-agent";
 
-const bootstrap = {};
-const runtime = await createAgentSessionRuntime(bootstrap, {
+const createRuntime: CreateAgentSessionRuntimeFactory = async ({ cwd, sessionManager, sessionStartEvent }) => {
+  const services = await createAgentSessionServices({ cwd });
+  return {
+    ...(await createAgentSessionFromServices({ services, sessionManager, sessionStartEvent })),
+    services,
+    diagnostics: services.diagnostics,
+  };
+};
+const runtime = await createAgentSessionRuntime(createRuntime, {
   cwd: process.cwd(),
+  agentDir: getAgentDir(),
   sessionManager: SessionManager.create(process.cwd()),
 });
-const runtimeHost = new AgentSessionRuntimeHost(bootstrap, runtime);
 
-const mode = new InteractiveMode(runtimeHost, {
+const mode = new InteractiveMode(runtime, {
   migratedProviders: [],
   modelFallbackMessage: undefined,
   initialMessage: "Hello",
@@ -944,20 +986,30 @@ Single-shot mode: send prompts, output result, exit:
 
 ```typescript
 import {
-  AgentSessionRuntimeHost,
+  type CreateAgentSessionRuntimeFactory,
+  createAgentSessionFromServices,
   createAgentSessionRuntime,
+  createAgentSessionServices,
+  getAgentDir,
   runPrintMode,
   SessionManager,
 } from "@mariozechner/pi-coding-agent";
 
-const bootstrap = {};
-const runtime = await createAgentSessionRuntime(bootstrap, {
+const createRuntime: CreateAgentSessionRuntimeFactory = async ({ cwd, sessionManager, sessionStartEvent }) => {
+  const services = await createAgentSessionServices({ cwd });
+  return {
+    ...(await createAgentSessionFromServices({ services, sessionManager, sessionStartEvent })),
+    services,
+    diagnostics: services.diagnostics,
+  };
+};
+const runtime = await createAgentSessionRuntime(createRuntime, {
   cwd: process.cwd(),
+  agentDir: getAgentDir(),
   sessionManager: SessionManager.create(process.cwd()),
 });
-const runtimeHost = new AgentSessionRuntimeHost(bootstrap, runtime);
 
-await runPrintMode(runtimeHost, {
+await runPrintMode(runtime, {
   mode: "text",
   initialMessage: "Hello",
   initialImages: [],
@@ -971,20 +1023,30 @@ JSON-RPC mode for subprocess integration:
 
 ```typescript
 import {
-  AgentSessionRuntimeHost,
+  type CreateAgentSessionRuntimeFactory,
+  createAgentSessionFromServices,
   createAgentSessionRuntime,
+  createAgentSessionServices,
+  getAgentDir,
   runRpcMode,
   SessionManager,
 } from "@mariozechner/pi-coding-agent";
 
-const bootstrap = {};
-const runtime = await createAgentSessionRuntime(bootstrap, {
+const createRuntime: CreateAgentSessionRuntimeFactory = async ({ cwd, sessionManager, sessionStartEvent }) => {
+  const services = await createAgentSessionServices({ cwd });
+  return {
+    ...(await createAgentSessionFromServices({ services, sessionManager, sessionStartEvent })),
+    services,
+    diagnostics: services.diagnostics,
+  };
+};
+const runtime = await createAgentSessionRuntime(createRuntime, {
   cwd: process.cwd(),
+  agentDir: getAgentDir(),
   sessionManager: SessionManager.create(process.cwd()),
 });
-const runtimeHost = new AgentSessionRuntimeHost(bootstrap, runtime);
 
-await runRpcMode(runtimeHost);
+await runRpcMode(runtime);
 ```
 
 See [RPC documentation](rpc.md) for the JSON protocol.
@@ -1018,7 +1080,7 @@ The main entry point exports:
 // Factory
 createAgentSession
 createAgentSessionRuntime
-AgentSessionRuntimeHost
+AgentSessionRuntime
 
 // Auth and Models
 AuthStorage
@@ -1030,6 +1092,7 @@ type ResourceLoader
 createEventBus
 
 // Helpers
+defineTool
 
 // Session management
 SessionManager

package/docs/settings.md

@@ -137,7 +137,7 @@ When a provider requests a retry delay longer than `maxDelayMs` (e.g., Google's
 { "sessionDir": ".pi/sessions" }
 ```
 
-When multiple sources specify a session directory, `--session-dir` CLI flag takes precedence, then `sessionDir` in settings.json, then extension hooks.
+When multiple sources specify a session directory, `--session-dir` CLI flag takes precedence over `sessionDir` in settings.json.
 
 ### Model Cycling
 

package/examples/extensions/custom-provider-anthropic/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "pi-extension-custom-provider",
-  "version": "1.15.1",
+  "version": "1.16.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pi-extension-custom-provider",
-      "version": "1.15.1",
+      "version": "1.16.1",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.52.0"
       }

package/examples/extensions/custom-provider-anthropic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-extension-custom-provider-anthropic",
   "private": true,
-  "version": "1.15.1",
+  "version": "1.16.1",
   "type": "module",
   "scripts": {
     "clean": "echo 'nothing to clean'",

package/examples/extensions/custom-provider-gitlab-duo/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-extension-custom-provider-gitlab-duo",
   "private": true,
-  "version": "1.15.1",
+  "version": "1.16.1",
   "type": "module",
   "scripts": {
     "clean": "echo 'nothing to clean'",

package/examples/extensions/custom-provider-qwen-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-extension-custom-provider-qwen-cli",
   "private": true,
-  "version": "1.14.1",
+  "version": "1.15.1",
   "type": "module",
   "scripts": {
     "clean": "echo 'nothing to clean'",

package/examples/extensions/hello.ts

@@ -3,23 +3,24 @@
  */
 
 import { Type } from "@mariozechner/pi-ai";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { defineTool, type ExtensionAPI } from "@mariozechner/pi-coding-agent";
 
-export default function (pi: ExtensionAPI) {
-	pi.registerTool({
-		name: "hello",
-		label: "Hello",
-		description: "A simple greeting tool",
-		parameters: Type.Object({
-			name: Type.String({ description: "Name to greet" }),
-		}),
+const helloTool = defineTool({
+	name: "hello",
+	label: "Hello",
+	description: "A simple greeting tool",
+	parameters: Type.Object({
+		name: Type.String({ description: "Name to greet" }),
+	}),
+
+	async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
+		return {
+			content: [{ type: "text", text: `Hello, ${params.name}!` }],
+			details: { greeted: params.name },
+		};
+	},
+});
 
-		async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
-			const { name } = params as { name: string };
-			return {
-				content: [{ type: "text", text: `Hello, ${name}!` }],
-				details: { greeted: name },
-			};
-		},
-	});
+export default function (pi: ExtensionAPI) {
+	pi.registerTool(helloTool);
 }

package/examples/extensions/with-deps/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "pi-extension-with-deps",
-  "version": "1.28.1",
+  "version": "1.29.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pi-extension-with-deps",
-      "version": "1.28.1",
+      "version": "1.29.1",
       "dependencies": {
         "ms": "^2.1.3"
       },

package/examples/extensions/with-deps/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-extension-with-deps",
   "private": true,
-  "version": "1.28.1",
+  "version": "1.29.1",
   "type": "module",
   "scripts": {
     "clean": "echo 'nothing to clean'",

package/examples/sdk/13-session-runtime.ts

@@ -1,27 +1,45 @@
 /**
- * Session Runtime Host
+ * Session runtime
  *
- * Use the runtime host when you need to replace the active AgentSession,
+ * Use AgentSessionRuntime when you need to replace the active AgentSession,
  * for example for new-session, resume, fork, or import flows.
  *
- * The important pattern is: after the host replaces the runtime, rebind any
- * session-local subscriptions and extension bindings to `runtimeHost.session`.
+ * The important pattern is: after the runtime replaces the active session,
+ * rebind any session-local subscriptions and extension bindings to `runtime.session`.
  */
 
-import { AgentSessionRuntimeHost, createAgentSessionRuntime, SessionManager } from "@mariozechner/pi-coding-agent";
+import {
+	type CreateAgentSessionRuntimeFactory,
+	createAgentSessionFromServices,
+	createAgentSessionRuntime,
+	createAgentSessionServices,
+	getAgentDir,
+	SessionManager,
+} from "@mariozechner/pi-coding-agent";
 
-const bootstrap = {};
-const runtime = await createAgentSessionRuntime(bootstrap, {
+const createRuntime: CreateAgentSessionRuntimeFactory = async ({ cwd, sessionManager, sessionStartEvent }) => {
+	const services = await createAgentSessionServices({ cwd });
+	return {
+		...(await createAgentSessionFromServices({
+			services,
+			sessionManager,
+			sessionStartEvent,
+		})),
+		services,
+		diagnostics: services.diagnostics,
+	};
+};
+const runtime = await createAgentSessionRuntime(createRuntime, {
 	cwd: process.cwd(),
+	agentDir: getAgentDir(),
 	sessionManager: SessionManager.create(process.cwd()),
 });
-const runtimeHost = new AgentSessionRuntimeHost(bootstrap, runtime);
 
 let unsubscribe: (() => void) | undefined;
 
 async function bindSession() {
 	unsubscribe?.();
-	const session = runtimeHost.session;
+	const session = runtime.session;
 	await session.bindExtensions({});
 	unsubscribe = session.subscribe((event) => {
 		if (event.type === "queue_update") {
@@ -35,15 +53,15 @@ let session = await bindSession();
 const originalSessionFile = session.sessionFile;
 console.log("Initial session:", originalSessionFile);
 
-await runtimeHost.newSession();
+await runtime.newSession();
 session = await bindSession();
 console.log("After newSession():", session.sessionFile);
 
 if (originalSessionFile) {
-	await runtimeHost.switchSession(originalSessionFile);
+	await runtime.switchSession(originalSessionFile);
 	session = await bindSession();
 	console.log("After switchSession():", session.sessionFile);
 }
 
 unsubscribe?.();
-await runtimeHost.dispose();
+await runtime.dispose();

package/examples/sdk/README.md

@@ -2,6 +2,8 @@
 
 Programmatic usage of pi-coding-agent via `createAgentSession()` and `createAgentSessionRuntime()`.
 
+The runtime example shows how to build a recreate function that closes over process-global fixed inputs and recreates cwd-bound services and sessions as the active session cwd changes.
+
 ## Examples
 
 | File | Description |

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codex-infinity/pi-infinity",
-	"version": "0.64.2",
+	"version": "0.65.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"piConfig": {
@@ -40,9 +40,9 @@
 	},
 	"dependencies": {
 		"@mariozechner/jiti": "^2.6.2",
-		"@mariozechner/pi-agent-core": "^0.64.2",
-		"@mariozechner/pi-ai": "^0.64.2",
-		"@mariozechner/pi-tui": "^0.64.2",
+		"@mariozechner/pi-agent-core": "^0.65.1",
+		"@mariozechner/pi-ai": "^0.65.1",
+		"@mariozechner/pi-tui": "^0.65.1",
 		"@silvia-odwyer/photon-node": "^0.3.4",
 		"ajv": "^8.17.1",
 		"chalk": "^5.5.0",