claude-code-wakatime 3.0.5 → 3.1.1

package/hooks/hooks.json

@@ -6,7 +6,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node ${CLAUDE_PLUGIN_ROOT}/dist/index.js"
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/run"
           }
         ]
       }
@@ -17,7 +17,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node ${CLAUDE_PLUGIN_ROOT}/dist/index.js"
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/run"
           }
         ]
       }
@@ -28,7 +28,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node ${CLAUDE_PLUGIN_ROOT}/dist/index.js"
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/run"
           }
         ]
       }
@@ -39,7 +39,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node ${CLAUDE_PLUGIN_ROOT}/dist/index.js"
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/run"
           }
         ]
       }
@@ -50,7 +50,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node ${CLAUDE_PLUGIN_ROOT}/dist/index.js"
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/run"
           }
         ]
       }
@@ -61,7 +61,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node ${CLAUDE_PLUGIN_ROOT}/dist/index.js"
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/run"
           }
         ]
       }
@@ -72,10 +72,10 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node ${CLAUDE_PLUGIN_ROOT}/dist/index.js"
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/run"
           }
         ]
       }
     ]
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-wakatime",
-  "version": "3.0.5",
+  "version": "3.1.1",
   "description": "WakaTime plugin for Claude Code",
   "bin": {
     "claude-code-wakatime": "dist/index.js"
@@ -11,9 +11,9 @@
     "build:legacy": "esbuild src/install-hooks.ts --bundle --platform=node --outfile=dist/install-hooks.js",
     "build": "npm run build:legacy && esbuild src/index.ts --bundle --platform=node --outfile=dist/index.js",
     "watch": "npm run prebuild && tsc --watch",
-    "release:major": "npm version major && npm run build && npm publish && git push && git push --tags",
-    "release:minor": "npm version minor && npm run build && npm publish && git push && git push --tags",
-    "release:patch": "npm version patch && npm run build && npm publish && git push && git push --tags"
+    "release:major": "npm version major && npm run build && npm publish && git commit -am \"build release\" && git push && git push --tags",
+    "release:minor": "npm version minor && npm run build && npm publish && git commit -am \"build release\" && git push && git push --tags",
+    "release:patch": "npm version patch && npm run build && npm publish && git commit -am \"build release\" && git push && git push --tags"
   },
   "repository": {
     "type": "git",

package/scripts/generate-version.js

@@ -5,18 +5,30 @@ const path = require('path');
 
 const packagePath = path.join(__dirname, '..', 'package.json');
 const versionFilePath = path.join(__dirname, '..', 'src', 'version.ts');
+const marketplaceFilePath = path.join(__dirname, '..', '.claude-plugin', 'marketplace.json');
+const pluginFilePath = path.join(__dirname, '..', '.claude-plugin', 'plugin.json');
 
 try {
   const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
   const version = packageJson.version;
-  
+
   const versionFileContent = `// This file is auto-generated during build. Do not edit manually.
 export const VERSION = '${version}';
 `;
-  
+
   fs.writeFileSync(versionFilePath, versionFileContent);
   console.log(`Generated version.ts with version ${version}`);
+
+  const marketplace = JSON.parse(fs.readFileSync(marketplaceFilePath, 'utf8'));
+  marketplace.plugins[0].version = version;
+  fs.writeFileSync(marketplaceFilePath, JSON.stringify(marketplace, null, 2));
+  console.log(`Generated marketplace.json with version ${version}`);
+
+  const plugin = JSON.parse(fs.readFileSync(pluginFilePath, 'utf8'));
+  plugin.version = version;
+  fs.writeFileSync(pluginFilePath, JSON.stringify(plugin, null, 2));
+  console.log(`Generated plugin.json with version ${version}`);
 } catch (error) {
   console.error('Error generating version file:', error);
   process.exit(1);
-}
+}

package/scripts/run

