crewly 1.20.263 → 1.20.265

package/dist/backend/backend/src/services/google/google-reauth-notifier.service.js

@@ -0,0 +1,283 @@
+/**
+ * Google reconnect cards — the harness asks the owner, not the agent.
+ *
+ * 2026-10-08: the Personal Assistant tried to save a reply as a Gmail draft,
+ * Google answered 403 "insufficient authentication scopes" (no grant carried
+ * `gmail.compose`), and the agent told the owner to "re-authorize Gmail in
+ * Crewly Connections" — a page the owner cannot reach from a phone. The
+ * same dead end follows an expired or revoked grant.
+ *
+ * So when a Google call fails because the grant is too narrow or no longer
+ * honoured, this posts the existing one-tap connect card (single-use ticket,
+ * `google-connect-card.ts`) to the owner in Slack — where the agent is
+ * working if that is known, else the owner's DM with that agent — at most
+ * once per product and Google account per
+ * {@link GOOGLE_WORKSPACE_CONSTANTS.REAUTH.CARD_THROTTLE_MS}. It then watches
+ * Cloud until the reconnect lands and tells the waiting agents to retry.
+ *
+ * Everything that touches Slack, Cloud or an agent is injected, so the
+ * machine the failure happened on is the one that posts — any machine with
+ * Slack and a Cloud session works the same.
+ *
+ * @module services/google/google-reauth-notifier.service
+ */
+import { GOOGLE_WORKSPACE_CONSTANTS } from '../../constants.js';
+import { LoggerService } from '../core/logger.service.js';
+import { buildConnectCard, PRODUCT_LABELS } from '../../controllers/google/google-connect-card.js';
+const logger = LoggerService.getInstance().createComponentLogger('GoogleReauthNotifier');
+/**
+ * The scope a `missing_scope` failure is about, per product — what a
+ * reconnect must have added for the retry to work.
+ */
+const EXTRA_SCOPE = {
+    gmail: GOOGLE_WORKSPACE_CONSTANTS.GMAIL_COMPOSE_SCOPE,
+    drive: GOOGLE_WORKSPACE_CONSTANTS.DRIVE_FULL_SCOPE,
+};
+/** What the missing scope lets the agent do, for the card. */
+const EXTRA_PURPOSE = {
+    gmail: 'save drafts',
+    drive: 'comment on documents',
+};
+/** What the agent retries once the scope is there. */
+const EXTRA_RETRY = {
+    gmail: 'your draft',
+    drive: 'your comment',
+};
+/**
+ * The card's first line. Owner-facing, so it says what broke and that it is
+ * quick — not which scope is missing.
+ *
+ * @param trigger - The failure
+ * @returns Card message
+ */
+export function reauthCardMessage(trigger) {
+    const label = PRODUCT_LABELS[trigger.product] ?? trigger.product;
+    if (trigger.kind === 'expired')
+        return `${label} access expired — tap to reconnect.`;
+    const purpose = EXTRA_PURPOSE[trigger.product];
+    return `${label} needs re-authorization${purpose ? ` to ${purpose}` : ''} (missing permission). Tap to reconnect — takes 30 seconds on your phone.`;
+}
+/**
+ * What the agent is told once the owner has reconnected.
+ *
+ * @param trigger - The failure
+ * @returns Notice text
+ */
+export function reauthRetryNotice(trigger) {
+    const label = PRODUCT_LABELS[trigger.product] ?? trigger.product;
+    const what = trigger.kind === 'missing_scope' ? EXTRA_RETRY[trigger.product] : undefined;
+    return `[GOOGLE] ${label} reconnected — retry ${what ?? 'what failed'}.`;
+}
+/**
+ * Whether a status from Cloud shows the failure fixed.
+ *
+ * - `missing_scope`: the account is connected for the product and now
+ *   carries the scope the call lacked (or, for a product with no known
+ *   extra, reports nothing missing).
+ * - `expired`: the account is connected for the product again (Cloud
+ *   deleted the dead grant, so being there at all is new).
+ *
+ * @param status - Cloud's connections
+ * @param trigger - The failure
+ * @returns True when the agent can retry
+ */
+export function isReconnected(status, trigger) {
+    if (!status.connected)
+        return false;
+    const account = trigger.account?.toLowerCase();
+    const connection = account
+        ? status.connections.find((c) => c.email.toLowerCase() === account)
+        : status.connections.find((c) => c.isDefault) ?? status.connections[0];
+    if (!connection || !connection.products.includes(trigger.product))
+        return false;
+    if (trigger.kind === 'expired')
+        return true;
+    const needed = EXTRA_SCOPE[trigger.product];
+    if (needed)
+        return connection.scopes.includes(needed);
+    return (connection.missingScopes ?? []).length === 0;
+}
+/**
+ * Throttle key: one card per product and Google account.
+ *
+ * @param trigger - The failure
+ * @returns Key
+ */
+function keyOf(trigger) {
+    return `${trigger.product}\u0000${(trigger.account ?? '').toLowerCase()}`;
+}
+/**
+ * Posts reconnect cards and tells agents when to retry.
+ */
+export class GoogleReauthNotifier {
+    deps;
+    static instance = null;
+    pending = new Map();
+    /** Posts on the wire, so two failures at once post one card */
+    posting = new Map();
+    now;
+    setTimer;
+    /**
+     * @param deps - Collaborators
+     */
+    constructor(deps) {
+        this.deps = deps;
+        this.now = deps.now ?? (() => Date.now());
+        this.setTimer =
+            deps.setTimer ??
+                ((fn, ms) => {
+                    const t = setTimeout(fn, ms);
+                    t.unref?.();
+                    return { cancel: () => clearTimeout(t) };
+                });
+    }
+    /** The wired instance, or null when Slack is not set up on this machine. */
+    static getInstance() {
+        return GoogleReauthNotifier.instance;
+    }
+    /**
+     * Install (or, with null, remove) the process-wide instance.
+     *
+     * @param next - Notifier
+     */
+    static setInstance(next) {
+        GoogleReauthNotifier.instance?.stop();
+        GoogleReauthNotifier.instance = next;
+    }
+    /**
+     * Ask the owner to reconnect, unless a card for this product and account
+     * went out within the throttle window — then only remember that this
+     * agent is waiting too.
+     *
+     * @param trigger - The failure
+     * @returns What happened, for the agent's hint
+     */
+    async notify(trigger) {
+        const key = keyOf(trigger);
+        const nowMs = this.now();
+        const existing = this.pending.get(key);
+        if (existing && nowMs - existing.sentAtMs < GOOGLE_WORKSPACE_CONSTANTS.REAUTH.CARD_THROTTLE_MS) {
+            if (trigger.agentSession)
+                existing.waiters.add(trigger.agentSession);
+            // The watch on the card may have run out; someone is waiting again, so
+            // look for a reconnect made some other way (the Connections page).
+            if (!existing.timer) {
+                existing.watchUntilMs = nowMs + GOOGLE_WORKSPACE_CONSTANTS.REAUTH.POLL_GRACE_MS;
+                this.schedule(key, existing);
+            }
+            return {
+                status: 'already_sent',
+                sentAt: new Date(existing.sentAtMs).toISOString(),
+                nextCardAfter: new Date(existing.sentAtMs + GOOGLE_WORKSPACE_CONSTANTS.REAUTH.CARD_THROTTLE_MS).toISOString(),
+            };
+        }
+        const inFlight = this.posting.get(key);
+        if (inFlight) {
+            const result = await inFlight;
+            if (trigger.agentSession)
+                this.pending.get(key)?.waiters.add(trigger.agentSession);
+            return result;
+        }
+        const task = this.post(key, trigger).finally(() => this.posting.delete(key));
+        this.posting.set(key, task);
+        return task;
+    }
+    /** Stop every watch (shutdown, tests). */
+    stop() {
+        for (const p of this.pending.values())
+            p.timer?.cancel();
+        this.pending.clear();
+    }
+    async post(key, trigger) {
+        const owner = this.deps.ownerUserId();
+        if (!owner)
+            return { status: 'unavailable', why: 'the owner is not known on Slack' };
+        const place = await this.deps.placeFor(trigger.agentSession, owner).catch(() => null);
+        if (!place)
+            return { status: 'unavailable', why: 'no Slack conversation with the owner from this machine' };
+        let link;
+        try {
+            link = await this.deps.connectUrl({
+                products: [trigger.product],
+                ...(trigger.account ? { email: trigger.account } : {}),
+                slackUserId: owner,
+                slackChannelId: place.slackChannelId,
+                ...(place.threadTs ? { slackThreadTs: place.threadTs } : {}),
+            });
+        }
+        catch (err) {
+            const why = err instanceof Error ? err.message : String(err);
+            logger.warn('Could not mint a Google reconnect link', { product: trigger.product, error: why });
+            return { status: 'unavailable', why: `Crewly Cloud did not issue a link (${why})` };
+        }
+        const card = buildConnectCard(trigger.product, link.url, link.expiresAt, {
+            message: reauthCardMessage(trigger),
+            ...(trigger.account ? { account: trigger.account } : {}),
+        });
+        const posted = await this.deps.postCard(place, owner, card.text, card.blocks).catch(() => false);
+        if (!posted)
+            return { status: 'unavailable', why: 'Slack refused the card' };
+        const sentAtMs = this.now();
+        const expiresMs = Date.parse(link.expiresAt);
+        const pending = {
+            trigger,
+            sentAtMs,
+            watchUntilMs: (Number.isFinite(expiresMs) ? expiresMs : sentAtMs) + GOOGLE_WORKSPACE_CONSTANTS.REAUTH.POLL_GRACE_MS,
+            waiters: new Set(trigger.agentSession ? [trigger.agentSession] : []),
+        };
+        this.pending.get(key)?.timer?.cancel();
+        this.pending.set(key, pending);
+        this.schedule(key, pending);
+        logger.info('Posted a Google reconnect card', {
+            product: trigger.product,
+            kind: trigger.kind,
+            account: trigger.account,
+            slackChannelId: place.slackChannelId,
+            threaded: !!place.threadTs,
+            agentSession: trigger.agentSession,
+        });
+        return { status: 'posted', expiresAt: link.expiresAt };
+    }
+    /** Check again after the poll interval, until the watch window closes. */
+    schedule(key, pending) {
+        pending.timer = this.setTimer(() => {
+            void this.check(key, pending);
+        }, GOOGLE_WORKSPACE_CONSTANTS.REAUTH.POLL_INTERVAL_MS);
+    }
+    /**
+     * One look at Cloud. On success the waiting agents are told to retry and
+     * the throttle is lifted, so a later, different failure gets its own card.
+     */
+    async check(key, pending) {
+        if (this.pending.get(key) !== pending)
+            return;
+        let fixed = false;
+        try {
+            fixed = isReconnected(await this.deps.status(), pending.trigger);
+        }
+        catch (err) {
+            logger.debug('Could not read Google status while waiting for a reconnect', {
+                error: err instanceof Error ? err.message : String(err),
+            });
+        }
+        if (!fixed) {
+            if (this.now() < pending.watchUntilMs)
+                this.schedule(key, pending);
+            else
+                pending.timer = undefined;
+            return;
+        }
+        this.pending.delete(key);
+        this.deps.clearTokenCache(pending.trigger.account);
+        const notice = reauthRetryNotice(pending.trigger);
+        for (const session of pending.waiters) {
+            await this.deps.tellAgent(session, notice).catch(() => false);
+        }
+        logger.info('Google reconnected; told the waiting agents to retry', {
+            product: pending.trigger.product,
+            account: pending.trigger.account,
+            agents: [...pending.waiters],
+        });
+    }
+}
+//# sourceMappingURL=google-reauth-notifier.service.js.map

