@roj-ai/sdk 0.1.32 → 0.1.34

package/dist/plugins/session-stats/plugin.js

@@ -1,21 +1,28 @@
 import { agentEvents } from '../../core/agents/state.js';
+import { contextEvents } from '../../core/context/state.js';
 import { llmEvents } from '../../core/llm/state.js';
 import { definePlugin } from '../../core/plugins/plugin-builder.js';
 import { selectPluginState } from '../../core/sessions/reducer.js';
 import { toolEvents } from '../../core/tools/state.js';
+import { userChatEvents } from '../../plugins/user-chat/plugin.js';
 const createInitialStats = () => ({
     totalTokens: 0,
     promptTokens: 0,
     completionTokens: 0,
+    cacheReadTokens: 0,
+    cacheWriteTokens: 0,
     totalCost: 0,
     llmCalls: 0,
     llmErrors: 0,
     toolCalls: 0,
     toolErrors: 0,
+    userMessages: 0,
+    compactions: 0,
     agentCount: 0,
     firstEventAt: null,
     lastEventAt: null,
     byProvider: {},
+    byAgent: {},
 });
 const PLUGIN_STATE_KEY = 'sessionStats';
 /**
@@ -28,11 +35,11 @@ export function selectSessionStats(sessionState) {
 // Plugin
 // ============================================================================
 export const sessionStatsPlugin = definePlugin('session-stats')
-    .events([agentEvents, llmEvents, toolEvents])
+    .events([agentEvents, llmEvents, toolEvents, contextEvents, userChatEvents])
     .state({
     key: PLUGIN_STATE_KEY,
     initial: createInitialStats,
-    reduce: (stats, event) => {
+    reduce: (stats, event, sessionState) => {
         const now = event.timestamp;
         const withTimestamp = (partial) => ({
             ...stats,
@@ -61,13 +68,29 @@ export const sessionStatsPlugin = definePlugin('session-stats')
                         },
                     }
                     : stats.byProvider;
+                // Core reducer runs before plugin slices, so the spawning agent is already in state.
+                const definitionName = sessionState.agents.get(event.agentId)?.definitionName;
+                const byAgent = definitionName
+                    ? {
+                        ...stats.byAgent,
+                        [definitionName]: {
+                            llmCalls: (stats.byAgent[definitionName]?.llmCalls ?? 0) + 1,
+                            promptTokens: (stats.byAgent[definitionName]?.promptTokens ?? 0) + event.metrics.promptTokens,
+                            completionTokens: (stats.byAgent[definitionName]?.completionTokens ?? 0) + event.metrics.completionTokens,
+                            totalCost: (stats.byAgent[definitionName]?.totalCost ?? 0) + (event.metrics.cost ?? 0),
+                        },
+                    }
+                    : stats.byAgent;
                 return withTimestamp({
                     llmCalls: stats.llmCalls + 1,
                     totalTokens: stats.totalTokens + event.metrics.totalTokens,
                     promptTokens: stats.promptTokens + event.metrics.promptTokens,
                     completionTokens: stats.completionTokens + event.metrics.completionTokens,
+                    cacheReadTokens: stats.cacheReadTokens + (event.metrics.cachedTokens ?? 0),
+                    cacheWriteTokens: stats.cacheWriteTokens + (event.metrics.cacheWriteTokens ?? 0),
                     totalCost: stats.totalCost + (event.metrics.cost ?? 0),
                     byProvider,
+                    byAgent,
                 });
             }
             case 'inference_failed':
@@ -76,6 +99,10 @@ export const sessionStatsPlugin = definePlugin('session-stats')
                 return withTimestamp({ toolCalls: stats.toolCalls + 1 });
             case 'tool_failed':
                 return withTimestamp({ toolErrors: stats.toolErrors + 1 });
+            case 'user_chat_message_received':
+                return withTimestamp({ userMessages: stats.userMessages + 1 });
+            case 'context_compacted':
+                return withTimestamp({ compactions: stats.compactions + 1 });
             default:
                 return stats;
         }

package/dist/plugins/session-stats/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/plugins/session-stats/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAE9D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AA8BlD,MAAM,kBAAkB,GAAG,GAAsB,EAAE,CAAC,CAAC;IACpD,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,CAAC;IACf,gBAAgB,EAAE,CAAC;IACnB,SAAS,EAAE,CAAC;IACZ,QAAQ,EAAE,CAAC;IACX,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,CAAC;IACZ,UAAU,EAAE,CAAC;IACb,UAAU,EAAE,CAAC;IACb,YAAY,EAAE,IAAI;IAClB,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,EAAE;CACd,CAAC,CAAA;AAEF,MAAM,gBAAgB,GAAG,cAAc,CAAA;AAEvC;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,YAA0B;IAC5D,OAAO,iBAAiB,CAAoB,YAAY,EAAE,gBAAgB,CAAC,IAAI,kBAAkB,EAAE,CAAA;AACpG,CAAC;AAED,+EAA+E;AAC/E,SAAS;AACT,+EAA+E;AAE/E,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAC,eAAe,CAAC;KAC7D,MAAM,CAAC,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;KAC5C,KAAK,CAAC;IACN,GAAG,EAAE,gBAAgB;IACrB,OAAO,EAAE,kBAAkB;IAC3B,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACxB,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAA;QAC3B,MAAM,aAAa,GAAG,CAAC,OAAmC,EAAqB,EAAE,CAAC,CAAC;YAClF,GAAG,KAAK;YACR,GAAG,OAAO;YACV,YAAY,EAAE,KAAK,CAAC,YAAY,IAAI,GAAG;YACvC,WAAW,EAAE,GAAG;SAChB,CAAC,CAAA;QAEF,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,eAAe;gBACnB,OAAO,aAAa,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,CAAA;YAE3D,0EAA0E;YAC1E,oEAAoE;YACpE,sDAAsD;YACtD,KAAK,qBAAqB,CAAC;YAC3B,KAAK,+BAA+B,CAAC,CAAC,CAAC;gBACtC,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAA;gBACvC,MAAM,UAAU,GAAG,QAAQ;oBAC1B,CAAC,CAAC;wBACD,GAAG,KAAK,CAAC,UAAU;wBACnB,CAAC,QAAQ,CAAC,EAAE;4BACX,QAAQ,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC;4BACzD,WAAW,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,WAAW,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW;4BACvF,YAAY,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,YAAY,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY;4BAC1F,gBAAgB,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,gBAAgB,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB;4BACtG,SAAS,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC;yBACnF;qBACD;oBACD,CAAC,CAAC,KAAK,CAAC,UAAU,CAAA;gBACnB,OAAO,aAAa,CAAC;oBACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAG,CAAC;oBAC5B,WAAW,EAAE,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW;oBAC1D,YAAY,EAAE,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY;oBAC7D,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB;oBACzE,SAAS,EAAE,KAAK,CAAC,SAAS,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC;oBACtD,UAAU;iBACV,CAAC,CAAA;YACH,CAAC;YAED,KAAK,kBAAkB;gBACtB,OAAO,aAAa,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,CAAA;YAEzD,KAAK,cAAc;gBAClB,OAAO,aAAa,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,CAAA;YAEzD,KAAK,aAAa;gBACjB,OAAO,aAAa,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,CAAA;YAE3D;gBACC,OAAO,KAAK,CAAA;QACd,CAAC;IACF,CAAC;CACD,CAAC;KACD,KAAK,EAAE,CAAA"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/plugins/session-stats/plugin.ts"],"names":[],"mappings":"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"}

package/dist/plugins/session-stats/plugin.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=plugin.test.d.ts.map

package/dist/plugins/session-stats/plugin.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin.test.d.ts","sourceRoot":"","sources":["../../../src/plugins/session-stats/plugin.test.ts"],"names":[],"mappings":""}

package/dist/plugins/session-stats/plugin.test.js

@@ -0,0 +1,145 @@
+import { describe, expect, it } from 'bun:test';
+import { AgentId } from '../../core/agents/schema.js';
+import { agentEvents } from '../../core/agents/state.js';
+import { contextEvents } from '../../core/context/state.js';
+import { withSessionId } from '../../core/events/test-helpers.js';
+import { llmEvents } from '../../core/llm/state.js';
+import { createApplyEvent } from '../../core/sessions/apply-event.js';
+import { SessionId } from '../../core/sessions/schema.js';
+import { createSessionState } from '../../core/sessions/state.js';
+import { ToolCallId } from '../../core/tools/schema.js';
+import { toolEvents } from '../../core/tools/state.js';
+import { userChatEvents } from '../../plugins/user-chat/plugin.js';
+import { ChatMessageId } from '../../plugins/user-chat/schema.js';
+import { selectSessionStats, sessionStatsPlugin } from './plugin.js';
+const sessionId = SessionId('session-stats-test');
+const orchestrator = AgentId('orchestrator-1');
+const worker = AgentId('worker-1');
+const applyEvent = createApplyEvent([sessionStatsPlugin.create()]);
+const metrics = (overrides = {}) => ({
+    promptTokens: 100,
+    completionTokens: 20,
+    totalTokens: 120,
+    latencyMs: 10,
+    model: 'test-model',
+    provider: 'anthropic',
+    cost: 0.5,
+    ...overrides,
+});
+const spawn = (agentId, definitionName) => withSessionId(sessionId, agentEvents.create('agent_spawned', { agentId, definitionName, parentId: null }));
+const inference = (agentId, m) => withSessionId(sessionId, llmEvents.create('inference_completed', {
+    agentId,
+    consumedMessageIds: [],
+    response: { content: 'ok', toolCalls: [] },
+    metrics: m,
+}));
+const reduce = (events) => selectSessionStats(events.reduce(applyEvent, createSessionState(sessionId, 'test-preset', 0)));
+describe('session-stats plugin', () => {
+    it('starts from zeroed counters', () => {
+        const stats = reduce([]);
+        expect(stats.userMessages).toBe(0);
+        expect(stats.compactions).toBe(0);
+        expect(stats.cacheReadTokens).toBe(0);
+        expect(stats.cacheWriteTokens).toBe(0);
+        expect(stats.byAgent).toEqual({});
+    });
+    it('counts user chat messages', () => {
+        const stats = reduce([
+            spawn(orchestrator, 'orchestrator'),
+            withSessionId(sessionId, userChatEvents.create('user_chat_message_received', {
+                agentId: orchestrator,
+                messageId: ChatMessageId('m1'),
+                content: 'hello',
+                timestamp: 1,
+            })),
+            withSessionId(sessionId, userChatEvents.create('user_chat_message_received', {
+                agentId: orchestrator,
+                messageId: ChatMessageId('m2'),
+                content: 'again',
+                timestamp: 2,
+            })),
+        ]);
+        expect(stats.userMessages).toBe(2);
+    });
+    it('counts context compactions', () => {
+        const stats = reduce([
+            spawn(orchestrator, 'orchestrator'),
+            withSessionId(sessionId, contextEvents.create('context_compacted', {
+                agentId: orchestrator,
+                compactedContent: 'summary',
+                newConversationHistory: [],
+                originalTokens: 1000,
+                compactedTokens: 100,
+                messagesRemoved: 8,
+            })),
+        ]);
+        expect(stats.compactions).toBe(1);
+    });
+    it('sums cache read and write tokens across main and auxiliary inferences', () => {
+        const stats = reduce([
+            spawn(orchestrator, 'orchestrator'),
+            inference(orchestrator, metrics({ cachedTokens: 800, cacheWriteTokens: 200 })),
+            withSessionId(sessionId, llmEvents.create('auxiliary_inference_completed', {
+                agentId: orchestrator,
+                metrics: metrics({ cachedTokens: 50, cacheWriteTokens: 10 }),
+            })),
+            // Providers that report no cache usage must not break the totals.
+            inference(orchestrator, metrics()),
+        ]);
+        expect(stats.cacheReadTokens).toBe(850);
+        expect(stats.cacheWriteTokens).toBe(210);
+        expect(stats.llmCalls).toBe(3);
+    });
+    it('breaks LLM usage down by agent definition name', () => {
+        const stats = reduce([
+            spawn(orchestrator, 'orchestrator'),
+            spawn(worker, 'coder'),
+            inference(orchestrator, metrics({ promptTokens: 100, completionTokens: 20, cost: 0.5 })),
+            inference(worker, metrics({ promptTokens: 300, completionTokens: 40, cost: 1.25 })),
+            inference(worker, metrics({ promptTokens: 200, completionTokens: 10, cost: 0.25 })),
+            withSessionId(sessionId, llmEvents.create('auxiliary_inference_completed', {
+                agentId: worker,
+                metrics: metrics({ promptTokens: 10, completionTokens: 1, cost: 0.05 }),
+            })),
+        ]);
+        expect(stats.byAgent).toEqual({
+            orchestrator: { llmCalls: 1, promptTokens: 100, completionTokens: 20, totalCost: 0.5 },
+            coder: { llmCalls: 3, promptTokens: 510, completionTokens: 51, totalCost: 1.55 },
+        });
+        expect(stats.totalCost).toBeCloseTo(2.05, 10);
+    });
+    it('keeps existing counters working', () => {
+        const stats = reduce([
+            spawn(orchestrator, 'orchestrator'),
+            inference(orchestrator, metrics()),
+            withSessionId(sessionId, llmEvents.create('inference_failed', { agentId: orchestrator, error: 'boom' })),
+            withSessionId(sessionId, toolEvents.create('tool_started', {
+                agentId: orchestrator,
+                toolCallId: ToolCallId('tc-1'),
+                toolName: 'read_file',
+                input: {},
+            })),
+            withSessionId(sessionId, toolEvents.create('tool_failed', {
+                agentId: orchestrator,
+                toolCallId: ToolCallId('tc-1'),
+                error: 'ENOENT',
+            })),
+        ]);
+        expect(stats.agentCount).toBe(1);
+        expect(stats.llmCalls).toBe(1);
+        expect(stats.llmErrors).toBe(1);
+        expect(stats.toolCalls).toBe(1);
+        expect(stats.toolErrors).toBe(1);
+        expect(stats.totalTokens).toBe(120);
+        expect(stats.promptTokens).toBe(100);
+        expect(stats.completionTokens).toBe(20);
+        expect(stats.byProvider.anthropic).toEqual({
+            llmCalls: 1,
+            totalTokens: 120,
+            promptTokens: 100,
+            completionTokens: 20,
+            totalCost: 0.5,
+        });
+    });
+});
+//# sourceMappingURL=plugin.test.js.map

package/dist/plugins/session-stats/plugin.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin.test.js","sourceRoot":"","sources":["../../../src/plugins/session-stats/plugin.test.ts"],"names":[],"mappings":"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"}

package/dist/transport/http/middleware/error-handler.d.ts

@@ -17,5 +17,5 @@ export declare const errorHandler: (error: Error, c: Context<AppEnv>) => Respons
         type: string;
         message: string;
     };
-}, 100 | 500 | 404 | 409 | 400 | 403 | -1 | 429 | 401 | 200 | 300 | 501 | 201 | 102 | 103 | 202 | 203 | 206 | 207 | 208 | 226 | 301 | 302 | 303 | 305 | 306 | 307 | 308 | 402 | 405 | 406 | 407 | 408 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 421 | 422 | 423 | 424 | 425 | 426 | 428 | 431 | 451 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 510 | 511, "json">;
+}, 100 | 500 | 404 | 409 | 400 | 403 | -1 | 200 | 429 | 401 | 300 | 501 | 201 | 510 | 102 | 103 | 202 | 203 | 206 | 207 | 208 | 226 | 301 | 302 | 303 | 305 | 306 | 307 | 308 | 402 | 405 | 406 | 407 | 408 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 421 | 422 | 423 | 424 | 425 | 426 | 428 | 431 | 451 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 511, "json">;
 //# sourceMappingURL=error-handler.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@roj-ai/sdk",
-	"version": "0.1.32",
+	"version": "0.1.34",
 	"type": "module",
 	"main": "./dist/index.js",
 	"exports": {
@@ -135,7 +135,7 @@
 		"type-check": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@roj-ai/transport": "^0.1.32",
+		"@roj-ai/transport": "^0.1.34",
 		"@hono/zod-validator": "0.7.6",
 		"hono": "4.12.5",
 		"ignore": "7.0.5",

package/src/bootstrap.ts

@@ -37,6 +37,7 @@ import { llmDebugPlugin } from './plugins/llm-debug/plugin.js'
 import { logsPlugin } from './plugins/logs/index.js'
 import { mailboxPlugin } from './plugins/mailbox/plugin.js'
 import { servicePlugin } from './plugins/services/plugin.js'
+import { ServicePidRegistry } from './plugins/services/pid-registry.js'
 import { PortPool } from './plugins/services/port-pool.js'
 import { presetsPlugin, sessionLifecyclePlugin } from './plugins/session-lifecycle/index.js'
 import { sessionStatsPlugin } from './plugins/session-stats/index.js'
@@ -89,6 +90,8 @@ export interface Services {
 	config: Config
 	/** Global port pool shared across all sessions */
 	portPool: PortPool
