neuvikon 0.2.9 → 0.2.11

package/dist/index.mjs

@@ -238,7 +238,7 @@ function transcriptSize(path) {
 		closeSync(fd);
 	}
 }
-function readUsageSince(path, offset) {
+function readUsageSince(path, offset, since) {
 	let fd;
 	try {
 		fd = openSync(path, "r");
@@ -251,7 +251,8 @@ function readUsageSince(path, offset) {
 		if (size === from) return {
 			tokensIn: 0,
 			tokensOut: 0,
-			offset: size
+			offset: size,
+			lastMessageId: since
 		};
 		const buffer = Buffer.alloc(size - from);
 		readSync(fd, buffer, 0, buffer.length, from);
@@ -260,10 +261,12 @@ function readUsageSince(path, offset) {
 		if (lastNewline === -1) return {
 			tokensIn: 0,
 			tokensOut: 0,
-			offset: from
+			offset: from,
+			lastMessageId: since
 		};
 		let tokensIn = 0;
 		let tokensOut = 0;
+		let lastMessageId = since;
 		for (const line of text.slice(0, lastNewline).split("\n")) {
 			if (!line.trim()) continue;
 			let row;
@@ -274,13 +277,16 @@ function readUsageSince(path, offset) {
 			}
 			const usage = extractUsage(row);
 			if (!usage) continue;
+			if (usage.messageId !== void 0 && usage.messageId === lastMessageId) continue;
+			lastMessageId = usage.messageId ?? lastMessageId;
 			tokensIn += usage.tokensIn;
 			tokensOut += usage.tokensOut;
 		}
 		return {
 			tokensIn,
 			tokensOut,
-			offset: from + Buffer.byteLength(text.slice(0, lastNewline + 1))
+			offset: from + Buffer.byteLength(text.slice(0, lastNewline + 1)),
+			lastMessageId
 		};
 	} catch {
 		return null;
@@ -297,9 +303,11 @@ function extractUsage(row) {
 	if (typeof message !== "object" || message === null) return null;
 	const usage = message.usage;
 	if (typeof usage !== "object" || usage === null) return null;
+	const id = message.id;
 	const fields = usage;
 	return {
-		tokensIn: toCount$1(fields.input_tokens) + toCount$1(fields.cache_read_input_tokens) + toCount$1(fields.cache_creation_input_tokens),
+		messageId: typeof id === "string" && id ? id : void 0,
+		tokensIn: toCount$1(fields.input_tokens) + toCount$1(fields.cache_creation_input_tokens),
 		tokensOut: toCount$1(fields.output_tokens)
 	};
 }
@@ -358,6 +366,133 @@ function fail(message, hint) {
 	process.exit(1);
 }
 //#endregion
+//#region src/commands/report.ts
+/**
+* Agent hooks hand their context to the command on stdin as JSON. Reading the
+* transcript path from there means a hook is a bare `npx neuvikon report` with
+* nothing to wire up, and nothing to keep in sync when a tool renames a flag.
+*/
+async function transcriptFromHookPayload() {
+	const raw = await readStdin();
+	if (!raw.trim()) return void 0;
+	try {
+		const payload = JSON.parse(raw);
+		if (typeof payload !== "object" || payload === null) return void 0;
+		const path = payload.transcript_path;
+		return typeof path === "string" && path ? path : void 0;
+	} catch {
+		return;
+	}
+}
+function toCount(raw) {
+	if (raw === void 0) return void 0;
+	const value = Number(raw);
+	return Number.isFinite(value) && value >= 0 ? value : void 0;
+}
+/**
+* What the transcript has accumulated since this session's baseline.
+*
+* A session with no baseline yet establishes one here rather than counting
+* from the top: everything before the ticket started belongs to whatever the
+* agent was doing beforehand, not to this ticket.
+*/
+function pendingUsage(session, transcript) {
+	if (!transcript) return {
+		tokensIn: 0,
+		tokensOut: 0
+	};
+	let baseline = session.transcriptOffset;
+	if (baseline === void 0) {
+		baseline = transcriptSize(transcript) ?? void 0;
+		if (baseline !== void 0) writeSession({
+			...session,
+			transcriptOffset: baseline
+		});
+	}
+	if (baseline === void 0) return {
+		tokensIn: 0,
+		tokensOut: 0
+	};
+	const usage = readUsageSince(transcript, baseline, session.lastMessageId);
+	if (!usage) return {
+		tokensIn: 0,
+		tokensOut: 0
+	};
+	return {
+		tokensIn: usage.tokensIn,
+		tokensOut: usage.tokensOut,
+		nextOffset: usage.offset,
+		nextMessageId: usage.lastMessageId
+	};
+}
+/**
+* Hands a delta to the server, advancing the local offset only once it is
+* accepted — a dropped request leaves the window to be retried by the next
+* call instead of silently losing those tokens.
+*/
+async function postUsage(credentials, session, delta) {
+	try {
+		await post(credentials.url, "/api/agent/events", {
+			token: credentials.token,
+			event: "report",
+			sessionKey: session.sessionKey,
+			tokensIn: delta.tokensIn,
+			tokensOut: delta.tokensOut
+		});
+	} catch {
+		return false;
+	}
+	if (delta.nextOffset !== void 0) writeSession({
+		...session,
+		transcriptOffset: delta.nextOffset,
+		lastMessageId: delta.nextMessageId
+	});
+	return true;
+}
+/**
+* Closes a session, carrying everything it accumulated since its last report.
+*
+* Switching tickets used to stop the outgoing session bare, which dropped every
+* token it had earned since its last turn ended — and a ticket that was started
+* and left inside a single turn recorded exactly nothing.
+*/
+async function stopSession(credentials, session, transcript) {
+	const usage = pendingUsage(session, transcript);
+	await post(credentials.url, "/api/agent/events", {
+		token: credentials.token,
+		event: "stop",
+		sessionKey: session.sessionKey,
+		tokensIn: usage.tokensIn,
+		tokensOut: usage.tokensOut
+	}).catch(() => void 0);
+}
+/**
+* Called from an agent hook on every turn, so it is deliberately silent and
+* never exits non-zero: a token count is not worth interrupting someone's work
+* over, and a hook that fails loudly is a hook people uninstall.
+*/
+async function report(flags) {
+	const credentials = readCredentials();
+	const session = readSession();
+	if (!credentials || !session) {
+		if (flags.has("verbose")) info(dim(credentials ? "No ticket is being tracked here." : "Not logged in."));
+		return;
+	}
+	const fromTranscript = pendingUsage(session, flags.get("transcript") || await transcriptFromHookPayload() || claudeTranscriptPath());
+	const delta = {
+		tokensIn: (toCount(flags.get("tokens-in")) ?? 0) + fromTranscript.tokensIn,
+		tokensOut: (toCount(flags.get("tokens-out")) ?? 0) + fromTranscript.tokensOut,
+		nextOffset: fromTranscript.nextOffset,
+		nextMessageId: fromTranscript.nextMessageId
+	};
+	if (!delta.tokensIn && !delta.tokensOut && !flags.has("heartbeat")) {
+		if (flags.has("verbose")) info(dim("No new usage to report."));
+		return;
+	}
+	await postUsage(credentials, session, delta);
+	if (flags.has("verbose")) info(dim(`Reported ${delta.tokensIn} in / ${delta.tokensOut} out`));
+}
+//#endregion
 //#region src/commands/hook-start.ts
 /**
 * `UserPromptSubmit` fires before the turn runs, which is what lets it capture
@@ -396,18 +531,14 @@ async function hookStart() {
 		if (!ref) return;
 		const existing = readSession();
 		if (existing?.ticket === ref) return;
+		const transcript = transcriptPath ?? claudeTranscriptPath();
 		const result = await post(credentials.url, "/api/agent/events", {
 			token: credentials.token,
 			event: "start",
 			ticketRef: ref,
 			tool: "claude-code"
 		});
-		if (existing) await post(credentials.url, "/api/agent/events", {
-			token: credentials.token,
-			event: "stop",
-			sessionKey: existing.sessionKey
-		}).catch(() => void 0);
-		const transcript = transcriptPath ?? claudeTranscriptPath();
+		if (existing) await stopSession(credentials, existing, transcript);
 		const transcriptOffset = transcript ? transcriptSize(transcript) ?? void 0 : void 0;
 		writeSession({
 			sessionKey: result.sessionKey,
@@ -770,113 +901,6 @@ async function logout() {
 	info(dim("  Could not reach Neuvikon to revoke the token — revoke it in settings if it leaked."));
 }
 //#endregion
-//#region src/commands/report.ts
-/**
-* Agent hooks hand their context to the command on stdin as JSON. Reading the
-* transcript path from there means a hook is a bare `npx neuvikon report` with
-* nothing to wire up, and nothing to keep in sync when a tool renames a flag.
-*/
-async function transcriptFromHookPayload() {
-	const raw = await readStdin();
-	if (!raw.trim()) return void 0;
-	try {
-		const payload = JSON.parse(raw);
-		if (typeof payload !== "object" || payload === null) return void 0;
-		const path = payload.transcript_path;
-		return typeof path === "string" && path ? path : void 0;
-	} catch {
-		return;
-	}
-}
-function toCount(raw) {
-	if (raw === void 0) return void 0;
-	const value = Number(raw);
-	return Number.isFinite(value) && value >= 0 ? value : void 0;
-}
-/**
-* What the transcript has accumulated since this session's baseline.
-*
-* A session with no baseline yet establishes one here rather than counting
-* from the top: everything before the ticket started belongs to whatever the
-* agent was doing beforehand, not to this ticket.
-*/
-function pendingUsage(session, transcript) {
-	if (!transcript) return {
-		tokensIn: 0,
-		tokensOut: 0
-	};
-	let baseline = session.transcriptOffset;
-	if (baseline === void 0) {
-		baseline = transcriptSize(transcript) ?? void 0;
-		if (baseline !== void 0) writeSession({
-			...session,
-			transcriptOffset: baseline
-		});
-	}
-	if (baseline === void 0) return {
-		tokensIn: 0,
-		tokensOut: 0
-	};
-	const usage = readUsageSince(transcript, baseline);
-	if (!usage) return {
-		tokensIn: 0,
-		tokensOut: 0
-	};
-	return {
-		tokensIn: usage.tokensIn,
-		tokensOut: usage.tokensOut,
-		nextOffset: usage.offset
-	};
-}
-/**
-* Hands a delta to the server, advancing the local offset only once it is
-* accepted — a dropped request leaves the window to be retried by the next
-* call instead of silently losing those tokens.
-*/
-async function postUsage(credentials, session, delta) {
-	try {
-		await post(credentials.url, "/api/agent/events", {
-			token: credentials.token,
-			event: "report",
-			sessionKey: session.sessionKey,
-			tokensIn: delta.tokensIn,
-			tokensOut: delta.tokensOut
-		});
-	} catch {
-		return false;
-	}
-	if (delta.nextOffset !== void 0) writeSession({
-		...session,
-		transcriptOffset: delta.nextOffset
-	});
-	return true;
-}
-/**
-* Called from an agent hook on every turn, so it is deliberately silent and
-* never exits non-zero: a token count is not worth interrupting someone's work
-* over, and a hook that fails loudly is a hook people uninstall.
-*/
-async function report(flags) {
-	const credentials = readCredentials();
-	const session = readSession();
-	if (!credentials || !session) {
-		if (flags.has("verbose")) info(dim(credentials ? "No ticket is being tracked here." : "Not logged in."));
-		return;
-	}
-	const fromTranscript = pendingUsage(session, flags.get("transcript") || await transcriptFromHookPayload() || claudeTranscriptPath());
-	const delta = {
-		tokensIn: (toCount(flags.get("tokens-in")) ?? 0) + fromTranscript.tokensIn,
-		tokensOut: (toCount(flags.get("tokens-out")) ?? 0) + fromTranscript.tokensOut,
-		nextOffset: fromTranscript.nextOffset
-	};
-	if (!delta.tokensIn && !delta.tokensOut && !flags.has("heartbeat")) {
-		if (flags.has("verbose")) info(dim("No new usage to report."));
-		return;
-	}
-	await postUsage(credentials, session, delta);
-	if (flags.has("verbose")) info(dim(`Reported ${delta.tokensIn} in / ${delta.tokensOut} out`));
-}
-//#endregion
 //#region src/commands/start.ts
 const TOOLS = /* @__PURE__ */ new Set([
 	"claude-code",
@@ -913,6 +937,7 @@ async function start(flags, positional) {
 		info(dim(`Already tracking ${ref}.`));
 		return;
 	}
+	const transcript = flags.get("transcript") || claudeTranscriptPath();
 	let result;
 	try {
 		result = await post(credentials.url, "/api/agent/events", {
@@ -929,12 +954,7 @@ async function start(flags, positional) {
 		}
 		throw error;
 	}
-	if (existing) await post(credentials.url, "/api/agent/events", {
-		token: credentials.token,
-		event: "stop",
-		sessionKey: existing.sessionKey
-	}).catch(() => void 0);
-	const transcript = flags.get("transcript") || claudeTranscriptPath();
+	if (existing) await stopSession(credentials, existing, transcript);
 	writeSession({
 		sessionKey: result.sessionKey,
 		ticket: ref,
@@ -970,16 +990,7 @@ async function stop(flags) {
 		return;
 	}
 	const credentials = readCredentials();
-	if (credentials) {
-		const usage = pendingUsage(session, flags.get("transcript") || claudeTranscriptPath());
-		await post(credentials.url, "/api/agent/events", {
-			token: credentials.token,
-			event: "stop",
-			sessionKey: session.sessionKey,
-			tokensIn: usage.tokensIn,
-			tokensOut: usage.tokensOut
-		}).catch(() => void 0);
-	}
+	if (credentials) await stopSession(credentials, session, flags.get("transcript") || claudeTranscriptPath());
 	clearSession();
 	success(`Stopped tracking ${session.ticket}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuvikon",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Tell Neuvikon which ticket your coding agent is working on.",
   "keywords": [
     "neuvikon",
@@ -40,5 +40,8 @@
     "@types/node": "^26.2.0",
     "tsdown": "^0.22.14",
     "typescript": "^7.0.2"
+  },
+  "dependencies": {
+    "neuvikon": "link:"
   }
 }