@waron97/prbot 3.0.2 → 3.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@waron97/prbot",
-    "version": "3.0.2",
+    "version": "3.0.4",
     "description": "",
     "main": "index.js",
     "scripts": {

package/src/agrippa/commands/init.js

@@ -74,16 +74,20 @@ async function init() {
             },
         ]);
         if (!overwrite) {
-            console.log('Aborted.');
-            return;
+            console.log('Skipped workspace file.');
+        } else {
+            writeFileSync(WORKSPACE_FILE, TEMPLATE, 'utf-8');
+            console.log(`Created ${WORKSPACE_FILE}`);
+            console.log(`Run 'agrippa clone' to add resources to this workspace.`);
+            console.log(`Add ${WORKSPACE_FILE} to .gitignore if it contains credentials.`);
         }
+    } else {
+        writeFileSync(WORKSPACE_FILE, TEMPLATE, 'utf-8');
+        console.log(`Created ${WORKSPACE_FILE}`);
+        console.log(`Run 'agrippa clone' to add resources to this workspace.`);
+        console.log(`Add ${WORKSPACE_FILE} to .gitignore if it contains credentials.`);
     }
 
-    writeFileSync(WORKSPACE_FILE, TEMPLATE, 'utf-8');
-    console.log(`Created ${WORKSPACE_FILE}`);
-    console.log(`Run 'agrippa clone' to add resources to this workspace.`);
-    console.log(`Add ${WORKSPACE_FILE} to .gitignore if it contains credentials.`);
-
     if (!existsSync('pyproject.toml')) {
         writeFileSync('pyproject.toml', PYPROJECT_TOML, 'utf-8');
         console.log('Created pyproject.toml (ruff builtins)');

package/src/agrippa/commands/pull.js

@@ -162,55 +162,25 @@ async function fetchRemoteCode(token, ripUrl, workspace) {
 }
 
 async function selectEntries(changed, verb, mode = 'pull') {
-    // Group by parent folder for folder-level pre-selection
-    const folderMap = new Map();
-    for (const entry of changed) {
-        const folder = dirname(entry.path) || '.';
-        if (!folderMap.has(folder)) folderMap.set(folder, []);
-        folderMap.get(folder).push(entry);
-    }
-
-    const folders = [...folderMap.keys()];
-
-    // Folder-level pre-selection (only shown when there are multiple folders)
-    let includedFolders = new Set(folders);
-    if (folders.length > 1) {
-        const { selectedFolders } = await inquirer.prompt([
-            {
-                type: 'checkbox',
-                name: 'selectedFolders',
-                message: `Select workflows/folders to ${verb}:`,
-                choices: folders.map((f) => ({
-                    name: `${f}/  (${folderMap.get(f).length} changed)`,
-                    value: f,
-                    checked: true,
-                })),
-            },
-        ]);
-        includedFolders = new Set(selectedFolders);
-    }
-
-    const candidates = changed.filter((e) => includedFolders.has(dirname(e.path) || '.'));
-
-    if (!candidates.length) return [];
-
     const badgeFor = (status) => {
         if (mode === 'push') {
-            return status === 'fast-forward' ? '↑ local updated' : '⚠ remote changes will be overwritten';
+            return status === 'fast-forward' ? '↑ safe' : '⚠ conflict';
         }
-        return status === 'fast-forward' ? '↑ remote updated' : '⚠ local changes will be lost';
+        return status === 'fast-forward' ? '↑ safe' : '⚠ conflict';
     };
 
+    const choices = changed.map((e) => ({
+        name: `${e.name}  [${badgeFor(e.status)}]`,
+        value: e,
+        checked: true,
+    }));
+
     const { selected } = await inquirer.prompt([
         {
             type: 'checkbox',
             name: 'selected',
-            message: `Fine-tune records to ${verb}: (space to toggle, a to toggle all)`,
-            choices: candidates.map((e) => ({
-                name: `[${dirname(e.path) || '.'}]  ${e.name}  [${badgeFor(e.status)}]`,
-                value: e,
-                checked: true,
-            })),
+            message: `Select records to ${verb}:`,
+            choices,
             pageSize: 20,
         },
     ]);

package/src/agrippa/lib/config.js

@@ -19,7 +19,7 @@ function writeConfig(config) {
 function loadEffectiveEnv(localConfig) {
     // Load global prbot config as the base (KC_URL, KC_USER, RIP_URL, etc. live here)
     if (existsSync(CONFIG_FILE)) {
-        configDotenv({ path: CONFIG_FILE });
+        configDotenv({ path: CONFIG_FILE, quiet: true });
     }
 
     // Overlay workspace-level overrides from agrippa.yaml's agrippa: section

package/src/commands/autopr.js

@@ -150,9 +150,11 @@ function scoreSections(sections, candidates) {
                 continue;
             }
             // Token fallback
-            const tokens = lc.split(/[\s|_\-.]+/).filter((t) => t.length > 2);
+            const tokens = lc.split(/[\s|_\-.]+/).filter((t) => t.length > 1);
             for (const token of tokens) {
-                if (heading.includes(token)) score++;
+                if (heading.includes(token)) {
+                    score += /^\d+$/.test(token) ? 5 : 1;
+                }
             }
         }
         if (score > 0) results.push({ ...section, score });

package/src/index.js

@@ -10,8 +10,18 @@ import { init } from './commands/init.js';
 import { main as prMain } from './commands/pr.js';
 import { verbot } from './commands/ver.js';
 import { CONFIG_FILE } from './config.js';
+import { checkForUpdate, currentVersion } from './lib/updateCheck.js';
 
-configDotenv({ path: CONFIG_FILE });
+configDotenv({ path: CONFIG_FILE, quiet: true });
+
+let _updateAvailable = null;
+checkForUpdate().then((v) => { _updateAvailable = v; });
+
+process.on('exit', () => {
+    if (_updateAvailable) {
+        console.log(`\nUpdate available: ${currentVersion} → ${_updateAvailable}\nRun: prbot update`);
+    }
+});
 
 program
     .command('pr <module>')

package/src/lib/updateCheck.js

@@ -0,0 +1,60 @@
+import { execFile } from 'child_process';
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { CONFIG_DIR } from '../config.js';
+
+const CACHE_FILE = path.join(CONFIG_DIR, '.update-check');
+const CACHE_TTL_MS = 24 * 60 * 60 * 1000;
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const pkg = JSON.parse(readFileSync(path.join(__dirname, '../../package.json'), 'utf8'));
+
+export const currentVersion = pkg.version;
+
+function semverGt(a, b) {
+    const pa = a.split('.').map(Number);
+    const pb = b.split('.').map(Number);
+    for (let i = 0; i < 3; i++) {
+        if (pa[i] > pb[i]) return true;
+        if (pa[i] < pb[i]) return false;
+    }
+    return false;
+}
+
+function readCache() {
+    try {
+        if (!existsSync(CACHE_FILE)) return null;
+        const data = JSON.parse(readFileSync(CACHE_FILE, 'utf8'));
+        if (Date.now() - new Date(data.checkedAt).getTime() > CACHE_TTL_MS) return null;
+        return data.latestVersion;
+    } catch {
+        return null;
+    }
+}
+
+function writeCache(latestVersion) {
+    try {
+        mkdirSync(CONFIG_DIR, { recursive: true });
+        writeFileSync(CACHE_FILE, JSON.stringify({ checkedAt: new Date().toISOString(), latestVersion }));
+    } catch {
+        // non-critical
+    }
+}
+
+function fetchLatest() {
+    return new Promise((resolve) => {
+        execFile('npm', ['view', '@waron97/prbot', 'version'], { timeout: 5000 }, (err, stdout) => {
+            if (err) resolve(null);
+            else resolve(stdout.trim());
+        });
+    });
+}
+
+export async function checkForUpdate() {
+    const cached = readCache();
+    const latest = cached ?? (await fetchLatest());
+    if (latest && !cached) writeCache(latest);
+    if (latest && semverGt(latest, currentVersion)) return latest;
+    return null;
+}