lsd-pi 1.3.7 → 1.3.10

package/src/resources/extensions/subagent/index.ts

@@ -492,6 +492,10 @@ interface SubagentDetails {
     agentScope: AgentScope;
     projectAgentsDir: string | null;
     results: SingleResult[];
+    /** Total planned steps for chain mode (undefined for single/parallel). */
+    totalChainSteps?: number;
+    /** Currently executing chain step (1-indexed, undefined if chain completed). */
+    currentChainStep?: number;
 }
 
 function getFinalOutput(messages: Message[]): string {
@@ -1254,11 +1258,13 @@ export default function(pi: ExtensionAPI) {
 
             const makeDetails =
                 (mode: "single" | "parallel" | "chain") =>
-                    (results: SingleResult[]): SubagentDetails => ({
+                    (results: SingleResult[], opts?: { totalSteps?: number; currentStep?: number }): SubagentDetails => ({
                         mode,
                         agentScope,
                         projectAgentsDir: discovery.projectAgentsDir,
                         results,
+                        totalChainSteps: opts?.totalSteps,
+                        currentChainStep: opts?.currentStep,
                     });
 
             const trackInProcessDepth = (
@@ -1362,7 +1368,8 @@ export default function(pi: ExtensionAPI) {
                     const step = params.chain[i];
                     const taskWithContext = step.task.replace(/\{previous\}/g, previousOutput);
 
-                    // Create update callback that includes all previous results
+                    // Create update callback that includes all previous results + chain progress
+                    const chainTotalSteps = params.chain.length;
                     const chainUpdate: OnUpdateCallback | undefined = onUpdate
                         ? (partial) => {
                             // Combine completed results with current streaming result
@@ -1371,7 +1378,10 @@ export default function(pi: ExtensionAPI) {
                                 const allResults = [...results, currentResult];
                                 onUpdate({
                                     content: partial.content,
-                                    details: makeDetails("chain")(allResults),
+                                    details: makeDetails("chain")(allResults, {
+                                        totalSteps: chainTotalSteps,
+                                        currentStep: i + 1,
+                                    }),
                                 });
                             }
                         }
@@ -1425,7 +1435,7 @@ export default function(pi: ExtensionAPI) {
                             result.errorMessage || result.stderr || getFinalOutput(result.messages) || "(no output)";
                         return {
                             content: [{ type: "text", text: `Chain stopped at step ${i + 1} (${step.agent}): ${errorMsg}` }],
-                            details: makeDetails("chain")(results),
+                            details: makeDetails("chain")(results, { totalSteps: params.chain.length }),
                             isError: true,
                         };
                     }
@@ -1433,7 +1443,7 @@ export default function(pi: ExtensionAPI) {
                 }
                 return {
                     content: [{ type: "text", text: getFinalOutput(results[results.length - 1].messages) || "(no output)" }],
-                    details: makeDetails("chain")(results),
+                    details: makeDetails("chain")(results, { totalSteps: params.chain.length }),
                 };
             }
 
@@ -2109,7 +2119,19 @@ export default function(pi: ExtensionAPI) {
 
             if (details.mode === "chain") {
                 const successCount = details.results.filter((r) => r.exitCode === 0).length;
-                const icon = successCount === details.results.length ? theme.fg("success", "✓") : theme.fg("error", "✗");
+                const isRunning = details.currentChainStep != null;
+                const icon = !isRunning && successCount === details.results.length
+                    ? theme.fg("success", "✓")
+                    : isRunning
+                        ? theme.fg("accent", "◉")
+                        : theme.fg("error", "✗");
+
+                const totalLabel = details.totalChainSteps != null
+                    ? `${details.results.length}/${details.totalChainSteps} steps`
+                    : `${details.results.length} steps`;
+                const progressLabel = isRunning
+                    ? ` (step ${details.currentChainStep} running)`
+                    : "";
 
                 if (expanded) {
                     const container = new Container();
@@ -2118,7 +2140,7 @@ export default function(pi: ExtensionAPI) {
                             icon +
                             " " +
                             theme.fg("toolTitle", theme.bold("chain ")) +
-                            theme.fg("accent", `${successCount}/${details.results.length} steps`),
+                            theme.fg("accent", `${totalLabel}${progressLabel}`),
                             0,
                             0,
                         ),
@@ -2175,7 +2197,7 @@ export default function(pi: ExtensionAPI) {
                     icon +
                     " " +
                     theme.fg("toolTitle", theme.bold("chain ")) +
-                    theme.fg("accent", `${successCount}/${details.results.length} steps`);
+                    theme.fg("accent", `${totalLabel}${progressLabel}`);
                 for (const r of details.results) {
                     const rIcon = r.exitCode === 0 ? theme.fg("success", "✓") : theme.fg("error", "✗");
                     const displayItems = getDisplayItems(r.messages);

package/src/resources/extensions/subagent/model-resolution.ts

@@ -21,6 +21,7 @@ const BARE_MODEL_PROVIDER_RULES: Array<{ provider: string; matches: (modelId: st
 		matches: (modelId) => /^(mistral-|ministral-|codestral-)/.test(modelId),
 	},
 	{ provider: "groq", matches: (modelId) => modelId.startsWith("llama-") || modelId.startsWith("mixtral-") },
+	{ provider: "zhipu", matches: (modelId) => modelId.startsWith("glm-") },
 ];
 
 export function inferProviderForBareModel(modelId: string): string | undefined {

package/src/resources/extensions/usage/index.ts

@@ -75,6 +75,8 @@ type UsageRow = {
 	cacheWrite: number;
 	total: number;
 	cost: number;
+	totalDurationMs: number;
+	totalOutputForSpeed: number;
 };
 
 type UsageReport = {
@@ -313,6 +315,7 @@ function collectUsage(sessionFiles: string[], startMs: number, endMs: number, sc
 		let projectLabel = basename(file);
 		let headerResolved = false;
 		let currentModel = "";
+		let lastUserTimestamp = 0;
 
 		const raw = readFileSync(file, "utf-8");
 		for (const line of raw.split("\n")) {
@@ -367,6 +370,8 @@ function collectUsage(sessionFiles: string[], startMs: number, endMs: number, sc
 					cacheWrite: 0,
 					total: 0,
 					cost: 0,
+					totalDurationMs: 0,
+					totalOutputForSpeed: 0,
 				};
 
 				existing.messages += 1;
@@ -376,10 +381,27 @@ function collectUsage(sessionFiles: string[], startMs: number, endMs: number, sc
 				existing.cacheWrite += cacheWrite;
 				existing.total += total;
 				existing.cost += cost;
+
+				// Track tok/sec: use preceding user message timestamp
+				if (output > 0 && lastUserTimestamp > 0) {
+					const durationMs = timestamp - lastUserTimestamp;
+					if (durationMs > 0) {
+						existing.totalDurationMs += durationMs;
+						existing.totalOutputForSpeed += output;
+					}
+				}
+
 				rows.set(key, existing);
 			} else if (message.role === "user") {
 				const timestamp = Number(message.timestamp ?? 0);
-				if (!timestamp || timestamp < startMs || timestamp >= endMs) continue;
+				if (!timestamp) continue;
+
+				// Always track last user timestamp for tok/sec calculation,
+				// even if this user message is outside the time range
+				// (the assistant response may still be within range).
+				lastUserTimestamp = timestamp;
+
+				if (timestamp < startMs || timestamp >= endMs) continue;
 
 				matchedUserPrompts++;
 				const model = currentModel;
@@ -397,6 +419,8 @@ function collectUsage(sessionFiles: string[], startMs: number, endMs: number, sc
 					cacheWrite: 0,
 					total: 0,
 					cost: 0,
+					totalDurationMs: 0,
+					totalOutputForSpeed: 0,
 				};
 
 				existing.userPrompts += 1;
@@ -431,9 +455,11 @@ function collectUsage(sessionFiles: string[], startMs: number, endMs: number, sc
 			acc.cacheWrite += row.cacheWrite;
 			acc.total += row.total;
 			acc.cost += row.cost;
+			acc.totalDurationMs += row.totalDurationMs;
+			acc.totalOutputForSpeed += row.totalOutputForSpeed;
 			return acc;
 		},
-		{ messages: 0, userPrompts: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0, cost: 0 },
+		{ messages: 0, userPrompts: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0, cost: 0, totalDurationMs: 0, totalOutputForSpeed: 0 },
 	);
 
 	return {
@@ -448,6 +474,11 @@ function collectUsage(sessionFiles: string[], startMs: number, endMs: number, sc
 	};
 }
 
+function formatSpeed(totalDurationMs: number, totalOutputForSpeed: number): string {
+	if (totalDurationMs <= 0) return "—";
+	return Math.round(totalOutputForSpeed / (totalDurationMs / 1000)).toLocaleString();
+}
+
 function renderTable(report: UsageReport): string {
 	const firstColumnHeader = report.groupBy === "project"
 		? "project"
@@ -465,8 +496,11 @@ function renderTable(report: UsageReport): string {
 		write: formatInt(row.cacheWrite),
 		total: formatInt(row.total),
 		cost: formatCost(row.cost),
+		speed: formatSpeed(row.totalDurationMs, row.totalOutputForSpeed),
 	}));
 
+	const totalsSpeed = formatSpeed(report.totals.totalDurationMs, report.totals.totalOutputForSpeed);
+
 	const widths = {
 		label: Math.max(firstColumnHeader.length, ...displayRows.map((row) => row.label.length), 5),
 		userPrompts: Math.max(11, ...displayRows.map((row) => row.userPrompts.length), String(report.totals.userPrompts).length),
@@ -477,6 +511,7 @@ function renderTable(report: UsageReport): string {
 		write: Math.max(5, ...displayRows.map((row) => row.write.length), formatInt(report.totals.cacheWrite).length),
 		total: Math.max(5, ...displayRows.map((row) => row.total.length), formatInt(report.totals.total).length),
 		cost: Math.max(7, ...displayRows.map((row) => row.cost.length), formatCost(report.totals.cost).length),
+		speed: Math.max(5, ...displayRows.map((row) => row.speed.length), totalsSpeed.length),
 	};
 
 	const header = [
@@ -489,6 +524,7 @@ function renderTable(report: UsageReport): string {
 		"write".padStart(widths.write),
 		"total".padStart(widths.total),
 		"cost".padStart(widths.cost),
+		"tok/s".padStart(widths.speed),
 	].join("  ");
 
 	const divider = "-".repeat(header.length);
@@ -502,6 +538,7 @@ function renderTable(report: UsageReport): string {
 		row.write.padStart(widths.write),
 		row.total.padStart(widths.total),
 		row.cost.padStart(widths.cost),
+		row.speed.padStart(widths.speed),
 	].join("  "));
 
 	const totalsLine = [
@@ -514,6 +551,7 @@ function renderTable(report: UsageReport): string {
 		formatInt(report.totals.cacheWrite).padStart(widths.write),
 		formatInt(report.totals.total).padStart(widths.total),
 		formatCost(report.totals.cost).padStart(widths.cost),
+		totalsSpeed.padStart(widths.speed),
 	].join("  ");
 
 	return [header, divider, ...body, divider, totalsLine].join("\n");

package/src/resources/extensions/voice/index.ts

@@ -303,6 +303,7 @@ export default function(pi: ExtensionAPI) {
             activationMode,
             editorText: ctx.ui.getEditorText(),
             holdToTalkSupported: isKittyProtocolActive(),
+            isEditorFocused: ctx.ui.isEditorFocused(),
             onUnsupported: () => {
                 if (holdToTalkUnsupportedNotified) return;
                 holdToTalkUnsupportedNotified = true;

package/src/resources/extensions/voice/push-to-talk.ts

@@ -8,6 +8,7 @@ export interface PushToTalkState {
     activationMode: VoiceActivationMode | null;
     editorText: string;
     holdToTalkSupported: boolean;
+    isEditorFocused: boolean;
     onUnsupported?(): void;
     startPushToTalk(): void | Promise<void>;
     stopVoice(): void | Promise<void>;
@@ -16,6 +17,8 @@ export interface PushToTalkState {
 export function handlePushToTalkInput(data: string, state: PushToTalkState): ReturnType<TerminalInputHandler> {
     if (!matchesKey(data, Key.space)) return undefined;
 
+    if (!state.isEditorFocused) return undefined;
+
     if (isKeyRelease(data)) {
         if (state.activationMode === "push-to-talk") {
             void Promise.resolve(state.stopVoice());

package/src/resources/extensions/voice/tests/push-to-talk.test.ts

@@ -15,6 +15,7 @@ describe("voice push-to-talk handler", () => {
             activationMode: null,
             editorText: "",
             holdToTalkSupported: true,
+            isEditorFocused: true,
             startPushToTalk: () => { startCalls += 1; },
             stopVoice: () => { stopCalls += 1; },
         });
@@ -32,6 +33,7 @@ describe("voice push-to-talk handler", () => {
             activationMode: null,
             editorText: "hello",
             holdToTalkSupported: true,
+            isEditorFocused: true,
             startPushToTalk: () => { startCalls += 1; },
             stopVoice: () => { },
         });
@@ -48,6 +50,7 @@ describe("voice push-to-talk handler", () => {
             activationMode: "push-to-talk",
             editorText: "",
             holdToTalkSupported: true,
+            isEditorFocused: true,
             startPushToTalk: () => { startCalls += 1; },
             stopVoice: () => { },
         });
@@ -64,6 +67,7 @@ describe("voice push-to-talk handler", () => {
             activationMode: "push-to-talk",
             editorText: "",
             holdToTalkSupported: true,
+            isEditorFocused: true,
             startPushToTalk: () => { },
             stopVoice: () => { stopCalls += 1; },
         });
@@ -80,6 +84,7 @@ describe("voice push-to-talk handler", () => {
             activationMode: "toggle",
             editorText: "",
             holdToTalkSupported: true,
+            isEditorFocused: true,
             startPushToTalk: () => { },
             stopVoice: () => { stopCalls += 1; },
         });
@@ -97,6 +102,7 @@ describe("voice push-to-talk handler", () => {
             activationMode: null,
             editorText: "",
             holdToTalkSupported: false,
+            isEditorFocused: true,
             onUnsupported: () => { notifyCalls += 1; },
             startPushToTalk: () => { startCalls += 1; },
             stopVoice: () => { },