logwork-cli 0.0.0-stage → 1.1.0

package/lib/worklog-task-resolver.mjs

@@ -0,0 +1,113 @@
+const SUGGESTION_LIMIT = 5;
+const TYPE_OF_WORK = new Set(['create', 'correct', 'improve', 'other']);
+
+export function readCatalogTypeOfWork(task) {
+  const value = String(task?.typeOfWork ?? task?.type_of_work ?? '').trim();
+  return TYPE_OF_WORK.has(value) ? value : undefined;
+}
+
+export function resolveWorklogTask({ taskName, projectId, tasks = [] }) {
+  const normalizedName = String(taskName || '').trim();
+  if (!normalizedName) {
+    throw new Error('taskName must not be empty.');
+  }
+
+  const projectIdNumber = Number(projectId);
+  if (!Number.isFinite(projectIdNumber) || projectIdNumber <= 0) {
+    throw new Error('projectId must be a positive number.');
+  }
+
+  const comparable = normalizedName.toLocaleLowerCase();
+  const idMatch = /^#(\d+)$/.exec(normalizedName);
+  const matches = idMatch
+    ? tasks.filter((task) => String(task?.id) === idMatch[1])
+    : tasks.filter((task) => {
+      const name = String(task?.name || '').trim();
+      return name && name.toLocaleLowerCase() === comparable;
+    });
+
+  if (matches.length > 1) {
+    const ids = matches.map((task) => task.id).join(', ');
+    throw new Error(
+      `Ambiguous worklog task name "${normalizedName}" for project ${projectIdNumber} (ids: ${ids}).`
+    );
+  }
+
+  if (!matches.length) {
+    const suggestions = suggestTaskNames(tasks, normalizedName);
+    const hint = suggestions.length
+      ? ` Similar tasks: ${suggestions.map((name) => `"${name}"`).join(', ')}.`
+      : ' No similar tasks found for this project.';
+    throw new Error(
+      `No worklog task named "${normalizedName}" for project ${projectIdNumber}.${hint}`
+    );
+  }
+
+  const task = matches[0];
+  const taskProjectId = readTaskProjectId(task);
+  const catalogTypeOfWork = readCatalogTypeOfWork(task);
+  return {
+    worklogTaskId: task.id,
+    taskName: String(task.name || '').trim(),
+    needsProjectId: taskProjectId === null || taskProjectId === undefined,
+    ...(catalogTypeOfWork ? { typeOfWork: catalogTypeOfWork } : {})
+  };
+}
+
+export function mergeWorklogTaskLists(projectTasks = [], defaultTasks = []) {
+  const byId = new Map();
+  for (const task of [...projectTasks, ...defaultTasks]) {
+    if (task?.id !== undefined && task?.id !== null && !byId.has(task.id)) {
+      byId.set(task.id, task);
+    }
+  }
+  return [...byId.values()];
+}
+
+export function normalizeWorklogTask(record = {}) {
+  const projectId = readTaskProjectId(record);
+  return {
+    id: record.id,
+    name: String(record.name || '').trim(),
+    description: String(record.description || '').trim(),
+    projectId: projectId === undefined ? null : projectId,
+    typeOfWork: record.type_of_work ?? record.typeOfWork ?? null,
+    isDefault: Boolean(record.is_default ?? record.isDefault)
+  };
+}
+
+function readTaskProjectId(task) {
+  if (task?.project_id !== undefined && task?.project_id !== null) {
+    return Number(task.project_id);
+  }
+  if (task?.project?.id !== undefined && task?.project?.id !== null) {
+    return Number(task.project.id);
+  }
+  if (task?.projectId !== undefined && task?.projectId !== null) {
+    return Number(task.projectId);
+  }
+  return null;
+}
+
+export function listAvailableTaskNames(tasks = [], limit = 30) {
+  return [...new Set(tasks
+    .map((task) => String(task?.name || '').trim())
+    .filter(Boolean))]
+    .slice(0, limit);
+}
+
+export function listSuggestedTaskNames(tasks, taskName, limit = SUGGESTION_LIMIT) {
+  return suggestTaskNames(tasks, taskName, limit);
+}
+
+function suggestTaskNames(tasks, taskName, limit = SUGGESTION_LIMIT) {
+  const needle = String(taskName || '').trim().toLocaleLowerCase();
+  if (!needle) {
+    return [];
+  }
+
+  return tasks
+    .map((task) => String(task?.name || '').trim())
+    .filter((name) => name && name.toLocaleLowerCase().includes(needle))
+    .slice(0, limit);
+}

package/package.json

