@unifiedmemory/cli 1.3.6 → 1.3.9

package/.github/workflows/test-and-publish.yml

@@ -83,8 +83,12 @@ jobs:
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-          git tag v${{ steps.version-check.outputs.current }}
-          git push origin v${{ steps.version-check.outputs.current }}
+          if ! git ls-remote --tags origin | grep -q "refs/tags/v${{ steps.version-check.outputs.current }}"; then
+            git tag v${{ steps.version-check.outputs.current }}
+            git push origin v${{ steps.version-check.outputs.current }}
+          else
+            echo "Tag v${{ steps.version-check.outputs.current }} already exists, skipping"
+          fi
 
       - name: Skip publish notification
         if: steps.version-check.outputs.version_changed == 'false'

package/index.js

@@ -4,6 +4,9 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
+import { readFileSync } from 'fs';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
 import { login } from './commands/login.js';
 import { init } from './commands/init.js';
 import { switchOrg, showOrg } from './commands/org.js';
@@ -13,12 +16,15 @@ import { getSelectedOrg } from './lib/token-storage.js';
 import { loadAndRefreshToken } from './lib/token-validation.js';
 import { showWelcome } from './lib/welcome.js';
 
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const packageJson = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf8'));
+
 const program = new Command();
 
 program
   .name('um')
   .description('UnifiedMemory CLI - AI code assistant integration')
-  .version('1.1.0');
+  .version(packageJson.version);
 
 // Unified command (primary)
 program
@@ -199,7 +205,7 @@ noteCommand
 
 // Show welcome splash if no command provided
 if (process.argv.length === 2) {
-  showWelcome();
+  await showWelcome();
   program.help();
 }
 

package/lib/token-refresh.js

@@ -1,6 +1,7 @@
 import { getToken, saveToken } from './token-storage.js';
 import { config } from './config.js';
 import { parseJWT } from './jwt-utils.js';
+import { getOrgScopedToken } from './clerk-api.js';
 
 /**
  * Check if token has expired
@@ -71,13 +72,36 @@ export async function refreshAccessToken(tokenData) {
 
     const newTokenData = await response.json();
 
-    // Parse new JWT
-    const decoded = parseJWT(newTokenData.id_token || newTokenData.access_token);
+    // Parse refreshed JWT
+    const refreshedToken = newTokenData.id_token || newTokenData.access_token;
+    let finalIdToken = newTokenData.id_token;
+    let decoded = parseJWT(refreshedToken);
+
+    // Debug: log what we got from refresh
+    console.error(`  Refreshed token has sid: ${decoded?.sid ? 'yes' : 'no'}`);
+    console.error(`  selectedOrg: ${tokenData.selectedOrg?.id || 'none'}`);
+
+    // If we have org context, get org-scoped token to ensure JWT has org claims
+    if (tokenData.selectedOrg?.id && decoded?.sid) {
+      try {
+        const orgToken = await getOrgScopedToken(
+          decoded.sid,
+          tokenData.selectedOrg.id,
+          refreshedToken
+        );
+        finalIdToken = orgToken.jwt;
+        decoded = parseJWT(orgToken.jwt);
+      } catch (error) {
+        // Log warning but continue with base token
+        // The subsequent API call may fail, prompting re-login
+        console.error(`⚠️  Could not refresh org-scoped token: ${error.message}`);
+      }
+    }
 
     // Build updated token object, preserving selectedOrg
     const updatedToken = {
       accessToken: newTokenData.access_token,
-      idToken: newTokenData.id_token,
+      idToken: finalIdToken,
       tokenType: newTokenData.token_type || 'Bearer',
       expiresIn: newTokenData.expires_in,
       receivedAt: Date.now(),

package/lib/welcome.js

@@ -2,22 +2,50 @@ import chalk from 'chalk';
 import { readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
+import axios from 'axios';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const packageJson = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf8'));
 const version = packageJson.version;
 
-export function showWelcome() {
-  const pink = chalk.hex('#FF69B4');
-  const lightPink = chalk.hex('#FFB6C1');
-  const darkPink = chalk.hex('#C71585');
+const PACKAGE_NAME = '@unifiedmemory/cli';
+
+/**
+ * Check npm registry for latest version (non-blocking)
+ * @returns {Promise<{latest: string, isOutdated: boolean} | null>}
+ */
+export async function checkLatestVersion() {
+  try {
+    const response = await axios.get(
+      `https://registry.npmjs.org/${PACKAGE_NAME}/latest`,
+      { timeout: 2000 }
+    );
+    const latest = response.data.version;
+    const isOutdated = latest !== version;
+    return { latest, isOutdated };
+  } catch {
+    return null; // Silently fail - don't block CLI
+  }
+}
+
+export async function showWelcome() {
   const gray = chalk.gray;
   const white = chalk.white;
+  const yellow = chalk.yellow;
 
   console.log('');
   console.log(white.bold('  UnifiedMemory CLI ') + gray(`v${version}`));
   console.log(gray('  AI-powered knowledge assistant'));
   console.log('');
+
+  // Check for updates (non-blocking with short timeout)
+  const versionInfo = await checkLatestVersion();
+  if (versionInfo?.isOutdated) {
+    console.log(yellow('  ⚠ Update available: ') + white(`v${versionInfo.latest}`));
+    console.log(gray('    Run: ') + white('npm install -g @unifiedmemory/cli'));
+    console.log('');
+  }
+
   console.log(white('  Quick Start:'));
   console.log(gray('    um init         ') + white('Initialize in current project'));
   console.log(gray('    um status       ') + white('Check configuration'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unifiedmemory/cli",
-  "version": "1.3.6",
+  "version": "1.3.9",
   "description": "UnifiedMemory CLI - AI code assistant integration",
   "main": "index.js",
   "type": "module",