+	/** Durable record of spawned service processes, swept once at boot. */
+	pidRegistry: ServicePidRegistry
 	/** Preprocessor registry for upload content extraction */
 	preprocessorRegistry: PreprocessorRegistry
 	/** Host-environment adapters (filesystem, process). */
@@ -118,6 +121,8 @@ export function bootstrap(config: Config, userConfig: RojConfig, platform: Platf
 	const toolExecutor = new ToolExecutorImpl(logger)
 	const dataFileStore = new SessionFileStore(config.dataPath, undefined, false, platform.fs, 'session')
 	const portPool = new PortPool()
+	// Swept by the server before it serves — see ServicePidRegistry.sweepOrphans.
+	const pidRegistry = new ServicePidRegistry(platform.fs, logger, config.dataPath)
 
 	const preprocessorRegistry = new PreprocessorRegistry()
 	const imageClassifierGate = new Semaphore(config.imageClassifierConcurrency ?? 10)
@@ -148,6 +153,7 @@ export function bootstrap(config: Config, userConfig: RojConfig, platform: Platf
 		dataFileStore,
 		config,
 		portPool,
+		pidRegistry,
 		preprocessorRegistry,
 		platform,
 	}
@@ -253,6 +259,7 @@ export function createSystemFromServices(
 		preprocessorRegistry: services.preprocessorRegistry,
 		llmLogger: services.llmLogger,
 		portPool: services.portPool,
+		pidRegistry: services.pidRegistry,
 		platform: services.platform,
 	})
 }

