@bobfrankston/gcards 0.1.8 → 0.1.9

package/gfix.ts

@@ -13,7 +13,7 @@ import path from 'path';
 import readline from 'readline';
 import type { GooglePerson, GoogleName, GooglePhoneNumber, GoogleEmailAddress, GoogleBirthday } from './glib/types.ts';
 import type { DeleteQueue, DeleteQueueEntry, UserPaths } from './glib/gctypes.ts';
-import { DATA_DIR, resolveUser, getUserPaths, loadIndex, getAllUsers, normalizeUser } from './glib/gutils.ts';
+import { DATA_DIR, resolveUser, getUserPaths, loadIndex, getAllUsers, normalizeUser, matchUsers } from './glib/gutils.ts';
 import { mergeContacts as mergeContactData, collectSourcePhotos, type MergeEntry, type PhotoEntry } from './glib/gmerge.ts';
 
 function loadDeleteQueue(paths: UserPaths): DeleteQueue {
@@ -1445,13 +1445,7 @@ function findContactById(paths: UserPaths, id: string): { contact: GooglePerson;
     return null;
 }
 
-/** Match users by partial name - returns matching user names */
-function matchUsers(pattern: string): string[] {
-    const allUsers = getAllUsers();
-    const normalizedPattern = pattern.toLowerCase();
 
-    return allUsers.filter(user => user.toLowerCase().includes(normalizedPattern));
-}
 
 /** Convert wildcard pattern to regex (supports * and ?) */
 function wildcardToRegex(pattern: string): RegExp {

package/glib/gutils.ts

@@ -85,6 +85,32 @@ export function resolveUser(cliUser: string, setAsDefault = false): string {
     // 1. Use CLI-specified user if provided (and not 'default')
     if (cliUser && cliUser !== 'default') {
         const normalized = normalizeUser(cliUser);
+        
+        // Check if this matches an existing user (exact or substring match)
+        const matches = matchUsers(normalized);
+        
+        if (matches.length === 1) {
+            const matched = matches[0];
+            console.log(`Matched '${cliUser}' to existing user: ${matched}`);
+            if (setAsDefault) {
+                const config = loadConfig();
+                config.lastUser = matched;
+                saveConfig(config);
+            }
+            return matched;
+        } else if (matches.length > 1) {
+            console.error(`Ambiguous user '${cliUser}' matches multiple users: ${matches.join(', ')}`);
+            console.error('Please be more specific.');
+            process.exit(1);
+        }
+        
+        // No match found - this is a new user, require email format with @
+        if (!cliUser.includes('@')) {
+            console.error(`New user '${cliUser}' must be specified as an email address (e.g., ${cliUser}@gmail.com)`);
+            process.exit(1);
+        }
+        
+        // New user - use normalized version
         if (setAsDefault) {
             const config = loadConfig();
             config.lastUser = normalized;
@@ -109,6 +135,13 @@ export function normalizeUser(user: string): string {
     return user.toLowerCase().split(/[+@]/)[0].replace(/\./g, '');
 }
 
+/** Match users by partial name (substring match) - returns matching user names */
+export function matchUsers(pattern: string): string[] {
+    const allUsers = getAllUsers();
+    const normalizedPattern = pattern.toLowerCase();
+    return allUsers.filter(user => user.toLowerCase().includes(normalizedPattern));
+}
+
 export function getAllUsers(): string[] {
     if (!fs.existsSync(DATA_DIR)) {
         return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/gcards",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Google Contacts cleanup and management tool",
   "type": "module",
   "main": "gcards.ts",