@gitset-dev/cli 2.0.1 → 2.1.0

package/README.md

@@ -33,7 +33,7 @@ nowhere else. It never contacts a Gitset server.
 npm install -g @gitset-dev/cli
 ```
 
-Requires Node.js 18+. Commands that publish to GitHub (`--create`,
+Requires Node.js 20+. Commands that publish to GitHub (`--create`,
 `--apply`) use the [GitHub CLI](https://cli.github.com) (`gh`) with your
 existing login.
 

package/lib/cli-issue.js

@@ -12,7 +12,7 @@
 const { execFileSync } = require('child_process');
 const readline = require('readline');
 const genLocal = require('./generate-local');
-const { suggestLabels } = require('./labels-ai');
+const { pickLabels } = require('./label-picker');
 const theme = require('../src/utils/theme');
 
 const out = (s = '') => console.log(s);
@@ -106,6 +106,7 @@ async function runIssueCommand(argv) {
   for (;;) {
     out();
     out(theme.bold(`Title: ${title}`));
+    if (selectedLabels.length) out(theme.dim(`Labels: ${selectedLabels.map((l) => l.name).join(', ')}`));
     out(theme.accent(result.text.slice(0, 1500) + (result.text.length > 1500 ? '\n… (truncated)' : '')));
     out();
     out(theme.dim(`tip: edit ~/.gitset/templates/issue.md (or run \`gitset template edit issue\`) to change the format`));
@@ -115,16 +116,12 @@ async function runIssueCommand(argv) {
     if (ch === 'c') return create(result.text);
     if (ch === 'l') {
       try {
-        let existing = '';
-        try { existing = JSON.parse(execFileSync('gh', ['label', 'list', '--limit', '100', '--json', 'name'], { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] })).map((x) => x.name).join(', '); } catch {  }
-        process.stderr.write(theme.dim('… suggesting labels\n'));
-        const sug = await suggestLabels({ title, body: result.text, existing, provider: getFlag(argv, '--provider'), model: getFlag(argv, '--model') });
-        if (sug.length === 0) { out(theme.warn('No label suggestions.')); continue; }
-        out('Suggested: ' + sug.map((l, i) => `[${i + 1}] ${l.name}`).join('  '));
-        const pick = await ask('Apply which? (comma numbers, "all", or blank to skip): ');
-        if (pick.toLowerCase() === 'all') selectedLabels = sug;
-        else { const idx = pick.split(',').map((s) => parseInt(s.trim(), 10) - 1).filter((n) => n >= 0 && n < sug.length); selectedLabels = idx.map((i) => sug[i]); }
-        if (selectedLabels.length) out(theme.success(`✓ labels: ${selectedLabels.map((l) => l.name).join(', ')}`));
+        const chosen = await pickLabels({ title, body: result.text, provider: getFlag(argv, '--provider'), model: getFlag(argv, '--model') });
+        if (chosen.length) {
+          const byName = new Map(selectedLabels.map((l) => [l.name.toLowerCase(), l]));
+          for (const l of chosen) byName.set(l.name.toLowerCase(), l);
+          selectedLabels = [...byName.values()];
+        }
       } catch (e) { errln(e.message); }
       continue;
     }

package/lib/cli-pr.js

@@ -12,7 +12,7 @@
 const { execFileSync } = require('child_process');
 const readline = require('readline');
 const genLocal = require('./generate-local');
-const { suggestLabels } = require('./labels-ai');
+const { pickLabels } = require('./label-picker');
 const theme = require('../src/utils/theme');
 
 const out = (s = '') => console.log(s);
