@undefineds.co/linx 0.2.16 → 0.2.18

package/dist/lib/login-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"login-command.js","sourceRoot":"","sources":["../../src/lib/login-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login-command.js","sourceRoot":"","sources":["../../src/lib/login-command.ts"],"names":[],"mappings":"AACA,OAAO,EACL,oBAAoB,GACrB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,yBAAyB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAiBxC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,IAAe,EACf,OAAyB,EAAE;IAE3B,MAAM,qBAAqB,GAAG,IAAI,CAAC,yBAAyB,IAAI,yBAAyB,CAAA;IACzF,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,IAAI,WAAW,CAAA;IACrD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,IAAI,UAAU,CAAA;IAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IAE5E,IAAI,mBAAmB,GAAG,KAAK,CAAA;IAC/B,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC;QACzC,SAAS,EAAE,IAAI,CAAC,GAAG;QACnB,UAAU,EAAE,IAAI;QAChB,SAAS,CAAC,GAAG;YACX,mBAAmB,GAAG,IAAI,CAAA;YAC1B,KAAK,CAAC,+CAA+C,CAAC,CAAA;YACtD,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,CAAA;YACnB,KAAK,CAAC,mIAAmI,CAAC,CAAA;QAC5I,CAAC;QACD,WAAW,EAAE,aAAa;QAC1B,KAAK,CAAC,iBAAiB,CAAC,MAAM;YAC5B,OAAO,CAAC,MAAM,YAAY,CAAC,8CAA8C,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAC5F,CAAC;KACF,CAAC,CAAA;IAEF,IAAI,mBAAmB,EAAE,CAAC;QACxB,KAAK,CAAC,IAAI,CAAC,CAAA;IACb,CAAC;IACD,KAAK,CAAC,0BAA0B,CAAC,CAAA;IACjC,KAAK,CAAC,WAAW,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA;IAChC,KAAK,CAAC,UAAU,MAAM,CAAC,KAAK,IAAI,CAAC,CAAA;IACjC,KAAK,CAAC,oBAAoB,CAAC,CAAA;IAC3B,KAAK,CAAC,YAAY,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB,IAAI,CAAC,CAAA;AACpF,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAqC;IAC5D,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,uEAAuE;IACjF,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,MAAM,CAAC,KAAK,EAAE;QACb,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,qBAAqB,EAAE;QAChC,WAAW,EAAE,4BAA4B;KAC1C,CAAC;IACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAkB;IAC1C,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,iDAAiD;IAC3D,OAAO,EAAE,KAAK,IAAI,EAAE;QAClB,mBAAmB,EAAE,CAAA;QACrB,gBAAgB,EAAE,CAAA;QAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAA;IACvE,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAsC;IAC9D,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,sCAAsC;IAChD,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAChF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAA;QACpC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;QAC3D,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,oBAAoB,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YAC7E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,KAAK,KAAK,CAAC,KAAK,IAAI,CAAC,CAAA;QACxD,CAAC;IACH,CAAC;CACF,CAAA"}

package/dist/lib/models.js

@@ -1,5 +1,5 @@
-import { XPOD_AI, XPOD_CREDENTIAL, aiConfigModelUri, aiConfigProviderUri, aiModelTable, aiProviderTable, buildAIConfigMutationPlan, buildAIConfigProviderStateMap, buildWatchThreadMetadata, buildWatchTranscriptMessages, credentialTable, ContactType, agentTable, applySolidComunicaPatches, chatTable, contactTable, drizzle, eq, getAIConfigProviderFamilyIds, getAIConfigProviderMetadata, getDefaultAIConfigCredentialId, getBuiltinModels as getSharedBuiltinModels, findPodRowByStorageId, initSolidTables, whereByPodStorageId, solidSchema, messageTable, sessionTable, normalizeAIConfigProviderId, normalizeAIConfigResourceId, sameAIConfigProviderFamily, sessionRepository, threadTable, } from '@undefineds.co/models';
-export { ContactType, agentTable, applySolidComunicaPatches, aiConfigModelUri, aiConfigProviderUri, aiModelTable, aiProviderTable, buildAIConfigMutationPlan, buildAIConfigProviderStateMap, buildWatchThreadMetadata, buildWatchTranscriptMessages, chatTable, contactTable, credentialTable, drizzle, eq, getAIConfigProviderFamilyIds, getAIConfigProviderMetadata, getDefaultAIConfigCredentialId, findPodRowByStorageId, solidSchema, initSolidTables, whereByPodStorageId, messageTable, sessionTable, normalizeAIConfigProviderId, normalizeAIConfigResourceId, sameAIConfigProviderFamily, sessionRepository, threadTable, XPOD_AI, XPOD_CREDENTIAL, };
+import { XPOD_AI, XPOD_CREDENTIAL, aiConfigModelRef, aiConfigProviderRef, aiModelTable, aiProviderTable, buildAIConfigMutationPlan, buildAIConfigProviderStateMap, buildWatchThreadMetadata, buildWatchTranscriptMessages, credentialTable, ContactType, extractChatIdFromChatRef, extractThreadIdFromThreadRef, agentTable, approvalResource, auditResource, applySolidComunicaPatches, chatTable, contactTable, drizzle, eq, getAIConfigProviderFamilyIds, getAIConfigProviderMetadata, getDefaultAIConfigCredentialId, getBuiltinModels as getSharedBuiltinModels, grantResource, inboxNotificationTable, initSolidTables, solidSchema, messageTable, sessionTable, normalizeAIConfigProviderId, normalizeAIConfigModelId, normalizeAIConfigResourceId, sameAIConfigProviderFamily, sessionRepository, threadTable, } from '@undefineds.co/models';
+export { ContactType, extractChatIdFromChatRef, extractThreadIdFromThreadRef, agentTable, approvalResource, auditResource, applySolidComunicaPatches, aiConfigModelRef, aiConfigProviderRef, aiModelTable, aiProviderTable, buildAIConfigMutationPlan, buildAIConfigProviderStateMap, buildWatchThreadMetadata, buildWatchTranscriptMessages, chatTable, contactTable, credentialTable, drizzle, eq, getAIConfigProviderFamilyIds, getAIConfigProviderMetadata, getDefaultAIConfigCredentialId, grantResource, inboxNotificationTable, solidSchema, initSolidTables, messageTable, sessionTable, normalizeAIConfigProviderId, normalizeAIConfigModelId, normalizeAIConfigResourceId, sameAIConfigProviderFamily, sessionRepository, threadTable, XPOD_AI, XPOD_CREDENTIAL, };
 export function getBuiltinModels() {
     return getSharedBuiltinModels();
 }

