@bakers-build/addon-track 0.2.1-next.211 → 0.3.1-next.308

package/dist/src/evidence.d.ts

@@ -5,7 +5,13 @@ type Selection = {
     to: string;
     timezone?: string;
 };
-export declare function loadEvidence(client: Client, selection: Selection, worklogClient: Pick<Client, 'get'>): Promise<{
+/** The slice of `@dropsh/plugin-tool`'s ToolClient this reader needs. */
+export type WorklogTool = {
+    call(name: string, args: Record<string, unknown>): Promise<{
+        structuredContent?: unknown;
+    }>;
+};
+export declare function loadEvidence(client: Client, selection: Selection, worklogTool: WorklogTool): Promise<{
     owner_id: string;
     timezone: string;
     from: string;

package/dist/src/evidence.js

@@ -18,14 +18,14 @@ function rows(value) {
             typeof row.id === 'string' &&
             typeof row.type === 'string'));
 }
-async function collect(client, type, params, path = `${type}/${type}`) {
+async function collect(client, type, params) {
     const data = new Map();
     const included = new Map();
     let complete = true;
     let offset = 0;
     while (true) {
         params.addPageLimit(50).addPageOffset(offset);
-        const raw = await client.get(path, params);
+        const raw = await client.get(`${type}/${type}`, params);
         if (!raw || typeof raw !== 'object' || !('data' in raw) || !rows(raw.data))
             throw new Error(`Invalid ${type} collection response.`);
         const page = raw;
@@ -62,13 +62,52 @@ async function collect(client, type, params, path = `${type}/${type}`) {
         complete,
     };
 }
+const ided = (value) => Array.isArray(value) &&
+    value.every((row) => row && typeof row === 'object' && typeof row.id === 'string');
+/** Page `tool_api__bakers_worklog_list` (the owner's own worklogs) until next_offset is null. */
+async function collectWorklogs(tool, from, to) {
+    const data = new Map();
+    const tickets = new Map();
+    const projects = new Map();
+    let complete = true;
+    let offset = 0;
+    while (true) {
+        const { structuredContent: page } = await tool.call('tool_api__bakers_worklog_list', { from, to, limit: 50, offset });
+        if (!page ||
+            typeof page !== 'object' ||
+            !ided(page.data) ||
+            !ided(page.tickets) ||
+            !ided(page.projects))
+            throw new Error('Invalid worklog tool response.');
+        const { data: rows, omitted, next_offset: next } = page;
+        if (omitted)
+            complete = false;
+        for (const row of rows)
+            data.set(row.id, row);
+        for (const row of page.tickets)
+            tickets.set(row.id, row);
+        for (const row of page.projects)
+            projects.set(row.id, row);
+        if (next === null || next === undefined)
+            break;
+        if (!Number.isSafeInteger(next) || next <= offset)
+            throw new Error('Non-advancing worklog pagination.');
+        offset = next;
+    }
+    return {
+        data: [...data.values()],
+        tickets: [...tickets.values()],
+        projects: [...projects.values()],
+        complete,
+    };
+}
 function context(params) {
     return params
         .addInclude(['ticket_id.project_id'])
         .addFields('bb_ticket--bb_ticket', ['identifier', 'title', 'project_id'])
         .addFields('bb_project--bb_project', ['name']);
 }
-export async function loadEvidence(client, selection, worklogClient) {
+export async function loadEvidence(client, selection, worklogTool) {
     const dates = selectedDates(selection.from, selection.to);
     if (selection.timezone)
         calendar(selection.timezone);
@@ -131,14 +170,10 @@ export async function loadEvidence(client, selection, worklogClient) {
     ])
         .addFields('bb_comment--bb_comment', ['body'])
         .addSort('drupal_internal__id');
-    const worklogParams = new DrupalJsonApiParams().addCustomParam({
-        from: weekStart,
-        to: weekEnd,
-    });
     const [runPage, activityPage, worklogPage] = await Promise.all([
         collect(client, 'bb_run', runParams),
         collect(client, 'bb_activity', activityParams),
-        collect(worklogClient, 'bb_track_worklog', worklogParams, 'worklogs'),
+        collectWorklogs(worklogTool, weekStart, weekEnd),
     ]);
     for (const [name, page] of [
         ['runs', runPage],
@@ -151,11 +186,7 @@ export async function loadEvidence(client, selection, worklogClient) {
     const tickets = {};
     const projects = {};
     const summaries = new Map();
-    for (const row of [
-        ...runPage.included,
-        ...activityPage.included,
-        ...worklogPage.included,
-    ]) {
+    for (const row of [...runPage.included, ...activityPage.included]) {
         if (row.type === 'bb_ticket--bb_ticket')
             tickets[row.id] = {
                 identifier: attr(row, 'identifier') ?? null,
@@ -170,6 +201,14 @@ export async function loadEvidence(client, selection, worklogClient) {
                 summaries.set(row.id, body.value);
         }
     }
+    for (const ticket of worklogPage.tickets)
+        tickets[ticket.id] = {
+            identifier: ticket.identifier ?? null,
+            title: ticket.title ?? null,
+            project_id: ticket.project_id ?? null,
+        };
+    for (const project of worklogPage.projects)
+        projects[project.id] = { name: project.name ?? null };
     const unplaced = [];
     for (const [id, ticket] of Object.entries(tickets))
         if (ticket.project_id && !projects[ticket.project_id])
@@ -249,24 +288,21 @@ export async function loadEvidence(client, selection, worklogClient) {
             summary_truncated: (summary?.length ?? 0) > 2000,
         };
     });
-    const worklogs = worklogPage.data
-        .filter((row) => relation(row, 'owner_user_id') === owner)
-        .map((row) => ({
+    const worklogs = worklogPage.data.map((row) => ({
         id: row.id,
-        date: attr(row, 'work_date'),
-        state: attr(row, 'state'),
-        duration_seconds: seconds(attr(row, 'duration_seconds')),
-        description: attr(row, 'description'),
-        ticket_id: relation(row, 'ticket_id'),
-        project_id: relation(row, 'project_id'),
-        submission_id: relation(row, 'submission_id'),
-        source_keys: attr(row, 'source_keys') ?? null,
+        date: row.work_date,
+        state: row.state,
+        duration_seconds: seconds(row.duration_seconds),
+        description: row.description,
+        ticket_id: row.ticket_id ?? null,
+        project_id: row.project_id ?? null,
+        submission_id: row.submission_id ?? null,
+        source_keys: row.source_keys ?? null,
     }));
-    const worklogsValid = worklogPage.data.every((row) => relation(row, 'owner_user_id')) &&
-        worklogs.every((row) => typeof row.date === 'string' &&
-            Number.isFinite(civilDate(row.date)) &&
-            row.duration_seconds !== null &&
-            ['recorded', 'approved', 'proposed'].includes(String(row.state)));
+    const worklogsValid = worklogs.every((row) => typeof row.date === 'string' &&
+        Number.isFinite(civilDate(row.date)) &&
+        row.duration_seconds !== null &&
+        ['recorded', 'approved', 'proposed'].includes(String(row.state)));
     if (!worklogsValid)
         evidenceGaps.push('Some worklogs have invalid dates, states or durations.');
     for (const row of [...activities, ...worklogs]) {

package/dist/src/index.js

@@ -1,4 +1,5 @@
-import { createBbConnectionClient, loadReadyBbConnection, } from '@bakers-build/core';
+import { createBbConnectionContext, loadReadyBbConnection, } from '@bakers-build/core';
+import { createToolClient } from '@dropsh/plugin-tool';
 import { loadEvidence } from './evidence.js';
 export function registerTrack(program, read) {
     program
@@ -26,12 +27,15 @@ const trackCommand = {
                 ...(options.config ? { explicit: options.config } : {}),
                 ...(options.connection ? { connection: options.connection } : {}),
             });
-            const client = await createBbConnectionClient(connection);
-            const worklogs = await createBbConnectionClient({
-                ...connection,
-                site: { ...connection.site, jsonapi_prefix: '/api/time' },
-            });
-            return loadEvidence(client, options, worklogs);
+            const { client, auth, baseUrl } = await createBbConnectionContext(connection);
+            // Worklogs come from the `tool_api__bakers_worklog_list` MCP tool on the same auth profile.
+            const tools = createToolClient({ auth, baseUrl, endpoint: '/mcp' });
+            try {
+                return await loadEvidence(client, options, tools);
+            }
+            finally {
+                await tools.close();
+            }
         });
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakers-build/addon-track",
-  "version": "0.2.1-next.211",
+  "version": "0.3.1-next.308",
   "description": "Read personal daily evidence for time preparation.",
   "type": "module",
   "license": "MIT",
@@ -20,10 +20,11 @@
     "directory": "bakers-cli/addons/track"
   },
   "dependencies": {
+    "@dropsh/plugin-tool": "^0.8.2",
     "commander": "^12.1.0",
     "drupal-jsonapi-params": "^3.0.1"
   },
   "peerDependencies": {
-    "@bakers-build/core": "^0.2.1-next.211"
+    "@bakers-build/core": "^0.3.1-next.308"
   }
 }