pi-agent-flow 1.1.0 → 1.2.0

package/{flow.ts → src/flow.ts}

@@ -10,8 +10,8 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import type { AgentToolResult } from "@mariozechner/pi-agent-core";
-import { type FlowConfig, getFlowTier } from "./agents.js";
-import { parseFlowCliArgs } from "./runner-cli.js";
+import { type FlowConfig } from "./agents.js";
+import { parseFlowCliArgs } from "./cli-args.js";
 import { processFlowJsonLine, drainStreamingText, drainStreamingEstimate, drainCtxEstimate, updateSmoothedTps, drainSmoothedTps } from "./runner-events.js";
 import {
 	type SingleResult,
@@ -52,8 +52,8 @@ function mergeStreamingUsage(
 		...actual,
 		...(estimatedOutputTokens > 0 ? { output: Math.max(actual.output, estimatedOutputTokens) } : {}),
 		...(ctxEstimate > 0 ? { contextTokens: Math.max(actual.contextTokens, ctxEstimate) } : {}),
-		// Preserve the peak smoothedTPS seen during the stream rather than the live EMA value.
-		...(smoothedTps > 0 ? { smoothedTps: Math.max(actual.smoothedTps || 0, smoothedTps) } : {}),
+		// Show the live EMA value so the dashboard can rise and fall smoothly.
+		...(smoothedTps > 0 ? { smoothedTps } : {}),
 	};
 }
 
@@ -117,7 +117,7 @@ export function getOptimizedTools(
 	);
 	if (!hasLegacyTools) return flowTools;
 	const filtered = flowTools.filter(
-		(t) => t !== "read" && t !== "write" && t !== "edit" && t !== "batch",
+		(t) => t !== "read" && t !== "write" && t !== "edit" && t !== "batch" && t !== "batch_read",
 	);
 	return filtered.includes("batch")
 		? filtered
