@selesai/code 0.13.21 → 0.13.23

package/dist/extensions/pi-subagents/src/agents/builtin-agent-augmentations.ts

@@ -0,0 +1,71 @@
+import type { ExtensionAPI } from "@selesai/code";
+import type { AgentConfig } from "./agents.ts";
+
+/** Public event emitted by pi-subagents while its parent extension is loading. */
+export const BUILTIN_AGENT_AUGMENTATION_REQUEST_EVENT = "pi-subagents:request-builtin-agent-augmentations";
+
+export interface BuiltinAgentAugmentation {
+	id: string;
+	agentNames: readonly string[];
+	addTools?: readonly string[];
+	subagentOnlyExtensions?: readonly string[];
+}
+
+interface BuiltinAgentAugmentationRequest {
+	register(augmentation: BuiltinAgentAugmentation): void;
+}
+
+function strings(value: unknown, field: string): string[] {
+	if (!Array.isArray(value) || value.length === 0 || value.some((entry) => typeof entry !== "string" || !entry.trim() || entry.trim() !== entry)) {
+		throw new Error(`Builtin agent augmentation ${field} must be a non-empty array of trimmed strings.`);
+	}
+	return [...new Set(value)];
+}
+
+function validate(augmentation: BuiltinAgentAugmentation): BuiltinAgentAugmentation {
+	if (!augmentation || typeof augmentation !== "object") throw new Error("Builtin agent augmentation must be an object.");
+	if (typeof augmentation.id !== "string" || !augmentation.id.trim() || augmentation.id.trim() !== augmentation.id) throw new Error("Builtin agent augmentation id must be a non-empty trimmed string.");
+	const agentNames = strings(augmentation.agentNames, "agentNames");
+	const addTools = augmentation.addTools === undefined ? undefined : strings(augmentation.addTools, "addTools");
+	const subagentOnlyExtensions = augmentation.subagentOnlyExtensions === undefined ? undefined : strings(augmentation.subagentOnlyExtensions, "subagentOnlyExtensions");
+	if (!addTools?.length && !subagentOnlyExtensions?.length) throw new Error("Builtin agent augmentation must add tools or child extensions.");
+	return { id: augmentation.id, agentNames, ...(addTools ? { addTools } : {}), ...(subagentOnlyExtensions ? { subagentOnlyExtensions } : {}) };
+}
+
+/** Ask already-loaded extensions for additive patches to pi-subagents builtins. */
+export function requestBuiltinAgentAugmentations(pi: ExtensionAPI): BuiltinAgentAugmentation[] {
+	const byId = new Map<string, BuiltinAgentAugmentation>();
+	const request: BuiltinAgentAugmentationRequest = {
+		register(augmentation) {
+			const parsed = validate(augmentation);
+			if (byId.has(parsed.id)) throw new Error(`Builtin agent augmentation '${parsed.id}' was registered more than once.`);
+			byId.set(parsed.id, parsed);
+		},
+	};
+	pi.events.emit(BUILTIN_AGENT_AUGMENTATION_REQUEST_EVENT, request);
+	return [...byId.values()];
+}
+
+/**
+ * Apply patches only to selected builtins. User/project profiles and explicit
+ * builtin overrides retain precedence over an extension's defaults.
+ */
+export function applyBuiltinAgentAugmentations(agents: AgentConfig[], augmentations: readonly BuiltinAgentAugmentation[]): AgentConfig[] {
+	return agents.map((agent) => {
+		if (agent.source !== "builtin") return agent;
+		const matches = augmentations.filter((augmentation) => augmentation.agentNames.includes(agent.name));
+		if (matches.length === 0) return agent;
+		const overridden = new Set(agent.override?.fields ?? []);
+		const tools = overridden.has("tools")
+			? agent.tools
+			: [...new Set([...(agent.tools ?? []), ...matches.flatMap((augmentation) => augmentation.addTools ?? [])])];
+		const subagentOnlyExtensions = overridden.has("subagentOnlyExtensions")
+			? agent.subagentOnlyExtensions
+			: [...new Set([...(agent.subagentOnlyExtensions ?? []), ...matches.flatMap((augmentation) => augmentation.subagentOnlyExtensions ?? [])])];
+		return {
+			...agent,
+			...(tools ? { tools } : {}),
+			...(subagentOnlyExtensions ? { subagentOnlyExtensions } : {}),
+		};
+	});
+}

package/dist/extensions/pi-subagents/src/extension/index.ts

@@ -20,6 +20,7 @@ import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import { keyText, type ExtensionAPI, type ExtensionContext, type ToolDefinition } from "@selesai/code";
 import { Box, Container, Spacer, Text, truncateToWidth, visibleWidth, wrapTextWithAnsi, type Component } from "@earendil-works/pi-tui";
 import { clearAgentDiscoveryCache, discoverAgentSnapshot, discoverAgents, type AgentConfig, type AgentScope } from "../agents/agents.ts";
