Merge branch 'dev' into feature/heartbeat

# Conflicts:
#	src/app/App.svelte
#	src/app/store.svelte.ts
#	src/app/store.test.ts
#	src/features/workspaces/ui/WorkspaceCard.test.ts

1 files changed, 24 insertions, 24 deletions

diff --git a/src/core/metrics/index.ts b/src/core/metrics/index.ts
index 36cd96f..d3c9669 100644
--- a/src/core/metrics/index.ts
+++ b/src/core/metrics/index.ts
@@ -1,31 +1,31 @@
 export {
-	type ContextUsage,
-	computeCachePct,
-	computeContextUsage,
-	computeExpectedCachePct,
-	computeTps,
-	formatCompactTokens,
-	formatContextSize,
-	viewCacheRate,
-	viewExpectedCache,
-	viewStepMetrics,
-	viewTurnMetrics,
+  type ContextUsage,
+  computeCachePct,
+  computeContextUsage,
+  computeExpectedCachePct,
+  computeTps,
+  formatCompactTokens,
+  formatContextSize,
+  viewCacheRate,
+  viewExpectedCache,
+  viewStepMetrics,
+  viewTurnMetrics,
 } from "./format";
 export { interleaveTurnMetrics } from "./place";
 export {
-	applyDurableMetrics,
-	foldMetricsEvent,
-	initialMetricsState,
-	selectCurrentContextSize,
-	selectOrderedTurnMetrics,
+  applyDurableMetrics,
+  foldMetricsEvent,
+  initialMetricsState,
+  selectCurrentContextSize,
+  selectOrderedTurnMetrics,
 } from "./reducer";
 export type {
-	CacheRateView,
-	MetricsRow,
-	MetricsState,
-	StepMetrics,
-	StepMetricsView,
-	TurnMetrics,
-	TurnMetricsEntry,
-	TurnMetricsView,
+  CacheRateView,
+  MetricsRow,
+  MetricsState,
+  StepMetrics,
+  StepMetricsView,
+  TurnMetrics,
+  TurnMetricsEntry,
+  TurnMetricsView,
 } from "./types";