@@ -1,6 +1,75 @@
 {
   "name": "logwork-cli",
-  "version": "0.0.0-stage",
-  "stub": true,
-  "description": "Temporary package placeholder for staged publishing"
-}
+  "version": "1.1.0",
+  "description": "Log work to Resource Optimiser and Jira from the terminal, an MCP server for AI IDEs, and a terminal UI.",
+  "license": "UNLICENSED",
+  "type": "module",
+  "homepage": "https://github.com/malcohelper/logwork-cli#readme",
+  "bugs": {
+    "url": "https://github.com/malcohelper/logwork-cli/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/malcohelper/logwork-cli.git"
+  },
+  "keywords": [
+    "logwork",
+    "resource-optimiser",
+    "mcp-server",
+    "ai-assistant",
+    "nodejs",
+    "macos",
+    "windows",
+    "keycloak",
+    "codex",
+    "cursor",
+    "vscode",
+    "claude-code",
+    "cli"
+  ],
+  "engines": {
+    "node": ">=22"
+  },
+  "os": [
+    "darwin",
+    "win32"
+  ],
+  "files": [
+    "bin/",
+    "commands/",
+    "lib/",
+    "skills/",
+    "docs/",
+    "examples/mcp/",
+    "setup.sh",
+    "README.md",
+    "LICENSE",
+    "RELEASE.md"
+  ],
+  "bin": {
+    "logwork": "bin/logwork.mjs",
+    "logwork-cli": "bin/logwork.mjs"
+  },
+  "scripts": {
+    "start": "node bin/logwork.mjs",
+    "dry-run": "LOGWORK_DRY_RUN=1 node bin/logwork.mjs",
+    "mcp": "node bin/logwork.mjs mcp",
+    "setup": "node bin/logwork.mjs setup",
+    "audit:prod": "npm audit --omit=dev --audit-level=moderate",
+    "pack:check": "npm pack --dry-run",
+    "release:doctor": "node bin/logwork.mjs release doctor --full",
+    "release:check": "npm test && npm run audit:prod && npm run pack:check && git diff --check",
+    "test:windows-credential": "node --test --test-name-pattern=\"Windows Credential Manager stores, reads, and deletes a test credential\" test/credential-store.test.mjs",
+    "test": "node --test"
+  },
+  "dependencies": {
+    "@clack/prompts": "^1.5.0",
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "chalk": "^5.6.2",
+    "ink": "^7.0.5",
+    "ink-select-input": "^6.2.0",
+    "ink-text-input": "^6.0.0",
+    "react": "^19.2.7",
+    "zod": "^4.4.3"
+  }
+}

package/setup.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+if ! command -v node >/dev/null 2>&1; then
+  echo "Node.js 22+ is required. Install Node, then run setup again." >&2
+  exit 1
+fi
+
+NODE_MAJOR="$(node -p "Number(process.versions.node.split('.')[0])")"
+if [ "$NODE_MAJOR" -lt 22 ]; then
+  echo "Node.js 22+ is required. Current version: $(node --version)" >&2
+  exit 1
+fi
+
+if ! command -v npm >/dev/null 2>&1; then
+  echo "npm is required. Install npm, then run setup again." >&2
+  exit 1
+fi
+
+node "$SCRIPT_DIR/bin/logwork.mjs" setup "$@"

package/skills/logwork/SKILL.md

@@ -0,0 +1,43 @@
+---
+name: logwork
+description: Log work hours to Resource Optimiser (RO) and Jira from the user's own git commits with the logwork MCP tools. Use when the user asks to log work, fill in logwork or timesheets for a day or week, check missing hours, or fix existing RO entries.
+---
+
+# Logwork from commits
+
+Goal: every logged line is backed by real work (the user's commits or what the user tells you), uses a valid RO worklog task, has a clear description, and fits the day's booked hours.
+
+## Steps
+
+1. **Find the gaps.** Call `get_logwork` for the period. A day/project still needs time when booked > logged. Skip days that are already full.
+2. **Collect the evidence.** Call `draft_from_commits` with the same period and `repos` set to every repo the user worked in (the open workspace folders; ask the user for others). It groups the user's commits per day by repo, ticket and kind of work, suggests a worklog task per group, and splits each day's remaining RO hours across the groups. Treat its hours as a starting point, not a fact.
+3. **Check the worklog tasks.** For each project involved, call `list_tasks(projectId)`. Keep the suggested task when it exists in that catalog; otherwise pick the catalog task whose description matches the work.
+4. **Write the descriptions.** One line per piece of work: what was done and the outcome, with ticket keys, in English, under about 200 characters, no `|`. Rewrite vague commit subjects ("wip", "fix", "update"); use `get_jira_issue` to read the ticket when the subject alone is unclear.
+5. **Set the hours.**
+   - Stay within the remaining booked hours per day and project unless the user says otherwise.
+   - Use 0.5h steps.
+   - Do not log weekends or days without a booking unless the user asks.
+   - Work without commits (meetings, reviews, support) only comes from the user; ask, then log it as `Other Activities` or `Code Review & Refactoring`.
+6. **Resolve projects.** Ticket prefixes and mappings pick the project. If a line stays unresolved, ask the user and offer `map_project` so it is automatic next time.
+7. **Get approval, then write.**
+   - Show the final block to the user.
+   - On approval, call `log_work(text)` and show its preview summary.
+   - Then call `log_work(batchId, confirm: true)`.
+   - If the user also logs Jira, do the same with `log_jira_work`. Jira needs exactly one issue key per line.
+
+## Line format
+
+```text
+Friday, 06 Nov 2026
++2 Feature Development | Implement SSO login with ADFS (STM-4)
++1 Bug Fix | Fix date picker timezone offset (SAP-42)
+```
+
+`+<hours> <worklog task> | <description>`. The task is an RO catalog name or `#<id>`.
+
+## Rules
+
+- Never invent work that is not in the commits or in what the user told you. When unsure, ask.
+- Never set `confirm: true` without the user's explicit approval of that preview.
+- Never ask for or pass passwords, OTPs or tokens. On `authRequired`, call `login` and let the user finish in the terminal.
+- To fix an existing entry, use `edit_entry` (submitted or approved entries) or `resubmit_entry` (rejected entries). Do not log a duplicate.