@bobfrankston/gcards 0.1.17 → 0.1.19

package/gcards.code-workspace

@@ -0,0 +1,33 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "../../../projects/OAuth/OauthSupport"
+		}
+	],
+	"settings": {
+		"workbench.colorTheme": "Visual Studio 2019 Dark",
+		"workbench.colorCustomizations": {
+			"activityBar.activeBackground": "#0ae04a",
+			"activityBar.background": "#0ae04a",
+			"activityBar.foreground": "#15202b",
+			"activityBar.inactiveForeground": "#15202b99",
+			"activityBarBadge.background": "#9266f8",
+			"activityBarBadge.foreground": "#15202b",
+			"commandCenter.border": "#e7e7e799",
+			"sash.hoverBorder": "#0ae04a",
+			"statusBar.background": "#08af3a",
+			"statusBar.foreground": "#e7e7e7",
+			"statusBarItem.hoverBackground": "#0ae04a",
+			"statusBarItem.remoteBackground": "#08af3a",
+			"statusBarItem.remoteForeground": "#e7e7e7",
+			"titleBar.activeBackground": "#08af3a",
+			"titleBar.activeForeground": "#e7e7e7",
+			"titleBar.inactiveBackground": "#08af3a99",
+			"titleBar.inactiveForeground": "#e7e7e799"
+		},
+		"peacock.color": "#08af3a"
+	}
+}

package/gcards.ts

@@ -13,7 +13,7 @@ import { authenticateOAuth } from '../../../projects/oauth/oauthsupport/index.ts
 import type { GooglePerson, GoogleConnectionsResponse } from './glib/types.ts';
 import { GCARDS_GUID_KEY, extractGuids } from './glib/gctypes.ts';
 import type { ContactIndex, IndexEntry, DeletedEntry, DeleteQueue, DeleteQueueEntry, PushStatus, PendingChange, UserPaths } from './glib/gctypes.ts';
-import { DATA_DIR, CREDENTIALS_FILE, loadConfig, saveConfig, getUserPaths, ensureUserDir, loadIndex, normalizeUser, getAllUsers, resolveUser, FileLogger } from './glib/gutils.ts';
+import { DATA_DIR, CREDENTIALS_FILE, loadConfig, saveConfig, getUserPaths, ensureUserDir, loadIndex, normalizeUser, getAllUsers, resolveUser, FileLogger, processProblemsFile } from './glib/gutils.ts';
 import { explainApiError, isAIAvailable, showAISetupHint } from './glib/aihelper.ts';
 
 const PEOPLE_API_BASE = 'https://people.googleapis.com/v1';
