logwork-cli 1.2.0 → 1.3.0

package/lib/ui.mjs

@@ -1,5 +1,6 @@
 import * as clackPrompts from '@clack/prompts';
 import { CONFIG } from './config.mjs';
+import { formatSuggestionReason, orderProjectsForPicker } from './repo-project-suggestions.mjs';
 
 // Every prompt function takes an optional `{ prompts }` (default: @clack/prompts)
 // so tests can answer prompts without a terminal.
@@ -28,6 +29,49 @@ export function projectSelectOptions(projects, daySummaries) {
   });
 }
 
+export const SKIP_REPO_PROJECT = '__skip__';
+
+// Options for "which RO project does this repo belong to?": suggested projects
+// first (reason as hint), then every other member project, then skip. Values
+// are option keys; resolve them with the returned items.
+export function repoProjectSelectOptions(suggestions = [], candidates = [], { skipLabel = 'Skip for now' } = {}) {
+  const items = orderProjectsForPicker(candidates, suggestions);
+  const options = items.map((item, index) => ({
+    value: `project:${index}`,
+    label: item.project.projectName || `project member ${item.project.projectMemberId}`,
+    ...(item.suggestion ? { hint: formatSuggestionReason(item.suggestion) } : {})
+  }));
+  options.push({ value: SKIP_REPO_PROJECT, label: skipLabel });
+  return {
+    items,
+    options,
+    initialValue: options[0].value
+  };
+}
+
+export function repoProjectFromOption(items, value) {
+  const match = /^project:(\d+)$/.exec(String(value || ''));
+  return match ? items[Number(match[1])]?.project || null : null;
+}
+
+// Asks which project a repo belongs to. Returns the chosen project, or null
+// when the user skips (Escape / Ctrl+C also skip).
+export async function chooseRepoProject({ repoName, suggestions = [], candidates = [] }, { prompts = clackPrompts } = {}) {
+  const { items, options, initialValue } = repoProjectSelectOptions(suggestions, candidates);
+  if (!items.length) {
+    return null;
+  }
+  const value = await prompts.select({
+    message: `Which RO project does ${repoName} belong to?`,
+    options,
+    initialValue
+  });
+  if (prompts.isCancel(value)) {
+    return null;
+  }
+  return repoProjectFromOption(items, value);
+}
+
 export async function chooseTask(tasks, { prompts = clackPrompts } = {}) {
   const taskId = handleCancel(await prompts.select({
     message: 'Chọn loại công việc:',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "logwork-cli",
-  "version": "1.2.0",
+  "version": "1.3.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",

package/skills/logwork/SKILL.md

@@ -19,7 +19,12 @@ Goal: every logged line is backed by real work (the user's commits or what the u
    - 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.** The draft's `projectOverrides` already name the project of every resolved line. For `unmappedRepos` (lines with no project), ask the user which RO project the repo belongs to and offer `map_project` with `repos` (and `tickets` if useful), so later drafts resolve it; then run `draft_from_commits` again. A line `log_work` still cannot resolve: ask the user and add its id to `projectOverrides`.
+6. **Resolve projects.** The draft's `projectOverrides` already name the project of every resolved line. For each repo in `unmappedRepos` (lines with no project):
+   - Take the top entry of `repoSuggestions[repo]` (ranked by ticket history, repo/remote name and single booked project; `reasons` say why).
+   - Ask one short question per repo, by project name: "Is `<repo name>` part of **<projectName>**? (<first reason>)". With no suggestion, ask which project it belongs to and offer names from `projectCandidates`.
+   - On a yes (or the user's own pick), call `map_project` with `projectName` (or that suggestion's `projectMemberId`), `repos: [repo]` and `confirm: true`. Never ask the user for ids.
+   - Then run `draft_from_commits` again so those lines get their project and hours.
+   A line `log_work` still cannot resolve: ask the user and add its id to `projectOverrides`.
 7. **Get approval, then write.**
    - Show the final block to the user.
    - On approval, call `log_work(text, projectOverrides)` and show its preview summary. Pass `projectOverrides` from the draft unchanged when `draftText` is unchanged. Entry ids are `<date>-<NN>` with NN counting lines through the whole text, so if you add, remove or reorder lines, renumber the overrides to match.