package/dist/backend/backend/src/services/google/google-reauth-notifier.service.js.map

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

package/dist/backend/backend/src/services/google/google-reauth.wiring.d.ts

@@ -0,0 +1,71 @@
+/**
+ * Google reconnect cards — wiring with the real Slack, Cloud and agents.
+ *
+ * Kept apart from the notifier so its rules (throttle, wording, when a
+ * reconnect counts) are testable without Slack. Everything here runs on the
+ * machine where the Google call failed: its Slack transport posts the card,
+ * its Cloud session mints the ticket, its agents are told to retry. That is
+ * the same on every machine, so an agent on a second machine (the Personal
+ * Assistant on iriss-air, 2026-10-08) gets the same card as one on the main
+ * Mac.
+ *
+ * @module services/google/google-reauth.wiring
+ */
+import type { SlackBlock } from '../../types/slack.types.js';
+import { GoogleReauthNotifier, type ReauthNotifierDeps } from './google-reauth-notifier.service.js';
+/** The Slack calls the wiring makes (a slice of SlackService). */
+export interface ReauthSlackApi {
+    getOwnerUserId?: (() => string | null) | null;
+    openDirectMessage: (userId: string, botToken?: string) => Promise<string>;
+    sendMessage: (message: {
+        channelId: string;
+        text: string;
+        blocks?: SlackBlock[];
+        threadTs?: string;
+        botToken?: string;
+        skipChatV2Mirror?: boolean;
+    }) => Promise<string>;
+    sendEphemeral: (channelId: string, userId: string, text: string, blocks?: unknown[], botToken?: string, threadTs?: string) => Promise<boolean>;
+}
+/** What the wiring needs from the rest of the process. */
+export interface ReauthWiringInput {
+    /** Deliver text to an agent; wakes it when needed */
+    sendToAgent: (session: string, text: string) => Promise<boolean>;
+    /** Seams for tests; default to the real singletons */
+    slack?: () => ReauthSlackApi;
+    /** The Slack place of the agent's current work */
+    workDestination?: (session: string) => Promise<{
+        slackChannelId: string;
+        threadTs?: string;
+    } | null>;
+    /** The owner↔agent Slack DM, when there is one */
+    agentDm?: (session: string) => {
+        slackChannelId: string;
+    } | null;
+    /** The agent's own installed bot token */
+    agentBotToken?: (session: string) => string | undefined;
+}
+/**
+ * A Slack DM channel id. DMs are private to the owner and the bot, so a
+ * card there can be an ordinary message — which, unlike an ephemeral one,
+ * reaches the owner's phone as a notification and survives a reload.
+ *
+ * @param channelId - Slack channel id
+ * @returns True for `D…`
+ */
+export declare function isDirectMessage(channelId: string): boolean;
+/**
+ * Build the notifier's collaborators.
+ *
+ * @param input - Process hooks and test seams
+ * @returns Notifier deps
+ */
+export declare function createReauthNotifierDeps(input: ReauthWiringInput): ReauthNotifierDeps;
+/**
+ * Install the process-wide notifier. Called once Slack is up.
+ *
+ * @param input - Process hooks
+ * @returns The notifier
+ */
+export declare function startGoogleReauthNotifier(input: ReauthWiringInput): GoogleReauthNotifier;
+//# sourceMappingURL=google-reauth.wiring.d.ts.map