@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+set -eu
+
+ROOT="${CLAUDE_PLUGIN_ROOT:-$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)}"
+
+# If user provides an explicit node path, use it
+if [ -n "${NODE_BIN:-}" ] && [ -x "${NODE_BIN}" ]; then
+  exec "${NODE_BIN}" "$ROOT/dist/index.js" "$@"
+fi
+
+# If node exists anyway, use it
+if command -v node >/dev/null 2>&1; then
+  exec node "$ROOT/dist/index.js" "$@"
+fi
+
+# NixOS bootstrap: run node from nixpkgs (flakes)
+if command -v nix >/dev/null 2>&1; then
+  exec nix run nixpkgs#nodejs -- node "$ROOT/dist/index.js" "$@"
+fi
+
+echo "Error: Node.js not found. On NixOS either:
+- set NODE_BIN=/absolute/path/to/node, or
+- ensure 'nix' is available and flakes are enabled." >&2
+exit 127

package/src/index.ts

@@ -4,27 +4,27 @@ import { execFile } from 'child_process';
 import { Options } from './options';
 import { VERSION } from './version';
 import { Dependencies } from './dependencies';
-import { logger, Logger, LogLevel } from './logger';
+import { logger, LogLevel } from './logger';
 import { Input } from './types';
 import { buildOptions, formatArguments, getEntityFiles, parseInput, shouldSendHeartbeat, updateState } from './utils';
 
 const options = new Options();
 const deps = new Dependencies(options, logger);
 
