@techdivision/opencode-time-tracking 0.3.1 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@techdivision/opencode-time-tracking",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Automatic time tracking plugin for OpenCode - tracks session duration and tool usage to CSV",
   "main": "src/Plugin.ts",
   "types": "src/Plugin.ts",

package/src/Plugin.ts

@@ -13,6 +13,7 @@ import { ConfigLoader } from "./services/ConfigLoader"
 import { CsvWriter } from "./services/CsvWriter"
 import { SessionManager } from "./services/SessionManager"
 import { TicketExtractor } from "./services/TicketExtractor"
+import { TicketResolver } from "./services/TicketResolver"
 import { createEventHook } from "./hooks/EventHook"
 import { createToolExecuteAfterHook } from "./hooks/ToolExecuteAfterHook"
 
@@ -61,13 +62,14 @@ export const plugin: Plugin = async ({
   const sessionManager = new SessionManager()
   const csvWriter = new CsvWriter(config, directory)
   const ticketExtractor = new TicketExtractor(client)
+  const ticketResolver = new TicketResolver(config, ticketExtractor)
 
   const hooks: Hooks = {
     "tool.execute.after": createToolExecuteAfterHook(
       sessionManager,
       ticketExtractor
     ),
-    event: createEventHook(sessionManager, csvWriter, client),
+    event: createEventHook(sessionManager, csvWriter, client, ticketResolver),
   }
 
   return hooks

package/src/hooks/EventHook.ts

@@ -6,6 +6,7 @@ import type { AssistantMessage, Event, Message } from "@opencode-ai/sdk"
 
 import type { CsvWriter } from "../services/CsvWriter"
 import type { SessionManager } from "../services/SessionManager"
+import type { TicketResolver } from "../services/TicketResolver"
 import type { MessagePartUpdatedProperties } from "../types/MessagePartUpdatedProperties"
 import type { MessageWithParts } from "../types/MessageWithParts"
 import type { OpencodeClient } from "../types/OpencodeClient"
@@ -83,10 +84,11 @@ async function extractSummaryTitle(
 export function createEventHook(
   sessionManager: SessionManager,
   csvWriter: CsvWriter,
-  client: OpencodeClient
+  client: OpencodeClient,
+  ticketResolver: TicketResolver
 ) {
   return async ({ event }: { event: Event }): Promise<void> => {
-    // Track model from assistant messages
+    // Track model and agent from assistant messages
     if (event.type === "message.updated") {
       const props = event.properties as MessageUpdatedProperties
       const message = props.info
@@ -94,29 +96,40 @@ export function createEventHook(
       if (message.role === "assistant") {
         const assistantMsg = message as AssistantMessage
 
+        // Ensure session exists for tracking
+        if (!sessionManager.has(assistantMsg.sessionID)) {
+          sessionManager.create(assistantMsg.sessionID, null)
+        }
+
+        // Track model
         if (assistantMsg.modelID && assistantMsg.providerID) {
           sessionManager.setModel(assistantMsg.sessionID, {
             modelID: assistantMsg.modelID,
             providerID: assistantMsg.providerID,
           })
         }
+
+        // Track agent from mode field
+        if (assistantMsg.mode) {
+          sessionManager.setAgent(assistantMsg.sessionID, assistantMsg.mode)
+        }
       }
 
       return
     }
 
-    // Track token usage and agent from message part events
+    // Track token usage from message part events
     if (event.type === "message.part.updated") {
       const props = event.properties as MessagePartUpdatedProperties
       const part = props.part
 
-      // Track agent from agent parts (only first agent is stored)
-      if (part.type === "agent" && part.sessionID && part.name) {
-        sessionManager.setAgent(part.sessionID, part.name)
-      }
-
       // Track token usage from step-finish events
       if (part.type === "step-finish" && part.sessionID && part.tokens) {
+        // Ensure session exists for token tracking
+        if (!sessionManager.has(part.sessionID)) {
+          sessionManager.create(part.sessionID, null)
+        }
+
         sessionManager.addTokenUsage(part.sessionID, {
           input: part.tokens.input,
           output: part.tokens.output,
@@ -138,10 +151,17 @@ export function createEventHook(
         return
       }
 
-      const session = sessionManager.get(sessionID)
+      // Atomically get and delete to prevent race conditions
+      const session = sessionManager.getAndDelete(sessionID)
 
-      if (!session || session.activities.length === 0) {
-        sessionManager.delete(sessionID)
+      // Check if session has any trackable data
+      const hasActivity = (session?.activities.length ?? 0) > 0
+      const hasTokens =
+        (session?.tokenUsage.input ?? 0) +
+          (session?.tokenUsage.output ?? 0) >
+        0
+
+      if (!session || (!hasActivity && !hasTokens)) {
         return
       }
 
@@ -170,9 +190,13 @@ export function createEventHook(
       // Get agent name if available
       const agentString = session.agent?.name ?? null
 
+      // Resolve ticket and account key with fallback hierarchy
+      const resolved = await ticketResolver.resolve(sessionID, agentString)
+
       try {
         await csvWriter.write({
-          ticket: session.ticket,
+          ticket: resolved.ticket,
+          accountKey: resolved.accountKey,
           startTime: session.startTime,
           endTime,
           durationSeconds,
@@ -187,7 +211,7 @@ export function createEventHook(
 
         await client.tui.showToast({
           body: {
-            message: `Time tracked: ${minutes} min, ${totalTokens} tokens${session.ticket ? ` for ${session.ticket}` : ""}`,
+            message: `Time tracked: ${minutes} min, ${totalTokens} tokens${resolved.ticket ? ` for ${resolved.ticket}` : ""}`,
             variant: "success",
           },
         })
@@ -198,9 +222,7 @@ export function createEventHook(
             variant: "error",
           },
         })
-        }
-
-      sessionManager.delete(sessionID)
+      }
     }
   }
 }

package/src/services/CsvWriter.ts

@@ -113,7 +113,7 @@ export class CsvWriter {
       this.config.user_email,
       "",
       data.ticket ?? "",
-      this.config.default_account_key,
+      data.accountKey,
       CsvFormatter.formatTime(data.startTime),
       CsvFormatter.formatTime(data.endTime),
       data.durationSeconds.toString(),

package/src/services/SessionManager.ts

@@ -81,6 +81,27 @@ export class SessionManager {
     this.sessions.delete(sessionID)
   }
 
+  /**
+   * Retrieves and deletes a session atomically.
+   *
+   * @param sessionID - The OpenCode session identifier
+   * @returns The session data, or `undefined` if not found
+   *
+   * @remarks
+   * Prevents race conditions when multiple idle events fire
+   * for the same session. The session is removed immediately
+   * after retrieval to ensure it can only be processed once.
+   */
+  getAndDelete(sessionID: string): SessionData | undefined {
+    const session = this.sessions.get(sessionID)
+
+    if (session) {
+      this.sessions.delete(sessionID)
+    }
+
+    return session
+  }
+
   /**
    * Adds a tool activity to a session.
    *

package/src/services/TicketResolver.ts

@@ -0,0 +1,112 @@
+/**
+ * @fileoverview Resolves tickets and account keys with fallback hierarchy.
+ */
+
+import type { ResolvedTicketInfo } from "../types/ResolvedTicketInfo"
+import type { TimeTrackingConfig } from "../types/TimeTrackingConfig"
+import type { TicketExtractor } from "./TicketExtractor"
+
+/**
+ * Resolves tickets and account keys using fallback hierarchy.
+ *
+ * @remarks
+ * Ticket fallback hierarchy:
+ * 1. Context ticket (from messages/todos)
+ * 2. Agent default (from config)
+ * 3. Global default (from config)
+ * 4. `null` (no ticket found)
+ *
+ * Account key fallback hierarchy:
+ * 1. Agent-specific account_key
+ * 2. Global default account_key
+ * 3. default_account_key from config
+ */
+export class TicketResolver {
+  /** Plugin configuration */
+  private config: TimeTrackingConfig
+
+  /** Ticket extractor for context-based lookup */
+  private ticketExtractor: TicketExtractor
+
+  /**
+   * Creates a new ticket resolver instance.
+   *
+   * @param config - The plugin configuration
+   * @param ticketExtractor - The ticket extractor instance
+   */
+  constructor(config: TimeTrackingConfig, ticketExtractor: TicketExtractor) {
+    this.config = config
+    this.ticketExtractor = ticketExtractor
+  }
+
+  /**
+   * Resolves ticket and account key for a session.
+   *
+   * @param sessionID - The OpenCode session identifier
+   * @param agentName - The agent name (e.g., "@developer"), or `null`
+   * @returns Resolved ticket info with ticket and accountKey
+   *
+   * @example
+   * ```typescript
+   * const resolved = await ticketResolver.resolve("session-123", "@developer")
+   * // Returns { ticket: "PROJ-123", accountKey: "TD_DEV" }
+   * ```
+   */
+  async resolve(
+    sessionID: string,
+    agentName: string | null
+  ): Promise<ResolvedTicketInfo> {
+    // 1. Try context ticket
+    const contextTicket = await this.ticketExtractor.extract(sessionID)
+
+    if (contextTicket) {
+      return {
+        ticket: contextTicket,
+        accountKey: this.resolveAccountKey(agentName),
+      }
+    }
+
+    // 2. Try agent default
+    if (agentName && this.config.agent_defaults?.[agentName]) {
+      return {
+        ticket: this.config.agent_defaults[agentName].issue_key,
+        accountKey: this.resolveAccountKey(agentName),
+      }
+    }
+
+    // 3. Try global default
+    if (this.config.global_default) {
+      return {
+        ticket: this.config.global_default.issue_key,
+        accountKey: this.resolveAccountKey(agentName),
+      }
+    }
+
+    // 4. No ticket found
+    return {
+      ticket: null,
+      accountKey: this.resolveAccountKey(agentName),
+    }
+  }
+
+  /**
+   * Resolves account key using fallback hierarchy.
+   *
+   * @param agentName - The agent name, or `null`
+   * @returns Resolved Tempo account key
+   */
+  private resolveAccountKey(agentName: string | null): string {
+    // 1. Agent-specific account_key
+    if (agentName && this.config.agent_defaults?.[agentName]?.account_key) {
+      return this.config.agent_defaults[agentName].account_key!
+    }
+
+    // 2. Global default account_key
+    if (this.config.global_default?.account_key) {
+      return this.config.global_default.account_key
+    }
+
+    // 3. Config default
+    return this.config.default_account_key
+  }
+}

package/src/types/AgentDefaultConfig.ts

@@ -0,0 +1,29 @@
+/**
+ * @fileoverview Agent-specific default ticket configuration.
+ */
+
+/**
+ * Configuration for agent-specific default tickets.
+ *
+ * @remarks
+ * Used as fallback when no ticket is found in session context.
+ * Each agent (e.g., "@developer", "@reviewer") can have its own default.
+ */
+export interface AgentDefaultConfig {
+  /**
+   * Default JIRA Issue Key for this agent.
+   *
+   * @remarks
+   * Must match pattern `^[A-Z][A-Z0-9]+-[0-9]+$` (e.g., "PROJ-123")
+   */
+  issue_key: string
+
+  /**
+   * Optional Tempo Account Key override.
+   *
+   * @remarks
+   * If not set, falls back to `global_default.account_key`
+   * or `default_account_key`.
+   */
+  account_key?: string
+}

package/src/types/CsvEntryData.ts

@@ -45,4 +45,15 @@ export interface CsvEntryData {
    * Only the first/primary agent is tracked.
    */
   agent: string | null
+
+  /**
+   * Tempo account key for the worklog entry.
+   *
+   * @remarks
+   * Resolved from (in order of priority):
+   * 1. Agent-specific account_key
+   * 2. Global default account_key
+   * 3. default_account_key from config
+   */
+  accountKey: string
 }

package/src/types/GlobalDefaultConfig.ts

@@ -0,0 +1,28 @@
+/**
+ * @fileoverview Global fallback ticket configuration.
+ */
+
+/**
+ * Configuration for global default ticket fallback.
+ *
+ * @remarks
+ * Used when no ticket is found in session context and no
+ * agent-specific default is configured.
+ */
+export interface GlobalDefaultConfig {
+  /**
+   * Global default JIRA Issue Key.
+   *
+   * @remarks
+   * Must match pattern `^[A-Z][A-Z0-9]+-[0-9]+$` (e.g., "PROJ-MISC-001")
+   */
+  issue_key: string
+
+  /**
+   * Optional Tempo Account Key.
+   *
+   * @remarks
+   * If not set, falls back to `default_account_key`.
+   */
+  account_key?: string
+}

package/src/types/ResolvedTicketInfo.ts

@@ -0,0 +1,35 @@
+/**
+ * @fileoverview Result type for ticket resolution.
+ */
+
+/**
+ * Result of ticket resolution containing ticket and account key.
+ *
+ * @remarks
+ * Returned by `TicketResolver.resolve()` after applying the
+ * fallback hierarchy.
+ */
+export interface ResolvedTicketInfo {
+  /**
+   * Resolved JIRA ticket, or `null` if not found.
+   *
+   * @remarks
+   * Resolution priority:
+   * 1. Context ticket (from messages/todos)
+   * 2. Agent default (from config)
+   * 3. Global default (from config)
+   * 4. `null` (no ticket found)
+   */
+  ticket: string | null
+
+  /**
+   * Resolved Tempo account key.
+   *
+   * @remarks
+   * Resolution priority:
+   * 1. Agent-specific account_key
+   * 2. Global default account_key
+   * 3. default_account_key from config
+   */
+  accountKey: string
+}

package/src/types/TimeTrackingConfig.ts

@@ -2,6 +2,9 @@
  * @fileoverview Configuration type for the time tracking plugin.
  */
 
+import type { AgentDefaultConfig } from "./AgentDefaultConfig"
+import type { GlobalDefaultConfig } from "./GlobalDefaultConfig"
+
 /**
  * Time tracking configuration as stored in `.opencode/opencode-project.json`.
  *
@@ -24,6 +27,24 @@ export interface TimeTrackingJsonConfig {
 
   /** Default Jira account key for time entries */
   default_account_key: string
+
+  /**
+   * Agent-specific default tickets.
+   *
+   * @remarks
+   * Map of agent names (e.g., "@developer", "@reviewer") to their
+   * default ticket configuration. Used when no ticket is found in context.
+   */
+  agent_defaults?: Record<string, AgentDefaultConfig>
+
+  /**
+   * Global fallback ticket configuration.
+   *
+   * @remarks
+   * Used when no ticket is found in context and no agent-specific
+   * default is configured.
+   */
+  global_default?: GlobalDefaultConfig
 }
 
 /**

package/src/utils/DescriptionGenerator.ts

@@ -35,7 +35,7 @@ export class DescriptionGenerator {
    */
   static generate(activities: ActivityData[]): string {
     if (activities.length === 0) {
-      return "No activities tracked"
+      return "Chat session (no tool calls)"
     }
 
     const toolCounts = activities.reduce(