Merge pull request #14 from techdivision/develop

Release v0.6.0

Author: wagnert

AGENTS.md

@@ -33,7 +33,8 @@ src/
 │   ├── ConfigLoader.ts       # Load plugin configuration
 │   ├── CsvWriter.ts          # CSV file output
 │   ├── SessionManager.ts     # Session state management
-│   └── TicketExtractor.ts    # Extract tickets from messages/todos
+│   ├── TicketExtractor.ts    # Extract tickets from messages/todos
+│   └── TicketResolver.ts     # Resolve tickets with fallback hierarchy
 ├── types/                    # TypeScript interfaces (one per file)
 │   ├── ActivityData.ts
 │   ├── SessionData.ts
@@ -196,16 +197,22 @@ export default plugin
 
 ## Configuration
 
-Plugin config file: `.opencode/time-tracking.json`
+Plugin config file: `.opencode/opencode-project.json`
 
 ```json
 {
-  "csv_file": "~/worklogs/time.csv",
-  "user_email": "user@example.com",
-  "default_account_key": "ACCOUNT-1"
+  "time_tracking": {
+    "csv_file": "~/worklogs/time.csv",
+    "global_default": {
+      "issue_key": "PROJ-MISC",
+      "account_key": "ACCOUNT-1"
+    }
+  }
 }
 ```
 
+User email is resolved from `OPENCODE_USER_EMAIL` environment variable or system username.
+
 ## Git Workflow (Gitflow)
 
 This project follows **Gitflow**:

CHANGELOG.md

@@ -0,0 +1,54 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [0.6.0] - 2025-01-31
+
+### Breaking Changes
+
+- **Config:** `default_account_key` removed from top-level config
+- **Config:** `global_default` is now required (was optional)
+- **Config:** `global_default.account_key` is now required (was optional)
+
+### Migration
+
+Update your `.opencode/opencode-project.json`:
+
+**Before (0.5.x):**
+```json
+{
+  "time_tracking": {
+    "csv_file": "...",
+    "default_account_key": "TD_KS_1100",
+    "global_default": {
+      "issue_key": "PROJ-123"
+    }
+  }
+}
+```
+
+**After (0.6.0):**
+```json
+{
+  "time_tracking": {
+    "csv_file": "...",
+    "global_default": {
+      "issue_key": "PROJ-123",
+      "account_key": "TD_KS_1100"
+    }
+  }
+}
+```
+
+Run `/time-tracking.init` to automatically migrate your configuration.
+
+## [0.5.0] - 2025-01-28
+
+### Added
+
+- Initial release
+- Automatic session tracking with ticket extraction
+- CSV export for time entries
+- Agent-specific default tickets
+- Global fallback configuration
+- Ignored agents support

README.md

