npm - devchain-cli - Versions diffs - 0.15.0 → 0.16.1 - Mend

devchain-cli 0.15.0 → 0.16.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (192) hide show

package/dist/server/modules/core/services/copilot-trusted-folders.service.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"copilot-trusted-folders.service.js","sourceRoot":"","sources":["../../../../src/modules/core/services/copilot-trusted-folders.service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/core/services/preflight.service.d.ts CHANGED Viewed

@@ -51,6 +51,7 @@ export declare class PreflightService {
     private getEnabledProvidersFilter;
     private evaluateMcpStatus;
     private isMcpSupported;
+    private evaluateAuthStatus;
     private checkTmux;
     private checkProvider;
     private checkProviderWithConfig;

package/dist/server/modules/core/services/preflight.service.js CHANGED Viewed

@@ -341,6 +341,33 @@ let PreflightService = class PreflightService {
     isMcpSupported(name) {
         return this.adapterFactory.isSupported(name);
     }
+    async evaluateAuthStatus(provider) {
+        let adapter;
+        try {
+            adapter = this.adapterFactory.getAdapter(provider.name);
+        }
+        catch {
+            return { authStatus: 'pass' };
+        }
+        if (!(0, adapters_1.isAuthProbeCapable)(adapter)) {
+            return { authStatus: 'pass' };
+        }
+        try {
+            const { authenticated, remediation } = await adapter.probeAuth();
+            if (authenticated) {
+                return { authStatus: 'pass' };
+            }
+            return {
+                authStatus: 'warn',
+                authMessage: `${provider.name} may not be authenticated`,
+                authDetails: remediation,
+            };
+        }
+        catch (error) {
+            logger.debug({ error, provider: provider.name }, 'Auth probe failed (non-blocking)');
+            return { authStatus: 'pass' };
+        }
+    }
     async checkTmux() {
         try {
             const result = await this.executor.run({ argv: ['tmux', '-V'], mode: 'pipe' });
@@ -424,14 +451,19 @@ let PreflightService = class PreflightService {
                     : 'Binary is either missing or not executable. Check file permissions.';
         }
         const { mcpStatus, mcpMessage, mcpDetails } = await this.evaluateMcpStatus(provider, projectPath);
-        const statusCollection = [binaryStatus, mcpStatus];
+        const { authStatus, authMessage, authDetails } = await this.evaluateAuthStatus(provider);
+        const statusCollection = [binaryStatus, mcpStatus, authStatus];
         const overallStatus = statusCollection.includes('fail')
             ? 'fail'
             : statusCollection.includes('warn')
                 ? 'warn'
                 : 'pass';
-        const summaryMessage = binaryStatus === overallStatus ? binaryMessage : (mcpMessage ?? binaryMessage);
-        const combinedDetails = [binaryDetails, mcpDetails].filter(Boolean).join(' | ') || undefined;
+        const summaryMessage = binaryStatus === overallStatus
+            ? binaryMessage
+            : overallStatus === authStatus && authMessage
+                ? authMessage
+                : (mcpMessage ?? binaryMessage);
+        const combinedDetails = [binaryDetails, mcpDetails, authDetails].filter(Boolean).join(' | ') || undefined;
         const requiresProjectContext = this.isMcpSupported(provider.name) && !(0, adapters_1.isMcpCli)(this.adapterFactory.getAdapter(provider.name))
             ? true
             : undefined;

package/dist/server/modules/core/services/preflight.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"preflight.service.js","sourceRoot":"","sources":["../../../../src/modules/core/services/preflight.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,0CAAuD;AACvD,2DAA8D;AAC9D,2CAA6B;AAO7B,kEAI0C;AAC1C,kHAA4G;AAC5G,0EAAgG;AAChG,uDAA4E;AAC5E,0GAAiG;AAEjG,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,kBAAkB,CAAC,CAAC;AAgDzC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAC8C,OAAuB,EAClD,eAA+C,EAC/C,cAAsC,EACtC,QAAyB;QAHE,YAAO,GAAP,OAAO,CAAgB;QAClD,oBAAe,GAAf,eAAe,CAAgC;QAC/C,mBAAc,GAAd,cAAc,CAAwB;QACtC,aAAQ,GAAR,QAAQ,CAAiB;IACzC,CAAC;IAUI,KAAK,CAAC,6BAA6B,CAAC,SAAoC;QAW9E,MAAM,WAAW,GAAG,IAAI,GAAG,EAQxB,CAAC;QAIJ,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE,CAAC;YACtE,KAAK,MAAM,QAAQ,IAAI,eAAe,CAAC,KAAK,EAAE,CAAC;gBAE7C,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC/E,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE;oBAC3B,QAAQ;oBACR,QAAQ,EAAE,EAAE;oBACZ,OAAO,EAAE,eAAe;oBACxB,UAAU,EAAE,EAAE;iBACf,CAAC,CAAC;YACL,CAAC;YACD,OAAO,WAAW,CAAC;QACrB,CAAC;QAGD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC;QAGlC,MAAM,SAAS,GAAG;YAChB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;SACpF,CAAC;QAEF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAE3B,OAAO,WAAW,CAAC;QACrB,CAAC;QAGD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,SAAS,CAAC,CAAC;QAC9E,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAGzD,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAGnE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAGhE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;gBAC5B,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,+BAA+B,CAAC,CAAC;gBACpE,SAAS;YACX,CAAC;YAED,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACrD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,gBAAgB,EAAE,EAAE,kBAAkB,CAAC,CAAC;gBACzF,SAAS;YACX,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;YACrC,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAChD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE,oBAAoB,CAAC,CAAC;gBACrE,SAAS;YACX,CAAC;YAGD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBACjC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE;oBAC1B,QAAQ;oBACR,QAAQ,EAAE,EAAE;oBACZ,OAAO,EAAE,EAAE;oBACX,UAAU,EAAE,EAAE;iBACf,CAAC,CAAC;YACL,CAAC;YAED,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;YAC1C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAGjC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;gBAClD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAUO,KAAK,CAAC,6BAA6B,CAAC,SAAyB;QAWnE,MAAM,WAAW,GAAG,IAAI,GAAG,EAQxB,CAAC;QAEJ,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAE3D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,KAAK,MAAM,QAAQ,IAAI,eAAe,CAAC,KAAK,EAAE,CAAC;gBAC7C,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;YACxF,CAAC;YACD,OAAO,WAAW,CAAC;QACrB,CAAC;QAGD,KAAK,MAAM,QAAQ,IAAI,eAAe,CAAC,KAAK,EAAE,CAAC;YAC7C,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QACxF,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC;QAElC,MAAM,SAAS,GAAG;YAChB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;SACpF,CAAC;QAEF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,SAAS,CAAC,CAAC;QAC9E,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAEzD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,CAAC,KAAK,CAAC,gBAAgB;gBAAE,SAAS;YACtC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACrD,IAAI,CAAC,MAAM;gBAAE,SAAS;YACtB,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAChD,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;gBAClD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAKD,KAAK,CAAC,SAAS,CACb,WAAoB,EACpB,IAAwC;QAExC,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,GAAG,EAAE,CAAC;YACvC,OAAO;gBACL,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE;oBACN;wBACE,IAAI,EAAE,WAAW;wBACjB,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE,sCAAsC;qBAChD;iBACF;gBACD,SAAS,EAAE,EAAE;gBACb,qBAAqB,EAAE,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE;gBAClE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CAAC;QACJ,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,EAAE,0BAA0B,CAAC,CAAC;QAEzD,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,MAAM,cAAc,GAAoB,EAAE,CAAC;QAE3C,MAAM,mBAAmB,GAAG,IAAI,EAAE,mBAAmB,KAAK,IAAI,CAAC;QAG/D,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,eAAe,GAA8B,SAAS,CAAC;QAC3D,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBAClE,eAAe,GAAG,OAAO,EAAE,EAAE,CAAC;gBAC9B,MAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,EAC3C,gDAAgD,CACjD,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,EAAE,iDAAiD,CAAC,CAAC;YAClF,CAAC;QACH,CAAC;QAGD,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,mBAAmB;gBACzC,CAAC,CAAC,MAAM,IAAI,CAAC,6BAA6B,CAAC,eAAe,CAAC;gBAC3D,CAAC,CAAC,MAAM,IAAI,CAAC,6BAA6B,CAAC,eAAe,CAAC,CAAC;YAC9D,MAAM,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC1D,MAAM,CAAC,KAAK,CACV,EAAE,aAAa,EAAE,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,IAAI,KAAK,EAAE,EACpF,sDAAsD,CACvD,CAAC;YAEF,IAAI,mBAAmB,EAAE,CAAC;gBACxB,MAAM,aAAa,GAAG,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CACxD,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,gBAAgB;oBACjB,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CACxE,CAAC;gBACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACzB,IAAI,CAAC,uBAAuB,CAC1B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,EACf,WAAW,CACZ,CACF,CACF,CAAC;gBACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACxC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;oBAC1B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;wBAClC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBACpC,CAAC;yBAAM,CAAC;wBACN,MAAM,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;wBAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC;wBAC1B,MAAM,MAAM,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBAChE,MAAM,QAAQ,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;wBAC9D,IAAI,sBAA2C,CAAC;wBAChD,IAAI,CAAC;4BACH,sBAAsB;gCACpB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;oCACvC,CAAC,IAAA,mBAAQ,EAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oCAC3D,CAAC,CAAC,IAAI;oCACN,CAAC,CAAC,SAAS,CAAC;wBAClB,CAAC;wBAAC,MAAM,CAAC;wBAET,CAAC;wBACD,cAAc,CAAC,IAAI,CAAC;4BAClB,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE;4BACpB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI;4BACxB,MAAM,EAAE,MAAM;4BACd,OAAO,EAAE,MAAM;4BACf,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,IAAI;4BACtC,YAAY,EAAE,MAAM;4BACpB,aAAa,EAAE,oBAAoB,IAAI,CAAC,QAAQ,CAAC,IAAI,kDAAkD;4BACvG,SAAS,EAAE,MAAM;4BACjB,UAAU,EAAE,MAAM;4BAClB,UAAU,EAAE,QAAQ,IAAI,oDAAoD;4BAC5E,sBAAsB;yBACvB,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;oBAC5C,IACE,gBAAgB;wBAChB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,EACtE,CAAC;wBACD,MAAM,CAAC,KAAK,CACV,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAChC,gEAAgE,CACjE,CAAC;wBACF,SAAS;oBACX,CAAC;oBACD,cAAc,CAAC,IAAI,CACjB,MAAM,IAAI,CAAC,uBAAuB,CAChC,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,EACf,WAAW,CACZ,CACF,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,sDAAsD,CAAC,CAAC;YAChF,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,WAAW;gBACjB,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,wCAAwC;gBACjD,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAClE,CAAC,CAAC;QACL,CAAC;QAGD,IAAI,CAAC,mBAAmB,IAAI,WAAW,EAAE,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC;QAC3D,CAAC;QAGD,MAAM,OAAO,GACX,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;QAC7F,MAAM,OAAO,GACX,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;QAC7F,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;QAE7D,MAAM,MAAM,GAAoB;YAC9B,OAAO;YACP,MAAM;YACN,SAAS,EAAE,cAAc;YACzB,qBAAqB,EAAE,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE;YAClE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC;QAEF,MAAM,CAAC,IAAI,CACT,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,CAAC,MAAM,EAAE,EAC5E,4BAA4B,CAC7B,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,yBAAyB;QAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAC1C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,GAAG;aACf,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;aAC1C,MAAM,CAAC,OAAO,CAAC,CAAC;QACnB,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,QAAkB,EAClB,WAAoB;QAMpB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACxC,OAAO;gBACL,SAAS,EAAE,MAAM;gBACjB,UAAU,EAAE,qCAAqC;aAClD,CAAC;QACJ,CAAC;QAGD,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,IAAA,mBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvC,OAAO;gBACL,SAAS,EAAE,MAAM;gBACjB,UAAU,EAAE,GAAG,QAAQ,CAAC,IAAI,6DAA6D;aAC1F,CAAC;QACJ,CAAC;QAGD,MAAM,EAAE,YAAY,EAAE,GAAG,wDAAa,mCAAmC,GAAC,CAAC;QAC3E,MAAM,EAAE,YAAY,EAAE,GAAG,wDAAa,kBAAkB,GAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;QAC3B,MAAM,gBAAgB,GAAG,GAAG,YAAY,CAAC,oBAAoB,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;QACxG,MAAM,aAAa,GAAG,UAAU,CAAC;QAEjC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,QAAQ,EAAE;YACxE,GAAG,EAAE,WAAW;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACxB,OAAO;gBACL,SAAS,EAAE,MAAM;gBACjB,UAAU,EAAE,UAAU,CAAC,OAAO;gBAC9B,UAAU,EAAE,SAAS;aACtB,CAAC;QACJ,CAAC;QAGD,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,aAAa,CAAC,CAAC;QAExF,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO;gBACL,SAAS,EAAE,MAAM;gBACjB,UAAU,EAAE,cAAc,aAAa,cAAc;gBACrD,UAAU,EAAE,oDAAoD,gBAAgB,EAAE;aACnF,CAAC;QACJ,CAAC;QAGD,IAAI,aAAa,CAAC,QAAQ,KAAK,gBAAgB,EAAE,CAAC;YAChD,OAAO;gBACL,SAAS,EAAE,MAAM;gBACjB,UAAU,EAAE,oCAAoC,aAAa,IAAI;gBACjE,UAAU,EAAE,aAAa,gBAAgB,YAAY,aAAa,CAAC,QAAQ,oDAAoD;aAChI,CAAC;QACJ,CAAC;QAED,OAAO;YACL,SAAS,EAAE,MAAM;YACjB,UAAU,EAAE,6BAA6B,aAAa,MAAM,gBAAgB,IAAI;SACjF,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,IAAY;QACjC,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAKO,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YAC/E,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO;oBACL,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,gBAAgB;oBACzB,OAAO,EACL,iFAAiF;iBACpF,CAAC;YACJ,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAIrC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACtE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAElB,OAAO;oBACL,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,4CAA4C;oBACrD,OAAO,EAAE,YAAY,OAAO,uDAAuD;iBACpF,CAAC;YACJ,CAAC;YAED,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5C,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClE,MAAM,UAAU,GAAG,KAAK,GAAG,KAAK,GAAG,EAAE,CAAC;YAEtC,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;gBACrB,OAAO;oBACL,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,QAAQ,OAAO,yBAAyB;oBACjD,OAAO,EAAE,sEAAsE;iBAChF,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,QAAQ,OAAO,QAAQ;aACjC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,gBAAgB;gBACzB,OAAO,EAAE,iFAAiF;aAC3F,CAAC;QACJ,CAAC;IACH,CAAC;IAKO,KAAK,CAAC,aAAa,CACzB,QAAkB,EAClB,QAAwB,EACxB,WAAoB;QAEpB,IAAI,YAAY,GAA6B,MAAM,CAAC;QACpD,IAAI,aAAa,GAAG,GAAG,QAAQ,CAAC,IAAI,wBAAwB,CAAC;QAC7D,IAAI,aAAiC,CAAC;QACtC,IAAI,eAAe,GAAkB,QAAQ,CAAC,OAAO,IAAI,IAAI,CAAC;QAE9D,IAAI,CAAC;YACH,IAAI,QAAQ,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1D,MAAM,IAAA,iBAAM,EAAC,QAAQ,CAAC,OAAO,EAAE,oBAAS,CAAC,IAAI,CAAC,CAAC;gBAC/C,YAAY,GAAG,MAAM,CAAC;gBACtB,aAAa,GAAG,GAAG,QAAQ,CAAC,IAAI,oBAAoB,QAAQ,CAAC,OAAO,EAAE,CAAC;YACzE,CAAC;iBAAM,CAAC;gBACN,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACtE,IAAI,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;oBAChD,YAAY,GAAG,MAAM,CAAC;oBACtB,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC;oBACxC,aAAa,GAAG,GAAG,QAAQ,CAAC,IAAI,wBAAwB,UAAU,CAAC,UAAU,EAAE,CAAC;oBAChF,aAAa,GAAG,UAAU,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC5F,CAAC;qBAAM,CAAC;oBACN,YAAY,GAAG,MAAM,CAAC;oBACtB,aAAa;wBACX,UAAU,CAAC,OAAO;4BAClB,2EAA2E,CAAC;gBAChF,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,YAAY,GAAG,MAAM,CAAC;YACtB,aAAa,GAAG,GAAG,QAAQ,CAAC,IAAI,wBAAwB,CAAC;YACzD,aAAa;gBACX,KAAK,YAAY,KAAK;oBACpB,CAAC,CAAC,KAAK,CAAC,OAAO;oBACf,CAAC,CAAC,qEAAqE,CAAC;QAC9E,CAAC;QAID,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CACxE,QAAQ,EACR,WAAW,CACZ,CAAC;QACF,MAAM,gBAAgB,GAAoC,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QACpF,MAAM,aAAa,GAAG,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC;YACrD,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACjC,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,MAAM,CAAC;QAEb,MAAM,cAAc,GAClB,YAAY,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,aAAa,CAAC,CAAC;QAEjF,MAAM,eAAe,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC;QAE7F,MAAM,sBAAsB,GAC1B,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,mBAAQ,EAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC5F,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,SAAS,CAAC;QAEhB,OAAO;YACL,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,OAAO,EAAE,eAAe;YACxB,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE,cAAc;YACvB,OAAO,EAAE,eAAe;YACxB,YAAY;YACZ,aAAa;YACb,aAAa;YACb,SAAS;YACT,UAAU;YACV,UAAU;YACV,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,sBAAsB;SACvB,CAAC;IACJ,CAAC;IAKO,KAAK,CAAC,uBAAuB,CACnC,QAAkB,EAClB,QAAwB,EACxB,OAAgC,EAChC,UAAoB,EACpB,WAAoB;QAGpB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAG5E,IAAI,iBAAiB,GAA6B,MAAM,CAAC;QACzD,IAAI,kBAAsC,CAAC;QAC3C,MAAM,iBAAiB,GAAa,EAAE,CAAC;QAEvC,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC;YACjB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxD,IAAI,CAAC;oBACH,IAAA,4BAAc,EAAC,GAAG,CAAC,CAAC;oBACpB,IAAA,8BAAgB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC/B,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,iBAAiB,GAAG,MAAM,CAAC;oBAC3B,IAAI,KAAK,YAAY,6BAAe,EAAE,CAAC;wBACrC,iBAAiB,CAAC,IAAI,CAAC,aAAa,QAAQ,CAAC,IAAI,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC1E,CAAC;yBAAM,CAAC;wBACN,iBAAiB,CAAC,IAAI,CAAC,aAAa,QAAQ,CAAC,IAAI,uBAAuB,GAAG,GAAG,CAAC,CAAC;oBAClF,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,kBAAkB,GAAG,8BAA8B,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACrF,CAAC;QAGD,IAAI,eAAe,GAA6B,MAAM,CAAC;QACvD,IAAI,gBAAoC,CAAC;QACzC,MAAM,SAAS,GAAa,EAAE,CAAC;QAE/B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;gBAChB,SAAS;YACX,CAAC;YAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtD,IAAI,CAAC;oBACH,IAAA,4BAAc,EAAC,GAAG,CAAC,CAAC;oBACpB,IAAA,8BAAgB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC/B,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,eAAe,GAAG,MAAM,CAAC;oBACzB,IAAI,KAAK,YAAY,6BAAe,EAAE,CAAC;wBACrC,SAAS,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;oBACtE,CAAC;yBAAM,CAAC;wBACN,SAAS,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC;oBACrE,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,gBAAgB,GAAG,qBAAqB,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAClE,CAAC;QAGD,MAAM,kBAAkB,GAAa,EAAE,CAAC;QACxC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,SAAS;YACX,CAAC;YAED,IAAI,CAAC;gBACH,IAAA,qCAAmB,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,qCAAmB,EAAE,CAAC;oBACzC,kBAAkB,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC/E,CAAC;qBAAM,CAAC;oBACN,kBAAkB,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC;gBAC9E,CAAC;YACH,CAAC;QACH,CAAC;QAGD,MAAM,gBAAgB,GAAoC;YACxD,SAAS,CAAC,MAAM;YAChB,iBAAiB;YACjB,eAAe;YACf,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;SAChD,CAAC;QACF,MAAM,aAAa,GAAG,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC;YACrD,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACjC,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,MAAM,CAAC;QAGb,MAAM,UAAU,GAAG;YACjB,SAAS,CAAC,OAAO;YACjB,kBAAkB;YAClB,gBAAgB;YAChB,kBAAkB,CAAC,MAAM,GAAG,CAAC;gBAC3B,CAAC,CAAC,mBAAmB,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACrD,CAAC,CAAC,SAAS;SACd;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,KAAK,CAAC,CAAC;QAEf,OAAO;YACL,GAAG,SAAS;YACZ,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE,UAAU,IAAI,SAAS;YAChC,iBAAiB;YACjB,kBAAkB;YAClB,eAAe;YACf,gBAAgB;YAChB,YAAY,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;SAC7D,CAAC;IACJ,CAAC;IAKO,KAAK,CAAC,mBAAmB,CAAC,WAAmB;QACnD,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YAGzD,IAAI,CAAC;gBACH,MAAM,IAAA,iBAAM,EAAC,YAAY,EAAE,oBAAS,CAAC,IAAI,CAAC,CAAC;gBAC3C,OAAO;oBACL,IAAI,EAAE,kBAAkB;oBACxB,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,mBAAmB,YAAY,WAAW;iBACpD,CAAC;YACJ,CAAC;YAAC,OAAO,WAAW,EAAE,CAAC;gBAErB,IAAI,CAAC;oBACH,MAAM,IAAA,gBAAK,EAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC/C,OAAO;wBACL,IAAI,EAAE,kBAAkB;wBACxB,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE,WAAW,YAAY,oBAAoB;qBACrD,CAAC;gBACJ,CAAC;gBAAC,OAAO,UAAU,EAAE,CAAC;oBACpB,OAAO;wBACL,IAAI,EAAE,kBAAkB;wBACxB,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE,0BAA0B,YAAY,EAAE;wBACjD,OAAO,EAAE,UAAU,UAAU,YAAY,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,gCAAgC;qBACtH,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,IAAI,EAAE,kBAAkB;gBACxB,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,qCAAqC;gBAC9C,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;aAClE,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,QAAQ,CAAC,SAAiB,EAAE,WAAoB;QACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,oBAAoB,SAAS,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAA;AA9vBY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;6CACQ,kEAA8B;QAC/B,iCAAsB;QAC5B,uCAAe;GALjC,gBAAgB,CA8vB5B"}
1	+ {"version":3,"file":"preflight.service.js","sourceRoot":"","sources":["../../../../src/modules/core/services/preflight.service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/core/services/trust-folders-logic.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+export type TrustLevel = 'TRUST_FOLDER' | 'TRUST_PARENT' | 'DO_NOT_TRUST';
+export type EffectiveTrust = {
+    kind: 'trusted';
+    via: 'exact' | 'ancestor' | 'parent_rule';
+} | {
+    kind: 'distrusted';
+    via: 'exact' | 'ancestor';
+} | {
+    kind: 'no_rule';
+};
+export declare function getEffectiveTrust(projectPath: string, rules: Record<string, TrustLevel>): EffectiveTrust;

package/dist/server/modules/core/services/trust-folders-logic.js ADDED Viewed

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEffectiveTrust = getEffectiveTrust;
+const path_1 = require("path");
+function isSubpath(parent, child) {
+    if (parent === child)
+        return true;
+    const parentWithSep = parent.endsWith('/') ? parent : parent + '/';
+    return child.startsWith(parentWithSep);
+}
+function getEffectiveTrust(projectPath, rules) {
+    let bestMatch = null;
+    for (const [rulePath, level] of Object.entries(rules)) {
+        const effectivePath = level === 'TRUST_PARENT' ? (0, path_1.dirname)(rulePath) : rulePath;
+        if (!isSubpath(effectivePath, projectPath))
+            continue;
+        if (!bestMatch || effectivePath.length > bestMatch.effectivePath.length) {
+            bestMatch = { effectivePath, level, rulePath };
+        }
+    }
+    if (!bestMatch)
+        return { kind: 'no_rule' };
+    if (bestMatch.level === 'DO_NOT_TRUST') {
+        const via = bestMatch.effectivePath === projectPath ? 'exact' : 'ancestor';
+        return { kind: 'distrusted', via };
+    }
+    if (bestMatch.level === 'TRUST_FOLDER') {
+        const via = bestMatch.effectivePath === projectPath ? 'exact' : 'ancestor';
+        return { kind: 'trusted', via };
+    }
+    return { kind: 'trusted', via: 'parent_rule' };
+}
+//# sourceMappingURL=trust-folders-logic.js.map

package/dist/server/modules/core/services/trust-folders-logic.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"trust-folders-logic.js","sourceRoot":"","sources":["../../../../src/modules/core/services/trust-folders-logic.ts"],"names":[],"mappings":";;AAyBA,8CA6BC;AAtDD,+BAA+B;AAmB/B,SAAS,SAAS,CAAC,MAAc,EAAE,KAAa;IAC9C,IAAI,MAAM,KAAK,KAAK;QAAE,OAAO,IAAI,CAAC;IAClC,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC;IACnE,OAAO,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,iBAAiB,CAC/B,WAAmB,EACnB,KAAiC;IAEjC,IAAI,SAAS,GAA0E,IAAI,CAAC;IAE5F,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACtD,MAAM,aAAa,GAAG,KAAK,KAAK,cAAc,CAAC,CAAC,CAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAE9E,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,WAAW,CAAC;YAAE,SAAS;QAErD,IAAI,CAAC,SAAS,IAAI,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YACxE,SAAS,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;QACjD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAE3C,IAAI,SAAS,CAAC,KAAK,KAAK,cAAc,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,SAAS,CAAC,aAAa,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;QAC3E,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;IACrC,CAAC;IAED,IAAI,SAAS,CAAC,KAAK,KAAK,cAAc,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,SAAS,CAAC,aAAa,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;QAC3E,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC;AACjD,CAAC"}

package/dist/server/modules/e2ee/controllers/e2ee-pairing.controller.d.ts CHANGED Viewed

@@ -8,6 +8,7 @@ interface CompleteBody {
     deviceEncKid?: string;
     pairingMac?: string;
     label?: string;
+    installId?: string;
 }
 export declare class E2eePairingController {
     private readonly pairing;

package/dist/server/modules/e2ee/controllers/e2ee-pairing.controller.js CHANGED Viewed

@@ -37,6 +37,7 @@ let E2eePairingController = class E2eePairingController {
             deviceEncKid: body.deviceEncKid,
             pairingMac: body.pairingMac,
             ...(body.label !== undefined ? { label: body.label } : {}),
+            ...(body.installId !== undefined ? { installId: body.installId } : {}),
         });
     }
 };

package/dist/server/modules/e2ee/controllers/e2ee-pairing.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"e2ee-pairing.controller.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/controllers/e2ee-pairing.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwD;AACxD,oEAAqE;AACrE,2EAI0C;~~AAsBnC~~,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAA6B,OAA2B;QAA3B,YAAO,GAAP,OAAO,CAAoB;IAAG,CAAC;IAGtD,AAAN,KAAK,CAAC,KAAK,CAAS,IAAe;QACjC,IAAI,CAAC,IAAI,EAAE,SAAS;YAAE,MAAM,IAAI,6BAAe,CAAC,uBAAuB,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CAAS,IAAkB;QACvC,IAAI,CAAC,IAAI,EAAE,SAAS;YAAE,MAAM,IAAI,6BAAe,CAAC,uBAAuB,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACpE,MAAM,IAAI,6BAAe,CAAC,2DAA2D,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;YACpC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;~~SAC3D~~,CAAC,CAAC;IACL,CAAC;CACF,CAAA;~~AAvBY~~,sDAAqB;AAI1B;IADL,IAAA,aAAI,EAAC,OAAO,CAAC;IACD,WAAA,IAAA,aAAI,GAAE,CAAA;;;;kDAGlB;AAGK;IADL,IAAA,aAAI,EAAC,UAAU,CAAC;IACD,WAAA,IAAA,aAAI,GAAE,CAAA;;;;~~qDAYrB~~;~~gCAtBU~~,qBAAqB;IADjC,IAAA,mBAAU,EAAC,kBAAkB,CAAC;qCAES,yCAAkB;GAD7C,qBAAqB,~~CAuBjC~~"}
1	+ {"version":3,"file":"e2ee-pairing.controller.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/controllers/e2ee-pairing.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwD;AACxD,oEAAqE;AACrE,2EAI0C;AAwBnC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAA6B,OAA2B;QAA3B,YAAO,GAAP,OAAO,CAAoB;IAAG,CAAC;IAGtD,AAAN,KAAK,CAAC,KAAK,CAAS,IAAe;QACjC,IAAI,CAAC,IAAI,EAAE,SAAS;YAAE,MAAM,IAAI,6BAAe,CAAC,uBAAuB,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CAAS,IAAkB;QACvC,IAAI,CAAC,IAAI,EAAE,SAAS;YAAE,MAAM,IAAI,6BAAe,CAAC,uBAAuB,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACpE,MAAM,IAAI,6BAAe,CAAC,2DAA2D,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;YACpC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACvE,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAxBY,sDAAqB;AAI1B;IADL,IAAA,aAAI,EAAC,OAAO,CAAC;IACD,WAAA,IAAA,aAAI,GAAE,CAAA;;;;kDAGlB;AAGK;IADL,IAAA,aAAI,EAAC,UAAU,CAAC;IACD,WAAA,IAAA,aAAI,GAAE,CAAA;;;;qDAarB;gCAvBU,qBAAqB;IADjC,IAAA,mBAAU,EAAC,kBAAkB,CAAC;qCAES,yCAAkB;GAD7C,qBAAqB,CAwBjC"}

package/dist/server/modules/e2ee/services/e2ee-device-store.service.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ export interface E2eePeerDevice {
     verifiedVia?: E2eeVerificationMethod;
     verifiedAt?: string;
     label?: string;
+    installId?: string;
 }
 export declare class E2eeDeviceStoreService {
     private readonly db;
@@ -17,10 +18,16 @@ export declare class E2eeDeviceStoreService {
     add(device: Omit<E2eePeerDevice, 'addedAt' | 'trust'> & {
         addedAt?: string;
         trust?: E2eeTrustStatus;
+    }, opts?: {
+        evictVerified?: boolean;
+    }): E2eePeerDevice;
+    reconcile(incoming: IncomingPeerKey, now?: string, opts?: {
+        installId?: string;
+        evictVerified?: boolean;
     }): E2eePeerDevice;
-    reconcile(incoming: IncomingPeerKey, now?: string): E2eePeerDevice;
     markVerified(kid: string, now?: string): E2eePeerDevice | null;
     private toDevice;
+    private supersedeByInstallId;
     get(kid: string): E2eePeerDevice | null;
     revoke(kid: string): boolean;
     list(): E2eePeerDevice[];

package/dist/server/modules/e2ee/services/e2ee-device-store.service.js CHANGED Viewed

@@ -23,12 +23,16 @@ const logger_1 = require("../../../common/logging/logger");
 const logger = (0, logger_1.createLogger)('E2eeDeviceStore');
 const SETTINGS_KEY = 'cloud.e2ee.devices';
 const STORE_VERSION = 1;
+const CANONICAL_UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
+function isCanonicalUuid(value) {
+    return typeof value === 'string' && CANONICAL_UUID_RE.test(value);
+}
 let E2eeDeviceStoreService = class E2eeDeviceStoreService {
     constructor(db) {
         this.db = db;
         this.sqlite = (0, sqlite_raw_1.getRawSqliteClient)(this.db);
     }
-    add(device) {
+    add(device, opts = {}) {
         const dir = this.load();
         const record = {
             kid: device.kid,
@@ -39,13 +43,15 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
             ...(device.verifiedVia !== undefined ? { verifiedVia: device.verifiedVia } : {}),
             ...(device.verifiedAt !== undefined ? { verifiedAt: device.verifiedAt } : {}),
             ...(device.label !== undefined ? { label: device.label } : {}),
+            ...(isCanonicalUuid(device.installId) ? { installId: device.installId } : {}),
         };
         dir.devices[record.kid] = record;
+        const superseded = this.supersedeByInstallId(dir.devices, record.installId, record.kid, opts.evictVerified ?? false);
         this.save(dir);
-        logger.info({ kid: record.kid, trust: record.trust }, 'Peer E2EE device public key added');
+        logger.info({ kid: record.kid, trust: record.trust, superseded }, 'Peer E2EE device public key added');
         return record;
     }
-    reconcile(incoming, now = new Date().toISOString()) {
+    reconcile(incoming, now = new Date().toISOString(), opts = {}) {
         const dir = this.load();
         const existing = (dir.devices[incoming.kid] ?? null);
         const prior = existing ??
@@ -53,9 +59,13 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
             null;
         const reconciled = (0, shared_1.reconcilePeerKey)(prior, incoming, now);
         const record = this.toDevice(reconciled);
+        if (isCanonicalUuid(opts.installId)) {
+            record.installId = opts.installId;
+        }
         dir.devices[record.kid] = record;
+        const superseded = this.supersedeByInstallId(dir.devices, record.installId, record.kid, opts.evictVerified ?? false);
         this.save(dir);
-        logger.info({ kid: record.kid, trust: record.trust, adoptedVia: record.adoptedVia }, 'Peer E2EE device reconciled (TOFU adopt / rotation)');
+        logger.info({ kid: record.kid, trust: record.trust, adoptedVia: record.adoptedVia, superseded }, 'Peer E2EE device reconciled (TOFU adopt / rotation)');
         return record;
     }
     markVerified(kid, now = new Date().toISOString()) {
@@ -79,8 +89,25 @@ let E2eeDeviceStoreService = class E2eeDeviceStoreService {
             ...(rec.verifiedVia !== undefined ? { verifiedVia: rec.verifiedVia } : {}),
             ...(rec.verifiedAt !== undefined ? { verifiedAt: rec.verifiedAt } : {}),
             ...(rec.label !== undefined ? { label: rec.label } : {}),
+            ...(rec.installId !== undefined ? { installId: rec.installId } : {}),
         };
     }
+    supersedeByInstallId(devices, installId, keepKid, evictVerified) {
+        if (!isCanonicalUuid(installId))
+            return 0;
+        let evicted = 0;
+        for (const [kid, device] of Object.entries(devices)) {
+            if (kid === keepKid)
+                continue;
+            if (device.installId !== installId)
+                continue;
+            if (!evictVerified && device.trust === 'verified')
+                continue;
+            delete devices[kid];
+            evicted++;
+        }
+        return evicted;
+    }
     get(kid) {
         return this.load().devices[kid] ?? null;
     }

package/dist/server/modules/e2ee/services/e2ee-device-store.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"e2ee-device-store.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-device-store.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,mCAAoC;AACpC,+DAAmE;AAEnE,6CAQ0B;AAC1B,8DAA6D;AAC7D,4DAAiE;AACjE,2DAA8D;AAE9D,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,iBAAiB,CAAC,CAAC;AAE/C,MAAM,YAAY,GAAG,oBAAoB,CAAC;~~AAkC1C~~,MAAM,aAAa,GAAG,CAAC,CAAC;~~AAUjB~~,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAGjC,YAAoD,EAAyB;QAAzB,OAAE,GAAF,EAAE,CAAuB;QAC3E,IAAI,CAAC,MAAM,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;IAOD,GAAG,CACD,MAGC;~~QAED~~,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,MAAM,MAAM,GAAmB;YAC7B,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnD,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,YAAY;YACnC,GAAG,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7E,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChF,GAAG,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7E,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;~~SAC/D~~,CAAC;QACF,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;~~QACjC~~,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,MAAM,CAAC,IAAI,~~CAAC~~,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,mCAAmC,~~CAAC~~,CAAC;~~QAC3F~~,OAAO,MAAM,CAAC;IAChB,CAAC;IAUD,SAAS,~~CAAC~~,QAAyB,~~EAAE~~,MAAc,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;~~QACzE~~,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAA2B,CAAC;QAG/E,MAAM,KAAK,GACT,QAAQ;YACR,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,QAAQ,CAAC,YAAY,CAAC;YAChF,IAAI,CAAC;QACP,MAAM,UAAU,GAAG,IAAA,yBAAgB,EAAC,KAA+B,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;~~QACpF~~,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,~~UAAU~~,CAAC,CAAC;~~QACzC~~,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;~~QACjC~~,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,MAAM,CAAC,IAAI,CACT,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,~~EACvE~~,qDAAqD,CACtD,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAMD,YAAY,CAAC,GAAW,EAAE,MAAc,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QAC9D,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAA,oCAA2B,EAAC,QAA2B,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5F,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,oDAAoD,CAAC,CAAC;QAC3E,OAAO,MAAM,CAAC;IAChB,CAAC;~~IAGO~~,QAAQ,CAAC,~~GAAoB~~;~~QACnC~~,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,YAAY,EAAE,GAAG,CAAC,YAAY;YAC9B,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,GAAG,CAAC,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,GAAG,CAAC,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E,GAAG,CAAC,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;~~SACzD~~,CAAC;IACJ,CAAC;IAGD,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;IAC1C,CAAC;IAGD,MAAM,CAAC,GAAW;QAChB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QACpC,OAAO,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,qCAAqC,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC;IACd,CAAC;IAGD,IAAI;QACF,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAEO,IAAI;QACV,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM;aACpB,OAAO,CAAC,0CAA0C,CAAC;aACnD,GAAG,CAAC,YAAY,CAAkC,CAAC;QACtD,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACnD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAoB,CAAC;YACxD,IAAI,MAAM,CAAC,CAAC,KAAK,aAAa,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACrE,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;gBACtE,OAAO,EAAE,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAC3C,CAAC;YAGD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChD,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;oBAC9D,GAAG,CAAC,KAAK,GAAG,YAAY,CAAC;gBAC3B,CAAC;YACH,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;YACjE,OAAO,EAAE,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QAC3C,CAAC;IACH,CAAC;IAEO,IAAI,CAAC,GAAoB;QAC/B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM;aACR,OAAO,CACN;;iGAEyF,CAC1F;aACA,GAAG,CAAC,IAAA,mBAAU,GAAE,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACpE,CAAC;CACF,CAAA;~~AAnJY~~,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAIE,WAAA,IAAA,eAAM,EAAC,2BAAa,CAAC,CAAA;qCAAsB,sCAAqB;GAHlE,sBAAsB,~~CAmJlC~~"}
1	+ {"version":3,"file":"e2ee-device-store.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-device-store.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,mCAAoC;AACpC,+DAAmE;AAEnE,6CAQ0B;AAC1B,8DAA6D;AAC7D,4DAAiE;AACjE,2DAA8D;AAE9D,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,iBAAiB,CAAC,CAAC;AAE/C,MAAM,YAAY,GAAG,oBAAoB,CAAC;AA2C1C,MAAM,aAAa,GAAG,CAAC,CAAC;AAQxB,MAAM,iBAAiB,GACrB,2EAA2E,CAAC;AAE9E,SAAS,eAAe,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACpE,CAAC;AAUM,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAGjC,YAAoD,EAAyB;QAAzB,OAAE,GAAF,EAAE,CAAuB;QAC3E,IAAI,CAAC,MAAM,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;IAOD,GAAG,CACD,MAGC,EACD,OAAoC,EAAE;QAEtC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,MAAM,MAAM,GAAmB;YAC7B,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnD,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,YAAY;YACnC,GAAG,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7E,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChF,GAAG,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7E,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAE9D,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9E,CAAC;QACF,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAGjC,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAC1C,GAAG,CAAC,OAAO,EACX,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,GAAG,EACV,IAAI,CAAC,aAAa,IAAI,KAAK,CAC5B,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,MAAM,CAAC,IAAI,CACT,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,EACpD,mCAAmC,CACpC,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAUD,SAAS,CACP,QAAyB,EACzB,MAAc,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EACtC,OAAwD,EAAE;QAE1D,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAA2B,CAAC;QAG/E,MAAM,KAAK,GACT,QAAQ;YACR,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,QAAQ,CAAC,YAAY,CAAC;YAChF,IAAI,CAAC;QACP,MAAM,UAAU,GAAG,IAAA,yBAAgB,EAAC,KAA+B,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAKpF,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAsD,CAAC,CAAC;QACrF,IAAI,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACpC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACpC,CAAC;QACD,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAIjC,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAC1C,GAAG,CAAC,OAAO,EACX,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,GAAG,EACV,IAAI,CAAC,aAAa,IAAI,KAAK,CAC5B,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,MAAM,CAAC,IAAI,CACT,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,UAAU,EAAE,EACnF,qDAAqD,CACtD,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAMD,YAAY,CAAC,GAAW,EAAE,MAAc,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QAC9D,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAA,oCAA2B,EAAC,QAA2B,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5F,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,oDAAoD,CAAC,CAAC;QAC3E,OAAO,MAAM,CAAC;IAChB,CAAC;IAQO,QAAQ,CAAC,GAA6C;QAC5D,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,YAAY,EAAE,GAAG,CAAC,YAAY;YAC9B,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,GAAG,CAAC,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,GAAG,CAAC,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E,GAAG,CAAC,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACrE,CAAC;IACJ,CAAC;IAsBO,oBAAoB,CAC1B,OAAuC,EACvC,SAA6B,EAC7B,OAAe,EACf,aAAsB;QAEtB,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;YAAE,OAAO,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACpD,IAAI,GAAG,KAAK,OAAO;gBAAE,SAAS;YAC9B,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS;gBAAE,SAAS;YAC7C,IAAI,CAAC,aAAa,IAAI,MAAM,CAAC,KAAK,KAAK,UAAU;gBAAE,SAAS;YAC5D,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;YACpB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAGD,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;IAC1C,CAAC;IAGD,MAAM,CAAC,GAAW;QAChB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QACpC,OAAO,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,qCAAqC,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC;IACd,CAAC;IAGD,IAAI;QACF,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAEO,IAAI;QACV,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM;aACpB,OAAO,CAAC,0CAA0C,CAAC;aACnD,GAAG,CAAC,YAAY,CAAkC,CAAC;QACtD,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACnD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAoB,CAAC;YACxD,IAAI,MAAM,CAAC,CAAC,KAAK,aAAa,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACrE,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;gBACtE,OAAO,EAAE,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAC3C,CAAC;YAGD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChD,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;oBAC9D,GAAG,CAAC,KAAK,GAAG,YAAY,CAAC;gBAC3B,CAAC;YACH,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;YACjE,OAAO,EAAE,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QAC3C,CAAC;IACH,CAAC;IAEO,IAAI,CAAC,GAAoB;QAC/B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM;aACR,OAAO,CACN;;iGAEyF,CAC1F;aACA,GAAG,CAAC,IAAA,mBAAU,GAAE,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACpE,CAAC;CACF,CAAA;AAjOY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAIE,WAAA,IAAA,eAAM,EAAC,2BAAa,CAAC,CAAA;qCAAsB,sCAAqB;GAHlE,sBAAsB,CAiOlC"}

package/dist/server/modules/e2ee/services/e2ee-pairing.service.d.ts CHANGED Viewed

@@ -12,6 +12,7 @@ export interface CompleteQrPairingInput {
     deviceEncKid: string;
     pairingMac: string;
     label?: string;
+    installId?: string;
 }
 export interface CompleteQrPairingResult {
     kid: string;

package/dist/server/modules/e2ee/services/e2ee-pairing.service.js CHANGED Viewed

@@ -85,7 +85,8 @@ let E2eePairingService = class E2eePairingService {
             verifiedVia: 'qr',
             verifiedAt: new Date().toISOString(),
             ...(input.label !== undefined ? { label: input.label } : {}),
-        });
+            ...(input.installId !== undefined ? { installId: input.installId } : {}),
+        }, { evictVerified: true });
         this.pending.delete(input.channelId);
         logger.info({ channelId: input.channelId, deviceKid: record.kid }, 'E2EE QR pairing verified — peer device marked VERIFIED');
         return { kid: record.kid, trust: record.trust };

package/dist/server/modules/e2ee/services/e2ee-pairing.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"e2ee-pairing.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-pairing.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mCAAqC;AACrC,6CAU0B;AAC1B,oEAAoG;AACpG,2DAA8D;AAC9D,iEAA4D;AAC5D,2EAAqE;AAErE,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,aAAa,CAAC,CAAC;AAG3C,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;~~AA8C9B~~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~~CAAC~~;~~YAClC~~,GAAG,EAAE,KAAK,CAAC,YAAY;YACvB,YAAY,EAAE,KAAK,CAAC,eAAe;YACnC,KAAK,EAAE,UAAU;YACjB,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACpC,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;~~SAC7D~~,CAAC,CAAC;~~QAEH~~,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CACT,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,EAAE,EACrD,wDAAwD,CACzD,CAAC;QACF,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IAClD,CAAC;IAEO,YAAY;QAClB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC;QAC3C,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC9C,IAAI,KAAK,CAAC,SAAS,GAAG,MAAM;gBAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CACF,CAAA;~~AApHY~~,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAMiB,yCAAkB;QACd,kDAAsB;GAN3C,kBAAkB,~~CAoH9B~~"}
1	+ {"version":3,"file":"e2ee-pairing.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-pairing.service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/e2ee/services/e2ee-trust.service.d.ts CHANGED Viewed

@@ -32,5 +32,5 @@ export declare class E2eeTrustService {
         kid: string;
         removed: boolean;
     };
-    adoptPeerKeyTofu(incoming: IncomingPeerKey): DeviceTrustResult;
+    adoptPeerKeyTofu(incoming: IncomingPeerKey, installId?: string): DeviceTrustResult;
 }

package/dist/server/modules/e2ee/services/e2ee-trust.service.js CHANGED Viewed

@@ -82,7 +82,7 @@ let E2eeTrustService = class E2eeTrustService {
             logger.info({ kid }, 'E2EE device un-paired from Paired devices');
         return { kid, removed };
     }
-    adoptPeerKeyTofu(incoming) {
+    adoptPeerKeyTofu(incoming, installId) {
         if (!incoming?.kid || !incoming.publicKeyB64) {
             throw new error_types_1.ValidationError('kid and publicKeyB64 are required');
         }
@@ -101,7 +101,10 @@ let E2eeTrustService = class E2eeTrustService {
             logger.warn({ suppliedKid: incoming.kid, derivedKid }, 'E2EE adopt rejected — kid does not match public key (possible substitution)');
             throw new error_types_1.ValidationError('kid does not match public key');
         }
-        const record = this.deviceStore.reconcile(incoming);
+        const record = this.deviceStore.reconcile(incoming, undefined, {
+            installId,
+            evictVerified: false,
+        });
         return {
             kid: record.kid,
             trust: record.trust,

package/dist/server/modules/e2ee/services/e2ee-trust.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"e2ee-trust.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-trust.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAS0B;AAC1B,oEAAoF;AACpF,2DAA8D;AAC9D,iEAA4D;AAC5D,2EAAqE;AAErE,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,WAAW,CAAC,CAAC;AAwClC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,OAA2B,EAC3B,WAAmC;QADnC,YAAO,GAAP,OAAO,CAAoB;QAC3B,gBAAW,GAAX,WAAW,CAAwB;IACnD,CAAC;IAOJ,WAAW;QACT,OAAO,IAAI,CAAC,WAAW;aACpB,IAAI,EAAE;aACN,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACX,GAAG,EAAE,CAAC,CAAC,GAAG;YACV,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,GAAG,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnE,GAAG,CAAC,CAAC,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtE,GAAG,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACpE,CAAC,CAAC;aACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,CAAC;IAGD,KAAK,CAAC,eAAe,CAAC,GAAW;QAC/B,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,6BAAe,CAAC,iBAAiB,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,2BAAa,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAEzD,IAAI,SAAqB,CAAC;QAC1B,IAAI,CAAC;YACH,SAAS,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,6BAAe,CAAC,8CAA8C,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,SAAS,CAAC,MAAM,KAAK,gCAAuB,EAAE,CAAC;YACjD,MAAM,IAAI,6BAAe,CAAC,6BAA6B,gCAAuB,QAAQ,CAAC,CAAC;QAC1F,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,YAAY,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACnE,OAAO;YACL,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,YAAY;YACZ,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjF,CAAC;IACJ,CAAC;IAGD,YAAY,CAAC,GAAW;QACtB,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,6BAAe,CAAC,iBAAiB,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,2BAAa,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QACzD,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,gDAAgD,CAAC,CAAC;QACvE,OAAO;YACL,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjF,CAAC;IACJ,CAAC;IAQD,YAAY,CAAC,GAAW;QACtB,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,6BAAe,CAAC,iBAAiB,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,OAAO;YAAE,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,2CAA2C,CAAC,CAAC;QAC/E,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;IAC1B,CAAC;~~IAGD~~,gBAAgB,CAAC,QAAyB;~~QACxC~~,IAAI,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC7C,MAAM,IAAI,6BAAe,CAAC,mCAAmC,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,GAAe,CAAC;QACpB,IAAI,CAAC;YACH,GAAG,GAAG,IAAA,sBAAa,EAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC7C,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,6BAAe,CAAC,kCAAkC,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,gCAAuB,EAAE,CAAC;YAC3C,MAAM,IAAI,6BAAe,CAAC,+BAA+B,gCAAuB,QAAQ,CAAC,CAAC;QAC5F,CAAC;QAKD,MAAM,UAAU,GAAG,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC;QAClC,IAAI,UAAU,KAAK,QAAQ,CAAC,GAAG,EAAE,CAAC;YAChC,MAAM,CAAC,IAAI,CACT,EAAE,WAAW,EAAE,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,EACzC,6EAA6E,CAC9E,CAAC;YACF,MAAM,IAAI,6BAAe,CAAC,+BAA+B,CAAC,CAAC;QAC7D,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;~~QACpD~~,OAAO;YACL,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjF,CAAC;IACJ,CAAC;CACF,CAAA;~~AA/GY~~,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAGiB,yCAAkB;QACd,kDAAsB;GAH3C,gBAAgB,~~CA+G5B~~"}
1	+ {"version":3,"file":"e2ee-trust.service.js","sourceRoot":"","sources":["../../../../src/modules/e2ee/services/e2ee-trust.service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/events/catalog/claude.hooks.session.started.d.ts CHANGED Viewed

@@ -3,6 +3,8 @@ export declare const claudeHooksSessionStartedEvent: {
     readonly name: "claude.hooks.session.started";
     readonly schema: z.ZodObject<{
         claudeSessionId: z.ZodString;
+        providerName: z.ZodOptional<z.ZodString>;
+        providerSessionId: z.ZodOptional<z.ZodString>;
         source: z.ZodString;
         model: z.ZodOptional<z.ZodString>;
         permissionMode: z.ZodOptional<z.ZodString>;
@@ -19,6 +21,8 @@ export declare const claudeHooksSessionStartedEvent: {
         sessionId: string | null;
         tmuxSessionName: string;
         claudeSessionId: string;
+        providerName?: string | undefined;
+        providerSessionId?: string | undefined;
         agentName?: string | null | undefined;
         transcriptPath?: string | undefined;
         model?: string | undefined;
@@ -30,6 +34,8 @@ export declare const claudeHooksSessionStartedEvent: {
         sessionId: string | null;
         tmuxSessionName: string;
         claudeSessionId: string;
+        providerName?: string | undefined;
+        providerSessionId?: string | undefined;
         agentName?: string | null | undefined;
         transcriptPath?: string | undefined;
         model?: string | undefined;

package/dist/server/modules/events/catalog/claude.hooks.session.started.js CHANGED Viewed

@@ -6,6 +6,8 @@ exports.claudeHooksSessionStartedEvent = {
     name: 'claude.hooks.session.started',
     schema: zod_1.z.object({
         claudeSessionId: zod_1.z.string().min(1),
+        providerName: zod_1.z.string().min(1).optional(),
+        providerSessionId: zod_1.z.string().min(1).optional(),
         source: zod_1.z.string().min(1),
         model: zod_1.z.string().min(1).optional(),
         permissionMode: zod_1.z.string().min(1).optional(),

package/dist/server/modules/events/catalog/claude.hooks.session.started.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"claude.hooks.session.started.js","sourceRoot":"","sources":["../../../../src/modules/events/catalog/claude.hooks.session.started.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAEX,QAAA,8BAA8B,GAAG;~~IAC5C~~,IAAI,EAAE,8BAA8B;IACpC,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC;~~QACf~~,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAElC,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACzB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QACnC,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC5C,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC5C,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAClC,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;QAC5B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;QACrC,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;QAClD,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;KACxC,CAAC;CACM,CAAC"}
1	+ {"version":3,"file":"claude.hooks.session.started.js","sourceRoot":"","sources":["../../../../src/modules/events/catalog/claude.hooks.session.started.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAEX,QAAA,8BAA8B,GAAG;IAI5C,IAAI,EAAE,8BAA8B;IACpC,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC;QAMf,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAElC,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAE1C,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAE/C,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACzB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QACnC,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC5C,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC5C,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAClC,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;QAC5B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;QACrC,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;QAClD,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;KACxC,CAAC;CACM,CAAC"}