fix: address PR review feedback

- Use fireAndForgetEnd() on all non-streaming handleEnd call sites so
  rejections are logged consistently (Greptile P2 / claude review #1)
- Guard drainUsageCollector() and getUsageCollectorHealth() against
  pre-init calls via tryGetUsageCollector() so a SIGTERM during early
  startup drains cleanly instead of throwing (Greptile / claude review #2)
- Align heading regex in usage-collector.ts with proxy.ts to prevent
  future divergence (claude review #3)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: tombii

packages/proxy/src/proxy.ts

@@ -28,6 +28,7 @@ import {
 import {
 	getUsageCollector,
 	initUsageCollector,
+	tryGetUsageCollector,
 	type UsageCollectorHealth,
 } from "./usage-collector";
 
@@ -108,11 +109,11 @@ export function initProxy(getStorePayloads: () => boolean): void {
 }
 
 export async function drainUsageCollector(): Promise<void> {
-	return getUsageCollector().drain();
+	return tryGetUsageCollector()?.drain() ?? Promise.resolve();
 }
 
 export function getUsageCollectorHealth(): UsageCollectorHealth {
-	return getUsageCollector().getHealth();
+	return tryGetUsageCollector()?.getHealth() ?? { state: "ready" };
 }
 
 // ===== MAIN HANDLER =====

packages/proxy/src/response-handler.ts

@@ -262,13 +262,12 @@ export async function forwardToClient(
 	 *********************************************************************/
 	if (!response.body) {
 		if (shouldProcessRequest) {
-			const endMsg: EndMessage = {
+			fireAndForgetEnd({
 				type: "end",
 				requestId,
 				responseBody: null,
 				success: isExpectedResponse(path, response),
-			};
-			void getUsageCollector().handleEnd(endMsg);
+			});
 		}
 
 		return response;
@@ -281,24 +280,22 @@ export async function forwardToClient(
 		onClose(buffered) {
 			if (!shouldProcessRequest) return;
 			const cappedBuf = combineChunks(buffered);
-			const endMsg: EndMessage = {
+			fireAndForgetEnd({
 				type: "end",
 				requestId,
 				responseBody:
 					cappedBuf.byteLength > 0 ? cappedBuf.toString("base64") : null,
 				success: isExpectedResponse(path, response),
-			};
-			void getUsageCollector().handleEnd(endMsg);
+			});
 		},
 		onError(err) {
 			if (!shouldProcessRequest) return;
-			const endMsg: EndMessage = {
+			fireAndForgetEnd({
 				type: "end",
 				requestId,
 				success: false,
 				error: err.message,
-			};
-			void getUsageCollector().handleEnd(endMsg);
+			});
 		},
 	});
 

packages/proxy/src/usage-collector.ts

@@ -110,7 +110,8 @@ function extractProjectFromRequest(startMessage: StartMessage): string | null {
 	const sanitizedPath = sanitizeProjectName(pathMatch?.[1]);
 	if (sanitizedPath) return sanitizedPath;
 
-	const headingMatch = systemPrompt.match(/^#\s+(.+?)$/m);
+	// Mirror of the regex in proxy.ts (both cap output via sanitizeProjectName)
+	const headingMatch = systemPrompt.match(/^#\s+([^\n\r]{1,100})/m);
 	if (headingMatch) {
 		const heading = sanitizeProjectName(headingMatch[1]);
 		if (heading && !heading.toLowerCase().startsWith("claude")) {
@@ -1045,3 +1046,11 @@ export function getUsageCollector(): UsageCollector {
 	}
 	return _usageCollector;
 }
+
+/**
+ * Returns the singleton or null if not yet initialized.
+ * Use in shutdown / health paths where a pre-init call must be a no-op.
+ */
+export function tryGetUsageCollector(): UsageCollector | null {
+	return _usageCollector;
+}