@@ -23,7 +23,10 @@ Add the `time_tracking` section to your `.opencode/opencode-project.json`:
   "$schema": "https://raw.githubusercontent.com/techdivision/opencode-plugins/main/schemas/opencode-project.json",
   "time_tracking": {
     "csv_file": "~/time_tracking/time-tracking.csv",
-    "default_account_key": "YOUR_ACCOUNT_KEY"
+    "global_default": {
+      "issue_key": "PROJ-MISC",
+      "account_key": "YOUR_ACCOUNT_KEY"
+    }
   }
 }
 ```
@@ -46,11 +49,100 @@ export OPENCODE_USER_EMAIL=your@email.com
 
 If not set, the system username is used as fallback.
 
+## Configuration Options
+
+### Required Fields
+
+| Field | Description |
+|-------|-------------|
+| `csv_file` | Path to the CSV output file (supports `~/`, absolute, or relative paths) |
+| `global_default.issue_key` | Default JIRA issue key when no ticket found in context |
+| `global_default.account_key` | Default Tempo account key for time entries |
+
+### Optional Fields
+
+#### Agent-specific Defaults
+
+Override default ticket/account for specific agents:
+
+```json
+{
+  "time_tracking": {
+    "csv_file": "...",
+    "global_default": {
+      "issue_key": "PROJ-MISC",
+      "account_key": "TD_GENERAL"
+    },
+    "agent_defaults": {
+      "@developer": {
+        "issue_key": "PROJ-DEV",
+        "account_key": "TD_DEVELOPMENT"
+      },
+      "@reviewer": {
+        "issue_key": "PROJ-REVIEW"
+      }
+    }
+  }
+}
+```
+
+#### Ignored Agents
+
+Skip time tracking for specific agents:
+
+```json
+{
+  "time_tracking": {
+    "csv_file": "...",
+    "global_default": { ... },
+    "ignored_agents": ["@internal", "@notrack"]
+  }
+}
+```
+
+### Full Example
+
+```json
+{
+  "$schema": "https://raw.githubusercontent.com/techdivision/opencode-plugins/main/schemas/opencode-project.json",
+  "time_tracking": {
+    "csv_file": "~/time_tracking/time-tracking.csv",
+    "global_default": {
+      "issue_key": "PROJ-MISC",
+      "account_key": "TD_GENERAL"
+    },
+    "agent_defaults": {
+      "@developer": {
+        "issue_key": "PROJ-DEV",
+        "account_key": "TD_DEVELOPMENT"
+      },
+      "@reviewer": {
+        "issue_key": "PROJ-REVIEW"
+      }
+    },
+    "ignored_agents": ["@internal"]
+  }
+}
+```
+
+## Fallback Hierarchy
+
+### Ticket Resolution
+
+1. Context ticket (from messages/todos)
+2. Agent-specific `issue_key` (if configured)
+3. `global_default.issue_key`
+
+### Account Key Resolution
+
+1. Agent-specific `account_key` (if configured)
+2. `global_default.account_key`
+
 ## How it works
 
 - Tracks tool executions during each session turn
-- Extracts JIRA ticket from git branch name (e.g., `feature/PROJ-123-description`)
-- Writes CSV entry when session becomes idle (after each complete response)
+- Extracts JIRA ticket from user messages or todos
+- Writes CSV entry when session becomes idle
 - Shows toast notification with tracked time
 
 ## CSV Format

package.json

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

src/services/TicketResolver.ts

@@ -18,8 +18,7 @@ import type { TicketExtractor } from "./TicketExtractor"
  *
  * Account key fallback hierarchy:
  * 1. Agent-specific account_key
- * 2. Global default account_key
- * 3. default_account_key from config
+ * 2. Global default account_key (required)
  */
 export class TicketResolver {
   /** Plugin configuration */
@@ -101,12 +100,7 @@ export class TicketResolver {
       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
+    // 2. Global default account_key (required)
+    return this.config.global_default.account_key
   }
 }

src/types/GlobalDefaultConfig.ts

@@ -19,10 +19,11 @@ export interface GlobalDefaultConfig {
   issue_key: string
 
   /**
-   * Optional Tempo Account Key.
+   * Default Tempo Account Key.
    *
    * @remarks
-   * If not set, falls back to `default_account_key`.
+   * Required. Used as the default account for all time entries
+   * unless overridden by agent-specific configuration.
    */
-  account_key?: string
+  account_key: string
 }

src/types/TimeTrackingConfig.ts

@@ -25,26 +25,23 @@ export interface TimeTrackingJsonConfig {
    */
   csv_file: string
 
-  /** Default Jira account key for time entries */
-  default_account_key: string
-
   /**
-   * Agent-specific default tickets.
+   * Global fallback ticket and account configuration.
    *
    * @remarks
-   * Map of agent names (e.g., "@developer", "@reviewer") to their
-   * default ticket configuration. Used when no ticket is found in context.
+   * Required. Contains the default issue_key and account_key used when
+   * no ticket is found in context and no agent-specific default is configured.
    */
-  agent_defaults?: Record<string, AgentDefaultConfig>
+  global_default: GlobalDefaultConfig
 
   /**
-   * Global fallback ticket configuration.
+   * Agent-specific default tickets.
    *
    * @remarks
-   * Used when no ticket is found in context and no agent-specific
-   * default is configured.
+   * Map of agent names (e.g., "@developer", "@reviewer") to their
+   * default ticket configuration. Used when no ticket is found in context.
    */
-  global_default?: GlobalDefaultConfig
+  agent_defaults?: Record<string, AgentDefaultConfig>
 
   /**
    * List of agent names to ignore for time tracking.