package/dist/lib/models.js.map

@@ -1 +1 @@
-{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/lib/models.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,eAAe,EACf,yBAAyB,EACzB,6BAA6B,EAC7B,wBAAwB,EACxB,4BAA4B,EAC5B,eAAe,EACf,WAAW,EACX,UAAU,EACV,yBAAyB,EACzB,SAAS,EACT,YAAY,EACZ,OAAO,EACP,EAAE,EACF,4BAA4B,EAC5B,2BAA2B,EAC3B,8BAA8B,EAC9B,gBAAgB,IAAI,sBAAsB,EAC1C,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,2BAA2B,EAC3B,2BAA2B,EAC3B,0BAA0B,EAC1B,iBAAiB,EACjB,WAAW,GAmBZ,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EACL,WAAW,EACX,UAAU,EACV,yBAAyB,EACzB,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,eAAe,EACf,yBAAyB,EACzB,6BAA6B,EAC7B,wBAAwB,EACxB,4BAA4B,EAC5B,SAAS,EACT,YAAY,EACZ,eAAe,EACf,OAAO,EACP,EAAE,EACF,4BAA4B,EAC5B,2BAA2B,EAC3B,8BAA8B,EAC9B,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,YAAY,EACZ,2BAA2B,EAC3B,2BAA2B,EAC3B,0BAA0B,EAC1B,iBAAiB,EACjB,WAAW,EACX,OAAO,EACP,eAAe,GAChB,CAAA;AAsBD,MAAM,UAAU,gBAAgB;IAC9B,OAAO,sBAAsB,EAAE,CAAA;AACjC,CAAC"}
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/lib/models.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,eAAe,EACf,yBAAyB,EACzB,6BAA6B,EAC7B,wBAAwB,EACxB,4BAA4B,EAC5B,eAAe,EACf,WAAW,EACX,wBAAwB,EACxB,4BAA4B,EAC5B,UAAU,EACV,gBAAgB,EAChB,aAAa,EACb,yBAAyB,EACzB,SAAS,EACT,YAAY,EACZ,OAAO,EACP,EAAE,EACF,4BAA4B,EAC5B,2BAA2B,EAC3B,8BAA8B,EAC9B,gBAAgB,IAAI,sBAAsB,EAC1C,aAAa,EACb,sBAAsB,EACtB,eAAe,EACf,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,2BAA2B,EAC3B,wBAAwB,EACxB,2BAA2B,EAC3B,0BAA0B,EAC1B,iBAAiB,EACjB,WAAW,GA0BZ,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EACL,WAAW,EACX,wBAAwB,EACxB,4BAA4B,EAC5B,UAAU,EACV,gBAAgB,EAChB,aAAa,EACb,yBAAyB,EACzB,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,eAAe,EACf,yBAAyB,EACzB,6BAA6B,EAC7B,wBAAwB,EACxB,4BAA4B,EAC5B,SAAS,EACT,YAAY,EACZ,eAAe,EACf,OAAO,EACP,EAAE,EACF,4BAA4B,EAC5B,2BAA2B,EAC3B,8BAA8B,EAC9B,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,2BAA2B,EAC3B,wBAAwB,EACxB,2BAA2B,EAC3B,0BAA0B,EAC1B,iBAAiB,EACjB,WAAW,EACX,OAAO,EACP,eAAe,GAChB,CAAA;AA6BD,MAAM,UAAU,gBAAgB;IAC9B,OAAO,sBAAsB,EAAE,CAAA;AACjC,CAAC"}

package/dist/lib/oidc-auth.js

@@ -38,7 +38,7 @@ export function isOidcLoginExpiredError(error) {
 }
 export async function ensureBrowserConsentLogin(options = {}) {
     if (!options.forceFresh) {
-        const reused = await reuseExistingBrowserConsentLogin(options).catch(() => null);
+        const reused = await reuseBrowserConsentLogin(options).catch(() => null);
         if (reused) {
             return {
                 ...reused,
@@ -87,7 +87,7 @@ export async function loginWithBrowserConsent(options = {}) {
     }, async (requestUrl) => {
         assertOidcCallbackDidNotReturnError(requestUrl);
         await session.handleIncomingRedirect(requestUrl);
-    }, options.manualRedirectUrl);
+    }, options.manualRedirectUrl, options.signal);
     if (!session.info.isLoggedIn || !session.info.webId) {
         throw new Error('Login did not complete successfully');
     }
@@ -104,12 +104,12 @@ export async function loginWithBrowserConsent(options = {}) {
     persistBrowserLoginResult(result);
     return result;
 }
-export async function getOidcAccessToken(credentials) {
+export async function getOidcAccessToken(credentials, options = {}) {
     if (credentials.authType !== 'oidc_oauth' || !isLinxOidcOAuthSecrets(credentials.secrets)) {
         return null;
     }
     const secrets = credentials.secrets;
-    if (!secrets.oidcAccessToken) {
+    if (options.forceRefresh || !secrets.oidcAccessToken) {
         return refreshStoredOidcSession(credentials, secrets);
     }
     const expiresAt = secrets.oidcExpiresAt ? new Date(secrets.oidcExpiresAt).getTime() : 0;
@@ -133,9 +133,10 @@ export function serializeOidcCredentials(url, webId, tokenSet) {
         },
     };
 }
-export async function withCallbackServer(host, pathname, startLogin, onCallback, manualRedirectUrl) {
+export async function withCallbackServer(host, pathname, startLogin, onCallback, manualRedirectUrl, signal) {
     const server = createServer();
     const sockets = new Set();
+    let manualRedirectAbortController;
     server.on('connection', (socket) => {
         sockets.add(socket);
         socket.on('close', () => {
@@ -195,13 +196,15 @@ export async function withCallbackServer(host, pathname, startLogin, onCallback,
             throw new Error('Failed to allocate local callback server port');
         }
         const callbackUrl = `http://${host}:${address.port}${pathname}`;
-        const manualRedirectAbortController = new AbortController();
+        const manualRedirectController = new AbortController();
+        manualRedirectAbortController = manualRedirectController;
+        const manualRedirectSignal = combineAbortSignals(manualRedirectController.signal, signal);
         const cancellableCallbackPromise = callbackPromise.finally(() => {
-            manualRedirectAbortController.abort();
+            manualRedirectController.abort();
         });
         await startLogin(callbackUrl);
-        const manualRedirectPromise = waitForManualRedirect(onCallback, manualRedirectUrl, manualRedirectAbortController.signal).catch((error) => {
-            if (manualRedirectAbortController.signal.aborted) {
+        const manualRedirectPromise = waitForManualRedirect(onCallback, manualRedirectUrl, manualRedirectSignal).catch((error) => {
+            if (manualRedirectController.signal.aborted) {
                 return new Promise(() => undefined);
             }
             throw error;
@@ -209,9 +212,11 @@ export async function withCallbackServer(host, pathname, startLogin, onCallback,
         await Promise.race([
             cancellableCallbackPromise,
             manualRedirectPromise,
+            waitForAbort(signal),
         ]);
     }
     finally {
+        manualRedirectAbortController?.abort();
         server.closeIdleConnections?.();
         server.closeAllConnections?.();
         for (const socket of sockets) {
@@ -353,7 +358,7 @@ function renderCallbackPage(input) {
 </body>
 </html>`;
 }
-async function reuseExistingBrowserConsentLogin(options) {
+export async function reuseBrowserConsentLogin(options) {
     const stored = loadCredentials();
     if (!stored || stored.authType !== 'oidc_oauth') {
         return null;
@@ -366,7 +371,7 @@ async function reuseExistingBrowserConsentLogin(options) {
     if (requestedIssuer !== storedIssuer) {
         return null;
     }
-    const accessToken = await getOidcAccessToken(stored);
+    const accessToken = await getOidcAccessToken(stored, { forceRefresh: options.forceRefreshExisting });
     if (!accessToken || !isLinxOidcOAuthSecrets(stored.secrets)) {
         return null;
     }
@@ -495,13 +500,55 @@ async function waitForManualRedirect(onCallback, manualRedirectUrl, signal) {
         await new Promise(() => undefined);
         return;
     }
-    const requestUrl = await manualRedirectUrl(signal);
+    let requestUrl;
+    try {
+        requestUrl = await manualRedirectUrl(signal);
+    }
+    catch (error) {
+        if (signal?.aborted) {
+            throw error;
+        }
+        await new Promise(() => undefined);
+        return;
+    }
     if (signal?.aborted || !requestUrl) {
         await new Promise(() => undefined);
         return;
     }
     await onCallback(requestUrl);
 }
+function waitForAbort(signal) {
+    if (!signal) {
+        return new Promise(() => undefined);
+    }
+    return new Promise((_, reject) => {
+        const rejectCancelled = () => reject(new Error('Login cancelled'));
+        if (signal.aborted) {
+            rejectCancelled();
+            return;
+        }
+        signal.addEventListener('abort', rejectCancelled, { once: true });
+    });
+}
+function combineAbortSignals(...signals) {
+    const activeSignals = signals.filter((entry) => Boolean(entry));
+    if (activeSignals.length === 0) {
+        return undefined;
+    }
+    if (activeSignals.length === 1) {
+        return activeSignals[0];
+    }
+    const controller = new AbortController();
+    const abort = () => controller.abort();
+    for (const entry of activeSignals) {
+        if (entry.aborted) {
+            controller.abort();
+            break;
+        }
+        entry.addEventListener('abort', abort, { once: true });
+    }
+    return controller.signal;
+}
 export async function openBrowser(url) {
     if (process.platform === 'darwin') {
         await execFileAsync('open', [url]);

package/dist/lib/oidc-auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"oidc-auth.js","sourceRoot":"","sources":["../../src/lib/oidc-auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oidc-auth.js","sourceRoot":"","sources":["../../src/lib/oidc-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EACL,MAAM,EACN,qBAAqB,EACrB,cAAc,EACd,OAAO,GAER,MAAM,iCAAiC,CAAA;AAExC,OAAO,EAAE,sBAAsB,EAAE,8BAA8B,EAA6B,MAAM,8BAA8B,CAAA;AAChI,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAEpE,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;AACzC,MAAM,qBAAqB,GAAG,WAAW,CAAA;AACzC,MAAM,qBAAqB,GAAG,gBAAgB,CAAA;AAC9C,MAAM,mBAAmB,GAAG,UAAU,CAAA;AA0BtC,MAAM,OAAO,yBAA0B,SAAQ,KAAK;IACzC,WAAW,GAAG,IAAI,CAAA;IAE3B,YAAY,KAAe;QACzB,KAAK,CAAC,2BAA2B,CAAC,CAAA;QAClC,IAAI,CAAC,IAAI,GAAG,2BAA2B,CAAA;QACvC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,CAAC;YAAC,IAAoC,CAAC,KAAK,GAAG,KAAK,CAAA;QACtD,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,IAAI,KAAK,YAAY,yBAAyB,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,aAAa,IAAI,KAAK,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;QACxG,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACtE,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;IACxC,OAAO,UAAU,CAAC,QAAQ,CAAC,0BAA0B,CAAC;WACjD,UAAU,CAAC,QAAQ,CAAC,6BAA6B,CAAC;WAClD,UAAU,CAAC,QAAQ,CAAC,yCAAyC,CAAC;WAC9D,UAAU,CAAC,QAAQ,CAAC,gBAAgB,CAAC;WACrC,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,UAAmC,EAAE;IAErC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;QACxE,IAAI,MAAM,EAAE,CAAC;YACX,OAAO;gBACL,GAAG,MAAM;gBACT,qBAAqB,EAAE,IAAI;aAC5B,CAAA;QACH,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAAC,CAAA;IACpD,OAAO;QACL,GAAG,KAAK;QACR,qBAAqB,EAAE,KAAK;KAC7B,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,UAAmC,EAAE;IAErC,MAAM,OAAO,GAAG,wBAAwB,EAAE,CAAA;IAC1C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;QAC1B,OAAO;QACP,SAAS,EAAE,KAAK;KACjB,EAAE,iBAAiB,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAEjC,MAAM,OAAO,GAAG,8BAA8B,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IACjE,IAAI,cAAc,GAA2B,IAAI,CAAA;IAEjD,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;QAChD,cAAc,GAAG,QAAQ,CAAA;IAC3B,CAAC,CAAC,CAAA;IAEF,MAAM,kBAAkB,CACtB,OAAO,CAAC,YAAY,IAAI,qBAAqB,EAC7C,OAAO,CAAC,YAAY,IAAI,qBAAqB,EAC7C,KAAK,EAAE,WAAW,EAAE,EAAE;QACpB,IAAI,YAAY,GAAG,KAAK,CAAA;QACxB,MAAM,OAAO,CAAC,KAAK,CAAC;YAClB,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACtC,WAAW,EAAE,WAAW;YACxB,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,mBAAmB;YACrD,cAAc,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC5B,YAAY,GAAG,IAAI,CAAA;gBACnB,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,CAAA;gBACxB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;oBACxB,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;gBAChC,CAAC;qBAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;oBAC9B,MAAM,WAAW,CAAC,GAAG,CAAC,CAAA;gBACxB,CAAC;YACH,CAAC;YACD,SAAS,EAAE,QAAQ;SACpB,CAAC,CAAA;QAEF,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,EACD,KAAK,EAAE,UAAU,EAAE,EAAE;QACnB,mCAAmC,CAAC,UAAU,CAAC,CAAA;QAC/C,MAAM,OAAO,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAA;IAClD,CAAC,EACD,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,MAAM,CACf,CAAA;IAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;IACxD,CAAC;IAED,MAAM,QAAQ,GAAG,cAAwC,CAAA;IACzD,IAAI,CAAC,QAAQ,EAAE,YAAY,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;IACjE,CAAC;IAED,MAAM,MAAM,GAAG;QACb,GAAG,EAAE,OAAO;QACZ,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK;QACzB,QAAQ;QACR,iBAAiB,EAAE,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC;KACnF,CAAA;IACD,yBAAyB,CAAC,MAAM,CAAC,CAAA;IACjC,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAkF,EAClF,UAAsC,EAAE;IAExC,IAAI,WAAW,CAAC,QAAQ,KAAK,YAAY,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1F,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,OAA+B,CAAA;IAC3D,IAAI,OAAO,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QACrD,OAAO,wBAAwB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IACvD,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IACvF,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;QACpE,OAAO,wBAAwB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IACvD,CAAC;IAED,OAAO,OAAO,CAAC,eAAe,CAAA;AAChC,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,GAAW,EACX,KAAa,EACb,QAAyB;IAEzB,OAAO;QACL,GAAG;QACH,KAAK;QACL,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE;YACP,gBAAgB,EAAE,QAAQ,CAAC,YAAY,IAAI,EAAE;YAC7C,eAAe,EAAE,QAAQ,CAAC,WAAW,IAAI,EAAE;YAC3C,aAAa,EAAE,QAAQ,CAAC,SAAS;gBAC/B,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE;gBACnD,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC5B,YAAY,EAAE,QAAQ,CAAC,QAAQ;SAChC;KACF,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAY,EACZ,QAAgB,EAChB,UAAkD,EAClD,UAAiD,EACjD,iBAA6D,EAC7D,MAAoB;IAEpB,MAAM,MAAM,GAAG,YAAY,EAAE,CAAA;IAC7B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IACjC,IAAI,6BAA0D,CAAA;IAC9D,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE;QACjC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACnB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACtB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACxB,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,MAAM,eAAe,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5D,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAChC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,EAAE,UAAU,IAAI,EAAE,CAAC,CAAA;YAC5D,IAAI,UAAU,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACrC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAA;gBACpB,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;gBACpB,OAAM;YACR,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;YAChC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC5C,MAAM,CAAC,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC,CAAA;gBACrE,OAAM;YACR,CAAC;YAED,MAAM,WAAW,GAAG,UAAU,IAAI,IAAI,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,EAAE,CAAA;YAC9F,UAAU,CAAC,WAAW,CAAC;iBACpB,IAAI,CAAC,GAAG,EAAE;gBACT,GAAG,CAAC,UAAU,GAAG,GAAG,CAAA;gBACpB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAA;gBACzD,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;gBACpC,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC;oBACzB,KAAK,EAAE,sBAAsB;oBAC7B,WAAW,EAAE,8DAA8D;oBAC3E,IAAI,EAAE,SAAS;iBAChB,CAAC,CAAC,CAAA;gBACH,MAAM,CAAC,oBAAoB,EAAE,EAAE,CAAA;gBAC/B,MAAM,CAAC,mBAAmB,EAAE,EAAE,CAAA;gBAC9B,OAAO,EAAE,CAAA;YACX,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,GAAG,CAAC,UAAU,GAAG,GAAG,CAAA;gBACpB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAA;gBACzD,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;gBACpC,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC;oBACzB,KAAK,EAAE,mBAAmB;oBAC1B,WAAW,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;oBACnE,IAAI,EAAE,OAAO;iBACd,CAAC,CAAC,CAAA;gBACH,MAAM,CAAC,oBAAoB,EAAE,EAAE,CAAA;gBAC/B,MAAM,CAAC,mBAAmB,EAAE,EAAE,CAAA;gBAC9B,MAAM,CAAC,KAAK,CAAC,CAAA;YACf,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAC5B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;QAChC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAClE,CAAC;QAED,MAAM,WAAW,GAAG,UAAU,IAAI,IAAK,OAAuB,CAAC,IAAI,GAAG,QAAQ,EAAE,CAAA;QAChF,MAAM,wBAAwB,GAAG,IAAI,eAAe,EAAE,CAAA;QACtD,6BAA6B,GAAG,wBAAwB,CAAA;QACxD,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACzF,MAAM,0BAA0B,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE;YAC9D,wBAAwB,CAAC,KAAK,EAAE,CAAA;QAClC,CAAC,CAAC,CAAA;QACF,MAAM,UAAU,CAAC,WAAW,CAAC,CAAA;QAC7B,MAAM,qBAAqB,GAAG,qBAAqB,CACjD,UAAU,EACV,iBAAiB,EACjB,oBAAoB,CACrB,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAChB,IAAI,wBAAwB,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBAC5C,OAAO,IAAI,OAAO,CAAO,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;YAC3C,CAAC;YACD,MAAM,KAAK,CAAA;QACb,CAAC,CAAC,CAAA;QACF,MAAM,OAAO,CAAC,IAAI,CAAC;YACjB,0BAA0B;YAC1B,qBAAqB;YACrB,YAAY,CAAC,MAAM,CAAC;SACrB,CAAC,CAAA;IACJ,CAAC;YAAS,CAAC;QACT,6BAA6B,EAAE,KAAK,EAAE,CAAA;QACtC,MAAM,CAAC,oBAAoB,EAAE,EAAE,CAAA;QAC/B,MAAM,CAAC,mBAAmB,EAAE,EAAE,CAAA;QAC9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACH,MAAM,CAAC,OAAO,EAAE,CAAA;YAClB,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;QACD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IACrE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mCAAmC,CAAC,UAAkB;IACpE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAA;IAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAM;IACR,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC7D,MAAM,OAAO,GAAG;QACd,0BAA0B,KAAK,EAAE;QACjC,WAAW,CAAC,CAAC,CAAC,gBAAgB,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI;QAClD,aAAa,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE;KACzC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACjB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;AACrC,CAAC;AAED,SAAS,kBAAkB,CAAC,KAI3B;IACC,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC5C,MAAM,kBAAkB,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACxD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC/D,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IACnE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;IAEjD,OAAO;;;;;WAKE,YAAY;;;;;;;;;kBASL,MAAM;uBACD,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAoFP,IAAI;UACpB,YAAY;SACb,kBAAkB;;;;;;;QAOnB,CAAA;AACR,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,OAAgC;IAEhC,MAAM,MAAM,GAAG,eAAe,EAAE,CAAA;IAChC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;QAChD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAChF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,eAAe,GAAG,8BAA8B,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IACzE,MAAM,YAAY,GAAG,8BAA8B,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC/D,IAAI,eAAe,KAAK,YAAY,EAAE,CAAC;QACrC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAA;IACpG,IAAI,CAAC,WAAW,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO;QACL,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,QAAQ,EAAE;YACR,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACrC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY,IAAI,mBAAmB;YAC5D,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB;YAC7C,WAAW;YACX,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa;gBACrC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;gBACrE,CAAC,CAAC,SAAS;SACd;QACD,iBAAiB,EAAE,MAAM;KAC1B,CAAA;AACH,CAAC;AAED,SAAS,yBAAyB,CAAC,MAA8B;IAC/D,eAAe,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;IACzC,kBAAkB,CAAC;QACjB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,cAAc;QACrB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACpC,CAAC,CAAA;AACJ,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,WAAkF,EAClF,OAA6B;IAE7B,MAAM,OAAO,GAAG,wBAAwB,EAAE,CAAA;IAC1C,MAAM,SAAS,GAAG,MAAM,0BAA0B,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IAC/F,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,qBAAqB,CAAC,SAAS,EAAE;QACrD,OAAO;QACP,cAAc,EAAE,KAAK;KACtB,CAAC,CAAA;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,iBAAiB,GAA2B,IAAI,CAAA;IACpD,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;QAChD,iBAAiB,GAAG,QAAQ,CAAA;IAC9B,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC;QACH,MAAM,cAAc,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,yBAAyB,CAAC,KAAK,CAAC,CAAA;QAC5C,CAAC;QACD,MAAM,KAAK,CAAA;IACb,CAAC;IAED,MAAM,YAAY,GAAG,iBAA2C,CAAA;IAChE,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,CAAC,gBAAgB,GAAG,YAAY,CAAC,YAAY,IAAI,OAAO,CAAC,gBAAgB,CAAA;IAChF,OAAO,CAAC,eAAe,GAAG,YAAY,CAAC,WAAW,CAAA;IAClD,OAAO,CAAC,aAAa,GAAG,YAAY,CAAC,SAAS;QAC5C,CAAC,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE;QACvD,CAAC,CAAC,OAAO,CAAC,aAAa,CAAA;IACzB,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAA;IAEpE,eAAe,CAAC;QACd,GAAG,EAAE,WAAW,CAAC,GAAG;QACpB,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK;QAC9C,QAAQ,EAAE,YAAY;QACtB,OAAO;KACR,CAAC,CAAA;IACF,kBAAkB,CAAC;QACjB,GAAG,EAAE,WAAW,CAAC,GAAG;QACpB,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,cAAc;QACrB,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK;QAC9C,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACpC,CAAC,CAAA;IAEF,OAAO,YAAY,CAAC,WAAW,CAAA;AACjC,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,OAAoD,EACpD,KAAa,EACb,SAAiB;IAEjB,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAA;IACpE,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,UAAU,GAAa,EAAE,CAAA;IAC7B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAA;QACnF,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACtD,KAAK,MAAM,SAAS,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;QAClD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAA;QAC9E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,SAAQ;QACV,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAwC,CAAA;YACxE,MAAM,YAAY,GAAG,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;YAC3E,MAAM,aAAa,GAAG,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAClG,IAAI,YAAY,KAAK,KAAK,IAAI,aAAa,KAAK,gBAAgB,EAAE,CAAC;gBACjE,OAAO,SAAS,CAAA;YAClB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,SAAQ;QACV,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,KAAK;SACT,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC;SACvB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AAC3B,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,UAAiD,EACjD,iBAA6D,EAC7D,MAAoB;IAEpB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAClC,OAAM;IACR,CAAC;IAED,IAAI,UAAkB,CAAA;IACtB,IAAI,CAAC;QACH,UAAU,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAA;IAC9C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACpB,MAAM,KAAK,CAAA;QACb,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAClC,OAAM;IACR,CAAC;IACD,IAAI,MAAM,EAAE,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;QACnC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAClC,OAAM;IACR,CAAC;IACD,MAAM,UAAU,CAAC,UAAU,CAAC,CAAA;AAC9B,CAAC;AAED,SAAS,YAAY,CAAC,MAAoB;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;IACrC,CAAC;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;QAC/B,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAA;QAClE,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,eAAe,EAAE,CAAA;YACjB,OAAM;QACR,CAAC;QACD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IACnE,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAG,OAAuC;IACrE,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAwB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;IACrF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,aAAa,CAAC,CAAC,CAAC,CAAA;IACzB,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IACxC,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;IACtC,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,UAAU,CAAC,KAAK,EAAE,CAAA;YAClB,MAAK;QACP,CAAC;QACD,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IACxD,CAAC;IACD,OAAO,UAAU,CAAC,MAAM,CAAA;AAC1B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAW;IAC3C,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;QAClC,OAAM;IACR,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,CAAA;QACpD,OAAM;IACR,CAAC;IACD,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;AACxC,CAAC"}

package/dist/lib/pi-adapter/auth.js

@@ -1,18 +1,47 @@
 import { getClientCredentialId, getClientCredentialKey, getClientCredentials, loadCredentials } from '../credentials-store.js';
 import { getOidcAccessToken, isOidcLoginExpiredError } from '../oidc-auth.js';
 import { getAccessToken } from '../solid-auth.js';
-export async function resolveLinxPiCloudOAuthCredential(issuerUrl, runtime = {
-    loadCredentials,
-    getClientCredentials,
-    getAccessToken,
-}) {
+function isPiAuthBridgeRuntime(value) {
+    return typeof value === 'object'
+        && value !== null
+        && ('loadCredentials' in value
+            || 'getClientCredentials' in value
+            || 'getAccessToken' in value
+            || 'getOidcAccessToken' in value);
+}
+function resolveOidcExpiresAt(secrets) {
+    const rawExpiresAt = typeof secrets === 'object'
+        && secrets !== null
+        && 'oidcExpiresAt' in secrets
+        ? secrets.oidcExpiresAt
+        : undefined;
+    if (typeof rawExpiresAt !== 'string') {
+        return Date.now();
+    }
+    const expiresAt = new Date(rawExpiresAt).getTime();
+    return Number.isFinite(expiresAt) ? expiresAt : Date.now();
+}
+export async function resolveLinxPiCloudOAuthCredential(issuerUrl, optionsOrRuntime = {}, runtimeArg) {
+    const defaultRuntime = {
+        loadCredentials,
+        getClientCredentials,
+        getAccessToken,
+        getOidcAccessToken,
+    };
+    const options = isPiAuthBridgeRuntime(optionsOrRuntime)
+        ? {}
+        : optionsOrRuntime;
+    const runtime = {
+        ...defaultRuntime,
+        ...(isPiAuthBridgeRuntime(optionsOrRuntime) ? optionsOrRuntime : runtimeArg),
+    };
     const stored = runtime.loadCredentials();
     if (!stored) {
         return null;
     }
     const clientCredentials = runtime.getClientCredentials(stored);
     if (!clientCredentials) {
-        const oidcAccessToken = await getOidcAccessToken(stored).catch((error) => {
+        const oidcAccessToken = await runtime.getOidcAccessToken(stored, { forceRefresh: options.forceRefresh }).catch((error) => {
             if (isOidcLoginExpiredError(error)) {
                 throw error;
             }
@@ -25,7 +54,7 @@ export async function resolveLinxPiCloudOAuthCredential(issuerUrl, runtime = {
             type: 'oauth',
             refresh: 'linx-oidc-refresh',
             access: oidcAccessToken,
-            expires: Date.now() + 60 * 60 * 1000,
+            expires: resolveOidcExpiresAt(stored.secrets),
         };
     }
     const resolvedIssuerUrl = issuerUrl?.trim() || stored.url;

package/dist/lib/pi-adapter/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/lib/pi-adapter/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC9H,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAajD,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,SAAkB,EAClB,UAA+B;IAC7B,eAAe;IACf,oBAAoB;IACpB,cAAc;CACf;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAA;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;IAC9D,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACvE,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnC,MAAM,KAAK,CAAA;YACb,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,OAAO;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,mBAAmB;YAC5B,MAAM,EAAE,eAAe;YACvB,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;SACrC,CAAA;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,SAAS,EAAE,IAAI,EAAE,IAAI,MAAM,CAAC,GAAG,CAAA;IACzD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,CAAA;IACzD,MAAM,YAAY,GAAG,sBAAsB,CAAC,iBAAiB,CAAC,CAAA;IAC9D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,iBAAiB,CAAC,CAAA;IACrF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO;QACL,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,YAAY;QACrB,MAAM,EAAE,KAAK,CAAC,WAAW;QACzB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE;KACnC,CAAA;AACH,CAAC"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/lib/pi-adapter/auth.ts"],"names":[],"mappings":"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"}

package/dist/lib/pi-adapter/branding.js

@@ -13,6 +13,7 @@ export const LINX_CHANGELOG_URL = 'https://github.com/undefineds-co/linx-cli/rel
 export const LINX_CLI_VERSION = readLinxCliVersion();
 const LINX_AUTH_LOGIN_IN_PROGRESS = Symbol.for('linx.tui.authLoginInProgress');
 const LINX_AUTH_LOGIN_ON_INIT = Symbol.for('linx.tui.authLoginOnInit');
+const LINX_AUTH_PENDING_RETRY = Symbol.for('linx.tui.authPendingRetry');
 const LINX_AUTH_LOGIN_SCHEDULED = Symbol.for('linx.tui.authLoginScheduled');
 const LINX_AUTH_REPORTING_ERROR = Symbol.for('linx.tui.authReportingError');
 const LINX_UPDATE_IN_PROGRESS = Symbol.for('linx.tui.updateInProgress');
@@ -222,10 +223,13 @@ function patchAuthExpiredSessionEvents(interactive) {
         return;
     }
     interactive.handleEvent = async function patchedHandleEvent(event) {
-        const result = await originalHandleEvent(event);
         if (eventHasLinxAuthExpiredError(event)) {
+            prepareLinxAuthExpiredRetry(this);
+            suppressLinxAuthExpiredAssistantError(this);
             scheduleLinxCloudLogin(this, 'expired');
+            return undefined;
         }
+        const result = await originalHandleEvent(event);
         return result;
     };
 }
@@ -283,7 +287,7 @@ async function startLinxCloudLogin(interactive, options = {}) {
             }
             await runLinxCloudBrowserLogin(interactive, authStorage, reason);
             await refreshLinxAuthState(interactive);
-            interactive.showStatus?.(`${authStatusPrefix(reason)} Browser authorization complete. Retry your message.`);
+            await finishLinxAuthSuccess(interactive, reason, 'Browser authorization complete.');
             return;
         }
         if (selected === AUTH_OPTION_API_KEY) {
@@ -403,7 +407,210 @@ async function promptForLinxApiKey(interactive, reason) {
     authStorage?.setRuntimeApiKey?.(LINX_PROVIDER_ID, trimmed);
     authStorage?.set?.(LINX_PROVIDER_ID, { type: 'api_key', key: trimmed });
     await refreshLinxAuthState(interactive);
-    interactive.showStatus?.(`${authStatusPrefix(reason)} API key saved for this TUI session. Retry your message.`);
+    await finishLinxAuthSuccess(interactive, reason, 'API key saved for this TUI session.');
+}
+async function finishLinxAuthSuccess(interactive, reason, detail) {
+    const prefix = authStatusPrefix(reason);
+    const retryStarted = await retryPendingLinxAuthTurn(interactive, reason);
+    if (retryStarted) {
+        interactive.showStatus?.(`${prefix} ${detail} Retrying your message...`);
+        return;
+    }
+    const suffix = reason === 'expired' ? ' Retry your message.' : '';
+    interactive.showStatus?.(`${prefix} ${detail}${suffix}`);
+}
+function prepareLinxAuthExpiredRetry(interactive) {
+    if (interactive[LINX_AUTH_PENDING_RETRY]) {
+        return;
+    }
+    const session = interactive.session;
+    const sessionManager = session?.sessionManager;
+    const leafId = typeof sessionManager?.getLeafId === 'function'
+        ? sessionManager.getLeafId()
+        : undefined;
+    const leafEntry = leafId && typeof sessionManager?.getEntry === 'function'
+        ? sessionManager.getEntry(leafId)
+        : undefined;
+    const leafMessage = leafEntry?.type === 'message' ? leafEntry.message : undefined;
+    const userEntry = findLastUserMessageEntry(sessionManager, leafId);
+    const promptText = extractUserMessageText(userEntry?.message)
+        ?? extractUserMessageText(leafMessage)
+        ?? findLastUserMessageText(session?.state?.messages);
+    const pending = {
+        continueFromId: userEntry?.id ?? (leafMessage?.role === 'user' ? leafId : undefined),
+        promptText,
+        promptParentId: userEntry?.parentId ?? (leafMessage?.role === 'user' ? leafEntry.parentId : undefined),
+    };
+    interactive[LINX_AUTH_PENDING_RETRY] = pending;
+    // AgentSession persists the assistant error after TUI subscribers run. Restore
+    // the active branch on the next tick so "continue" never resumes from the
+    // failed auth assistant message if the user cancels or login fails.
+    setTimeout(() => {
+        if (interactive[LINX_AUTH_PENDING_RETRY] === pending) {
+            restoreLinxRetryBranch(interactive.session, pending.continueFromId);
+        }
+    }, 0);
+}
+function suppressLinxAuthExpiredAssistantError(interactive) {
+    const streamingComponent = interactive.streamingComponent;
+    if (streamingComponent) {
+        interactive.chatContainer?.removeChild?.(streamingComponent);
+    }
+    interactive.streamingComponent = undefined;
+    interactive.streamingMessage = undefined;
+    interactive.footer?.invalidate?.();
+    interactive.ui?.requestRender?.();
+}
+async function retryPendingLinxAuthTurn(interactive, reason) {
+    if (reason !== 'expired') {
+        return false;
+    }
+    const pending = interactive[LINX_AUTH_PENDING_RETRY];
+    if (!pending) {
+        return false;
+    }
+    interactive[LINX_AUTH_PENDING_RETRY] = undefined;
+    const session = interactive.session;
+    const sessionManager = session?.sessionManager;
+    if (!session || !sessionManager) {
+        return false;
+    }
+    await session.agent?.waitForIdle?.();
+    try {
+        restoreLinxRetryBranch(session, pending.continueFromId);
+        if (typeof session.agent?.continue === 'function') {
+            startLinxContinuation(interactive, session, pending);
+            return true;
+        }
+    }
+    catch (error) {
+        if (!pending.promptText) {
+            throw error;
+        }
+    }
+    if (!pending.promptText || typeof session.prompt !== 'function') {
+        return false;
+    }
+    restoreLinxRetryBranch(session, pending.promptParentId);
+    const promptResult = session.prompt(pending.promptText);
+    if (isPromiseLike(promptResult)) {
+        promptResult.catch((error) => {
+            const message = error instanceof Error ? error.message : String(error);
+            interactive.showError?.(`LinX Cloud retry failed: ${message}`);
+        });
+    }
+    return true;
+}
+function startLinxContinuation(interactive, session, pending) {
+    try {
+        const result = session.agent.continue();
+        if (isPromiseLike(result)) {
+            result.catch((error) => {
+                void retryLinxPromptFallback(interactive, session, pending, error);
+            });
+        }
+    }
+    catch (error) {
+        void retryLinxPromptFallback(interactive, session, pending, error);
+    }
+}
+async function retryLinxPromptFallback(interactive, session, pending, cause) {
+    if (!pending.promptText || typeof session?.prompt !== 'function') {
+        const message = cause instanceof Error ? cause.message : String(cause);
+        interactive.showError?.(`LinX Cloud retry failed: ${message}`);
+        return;
+    }
+    try {
+        restoreLinxRetryBranch(session, pending.promptParentId);
+        await session.prompt(pending.promptText);
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        interactive.showError?.(`LinX Cloud retry failed: ${message}`);
+    }
+}
+function restoreLinxRetryBranch(session, leafId) {
+    const sessionManager = session?.sessionManager;
+    if (!sessionManager) {
+        return;
+    }
+    if (typeof leafId === 'string' && leafId) {
+        sessionManager.branch?.(leafId);
+    }
+    else if (leafId === null) {
+        sessionManager.resetLeaf?.();
+    }
+    const context = sessionManager.buildSessionContext?.();
+    if (context?.messages && session.agent?.state) {
+        session.agent.state.messages = context.messages;
+    }
+}
+function findLastUserMessageText(messages) {
+    if (!Array.isArray(messages)) {
+        return undefined;
+    }
+    for (let index = messages.length - 1; index >= 0; index -= 1) {
+        const text = extractUserMessageText(messages[index]);
+        if (text) {
+            return text;
+        }
+    }
+    return undefined;
+}
+function findLastUserMessageEntry(sessionManager, leafId) {
+    const branch = typeof sessionManager?.getBranch === 'function' && typeof leafId === 'string'
+        ? sessionManager.getBranch(leafId)
+        : undefined;
+    const entries = Array.isArray(branch) && branch.length > 0
+        ? branch
+        : typeof sessionManager?.getEntries === 'function'
+            ? sessionManager.getEntries()
+            : [];
+    if (!Array.isArray(entries)) {
+        return undefined;
+    }
+    for (let index = entries.length - 1; index >= 0; index -= 1) {
+        const entry = entries[index];
+        if (isRecord(entry)
+            && entry.type === 'message'
+            && typeof entry.id === 'string'
+            && isRecord(entry.message)
+            && entry.message.role === 'user') {
+            return {
+                id: entry.id,
+                parentId: normalizeParentId(entry.parentId),
+                message: entry.message,
+            };
+        }
+    }
+    return undefined;
+}
+function normalizeParentId(parentId) {
+    if (typeof parentId === 'string') {
+        return parentId;
+    }
+    if (parentId === null) {
+        return null;
+    }
+    return undefined;
+}
+function extractUserMessageText(message) {
+    if (!isRecord(message) || message.role !== 'user') {
+        return undefined;
+    }
+    const content = message.content;
+    if (typeof content === 'string') {
+        return content.trim() || undefined;
+    }
+    if (!Array.isArray(content)) {
+        return undefined;
+    }
+    const text = content
+        .filter((entry) => (isRecord(entry) && entry.type === 'text' && typeof entry.text === 'string'))
+        .map((entry) => entry.text)
+        .join('')
+        .trim();
+    return text || undefined;
 }
 async function refreshLinxAuthState(interactive) {
     interactive.session?.modelRegistry?.refresh?.();
@@ -421,7 +628,7 @@ function authStatusPrefix(reason) {
 }
 async function runLinxCloudLogin(interactive, authStorage, reason) {
     await authStorage.login(LINX_PROVIDER_ID, {
-        forceFresh: reason === 'expired',
+        forceFresh: true,
         onAuth(info) {
             showLinxLoginUrl(interactive, info);
             openLoginUrl(info.url, interactive);
@@ -472,7 +679,7 @@ async function runLinxCloudLoginDialog(interactive, authStorage, reason) {
     });
     try {
         await authStorage.login(LINX_PROVIDER_ID, {
-            forceFresh: reason === 'expired',
+            forceFresh: true,
             onAuth(info) {
                 dialog.showAuth(info.url, info.instructions);
                 dialog.showManualInput('Paste redirect URL below, or complete login in browser:')
@@ -805,4 +1012,7 @@ function isRecord(value) {
 function stripAnsi(text) {
     return text.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, '');
 }
+function isPromiseLike(value) {
+    return isRecord(value) && typeof value.then === 'function';
+}
 //# sourceMappingURL=branding.js.map