package/dist/backend/backend/src/services/google/google-reauth.wiring.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"google-reauth.wiring.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/google/google-reauth.wiring.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAM7D,OAAO,EAAE,oBAAoB,EAAE,KAAK,kBAAkB,EAAoB,MAAM,qCAAqC,CAAC;AAItH,kEAAkE;AAClE,MAAM,WAAW,cAAc;IAC7B,cAAc,CAAC,EAAE,CAAC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAC9C,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1E,WAAW,EAAE,CAAC,OAAO,EAAE;QACrB,SAAS,EAAE,MAAM,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC5B,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,aAAa,EAAE,CACb,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,EAClB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AAED,0DAA0D;AAC1D,MAAM,WAAW,iBAAiB;IAChC,qDAAqD;IACrD,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACjE,sDAAsD;IACtD,KAAK,CAAC,EAAE,MAAM,cAAc,CAAC;IAC7B,kDAAkD;IAClD,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACrG,kDAAkD;IAClD,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK;QAAE,cAAc,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACjE,0CAA0C;IAC1C,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CACzD;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB,CAkFrF;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,iBAAiB,GAAG,oBAAoB,CAKxF"}

package/dist/backend/backend/src/services/google/google-reauth.wiring.js

@@ -0,0 +1,132 @@
+/**
+ * Google reconnect cards — wiring with the real Slack, Cloud and agents.
+ *
+ * Kept apart from the notifier so its rules (throttle, wording, when a
+ * reconnect counts) are testable without Slack. Everything here runs on the
+ * machine where the Google call failed: its Slack transport posts the card,
+ * its Cloud session mints the ticket, its agents are told to retry. That is
+ * the same on every machine, so an agent on a second machine (the Personal
+ * Assistant on iriss-air, 2026-10-08) gets the same card as one on the main
+ * Mac.
+ *
+ * @module services/google/google-reauth.wiring
+ */
+import { LoggerService } from '../core/logger.service.js';
+import { getSlackService } from '../slack/slack.service.js';
+import { getSlackAgentDmService } from '../slack/slack-agent-dm.service.js';
+import { getSlackAgentIdentityService } from '../slack/slack-agent-identity.service.js';
+import { GoogleWorkspaceTokenService } from './google-workspace-token.service.js';
+import { GoogleReauthNotifier } from './google-reauth-notifier.service.js';
+const logger = LoggerService.getInstance().createComponentLogger('GoogleReauthWiring');
+/**
+ * A Slack DM channel id. DMs are private to the owner and the bot, so a
+ * card there can be an ordinary message — which, unlike an ephemeral one,
+ * reaches the owner's phone as a notification and survives a reload.
+ *
+ * @param channelId - Slack channel id
+ * @returns True for `D…`
+ */
+export function isDirectMessage(channelId) {
+    return channelId.startsWith('D');
+}
+/**
+ * Build the notifier's collaborators.
+ *
+ * @param input - Process hooks and test seams
+ * @returns Notifier deps
+ */
+export function createReauthNotifierDeps(input) {
+    const slack = input.slack ?? (() => getSlackService());
+    const botTokenOf = input.agentBotToken ?? ((session) => getSlackAgentIdentityService()?.getInstalled(session)?.botToken);
+    const agentDm = input.agentDm ??
+        ((session) => {
+            const link = getSlackAgentDmService()?.findByAgentSession(session);
+            return link ? { slackChannelId: link.slackChannelId } : null;
+        });
+    const workDestination = input.workDestination ??
+        (async (session) => {
+            const { resolveAgentSlackDestination } = await import('../orc/work-item-destination.wiring.js');
+            return resolveAgentSlackDestination(session);
+        });
+    const tokens = () => GoogleWorkspaceTokenService.getInstance();
+    /** The owner's DM with this bot. */
+    const ownerDm = async (owner, botToken) => {
+        const id = await slack().openDirectMessage(owner, botToken).catch(() => null);
+        return id ? { slackChannelId: id, ...(botToken ? { botToken } : {}) } : null;
+    };
+    /** One post attempt; a DM gets an ordinary message, a channel an ephemeral one. */
+    const postOnce = async (place, owner, text, blocks, botToken) => {
+        if (isDirectMessage(place.slackChannelId)) {
+            const ts = await slack()
+                .sendMessage({
+                channelId: place.slackChannelId,
+                text,
+                blocks: blocks,
+                ...(place.threadTs ? { threadTs: place.threadTs } : {}),
+                ...(botToken ? { botToken } : {}),
+                // A card is not conversation: keep it out of the chat mirror.
+                skipChatV2Mirror: true,
+            })
+                .catch(() => '');
+            return !!ts;
+        }
+        return slack()
+            .sendEphemeral(place.slackChannelId, owner, text, blocks, botToken, place.threadTs)
+            .catch(() => false);
+    };
+    return {
+        ownerUserId: () => slack().getOwnerUserId?.() ?? null,
+        placeFor: async (session, owner) => {
+            const botToken = session ? botTokenOf(session) : undefined;
+            if (session) {
+                // Where the agent is working — but only a conversation, not a bare
+                // team channel: a card at the top of #team would reach nobody.
+                const work = await workDestination(session).catch(() => null);
+                if (work?.slackChannelId && (work.threadTs || isDirectMessage(work.slackChannelId))) {
+                    return {
+                        slackChannelId: work.slackChannelId,
+                        ...(work.threadTs ? { threadTs: work.threadTs } : {}),
+                        ...(botToken ? { botToken } : {}),
+                    };
+                }
+                const dm = agentDm(session);
+                if (dm)
+                    return { slackChannelId: dm.slackChannelId, ...(botToken ? { botToken } : {}) };
+            }
+            return ownerDm(owner, botToken);
+        },
+        connectUrl: (args) => tokens().buildSlackConnectUrl(args),
+        postCard: async (place, owner, text, blocks) => {
+            if (await postOnce(place, owner, text, blocks, place.botToken))
+                return true;
+            // The agent's own bot may not be in that conversation; the shared bot
+            // usually is.
+            if (place.botToken && (await postOnce(place, owner, text, blocks)))
+                return true;
+            if (isDirectMessage(place.slackChannelId))
+                return false;
+            // A channel thread refused it: the owner's DM still reaches the phone.
+            const dm = await ownerDm(owner, place.botToken);
+            if (dm && (await postOnce(dm, owner, text, blocks, dm.botToken)))
+                return true;
+            logger.warn('Could not post the Google reconnect card anywhere', { slackChannelId: place.slackChannelId });
+            return false;
+        },
+        status: () => tokens().status(),
+        clearTokenCache: (account) => tokens().clearCache(account),
+        tellAgent: input.sendToAgent,
+    };
+}
+/**
+ * Install the process-wide notifier. Called once Slack is up.
+ *
+ * @param input - Process hooks
+ * @returns The notifier
+ */
+export function startGoogleReauthNotifier(input) {
+    const notifier = new GoogleReauthNotifier(createReauthNotifierDeps(input));
+    GoogleReauthNotifier.setInstance(notifier);
+    logger.info('Google reconnect cards started');
+    return notifier;
+}
+//# sourceMappingURL=google-reauth.wiring.js.map

