diffsplain 0.10.0 → 0.11.0

package/scripts/review-chat-provider.mjs

@@ -9,6 +9,7 @@ import { join } from 'node:path';
 import {
   agentCommand,
   parseAgentResponse,
+  parseAgentUsage,
 } from './coding-agents.mjs';
 
 const maximumProviderOutputBytes = 1024 * 1024;
@@ -99,8 +100,10 @@ function providerOptions(options) {
     binary: providerBinary(options, agent),
     model: options.model,
     reasoning: options.reasoning,
+    fast: options.fast === true,
     accessMode: options.accessMode,
     env: providerEnvironment(options),
+    onUsage: typeof options.onUsage === 'function' ? options.onUsage : noChange,
   };
 }
 
@@ -124,6 +127,7 @@ function providerInvocation(options, request, paths) {
     binary: options.binary,
     model: options.model,
     reasoning: options.reasoning,
+    fast: options.fast,
     prompt: request.prompt,
     schema: request.responseSchema,
     schemaPath: paths.schemaPath,
@@ -145,12 +149,15 @@ function preparedProviderRequest(options, request) {
 }
 
 class ChildExecution {
-  constructor({ invocation, input, agent, signal, temporary }) {
+  constructor({ invocation, input, agent, signal, temporary, onUsage, usageContext }) {
     this.invocation = invocation;
     this.input = input;
     this.agent = agent;
     this.signal = signal;
     this.temporary = temporary;
+    this.onUsage = onUsage;
+    this.usageContext = usageContext;
+    this.usageReported = false;
     this.child = undefined;
     this.settled = false;
     this.closed = false;
@@ -277,11 +284,23 @@ class ChildExecution {
   finishClose() {
     if (this.closed) return;
     this.closed = true;
+    this.reportUsage();
     this.clearForceKill();
     removeTemporary(this.temporary);
     this.resolveFinished();
   }
 
+  reportUsage() {
+    if (this.usageReported) return;
+    this.usageReported = true;
+    try {
+      this.onUsage({
+        ...this.usageContext,
+        usage: parseAgentUsage(this.agent, childOutput(this.stdout)),
+      });
+    } catch {}
+  }
+
   resolve(value) {
     this.settle(this.resolvePromise, value);
   }
@@ -300,6 +319,7 @@ class ChildExecution {
 
   closeChild(status, signal) {
     this.clearForceKill();
+    this.reportUsage();
     if (!this.settled) {
       const error = closeError(this, status, signal);
       if (error) this.reject(error);
@@ -325,7 +345,7 @@ function trackExecution(executions, execution) {
   return execution;
 }
 
-function runRequest(options, executions, request) {
+function runRequest(options, executions, request, usageContext = {}) {
   const prepared = preparedProviderRequest(options, request);
   const controller = new AbortController();
   const execution = providerChild({
@@ -334,6 +354,8 @@ function runRequest(options, executions, request) {
     agent: options.agent,
     signal: controller.signal,
     temporary: prepared.temporary,
+    onUsage: options.onUsage,
+    usageContext,
   });
   const tracked = trackExecution(executions, execution);
   return {
@@ -353,8 +375,8 @@ export function createCodingAgentChatProvider(options = {}) {
   const configured = providerOptions(options);
   const executions = new Set();
   return {
-    run(request) {
-      return runRequest(configured, executions, request);
+    run(request, context) {
+      return runRequest(configured, executions, request, context);
     },
     close() {
       closeExecutions(executions);

package/scripts/serve-built.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import { randomBytes, timingSafeEqual } from 'node:crypto';
-import { watchFile, unwatchFile } from 'node:fs';
+import { createHash, randomBytes, timingSafeEqual } from 'node:crypto';
+import { readFileSync, watchFile, unwatchFile } from 'node:fs';
 import { readFile, stat } from 'node:fs/promises';
 import { createServer } from 'node:http';
 import { dirname, extname, resolve, sep } from 'node:path';
@@ -12,6 +12,13 @@ import {
   createReviewChat,
 } from './review-chat.mjs';
 import { publicError } from './review-chat-context.mjs';
+import {
+  emptyUsageAccumulator,
+  formatReviewUsage,
+  recordUsage,
+  reviewUsage,
+  usageSummary,
+} from './agent-usage.mjs';
 
 const root = resolve(dirname(fileURLToPath(import.meta.url)), '..');
 const clientRoot = resolve(root, 'dist');
@@ -38,6 +45,7 @@ const chatAgent = option('--chat-agent');
 const chatBinary = option('--chat-binary', chatAgent);
 const chatModel = option('--chat-model');
 const chatReasoning = option('--chat-reasoning');
+const chatFast = rawArgs.includes('--chat-fast');
 const chatAccessMode = option('--chat-access-mode', 'snapshot-only');
 const chatAccessRoot = option('--chat-access-root');
 if (!/^\d+$/.test(portValue) || Number(portValue) > 65_535) {
@@ -266,7 +274,7 @@ function matchingAccess(value, expectedValue) {
 
 async function fetchAsset(url) {
   if (url.pathname === '/diff-data.json') {
-    return fileResponse(output, { live: true });
+    return liveSnapshotResponse();
   }
   const pathname = decodeURIComponent(url.pathname);
   const file = resolve(
@@ -279,6 +287,44 @@ async function fetchAsset(url) {
   return fileResponse(file);
 }
 
+async function parsedLiveSnapshot() {
+  try {
+    return JSON.parse(await readFile(output, 'utf8'));
+  } catch {
+    return undefined;
+  }
+}
+
+function liveSnapshotVersion(snapshot, usage) {
+  return createHash('sha256')
+    .update(JSON.stringify({ version: snapshot.version, usage }))
+    .digest('hex')
+    .slice(0, 12);
+}
+
+function snapshotNoteSummary(snapshot) {
+  return snapshot?.usage?.agentNotes ||
+    usageSummary(emptyUsageAccumulator());
+}
+
+function snapshotResponse(snapshot, usage) {
+  return jsonResponse({
+    ...snapshot,
+    version: liveSnapshotVersion(snapshot, usage),
+    usage,
+  });
+}
+
+async function liveSnapshotResponse() {
+  const snapshot = await parsedLiveSnapshot();
+  if (!snapshot) return fileResponse(output, { live: true });
+  const fingerprint = snapshot?.notes?.reviewFingerprint;
+  if (!fingerprint) return fileResponse(output, { live: true });
+  const chatSummary = currentChatUsage(fingerprint);
+  const usage = reviewUsage(snapshotNoteSummary(snapshot), chatSummary);
+  return snapshotResponse(snapshot, usage);
+}
+
 function jsonResponse(value, status = 200) {
   return webResponse(JSON.stringify(value), {
     status,
@@ -399,6 +445,53 @@ function logObservedError(area, error) {
   console.log(`Diffsplain ${area.replaceAll('-', ' ')} error: ${publicError(error)}`);
 }
 
+let chatUsageFingerprint;
+let chatUsage = emptyUsageAccumulator();
+let reviewChat;
+
+function snapshotUsageState() {
+  try {
+    const snapshot = JSON.parse(readFileSync(output, 'utf8'));
+    return {
+      agentNotes: snapshot.usage?.agentNotes,
+      fingerprint: snapshot.notes?.reviewFingerprint,
+    };
+  } catch {
+    return {};
+  }
+}
+
+function currentChatUsage(fingerprint) {
+  return fingerprint === chatUsageFingerprint
+    ? usageSummary(chatUsage)
+    : usageSummary(emptyUsageAccumulator());
+}
+
+function resetChatUsage(fingerprint) {
+  if (fingerprint === chatUsageFingerprint) return;
+  chatUsageFingerprint = fingerprint;
+  chatUsage = emptyUsageAccumulator();
+}
+
+function recordChatUsage({ reviewFingerprint, usage }) {
+  const snapshot = snapshotUsageState();
+  if (
+    !reviewFingerprint ||
+    snapshot.fingerprint !== reviewFingerprint ||
+    reviewChat?.getState().fingerprint !== reviewFingerprint
+  ) {
+    return;
+  }
+  resetChatUsage(reviewFingerprint);
+  chatUsage = recordUsage(chatUsage, usage);
+  const totals = reviewUsage(
+    snapshot.agentNotes || usageSummary(emptyUsageAccumulator()),
+    usageSummary(chatUsage),
+  );
+  console.log(formatReviewUsage(totals));
+  broadcastEvent('update');
+}
+
 const chatProviderAccess = chatAccessMode === 'checkout-read-only'
   ? { mode: chatAccessMode, root: resolve(chatAccessRoot) }
   : { mode: chatAccessMode, reason: 'target-mismatch' };
@@ -408,10 +501,12 @@ const chatProvider = chatAgent
       binary: chatBinary,
       model: chatModel,
       reasoning: chatReasoning,
+      fast: chatFast,
       accessMode: chatProviderAccess,
+      onUsage: recordChatUsage,
     })
   : undefined;
-const reviewChat = createReviewChat({
+reviewChat = createReviewChat({
   snapshotPath: chatSnapshot,
   provider: chatProvider,
   accessMode: chatProviderAccess,
@@ -611,6 +706,7 @@ watchFile(output, { interval: 100 }, (current, previous) => {
     return;
   }
   reviewChat.refresh();
+  resetChatUsage(reviewChat.getState().fingerprint);
   broadcastEvent('update');
 });