crewly 1.20.264 → 1.20.266

package/dist/backend/backend/src/controllers/google/google-connect-card.js

@@ -14,7 +14,7 @@ import { GOOGLE_PRODUCTS } from '../../constants.js';
 import { LoggerService } from '../../services/core/logger.service.js';
 const logger = LoggerService.getInstance().createComponentLogger('GoogleConnectCard');
 /** Human names for the products, for the card's first line. */
-const PRODUCT_LABELS = {
+export const PRODUCT_LABELS = {
     gmail: 'Gmail',
     calendar: 'Google Calendar',
     drive: 'Google Drive',
@@ -22,14 +22,39 @@ const PRODUCT_LABELS = {
 /**
  * Build the card. Pure, so the wording is testable without Slack.
  *
+ * A reconnect (`reconnect`) replaces the generic "Needs access" with the
+ * reason the harness hit — "Gmail needs re-authorization to save drafts" —
+ * and names the Google account, because an owner with two Gmail logins has
+ * to know which one to pick.
+ *
  * @param product - Product needing consent
  * @param url - The ticket link behind the button
  * @param expiresAt - When the link stops working
+ * @param reconnect - Why a working connection needs the owner again, and for which account
  * @returns Block Kit blocks and the fallback text
  */
-export function buildConnectCard(product, url, expiresAt) {
+export function buildConnectCard(product, url, expiresAt, reconnect) {
     const label = PRODUCT_LABELS[product] ?? product;
     const minutes = Math.max(1, Math.round((new Date(expiresAt).getTime() - Date.now()) / 60_000));
+    // Say both, because both surprise people: the link dies, and it is for
+    // them alone.
+    const note = `Only you can see this. The link works once, for about ${minutes} minutes.`;
+    if (reconnect) {
+        return {
+            text: reconnect.message,
+            blocks: [
+                {
+                    type: 'section',
+                    text: { type: 'mrkdwn', text: reconnect.message },
+                    accessory: { type: 'button', text: { type: 'plain_text', text: 'Reconnect' }, url, style: 'primary' },
+                },
+                {
+                    type: 'context',
+                    elements: [{ type: 'mrkdwn', text: reconnect.account ? `${reconnect.account} · ${note}` : note }],
+                },
+            ],
+        };
+    }
     return {
         text: `${label} needs access — open the link to authorize Crewly.`,
         blocks: [
@@ -40,14 +65,7 @@ export function buildConnectCard(product, url, expiresAt) {
             },
             {
                 type: 'context',
-                elements: [
-                    {
-                        type: 'mrkdwn',
-                        // Say both, because both surprise people: the link dies, and it
-                        // is for them alone.
-                        text: `Only you can see this. The link works once, for about ${minutes} minutes.`,
-                    },
-                ],
+                elements: [{ type: 'mrkdwn', text: note }],
             },
         ],
     };

package/dist/backend/backend/src/controllers/google/google-connect-card.js.map

@@ -1 +1 @@
-{"version":3,"file":"google-connect-card.js","sourceRoot":"","sources":["../../../../../../backend/src/controllers/google/google-connect-card.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"google-connect-card.js","sourceRoot":"","sources":["../../../../../../backend/src/controllers/google/google-connect-card.ts"],"names":[],"mappings":"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"}

package/dist/backend/backend/src/controllers/google/google.controller.d.ts

@@ -20,6 +20,7 @@ import { DocsService } from '../../services/google/docs.service.js';
 import { DocsCommentsService } from '../../services/google/docs-comments.service.js';
 import { SheetsService } from '../../services/google/sheets.service.js';
 import { SlidesService } from '../../services/google/slides.service.js';
+import { type ReauthNotifyResult, type ReauthTrigger } from '../../services/google/google-reauth-notifier.service.js';
 /** The services the handlers use; swappable for tests. */
 export interface GoogleControllerDeps {
     tokens: GoogleWorkspaceTokenService;
@@ -37,16 +38,39 @@ export interface GoogleControllerDeps {
  * @param next - Dependency set or null to rebuild lazily
  */
 export declare function setGoogleControllerDeps(next: GoogleControllerDeps | null): void;
+/**
+ * The reconnect a failure calls for, if only the owner can fix it: the grant
+ * lacks a scope this call needs (Google 403 insufficient scopes), or Google
+ * no longer honours it (expired / revoked — Cloud said `grant_revoked`).
+ *
+ * @param err - The failure
+ * @param req - Incoming request (agent session, Google account)
+ * @returns The trigger, or null for any other failure
+ */
+export declare function reauthTriggerFor(err: unknown, req: Request): ReauthTrigger | null;
+/**
+ * The agent-facing next step after a reconnect card was (or was not) sent.
+ *
+ * The agent must not send the owner to the Connections page: the owner is
+ * usually on a phone, and the card already is the whole fix.
+ *
+ * @param trigger - The failure
+ * @param result - What the notifier did
+ * @returns The hint, or null to fall back to the generic one
+ */
+export declare function reauthHint(trigger: ReauthTrigger, result: ReauthNotifyResult | null): string | null;
 /**
  * Answer a failure with the contract's `{ success:false, error, hint }`
  * shape. `not_connected` carries the consent URL as the hint; the other
- * codes get a one-line next step.
+ * codes get a one-line next step. A failure only the owner can fix (missing
+ * scope, expired grant) first posts the owner a one-tap reconnect card in
+ * Slack, and the hint says so.
  *
  * @param req - Incoming request (for the connect URL)
  * @param res - Response
  * @param err - The failure
  */
-export declare function sendGoogleError(req: Request, res: Response, err: unknown): void;
+export declare function sendGoogleError(req: Request, res: Response, err: unknown): Promise<void>;
 /**
  * GET /api/google/status — `{ connected, cloudConnected, email?, scopes?, grantedAt? }`.
  *

package/dist/backend/backend/src/controllers/google/google.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"google.controller.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/controllers/google/google.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"google.controller.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/controllers/google/google.controller.ts"],"names":[],"mappings":"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"}

package/dist/backend/backend/src/controllers/google/google.controller.js

@@ -26,6 +26,8 @@ import { SheetsService } from '../../services/google/sheets.service.js';
 import { SlidesService } from '../../services/google/slides.service.js';
 import { isOwnerCaller } from '../../middleware/caller-identity.middleware.js';
 import { readAgentSessionHeader } from '../../utils/agent-caller.utils.js';
+import { GoogleReauthNotifier, } from '../../services/google/google-reauth-notifier.service.js';
+import { PRODUCT_LABELS } from './google-connect-card.js';
 /** Who a held send is attributed to when the caller named no agent session. */
 const UNIDENTIFIED_SENDER = 'unidentified caller';
 const logger = LoggerService.getInstance().createComponentLogger('GoogleController');
@@ -171,22 +173,101 @@ function accountOf(req) {
     const raw = typeof req.query.account === 'string' ? req.query.account : req.get('X-Google-Account') ?? '';
     return raw.trim() || undefined;
 }
+/**
+ * The reconnect a failure calls for, if only the owner can fix it: the grant
+ * lacks a scope this call needs (Google 403 insufficient scopes), or Google
+ * no longer honours it (expired / revoked — Cloud said `grant_revoked`).
+ *
+ * @param err - The failure
+ * @param req - Incoming request (agent session, Google account)
+ * @returns The trigger, or null for any other failure
+ */
+export function reauthTriggerFor(err, req) {
+    if (!(err instanceof GoogleWorkspaceError))
+        return null;
+    const CODES = GOOGLE_WORKSPACE_CONSTANTS.ERROR_CODES;
+    const product = err.details?.product;
+    if (!product)
+        return null;
+    let kind;
+    if (err.code === CODES.REAUTH_REQUIRED)
+        kind = 'missing_scope';
+    else if (err.code === CODES.NOT_CONNECTED && err.details?.reason === 'grant_revoked')
+        kind = 'expired';
+    else
+        return null;
+    const account = err.details?.account ?? accountOf(req);
+    // Only an agent's call: the owner at the dashboard is already looking at
+    // the Connections page, and a card in Slack would be noise.
+    const agentSession = isOwnerCaller(req) ? undefined : readAgentSessionHeader(req);
+    if (!agentSession)
+        return null;
+    return { product, kind, agentSession, ...(account ? { account } : {}) };
+}
+/**
+ * Ask the owner to reconnect, without holding the skill call for long.
+ *
+ * @param trigger - The failure
+ * @returns What happened, or null when no notifier is wired or it timed out
+ */
+async function notifyReauth(trigger) {
+    const notifier = GoogleReauthNotifier.getInstance();
+    if (!notifier)
+        return null;
+    let timer;
+    const timeout = new Promise((resolve) => {
+        timer = setTimeout(() => resolve(null), GOOGLE_WORKSPACE_CONSTANTS.REAUTH.POST_TIMEOUT_MS);
+    });
+    try {
+        return await Promise.race([notifier.notify(trigger).catch(() => null), timeout]);
+    }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+    }
+}
+/**
+ * The agent-facing next step after a reconnect card was (or was not) sent.
+ *
+ * The agent must not send the owner to the Connections page: the owner is
+ * usually on a phone, and the card already is the whole fix.
+ *
+ * @param trigger - The failure
+ * @param result - What the notifier did
+ * @returns The hint, or null to fall back to the generic one
+ */
+export function reauthHint(trigger, result) {
+    const label = PRODUCT_LABELS[trigger.product] ?? trigger.product;
+    if (result?.status === 'posted') {
+        return `A reconnect link was sent to the owner in Slack. Tell them in one line that you need them to tap it (no need to mention Connections). You will get a message saying ${label} is reconnected — then retry.`;
+    }
+    if (result?.status === 'already_sent') {
+        return `A reconnect link was already sent to the owner in Slack at ${result.sentAt}; no new one is sent before ${result.nextCardAfter}. Do not ask again — you will get a message saying ${label} is reconnected, then retry.`;
+    }
+    return null;
+}
 /**
  * Answer a failure with the contract's `{ success:false, error, hint }`
  * shape. `not_connected` carries the consent URL as the hint; the other
- * codes get a one-line next step.
+ * codes get a one-line next step. A failure only the owner can fix (missing
+ * scope, expired grant) first posts the owner a one-tap reconnect card in
+ * Slack, and the hint says so.
  *
  * @param req - Incoming request (for the connect URL)
  * @param res - Response
  * @param err - The failure
  */
-export function sendGoogleError(req, res, err) {
+export async function sendGoogleError(req, res, err) {
     const CODES = GOOGLE_WORKSPACE_CONSTANTS.ERROR_CODES;
     if (err instanceof GoogleWorkspaceError) {
+        const trigger = reauthTriggerFor(err, req);
+        const reauth = trigger ? await notifyReauth(trigger) : null;
+        const reauthText = trigger ? reauthHint(trigger, reauth) : null;
         let hint;
         switch (err.code) {
             case CODES.NOT_CONNECTED:
-                hint = connectUrlOrNull(req)
+                hint = reauthText
+                    ?? connectUrlOrNull(req)
                     ?? 'Sign in to Crewly Cloud (Settings → Cloud & devices), then connect Google Workspace under Connections.';
                 break;
             case CODES.NOT_LOGGED_IN:
@@ -198,10 +279,13 @@ export function sendGoogleError(req, res, err) {
             case CODES.VALIDATION:
                 hint = 'Fix the request and retry.';
                 break;
-            case CODES.REAUTH_REQUIRED:
+            case CODES.REAUTH_REQUIRED: {
                 // Owner-away: the only step is one tap on the Slack card.
-                hint = 'Ask the owner to reconnect Google Drive: run the google-connect skill with --product drive. It posts a one-tap card in Slack; nothing to do on this machine.';
+                const product = err.details?.product ?? 'drive';
+                hint = reauthText
+                    ?? `Ask the owner to reconnect ${PRODUCT_LABELS[product] ?? product}: run the google-connect skill with --product ${product}. It posts a one-tap card in Slack; nothing to do on this machine.`;
                 break;
+            }
             case PEOPLE_CONSTANTS.NOT_PERMITTED_CODE:
                 hint = PEOPLE_CONSTANTS.NOT_PERMITTED_HINT;
                 break;
@@ -210,7 +294,13 @@ export function sendGoogleError(req, res, err) {
                     ? 'The Google token was rejected; retry once — the cache has been cleared.'
                     : 'Google or Crewly Cloud failed; retry later.';
         }
-        res.status(err.status).json({ success: false, error: err.code, message: err.message, hint });
+        res.status(err.status).json({
+            success: false,
+            error: err.code,
+            message: err.message,
+            hint,
+            ...(reauthText ? { reconnectLinkSent: true } : {}),
+        });
         return;
     }
     const message = err instanceof Error ? err.message : String(err);
@@ -251,7 +341,7 @@ export async function getStatus(req, res) {
         res.json({ success: true, data });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -267,7 +357,7 @@ export async function getConnectUrl(req, res) {
         res.json({ success: true, data: { url } });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -283,7 +373,7 @@ export async function disconnect(req, res) {
         res.json({ success: true, data });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -305,7 +395,7 @@ export async function setDefaultAccount(req, res) {
         res.json({ success: true, data });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -335,7 +425,7 @@ export async function gmailSearch(req, res) {
         res.json({ success: true, data: { query, count: messages.length, messages } });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -350,7 +440,7 @@ export async function gmailRead(req, res) {
         res.json({ success: true, data: message });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -424,7 +514,7 @@ export async function gmailSend(req, res) {
         res.json({ success: true, data: sent });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -444,7 +534,7 @@ export async function calendarList(req, res) {
         res.json({ success: true, data: { count: events.length, events } });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -474,7 +564,7 @@ export async function calendarCreate(req, res) {
         res.json({ success: true, data: event });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 // ---------------------------------------------------------------------------
@@ -497,7 +587,7 @@ export async function driveSearch(req, res) {
         res.json({ success: true, data: { count: files.length, files } });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -511,7 +601,7 @@ export async function driveGet(req, res) {
         res.json({ success: true, data: await depsForRequest(req).drive.get(String(req.params.id ?? '')) });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -525,7 +615,7 @@ export async function driveContent(req, res) {
         res.json({ success: true, data: await depsForRequest(req).drive.readContent(String(req.params.id ?? '')) });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -549,7 +639,7 @@ export async function driveUpload(req, res) {
         res.json({ success: true, data: file });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 // ---------------------------------------------------------------------------
@@ -566,7 +656,7 @@ export async function docsRead(req, res) {
         res.json({ success: true, data: await depsForRequest(req).docs.read(String(req.params.id ?? '')) });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -583,7 +673,7 @@ export async function docsCreate(req, res) {
         res.json({ success: true, data: doc });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -598,7 +688,7 @@ export async function docsAppend(req, res) {
         res.json({ success: true, data: await depsForRequest(req).docs.append(String(req.params.id ?? ''), String(body.text ?? '')) });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -614,7 +704,7 @@ export async function docsCommentsList(req, res) {
         res.json({ success: true, data: await depsForRequest(req).docComments.list(String(req.params.id ?? ''), { includeResolved }) });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -632,7 +722,7 @@ export async function docsCommentsAdd(req, res) {
         res.json({ success: true, data });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -649,7 +739,7 @@ export async function docsCommentsReply(req, res) {
         res.json({ success: true, data });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -667,7 +757,7 @@ export async function docsCommentsResolve(req, res) {
         res.json({ success: true, data });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 // ---------------------------------------------------------------------------
@@ -684,7 +774,7 @@ export async function sheetsInfo(req, res) {
         res.json({ success: true, data: await depsForRequest(req).sheets.info(String(req.params.id ?? '')) });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -698,7 +788,7 @@ export async function sheetsRead(req, res) {
         res.json({ success: true, data: await depsForRequest(req).sheets.read(String(req.params.id ?? ''), q(req, 'range') || undefined) });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -715,7 +805,7 @@ export async function sheetsCreate(req, res) {
         res.json({ success: true, data: info });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -733,7 +823,7 @@ export async function sheetsWrite(req, res) {
         res.json({ success: true, data: { mode: body.mode === 'update' ? 'update' : 'append', ...result } });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 // ---------------------------------------------------------------------------
@@ -750,7 +840,7 @@ export async function slidesRead(req, res) {
         res.json({ success: true, data: await depsForRequest(req).slides.read(String(req.params.id ?? '')) });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -767,7 +857,7 @@ export async function slidesCreate(req, res) {
         res.json({ success: true, data: deck });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 /**
@@ -848,7 +938,7 @@ export async function gmailResolveHeld(req, res) {
         res.json({ success: true, data: sent });
     }
     catch (err) {
-        sendGoogleError(req, res, err);
+        await sendGoogleError(req, res, err);
     }
 }
 //# sourceMappingURL=google.controller.js.map