@@ -130,6 +130,7 @@ async function runPrCommand(argv) {
   for (;;) {
     out();
     out(theme.bold(`${title}  ${theme.dim(`(${base} ← ${head})`)}`));
+    if (selectedLabels.length) out(theme.dim(`Labels: ${selectedLabels.map((l) => l.name).join(', ')}`));
     out(theme.accent(result.text.slice(0, 1500) + (result.text.length > 1500 ? '\n… (truncated)' : '')));
     out();
     out(theme.dim(`tip: edit ~/.gitset/templates/pr.md (or run \`gitset template edit pr\`) to change the format`));
@@ -139,16 +140,12 @@ async function runPrCommand(argv) {
     if (ch === 'c') return create(result.text);
     if (ch === 'l') {
       try {
-        let existing = '';
-        try { existing = JSON.parse(execFileSync('gh', ['label', 'list', '--limit', '100', '--json', 'name'], { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] })).map((x) => x.name).join(', '); } catch {  }
-        process.stderr.write(theme.dim('… suggesting labels\n'));
-        const sug = await suggestLabels({ title, body: result.text, existing, provider: getFlag(argv, '--provider'), model: getFlag(argv, '--model') });
-        if (sug.length === 0) { out(theme.warn('No label suggestions.')); continue; }
-        out('Suggested: ' + sug.map((l, i) => `[${i + 1}] ${l.name}`).join('  '));
-        const pick = await ask('Apply which? (comma numbers, "all", or blank to skip): ');
-        if (pick.toLowerCase() === 'all') selectedLabels = sug;
-        else { const idx = pick.split(',').map((s) => parseInt(s.trim(), 10) - 1).filter((n) => n >= 0 && n < sug.length); selectedLabels = idx.map((i) => sug[i]); }
-        if (selectedLabels.length) out(theme.success(`✓ labels: ${selectedLabels.map((l) => l.name).join(', ')}`));
+        const chosen = await pickLabels({ title, body: result.text, provider: getFlag(argv, '--provider'), model: getFlag(argv, '--model') });
+        if (chosen.length) {
+          const byName = new Map(selectedLabels.map((l) => [l.name.toLowerCase(), l]));
+          for (const l of chosen) byName.set(l.name.toLowerCase(), l);
+          selectedLabels = [...byName.values()];
+        }
       } catch (e) { errln(e.message); }
       continue;
     }

package/lib/label-picker.js

@@ -0,0 +1,117 @@
+'use strict';
+
+/**
+ * Shared label-selection UI for `gitset issue` / `gitset pr`'s [l]abels
+ * step. Three explicit sources, so it's always clear whether a pick
+ * applies something that already exists in the repo, asks the AI (which
+ * marks each suggestion new vs. existing), or pulls from your saved
+ * label pack (`gitset labelspack`).
+ */
+const { execFileSync } = require('child_process');
+const readline = require('readline');
+const { suggestLabels } = require('./labels-ai');
+const { getLabels } = require('../src/utils/labels');
+const theme = require('../src/utils/theme');
+
+const out = (s = '') => console.log(s);
+const errln = (s) => console.error(`${theme.error('✗')} ${s}`);
+
+function ask(q) {
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise((r) => rl.question(q, (a) => { rl.close(); r(a.trim()); }));
+}
+
+function getRepoLabels() {
+  try {
+    return JSON.parse(execFileSync(
+      'gh', ['label', 'list', '--limit', '200', '--json', 'name,color,description'],
+      { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] },
+    ));
+  } catch { return []; }
+}
+
+function tagExisting(candidates, repoLabels) {
+  const names = new Set(repoLabels.map((l) => l.name.toLowerCase()));
+  return candidates.map((l) => ({ ...l, existsInRepo: names.has(String(l.name).toLowerCase()) }));
+}
+
+function printChoices(list) {
+  list.forEach((l, i) => {
+    const tag = l.existsInRepo === true ? theme.dim(' (existing)')
+      : l.existsInRepo === false ? theme.accent(' (new)') : '';
+    const desc = l.description ? theme.dim(`  — ${l.description}`) : '';
+    out(`  [${i + 1}] ${l.name}${tag}${desc}`);
+  });
+}
+
+async function pickFrom(list) {
+  if (list.length === 0) return [];
+  printChoices(list);
+  const pick = await ask('Apply which? (comma numbers, "all", or blank to skip): ');
+  if (pick.toLowerCase() === 'all') return list;
+  const idx = pick.split(',').map((s) => parseInt(s.trim(), 10) - 1).filter((n) => n >= 0 && n < list.length);
+  return idx.map((i) => list[i]);
+}
+
+/**
+ * @returns {Promise<Array<{name,color,description}>>} labels picked this round ([] to skip)
+ */
+async function pickLabels({ title, body, provider, model }) {
+  const repoLabels = getRepoLabels();
+
+  for (;;) {
+    out();
+    out(theme.bold('Labels — where from?'));
+    out(`  ${theme.key('1', ' Existing repo labels')} ${theme.dim(`(${repoLabels.length} in this repo)`)}`);
+    out(`  ${theme.key('2', ' AI suggestions')} ${theme.dim('(tags each pick new vs. existing)')}`);
+    out(`  ${theme.key('3', ' Your label pack')} ${theme.dim('(gitset labelspack)')}`);
+    const src = (await ask(`  ${theme.key('q', 'uit / skip')} > `)).toLowerCase();
+
+    if (src === '1') {
+      if (repoLabels.length === 0) {
+        out(theme.warn('This repo has no labels yet — try 2 (AI) or 3 (your pack) instead.'));
+        continue;
+      }
+      const chosen = await pickFrom(repoLabels.map((l) => ({ ...l, existsInRepo: true })));
+      if (chosen.length) out(theme.success(`✓ labels: ${chosen.map((l) => l.name).join(', ')}`));
+      return chosen;
+    }
+
+    if (src === '2') {
+      process.stderr.write(theme.dim('… asking the AI for label suggestions\n'));
+      let sug;
+      try {
+        sug = await suggestLabels({
+          title, body, existing: repoLabels.map((l) => l.name).join(', '), provider, model,
+        });
+      } catch (e) {
+        errln(e.message || 'AI label suggestion failed.');
+        continue;
+      }
+      if (sug.length === 0) {
+        out(theme.warn("The AI didn't return usable suggestions. Try again, or use 1/3 instead."));
+        continue;
+      }
+      const chosen = await pickFrom(tagExisting(sug, repoLabels));
+      if (chosen.length) out(theme.success(`✓ labels: ${chosen.map((l) => l.name).join(', ')}`));
+      return chosen;
+    }
+
+    if (src === '3') {
+      const { source, labels } = getLabels();
+      if (labels.length === 0) {
+        out(theme.warn('Your label pack is empty. Run `gitset labelspack --init` first.'));
+        continue;
+      }
+      out(theme.dim(`(from ${source})`));
+      const chosen = await pickFrom(tagExisting(labels, repoLabels));
+      if (chosen.length) out(theme.success(`✓ labels: ${chosen.map((l) => l.name).join(', ')}`));
+      return chosen;
+    }
+
+    if (src === 'q' || src === '') return [];
+    out(theme.warn('Unrecognized option.'));
+  }
+}
+
+module.exports = { pickLabels };

package/lib/prompts/context.js

@@ -0,0 +1,17 @@
+'use strict';
+
+function currentDateLine() {
+  const now = new Date();
+  const iso = now.toISOString().slice(0, 10);
+  const natural = now.toLocaleDateString('en-US', { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' });
+  return `${natural} (${iso})`;
+}
+
+function dateAwarenessNote() {
+  return `Today's real date is ${currentDateLine()}. Treat this as "today"/"now" for any ` +
+    'date, year, or "released on" text you generate. Do not use a date from your training ' +
+    'data or default to a past year out of habit — only reference a different date when the ' +
+    'content specifically and verifiably describes a past event.';
+}
+
+module.exports = { currentDateLine, dateAwarenessNote };

package/lib/prompts/defaults.js

@@ -86,7 +86,7 @@ const readme = {
 const release = {
   id: 'release',
   build(ctx = {}) {
-    const { tag = '', commits = '', mode = 'summary', template = '', instruction = '', previous = '' } = ctx;
+    const { tag = '', repo = '', commits = '', mode = 'summary', template = '', instruction = '', previous = '' } = ctx;
     return {
       system:
         'You write release notes in GitHub-flavored Markdown. Group changes ' +
@@ -95,8 +95,12 @@ const release = {
         'with NO preamble, NO sign-off, and NO conversational text such as ' +
         '"Here\'s a summary" or "Here are the release notes". ' +
         'When a template/style example is provided, follow its structure, section ' +
-        'headings, ordering, and tone closely — treat it as the format to reproduce.',
+        'headings, ordering, and tone closely — treat it as the format to reproduce. ' +
+        'Never invent a repository path (e.g. placeholders like "your-project/your-repo" ' +
+        'or "user/repo") for a "Full Changelog" or compare link — only include such a link ' +
+        'when the real repository is given below, using that exact path; otherwise omit it.',
       user: [
+        repo && `Repository: ${clip(repo, 200)}`,
         tag && `Release: ${clip(tag, 100)}`,
         `Mode: ${mode}`,
         template && `Reproduce the structure, sections, and tone of this template/example closely:\n${clip(template, 12000)}`,

package/lib/prompts/index.js

@@ -2,6 +2,7 @@
 'use strict';
 
 const defaults = require('./defaults');
+const { dateAwarenessNote } = require('./context');
 
 let _cache = null;
 
@@ -61,7 +62,8 @@ function getPrompt(key, ctx = {}) {
   if (!out || typeof out.system !== 'string' || typeof out.user !== 'string') {
     throw new Error(`Prompt "${key}" must return { system: string, user: string }`);
   }
-  return out;
+
+  return { ...out, system: `${out.system}\n\n${dateAwarenessNote()}` };
 }
 
 function toAIRequest(key, ctx = {}, extra = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitset-dev/cli",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Gitset CLI — drafts commits, PRs, issues, READMEs and release notes with your own AI key. Fully local: your code and keys never touch a Gitset server. Draft. Refine. Ship.",
   "type": "commonjs",
   "bin": {
@@ -12,15 +12,9 @@
     "!lib/__tests__",
     "src/"
   ],
-  "packageManager": "pnpm@9.15.0",
   "engines": {
     "node": ">=20"
   },
-  "scripts": {
-    "sync:ai": "node scripts/sync-ai.js",
-    "test": "node --test lib/__tests__/*.test.js",
-    "start": "node index.js"
-  },
   "keywords": [
     "git",
     "cli",
@@ -50,5 +44,10 @@
   },
   "bugs": {
     "url": "https://github.com/gitset-dev/gitset-cli-v2/issues"
+  },
+  "scripts": {
+    "sync:ai": "node scripts/sync-ai.js",
+    "test": "node --test lib/__tests__/*.test.js",
+    "start": "node index.js"
   }
-}
+}