@@ -128,7 +128,7 @@ function buildFlowArgs(
 	flow: FlowConfig,
 	intent: string,
 	forkSessionPath: string | null,
-	tieredModels?: { lite?: string; flash?: string; full?: string },
+	model?: string,
 	parentDepth: number = 0,
 	maxDepth: number = 0,
 	toolOptimize: boolean = false,
@@ -145,10 +145,21 @@ function buildFlowArgs(
 		args.push("--session", forkSessionPath);
 	}
 
-	const tier = getFlowTier(flow.name);
-	const tierModel = tieredModels?.[tier] ?? inheritedCliArgs.tieredModels?.[tier];
-	const model = flow.model ?? tierModel ?? inheritedCliArgs.fallbackModel;
-	if (model) args.push("--model", model);
+	if (inheritedCliArgs.flowModelConfig) {
+		args.push("--flow-model-config", inheritedCliArgs.flowModelConfig);
+	}
+	if (inheritedCliArgs.tieredModels?.lite) {
+		args.push("--flow-lite-model", inheritedCliArgs.tieredModels.lite);
+	}
+	if (inheritedCliArgs.tieredModels?.flash) {
+		args.push("--flow-flash-model", inheritedCliArgs.tieredModels.flash);
+	}
+	if (inheritedCliArgs.tieredModels?.full) {
+		args.push("--flow-full-model", inheritedCliArgs.tieredModels.full);
+	}
+
+	const resolvedModel = model ?? flow.model ?? inheritedCliArgs.fallbackModel;
+	if (resolvedModel) args.push("--model", resolvedModel);
 
 	const thinking = flow.thinking ?? inheritedCliArgs.fallbackThinking;
 	if (thinking) args.push("--thinking", thinking);
@@ -245,8 +256,8 @@ export interface RunFlowOptions {
 	preventCycles: boolean;
 	/** Whether to transform tool lists to use batch. */
 	toolOptimize?: boolean;
-	/** Tiered model overrides (lite/flash/full). */
-	tieredModels?: { lite?: string; flash?: string; full?: string };
+	/** Explicit model to use for this flow execution. */
+	model?: string;
 	/** Abort signal for cancellation. */
 	signal?: AbortSignal;
 	/** Streaming update callback. */
@@ -276,6 +287,7 @@ export async function runFlow(opts: RunFlowOptions): Promise<SingleResult> {
 		maxDepth,
 		preventCycles,
 		toolOptimize = false,
+		model,
 		signal,
 		onUpdate,
 		makeDetails,
@@ -297,7 +309,7 @@ export async function runFlow(opts: RunFlowOptions): Promise<SingleResult> {
 		};
 	}
 
-	const resolvedModel = flow.model ?? inheritedCliArgs.fallbackModel;
+	const resolvedModel = model ?? flow.model ?? inheritedCliArgs.fallbackModel;
 	const result: SingleResult = {
 		type: normalizedFlowName,
 		agentSource: flow.source,
@@ -310,21 +322,30 @@ export async function runFlow(opts: RunFlowOptions): Promise<SingleResult> {
 		model: resolvedModel,
 	};
 
+	let liveStreamingText = "";
+	let liveEstimatedOutputTokens = 0;
+	let lastActualOutputTokens = result.usage.output;
 	const emitUpdate = () => {
-		const streaming = drainStreamingText(result);
+		const streamingDelta = drainStreamingText(result);
+		if (streamingDelta) liveStreamingText += streamingDelta;
 		const estimatedTokens = drainStreamingEstimate(result);
+		if (result.usage.output !== lastActualOutputTokens) {
+			lastActualOutputTokens = result.usage.output;
+			liveEstimatedOutputTokens = result.usage.output;
+		}
+		liveEstimatedOutputTokens += estimatedTokens;
 		const ctxEst = drainCtxEstimate(result);
 		updateSmoothedTps(result, estimatedTokens);
 		const smoothedTps = drainSmoothedTps(result);
-		const mergedUsage = mergeStreamingUsage(result.usage, estimatedTokens, ctxEst, smoothedTps);
+		const mergedUsage = mergeStreamingUsage(result.usage, liveEstimatedOutputTokens, ctxEst, smoothedTps);
 		onUpdate?.({
 			content: [
 				{
 					type: "text",
-					text: streaming || getFlowOutput(result.messages) || "(running...)",
+					text: liveStreamingText || getFlowOutput(result.messages) || "(running...)",
 				},
 			],
-			details: makeDetails([{ ...result, usage: mergedUsage }]),
+			details: makeDetails([{ ...result, usage: mergedUsage, streamingText: liveStreamingText || undefined }]),
 		});
 	};
 
@@ -342,7 +363,7 @@ export async function runFlow(opts: RunFlowOptions): Promise<SingleResult> {
 			flow,
 			intent,
 			forkSessionTmpPath,
-			opts.tieredModels,
+			model,
 			parentDepth,
 			maxDepth,
 			toolOptimize,

package/{hooks.ts → src/hooks.ts}

@@ -104,19 +104,19 @@ registerHook({
 	},
 });
 
-/** Suggest explore flow after a successful audit flow. */
+/** Suggest scout flow after a successful audit flow. */
 registerHook({
-	name: "pi-agent-flow/audit-to-explore",
+	name: "pi-agent-flow/audit-to-scout",
 	trigger: { flowTypes: ["audit"], onlyOnSuccess: true },
 	action: (ctx) => {
-		const exploreWasRequested = ctx.params.some(
-			(p) => p.type.toLowerCase() === "explore",
+		const scoutWasRequested = ctx.params.some(
+			(p) => p.type.toLowerCase() === "scout",
 		);
-		if (exploreWasRequested) return null;
+		if (scoutWasRequested) return null;
 
 		return {
 			content:
-				"Audit complete. Consider running an [explore] flow to review the audit findings.",
+				"Audit complete. Consider running a [scout] flow to trace the audit findings across the codebase.",
 			priority: 15,
 		};
 	},