baton-issue-tracker 1.5.0 → 1.7.0

package/source/models/schema.js

@@ -3,6 +3,12 @@ import { sql } from "drizzle-orm";
 import { Status, Priority } from "./issue.js";
 import { Action } from "./activityLog.js";
 
+export const agentsTable = sqliteTable("agents", {
+  id:   int().primaryKey({ autoIncrement: true }),
+  name: text().notNull().unique(),
+  type: text({ enum: ['agent', 'human'] }).notNull(),
+});
+
 export const issuesTable = sqliteTable("issues", {
   id:          int().primaryKey({ autoIncrement: true }),
   createdAt:   text("created_at").notNull().default(sql`CURRENT_TIMESTAMP`),
@@ -13,7 +19,7 @@ export const issuesTable = sqliteTable("issues", {
   priority:    text({ enum: Object.values(Priority) }).default(Priority.LOW),
   tokenLimit:  int("token_limit"),
   description: text(),
-  assignees:   text({mode: "json"}).default(sql`'[]'`),
+  assigneeId:  int("assignee_id").references(() => agentsTable.id),
 });
 
 export const activityTable = sqliteTable(
@@ -21,6 +27,7 @@ export const activityTable = sqliteTable(
   {
     logId:     int("log_id").primaryKey({ autoIncrement: true }),
     issueId:   int("issue_id"),
+    actorId:   int("actor_id").references(() => agentsTable.id),
     createdAt: text("created_at").notNull().default(sql`CURRENT_TIMESTAMP`),
     action:    text({ enum: Object.values(Action) }).notNull(),
     details:   text(),
@@ -46,8 +53,8 @@ export const issueSchema = {
     tokenLimit: { flag: '--token-limit', type: 'number' },
     priority:   { flag: '--priority', type: 'enum', values: Object.values(Priority) },
     description:{ flag: '--description', type: 'string' },
-    //assignees:   { flag: '--assignees', type: 'json'},
+    assigneeId: { flag: '--assignee-id', type: 'number'},
     // Pagination options 
     limit:      { flag: '--limit', type: 'number' },
-    offset:       { flag: '--offset', type: 'number' }
+    offset:     { flag: '--offset', type: 'number' }
 };

package/source/services/agentsService.js

@@ -0,0 +1,42 @@
+import { getDB } from '../db/index.js';
+import { eq } from "drizzle-orm";
+import { agentsTable } from "../models/schema.js";
+import { Agent } from '../models/agents.js';
+
+/**
+ * Registers a new agent in the database.
+ * @param {string} name 
+ * @param {string} type 
+ * @returns {Agent|null}
+ */
+export function registerAgent(name, type) {
+  const db = getDB();
+  const result = db.insert(agentsTable)
+    .values({ name: name, type: type })
+    .returning({ id: agentsTable.id })
+    .get();
+  
+  const row = db.select().from(agentsTable).where(eq(agentsTable.id, result.id)).get();
+  
+  if (row) {
+    return new Agent(row);
+  } else {
+    return null;
+  }
+}
+
+/**
+ * Retrieves an agent by their unique name.
+ * @param {string} name 
+ * @returns {Agent|null}
+ */
+export function getAgentByName(name) {
+  const db = getDB();
+  const row = db.select().from(agentsTable).where(eq(agentsTable.name, name)).get();
+  
+  if (row) {
+    return new Agent(row);
+  } else {
+    return null;
+  }
+}

package/source/services/authService.js

@@ -0,0 +1,44 @@
+import os from 'os';
+import { getAgentByName } from './agentsService.js';
+import { setActiveActor } from './issuesService.js';
+
+/**
+ * Authenticates the current execution context.
+ * Looks for BATON_AGENT in the environment, falling back to the OS username.
+ * If the agent/user is registered, it sets them as the active actor for this session.
+ * If not, it terminates the process with a helpful error message.
+ * @param {string} command - The command being executed
+ */
+export function authenticateContext(command) {
+  // Commands that don't require an active agent signed in
+  const exemptCommands = ['init', 'register', 'help'];
+  if (exemptCommands.includes(command)) {
+    return;
+  }
+
+  // Identify who is running the CLI
+  const activeName = process.env.BATON_AGENT || os.userInfo().username;
+  
+  try {
+    // Look them up in the database
+    const agent = getAgentByName(activeName);
+
+    if (!agent) {
+      console.error(`Error: Agent/User "${activeName}" is not registered in this Baton tracker.`);
+      console.error(`Please run 'baton register --name "${activeName}" --type "human"' (or "agent") first.`);
+      process.exit(1);
+    }
+
+    // Set the global state for the remainder of this command's lifecycle
+    setActiveActor(agent.id);
+  } catch (error) {
+    // Gracefully handle the scenario where the database hasn't been initialized yet
+    if (error.message && error.message.includes('no such table: agents')) {
+      console.error("Error: Tracker is not initialized. Please run 'baton init' first.");
+      process.exit(1);
+    }
+    
+    // Rethrow if it's a completely different error
+    throw error;
+  }
+}

package/source/services/issuesService.js

@@ -8,6 +8,17 @@ import {
 } from "../models/issue.js";
 import { ActivityLog, Action } from '../models/activityLog.js';
 
+// Internal variable to hold the active agent's ID for logging purposes. Set via setActiveActor() during authentication.
+let currentActorId = null;
+
+/**
+ * Sets the active actor ID for logging purposes.
+ * @param {number} id - The ID of the active actor.
+ */
+export function setActiveActor(id) {
+    currentActorId = id;
+}
+
 /**
  * Internal helper to log actions.
  * @private
@@ -18,7 +29,7 @@ import { ActivityLog, Action } from '../models/activityLog.js';
  */
 function logActivity(db, issueId, action, details = null) {
   db.insert(activityTable)
-    .values({ issueId, action, details })
+    .values({ issueId, action, details, actorId: currentActorId })
     .run();
 }
 
@@ -65,6 +76,7 @@ function findById(db, id) {
  * @property {string} [priority] - The priority level.
  * @property {number} [tokenLimit] - The maximum token limit for the issue.
  * @property {string} [description] - The detailed description of the issue.
+ * @property {number} [assigneeId] - The assigned agent ID.
  */
 
 /**
@@ -78,6 +90,7 @@ export function createIssue({
   priority,
   tokenLimit,
   description,
+  assigneeId,
 } = {}) {
 
   const db = getDB();
@@ -87,6 +100,7 @@ export function createIssue({
       priority: priority ?? Priority.LOW,
       tokenLimit: tokenLimit ?? null,
       description: description ?? null,
+      assigneeId: assigneeId ?? null,
     })
     .returning({ id: issuesTable.id })
     .get();
@@ -116,6 +130,7 @@ export function getIssue(id) {
  * @property {string} [priority] - Filter issues by their priority level.
  * @property {number} [limit] - Maximum number of issues to return.
  * @property {number} [offset] - Pagination offset.
+ * @property {number} [assigneeId] - Filter by assigned agent.
  */
 
 /**
@@ -123,7 +138,7 @@ export function getIssue(id) {
  * @param {ListIssuesOptions} options - Filtering and pagination options.
  * @returns {Issue[]}
  */
-export async function listIssues({ status, priority, limit, offset } = {}) {
+export async function listIssues({ status, priority, limit, offset, assigneeId } = {}) {
   const db = getDB();
   const filters = [];
 
@@ -136,6 +151,10 @@ export async function listIssues({ status, priority, limit, offset } = {}) {
     filters.push(sql`${issuesTable.priority} COLLATE NOCASE = ${priority}`);
   }
 
+  if (assigneeId !== undefined) {
+    filters.push(eq(issuesTable.assigneeId, assigneeId));
+  }
+
   // set defaults if limit or offset is NULL
   const limitVal = limit ?? 50;
   const offsetVal = offset ?? 0;
@@ -180,6 +199,7 @@ export function searchIssues(query) {
  * @property {number} [tokenLimit] - The updated token limit.
  * @property {string} [status] - The updated status.
  * @property {string} [priority] - The updated priority.
+ * @property {number} [assigneeId] - The updated assignee ID.
  */
 
 /**
@@ -190,13 +210,14 @@ export function searchIssues(query) {
  * @param {UpdateIssueFields} fields - The fields to update.
  * @returns {Issue}
  */
-export function updateIssue(id, oldIssue, { title, description, tokenLimit, status, priority } = {}) {
+export function updateIssue(id, oldIssue, { title, description, tokenLimit, status, priority, assigneeId } = {}) {
   const db = getDB();
   const updates = {};
 
   if (title !== undefined) updates.title = title;
   if (description !== undefined) updates.description = description;
   if (tokenLimit !== undefined) updates.tokenLimit = tokenLimit;
+  if (assigneeId !== undefined) updates.assigneeId = assigneeId;
 
   // Normalize status argument
   if (status !== undefined) {
@@ -350,12 +371,12 @@ export function getRecentActivity({ limit = 20 } = {}) {
   return db.select().from(activityTable).orderBy(sql`${activityTable.logId} DESC`).limit(limit).all();
 }
 // =============================================================================
-// Tracker operations (CLI: init / next / status / loop)
+// Tracker operations (CLI: init / next / status / claim)
 // To be edited later if needed.
 // =============================================================================
 
 /**
- * True when both `issues` and `activity` tables exist (matches initDB schema).
+ * True when both `issues`, `activity`, and `agents` tables exist.
  * @returns {boolean}
  */
 export function isTrackerReady() {
@@ -365,9 +386,9 @@ export function isTrackerReady() {
     const row = db.get(sql`
         SELECT COUNT(*) AS table_count
         FROM sqlite_master
-        WHERE type = 'table' AND name IN ('issues', 'activity')
+        WHERE type = 'table' AND name IN ('issues', 'activity', 'agents')
       `);
-    return (row?.table_count ?? 0) === 2;
+    return (row?.table_count ?? 0) === 3;
   } catch (error) {
     return false;
   }
@@ -425,12 +446,11 @@ export function selectNextIssue() {
 }
 
 /**
- * Mark an issue in-progress, increment attempts, and log activity (atomic).
- * Uses existing `findById` / `logActivity` from above; does not modify lines 1–187.
+ * Mark an issue in-progress, assign it to the current actor, increment attempts, and log activity.
  * @param {number} issueId
  * @returns {object}
  */
-export function workOnIssue(issueId) {
+export function claimIssue(issueId) {
   const db = getDB();
   const issue = findById(db, issueId);
 
@@ -444,6 +464,7 @@ export function workOnIssue(issueId) {
     tx.update(issuesTable)
       .set({ 
         status: Status.IN_PROGRESS,
+        assigneeId: currentActorId, 
         attemptNum: sql`${issuesTable.attemptNum} + 1` 
       })
       .where(eq(issuesTable.id, issueId))
@@ -453,14 +474,14 @@ export function workOnIssue(issueId) {
       tx,
       issueId,
       Action.STATE_CHANGE,
-      `Status changed from ${issue.status} to ${Status.IN_PROGRESS}`,
+      `Status changed from ${issue.status} to ${Status.IN_PROGRESS}`
     );
     
     logActivity(
       tx,
       issueId,
       Action.EDIT,
-      `Agent attempt #${issue.attemptNum + 1} on issue #${issueId}`,
+      `Agent attempt #${issue.attemptNum + 1} on issue #${issueId}`
     );
   });