Merge branch 'develop'

Author: wagnert

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.7.1] - 2025-03-01
+
+### Fixed
+
+- Fix `agent_defaults` lookup to be tolerant of `@` prefix in agent names
+- Add `AgentMatcher` utility for consistent agent name normalization across the codebase
+
 ## [0.7.0] - 2025-02-04
 
 ### Added

package.json

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

src/hooks/EventHook.ts

@@ -12,6 +12,7 @@ import type { MessageWithParts } from "../types/MessageWithParts"
 import type { OpencodeClient } from "../types/OpencodeClient"
 import type { TimeTrackingConfig } from "../types/TimeTrackingConfig"
 
+import { AgentMatcher } from "../utils/AgentMatcher"
 import { DescriptionGenerator } from "../utils/DescriptionGenerator"
 
 /**
@@ -193,9 +194,11 @@ export function createEventHook(
       const agentString = session.agent?.name ?? null
 
       // Check if agent should be ignored (tolerant matching: with or without @ prefix)
-      const normalizedAgent = agentString?.replace(/^@/, "")
+      const normalizedAgent = agentString
+        ? AgentMatcher.normalize(agentString)
+        : null
       const isIgnoredAgent = config.ignored_agents?.some(
-        (ignored) => ignored.replace(/^@/, "") === normalizedAgent
+        (ignored) => AgentMatcher.normalize(ignored) === normalizedAgent
       )
 
       if (agentString && isIgnoredAgent) {

src/services/TicketResolver.ts

@@ -6,6 +6,8 @@ import type { ResolvedTicketInfo } from "../types/ResolvedTicketInfo"
 import type { TimeTrackingConfig } from "../types/TimeTrackingConfig"
 import type { TicketExtractor } from "./TicketExtractor"
 
+import { AgentMatcher } from "../utils/AgentMatcher"
+
 /**
  * Resolves tickets and account keys using fallback hierarchy.
  *
@@ -65,11 +67,13 @@ export class TicketResolver {
       }
     }
 
-    // 2. Try agent default
-    if (agentName && this.config.agent_defaults?.[agentName]) {
+    // 2. Try agent default (tolerant matching: with or without @ prefix)
+    const agentKey = agentName ? this.findAgentKey(agentName) : null
+
+    if (agentKey) {
       return {
-        ticket: this.config.agent_defaults[agentName].issue_key,
-        accountKey: this.resolveAccountKey(agentName),
+        ticket: this.config.agent_defaults![agentKey].issue_key,
+        accountKey: this.resolveAccountKey(agentKey),
       }
     }
 
@@ -88,16 +92,41 @@ export class TicketResolver {
     }
   }
 
+  /**
+   * Finds the matching config key for an agent name.
+   *
+   * @param agentName - The agent name from the SDK
+   * @returns The matching config key, or `null` if not found
+   *
+   * @remarks
+   * Normalizes both the agent name and config keys to ensure
+   * matching works regardless of @ prefix.
+   */
+  private findAgentKey(agentName: string): string | null {
+    const defaults = this.config.agent_defaults
+
+    if (!defaults) {
+      return null
+    }
+
+    const normalized = AgentMatcher.normalize(agentName)
+    const key = Object.keys(defaults).find(
+      (k) => AgentMatcher.normalize(k) === normalized
+    )
+
+    return key ?? null
+  }
+
   /**
    * Resolves account key using fallback hierarchy.
    *
-   * @param agentName - The agent name, or `null`
+   * @param agentKey - The agent config key, or `null`
    * @returns Resolved Tempo account key
    */
-  private resolveAccountKey(agentName: string | null): string {
+  private resolveAccountKey(agentKey: 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!
+    if (agentKey && this.config.agent_defaults?.[agentKey]?.account_key) {
+      return this.config.agent_defaults[agentKey].account_key!
     }
 
     // 2. Global default account_key (required)

src/utils/AgentMatcher.ts

@@ -0,0 +1,31 @@
+/**
+ * @fileoverview Utility for normalizing agent names.
+ */
+
+/**
+ * Normalizes agent names to a canonical form.
+ *
+ * @remarks
+ * Agent names can appear with or without the "@" prefix
+ * depending on the source (SDK, config, user input).
+ * This class ensures consistent comparison by normalizing
+ * all agent names to the "@<name>" format.
+ */
+export class AgentMatcher {
+  /**
+   * Normalizes an agent name to canonical form (with @ prefix).
+   *
+   * @param agentName - The agent name to normalize
+   * @returns The normalized agent name with @ prefix
+   *
+   * @example
+   * ```typescript
+   * AgentMatcher.normalize("developer")      // → "@developer"
+   * AgentMatcher.normalize("@developer")     // → "@developer"
+   * AgentMatcher.normalize("@time-tracking") // → "@time-tracking"
+   * ```
+   */
+  static normalize(agentName: string): string {
+    return agentName.startsWith("@") ? agentName : `@${agentName}`
+  }
+}