claude-attribution 1.8.0 → 1.9.0

package/src/metrics/transcript.ts

@@ -4,8 +4,8 @@
  * Claude Code writes JSONL transcript files to:
  *   ~/.claude/projects/<project-key>/<session-id>.jsonl
  *
- * where <project-key> is the absolute repo path with '/' replaced by '-'.
- * Each line is a JSON object with `type: "human" | "assistant" | ...`.
+ * where <project-key> is a sanitized absolute repo path.
+ * Each line is a JSON object with `type: "user" | "assistant" | ...`.
  * Assistant messages include `message.model` and `message.usage` (token counts).
  *
  * Subagent transcripts are stored in:
@@ -17,7 +17,7 @@
 import { readFile, readdir } from "fs/promises";
 import { existsSync } from "fs";
 import { join, resolve } from "path";
-import { homedir } from "os";
+import { resolveClaudeProjectDir } from "./claude-projects.ts";
 
 export interface ModelUsage {
 	modelShort: "Opus" | "Sonnet" | "Haiku" | "Unknown";
@@ -50,12 +50,22 @@ export interface TranscriptResult {
 	toolCounts: Record<string, number>;
 	/** Skill names invoked (from Skill tool_use blocks with input.skill). */
 	skillNames: string[];
+	/** Subagent counts keyed by agent type/name when available. */
+	agentCounts?: Record<string, number>;
+	/** Source provider for the session metrics. */
+	provider?: "claude" | "copilot";
+	/** Whether cost can be estimated from the available local data. */
+	costMode?: "estimated" | "unavailable";
+	/** Explanation shown when cost cannot be estimated. */
+	costDescription?: string;
 }
 
 interface TranscriptEntry {
 	type?: string;
 	timestamp?: string;
+	toolUseResult?: unknown;
 	message?: {
+		role?: string;
 		model?: string;
 		usage?: {
 			input_tokens?: number;
@@ -63,7 +73,9 @@ interface TranscriptEntry {
 			cache_creation_input_tokens?: number;
 			cache_read_input_tokens?: number;
 		};
-		content?: Array<{
+		content?:
+			| string
+			| Array<{
 			type?: string;
 			name?: string;
 			input?: Record<string, unknown>;
@@ -83,20 +95,44 @@ function modelShort(full: string): ModelUsage["modelShort"] {
 	return "Unknown";
 }
 
+function contentBlocks(entry: TranscriptEntry): Array<{
+	type?: string;
+	name?: string;
+	input?: Record<string, unknown>;
+}> {
+	return Array.isArray(entry.message?.content) ? entry.message.content : [];
+}
+
+function isToolResultEntry(entry: TranscriptEntry): boolean {
+	return (
+		entry.toolUseResult !== undefined ||
+		contentBlocks(entry).some((block) => block.type === "tool_result")
+	);
+}
+
+function isHumanPromptEntry(entry: TranscriptEntry): boolean {
+	return (
+		(entry.type === "human" || entry.type === "user") && !isToolResultEntry(entry)
+	);
+}
+
+function timedMessageType(entry: TranscriptEntry): TimedMessage["type"] | null {
+	if (entry.type === "assistant") return "assistant";
+	if (isHumanPromptEntry(entry)) return "human";
+	if (isToolResultEntry(entry)) return "tool_result";
+	return null;
+}
+
 /**
  * Derive the Claude Code projects directory key from an absolute repo path.
  *
  * Claude Code stores transcripts at `~/.claude/projects/<key>/` where <key>
- * is the absolute path with every '/' replaced by '-'. For example:
- *   /Users/alice/Code/my-repo → -Users-alice-Code-my-repo
+ * is derived from the absolute repo path. Current Claude builds sanitize path
+ * punctuation like dots as well as path separators. For example:
+ *   /Users/alice.smith/Code/my-repo → -Users-alice-smith-Code-my-repo
  *
  * This key is used to locate the transcript JSONL file for a given session.
  */
-function projectKey(repoRoot: string): string {
-	// Claude Code replaces '/' with '-' in the path
-	return repoRoot.replace(/\//g, "-");
-}
-
 async function parseTranscriptFile(filePath: string): Promise<{
 	entries: TranscriptEntry[];
 	humanCount: number;
@@ -117,13 +153,14 @@ async function parseTranscriptFile(filePath: string): Promise<{
 		try {
 			const entry = JSON.parse(trimmed) as TranscriptEntry;
 			entries.push(entry);
-			if (entry.type === "human") humanCount++;
-			if (entry.type && entry.timestamp) {
+			if (isHumanPromptEntry(entry)) humanCount++;
+			const messageType = timedMessageType(entry);
+			if (messageType && entry.timestamp) {
 				const ms = new Date(entry.timestamp).getTime();
-				if (!isNaN(ms)) timedMessages.push({ type: entry.type, ts: ms });
+				if (!isNaN(ms)) timedMessages.push({ type: messageType, ts: ms });
 			}
 			if (entry.type === "assistant") {
-				for (const block of entry.message?.content ?? []) {
+				for (const block of contentBlocks(entry)) {
 					if (block.type !== "tool_use" || !block.name) continue;
 					toolCounts.set(block.name, (toolCounts.get(block.name) ?? 0) + 1);
 					if (
@@ -237,8 +274,8 @@ export async function parseTranscript(
 	repoRoot?: string,
 ): Promise<TranscriptResult | null> {
 	const root = repoRoot ?? resolve(process.cwd());
-	const key = projectKey(root);
-	const transcriptDir = join(homedir(), ".claude", "projects", key);
+	const transcriptDir = await resolveClaudeProjectDir(root);
+	if (!transcriptDir) return null;
 	const mainFile = join(transcriptDir, `${sessionId}.jsonl`);
 
 	if (!existsSync(mainFile)) return null;
@@ -317,5 +354,7 @@ export async function parseTranscript(
 		humanMinutes,
 		toolCounts: Object.fromEntries(toolCounts),
 		skillNames,
+		provider: "claude",
+		costMode: "estimated",
 	};
 }

package/src/setup/installed-repos.ts

@@ -102,13 +102,13 @@ export async function registerInstalledRepo(
 export async function unregisterInstalledRepo(
 	repoRoot: string,
 	homeDir = homedir(),
-): Promise<void> {
+): Promise<boolean> {
 	const normalizedPath = await normalizeRepoPath(repoRoot);
 	const records = await readInstalledRepoRegistry(homeDir);
 	const filtered = records.filter((record) => record.path !== normalizedPath);
-	if (filtered.length !== records.length) {
-		await writeInstalledRepoRegistry(filtered, homeDir);
-	}
+	if (filtered.length === records.length) return false;
+	await writeInstalledRepoRegistry(filtered, homeDir);
+	return true;
 }
 
 export function isTrackedRepoPathValid(repoRoot: string): boolean {

package/src/setup/uninstall.ts

@@ -213,8 +213,13 @@ async function main() {
 		console.log("✓ Removed .claude/attribution-state/installed-version");
 	}
 	try {
-		await unregisterInstalledRepo(targetRepo);
-		console.log("✓ Updated installed repo registry");
+		if (await unregisterInstalledRepo(targetRepo)) {
+			console.log("✓ Removed repo from installed repo registry");
+		} else {
+			console.log(
+				"ℹ Repo was not tracked in installed repo registry; nothing to update",
+			);
+		}
 	} catch (error) {
 		console.warn(
 			`⚠ Could not update installed repo registry: ${(error as Error).message}`,