-function sendHeartbeat(inp: Input | undefined): boolean {
+async function sendHeartbeat(inp: Input | undefined): Promise<boolean> {
   const projectFolder = inp?.cwd;
-  const { entities, claudeVersion } = getEntityFiles(inp);
+  const { entities, claudeVersion } = await getEntityFiles(inp);
   if (entities.size === 0) return false;
 
   const wakatime_cli = deps.getCliLocation();
 
-  for (const [entity, lineChanges] of entities.entries()) {
-    logger.debug(`Entity: ${entity}`);
+  for (const [entityFile, entityData] of entities.entries()) {
+    logger.debug(`Entity: ${entityFile}`);
     const args: string[] = [
       '--entity',
-      entity,
+      entityFile,
       '--entity-type',
-      'file',
+      entityData.type,
       '--category',
       'ai coding',
       '--plugin',
@@ -35,9 +35,9 @@ function sendHeartbeat(inp: Input | undefined): boolean {
       args.push(projectFolder);
     }
 
-    if (lineChanges) {
+    if (entityData.lineChanges) {
       args.push('--ai-line-changes');
-      args.push(lineChanges.toString());
+      args.push(entityData.lineChanges.toString());
     }
 
     logger.debug(`Sending heartbeat: ${formatArguments(wakatime_cli, args)}`);
@@ -53,7 +53,7 @@ function sendHeartbeat(inp: Input | undefined): boolean {
   return true;
 }
 
-function main() {
+async function main() {
   const inp = parseInput();
 
   const debug = options.getSetting('settings', 'debug');
@@ -65,8 +65,8 @@ function main() {
     deps.checkAndInstallCli();
 
     if (shouldSendHeartbeat(inp)) {
-      if (sendHeartbeat(inp)) {
-        updateState();
+      if (await sendHeartbeat(inp)) {
+        await updateState(inp);
       }
     }
   } catch (err) {

package/src/types.ts

@@ -2,11 +2,23 @@ export type State = {
   lastHeartbeatAt?: number;
 };
 
+export type HookEvent =
+  | 'PreToolUse'
+  | 'PermissionRequest'
+  | 'PostToolUse'
+  | 'Notification'
+  | 'UserPromptSubmit'
+  | 'Stop'
+  | 'SubagentStop'
+  | 'PreCompact'
+  | 'SessionStart'
+  | 'SessionEnd';
+
 export type Input = {
   session_id: string;
   transcript_path: string;
   cwd: string;
-  hook_event_name: string;
+  hook_event_name: HookEvent;
 };
 
 export type TranscriptLog = {
@@ -48,3 +60,10 @@ export type TranscriptLog = {
     replaceAll?: string;
   };
 };
+
+export type Entity = {
+  type: 'file' | 'app';
+  lineChanges: number;
+};
+
+export type EntityMap = Map<string, Entity>;

package/src/utils.ts

@@ -2,12 +2,9 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as child_process from 'child_process';
 import { StdioOptions } from 'child_process';
-import { Input, State, TranscriptLog } from './types';
-import path from 'path';
+import { Entity, EntityMap, Input, State, TranscriptLog } from './types';
 import { logger } from './logger';
 
-const STATE_FILE = path.join(os.homedir(), '.wakatime', 'claude-code.json');
-
 export function parseInput() {
   try {
     const stdinData = fs.readFileSync(0, 'utf-8');
@@ -21,26 +18,33 @@ export function parseInput() {
   return undefined;
 }
 
+function getStateFile(inp: Input): string {
+  return `${inp.transcript_path}.wakatime`;
+}
+
 export function shouldSendHeartbeat(inp?: Input): boolean {
   if (inp?.hook_event_name === 'Stop') {
     return true;
   }
 
+  if (!inp) return false;
+
   try {
-    const last = (JSON.parse(fs.readFileSync(STATE_FILE, 'utf-8')) as State).lastHeartbeatAt ?? timestamp();
+    const last = (JSON.parse(fs.readFileSync(getStateFile(inp), 'utf-8')) as State).lastHeartbeatAt ?? timestamp();
     return timestamp() - last >= 60;
   } catch {
     return true;
   }
 }
 
-export function updateState() {
-  fs.mkdirSync(path.dirname(STATE_FILE), { recursive: true });
-  fs.writeFileSync(STATE_FILE, JSON.stringify({ lastHeartbeatAt: timestamp() } as State, null, 2));
+export async function updateState(inp?: Input) {
+  if (!inp) return;
+  const file = getStateFile(inp);
+  await fs.promises.writeFile(file, JSON.stringify({ lastHeartbeatAt: timestamp() } as State, null, 2));
 }
 
-export function getEntityFiles(inp: Input | undefined): { entities: Map<string, number>; claudeVersion: string } {
-  const entities = new Map<string, number>();
+export async function getEntityFiles(inp: Input | undefined): Promise<{ entities: EntityMap; claudeVersion: string }> {
+  const entities = new Map<string, Entity>() as EntityMap;
   let claudeVersion = '';
 
   const transcriptPath = inp?.transcript_path;
@@ -48,7 +52,7 @@ export function getEntityFiles(inp: Input | undefined): { entities: Map<string,
     return { entities, claudeVersion };
   }
 
-  const lastHeartbeatAt = getLastHeartbeat();
+  const lastHeartbeatAt = await getLastHeartbeat(inp);
 
   const content = fs.readFileSync(transcriptPath, 'utf-8');
   for (const logLine of content.split('\n')) {
@@ -71,12 +75,17 @@ export function getEntityFiles(inp: Input | undefined): { entities: Map<string,
 
       const lineChanges = patches.map((patch) => patch.newLines - patch.oldLines).reduce((p, c) => p + c, 0);
 
-      entities.set(filePath, (entities.get(filePath) ?? 0) + lineChanges);
+      const prevLineChanges = (entities.get(filePath) ?? ({ lineChanges: 0 } as Entity)).lineChanges;
+      entities.set(filePath, { lineChanges: prevLineChanges + lineChanges, type: 'file' });
     } catch (err) {
       logger.warnException(err);
     }
   }
 
+  if (inp.hook_event_name == 'UserPromptSubmit' && entities.size === 0) {
+    entities.set(inp.cwd, { lineChanges: 0, type: 'app' });
+  }
+
   return { entities, claudeVersion };
 }
 
@@ -116,9 +125,9 @@ export function buildOptions(stdin?: boolean): Object {
   return options;
 }
 
-function getLastHeartbeat() {
+async function getLastHeartbeat(inp: Input) {
   try {
-    const stateData = JSON.parse(fs.readFileSync(STATE_FILE, 'utf-8')) as State;
+    const stateData = JSON.parse(await fs.promises.readFile(getStateFile(inp), 'utf-8')) as State;
     return stateData.lastHeartbeatAt ?? 0;
   } catch {
     return 0;