package/src/core/sessions/session-manager.ts

@@ -34,6 +34,7 @@ import type { Result } from '~/lib/utils/result.js'
 import { Err, Ok } from '~/lib/utils/result.js'
 import type { SpawnableAgentInfo } from '~/plugins/agents/index.js'
 import { getAgentUnconsumedMailbox, selectMailboxState } from '~/plugins/mailbox/query.js'
+import type { ServicePidRegistry } from '~/plugins/services/pid-registry.js'
 import type { PortPool } from '~/plugins/services/port-pool.js'
 import type { ServiceConfig } from '~/plugins/services/schema.js'
 import { selectSessionStats, type SessionStatsState } from '~/plugins/session-stats/index.js'
@@ -77,6 +78,7 @@ export interface SessionManagerOptions {
 	preprocessorRegistry?: PreprocessorRegistry
 	llmLogger?: LLMLogger
 	portPool?: PortPool
+	pidRegistry?: ServicePidRegistry
 	/** Host-environment adapters (filesystem, process). */
 	platform: Platform
 	systemPlugins?: readonly PluginDefinition<string, any, any, any, any>[]
@@ -108,6 +110,7 @@ export class SessionManager {
 	private readonly preprocessorRegistry?: PreprocessorRegistry
 	private readonly llmLogger?: LLMLogger
 	private readonly portPool?: PortPool
+	private readonly pidRegistry?: ServicePidRegistry
 	private readonly platform: Platform
 	private readonly systemPlugins: readonly PluginDefinition<string, any, any, any, any>[]
 
@@ -124,6 +127,7 @@ export class SessionManager {
 		this.preprocessorRegistry = options.preprocessorRegistry
 		this.llmLogger = options.llmLogger
 		this.portPool = options.portPool
+		this.pidRegistry = options.pidRegistry
 		this.platform = options.platform
 		this.systemPlugins = options.systemPlugins ?? []
 		this.managerMethods = this.collectManagerMethods()
@@ -774,7 +778,7 @@ export class SessionManager {
 			}
 		}
 		if (servicesByType.size > 0 && this.portPool) {
-			configs.set('services', { services: [...servicesByType.values()], portPool: this.portPool })
+			configs.set('services', { services: [...servicesByType.values()], portPool: this.portPool, pidRegistry: this.pidRegistry })
 		}
 
 		return configs

package/src/core/system.ts

@@ -10,6 +10,7 @@
 import type z4 from 'zod/v4'
 import type { Logger } from '~/lib/logger/logger.js'
 import type { Platform } from '~/platform/index.js'
+import type { ServicePidRegistry } from '~/plugins/services/pid-registry.js'
 import type { PortPool } from '~/plugins/services/port-pool.js'
 import type { PreprocessorRegistry } from '~/plugins/uploads/preprocessor.js'
 import type { EventStore } from './events/event-store.js'
@@ -120,6 +121,7 @@ export interface CreateSystemOptions<TPlugins extends readonly PluginDefinition<
 	preprocessorRegistry?: PreprocessorRegistry
 	llmLogger?: LLMLogger
 	portPool?: PortPool
+	pidRegistry?: ServicePidRegistry
 	/** Host-environment adapters (filesystem, process). */
 	platform: Platform
 }
@@ -145,6 +147,7 @@ export function createSystem<const TPlugins extends readonly PluginDefinition<st
 		preprocessorRegistry,
 		llmLogger,
 		portPool,
+		pidRegistry,
 		platform,
 	} = options
 