+import { applyBuiltinAgentAugmentations, requestBuiltinAgentAugmentations } from "../agents/builtin-agent-augmentations.ts";
 import { appendAdvertisedAgentPrompt, buildAdvertisedAgentPrompt } from "../agents/advertised-agent-prompt.ts";
 import { clearRuntimeAgentsForPi, listRuntimeAgentConfigs, mergeRuntimeAgents } from "../agents/runtime-agent-registry.ts";
 import { registerRuntimeAgentEventListener } from "../agents/runtime-agent-events.ts";
@@ -420,6 +421,7 @@ export default function registerSubagentExtension(pi: ExtensionAPI): void {
 		return;
 	}
 	const runtimeRegistry = getRuntimeRegistry();
+	const builtinAgentAugmentations = requestBuiltinAgentAugmentations(pi);
 
 	DIRS.results = ensureAccessibleDir(DIRS.results);
 	DIRS.async = ensureAccessibleDir(DIRS.async);
@@ -540,7 +542,7 @@ export default function registerSubagentExtension(pi: ExtensionAPI): void {
 		advertisedAgents = [];
 		if (!advertisedContext) return;
 		clearAgentDiscoveryCache();
-		advertisedAgents = discoverAgents(advertisedContext.cwd, "both", advertisedContext.model?.provider).agents
+		advertisedAgents = discoverAgentsForRuntime(advertisedContext.cwd, "both", advertisedContext.model?.provider).agents
 			.filter((agent) => agent.advertise === true);
 	};
 	const hasResultDeliveryDemand = () => {
@@ -550,9 +552,13 @@ export default function registerSubagentExtension(pi: ExtensionAPI): void {
 		return missionObserverResultCandidateFiles(DIRS.results).length > 0;
 	};
 	const discoverAgentsForRuntime = (cwd: string, scope: AgentScope, preferredModelProvider?: string) => {
-		if (listRuntimeAgentConfigs(pi).length === 0) return discoverAgents(cwd, scope, preferredModelProvider);
+		const augment = <T extends ReturnType<typeof discoverAgents>>(discovered: T): T => ({
+			...discovered,
+			agents: applyBuiltinAgentAugmentations(discovered.agents, builtinAgentAugmentations),
+		});
+		if (listRuntimeAgentConfigs(pi).length === 0) return augment(discoverAgents(cwd, scope, preferredModelProvider));
 		const snapshot = discoverAgentSnapshot(cwd, scope, preferredModelProvider, { includeChains: false });
-		const discovered = snapshot.effective;
+		const discovered = augment(snapshot.effective);
 		const all = snapshot.all;
 		const configuredAgents: AgentConfig[] = [
 			...all.builtin,

package/dist/extensions/pi-subagents/test/unit/builtin-agent-augmentations.test.ts

@@ -0,0 +1,44 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { applyBuiltinAgentAugmentations, type BuiltinAgentAugmentation } from "../../src/agents/builtin-agent-augmentations.ts";
+import type { AgentConfig } from "../../src/agents/agents.ts";
+
+const graft: BuiltinAgentAugmentation = {
+	id: "pi-graft",
+	agentNames: ["worker"],
+	addTools: ["graft_find_code"],
+	subagentOnlyExtensions: ["/extensions/pi-graft/index.ts"],
+};
+
+function agent(source: AgentConfig["source"], fields: Partial<AgentConfig> = {}): AgentConfig {
+	return {
+		name: "worker",
+		description: "Worker",
+		systemPrompt: "Work.",
+		systemPromptMode: "replace",
+		inheritProjectContext: false,
+		inheritGlobalContext: false,
+		inheritSkills: false,
+		filePath: "/agents/worker.md",
+		source,
+		tools: ["read"],
+		...fields,
+	};
+}
+
+describe("builtin agent augmentations", () => {
+	it("augments only an uncustomized selected builtin", () => {
+		const [builtin, user, overridden] = applyBuiltinAgentAugmentations([
+			agent("builtin"),
+			agent("user"),
+			agent("builtin", { override: { scope: "user", path: "/settings.json", fields: ["tools", "subagentOnlyExtensions"] } }),
+		], [graft]);
+
+		assert.deepEqual(builtin?.tools, ["read", "graft_find_code"]);
+		assert.deepEqual(builtin?.subagentOnlyExtensions, ["/extensions/pi-graft/index.ts"]);
+		assert.deepEqual(user?.tools, ["read"]);
+		assert.equal(user?.subagentOnlyExtensions, undefined);
+		assert.deepEqual(overridden?.tools, ["read"]);
+		assert.equal(overridden?.subagentOnlyExtensions, undefined);
+	});
+});

package/dist/extensions/tps.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { calculateReliableTps, type TpsTiming } from "./tps.ts";
+import { calculateLiveTps, calculateReliableTps, type TpsTiming } from "./tps.ts";
 
 function timing(overrides: Partial<TpsTiming> = {}): TpsTiming {
 	return {
@@ -15,6 +15,14 @@ function timing(overrides: Partial<TpsTiming> = {}): TpsTiming {
 	};
 }
 
+describe("calculateLiveTps", () => {
+	it("waits for a usable sample and rejects implausible rates", () => {
+		expect(calculateLiveTps(60, 0.2)).toBeNull();
+		expect(calculateLiveTps(100, 200)).toBe(500);
+		expect(calculateLiveTps(10_001, 1_000)).toBeNull();
+	});
+});
+
 describe("calculateReliableTps", () => {
 	it("uses active stream time for sufficiently sampled output", () => {
 		expect(calculateReliableTps(100, timing())).toEqual({

package/dist/extensions/tps.ts

@@ -75,6 +75,12 @@ export function calculateReliableTps(outputTokens: number, timing: TpsTiming): R
 	return { tps, effectiveMs, isPrimary };
 }
 
+export function calculateLiveTps(tokens: number, elapsedMs: number): number | null {
+	if (tokens <= 0 || elapsedMs < MIN_GENERATION_MS) return null;
+	const tps = Math.round(tokens / (elapsedMs / 1000));
+	return tps <= MAX_PLAUSIBLE_TPS ? tps : null;
+}
+
 export default function tpsExtension(pi: ExtensionAPI): void {
 	setupTpsTracker(pi);
 }
@@ -223,11 +229,11 @@ export function setupTpsTracker(pi: ExtensionAPI): void {
 
 		streamStart ??= now;
 		estimatedStreamedTokens += Math.max(0, streamEvent.delta.length / 4);
-		const elapsed = (now - streamStart) / 1000;
 		const officialTokens = generatedTokensFromUsage(asRecord(event.message.usage));
 		const currentTokens = officialTokens > 0 ? officialTokens : estimatedStreamedTokens;
-		if (elapsed > 0 && currentTokens > 0) {
-			ctx.ui.setStatus("tps", ctx.ui.theme.fg("accent", `${Math.round(currentTokens / elapsed)} tok/s`));
+		const tps = calculateLiveTps(currentTokens, now - streamStart);
+		if (tps !== null) {
+			ctx.ui.setStatus("tps", ctx.ui.theme.fg("accent", `${tps} tok/s`));
 		}
 	});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@selesai/code",
-  "version": "0.13.21",
+  "version": "0.13.23",
   "description": "Maintained, extension-first Pi coding agent with built-in workflows, subagents, web research, questions, skills, and an enhanced terminal UI.",
   "type": "module",
   "repository": {
@@ -52,7 +52,7 @@
     "clean": "shx rm -rf dist",
     "dev": "tsx src/cli.ts",
     "dev:print": "tsx src/cli.ts --print",
-    "test": "vitest run src/extensions/undo.test.ts src/extensions/tps.test.ts src/extensions/agent-browser.test.ts src/extensions/auto-session-name.test.ts src/extensions/context-compaction-reminder.test.ts src/extensions/copy-turn.test.ts src/extensions/grep-app/index.test.ts src/extensions/inline-skills.test.ts src/extensions/rtk.test.ts src/extensions/handoff-new.test.ts src/extensions/question/tests src/extensions/ponytail/test src/__tests__/tokenin-onboarding.test.ts src/__tests__/model-registry-defaults.test.ts src/cli/args.test.ts",
+    "test": "vitest run src/extensions/undo.test.ts src/extensions/tps.test.ts src/extensions/pi-graft src/extensions/agent-browser.test.ts src/extensions/auto-session-name.test.ts src/extensions/context-compaction-reminder.test.ts src/extensions/copy-turn.test.ts src/extensions/grep-app/index.test.ts src/extensions/inline-skills.test.ts src/extensions/rtk.test.ts src/extensions/handoff-new.test.ts src/extensions/question/tests src/extensions/ponytail/test src/__tests__/tokenin-onboarding.test.ts src/__tests__/model-registry-defaults.test.ts src/cli/args.test.ts",
     "test:coverage": "vitest run --coverage src/extensions/undo.test.ts src/extensions/tps.test.ts src/extensions/agent-browser.test.ts src/extensions/auto-session-name.test.ts src/extensions/context-compaction-reminder.test.ts src/extensions/copy-turn.test.ts src/extensions/grep-app/index.test.ts src/extensions/inline-skills.test.ts src/extensions/rtk.test.ts src/extensions/handoff-new.test.ts src/extensions/question/tests src/extensions/ponytail/test src/__tests__/tokenin-onboarding.test.ts src/__tests__/model-registry-defaults.test.ts src/cli/args.test.ts",
     "prepare": "npm run build",
     "build": "npm run clean && tsgo -p tsconfig.build.json && shx chmod +x dist/cli.js dist/rpc-entry.js && npm run copy-assets",