@@ -297,8 +297,17 @@ async function fetchContactsWithRetry(
     });
 
     if (response.status === 410) {
-        console.log('Sync token expired, performing full sync...');
-        return fetchContactsWithRetry(accessToken, undefined, pageToken, 0);
+        console.log('Sync token expired (410), performing full sync...');
+        return fetchContactsWithRetry(accessToken, undefined, undefined, 0);
+    }
+
+    if (response.status === 400) {
+        const text = await response.text();
+        if (text.includes('EXPIRED_SYNC_TOKEN')) {
+            console.log('Sync token expired (400), performing full sync...');
+            return fetchContactsWithRetry(accessToken, undefined, undefined, 0);
+        }
+        throw new Error(`API error: ${response.status} ${text}`);
     }
 
     if (response.status === 429) {
@@ -563,6 +572,12 @@ async function findPendingChanges(paths: UserPaths, logger: FileLogger, since?:
         console.log(`Using -since override: ${since}`);
     }
 
+    // Process problems.txt first (applies deletions, fixes, etc.)
+    const problemsResult = processProblemsFile(paths, false);
+    if (problemsResult.deleted > 0 || problemsResult.fixed > 0 || problemsResult.companies > 0) {
+        console.log(`Processed problems.txt: ${problemsResult.deleted} deleted, ${problemsResult.fixed} fixed, ${problemsResult.companies} companies`);
+    }
+
     // Check _delete.json for deletion requests
     const deleteQueue = loadDeleteQueue(paths);
     for (const entry of deleteQueue.entries) {
@@ -629,7 +644,7 @@ async function findPendingChanges(paths: UserPaths, logger: FileLogger, since?:
         const files = fs.readdirSync(paths.toDeleteDir).filter(f => f.endsWith('.json'));
         for (const file of files) {
             const filePath = path.join(paths.toDeleteDir, file);
-            let content: GooglePerson;
+            let content: GooglePerson & { _delete?: string | boolean };
             try {
                 content = JSON.parse(await fp.readFile(filePath, 'utf-8'));
             } catch (e: any) {
@@ -644,7 +659,8 @@ async function findPendingChanges(paths: UserPaths, logger: FileLogger, since?:
                 type: 'delete',
                 resourceName: content.resourceName,
                 displayName,
-                filePath
+                filePath,
+                _delete: content._delete === 'force' ? 'force' : undefined
             });
         }
     }
@@ -975,21 +991,21 @@ async function pushContacts(user: string, options: { yes: boolean; verbose: bool
                 const contactFile = path.join(paths.contactsDir, `${change.resourceName.replace('people/', '')}.json`);
                 const fileToRead = fs.existsSync(contactFile) ? contactFile : change.filePath;
 
-                // Check if contact has a real photo or is starred - skip deletion if so
+                // Read contact to check photo/starred/force status
                 let contactHasPhoto = false;
                 let contactIsStarred = false;
+                let isForced = change._delete === 'force' || index.contacts[change.resourceName]?._delete === 'force';
                 if (fs.existsSync(fileToRead)) {
                     try {
                         const contact = JSON.parse(fs.readFileSync(fileToRead, 'utf-8')) as GooglePerson;
                         contactHasPhoto = hasNonDefaultPhoto(contact);
                         contactIsStarred = isStarred(contact);
+                        if ((contact as any)._delete === 'force') isForced = true;
                     } catch { /* ignore read errors */ }
                 }
 
                 // Determine skip reason (photo takes precedence over starred)
-                // Use * prefix to indicate "skipped, not deleted"
                 // 'force' overrides photo/starred protection
-                const isForced = change._delete === 'force' || index.contacts[change.resourceName]?._delete === 'force';
                 const skipReason = isForced ? null : (contactHasPhoto ? '*photo' : (contactIsStarred ? '*starred' : null));
 
                 if (skipReason) {
@@ -1002,7 +1018,8 @@ async function pushContacts(user: string, options: { yes: boolean; verbose: bool
                     });
                     if (skipReason === '*photo') skippedPhoto++;
                     else if (skipReason === '*starred') skippedStarred++;
-                    console.log(`${ts()} [${String(processed).padStart(5)}/${total}] SKIPPED ${change.displayName} (${skipReason})`);
+                    const fileId = change.resourceName.replace('people/', '');
+                    console.log(`${ts()} [${String(processed).padStart(5)}/${total}] SKIPPED ${change.displayName} (${skipReason}) ${fileId}.json`);
 
                     // Update _delete to show skip reason
                     if (index.contacts[change.resourceName]) {
@@ -1114,25 +1131,34 @@ async function pushContacts(user: string, options: { yes: boolean; verbose: bool
             existingProblems = fs.readFileSync(problemsPath, 'utf-8');
         } else {
             existingProblems = `# Edit this file then run: gfix problems -u ${user}
-# Format: filename<TAB>name<TAB>reason
+# Format: filename ; name ; reason ; email
 # To delete: add 'x' at start of line
 # To mark as company: add 'c' at start of line (moves name to organization)
 # To fix name: replace the name with "First Last" or "First [Middle] Last"
+# Fields: nickname: title: company: suffix: (quote values with spaces, "" to remove)
 # To skip: leave unchanged
+# You can manually add entries to this file
 #
 `;
         }
 
-        // Add photo/starred entries
+        // Add photo/starred entries with email
         const newEntries = notDeleted.map(nd => {
             const id = nd.resourceName.replace('people/', '');
             const reason = nd.reason === '*photo' ? 'has-photo' : 'starred';
-            return `${id}.json\t${nd.displayName}\t${reason}`;
+            let email = '';
+            if (nd.filePath && fs.existsSync(nd.filePath)) {
+                try {
+                    const contact = JSON.parse(fs.readFileSync(nd.filePath, 'utf-8'));
+                    email = contact.emailAddresses?.[0]?.value || '';
+                } catch { /* ignore */ }
+            }
+            return `${id}.json ; ${nd.displayName} ; ${reason} ; ${email}`;
         });
 
         // Avoid duplicates - check if entry already exists
-        const existingLines = new Set(existingProblems.split('\n').map(l => l.split('\t')[0]));
-        const uniqueEntries = newEntries.filter(e => !existingLines.has(e.split('\t')[0]));
+        const existingLines = new Set(existingProblems.split('\n').map(l => l.split(';')[0].trim()));
+        const uniqueEntries = newEntries.filter(e => !existingLines.has(e.split(';')[0].trim()));
 
         if (uniqueEntries.length > 0) {
             fs.writeFileSync(problemsPath, existingProblems.trimEnd() + '\n' + uniqueEntries.join('\n') + '\n');
@@ -1160,6 +1186,8 @@ async function pushContacts(user: string, options: { yes: boolean; verbose: bool
     if (etagErrors.length > 0) {
         console.log(`\n${etagErrors.length} contact(s) had etag conflicts. Run 'gcards sync' to refresh, then retry push.`);
     }
+
+    process.exit(0);
 }
 
 async function main(): Promise<void> {

package/gfix.ts

@@ -14,7 +14,7 @@ import readline from 'readline';
 import { parse as parseJsonc } from 'jsonc-parser';
 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, matchUsers } from './glib/gutils.ts';
+import { DATA_DIR, resolveUser, getUserPaths, loadIndex, getAllUsers, normalizeUser, matchUsers, processProblemsFile } from './glib/gutils.ts';
 import { mergeContacts as mergeContactData, collectSourcePhotos, type MergeEntry, type PhotoEntry } from './glib/gmerge.ts';
 
 function loadDeleteQueue(paths: UserPaths): DeleteQueue {
@@ -925,6 +925,11 @@ async function runNamesFix(user: string, mode: 'inspect' | 'apply'): Promise<voi
 
             // Note: email-in-name is now handled earlier as DELETE
 
+            // Skip CJK names (Chinese, Japanese, Korean) - they don't use spaces
+            if (/^[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]+$/u.test(name.givenName)) {
+                continue;
+            }
+
             const parsed = parseFullName(name.givenName);
 
             // Company names are fine - skip without adding to problems
@@ -935,7 +940,8 @@ async function runNamesFix(user: string, mode: 'inspect' | 'apply'): Promise<voi
             // Check for ambiguous cases
             if (parsed.ambiguous) {
                 const displayName = name.displayName || name.givenName || 'Unknown';
-                problems.push(`${file}\t${name.givenName}\tambiguous`);
+                const email = contact.emailAddresses?.[0]?.value || '';
+                problems.push(`${file} ; ${name.givenName} ; ambiguous ; ${email}`);
                 console.log(`  [SKIP:ambiguous] ${displayName} (${file})`);
                 continue;
             }
@@ -943,7 +949,8 @@ async function runNamesFix(user: string, mode: 'inspect' | 'apply'): Promise<voi
             // Check if no parseable last name
             if (!parsed.last) {
                 const displayName = name.displayName || name.givenName || 'Unknown';
-                problems.push(`${file}\t${name.givenName}\tno-last-name`);
+                const email = contact.emailAddresses?.[0]?.value || '';
+                problems.push(`${file} ; ${name.givenName} ; no-last-name ; ${email}`);
                 console.log(`  [SKIP:no-last-name] ${displayName} (${file})`);
                 continue;
             }
@@ -1093,11 +1100,13 @@ async function runNamesFix(user: string, mode: 'inspect' | 'apply'): Promise<voi
     if (problems.length > 0) {
         const problemsPath = path.join(paths.userDir, 'problems.txt');
         const header = `# Edit this file then run: gfix problems -u ${user}
-# Format: filename<TAB>name<TAB>reason
+# Format: filename ; name ; reason ; email
 # To delete: add 'x' at start of line
 # To mark as company: add 'c' at start of line (moves name to organization)
 # To fix name: replace the name with "First Last" or "First [Middle] Last"
+# Fields: nickname: title: company: suffix: (quote values with spaces, "" to remove)
 # To skip: leave unchanged
+# You can manually add entries to this file
 #
 `;
         fs.writeFileSync(problemsPath, header + problems.join('\n'));
@@ -1171,188 +1180,22 @@ async function runProblems(user: string): Promise<void> {
         process.exit(1);
     }
 
-    const content = fs.readFileSync(problemsPath, 'utf-8');
-    const lines = content.split(/\r?\n/).filter(l => l.trim() && !l.startsWith('#'));
-
-    if (lines.length === 0) {
-        console.log('No entries in problems.txt (or all are comments)');
-        return;
-    }
-
-    console.log(`\nProcessing ${lines.length} entries from problems.txt\n`);
-
-    let deleted = 0;
-    let fixed = 0;
-    let skipped = 0;
-
-    if (!fs.existsSync(paths.toDeleteDir)) {
-        fs.mkdirSync(paths.toDeleteDir, { recursive: true });
-    }
-
-    let companies = 0;
-
-    for (const line of lines) {
-        // Check for deletion marker (x or x<space> at start)
-        // Always force delete (overrides photo/starred protection)
-        const deleteMatch = line.match(/^x\s*(.*)/i);
-        if (deleteMatch) {
-            const rest = deleteMatch[1];
-            const parts = rest.split('\t');
-            const file = parts[0]?.trim();
-            if (!file) {
-                console.log(`  [SKIP] Can't parse: ${line.slice(0, 50)}`);
-                skipped++;
-                continue;
-            }
-
-            const srcPath = path.join(paths.contactsDir, file);
-            if (!fs.existsSync(srcPath)) {
-                console.log(`  [SKIP] File not found: ${file}`);
-                skipped++;
-                continue;
-            }
+    console.log(`\nProcessing problems.txt for user: ${user}\n`);
 
-            // Mark with _delete: 'force' to override photo/starred protection
-            const contact = parseJsonc(fs.readFileSync(srcPath, 'utf-8')) as GooglePerson;
-            (contact as any)._delete = 'force';
-            fs.writeFileSync(srcPath, JSON.stringify(contact, null, 2));
-
-            const dstPath = path.join(paths.toDeleteDir, file);
-            fs.renameSync(srcPath, dstPath);
-            console.log(`  [DELETE] ${file}`);
-            deleted++;
-            continue;
-        }
-
-        // Check for company marker (c or c<space> at start)
-        const companyMatch = line.match(/^c\s*(.*)/i);
-        if (companyMatch) {
-            const rest = companyMatch[1];
-            const parts = rest.split('\t');
-            const file = parts[0]?.trim();
-            const origName = parts[1]?.trim() || '';
-            if (!file) {
-                console.log(`  [SKIP] Can't parse: ${line.slice(0, 50)}`);
-                skipped++;
-                continue;
-            }
-
-            const filePath = path.join(paths.contactsDir, file);
-            if (!fs.existsSync(filePath)) {
-                console.log(`  [SKIP] File not found: ${file}`);
-                skipped++;
-                continue;
-            }
-
-            const contact = parseJsonc(fs.readFileSync(filePath, 'utf-8')) as GooglePerson;
-            const name = contact.names?.[0];
-            const companyName = name?.givenName || name?.displayName || origName;
-
-            // Move name to organization
-            if (!contact.organizations) {
-                contact.organizations = [];
-            }
-            if (contact.organizations.length === 0) {
-                contact.organizations.push({ name: companyName });
-            } else if (!contact.organizations[0].name) {
-                contact.organizations[0].name = companyName;
-            }
-
-            // Clear person name fields
-            if (name) {
-                delete name.givenName;
-                delete name.familyName;
-                delete name.middleName;
-                delete name.displayNameLastFirst;
-            }
-
-            fs.writeFileSync(filePath, JSON.stringify(contact, null, 2));
-            console.log(`  [COMPANY] ${file}: ${companyName}`);
-            companies++;
-            continue;
-        }
-
-        // Parse as tab-separated: filename<TAB>name<TAB>reason
-        const parts = line.split('\t');
-        if (parts.length < 2) {
-            skipped++;
-            continue;
-        }
-
-        const file = parts[0].trim();
-        const newName = parts[1].trim();
-        const originalReason = parts[2]?.trim() || '';
-
-        // Check if name was changed (compare with original patterns)
-        // Original format was: "Original Name" so if it doesn't start with quote, it's edited
-        const wasEdited = !newName.startsWith('"');
-
-        if (!wasEdited) {
-            skipped++;
-            continue;
-        }
-
-        // Parse the new name: "First Last" or "First [Middle] Last"
-        const filePath = path.join(paths.contactsDir, file);
-        if (!fs.existsSync(filePath)) {
-            console.log(`  [SKIP] File not found: ${file}`);
-            skipped++;
-            continue;
-        }
-
-        const contact = parseJsonc(fs.readFileSync(filePath, 'utf-8')) as GooglePerson;
-        const name = contact.names?.[0];
-        if (!name) {
-            console.log(`  [SKIP] No name in contact: ${file}`);
-            skipped++;
-            continue;
-        }
-
-        // Parse "First [Middle] Last" format
-        const nameMatch = newName.match(/^(\S+)(?:\s+\[([^\]]+)\])?\s+(.+)$/);
-        if (!nameMatch) {
-            // Try simple "First Last"
-            const simpleParts = newName.split(/\s+/);
-            if (simpleParts.length >= 2) {
-                const first = simpleParts[0];
-                const last = simpleParts.slice(1).join(' ');
-                name.givenName = first;
-                name.familyName = last;
-                delete name.middleName;
-                fs.writeFileSync(filePath, JSON.stringify(contact, null, 2));
-                console.log(`  [FIX] ${file}: ${first} ${last}`);
-                fixed++;
-            } else {
-                console.log(`  [SKIP] Can't parse name: "${newName}"`);
-                skipped++;
-            }
-            continue;
-        }
-
-        const [, first, middle, last] = nameMatch;
-        name.givenName = first;
-        name.familyName = last;
-        if (middle) {
-            name.middleName = middle;
-        } else {
-            delete name.middleName;
-        }
-
-        fs.writeFileSync(filePath, JSON.stringify(contact, null, 2));
-        console.log(`  [FIX] ${file}: ${first}${middle ? ' ' + middle : ''} ${last}`);
-        fixed++;
-    }
+    const result = processProblemsFile(paths);
 
     console.log(`\n${'='.repeat(50)}`);
     console.log(`Summary:`);
-    console.log(`  Fixed: ${fixed}`);
-    console.log(`  Companies: ${companies}`);
-    console.log(`  Deleted: ${deleted}`);
-    console.log(`  Skipped: ${skipped}`);
+    console.log(`  Fixed: ${result.fixed}`);
+    console.log(`  Companies: ${result.companies}`);
+    console.log(`  Deleted: ${result.deleted}`);
+    console.log(`  Skipped: ${result.skipped}`);
 
-    if (fixed > 0 || deleted > 0 || companies > 0) {
+    if (result.fixed > 0 || result.deleted > 0 || result.companies > 0) {
         console.log(`\nRun 'gcards push -u ${user}' to apply changes to Google.`);
     }
+
+    process.exit(0);
 }
 
 async function runFix(user: string, mode: 'inspect' | 'apply'): Promise<void> {

package/glib/gutils.ts

@@ -197,3 +197,259 @@ export class FileLogger {
         fs.appendFileSync(this.filePath, message + '\n');
     }
 }
+
+export interface ProblemsResult {
+    deleted: number;
+    fixed: number;
+    companies: number;
+    skipped: number;
+    remaining: string[];  // Lines that weren't processed (unchanged)
+}
+
+/**
+ * Process problems.txt file - apply deletions, company marks, name fixes, field updates
+ * Returns counts and remaining unprocessed lines
+ */
+export function processProblemsFile(paths: UserPaths, verbose = true): ProblemsResult {
+    const problemsPath = path.join(paths.userDir, 'problems.txt');
+    const result: ProblemsResult = { deleted: 0, fixed: 0, companies: 0, skipped: 0, remaining: [] };
+
+    if (!fs.existsSync(problemsPath)) {
+        return result;
+    }
+
+    const content = fs.readFileSync(problemsPath, 'utf-8');
+    const lines = content.split(/\r?\n/);
+    const headerLines: string[] = [];
+
+    if (!fs.existsSync(paths.toDeleteDir)) {
+        fs.mkdirSync(paths.toDeleteDir, { recursive: true });
+    }
+
+    for (const line of lines) {
+        // Preserve comments and blank lines for remaining file
+        if (!line.trim() || line.startsWith('#')) {
+            headerLines.push(line);
+            continue;
+        }
+
+        // Check for deletion marker (x or x<space> at start)
+        const deleteMatch = line.match(/^x\s*(.*)/i);
+        if (deleteMatch) {
+            const rest = deleteMatch[1];
+            const parts = rest.split(';');
+            const file = parts[0]?.trim();
+            if (!file) {
+                if (verbose) console.log(`  [SKIP] Can't parse: ${line.slice(0, 50)}`);
+                result.skipped++;
+                continue;
+            }
+
+            const srcPath = path.join(paths.contactsDir, file);
+            if (!fs.existsSync(srcPath)) {
+                result.skipped++;
+                continue;
+            }
+
+            // Mark with _delete: 'force' to override photo/starred protection
+            const contact = parseJsonc(fs.readFileSync(srcPath, 'utf-8'));
+            (contact as any)._delete = 'force';
+            fs.writeFileSync(srcPath, JSON.stringify(contact, null, 2));
+
+            const dstPath = path.join(paths.toDeleteDir, file);
+            fs.renameSync(srcPath, dstPath);
+            if (verbose) console.log(`  [DELETE] ${file}`);
+            result.deleted++;
+            continue;
+        }
+
+        // Check for company marker (c or c<space> at start)
+        const companyMatch = line.match(/^c\s*(.*)/i);
+        if (companyMatch) {
+            const rest = companyMatch[1];
+            const parts = rest.split(';');
+            const file = parts[0]?.trim();
+            const origName = parts[1]?.trim() || '';
+            if (!file) {
+                if (verbose) console.log(`  [SKIP] Can't parse: ${line.slice(0, 50)}`);
+                result.skipped++;
+                continue;
+            }
+
+            const filePath = path.join(paths.contactsDir, file);
+            if (!fs.existsSync(filePath)) {
+                result.skipped++;
+                continue;
+            }
+
+            const contact = parseJsonc(fs.readFileSync(filePath, 'utf-8')) as any;
+            const name = contact.names?.[0];
+            const companyName = name?.givenName || name?.displayName || origName;
+
+            // Move name to organization
+            if (!contact.organizations) contact.organizations = [];
+            if (contact.organizations.length === 0) {
+                contact.organizations.push({ name: companyName });
+            } else if (!contact.organizations[0].name) {
+                contact.organizations[0].name = companyName;
+            }
+
+            // Clear person name fields
+            if (name) {
+                delete name.givenName;
+                delete name.familyName;
+                delete name.middleName;
+                delete name.displayNameLastFirst;
+            }
+
+            fs.writeFileSync(filePath, JSON.stringify(contact, null, 2));
+            if (verbose) console.log(`  [COMPANY] ${file}: ${companyName}`);
+            result.companies++;
+            continue;
+        }
+
+        // Parse as semicolon-separated: filename ; name ; reason ; email
+        const parts = line.split(';');
+        if (parts.length < 2) {
+            result.remaining.push(line);
+            result.skipped++;
+            continue;
+        }
+
+        const file = parts[0].trim();
+        const fieldsPart = parts[1].trim();
+
+        // Check if anything was changed (original starts with quote)
+        if (fieldsPart.startsWith('"')) {
+            result.remaining.push(line);
+            result.skipped++;
+            continue;
+        }
+
+        const filePath = path.join(paths.contactsDir, file);
+        if (!fs.existsSync(filePath)) {
+            result.skipped++;
+            continue;
+        }
+
+        const contact = parseJsonc(fs.readFileSync(filePath, 'utf-8')) as any;
+
+        // Parse field:value pairs and name
+        const fieldRegex = /(\w+):(?:"([^"]+)"|(\S+))/g;
+        const fields: Record<string, string> = {};
+        let remaining = fieldsPart;
+
+        let match: RegExpExecArray | null;
+        while ((match = fieldRegex.exec(fieldsPart)) !== null) {
+            const fieldName = match[1].toLowerCase();
+            const value = match[2] ?? match[3];  // quoted or unquoted
+            fields[fieldName] = value;
+            remaining = remaining.replace(match[0], '').trim();
+        }
+
+        const changes: string[] = [];
+
+        // Apply field updates (empty string "" means remove)
+        if ('nickname' in fields) {
+            if (fields.nickname === '') {
+                delete contact.nicknames;
+                changes.push(`nickname:[removed]`);
+            } else {
+                if (!contact.nicknames) contact.nicknames = [];
+                if (contact.nicknames.length === 0) {
+                    contact.nicknames.push({ value: fields.nickname });
+                } else {
+                    contact.nicknames[0].value = fields.nickname;
+                }
+                changes.push(`nickname:${fields.nickname}`);
+            }
+        }
+
+        if ('title' in fields) {
+            if (fields.title === '') {
+                if (contact.organizations?.[0]) delete contact.organizations[0].title;
+                changes.push(`title:[removed]`);
+            } else {
+                if (!contact.organizations) contact.organizations = [];
+                if (contact.organizations.length === 0) {
+                    contact.organizations.push({ title: fields.title });
+                } else {
+                    contact.organizations[0].title = fields.title;
+                }
+                changes.push(`title:${fields.title}`);
+            }
+        }
+
+        if ('company' in fields) {
+            if (fields.company === '') {
+                if (contact.organizations?.[0]) delete contact.organizations[0].name;
+                changes.push(`company:[removed]`);
+            } else {
+                if (!contact.organizations) contact.organizations = [];
+                if (contact.organizations.length === 0) {
+                    contact.organizations.push({ name: fields.company });
+                } else {
+                    contact.organizations[0].name = fields.company;
+                }
+                changes.push(`company:${fields.company}`);
+            }
+        }
+
+        if ('suffix' in fields) {
+            if (fields.suffix === '') {
+                if (contact.names?.[0]) delete contact.names[0].honorificSuffix;
+                changes.push(`suffix:[removed]`);
+            } else {
+                if (!contact.names) contact.names = [{}];
+                contact.names[0].honorificSuffix = fields.suffix;
+                changes.push(`suffix:${fields.suffix}`);
+            }
+        }
+
+        // Parse name from remaining text
+        const newName = remaining.trim();
+        if (newName) {
+            const name = contact.names?.[0];
+            if (name) {
+                const nameMatch = newName.match(/^(\S+)(?:\s+\[([^\]]+)\])?\s+(.+)$/);
+                if (!nameMatch) {
+                    const simpleParts = newName.split(/\s+/);
+                    if (simpleParts.length >= 2) {
+                        name.givenName = simpleParts[0];
+                        name.familyName = simpleParts.slice(1).join(' ');
+                        delete name.middleName;
+                        changes.push(`${simpleParts[0]} ${simpleParts.slice(1).join(' ')}`);
+                    }
+                } else {
+                    const [, first, middle, last] = nameMatch;
+                    name.givenName = first;
+                    name.familyName = last;
+                    if (middle) {
+                        name.middleName = middle;
+                    } else {
+                        delete name.middleName;
+                    }
+                    changes.push(`${first}${middle ? ' ' + middle : ''} ${last}`);
+                }
+            }
+        }
+
+        if (changes.length === 0) {
+            result.remaining.push(line);
+            result.skipped++;
+            continue;
+        }
+
+        fs.writeFileSync(filePath, JSON.stringify(contact, null, 2));
+        if (verbose) console.log(`  [FIX] ${file}: ${changes.join(', ')}`);
+        result.fixed++;
+    }
+
+    // Rewrite problems.txt with only remaining unprocessed lines
+    if (result.deleted > 0 || result.fixed > 0 || result.companies > 0) {
+        const newContent = [...headerLines, ...result.remaining].join('\n');
+        fs.writeFileSync(problemsPath, newContent);
+    }
+
+    return result;
+}

package/package.json

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