@@ -167,6 +170,7 @@ export function createSystem<const TPlugins extends readonly PluginDefinition<st
 		preprocessorRegistry,
 		llmLogger,
 		portPool,
+		pidRegistry,
 		platform,
 		systemPlugins: [...plugins],
 	})

package/src/index.ts

@@ -99,7 +99,7 @@ export type { EvictionAgentConfig, EvictionConfig } from '~/plugins/result-evict
 export { servicePlugin } from '~/plugins/services/plugin.js'
 export type { ServiceAgentConfig, ServiceStatusChangedEvent } from '~/plugins/services/plugin.js'
 export { selectSessionStats, sessionStatsPlugin } from '~/plugins/session-stats/plugin.js'
-export type { SessionStatsState } from '~/plugins/session-stats/plugin.js'
+export type { AgentStats, ProviderStats, SessionStatsState } from '~/plugins/session-stats/plugin.js'
 export { sessionStatePlugin } from '~/plugins/session-state/plugin.js'
 export type { SessionStatePluginConfig } from '~/plugins/session-state/plugin.js'
 export { presetsPlugin, sessionLifecyclePlugin } from '~/plugins/session-lifecycle/plugin.js'

package/src/plugins/services/pid-registry.test.ts

@@ -0,0 +1,180 @@
+import { describe, expect, it } from 'bun:test'
+import { spawn } from 'node:child_process'
+import { readdir, readFile, mkdtemp, rm, writeFile, mkdir } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { silentLogger } from '~/lib/logger/logger.js'
+import { createNodePlatform } from '~/testing/node-platform.js'
+import { ServicePidRegistry } from './pid-registry.js'
+import { getProcessStartTime } from './service.js'
+
+const fs = createNodePlatform().fs
+
+async function withDataDir<T>(fn: (dataPath: string) => Promise<T>): Promise<T> {
+	const dataPath = await mkdtemp(join(tmpdir(), 'pid-registry-'))
+	try {
+		return await fn(dataPath)
+	} finally {
+		await rm(dataPath, { recursive: true, force: true })
+	}
+}
+
+/** A detached `sleep`, so `kill(-pid)` has a real process group to take down. */
+function spawnVictim(): { pid: number; exited: Promise<void> } {
+	const child = spawn('/bin/sh', ['-c', 'sleep 60'], { detached: true, stdio: 'ignore' })
+	child.unref()
+	if (!child.pid) throw new Error('failed to spawn victim')
+	const exited = new Promise<void>(resolve => child.on('close', () => resolve()))
+	return { pid: child.pid, exited }
+}
+
+function isAlive(pid: number): boolean {
+	try {
+		process.kill(pid, 0)
+		return true
+	} catch {
+		return false
+	}
+}
+
+/** A pid the kernel cannot have handed out, so it reads as a dead agent. */
+async function unusablePid(): Promise<number> {
+	const max = Number((await readFile('/proc/sys/kernel/pid_max', 'utf-8')).trim())
+	return max + 1
+}
+
+async function writeRecord(dataPath: string, record: Record<string, unknown>): Promise<string> {
+	const dir = join(dataPath, 'service-pids')
+	await mkdir(dir, { recursive: true })
+	const path = join(dir, `${record.sessionId}__${record.serviceType}.json`)
+	await writeFile(path, JSON.stringify(record))
+	return path
+}
+
+const makeRegistry = (dataPath: string) => new ServicePidRegistry(fs, silentLogger, dataPath)
+
+describe('ServicePidRegistry', () => {
+	it('kills a service left behind by an agent that is gone, and drops the record', async () => {
+		await withDataDir(async dataPath => {
+			const victim = spawnVictim()
+			await writeRecord(dataPath, {
+				sessionId: 'sess-1',
+				serviceType: 'astro-dev',
+				pid: victim.pid,
+				pidStartTime: await getProcessStartTime(fs, victim.pid),
+				command: 'sleep 60',
+				agentPid: await unusablePid(),
+				agentStartTime: 12345,
+			})
+
+			await makeRegistry(dataPath).sweepOrphans()
+
+			await victim.exited
+			expect(isAlive(victim.pid)).toBe(false)
+			expect(await readdir(join(dataPath, 'service-pids'))).toEqual([])
+		})
+	})
+
+	it('leaves a service whose agent is still running', async () => {
+		await withDataDir(async dataPath => {
+			const victim = spawnVictim()
+			try {
+				// This test process stands in for a second, still-live agent.
+				await writeRecord(dataPath, {
+					sessionId: 'sess-1',
+					serviceType: 'astro-dev',
+					pid: victim.pid,
+					pidStartTime: await getProcessStartTime(fs, victim.pid),
+					command: 'sleep 60',
+					agentPid: process.pid,
+					agentStartTime: await getProcessStartTime(fs, process.pid),
+				})
+
+				await makeRegistry(dataPath).sweepOrphans()
+
+				expect(isAlive(victim.pid)).toBe(true)
+				expect(await readdir(join(dataPath, 'service-pids'))).toHaveLength(1)
+			} finally {
+				process.kill(-victim.pid, 'SIGKILL')
+			}
+		})
+	})
+
+	it('refuses to kill when the pid has been recycled', async () => {
+		await withDataDir(async dataPath => {
+			const victim = spawnVictim()
+			try {
+				const actual = await getProcessStartTime(fs, victim.pid)
+				await writeRecord(dataPath, {
+					sessionId: 'sess-1',
+					serviceType: 'astro-dev',
+					pid: victim.pid,
+					// Deliberately not the process now holding this pid.
+					pidStartTime: (actual ?? 0) + 999,
+					command: 'sleep 60',
+					agentPid: await unusablePid(),
+				})
+
+				await makeRegistry(dataPath).sweepOrphans()
+
+				expect(isAlive(victim.pid)).toBe(true)
+				// The record still goes — whatever holds that pid now, it is not ours to track.
+				expect(await readdir(join(dataPath, 'service-pids'))).toEqual([])
+			} finally {
+				process.kill(-victim.pid, 'SIGKILL')
+			}
+		})
+	})
+
+	it('never sweeps what this very process started', async () => {
+		await withDataDir(async dataPath => {
+			const registry = makeRegistry(dataPath)
+			const victim = spawnVictim()
+			try {
+				await registry.record({
+					sessionId: 'sess-1',
+					serviceType: 'astro-dev',
+					pid: victim.pid,
+					pidStartTime: await getProcessStartTime(fs, victim.pid),
+					command: 'sleep 60',
+				})
+
+				await registry.sweepOrphans()
+
+				expect(isAlive(victim.pid)).toBe(true)
+			} finally {
+				process.kill(-victim.pid, 'SIGKILL')
+			}
+		})
+	})
+
+	it('drops an unreadable record instead of throwing', async () => {
+		await withDataDir(async dataPath => {
+			const dir = join(dataPath, 'service-pids')
+			await mkdir(dir, { recursive: true })
+			await writeFile(join(dir, 'sess-1__astro-dev.json'), 'not json')
+
+			await makeRegistry(dataPath).sweepOrphans()
+
+			expect(await readdir(dir)).toEqual([])
+		})
+	})
+
+	it('does nothing when no service has ever been recorded', async () => {
+		await withDataDir(async dataPath => {
+			await makeRegistry(dataPath).sweepOrphans()
+		})
+	})
+
+	it('forget removes the record for a service that has exited', async () => {
+		await withDataDir(async dataPath => {
+			const registry = makeRegistry(dataPath)
+			await registry.record({ sessionId: 'sess-1', serviceType: 'astro-dev', pid: 1, pidStartTime: 1, command: 'x' })
+			expect(await readdir(join(dataPath, 'service-pids'))).toHaveLength(1)
+
+			await registry.forget('sess-1', 'astro-dev')
+
+			expect(await readdir(join(dataPath, 'service-pids'))).toEqual([])
+		})
+	})
+})