package/dist/backend/backend/src/services/google/google-reauth.wiring.js.map

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

package/dist/backend/backend/src/services/google/google-workspace-token.service.d.ts

@@ -33,6 +33,12 @@ export interface GoogleConnection extends GrantOwnership {
     /** Products the grant covers, derived by Cloud from the granted scopes. */
     products: GoogleProduct[];
     scopes: string[];
+    /**
+     * Optional scopes the grant lacks for products it covers (Cloud auth >=
+     * 1.10.9; absent on an older Cloud). E.g. `gmail.compose`: reads and sends
+     * work, drafts need a reconnect.
+     */
+    missingScopes?: string[];
     grantedAt: string;
     /** True for the account used when a caller names none. */
     isDefault: boolean;
@@ -55,18 +61,26 @@ export interface GoogleWorkspaceStatus {
  * {@link GOOGLE_WORKSPACE_CONSTANTS.ERROR_CODES} (or `http_<n>` for anything
  * unmapped), so the controller and the skills can branch without parsing text.
  */
+/** Structured context on a {@link GoogleWorkspaceError}. */
+export interface GoogleWorkspaceErrorDetails {
+    /** For `not_permitted`: who owns the grant (issue #968) */
+    authorizedBy?: string;
+    /**
+     * Why, when the code alone is not enough: `insufficient_scope` (Google
+     * 403, the grant lacks a scope this call needs) or `grant_revoked` (the
+     * refresh token is dead — expired or revoked; Cloud deleted the grant).
+     */
+    reason?: 'insufficient_scope' | 'grant_revoked';
+    /** Product the failing call was for */
+    product?: GoogleProduct;
+    /** Google account the failing call acted as, when known */
+    account?: string;
+}
 export declare class GoogleWorkspaceError extends Error {
     readonly status: number;
     readonly code: string;
-    /** For `not_permitted`: who owns the grant (issue #968) */
-    readonly details?: {
-        authorizedBy?: string;
-    } | undefined;
-    constructor(status: number, code: string, message: string, 
-    /** For `not_permitted`: who owns the grant (issue #968) */
-    details?: {
-        authorizedBy?: string;
-    } | undefined);
+    readonly details?: GoogleWorkspaceErrorDetails | undefined;
+    constructor(status: number, code: string, message: string, details?: GoogleWorkspaceErrorDetails | undefined);
 }
 /**
  * Map a Cloud workspace-endpoint failure to the status/code this instance
@@ -79,7 +93,9 @@ export declare class GoogleWorkspaceError extends Error {
  * @param message - Human message from Cloud's body, if any
  * @returns The error to throw
  */
-export declare function mapCloudFailure(httpStatus: number, code: string | undefined, message: string | undefined): GoogleWorkspaceError;
+export declare function mapCloudFailure(httpStatus: number, code: string | undefined, message: string | undefined, details?: {
+    email?: unknown;
+}): GoogleWorkspaceError;
 /**
  * Fetches, caches and refreshes the Google access token that Cloud mints
  * from the owner's stored grant.
@@ -219,6 +235,8 @@ export declare class GoogleWorkspaceTokenService {
      */
     buildSlackConnectUrl(options?: {
         products?: readonly GoogleProduct[];
+        /** Google account to reconnect; Google preselects it (Cloud auth >= 1.10.9, ignored before). */
+        email?: string;
         slackUserId?: string;
         slackChannelId?: string;
         slackThreadTs?: string;

package/dist/backend/backend/src/services/google/google-workspace-token.service.d.ts.map

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